From 975e72dc240e4d357c6bfb7ddcc47dd439e54cd9 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sun, 5 Nov 2023 20:54:03 -0300 Subject: [PATCH] func_809F24C8 matching --- spec | 4 ---- src/overlays/actors/ovl_Boss_06/z_boss_06.c | 5 ----- 2 files changed, 9 deletions(-) diff --git a/spec b/spec index 9fa5e2b28..3e9500362 100644 --- a/spec +++ b/spec @@ -2315,11 +2315,7 @@ beginseg name "ovl_Boss_06" compress include "build/src/overlays/actors/ovl_Boss_06/z_boss_06.o" -#ifdef NON_MATCHING include "build/src/overlays/actors/ovl_Boss_06/ovl_Boss_06_reloc.o" -#else - include "build/data/ovl_Boss_06/ovl_Boss_06.reloc.o" -#endif endseg beginseg diff --git a/src/overlays/actors/ovl_Boss_06/z_boss_06.c b/src/overlays/actors/ovl_Boss_06/z_boss_06.c index 887c3fcc6..94b10fcfb 100644 --- a/src/overlays/actors/ovl_Boss_06/z_boss_06.c +++ b/src/overlays/actors/ovl_Boss_06/z_boss_06.c @@ -182,8 +182,6 @@ void func_809F24A8(Boss06* this) { this->unk_1AC = 0.0f; } -#ifdef NON_MATCHING -// The 1 constant from the switch branch is reused in case 2 for some reason. void func_809F24C8(Boss06* this, PlayState* play) { s16 sp4E = 0; Player* player = GET_PLAYER(play); @@ -344,9 +342,6 @@ void func_809F24C8(Boss06* this, PlayState* play) { Play_SetCameraAtEye(play, this->subCamId, &this->subCamAt, &this->subCamEye); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Boss_06/func_809F24C8.s") -#endif void func_809F2B64(Boss06* this, PlayState* play) { this->actionFunc = func_809F2C44;