Merge pull request #374 from hatal175/pina

This commit is contained in:
notyourav
2022-02-11 16:47:08 -08:00
committed by GitHub
7 changed files with 68 additions and 146 deletions
-64
View File
@@ -1,64 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
movs r1, #0x20
movs r2, #0x20
bl sub_0806ED9C
cmp r0, #0
blt _080635B2
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _080635B8
bl Random
movs r1, #0x3f
ands r1, r0
cmp r1, #0
bne _080635B2
movs r0, #1
strb r0, [r4, #0xf]
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
_080635B2:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _080635D0
_080635B8:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _080635D0
movs r0, #0
strb r0, [r4, #0xf]
_080635D0:
adds r0, r4, #0
adds r0, #0x39
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
beq _080635FC
movs r0, #2
strb r0, [r4, #0xc]
adds r0, r4, #0
bl GetAnimationState
adds r1, r0, #0
adds r1, #4
adds r0, r4, #0
bl InitAnimationForceUpdate
ldrb r0, [r4, #0xe]
ldr r1, _08063604 @ =0x00000A01
adds r0, r0, r1
bl MessageFromTarget
_080635FC:
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
.align 2, 0
_08063604: .4byte 0x00000A01
.syntax divided
-64
View File
@@ -1,64 +0,0 @@
.syntax unified
push {r4, lr}
adds r4, r0, #0
movs r1, #0x20
movs r2, #0x20
bl sub_0806ED9C
cmp r0, #0
blt _08063AEE
ldrb r0, [r4, #0xf]
cmp r0, #0
bne _08063AF4
bl Random
movs r1, #0x3f
ands r1, r0
cmp r1, #0
bne _08063AEE
adds r0, r4, #0
movs r1, #0
bl InitAnimationForceUpdate
movs r0, #1
strb r0, [r4, #0xf]
_08063AEE:
ldrb r0, [r4, #0xf]
cmp r0, #0
beq _08063B0C
_08063AF4:
adds r0, r4, #0
bl UpdateAnimationSingleFrame
adds r0, r4, #0
adds r0, #0x5a
ldrb r1, [r0]
movs r0, #0x80
ands r0, r1
cmp r0, #0
beq _08063B0C
movs r0, #0
strb r0, [r4, #0xf]
_08063B0C:
adds r0, r4, #0
adds r0, #0x39
ldrb r0, [r0]
lsls r0, r0, #0x18
asrs r0, r0, #0x18
cmp r0, #0
beq _08063B38
movs r0, #2
strb r0, [r4, #0xc]
adds r0, r4, #0
bl GetAnimationState
adds r1, r0, #0
adds r1, #4
adds r0, r4, #0
bl InitAnimationForceUpdate
ldrb r0, [r4, #0xe]
ldr r1, _08063B40 @ =0x00000A01
adds r0, r0, r1
bl MessageFromTarget
_08063B38:
adds r0, r4, #0
bl sub_0806ED78
pop {r4, pc}
.align 2, 0
_08063B40: .4byte 0x00000A01
.syntax divided