diff --git a/src/game/game_157db0.c b/src/game/game_157db0.c index 82153a254..01c7516a9 100644 --- a/src/game/game_157db0.c +++ b/src/game/game_157db0.c @@ -2867,7 +2867,7 @@ glabel func0f15a2c4 /* f15a634: ae220004 */ sw $v0,0x4($s1) /* f15a638: 10400013 */ beqz $v0,.L0f15a688 /* f15a63c: 00000000 */ sll $zero,$zero,0x0 -/* f15a640: 0fc59eb8 */ jal func0f167ae0 +/* f15a640: 0fc59eb8 */ jal getVar80084040 /* f15a644: 00000000 */ sll $zero,$zero,0x0 /* f15a648: 1040000f */ beqz $v0,.L0f15a688 /* f15a64c: 00000000 */ sll $zero,$zero,0x0 @@ -3331,7 +3331,7 @@ glabel func0f15a6f4 /* f15acb0: 00408825 */ or $s1,$v0,$zero /* f15acb4: 50400014 */ beqzl $v0,.L0f15ad08 /* f15acb8: 3c0c0103 */ lui $t4,0x103 -/* f15acbc: 0fc59eb8 */ jal func0f167ae0 +/* f15acbc: 0fc59eb8 */ jal getVar80084040 /* f15acc0: 00000000 */ sll $zero,$zero,0x0 /* f15acc4: 50400010 */ beqzl $v0,.L0f15ad08 /* f15acc8: 3c0c0103 */ lui $t4,0x103 @@ -3387,7 +3387,7 @@ glabel func0f15a6f4 /* f15ad88: 00408825 */ or $s1,$v0,$zero /* f15ad8c: 5040000e */ beqzl $v0,.L0f15adc8 /* f15ad90: 3c0c0103 */ lui $t4,0x103 -/* f15ad94: 0fc59eb8 */ jal func0f167ae0 +/* f15ad94: 0fc59eb8 */ jal getVar80084040 /* f15ad98: 00000000 */ sll $zero,$zero,0x0 /* f15ad9c: 10400009 */ beqz $v0,.L0f15adc4 /* f15ada0: 3c198008 */ lui $t9,%hi(var8007fc00) @@ -3418,7 +3418,7 @@ glabel func0f15a6f4 /* f15adfc: 00408825 */ or $s1,$v0,$zero /* f15ae00: 10400013 */ beqz $v0,.L0f15ae50 /* f15ae04: 00000000 */ sll $zero,$zero,0x0 -/* f15ae08: 0fc59eb8 */ jal func0f167ae0 +/* f15ae08: 0fc59eb8 */ jal getVar80084040 /* f15ae0c: 00000000 */ sll $zero,$zero,0x0 /* f15ae10: 1040000f */ beqz $v0,.L0f15ae50 /* f15ae14: 00000000 */ sll $zero,$zero,0x0 @@ -3458,7 +3458,7 @@ glabel func0f15a6f4 /* f15ae90: 24510008 */ addiu $s1,$v0,0x8 /* f15ae94: 0c012d20 */ jal osVirtualToPhysical /* f15ae98: 00402025 */ or $a0,$v0,$zero -/* f15ae9c: 0fc59eb8 */ jal func0f167ae0 +/* f15ae9c: 0fc59eb8 */ jal getVar80084040 /* f15aea0: ae020004 */ sw $v0,0x4($s0) /* f15aea4: 1040001c */ beqz $v0,.L0f15af18 /* f15aea8: 3c18800a */ lui $t8,%hi(g_Vars+0x284) @@ -3544,7 +3544,7 @@ glabel func0f15a6f4 /* f15afdc: 00408825 */ or $s1,$v0,$zero /* f15afe0: 50400009 */ beqzl $v0,.L0f15b008 /* f15afe4: 3c0b0103 */ lui $t3,0x103 -/* f15afe8: 0fc59eb8 */ jal func0f167ae0 +/* f15afe8: 0fc59eb8 */ jal getVar80084040 /* f15afec: 00000000 */ sll $zero,$zero,0x0 /* f15aff0: 10400004 */ beqz $v0,.L0f15b004 /* f15aff4: 02202025 */ or $a0,$s1,$zero @@ -3570,7 +3570,7 @@ glabel func0f15a6f4 /* f15b03c: 00408825 */ or $s1,$v0,$zero /* f15b040: 10400013 */ beqz $v0,.L0f15b090 /* f15b044: 00000000 */ sll $zero,$zero,0x0 -/* f15b048: 0fc59eb8 */ jal func0f167ae0 +/* f15b048: 0fc59eb8 */ jal getVar80084040 /* f15b04c: 00000000 */ sll $zero,$zero,0x0 /* f15b050: 1040000f */ beqz $v0,.L0f15b090 /* f15b054: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c index 617cae3f1..6f6caed8b 100644 --- a/src/game/game_167ae0.c +++ b/src/game/game_167ae0.c @@ -112,11 +112,13 @@ #include "lib/lib_4e530.h" #include "types.h" +u32 getVar80084040(void) +{ + return var80084040; +} + GLOBAL_ASM( -glabel func0f167ae0 -/* f167ae0: 3c028008 */ lui $v0,%hi(var80084040) -/* f167ae4: 03e00008 */ jr $ra -/* f167ae8: 8c424040 */ lw $v0,%lo(var80084040)($v0) +glabel func0f167aec /* f167aec: 3c018008 */ lui $at,0x8008 /* f167af0: 03e00008 */ jr $ra /* f167af4: ac244040 */ sw $a0,0x4040($at) diff --git a/src/include/game/game_167ae0.h b/src/include/game/game_167ae0.h index 54c2715d8..5ea74455d 100644 --- a/src/include/game/game_167ae0.h +++ b/src/include/game/game_167ae0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f167ae0(void); +u32 getVar80084040(void); u32 func0f167af8(void); void func0f167b10(void); u32 func0f167b48(void);