From 5fcd494a7aebc025ba9182f7872c6e24ed556bf4 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Tue, 13 Jul 2021 21:49:05 -0400 Subject: `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 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 * Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c Co-authored-by: Kenix3 * Update variables names Co-authored-by: Kenix3 --- src/code/z_scene.c | 2 +- src/code/z_vr_box.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/code') 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; -- cgit v1.2.3