diff --git a/src/game/dlights.c b/src/game/dlights.c index 9b69b36b3..00b3e2551 100644 --- a/src/game/dlights.c +++ b/src/game/dlights.c @@ -795,7 +795,7 @@ glabel var7f1a7d8c /* f0012a4: 44cef800 */ ctc1 $t6,$31 /* f0012a8: acab0000 */ sw $t3,0x0($a1) /* f0012ac: afa50028 */ sw $a1,0x28($sp) -/* f0012b0: 0fc2d5ea */ jal func0f0b57a8 +/* f0012b0: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0012b4: 26100008 */ addiu $s0,$s0,0x8 /* f0012b8: 8fa50028 */ lw $a1,0x28($sp) /* f0012bc: 3c0c0382 */ lui $t4,0x382 @@ -804,7 +804,7 @@ glabel var7f1a7d8c /* f0012c8: aca20004 */ sw $v0,0x4($a1) /* f0012cc: ac6c0000 */ sw $t4,0x0($v1) /* f0012d0: afa30024 */ sw $v1,0x24($sp) -/* f0012d4: 0fc2d5ea */ jal func0f0b57a8 +/* f0012d4: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0012d8: 26100008 */ addiu $s0,$s0,0x8 /* f0012dc: 8fa30024 */ lw $v1,0x24($sp) /* f0012e0: 244d0010 */ addiu $t5,$v0,0x10 @@ -848,7 +848,7 @@ glabel func0f001300 /* f001368: acca0000 */ sw $t2,0x0($a2) /* f00136c: 24c40008 */ addiu $a0,$a2,0x8 /* f001370: afa40030 */ sw $a0,0x30($sp) -/* f001374: 0fc2d5ea */ jal func0f0b57a8 +/* f001374: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f001378: afa60020 */ sw $a2,0x20($sp) /* f00137c: 8fa30030 */ lw $v1,0x30($sp) /* f001380: 8fa60020 */ lw $a2,0x20($sp) @@ -858,7 +858,7 @@ glabel func0f001300 /* f001390: ac6b0000 */ sw $t3,0x0($v1) /* f001394: 24640008 */ addiu $a0,$v1,0x8 /* f001398: afa40030 */ sw $a0,0x30($sp) -/* f00139c: 0fc2d5ea */ jal func0f0b57a8 +/* f00139c: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0013a0: afa3001c */ sw $v1,0x1c($sp) /* f0013a4: 8fa3001c */ lw $v1,0x1c($sp) /* f0013a8: 8fa40030 */ lw $a0,0x30($sp) diff --git a/src/game/game_097ba0.c b/src/game/game_097ba0.c index 9d96c1961..e00a6db95 100644 --- a/src/game/game_097ba0.c +++ b/src/game/game_097ba0.c @@ -18946,7 +18946,7 @@ glabel var7f1aca90 /* f0a74d4: 25ae0008 */ addiu $t6,$t5,0x8 /* f0a74d8: afae014c */ sw $t6,0x14c($sp) /* f0a74dc: adaf0000 */ sw $t7,0x0($t5) -/* f0a74e0: 0fc2d5ea */ jal func0f0b57a8 +/* f0a74e0: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0a74e4: afad00d4 */ sw $t5,0xd4($sp) /* f0a74e8: 8fa500d4 */ lw $a1,0xd4($sp) /* f0a74ec: 3c080382 */ lui $t0,0x382 @@ -18956,7 +18956,7 @@ glabel var7f1aca90 /* f0a74fc: 25890008 */ addiu $t1,$t4,0x8 /* f0a7500: afa9014c */ sw $t1,0x14c($sp) /* f0a7504: ad880000 */ sw $t0,0x0($t4) -/* f0a7508: 0fc2d5ea */ jal func0f0b57a8 +/* f0a7508: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0a750c: afac00d0 */ sw $t4,0xd0($sp) /* f0a7510: 8fa300d0 */ lw $v1,0xd0($sp) /* f0a7514: 244a0010 */ addiu $t2,$v0,0x10 diff --git a/src/game/game_0b3350.c b/src/game/game_0b3350.c index aa1ef35fc..a7360d683 100644 --- a/src/game/game_0b3350.c +++ b/src/game/game_0b3350.c @@ -2431,13 +2431,10 @@ void currentPlayerSetUnk175c(u32 value) g_Vars.currentplayer->unk175c = value; } -GLOBAL_ASM( -glabel func0f0b57a8 -/* f0b57a8: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f0b57ac: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f0b57b0: 03e00008 */ jr $ra -/* f0b57b4: 8dc2175c */ lw $v0,0x175c($t6) -); +u32 currentPlayerGetUnk175c(void) +{ + return g_Vars.currentplayer->unk175c; +} GLOBAL_ASM( glabel func0f0b57b8 diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c index fae39efc0..ec00994f4 100644 --- a/src/game/game_0f09f0.c +++ b/src/game/game_0f09f0.c @@ -5252,7 +5252,7 @@ glabel var7f1b2948 /* f0f4d8c: 25ae0008 */ addiu $t6,$t5,0x8 /* f0f4d90: afae0440 */ sw $t6,0x440($sp) /* f0f4d94: adac0000 */ sw $t4,0x0($t5) -/* f0f4d98: 0fc2d5ea */ jal func0f0b57a8 +/* f0f4d98: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0f4d9c: afad00b8 */ sw $t5,0xb8($sp) /* f0f4da0: 8fa500b8 */ lw $a1,0xb8($sp) /* f0f4da4: 3c0a0382 */ lui $t2,0x382 @@ -5262,7 +5262,7 @@ glabel var7f1b2948 /* f0f4db4: 25f80008 */ addiu $t8,$t7,0x8 /* f0f4db8: afb80440 */ sw $t8,0x440($sp) /* f0f4dbc: adea0000 */ sw $t2,0x0($t7) -/* f0f4dc0: 0fc2d5ea */ jal func0f0b57a8 +/* f0f4dc0: 0fc2d5ea */ jal currentPlayerGetUnk175c /* f0f4dc4: afaf00b4 */ sw $t7,0xb4($sp) /* f0f4dc8: 8fa600b4 */ lw $a2,0xb4($sp) /* f0f4dcc: 24590010 */ addiu $t9,$v0,0x10 diff --git a/src/include/game/game_0b3350.h b/src/include/game/game_0b3350.h index fd70d6cd9..baed7c4e4 100644 --- a/src/include/game/game_0b3350.h +++ b/src/include/game/game_0b3350.h @@ -40,7 +40,7 @@ u32 currentPlayerGetUnk1754(void); void currentPlayerSetUnk174c(u32 value); u32 currentPlayerGetUnk174c(void); void currentPlayerSetUnk175c(u32 value); -u32 func0f0b57a8(void); +u32 currentPlayerGetUnk175c(void); u32 func0f0b57b8(void); f32 func0f0b57d8(void); f32 func0f0b57e8(void);