label and decomp some pokemon animation stuff

This commit is contained in:
DizzyEggg
2017-09-12 13:05:54 +02:00
parent e5ff9e3db1
commit 6539188fa6
16 changed files with 178 additions and 329 deletions
+3 -284
View File
@@ -5,289 +5,8 @@
.text
thumb_func_start sub_806ECAC
sub_806ECAC: @ 806ECAC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r2, r0, r1
ldrh r0, [r2, 0xE]
subs r0, 0x1
strh r0, [r2, 0xE]
lsls r0, 16
cmp r0, 0
bne _0806ECE2
ldrh r0, [r2, 0x8]
ldrh r1, [r2, 0xA]
lsls r1, 16
orrs r0, r1
ldrb r1, [r2, 0xC]
bl sub_817F578
movs r0, 0xFF
bl sub_81C488C
adds r0, r4, 0
bl DestroyTask
_0806ECE2:
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_806ECAC
thumb_func_start sub_806ECEC
sub_806ECEC: @ 806ECEC
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 16
lsrs r4, r1, 16
lsls r2, 24
lsrs r2, 24
lsls r3, 24
lsrs r3, 24
ldr r0, =gHitMarker
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
cmp r0, 0
beq _0806ED30
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
ldr r1, =0x02000002
ands r0, r1
cmp r0, 0
bne _0806ED30
movs r0, 0x80
orrs r3, r0
adds r0, r5, 0
adds r1, r4, 0
bl sub_806ED40
b _0806ED38
.pool
_0806ED30:
adds r0, r5, 0
adds r1, r4, 0
bl sub_806ED40
_0806ED38:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_806ECEC
thumb_func_start sub_806ED40
sub_806ED40: @ 806ED40
push {r4-r6,lr}
adds r5, r0, 0
lsls r1, 16
lsrs r4, r1, 16
lsls r2, 24
lsrs r2, 24
lsls r3, 24
lsrs r3, 24
movs r0, 0x7F
ands r0, r3
cmp r0, 0
beq _0806ED60
cmp r0, 0x1
beq _0806ED64
movs r1, 0
b _0806ED66
_0806ED60:
movs r1, 0xE7
b _0806ED66
_0806ED64:
movs r1, 0x19
_0806ED66:
movs r0, 0x80
ands r0, r3
cmp r0, 0
beq _0806ED84
cmp r2, 0
bne _0806ED7C
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
bl PlayCry1
_0806ED7C:
ldr r0, =SpriteCallbackDummy
b _0806EDFA
.pool
_0806ED84:
cmp r2, 0
bne _0806EDA6
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
bl PlayCry1
adds r0, r4, 0
bl sub_806F0D4
lsls r0, 24
cmp r0, 0
beq _0806EDA6
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
_0806EDA6:
ldr r0, =gUnknown_08329B87
subs r4, 0x1
adds r6, r4, r0
ldrb r0, [r6]
cmp r0, 0
beq _0806EDEC
ldr r0, =sub_806EC70
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, =gTasks
lsls r1, r0, 2
adds r1, r0
lsls r1, 3
adds r1, r2
strh r5, [r1, 0x8]
lsrs r0, r5, 16
strh r0, [r1, 0xA]
ldr r0, =gUnknown_083299EC
adds r0, r4, r0
ldrb r0, [r0]
strh r0, [r1, 0xC]
ldrb r0, [r6]
strh r0, [r1, 0xE]
b _0806EDF8
.pool
_0806EDEC:
ldr r0, =gUnknown_083299EC
adds r0, r4, r0
ldrb r1, [r0]
adds r0, r5, 0
bl sub_817F544
_0806EDF8:
ldr r0, =nullsub_18
_0806EDFA:
str r0, [r5, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_806ED40
thumb_func_start sub_806EE0C
sub_806EE0C: @ 806EE0C
push {r4-r6,lr}
adds r5, r0, 0
lsls r1, 16
lsrs r4, r1, 16
lsls r2, 24
cmp r2, 0
bne _0806EE2E
adds r0, r4, 0
bl sub_806F0D4
lsls r0, 24
cmp r0, 0
beq _0806EE2E
adds r0, r5, 0
movs r1, 0x1
bl StartSpriteAnim
_0806EE2E:
ldr r0, =gUnknown_08329B87
subs r4, 0x1
adds r6, r4, r0
ldrb r0, [r6]
cmp r0, 0
beq _0806EE80
ldr r0, =sub_806ECAC
movs r1, 0
bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, =gTasks
lsls r2, r0, 2
adds r2, r0
lsls r2, 3
adds r2, r1
strh r5, [r2, 0x8]
lsrs r1, r5, 16
strh r1, [r2, 0xA]
ldr r1, =gUnknown_083299EC
adds r1, r4, r1
ldrb r1, [r1]
strh r1, [r2, 0xC]
ldrb r1, [r6]
strh r1, [r2, 0xE]
bl sub_81C488C
adds r0, r5, 0
bl sub_817F60C
b _0806EE8C
.pool
_0806EE80:
ldr r0, =gUnknown_083299EC
adds r0, r4, r0
ldrb r1, [r0]
adds r0, r5, 0
bl sub_817F578
_0806EE8C:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_806EE0C
thumb_func_start sub_806EE98
sub_806EE98: @ 806EE98
push {lr}
ldr r0, =sub_806ECAC
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _0806EEAC
bl DestroyTask
_0806EEAC:
pop {r0}
bx r0
.pool
thumb_func_end sub_806EE98
thumb_func_start sub_806EEB4
sub_806EEB4: @ 806EEB4
push {r4,lr}
adds r4, r0, 0
lsls r1, 16
lsrs r2, r1, 16
ldr r0, =gHitMarker
ldr r0, [r0]
movs r1, 0x80
ands r0, r1
cmp r0, 0
beq _0806EEE8
ldr r0, =gBattleTypeFlags
ldr r0, [r0]
ldr r1, =0x02000002
ands r0, r1
cmp r0, 0
bne _0806EEE8
ldr r0, =SpriteCallbackDummy
b _0806EEFC
.pool
_0806EEE8:
adds r0, r2, 0
bl sub_817F474
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_817F594
ldr r0, =nullsub_18
_0806EEFC:
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_806EEB4
thumb_func_start sub_806EF08
sub_806EF08: @ 806EF08
@@ -543,8 +262,8 @@ _0806F0BE:
.pool
thumb_func_end sub_806F0B0
thumb_func_start sub_806F0D4
sub_806F0D4: @ 806F0D4
thumb_func_start HasTwoFramesAnimation
HasTwoFramesAnimation: @ 806F0D4
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -568,7 +287,7 @@ _0806F0F8:
pop {r1}
bx r1
.pool
thumb_func_end sub_806F0D4
thumb_func_end HasTwoFramesAnimation
thumb_func_start sub_806F104
sub_806F104: @ 806F104