dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Decompile rock

Browse Source
This commit is contained in:
Marcus Huderle
2018-11-25 17:00:18 -06:00
parent 19e235867a
commit 5947e0d229
35 changed files with 771 additions and 1644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
asm/battle_anim_815A0D4.s
View File

@@ -259,7 +259,7 @@ _0815A2B2:
strh r0, [r5, 0x2E]
strh r7, [r5, 0x32]
strh r6, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -767,7 +767,7 @@ sub_815A6C4: @ 815A6C4
sub sp, 0x4
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
mov r5, sp
@@ -802,7 +802,7 @@ _0815A6F8:
ldr r0, =0x0000ffce
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_815A73C
str r0, [r4, 0x1C]
add sp, 0x4
@@ -2216,7 +2216,7 @@ sub_815B27C: @ 815B27C
bne _0815B290
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
_0815B290:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -2291,7 +2291,7 @@ _0815B2D8:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
_0815B324:
pop {r4,r5}
@@ -2810,7 +2810,7 @@ sub_815B70C: @ 815B70C
_0815B71E:
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x90
lsls r0, 4
strh r0, [r4, 0x30]
@@ -4309,7 +4309,7 @@ sub_815C400: @ 815C400
bne _0815C41E
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -8448,7 +8448,7 @@ _0815E4EE:
adds r0, r1
lsls r0, 2
adds r0, r4
bl sub_80A68D4
bl InitAnimArcTranslation
mov r1, r10
ldrb r0, [r1]
bl GetBattlerSide
@@ -9605,7 +9605,7 @@ sub_815EE84: @ 815EE84
bne _0815EEA8
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
b _0815EEAA
.pool

8
asm/battle_anim_8170478.s
View File

@@ -1473,7 +1473,7 @@ sub_8171104: @ 8171104
ldr r0, =0x0000ffd8
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8171134
str r0, [r4, 0x1C]
pop {r4}
@@ -2631,7 +2631,7 @@ _08171A26:
ldrsb r0, [r1, r0]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
add r4, r10
ldr r0, =sub_8171AAC
str r0, [r4]
@@ -5571,7 +5571,7 @@ sub_817330C: @ 817330C
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
@@ -5600,7 +5600,7 @@ sub_817330C: @ 817330C
ldr r0, =0x0000ffe0
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r2, =gSprites
ldr r1, =gBattlerSpriteIds
ldr r0, =gBattleAnimAttacker

52
asm/battle_anim_effects_1.s
View File

