diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2021-07-13 21:49:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 21:49:05 -0400 |
| commit | 5fcd494a7aebc025ba9182f7872c6e24ed556bf4 (patch) | |
| tree | 10387ccec1f47cc7c72c25507eb242cbcc32b404 /src/code | |
| parent | 5453731f4e2cadabc518b76ebb1ea9d9d6f366b7 (diff) | |
`ovl_En_Ma4` matched and mostly documented (#199)
* First pass
* limbdraw
* another one
* lots of stuff
* stuff
* big one
* func_80ABEB6C
* The NON_MATCHING that matches in reality
* "Fix" some cases
* Fix merge issues
* fix func_80ABF254
* match a pair
* func_80ABF7C8
* func_80ABE1C4
* func_80ABF354
* func_80ABF534
* Import data
* Limb fixes
* Minor renames
* Fix merge issues
* A few renames
* Rename half the functions
* More renames
* More renaming
* documentation finished
* Format
* fix typo
* whoops
* Fix merge issues
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update variables names
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_scene.c | 2 | ||||
| -rw-r--r-- | src/code/z_vr_box.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_scene.c b/src/code/z_scene.c index c8170b17f..9cddb5093 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -316,7 +316,7 @@ void Scene_HeaderCmdLightList(GlobalContext* globalCtx, SceneCmd* cmd) { // SceneTableEntry Header Command 0x0D: Path List void Scene_HeaderCmdPathList(GlobalContext* globalCtx, SceneCmd* cmd) { - globalCtx->setupPathList = (void*)Lib_SegmentedToVirtual(cmd->pathList.segment); + globalCtx->setupPathList = (Path*)Lib_SegmentedToVirtual(cmd->pathList.segment); } // SceneTableEntry Header Command 0x0E: Transition Actor List diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index bdf60720e..e546b37a3 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -39,7 +39,7 @@ void func_80143148(SkyboxContext* skyboxCtx, s32 arg1) { #ifdef NON_MATCHING // Matches besides rodata, since rodata is not merged into the asm in code files yet. void func_801431E8(GameState* gamestate, SkyboxContext* skyboxCtx, s16 skyType) { - GlobalContext* globalCtx = (GlobalContext*)state; + GlobalContext* globalCtx = (GlobalContext*)gamestate; u32 size; void* offset; s32 pad; |