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

Match 4 functions in BGcheck, remove nonequivalency in DynaPoly_ExpandSRT and BgHakaBombwall (#1128) 

* match 1

* more matches

* one thing

* cleaned up conditionals

* move bss

* format

* I swear that's all of the ()

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
This commit is contained in:
petrie911 2022-10-20 20:34:21 -05:00 committed by GitHub
parent 75d7cf668c
commit dca019f9fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 278 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -164,7 +164,7 @@ f64 func_80086CEC(f64 param_1);
s32 func_80086CF8(f32 param_1);
s32 func_80086D08(f64 param_1);
// void func_80086D18(void);
// void func_80086D24(void);
f64 func_80086D24(f64);
s32 func_80086D30(f32 param_1);
s32 func_80086D40(f64 param_1);
// void func_80086D50(void);

534
src/code/z_bgcheck.c
View File

File diff suppressed because it is too large Load Diff

2
src/overlays/actors/ovl_Bg_Haka_Bombwall/z_bg_haka_bombwall.c
View File

@ -137,7 +137,7 @@ void func_80BD5E6C(BgHakaBombwall* this, PlayState* play) {
}
EffectSsKakera_Spawn(play, &spE0, &spD4, &spE0, gravity, phi_s0, 30, 0, 0, D_80BD64CC[i & 3], phi_t0, 0, 50, -1,
OBJECT_IKANA_OBJ, object_haka_obj_DL_001680);
OBJECT_HAKA_OBJ, object_haka_obj_DL_001680);
}
Matrix_Pop();

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

@ -182,7 +182,7 @@ void func_809F24A8(Boss06* this) {
}
#ifdef NON_MATCHING
// Weird loading of 1
// 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);