@@ -92,7 +92,7 @@ sub_80FE8E0: @ 80FE8E0
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -109,7 +109,7 @@ sub_80FE8E0: @ 80FE8E0
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r4, 0
@@ -125,7 +125,7 @@ sub_80FE930: @ 80FE930
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrb r1, [r5, 0x6]
adds r0, r4, 0
@@ -145,7 +145,7 @@ sub_80FE930: @ 80FE930
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
@@ -161,7 +161,7 @@ sub_80FE988: @ 80FE988
push {r4-r6,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x4]
strh r0, [r4, 0x2E]
@@ -337,7 +337,7 @@ sub_80FEAD8: @ 80FEAD8
ldrh r0, [r6, 0x4]
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_80FEB28
str r0, [r4, 0x1C]
pop {r4-r6}
@@ -493,7 +493,7 @@ sub_80FEC48: @ 80FEC48
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -528,7 +528,7 @@ _080FEC68:
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_80FECB8
str r0, [r6, 0x1C]
pop {r4-r6}
@@ -762,7 +762,7 @@ sub_80FEE78: @ 80FEE78
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -859,7 +859,7 @@ sub_80FEF44: @ 80FEF44
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
@@ -1079,7 +1079,7 @@ sub_80FF0F4: @ 80FF0F4
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1138,7 +1138,7 @@ _080FF174:
ldrh r0, [r0, 0xA]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1256,8 +1256,8 @@ _080FF260:
bx r0
thumb_func_end sub_80FF1C0
thumb_func_start sub_80FF268
sub_80FF268: @ 80FF268
thumb_func_start AnimMoveTwisterParticle
AnimMoveTwisterParticle: @ 80FF268
push {r4,lr}
adds r4, r0, 0
bl IsDoubleBattle
@@ -1294,7 +1294,7 @@ _080FF28A:
pop {r0}
bx r0
.pool
thumb_func_end sub_80FF268
thumb_func_end AnimMoveTwisterParticle
thumb_func_start sub_80FF2BC
sub_80FF2BC: @ 80FF2BC
@@ -2348,7 +2348,7 @@ sub_80FFB18: @ 80FFB18
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0
@@ -3100,7 +3100,7 @@ _08100060:
adds r0, r1
lsls r0, 2
adds r0, r4
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8100128
str r0, [r5]
pop {r4-r6}
@@ -3263,7 +3263,7 @@ _08100204:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3335,7 +3335,7 @@ _08100272:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3394,7 +3394,7 @@ _081002E8:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3448,7 +3448,7 @@ _08100380:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3505,7 +3505,7 @@ _081003D2:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -3557,7 +3557,7 @@ _08100464:
adds r0, r4, 0
bl StartSpriteAnim
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _081004FA
@@ -5766,7 +5766,7 @@ _08101604:
asrs r0, 24
adds r4, r0
strh r4, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_8101684
adds r0, r5, 0
@@ -5900,7 +5900,7 @@ _08101718:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_8101820
adds r0, r5, 0
@@ -7478,7 +7478,7 @@ _08102390:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0

38
asm/battle_anim_effects_2.s
View File

@@ -240,7 +240,7 @@ sub_8103620: @ 8103620
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -269,7 +269,7 @@ sub_8103658: @ 8103658
ldrh r1, [r0, 0x22]
adds r1, 0xF
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =sub_8103680
bl StoreSpriteCallbackInData6
@@ -526,7 +526,7 @@ sub_810387C: @ 810387C
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =sub_80A67BC
str r0, [r4, 0x1C]
ldr r1, =sub_81038A0
@@ -548,7 +548,7 @@ sub_81038A0: @ 81038A0
ldrh r1, [r0, 0x22]
subs r1, 0x20
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6
@@ -594,7 +594,7 @@ _081038EC:
_0810390E:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -657,7 +657,7 @@ _08103980:
mov r0, r8
strh r0, [r5, 0x32]
strh r7, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -1424,7 +1424,7 @@ sub_8103FE8: @ 8103FE8
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gUnknown_085934A0
ldrh r0, [r0, 0x2]
bl IndexOfSpritePaletteTag
@@ -1507,7 +1507,7 @@ sub_8104088: @ 8104088
sub sp, 0x4
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -1655,7 +1655,7 @@ sub_81041C4: @ 81041C4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x14
strh r0, [r4, 0x2E]
ldr r5, =gBattleAnimTarget
@@ -1671,7 +1671,7 @@ sub_81041C4: @ 81041C4
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
adds r2, r4, 0
adds r2, 0x2C
@@ -1809,7 +1809,7 @@ sub_8104304: @ 8104304
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -1896,7 +1896,7 @@ _08104390:
lsrs r0, 24
adds r0, r6
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_81043F8
adds r0, r5, 0
@@ -4038,7 +4038,7 @@ sub_8105538: @ 8105538
push {r4,lr}
adds r4, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -5141,7 +5141,7 @@ sub_8105DE8: @ 8105DE8
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimAttacker
ldrb r0, [r6]
bl GetBattlerSide
@@ -5172,7 +5172,7 @@ _08105E08:
ldrh r1, [r4, 0x6]
adds r0, r1
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -5200,7 +5200,7 @@ sub_8105E60: @ 8105E60
bne _08105E7A
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
_08105E7A:
movs r1, 0x30
ldrsh r0, [r4, r1]
@@ -5525,7 +5525,7 @@ sub_8106140: @ 8106140
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x5F
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
@@ -6543,7 +6543,7 @@ sub_81069B8: @ 81069B8
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =sub_810699C
str r0, [r4, 0x1C]
pop {r4}
@@ -7496,7 +7496,7 @@ _08107118:
ldrh r0, [r5, 0x22]
subs r0, 0x48
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0

