diff --git a/src/game/game_1999b0.c b/src/game/game_1999b0.c index 1f972f072..c0060629f 100644 --- a/src/game/game_1999b0.c +++ b/src/game/game_1999b0.c @@ -3037,18 +3037,10 @@ glabel func0f19c1cc /* f19c21c: 00000000 */ sll $zero,$zero,0x0 ); -GLOBAL_ASM( -glabel func0f19c220 -/* f19c220: 27bdffe8 */ addiu $sp,$sp,-24 -/* f19c224: afbf0014 */ sw $ra,0x14($sp) -/* f19c228: 00002025 */ or $a0,$zero,$zero -/* f19c22c: 0fc62fdc */ jal func0f18bf70 -/* f19c230: 00002825 */ or $a1,$zero,$zero -/* f19c234: 8fbf0014 */ lw $ra,0x14($sp) -/* f19c238: 27bd0018 */ addiu $sp,$sp,0x18 -/* f19c23c: 03e00008 */ jr $ra -/* f19c240: 00000000 */ sll $zero,$zero,0x0 -); +s32 func0f19c220(void) +{ + return func0f18bf70(0, 0); +} void mpCalculateVar800884b4(void) { diff --git a/src/include/game/game_187770.h b/src/include/game/game_187770.h index 39feaf3bf..53b3bc647 100644 --- a/src/include/game/game_187770.h +++ b/src/include/game/game_187770.h @@ -57,7 +57,7 @@ u32 func0f18bc30(void); u32 func0f18bc70(void); s32 func0f18bc9c(s32 arg0); u32 func0f18bee8(void); -u32 func0f18bf70(void); +s32 func0f18bf70(s32 arg0, s32 arg1); u32 func0f18bfc0(void); u32 func0f18bfcc(void); u32 func0f18bfd8(void); diff --git a/src/include/game/game_1999b0.h b/src/include/game/game_1999b0.h index 66b32ba5e..0b3735bde 100644 --- a/src/include/game/game_1999b0.h +++ b/src/include/game/game_1999b0.h @@ -44,7 +44,7 @@ u32 func0f19bd4c(void); u32 func0f19bfa0(void); u32 func0f19c190(void); u32 func0f19c1cc(void); -void func0f19c220(void); +s32 func0f19c220(void); void mpCalculateVar800884b4(void); void mpResetVar800884b4(void); bool mpIsVar800884b4NonZero(void);