diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c index a36c0d6b4..b4118e068 100644 --- a/src/game/game_0601b0.c +++ b/src/game/game_0601b0.c @@ -354,7 +354,7 @@ Gfx *propRender(Gfx *gdl, struct prop *prop, bool arg2) gdl = propchrRender(prop, gdl, arg2); break; case PROPTYPE_PLAYER: - gdl = propplayerRender(prop, gdl, arg2); + gdl = playerRender(prop, gdl, arg2); break; case PROPTYPE_EXPLOSION: gdl = explosionRender(prop, gdl, arg2); diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 4f28e9bf9..230d1ef61 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -11892,33 +11892,14 @@ glabel var7f1ad744 /* f0c329c: 00000000 */ nop ); -GLOBAL_ASM( -glabel propplayerRender -/* f0c32a0: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0c32a4: afbf0014 */ sw $ra,0x14($sp) -/* f0c32a8: afa40018 */ sw $a0,0x18($sp) -/* f0c32ac: afa5001c */ sw $a1,0x1c($sp) -/* f0c32b0: 0fc4a25f */ jal propGetPlayerNum -/* f0c32b4: afa60020 */ sw $a2,0x20($sp) -/* f0c32b8: 00027080 */ sll $t6,$v0,0x2 -/* f0c32bc: 3c0f800a */ lui $t7,%hi(g_Vars+0x64) -/* f0c32c0: 01ee7821 */ addu $t7,$t7,$t6 -/* f0c32c4: 8defa024 */ lw $t7,%lo(g_Vars+0x64)($t7) -/* f0c32c8: 8fa40018 */ lw $a0,0x18($sp) -/* f0c32cc: 8fa5001c */ lw $a1,0x1c($sp) -/* f0c32d0: 8df819c8 */ lw $t8,0x19c8($t7) -/* f0c32d4: 53000005 */ beqzl $t8,.L0f0c32ec -/* f0c32d8: 8fbf0014 */ lw $ra,0x14($sp) -/* f0c32dc: 0fc094a2 */ jal propchrRender -/* f0c32e0: 8fa60020 */ lw $a2,0x20($sp) -/* f0c32e4: afa2001c */ sw $v0,0x1c($sp) -/* f0c32e8: 8fbf0014 */ lw $ra,0x14($sp) -.L0f0c32ec: -/* f0c32ec: 8fa2001c */ lw $v0,0x1c($sp) -/* f0c32f0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0c32f4: 03e00008 */ jr $ra -/* f0c32f8: 00000000 */ nop -); +Gfx *playerRender(struct prop *prop, Gfx *gdl, bool arg2) +{ + if (g_Vars.players[propGetPlayerNum(prop)]->haschrbody) { + gdl = propchrRender(prop, gdl, arg2); + } + + return gdl; +} Gfx *currentPlayerLoadMatrix(Gfx *gdl) { diff --git a/src/include/game/game_0b63b0.h b/src/include/game/game_0b63b0.h index e8e15ab13..06605302d 100644 --- a/src/include/game/game_0b63b0.h +++ b/src/include/game/game_0b63b0.h @@ -84,7 +84,7 @@ s32 getMissionTime(void); s32 func0f0c228c(struct prop *prop); u32 func0f0c2364(void); u32 func0f0c2a58(void); -Gfx *propplayerRender(struct prop *prop, Gfx *gdl, bool arg2); +Gfx *playerRender(struct prop *prop, Gfx *gdl, bool arg2); Gfx *currentPlayerLoadMatrix(Gfx *gdl); u32 func0f0c3320(void); void setTickMode(s32 tickmode);