From 6eda0c93a83add6fbff787c5b272d3d7673690e1 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 21 Nov 2020 08:50:16 +1000 Subject: [PATCH] Decompile waypointEnableSegment --- src/game/padhalllv.c | 24 ++++++------------------ src/include/game/padhalllv.h | 2 +- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/game/padhalllv.c b/src/game/padhalllv.c index 807adf999..7a707cb51 100644 --- a/src/game/padhalllv.c +++ b/src/game/padhalllv.c @@ -1709,7 +1709,7 @@ glabel waypointDisableSegmentInDirection ); GLOBAL_ASM( -glabel func0f11594c +glabel waypointEnableSegmentInDirection /* f11594c: 3c0a800a */ lui $t2,%hi(g_StageSetup) /* f115950: 8c8e0008 */ lw $t6,0x8($a0) /* f115954: 8c890004 */ lw $t1,0x4($a0) @@ -1787,20 +1787,8 @@ void waypointDisableSegment(struct waypoint *a, struct waypoint *b) waypointDisableSegmentInDirection(b, a); } -GLOBAL_ASM( -glabel waypointEnableSegment -/* f115a78: 27bdffe8 */ addiu $sp,$sp,-24 -/* f115a7c: afbf0014 */ sw $ra,0x14($sp) -/* f115a80: afa40018 */ sw $a0,0x18($sp) -/* f115a84: 0fc45653 */ jal func0f11594c -/* f115a88: afa5001c */ sw $a1,0x1c($sp) -/* f115a8c: 8fa4001c */ lw $a0,0x1c($sp) -/* f115a90: 0fc45653 */ jal func0f11594c -/* f115a94: 8fa50018 */ lw $a1,0x18($sp) -/* f115a98: 8fbf0014 */ lw $ra,0x14($sp) -/* f115a9c: 27bd0018 */ addiu $sp,$sp,0x18 -/* f115aa0: 03e00008 */ jr $ra -/* f115aa4: 00000000 */ nop -/* f115aa8: 00000000 */ nop -/* f115aac: 00000000 */ nop -); +void waypointEnableSegment(struct waypoint *a, struct waypoint *b) +{ + waypointEnableSegmentInDirection(a, b); + waypointEnableSegmentInDirection(b, a); +} diff --git a/src/include/game/padhalllv.h b/src/include/game/padhalllv.h index 2c87de131..f16549868 100644 --- a/src/include/game/padhalllv.h +++ b/src/include/game/padhalllv.h @@ -23,7 +23,7 @@ u32 func0f1153c4(void); u32 func0f1154cc(void); u32 func0f1155e0(void); void waypointDisableSegmentInDirection(struct waypoint *a, struct waypoint *b); -u32 func0f11594c(void); +void waypointEnableSegmentInDirection(struct waypoint *a, struct waypoint *b); void waypointDisableSegment(struct waypoint *a, struct waypoint *b); void waypointEnableSegment(struct waypoint *a, struct waypoint *b);