From c5a3133242087945015a35eedcf60ed6825d7e63 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 21 Nov 2020 11:15:01 +1000 Subject: [PATCH] Decompile func0f115390 --- src/game/padhalllv.c | 27 +++++++++------------------ src/include/game/padhalllv.h | 2 +- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index cfb31dc4c..55f46cfbe 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -1277,24 +1277,15 @@ glabel waypointFindRoute /* f11538c: 01e01025 */ or $v0,$t7,$zero ); -GLOBAL_ASM( -glabel func0f115390 -/* f115390: 3c02800a */ lui $v0,%hi(g_StageSetup) -/* f115394: 8c42d030 */ lw $v0,%lo(g_StageSetup)($v0) -/* f115398: 2403ffff */ addiu $v1,$zero,-1 -/* f11539c: 8c4e0000 */ lw $t6,0x0($v0) -/* f1153a0: 05c00006 */ bltz $t6,.L0f1153bc -/* f1153a4: 00000000 */ nop -/* f1153a8: 8c4f0010 */ lw $t7,0x10($v0) -.L0f1153ac: -/* f1153ac: ac43000c */ sw $v1,0xc($v0) -/* f1153b0: 24420010 */ addiu $v0,$v0,16 -/* f1153b4: 05e3fffd */ bgezl $t7,.L0f1153ac -/* f1153b8: 8c4f0010 */ lw $t7,0x10($v0) -.L0f1153bc: -/* f1153bc: 03e00008 */ jr $ra -/* f1153c0: 00000000 */ nop -); +void func0f115390(void) +{ + struct waypoint *waypoint = g_StageSetup.waypoints; + + while (waypoint->padnum >= 0) { + waypoint->terminator = -1; + waypoint++; + } +} GLOBAL_ASM( glabel func0f1153c4 diff --git a/src/include/game/padhalllv.h b/src/include/game/padhalllv.h index f16549868..d24414da0 100644 --- a/src/include/game/padhalllv.h +++ b/src/include/game/padhalllv.h @@ -18,7 +18,7 @@ u32 func0f114ee4(void); u32 func0f114f70(void); u32 func0f11505c(void); s32 waypointFindRoute(struct waypoint *from, struct waypoint *to, struct waypoint **arr, s32 maxwaypoints); -u32 func0f115390(void); +void func0f115390(void); u32 func0f1153c4(void); u32 func0f1154cc(void); u32 func0f1155e0(void);