diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-05-12 22:32:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-13 15:32:19 +1000 |
| commit | cc6cc8da96ceaad7b1bfa318e5e3c422b2a89ba7 (patch) | |
| tree | fbce69f1a198b792b44e8b38704e1bf350393d3d /src/code | |
| parent | b312b76db7a7231b7a792cccf80eff7a6af96aba (diff) | |
Add a Couple Disasm Hacks (Fix NON_MATCHING Builds) (#1231)
* collision check bss
* play_hireso
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_collision_check.c | 8 | ||||
| -rw-r--r-- | src/code/z_play.c | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 20083f3c4..8bcd244bd 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 bd4db8fec..57386c97c 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 }; |