falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match func_809F24C8 NON_MATCHING (#1465) 

* fix func_809F24C8

* reloc
This commit is contained in:
Alejandro Asenjo Nitti 2023-11-07 10:32:25 -03:00 committed by GitHub
parent 277c184cb4
commit 28e2da2a18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec
View File

@ -2328,11 +2328,7 @@ beginseg
name "ovl_Boss_06" name "ovl_Boss_06"
compress compress
include "build/src/overlays/actors/ovl_Boss_06/z_boss_06.o" 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" 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 endseg
beginseg beginseg

5
src/overlays/actors/ovl_Boss_06/z_boss_06.c
View File

@ -182,8 +182,6 @@ void func_809F24A8(Boss06* this) {
this->unk_1AC = 0.0f; 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) { void func_809F24C8(Boss06* this, PlayState* play) {
s16 sp4E = 0; s16 sp4E = 0;
Player* player = GET_PLAYER(play); 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); 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) { void func_809F2B64(Boss06* this, PlayState* play) {
this->actionFunc = func_809F2C44; this->actionFunc = func_809F2C44;

4
src/overlays/actors/ovl_En_Knight/z_en_knight.h
View File

@ -11,9 +11,9 @@ typedef struct EnKnight {
/* 0x000 */ Actor actor; /* 0x000 */ Actor actor;
/* 0x144 */ s16 unk_144; /* 0x144 */ s16 unk_144;
/* 0x146 */ char unk_146[0x2]; /* 0x146 */ char unk_146[0x2];
/* 0x148 */ s8 unk_148; /* 0x148 */ u8 unk_148;
/* 0x149 */ char unk_149[0x8]; /* 0x149 */ char unk_149[0x8];
/* 0x151 */ s8 unk_151; /* 0x151 */ u8 unk_151;
/* 0x152 */ char unk_152[0x1]; /* 0x152 */ char unk_152[0x1];
/* 0x153 */ u8 unk_153; /* 0x153 */ u8 unk_153;
/* 0x154 */ u8 unk_154; /* 0x154 */ u8 unk_154;