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

Sync battle anim labels with pokeruby

Browse Source
This commit is contained in:
DizzyEggg
2018-09-12 22:58:03 +02:00
parent 10b479a3ca
commit 8a81bd1bce
17 changed files with 6441 additions and 6245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asm/battle_anim_80A5C6C.s
View File

@@ -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 AnimTask_GetHappinessPowerLevel
AnimTask_GetHappinessPowerLevel: @ 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 AnimTask_GetHappinessPowerLevel
thumb_func_end AnimTask_GetFrustrationPowerLevel
thumb_func_start sub_80A8174
sub_80A8174: @ 80A8174

2
asm/battle_anim_80A9C70.s
View File

@@ -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

48
asm/battle_anim_80D51AC.s
View File

@@ -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

28
asm/battle_anim_80FE840.s
View File

@@ -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
@@ -17083,8 +17083,8 @@ AnimTask_GetFuryCutterHitCount: @ 8107168
.pool
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
@@ -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
@@ -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
@@ -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
@@ -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

6
asm/battle_anim_815A0D4.s
View File

@@ -10861,8 +10861,8 @@ _0815F896:
.pool
thumb_func_end sub_815F7C4
thumb_func_start AnimTask_GetHappinessPowerLevel2
AnimTask_GetHappinessPowerLevel2: @ 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 AnimTask_GetHappinessPowerLevel2
thumb_func_end AnimTask_GetReturnPowerLevel
thumb_func_start sub_815F8F4
sub_815F8F4: @ 815F8F4

6
asm/battle_anim_8170478.s
View File

@@ -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

6
asm/macros/battle_anim_script.inc
View File

@@ -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