14
asm/bug.s
View File

@@ -85,7 +85,7 @@ _081103C4:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
@@ -160,7 +160,7 @@ _08110478:
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
@@ -189,7 +189,7 @@ sub_81104E4: @ 81104E4
_08110500:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x2E]
@@ -528,7 +528,7 @@ _081107A0:
_081107B2:
adds r0, r7, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2
@@ -579,7 +579,7 @@ _081107B2:
strh r0, [r7, 0x2E]
strh r4, [r7, 0x32]
strh r5, [r7, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r7, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r7, 0
@@ -596,7 +596,7 @@ sub_8110850: @ 8110850
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -631,7 +631,7 @@ _08110870:
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_81108CC
str r0, [r6, 0x1C]
adds r2, r6, 0

4
asm/dark.s
View File

@@ -264,7 +264,7 @@ sub_81138D4: @ 81138D4
movs r0, 0x7E
strh r0, [r4, 0x2E]
adds r0, r4, 0
bl sub_80A6E14
bl InitSpriteDataForLinearTranslation
ldrh r0, [r4, 0x30]
negs r0, r0
strh r0, [r4, 0x34]
@@ -563,7 +563,7 @@ _08113B60:
ldr r0, =0x0000fff4
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8113B90
str r0, [r4, 0x1C]
pop {r4-r7}

2
asm/dragon.s
View File

@@ -144,7 +144,7 @@ _0811318E:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r5, 0

2
asm/electric.s
View File

@@ -345,7 +345,7 @@ sub_810A46C: @ 810A46C
push {r4-r6,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimArgs
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]

10
asm/fight.s
View File

@@ -104,7 +104,7 @@ sub_810CEE0: @ 810CEE0
bne _0810CF04
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _0810CF0C
.pool
_0810CF04:
@@ -378,7 +378,7 @@ _0810D142:
ldrh r0, [r4, 0x22]
subs r0, 0x14
strh r0, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =sub_810D164
adds r0, r4, 0
@@ -417,7 +417,7 @@ sub_810D164: @ 810D164
strh r1, [r5, 0x22]
strh r6, [r5, 0x26]
strh r6, [r5, 0x24]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -618,7 +618,7 @@ sub_810D308: @ 810D308
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =sub_810D360
adds r0, r5, 0
@@ -1460,7 +1460,7 @@ sub_810DA10: @ 810DA10
bne _0810DA2C
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810DA34
.pool
_0810DA2C:

8
asm/fire.s
View File

@@ -347,7 +347,7 @@ sub_810916C: @ 810916C
strh r1, [r0, 0x32]
movs r1, 0x50
strh r1, [r0, 0x36]
ldr r1, =sub_80A6EEC
ldr r1, =StartAnimLinearTranslation
str r1, [r0, 0x1C]
ldr r1, =DestroyAnimSprite
bl StoreSpriteCallbackInData6
@@ -421,7 +421,7 @@ sub_810921C: @ 810921C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
movs r1, 0
@@ -613,7 +613,7 @@ sub_81093A4: @ 81093A4
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x30]
@@ -1564,7 +1564,7 @@ _08109B12:
_08109B18:
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimArgs
ldrb r1, [r4, 0x4]
adds r0, r5, 0

12
asm/flying.s
View File

