From a70825cb53a0e6af605d0a1d5ec161ddb9894a0f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 6 Apr 2020 00:00:09 +1000 Subject: [PATCH] Decompile currentPlayerFlipAnimation --- src/game/game_0125a0.c | 4 ++-- src/game/game_113220.c | 18 ++++++------------ src/include/game/game_113220.h | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/game/game_0125a0.c b/src/game/game_0125a0.c index 1e4064e3f..4882fd41e 100644 --- a/src/game/game_0125a0.c +++ b/src/game/game_0125a0.c @@ -338,8 +338,8 @@ glabel func0f012684 /* f012a58: 0c007787 */ jal func0001de1c /* f012a5c: 8d050008 */ lw $a1,0x8($t0) /* f012a60: 8e240284 */ lw $a0,0x284($s1) -/* f012a64: 3c057f11 */ lui $a1,%hi(func0f113220) -/* f012a68: 24a53220 */ addiu $a1,$a1,%lo(func0f113220) +/* f012a64: 3c057f11 */ lui $a1,%hi(currentPlayerFlipAnimation) +/* f012a68: 24a53220 */ addiu $a1,$a1,%lo(currentPlayerFlipAnimation) /* f012a6c: 0c0077a6 */ jal func0001de98 /* f012a70: 2484045c */ addiu $a0,$a0,0x45c /* f012a74: 0fc44c8f */ jal currentPlayerUpdateIdleHeadRoll diff --git a/src/game/game_113220.c b/src/game/game_113220.c index 57781ec56..71f8a3aa3 100644 --- a/src/game/game_113220.c +++ b/src/game/game_113220.c @@ -51,16 +51,10 @@ u32 var80075c94 = 0x00000000; u32 var80075c98 = 0x00000000; u32 var80075c9c = 0x00000000; -GLOBAL_ASM( -glabel func0f113220 -/* f113220: 3c0e800a */ lui $t6,%hi(g_Vars+0x284) -/* f113224: 8dcea244 */ lw $t6,%lo(g_Vars+0x284)($t6) -/* f113228: 8dc3047c */ lw $v1,0x47c($t6) -/* f11322c: 80620008 */ lb $v0,0x8($v1) -/* f113230: 2c4f0001 */ sltiu $t7,$v0,0x1 -/* f113234: 03e00008 */ jr $ra -/* f113238: a06f0008 */ sb $t7,0x8($v1) -); +void currentPlayerFlipAnimation(void) +{ + g_Vars.currentplayer->animdata.anim->flip = !g_Vars.currentplayer->animdata.anim->flip; +} void currentPlayerUpdateIdleHeadRoll(void) { @@ -682,8 +676,8 @@ glabel func0f113f10 /* f114020: 2484045c */ addiu $a0,$a0,1116 /* f114024: 3c04800a */ lui $a0,%hi(g_Vars+0x284) /* f114028: 8c84a244 */ lw $a0,%lo(g_Vars+0x284)($a0) -/* f11402c: 3c057f11 */ lui $a1,%hi(func0f113220) -/* f114030: 24a53220 */ addiu $a1,$a1,%lo(func0f113220) +/* f11402c: 3c057f11 */ lui $a1,%hi(currentPlayerFlipAnimation) +/* f114030: 24a53220 */ addiu $a1,$a1,%lo(currentPlayerFlipAnimation) /* f114034: 0c0077a6 */ jal func0001de98 /* f114038: 2484045c */ addiu $a0,$a0,1116 /* f11403c: 3c0a800a */ lui $t2,%hi(g_Vars+0x284) diff --git a/src/include/game/game_113220.h b/src/include/game/game_113220.h index d3a2bfd4a..e2618ca28 100644 --- a/src/include/game/game_113220.h +++ b/src/include/game/game_113220.h @@ -3,7 +3,7 @@ #include #include "types.h" -u32 func0f113220(void); +void currentPlayerFlipAnimation(void); void currentPlayerUpdateIdleHeadRoll(void); void currentPlayerUpdateHeadPos(struct coord *vel); void currentPlayerUpdateHeadRot(struct coord *lookvel, struct coord *upvel);