Merge pull request #65 from cawtds/move-animations

Add missing move animations from expansion

asm/macros/battle_anim_script.inc

@@ -270,6 +270,63 @@
 	.macro stopsound
 	.byte 0x2f
 	.endm
+
+	@ same as createvisualtask except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
+	.macro createvisualtaskontargets addr:req, priority:req, battlerargindex:req, argv:vararg
+	.byte 0x30
+	.4byte \addr
+	.byte \priority
+	.byte \battlerargindex
+	.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2	@ num_args
+.Lcreatetask_\@_1:
+	.2byte \argv
+.Lcreatetask_\@_2:
+	.endm
+
+	@ same as createsprite except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
+	.macro createspriteontargets template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
+	.byte 0x31
+	.4byte \template
+	.if \anim_battler == ANIM_TARGET
+	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.else
+	.byte (\subpriority_offset & 0x7F)
+	.endif
+	.byte \battlerargindex
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
+	.2byte \argv
+.Lsprite_\@_2:
+	.endm
+
+	@ does not overwrite gBattleAnimArgs[battlerargindex], some sprite templates are too dependent on the value (e.g. heal block)
+	.macro createspriteontargets_onpos template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
+	.byte 0x32
+	.4byte \template
+	.if \anim_battler == ANIM_TARGET
+	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.else
+	.byte (\subpriority_offset & 0x7F)
+	.endif
+	.byte \battlerargindex
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
+	.2byte \argv
+.Lsprite_\@_2:
+	.endm
+
+.macro createdragondartsprite anim_battler:req, subpriority_offset:req, argv:vararg
+	.byte 0x33
+	.if \anim_battler == ANIM_TARGET
+	.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
+	.else
+	.byte (\subpriority_offset & 0x7F)
+	.endif
+	.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
+.Lsprite_\@_1:
+	.2byte \argv
+.Lsprite_\@_2:
+	.endm
 	
 @ useful macros
 	.macro jumpreteq value:req, ptr:req
@@ -283,3 +340,8 @@
 	.macro jumpretfalse ptr:req
 	jumpreteq FALSE, \ptr
 	.endm
+
+	.macro jumpifdoublebattle ptr:req
+	createvisualtask AnimTask_IsDoubleBattle, 0
+	jumprettrue \ptr
+	.endm

graphics/battle_anims/backgrounds/aeroblast.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+172 222 230
+164 213 230
+148 205 222
+131 205 222
+123 197 213
+115 189 205
+98 180 197
+90 180 197
+82 172 189
+74 164 180
+65 156 180
+57 131 156
+49 115 131
+41 82 106
+24 74 82

graphics/battle_anims/backgrounds/aura_sphere.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 205 82
+238 205 74
+238 205 57
+246 222 123
+238 205 57
+238 197 49
+230 189 24
+246 213 82
+255 222 131
+255 213 115
+255 213 106
+255 213 90
+246 213 82
+255 230 156
+0 0 0

graphics/battle_anims/backgrounds/bloom_doom.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 0
+131 230 255
+106 213 255
+98 205 255
+57 156 180
+8 115 123
+180 189 172
+156 180 164
+115 164 131
+74 131 106
+49 106 65
+0 106 74
+0 90 49
+0 82 24
+0 65 0
+0 32 0

graphics/battle_anims/backgrounds/bolt_strike.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 8 8
+255 255 255
+222 246 246
+189 230 230
+156 213 213
+131 205 205
+115 189 189
+90 172 172
+65 156 156
+49 139 139
+32 123 123
+16 98 98
+0 74 74
+0 49 49
+0 32 32
+0 16 16

graphics/battle_anims/backgrounds/chloroblast.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 164 255
+16 123 41
+32 164 82
+57 205 131
+82 238 172
+139 246 205
+197 255 230
+238 255 238
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/clangorous_soulblaze.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+246 189 49
+246 172 41
+238 156 32
+222 131 24
+205 115 8
+197 65 0
+180 57 0
+172 90 65
+156 74 49
+148 65 24
+139 74 49
+123 65 32
+98 49 32
+82 32 16
+74 24 8

graphics/battle_anims/backgrounds/dark_void.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+48 48 48
+72 72 72
+88 88 88
+120 120 120
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/dynamax_cannon.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 164 255
+255 106 139
+255 131 222
+255 139 230
+255 164 238
+255 189 255
+255 205 255
+246 230 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/electric_terrain.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 24 32
+255 246 205
+246 246 222
+246 238 189
+238 238 213
+238 238 205
+238 230 197
+230 230 180
+230 222 164
+230 222 172
+222 213 139
+213 205 123
+213 205 115
+205 197 106
+197 189 106
+57 49 65

