From cc6cc8da96ceaad7b1bfa318e5e3c422b2a89ba7 Mon Sep 17 00:00:00 2001 From: Derek Hensley Date: Fri, 12 May 2023 22:32:19 -0700 Subject: [PATCH] Add a Couple Disasm Hacks (Fix NON_MATCHING Builds) (#1231) * collision check bss * play_hireso --- src/code/z_collision_check.c | 8 ++++++++ src/code/z_play.c | 3 --- tools/disasm/disasm.py | 4 ++++ tools/disasm/variables.txt | 1 - 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 20083f3c46..8bcd244bd4 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -23,16 +23,24 @@ Vec3f D_801EE0D8; TriNorm D_801EE0E8[2]; TriNorm D_801EE150; TriNorm D_801EE188; + +#ifndef NON_MATCHING Vec3f D_801EE1C0; Vec3f D_801EE1D0; Vec3f D_801EE1E0; Vec3f D_801EE1F0; EffectSparkInit D_801EE200; +#endif + TriNorm D_801EE6C8; TriNorm D_801EE700; + +#ifndef NON_MATCHING EffectSparkInit D_801EE738; EffectSparkInit D_801EEC00; EffectSparkInit D_801EF0C8; +#endif + TriNorm D_801EF590; TriNorm D_801EF5C8; TriNorm D_801EF600; diff --git a/src/code/z_play.c b/src/code/z_play.c index bd4db8feca..57386c97c8 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -2342,6 +2342,3 @@ void Play_Init(GameState* thisx) { sBombersNotebookOpen = false; BombersNotebook_Init(&sBombersNotebook); } - -//! TODO: fake symbol, remove when BombersNotebook_Update is matching -u16 D_801D0D78[] = { 0, 0, 0, 0 }; diff --git a/tools/disasm/disasm.py b/tools/disasm/disasm.py index 0f5e16464f..e7b0f4d815 100755 --- a/tools/disasm/disasm.py +++ b/tools/disasm/disasm.py @@ -177,6 +177,10 @@ def proper_name(symbol, in_data=False, is_symbol=True): return variables_ast[0x809C46DC][0] + " + 0x14" elif symbol == 0x801EF66D: # z_message_nes constant-folding stray fairy array return variables_ast[0x801EF670][0] + f" - 0x{0x801EF670 - 0x801EF66D:X}" + elif symbol == 0x801EF51D: # z_message constant-folding stray fairy array + return variables_ast[0x801EF670][0] + f" - 0x{0x801EF670 - 0x801EF51D:X}" + elif symbol == 0x801D0D7A: # play_hireso constant-folding D_801D0D80 array + return variables_ast[0x801D0D80][0] + f" - 0x{0x801D0D80 - 0x801D0D7A:X}" elif symbol == 0x80A09740: # boss_07 symbol with large addend folded into %lo return variables_ast[0x80A09A60][0] + f" - 0x{0x80A09A60 - 0x80A09740:X}" # bg_ikana_mirror symbol with large addend folded into %lo diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index d0c90775b4..ffd045d44e 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -2138,7 +2138,6 @@ 0x801D0D5C:("sIsCameraUnderwater","UNK_TYPE2","",0x2), 0x801D0D60:("D_801D0D60","Input*","",0x4), 0x801D0D64:("sPlayerCsIdToCsCamId","s16","[10]",0x14), - 0x801D0D78:("D_801D0D78","u16","[4]",0x4), 0x801D0D80:("D_801D0D80","UNK_TYPE1","",0x1), 0x801D11F4:("D_801D11F4","UNK_TYPE1","",0x1), 0x801D1230:("D_801D1230","UNK_TYPE1","",0x1),