Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
This commit is contained in:
@@ -4077,8 +4077,8 @@ _080A7B90:
|
||||
bx r0
|
||||
thumb_func_end sub_80A7AFC
|
||||
|
||||
thumb_func_start sub_80A7B98
|
||||
sub_80A7B98: @ 80A7B98
|
||||
thumb_func_start AnimTask_BlendMonInAndOut
|
||||
AnimTask_BlendMonInAndOut: @ 80A7B98
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -4117,7 +4117,7 @@ _080A7BE2:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80A7B98
|
||||
thumb_func_end AnimTask_BlendMonInAndOut
|
||||
|
||||
thumb_func_start sub_80A7BF4
|
||||
sub_80A7BF4: @ 80A7BF4
|
||||
@@ -4802,8 +4802,8 @@ _080A8136:
|
||||
.pool
|
||||
thumb_func_end sub_80A80C8
|
||||
|
||||
thumb_func_start sub_80A8140
|
||||
sub_80A8140: @ 80A8140
|
||||
thumb_func_start AnimTask_GetFrustrationPowerLevel
|
||||
AnimTask_GetFrustrationPowerLevel: @ 80A8140
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -4827,7 +4827,7 @@ _080A815E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80A8140
|
||||
thumb_func_end AnimTask_GetFrustrationPowerLevel
|
||||
|
||||
thumb_func_start sub_80A8174
|
||||
sub_80A8174: @ 80A8174
|
||||
|
||||
@@ -867,7 +867,7 @@ LaunchStatusAnimation: @ 80AA364
|
||||
strb r4, [r0]
|
||||
ldr r0, =gBattleAnimTarget
|
||||
strb r4, [r0]
|
||||
ldr r0, =gBattleAnims_Statuses
|
||||
ldr r0, =gBattleAnims_StatusConditions
|
||||
movs r2, 0
|
||||
bl LaunchBattleAnimation
|
||||
ldr r0, =task0A_80788BC
|
||||
|
||||
+24
-24
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_80D51AC
|
||||
sub_80D51AC: @ 80D51AC
|
||||
thumb_func_start AnimTask_ShakeMon
|
||||
AnimTask_ShakeMon: @ 80D51AC
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -56,7 +56,7 @@ _080D520C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D51AC
|
||||
thumb_func_end AnimTask_ShakeMon
|
||||
|
||||
thumb_func_start sub_80D5220
|
||||
sub_80D5220: @ 80D5220
|
||||
@@ -151,8 +151,8 @@ _080D52CA:
|
||||
bx r0
|
||||
thumb_func_end sub_80D5220
|
||||
|
||||
thumb_func_start sub_80D52D0
|
||||
sub_80D52D0: @ 80D52D0
|
||||
thumb_func_start AnimTask_ShakeMon2
|
||||
AnimTask_ShakeMon2: @ 80D52D0
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -265,7 +265,7 @@ _080D53A6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D52D0
|
||||
thumb_func_end AnimTask_ShakeMon2
|
||||
|
||||
thumb_func_start sub_80D53BC
|
||||
sub_80D53BC: @ 80D53BC
|
||||
@@ -372,8 +372,8 @@ _080D5478:
|
||||
bx r0
|
||||
thumb_func_end sub_80D53BC
|
||||
|
||||
thumb_func_start sub_80D5484
|
||||
sub_80D5484: @ 80D5484
|
||||
thumb_func_start AnimTask_ShakeMonInPlace
|
||||
AnimTask_ShakeMonInPlace: @ 80D5484
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -432,7 +432,7 @@ _080D54F6:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D5484
|
||||
thumb_func_end AnimTask_ShakeMonInPlace
|
||||
|
||||
thumb_func_start sub_80D5508
|
||||
sub_80D5508: @ 80D5508
|
||||
@@ -595,8 +595,8 @@ _080D563C:
|
||||
bx r0
|
||||
thumb_func_end sub_80D5508
|
||||
|
||||
thumb_func_start sub_80D5644
|
||||
sub_80D5644: @ 80D5644
|
||||
thumb_func_start AnimTask_ShakeAndSinkMon
|
||||
AnimTask_ShakeAndSinkMon: @ 80D5644
|
||||
push {r4,r5,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -635,7 +635,7 @@ sub_80D5644: @ 80D5644
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D5644
|
||||
thumb_func_end AnimTask_ShakeAndSinkMon
|
||||
|
||||
thumb_func_start sub_80D56A4
|
||||
sub_80D56A4: @ 80D56A4
|
||||
@@ -837,8 +837,8 @@ _080D5822:
|
||||
.pool
|
||||
thumb_func_end sub_80D57B8
|
||||
|
||||
thumb_func_start sub_80D5830
|
||||
sub_80D5830: @ 80D5830
|
||||
thumb_func_start AnimTask_TranslateMonEllipticalRespectSide
|
||||
AnimTask_TranslateMonEllipticalRespectSide: @ 80D5830
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -859,7 +859,7 @@ _080D584C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D5830
|
||||
thumb_func_end AnimTask_TranslateMonEllipticalRespectSide
|
||||
|
||||
thumb_func_start sub_80D5860
|
||||
sub_80D5860: @ 80D5860
|
||||
@@ -1325,8 +1325,8 @@ sub_80D5C20: @ 80D5C20
|
||||
.pool
|
||||
thumb_func_end sub_80D5C20
|
||||
|
||||
thumb_func_start sub_80D5C50
|
||||
sub_80D5C50: @ 80D5C50
|
||||
thumb_func_start AnimTask_WindUpLunge
|
||||
AnimTask_WindUpLunge: @ 80D5C50
|
||||
push {r4-r7,lr}
|
||||
lsls r0, 24
|
||||
lsrs r6, r0, 24
|
||||
@@ -1390,7 +1390,7 @@ _080D5C82:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D5C50
|
||||
thumb_func_end AnimTask_WindUpLunge
|
||||
|
||||
thumb_func_start sub_80D5CE4
|
||||
sub_80D5CE4: @ 80D5CE4
|
||||
@@ -1617,8 +1617,8 @@ _080D5EAA:
|
||||
.pool
|
||||
thumb_func_end sub_80D5E6C
|
||||
|
||||
thumb_func_start sub_80D5EB8
|
||||
sub_80D5EB8: @ 80D5EB8
|
||||
thumb_func_start AnimTask_SwayMon
|
||||
AnimTask_SwayMon: @ 80D5EB8
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -1676,7 +1676,7 @@ _080D5F18:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D5EB8
|
||||
thumb_func_end AnimTask_SwayMon
|
||||
|
||||
thumb_func_start sub_80D5F3C
|
||||
sub_80D5F3C: @ 80D5F3C
|
||||
@@ -1828,8 +1828,8 @@ _080D6050:
|
||||
.pool
|
||||
thumb_func_end sub_80D5F3C
|
||||
|
||||
thumb_func_start sub_80D6064
|
||||
sub_80D6064: @ 80D6064
|
||||
thumb_func_start AnimTask_ScaleMonAndRestore
|
||||
AnimTask_ScaleMonAndRestore: @ 80D6064
|
||||
push {r4-r6,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -1867,7 +1867,7 @@ sub_80D6064: @ 80D6064
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_80D6064
|
||||
thumb_func_end AnimTask_ScaleMonAndRestore
|
||||
|
||||
thumb_func_start sub_80D60BC
|
||||
sub_80D60BC: @ 80D60BC
|
||||
|
||||
+50
-50
@@ -7975,7 +7975,7 @@ _08102794:
|
||||
mov r12, r5
|
||||
ldr r7, =gUnknown_08592EBC
|
||||
mov r8, r7
|
||||
ldr r6, =gUnknown_08592EEC
|
||||
ldr r6, =gBattleAnimSpriteTemplate_8592EEC
|
||||
movs r5, 0x1
|
||||
_081027B2:
|
||||
lsls r0, r2, 4
|
||||
@@ -17049,8 +17049,8 @@ _08107118:
|
||||
.pool
|
||||
thumb_func_end sub_81070AC
|
||||
|
||||
thumb_func_start sub_8107144
|
||||
sub_8107144: @ 8107144
|
||||
thumb_func_start AnimTask_IsFuryCutterHitRight
|
||||
AnimTask_IsFuryCutterHitRight: @ 8107144
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -17065,10 +17065,10 @@ sub_8107144: @ 8107144
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8107144
|
||||
thumb_func_end AnimTask_IsFuryCutterHitRight
|
||||
|
||||
thumb_func_start sub_8107168
|
||||
sub_8107168: @ 8107168
|
||||
thumb_func_start AnimTask_GetFuryCutterHitCount
|
||||
AnimTask_GetFuryCutterHitCount: @ 8107168
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -17081,10 +17081,10 @@ sub_8107168: @ 8107168
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8107168
|
||||
thumb_func_end AnimTask_GetFuryCutterHitCount
|
||||
|
||||
thumb_func_start sub_8107188
|
||||
sub_8107188: @ 8107188
|
||||
thumb_func_start AnimTask_CreateRaindrops
|
||||
AnimTask_CreateRaindrops: @ 8107188
|
||||
push {r4-r6,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -17150,7 +17150,7 @@ _0810720A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8107188
|
||||
thumb_func_end AnimTask_CreateRaindrops
|
||||
|
||||
thumb_func_start sub_810721C
|
||||
sub_810721C: @ 810721C
|
||||
@@ -18033,8 +18033,8 @@ _0810794C:
|
||||
bx r0
|
||||
thumb_func_end sub_810790C
|
||||
|
||||
thumb_func_start sub_8107954
|
||||
sub_8107954: @ 8107954
|
||||
thumb_func_start AnimTask_CreateSurfWave
|
||||
AnimTask_CreateSurfWave: @ 8107954
|
||||
push {r4-r7,lr}
|
||||
mov r7, r10
|
||||
mov r6, r9
|
||||
@@ -18256,7 +18256,7 @@ _08107B58:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8107954
|
||||
thumb_func_end AnimTask_CreateSurfWave
|
||||
|
||||
thumb_func_start sub_8107B84
|
||||
sub_8107B84: @ 8107B84
|
||||
@@ -22914,8 +22914,8 @@ _0810A054:
|
||||
.pool
|
||||
thumb_func_end sub_8109E2C
|
||||
|
||||
thumb_func_start sub_810A060
|
||||
sub_810A060: @ 810A060
|
||||
thumb_func_start AnimTask_BlendBackground
|
||||
AnimTask_BlendBackground: @ 810A060
|
||||
push {r4,lr}
|
||||
sub sp, 0x10
|
||||
adds r4, r0, 0
|
||||
@@ -22938,7 +22938,7 @@ sub_810A060: @ 810A060
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810A060
|
||||
thumb_func_end AnimTask_BlendBackground
|
||||
|
||||
thumb_func_start sub_810A094
|
||||
sub_810A094: @ 810A094
|
||||
@@ -28522,8 +28522,8 @@ _0810CDF6:
|
||||
bx r0
|
||||
thumb_func_end sub_810CDB0
|
||||
|
||||
thumb_func_start sub_810CDFC
|
||||
sub_810CDFC: @ 810CDFC
|
||||
thumb_func_start AnimTask_GetRolloutCounter
|
||||
AnimTask_GetRolloutCounter: @ 810CDFC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -28544,7 +28544,7 @@ sub_810CDFC: @ 810CDFC
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_810CDFC
|
||||
thumb_func_end AnimTask_GetRolloutCounter
|
||||
|
||||
thumb_func_start unc_080B08A0
|
||||
unc_080B08A0: @ 810CE2C
|
||||
@@ -28796,7 +28796,7 @@ _0810D028:
|
||||
mov r1, r9
|
||||
ldrh r0, [r1, 0x2]
|
||||
strh r0, [r5, 0x2E]
|
||||
ldr r0, =gUnknown_08597358
|
||||
ldr r0, =gBasicHitSplatSpriteTemplate
|
||||
movs r2, 0x20
|
||||
ldrsh r1, [r5, r2]
|
||||
movs r3, 0x22
|
||||
@@ -36190,8 +36190,8 @@ _08110BC6:
|
||||
bx r0
|
||||
thumb_func_end sub_8110B80
|
||||
|
||||
thumb_func_start sub_8110BCC
|
||||
sub_8110BCC: @ 8110BCC
|
||||
thumb_func_start AnimTask_LoadSandstormBackground
|
||||
AnimTask_LoadSandstormBackground: @ 8110BCC
|
||||
push {r4-r6,lr}
|
||||
sub sp, 0x10
|
||||
lsls r0, 24
|
||||
@@ -36275,7 +36275,7 @@ _08110C6E:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8110BCC
|
||||
thumb_func_end AnimTask_LoadSandstormBackground
|
||||
|
||||
thumb_func_start sub_8110CB0
|
||||
sub_8110CB0: @ 8110CB0
|
||||
@@ -37293,8 +37293,8 @@ _081114E6:
|
||||
bx r0
|
||||
thumb_func_end sub_811149C
|
||||
|
||||
thumb_func_start sub_81114EC
|
||||
sub_81114EC: @ 81114EC
|
||||
thumb_func_start AnimTask_GetSeismicTossDamageLevel
|
||||
AnimTask_GetSeismicTossDamageLevel: @ 81114EC
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
@@ -37326,7 +37326,7 @@ _0811151A:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81114EC
|
||||
thumb_func_end AnimTask_GetSeismicTossDamageLevel
|
||||
|
||||
thumb_func_start sub_811152C
|
||||
sub_811152C: @ 811152C
|
||||
@@ -45184,8 +45184,8 @@ _081155F4:
|
||||
.pool
|
||||
thumb_func_end sub_8115588
|
||||
|
||||
thumb_func_start sub_8115600
|
||||
sub_8115600: @ 8115600
|
||||
thumb_func_start AnimTask_IsPowerOver99
|
||||
AnimTask_IsPowerOver99: @ 8115600
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r1, r0, 24
|
||||
@@ -45203,7 +45203,7 @@ _08115614:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8115600
|
||||
thumb_func_end AnimTask_IsPowerOver99
|
||||
|
||||
thumb_func_start sub_8115628
|
||||
sub_8115628: @ 8115628
|
||||
@@ -47427,8 +47427,8 @@ _08116832:
|
||||
.pool
|
||||
thumb_func_end sub_811675C
|
||||
|
||||
thumb_func_start sub_8116848
|
||||
sub_8116848: @ 8116848
|
||||
thumb_func_start AnimTask_BlendParticle
|
||||
AnimTask_BlendParticle: @ 8116848
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -47447,7 +47447,7 @@ sub_8116848: @ 8116848
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8116848
|
||||
thumb_func_end AnimTask_BlendParticle
|
||||
|
||||
thumb_func_start sub_8116874
|
||||
sub_8116874: @ 8116874
|
||||
@@ -49190,8 +49190,8 @@ _0811773E:
|
||||
.pool
|
||||
thumb_func_end sub_81176D8
|
||||
|
||||
thumb_func_start sub_8117754
|
||||
sub_8117754: @ 8117754
|
||||
thumb_func_start AnimTask_IsAttackerOpponentSide
|
||||
AnimTask_IsAttackerOpponentSide: @ 8117754
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -49209,10 +49209,10 @@ sub_8117754: @ 8117754
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8117754
|
||||
thumb_func_end AnimTask_IsAttackerOpponentSide
|
||||
|
||||
thumb_func_start sub_8117780
|
||||
sub_8117780: @ 8117780
|
||||
thumb_func_start AnimTask_IsTargetOpponentSide
|
||||
AnimTask_IsTargetOpponentSide: @ 8117780
|
||||
push {r4,lr}
|
||||
adds r4, r0, 0
|
||||
lsls r4, 24
|
||||
@@ -49230,10 +49230,10 @@ sub_8117780: @ 8117780
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8117780
|
||||
thumb_func_end AnimTask_IsTargetOpponentSide
|
||||
|
||||
thumb_func_start sub_81177AC
|
||||
sub_81177AC: @ 81177AC
|
||||
thumb_func_start AnimTask_IsTargetPartner
|
||||
AnimTask_IsTargetPartner: @ 81177AC
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
@@ -49256,7 +49256,7 @@ _081177C8:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81177AC
|
||||
thumb_func_end AnimTask_IsTargetPartner
|
||||
|
||||
thumb_func_start sub_81177E4
|
||||
sub_81177E4: @ 81177E4
|
||||
@@ -49753,8 +49753,8 @@ _08117C0C:
|
||||
.pool
|
||||
thumb_func_end sub_8117A60
|
||||
|
||||
thumb_func_start sub_8117C24
|
||||
sub_8117C24: @ 8117C24
|
||||
thumb_func_start AnimTask_GetBattleTerrain
|
||||
AnimTask_GetBattleTerrain: @ 8117C24
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@@ -49766,7 +49766,7 @@ sub_8117C24: @ 8117C24
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8117C24
|
||||
thumb_func_end AnimTask_GetBattleTerrain
|
||||
|
||||
thumb_func_start sub_8117C44
|
||||
sub_8117C44: @ 8117C44
|
||||
@@ -50032,8 +50032,8 @@ _08117E34:
|
||||
.pool
|
||||
thumb_func_end sub_8117DD8
|
||||
|
||||
thumb_func_start sub_8117E60
|
||||
sub_8117E60: @ 8117E60
|
||||
thumb_func_start AnimTask_IsContest
|
||||
AnimTask_IsContest: @ 8117E60
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -50057,7 +50057,7 @@ _08117E84:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8117E60
|
||||
thumb_func_end AnimTask_IsContest
|
||||
|
||||
thumb_func_start sub_8117E94
|
||||
sub_8117E94: @ 8117E94
|
||||
@@ -50078,8 +50078,8 @@ sub_8117E94: @ 8117E94
|
||||
.pool
|
||||
thumb_func_end sub_8117E94
|
||||
|
||||
thumb_func_start sub_8117EC4
|
||||
sub_8117EC4: @ 8117EC4
|
||||
thumb_func_start AnimTask_IsTargetSameSide
|
||||
AnimTask_IsTargetSameSide: @ 8117EC4
|
||||
push {r4,r5,lr}
|
||||
lsls r0, 24
|
||||
lsrs r5, r0, 24
|
||||
@@ -50109,7 +50109,7 @@ _08117EFC:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8117EC4
|
||||
thumb_func_end AnimTask_IsTargetSameSide
|
||||
|
||||
thumb_func_start sub_8117F10
|
||||
sub_8117F10: @ 8117F10
|
||||
|
||||
+15
-15
@@ -1012,8 +1012,8 @@ _0815A8C2:
|
||||
bx r0
|
||||
thumb_func_end sub_815A8AC
|
||||
|
||||
thumb_func_start sub_815A8C8
|
||||
sub_815A8C8: @ 815A8C8
|
||||
thumb_func_start AnimTask_IsTargetPlayerSide
|
||||
AnimTask_IsTargetPlayerSide: @ 815A8C8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -1039,10 +1039,10 @@ _0815A8F0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_815A8C8
|
||||
thumb_func_end AnimTask_IsTargetPlayerSide
|
||||
|
||||
thumb_func_start sub_815A904
|
||||
sub_815A904: @ 815A904
|
||||
thumb_func_start AnimTask_IsHealingMove
|
||||
AnimTask_IsHealingMove: @ 815A904
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -1064,7 +1064,7 @@ _0815A924:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_815A904
|
||||
thumb_func_end AnimTask_IsHealingMove
|
||||
|
||||
thumb_func_start sub_815A934
|
||||
sub_815A934: @ 815A934
|
||||
@@ -10048,8 +10048,8 @@ _0815F1DE:
|
||||
.pool
|
||||
thumb_func_end sub_815F18C
|
||||
|
||||
thumb_func_start sub_815F20C
|
||||
sub_815F20C: @ 815F20C
|
||||
thumb_func_start AnimTask_MonToSubstitute
|
||||
AnimTask_MonToSubstitute: @ 815F20C
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@@ -10183,7 +10183,7 @@ _0815F310:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_815F20C
|
||||
thumb_func_end AnimTask_MonToSubstitute
|
||||
|
||||
thumb_func_start sub_815F330
|
||||
sub_815F330: @ 815F330
|
||||
@@ -10861,8 +10861,8 @@ _0815F896:
|
||||
.pool
|
||||
thumb_func_end sub_815F7C4
|
||||
|
||||
thumb_func_start sub_815F8A0
|
||||
sub_815F8A0: @ 815F8A0
|
||||
thumb_func_start AnimTask_GetReturnPowerLevel
|
||||
AnimTask_GetReturnPowerLevel: @ 815F8A0
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r4, r0, 24
|
||||
@@ -10904,7 +10904,7 @@ _0815F8E0:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_815F8A0
|
||||
thumb_func_end AnimTask_GetReturnPowerLevel
|
||||
|
||||
thumb_func_start sub_815F8F4
|
||||
sub_815F8F4: @ 815F8F4
|
||||
@@ -12336,8 +12336,8 @@ _081604E8:
|
||||
bx r0
|
||||
thumb_func_end sub_81603F4
|
||||
|
||||
thumb_func_start sub_81604F0
|
||||
sub_81604F0: @ 81604F0
|
||||
thumb_func_start AnimTask_GetWeather
|
||||
AnimTask_GetWeather: @ 81604F0
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r3, r0, 24
|
||||
@@ -12380,7 +12380,7 @@ _08160538:
|
||||
bl DestroyAnimVisualTask
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_81604F0
|
||||
thumb_func_end AnimTask_GetWeather
|
||||
|
||||
thumb_func_start sub_8160544
|
||||
sub_8160544: @ 8160544
|
||||
|
||||
@@ -1030,8 +1030,8 @@ sub_8170D24: @ 8170D24
|
||||
.pool
|
||||
thumb_func_end sub_8170D24
|
||||
|
||||
thumb_func_start sub_8170D4C
|
||||
sub_8170D4C: @ 8170D4C
|
||||
thumb_func_start AnimTask_IsBallBlockedByTrainer
|
||||
AnimTask_IsBallBlockedByTrainer: @ 8170D4C
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -1055,7 +1055,7 @@ _08170D74:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_8170D4C
|
||||
thumb_func_end AnimTask_IsBallBlockedByTrainer
|
||||
|
||||
thumb_func_start ItemIdToBallId
|
||||
ItemIdToBallId: @ 8170D84
|
||||
@@ -5757,8 +5757,8 @@ _081734A0:
|
||||
.pool
|
||||
thumb_func_end sub_817345C
|
||||
|
||||
thumb_func_start sub_81734B4
|
||||
sub_81734B4: @ 81734B4
|
||||
thumb_func_start AnimTask_GetTrappedMoveAnimId
|
||||
AnimTask_GetTrappedMoveAnimId: @ 81734B4
|
||||
push {lr}
|
||||
lsls r0, 24
|
||||
lsrs r2, r0, 24
|
||||
@@ -5805,7 +5805,7 @@ _0817350C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end sub_81734B4
|
||||
thumb_func_end AnimTask_GetTrappedMoveAnimId
|
||||
|
||||
thumb_func_start sub_817351C
|
||||
sub_817351C: @ 817351C
|
||||
|
||||
@@ -66,9 +66,9 @@
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro setalpha param0
|
||||
.byte 0xc
|
||||
.2byte \param0
|
||||
.macro setalpha eva, evb
|
||||
.byte 0x0C
|
||||
.2byte ((\evb) << 8) | (\eva)
|
||||
.endm
|
||||
|
||||
.macro blendoff
|
||||
@@ -266,3 +266,16 @@
|
||||
.macro stopsound
|
||||
.byte 0x2f
|
||||
.endm
|
||||
|
||||
@ useful macros
|
||||
.macro jumpreteq value, ptr
|
||||
jumpargeq ARG_RET_ID, \value, \ptr
|
||||
.endm
|
||||
|
||||
.macro jumprettrue ptr
|
||||
jumpreteq TRUE, \ptr
|
||||
.endm
|
||||
|
||||
.macro jumpretfalse ptr
|
||||
jumpreteq FALSE, \ptr
|
||||
.endm
|
||||
|
||||
Reference in New Issue
Block a user