izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

func_809F24C8 matching

Browse Source
This commit is contained in:
Alejandro Javier Asenjo Nitti
2023-11-05 20:54:03 -03:00
parent ac01925971
commit 975e72dc24
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
-4
View File
@@ -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
src/overlays/actors/ovl_Boss_06/z_boss_06.c
-5
View File
@@ -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;