@@ -199,7 +199,7 @@ sub_810DFA8: @ 810DFA8
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -359,7 +359,7 @@ _0810E0FE:
ldrh r3, [r5, 0x36]
adds r0, r3
strh r0, [r5, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r5, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r5, 0
@@ -378,7 +378,7 @@ sub_810E13C: @ 810E13C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]
@@ -1613,7 +1613,7 @@ sub_810EAA0: @ 810EAA0
bne _0810EABC
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810EAC4
.pool
_0810EABC:
@@ -1807,7 +1807,7 @@ sub_810EC34: @ 810EC34
_0810EC46:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0
bl GetAnimBattlerSpriteId
ldr r2, =gSprites
@@ -1927,7 +1927,7 @@ sub_810ED28: @ 810ED28
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x2E]

4
asm/ghost.s
View File

@@ -10,7 +10,7 @@ sub_811160C: @ 811160C
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -2441,7 +2441,7 @@ sub_81129F0: @ 81129F0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide

12
asm/ground.s
View File

@@ -40,7 +40,7 @@ sub_8114994: @ 8114994
ldr r0, =0x0000ffd8
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_81149FC
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -86,7 +86,7 @@ sub_81149FC: @ 81149FC
movs r0, 0x28
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8114A60
str r0, [r5, 0x1C]
_08114A50:
@@ -149,7 +149,7 @@ _08114A9C:
ldrh r4, [r4, 0x6]
adds r0, r4
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
@@ -167,7 +167,7 @@ sub_8114AF0: @ 8114AF0
push {r7}
adds r6, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r4, =gBattleAnimTarget
ldrb r0, [r4]
movs r1, 0x2
@@ -211,7 +211,7 @@ _08114B48:
strh r0, [r6, 0x32]
adds r0, r7, r4
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =move_anim_8074EE0
adds r0, r6, 0
@@ -1034,7 +1034,7 @@ _081151DA:
ldrh r0, [r7, 0x8]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8115228
str r0, [r5, 0x1C]
pop {r4-r7}

14
asm/ice.s
View File

@@ -370,7 +370,7 @@ sub_810B8EC: @ 810B8EC
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
movs r1, 0x2
@@ -413,7 +413,7 @@ _0810B936:
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
bl StoreSpriteCallbackInData6
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
@@ -513,7 +513,7 @@ sub_810BA24: @ 810BA24
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -814,7 +814,7 @@ sub_810BC94: @ 810BC94
sub sp, 0x10
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r1, =gBattleAnimArgs
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x2E]
@@ -1103,7 +1103,7 @@ sub_810BED0: @ 810BED0
bne _0810BEF4
adds r0, r5, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810BF32
.pool
_0810BEF4:
@@ -2762,7 +2762,7 @@ _0810CCA6:
bl StartSpriteAffineAnim
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r6, =gBattleAnimArgs
ldrh r0, [r6, 0x8]
strh r0, [r5, 0x2E]
@@ -2796,7 +2796,7 @@ _0810CCCE:
ldrh r0, [r6, 0xA]
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_810CD1C
str r0, [r5, 0x1C]
pop {r4-r6}

10
asm/normal.s
View File

@@ -1584,7 +1584,7 @@ sub_8116388: @ 8116388
bne _081163AC
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081163B4
.pool
_081163AC:
@@ -1616,7 +1616,7 @@ sub_81163D0: @ 81163D0
bne _081163F4
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081163FC
.pool
_081163F4:
@@ -1690,7 +1690,7 @@ _08116474:
bne _08116494
adds r0, r4, 0
movs r1, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0811649C
.pool
_08116494:
@@ -1789,7 +1789,7 @@ sub_8116560: @ 8116560
bne _0811657C
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _08116584
.pool
_0811657C:
@@ -1824,7 +1824,7 @@ sub_81165A8: @ 81165A8
bne _081165CC
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
b _081165D4
.pool
_081165CC:

12
asm/poison.s
View File

