diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index 0fcb53c7e..52cca67c5 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -14869,13 +14869,10 @@ glabel func0f0fd570 /* f0fd64c: 27bd0008 */ addiu $sp,$sp,0x8 ); -GLOBAL_ASM( -glabel func0f0fd650 -/* f0fd650: 3c0e800a */ lui $t6,0x800a -/* f0fd654: 8dcea244 */ lw $t6,-0x5dbc($t6) -/* f0fd658: 03e00008 */ jr $ra -/* f0fd65c: 8dc21c04 */ lw $v0,0x1c04($t6) -); +bool currentPlayerIsInTraining(void) +{ + return g_Vars.currentplayer->training; +} void func0f0fd660(void) { diff --git a/src/game/game_176d70.c b/src/game/game_176d70.c index c19b9ce8d..7854717a4 100644 --- a/src/game/game_176d70.c +++ b/src/game/game_176d70.c @@ -15216,7 +15216,7 @@ glabel func0f185e20 /* f185f90: afa0001c */ sw $zero,0x1c($sp) /* f185f94: afa50034 */ sw $a1,0x34($sp) /* f185f98: afa00028 */ sw $zero,0x28($sp) -/* f185f9c: 0fc3f594 */ jal func0f0fd650 +/* f185f9c: 0fc3f594 */ jal currentPlayerIsInTraining /* f185fa0: afa00020 */ sw $zero,0x20($sp) /* f185fa4: 3c07800b */ lui $a3,%hi(g_MpSetup) /* f185fa8: 24e7cb88 */ addiu $a3,$a3,%lo(g_MpSetup) diff --git a/src/include/game/game_0f09f0.h b/src/include/game/game_0f09f0.h index 692864981..b5934883e 100644 --- a/src/include/game/game_0f09f0.h +++ b/src/include/game/game_0f09f0.h @@ -78,7 +78,7 @@ u32 func0f0fd320(void); u32 func0f0fd494(void); u32 func0f0fd548(void); u32 func0f0fd570(void); -u32 func0f0fd650(void); +bool currentPlayerIsInTraining(void); void func0f0fd660(void); u32 func0f0fdd00(void); u32 func0f0fdd84(void);