mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-11 15:28:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Match keaton/sub_08032574

Browse Source
This commit is contained in:
Marcus Huderle
2020-08-08 09:06:54 -05:00
parent 10819392f7
commit 2c0b39832e
2 changed files with 13 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/keaton.c
+13 -17
View File
@@ -115,26 +115,22 @@ void sub_080324FC(Entity* this) {
}
}
#if NON_MATCHING // r4-r5 register swap
void sub_08032574(Entity* this) {
if (this->attachedEntity == NULL || !(this->attachedEntity->bitfield & 0x80)) {
(this->field_0x76)--;
if ((this->field_0x76 == 0) || (sub_080AEFE0(this) == 0)) {
sub_0803275C(this);
} else {
UpdateAnimationSingleFrame(this);
if (!(this->field_0x76 & 0x7)) {
sub_08032794(this);
}
}
if (this->attachedEntity && (this->attachedEntity->bitfield & 0x80)) {
sub_0803275C(this);
return;
}
if (--this->field_0x76 == 0 || !sub_080AEFE0(this)) {
sub_0803275C(this);
return;
}
UpdateAnimationSingleFrame(this);
if ((this->field_0x76 & 0x7) == 0) {
sub_08032794(this);
}
}
#else
NAKED
void sub_08032574(Entity* this) {
asm(".include \"asm/non_matching/keaton/sub_08032574.inc\"");
}
#endif
void sub_080325C4(Entity* this) {
this->actionDelay--;