graphics/battle_anims/backgrounds/fire1.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 0
+255 156 0
+255 98 0
+255 49 0
+246 57 16
+238 65 16
+180 65 24
+123 49 24
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/fire2.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+104 168 168
+88 144 160
+72 112 160
+64 64 120
+56 80 152
+64 80 144
+72 64 104
+72 56 96
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/focus_blast.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 98 74
+255 90 65
+255 82 57
+255 139 123
+255 74 49
+255 65 41
+255 57 32
+255 106 90
+255 148 139
+255 131 123
+255 123 115
+255 115 106
+255 106 98
+255 164 164
+0 0 0

graphics/battle_anims/backgrounds/garbage_falls.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+180 172 148
+159 156 129
+137 140 110
+115 123 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/giga_impact.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+240 136 184
+232 104 168
+136 8 40
+248 24 104
+216 32 96
+224 72 136
+160 0 48
+216 0 64
+200 40 88
+192 0 56
+176 32 128
+176 24 72
+152 16 56
+200 48 80
+216 56 160

graphics/battle_anims/backgrounds/grassy_terrain.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 24 32
+230 255 238
+172 255 205
+222 255 230
+205 255 222
+180 255 205
+172 255 197
+213 255 230
+197 255 213
+164 255 197
+189 255 213
+213 255 222
+156 246 189
+148 246 180
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/gunk_shot.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+205 98 255
+197 90 255
+197 82 255
+213 148 255
+197 72 255
+197 64 255
+189 56 255
+205 106 255
+222 156 255
+205 139 255
+205 131 255
+205 123 255
+205 115 255
+230 180 255
+0 0 0

graphics/battle_anims/backgrounds/hurricane.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+197 255 255
+139 222 246
+115 213 255
+106 205 255
+98 197 255
+90 180 246
+74 164 238
+65 156 238
+49 148 230
+41 139 230
+41 115 213
+32 131 222
+32 98 205
+32 90 197
+41 74 180

graphics/battle_anims/backgrounds/hydro_cannon.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+197 230 255
+139 205 246
+82 172 238
+57 131 205
+32 82 164
+16 41 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/hydro_pump.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+222 246 255
+189 230 255
+148 213 246
+123 205 255
+90 180 238
+65 164 230
+41 139 222
+24 123 213
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/hyper_beam.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 164 255
+255 255 255
+246 197 222
+230 148 180
+205 98 139
+156 82 106
+90 57 74
+41 32 41
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/hyperspace_fury.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+197 0 65
+160 0 0
+80 0 0
+0 0 0
+189 139 0
+80 0 112
+120 0 168
+255 32 106
+0 164 90
+65 0 213
+49 0 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/inferno_overdrive.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 255
+255 255 230
+255 255 172
+255 255 139
+255 255 106
+255 238 82
+255 230 65
+255 197 32
+255 172 16
+255 148 8
+238 115 0
+222 82 0
+197 49 0
+156 24 0
+98 8 0
+57 0 0

graphics/battle_anims/backgrounds/leaf_storm.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+238 246 230
+205 238 180
+213 238 189
+197 230 180
+197 230 172
+172 222 148
+189 222 164
+164 213 139
+156 205 131
+131 197 106
+139 197 115
+123 189 98
+98 180 65
+65 172 32

graphics/battle_anims/backgrounds/magic_room.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+248 248 144
+224 224 120
+200 200 96
+176 176 72
+152 152 48
+120 120 16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/magma_storm.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 214 0
+255 197 0
+255 173 0
+255 165 0
+148 90 222
+255 107 0
+255 132 0
+255 148 0
+255 156 41
+0 0 0
+0 90 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/malicious_moonsault.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+255 74 74
+238 24 24
+222 65 65
+164 41 41
+164 16 16
+106 32 32
+106 8 8
+65 16 16
+32 24 222
+98 65 222
+24 16 131
+0 0 65
+32 8 8
+8 0 0
+0 0 0

