diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c index 4e21a3f41..239a61b1a 100644 --- a/src/game/chr/chraction.c +++ b/src/game/chr/chraction.c @@ -16424,7 +16424,7 @@ void chrTickDie(struct chrdata *chr) if (animGetFrame(animdata) >= func0001d1a0(animdata)) { if (CHRRACE(chr) == RACE_HUMAN && animGetId(animdata) == ANIM_DEATH_STOMACH_LONG) { - func0001dccc(animdata, ANIM_003C, !func0001d15c(animdata), 50, 0.3, animGetNumFrames(ANIM_003C) - 51.0f); + func0001dccc(animdata, ANIM_003C, !animIsFlipped(animdata), 50, 0.3, animGetNumFrames(ANIM_003C) - 51.0f); func0001deb0(animdata, 0.5, animGetNumFrames(ANIM_003C) - 51.0f); return; } diff --git a/src/include/library/library_1a500.h b/src/include/library/library_1a500.h index 847c47366..c20d2cd00 100644 --- a/src/include/library/library_1a500.h +++ b/src/include/library/library_1a500.h @@ -51,7 +51,7 @@ u32 func0001cd18(void); u32 func0001ce64(void); u32 func0001cebc(void); u32 animGetId(struct animdata *animdata); -bool func0001d15c(struct animdata *animdata); +bool animIsFlipped(struct animdata *animdata); f32 animGetFrame(struct animdata *animdata); f32 func0001d1a0(struct animdata *animdata); u32 func0001d218(void); diff --git a/src/library/library_1a500.c b/src/library/library_1a500.c index 9c9d19815..874eeb9ef 100644 --- a/src/library/library_1a500.c +++ b/src/library/library_1a500.c @@ -3558,18 +3558,14 @@ u32 animGetId(struct animdata *animdata) return 0; } -GLOBAL_ASM( -glabel func0001d15c -/* 1d15c: 8c830020 */ lw $v1,0x20($a0) -/* 1d160: 00001025 */ or $v0,$zero,$zero -/* 1d164: 10600003 */ beqz $v1,.L0001d174 -/* 1d168: 00000000 */ sll $zero,$zero,0x0 -/* 1d16c: 03e00008 */ jr $ra -/* 1d170: 80620008 */ lb $v0,0x8($v1) -.L0001d174: -/* 1d174: 03e00008 */ jr $ra -/* 1d178: 00000000 */ sll $zero,$zero,0x0 -); +bool animIsFlipped(struct animdata *animdata) +{ + if (animdata->anim) { + return animdata->anim->flip; + } + + return false; +} f32 animGetFrame(struct animdata *animdata) {