From 78f1a486668051480bd7fa603ac69952baba14e7 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 8 Sep 2020 17:41:27 +1000 Subject: [PATCH] Decompile setupClearProxyMines --- src/game/game_00c490.c | 23 +++++++++-------------- src/include/game/game_00c490.h | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c index 1f1ae6808..6507a0ad3 100644 --- a/src/game/game_00c490.c +++ b/src/game/game_00c490.c @@ -119,7 +119,7 @@ glabel func0f00c490 .L0f00c57c: /* f00c57c: 0fc03323 */ jal func0f00cc8c /* f00c580: 00000000 */ nop -/* f00c584: 0fc0338f */ jal func0f00ce3c +/* f00c584: 0fc0338f */ jal setupClearProxyMines /* f00c588: 00000000 */ nop /* f00c58c: 3c018007 */ lui $at,%hi(g_AlarmTimer) /* f00c590: ac2098d4 */ sw $zero,%lo(g_AlarmTimer)($at) @@ -717,19 +717,14 @@ glabel func0f00cc8c /* f00ce38: ad890004 */ sw $t1,0x4($t4) ); -GLOBAL_ASM( -glabel func0f00ce3c -/* f00ce3c: 3c03800a */ lui $v1,%hi(g_ProxyMines) -/* f00ce40: 3c02800a */ lui $v0,%hi(var8009ce38) -/* f00ce44: 2442ce38 */ addiu $v0,$v0,%lo(var8009ce38) -/* f00ce48: 2463cdc0 */ addiu $v1,$v1,%lo(g_ProxyMines) -.L0f00ce4c: -/* f00ce4c: 24630004 */ addiu $v1,$v1,0x4 -/* f00ce50: 1462fffe */ bne $v1,$v0,.L0f00ce4c -/* f00ce54: ac60fffc */ sw $zero,-0x4($v1) -/* f00ce58: 03e00008 */ jr $ra -/* f00ce5c: 00000000 */ nop -); +void setupClearProxyMines(void) +{ + s32 i; + + for (i = 0; i < ARRAYCOUNT(g_ProxyMines); i++) { + g_ProxyMines[i] = NULL; + } +} GLOBAL_ASM( glabel setupCountCommandType diff --git a/src/include/game/game_00c490.h b/src/include/game/game_00c490.h index b22dea7a4..16086e6d8 100644 --- a/src/include/game/game_00c490.h +++ b/src/include/game/game_00c490.h @@ -10,7 +10,7 @@ void func0f00cc44(struct var80069924 *thing); void func0f00cc5c(struct var80069928 *thing); void func0f00cc74(struct var8006992c *thing); u32 func0f00cc8c(void); -u32 func0f00ce3c(void); +void setupClearProxyMines(void); u32 setupCountCommandType(u8 type); void func0f00cee4(struct defaultobj *obj, u32 arg1); void weaponAssignToHome(struct weaponobj *weapon, u32 arg1);