diff --git a/include/common.h b/include/common.h index 9c1f2f3d..fc85b616 100644 --- a/include/common.h +++ b/include/common.h @@ -6,6 +6,7 @@ typedef unsigned char u8; typedef unsigned short u16; typedef unsigned int u32; typedef unsigned long long u64; +typedef float f32; #define true 1 #define false 0 diff --git a/src/main/5A20.c b/src/main/5A20.c index b6d208da..66a57a2a 100644 --- a/src/main/5A20.c +++ b/src/main/5A20.c @@ -1,12 +1,22 @@ #include "common.h" -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004E20.s") +f32 func_80004E20(f32 arg0, f32 arg1) { + return arg0 - ((s32)(arg0 / arg1) * arg1); +} #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004E4C.s") #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004EB0.s") -#pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004FC8.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; + D_8013B3A0 = arg2; +} #pragma GLOBAL_ASM("asm/us/nonmatchings/main/5A20/func_80004FE8.s")