falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match sub_080304BC

This commit is contained in:
Tal Hayon 2022-05-05 17:08:54 +03:00
parent 603efdcb04
commit 45806a810f
2 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
asm/non_matching/armos/sub_080304BC.inc
View File

@ -1,29 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
bl sub_080309A8
adds r3, r4, #0
adds r3, #0x5a
ldrb r1, [r3]
movs r0, #0x80
ands r0, r1
lsls r0, r0, #0x18
lsrs r2, r0, #0x18
cmp r2, #0
beq _080304DE
adds r0, r4, #0
bl sub_08030580
b _080304F0
_080304DE:
lsls r0, r1, #0x18
lsrs r0, r0, #0x18
cmp r0, #1
bne _080304F0
strb r2, [r3]
movs r0, #0x95
lsls r0, r0, #1
bl EnqueueSFX
_080304F0:
pop {r4, pc}
.align 2, 0
.syntax divided

14
src/enemy/armos.c
View File

@ -240,21 +240,15 @@ void sub_08030474(ArmosEntity* this) {
}
}
NONMATCH("asm/non_matching/armos/sub_080304BC.inc", void sub_080304BC(ArmosEntity* this)) {
u32 tmp;
void sub_080304BC(ArmosEntity* this) {
sub_080309A8(this);
tmp = super->frame & ANIM_DONE;
if (tmp != 0) {
if ((super->frame & ANIM_DONE) != 0) {
sub_08030580(this);
} else {
if (super->frame == 1) {
super->frame = tmp;
} else if (super->frame == 1) {
super->frame = 0;
EnqueueSFX(SFX_12A);
}
}
}
END_NONMATCH
void sub_080304F4(ArmosEntity* this) {
LinearMoveUpdate(super);