diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2023-11-07 10:32:25 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-07 10:32:25 -0300 |
| commit | 28e2da2a18ddf1fc2dd81199e73eb18252684b43 (patch) | |
| tree | cd4cc0af976456e4e03a58abb44c87a6c1880c1b /src | |
| parent | 277c184cb418db1f937edc5891db5c4c1b031f15 (diff) | |
Match func_809F24C8 NON_MATCHING (#1465)
* fix func_809F24C8
* reloc
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_Boss_06/z_boss_06.c | 5 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Knight/z_en_knight.h | 4 |
2 files changed, 2 insertions, 7 deletions
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 92db6dc89..a06fe25d1 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; diff --git a/src/overlays/actors/ovl_En_Knight/z_en_knight.h b/src/overlays/actors/ovl_En_Knight/z_en_knight.h index 2d413fea3..dc8fb1bca 100644 --- a/src/overlays/actors/ovl_En_Knight/z_en_knight.h +++ b/src/overlays/actors/ovl_En_Knight/z_en_knight.h @@ -11,9 +11,9 @@ typedef struct EnKnight { /* 0x000 */ Actor actor; /* 0x144 */ s16 unk_144; /* 0x146 */ char unk_146[0x2]; - /* 0x148 */ s8 unk_148; + /* 0x148 */ u8 unk_148; /* 0x149 */ char unk_149[0x8]; - /* 0x151 */ s8 unk_151; + /* 0x151 */ u8 unk_151; /* 0x152 */ char unk_152[0x1]; /* 0x153 */ u8 unk_153; /* 0x154 */ u8 unk_154; |