mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
Sync battle anim labels with pokeruby
This commit is contained in:
DizzyEggg
parent
10b479a3ca
commit
8a81bd1bce
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -14,15 +14,15 @@ gUnknown_08592114:: @ 8592114
|
||||
.4byte gUnknown_085920F0
|
||||
|
||||
.align 2
|
||||
gUnknown_08592118:: @ 8592118
|
||||
gSleepPowderParticleSpriteTemplate:: @ 8592118
|
||||
spr_template 0x2753, 0x2753, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
|
||||
|
||||
.align 2
|
||||
gUnknown_08592130:: @ 8592130
|
||||
gStunSporeParticleSpriteTemplate:: @ 8592130
|
||||
spr_template 0x2754, 0x2754, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
|
||||
|
||||
.align 2
|
||||
gUnknown_08592148:: @ 8592148
|
||||
gPoisonPowderParticleSpriteTemplate:: @ 8592148
|
||||
spr_template 0x2751, 0x2751, gUnknown_08524944, gUnknown_08592114, NULL, gDummySpriteAffineAnimTable, sub_80FE840
|
||||
|
||||
.align 2
|
||||
@ -142,7 +142,7 @@ gUnknown_085922B4:: @ 85922B4
|
||||
.4byte gUnknown_085922A8
|
||||
|
||||
.align 2
|
||||
gUnknown_085922BC:: @ 85922BC
|
||||
gLeechSeedSpriteTemplate:: @ 85922BC
|
||||
spr_template 0x2716, 0x2716, gUnknown_0852490C, gUnknown_085922B4, NULL, gDummySpriteAffineAnimTable, sub_80FEC48
|
||||
|
||||
.align 2
|
||||
@ -230,7 +230,7 @@ gUnknown_08592400:: @ 8592400
|
||||
.4byte gUnknown_085923F0
|
||||
|
||||
.align 2
|
||||
gUnknown_08592404:: @ 8592404
|
||||
gSwiftStarSpriteTemplate:: @ 8592404
|
||||
spr_template 0x27be, 0x27be, gUnknown_08524974, gDummySpriteAnimTable, NULL, gUnknown_08592400, sub_80FF0F4
|
||||
|
||||
.align 2
|
||||
@ -353,7 +353,7 @@ gUnknown_08592610:: @ 8592610
|
||||
spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFB18
|
||||
|
||||
.align 2
|
||||
gUnknown_08592628:: @ 8592628
|
||||
gBattleAnimSpriteTemplate_8592628:: @ 8592628
|
||||
spr_template 0x27f0, 0x27f0, gUnknown_08524974, gUnknown_085925AC, NULL, gUnknown_08592608, sub_80FFBF4
|
||||
|
||||
.align 2
|
||||
@ -599,7 +599,7 @@ gUnknown_08592A18:: @ 8592A18
|
||||
.4byte gUnknown_08592A04
|
||||
|
||||
.align 2
|
||||
gUnknown_08592A1C:: @ 8592A1C
|
||||
gCuttingSliceSpriteTemplate:: @ 8592A1C
|
||||
spr_template 0x279a, 0x279a, gUnknown_08524A34, gUnknown_08592A18, NULL, gDummySpriteAffineAnimTable, sub_8100AE0
|
||||
|
||||
.align 2
|
||||
@ -888,7 +888,7 @@ gUnknown_08592EE8:: @ 8592EE8
|
||||
.4byte gUnknown_08592ED4
|
||||
|
||||
.align 2
|
||||
gUnknown_08592EEC:: @ 8592EEC
|
||||
gBattleAnimSpriteTemplate_8592EEC:: @ 8592EEC
|
||||
spr_template 0x27d3, 0x27d3, gUnknown_0852490C, gUnknown_08592EE8, NULL, gDummySpriteAffineAnimTable, sub_8102540
|
||||
|
||||
.align 2
|
||||
@ -1157,11 +1157,11 @@ gUnknown_0859337C:: @ 859337C
|
||||
.4byte gUnknown_0859335C
|
||||
|
||||
.align 2
|
||||
gUnknown_08593380:: @ 8593380
|
||||
gBattleAnimSpriteTemplate_8593380:: @ 8593380
|
||||
spr_template 0x2715, 0x2715, gUnknown_08524ADC, gDummySpriteAnimTable, NULL, gUnknown_0859337C, sub_810387C
|
||||
|
||||
.align 2
|
||||
gUnknown_08593398:: @ 8593398
|
||||
gSonicBoomSpriteTemplate:: @ 8593398
|
||||
spr_template 0x2713, 0x2713, gUnknown_08524B14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81038C8
|
||||
|
||||
.align 2
|
||||
@ -1189,11 +1189,11 @@ gUnknown_08593424:: @ 8593424
|
||||
.4byte gUnknown_085933E0
|
||||
|
||||
.align 2
|
||||
gUnknown_08593428:: @ 8593428
|
||||
gSupersonicWaveSpriteTemplate:: @ 8593428
|
||||
spr_template 0x27b3, 0x27b3, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
|
||||
|
||||
.align 2
|
||||
gUnknown_08593440:: @ 8593440
|
||||
gScreechWaveSpriteTemplate:: @ 8593440
|
||||
spr_template 0x27b4, 0x27b4, gUnknown_08524A14, gDummySpriteAnimTable, NULL, gUnknown_08593420, sub_80A7820
|
||||
|
||||
.align 2
|
||||
@ -1357,7 +1357,7 @@ gUnknown_08593718:: @ 8593718
|
||||
.4byte gUnknown_08593704
|
||||
|
||||
.align 2
|
||||
gUnknown_0859371C:: @ 859371C
|
||||
gBattleAnimSpriteTemplate_859371C:: @ 859371C
|
||||
spr_template 0x27d6, 0x27d6, gUnknown_08524914, gUnknown_08593718, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
|
||||
|
||||
.align 2
|
||||
@ -1436,7 +1436,7 @@ gUnknown_08593880:: @ 8593880
|
||||
spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593818, sub_81052A4
|
||||
|
||||
.align 2
|
||||
gUnknown_08593898:: @ 8593898
|
||||
gBattleAnimSpriteTemplate_8593898:: @ 8593898
|
||||
spr_template 0x27db, 0x27db, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08593810, sub_81054E8
|
||||
|
||||
.align 2
|
||||
@ -1497,7 +1497,7 @@ gUnknown_085939A0:: @ 85939A0
|
||||
spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106140
|
||||
|
||||
.align 2
|
||||
gUnknown_085939B8:: @ 85939B8
|
||||
gBattleAnimSpriteTemplate_85939B8:: @ 85939B8
|
||||
spr_template 0x27e8, 0x27e8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81061C4
|
||||
|
||||
.align 2
|
||||
@ -1514,11 +1514,11 @@ gUnknown_08593A00:: @ 8593A00
|
||||
.4byte gUnknown_085939E8
|
||||
|
||||
.align 2
|
||||
gUnknown_08593A04:: @ 8593A04
|
||||
gHiddenPowerOrbSpriteTemplate:: @ 8593A04
|
||||
spr_template 0x27e9, 0x27e9, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_810673C
|
||||
|
||||
.align 2
|
||||
gUnknown_08593A1C:: @ 8593A1C
|
||||
gHiddenPowerOrbScatterSpriteTemplate:: @ 8593A1C
|
||||
spr_template 0x27e9, 0x27e9, gUnknown_085249CC, gDummySpriteAnimTable, NULL, gUnknown_08593A00, sub_8106878
|
||||
|
||||
.align 2
|
||||
@ -1620,7 +1620,7 @@ gUnknown_08593B98:: @ 8593B98
|
||||
.2byte 0xfff8, 0x000c, 0x0400, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_08593BB8:: @ 8593BB8
|
||||
gBattleAnimSpriteTemplate_8593BB8:: @ 8593BB8
|
||||
spr_template 0x27f1, 0x27f1, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8106E00
|
||||
|
||||
.align 2
|
||||
@ -1703,7 +1703,7 @@ gUnknown_08595064:: @ 8595064
|
||||
.4byte gUnknown_08595054
|
||||
|
||||
.align 2
|
||||
gUnknown_08595068:: @ 8595068
|
||||
gBattleAnimSpriteTemplate_8595068:: @ 8595068
|
||||
spr_template 0x27a2, 0x27a2, gUnknown_08524A8C, gUnknown_08595064, NULL, gUnknown_08595050, sub_8107260
|
||||
|
||||
.align 2
|
||||
@ -1990,11 +1990,11 @@ gUnknown_085954D0:: @ 85954D0
|
||||
.4byte gUnknown_085954B8
|
||||
|
||||
.align 2
|
||||
gUnknown_085954D4:: @ 85954D4
|
||||
gEmberSpriteTemplate:: @ 85954D4
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A7820
|
||||
|
||||
.align 2
|
||||
gUnknown_085954EC:: @ 85954EC
|
||||
gEmberFlareSpriteTemplate:: @ 85954EC
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8109198
|
||||
|
||||
.align 2
|
||||
@ -2031,7 +2031,7 @@ gUnknown_0859556C:: @ 859556C
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08595540, NULL, gDummySpriteAffineAnimTable, sub_8109364
|
||||
|
||||
.align 2
|
||||
gUnknown_08595584:: @ 8595584
|
||||
gBattleAnimSpriteTemplate_8595584:: @ 8595584
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_81093A4
|
||||
|
||||
.align 2
|
||||
@ -2138,7 +2138,7 @@ gUnknown_08595734:: @ 8595734
|
||||
spr_template 0x275f, 0x275f, gUnknown_08524914, gUnknown_08595730, NULL, gDummySpriteAffineAnimTable, sub_810A274
|
||||
|
||||
.align 2
|
||||
gUnknown_0859574C:: @ 859574C
|
||||
gBattleAnimSpriteTemplate_859574C:: @ 859574C
|
||||
spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A308
|
||||
|
||||
.align 2
|
||||
@ -2175,15 +2175,15 @@ gUnknown_085957DC:: @ 85957DC
|
||||
.4byte gUnknown_085957BC
|
||||
|
||||
.align 2
|
||||
gUnknown_085957E0:: @ 85957E0
|
||||
gBattleAnimSpriteTemplate_85957E0:: @ 85957E0
|
||||
spr_template 0x282a, 0x282a, gUnknown_08524974, gUnknown_085957B8, NULL, gUnknown_085957DC, sub_810A5BC
|
||||
|
||||
.align 2
|
||||
gUnknown_085957F8:: @ 85957F8
|
||||
gBattleAnimSpriteTemplate_85957F8:: @ 85957F8
|
||||
spr_template 0x271b, 0x271b, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gUnknown_0859578C, sub_810A628
|
||||
|
||||
.align 2
|
||||
gUnknown_08595810:: @ 8595810
|
||||
gElectricitySpriteTemplate:: @ 8595810
|
||||
spr_template 0x271b, 0x271b, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_810A75C
|
||||
|
||||
.align 2
|
||||
@ -2613,7 +2613,7 @@ gUnknown_08595E80:: @ 8595E80
|
||||
spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEB4
|
||||
|
||||
.align 2
|
||||
gUnknown_08595E98:: @ 8595E98
|
||||
gFistFootSpriteTemplate:: @ 8595E98
|
||||
spr_template 0x279f, 0x279f, gUnknown_08524914, gUnknown_08595E54, NULL, gDummySpriteAffineAnimTable, sub_810CEE0
|
||||
|
||||
.align 2
|
||||
@ -2651,7 +2651,7 @@ gUnknown_08595F44:: @ 8595F44
|
||||
.4byte gUnknown_08595F2C
|
||||
|
||||
.align 2
|
||||
gUnknown_08595F48:: @ 8595F48
|
||||
gMegaPunchKickSpriteTemplate:: @ 8595F48
|
||||
spr_template 0x279f, 0x279f, gUnknown_085249D4, gUnknown_08595E54, NULL, gUnknown_08595F44, sub_810D278
|
||||
|
||||
.align 2
|
||||
@ -2841,11 +2841,11 @@ gUnknown_0859623C:: @ 859623C
|
||||
.4byte gUnknown_08596224
|
||||
|
||||
.align 2
|
||||
gUnknown_08596240:: @ 8596240
|
||||
gPoisonBubbleSpriteTemplate:: @ 8596240
|
||||
spr_template 0x27a6, 0x27a6, gUnknown_0852496C, gUnknown_08596164, NULL, gUnknown_0859623C, sub_810DDC4
|
||||
|
||||
.align 2
|
||||
gUnknown_08596258:: @ 8596258
|
||||
gWaterBubbleSpriteTemplate:: @ 8596258
|
||||
spr_template 0x27ab, 0x27ab, gUnknown_08524A8C, gUnknown_08595200, NULL, gUnknown_0859623C, sub_810DDC4
|
||||
|
||||
.align 2
|
||||
@ -2862,7 +2862,7 @@ gUnknown_085962A0:: @ 85962A0
|
||||
.4byte gUnknown_08596288
|
||||
|
||||
.align 2
|
||||
gUnknown_085962A4:: @ 85962A4
|
||||
gBattleAnimSpriteTemplate_85962A4:: @ 85962A4
|
||||
spr_template 0x2719, 0x2719, gUnknown_085249BC, gDummySpriteAnimTable, NULL, gUnknown_085962A0, sub_810DFA8
|
||||
|
||||
.align 2
|
||||
@ -3268,15 +3268,15 @@ gUnknown_08596A2C:: @ 8596A2C
|
||||
spr_template 0x27c5, 0x27c5, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_08596A28, sub_811067C
|
||||
|
||||
.align 2
|
||||
gUnknown_08596A44:: @ 8596A44
|
||||
gLinearStingerSpriteTemplate:: @ 8596A44
|
||||
spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110720
|
||||
|
||||
.align 2
|
||||
gUnknown_08596A5C:: @ 8596A5C
|
||||
gPinMissileSpriteTemplate:: @ 8596A5C
|
||||
spr_template 0x27b1, 0x27b1, gUnknown_0852496C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
|
||||
|
||||
.align 2
|
||||
gUnknown_08596A74:: @ 8596A74
|
||||
gIcicleSpearSpriteTemplate:: @ 8596A74
|
||||
spr_template 0x2816, 0x2816, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110850
|
||||
|
||||
.align 2
|
||||
@ -3342,7 +3342,7 @@ gUnknown_08596B88:: @ 8596B88
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_085954D0, NULL, gDummySpriteAffineAnimTable, sub_8110B38
|
||||
|
||||
.align 2
|
||||
gUnknown_08596BA0:: @ 8596BA0
|
||||
gBattleAnimSpriteTemplate_8596BA0:: @ 8596BA0
|
||||
spr_template 0x2815, 0x2815, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8110E4C
|
||||
|
||||
.align 2
|
||||
@ -3500,11 +3500,11 @@ gUnknown_08596DD0:: @ 8596DD0
|
||||
spr_template 0x27d7, 0x27d7, gUnknown_08524A54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81129F0
|
||||
|
||||
.align 2
|
||||
gUnknown_08596DE8:: @ 8596DE8
|
||||
gBattleAnimSpriteTemplate_8596DE8:: @ 8596DE8
|
||||
spr_template 0x27d8, 0x27d8, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
|
||||
|
||||
.align 2
|
||||
gUnknown_08596E00:: @ 8596E00
|
||||
gBattleAnimSpriteTemplate_8596E00:: @ 8596E00
|
||||
spr_template 0x27ed, 0x27ed, gUnknown_08524A34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8112B78
|
||||
|
||||
.align 2
|
||||
@ -3533,7 +3533,7 @@ gUnknown_08596E78:: @ 8596E78
|
||||
.4byte gUnknown_08596E60
|
||||
|
||||
.align 2
|
||||
gUnknown_08596E7C:: @ 8596E7C
|
||||
gBattleAnimSpriteTemplate_8596E7C:: @ 8596E7C
|
||||
spr_template 0x272d, 0x272d, gUnknown_08524914, gUnknown_08596E78, NULL, gDummySpriteAffineAnimTable, sub_8113064
|
||||
|
||||
.align 2
|
||||
@ -3705,7 +3705,7 @@ gUnknown_08597130:: @ 8597130
|
||||
.4byte gUnknown_08597118
|
||||
|
||||
.align 2
|
||||
gUnknown_08597138:: @ 8597138
|
||||
gBattleAnimSpriteTemplate_8597138:: @ 8597138
|
||||
spr_template 0x2737, 0x2737, gUnknown_08524914, gUnknown_08597130, NULL, gDummySpriteAffineAnimTable, sub_81144BC
|
||||
|
||||
.align 2
|
||||
@ -3774,15 +3774,15 @@ gUnknown_08597254:: @ 8597254
|
||||
.4byte gUnknown_08597240
|
||||
|
||||
.align 2
|
||||
gUnknown_0859725C:: @ 859725C
|
||||
gConfusionDuckSpriteTemplate:: @ 859725C
|
||||
spr_template 0x2759, 0x2759, gUnknown_0852490C, gUnknown_08597254, NULL, gDummySpriteAffineAnimTable, sub_811572C
|
||||
|
||||
.align 2
|
||||
gUnknown_08597274:: @ 8597274
|
||||
gSimplePaletteBlendSpriteTemplate:: @ 8597274
|
||||
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81157FC
|
||||
|
||||
.align 2
|
||||
gUnknown_0859728C:: @ 859728C
|
||||
gBattleAnimSpriteTemplate_859728C:: @ 859728C
|
||||
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81158A4
|
||||
|
||||
.align 2
|
||||
@ -3799,7 +3799,7 @@ gUnknown_085972C0:: @ 85972C0
|
||||
spr_template 0x2757, 0x2757, gUnknown_08524914, gUnknown_085972BC, NULL, gDummySpriteAffineAnimTable, sub_81159B4
|
||||
|
||||
.align 2
|
||||
gUnknown_085972D8:: @ 85972D8
|
||||
gBattleAnimSpriteTemplate_85972D8:: @ 85972D8
|
||||
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_81160A4
|
||||
|
||||
.align 2
|
||||
@ -3829,11 +3829,11 @@ gUnknown_08597348:: @ 8597348
|
||||
.4byte gUnknown_08597330
|
||||
|
||||
.align 2
|
||||
gUnknown_08597358:: @ 8597358
|
||||
gBasicHitSplatSpriteTemplate:: @ 8597358
|
||||
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116388
|
||||
|
||||
.align 2
|
||||
gUnknown_08597370:: @ 8597370
|
||||
gBattleAnimSpriteTemplate_8597370:: @ 8597370
|
||||
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116420
|
||||
|
||||
.align 2
|
||||
@ -3845,7 +3845,7 @@ gUnknown_085973A0:: @ 85973A0
|
||||
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_8116458
|
||||
|
||||
.align 2
|
||||
gUnknown_085973B8:: @ 85973B8
|
||||
gBattleAnimSpriteTemplate_85973B8:: @ 85973B8
|
||||
spr_template 0x2797, 0x2797, gUnknown_08524A94, gDummySpriteAnimTable, NULL, gUnknown_08597348, sub_81164F0
|
||||
|
||||
.align 2
|
||||
|
||||
@ -330,7 +330,7 @@ gUnknown_085CE5A8::
|
||||
spr_template 0x2800, 0x2800, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CB88
|
||||
gUnknown_085CE5C0::
|
||||
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815CC94
|
||||
gUnknown_085CE5D8::
|
||||
gBattleAnimSpriteTemplate_85CE5D8::
|
||||
spr_template 0x27fc, 0x27fc, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815CDB4
|
||||
|
||||
.align 2
|
||||
|
||||
@ -140,7 +140,7 @@ gUnknown_085E5310:: @ 85E5310
|
||||
.2byte 0x0100, 0x0503, 0x0506, 0x0004
|
||||
|
||||
.align 2
|
||||
gUnknown_085E5338:: @ 85E5338
|
||||
gBattleAnimSpriteTemplate_85E5338:: @ 85E5338
|
||||
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
|
||||
|
||||
.align 2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -38,17 +38,6 @@
|
||||
#define MAX_TRAINER_ITEMS 4
|
||||
#define MAX_MON_MOVES 4
|
||||
|
||||
#define BATTLE_TERRAIN_GRASS 0
|
||||
#define BATTLE_TERRAIN_LONG_GRASS 1
|
||||
#define BATTLE_TERRAIN_SAND 2
|
||||
#define BATTLE_TERRAIN_UNDERWATER 3
|
||||
#define BATTLE_TERRAIN_WATER 4
|
||||
#define BATTLE_TERRAIN_POND 5
|
||||
#define BATTLE_TERRAIN_MOUNTAIN 6
|
||||
#define BATTLE_TERRAIN_CAVE 7
|
||||
#define BATTLE_TERRAIN_BUILDING 8
|
||||
#define BATTLE_TERRAIN_PLAIN 9
|
||||
|
||||
// array entries for battle communication
|
||||
#define MULTIUSE_STATE 0x0
|
||||
#define CURSOR_POSITION 0x1
|
||||
|
||||
@ -281,4 +281,16 @@
|
||||
#define MOVE_EFFECT_AFFECTS_USER 0x40
|
||||
#define MOVE_EFFECT_CERTAIN 0x80
|
||||
|
||||
// Battle terrain defines for gBattleTerrain.
|
||||
#define BATTLE_TERRAIN_GRASS 0
|
||||
#define BATTLE_TERRAIN_LONG_GRASS 1
|
||||
#define BATTLE_TERRAIN_SAND 2
|
||||
#define BATTLE_TERRAIN_UNDERWATER 3
|
||||
#define BATTLE_TERRAIN_WATER 4
|
||||
#define BATTLE_TERRAIN_POND 5
|
||||
#define BATTLE_TERRAIN_MOUNTAIN 6
|
||||
#define BATTLE_TERRAIN_CAVE 7
|
||||
#define BATTLE_TERRAIN_BUILDING 8
|
||||
#define BATTLE_TERRAIN_PLAIN 9
|
||||
|
||||
#endif // GUARD_CONSTANTS_BATTLE_H
|
||||
|
||||
@ -1,6 +1,312 @@
|
||||
#ifndef GUARD_CONSTANTS_BATTLE_ANIM_H
|
||||
#define GUARD_CONSTANTS_BATTLE_ANIM_H
|
||||
|
||||
// Sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
|
||||
#define GET_TRUE_SPRITE_INDEX(i) ((i - ANIM_SPRITES_START))
|
||||
|
||||
// Particle ids.
|
||||
#define ANIM_SPRITES_START 10000
|
||||
|
||||
#define ANIM_TAG_000 (ANIM_SPRITES_START + 0)
|
||||
#define ANIM_TAG_001 (ANIM_SPRITES_START + 1)
|
||||
#define ANIM_TAG_002 (ANIM_SPRITES_START + 2)
|
||||
#define ANIM_TAG_003 (ANIM_SPRITES_START + 3)
|
||||
#define ANIM_TAG_004 (ANIM_SPRITES_START + 4)
|
||||
#define ANIM_TAG_005 (ANIM_SPRITES_START + 5)
|
||||
#define ANIM_TAG_006 (ANIM_SPRITES_START + 6)
|
||||
#define ANIM_TAG_007 (ANIM_SPRITES_START + 7)
|
||||
#define ANIM_TAG_008 (ANIM_SPRITES_START + 8)
|
||||
#define ANIM_TAG_009 (ANIM_SPRITES_START + 9)
|
||||
#define ANIM_TAG_010 (ANIM_SPRITES_START + 10)
|
||||
#define ANIM_TAG_011 (ANIM_SPRITES_START + 11)
|
||||
#define ANIM_TAG_012 (ANIM_SPRITES_START + 12)
|
||||
#define ANIM_TAG_013 (ANIM_SPRITES_START + 13)
|
||||
#define ANIM_TAG_014 (ANIM_SPRITES_START + 14)
|
||||
#define ANIM_TAG_015 (ANIM_SPRITES_START + 15)
|
||||
#define ANIM_TAG_016 (ANIM_SPRITES_START + 16)
|
||||
#define ANIM_TAG_017 (ANIM_SPRITES_START + 17)
|
||||
#define ANIM_TAG_018 (ANIM_SPRITES_START + 18)
|
||||
#define ANIM_TAG_019 (ANIM_SPRITES_START + 19)
|
||||
#define ANIM_TAG_020 (ANIM_SPRITES_START + 20)
|
||||
#define ANIM_TAG_021 (ANIM_SPRITES_START + 21)
|
||||
#define ANIM_TAG_022 (ANIM_SPRITES_START + 22)
|
||||
#define ANIM_TAG_023 (ANIM_SPRITES_START + 23)
|
||||
#define ANIM_TAG_024 (ANIM_SPRITES_START + 24)
|
||||
#define ANIM_TAG_025 (ANIM_SPRITES_START + 25)
|
||||
#define ANIM_TAG_026 (ANIM_SPRITES_START + 26)
|
||||
#define ANIM_TAG_027 (ANIM_SPRITES_START + 27)
|
||||
#define ANIM_TAG_028 (ANIM_SPRITES_START + 28)
|
||||
#define ANIM_TAG_029 (ANIM_SPRITES_START + 29)
|
||||
#define ANIM_TAG_030 (ANIM_SPRITES_START + 30)
|
||||
#define ANIM_TAG_031 (ANIM_SPRITES_START + 31)
|
||||
#define ANIM_TAG_032 (ANIM_SPRITES_START + 32)
|
||||
#define ANIM_TAG_033 (ANIM_SPRITES_START + 33)
|
||||
#define ANIM_TAG_034 (ANIM_SPRITES_START + 34)
|
||||
#define ANIM_TAG_035 (ANIM_SPRITES_START + 35)
|
||||
#define ANIM_TAG_036 (ANIM_SPRITES_START + 36)
|
||||
#define ANIM_TAG_037 (ANIM_SPRITES_START + 37)
|
||||
#define ANIM_TAG_038 (ANIM_SPRITES_START + 38)
|
||||
#define ANIM_TAG_039 (ANIM_SPRITES_START + 39)
|
||||
#define ANIM_TAG_040 (ANIM_SPRITES_START + 40)
|
||||
#define ANIM_TAG_041 (ANIM_SPRITES_START + 41)
|
||||
#define ANIM_TAG_042 (ANIM_SPRITES_START + 42)
|
||||
#define ANIM_TAG_043 (ANIM_SPRITES_START + 43)
|
||||
#define ANIM_TAG_044 (ANIM_SPRITES_START + 44)
|
||||
#define ANIM_TAG_045 (ANIM_SPRITES_START + 45)
|
||||
#define ANIM_TAG_046 (ANIM_SPRITES_START + 46)
|
||||
#define ANIM_TAG_047 (ANIM_SPRITES_START + 47)
|
||||
#define ANIM_TAG_048 (ANIM_SPRITES_START + 48)
|
||||
#define ANIM_TAG_049 (ANIM_SPRITES_START + 49)
|
||||
#define ANIM_TAG_050 (ANIM_SPRITES_START + 50)
|
||||
#define ANIM_TAG_051 (ANIM_SPRITES_START + 51)
|
||||
#define ANIM_TAG_052 (ANIM_SPRITES_START + 52)
|
||||
#define ANIM_TAG_053 (ANIM_SPRITES_START + 53)
|
||||
#define ANIM_TAG_054 (ANIM_SPRITES_START + 54)
|
||||
#define ANIM_TAG_055 (ANIM_SPRITES_START + 55)
|
||||
#define ANIM_TAG_056 (ANIM_SPRITES_START + 56)
|
||||
#define ANIM_TAG_057 (ANIM_SPRITES_START + 57)
|
||||
#define ANIM_TAG_058 (ANIM_SPRITES_START + 58)
|
||||
#define ANIM_TAG_059 (ANIM_SPRITES_START + 59)
|
||||
#define ANIM_TAG_060 (ANIM_SPRITES_START + 60)
|
||||
#define ANIM_TAG_061 (ANIM_SPRITES_START + 61)
|
||||
#define ANIM_TAG_062 (ANIM_SPRITES_START + 62)
|
||||
#define ANIM_TAG_063 (ANIM_SPRITES_START + 63)
|
||||
#define ANIM_TAG_064 (ANIM_SPRITES_START + 64)
|
||||
#define ANIM_TAG_065 (ANIM_SPRITES_START + 65)
|
||||
#define ANIM_TAG_066 (ANIM_SPRITES_START + 66)
|
||||
#define ANIM_TAG_067 (ANIM_SPRITES_START + 67)
|
||||
#define ANIM_TAG_068 (ANIM_SPRITES_START + 68)
|
||||
#define ANIM_TAG_069 (ANIM_SPRITES_START + 69)
|
||||
#define ANIM_TAG_070 (ANIM_SPRITES_START + 70)
|
||||
#define ANIM_TAG_071 (ANIM_SPRITES_START + 71)
|
||||
#define ANIM_TAG_072 (ANIM_SPRITES_START + 72)
|
||||
#define ANIM_TAG_073 (ANIM_SPRITES_START + 73)
|
||||
#define ANIM_TAG_074 (ANIM_SPRITES_START + 74)
|
||||
#define ANIM_TAG_075 (ANIM_SPRITES_START + 75)
|
||||
#define ANIM_TAG_076 (ANIM_SPRITES_START + 76)
|
||||
#define ANIM_TAG_077 (ANIM_SPRITES_START + 77)
|
||||
#define ANIM_TAG_078 (ANIM_SPRITES_START + 78)
|
||||
#define ANIM_TAG_079 (ANIM_SPRITES_START + 79)
|
||||
#define ANIM_TAG_080 (ANIM_SPRITES_START + 80)
|
||||
#define ANIM_TAG_081 (ANIM_SPRITES_START + 81)
|
||||
#define ANIM_TAG_082 (ANIM_SPRITES_START + 82)
|
||||
#define ANIM_TAG_083 (ANIM_SPRITES_START + 83)
|
||||
#define ANIM_TAG_084 (ANIM_SPRITES_START + 84)
|
||||
#define ANIM_TAG_085 (ANIM_SPRITES_START + 85)
|
||||
#define ANIM_TAG_086 (ANIM_SPRITES_START + 86)
|
||||
#define ANIM_TAG_087 (ANIM_SPRITES_START + 87)
|
||||
#define ANIM_TAG_088 (ANIM_SPRITES_START + 88)
|
||||
#define ANIM_TAG_089 (ANIM_SPRITES_START + 89)
|
||||
#define ANIM_TAG_090 (ANIM_SPRITES_START + 90)
|
||||
#define ANIM_TAG_091 (ANIM_SPRITES_START + 91)
|
||||
#define ANIM_TAG_092 (ANIM_SPRITES_START + 92)
|
||||
#define ANIM_TAG_093 (ANIM_SPRITES_START + 93)
|
||||
#define ANIM_TAG_094 (ANIM_SPRITES_START + 94)
|
||||
#define ANIM_TAG_095 (ANIM_SPRITES_START + 95)
|
||||
#define ANIM_TAG_096 (ANIM_SPRITES_START + 96)
|
||||
#define ANIM_TAG_097 (ANIM_SPRITES_START + 97)
|
||||
#define ANIM_TAG_098 (ANIM_SPRITES_START + 98)
|
||||
#define ANIM_TAG_099 (ANIM_SPRITES_START + 99)
|
||||
#define ANIM_TAG_100 (ANIM_SPRITES_START + 100)
|
||||
#define ANIM_TAG_101 (ANIM_SPRITES_START + 101)
|
||||
#define ANIM_TAG_102 (ANIM_SPRITES_START + 102)
|
||||
#define ANIM_TAG_103 (ANIM_SPRITES_START + 103)
|
||||
#define ANIM_TAG_104 (ANIM_SPRITES_START + 104)
|
||||
#define ANIM_TAG_105 (ANIM_SPRITES_START + 105)
|
||||
#define ANIM_TAG_106 (ANIM_SPRITES_START + 106)
|
||||
#define ANIM_TAG_107 (ANIM_SPRITES_START + 107)
|
||||
#define ANIM_TAG_108 (ANIM_SPRITES_START + 108)
|
||||
#define ANIM_TAG_109 (ANIM_SPRITES_START + 109)
|
||||
#define ANIM_TAG_110 (ANIM_SPRITES_START + 110)
|
||||
#define ANIM_TAG_111 (ANIM_SPRITES_START + 111)
|
||||
#define ANIM_TAG_112 (ANIM_SPRITES_START + 112)
|
||||
#define ANIM_TAG_113 (ANIM_SPRITES_START + 113)
|
||||
#define ANIM_TAG_114 (ANIM_SPRITES_START + 114)
|
||||
#define ANIM_TAG_115 (ANIM_SPRITES_START + 115)
|
||||
#define ANIM_TAG_116 (ANIM_SPRITES_START + 116)
|
||||
#define ANIM_TAG_117 (ANIM_SPRITES_START + 117)
|
||||
#define ANIM_TAG_118 (ANIM_SPRITES_START + 118)
|
||||
#define ANIM_TAG_119 (ANIM_SPRITES_START + 119)
|
||||
#define ANIM_TAG_120 (ANIM_SPRITES_START + 120)
|
||||
#define ANIM_TAG_121 (ANIM_SPRITES_START + 121)
|
||||
#define ANIM_TAG_122 (ANIM_SPRITES_START + 122)
|
||||
#define ANIM_TAG_123 (ANIM_SPRITES_START + 123)
|
||||
#define ANIM_TAG_124 (ANIM_SPRITES_START + 124)
|
||||
#define ANIM_TAG_125 (ANIM_SPRITES_START + 125)
|
||||
#define ANIM_TAG_126 (ANIM_SPRITES_START + 126)
|
||||
#define ANIM_TAG_127 (ANIM_SPRITES_START + 127)
|
||||
#define ANIM_TAG_128 (ANIM_SPRITES_START + 128)
|
||||
#define ANIM_TAG_129 (ANIM_SPRITES_START + 129)
|
||||
#define ANIM_TAG_130 (ANIM_SPRITES_START + 130)
|
||||
#define ANIM_TAG_131 (ANIM_SPRITES_START + 131)
|
||||
#define ANIM_TAG_132 (ANIM_SPRITES_START + 132)
|
||||
#define ANIM_TAG_133 (ANIM_SPRITES_START + 133)
|
||||
#define ANIM_TAG_134 (ANIM_SPRITES_START + 134)
|
||||
#define ANIM_TAG_135 (ANIM_SPRITES_START + 135)
|
||||
#define ANIM_TAG_136 (ANIM_SPRITES_START + 136)
|
||||
#define ANIM_TAG_137 (ANIM_SPRITES_START + 137)
|
||||
#define ANIM_TAG_138 (ANIM_SPRITES_START + 138)
|
||||
#define ANIM_TAG_139 (ANIM_SPRITES_START + 139)
|
||||
#define ANIM_TAG_140 (ANIM_SPRITES_START + 140)
|
||||
#define ANIM_TAG_141 (ANIM_SPRITES_START + 141)
|
||||
#define ANIM_TAG_142 (ANIM_SPRITES_START + 142)
|
||||
#define ANIM_TAG_143 (ANIM_SPRITES_START + 143)
|
||||
#define ANIM_TAG_144 (ANIM_SPRITES_START + 144)
|
||||
#define ANIM_TAG_145 (ANIM_SPRITES_START + 145)
|
||||
#define ANIM_TAG_146 (ANIM_SPRITES_START + 146)
|
||||
#define ANIM_TAG_147 (ANIM_SPRITES_START + 147)
|
||||
#define ANIM_TAG_148 (ANIM_SPRITES_START + 148)
|
||||
#define ANIM_TAG_149 (ANIM_SPRITES_START + 149)
|
||||
#define ANIM_TAG_150 (ANIM_SPRITES_START + 150)
|
||||
#define ANIM_TAG_151 (ANIM_SPRITES_START + 151)
|
||||
#define ANIM_TAG_152 (ANIM_SPRITES_START + 152)
|
||||
#define ANIM_TAG_153 (ANIM_SPRITES_START + 153)
|
||||
#define ANIM_TAG_154 (ANIM_SPRITES_START + 154)
|
||||
#define ANIM_TAG_155 (ANIM_SPRITES_START + 155)
|
||||
#define ANIM_TAG_156 (ANIM_SPRITES_START + 156)
|
||||
#define ANIM_TAG_157 (ANIM_SPRITES_START + 157)
|
||||
#define ANIM_TAG_158 (ANIM_SPRITES_START + 158)
|
||||
#define ANIM_TAG_159 (ANIM_SPRITES_START + 159)
|
||||
#define ANIM_TAG_160 (ANIM_SPRITES_START + 160)
|
||||
#define ANIM_TAG_161 (ANIM_SPRITES_START + 161)
|
||||
#define ANIM_TAG_162 (ANIM_SPRITES_START + 162)
|
||||
#define ANIM_TAG_163 (ANIM_SPRITES_START + 163)
|
||||
#define ANIM_TAG_164 (ANIM_SPRITES_START + 164)
|
||||
#define ANIM_TAG_165 (ANIM_SPRITES_START + 165)
|
||||
#define ANIM_TAG_166 (ANIM_SPRITES_START + 166)
|
||||
#define ANIM_TAG_167 (ANIM_SPRITES_START + 167)
|
||||
#define ANIM_TAG_168 (ANIM_SPRITES_START + 168)
|
||||
#define ANIM_TAG_169 (ANIM_SPRITES_START + 169)
|
||||
#define ANIM_TAG_170 (ANIM_SPRITES_START + 170)
|
||||
#define ANIM_TAG_171 (ANIM_SPRITES_START + 171)
|
||||
#define ANIM_TAG_172 (ANIM_SPRITES_START + 172)
|
||||
#define ANIM_TAG_173 (ANIM_SPRITES_START + 173)
|
||||
#define ANIM_TAG_174 (ANIM_SPRITES_START + 174)
|
||||
#define ANIM_TAG_175 (ANIM_SPRITES_START + 175)
|
||||
#define ANIM_TAG_176 (ANIM_SPRITES_START + 176)
|
||||
#define ANIM_TAG_177 (ANIM_SPRITES_START + 177)
|
||||
#define ANIM_TAG_178 (ANIM_SPRITES_START + 178)
|
||||
#define ANIM_TAG_179 (ANIM_SPRITES_START + 179)
|
||||
#define ANIM_TAG_180 (ANIM_SPRITES_START + 180)
|
||||
#define ANIM_TAG_181 (ANIM_SPRITES_START + 181)
|
||||
#define ANIM_TAG_182 (ANIM_SPRITES_START + 182)
|
||||
#define ANIM_TAG_183 (ANIM_SPRITES_START + 183)
|
||||
#define ANIM_TAG_184 (ANIM_SPRITES_START + 184)
|
||||
#define ANIM_TAG_185 (ANIM_SPRITES_START + 185)
|
||||
#define ANIM_TAG_186 (ANIM_SPRITES_START + 186)
|
||||
#define ANIM_TAG_187 (ANIM_SPRITES_START + 187)
|
||||
#define ANIM_TAG_188 (ANIM_SPRITES_START + 188)
|
||||
#define ANIM_TAG_189 (ANIM_SPRITES_START + 189)
|
||||
#define ANIM_TAG_190 (ANIM_SPRITES_START + 190)
|
||||
#define ANIM_TAG_191 (ANIM_SPRITES_START + 191)
|
||||
#define ANIM_TAG_192 (ANIM_SPRITES_START + 192)
|
||||
#define ANIM_TAG_193 (ANIM_SPRITES_START + 193)
|
||||
#define ANIM_TAG_194 (ANIM_SPRITES_START + 194)
|
||||
#define ANIM_TAG_195 (ANIM_SPRITES_START + 195)
|
||||
#define ANIM_TAG_196 (ANIM_SPRITES_START + 196)
|
||||
#define ANIM_TAG_197 (ANIM_SPRITES_START + 197)
|
||||
#define ANIM_TAG_198 (ANIM_SPRITES_START + 198)
|
||||
#define ANIM_TAG_199 (ANIM_SPRITES_START + 199)
|
||||
#define ANIM_TAG_200 (ANIM_SPRITES_START + 200)
|
||||
#define ANIM_TAG_201 (ANIM_SPRITES_START + 201)
|
||||
#define ANIM_TAG_202 (ANIM_SPRITES_START + 202)
|
||||
#define ANIM_TAG_203 (ANIM_SPRITES_START + 203)
|
||||
#define ANIM_TAG_204 (ANIM_SPRITES_START + 204)
|
||||
#define ANIM_TAG_205 (ANIM_SPRITES_START + 205)
|
||||
#define ANIM_TAG_206 (ANIM_SPRITES_START + 206)
|
||||
#define ANIM_TAG_207 (ANIM_SPRITES_START + 207)
|
||||
#define ANIM_TAG_208 (ANIM_SPRITES_START + 208)
|
||||
#define ANIM_TAG_209 (ANIM_SPRITES_START + 209)
|
||||
#define ANIM_TAG_210 (ANIM_SPRITES_START + 210)
|
||||
#define ANIM_TAG_211 (ANIM_SPRITES_START + 211)
|
||||
#define ANIM_TAG_212 (ANIM_SPRITES_START + 212)
|
||||
#define ANIM_TAG_213 (ANIM_SPRITES_START + 213)
|
||||
#define ANIM_TAG_214 (ANIM_SPRITES_START + 214)
|
||||
#define ANIM_TAG_215 (ANIM_SPRITES_START + 215)
|
||||
#define ANIM_TAG_216 (ANIM_SPRITES_START + 216)
|
||||
#define ANIM_TAG_217 (ANIM_SPRITES_START + 217)
|
||||
#define ANIM_TAG_218 (ANIM_SPRITES_START + 218)
|
||||
#define ANIM_TAG_219 (ANIM_SPRITES_START + 219)
|
||||
#define ANIM_TAG_220 (ANIM_SPRITES_START + 220)
|
||||
#define ANIM_TAG_221 (ANIM_SPRITES_START + 221)
|
||||
#define ANIM_TAG_222 (ANIM_SPRITES_START + 222)
|
||||
#define ANIM_TAG_223 (ANIM_SPRITES_START + 223)
|
||||
#define ANIM_TAG_224 (ANIM_SPRITES_START + 224)
|
||||
#define ANIM_TAG_225 (ANIM_SPRITES_START + 225)
|
||||
#define ANIM_TAG_226 (ANIM_SPRITES_START + 226)
|
||||
#define ANIM_TAG_227 (ANIM_SPRITES_START + 227)
|
||||
#define ANIM_TAG_228 (ANIM_SPRITES_START + 228)
|
||||
#define ANIM_TAG_229 (ANIM_SPRITES_START + 229)
|
||||
#define ANIM_TAG_230 (ANIM_SPRITES_START + 230)
|
||||
#define ANIM_TAG_231 (ANIM_SPRITES_START + 231)
|
||||
#define ANIM_TAG_232 (ANIM_SPRITES_START + 232)
|
||||
#define ANIM_TAG_233 (ANIM_SPRITES_START + 233)
|
||||
#define ANIM_TAG_234 (ANIM_SPRITES_START + 234)
|
||||
#define ANIM_TAG_235 (ANIM_SPRITES_START + 235)
|
||||
#define ANIM_TAG_236 (ANIM_SPRITES_START + 236)
|
||||
#define ANIM_TAG_237 (ANIM_SPRITES_START + 237)
|
||||
#define ANIM_TAG_238 (ANIM_SPRITES_START + 238)
|
||||
#define ANIM_TAG_239 (ANIM_SPRITES_START + 239)
|
||||
#define ANIM_TAG_240 (ANIM_SPRITES_START + 240)
|
||||
#define ANIM_TAG_241 (ANIM_SPRITES_START + 241)
|
||||
#define ANIM_TAG_242 (ANIM_SPRITES_START + 242)
|
||||
#define ANIM_TAG_243 (ANIM_SPRITES_START + 243)
|
||||
#define ANIM_TAG_244 (ANIM_SPRITES_START + 244)
|
||||
#define ANIM_TAG_245 (ANIM_SPRITES_START + 245)
|
||||
#define ANIM_TAG_246 (ANIM_SPRITES_START + 246)
|
||||
#define ANIM_TAG_247 (ANIM_SPRITES_START + 247)
|
||||
#define ANIM_TAG_248 (ANIM_SPRITES_START + 248)
|
||||
#define ANIM_TAG_249 (ANIM_SPRITES_START + 249)
|
||||
#define ANIM_TAG_250 (ANIM_SPRITES_START + 250)
|
||||
#define ANIM_TAG_251 (ANIM_SPRITES_START + 251)
|
||||
#define ANIM_TAG_252 (ANIM_SPRITES_START + 252)
|
||||
#define ANIM_TAG_253 (ANIM_SPRITES_START + 253)
|
||||
#define ANIM_TAG_254 (ANIM_SPRITES_START + 254)
|
||||
#define ANIM_TAG_255 (ANIM_SPRITES_START + 255)
|
||||
#define ANIM_TAG_256 (ANIM_SPRITES_START + 256)
|
||||
#define ANIM_TAG_257 (ANIM_SPRITES_START + 257)
|
||||
#define ANIM_TAG_258 (ANIM_SPRITES_START + 258)
|
||||
#define ANIM_TAG_259 (ANIM_SPRITES_START + 259)
|
||||
#define ANIM_TAG_260 (ANIM_SPRITES_START + 260)
|
||||
#define ANIM_TAG_261 (ANIM_SPRITES_START + 261)
|
||||
#define ANIM_TAG_262 (ANIM_SPRITES_START + 262)
|
||||
#define ANIM_TAG_263 (ANIM_SPRITES_START + 263)
|
||||
#define ANIM_TAG_264 (ANIM_SPRITES_START + 264)
|
||||
#define ANIM_TAG_265 (ANIM_SPRITES_START + 265)
|
||||
#define ANIM_TAG_266 (ANIM_SPRITES_START + 266)
|
||||
#define ANIM_TAG_267 (ANIM_SPRITES_START + 267)
|
||||
#define ANIM_TAG_268 (ANIM_SPRITES_START + 268)
|
||||
#define ANIM_TAG_269 (ANIM_SPRITES_START + 269)
|
||||
#define ANIM_TAG_270 (ANIM_SPRITES_START + 270)
|
||||
#define ANIM_TAG_271 (ANIM_SPRITES_START + 271)
|
||||
#define ANIM_TAG_272 (ANIM_SPRITES_START + 272)
|
||||
#define ANIM_TAG_273 (ANIM_SPRITES_START + 273)
|
||||
#define ANIM_TAG_274 (ANIM_SPRITES_START + 274)
|
||||
#define ANIM_TAG_275 (ANIM_SPRITES_START + 275)
|
||||
#define ANIM_TAG_276 (ANIM_SPRITES_START + 276)
|
||||
#define ANIM_TAG_277 (ANIM_SPRITES_START + 277)
|
||||
#define ANIM_TAG_278 (ANIM_SPRITES_START + 278)
|
||||
#define ANIM_TAG_279 (ANIM_SPRITES_START + 279)
|
||||
#define ANIM_TAG_280 (ANIM_SPRITES_START + 280)
|
||||
#define ANIM_TAG_281 (ANIM_SPRITES_START + 281)
|
||||
#define ANIM_TAG_282 (ANIM_SPRITES_START + 282)
|
||||
#define ANIM_TAG_283 (ANIM_SPRITES_START + 283)
|
||||
#define ANIM_TAG_284 (ANIM_SPRITES_START + 284)
|
||||
#define ANIM_TAG_285 (ANIM_SPRITES_START + 285)
|
||||
#define ANIM_TAG_286 (ANIM_SPRITES_START + 286)
|
||||
#define ANIM_TAG_287 (ANIM_SPRITES_START + 287)
|
||||
#define ANIM_TAG_288 (ANIM_SPRITES_START + 288)
|
||||
#define ANIM_TAG_289 (ANIM_SPRITES_START + 289)
|
||||
#define ANIM_TAG_290 (ANIM_SPRITES_START + 290)
|
||||
#define ANIM_TAG_291 (ANIM_SPRITES_START + 291)
|
||||
#define ANIM_TAG_292 (ANIM_SPRITES_START + 292)
|
||||
#define ANIM_TAG_293 (ANIM_SPRITES_START + 293)
|
||||
#define ANIM_TAG_294 (ANIM_SPRITES_START + 294)
|
||||
#define ANIM_TAG_295 (ANIM_SPRITES_START + 295)
|
||||
#define ANIM_TAG_296 (ANIM_SPRITES_START + 296)
|
||||
#define ANIM_TAG_297 (ANIM_SPRITES_START + 297)
|
||||
#define ANIM_TAG_298 (ANIM_SPRITES_START + 298)
|
||||
|
||||
// battlers
|
||||
#define ANIM_ATTACKER 0
|
||||
#define ANIM_TARGET 1
|
||||
|
||||
@ -16,9 +16,6 @@
|
||||
#include "palette.h"
|
||||
#include "main.h"
|
||||
|
||||
// sprites start at 10000 and thus must be subtracted of 10000 to account for the true index.
|
||||
#define GET_TRUE_SPRITE_INDEX(i) ((i - 10000))
|
||||
|
||||
#define ANIM_SPRITE_INDEX_COUNT 8
|
||||
|
||||
extern u16 gBattle_WIN0H;
|
||||
|
||||
@ -29,7 +29,7 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
|
||||
extern struct MusicPlayerInfo gMPlayInfo_BGM;
|
||||
|
||||
extern const u8 gUnknown_0831C604[];
|
||||
extern const u8 * const gBattleAnims_VariousTable[];
|
||||
extern const u8 * const gBattleAnims_General[];
|
||||
extern const u8 * const gBattleAnims_Special[];
|
||||
extern const struct CompressedSpriteSheet gMonFrontPicTable[];
|
||||
extern const struct CompressedSpriteSheet gMonBackPicTable[];
|
||||
@ -437,7 +437,7 @@ bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattler, u8 atkBattler, u8 de
|
||||
gBattleAnimAttacker = atkBattler;
|
||||
gBattleAnimTarget = defBattler;
|
||||
gBattleSpritesDataPtr->animationData->animArg = argument;
|
||||
LaunchBattleAnimation(gBattleAnims_VariousTable, tableId, FALSE);
|
||||
LaunchBattleAnimation(gBattleAnims_General, tableId, FALSE);
|
||||
taskId = CreateTask(Task_ClearBitWhenBattleTableAnimDone, 10);
|
||||
gTasks[taskId].tBattlerId = activeBattler;
|
||||
gBattleSpritesDataPtr->healthBoxesData[gTasks[taskId].tBattlerId].animFromTableActive = 1;
|
||||
|
||||
@ -414,7 +414,7 @@ static const struct SpriteTemplate gUnknown_0857FE10 =
|
||||
.callback = SpriteCallbackDummy,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_0857FE28 =
|
||||
const struct SpriteTemplate gHorizontalLungeSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
@ -425,7 +425,7 @@ const struct SpriteTemplate gUnknown_0857FE28 =
|
||||
.callback = sub_80D5860,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_0857FE40 =
|
||||
const struct SpriteTemplate gVerticalDipSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
@ -436,7 +436,7 @@ const struct SpriteTemplate gUnknown_0857FE40 =
|
||||
.callback = sub_80D58F8,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_0857FE58 =
|
||||
const struct SpriteTemplate gSlideMonToOriginalPosSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
@ -447,7 +447,7 @@ const struct SpriteTemplate gUnknown_0857FE58 =
|
||||
.callback = sub_80D5968,
|
||||
};
|
||||
|
||||
const struct SpriteTemplate gUnknown_0857FE70 =
|
||||
const struct SpriteTemplate gSlideMonToOffsetSpriteTemplate =
|
||||
{
|
||||
.tileTag = 0,
|
||||
.paletteTag = 0,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user