Match func_8006B7E4, func_8006EEE8, func_80071A20 (#395)

* Match func_8006B7E4, func_8006EEE8, func_80071A20

* Fix missing extern void call
This commit is contained in:
Joshua Peisach
2023-09-05 16:38:40 -04:00
committed by GitHub
parent 8a2fdc21f5
commit 67fbcac9ec
7 changed files with 68 additions and 293 deletions
+6 -12
View File
@@ -6190,20 +6190,14 @@ void func_8006AFD0(Player *player, s16 arg1, s8 arg2, s8 arg3) {
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006AFD0.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_8006A50C(Player *, Player *, s8, s32, s32, s32); // extern
extern s16 gPlayerBalloonCount;
extern void func_8006A50C(Player*, f32, f32, s8, s8, s16);
void func_8006B7E4(Player *player, s32 arg1) {
func_8006A50C(NULL, NULL, arg1, 0, 0);
func_8006A50C(player, 0x3FC00000, 0x40000000, arg1, 1, 0x1C70);
func_8006A50C(player, 0xBFC00000, 0x40000000, arg1, 2, -0x1C70);
*(&gPlayerBalloonCount + (arg1 * 2)) = 2;
void func_8006B7E4(Player* player, s8 arg1) {
func_8006A50C(player, 0.0f, 0.0f, arg1, (s8) 0, (s16) 0);
func_8006A50C(player, 1.5f, 2.0f, arg1, (s8) 1, (s16) 0x1C70);
func_8006A50C(player, -1.5f, 2.0f, arg1, (s8) 2, (s16) -0x1C70);
gPlayerBalloonCount[arg1] = 2;
}
#else
GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006B7E4.s")
#endif
void func_8006B87C(UNUSED Player *player, s8 playerIndex) {
gPlayerBalloonStatus[playerIndex][0] = BALLOON_STATUS_GONE;