graphics/battle_anims/backgrounds/max_lightning.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 24 32
+115 115 139
+90 90 106
+74 74 98
+65 65 82
+57 57 74
+49 49 57
+41 41 49
+32 32 41
+24 24 32
+16 16 24
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/misty_terrain.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 24 32
+255 246 246
+255 238 238
+255 230 230
+255 222 230
+255 222 222
+255 213 222
+255 205 213
+255 205 205
+255 197 205
+255 197 197
+255 189 189
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/neverending_nightmare.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 0
+0 41 98
+0 41 90
+0 32 82
+0 32 74
+0 24 74
+0 24 65
+0 24 57
+0 16 57
+0 16 49
+0 8 41
+0 8 32
+0 0 24
+0 0 16
+0 0 8
+0 0 0

graphics/battle_anims/backgrounds/nightmare.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+98 49 74
+90 32 65
+82 32 65
+82 32 57
+74 24 57
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/poison_falls.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+180 106 255
+180 82 246
+148 65 205
+115 24 205
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/psychic_new.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+19 0 82
+38 0 98
+58 0 114
+78 0 131
+97 0 147
+117 0 164
+137 0 180
+156 0 196
+176 0 213
+196 0 229
+216 0 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/battle_anims/backgrounds/psychic_terrain.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+238 24 32
+246 222 255
+238 213 255
+238 205 246
+230 197 246
+230 180 246
+222 172 246
+222 164 246
+222 156 246
+213 148 246
+205 139 238
+197 115 238
+189 98 238
+189 90 230
+180 74 230
+0 0 0

graphics/battle_anims/backgrounds/rainbow.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+109 92 75
+255 255 255
+255 107 122
+255 200 102
+255 255 107
+143 255 160
+107 255 255
+107 129 255
+220 114 255
+199 255 250
+232 240 248
+224 232 240
+208 224 240
+191 202 224
+183 189 202
+157 166 181

graphics/battle_anims/backgrounds/rock_wrecker.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+96 192 24
+248 248 216
+248 248 176
+248 240 144
+248 232 120
+248 232 112
+248 216 96
+240 200 88
+232 192 72
+232 184 64
+232 176 56
+224 160 32
+216 152 32
+208 136 40
+192 120 40
+176 88 40

graphics/battle_anims/backgrounds/shattered_psyche.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+222 164 255
+238 139 255
+213 139 255
+189 139 255
+213 115 255
+197 90 255
+189 115 246
+172 148 238
+180 90 230
+172 90 213
+156 131 213
+148 82 205
+123 139 197
+131 90 180
+115 123 172

graphics/battle_anims/backgrounds/sky_afternoon.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+246 230 180
+255 222 139
+255 230 123
+255 222 106
+255 213 98
+255 197 57
+255 180 32
+255 172 8
+255 156 8
+230 131 8
+222 123 8
+205 106 8
+205 90 8
+197 74 8
+189 57 8

graphics/battle_anims/backgrounds/sky_day.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+211 216 222
+198 208 221
+184 199 218
+170 191 215
+156 181 212
+142 172 207
+128 162 203
+117 154 198
+104 147 199
+101 141 189
+89 137 194
+82 127 179
+77 128 190
+63 117 184
+52 106 169

graphics/battle_anims/backgrounds/sky_night.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+139 90 222
+131 65 230
+106 41 230
+98 32 230
+98 16 255
+65 8 255
+49 8 205
+41 8 180
+24 0 172
+24 0 156
+32 0 148
+32 0 131
+32 0 115
+24 0 106
+24 0 98

graphics/battle_anims/backgrounds/sludge_wave.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+175 128 139
+167 70 255
+184 86 255
+208 111 255
+233 136 255
+249 160 255
+255 185 255
+255 210 255
+255 235 255
+167 70 255
+184 86 255
+255 177 255
+255 218 255
+255 235 255
+69 0 0
+69 0 0

graphics/battle_anims/backgrounds/snuggle_forever.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+41 57 16
+115 106 74
+41 74 24
+24 24 24
+32 49 16
+57 57 16
+156 156 123
+74 74 32
+57 98 32
+139 131 98
+123 123 82
+74 115 41
+90 90 49
+90 131 41
+24 32 8

graphics/battle_anims/backgrounds/soulstealing_7star_strike.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 0 0
+57 197 172
+49 180 164
+49 180 156
+41 180 148
+41 164 148
+41 164 139
+32 164 131
+41 156 139
+24 156 106
+32 148 131
+32 139 131
+24 131 98
+32 123 115
+24 115 98
+24 98 90