dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name battle anim globals

Browse Source
This commit is contained in:
garak
2019-05-23 16:15:54 -04:00
parent 337c817721
commit 4ea6dcc4ab
10 changed files with 2449 additions and 2449 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_anim.s
+70 -70
View File
@@ -34,9 +34,9 @@ ClearBattleAnimationVars: @ 80724C0
ldr r5, _08072578 @ =gUnknown_2037F16
ldr r6, _0807257C @ =gUnknown_2037F17
ldr r7, _08072580 @ =gUnknown_2037F18
ldr r0, _08072584 @ =gUnknown_2037F1A
ldr r0, _08072584 @ =gBattleAnimAttacker
mov r12, r0
ldr r1, _08072588 @ =gUnknown_2037F1B
ldr r1, _08072588 @ =gBattleAnimTarget
mov r8, r1
ldr r0, _0807258C @ =gUnknown_2037F24
mov r9, r0
@@ -52,7 +52,7 @@ _0807250A:
subs r2, 0x1
cmp r2, 0
bge _0807250A
ldr r1, _08072598 @ =gUnknown_2037F02
ldr r1, _08072598 @ =gBattleAnimArgs
movs r2, 0
adds r0, r1, 0
adds r0, 0xE
@@ -96,12 +96,12 @@ _08072574: .4byte gUnknown_2037F14
_08072578: .4byte gUnknown_2037F16
_0807257C: .4byte gUnknown_2037F17
_08072580: .4byte gUnknown_2037F18
_08072584: .4byte gUnknown_2037F1A
_08072588: .4byte gUnknown_2037F1B
_08072584: .4byte gBattleAnimAttacker
_08072588: .4byte gBattleAnimTarget
_0807258C: .4byte gUnknown_2037F24
_08072590: .4byte 0x0000ffff
_08072594: .4byte gUnknown_2037EEE
_08072598: .4byte gUnknown_2037F02
_08072598: .4byte gBattleAnimArgs
thumb_func_end ClearBattleAnimationVars
thumb_func_start DoMoveAnim
@@ -110,11 +110,11 @@ DoMoveAnim: @ 807259C
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
ldr r2, _080725C0 @ =gUnknown_2037F1A
ldr r2, _080725C0 @ =gBattleAnimAttacker
ldr r0, _080725C4 @ =sBattler_AI
ldrb r0, [r0]
strb r0, [r2]
ldr r2, _080725C8 @ =gUnknown_2037F1B
ldr r2, _080725C8 @ =gBattleAnimTarget
ldr r0, _080725CC @ =gBattlerTarget
ldrb r0, [r0]
strb r0, [r2]
@@ -124,9 +124,9 @@ DoMoveAnim: @ 807259C
pop {r0}
bx r0
.align 2, 0
_080725C0: .4byte gUnknown_2037F1A
_080725C0: .4byte gBattleAnimAttacker
_080725C4: .4byte sBattler_AI
_080725C8: .4byte gUnknown_2037F1B
_080725C8: .4byte gBattleAnimTarget
_080725CC: .4byte gBattlerTarget
_080725D0: .4byte gUnknown_81C68F4
thumb_func_end DoMoveAnim
@@ -206,7 +206,7 @@ _08072658:
ldr r0, _080726D4 @ =gUnknown_2037EDC
mov r10, r0
ldr r7, _080726D8 @ =RunAnimScriptCommand
ldr r1, _080726DC @ =gUnknown_2037F02
ldr r1, _080726DC @ =gBattleAnimArgs
movs r2, 0
adds r0, r1, 0
adds r0, 0xE
@@ -257,7 +257,7 @@ _080726CC: .4byte gUnknown_2037EE1
_080726D0: .4byte gUnknown_2037EE0
_080726D4: .4byte gUnknown_2037EDC
_080726D8: .4byte RunAnimScriptCommand
_080726DC: .4byte gUnknown_2037F02
_080726DC: .4byte gBattleAnimArgs
_080726E0: .4byte 0x0000ffff
_080726E4: .4byte gUnknown_2037EEE
_080726E8: .4byte gUnknown_81C68EC
@@ -581,7 +581,7 @@ ScriptCmd_createsprite: @ 807291C
cmp r0, 0
beq _0807296C
adds r6, r5, 0
ldr r5, _08072988 @ =gUnknown_2037F02
ldr r5, _08072988 @ =gBattleAnimArgs
adds r3, r0, 0
_08072954:
ldr r2, [r6]
@@ -610,16 +610,16 @@ _0807296C:
b _0807298E
.align 2, 0
_08072984: .4byte gUnknown_2037ED4
_08072988: .4byte gUnknown_2037F02
_08072988: .4byte gBattleAnimArgs
_0807298C:
negs r0, r4
_0807298E:
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08072998 @ =gUnknown_2037F1B
ldr r0, _08072998 @ =gBattleAnimTarget
b _080729AE
.align 2, 0
_08072998: .4byte gUnknown_2037F1B
_08072998: .4byte gBattleAnimTarget
_0807299C:
cmp r4, 0x3F
bls _080729A6
@@ -631,7 +631,7 @@ _080729A6:
_080729A8:
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08072A04 @ =gUnknown_2037F1A
ldr r0, _08072A04 @ =gBattleAnimAttacker
_080729AE:
ldrb r0, [r0]
bl sub_807685C
@@ -648,7 +648,7 @@ _080729AE:
bgt _080729CC
movs r6, 0x3
_080729CC:
ldr r5, _08072A08 @ =gUnknown_2037F1B
ldr r5, _08072A08 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -674,8 +674,8 @@ _080729CC:
pop {r0}
bx r0
.align 2, 0
_08072A04: .4byte gUnknown_2037F1A
_08072A08: .4byte gUnknown_2037F1B
_08072A04: .4byte gBattleAnimAttacker
_08072A08: .4byte gBattleAnimTarget
_08072A0C: .4byte gUnknown_2037EE2
thumb_func_end ScriptCmd_createsprite
@@ -707,7 +707,7 @@ ScriptCmd_createvisualtask: @ 8072A10
cmp r0, 0
beq _08072A60
adds r5, r4, 0
ldr r4, _08072A84 @ =gUnknown_2037F02
ldr r4, _08072A84 @ =gBattleAnimArgs
adds r3, r0, 0
_08072A48:
ldr r2, [r5]
@@ -738,7 +738,7 @@ _08072A60:
bx r0
.align 2, 0
_08072A80: .4byte gUnknown_2037ED4
_08072A84: .4byte gUnknown_2037F02
_08072A84: .4byte gBattleAnimArgs
_08072A88: .4byte gUnknown_2037EE2
thumb_func_end ScriptCmd_createvisualtask
@@ -980,12 +980,12 @@ _08072C52:
cmp r6, 0x2
bne _08072C60
_08072C56:
ldr r0, _08072C5C @ =gUnknown_2037F1A
ldr r0, _08072C5C @ =gBattleAnimAttacker
b _08072C62
.align 2, 0
_08072C5C: .4byte gUnknown_2037F1A
_08072C5C: .4byte gBattleAnimAttacker
_08072C60:
ldr r0, _08072CD8 @ =gUnknown_2037F1B
ldr r0, _08072CD8 @ =gBattleAnimTarget
_08072C62:
ldrb r5, [r0]
adds r0, r5, 0
@@ -1043,7 +1043,7 @@ _08072C88:
ldr r0, _08072CF0 @ =gBattle_BG1_Y
b _08072CFC
.align 2, 0
_08072CD8: .4byte gUnknown_2037F1B
_08072CD8: .4byte gBattleAnimTarget
_08072CDC: .4byte gUnknown_2023D44
_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072CE4: .4byte gTasks
@@ -1715,12 +1715,12 @@ _0807326E:
cmp r4, 0x2
bne _0807327C
_08073272:
ldr r0, _08073278 @ =gUnknown_2037F1A
ldr r0, _08073278 @ =gBattleAnimAttacker
b _0807327E
.align 2, 0
_08073278: .4byte gUnknown_2037F1A
_08073278: .4byte gBattleAnimAttacker
_0807327C:
ldr r0, _080732D4 @ =gUnknown_2037F1B
ldr r0, _080732D4 @ =gBattleAnimTarget
_0807327E:
ldrb r5, [r0]
ldr r3, _080732D8 @ =gUnknown_2037F14
@@ -1766,7 +1766,7 @@ _080732A4:
strb r1, [r0]
b _080732E6
.align 2, 0
_080732D4: .4byte gUnknown_2037F1B
_080732D4: .4byte gBattleAnimTarget
_080732D8: .4byte gUnknown_2037F14
_080732DC: .4byte gSprites
_080732E0: .4byte gUnknown_2023D44
@@ -1888,12 +1888,12 @@ _080733BE:
cmp r5, 0x2
bne _080733CC
_080733C2:
ldr r0, _080733C8 @ =gUnknown_2037F1A
ldr r0, _080733C8 @ =gBattleAnimAttacker
b _080733CE
.align 2, 0
_080733C8: .4byte gUnknown_2037F1A
_080733C8: .4byte gBattleAnimAttacker
_080733CC:
ldr r0, _08073474 @ =gUnknown_2037F1B
ldr r0, _08073474 @ =gBattleAnimTarget
_080733CE:
ldrb r4, [r0]
adds r0, r4, 0
@@ -1976,7 +1976,7 @@ _08073464:
pop {r0}
bx r0
.align 2, 0
_08073474: .4byte gUnknown_2037F1B
_08073474: .4byte gBattleAnimTarget
_08073478: .4byte gSprites
_0807347C: .4byte gUnknown_2023D44
_08073480: .4byte gUnknown_2037ED4
@@ -2007,12 +2007,12 @@ _080734A6:
cmp r5, 0x2
bne _080734B4
_080734AA:
ldr r0, _080734B0 @ =gUnknown_2037F1A
ldr r0, _080734B0 @ =gBattleAnimAttacker
b _080734B6
.align 2, 0
_080734B0: .4byte gUnknown_2037F1A
_080734B0: .4byte gBattleAnimAttacker
_080734B4:
ldr r0, _08073514 @ =gUnknown_2037F1B
ldr r0, _08073514 @ =gBattleAnimTarget
_080734B6:
ldrb r6, [r0]
adds r0, r6, 0
@@ -2061,7 +2061,7 @@ _080734E0:
strb r1, [r0]
b _08073522
.align 2, 0
_08073514: .4byte gUnknown_2037F1B
_08073514: .4byte gBattleAnimTarget
_08073518: .4byte gSprites
_0807351C: .4byte gUnknown_2023D44
_08073520:
@@ -2290,7 +2290,7 @@ ScriptCmd_setarg: @ 80736AC
orrs r4, r0
adds r1, 0x4
str r1, [r5]
ldr r0, _080736DC @ =gUnknown_2037F02
ldr r0, _080736DC @ =gBattleAnimArgs
lsls r2, 1
adds r2, r0
strh r4, [r2]
@@ -2299,7 +2299,7 @@ ScriptCmd_setarg: @ 80736AC
bx r0
.align 2, 0
_080736D8: .4byte gUnknown_2037ED4
_080736DC: .4byte gUnknown_2037F02
_080736DC: .4byte gBattleAnimArgs
thumb_func_end ScriptCmd_setarg
thumb_func_start ScriptCmd_choosetwoturnanim
@@ -2469,7 +2469,7 @@ sub_80737E4: @ 80737E4
bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08073828 @ =gUnknown_2037F1B
ldr r0, _08073828 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2485,7 +2485,7 @@ sub_80737E4: @ 80737E4
.align 2, 0
_08073820: .4byte gUnknown_2037ED4
_08073824: .4byte sub_8073850
_08073828: .4byte gUnknown_2037F1B
_08073828: .4byte gBattleAnimTarget
_0807382C: .4byte gTasks
_08073830:
ldr r1, _08073848 @ =gTasks
@@ -2774,7 +2774,7 @@ sub_8073A44: @ 8073A44
lsrs r4, r0, 24
ldr r0, _08073A78 @ =gUnknown_2024018
ldr r1, [r0]
ldr r0, _08073A7C @ =gUnknown_2037F1A
ldr r0, _08073A7C @ =gBattleAnimAttacker
ldrb r2, [r0]
ldr r1, [r1, 0x4]
lsls r0, r2, 1
@@ -2796,14 +2796,14 @@ sub_8073A44: @ 8073A44
b _08073AE6
.align 2, 0
_08073A78: .4byte gUnknown_2024018
_08073A7C: .4byte gUnknown_2037F1A
_08073A7C: .4byte gBattleAnimAttacker
_08073A80:
adds r0, r2, 0
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
bne _08073ABA
ldr r0, _08073AA8 @ =gUnknown_2037F1B
ldr r0, _08073AA8 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2816,7 +2816,7 @@ _08073A80:
movs r4, 0xC0
b _08073AE6
.align 2, 0
_08073AA8: .4byte gUnknown_2037F1B
_08073AA8: .4byte gBattleAnimTarget
_08073AAC:
movs r0, 0x40
negs r0, r0
@@ -2826,7 +2826,7 @@ _08073AAC:
lsls r0, 24
b _08073AE4
_08073ABA:
ldr r0, _08073ADC @ =gUnknown_2037F1B
ldr r0, _08073ADC @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -2842,7 +2842,7 @@ _08073ABA:
movs r4, 0x3F
b _08073AE6
.align 2, 0
_08073ADC: .4byte gUnknown_2037F1B
_08073ADC: .4byte gBattleAnimTarget
_08073AE0:
lsls r0, r4, 24
negs r0, r0
@@ -2876,7 +2876,7 @@ sub_8073B08: @ 8073B08
lsrs r4, r0, 24
ldr r0, _08073B3C @ =gUnknown_2024018
ldr r1, [r0]
ldr r0, _08073B40 @ =gUnknown_2037F1A
ldr r0, _08073B40 @ =gBattleAnimAttacker
ldrb r2, [r0]
ldr r1, [r1, 0x4]
lsls r0, r2, 1
@@ -2898,7 +2898,7 @@ sub_8073B08: @ 8073B08
b _08073B56
.align 2, 0
_08073B3C: .4byte gUnknown_2024018
_08073B40: .4byte gUnknown_2037F1A
_08073B40: .4byte gBattleAnimAttacker
_08073B44:
adds r0, r2, 0
bl GetBattlerSide
@@ -3597,7 +3597,7 @@ ScriptCmd_createsoundtask: @ 807406C
cmp r0, 0
beq _080740B6
adds r5, r4, 0
ldr r4, _080740D8 @ =gUnknown_2037F02
ldr r4, _080740D8 @ =gBattleAnimArgs
adds r3, r0, 0
_0807409E:
ldr r2, [r5]
@@ -3628,7 +3628,7 @@ _080740B6:
bx r0
.align 2, 0
_080740D4: .4byte gUnknown_2037ED4
_080740D8: .4byte gUnknown_2037F02
_080740D8: .4byte gBattleAnimArgs
_080740DC: .4byte gUnknown_2037EE3
thumb_func_end ScriptCmd_createsoundtask
@@ -3707,7 +3707,7 @@ ScriptCmd_jumpargeq: @ 8074164
ldrb r0, [r3, 0x2]
lsls r0, 8
orrs r1, r0
ldr r0, _080741A8 @ =gUnknown_2037F02
ldr r0, _080741A8 @ =gBattleAnimArgs
lsls r2, 1
adds r2, r0
lsls r1, 16
@@ -3730,7 +3730,7 @@ ScriptCmd_jumpargeq: @ 8074164
b _080741B2
.align 2, 0
_080741A4: .4byte gUnknown_2037ED4
_080741A8: .4byte gUnknown_2037F02
_080741A8: .4byte gBattleAnimArgs
_080741AC:
adds r0, r4, 0
adds r0, 0x8
@@ -3762,13 +3762,13 @@ sub_80741C8: @ 80741C8
str r1, [r0]
cmp r2, 0
beq _080741E4
ldr r0, _080741E0 @ =gUnknown_2037F1B
ldr r0, _080741E0 @ =gBattleAnimTarget
b _080741E6
.align 2, 0
_080741DC: .4byte gUnknown_2037ED4
_080741E0: .4byte gUnknown_2037F1B
_080741E0: .4byte gBattleAnimTarget
_080741E4:
ldr r0, _08074210 @ =gUnknown_2037F1A
ldr r0, _08074210 @ =gBattleAnimAttacker
_080741E6:
ldrb r0, [r0]
bl GetBattlerPosition
@@ -3791,7 +3791,7 @@ _0807420C:
pop {r0}
bx r0
.align 2, 0
_08074210: .4byte gUnknown_2037F1A
_08074210: .4byte gBattleAnimAttacker
thumb_func_end sub_80741C8
thumb_func_start sub_8074214
@@ -3823,11 +3823,11 @@ sub_807423C: @ 807423C
ldrb r6, [r0, 0x1]
adds r0, 0x2
str r0, [r1]
ldr r7, _08074270 @ =gUnknown_2037F1A
ldr r7, _08074270 @ =gBattleAnimAttacker
ldrb r0, [r7]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074274 @ =gUnknown_2037F1B
ldr r5, _08074274 @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -3840,8 +3840,8 @@ sub_807423C: @ 807423C
b _0807427A
.align 2, 0
_0807426C: .4byte gUnknown_2037ED4
_08074270: .4byte gUnknown_2037F1A
_08074274: .4byte gUnknown_2037F1B
_08074270: .4byte gBattleAnimAttacker
_08074274: .4byte gBattleAnimTarget
_08074278:
ldrb r0, [r7]
_0807427A:
@@ -3946,11 +3946,11 @@ sub_8074320: @ 8074320
lsls r0, 24
cmp r0, 0
beq _080743C2
ldr r6, _08074368 @ =gUnknown_2037F1A
ldr r6, _08074368 @ =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _0807436C @ =gUnknown_2037F1B
ldr r5, _0807436C @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -3967,8 +3967,8 @@ sub_8074320: @ 8074320
b _0807437C
.align 2, 0
_08074364: .4byte gUnknown_2037ED4
_08074368: .4byte gUnknown_2037F1A
_0807436C: .4byte gUnknown_2037F1B
_08074368: .4byte gBattleAnimAttacker
_0807436C: .4byte gBattleAnimTarget
_08074370:
ldrb r0, [r5]
bl sub_80768B0
@@ -4028,11 +4028,11 @@ sub_80743C8: @ 80743C8
lsls r0, 24
cmp r0, 0
beq _0807444C
ldr r6, _08074410 @ =gUnknown_2037F1A
ldr r6, _08074410 @ =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
adds r4, r0, 0
ldr r5, _08074414 @ =gUnknown_2037F1B
ldr r5, _08074414 @ =gBattleAnimTarget
ldrb r0, [r5]
bl GetBattlerSide
lsls r4, 24
@@ -4049,8 +4049,8 @@ sub_80743C8: @ 80743C8
b _08074424
.align 2, 0
_0807440C: .4byte gUnknown_2037ED4
_08074410: .4byte gUnknown_2037F1A
_08074414: .4byte gUnknown_2037F1B
_08074410: .4byte gBattleAnimAttacker
_08074414: .4byte gBattleAnimTarget
_08074418:
ldrb r0, [r5]
bl sub_80768B0
asm/battle_anim_8074480.s
+104 -104
View File
@@ -711,7 +711,7 @@ GetAnimBankSpriteId: @ 80749D4
adds r1, r0, 0
cmp r0, 0
bne _080749FC
ldr r4, _080749F4 @ =gUnknown_2037F1A
ldr r4, _080749F4 @ =gBattleAnimAttacker
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
@@ -721,12 +721,12 @@ GetAnimBankSpriteId: @ 80749D4
ldrb r0, [r4]
b _08074A5A
.align 2, 0
_080749F4: .4byte gUnknown_2037F1A
_080749F4: .4byte gBattleAnimAttacker
_080749F8: .4byte gUnknown_2023D44
_080749FC:
cmp r0, 0x1
bne _08074A1C
ldr r4, _08074A14 @ =gUnknown_2037F1B
ldr r4, _08074A14 @ =gBattleAnimTarget
ldrb r0, [r4]
bl sub_8075224
lsls r0, 24
@@ -736,12 +736,12 @@ _080749FC:
ldrb r0, [r4]
b _08074A5A
.align 2, 0
_08074A14: .4byte gUnknown_2037F1B
_08074A14: .4byte gBattleAnimTarget
_08074A18: .4byte gUnknown_2023D44
_08074A1C:
cmp r1, 0x2
bne _08074A38
ldr r5, _08074A34 @ =gUnknown_2037F1A
ldr r5, _08074A34 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
@@ -751,9 +751,9 @@ _08074A1C:
beq _08074A4A
b _08074A54
.align 2, 0
_08074A34: .4byte gUnknown_2037F1A
_08074A34: .4byte gBattleAnimAttacker
_08074A38:
ldr r5, _08074A50 @ =gUnknown_2037F1B
ldr r5, _08074A50 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r4, 0x2
eors r0, r4
@@ -765,7 +765,7 @@ _08074A4A:
movs r0, 0xFF
b _08074A5E
.align 2, 0
_08074A50: .4byte gUnknown_2037F1B
_08074A50: .4byte gBattleAnimTarget
_08074A54:
ldr r1, _08074A64 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -1242,7 +1242,7 @@ sub_8074D80: @ 8074D80
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, _08074DBC @ =gUnknown_2037F1B
ldr r5, _08074DBC @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -1261,7 +1261,7 @@ sub_8074D80: @ 8074D80
pop {r0}
bx r0
.align 2, 0
_08074DBC: .4byte gUnknown_2037F1B
_08074DBC: .4byte gBattleAnimTarget
_08074DC0: .4byte sub_8074C64
thumb_func_end sub_8074D80
@@ -1443,7 +1443,7 @@ sub_8074EF4: @ 8074EF4
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x34]
ldr r5, _08074F30 @ =gUnknown_2037F1A
ldr r5, _08074F30 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -1462,7 +1462,7 @@ sub_8074EF4: @ 8074EF4
pop {r0}
bx r0
.align 2, 0
_08074F30: .4byte gUnknown_2037F1A
_08074F30: .4byte gBattleAnimAttacker
_08074F34: .4byte sub_8074C64
thumb_func_end sub_8074EF4
@@ -1553,7 +1553,7 @@ sub_8074FA8: @ 8074FA8
sub_8074FCC: @ 8074FCC
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _08074FF4 @ =gUnknown_2037F1A
ldr r4, _08074FF4 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -1570,7 +1570,7 @@ sub_8074FCC: @ 8074FCC
pop {r0}
bx r0
.align 2, 0
_08074FF4: .4byte gUnknown_2037F1A
_08074FF4: .4byte gBattleAnimAttacker
thumb_func_end sub_8074FCC
thumb_func_start sub_8074FF8
@@ -1582,13 +1582,13 @@ sub_8074FF8: @ 8074FF8
lsls r1, 16
lsrs r5, r1, 16
mov r8, r5
ldr r7, _08075030 @ =gUnknown_2037F1A
ldr r7, _08075030 @ =gBattleAnimAttacker
ldrb r0, [r7]
movs r1, 0
bl sub_8074480
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08075034 @ =gUnknown_2037F1B
ldr r0, _08075034 @ =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0
bl sub_8074480
@@ -1601,8 +1601,8 @@ sub_8074FF8: @ 8074FF8
lsls r0, r5, 16
b _08075054
.align 2, 0
_08075030: .4byte gUnknown_2037F1A
_08075034: .4byte gUnknown_2037F1B
_08075030: .4byte gBattleAnimAttacker
_08075034: .4byte gBattleAnimTarget
_08075038:
ldrb r0, [r7]
bl GetBattlerSide
@@ -1738,7 +1738,7 @@ sub_8075114: @ 8075114
lsls r1, 24
cmp r1, 0
bne _0807513C
ldr r4, _08075158 @ =gUnknown_2037F1B
ldr r4, _08075158 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
bl sub_8074844
@@ -1752,7 +1752,7 @@ sub_8075114: @ 8075114
lsrs r0, 24
strh r0, [r5, 0x22]
_0807513C:
ldr r4, _0807515C @ =gUnknown_2037F02
ldr r4, _0807515C @ =gBattleAnimArgs
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r5, 0
@@ -1765,8 +1765,8 @@ _0807513C:
pop {r0}
bx r0
.align 2, 0
_08075158: .4byte gUnknown_2037F1B
_0807515C: .4byte gUnknown_2037F02
_08075158: .4byte gBattleAnimTarget
_0807515C: .4byte gBattleAnimArgs
thumb_func_end sub_8075114
thumb_func_start sub_8075160
@@ -1776,7 +1776,7 @@ sub_8075160: @ 8075160
lsls r1, 24
cmp r1, 0
bne _08075184
ldr r4, _08075180 @ =gUnknown_2037F1A
ldr r4, _08075180 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0
bl sub_8074844
@@ -1787,9 +1787,9 @@ sub_8075160: @ 8075160
movs r1, 0x1
b _08075198
.align 2, 0
_08075180: .4byte gUnknown_2037F1A
_08075180: .4byte gBattleAnimAttacker
_08075184:
ldr r4, _080751BC @ =gUnknown_2037F1A
ldr r4, _080751BC @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074844
@@ -1803,7 +1803,7 @@ _08075198:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
ldr r4, _080751C0 @ =gUnknown_2037F02
ldr r4, _080751C0 @ =gBattleAnimArgs
movs r0, 0
ldrsh r1, [r4, r0]
adds r0, r5, 0
@@ -1816,8 +1816,8 @@ _08075198:
pop {r0}
bx r0
.align 2, 0
_080751BC: .4byte gUnknown_2037F1A
_080751C0: .4byte gUnknown_2037F02
_080751BC: .4byte gBattleAnimAttacker
_080751C0: .4byte gBattleAnimArgs
thumb_func_end sub_8075160
thumb_func_start GetBattlerSide
@@ -2011,7 +2011,7 @@ sub_8075300: @ 8075300
ldr r0, _08075338 @ =gUnknown_2022BBC
ldr r0, [r0]
str r0, [r4, 0x4]
ldr r0, _0807533C @ =gUnknown_2037F1A
ldr r0, _0807533C @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80768B0
lsls r0, 24
@@ -2030,7 +2030,7 @@ sub_8075300: @ 8075300
.align 2, 0
_08075334: .4byte gUnknown_2022BB8
_08075338: .4byte gUnknown_2022BBC
_0807533C: .4byte gUnknown_2037F1A
_0807533C: .4byte gBattleAnimAttacker
_08075340:
movs r1, 0
movs r0, 0x9
@@ -3252,7 +3252,7 @@ sub_8075BE8: @ 8075BE8
_08075C1C:
cmp r1, 0
beq _08075C2E
ldr r0, _08075CB0 @ =gUnknown_2037F1A
ldr r0, _08075CB0 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3262,7 +3262,7 @@ _08075C1C:
_08075C2E:
cmp r2, 0
beq _08075C40
ldr r0, _08075CB4 @ =gUnknown_2037F1B
ldr r0, _08075CB4 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r1, r0, 0
adds r1, 0x10
@@ -3272,7 +3272,7 @@ _08075C2E:
_08075C40:
cmp r3, 0
beq _08075C64
ldr r6, _08075CB0 @ =gUnknown_2037F1A
ldr r6, _08075CB0 @ =gBattleAnimAttacker
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
@@ -3290,7 +3290,7 @@ _08075C40:
_08075C64:
cmp r7, 0
beq _08075C88
ldr r6, _08075CB4 @ =gUnknown_2037F1B
ldr r6, _08075CB4 @ =gBattleAnimTarget
ldrb r0, [r6]
movs r5, 0x2
eors r0, r5
@@ -3328,8 +3328,8 @@ _08075CA0:
pop {r1}
bx r1
.align 2, 0
_08075CB0: .4byte gUnknown_2037F1A
_08075CB4: .4byte gUnknown_2037F1B
_08075CB0: .4byte gBattleAnimAttacker
_08075CB4: .4byte gBattleAnimTarget
thumb_func_end sub_8075BE8
thumb_func_start sub_8075CB8
@@ -3454,7 +3454,7 @@ sub_8075D9C: @ 8075D9C
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08075DDA
ldr r2, _08075DC8 @ =gUnknown_2037F02
ldr r2, _08075DC8 @ =gBattleAnimArgs
movs r3, 0x6
ldrsh r0, [r2, r3]
movs r1, 0
@@ -3470,7 +3470,7 @@ _08075DB6:
bl sub_8075160
b _08075DD2
.align 2, 0
_08075DC8: .4byte gUnknown_2037F02
_08075DC8: .4byte gBattleAnimArgs
_08075DCC:
adds r0, r4, 0
bl sub_8075114
@@ -3499,7 +3499,7 @@ _08075DEE:
sub_8075DF4: @ 8075DF4
push {r4-r7,lr}
adds r5, r0, 0
ldr r6, _08075E6C @ =gUnknown_2037F02
ldr r6, _08075E6C @ =gBattleAnimArgs
movs r1, 0xA
ldrsh r0, [r6, r1]
movs r1, 0xFF
@@ -3518,7 +3518,7 @@ _08075E0C:
_08075E16:
adds r0, r5, 0
bl sub_8075160
ldr r0, _08075E70 @ =gUnknown_2037F1A
ldr r0, _08075E70 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -3530,7 +3530,7 @@ _08075E16:
_08075E30:
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
ldr r4, _08075E74 @ =gUnknown_2037F1B
ldr r4, _08075E74 @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -3556,9 +3556,9 @@ _08075E30:
pop {r0}
bx r0
.align 2, 0
_08075E6C: .4byte gUnknown_2037F02
_08075E70: .4byte gUnknown_2037F1A
_08075E74: .4byte gUnknown_2037F1B
_08075E6C: .4byte gBattleAnimArgs
_08075E70: .4byte gBattleAnimAttacker
_08075E74: .4byte gBattleAnimTarget
_08075E78: .4byte sub_8075590
_08075E7C: .4byte DestroyAnimSprite
thumb_func_end sub_8075DF4
@@ -3569,21 +3569,21 @@ sub_8075E80: @ 8075E80
adds r6, r0, 0
movs r1, 0x1
bl sub_8075160
ldr r0, _08075EE0 @ =gUnknown_2037F1A
ldr r0, _08075EE0 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075EA0
ldr r1, _08075EE4 @ =gUnknown_2037F02
ldr r1, _08075EE4 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
_08075EA0:
ldr r4, _08075EE4 @ =gUnknown_2037F02
ldr r4, _08075EE4 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r6, 0x2E]
ldr r5, _08075EE8 @ =gUnknown_2037F1B
ldr r5, _08075EE8 @ =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -3610,9 +3610,9 @@ _08075EA0:
pop {r0}
bx r0
.align 2, 0
_08075EE0: .4byte gUnknown_2037F1A
_08075EE4: .4byte gUnknown_2037F02
_08075EE8: .4byte gUnknown_2037F1B
_08075EE0: .4byte gBattleAnimAttacker
_08075EE4: .4byte gBattleAnimArgs
_08075EE8: .4byte gBattleAnimTarget
_08075EEC: .4byte sub_8075EF0
thumb_func_end sub_8075E80
@@ -3636,7 +3636,7 @@ _08075F04:
sub_8075F0C: @ 8075F0C
push {r4-r7,lr}
adds r5, r0, 0
ldr r0, _08075F20 @ =gUnknown_2037F02
ldr r0, _08075F20 @ =gBattleAnimArgs
movs r2, 0xC
ldrsh r1, [r0, r2]
cmp r1, 0
@@ -3645,7 +3645,7 @@ sub_8075F0C: @ 8075F0C
movs r7, 0x3
b _08075F28
.align 2, 0
_08075F20: .4byte gUnknown_2037F02
_08075F20: .4byte gBattleAnimArgs
_08075F24:
movs r4, 0
movs r7, 0x1
@@ -3657,24 +3657,24 @@ _08075F28:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075160
ldr r0, _08075F3C @ =gUnknown_2037F1A
ldr r0, _08075F3C @ =gBattleAnimAttacker
b _08075F4A
.align 2, 0
_08075F3C: .4byte gUnknown_2037F1A
_08075F3C: .4byte gBattleAnimAttacker
_08075F40:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075114
ldr r0, _08075FA8 @ =gUnknown_2037F1B
ldr r0, _08075FA8 @ =gBattleAnimTarget
_08075F4A:
ldrb r6, [r0]
ldr r0, _08075FAC @ =gUnknown_2037F1A
ldr r0, _08075FAC @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08075F62
ldr r1, _08075FB0 @ =gUnknown_2037F02
ldr r1, _08075FB0 @ =gBattleAnimArgs
ldrh r0, [r1, 0x4]
negs r0, r0
strh r0, [r1, 0x4]
@@ -3682,7 +3682,7 @@ _08075F62:
adds r0, r5, 0
adds r1, r4, 0
bl sub_8075114
ldr r4, _08075FB0 @ =gUnknown_2037F02
ldr r4, _08075FB0 @ =gBattleAnimArgs
ldrh r0, [r4, 0x8]
strh r0, [r5, 0x2E]
adds r0, r6, 0
@@ -3710,9 +3710,9 @@ _08075F62:
pop {r0}
bx r0
.align 2, 0
_08075FA8: .4byte gUnknown_2037F1B
_08075FAC: .4byte gUnknown_2037F1A
_08075FB0: .4byte gUnknown_2037F02
_08075FA8: .4byte gBattleAnimTarget
_08075FAC: .4byte gBattleAnimAttacker
_08075FB0: .4byte gBattleAnimArgs
_08075FB4: .4byte sub_8075590
_08075FB8: .4byte DestroyAnimSprite
thumb_func_end sub_8075F0C
@@ -3801,7 +3801,7 @@ sub_8076048: @ 8076048
lsrs r5, r0, 24
movs r6, 0
movs r3, 0
ldr r2, _080760C0 @ =gUnknown_2037F02
ldr r2, _080760C0 @ =gBattleAnimArgs
movs r0, 0x4
ldrsh r1, [r2, r0]
movs r4, 0
@@ -3860,7 +3860,7 @@ _0807607C:
pop {r0}
bx r0
.align 2, 0
_080760C0: .4byte gUnknown_2037F02
_080760C0: .4byte gBattleAnimArgs
_080760C4: .4byte 0x0000ffff
_080760C8: .4byte gTasks
_080760CC: .4byte sub_80760D0
@@ -3952,7 +3952,7 @@ sub_807616C: @ 807616C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0807618C @ =gUnknown_2037F02
ldr r0, _0807618C @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -3963,7 +3963,7 @@ sub_807616C: @ 807616C
bl DestroyAnimVisualTask
b _080761B6
.align 2, 0
_0807618C: .4byte gUnknown_2037F02
_0807618C: .4byte gBattleAnimArgs
_08076190:
ldr r1, _080761BC @ =gTasks
lsls r0, r4, 2
@@ -3995,7 +3995,7 @@ _080761C4: .4byte 0x00000101
thumb_func_start sub_80761C8
sub_80761C8: @ 80761C8
ldr r3, _080761E8 @ =gUnknown_2037F02
ldr r3, _080761E8 @ =gBattleAnimArgs
ldrh r1, [r3, 0x2]
movs r2, 0
strh r1, [r0, 0xA]
@@ -4012,7 +4012,7 @@ sub_80761C8: @ 80761C8
str r1, [r0]
bx lr
.align 2, 0
_080761E8: .4byte gUnknown_2037F02
_080761E8: .4byte gBattleAnimArgs
_080761EC: .4byte sub_80761F0
thumb_func_end sub_80761C8
@@ -4099,7 +4099,7 @@ sub_8076288: @ 8076288
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080762A8 @ =gUnknown_2037F02
ldr r0, _080762A8 @ =gBattleAnimArgs
ldrh r0, [r0]
bl IndexOfSpritePaletteTag
lsls r0, 24
@@ -4110,7 +4110,7 @@ sub_8076288: @ 8076288
bl DestroyAnimVisualTask
b _080762C2
.align 2, 0
_080762A8: .4byte gUnknown_2037F02
_080762A8: .4byte gBattleAnimArgs
_080762AC:
ldr r1, _080762C8 @ =gTasks
lsls r0, r4, 2
@@ -4680,7 +4680,7 @@ sub_80766B8: @ 80766B8
bhi _080766D6
movs r1, 0x2
_080766D6:
ldr r0, _080766E8 @ =gUnknown_2037F02
ldr r0, _080766E8 @ =gBattleAnimArgs
strh r1, [r0, 0xE]
adds r0, r2, 0
bl DestroyAnimVisualTask
@@ -4688,7 +4688,7 @@ _080766D6:
bx r0
.align 2, 0
_080766E4: .4byte gUnknown_2037EFE
_080766E8: .4byte gUnknown_2037F02
_080766E8: .4byte gBattleAnimArgs
thumb_func_end sub_80766B8
thumb_func_start sub_80766EC
@@ -4699,7 +4699,7 @@ sub_80766EC: @ 80766EC
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
ldr r6, _080767E0 @ =gUnknown_2037F1B
ldr r6, _080767E0 @ =gBattleAnimTarget
ldrb r0, [r6]
bl sub_8072DF0
lsls r0, 24
@@ -4725,7 +4725,7 @@ sub_80766EC: @ 80766EC
orrs r0, r2
strb r0, [r1, 0x5]
_0807672C:
ldr r0, _080767EC @ =gUnknown_2037F1A
ldr r0, _080767EC @ =gBattleAnimAttacker
mov r8, r0
ldrb r0, [r0]
bl sub_8072DF0
@@ -4815,10 +4815,10 @@ _080767D4:
pop {r0}
bx r0
.align 2, 0
_080767E0: .4byte gUnknown_2037F1B
_080767E0: .4byte gBattleAnimTarget
_080767E4: .4byte gSprites
_080767E8: .4byte gUnknown_2023D44
_080767EC: .4byte gUnknown_2037F1A
_080767EC: .4byte gBattleAnimAttacker
thumb_func_end sub_80766EC
thumb_func_start sub_80767F0
@@ -5719,13 +5719,13 @@ sub_8076ED8: @ 8076ED8
push {r4,lr}
adds r4, r0, 0
bl sub_8074FCC
ldr r0, _08076F10 @ =gUnknown_2037F1A
ldr r0, _08076F10 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F18
ldr r2, _08076F14 @ =gUnknown_2037F02
ldr r2, _08076F14 @ =gBattleAnimArgs
ldrh r0, [r4, 0x20]
ldrh r1, [r2]
subs r0, r1
@@ -5742,10 +5742,10 @@ sub_8076ED8: @ 8076ED8
adds r1, r2, 0
b _08076F22
.align 2, 0
_08076F10: .4byte gUnknown_2037F1A
_08076F14: .4byte gUnknown_2037F02
_08076F10: .4byte gBattleAnimAttacker
_08076F14: .4byte gBattleAnimArgs
_08076F18:
ldr r1, _08076F4C @ =gUnknown_2037F02
ldr r1, _08076F4C @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5772,7 +5772,7 @@ _08076F22:
pop {r0}
bx r0
.align 2, 0
_08076F4C: .4byte gUnknown_2037F02
_08076F4C: .4byte gBattleAnimArgs
_08076F50: .4byte move_anim_8074EE0
_08076F54: .4byte sub_8074E70
thumb_func_end sub_8076ED8
@@ -5781,13 +5781,13 @@ _08076F54: .4byte sub_8074E70
sub_8076F58: @ 8076F58
push {r4,lr}
adds r4, r0, 0
ldr r0, _08076F80 @ =gUnknown_2037F1A
ldr r0, _08076F80 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076F88
ldr r2, _08076F84 @ =gUnknown_2037F02
ldr r2, _08076F84 @ =gBattleAnimArgs
ldrh r0, [r4, 0x20]
ldrh r1, [r2]
subs r0, r1
@@ -5799,10 +5799,10 @@ sub_8076F58: @ 8076F58
adds r1, r2, 0
b _08076F92
.align 2, 0
_08076F80: .4byte gUnknown_2037F1A
_08076F84: .4byte gUnknown_2037F02
_08076F80: .4byte gBattleAnimAttacker
_08076F84: .4byte gBattleAnimArgs
_08076F88:
ldr r1, _08076FC4 @ =gUnknown_2037F02
ldr r1, _08076FC4 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5832,7 +5832,7 @@ _08076F92:
pop {r0}
bx r0
.align 2, 0
_08076FC4: .4byte gUnknown_2037F02
_08076FC4: .4byte gBattleAnimArgs
_08076FC8: .4byte move_anim_8074EE0
_08076FCC: .4byte sub_8074E70
thumb_func_end sub_8076F58
@@ -5842,23 +5842,23 @@ sub_8076FD0: @ 8076FD0
push {r4,lr}
adds r4, r0, 0
bl sub_8074FCC
ldr r0, _08076FF4 @ =gUnknown_2037F1A
ldr r0, _08076FF4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08076FFC
ldr r0, _08076FF8 @ =gUnknown_2037F02
ldr r0, _08076FF8 @ =gBattleAnimArgs
ldrh r1, [r4, 0x20]
ldrh r2, [r0]
subs r1, r2
strh r1, [r4, 0x20]
b _08077008
.align 2, 0
_08076FF4: .4byte gUnknown_2037F1A
_08076FF8: .4byte gUnknown_2037F02
_08076FF4: .4byte gBattleAnimAttacker
_08076FF8: .4byte gBattleAnimArgs
_08076FFC:
ldr r1, _08077024 @ =gUnknown_2037F02
ldr r1, _08077024 @ =gBattleAnimArgs
ldrh r0, [r1]
ldrh r2, [r4, 0x20]
adds r0, r2
@@ -5878,7 +5878,7 @@ _08077008:
pop {r0}
bx r0
.align 2, 0
_08077024: .4byte gUnknown_2037F02
_08077024: .4byte gBattleAnimArgs
_08077028: .4byte sub_8074F6C
_0807702C: .4byte DestroyAnimSprite
thumb_func_end sub_8076FD0
@@ -5899,7 +5899,7 @@ sub_8077030: @ 8077030
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x8]
ldr r7, _080770C8 @ =gUnknown_2037F1A
ldr r7, _080770C8 @ =gBattleAnimAttacker
ldrb r0, [r7]
bl GetBattlerSide
lsls r0, 24
@@ -5959,7 +5959,7 @@ _080770C0:
b _080770D6
.align 2, 0
_080770C4: .4byte gTasks
_080770C8: .4byte gUnknown_2037F1A
_080770C8: .4byte gBattleAnimAttacker
_080770CC: .4byte gSprites
_080770D0: .4byte 0x00002771
_080770D4:
@@ -5974,7 +5974,7 @@ _080770D6:
adds r1, r2
ldr r2, _0807710C @ =0x04000008
bl CpuSet
ldr r0, _08077110 @ =gUnknown_2037F02
ldr r0, _08077110 @ =gBattleAnimArgs
ldrb r2, [r0, 0x2]
ldrh r3, [r0]
adds r0, r6, 0
@@ -5989,7 +5989,7 @@ _080770D6:
_08077104: .4byte gPlttBufferUnfaded
_08077108: .4byte gPlttBufferFaded
_0807710C: .4byte 0x04000008
_08077110: .4byte gUnknown_2037F02
_08077110: .4byte gBattleAnimArgs
_08077114: .4byte sub_8077118
thumb_func_end sub_8077030
@@ -6198,7 +6198,7 @@ _08077298: .4byte gTasks
sub_807729C: @ 807729C
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _080772D0 @ =gUnknown_2037F1A
ldr r4, _080772D0 @ =gBattleAnimAttacker
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -6219,7 +6219,7 @@ sub_807729C: @ 807729C
movs r0, 0x5
b _080772D6
.align 2, 0
_080772D0: .4byte gUnknown_2037F1A
_080772D0: .4byte gBattleAnimAttacker
_080772D4:
ldr r0, _080772E8 @ =0x0000fff6
_080772D6:
@@ -6289,7 +6289,7 @@ _08077348:
sub_8077350: @ 8077350
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _08077388 @ =gUnknown_2037F02
ldr r5, _08077388 @ =gBattleAnimArgs
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldrh r0, [r5, 0x8]
@@ -6300,7 +6300,7 @@ sub_8077350: @ 8077350
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x36]
ldr r0, _0807738C @ =gUnknown_2037F1B
ldr r0, _0807738C @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -6315,8 +6315,8 @@ sub_8077350: @ 8077350
subs r0, 0x14
b _0807739E
.align 2, 0
_08077388: .4byte gUnknown_2037F02
_0807738C: .4byte gUnknown_2037F1B
_08077388: .4byte gBattleAnimArgs
_0807738C: .4byte gBattleAnimTarget
_08077390:
ldrh r0, [r5, 0x8]
subs r0, 0x1E
asm/battle_anim_8078178.s
+8 -8
View File
@@ -341,7 +341,7 @@ sub_80783FC: @ 80783FC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r4, _080784AC @ =gUnknown_2037F1B
ldr r4, _080784AC @ =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
bl sub_8074480
@@ -420,7 +420,7 @@ _08078484:
pop {r0}
bx r0
.align 2, 0
_080784AC: .4byte gUnknown_2037F1B
_080784AC: .4byte gBattleAnimTarget
_080784B0: .4byte 0xffe00000
_080784B4: .4byte 0xffdc0000
_080784B8: .4byte 0xfffa0000
@@ -867,7 +867,7 @@ _08078830:
bl DestroyAnimVisualTask
b _0807885A
_08078838:
ldr r0, _08078860 @ =gUnknown_2037F02
ldr r0, _08078860 @ =gBattleAnimArgs
movs r1, 0
strh r5, [r0]
strh r2, [r0, 0x2]
@@ -888,7 +888,7 @@ _0807885A:
pop {r0}
bx r0
.align 2, 0
_08078860: .4byte gUnknown_2037F02
_08078860: .4byte gBattleAnimArgs
_08078864: .4byte gTasks
_08078868: .4byte sub_80BB088
thumb_func_end sub_8078694
@@ -901,9 +901,9 @@ LaunchStatusAnimation: @ 807886C
lsrs r4, 24
lsls r1, 24
lsrs r1, 24
ldr r0, _080788A8 @ =gUnknown_2037F1A
ldr r0, _080788A8 @ =gBattleAnimAttacker
strb r4, [r0]
ldr r0, _080788AC @ =gUnknown_2037F1B
ldr r0, _080788AC @ =gBattleAnimTarget
strb r4, [r0]
ldr r0, _080788B0 @ =gUnknown_81C6E84
movs r2, 0
@@ -923,8 +923,8 @@ LaunchStatusAnimation: @ 807886C
pop {r0}
bx r0
.align 2, 0
_080788A8: .4byte gUnknown_2037F1A
_080788AC: .4byte gUnknown_2037F1B
_080788A8: .4byte gBattleAnimAttacker
_080788AC: .4byte gBattleAnimTarget
_080788B0: .4byte gUnknown_81C6E84
_080788B4: .4byte task0A_80788BC
_080788B8: .4byte gTasks
asm/battle_anim_80989F8.s
+99 -99
View File
@@ -10,7 +10,7 @@ sub_80989F8: @ 80989F8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _08098A18 @ =gUnknown_2037F02
ldr r4, _08098A18 @ =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -21,7 +21,7 @@ sub_80989F8: @ 80989F8
bl DestroyAnimVisualTask
b _08098A58
.align 2, 0
_08098A18: .4byte gUnknown_2037F02
_08098A18: .4byte gBattleAnimArgs
_08098A1C:
ldr r1, _08098A60 @ =gSprites
lsls r0, r2, 4
@@ -163,7 +163,7 @@ sub_8098B1C: @ 8098B1C
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0
ldr r2, _08098B44 @ =gUnknown_2037F02
ldr r2, _08098B44 @ =gBattleAnimArgs
ldrh r0, [r2]
movs r3, 0
ldrsh r1, [r2, r3]
@@ -178,7 +178,7 @@ sub_8098B1C: @ 8098B1C
bne _08098B9E
b _08098BA2
.align 2, 0
_08098B44: .4byte gUnknown_2037F02
_08098B44: .4byte gBattleAnimArgs
_08098B48:
cmp r1, 0x8
beq _08098B94
@@ -224,7 +224,7 @@ _08098B88:
_08098B90: .4byte gUnknown_2023D44
_08098B94:
ldr r1, _08098BAC @ =gUnknown_2023D44
ldr r0, _08098BB0 @ =gUnknown_2037F1A
ldr r0, _08098BB0 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
_08098B9C:
@@ -238,14 +238,14 @@ _08098BA2:
b _08098BF2
.align 2, 0
_08098BAC: .4byte gUnknown_2023D44
_08098BB0: .4byte gUnknown_2037F1A
_08098BB0: .4byte gBattleAnimAttacker
_08098BB4:
ldr r1, _08098BF8 @ =gSprites
lsls r0, r3, 4
adds r0, r3
lsls r0, 2
adds r0, r1
ldr r2, _08098BFC @ =gUnknown_2037F02
ldr r2, _08098BFC @ =gBattleAnimArgs
ldrh r1, [r2, 0x2]
strh r1, [r0, 0x24]
ldrh r1, [r2, 0x4]
@@ -276,7 +276,7 @@ _08098BF2:
bx r0
.align 2, 0
_08098BF8: .4byte gSprites
_08098BFC: .4byte gUnknown_2037F02
_08098BFC: .4byte gBattleAnimArgs
_08098C00: .4byte gTasks
_08098C04: .4byte sub_8098C08
thumb_func_end sub_8098B1C
@@ -393,7 +393,7 @@ sub_8098CD0: @ 8098CD0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _08098CF0 @ =gUnknown_2037F02
ldr r4, _08098CF0 @ =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -404,7 +404,7 @@ sub_8098CD0: @ 8098CD0
bl DestroyAnimVisualTask
b _08098D42
.align 2, 0
_08098CF0: .4byte gUnknown_2037F02
_08098CF0: .4byte gBattleAnimArgs
_08098CF4:
ldr r0, _08098D48 @ =gSprites
lsls r1, r3, 4
@@ -624,7 +624,7 @@ sub_8098E90: @ 8098E90
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, _08098EE0 @ =gUnknown_2037F02
ldr r5, _08098EE0 @ =gBattleAnimArgs
ldrb r0, [r5]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -658,7 +658,7 @@ sub_8098E90: @ 8098E90
pop {r0}
bx r0
.align 2, 0
_08098EE0: .4byte gUnknown_2037F02
_08098EE0: .4byte gBattleAnimArgs
_08098EE4: .4byte gSprites
_08098EE8: .4byte gTasks
_08098EEC: .4byte sub_8098EF0
@@ -750,7 +750,7 @@ sub_8098F84: @ 8098F84
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0x1
ldr r4, _08098FF8 @ =gUnknown_2037F02
ldr r4, _08098FF8 @ =gBattleAnimArgs
ldrb r0, [r4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -804,7 +804,7 @@ _08098FCE:
pop {r0}
bx r0
.align 2, 0
_08098FF8: .4byte gUnknown_2037F02
_08098FF8: .4byte gBattleAnimArgs
_08098FFC: .4byte gTasks
_08099000: .4byte sub_8099004
thumb_func_end sub_8098F84
@@ -876,13 +876,13 @@ sub_809907C: @ 809907C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080990A4 @ =gUnknown_2037F1A
ldr r0, _080990A4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099098
ldr r1, _080990A8 @ =gUnknown_2037F02
ldr r1, _080990A8 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
@@ -893,8 +893,8 @@ _08099098:
pop {r0}
bx r0
.align 2, 0
_080990A4: .4byte gUnknown_2037F1A
_080990A8: .4byte gUnknown_2037F02
_080990A4: .4byte gBattleAnimAttacker
_080990A8: .4byte gBattleAnimArgs
thumb_func_end sub_809907C
thumb_func_start sub_80990AC
@@ -907,21 +907,21 @@ sub_80990AC: @ 80990AC
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, _080990D4 @ =gUnknown_2037F1A
ldr r0, _080990D4 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080990DC
ldr r1, _080990D8 @ =gUnknown_2037F02
ldr r1, _080990D8 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
b _080990E0
.align 2, 0
_080990D4: .4byte gUnknown_2037F1A
_080990D8: .4byte gUnknown_2037F02
_080990D4: .4byte gBattleAnimAttacker
_080990D8: .4byte gBattleAnimArgs
_080990DC:
ldr r1, _0809910C @ =gUnknown_2037F02
ldr r1, _0809910C @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
_080990E0:
strh r0, [r4, 0x30]
@@ -930,7 +930,7 @@ _080990E0:
strh r2, [r4, 0x2E]
strh r0, [r4, 0x32]
ldr r1, _08099110 @ =gUnknown_2023D44
ldr r0, _08099114 @ =gUnknown_2037F1A
ldr r0, _08099114 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -945,9 +945,9 @@ _080990E0:
pop {r0}
bx r0
.align 2, 0
_0809910C: .4byte gUnknown_2037F02
_0809910C: .4byte gBattleAnimArgs
_08099110: .4byte gUnknown_2023D44
_08099114: .4byte gUnknown_2037F1A
_08099114: .4byte gBattleAnimAttacker
_08099118: .4byte sub_8099120
_0809911C: .4byte sub_8074DC4
thumb_func_end sub_80990AC
@@ -981,7 +981,7 @@ sub_8099144: @ 8099144
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r5, _08099184 @ =gUnknown_2037F02
ldr r5, _08099184 @ =gBattleAnimArgs
ldrb r0, [r5, 0x4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -1003,7 +1003,7 @@ sub_8099144: @ 8099144
pop {r0}
bx r0
.align 2, 0
_08099184: .4byte gUnknown_2037F02
_08099184: .4byte gBattleAnimArgs
_08099188: .4byte sub_8099190
_0809918C: .4byte sub_8074DC4
thumb_func_end sub_8099144
@@ -1032,26 +1032,26 @@ sub_80991B4: @ 80991B4
push {r4-r7,lr}
sub sp, 0x4
adds r6, r0, 0
ldr r0, _080991CC @ =gUnknown_2037F02
ldr r0, _080991CC @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080991D8
ldr r1, _080991D0 @ =gUnknown_2023D44
ldr r0, _080991D4 @ =gUnknown_2037F1A
ldr r0, _080991D4 @ =gBattleAnimAttacker
b _080991DC
.align 2, 0
_080991CC: .4byte gUnknown_2037F02
_080991CC: .4byte gBattleAnimArgs
_080991D0: .4byte gUnknown_2023D44
_080991D4: .4byte gUnknown_2037F1A
_080991D4: .4byte gBattleAnimAttacker
_080991D8:
ldr r1, _0809923C @ =gUnknown_2023D44
ldr r0, _08099240 @ =gUnknown_2037F1B
ldr r0, _08099240 @ =gBattleAnimTarget
_080991DC:
ldrb r0, [r0]
adds r0, r1
ldrb r7, [r0]
ldr r5, _08099244 @ =gUnknown_2037F02
ldr r5, _08099244 @ =gBattleAnimArgs
ldrh r0, [r5, 0x4]
movs r3, 0
strh r0, [r6, 0x2E]
@@ -1096,15 +1096,15 @@ _080991DC:
b _08099252
.align 2, 0
_0809923C: .4byte gUnknown_2023D44
_08099240: .4byte gUnknown_2037F1B
_08099244: .4byte gUnknown_2037F02
_08099240: .4byte gBattleAnimTarget
_08099244: .4byte gBattleAnimArgs
_08099248: .4byte gSprites
_0809924C:
cmp r0, 0x2
bne _08099252
strh r3, [r6, 0x30]
_08099252:
ldr r0, _08099268 @ =gUnknown_2037F02
ldr r0, _08099268 @ =gBattleAnimArgs
ldrh r1, [r0, 0x2]
lsls r0, r7, 8
orrs r0, r1
@@ -1116,7 +1116,7 @@ _08099252:
pop {r0}
bx r0
.align 2, 0
_08099268: .4byte gUnknown_2037F02
_08099268: .4byte gBattleAnimArgs
_0809926C: .4byte sub_8099270
thumb_func_end sub_80991B4
@@ -1188,18 +1188,18 @@ _080992DA:
sub_80992E0: @ 80992E0
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, _080992F4 @ =gUnknown_2037F02
ldr r0, _080992F4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080992FC
ldr r0, _080992F8 @ =gUnknown_2037F1A
ldr r0, _080992F8 @ =gBattleAnimAttacker
b _080992FE
.align 2, 0
_080992F4: .4byte gUnknown_2037F02
_080992F8: .4byte gUnknown_2037F1A
_080992F4: .4byte gBattleAnimArgs
_080992F8: .4byte gBattleAnimAttacker
_080992FC:
ldr r0, _0809937C @ =gUnknown_2037F1B
ldr r0, _0809937C @ =gBattleAnimTarget
_080992FE:
ldrb r2, [r0]
ldr r0, _08099380 @ =gUnknown_2023D44
@@ -1210,7 +1210,7 @@ _080992FE:
lsls r0, 24
cmp r0, 0
beq _08099328
ldr r1, _08099384 @ =gUnknown_2037F02
ldr r1, _08099384 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
@@ -1222,7 +1222,7 @@ _080992FE:
negs r0, r0
strh r0, [r1, 0x4]
_08099328:
ldr r2, _08099384 @ =gUnknown_2037F02
ldr r2, _08099384 @ =gBattleAnimArgs
ldrh r0, [r2, 0x8]
movs r4, 0
strh r0, [r5, 0x2E]
@@ -1263,9 +1263,9 @@ _08099328:
pop {r0}
bx r0
.align 2, 0
_0809937C: .4byte gUnknown_2037F1B
_0809937C: .4byte gBattleAnimTarget
_08099380: .4byte gUnknown_2023D44
_08099384: .4byte gUnknown_2037F02
_08099384: .4byte gBattleAnimArgs
_08099388: .4byte gSprites
_0809938C: .4byte DestroyAnimSprite
_08099390: .4byte sub_8074E14
@@ -1281,18 +1281,18 @@ sub_8099394: @ 8099394
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
ldr r0, _080993B4 @ =gUnknown_2037F02
ldr r0, _080993B4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080993BC
ldr r0, _080993B8 @ =gUnknown_2037F1A
ldr r0, _080993B8 @ =gBattleAnimAttacker
b _080993BE
.align 2, 0
_080993B4: .4byte gUnknown_2037F02
_080993B8: .4byte gUnknown_2037F1A
_080993B4: .4byte gBattleAnimArgs
_080993B8: .4byte gBattleAnimAttacker
_080993BC:
ldr r0, _0809943C @ =gUnknown_2037F1B
ldr r0, _0809943C @ =gBattleAnimTarget
_080993BE:
ldrb r1, [r0]
ldr r0, _08099440 @ =gUnknown_2023D44
@@ -1303,7 +1303,7 @@ _080993BE:
lsls r0, 24
cmp r0, 0
beq _080993E8
ldr r1, _08099444 @ =gUnknown_2037F02
ldr r1, _08099444 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
@@ -1315,7 +1315,7 @@ _080993BE:
negs r0, r0
strh r0, [r1, 0x4]
_080993E8:
ldr r5, _08099444 @ =gUnknown_2037F02
ldr r5, _08099444 @ =gBattleAnimArgs
ldrh r0, [r5, 0x8]
strh r0, [r6, 0x2E]
ldr r0, _08099448 @ =gSprites
@@ -1356,9 +1356,9 @@ _080993E8:
bl StoreSpriteCallbackInData6
b _08099458
.align 2, 0
_0809943C: .4byte gUnknown_2037F1B
_0809943C: .4byte gBattleAnimTarget
_08099440: .4byte gUnknown_2023D44
_08099444: .4byte gUnknown_2037F02
_08099444: .4byte gBattleAnimArgs
_08099448: .4byte gSprites
_0809944C: .4byte DestroyAnimSprite
_08099450:
@@ -1408,7 +1408,7 @@ sub_809949C: @ 809949C
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r5, _08099520 @ =gUnknown_2037F02
ldr r5, _08099520 @ =gBattleAnimArgs
movs r0, 0x6
ldrsh r1, [r5, r0]
movs r0, 0x80
@@ -1416,7 +1416,7 @@ sub_809949C: @ 809949C
bl __divsi3
lsls r0, 16
lsrs r7, r0, 16
ldr r0, _08099524 @ =gUnknown_2037F1A
ldr r0, _08099524 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -1468,8 +1468,8 @@ _080994CE:
pop {r0}
bx r0
.align 2, 0
_08099520: .4byte gUnknown_2037F02
_08099524: .4byte gUnknown_2037F1A
_08099520: .4byte gBattleAnimArgs
_08099524: .4byte gBattleAnimAttacker
_08099528: .4byte gTasks
_0809952C: .4byte sub_8099530
thumb_func_end sub_809949C
@@ -1585,7 +1585,7 @@ sub_80995FC: @ 80995FC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _08099620 @ =gUnknown_2037F02
ldr r1, _08099620 @ =gBattleAnimArgs
movs r2, 0
ldrsh r0, [r1, r2]
cmp r0, 0x2
@@ -1600,18 +1600,18 @@ sub_80995FC: @ 80995FC
lsrs r2, r0, 24
b _08099664
.align 2, 0
_08099620: .4byte gUnknown_2037F02
_08099620: .4byte gBattleAnimArgs
_08099624:
cmp r0, 0x3
beq _08099634
b _0809965C
_0809962A:
ldr r5, _08099630 @ =gUnknown_2037F1A
ldr r5, _08099630 @ =gBattleAnimAttacker
b _08099636
.align 2, 0
_08099630: .4byte gUnknown_2037F1A
_08099630: .4byte gBattleAnimAttacker
_08099634:
ldr r5, _08099654 @ =gUnknown_2037F1B
ldr r5, _08099654 @ =gBattleAnimTarget
_08099636:
ldrb r0, [r5]
movs r4, 0x2
@@ -1627,7 +1627,7 @@ _08099636:
ldrb r2, [r0]
b _08099664
.align 2, 0
_08099654: .4byte gUnknown_2037F1B
_08099654: .4byte gBattleAnimTarget
_08099658: .4byte gUnknown_2023D44
_0809965C:
adds r0, r6, 0
@@ -1640,21 +1640,21 @@ _08099664:
lsls r0, 3
adds r5, r0, r1
strh r2, [r5, 0x8]
ldr r0, _08099688 @ =gUnknown_2037F1B
ldr r0, _08099688 @ =gBattleAnimTarget
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099690
ldr r0, _0809968C @ =gUnknown_2037F02
ldr r0, _0809968C @ =gBattleAnimArgs
ldrh r0, [r0, 0x2]
b _08099696
.align 2, 0
_08099684: .4byte gTasks
_08099688: .4byte gUnknown_2037F1B
_0809968C: .4byte gUnknown_2037F02
_08099688: .4byte gBattleAnimTarget
_0809968C: .4byte gBattleAnimArgs
_08099690:
ldr r0, _080996AC @ =gUnknown_2037F02
ldr r0, _080996AC @ =gBattleAnimArgs
ldrh r0, [r0, 0x2]
negs r0, r0
_08099696:
@@ -1670,7 +1670,7 @@ _080996A4:
pop {r0}
bx r0
.align 2, 0
_080996AC: .4byte gUnknown_2037F02
_080996AC: .4byte gBattleAnimArgs
_080996B0: .4byte gTasks
_080996B4: .4byte sub_80996B8
thumb_func_end sub_80995FC
@@ -1721,18 +1721,18 @@ sub_8099704: @ 8099704
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
ldr r6, _08099754 @ =gUnknown_2037F1A
ldr r6, _08099754 @ =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _08099720
ldr r1, _08099758 @ =gUnknown_2037F02
ldr r1, _08099758 @ =gBattleAnimArgs
ldrh r0, [r1, 0x2]
negs r0, r0
strh r0, [r1, 0x2]
_08099720:
ldr r4, _08099758 @ =gUnknown_2037F02
ldr r4, _08099758 @ =gBattleAnimArgs
ldrb r0, [r4, 0x8]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -1758,11 +1758,11 @@ _08099720:
ldrb r0, [r6]
b _08099764
.align 2, 0
_08099754: .4byte gUnknown_2037F1A
_08099758: .4byte gUnknown_2037F02
_08099754: .4byte gBattleAnimAttacker
_08099758: .4byte gBattleAnimArgs
_0809975C: .4byte gTasks
_08099760:
ldr r0, _0809977C @ =gUnknown_2037F1B
ldr r0, _0809977C @ =gBattleAnimTarget
ldrb r0, [r0]
_08099764:
strh r0, [r2, 0x12]
@@ -1778,7 +1778,7 @@ _08099764:
pop {r0}
bx r0
.align 2, 0
_0809977C: .4byte gUnknown_2037F1B
_0809977C: .4byte gBattleAnimTarget
_08099780: .4byte gTasks
_08099784: .4byte sub_8099788
thumb_func_end sub_8099704
@@ -1944,7 +1944,7 @@ sub_80998B0: @ 80998B0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r6, _080998FC @ =gUnknown_2037F02
ldr r6, _080998FC @ =gBattleAnimArgs
ldrb r0, [r6, 0x6]
bl GetAnimBankSpriteId
adds r5, r0, 0
@@ -1977,7 +1977,7 @@ sub_80998B0: @ 80998B0
pop {r0}
bx r0
.align 2, 0
_080998FC: .4byte gUnknown_2037F02
_080998FC: .4byte gBattleAnimArgs
_08099900: .4byte gTasks
_08099904: .4byte sub_8099908
thumb_func_end sub_80998B0
@@ -2051,7 +2051,7 @@ sub_8099980: @ 8099980
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r4, _080999BC @ =gUnknown_2037F02
ldr r4, _080999BC @ =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -2075,7 +2075,7 @@ sub_8099980: @ 8099980
strh r1, [r2, 0xE]
b _080999D0
.align 2, 0
_080999BC: .4byte gUnknown_2037F02
_080999BC: .4byte gBattleAnimArgs
_080999C0: .4byte gTasks
_080999C4:
ldrh r0, [r4]
@@ -2090,7 +2090,7 @@ _080999D0:
adds r0, r4, r7
lsls r0, 3
adds r5, r0, r1
ldr r6, _08099A00 @ =gUnknown_2037F02
ldr r6, _08099A00 @ =gBattleAnimArgs
ldrh r0, [r6, 0x2]
strh r0, [r5, 0x10]
mov r0, r8
@@ -2107,18 +2107,18 @@ _080999D0:
b _08099A28
.align 2, 0
_080999FC: .4byte gTasks
_08099A00: .4byte gUnknown_2037F02
_08099A00: .4byte gBattleAnimArgs
_08099A04:
movs r1, 0x4
ldrsh r0, [r6, r1]
cmp r0, 0
bne _08099A14
ldr r0, _08099A10 @ =gUnknown_2037F1A
ldr r0, _08099A10 @ =gBattleAnimAttacker
b _08099A16
.align 2, 0
_08099A10: .4byte gUnknown_2037F1A
_08099A10: .4byte gBattleAnimAttacker
_08099A14:
ldr r0, _08099A6C @ =gUnknown_2037F1B
ldr r0, _08099A6C @ =gBattleAnimTarget
_08099A16:
ldrb r0, [r0]
bl GetBattlerSide
@@ -2165,7 +2165,7 @@ _08099A54:
pop {r0}
bx r0
.align 2, 0
_08099A6C: .4byte gUnknown_2037F1B
_08099A6C: .4byte gBattleAnimTarget
_08099A70: .4byte gTasks
_08099A74: .4byte sub_8099B54
thumb_func_end sub_8099980
@@ -2177,7 +2177,7 @@ sub_8099A78: @ 8099A78
push {r7}
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _08099AB4 @ =gUnknown_2037F02
ldr r4, _08099AB4 @ =gBattleAnimArgs
ldrb r0, [r4, 0x4]
bl GetAnimBankSpriteId
lsls r0, 24
@@ -2198,14 +2198,14 @@ sub_8099A78: @ 8099A78
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08099AC0
ldr r0, _08099ABC @ =gUnknown_2037F1A
ldr r0, _08099ABC @ =gBattleAnimAttacker
b _08099AC2
.align 2, 0
_08099AB4: .4byte gUnknown_2037F02
_08099AB4: .4byte gBattleAnimArgs
_08099AB8: .4byte gTasks
_08099ABC: .4byte gUnknown_2037F1A
_08099ABC: .4byte gBattleAnimAttacker
_08099AC0:
ldr r0, _08099AF0 @ =gUnknown_2037F1B
ldr r0, _08099AF0 @ =gBattleAnimTarget
_08099AC2:
ldrb r0, [r0]
bl GetBattlerSide
@@ -2216,7 +2216,7 @@ _08099AC2:
negs r0, r0
strh r0, [r4, 0x2]
_08099AD4:
ldr r0, _08099AF4 @ =gUnknown_2037F02
ldr r0, _08099AF4 @ =gBattleAnimArgs
movs r2, 0x6
ldrsh r1, [r0, r2]
adds r6, r0, 0
@@ -2231,8 +2231,8 @@ _08099AD4:
strh r1, [r0, 0xE]
b _08099B16
.align 2, 0
_08099AF0: .4byte gUnknown_2037F1B
_08099AF4: .4byte gUnknown_2037F02
_08099AF0: .4byte gBattleAnimTarget
_08099AF4: .4byte gBattleAnimArgs
_08099AF8: .4byte gTasks
_08099AFC:
ldr r3, _08099B4C @ =gTasks
@@ -2356,7 +2356,7 @@ sub_8099BD4: @ 8099BD4
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08099C00 @ =gUnknown_2037F02
ldr r0, _08099C00 @ =gBattleAnimArgs
movs r2, 0
ldrsh r1, [r0, r2]
mov r8, r0
@@ -2373,7 +2373,7 @@ sub_8099BD4: @ 8099BD4
bl __udivsi3
b _08099C20
.align 2, 0
_08099C00: .4byte gUnknown_2037F02
_08099C00: .4byte gBattleAnimArgs
_08099C04: .4byte gTasks
_08099C08: .4byte gUnknown_2037EEC
_08099C0C:
asm/battle_anim_80A22E8.s
+1716 -1716
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80DE2C0.s
+312 -312
View File
File diff suppressed because it is too large Load Diff
asm/battle_anim_80EEC0C.s
+91 -91
View File
@@ -16,7 +16,7 @@ sub_80EEC0C: @ 80EEC0C
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
ldr r0, _080EEDB4 @ =gUnknown_2037F1A
ldr r0, _080EEDB4 @ =gBattleAnimAttacker
ldrb r4, [r0]
ldr r0, _080EEDB8 @ =gUnknown_2022984
movs r1, 0
@@ -203,7 +203,7 @@ sub_80EEC0C: @ 80EEC0C
pop {r0}
bx r0
.align 2, 0
_080EEDB4: .4byte gUnknown_2037F1A
_080EEDB4: .4byte gBattleAnimAttacker
_080EEDB8: .4byte gUnknown_2022984
_080EEDBC: .4byte gUnknown_2022986
_080EEDC0: .4byte 0x00003f3f
@@ -228,7 +228,7 @@ sub_80EEDF4: @ 80EEDF4
push {r7}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _080EEE3C @ =gUnknown_2037F1A
ldr r0, _080EEE3C @ =gBattleAnimAttacker
ldrb r0, [r0]
mov r8, r0
ldr r1, _080EEE40 @ =gTasks
@@ -260,7 +260,7 @@ sub_80EEDF4: @ 80EEDF4
beq _080EEE4E
b _080EEFA8
.align 2, 0
_080EEE3C: .4byte gUnknown_2037F1A
_080EEE3C: .4byte gBattleAnimAttacker
_080EEE40: .4byte gTasks
_080EEE44: .4byte gBattle_BG1_Y
_080EEE48:
@@ -569,7 +569,7 @@ sub_80EF0B4: @ 80EF0B4
lsrs r4, 24
mov r1, sp
adds r1, 0x1
ldr r0, _080EF0DC @ =gUnknown_2037F1A
ldr r0, _080EF0DC @ =gBattleAnimAttacker
ldrb r2, [r0]
mov r0, sp
bl sub_80EEFC8
@@ -580,7 +580,7 @@ sub_80EF0B4: @ 80EF0B4
pop {r0}
bx r0
.align 2, 0
_080EF0DC: .4byte gUnknown_2037F1A
_080EF0DC: .4byte gBattleAnimAttacker
thumb_func_end sub_80EF0B4
thumb_func_start sub_80EF0E0
@@ -664,7 +664,7 @@ sub_80EF180: @ 80EF180
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF19C @ =gUnknown_2037F1A
ldr r0, _080EF19C @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80EF0E0
adds r0, r4, 0
@@ -673,7 +673,7 @@ sub_80EF180: @ 80EF180
pop {r0}
bx r0
.align 2, 0
_080EF19C: .4byte gUnknown_2037F1A
_080EF19C: .4byte gBattleAnimAttacker
thumb_func_end sub_80EF180
thumb_func_start sub_80EF1A0
@@ -685,7 +685,7 @@ sub_80EF1A0: @ 80EF1A0
adds r1, r0
lsls r1, 3
adds r1, r2
ldr r2, _080EF1C4 @ =gUnknown_2037F02
ldr r2, _080EF1C4 @ =gBattleAnimArgs
ldrh r0, [r2]
strh r0, [r1, 0x1C]
ldrh r0, [r2, 0x2]
@@ -695,7 +695,7 @@ sub_80EF1A0: @ 80EF1A0
bx lr
.align 2, 0
_080EF1C0: .4byte gTasks
_080EF1C4: .4byte gUnknown_2037F02
_080EF1C4: .4byte gBattleAnimArgs
_080EF1C8: .4byte sub_80EF1CC
thumb_func_end sub_80EF1A0
@@ -810,7 +810,7 @@ sub_80EF298: @ 80EF298
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080EF2C4 @ =gUnknown_2023D44
ldr r0, _080EF2C8 @ =gUnknown_2037F1A
ldr r0, _080EF2C8 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r5, [r0]
@@ -830,7 +830,7 @@ sub_80EF298: @ 80EF298
b _080EF338
.align 2, 0
_080EF2C4: .4byte gUnknown_2023D44
_080EF2C8: .4byte gUnknown_2037F1A
_080EF2C8: .4byte gBattleAnimAttacker
_080EF2CC: .4byte gTasks
_080EF2D0:
cmp r0, 0x2
@@ -901,7 +901,7 @@ sub_80EF344: @ 80EF344
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080EF37C @ =gUnknown_2023D44
ldr r4, _080EF380 @ =gUnknown_2037F1A
ldr r4, _080EF380 @ =gBattleAnimAttacker
ldrb r0, [r4]
adds r1, r0, r1
ldrb r1, [r1]
@@ -921,7 +921,7 @@ sub_80EF344: @ 80EF344
b _080EF39C
.align 2, 0
_080EF37C: .4byte gUnknown_2023D44
_080EF380: .4byte gUnknown_2037F1A
_080EF380: .4byte gBattleAnimAttacker
_080EF384: .4byte gBattlerPartyIndexes
_080EF388: .4byte gPlayerParty
_080EF38C:
@@ -960,7 +960,7 @@ _080EF3CC: .4byte gBattlerPartyIndexes
_080EF3D0: .4byte gEnemyParty
_080EF3D4: .4byte gTasks
_080EF3D8:
ldr r5, _080EF450 @ =gUnknown_2037F1A
ldr r5, _080EF450 @ =gBattleAnimAttacker
ldrb r0, [r5]
movs r1, 0
bl sub_8074480
@@ -1015,7 +1015,7 @@ _080EF3D8:
strh r0, [r6, 0x8]
b _080EF482
.align 2, 0
_080EF450: .4byte gUnknown_2037F1A
_080EF450: .4byte gBattleAnimAttacker
_080EF454: .4byte gSprites
_080EF458:
movs r1, 0x1C
@@ -1103,21 +1103,21 @@ sub_80EF4E0: @ 80EF4E0
beq _080EF504
cmp r0, 0x6
beq _080EF514
ldr r1, _080EF500 @ =gUnknown_2037F02
ldr r1, _080EF500 @ =gBattleAnimArgs
movs r0, 0
b _080EF518
.align 2, 0
_080EF4FC: .4byte gUnknown_2024018
_080EF500: .4byte gUnknown_2037F02
_080EF500: .4byte gBattleAnimArgs
_080EF504:
ldr r1, _080EF50C @ =gUnknown_2037F02
ldr r1, _080EF50C @ =gBattleAnimArgs
ldr r0, _080EF510 @ =0x0000ffff
b _080EF518
.align 2, 0
_080EF50C: .4byte gUnknown_2037F02
_080EF50C: .4byte gBattleAnimArgs
_080EF510: .4byte 0x0000ffff
_080EF514:
ldr r1, _080EF524 @ =gUnknown_2037F02
ldr r1, _080EF524 @ =gBattleAnimArgs
ldr r0, _080EF528 @ =0x0000fffe
_080EF518:
strh r0, [r1, 0xE]
@@ -1126,7 +1126,7 @@ _080EF518:
pop {r0}
bx r0
.align 2, 0
_080EF524: .4byte gUnknown_2037F02
_080EF524: .4byte gBattleAnimArgs
_080EF528: .4byte 0x0000fffe
thumb_func_end sub_80EF4E0
@@ -1236,7 +1236,7 @@ sub_80EF5AC: @ 80EF5AC
adds r6, r4, r1
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r2, _080EF680 @ =gUnknown_2037F1B
ldr r2, _080EF680 @ =gBattleAnimTarget
mov r8, r2
ldrb r0, [r2]
movs r1, 0
@@ -1300,7 +1300,7 @@ sub_80EF5AC: @ 80EF5AC
_080EF674: .4byte gUnknown_2023D68
_080EF678: .4byte gUnknown_82606F4
_080EF67C: .4byte gSprites
_080EF680: .4byte gUnknown_2037F1B
_080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0
_080EF688: .4byte gUnknown_2024018
_080EF68C: .4byte gUnknown_2023D44
@@ -1407,7 +1407,7 @@ _080EF708:
adds r6, r4, r0
movs r0, 0x22
strh r0, [r6, 0x2E]
ldr r1, _080EF7D4 @ =gUnknown_2037F1B
ldr r1, _080EF7D4 @ =gBattleAnimTarget
mov r8, r1
ldrb r0, [r1]
movs r1, 0
@@ -1460,7 +1460,7 @@ _080EF7C4: .4byte gSaveBlock2Ptr
_080EF7C8: .4byte gUnknown_2023D68
_080EF7CC: .4byte gUnknown_82606F4
_080EF7D0: .4byte gSprites
_080EF7D4: .4byte gUnknown_2037F1B
_080EF7D4: .4byte gBattleAnimTarget
_080EF7D8: .4byte SpriteCallbackDummy
_080EF7DC: .4byte gUnknown_2023D44
_080EF7E0: .4byte sub_8012354
@@ -1674,7 +1674,7 @@ _080EF954:
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, _080EF9B0 @ =gUnknown_2037F1B
ldr r0, _080EF9B0 @ =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
@@ -1688,7 +1688,7 @@ _080EF99E:
.align 2, 0
_080EF9A8: .4byte sub_80EF9B4
_080EF9AC: .4byte gUnknown_2023D68
_080EF9B0: .4byte gUnknown_2037F1B
_080EF9B0: .4byte gBattleAnimTarget
thumb_func_end sub_80EF8F0
thumb_func_start sub_80EF9B4
@@ -1712,7 +1712,7 @@ sub_80EF9B4: @ 80EF9B4
str r0, [r4, 0x1C]
ldr r2, _080EFA00 @ =gSprites
ldr r1, _080EFA04 @ =gUnknown_2023D44
ldr r0, _080EFA08 @ =gUnknown_2037F1B
ldr r0, _080EFA08 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -1731,7 +1731,7 @@ _080EF9F8: .4byte TaskDummy
_080EF9FC: .4byte sub_80EFA0C
_080EFA00: .4byte gSprites
_080EFA04: .4byte gUnknown_2023D44
_080EFA08: .4byte gUnknown_2037F1B
_080EFA08: .4byte gBattleAnimTarget
thumb_func_end sub_80EF9B4
thumb_func_start sub_80EFA0C
@@ -1739,7 +1739,7 @@ sub_80EFA0C: @ 80EFA0C
push {r4-r7,lr}
adds r7, r0, 0
ldr r1, _080EFA50 @ =gUnknown_2023D44
ldr r0, _080EFA54 @ =gUnknown_2037F1B
ldr r0, _080EFA54 @ =gBattleAnimTarget
ldrb r0, [r0]
adds r0, r1
ldrb r4, [r0]
@@ -1772,7 +1772,7 @@ _080EFA3E:
b _080EFB20
.align 2, 0
_080EFA50: .4byte gUnknown_2023D44
_080EFA54: .4byte gUnknown_2037F1B
_080EFA54: .4byte gBattleAnimTarget
_080EFA58: .4byte gTasks
_080EFA5C:
cmp r0, 0x2
@@ -2495,7 +2495,7 @@ sub_80EFFC4: @ 80EFFC4
push {r7}
sub sp, 0x4
adds r6, r0, 0
ldr r7, _080F0004 @ =gUnknown_2037F1B
ldr r7, _080F0004 @ =gBattleAnimTarget
ldrh r0, [r6, 0x36]
adds r0, 0x1
movs r1, 0
@@ -2519,7 +2519,7 @@ sub_80EFFC4: @ 80EFFC4
bl sub_80F01B8
b _080F0088
.align 2, 0
_080F0004: .4byte gUnknown_2037F1B
_080F0004: .4byte gBattleAnimTarget
_080F0008:
cmp r1, 0x3C
bne _080F0026
@@ -2893,7 +2893,7 @@ sub_80F02B0: @ 80F02B0
movs r2, 0x1
movs r3, 0x1C
bl LaunchBallStarsTask
ldr r0, _080F036C @ =gUnknown_2037F1B
ldr r0, _080F036C @ =gBattleAnimTarget
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
@@ -2902,7 +2902,7 @@ sub_80F02B0: @ 80F02B0
_080F0302:
ldr r6, _080F0370 @ =gSprites
ldr r5, _080F0374 @ =gUnknown_2023D44
ldr r4, _080F036C @ =gUnknown_2037F1B
ldr r4, _080F036C @ =gBattleAnimTarget
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2950,7 +2950,7 @@ _080F0302:
.align 2, 0
_080F0364: .4byte sub_80F0378
_080F0368: .4byte gUnknown_2023D68
_080F036C: .4byte gUnknown_2037F1B
_080F036C: .4byte gBattleAnimTarget
_080F0370: .4byte gSprites
_080F0374: .4byte gUnknown_2023D44
thumb_func_end sub_80F02B0
@@ -2975,7 +2975,7 @@ sub_80F0378: @ 80F0378
_080F0396:
ldr r4, _080F03C4 @ =gSprites
ldr r3, _080F03C8 @ =gUnknown_2023D44
ldr r2, _080F03CC @ =gUnknown_2037F1B
ldr r2, _080F03CC @ =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -2997,7 +2997,7 @@ _080F0396:
.align 2, 0
_080F03C4: .4byte gSprites
_080F03C8: .4byte gUnknown_2023D44
_080F03CC: .4byte gUnknown_2037F1B
_080F03CC: .4byte gBattleAnimTarget
_080F03D0:
ldr r6, _080F045C @ =0xfffffee0
adds r0, r6, 0
@@ -3027,7 +3027,7 @@ _080F03F0:
beq _080F0456
ldr r4, _080F0460 @ =gSprites
ldr r3, _080F0464 @ =gUnknown_2023D44
ldr r2, _080F0468 @ =gUnknown_2037F1B
ldr r2, _080F0468 @ =gBattleAnimTarget
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -3074,7 +3074,7 @@ _080F0456:
_080F045C: .4byte 0xfffffee0
_080F0460: .4byte gSprites
_080F0464: .4byte gUnknown_2023D44
_080F0468: .4byte gUnknown_2037F1B
_080F0468: .4byte gBattleAnimTarget
_080F046C: .4byte gUnknown_2024018
_080F0470: .4byte sub_80F018C
_080F0474: .4byte gUnknown_2024005
@@ -5083,7 +5083,7 @@ sub_80F1420: @ 80F1420
movs r0, 0
mov r8, r0
ldr r0, _080F1454 @ =gUnknown_2023D44
ldr r3, _080F1458 @ =gUnknown_2037F1A
ldr r3, _080F1458 @ =gBattleAnimAttacker
ldrb r2, [r3]
adds r0, r2, r0
ldrb r6, [r0]
@@ -5103,14 +5103,14 @@ sub_80F1420: @ 80F1420
b _080F15BA
.align 2, 0
_080F1454: .4byte gUnknown_2023D44
_080F1458: .4byte gUnknown_2037F1A
_080F1458: .4byte gBattleAnimAttacker
_080F145C: .4byte gTasks
_080F1460:
cmp r0, 0x2
beq _080F150A
b _080F15BA
_080F1466:
ldr r0, _080F14A0 @ =gUnknown_2037F02
ldr r0, _080F14A0 @ =gBattleAnimArgs
ldrh r0, [r0]
strh r0, [r5, 0x1E]
movs r2, 0xA0
@@ -5138,7 +5138,7 @@ _080F1466:
adds r4, r3, 0
b _080F14C0
.align 2, 0
_080F14A0: .4byte gUnknown_2037F02
_080F14A0: .4byte gBattleAnimArgs
_080F14A4: .4byte gSprites
_080F14A8:
ldr r3, _080F14F0 @ =gSprites
@@ -5238,7 +5238,7 @@ _080F1558:
adds r0, r1
ldrb r1, [r0, 0x8]
strh r1, [r0, 0x8]
ldr r0, _080F1594 @ =gUnknown_2037F1A
ldr r0, _080F1594 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
lsls r0, 24
@@ -5259,7 +5259,7 @@ _080F1558:
.align 2, 0
_080F158C: .4byte gSprites
_080F1590: .4byte gTasks
_080F1594: .4byte gUnknown_2037F1A
_080F1594: .4byte gBattleAnimAttacker
_080F1598:
ldr r0, _080F15C4 @ =gSprites
adds r1, r4, r6
@@ -5315,7 +5315,7 @@ _080F15F0:
beq _080F167E
b _080F16B4
_080F15F6:
ldr r0, _080F1610 @ =gUnknown_2037F1A
ldr r0, _080F1610 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl sub_80768B0
lsls r0, 24
@@ -5327,7 +5327,7 @@ _080F15F6:
bl SetGpuReg
b _080F1620
.align 2, 0
_080F1610: .4byte gUnknown_2037F1A
_080F1610: .4byte gBattleAnimAttacker
_080F1614: .4byte 0x00003f42
_080F1618:
ldr r1, _080F163C @ =0x00003f44
@@ -5380,7 +5380,7 @@ _080F1644:
b _080F16B4
_080F167E:
ldr r1, _080F16BC @ =gUnknown_2023D44
ldr r4, _080F16C0 @ =gUnknown_2037F1A
ldr r4, _080F16C0 @ =gBattleAnimAttacker
ldrb r0, [r4]
adds r0, r1
ldrb r1, [r0]
@@ -5409,7 +5409,7 @@ _080F16B4:
bx r0
.align 2, 0
_080F16BC: .4byte gUnknown_2023D44
_080F16C0: .4byte gUnknown_2037F1A
_080F16C0: .4byte gBattleAnimAttacker
_080F16C4: .4byte gSprites
_080F16C8: .4byte 0x06010000
thumb_func_end sub_80F15C8
@@ -5419,10 +5419,10 @@ sub_80F16CC: @ 80F16CC
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, _080F16F4 @ =gUnknown_2037F02
ldr r3, _080F16F4 @ =gBattleAnimArgs
ldr r1, _080F16F8 @ =gUnknown_2024018
ldr r2, [r1]
ldr r1, _080F16FC @ =gUnknown_2037F1A
ldr r1, _080F16FC @ =gBattleAnimAttacker
ldrb r1, [r1]
ldr r2, [r2]
lsls r1, 2
@@ -5435,9 +5435,9 @@ sub_80F16CC: @ 80F16CC
pop {r0}
bx r0
.align 2, 0
_080F16F4: .4byte gUnknown_2037F02
_080F16F4: .4byte gBattleAnimArgs
_080F16F8: .4byte gUnknown_2024018
_080F16FC: .4byte gUnknown_2037F1A
_080F16FC: .4byte gBattleAnimAttacker
thumb_func_end sub_80F16CC
thumb_func_start sub_80F1700
@@ -5445,7 +5445,7 @@ sub_80F1700: @ 80F1700
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r2, _080F1718 @ =gUnknown_2037F1B
ldr r2, _080F1718 @ =gBattleAnimTarget
ldr r1, _080F171C @ =gUnknown_2023D6E
ldrb r1, [r1]
strb r1, [r2]
@@ -5453,7 +5453,7 @@ sub_80F1700: @ 80F1700
pop {r0}
bx r0
.align 2, 0
_080F1718: .4byte gUnknown_2037F1B
_080F1718: .4byte gBattleAnimTarget
_080F171C: .4byte gUnknown_2023D6E
thumb_func_end sub_80F1700
@@ -5992,7 +5992,7 @@ sub_80F1B3C: @ 80F1B3C
movs r1, 0
bl sub_8074480
lsls r0, 24
ldr r5, _080F1BB0 @ =gUnknown_2037F02
ldr r5, _080F1BB0 @ =gBattleAnimArgs
lsrs r0, 24
ldrh r1, [r5, 0x4]
adds r0, r1
@@ -6014,7 +6014,7 @@ sub_80F1B3C: @ 80F1B3C
bl sub_8075068
ldr r2, _080F1BB8 @ =gSprites
ldr r1, _080F1BBC @ =gUnknown_2023D44
ldr r0, _080F1BC0 @ =gUnknown_2037F1A
ldr r0, _080F1BC0 @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -6031,11 +6031,11 @@ sub_80F1B3C: @ 80F1B3C
pop {r0}
bx r0
.align 2, 0
_080F1BB0: .4byte gUnknown_2037F02
_080F1BB0: .4byte gBattleAnimArgs
_080F1BB4: .4byte 0x0000ffe0
_080F1BB8: .4byte gSprites
_080F1BBC: .4byte gUnknown_2023D44
_080F1BC0: .4byte gUnknown_2037F1A
_080F1BC0: .4byte gBattleAnimAttacker
_080F1BC4: .4byte sub_8012354
_080F1BC8: .4byte sub_80F1BCC
thumb_func_end sub_80F1B3C
@@ -6046,7 +6046,7 @@ sub_80F1BCC: @ 80F1BCC
adds r3, r0, 0
ldr r2, _080F1BF4 @ =gSprites
ldr r1, _080F1BF8 @ =gUnknown_2023D44
ldr r0, _080F1BFC @ =gUnknown_2037F1A
ldr r0, _080F1BFC @ =gBattleAnimAttacker
ldrb r0, [r0]
adds r0, r1
ldrb r1, [r0]
@@ -6066,7 +6066,7 @@ _080F1BF0:
.align 2, 0
_080F1BF4: .4byte gSprites
_080F1BF8: .4byte gUnknown_2023D44
_080F1BFC: .4byte gUnknown_2037F1A
_080F1BFC: .4byte gBattleAnimAttacker
_080F1C00: .4byte sub_80F1C04
thumb_func_end sub_80F1BCC
@@ -6102,7 +6102,7 @@ sub_80F1C30: @ 80F1C30
adds r4, r0, 0
ldr r5, _080F1C80 @ =gSprites
ldr r3, _080F1C84 @ =gUnknown_2023D44
ldr r2, _080F1C88 @ =gUnknown_2037F1A
ldr r2, _080F1C88 @ =gBattleAnimAttacker
ldrb r0, [r2]
adds r0, r3
ldrb r1, [r0]
@@ -6139,7 +6139,7 @@ _080F1C78:
.align 2, 0
_080F1C80: .4byte gSprites
_080F1C84: .4byte gUnknown_2023D44
_080F1C88: .4byte gUnknown_2037F1A
_080F1C88: .4byte gBattleAnimAttacker
thumb_func_end sub_80F1C30
thumb_func_start sub_80F1C8C
@@ -6147,7 +6147,7 @@ sub_80F1C8C: @ 80F1C8C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080F1CA4 @ =gUnknown_2037F02
ldr r0, _080F1CA4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
@@ -6156,25 +6156,25 @@ sub_80F1C8C: @ 80F1C8C
beq _080F1CBC
b _080F1CD0
.align 2, 0
_080F1CA4: .4byte gUnknown_2037F02
_080F1CA4: .4byte gBattleAnimArgs
_080F1CA8:
movs r0, 0
bl GetBattlerAtPosition
ldr r1, _080F1CB8 @ =gUnknown_2037F1A
ldr r1, _080F1CB8 @ =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0x1
b _080F1CC8
.align 2, 0
_080F1CB8: .4byte gUnknown_2037F1A
_080F1CB8: .4byte gBattleAnimAttacker
_080F1CBC:
movs r0, 0x1
bl GetBattlerAtPosition
ldr r1, _080F1CDC @ =gUnknown_2037F1A
ldr r1, _080F1CDC @ =gBattleAnimAttacker
strb r0, [r1]
movs r0, 0
_080F1CC8:
bl GetBattlerAtPosition
ldr r1, _080F1CE0 @ =gUnknown_2037F1B
ldr r1, _080F1CE0 @ =gBattleAnimTarget
strb r0, [r1]
_080F1CD0:
adds r0, r4, 0
@@ -6183,8 +6183,8 @@ _080F1CD0:
pop {r0}
bx r0
.align 2, 0
_080F1CDC: .4byte gUnknown_2037F1A
_080F1CE0: .4byte gUnknown_2037F1B
_080F1CDC: .4byte gBattleAnimAttacker
_080F1CE0: .4byte gBattleAnimTarget
thumb_func_end sub_80F1C8C
thumb_func_start sub_80F1CE4
@@ -6196,14 +6196,14 @@ sub_80F1CE4: @ 80F1CE4
ldrb r0, [r2, 0x5]
cmp r0, 0x2
bls _080F1D00
ldr r1, _080F1CFC @ =gUnknown_2037F02
ldr r1, _080F1CFC @ =gBattleAnimArgs
movs r0, 0
b _080F1D04
.align 2, 0
_080F1CF8: .4byte gUnknown_2023E82
_080F1CFC: .4byte gUnknown_2037F02
_080F1CFC: .4byte gBattleAnimArgs
_080F1D00:
ldr r1, _080F1D10 @ =gUnknown_2037F02
ldr r1, _080F1D10 @ =gBattleAnimArgs
ldrb r0, [r2, 0x5]
_080F1D04:
strh r0, [r1, 0xE]
@@ -6212,7 +6212,7 @@ _080F1D04:
pop {r0}
bx r0
.align 2, 0
_080F1D10: .4byte gUnknown_2037F02
_080F1D10: .4byte gBattleAnimArgs
thumb_func_end sub_80F1CE4
thumb_func_start sub_80F1D14
@@ -6226,40 +6226,40 @@ sub_80F1D14: @ 80F1D14
ldrh r1, [r0]
cmp r1, 0x53
bne _080F1D34
ldr r1, _080F1D30 @ =gUnknown_2037F02
ldr r1, _080F1D30 @ =gBattleAnimArgs
movs r0, 0x1
b _080F1D6C
.align 2, 0
_080F1D2C: .4byte gUnknown_2024018
_080F1D30: .4byte gUnknown_2037F02
_080F1D30: .4byte gBattleAnimArgs
_080F1D34:
cmp r1, 0xFA
bne _080F1D44
ldr r1, _080F1D40 @ =gUnknown_2037F02
ldr r1, _080F1D40 @ =gBattleAnimArgs
movs r0, 0x2
b _080F1D6C
.align 2, 0
_080F1D40: .4byte gUnknown_2037F02
_080F1D40: .4byte gBattleAnimArgs
_080F1D44:
cmp r1, 0x80
bne _080F1D54
ldr r1, _080F1D50 @ =gUnknown_2037F02
ldr r1, _080F1D50 @ =gBattleAnimArgs
movs r0, 0x3
b _080F1D6C
.align 2, 0
_080F1D50: .4byte gUnknown_2037F02
_080F1D50: .4byte gBattleAnimArgs
_080F1D54:
movs r0, 0xA4
lsls r0, 1
cmp r1, r0
bne _080F1D68
ldr r1, _080F1D64 @ =gUnknown_2037F02
ldr r1, _080F1D64 @ =gBattleAnimArgs
movs r0, 0x4
b _080F1D6C
.align 2, 0
_080F1D64: .4byte gUnknown_2037F02
_080F1D64: .4byte gBattleAnimArgs
_080F1D68:
ldr r1, _080F1D78 @ =gUnknown_2037F02
ldr r1, _080F1D78 @ =gBattleAnimArgs
movs r0, 0
_080F1D6C:
strh r0, [r1]
@@ -6268,7 +6268,7 @@ _080F1D6C:
pop {r0}
bx r0
.align 2, 0
_080F1D78: .4byte gUnknown_2037F02
_080F1D78: .4byte gBattleAnimArgs
thumb_func_end sub_80F1D14
thumb_func_start sub_80F1D7C
@@ -6276,13 +6276,13 @@ sub_80F1D7C: @ 80F1D7C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r3, _080F1DA0 @ =gUnknown_2037F1A
ldr r3, _080F1DA0 @ =gBattleAnimAttacker
ldr r1, _080F1DA4 @ =gUnknown_2024018
ldr r2, [r1]
ldr r1, [r2, 0x8]
ldrh r1, [r1]
strb r1, [r3]
ldr r3, _080F1DA8 @ =gUnknown_2037F1B
ldr r3, _080F1DA8 @ =gBattleAnimTarget
ldr r1, [r2, 0x8]
ldrh r1, [r1]
lsrs r1, 8
@@ -6291,9 +6291,9 @@ sub_80F1D7C: @ 80F1D7C
pop {r0}
bx r0
.align 2, 0
_080F1DA0: .4byte gUnknown_2037F1A
_080F1DA0: .4byte gBattleAnimAttacker
_080F1DA4: .4byte gUnknown_2024018
_080F1DA8: .4byte gUnknown_2037F1B
_080F1DA8: .4byte gBattleAnimTarget
thumb_func_end sub_80F1D7C
.align 2, 0 @ Don't pad with nop.
asm/battle_anim_sound_tasks.s
+38 -38
View File
@@ -15,7 +15,7 @@ sub_80DCE10: @ 80DCE10
adds r6, r0
lsls r6, 3
adds r6, r1
ldr r1, _080DCE70 @ =gUnknown_2037F02
ldr r1, _080DCE70 @ =gBattleAnimArgs
ldrh r0, [r1]
strh r0, [r6, 0x8]
ldrh r0, [r1, 0x2]
@@ -51,7 +51,7 @@ sub_80DCE10: @ 80DCE10
bx r0
.align 2, 0
_080DCE6C: .4byte gTasks
_080DCE70: .4byte gUnknown_2037F02
_080DCE70: .4byte gBattleAnimArgs
_080DCE74: .4byte sub_80DCE78
thumb_func_end sub_80DCE10
@@ -168,7 +168,7 @@ mas_80DCF38: @ 80DCF38
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080DCFDC @ =gUnknown_2037F02
ldr r0, _080DCFDC @ =gBattleAnimArgs
ldrh r1, [r0]
str r1, [sp]
ldrb r5, [r0, 0x4]
@@ -236,7 +236,7 @@ mas_80DCF38: @ 80DCF38
pop {r0}
bx r0
.align 2, 0
_080DCFDC: .4byte gUnknown_2037F02
_080DCFDC: .4byte gBattleAnimArgs
_080DCFE0: .4byte gTasks
_080DCFE4: .4byte sub_80DCFE8
thumb_func_end mas_80DCF38
@@ -320,41 +320,41 @@ sub_80DD06C: @ 80DD06C
bl sub_8073A44
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _080DD090 @ =gUnknown_2037F02
ldr r0, _080DD090 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DD098
ldr r0, _080DD094 @ =gUnknown_2037F1A
ldr r0, _080DD094 @ =gBattleAnimAttacker
ldrb r4, [r0]
b _080DD0BE
.align 2, 0
_080DD090: .4byte gUnknown_2037F02
_080DD094: .4byte gUnknown_2037F1A
_080DD090: .4byte gBattleAnimArgs
_080DD094: .4byte gBattleAnimAttacker
_080DD098:
cmp r0, 0x1
bne _080DD0A8
ldr r0, _080DD0A4 @ =gUnknown_2037F1B
ldr r0, _080DD0A4 @ =gBattleAnimTarget
ldrb r4, [r0]
b _080DD0BE
.align 2, 0
_080DD0A4: .4byte gUnknown_2037F1B
_080DD0A4: .4byte gBattleAnimTarget
_080DD0A8:
cmp r0, 0x2
bne _080DD0B4
ldr r0, _080DD0B0 @ =gUnknown_2037F1A
ldr r0, _080DD0B0 @ =gBattleAnimAttacker
b _080DD0B6
.align 2, 0
_080DD0B0: .4byte gUnknown_2037F1A
_080DD0B0: .4byte gBattleAnimAttacker
_080DD0B4:
ldr r0, _080DD0E0 @ =gUnknown_2037F1B
ldr r0, _080DD0E0 @ =gBattleAnimTarget
_080DD0B6:
ldrb r1, [r0]
movs r0, 0x2
adds r4, r0, 0
eors r4, r1
_080DD0BE:
ldr r0, _080DD0E4 @ =gUnknown_2037F02
ldr r0, _080DD0E4 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0x1
@@ -371,8 +371,8 @@ _080DD0CC:
bl DestroyAnimVisualTask
b _080DD13A
.align 2, 0
_080DD0E0: .4byte gUnknown_2037F1B
_080DD0E4: .4byte gUnknown_2037F02
_080DD0E0: .4byte gBattleAnimTarget
_080DD0E4: .4byte gBattleAnimArgs
_080DD0E8:
adds r0, r4, 0
bl GetBattlerSide
@@ -432,41 +432,41 @@ sub_80DD148: @ 80DD148
bl sub_8073A44
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080DD16C @ =gUnknown_2037F02
ldr r0, _080DD16C @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
cmp r0, 0
bne _080DD174
ldr r0, _080DD170 @ =gUnknown_2037F1A
ldr r0, _080DD170 @ =gBattleAnimAttacker
ldrb r4, [r0]
b _080DD19A
.align 2, 0
_080DD16C: .4byte gUnknown_2037F02
_080DD170: .4byte gUnknown_2037F1A
_080DD16C: .4byte gBattleAnimArgs
_080DD170: .4byte gBattleAnimAttacker
_080DD174:
cmp r0, 0x1
bne _080DD184
ldr r0, _080DD180 @ =gUnknown_2037F1B
ldr r0, _080DD180 @ =gBattleAnimTarget
ldrb r4, [r0]
b _080DD19A
.align 2, 0
_080DD180: .4byte gUnknown_2037F1B
_080DD180: .4byte gBattleAnimTarget
_080DD184:
cmp r0, 0x2
bne _080DD190
ldr r0, _080DD18C @ =gUnknown_2037F1A
ldr r0, _080DD18C @ =gBattleAnimAttacker
b _080DD192
.align 2, 0
_080DD18C: .4byte gUnknown_2037F1A
_080DD18C: .4byte gBattleAnimAttacker
_080DD190:
ldr r0, _080DD1BC @ =gUnknown_2037F1B
ldr r0, _080DD1BC @ =gBattleAnimTarget
_080DD192:
ldrb r1, [r0]
movs r0, 0x2
adds r4, r0, 0
eors r4, r1
_080DD19A:
ldr r0, _080DD1C0 @ =gUnknown_2037F02
ldr r0, _080DD1C0 @ =gBattleAnimArgs
movs r2, 0
ldrsh r0, [r0, r2]
cmp r0, 0x1
@@ -483,8 +483,8 @@ _080DD1A8:
bl DestroyAnimVisualTask
b _080DD26A
.align 2, 0
_080DD1BC: .4byte gUnknown_2037F1B
_080DD1C0: .4byte gUnknown_2037F02
_080DD1BC: .4byte gBattleAnimTarget
_080DD1C0: .4byte gBattleAnimArgs
_080DD1C4:
adds r0, r4, 0
bl GetBattlerSide
@@ -521,7 +521,7 @@ _080DD1F6:
adds r0, r2, r6
lsls r0, 3
adds r0, r1
ldr r4, _080DD240 @ =gUnknown_2037F02
ldr r4, _080DD240 @ =gBattleAnimArgs
ldrh r1, [r4, 0x2]
strh r1, [r0, 0x8]
strh r3, [r0, 0xA]
@@ -543,7 +543,7 @@ _080DD1F6:
_080DD234: .4byte gBattlerPartyIndexes
_080DD238: .4byte gPlayerParty
_080DD23C: .4byte gTasks
_080DD240: .4byte gUnknown_2037F02
_080DD240: .4byte gBattleAnimArgs
_080DD244:
adds r0, r3, 0
movs r2, 0x7
@@ -677,7 +677,7 @@ sub_80DD334: @ 80DD334
negs r0, r0
bl sub_8073A44
ldr r2, _080DD374 @ =gUnknown_2037F1C
ldr r1, _080DD378 @ =gUnknown_2037F1A
ldr r1, _080DD378 @ =gBattleAnimAttacker
ldrb r1, [r1]
lsls r1, 1
adds r1, r2
@@ -701,7 +701,7 @@ sub_80DD334: @ 80DD334
b _080DD38A
.align 2, 0
_080DD374: .4byte gUnknown_2037F1C
_080DD378: .4byte gUnknown_2037F1A
_080DD378: .4byte gBattleAnimAttacker
_080DD37C: .4byte gTasks
_080DD380: .4byte sub_80DD390
_080DD384:
@@ -758,7 +758,7 @@ sub_80DD3DC: @ 80DD3DC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080DD40C @ =gUnknown_2037F02
ldr r0, _080DD40C @ =gBattleAnimArgs
ldrh r5, [r0]
ldrb r0, [r0, 0x2]
lsls r0, 24
@@ -775,7 +775,7 @@ sub_80DD3DC: @ 80DD3DC
pop {r0}
bx r0
.align 2, 0
_080DD40C: .4byte gUnknown_2037F02
_080DD40C: .4byte gBattleAnimArgs
thumb_func_end sub_80DD3DC
thumb_func_start sub_80DD410
@@ -784,7 +784,7 @@ sub_80DD410: @ 80DD410
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080DD440 @ =gUnknown_2037F02
ldr r0, _080DD440 @ =gBattleAnimArgs
ldrh r5, [r0]
ldrb r0, [r0, 0x2]
lsls r0, 24
@@ -801,7 +801,7 @@ sub_80DD410: @ 80DD410
pop {r0}
bx r0
.align 2, 0
_080DD440: .4byte gUnknown_2037F02
_080DD440: .4byte gBattleAnimArgs
thumb_func_end sub_80DD410
thumb_func_start sub_80DD444
@@ -814,7 +814,7 @@ sub_80DD444: @ 80DD444
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, _080DD4C8 @ =gUnknown_2037F02
ldr r0, _080DD4C8 @ =gBattleAnimArgs
ldrb r5, [r0, 0x2]
ldrb r6, [r0, 0x4]
ldrh r1, [r0, 0x6]
@@ -868,7 +868,7 @@ sub_80DD444: @ 80DD444
pop {r0}
bx r0
.align 2, 0
_080DD4C8: .4byte gUnknown_2037F02
_080DD4C8: .4byte gBattleAnimArgs
_080DD4CC: .4byte gTasks
_080DD4D0: .4byte sub_80DD4D4
thumb_func_end sub_80DD444
asm/battle_gfx_sfx_util.s
+8 -8
View File
@@ -417,10 +417,10 @@ _08034094:
_080340D8: .4byte gSprites
_080340DC: .4byte gUnknown_2023D44
_080340E0:
ldr r0, _08034144 @ =gUnknown_2037F1A
ldr r0, _08034144 @ =gBattleAnimAttacker
mov r2, r10
strb r2, [r0]
ldr r0, _08034148 @ =gUnknown_2037F1B
ldr r0, _08034148 @ =gBattleAnimTarget
mov r1, sp
ldrb r1, [r1]
strb r1, [r0]
@@ -466,8 +466,8 @@ _08034132:
pop {r1}
bx r1
.align 2, 0
_08034144: .4byte gUnknown_2037F1A
_08034148: .4byte gUnknown_2037F1B
_08034144: .4byte gBattleAnimAttacker
_08034148: .4byte gBattleAnimTarget
_0803414C: .4byte gUnknown_2024018
_08034150: .4byte gUnknown_81C6EA8
_08034154: .4byte Task_ClearBitWhenBattleTableAnimDone
@@ -551,9 +551,9 @@ InitAndLaunchSpecialAnimation: @ 80341D8
lsrs r4, 24
lsls r3, 24
lsrs r3, 24
ldr r0, _08034230 @ =gUnknown_2037F1A
ldr r0, _08034230 @ =gBattleAnimAttacker
strb r1, [r0]
ldr r0, _08034234 @ =gUnknown_2037F1B
ldr r0, _08034234 @ =gBattleAnimTarget
strb r2, [r0]
ldr r0, _08034238 @ =gUnknown_81C6F18
adds r1, r3, 0
@@ -587,8 +587,8 @@ InitAndLaunchSpecialAnimation: @ 80341D8
pop {r0}
bx r0
.align 2, 0
_08034230: .4byte gUnknown_2037F1A
_08034234: .4byte gUnknown_2037F1B
_08034230: .4byte gBattleAnimAttacker
_08034234: .4byte gBattleAnimTarget
_08034238: .4byte gUnknown_81C6F18
_0803423C: .4byte Task_ClearBitWhenSpecialAnimDone
_08034240: .4byte gTasks
sym_ewram.txt
+3 -3
View File
@@ -764,7 +764,7 @@ gUnknown_2037EFE: @ 2037EFE
gUnknown_2037F00: @ 2037F00
.space 0x2
gUnknown_2037F02: @ 2037F02
gBattleAnimArgs: @ 2037F02
.space 0x10
gUnknown_2037F12: @ 2037F12
@@ -782,10 +782,10 @@ gUnknown_2037F17: @ 2037F17
gUnknown_2037F18: @ 2037F18
.space 0x2
gUnknown_2037F1A: @ 2037F1A
gBattleAnimAttacker: @ 2037F1A
.space 0x1
gUnknown_2037F1B: @ 2037F1B
gBattleAnimTarget: @ 2037F1B
.space 0x1
gUnknown_2037F1C: @ 2037F1C