From e27ba240e14c23740accf6058153639b65f272a5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 1 Mar 2020 00:37:08 +1000 Subject: [PATCH] Rename functions relating to move mode --- src/game/game_066310.c | 4 ++-- src/game/game_0b63b0.c | 10 +++++----- src/game/game_0c3620.c | 2 +- src/game/game_0c37d0.c | 2 +- src/game/game_0c79f0.c | 28 ++++++++++++++-------------- src/game/game_0d1fe0.c | 4 ++-- src/include/game/game_0c3620.h | 2 +- src/include/game/game_0c37d0.h | 2 +- src/include/game/game_0c79f0.h | 4 ++-- src/include/game/game_0d1fe0.h | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/game/game_066310.c b/src/game/game_066310.c index 58184e3b6..8c4c09b95 100644 --- a/src/game/game_066310.c +++ b/src/game/game_066310.c @@ -6780,7 +6780,7 @@ glabel setupParseObject /* f06b02c: 14440004 */ bne $v0,$a0,.L0f06b040 /* f06b030: 00000000 */ sll $zero,$zero,0x0 .L0f06b034: -/* f06b034: 0fc31f4c */ jal func0f0c7d30 +/* f06b034: 0fc31f4c */ jal currentPlayerSetMoveMode /* f06b038: 00002025 */ or $a0,$zero,$zero /* f06b03c: 8e240014 */ lw $a0,0x14($s1) .L0f06b040: @@ -37694,7 +37694,7 @@ glabel func0f086d60 /* f086f10: 8d08a244 */ lw $t0,-0x5dbc($t0) /* f086f14: 8fb80030 */ lw $t8,0x30($sp) /* f086f18: 24040003 */ addiu $a0,$zero,0x3 -/* f086f1c: 0fc31f4c */ jal func0f0c7d30 +/* f086f1c: 0fc31f4c */ jal currentPlayerSetMoveMode /* f086f20: ad181a6c */ sw $t8,0x1a6c($t0) /* f086f24: 10000002 */ beqz $zero,.L0f086f30 /* f086f28: 24020001 */ addiu $v0,$zero,0x1 diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 5f3ae6da6..42b943478 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -1557,7 +1557,7 @@ glabel func0f0b77cc /* f0b7894: 8e0b0284 */ lw $t3,0x284($s0) /* f0b7898: ad6201b0 */ sw $v0,0x1b0($t3) /* f0b789c: 8e0c0284 */ lw $t4,0x284($s0) -/* f0b78a0: 0fc31f4c */ jal func0f0c7d30 +/* f0b78a0: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0b78a4: ad801af8 */ sw $zero,0x1af8($t4) /* f0b78a8: 8e0d0284 */ lw $t5,0x284($s0) /* f0b78ac: 24050001 */ addiu $a1,$zero,0x1 @@ -3624,7 +3624,7 @@ void func0f0b9674(void) { setTickMode(TICKMODE_4); var80070744 = 0; - func0f0c7d30(0); + currentPlayerSetMoveMode(MOVEMODE_NORMAL); var8009ddd8 = 0; var8009dddc = -90; var8009dde0 = 0; @@ -3858,7 +3858,7 @@ void func0f0b9a20(void) { setTickMode(TICKMODE_1); var80070744 = 0; - func0f0c7d30(0); + currentPlayerSetMoveMode(MOVEMODE_NORMAL); if (getCurrentStageId() == STAGE_TEST_LEN) { currentPlayerSetFadeColour(0, 0, 0, 1); @@ -4502,7 +4502,7 @@ glabel func0f0ba29c /* f0ba5b0: 44812000 */ mtc1 $at,$f4 /* f0ba5b4: 00002025 */ or $a0,$zero,$zero /* f0ba5b8: 46002481 */ sub.s $f18,$f4,$f0 -/* f0ba5bc: 0fc31f4c */ jal func0f0c7d30 +/* f0ba5bc: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0ba5c0: e7b20104 */ swc1 $f18,0x104($sp) /* f0ba5c4: 8e6202a0 */ lw $v0,0x2a0($s3) /* f0ba5c8: c7aa019c */ lwc1 $f10,0x19c($sp) @@ -12132,7 +12132,7 @@ glabel func0f0c1404 /* f0c158c: 00000000 */ sll $zero,$zero,0x0 /* f0c1590: ac441b78 */ sw $a0,0x1b78($v0) .L0f0c1594: -/* f0c1594: 0fc31f4c */ jal func0f0c7d30 +/* f0c1594: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0c1598: 00002025 */ or $a0,$zero,$zero /* f0c159c: 0fc28a72 */ jal func0f0a29c8 /* f0c15a0: 00000000 */ sll $zero,$zero,0x0 diff --git a/src/game/game_0c3620.c b/src/game/game_0c3620.c index c03d77777..05720d8f8 100644 --- a/src/game/game_0c3620.c +++ b/src/game/game_0c3620.c @@ -9,7 +9,7 @@ #include "types.h" GLOBAL_ASM( -glabel func0f0c3620 +glabel currentPlayerSetMoveModeCutscene /* f0c3620: 27bdffc8 */ addiu $sp,$sp,-56 /* f0c3624: afb40028 */ sw $s4,0x28($sp) /* f0c3628: 3c14800a */ lui $s4,%hi(g_Vars) diff --git a/src/game/game_0c37d0.c b/src/game/game_0c37d0.c index 4c6e1c619..a90303321 100644 --- a/src/game/game_0c37d0.c +++ b/src/game/game_0c37d0.c @@ -87,7 +87,7 @@ const u32 var7f1ad858[] = {0x00000000}; const u32 var7f1ad85c[] = {0x00000000}; GLOBAL_ASM( -glabel func0f0c37d0 +glabel currentPlayerSetMoveModeNormal /* f0c37d0: 3c08800a */ lui $t0,%hi(g_Vars) /* f0c37d4: 25089fc0 */ addiu $t0,$t0,%lo(g_Vars) /* f0c37d8: 8d020284 */ lw $v0,0x284($t0) diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c index 4b07f0785..2296118c4 100644 --- a/src/game/game_0c79f0.c +++ b/src/game/game_0c79f0.c @@ -348,11 +348,11 @@ void currentPlayerGrabProp(struct prop *prop) if ((obj->hidden & OBJHFLAG_04000000) == 0 && (obj->hidden & OBJHFLAG_08000000) == 0) { g_Vars.currentplayer->grabbedprop = prop; - func0f0cc6e0(); + currentPlayerSetMoveModeGrabbedProp(); } } -void func0f0c7d30(u32 arg) +void currentPlayerSetMoveMode(u32 movemode) { if (g_Vars.currentplayer->bondmovemode == MOVEMODE_GRABBEDPROP) { func0f0ccac4(); @@ -360,14 +360,14 @@ void func0f0c7d30(u32 arg) func0f0d2184(); } - if (arg == 3) { - func0f0d1fe0(); - } else if (arg == 4) { - func0f0cc6e0(); - } else if (arg == 5) { - func0f0c3620(); - } else if (arg == 0) { - func0f0c37d0(); + if (movemode == MOVEMODE_HOVERBIKE) { + currentPlayerSetMoveModeHoverbike(); + } else if (movemode == MOVEMODE_GRABBEDPROP) { + currentPlayerSetMoveModeGrabbedProp(); + } else if (movemode == MOVEMODE_CUTSCENE) { + currentPlayerSetMoveModeCutscene(); + } else if (movemode == MOVEMODE_NORMAL) { + currentPlayerSetMoveModeNormal(); } } @@ -419,7 +419,7 @@ glabel releaseObj .L0f0c7e84: /* f0c7e84: 0fc4a24b */ jal setCurrentPlayerNum /* f0c7e88: 02202025 */ or $a0,$s1,$zero -/* f0c7e8c: 0fc31f4c */ jal func0f0c7d30 +/* f0c7e8c: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0c7e90: 02402025 */ or $a0,$s2,$zero /* f0c7e94: 8e0c006c */ lw $t4,0x6c($s0) /* f0c7e98: 26310001 */ addiu $s1,$s1,0x1 @@ -5557,7 +5557,7 @@ glabel func0f0cc6ac ); GLOBAL_ASM( -glabel func0f0cc6e0 +glabel currentPlayerSetMoveModeGrabbedProp /* f0cc6e0: 27bdff68 */ addiu $sp,$sp,-152 /* f0cc6e4: afb0001c */ sw $s0,0x1c($sp) /* f0cc6e8: 3c10800a */ lui $s0,%hi(g_Vars) @@ -7617,7 +7617,7 @@ glabel func0f0ce450 .L0f0ce480: /* f0ce480: 8c780284 */ lw $t8,0x284($v1) /* f0ce484: 00002025 */ or $a0,$zero,$zero -/* f0ce488: 0fc31f4c */ jal func0f0c7d30 +/* f0ce488: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0ce48c: af0000d0 */ sw $zero,0xd0($t8) .L0f0ce490: /* f0ce490: 8fbf0014 */ lw $ra,0x14($sp) @@ -8493,7 +8493,7 @@ glabel func0f0ceec4 /* f0cf100: 14400003 */ bnez $v0,.L0f0cf110 /* f0cf104: 00000000 */ sll $zero,$zero,0x0 .L0f0cf108: -/* f0cf108: 0fc31f4c */ jal func0f0c7d30 +/* f0cf108: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0cf10c: 00002025 */ or $a0,$zero,$zero .L0f0cf110: /* f0cf110: 3c18800a */ lui $t8,0x800a diff --git a/src/game/game_0d1fe0.c b/src/game/game_0d1fe0.c index b012b4b27..f6278e065 100644 --- a/src/game/game_0d1fe0.c +++ b/src/game/game_0d1fe0.c @@ -59,7 +59,7 @@ const u32 var7f1adb98[] = {0x3f333333}; const u32 var7f1adb9c[] = {0x3c8ef461}; GLOBAL_ASM( -glabel func0f0d1fe0 +glabel currentPlayerSetMoveModeHoverbike /* f0d1fe0: 27bdff70 */ addiu $sp,$sp,-144 /* f0d1fe4: afb00034 */ sw $s0,0x34($sp) /* f0d1fe8: 3c10800a */ lui $s0,%hi(g_Vars) @@ -506,7 +506,7 @@ glabel func0f0d2558 /* f0d2678: 8c4b1af8 */ lw $t3,0x1af8($v0) /* f0d267c: 51600006 */ beqzl $t3,.L0f0d2698 /* f0d2680: ac4000d0 */ sw $zero,0xd0($v0) -/* f0d2684: 0fc31f4c */ jal func0f0c7d30 +/* f0d2684: 0fc31f4c */ jal currentPlayerSetMoveMode /* f0d2688: 00002025 */ or $a0,$zero,$zero /* f0d268c: 3c02800a */ lui $v0,0x800a /* f0d2690: 8c42a244 */ lw $v0,-0x5dbc($v0) diff --git a/src/include/game/game_0c3620.h b/src/include/game/game_0c3620.h index 862a84390..025d1be31 100644 --- a/src/include/game/game_0c3620.h +++ b/src/include/game/game_0c3620.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f0c3620(void); +u32 currentPlayerSetMoveModeCutscene(void); u32 func0f0c37c0(void); #endif diff --git a/src/include/game/game_0c37d0.h b/src/include/game/game_0c37d0.h index 5c0d6c4bd..0c70a39ac 100644 --- a/src/include/game/game_0c37d0.h +++ b/src/include/game/game_0c37d0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f0c37d0(void); +u32 currentPlayerSetMoveModeNormal(void); u32 func0f0c3ad0(void); u32 func0f0c3af4(void); u32 func0f0c3b38(void); diff --git a/src/include/game/game_0c79f0.h b/src/include/game/game_0c79f0.h index 6e82aa5db..fd2133420 100644 --- a/src/include/game/game_0c79f0.h +++ b/src/include/game/game_0c79f0.h @@ -17,7 +17,7 @@ void currentPlayerUpdateAutoAimXProp(struct prop *prop, f32 autoaimx); struct prop *currentPlayerGetHoverbike(void); struct prop *currentPlayerGetGrabbedProp(void); void currentPlayerGrabProp(struct prop *prop); -void func0f0c7d30(u32 arg0); +void currentPlayerSetMoveMode(u32 movemode); void releaseObj(u32 arg0); u32 func0f0c7f2c(void); u32 func0f0c7f98(void); @@ -42,7 +42,7 @@ u32 func0f0cc3b8(void); u32 func0f0cc654(void); u32 func0f0cc680(void); u32 func0f0cc6ac(void); -u32 func0f0cc6e0(void); +u32 currentPlayerSetMoveModeGrabbedProp(void); u32 func0f0ccac4(void); u32 func0f0ccbf0(void); u32 func0f0cd05c(void); diff --git a/src/include/game/game_0d1fe0.h b/src/include/game/game_0d1fe0.h index 1f5401375..69c14c013 100644 --- a/src/include/game/game_0d1fe0.h +++ b/src/include/game/game_0d1fe0.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f0d1fe0(void); +u32 currentPlayerSetMoveModeHoverbike(void); u32 func0f0d2184(void); u32 func0f0d2294(void); u32 func0f0d22f8(void);