@@ -20,7 +20,7 @@ sub_810DBAC: @ 810DBAC
_0810DBC2:
adds r0, r5, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x2E]
ldr r4, =gBattleAnimTarget
@@ -39,7 +39,7 @@ _0810DBC2:
ldr r0, =0x0000ffe2
strh r0, [r5, 0x38]
adds r0, r5, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_810DC10
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -80,7 +80,7 @@ sub_810DC2C: @ 810DC2C
_0810DC44:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimTarget
ldrb r0, [r0]
mov r6, sp
@@ -113,7 +113,7 @@ _0810DC72:
ldr r0, =0x0000ffe2
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_810DCB4
str r0, [r4, 0x1C]
add sp, 0x4
@@ -157,7 +157,7 @@ sub_810DCD0: @ 810DCD0
adds r0, r1
strh r0, [r4, 0x36]
adds r0, r4, 0
bl sub_80A6E14
bl InitSpriteDataForLinearTranslation
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r2, 0x4
@@ -242,7 +242,7 @@ _0810DD7C:
strh r2, [r4, 0x32]
adds r1, r3
strh r1, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0

4
asm/psychic.s
View File

@@ -514,7 +514,7 @@ _0810F5EE:
bne _0810F608
adds r0, r4, 0
adds r1, r6, 0
bl sub_80A69CC
bl InitAnimSpritePos
b _0810F610
.pool
_0810F608:
@@ -1449,7 +1449,7 @@ _0810FD60:
ldrh r0, [r5, 0x1C]
strh r0, [r4, 0x38]
adds r0, r4, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldrb r0, [r5, 0xC]
movs r1, 0x3
ands r1, r0

1469
asm/rock.s
View File

File diff suppressed because it is too large Load Diff

18
asm/water.s
View File

@@ -343,7 +343,7 @@ sub_810744C: @ 810744C
push {r4-r7,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -538,7 +538,7 @@ sub_81075EC: @ 81075EC
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
movs r0, 0x1E
strh r0, [r5, 0x2E]
ldrh r0, [r5, 0x20]
@@ -819,7 +819,7 @@ _0810781E:
movs r7, 0x3
_08107828:
adds r0, r6, 0
bl sub_80A69CC
bl InitAnimSpritePos
ldr r0, =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -849,7 +849,7 @@ _08107842:
ldrh r5, [r5, 0x6]
adds r0, r5
strh r0, [r6, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r6, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r6, 0
@@ -876,7 +876,7 @@ sub_8107894: @ 8107894
ldrh r0, [r4, 0x22]
adds r1, r0
strh r1, [r4, 0x36]
ldr r0, =sub_80A6EEC
ldr r0, =StartAnimLinearTranslation
str r0, [r4, 0x1C]
ldr r1, =DestroyAnimSprite
adds r0, r4, 0
@@ -904,7 +904,7 @@ sub_81078D0: @ 81078D0
_081078EC:
adds r0, r4, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
_081078F4:
ldr r0, =gBattleAnimArgs
ldrh r0, [r0, 0x4]
@@ -3137,7 +3137,7 @@ sub_8108AC0: @ 8108AC0
strh r1, [r0, 0x36]
ldrh r1, [r6, 0x1A]
strh r1, [r0, 0x38]
bl sub_80A68D4
bl InitAnimArcTranslation
adds r5, 0x1C
adds r4, r5
ldr r0, =sub_8108B2C
@@ -3191,7 +3191,7 @@ sub_8108B2C: @ 8108B2C
mvns r1, r1
strh r1, [r6, 0x38]
adds r0, r6, 0
bl sub_80A68D4
bl InitAnimArcTranslation
ldr r0, =sub_8108B94
str r0, [r6, 0x1C]
_08108B86:
@@ -3339,7 +3339,7 @@ sub_8108C94: @ 8108C94
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x1
bl sub_80A69CC
bl InitAnimSpritePos
ldr r5, =gBattleAnimTarget
ldrb r0, [r5]
movs r1, 0x2