diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c index a96b12154..8933cbd40 100644 --- a/src/game/game_19c990.c +++ b/src/game/game_19c990.c @@ -920,12 +920,10 @@ glabel func0f19d5c0 /* f19d5e4: a024d168 */ sb $a0,%lo(g_FiringRangeData+0x448)($at) ); -GLOBAL_ASM( -glabel func0f19d5e8 -/* f19d5e8: 3c02800b */ lui $v0,%hi(g_FiringRangeData+0x448) -/* f19d5ec: 03e00008 */ jr $ra -/* f19d5f0: 9042d168 */ lbu $v0,%lo(g_FiringRangeData+0x448)($v0) -); +u32 frGetDifficulty(void) +{ + return g_FiringRangeData.difficulty; +} GLOBAL_ASM( glabel func0f19d5f4 diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c index 29179d41b..bab9df32f 100644 --- a/src/game/game_1a3340.c +++ b/src/game/game_1a3340.c @@ -676,7 +676,7 @@ glabel menudialog001a3af4 /* f1a3bec: 10000006 */ beqz $zero,.L0f1a3c08 /* f1a3bf0: 00001025 */ or $v0,$zero,$zero .L0f1a3bf4: -/* f1a3bf4: 0fc6757a */ jal func0f19d5e8 +/* f1a3bf4: 0fc6757a */ jal frGetDifficulty /* f1a3bf8: afa60030 */ sw $a2,0x30($sp) /* f1a3bfc: 8fa60030 */ lw $a2,0x30($sp) /* f1a3c00: acc20000 */ sw $v0,0x0($a2) diff --git a/src/include/game/game_19c990.h b/src/include/game/game_19c990.h index 0a6105f5e..674791d83 100644 --- a/src/include/game/game_19c990.h +++ b/src/include/game/game_19c990.h @@ -23,7 +23,7 @@ u32 func0f19d414(void); void func0f19d4ec(void); u32 func0f19d560(void); u32 func0f19d5c0(void); -u32 func0f19d5e8(void); +u32 frGetDifficulty(void); u32 func0f19d5f4(void); struct frdata *getFiringRangeData(void); u32 func0f19d7d8(void);