diff --git a/src/main/5A20.c b/src/main/5A20.c index 47cb19a7..7e778bc8 100644 --- a/src/main/5A20.c +++ b/src/main/5A20.c @@ -1,5 +1,11 @@ #include "common.h" +extern s32 D_8013B3A0; +extern s32 D_8013B3B0; +extern s32 D_8013B3B4; + +void func_80005680(s32, s32, s32*); + f32 func_80004E20(f32 arg0, f32 arg1) { return arg0 - ((s32)(arg0 / arg1) * arg1); } @@ -8,10 +14,6 @@ f32 func_80004E20(f32 arg0, f32 arg1) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004EB0.s") -extern s32 D_8013B3A0; -extern s32 D_8013B3B0; -extern s32 D_8013B3B4; - void func_80004FC8(s32 arg0, s32 arg1, s32 arg2) { D_8013B3B0 = arg0; D_8013B3B4 = arg1; @@ -44,7 +46,10 @@ f32 func_800055DC(f32 arg0, s32 arg1) { #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005680.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80005708.s") +void func_80005708(s32* arg0) { + func_80005680(*arg0 + 64, *arg0, arg0); + *arg0 += 0x40; +} void func_80005740(s32* arg0) { *arg0 -= 64;