diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 18:45:04 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-26 18:45:04 -0500 |
| commit | 35a3a19fda87d95e829aa99bf1b6cf18a839c1a6 (patch) | |
| tree | 7dd8a2dc82721b02b336740219fd3fb5f72274a8 | |
| parent | b5417fafec7dd37cb4be391f3bd3d4541a2a381e (diff) | |
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
| -rw-r--r-- | Makefile | 34 | ||||
| -rw-r--r-- | constants.asm | 3 | ||||
| -rw-r--r-- | constants/battle_anim_constants.asm (renamed from constants/animation_constants.asm) | 12 | ||||
| -rw-r--r-- | constants/icon_constants.asm | 41 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 2 | ||||
| -rw-r--r-- | constants/pokemon_data_constants.asm | 43 | ||||
| -rw-r--r-- | constants/sprite_anim_constants.asm | 6 | ||||
| -rwxr-xr-x | data/anims/framesets.asm | 1271 | ||||
| -rw-r--r-- | data/battle_anims/ball_colors.asm (renamed from data/anims/ball_colors.asm) | 0 | ||||
| -rwxr-xr-x | data/battle_anims/framesets.asm | 1270 | ||||
| -rwxr-xr-x | data/battle_anims/oam.asm (renamed from data/anims/oam.asm) | 0 | ||||
| -rwxr-xr-x | data/battle_anims/object_gfx.asm (renamed from data/anims/object_gfx.asm) | 0 | ||||
| -rwxr-xr-x | data/battle_anims/objects.asm (renamed from data/anims/objects.asm) | 0 | ||||
| -rw-r--r-- | data/icon_pointers.asm (renamed from gfx/icon_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/palettes/pokemon_palettes.asm | 541 | ||||
| -rw-r--r-- | data/palettes/trainer_palettes.asm (renamed from gfx/trainer_palettes.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon/pic_pointers.asm (renamed from gfx/pokemon/pic_pointers.asm) | 0 | ||||
| -rw-r--r-- | data/pokemon/unown_pic_pointers.asm (renamed from gfx/pokemon/unown_pic_pointers.asm) | 0 | ||||
| -rwxr-xr-x | data/sprite_anims/framesets.asm (renamed from data/sprites/framesets.asm) | 0 | ||||
| -rw-r--r-- | data/sprite_anims/oam.asm (renamed from data/sprites/oam.asm) | 0 | ||||
| -rw-r--r-- | data/sprite_anims/sequences.asm (renamed from data/sprites/sequences.asm) | 0 | ||||
| -rw-r--r-- | data/trainers/pic_pointers.asm (renamed from gfx/trainer_pic_pointers.asm) | 0 | ||||
| -rw-r--r-- | docs/battle_anim_commands.md (renamed from docs/move_anim_commands.md) | 4 | ||||
| -rw-r--r-- | docs/event_commands.md | 2 | ||||
| -rw-r--r-- | docs/pic_animations.md | 9 | ||||
| -rw-r--r-- | engine/battle/battlestart_copytilemapatonce.asm (renamed from engine/routines/battlestart_copytilemapatonce.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/checkbattlescene.asm (renamed from engine/routines/checkbattlescene.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/consumehelditem.asm (renamed from engine/routines/consumehelditem.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/returntobattle_useball.asm (renamed from engine/routines/returntobattle_useball.asm) | 0 | ||||
| -rw-r--r-- | engine/battle/updatebattlehuds.asm (renamed from engine/routines/updatebattlehuds.asm) | 0 | ||||
| -rw-r--r-- | engine/battle_anims/anim_commands.asm (renamed from engine/anims/anim_commands.asm) | 2 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm (renamed from engine/anims/bg_effects.asm) | 0 | ||||
| -rwxr-xr-x | engine/battle_anims/engine.asm (renamed from engine/anims/engine.asm) | 0 | ||||
| -rwxr-xr-x | engine/battle_anims/functions.asm (renamed from engine/anims/functions.asm) | 2 | ||||
| -rwxr-xr-x | engine/battle_anims/getpokeballwobble.asm (renamed from engine/routines/getpokeballwobble.asm) | 0 | ||||
| -rwxr-xr-x | engine/battle_anims/helpers.asm (renamed from engine/anims/helpers.asm) | 0 | ||||
| -rw-r--r-- | engine/color.asm | 5 | ||||
| -rwxr-xr-x | engine/mon_icons.asm | 2 | ||||
| -rw-r--r-- | engine/movement.asm | 2 | ||||
| -rw-r--r-- | engine/scripting.asm | 2 | ||||
| -rwxr-xr-x | engine/sprites.asm | 6 | ||||
| -rwxr-xr-x | engine/trade_animation.asm | 2 | ||||
| -rw-r--r-- | event/kurt_selectquantity_interpretjoypad.asm (renamed from engine/routines/kurt_selectquantity_interpretjoypad.asm) | 0 | ||||
| -rw-r--r-- | gfx/anims.asm | 41 | ||||
| -rw-r--r-- | gfx/battle_anims.asm | 41 | ||||
| -rw-r--r-- | gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea (renamed from gfx/anims/aeroblast.2bpp.lz.2f07c4ea) | bin | 128 -> 128 bytes | |||
| -rw-r--r-- | gfx/battle_anims/aeroblast.png (renamed from gfx/anims/aeroblast.png) | bin | 187 -> 187 bytes | |||
| -rw-r--r-- | gfx/battle_anims/angels.2bpp.lz.b026d81e (renamed from gfx/anims/angels.2bpp.lz.b026d81e) | bin | 368 -> 368 bytes | |||
| -rw-r--r-- | gfx/battle_anims/angels.png (renamed from gfx/anims/angels.png) | bin | 363 -> 363 bytes | |||
| -rw-r--r-- | gfx/battle_anims/beam.2bpp.lz.80b6d613 (renamed from gfx/anims/beam.2bpp.lz.80b6d613) | bin | 144 -> 144 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/beam.png (renamed from gfx/anims/beam.png) | bin | 562 -> 562 bytes | |||
| -rw-r--r-- | gfx/battle_anims/bubble.2bpp.lz.03b8ac99 (renamed from gfx/anims/bubble.2bpp.lz.03b8ac99) | bin | 160 -> 160 bytes | |||
| -rw-r--r-- | gfx/battle_anims/bubble.png (renamed from gfx/anims/bubble.png) | bin | 237 -> 237 bytes | |||
| -rw-r--r-- | gfx/battle_anims/charge.2bpp.lz.95d3ea98 (renamed from gfx/anims/charge.2bpp.lz.95d3ea98) | bin | 112 -> 112 bytes | |||
| -rw-r--r-- | gfx/battle_anims/charge.png (renamed from gfx/anims/charge.png) | bin | 188 -> 188 bytes | |||
| -rw-r--r-- | gfx/battle_anims/cut.2bpp.lz.03d343ed (renamed from gfx/anims/cut.2bpp.lz.03d343ed) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/battle_anims/cut.png (renamed from gfx/anims/cut.png) | bin | 170 -> 170 bytes | |||
| -rw-r--r-- | gfx/battle_anims/egg.2bpp.lz.41dd1a53 (renamed from gfx/anims/egg.2bpp.lz.41dd1a53) | bin | 128 -> 128 bytes | |||
| -rw-r--r-- | gfx/battle_anims/egg.png (renamed from gfx/anims/egg.png) | bin | 200 -> 200 bytes | |||
| -rw-r--r-- | gfx/battle_anims/explosion.2bpp.lz.55fc334f (renamed from gfx/anims/explosion.2bpp.lz.55fc334f) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/battle_anims/explosion.png (renamed from gfx/anims/explosion.png) | bin | 157 -> 157 bytes | |||
| -rw-r--r-- | gfx/battle_anims/fire.2bpp.lz.d7701cda (renamed from gfx/anims/fire.2bpp.lz.d7701cda) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/battle_anims/fire.png (renamed from gfx/anims/fire.png) | bin | 153 -> 153 bytes | |||
| -rw-r--r-- | gfx/battle_anims/flower.2bpp.lz.1bc2e9d2 (renamed from gfx/anims/flower.2bpp.lz.1bc2e9d2) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/battle_anims/flower.png (renamed from gfx/anims/flower.png) | bin | 149 -> 149 bytes | |||
| -rw-r--r-- | gfx/battle_anims/globe.2bpp.lz.710dbb8e (renamed from gfx/anims/globe.2bpp.lz.710dbb8e) | bin | 240 -> 240 bytes | |||
| -rw-r--r-- | gfx/battle_anims/globe.png (renamed from gfx/anims/globe.png) | bin | 292 -> 292 bytes | |||
| -rw-r--r-- | gfx/battle_anims/haze.2bpp.lz.91424607 (renamed from gfx/anims/haze.2bpp.lz.91424607) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/battle_anims/haze.png (renamed from gfx/anims/haze.png) | bin | 173 -> 173 bytes | |||
| -rw-r--r-- | gfx/battle_anims/hit.2bpp.lz.2b3c83f2 (renamed from gfx/anims/hit.2bpp.lz.2b3c83f2) | bin | 240 -> 240 bytes | |||
| -rw-r--r-- | gfx/battle_anims/hit.png (renamed from gfx/anims/hit.png) | bin | 306 -> 306 bytes | |||
| -rw-r--r-- | gfx/battle_anims/horn.2bpp.lz.48908aae (renamed from gfx/anims/horn.2bpp.lz.48908aae) | bin | 96 -> 96 bytes | |||
| -rw-r--r-- | gfx/battle_anims/horn.png (renamed from gfx/anims/horn.png) | bin | 179 -> 179 bytes | |||
| -rw-r--r-- | gfx/battle_anims/ice.2bpp.lz.664d900f (renamed from gfx/anims/ice.2bpp.lz.664d900f) | bin | 64 -> 64 bytes | |||
| -rw-r--r-- | gfx/battle_anims/ice.png (renamed from gfx/anims/ice.png) | bin | 137 -> 137 bytes | |||
| -rw-r--r-- | gfx/battle_anims/lightning.2bpp.lz.a88fc131 (renamed from gfx/anims/lightning.2bpp.lz.a88fc131) | bin | 320 -> 320 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/lightning.png (renamed from gfx/anims/lightning.png) | bin | 820 -> 820 bytes | |||
| -rw-r--r-- | gfx/battle_anims/misc.2bpp.lz.4b20c3d7 (renamed from gfx/anims/misc.2bpp.lz.4b20c3d7) | bin | 416 -> 416 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/misc.png (renamed from gfx/anims/misc.png) | bin | 1082 -> 1082 bytes | |||
| -rw-r--r-- | gfx/battle_anims/noise.2bpp.lz.acb4a76e (renamed from gfx/anims/noise.2bpp.lz.acb4a76e) | bin | 192 -> 192 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/noise.png (renamed from gfx/anims/noise.png) | bin | 526 -> 526 bytes | |||
| -rw-r--r-- | gfx/battle_anims/objects.2bpp.lz.83f812de (renamed from gfx/anims/objects.2bpp.lz.83f812de) | bin | 224 -> 224 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/objects.png (renamed from gfx/anims/objects.png) | bin | 705 -> 705 bytes | |||
| -rw-r--r-- | gfx/battle_anims/plant.2bpp.lz.4a00c417 (renamed from gfx/anims/plant.2bpp.lz.4a00c417) | bin | 224 -> 224 bytes | |||
| -rw-r--r-- | gfx/battle_anims/plant.png (renamed from gfx/anims/plant.png) | bin | 293 -> 293 bytes | |||
| -rw-r--r-- | gfx/battle_anims/poison.2bpp.lz.fc7dc9c1 (renamed from gfx/anims/poison.2bpp.lz.fc7dc9c1) | bin | 112 -> 112 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/poison.png (renamed from gfx/anims/poison.png) | bin | 166 -> 166 bytes | |||
| -rw-r--r-- | gfx/battle_anims/pokeball.2bpp.lz.c58f7e01 (renamed from gfx/anims/pokeball.2bpp.lz.c58f7e01) | bin | 80 -> 80 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/pokeball.png (renamed from gfx/anims/pokeball.png) | bin | 388 -> 388 bytes | |||
| -rw-r--r-- | gfx/battle_anims/powder.2bpp.lz.bfd566bb (renamed from gfx/anims/powder.2bpp.lz.bfd566bb) | bin | 32 -> 32 bytes | |||
| -rw-r--r-- | gfx/battle_anims/powder.png (renamed from gfx/anims/powder.png) | bin | 100 -> 100 bytes | |||
| -rw-r--r-- | gfx/battle_anims/psychic.2bpp.lz.d80f285c (renamed from gfx/anims/psychic.2bpp.lz.d80f285c) | bin | 112 -> 112 bytes | |||
| -rw-r--r-- | gfx/battle_anims/psychic.png (renamed from gfx/anims/psychic.png) | bin | 175 -> 175 bytes | |||
| -rw-r--r-- | gfx/battle_anims/reflect.2bpp.lz.9a9c822d (renamed from gfx/anims/reflect.2bpp.lz.9a9c822d) | bin | 112 -> 112 bytes | |||
| -rw-r--r-- | gfx/battle_anims/reflect.png (renamed from gfx/anims/reflect.png) | bin | 211 -> 211 bytes | |||
| -rw-r--r-- | gfx/battle_anims/rocks.2bpp.lz.73d0153e (renamed from gfx/anims/rocks.2bpp.lz.73d0153e) | bin | 240 -> 240 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/rocks.png (renamed from gfx/anims/rocks.png) | bin | 669 -> 669 bytes | |||
| -rw-r--r-- | gfx/battle_anims/rope.2bpp.lz.209d63dd (renamed from gfx/anims/rope.2bpp.lz.209d63dd) | bin | 192 -> 192 bytes | |||
| -rw-r--r-- | gfx/battle_anims/rope.png (renamed from gfx/anims/rope.png) | bin | 256 -> 256 bytes | |||
| -rw-r--r-- | gfx/battle_anims/sand.2bpp.lz.c87c0eaa (renamed from gfx/anims/sand.2bpp.lz.c87c0eaa) | bin | 96 -> 96 bytes | |||
| -rwxr-xr-x | gfx/battle_anims/sand.png (renamed from gfx/anims/sand.png) | bin | 384 -> 384 bytes | |||
| -rw-r--r-- | gfx/battle_anims/shapes.2bpp.lz.262d77f0 (renamed from gfx/anims/shapes.2bpp.lz.262d77f0) | bin | 160 -> 160 bytes | |||
| -rw-r--r-- | gfx/battle_anims/shapes.png (renamed from gfx/anims/shapes.png) | bin | 237 -> 237 bytes | |||
| -rw-r--r-- | gfx/battle_anims/shine.2bpp.lz.5fb79056 (renamed from gfx/anims/shine.2bpp.lz.5fb79056) | bin | 224 -> 224 bytes | |||
| -rw-r--r-- | gfx/battle_anims/shine.png (renamed from gfx/anims/shine.png) | bin | 273 -> 273 bytes | |||
| -rw-r--r-- | gfx/battle_anims/skyattack.2bpp.lz.31738ab8 (renamed from gfx/anims/skyattack.2bpp.lz.31738ab8) | bin | 352 -> 352 bytes | |||
| -rw-r--r-- | gfx/battle_anims/skyattack.png (renamed from gfx/anims/skyattack.png) | bin | 393 -> 393 bytes | |||
| -rw-r--r-- | gfx/battle_anims/smoke.2bpp.lz.aa05905e (renamed from gfx/anims/smoke.2bpp.lz.aa05905e) | bin | 144 -> 144 bytes | |||
| -rw-r--r-- | gfx/battle_anims/smoke.png (renamed from gfx/anims/smoke.png) | bin | 191 -> 191 bytes | |||
| -rw-r--r-- | gfx/battle_anims/speed.2bpp.lz.1732b364 (renamed from gfx/anims/speed.2bpp.lz.1732b364) | bin | 80 -> 80 bytes | |||
| -rw-r--r-- | gfx/battle_anims/speed.png (renamed from gfx/anims/speed.png) | bin | 136 -> 136 bytes | |||
| -rw-r--r-- | gfx/battle_anims/status.2bpp.lz.0c0aa13e (renamed from gfx/anims/status.2bpp.lz.0c0aa13e) | bin | 288 -> 288 bytes | |||
| -rw-r--r-- | gfx/battle_anims/status.png (renamed from gfx/anims/status.png) | bin | 364 -> 364 bytes | |||
| -rw-r--r-- | gfx/battle_anims/water.2bpp.lz.7b52ed12 (renamed from gfx/anims/water.2bpp.lz.7b52ed12) | bin | 208 -> 208 bytes | |||
| -rw-r--r-- | gfx/battle_anims/water.png (renamed from gfx/anims/water.png) | bin | 277 -> 277 bytes | |||
| -rw-r--r-- | gfx/battle_anims/wave.2bpp.lz.bee99402 (renamed from gfx/anims/wave.2bpp.lz.bee99402) | bin | 160 -> 160 bytes | |||
| -rw-r--r-- | gfx/battle_anims/wave.png (renamed from gfx/anims/wave.png) | bin | 205 -> 205 bytes | |||
| -rw-r--r-- | gfx/battle_anims/web.2bpp.lz.80e3d480 (renamed from gfx/anims/web.2bpp.lz.80e3d480) | bin | 128 -> 128 bytes | |||
| -rw-r--r-- | gfx/battle_anims/web.png (renamed from gfx/anims/web.png) | bin | 191 -> 191 bytes | |||
| -rw-r--r-- | gfx/battle_anims/whip.2bpp.lz.d80d8d6e (renamed from gfx/anims/whip.2bpp.lz.d80d8d6e) | bin | 128 -> 128 bytes | |||
| -rw-r--r-- | gfx/battle_anims/whip.png (renamed from gfx/anims/whip.png) | bin | 210 -> 210 bytes | |||
| -rw-r--r-- | gfx/battle_anims/wind.2bpp.lz.5a785180 (renamed from gfx/anims/wind.2bpp.lz.5a785180) | bin | 192 -> 192 bytes | |||
| -rw-r--r-- | gfx/battle_anims/wind.png (renamed from gfx/anims/wind.png) | bin | 286 -> 286 bytes | |||
| -rw-r--r-- | gfx/pics.asm | 6 | ||||
| -rw-r--r-- | gfx/pokemon/palette_pointers.asm | 541 | ||||
| -rw-r--r-- | macros.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/battle_anims.asm (renamed from macros/scripts/move_anim.asm) | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm (renamed from macros/scripts/event.asm) | 0 | ||||
| -rw-r--r-- | macros/scripts/gfx_anims.asm (renamed from macros/scripts/gfx_anim.asm) | 0 | ||||
| -rw-r--r-- | macros/scripts/trade_anims.asm (renamed from macros/scripts/trade_anim.asm) | 0 | ||||
| -rw-r--r-- | main.asm | 34 | ||||
| -rw-r--r-- | maps/map_headers.asm | 2 |
132 files changed, 1967 insertions, 1969 deletions
@@ -169,23 +169,23 @@ gfx/slots/slots_3.2bpp: tools/gfx += --interleave --png=$< --remove-duplicates - gfx/card_flip/card_flip_2.2bpp: tools/gfx += --remove-whitespace -gfx/anims/angels.2bpp: tools/gfx += --trim-whitespace -gfx/anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace -gfx/anims/bubble.2bpp: tools/gfx += --trim-whitespace -gfx/anims/charge.2bpp: tools/gfx += --trim-whitespace -gfx/anims/egg.2bpp: tools/gfx += --remove-whitespace -gfx/anims/explosion.2bpp: tools/gfx += --remove-whitespace -gfx/anims/hit.2bpp: tools/gfx += --remove-whitespace -gfx/anims/horn.2bpp: tools/gfx += --remove-whitespace -gfx/anims/lightning.2bpp: tools/gfx += --remove-whitespace -gfx/anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip -gfx/anims/noise.2bpp: tools/gfx += --remove-whitespace -gfx/anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip -gfx/anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace -gfx/anims/reflect.2bpp: tools/gfx += --remove-whitespace -gfx/anims/rocks.2bpp: tools/gfx += --remove-whitespace -gfx/anims/skyattack.2bpp: tools/gfx += --remove-whitespace -gfx/anims/status.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/angels.2bpp: tools/gfx += --trim-whitespace +gfx/battle_anims/beam.2bpp: tools/gfx += --remove-xflip --remove-yflip --remove-whitespace +gfx/battle_anims/bubble.2bpp: tools/gfx += --trim-whitespace +gfx/battle_anims/charge.2bpp: tools/gfx += --trim-whitespace +gfx/battle_anims/egg.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/explosion.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/hit.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/horn.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/lightning.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/misc.2bpp: tools/gfx += --remove-duplicates --remove-xflip +gfx/battle_anims/noise.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/objects.2bpp: tools/gfx += --remove-whitespace --remove-xflip +gfx/battle_anims/pokeball.2bpp: tools/gfx += --remove-xflip --keep-whitespace +gfx/battle_anims/reflect.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace +gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace gfx/player/chris.2bpp: rgbgfx += -h gfx/player/chris_back.2bpp: rgbgfx += -h diff --git a/constants.asm b/constants.asm index 3e0f5311d..116f194a1 100644 --- a/constants.asm +++ b/constants.asm @@ -8,6 +8,7 @@ INCLUDE "constants/pokemon_constants.asm" INCLUDE "constants/type_constants.asm" INCLUDE "constants/move_constants.asm" INCLUDE "constants/battle_constants.asm" +INCLUDE "constants/battle_anim_constants.asm" INCLUDE "constants/map_constants.asm" INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_setup_constants.asm" @@ -20,12 +21,12 @@ INCLUDE "constants/event_flags.asm" INCLUDE "constants/engine_flags.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/sfx_constants.asm" -INCLUDE "constants/animation_constants.asm" INCLUDE "constants/phone_constants.asm" INCLUDE "constants/credits_constants.asm" INCLUDE "constants/gfx_constants.asm" INCLUDE "constants/input_constants.asm" INCLUDE "constants/pokemon_data_constants.asm" +INCLUDE "constants/icon_constants.asm" INCLUDE "constants/serial_constants.asm" INCLUDE "constants/mobile_constants.asm" INCLUDE "constants/misc_constants.asm" diff --git a/constants/animation_constants.asm b/constants/battle_anim_constants.asm index c6f27f31d..0170d5700 100644 --- a/constants/animation_constants.asm +++ b/constants/battle_anim_constants.asm @@ -26,7 +26,7 @@ const BATTLEANIMSTRUCT_17 BATTLEANIMSTRUCT_LENGTH EQU const_value -; BattleAnimObjects indexes (see data/anims/objects.asm) +; BattleAnimObjects indexes (see data/battle_anims/objects.asm) const_def const ANIM_OBJ_00 const ANIM_OBJ_01 @@ -217,7 +217,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const ANIM_OBJ_BA const ANIM_OBJ_BB -; DoBattleAnimFrame arguments (see engine/anims/functions.asm) +; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm) const_def const BATTLEANIMFUNC_00 const BATTLEANIMFUNC_01 @@ -300,7 +300,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMFUNC_4E const BATTLEANIMFUNC_4F -; BattleAnimFrameData indexes (see data/anims/framesets.asm) +; BattleAnimFrameData indexes (see data/battle_anims/framesets.asm) const_def const BATTLEANIMFRAMESET_00 const BATTLEANIMFRAMESET_01 @@ -488,7 +488,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMFRAMESET_B7 const BATTLEANIMFRAMESET_B8 -; BattleAnimOAMData indexes (see data/anims/oam.asm) +; BattleAnimOAMData indexes (see data/battle_anims/oam.asm) const_def const BATTLEANIMOAMSET_00 const BATTLEANIMOAMSET_01 @@ -707,7 +707,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value const BATTLEANIMOAMSET_D6 const BATTLEANIMOAMSET_D7 -; BattleBGEffects indexes (see engine/anims/bg_effects.asm) +; BattleBGEffects indexes (see engine/battle_anims/bg_effects.asm) const_value SET 1 const ANIM_BG_FLASH_INVERTED const ANIM_BG_FLASH_WHITE @@ -763,7 +763,7 @@ const_value SET 1 const ANIM_BG_WOBBLE_MON const ANIM_BG_35 -; AnimObjGFX indexes (see data/anims/object_gfx.asm) +; AnimObjGFX indexes (see data/battle_anims/object_gfx.asm) const_value SET 1 const ANIM_GFX_HIT const ANIM_GFX_CUT diff --git a/constants/icon_constants.asm b/constants/icon_constants.asm new file mode 100644 index 000000000..2b0456c1d --- /dev/null +++ b/constants/icon_constants.asm @@ -0,0 +1,41 @@ +; IconPointers indexes (see data/icon_pointers.asm) + const_def + const ICON_NULL + const ICON_POLIWAG + const ICON_JIGGLYPUFF + const ICON_DIGLETT + const ICON_PIKACHU + const ICON_STARYU + const ICON_FISH + const ICON_BIRD + const ICON_MONSTER + const ICON_CLEFAIRY + const ICON_ODDISH + const ICON_BUG + const ICON_GHOST + const ICON_LAPRAS + const ICON_HUMANSHAPE + const ICON_FOX + const ICON_EQUINE + const ICON_SHELL + const ICON_BLOB + const ICON_SERPENT + const ICON_VOLTORB + const ICON_SQUIRTLE + const ICON_BULBASAUR + const ICON_CHARMANDER + const ICON_CATERPILLAR + const ICON_UNOWN + const ICON_GEODUDE + const ICON_FIGHTER + const ICON_EGG + const ICON_JELLYFISH + const ICON_MOTH + const ICON_BAT + const ICON_SNORLAX + const ICON_HO_OH + const ICON_LUGIA + const ICON_GYARADOS + const ICON_SLOWPOKE + const ICON_SUDOWOODO + const ICON_BIGMON diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f6d85f929..559f22fda 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -10,8 +10,8 @@ ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) ; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm) ; - FramesPointers (see gfx/pokemon/frame_pointers.asm) -; - PokemonPalettes (see gfx/pokemon/palette_pointers.asm) ; - PicPointers (see gfx/pokemon/pic_pointers.asm) +; - PokemonPalettes (see data/palettes/pokemon_palettes.asm) ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - MonMenuIcons (see data/pokemon/menu_icons.asm) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index c1d0aee17..4fe24b512 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -102,49 +102,6 @@ REDMON_STRUCT_LENGTH EQU 44 PARTY_LENGTH EQU 6 -; IconPointers indexes (see gfx/icon_pointers.asm) - const_def - const ICON_NULL - const ICON_POLIWAG - const ICON_JIGGLYPUFF - const ICON_DIGLETT - const ICON_PIKACHU - const ICON_STARYU - const ICON_FISH - const ICON_BIRD - const ICON_MONSTER - const ICON_CLEFAIRY - const ICON_ODDISH - const ICON_BUG - const ICON_GHOST - const ICON_LAPRAS - const ICON_HUMANSHAPE - const ICON_FOX - const ICON_EQUINE - const ICON_SHELL - const ICON_BLOB - const ICON_SERPENT - const ICON_VOLTORB - const ICON_SQUIRTLE - const ICON_BULBASAUR - const ICON_CHARMANDER - const ICON_CATERPILLAR - const ICON_UNOWN - const ICON_GEODUDE - const ICON_FIGHTER - const ICON_EGG - const ICON_JELLYFISH - const ICON_MOTH - const ICON_BAT - const ICON_SNORLAX - const ICON_HO_OH - const ICON_LUGIA - const ICON_GYARADOS - const ICON_SLOWPOKE - const ICON_SUDOWOODO - const ICON_BIGMON - - ; evolution types (used in data/pokemon/evos_attacks.asm) const_value SET 1 const EVOLVE_LEVEL diff --git a/constants/sprite_anim_constants.asm b/constants/sprite_anim_constants.asm index 548c9b8be..8bb2aed35 100644 --- a/constants/sprite_anim_constants.asm +++ b/constants/sprite_anim_constants.asm @@ -17,7 +17,7 @@ const SPRITEANIMSTRUCT_0E ; e const SPRITEANIMSTRUCT_0F ; f -; SpriteAnimSeqData indexes (see data/sprites/sequences.asm) +; SpriteAnimSeqData indexes (see data/sprite_anims/sequences.asm) const_def const SPRITE_ANIM_INDEX_PARTY_MON ; 00 const SPRITE_ANIM_INDEX_GS_TITLE_TRAIL ; 01 @@ -103,7 +103,7 @@ const SPRITE_ANIM_SEQ_INTRO_UNOWN_F ; 21 const SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY ; 22 -; SpriteAnimFrameData indexes (see data/sprites/framesets.asm) +; SpriteAnimFrameData indexes (see data/sprite_anims/framesets.asm) const_def const SPRITE_ANIM_FRAMESET_00 const SPRITE_ANIM_FRAMESET_PARTY_MON ; 01 @@ -172,7 +172,7 @@ const SPRITE_ANIM_FRAMESET_CELEBI_LEFT ; 40 const SPRITE_ANIM_FRAMESET_CELEBI_RIGHT ; 41 -; SpriteAnimOAMData indexes (see data/sprites/oam.asm) +; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm) const_def const SPRITE_ANIM_OAMSET_RED_WALK_1 ; 00 const SPRITE_ANIM_OAMSET_RED_WALK_2 ; 01 diff --git a/data/anims/framesets.asm b/data/anims/framesets.asm deleted file mode 100755 index 7b4bb0a71..000000000 --- a/data/anims/framesets.asm +++ /dev/null @@ -1,1271 +0,0 @@ -BattleAnimFrameData: ; ce85e -; entries correspond to BATTLEANIMFRAMESET_* constants - dw .Frameset_00 ; BATTLEANIMFRAMESET_00 - dw .Frameset_01 ; BATTLEANIMFRAMESET_01 - dw .Frameset_02 ; BATTLEANIMFRAMESET_02 - dw .Frameset_03 ; BATTLEANIMFRAMESET_03 - dw .Frameset_04 ; BATTLEANIMFRAMESET_04 - dw .Frameset_05 ; BATTLEANIMFRAMESET_05 - dw .Frameset_06 ; BATTLEANIMFRAMESET_06 - dw .Frameset_07 ; BATTLEANIMFRAMESET_07 - dw .Frameset_08 ; BATTLEANIMFRAMESET_08 - dw .Frameset_09 ; BATTLEANIMFRAMESET_09 - dw .Frameset_0a ; BATTLEANIMFRAMESET_0A - dw .Frameset_0b ; BATTLEANIMFRAMESET_0B - dw .Frameset_0c ; BATTLEANIMFRAMESET_0C - dw .Frameset_0d ; BATTLEANIMFRAMESET_0D - dw .Frameset_0e ; BATTLEANIMFRAMESET_0E - dw .Frameset_0f ; BATTLEANIMFRAMESET_0F - dw .Frameset_10 ; BATTLEANIMFRAMESET_10 - dw .Frameset_11 ; BATTLEANIMFRAMESET_11 - dw .Frameset_12 ; BATTLEANIMFRAMESET_12 - dw .Frameset_13 ; BATTLEANIMFRAMESET_13 - dw .Frameset_14 ; BATTLEANIMFRAMESET_14 - dw .Frameset_15 ; BATTLEANIMFRAMESET_15 - dw .Frameset_16 ; BATTLEANIMFRAMESET_16 - dw .Frameset_17 ; BATTLEANIMFRAMESET_17 - dw .Frameset_18 ; BATTLEANIMFRAMESET_18 - dw .Frameset_19 ; BATTLEANIMFRAMESET_19 - dw .Frameset_1a ; BATTLEANIMFRAMESET_1A - dw .Frameset_1b ; BATTLEANIMFRAMESET_1B - dw .Frameset_1c ; BATTLEANIMFRAMESET_1C - dw .Frameset_1d ; BATTLEANIMFRAMESET_1D - dw .Frameset_1e ; BATTLEANIMFRAMESET_1E - dw .Frameset_1f ; BATTLEANIMFRAMESET_1F - dw .Frameset_20 ; BATTLEANIMFRAMESET_20 - dw .Frameset_21 ; BATTLEANIMFRAMESET_21 - dw .Frameset_22 ; BATTLEANIMFRAMESET_22 - dw .Frameset_23 ; BATTLEANIMFRAMESET_23 - dw .Frameset_24 ; BATTLEANIMFRAMESET_24 - dw .Frameset_25 ; BATTLEANIMFRAMESET_25 - dw .Frameset_26 ; BATTLEANIMFRAMESET_26 - dw .Frameset_27 ; BATTLEANIMFRAMESET_27 - dw .Frameset_28 ; BATTLEANIMFRAMESET_28 - dw .Frameset_29 ; BATTLEANIMFRAMESET_29 - dw .Frameset_2a ; BATTLEANIMFRAMESET_2A - dw .Frameset_2b ; BATTLEANIMFRAMESET_2B - dw .Frameset_2c ; BATTLEANIMFRAMESET_2C - dw .Frameset_2d ; BATTLEANIMFRAMESET_2D - dw .Frameset_2e ; BATTLEANIMFRAMESET_2E - dw .Frameset_2f ; BATTLEANIMFRAMESET_2F - dw .Frameset_30 ; BATTLEANIMFRAMESET_30 - dw .Frameset_31 ; BATTLEANIMFRAMESET_31 - dw .Frameset_32 ; BATTLEANIMFRAMESET_32 - dw .Frameset_33 ; BATTLEANIMFRAMESET_33 - dw .Frameset_34 ; BATTLEANIMFRAMESET_34 - dw .Frameset_35 ; BATTLEANIMFRAMESET_35 - dw .Frameset_36 ; BATTLEANIMFRAMESET_36 - dw .Frameset_37 ; BATTLEANIMFRAMESET_37 - dw .Frameset_38 ; BATTLEANIMFRAMESET_38 - dw .Frameset_39 ; BATTLEANIMFRAMESET_39 - dw .Frameset_3a ; BATTLEANIMFRAMESET_3A - dw .Frameset_3b ; BATTLEANIMFRAMESET_3B - dw .Frameset_3c ; BATTLEANIMFRAMESET_3C - dw .Frameset_3d ; BATTLEANIMFRAMESET_3D - dw .Frameset_3e ; BATTLEANIMFRAMESET_3E - dw .Frameset_3f ; BATTLEANIMFRAMESET_3F - dw .Frameset_40 ; BATTLEANIMFRAMESET_40 - dw .Frameset_41 ; BATTLEANIMFRAMESET_41 - dw .Frameset_42 ; BATTLEANIMFRAMESET_42 - dw .Frameset_43 ; BATTLEANIMFRAMESET_43 - dw .Frameset_44 ; BATTLEANIMFRAMESET_44 - dw .Frameset_45 ; BATTLEANIMFRAMESET_45 - dw .Frameset_46 ; BATTLEANIMFRAMESET_46 - dw .Frameset_47 ; BATTLEANIMFRAMESET_47 - dw .Frameset_48 ; BATTLEANIMFRAMESET_48 - dw .Frameset_49 ; BATTLEANIMFRAMESET_49 - dw .Frameset_4a ; BATTLEANIMFRAMESET_4A - dw .Frameset_4b ; BATTLEANIMFRAMESET_4B - dw .Frameset_4c ; BATTLEANIMFRAMESET_4C - dw .Frameset_4d ; BATTLEANIMFRAMESET_4D - dw .Frameset_4e ; BATTLEANIMFRAMESET_4E - dw .Frameset_4f ; BATTLEANIMFRAMESET_4F - dw .Frameset_50 ; BATTLEANIMFRAMESET_50 - dw .Frameset_51 ; BATTLEANIMFRAMESET_51 - dw .Frameset_52 ; BATTLEANIMFRAMESET_52 - dw .Frameset_53 ; BATTLEANIMFRAMESET_53 - dw .Frameset_54 ; BATTLEANIMFRAMESET_54 - dw .Frameset_55 ; BATTLEANIMFRAMESET_55 - dw .Frameset_56 ; BATTLEANIMFRAMESET_56 - dw .Frameset_57 ; BATTLEANIMFRAMESET_57 - dw .Frameset_58 ; BATTLEANIMFRAMESET_58 - dw .Frameset_59 ; BATTLEANIMFRAMESET_59 - dw .Frameset_5a ; BATTLEANIMFRAMESET_5A - dw .Frameset_5b ; BATTLEANIMFRAMESET_5B - dw .Frameset_5c ; BATTLEANIMFRAMESET_5C - dw .Frameset_5d ; BATTLEANIMFRAMESET_5D - dw .Frameset_5e ; BATTLEANIMFRAMESET_5E - dw .Frameset_5f ; BATTLEANIMFRAMESET_5F - dw .Frameset_60 ; BATTLEANIMFRAMESET_60 - dw .Frameset_61 ; BATTLEANIMFRAMESET_61 - dw .Frameset_62 ; BATTLEANIMFRAMESET_62 - dw .Frameset_63 ; BATTLEANIMFRAMESET_63 - dw .Frameset_64 ; BATTLEANIMFRAMESET_64 - dw .Frameset_65 ; BATTLEANIMFRAMESET_65 - dw .Frameset_66 ; BATTLEANIMFRAMESET_66 - dw .Frameset_67 ; BATTLEANIMFRAMESET_67 - dw .Frameset_68 ; BATTLEANIMFRAMESET_68 - dw .Frameset_69 ; BATTLEANIMFRAMESET_69 - dw .Frameset_6a ; BATTLEANIMFRAMESET_6A - dw .Frameset_6b ; BATTLEANIMFRAMESET_6B - dw .Frameset_6c ; BATTLEANIMFRAMESET_6C - dw .Frameset_6d ; BATTLEANIMFRAMESET_6D - dw .Frameset_6e ; BATTLEANIMFRAMESET_6E - dw .Frameset_6f ; BATTLEANIMFRAMESET_6F - dw .Frameset_70 ; BATTLEANIMFRAMESET_70 - dw .Frameset_71 ; BATTLEANIMFRAMESET_71 - dw .Frameset_72 ; BATTLEANIMFRAMESET_72 - dw .Frameset_73 ; BATTLEANIMFRAMESET_73 - dw .Frameset_74 ; BATTLEANIMFRAMESET_74 - dw .Frameset_75 ; BATTLEANIMFRAMESET_75 - dw .Frameset_76 ; BATTLEANIMFRAMESET_76 - dw .Frameset_77 ; BATTLEANIMFRAMESET_77 - dw .Frameset_78 ; BATTLEANIMFRAMESET_78 - dw .Frameset_79 ; BATTLEANIMFRAMESET_79 - dw .Frameset_7a ; BATTLEANIMFRAMESET_7A - dw .Frameset_7b ; BATTLEANIMFRAMESET_7B - dw .Frameset_7c ; BATTLEANIMFRAMESET_7C - dw .Frameset_7d ; BATTLEANIMFRAMESET_7D - dw .Frameset_7e ; BATTLEANIMFRAMESET_7E - dw .Frameset_7f ; BATTLEANIMFRAMESET_7F - dw .Frameset_80 ; BATTLEANIMFRAMESET_80 - dw .Frameset_81 ; BATTLEANIMFRAMESET_81 - dw .Frameset_82 ; BATTLEANIMFRAMESET_82 - dw .Frameset_83 ; BATTLEANIMFRAMESET_83 - dw .Frameset_84 ; BATTLEANIMFRAMESET_84 - dw .Frameset_85 ; BATTLEANIMFRAMESET_85 - dw .Frameset_86 ; BATTLEANIMFRAMESET_86 - dw .Frameset_87 ; BATTLEANIMFRAMESET_87 - dw .Frameset_88 ; BATTLEANIMFRAMESET_88 - dw .Frameset_89 ; BATTLEANIMFRAMESET_89 - dw .Frameset_8a ; BATTLEANIMFRAMESET_8A - dw .Frameset_8b ; BATTLEANIMFRAMESET_8B - dw .Frameset_8c ; BATTLEANIMFRAMESET_8C - dw .Frameset_8d ; BATTLEANIMFRAMESET_8D - dw .Frameset_8e ; BATTLEANIMFRAMESET_8E - dw .Frameset_8f ; BATTLEANIMFRAMESET_8F - dw .Frameset_90 ; BATTLEANIMFRAMESET_90 - dw .Frameset_91 ; BATTLEANIMFRAMESET_91 - dw .Frameset_92 ; BATTLEANIMFRAMESET_92 - dw .Frameset_93 ; BATTLEANIMFRAMESET_93 - dw .Frameset_94 ; BATTLEANIMFRAMESET_94 - dw .Frameset_95 ; BATTLEANIMFRAMESET_95 - dw .Frameset_96 ; BATTLEANIMFRAMESET_96 - dw .Frameset_97 ; BATTLEANIMFRAMESET_97 - dw .Frameset_98 ; BATTLEANIMFRAMESET_98 - dw .Frameset_99 ; BATTLEANIMFRAMESET_99 - dw .Frameset_9a ; BATTLEANIMFRAMESET_9A - dw .Frameset_9b ; BATTLEANIMFRAMESET_9B - dw .Frameset_9c ; BATTLEANIMFRAMESET_9C - dw .Frameset_9d ; BATTLEANIMFRAMESET_9D - dw .Frameset_9e ; BATTLEANIMFRAMESET_9E - dw .Frameset_9f ; BATTLEANIMFRAMESET_9F - dw .Frameset_a0 ; BATTLEANIMFRAMESET_A0 - dw .Frameset_a1 ; BATTLEANIMFRAMESET_A1 - dw .Frameset_a2 ; BATTLEANIMFRAMESET_A2 - dw .Frameset_a3 ; BATTLEANIMFRAMESET_A3 - dw .Frameset_a4 ; BATTLEANIMFRAMESET_A4 - dw .Frameset_a5 ; BATTLEANIMFRAMESET_A5 - dw .Frameset_a6 ; BATTLEANIMFRAMESET_A6 - dw .Frameset_a7 ; BATTLEANIMFRAMESET_A7 - dw .Frameset_a8 ; BATTLEANIMFRAMESET_A8 - dw .Frameset_a9 ; BATTLEANIMFRAMESET_A9 - dw .Frameset_aa ; BATTLEANIMFRAMESET_AA - dw .Frameset_ab ; BATTLEANIMFRAMESET_AB - dw .Frameset_ac ; BATTLEANIMFRAMESET_AC - dw .Frameset_ad ; BATTLEANIMFRAMESET_AD - dw .Frameset_ae ; BATTLEANIMFRAMESET_AE - dw .Frameset_af ; BATTLEANIMFRAMESET_AF - dw .Frameset_b0 ; BATTLEANIMFRAMESET_B0 - dw .Frameset_b1 ; BATTLEANIMFRAMESET_B1 - dw .Frameset_b2 ; BATTLEANIMFRAMESET_B2 - dw .Frameset_b3 ; BATTLEANIMFRAMESET_B3 - dw .Frameset_b4 ; BATTLEANIMFRAMESET_B4 - dw .Frameset_b5 ; BATTLEANIMFRAMESET_B5 - dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6 - dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7 - dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8 - - ; OAM index (see data/anims/oam.asm), flip flags / duration -.Frameset_00: - db BATTLEANIMOAMSET_00, $06 - db -4 - -.Frameset_01: - db BATTLEANIMOAMSET_01, $06 - db -4 - -.Frameset_02: - db BATTLEANIMOAMSET_02, $06 - db -4 - -.Frameset_03: - db BATTLEANIMOAMSET_03, $06 - db -4 - -.Frameset_04: - db BATTLEANIMOAMSET_04, $06 - db -4 - -.Frameset_05: - db BATTLEANIMOAMSET_05, $06 - db -4 - -.Frameset_06: - db BATTLEANIMOAMSET_06, $06 - db -4 - -.Frameset_07: - db BATTLEANIMOAMSET_03, $04 - db BATTLEANIMOAMSET_01, $01 - db BATTLEANIMOAMSET_03, $04 - db BATTLEANIMOAMSET_01, $01 - db BATTLEANIMOAMSET_03, $04 - db BATTLEANIMOAMSET_01, $01 - db BATTLEANIMOAMSET_03, $04 - db BATTLEANIMOAMSET_01, $01 - db -4 - -.Frameset_3e: - db BATTLEANIMOAMSET_4B, $02 - db BATTLEANIMOAMSET_4C, $02 - db BATTLEANIMOAMSET_4D, $04 - db BATTLEANIMOAMSET_4E, $02 - db -3, $02 - db BATTLEANIMOAMSET_4E, $02 - db -3, $02 - db BATTLEANIMOAMSET_4E, $02 - db -3, $02 - db BATTLEANIMOAMSET_4E, $02 - db -4 - -.Frameset_3f: - db BATTLEANIMOAMSET_4B, $42 - db BATTLEANIMOAMSET_4C, $42 - db BATTLEANIMOAMSET_4D, $44 - db BATTLEANIMOAMSET_4E, $42 - db -3, $02 - db BATTLEANIMOAMSET_4E, $42 - db -3, $02 - db BATTLEANIMOAMSET_4E, $42 - db -3, $02 - db BATTLEANIMOAMSET_4E, $42 - db -4 - -.Frameset_40: - db BATTLEANIMOAMSET_4B, $c2 - db BATTLEANIMOAMSET_4C, $c2 - db BATTLEANIMOAMSET_4D, $c4 - db BATTLEANIMOAMSET_4E, $c2 - db -3, $02 - db BATTLEANIMOAMSET_4E, $c2 - db -3, $02 - db BATTLEANIMOAMSET_4E, $c2 - db -3, $02 - db BATTLEANIMOAMSET_4E, $c2 - db -4 - -.Frameset_41: - db BATTLEANIMOAMSET_4B, $01 - db BATTLEANIMOAMSET_4C, $01 - db BATTLEANIMOAMSET_4D, $01 - db BATTLEANIMOAMSET_4F, $01 - db BATTLEANIMOAMSET_50, $01 - db BATTLEANIMOAMSET_51, $01 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -4 - -.Frameset_42: - db BATTLEANIMOAMSET_4B, $41 - db BATTLEANIMOAMSET_4C, $41 - db BATTLEANIMOAMSET_4D, $41 - db BATTLEANIMOAMSET_4F, $41 - db BATTLEANIMOAMSET_50, $41 - db BATTLEANIMOAMSET_51, $41 - db BATTLEANIMOAMSET_52, $42 - db -3, $02 - db BATTLEANIMOAMSET_52, $42 - db -3, $02 - db BATTLEANIMOAMSET_52, $42 - db -3, $02 - db BATTLEANIMOAMSET_52, $42 - db -4 - -.Frameset_08: - db BATTLEANIMOAMSET_00, $03 - db BATTLEANIMOAMSET_07, $03 - db BATTLEANIMOAMSET_08, $03 - db BATTLEANIMOAMSET_09, $03 - db -4 - -.Frameset_09: - db BATTLEANIMOAMSET_0A, $07 - db BATTLEANIMOAMSET_0B, $07 - db BATTLEANIMOAMSET_0A, $07 - db BATTLEANIMOAMSET_0B, $47 - db -2 - -.Frameset_0a: - db BATTLEANIMOAMSET_0C, $08 - db -1 - -.Frameset_0b: - db BATTLEANIMOAMSET_0D, $08 - db -1 - -.Frameset_0c: - db BATTLEANIMOAMSET_0A, $08 - db -1 - -.Frameset_0d: - db BATTLEANIMOAMSET_0A, $07 - db BATTLEANIMOAMSET_0B, $07 - db BATTLEANIMOAMSET_0A, $07 - db BATTLEANIMOAMSET_0B, $47 - db BATTLEANIMOAMSET_0A, $07 - db -1 - -.Frameset_0e: - db BATTLEANIMOAMSET_0A, $08 - db -1 - -.Frameset_0f: - db BATTLEANIMOAMSET_0A, $04 - db BATTLEANIMOAMSET_0E, $04 - db -2 - -.Frameset_10: - db BATTLEANIMOAMSET_0F, $04 - db BATTLEANIMOAMSET_10, $04 - db -2 - -.Frameset_11: - db BATTLEANIMOAMSET_10, $04 - db BATTLEANIMOAMSET_0F, $04 - db BATTLEANIMOAMSET_0E, $04 - db BATTLEANIMOAMSET_0A, $04 - db BATTLEANIMOAMSET_0E, $04 - db BATTLEANIMOAMSET_0A, $04 - db BATTLEANIMOAMSET_0E, $04 - db BATTLEANIMOAMSET_0A, $04 - db -4 - -.Frameset_12: - db BATTLEANIMOAMSET_10, $01 - db BATTLEANIMOAMSET_0F, $01 - db BATTLEANIMOAMSET_12, $01 - db BATTLEANIMOAMSET_11, $01 - db BATTLEANIMOAMSET_12, $01 - db BATTLEANIMOAMSET_0F, $01 - db -2 - -.Frameset_13: - db BATTLEANIMOAMSET_10, $03 - db BATTLEANIMOAMSET_0F, $03 - db BATTLEANIMOAMSET_12, $01 - db -3, $01 - db BATTLEANIMOAMSET_12, $01 - db -3, $01 - db BATTLEANIMOAMSET_12, $01 - db -3, $01 - db BATTLEANIMOAMSET_12, $01 - db -3, $01 - db BATTLEANIMOAMSET_12, $03 - db -4 - -.Frameset_14: - db BATTLEANIMOAMSET_13, $14 - db -4 - -.Frameset_15: - db BATTLEANIMOAMSET_10, $01 - db BATTLEANIMOAMSET_0F, $01 - db -2 - -.Frameset_16: - db BATTLEANIMOAMSET_14, $08 - db -1 - -.Frameset_17: - db BATTLEANIMOAMSET_17, $04 - db BATTLEANIMOAMSET_16, $08 - db BATTLEANIMOAMSET_15, $08 - db BATTLEANIMOAMSET_16, $08 - db BATTLEANIMOAMSET_17, $04 - db BATTLEANIMOAMSET_17, $04 - db BATTLEANIMOAMSET_16, $48 - db BATTLEANIMOAMSET_15, $48 - db BATTLEANIMOAMSET_16, $48 - db BATTLEANIMOAMSET_17, $04 - db -2 - -.Frameset_56: - db BATTLEANIMOAMSET_69, $08 - db -1 - -.Frameset_57: - db BATTLEANIMOAMSET_69, $20 - db BATTLEANIMOAMSET_6A, $04 - db BATTLEANIMOAMSET_6B, $04 - db BATTLEANIMOAMSET_6D, $04 - db BATTLEANIMOAMSET_6C, $04 - db -1 - -.Frameset_58: - db BATTLEANIMOAMSET_6C, $08 - db BATTLEANIMOAMSET_6D, $08 - db -2 - -.Frameset_18: - db BATTLEANIMOAMSET_18, $04 - db BATTLEANIMOAMSET_19, $04 - db BATTLEANIMOAMSET_1A, $04 - db -4 - -.Frameset_19: - db BATTLEANIMOAMSET_1B, $08 - db -1 - -.Frameset_1a: - db BATTLEANIMOAMSET_0F, $08 - db -1 - -.Frameset_1b: - db BATTLEANIMOAMSET_1C, $08 - db -1 - -.Frameset_1c: - db BATTLEANIMOAMSET_0A, $08 - db -4 - -.Frameset_1d: - db BATTLEANIMOAMSET_1D, $08 - db -1 - -.Frameset_1e: - db BATTLEANIMOAMSET_17, $08 - db -1 - -.Frameset_1f: - db BATTLEANIMOAMSET_0F, $03 - db BATTLEANIMOAMSET_10, $03 - db BATTLEANIMOAMSET_1E, $03 - db -1 - -.Frameset_20: - db BATTLEANIMOAMSET_1F, $10 - db BATTLEANIMOAMSET_20, $03 - db -4 - -.Frameset_21: - db BATTLEANIMOAMSET_20, $08 - db -1 - -.Frameset_22: - db BATTLEANIMOAMSET_20, $08 - db BATTLEANIMOAMSET_21, $08 - db BATTLEANIMOAMSET_1B, $08 - db BATTLEANIMOAMSET_21, $08 - db -2 - -.Frameset_23: - db BATTLEANIMOAMSET_22, $08 - db -1 - -.Frameset_24: - db BATTLEANIMOAMSET_1B, $08 - db -1 - -.Frameset_25: - db BATTLEANIMOAMSET_23, $08 - db -1 - -.Frameset_26: - db BATTLEANIMOAMSET_24, $08 - db -1 - -.Frameset_27: - db BATTLEANIMOAMSET_25, $08 - db -1 - -.Frameset_28: - db BATTLEANIMOAMSET_26, $08 - db BATTLEANIMOAMSET_27, $08 - db -1 - -.Frameset_29: - db BATTLEANIMOAMSET_28, $08 - db BATTLEANIMOAMSET_29, $08 - db -4 - -.Frameset_2a: - db BATTLEANIMOAMSET_2A, $01 - db BATTLEANIMOAMSET_2B, $01 - db BATTLEANIMOAMSET_2C, $01 - db BATTLEANIMOAMSET_2D, $01 - db BATTLEANIMOAMSET_2E, $01 - db BATTLEANIMOAMSET_2D, $01 - db BATTLEANIMOAMSET_2C, $01 - db BATTLEANIMOAMSET_2B, $01 - db BATTLEANIMOAMSET_2A, $01 - db -4 - -.Frameset_2b: - db BATTLEANIMOAMSET_14, $01 - db BATTLEANIMOAMSET_15, $01 - db -2 - -.Frameset_2c: - db BATTLEANIMOAMSET_2F, $04 - db BATTLEANIMOAMSET_30, $28 - db -4 - -.Frameset_2d: - db BATTLEANIMOAMSET_31, $08 - db -1 - -.Frameset_2e: - db BATTLEANIMOAMSET_32, $20 - db BATTLEANIMOAMSET_33, $20 - db BATTLEANIMOAMSET_34, $20 - db BATTLEANIMOAMSET_35, $20 ; fallthrough -.Frameset_2f: - db -3, $02 - db BATTLEANIMOAMSET_35, $04 - db -3, $02 - db BATTLEANIMOAMSET_35, $04 - db -3, $02 - db BATTLEANIMOAMSET_35, $04 - db -3, $02 - db BATTLEANIMOAMSET_35, $04 - db -4 - -.Frameset_30: - db BATTLEANIMOAMSET_14, $04 - db BATTLEANIMOAMSET_15, $04 - db -2 - -.Frameset_31: - db BATTLEANIMOAMSET_36, $02 - db BATTLEANIMOAMSET_37, $02 - db BATTLEANIMOAMSET_38, $02 - db BATTLEANIMOAMSET_39, $20 - db -4 - -.Frameset_32: - db BATTLEANIMOAMSET_3A, $02 - db BATTLEANIMOAMSET_3B, $02 - db BATTLEANIMOAMSET_3C, $02 - db BATTLEANIMOAMSET_3D, $20 - db -4 - -.Frameset_33: - db BATTLEANIMOAMSET_3A, $42 - db BATTLEANIMOAMSET_3B, $42 - db BATTLEANIMOAMSET_3C, $42 - db BATTLEANIMOAMSET_3D, $60 - db -4 - -.Frameset_34: - db BATTLEANIMOAMSET_3E, $08 - db BATTLEANIMOAMSET_3F, $08 - db BATTLEANIMOAMSET_40, $08 - db -1 - -.Frameset_35: - db BATTLEANIMOAMSET_40, $02 - db -3, $02 - db BATTLEANIMOAMSET_40, $02 - db -3, $02 - db BATTLEANIMOAMSET_41, $02 - db -3, $02 - db BATTLEANIMOAMSET_41, $02 - db -3, $02 - db -2 - -.Frameset_36: - db BATTLEANIMOAMSET_42, $02 - db BATTLEANIMOAMSET_43, $02 - db BATTLEANIMOAMSET_44, $02 - db BATTLEANIMOAMSET_45, $02 - db -2 - -.Frameset_37: - db BATTLEANIMOAMSET_19, $02 - db -3, $02 - db -2 - -.Frameset_38: - db BATTLEANIMOAMSET_46, $04 - db BATTLEANIMOAMSET_47, $04 - db -2 - -.Frameset_39: - db BATTLEANIMOAMSET_18, $02 - db -3, $02 - db -2 - -.Frameset_3a: - db BATTLEANIMOAMSET_48, $08 - db -1 - -.Frameset_3b: - db BATTLEANIMOAMSET_48, $48 - db -1 - -.Frameset_3c: - db BATTLEANIMOAMSET_49, $08 - db -1 - -.Frameset_3d: - db BATTLEANIMOAMSET_4A, $08 - db -1 - -.Frameset_43: - db BATTLEANIMOAMSET_20, $10 - db BATTLEANIMOAMSET_1F, $10 - db BATTLEANIMOAMSET_1E, $10 - db -1 - -.Frameset_4c: - db BATTLEANIMOAMSET_20, $08 - db BATTLEANIMOAMSET_1F, $08 - db BATTLEANIMOAMSET_1E, $08 - db -1 - -.Frameset_44: - db -3, $14 - db BATTLEANIMOAMSET_55, $28 - db BATTLEANIMOAMSET_54, $28 - db BATTLEANIMOAMSET_53, $14 - db -3, $04 - db BATTLEANIMOAMSET_53, $04 - db -3, $04 - db BATTLEANIMOAMSET_53, $04 - db -3, $04 - db BATTLEANIMOAMSET_53, $04 - db -4 - -.Frameset_7e: - db BATTLEANIMOAMSET_1E, $08 - db BATTLEANIMOAMSET_1F, $08 - db BATTLEANIMOAMSET_20, $08 - db -4 - -.Frameset_45: - db -3, $00 - db BATTLEANIMOAMSET_14, $00 - db BATTLEANIMOAMSET_15, $00 - db BATTLEANIMOAMSET_14, $40 - db -3, $00 - db BATTLEANIMOAMSET_16, $40 - db BATTLEANIMOAMSET_15, $00 - db BATTLEANIMOAMSET_16, $00 - db -2 - -.Frameset_46: - db BATTLEANIMOAMSET_56, $02 - db BATTLEANIMOAMSET_57, $04 - db -4 - -.Frameset_47: - db BATTLEANIMOAMSET_56, $c2 - db BATTLEANIMOAMSET_57, $c4 - db -4 - -.Frameset_48: - db BATTLEANIMOAMSET_56, $01 - db BATTLEANIMOAMSET_57, $01 - db BATTLEANIMOAMSET_58, $01 - db BATTLEANIMOAMSET_57, $c1 - db BATTLEANIMOAMSET_58, $c1 - db BATTLEANIMOAMSET_57, $02 - db -4 - -.Frameset_49: - db BATTLEANIMOAMSET_56, $c1 - db BATTLEANIMOAMSET_57, $c1 - db BATTLEANIMOAMSET_58, $c1 - db BATTLEANIMOAMSET_57, $01 - db BATTLEANIMOAMSET_58, $01 - db BATTLEANIMOAMSET_57, $c2 - db -4 - -.Frameset_4a: - db BATTLEANIMOAMSET_57, $c1 - db BATTLEANIMOAMSET_58, $c1 - db BATTLEANIMOAMSET_57, $01 - db BATTLEANIMOAMSET_58, $01 - db -2 - -.Frameset_4b: - db BATTLEANIMOAMSET_59, $01 - db BATTLEANIMOAMSET_5A, $01 - db BATTLEANIMOAMSET_5B, $01 - db BATTLEANIMOAMSET_5C, $02 - db -4 - -.Frameset_4d: - db BATTLEANIMOAMSET_0A, $0a - db BATTLEANIMOAMSET_0B, $43 - db BATTLEANIMOAMSET_5D, $43 - db BATTLEANIMOAMSET_0B, $c3 - db BATTLEANIMOAMSET_0A, $82 - db BATTLEANIMOAMSET_0B, $81 - db BATTLEANIMOAMSET_5D, $01 - db BATTLEANIMOAMSET_0B, $01 - db -2 - -.Frameset_4e: - db BATTLEANIMOAMSET_0A, $03 - db BATTLEANIMOAMSET_0B, $47 - db BATTLEANIMOAMSET_0A, $07 - db BATTLEANIMOAMSET_0B, $07 - db BATTLEANIMOAMSET_0A, $03 - db -2 - -.Frameset_4f: - db BATTLEANIMOAMSET_5E, $20 - db BATTLEANIMOAMSET_5E, $20 - db -4 - -.Frameset_50: - db BATTLEANIMOAMSET_5F, $20 - db BATTLEANIMOAMSET_5F, $20 - db -4 - -.Frameset_51: - db BATTLEANIMOAMSET_60, $08 - db -1 - -.Frameset_52: - db BATTLEANIMOAMSET_61, $01 - db BATTLEANIMOAMSET_62, $01 - db BATTLEANIMOAMSET_63, $01 - db -1 - -.Frameset_53: - db BATTLEANIMOAMSET_63, $07 - db BATTLEANIMOAMSET_64, $07 - db -2 - -.Frameset_54: - db BATTLEANIMOAMSET_65, $01 - db BATTLEANIMOAMSET_66, $01 - db BATTLEANIMOAMSET_67, $01 - db -1 - -.Frameset_55: - db BATTLEANIMOAMSET_67, $07 - db BATTLEANIMOAMSET_68, $07 - db -2 - -.Frameset_59: - db BATTLEANIMOAMSET_6E, $08 - db -1 - -.Frameset_5a: - db BATTLEANIMOAMSET_6F, $08 - db -1 - -.Frameset_5b: - db BATTLEANIMOAMSET_6E, $88 - db -1 - -.Frameset_5c: - db BATTLEANIMOAMSET_18, $04 - db BATTLEANIMOAMSET_70, $04 - db BATTLEANIMOAMSET_71, $04 - db BATTLEANIMOAMSET_72, $04 - db BATTLEANIMOAMSET_73, $04 - db -4 - -.Frameset_5d: - db BATTLEANIMOAMSET_74, $04 - db BATTLEANIMOAMSET_75, $04 - db -2 - -.Frameset_5e: - db BATTLEANIMOAMSET_14, $08 - db -1 - -.Frameset_7a: - db BATTLEANIMOAMSET_74, $03 - db BATTLEANIMOAMSET_14, $03 - db BATTLEANIMOAMSET_15, $03 - db BATTLEANIMOAMSET_14, $03 - db BATTLEANIMOAMSET_15, $03 - db -4 - -.Frameset_af: - db BATTLEANIMOAMSET_14, $00 - db BATTLEANIMOAMSET_15, $00 - db BATTLEANIMOAMSET_14, $00 - db BATTLEANIMOAMSET_15, $00 - db BATTLEANIMOAMSET_74, $0c - db -4 - -.Frameset_5f: - db BATTLEANIMOAMSET_76, $08 - db -1 - -.Frameset_60: - db BATTLEANIMOAMSET_77, $01 - db BATTLEANIMOAMSET_78, $01 - db BATTLEANIMOAMSET_79, $01 - db BATTLEANIMOAMSET_7A, $01 - db BATTLEANIMOAMSET_7B, $01 - db BATTLEANIMOAMSET_7C, $01 - db BATTLEANIMOAMSET_7D, $01 - db BATTLEANIMOAMSET_7C, $c1 - db BATTLEANIMOAMSET_7B, $c1 - db BATTLEANIMOAMSET_7A, $c1 - db BATTLEANIMOAMSET_79, $c1 - db BATTLEANIMOAMSET_78, $c1 - db BATTLEANIMOAMSET_77, $c1 - db -4 - -.Frameset_61: - db BATTLEANIMOAMSET_1B, $04 - db BATTLEANIMOAMSET_7E, $04 - db -2 - -.Frameset_62: - db BATTLEANIMOAMSET_1B, $44 - db BATTLEANIMOAMSET_7E, $44 - db -2 - -.Frameset_63: - db BATTLEANIMOAMSET_7F, $08 - db -1 - -.Frameset_64: - db BATTLEANIMOAMSET_25, $08 - db -1 - -.Frameset_65: - db BATTLEANIMOAMSET_80, $08 - db -1 - -.Frameset_66: - db BATTLEANIMOAMSET_83, $07 - db BATTLEANIMOAMSET_82, $07 - db BATTLEANIMOAMSET_81, $07 - db BATTLEANIMOAMSET_82, $07 - db BATTLEANIMOAMSET_83, $07 - db BATTLEANIMOAMSET_82, $07 - db BATTLEANIMOAMSET_81, $07 - db -4 - -.Frameset_67: - db BATTLEANIMOAMSET_1B, $10 - db -4 - -.Frameset_68: - db -3, $0f - db BATTLEANIMOAMSET_84, $0f - db BATTLEANIMOAMSET_85, $0f - db BATTLEANIMOAMSET_29, $0f - db BATTLEANIMOAMSET_28, $0f - db BATTLEANIMOAMSET_86, $20 - db -4 - -.Frameset_69: - db BATTLEANIMOAMSET_1B, $03 - db BATTLEANIMOAMSET_87, $03 - db BATTLEANIMOAMSET_88, $03 - db BATTLEANIMOAMSET_89, $03 - db -4 - -.Frameset_6a: - db BATTLEANIMOAMSET_8A, $02 - db BATTLEANIMOAMSET_8B, $02 - db BATTLEANIMOAMSET_8C, $02 - db BATTLEANIMOAMSET_8D, $02 - db -4 - -.Frameset_6b: - db BATTLEANIMOAMSET_61, $02 - db BATTLEANIMOAMSET_62, $02 - db BATTLEANIMOAMSET_63, $02 - db -1 - -.Frameset_6c: - db BATTLEANIMOAMSET_65, $02 - db BATTLEANIMOAMSET_66, $02 - db BATTLEANIMOAMSET_67, $02 - db -1 - -.Frameset_6d: - db BATTLEANIMOAMSET_8E, $08 - db -1 - -.Frameset_6e: - db BATTLEANIMOAMSET_8E, $48 - db -1 - -.Frameset_6f: - db BATTLEANIMOAMSET_8F, $10 - db BATTLEANIMOAMSET_90, $10 - db -2 - -.Frameset_70: - db BATTLEANIMOAMSET_91, $10 - db BATTLEANIMOAMSET_92, $10 - db -2 - -.Frameset_71: - db BATTLEANIMOAMSET_93, $08 - db -1 - -.Frameset_72: - db BATTLEANIMOAMSET_1E, $08 - db -1 - -.Frameset_73: - db BATTLEANIMOAMSET_1B, $07 - db BATTLEANIMOAMSET_94, $07 - db -2 - -.Frameset_74: - db BATTLEANIMOAMSET_95, $08 - db -1 - -.Frameset_75: - db BATTLEANIMOAMSET_96, $08 - db -1 - -.Frameset_76: - db BATTLEANIMOAMSET_95, $08 - db -1 - -.Frameset_77: - db BATTLEANIMOAMSET_97, $01 - db BATTLEANIMOAMSET_97, $41 - db -2 - -.Frameset_78: - db BATTLEANIMOAMSET_98, $08 - db -1 - -.Frameset_79: - db BATTLEANIMOAMSET_99, $20 - db BATTLEANIMOAMSET_99, $20 - db BATTLEANIMOAMSET_99, $20 - db BATTLEANIMOAMSET_99, $20 - db BATTLEANIMOAMSET_99, $20 - db BATTLEANIMOAMSET_9A, $08 - db -1 - -.Frameset_7b: - db BATTLEANIMOAMSET_9B, $08 - db -1 - -.Frameset_7c: - db BATTLEANIMOAMSET_9C, $02 - db BATTLEANIMOAMSET_9D, $02 - db BATTLEANIMOAMSET_9E, $08 - db -3, $02 - db BATTLEANIMOAMSET_9E, $02 - db -3, $02 - db BATTLEANIMOAMSET_9E, $02 - db -3, $02 - db BATTLEANIMOAMSET_9E, $02 - db -4 - -.Frameset_7d: - db BATTLEANIMOAMSET_9F, $08 - db -1 - -.Frameset_7f: - db BATTLEANIMOAMSET_0F, $08 - db -1 - -.Frameset_80: - db BATTLEANIMOAMSET_6B, $18 - db -4 - -.Frameset_81: - db BATTLEANIMOAMSET_A0, $01 ; fallthrough -.Frameset_82: - db BATTLEANIMOAMSET_A1, $01 ; fallthrough -.Frameset_83: - db BATTLEANIMOAMSET_A2, $01 - db -4 - -.Frameset_84: - db BATTLEANIMOAMSET_A3, $08 - db -1 - -.Frameset_85: - db BATTLEANIMOAMSET_A4, $04 - db BATTLEANIMOAMSET_A5, $04 - db BATTLEANIMOAMSET_A6, $04 - db BATTLEANIMOAMSET_A7, $04 - db BATTLEANIMOAMSET_A6, $44 - db BATTLEANIMOAMSET_A5, $44 - db -2 - -.Frameset_86: - db BATTLEANIMOAMSET_A8, $04 - db BATTLEANIMOAMSET_A9, $04 - db BATTLEANIMOAMSET_AA, $04 - db BATTLEANIMOAMSET_AB, $04 - db BATTLEANIMOAMSET_AA, $44 - db BATTLEANIMOAMSET_A9, $44 - db -2 - -.Frameset_87: - db BATTLEANIMOAMSET_1B, $08 - db -1 - -.Frameset_88: - db BATTLEANIMOAMSET_AC, $08 - db -1 - -.Frameset_89: - db BATTLEANIMOAMSET_AD, $08 - db -1 - -.Frameset_8a: - db BATTLEANIMOAMSET_AE, $08 - db -1 - -.Frameset_8b: - db BATTLEANIMOAMSET_AF, $08 - db -1 - -.Frameset_8c: - db BATTLEANIMOAMSET_B0, $20 - db -4 - -.Frameset_8d: - db BATTLEANIMOAMSET_B1, $07 - db BATTLEANIMOAMSET_B1, $47 - db -2 - -.Frameset_8e: - db BATTLEANIMOAMSET_B2, $08 - db -1 - -.Frameset_8f: - db BATTLEANIMOAMSET_B3, $08 - db -1 - -.Frameset_90: - db BATTLEANIMOAMSET_B3, $48 - db -1 - -.Frameset_91: - db BATTLEANIMOAMSET_B3, $88 - db -1 - -.Frameset_92: - db BATTLEANIMOAMSET_B3, $c8 - db -1 - -.Frameset_93: - db BATTLEANIMOAMSET_B5, $08 - db -1 - -.Frameset_94: - db BATTLEANIMOAMSET_B5, $48 - db -1 - -.Frameset_95: - db BATTLEANIMOAMSET_B5, $88 - db -1 - -.Frameset_96: - db BATTLEANIMOAMSET_B5, $c8 - db -1 - -.Frameset_97: - db BATTLEANIMOAMSET_B4, $08 - db -1 - -.Frameset_98: - db BATTLEANIMOAMSET_6B, $08 - db -1 - -.Frameset_99: - db BATTLEANIMOAMSET_B6, $08 - db -1 - -.Frameset_9a: - db BATTLEANIMOAMSET_B7, $20 - db -1 - -.Frameset_9b: - db BATTLEANIMOAMSET_1B, $20 - db -1 - -.Frameset_9c: - db BATTLEANIMOAMSET_B8, $20 - db -1 - -.Frameset_9d: - db BATTLEANIMOAMSET_B8, $60 - db -1 - -.Frameset_9e: - db BATTLEANIMOAMSET_B9, $20 - db -1 - -.Frameset_9f: - db BATTLEANIMOAMSET_BA, $20 - db -1 - -.Frameset_a0: - db BATTLEANIMOAMSET_BB, $60 - db -1 - -.Frameset_a1: - db BATTLEANIMOAMSET_BB, $20 - db -1 - -.Frameset_a2: - db BATTLEANIMOAMSET_BC, $20 - db -1 - -.Frameset_a3: - db BATTLEANIMOAMSET_BD, $0b - db BATTLEANIMOAMSET_BE, $0b - db BATTLEANIMOAMSET_1B, $0b - db -4 - -.Frameset_a4: - db BATTLEANIMOAMSET_BF, $04 - db BATTLEANIMOAMSET_C0, $04 - db BATTLEANIMOAMSET_C1, $04 - db -4 - -.Frameset_a5: - db BATTLEANIMOAMSET_C2, $20 - db BATTLEANIMOAMSET_C2, $20 - db -4 - -.Frameset_a6: - db BATTLEANIMOAMSET_4B, $02 - db BATTLEANIMOAMSET_4C, $02 - db BATTLEANIMOAMSET_4D, $20 - db BATTLEANIMOAMSET_4D, $20 - db BATTLEANIMOAMSET_4D, $20 - db BATTLEANIMOAMSET_4F, $01 - db BATTLEANIMOAMSET_50, $01 - db BATTLEANIMOAMSET_51, $01 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -3, $02 - db BATTLEANIMOAMSET_52, $02 - db -4 - -.Frameset_a7: - db BATTLEANIMOAMSET_4B, $c2 - db BATTLEANIMOAMSET_4C, $c2 - db BATTLEANIMOAMSET_4D, $e0 - db BATTLEANIMOAMSET_4D, $e0 - db BATTLEANIMOAMSET_4D, $e0 - db BATTLEANIMOAMSET_4F, $c1 - db BATTLEANIMOAMSET_50, $c1 - db BATTLEANIMOAMSET_51, $c1 - db BATTLEANIMOAMSET_52, $c2 - db -3, $02 - db BATTLEANIMOAMSET_52, $c2 - db -3, $02 - db BATTLEANIMOAMSET_52, $c2 - db -3, $02 - db BATTLEANIMOAMSET_52, $c2 - db -4 - -.Frameset_a8: - db BATTLEANIMOAMSET_C3, $01 - db BATTLEANIMOAMSET_C3, $c1 - db -2 - -.Frameset_a9: - db BATTLEANIMOAMSET_C4, $20 - db -1 - -.Frameset_aa: - db BATTLEANIMOAMSET_C5, $04 - db BATTLEANIMOAMSET_C6, $04 - db BATTLEANIMOAMSET_C7, $04 - db -4 - -.Frameset_ab: - db BATTLEANIMOAMSET_C8, $01 - db BATTLEANIMOAMSET_C8, $41 - db -2 - -.Frameset_ac: - db BATTLEANIMOAMSET_C9, $03 - db BATTLEANIMOAMSET_05, $03 - db -4 - -.Frameset_ad: - db BATTLEANIMOAMSET_CA, $20 - db BATTLEANIMOAMSET_CB, $03 - db BATTLEANIMOAMSET_CA, $03 - db BATTLEANIMOAMSET_CB, $03 - db -2 - -.Frameset_ae: - db BATTLEANIMOAMSET_03, $a0 - db -1 - -.Frameset_b0: - db BATTLEANIMOAMSET_CC, $20 - db -1 - -.Frameset_b1: - db BATTLEANIMOAMSET_7F, $02 - db BATTLEANIMOAMSET_25, $02 - db BATTLEANIMOAMSET_80, $02 - db BATTLEANIMOAMSET_25, $02 - db -2 - -.Frameset_b2: - db BATTLEANIMOAMSET_CD, $04 - db BATTLEANIMOAMSET_CE, $04 - db BATTLEANIMOAMSET_CD, $c4 - db BATTLEANIMOAMSET_CE, $c4 - db -2 - -.Frameset_b3: - db BATTLEANIMOAMSET_CF, $04 - db BATTLEANIMOAMSET_D0, $04 - db BATTLEANIMOAMSET_D1, $04 - db BATTLEANIMOAMSET_D2, $04 - db -4 - -.Frameset_b4: - db BATTLEANIMOAMSET_D3, $20 - db -1 - -.Frameset_b5: - db BATTLEANIMOAMSET_D4, $08 - db -1 - -.Frameset_b6: - db BATTLEANIMOAMSET_D5, $08 - db -1 - -.Frameset_b7: - db BATTLEANIMOAMSET_D6, $08 - db -1 - -.Frameset_b8: - db BATTLEANIMOAMSET_D7, $08 - db -1 - -; ceeae diff --git a/data/anims/ball_colors.asm b/data/battle_anims/ball_colors.asm index c3ba9d2b4..c3ba9d2b4 100644 --- a/data/anims/ball_colors.asm +++ b/data/battle_anims/ball_colors.asm diff --git a/data/battle_anims/framesets.asm b/data/battle_anims/framesets.asm new file mode 100755 index 000000000..671d12f95 --- /dev/null +++ b/data/battle_anims/framesets.asm @@ -0,0 +1,1270 @@ +BattleAnimFrameData: ; ce85e +; entries correspond to BATTLEANIMFRAMESET_* constants + dw .Frameset_00 ; BATTLEANIMFRAMESET_00 + dw .Frameset_01 ; BATTLEANIMFRAMESET_01 + dw .Frameset_02 ; BATTLEANIMFRAMESET_02 + dw .Frameset_03 ; BATTLEANIMFRAMESET_03 + dw .Frameset_04 ; BATTLEANIMFRAMESET_04 + dw .Frameset_05 ; BATTLEANIMFRAMESET_05 + dw .Frameset_06 ; BATTLEANIMFRAMESET_06 + dw .Frameset_07 ; BATTLEANIMFRAMESET_07 + dw .Frameset_08 ; BATTLEANIMFRAMESET_08 + dw .Frameset_09 ; BATTLEANIMFRAMESET_09 + dw .Frameset_0a ; BATTLEANIMFRAMESET_0A + dw .Frameset_0b ; BATTLEANIMFRAMESET_0B + dw .Frameset_0c ; BATTLEANIMFRAMESET_0C + dw .Frameset_0d ; BATTLEANIMFRAMESET_0D + dw .Frameset_0e ; BATTLEANIMFRAMESET_0E + dw .Frameset_0f ; BATTLEANIMFRAMESET_0F + dw .Frameset_10 ; BATTLEANIMFRAMESET_10 + dw .Frameset_11 ; BATTLEANIMFRAMESET_11 + dw .Frameset_12 ; BATTLEANIMFRAMESET_12 + dw .Frameset_13 ; BATTLEANIMFRAMESET_13 + dw .Frameset_14 ; BATTLEANIMFRAMESET_14 + dw .Frameset_15 ; BATTLEANIMFRAMESET_15 + dw .Frameset_16 ; BATTLEANIMFRAMESET_16 + dw .Frameset_17 ; BATTLEANIMFRAMESET_17 + dw .Frameset_18 ; BATTLEANIMFRAMESET_18 + dw .Frameset_19 ; BATTLEANIMFRAMESET_19 + dw .Frameset_1a ; BATTLEANIMFRAMESET_1A + dw .Frameset_1b ; BATTLEANIMFRAMESET_1B + dw .Frameset_1c ; BATTLEANIMFRAMESET_1C + dw .Frameset_1d ; BATTLEANIMFRAMESET_1D + dw .Frameset_1e ; BATTLEANIMFRAMESET_1E + dw .Frameset_1f ; BATTLEANIMFRAMESET_1F + dw .Frameset_20 ; BATTLEANIMFRAMESET_20 + dw .Frameset_21 ; BATTLEANIMFRAMESET_21 + dw .Frameset_22 ; BATTLEANIMFRAMESET_22 + dw .Frameset_23 ; BATTLEANIMFRAMESET_23 + dw .Frameset_24 ; BATTLEANIMFRAMESET_24 + dw .Frameset_25 ; BATTLEANIMFRAMESET_25 + dw .Frameset_26 ; BATTLEANIMFRAMESET_26 + dw .Frameset_27 ; BATTLEANIMFRAMESET_27 + dw .Frameset_28 ; BATTLEANIMFRAMESET_28 + dw .Frameset_29 ; BATTLEANIMFRAMESET_29 + dw .Frameset_2a ; BATTLEANIMFRAMESET_2A + dw .Frameset_2b ; BATTLEANIMFRAMESET_2B + dw .Frameset_2c ; BATTLEANIMFRAMESET_2C + dw .Frameset_2d ; BATTLEANIMFRAMESET_2D + dw .Frameset_2e ; BATTLEANIMFRAMESET_2E + dw .Frameset_2f ; BATTLEANIMFRAMESET_2F + dw .Frameset_30 ; BATTLEANIMFRAMESET_30 + dw .Frameset_31 ; BATTLEANIMFRAMESET_31 + dw .Frameset_32 ; BATTLEANIMFRAMESET_32 + dw .Frameset_33 ; BATTLEANIMFRAMESET_33 + dw .Frameset_34 ; BATTLEANIMFRAMESET_34 + dw .Frameset_35 ; BATTLEANIMFRAMESET_35 + dw .Frameset_36 ; BATTLEANIMFRAMESET_36 + dw .Frameset_37 ; BATTLEANIMFRAMESET_37 + dw .Frameset_38 ; BATTLEANIMFRAMESET_38 + dw .Frameset_39 ; BATTLEANIMFRAMESET_39 + dw .Frameset_3a ; BATTLEANIMFRAMESET_3A + dw .Frameset_3b ; BATTLEANIMFRAMESET_3B + dw .Frameset_3c ; BATTLEANIMFRAMESET_3C + dw .Frameset_3d ; BATTLEANIMFRAMESET_3D + dw .Frameset_3e ; BATTLEANIMFRAMESET_3E + dw .Frameset_3f ; BATTLEANIMFRAMESET_3F + dw .Frameset_40 ; BATTLEANIMFRAMESET_40 + dw .Frameset_41 ; BATTLEANIMFRAMESET_41 + dw .Frameset_42 ; BATTLEANIMFRAMESET_42 + dw .Frameset_43 ; BATTLEANIMFRAMESET_43 + dw .Frameset_44 ; BATTLEANIMFRAMESET_44 + dw .Frameset_45 ; BATTLEANIMFRAMESET_45 + dw .Frameset_46 ; BATTLEANIMFRAMESET_46 + dw .Frameset_47 ; BATTLEANIMFRAMESET_47 + dw .Frameset_48 ; BATTLEANIMFRAMESET_48 + dw .Frameset_49 ; BATTLEANIMFRAMESET_49 + dw .Frameset_4a ; BATTLEANIMFRAMESET_4A + dw .Frameset_4b ; BATTLEANIMFRAMESET_4B + dw .Frameset_4c ; BATTLEANIMFRAMESET_4C + dw .Frameset_4d ; BATTLEANIMFRAMESET_4D + dw .Frameset_4e ; BATTLEANIMFRAMESET_4E + dw .Frameset_4f ; BATTLEANIMFRAMESET_4F + dw .Frameset_50 ; BATTLEANIMFRAMESET_50 + dw .Frameset_51 ; BATTLEANIMFRAMESET_51 + dw .Frameset_52 ; BATTLEANIMFRAMESET_52 + dw .Frameset_53 ; BATTLEANIMFRAMESET_53 + dw .Frameset_54 ; BATTLEANIMFRAMESET_54 + dw .Frameset_55 ; BATTLEANIMFRAMESET_55 + dw .Frameset_56 ; BATTLEANIMFRAMESET_56 + dw .Frameset_57 ; BATTLEANIMFRAMESET_57 + dw .Frameset_58 ; BATTLEANIMFRAMESET_58 + dw .Frameset_59 ; BATTLEANIMFRAMESET_59 + dw .Frameset_5a ; BATTLEANIMFRAMESET_5A + dw .Frameset_5b ; BATTLEANIMFRAMESET_5B + dw .Frameset_5c ; BATTLEANIMFRAMESET_5C + dw .Frameset_5d ; BATTLEANIMFRAMESET_5D + dw .Frameset_5e ; BATTLEANIMFRAMESET_5E + dw .Frameset_5f ; BATTLEANIMFRAMESET_5F + dw .Frameset_60 ; BATTLEANIMFRAMESET_60 + dw .Frameset_61 ; BATTLEANIMFRAMESET_61 + dw .Frameset_62 ; BATTLEANIMFRAMESET_62 + dw .Frameset_63 ; BATTLEANIMFRAMESET_63 + dw .Frameset_64 ; BATTLEANIMFRAMESET_64 + dw .Frameset_65 ; BATTLEANIMFRAMESET_65 + dw .Frameset_66 ; BATTLEANIMFRAMESET_66 + dw .Frameset_67 ; BATTLEANIMFRAMESET_67 + dw .Frameset_68 ; BATTLEANIMFRAMESET_68 + dw .Frameset_69 ; BATTLEANIMFRAMESET_69 + dw .Frameset_6a ; BATTLEANIMFRAMESET_6A + dw .Frameset_6b ; BATTLEANIMFRAMESET_6B + dw .Frameset_6c ; BATTLEANIMFRAMESET_6C + dw .Frameset_6d ; BATTLEANIMFRAMESET_6D + dw .Frameset_6e ; BATTLEANIMFRAMESET_6E + dw .Frameset_6f ; BATTLEANIMFRAMESET_6F + dw .Frameset_70 ; BATTLEANIMFRAMESET_70 + dw .Frameset_71 ; BATTLEANIMFRAMESET_71 + dw .Frameset_72 ; BATTLEANIMFRAMESET_72 + dw .Frameset_73 ; BATTLEANIMFRAMESET_73 + dw .Frameset_74 ; BATTLEANIMFRAMESET_74 + dw .Frameset_75 ; BATTLEANIMFRAMESET_75 + dw .Frameset_76 ; BATTLEANIMFRAMESET_76 + dw .Frameset_77 ; BATTLEANIMFRAMESET_77 + dw .Frameset_78 ; BATTLEANIMFRAMESET_78 + dw .Frameset_79 ; BATTLEANIMFRAMESET_79 + dw .Frameset_7a ; BATTLEANIMFRAMESET_7A + dw .Frameset_7b ; BATTLEANIMFRAMESET_7B + dw .Frameset_7c ; BATTLEANIMFRAMESET_7C + dw .Frameset_7d ; BATTLEANIMFRAMESET_7D + dw .Frameset_7e ; BATTLEANIMFRAMESET_7E + dw .Frameset_7f ; BATTLEANIMFRAMESET_7F + dw .Frameset_80 ; BATTLEANIMFRAMESET_80 + dw .Frameset_81 ; BATTLEANIMFRAMESET_81 + dw .Frameset_82 ; BATTLEANIMFRAMESET_82 + dw .Frameset_83 ; BATTLEANIMFRAMESET_83 + dw .Frameset_84 ; BATTLEANIMFRAMESET_84 + dw .Frameset_85 ; BATTLEANIMFRAMESET_85 + dw .Frameset_86 ; BATTLEANIMFRAMESET_86 + dw .Frameset_87 ; BATTLEANIMFRAMESET_87 + dw .Frameset_88 ; BATTLEANIMFRAMESET_88 + dw .Frameset_89 ; BATTLEANIMFRAMESET_89 + dw .Frameset_8a ; BATTLEANIMFRAMESET_8A + dw .Frameset_8b ; BATTLEANIMFRAMESET_8B + dw .Frameset_8c ; BATTLEANIMFRAMESET_8C + dw .Frameset_8d ; BATTLEANIMFRAMESET_8D + dw .Frameset_8e ; BATTLEANIMFRAMESET_8E + dw .Frameset_8f ; BATTLEANIMFRAMESET_8F + dw .Frameset_90 ; BATTLEANIMFRAMESET_90 + dw .Frameset_91 ; BATTLEANIMFRAMESET_91 + dw .Frameset_92 ; BATTLEANIMFRAMESET_92 + dw .Frameset_93 ; BATTLEANIMFRAMESET_93 + dw .Frameset_94 ; BATTLEANIMFRAMESET_94 + dw .Frameset_95 ; BATTLEANIMFRAMESET_95 + dw .Frameset_96 ; BATTLEANIMFRAMESET_96 + dw .Frameset_97 ; BATTLEANIMFRAMESET_97 + dw .Frameset_98 ; BATTLEANIMFRAMESET_98 + dw .Frameset_99 ; BATTLEANIMFRAMESET_99 + dw .Frameset_9a ; BATTLEANIMFRAMESET_9A + dw .Frameset_9b ; BATTLEANIMFRAMESET_9B + dw .Frameset_9c ; BATTLEANIMFRAMESET_9C + dw .Frameset_9d ; BATTLEANIMFRAMESET_9D + dw .Frameset_9e ; BATTLEANIMFRAMESET_9E + dw .Frameset_9f ; BATTLEANIMFRAMESET_9F + dw .Frameset_a0 ; BATTLEANIMFRAMESET_A0 + dw .Frameset_a1 ; BATTLEANIMFRAMESET_A1 + dw .Frameset_a2 ; BATTLEANIMFRAMESET_A2 + dw .Frameset_a3 ; BATTLEANIMFRAMESET_A3 + dw .Frameset_a4 ; BATTLEANIMFRAMESET_A4 + dw .Frameset_a5 ; BATTLEANIMFRAMESET_A5 + dw .Frameset_a6 ; BATTLEANIMFRAMESET_A6 + dw .Frameset_a7 ; BATTLEANIMFRAMESET_A7 + dw .Frameset_a8 ; BATTLEANIMFRAMESET_A8 + dw .Frameset_a9 ; BATTLEANIMFRAMESET_A9 + dw .Frameset_aa ; BATTLEANIMFRAMESET_AA + dw .Frameset_ab ; BATTLEANIMFRAMESET_AB + dw .Frameset_ac ; BATTLEANIMFRAMESET_AC + dw .Frameset_ad ; BATTLEANIMFRAMESET_AD + dw .Frameset_ae ; BATTLEANIMFRAMESET_AE + dw .Frameset_af ; BATTLEANIMFRAMESET_AF + dw .Frameset_b0 ; BATTLEANIMFRAMESET_B0 + dw .Frameset_b1 ; BATTLEANIMFRAMESET_B1 + dw .Frameset_b2 ; BATTLEANIMFRAMESET_B2 + dw .Frameset_b3 ; BATTLEANIMFRAMESET_B3 + dw .Frameset_b4 ; BATTLEANIMFRAMESET_B4 + dw .Frameset_b5 ; BATTLEANIMFRAMESET_B5 + dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6 + dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7 + dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8 + +.Frameset_00: + frame BATTLEANIMOAMSET_00, $06 + delanim + +.Frameset_01: + frame BATTLEANIMOAMSET_01, $06 + delanim + +.Frameset_02: + frame BATTLEANIMOAMSET_02, $06 + delanim + +.Frameset_03: + frame BATTLEANIMOAMSET_03, $06 + delanim + +.Frameset_04: + frame BATTLEANIMOAMSET_04, $06 + delanim + +.Frameset_05: + frame BATTLEANIMOAMSET_05, $06 + delanim + +.Frameset_06: + frame BATTLEANIMOAMSET_06, $06 + delanim + +.Frameset_07: + frame BATTLEANIMOAMSET_03, $04 + frame BATTLEANIMOAMSET_01, $01 + frame BATTLEANIMOAMSET_03, $04 + frame BATTLEANIMOAMSET_01, $01 + frame BATTLEANIMOAMSET_03, $04 + frame BATTLEANIMOAMSET_01, $01 + frame BATTLEANIMOAMSET_03, $04 + frame BATTLEANIMOAMSET_01, $01 + delanim + +.Frameset_3e: + frame BATTLEANIMOAMSET_4B, $02 + frame BATTLEANIMOAMSET_4C, $02 + frame BATTLEANIMOAMSET_4D, $04 + frame BATTLEANIMOAMSET_4E, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $02 + delanim + +.Frameset_3f: + frame BATTLEANIMOAMSET_4B, $42 + frame BATTLEANIMOAMSET_4C, $42 + frame BATTLEANIMOAMSET_4D, $44 + frame BATTLEANIMOAMSET_4E, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $42 + delanim + +.Frameset_40: + frame BATTLEANIMOAMSET_4B, $c2 + frame BATTLEANIMOAMSET_4C, $c2 + frame BATTLEANIMOAMSET_4D, $c4 + frame BATTLEANIMOAMSET_4E, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_4E, $c2 + delanim + +.Frameset_41: + frame BATTLEANIMOAMSET_4B, $01 + frame BATTLEANIMOAMSET_4C, $01 + frame BATTLEANIMOAMSET_4D, $01 + frame BATTLEANIMOAMSET_4F, $01 + frame BATTLEANIMOAMSET_50, $01 + frame BATTLEANIMOAMSET_51, $01 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + delanim + +.Frameset_42: + frame BATTLEANIMOAMSET_4B, $41 + frame BATTLEANIMOAMSET_4C, $41 + frame BATTLEANIMOAMSET_4D, $41 + frame BATTLEANIMOAMSET_4F, $41 + frame BATTLEANIMOAMSET_50, $41 + frame BATTLEANIMOAMSET_51, $41 + frame BATTLEANIMOAMSET_52, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $42 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $42 + delanim + +.Frameset_08: + frame BATTLEANIMOAMSET_00, $03 + frame BATTLEANIMOAMSET_07, $03 + frame BATTLEANIMOAMSET_08, $03 + frame BATTLEANIMOAMSET_09, $03 + delanim + +.Frameset_09: + frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0B, $07 + frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0B, $47 + dorestart + +.Frameset_0a: + frame BATTLEANIMOAMSET_0C, $08 + endanim + +.Frameset_0b: + frame BATTLEANIMOAMSET_0D, $08 + endanim + +.Frameset_0c: + frame BATTLEANIMOAMSET_0A, $08 + endanim + +.Frameset_0d: + frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0B, $07 + frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0B, $47 + frame BATTLEANIMOAMSET_0A, $07 + endanim + +.Frameset_0e: + frame BATTLEANIMOAMSET_0A, $08 + endanim + +.Frameset_0f: + frame BATTLEANIMOAMSET_0A, $04 + frame BATTLEANIMOAMSET_0E, $04 + dorestart + +.Frameset_10: + frame BATTLEANIMOAMSET_0F, $04 + frame BATTLEANIMOAMSET_10, $04 + dorestart + +.Frameset_11: + frame BATTLEANIMOAMSET_10, $04 + frame BATTLEANIMOAMSET_0F, $04 + frame BATTLEANIMOAMSET_0E, $04 + frame BATTLEANIMOAMSET_0A, $04 + frame BATTLEANIMOAMSET_0E, $04 + frame BATTLEANIMOAMSET_0A, $04 + frame BATTLEANIMOAMSET_0E, $04 + frame BATTLEANIMOAMSET_0A, $04 + delanim + +.Frameset_12: + frame BATTLEANIMOAMSET_10, $01 + frame BATTLEANIMOAMSET_0F, $01 + frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_11, $01 + frame BATTLEANIMOAMSET_12, $01 + frame BATTLEANIMOAMSET_0F, $01 + dorestart + +.Frameset_13: + frame BATTLEANIMOAMSET_10, $03 + frame BATTLEANIMOAMSET_0F, $03 + frame BATTLEANIMOAMSET_12, $01 + dorepeat 1 + frame BATTLEANIMOAMSET_12, $01 + dorepeat 1 + frame BATTLEANIMOAMSET_12, $01 + dorepeat 1 + frame BATTLEANIMOAMSET_12, $01 + dorepeat 1 + frame BATTLEANIMOAMSET_12, $03 + delanim + +.Frameset_14: + frame BATTLEANIMOAMSET_13, $14 + delanim + +.Frameset_15: + frame BATTLEANIMOAMSET_10, $01 + frame BATTLEANIMOAMSET_0F, $01 + dorestart + +.Frameset_16: + frame BATTLEANIMOAMSET_14, $08 + endanim + +.Frameset_17: + frame BATTLEANIMOAMSET_17, $04 + frame BATTLEANIMOAMSET_16, $08 + frame BATTLEANIMOAMSET_15, $08 + frame BATTLEANIMOAMSET_16, $08 + frame BATTLEANIMOAMSET_17, $04 + frame BATTLEANIMOAMSET_17, $04 + frame BATTLEANIMOAMSET_16, $48 + frame BATTLEANIMOAMSET_15, $48 + frame BATTLEANIMOAMSET_16, $48 + frame BATTLEANIMOAMSET_17, $04 + dorestart + +.Frameset_56: + frame BATTLEANIMOAMSET_69, $08 + endanim + +.Frameset_57: + frame BATTLEANIMOAMSET_69, $20 + frame BATTLEANIMOAMSET_6A, $04 + frame BATTLEANIMOAMSET_6B, $04 + frame BATTLEANIMOAMSET_6D, $04 + frame BATTLEANIMOAMSET_6C, $04 + endanim + +.Frameset_58: + frame BATTLEANIMOAMSET_6C, $08 + frame BATTLEANIMOAMSET_6D, $08 + dorestart + +.Frameset_18: + frame BATTLEANIMOAMSET_18, $04 + frame BATTLEANIMOAMSET_19, $04 + frame BATTLEANIMOAMSET_1A, $04 + delanim + +.Frameset_19: + frame BATTLEANIMOAMSET_1B, $08 + endanim + +.Frameset_1a: + frame BATTLEANIMOAMSET_0F, $08 + endanim + +.Frameset_1b: + frame BATTLEANIMOAMSET_1C, $08 + endanim + +.Frameset_1c: + frame BATTLEANIMOAMSET_0A, $08 + delanim + +.Frameset_1d: + frame BATTLEANIMOAMSET_1D, $08 + endanim + +.Frameset_1e: + frame BATTLEANIMOAMSET_17, $08 + endanim + +.Frameset_1f: + frame BATTLEANIMOAMSET_0F, $03 + frame BATTLEANIMOAMSET_10, $03 + frame BATTLEANIMOAMSET_1E, $03 + endanim + +.Frameset_20: + frame BATTLEANIMOAMSET_1F, $10 + frame BATTLEANIMOAMSET_20, $03 + delanim + +.Frameset_21: + frame BATTLEANIMOAMSET_20, $08 + endanim + +.Frameset_22: + frame BATTLEANIMOAMSET_20, $08 + frame BATTLEANIMOAMSET_21, $08 + frame BATTLEANIMOAMSET_1B, $08 + frame BATTLEANIMOAMSET_21, $08 + dorestart + +.Frameset_23: + frame BATTLEANIMOAMSET_22, $08 + endanim + +.Frameset_24: + frame BATTLEANIMOAMSET_1B, $08 + endanim + +.Frameset_25: + frame BATTLEANIMOAMSET_23, $08 + endanim + +.Frameset_26: + frame BATTLEANIMOAMSET_24, $08 + endanim + +.Frameset_27: + frame BATTLEANIMOAMSET_25, $08 + endanim + +.Frameset_28: + frame BATTLEANIMOAMSET_26, $08 + frame BATTLEANIMOAMSET_27, $08 + endanim + +.Frameset_29: + frame BATTLEANIMOAMSET_28, $08 + frame BATTLEANIMOAMSET_29, $08 + delanim + +.Frameset_2a: + frame BATTLEANIMOAMSET_2A, $01 + frame BATTLEANIMOAMSET_2B, $01 + frame BATTLEANIMOAMSET_2C, $01 + frame BATTLEANIMOAMSET_2D, $01 + frame BATTLEANIMOAMSET_2E, $01 + frame BATTLEANIMOAMSET_2D, $01 + frame BATTLEANIMOAMSET_2C, $01 + frame BATTLEANIMOAMSET_2B, $01 + frame BATTLEANIMOAMSET_2A, $01 + delanim + +.Frameset_2b: + frame BATTLEANIMOAMSET_14, $01 + frame BATTLEANIMOAMSET_15, $01 + dorestart + +.Frameset_2c: + frame BATTLEANIMOAMSET_2F, $04 + frame BATTLEANIMOAMSET_30, $28 + delanim + +.Frameset_2d: + frame BATTLEANIMOAMSET_31, $08 + endanim + +.Frameset_2e: + frame BATTLEANIMOAMSET_32, $20 + frame BATTLEANIMOAMSET_33, $20 + frame BATTLEANIMOAMSET_34, $20 + frame BATTLEANIMOAMSET_35, $20 ; fallthrough +.Frameset_2f: + dorepeat 2 + frame BATTLEANIMOAMSET_35, $04 + dorepeat 2 + frame BATTLEANIMOAMSET_35, $04 + dorepeat 2 + frame BATTLEANIMOAMSET_35, $04 + dorepeat 2 + frame BATTLEANIMOAMSET_35, $04 + delanim + +.Frameset_30: + frame BATTLEANIMOAMSET_14, $04 + frame BATTLEANIMOAMSET_15, $04 + dorestart + +.Frameset_31: + frame BATTLEANIMOAMSET_36, $02 + frame BATTLEANIMOAMSET_37, $02 + frame BATTLEANIMOAMSET_38, $02 + frame BATTLEANIMOAMSET_39, $20 + delanim + +.Frameset_32: + frame BATTLEANIMOAMSET_3A, $02 + frame BATTLEANIMOAMSET_3B, $02 + frame BATTLEANIMOAMSET_3C, $02 + frame BATTLEANIMOAMSET_3D, $20 + delanim + +.Frameset_33: + frame BATTLEANIMOAMSET_3A, $42 + frame BATTLEANIMOAMSET_3B, $42 + frame BATTLEANIMOAMSET_3C, $42 + frame BATTLEANIMOAMSET_3D, $60 + delanim + +.Frameset_34: + frame BATTLEANIMOAMSET_3E, $08 + frame BATTLEANIMOAMSET_3F, $08 + frame BATTLEANIMOAMSET_40, $08 + endanim + +.Frameset_35: + frame BATTLEANIMOAMSET_40, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_40, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_41, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_41, $02 + dorepeat 2 + dorestart + +.Frameset_36: + frame BATTLEANIMOAMSET_42, $02 + frame BATTLEANIMOAMSET_43, $02 + frame BATTLEANIMOAMSET_44, $02 + frame BATTLEANIMOAMSET_45, $02 + dorestart + +.Frameset_37: + frame BATTLEANIMOAMSET_19, $02 + dorepeat 2 + dorestart + +.Frameset_38: + frame BATTLEANIMOAMSET_46, $04 + frame BATTLEANIMOAMSET_47, $04 + dorestart + +.Frameset_39: + frame BATTLEANIMOAMSET_18, $02 + dorepeat 2 + dorestart + +.Frameset_3a: + frame BATTLEANIMOAMSET_48, $08 + endanim + +.Frameset_3b: + frame BATTLEANIMOAMSET_48, $48 + endanim + +.Frameset_3c: + frame BATTLEANIMOAMSET_49, $08 + endanim + +.Frameset_3d: + frame BATTLEANIMOAMSET_4A, $08 + endanim + +.Frameset_43: + frame BATTLEANIMOAMSET_20, $10 + frame BATTLEANIMOAMSET_1F, $10 + frame BATTLEANIMOAMSET_1E, $10 + endanim + +.Frameset_4c: + frame BATTLEANIMOAMSET_20, $08 + frame BATTLEANIMOAMSET_1F, $08 + frame BATTLEANIMOAMSET_1E, $08 + endanim + +.Frameset_44: + dorepeat 20 + frame BATTLEANIMOAMSET_55, $28 + frame BATTLEANIMOAMSET_54, $28 + frame BATTLEANIMOAMSET_53, $14 + dorepeat 4 + frame BATTLEANIMOAMSET_53, $04 + dorepeat 4 + frame BATTLEANIMOAMSET_53, $04 + dorepeat 4 + frame BATTLEANIMOAMSET_53, $04 + delanim + +.Frameset_7e: + frame BATTLEANIMOAMSET_1E, $08 + frame BATTLEANIMOAMSET_1F, $08 + frame BATTLEANIMOAMSET_20, $08 + delanim + +.Frameset_45: + dorepeat 0 + frame BATTLEANIMOAMSET_14, $00 + frame BATTLEANIMOAMSET_15, $00 + frame BATTLEANIMOAMSET_14, $40 + dorepeat 0 + frame BATTLEANIMOAMSET_16, $40 + frame BATTLEANIMOAMSET_15, $00 + frame BATTLEANIMOAMSET_16, $00 + dorestart + +.Frameset_46: + frame BATTLEANIMOAMSET_56, $02 + frame BATTLEANIMOAMSET_57, $04 + delanim + +.Frameset_47: + frame BATTLEANIMOAMSET_56, $c2 + frame BATTLEANIMOAMSET_57, $c4 + delanim + +.Frameset_48: + frame BATTLEANIMOAMSET_56, $01 + frame BATTLEANIMOAMSET_57, $01 + frame BATTLEANIMOAMSET_58, $01 + frame BATTLEANIMOAMSET_57, $c1 + frame BATTLEANIMOAMSET_58, $c1 + frame BATTLEANIMOAMSET_57, $02 + delanim + +.Frameset_49: + frame BATTLEANIMOAMSET_56, $c1 + frame BATTLEANIMOAMSET_57, $c1 + frame BATTLEANIMOAMSET_58, $c1 + frame BATTLEANIMOAMSET_57, $01 + frame BATTLEANIMOAMSET_58, $01 + frame BATTLEANIMOAMSET_57, $c2 + delanim + +.Frameset_4a: + frame BATTLEANIMOAMSET_57, $c1 + frame BATTLEANIMOAMSET_58, $c1 + frame BATTLEANIMOAMSET_57, $01 + frame BATTLEANIMOAMSET_58, $01 + dorestart + +.Frameset_4b: + frame BATTLEANIMOAMSET_59, $01 + frame BATTLEANIMOAMSET_5A, $01 + frame BATTLEANIMOAMSET_5B, $01 + frame BATTLEANIMOAMSET_5C, $02 + delanim + +.Frameset_4d: + frame BATTLEANIMOAMSET_0A, $0a + frame BATTLEANIMOAMSET_0B, $43 + frame BATTLEANIMOAMSET_5D, $43 + frame BATTLEANIMOAMSET_0B, $c3 + frame BATTLEANIMOAMSET_0A, $82 + frame BATTLEANIMOAMSET_0B, $81 + frame BATTLEANIMOAMSET_5D, $01 + frame BATTLEANIMOAMSET_0B, $01 + dorestart + +.Frameset_4e: + frame BATTLEANIMOAMSET_0A, $03 + frame BATTLEANIMOAMSET_0B, $47 + frame BATTLEANIMOAMSET_0A, $07 + frame BATTLEANIMOAMSET_0B, $07 + frame BATTLEANIMOAMSET_0A, $03 + dorestart + +.Frameset_4f: + frame BATTLEANIMOAMSET_5E, $20 + frame BATTLEANIMOAMSET_5E, $20 + delanim + +.Frameset_50: + frame BATTLEANIMOAMSET_5F, $20 + frame BATTLEANIMOAMSET_5F, $20 + delanim + +.Frameset_51: + frame BATTLEANIMOAMSET_60, $08 + endanim + +.Frameset_52: + frame BATTLEANIMOAMSET_61, $01 + frame BATTLEANIMOAMSET_62, $01 + frame BATTLEANIMOAMSET_63, $01 + endanim + +.Frameset_53: + frame BATTLEANIMOAMSET_63, $07 + frame BATTLEANIMOAMSET_64, $07 + dorestart + +.Frameset_54: + frame BATTLEANIMOAMSET_65, $01 + frame BATTLEANIMOAMSET_66, $01 + frame BATTLEANIMOAMSET_67, $01 + endanim + +.Frameset_55: + frame BATTLEANIMOAMSET_67, $07 + frame BATTLEANIMOAMSET_68, $07 + dorestart + +.Frameset_59: + frame BATTLEANIMOAMSET_6E, $08 + endanim + +.Frameset_5a: + frame BATTLEANIMOAMSET_6F, $08 + endanim + +.Frameset_5b: + frame BATTLEANIMOAMSET_6E, $88 + endanim + +.Frameset_5c: + frame BATTLEANIMOAMSET_18, $04 + frame BATTLEANIMOAMSET_70, $04 + frame BATTLEANIMOAMSET_71, $04 + frame BATTLEANIMOAMSET_72, $04 + frame BATTLEANIMOAMSET_73, $04 + delanim + +.Frameset_5d: + frame BATTLEANIMOAMSET_74, $04 + frame BATTLEANIMOAMSET_75, $04 + dorestart + +.Frameset_5e: + frame BATTLEANIMOAMSET_14, $08 + endanim + +.Frameset_7a: + frame BATTLEANIMOAMSET_74, $03 + frame BATTLEANIMOAMSET_14, $03 + frame BATTLEANIMOAMSET_15, $03 + frame BATTLEANIMOAMSET_14, $03 + frame BATTLEANIMOAMSET_15, $03 + delanim + +.Frameset_af: + frame BATTLEANIMOAMSET_14, $00 + frame BATTLEANIMOAMSET_15, $00 + frame BATTLEANIMOAMSET_14, $00 + frame BATTLEANIMOAMSET_15, $00 + frame BATTLEANIMOAMSET_74, $0c + delanim + +.Frameset_5f: + frame BATTLEANIMOAMSET_76, $08 + endanim + +.Frameset_60: + frame BATTLEANIMOAMSET_77, $01 + frame BATTLEANIMOAMSET_78, $01 + frame BATTLEANIMOAMSET_79, $01 + frame BATTLEANIMOAMSET_7A, $01 + frame BATTLEANIMOAMSET_7B, $01 + frame BATTLEANIMOAMSET_7C, $01 + frame BATTLEANIMOAMSET_7D, $01 + frame BATTLEANIMOAMSET_7C, $c1 + frame BATTLEANIMOAMSET_7B, $c1 + frame BATTLEANIMOAMSET_7A, $c1 + frame BATTLEANIMOAMSET_79, $c1 + frame BATTLEANIMOAMSET_78, $c1 + frame BATTLEANIMOAMSET_77, $c1 + delanim + +.Frameset_61: + frame BATTLEANIMOAMSET_1B, $04 + frame BATTLEANIMOAMSET_7E, $04 + dorestart + +.Frameset_62: + frame BATTLEANIMOAMSET_1B, $44 + frame BATTLEANIMOAMSET_7E, $44 + dorestart + +.Frameset_63: + frame BATTLEANIMOAMSET_7F, $08 + endanim + +.Frameset_64: + frame BATTLEANIMOAMSET_25, $08 + endanim + +.Frameset_65: + frame BATTLEANIMOAMSET_80, $08 + endanim + +.Frameset_66: + frame BATTLEANIMOAMSET_83, $07 + frame BATTLEANIMOAMSET_82, $07 + frame BATTLEANIMOAMSET_81, $07 + frame BATTLEANIMOAMSET_82, $07 + frame BATTLEANIMOAMSET_83, $07 + frame BATTLEANIMOAMSET_82, $07 + frame BATTLEANIMOAMSET_81, $07 + delanim + +.Frameset_67: + frame BATTLEANIMOAMSET_1B, $10 + delanim + +.Frameset_68: + dorepeat 15 + frame BATTLEANIMOAMSET_84, $0f + frame BATTLEANIMOAMSET_85, $0f + frame BATTLEANIMOAMSET_29, $0f + frame BATTLEANIMOAMSET_28, $0f + frame BATTLEANIMOAMSET_86, $20 + delanim + +.Frameset_69: + frame BATTLEANIMOAMSET_1B, $03 + frame BATTLEANIMOAMSET_87, $03 + frame BATTLEANIMOAMSET_88, $03 + frame BATTLEANIMOAMSET_89, $03 + delanim + +.Frameset_6a: + frame BATTLEANIMOAMSET_8A, $02 + frame BATTLEANIMOAMSET_8B, $02 + frame BATTLEANIMOAMSET_8C, $02 + frame BATTLEANIMOAMSET_8D, $02 + delanim + +.Frameset_6b: + frame BATTLEANIMOAMSET_61, $02 + frame BATTLEANIMOAMSET_62, $02 + frame BATTLEANIMOAMSET_63, $02 + endanim + +.Frameset_6c: + frame BATTLEANIMOAMSET_65, $02 + frame BATTLEANIMOAMSET_66, $02 + frame BATTLEANIMOAMSET_67, $02 + endanim + +.Frameset_6d: + frame BATTLEANIMOAMSET_8E, $08 + endanim + +.Frameset_6e: + frame BATTLEANIMOAMSET_8E, $48 + endanim + +.Frameset_6f: + frame BATTLEANIMOAMSET_8F, $10 + frame BATTLEANIMOAMSET_90, $10 + dorestart + +.Frameset_70: + frame BATTLEANIMOAMSET_91, $10 + frame BATTLEANIMOAMSET_92, $10 + dorestart + +.Frameset_71: + frame BATTLEANIMOAMSET_93, $08 + endanim + +.Frameset_72: + frame BATTLEANIMOAMSET_1E, $08 + endanim + +.Frameset_73: + frame BATTLEANIMOAMSET_1B, $07 + frame BATTLEANIMOAMSET_94, $07 + dorestart + +.Frameset_74: + frame BATTLEANIMOAMSET_95, $08 + endanim + +.Frameset_75: + frame BATTLEANIMOAMSET_96, $08 + endanim + +.Frameset_76: + frame BATTLEANIMOAMSET_95, $08 + endanim + +.Frameset_77: + frame BATTLEANIMOAMSET_97, $01 + frame BATTLEANIMOAMSET_97, $41 + dorestart + +.Frameset_78: + frame BATTLEANIMOAMSET_98, $08 + endanim + +.Frameset_79: + frame BATTLEANIMOAMSET_99, $20 + frame BATTLEANIMOAMSET_99, $20 + frame BATTLEANIMOAMSET_99, $20 + frame BATTLEANIMOAMSET_99, $20 + frame BATTLEANIMOAMSET_99, $20 + frame BATTLEANIMOAMSET_9A, $08 + endanim + +.Frameset_7b: + frame BATTLEANIMOAMSET_9B, $08 + endanim + +.Frameset_7c: + frame BATTLEANIMOAMSET_9C, $02 + frame BATTLEANIMOAMSET_9D, $02 + frame BATTLEANIMOAMSET_9E, $08 + dorepeat 2 + frame BATTLEANIMOAMSET_9E, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_9E, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_9E, $02 + delanim + +.Frameset_7d: + frame BATTLEANIMOAMSET_9F, $08 + endanim + +.Frameset_7f: + frame BATTLEANIMOAMSET_0F, $08 + endanim + +.Frameset_80: + frame BATTLEANIMOAMSET_6B, $18 + delanim + +.Frameset_81: + frame BATTLEANIMOAMSET_A0, $01 ; fallthrough +.Frameset_82: + frame BATTLEANIMOAMSET_A1, $01 ; fallthrough +.Frameset_83: + frame BATTLEANIMOAMSET_A2, $01 + delanim + +.Frameset_84: + frame BATTLEANIMOAMSET_A3, $08 + endanim + +.Frameset_85: + frame BATTLEANIMOAMSET_A4, $04 + frame BATTLEANIMOAMSET_A5, $04 + frame BATTLEANIMOAMSET_A6, $04 + frame BATTLEANIMOAMSET_A7, $04 + frame BATTLEANIMOAMSET_A6, $44 + frame BATTLEANIMOAMSET_A5, $44 + dorestart + +.Frameset_86: + frame BATTLEANIMOAMSET_A8, $04 + frame BATTLEANIMOAMSET_A9, $04 + frame BATTLEANIMOAMSET_AA, $04 + frame BATTLEANIMOAMSET_AB, $04 + frame BATTLEANIMOAMSET_AA, $44 + frame BATTLEANIMOAMSET_A9, $44 + dorestart + +.Frameset_87: + frame BATTLEANIMOAMSET_1B, $08 + endanim + +.Frameset_88: + frame BATTLEANIMOAMSET_AC, $08 + endanim + +.Frameset_89: + frame BATTLEANIMOAMSET_AD, $08 + endanim + +.Frameset_8a: + frame BATTLEANIMOAMSET_AE, $08 + endanim + +.Frameset_8b: + frame BATTLEANIMOAMSET_AF, $08 + endanim + +.Frameset_8c: + frame BATTLEANIMOAMSET_B0, $20 + delanim + +.Frameset_8d: + frame BATTLEANIMOAMSET_B1, $07 + frame BATTLEANIMOAMSET_B1, $47 + dorestart + +.Frameset_8e: + frame BATTLEANIMOAMSET_B2, $08 + endanim + +.Frameset_8f: + frame BATTLEANIMOAMSET_B3, $08 + endanim + +.Frameset_90: + frame BATTLEANIMOAMSET_B3, $48 + endanim + +.Frameset_91: + frame BATTLEANIMOAMSET_B3, $88 + endanim + +.Frameset_92: + frame BATTLEANIMOAMSET_B3, $c8 + endanim + +.Frameset_93: + frame BATTLEANIMOAMSET_B5, $08 + endanim + +.Frameset_94: + frame BATTLEANIMOAMSET_B5, $48 + endanim + +.Frameset_95: + frame BATTLEANIMOAMSET_B5, $88 + endanim + +.Frameset_96: + frame BATTLEANIMOAMSET_B5, $c8 + endanim + +.Frameset_97: + frame BATTLEANIMOAMSET_B4, $08 + endanim + +.Frameset_98: + frame BATTLEANIMOAMSET_6B, $08 + endanim + +.Frameset_99: + frame BATTLEANIMOAMSET_B6, $08 + endanim + +.Frameset_9a: + frame BATTLEANIMOAMSET_B7, $20 + endanim + +.Frameset_9b: + frame BATTLEANIMOAMSET_1B, $20 + endanim + +.Frameset_9c: + frame BATTLEANIMOAMSET_B8, $20 + endanim + +.Frameset_9d: + frame BATTLEANIMOAMSET_B8, $60 + endanim + +.Frameset_9e: + frame BATTLEANIMOAMSET_B9, $20 + endanim + +.Frameset_9f: + frame BATTLEANIMOAMSET_BA, $20 + endanim + +.Frameset_a0: + frame BATTLEANIMOAMSET_BB, $60 + endanim + +.Frameset_a1: + frame BATTLEANIMOAMSET_BB, $20 + endanim + +.Frameset_a2: + frame BATTLEANIMOAMSET_BC, $20 + endanim + +.Frameset_a3: + frame BATTLEANIMOAMSET_BD, $0b + frame BATTLEANIMOAMSET_BE, $0b + frame BATTLEANIMOAMSET_1B, $0b + delanim + +.Frameset_a4: + frame BATTLEANIMOAMSET_BF, $04 + frame BATTLEANIMOAMSET_C0, $04 + frame BATTLEANIMOAMSET_C1, $04 + delanim + +.Frameset_a5: + frame BATTLEANIMOAMSET_C2, $20 + frame BATTLEANIMOAMSET_C2, $20 + delanim + +.Frameset_a6: + frame BATTLEANIMOAMSET_4B, $02 + frame BATTLEANIMOAMSET_4C, $02 + frame BATTLEANIMOAMSET_4D, $20 + frame BATTLEANIMOAMSET_4D, $20 + frame BATTLEANIMOAMSET_4D, $20 + frame BATTLEANIMOAMSET_4F, $01 + frame BATTLEANIMOAMSET_50, $01 + frame BATTLEANIMOAMSET_51, $01 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $02 + delanim + +.Frameset_a7: + frame BATTLEANIMOAMSET_4B, $c2 + frame BATTLEANIMOAMSET_4C, $c2 + frame BATTLEANIMOAMSET_4D, $e0 + frame BATTLEANIMOAMSET_4D, $e0 + frame BATTLEANIMOAMSET_4D, $e0 + frame BATTLEANIMOAMSET_4F, $c1 + frame BATTLEANIMOAMSET_50, $c1 + frame BATTLEANIMOAMSET_51, $c1 + frame BATTLEANIMOAMSET_52, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $c2 + dorepeat 2 + frame BATTLEANIMOAMSET_52, $c2 + delanim + +.Frameset_a8: + frame BATTLEANIMOAMSET_C3, $01 + frame BATTLEANIMOAMSET_C3, $c1 + dorestart + +.Frameset_a9: + frame BATTLEANIMOAMSET_C4, $20 + endanim + +.Frameset_aa: + frame BATTLEANIMOAMSET_C5, $04 + frame BATTLEANIMOAMSET_C6, $04 + frame BATTLEANIMOAMSET_C7, $04 + delanim + +.Frameset_ab: + frame BATTLEANIMOAMSET_C8, $01 + frame BATTLEANIMOAMSET_C8, $41 + dorestart + +.Frameset_ac: + frame BATTLEANIMOAMSET_C9, $03 + frame BATTLEANIMOAMSET_05, $03 + delanim + +.Frameset_ad: + frame BATTLEANIMOAMSET_CA, $20 + frame BATTLEANIMOAMSET_CB, $03 + frame BATTLEANIMOAMSET_CA, $03 + frame BATTLEANIMOAMSET_CB, $03 + dorestart + +.Frameset_ae: + frame BATTLEANIMOAMSET_03, $a0 + endanim + +.Frameset_b0: + frame BATTLEANIMOAMSET_CC, $20 + endanim + +.Frameset_b1: + frame BATTLEANIMOAMSET_7F, $02 + frame BATTLEANIMOAMSET_25, $02 + frame BATTLEANIMOAMSET_80, $02 + frame BATTLEANIMOAMSET_25, $02 + dorestart + +.Frameset_b2: + frame BATTLEANIMOAMSET_CD, $04 + frame BATTLEANIMOAMSET_CE, $04 + frame BATTLEANIMOAMSET_CD, $c4 + frame BATTLEANIMOAMSET_CE, $c4 + dorestart + +.Frameset_b3: + frame BATTLEANIMOAMSET_CF, $04 + frame BATTLEANIMOAMSET_D0, $04 + frame BATTLEANIMOAMSET_D1, $04 + frame BATTLEANIMOAMSET_D2, $04 + delanim + +.Frameset_b4: + frame BATTLEANIMOAMSET_D3, $20 + endanim + +.Frameset_b5: + frame BATTLEANIMOAMSET_D4, $08 + endanim + +.Frameset_b6: + frame BATTLEANIMOAMSET_D5, $08 + endanim + +.Frameset_b7: + frame BATTLEANIMOAMSET_D6, $08 + endanim + +.Frameset_b8: + frame BATTLEANIMOAMSET_D7, $08 + endanim + +; ceeae diff --git a/data/anims/oam.asm b/data/battle_anims/oam.asm index 5d88977bd..5d88977bd 100755 --- a/data/anims/oam.asm +++ b/data/battle_anims/oam.asm diff --git a/data/anims/object_gfx.asm b/data/battle_anims/object_gfx.asm index 133298d13..133298d13 100755 --- a/data/anims/object_gfx.asm +++ b/data/battle_anims/object_gfx.asm diff --git a/data/anims/objects.asm b/data/battle_anims/objects.asm index 8117d8495..8117d8495 100755 --- a/data/anims/objects.asm +++ b/data/battle_anims/objects.asm diff --git a/gfx/icon_pointers.asm b/data/icon_pointers.asm index bfe07abb6..bfe07abb6 100644 --- a/gfx/icon_pointers.asm +++ b/data/icon_pointers.asm diff --git a/data/palettes/pokemon_palettes.asm b/data/palettes/pokemon_palettes.asm new file mode 100644 index 000000000..1c491254a --- /dev/null +++ b/data/palettes/pokemon_palettes.asm @@ -0,0 +1,541 @@ +PokemonPalettes: ; a8ce + +; 000 + RGB 30, 22, 17 + RGB 16, 14, 19 +; 000 shiny + RGB 30, 22, 17 + RGB 16, 14, 19 + +INCLUDE "gfx/pokemon/bulbasaur/normal.pal" +INCLUDE "gfx/pokemon/bulbasaur/shiny.pal" +INCLUDE "gfx/pokemon/ivysaur/normal.pal" +INCLUDE "gfx/pokemon/ivysaur/shiny.pal" +INCLUDE "gfx/pokemon/venusaur/normal.pal" +INCLUDE "gfx/pokemon/venusaur/shiny.pal" +INCLUDE "gfx/pokemon/charmander/normal.pal" +INCLUDE "gfx/pokemon/charmander/shiny.pal" +INCLUDE "gfx/pokemon/charmeleon/normal.pal" +INCLUDE "gfx/pokemon/charmeleon/shiny.pal" +INCLUDE "gfx/pokemon/charizard/normal.pal" +INCLUDE "gfx/pokemon/charizard/shiny.pal" +INCLUDE "gfx/pokemon/squirtle/normal.pal" +INCLUDE "gfx/pokemon/squirtle/shiny.pal" +INCLUDE "gfx/pokemon/wartortle/normal.pal" +INCLUDE "gfx/pokemon/wartortle/shiny.pal" +INCLUDE "gfx/pokemon/blastoise/normal.pal" +INCLUDE "gfx/pokemon/blastoise/shiny.pal" +INCLUDE "gfx/pokemon/caterpie/normal.pal" +INCLUDE "gfx/pokemon/caterpie/shiny.pal" +INCLUDE "gfx/pokemon/metapod/normal.pal" +INCLUDE "gfx/pokemon/metapod/shiny.pal" +INCLUDE "gfx/pokemon/butterfree/normal.pal" +INCLUDE "gfx/pokemon/butterfree/shiny.pal" +INCLUDE "gfx/pokemon/weedle/normal.pal" +INCLUDE "gfx/pokemon/weedle/shiny.pal" +INCLUDE "gfx/pokemon/kakuna/normal.pal" +INCLUDE "gfx/pokemon/kakuna/shiny.pal" +INCLUDE "gfx/pokemon/beedrill/normal.pal" +INCLUDE "gfx/pokemon/beedrill/shiny.pal" +INCLUDE "gfx/pokemon/pidgey/normal.pal" +INCLUDE "gfx/pokemon/pidgey/shiny.pal" +INCLUDE "gfx/pokemon/pidgeotto/normal.pal" +INCLUDE "gfx/pokemon/pidgeotto/shiny.pal" +INCLUDE "gfx/pokemon/pidgeot/normal.pal" +INCLUDE "gfx/pokemon/pidgeot/shiny.pal" +INCLUDE "gfx/pokemon/rattata/normal.pal" +INCLUDE "gfx/pokemon/rattata/shiny.pal" +INCLUDE "gfx/pokemon/raticate/normal.pal" +INCLUDE "gfx/pokemon/raticate/shiny.pal" +INCLUDE "gfx/pokemon/spearow/normal.pal" +INCLUDE "gfx/pokemon/spearow/shiny.pal" +INCLUDE "gfx/pokemon/fearow/normal.pal" +INCLUDE "gfx/pokemon/fearow/shiny.pal" +INCLUDE "gfx/pokemon/ekans/normal.pal" +INCLUDE "gfx/pokemon/ekans/shiny.pal" +INCLUDE "gfx/pokemon/arbok/normal.pal" +INCLUDE "gfx/pokemon/arbok/shiny.pal" +INCLUDE "gfx/pokemon/pikachu/normal.pal" +INCLUDE "gfx/pokemon/pikachu/shiny.pal" +INCLUDE "gfx/pokemon/raichu/normal.pal" +INCLUDE "gfx/pokemon/raichu/shiny.pal" +INCLUDE "gfx/pokemon/sandshrew/normal.pal" +INCLUDE "gfx/pokemon/sandshrew/shiny.pal" +INCLUDE "gfx/pokemon/sandslash/normal.pal" +INCLUDE "gfx/pokemon/sandslash/shiny.pal" +INCLUDE "gfx/pokemon/nidoran_f/normal.pal" +INCLUDE "gfx/pokemon/nidoran_f/shiny.pal" +INCLUDE "gfx/pokemon/nidorina/normal.pal" +INCLUDE "gfx/pokemon/nidorina/shiny.pal" +INCLUDE "gfx/pokemon/nidoqueen/normal.pal" +INCLUDE "gfx/pokemon/nidoqueen/shiny.pal" +INCLUDE "gfx/pokemon/nidoran_m/normal.pal" +INCLUDE "gfx/pokemon/nidoran_m/shiny.pal" +INCLUDE "gfx/pokemon/nidorino/normal.pal" +INCLUDE "gfx/pokemon/nidorino/shiny.pal" +INCLUDE "gfx/pokemon/nidoking/normal.pal" +INCLUDE "gfx/pokemon/nidoking/shiny.pal" +INCLUDE "gfx/pokemon/clefairy/normal.pal" +INCLUDE "gfx/pokemon/clefairy/shiny.pal" +INCLUDE "gfx/pokemon/clefable/normal.pal" +INCLUDE "gfx/pokemon/clefable/shiny.pal" +INCLUDE "gfx/pokemon/vulpix/normal.pal" +INCLUDE "gfx/pokemon/vulpix/shiny.pal" +INCLUDE "gfx/pokemon/ninetales/normal.pal" +INCLUDE "gfx/pokemon/ninetales/shiny.pal" +INCLUDE "gfx/pokemon/jigglypuff/normal.pal" +INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" +INCLUDE "gfx/pokemon/wigglytuff/normal.pal" +INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" +INCLUDE "gfx/pokemon/zubat/normal.pal" +INCLUDE "gfx/pokemon/zubat/shiny.pal" +INCLUDE "gfx/pokemon/golbat/normal.pal" +INCLUDE "gfx/pokemon/golbat/shiny.pal" +INCLUDE "gfx/pokemon/oddish/normal.pal" +INCLUDE "gfx/pokemon/oddish/shiny.pal" +INCLUDE "gfx/pokemon/gloom/normal.pal" +INCLUDE "gfx/pokemon/gloom/shiny.pal" +INCLUDE "gfx/pokemon/vileplume/normal.pal" +INCLUDE "gfx/pokemon/vileplume/shiny.pal" +INCLUDE "gfx/pokemon/paras/normal.pal" +INCLUDE "gfx/pokemon/paras/shiny.pal" +INCLUDE "gfx/pokemon/parasect/normal.pal" +INCLUDE "gfx/pokemon/parasect/shiny.pal" +INCLUDE "gfx/pokemon/venonat/normal.pal" +INCLUDE "gfx/pokemon/venonat/shiny.pal" +INCLUDE "gfx/pokemon/venomoth/normal.pal" +INCLUDE "gfx/pokemon/venomoth/shiny.pal" +INCLUDE "gfx/pokemon/diglett/normal.pal" +INCLUDE "gfx/pokemon/diglett/shiny.pal" +INCLUDE "gfx/pokemon/dugtrio/normal.pal" +INCLUDE "gfx/pokemon/dugtrio/shiny.pal" +INCLUDE "gfx/pokemon/meowth/normal.pal" +INCLUDE "gfx/pokemon/meowth/shiny.pal" +INCLUDE "gfx/pokemon/persian/normal.pal" +INCLUDE "gfx/pokemon/persian/shiny.pal" +INCLUDE "gfx/pokemon/psyduck/normal.pal" +INCLUDE "gfx/pokemon/psyduck/shiny.pal" +INCLUDE "gfx/pokemon/golduck/normal.pal" +INCLUDE "gfx/pokemon/golduck/shiny.pal" +INCLUDE "gfx/pokemon/mankey/normal.pal" +INCLUDE "gfx/pokemon/mankey/shiny.pal" +INCLUDE "gfx/pokemon/primeape/normal.pal" +INCLUDE "gfx/pokemon/primeape/shiny.pal" +INCLUDE "gfx/pokemon/growlithe/normal.pal" +INCLUDE "gfx/pokemon/growlithe/shiny.pal" +INCLUDE "gfx/pokemon/arcanine/normal.pal" +INCLUDE "gfx/pokemon/arcanine/shiny.pal" +INCLUDE "gfx/pokemon/poliwag/normal.pal" +INCLUDE "gfx/pokemon/poliwag/shiny.pal" +INCLUDE "gfx/pokemon/poliwhirl/normal.pal" +INCLUDE "gfx/pokemon/poliwhirl/shiny.pal" +INCLUDE "gfx/pokemon/poliwrath/normal.pal" +INCLUDE "gfx/pokemon/poliwrath/shiny.pal" +INCLUDE "gfx/pokemon/abra/normal.pal" +INCLUDE "gfx/pokemon/abra/shiny.pal" +INCLUDE "gfx/pokemon/kadabra/normal.pal" +INCLUDE "gfx/pokemon/kadabra/shiny.pal" +INCLUDE "gfx/pokemon/alakazam/normal.pal" +INCLUDE "gfx/pokemon/alakazam/shiny.pal" +INCLUDE "gfx/pokemon/machop/normal.pal" +INCLUDE "gfx/pokemon/machop/shiny.pal" +INCLUDE "gfx/pokemon/machoke/normal.pal" +INCLUDE "gfx/pokemon/machoke/shiny.pal" +INCLUDE "gfx/pokemon/machamp/normal.pal" +INCLUDE "gfx/pokemon/machamp/shiny.pal" +INCLUDE "gfx/pokemon/bellsprout/normal.pal" +INCLUDE "gfx/pokemon/bellsprout/shiny.pal" +INCLUDE "gfx/pokemon/weepinbell/normal.pal" +INCLUDE "gfx/pokemon/weepinbell/shiny.pal" +INCLUDE "gfx/pokemon/victreebel/normal.pal" +INCLUDE "gfx/pokemon/victreebel/shiny.pal" +INCLUDE "gfx/pokemon/tentacool/normal.pal" +INCLUDE "gfx/pokemon/tentacool/shiny.pal" +INCLUDE "gfx/pokemon/tentacruel/normal.pal" +INCLUDE "gfx/pokemon/tentacruel/shiny.pal" +INCLUDE "gfx/pokemon/geodude/normal.pal" +INCLUDE "gfx/pokemon/geodude/shiny.pal" +INCLUDE "gfx/pokemon/graveler/normal.pal" +INCLUDE "gfx/pokemon/graveler/shiny.pal" +INCLUDE "gfx/pokemon/golem/normal.pal" +INCLUDE "gfx/pokemon/golem/shiny.pal" +INCLUDE "gfx/pokemon/ponyta/normal.pal" +INCLUDE "gfx/pokemon/ponyta/shiny.pal" +INCLUDE "gfx/pokemon/rapidash/normal.pal" +INCLUDE "gfx/pokemon/rapidash/shiny.pal" +INCLUDE "gfx/pokemon/slowpoke/normal.pal" +INCLUDE "gfx/pokemon/slowpoke/shiny.pal" +INCLUDE "gfx/pokemon/slowbro/normal.pal" +INCLUDE "gfx/pokemon/slowbro/shiny.pal" +INCLUDE "gfx/pokemon/magnemite/normal.pal" +INCLUDE "gfx/pokemon/magnemite/shiny.pal" +INCLUDE "gfx/pokemon/magneton/normal.pal" +INCLUDE "gfx/pokemon/magneton/shiny.pal" +INCLUDE "gfx/pokemon/farfetch_d/normal.pal" +INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" +INCLUDE "gfx/pokemon/doduo/normal.pal" +INCLUDE "gfx/pokemon/doduo/shiny.pal" +INCLUDE "gfx/pokemon/dodrio/normal.pal" +INCLUDE "gfx/pokemon/dodrio/shiny.pal" +INCLUDE "gfx/pokemon/seel/normal.pal" +INCLUDE "gfx/pokemon/seel/shiny.pal" +INCLUDE "gfx/pokemon/dewgong/normal.pal" +INCLUDE "gfx/pokemon/dewgong/shiny.pal" +INCLUDE "gfx/pokemon/grimer/normal.pal" +INCLUDE "gfx/pokemon/grimer/shiny.pal" +INCLUDE "gfx/pokemon/muk/normal.pal" +INCLUDE "gfx/pokemon/muk/shiny.pal" +INCLUDE "gfx/pokemon/shellder/normal.pal" +INCLUDE "gfx/pokemon/shellder/shiny.pal" +INCLUDE "gfx/pokemon/cloyster/normal.pal" +INCLUDE "gfx/pokemon/cloyster/shiny.pal" +INCLUDE "gfx/pokemon/gastly/normal.pal" +INCLUDE "gfx/pokemon/gastly/shiny.pal" +INCLUDE "gfx/pokemon/haunter/normal.pal" +INCLUDE "gfx/pokemon/haunter/shiny.pal" +INCLUDE "gfx/pokemon/gengar/normal.pal" +INCLUDE "gfx/pokemon/gengar/shiny.pal" +INCLUDE "gfx/pokemon/onix/normal.pal" +INCLUDE "gfx/pokemon/onix/shiny.pal" +INCLUDE "gfx/pokemon/drowzee/normal.pal" +INCLUDE "gfx/pokemon/drowzee/shiny.pal" +INCLUDE "gfx/pokemon/hypno/normal.pal" +INCLUDE "gfx/pokemon/hypno/shiny.pal" +INCLUDE "gfx/pokemon/krabby/normal.pal" +INCLUDE "gfx/pokemon/krabby/shiny.pal" +INCLUDE "gfx/pokemon/kingler/normal.pal" +INCLUDE "gfx/pokemon/kingler/shiny.pal" +INCLUDE "gfx/pokemon/voltorb/normal.pal" +INCLUDE "gfx/pokemon/voltorb/shiny.pal" +INCLUDE "gfx/pokemon/electrode/normal.pal" +INCLUDE "gfx/pokemon/electrode/shiny.pal" +INCLUDE "gfx/pokemon/exeggcute/normal.pal" +INCLUDE "gfx/pokemon/exeggcute/shiny.pal" +INCLUDE "gfx/pokemon/exeggutor/normal.pal" +INCLUDE "gfx/pokemon/exeggutor/shiny.pal" +INCLUDE "gfx/pokemon/cubone/normal.pal" +INCLUDE "gfx/pokemon/cubone/shiny.pal" +INCLUDE "gfx/pokemon/marowak/normal.pal" +INCLUDE "gfx/pokemon/marowak/shiny.pal" +INCLUDE "gfx/pokemon/hitmonlee/normal.pal" +INCLUDE "gfx/pokemon/hitmonlee/shiny.pal" +INCLUDE "gfx/pokemon/hitmonchan/normal.pal" +INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" +INCLUDE "gfx/pokemon/lickitung/normal.pal" +INCLUDE "gfx/pokemon/lickitung/shiny.pal" +INCLUDE "gfx/pokemon/koffing/normal.pal" +INCLUDE "gfx/pokemon/koffing/shiny.pal" +INCLUDE "gfx/pokemon/weezing/normal.pal" +INCLUDE "gfx/pokemon/weezing/shiny.pal" +INCLUDE "gfx/pokemon/rhyhorn/normal.pal" +INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" +INCLUDE "gfx/pokemon/rhydon/normal.pal" +INCLUDE "gfx/pokemon/rhydon/shiny.pal" +INCLUDE "gfx/pokemon/chansey/normal.pal" +INCLUDE "gfx/pokemon/chansey/shiny.pal" +INCLUDE "gfx/pokemon/tangela/normal.pal" +INCLUDE "gfx/pokemon/tangela/shiny.pal" +INCLUDE "gfx/pokemon/kangaskhan/normal.pal" +INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" +INCLUDE "gfx/pokemon/horsea/normal.pal" +INCLUDE "gfx/pokemon/horsea/shiny.pal" +INCLUDE "gfx/pokemon/seadra/normal.pal" +INCLUDE "gfx/pokemon/seadra/shiny.pal" +INCLUDE "gfx/pokemon/goldeen/normal.pal" +INCLUDE "gfx/pokemon/goldeen/shiny.pal" +INCLUDE "gfx/pokemon/seaking/normal.pal" +INCLUDE "gfx/pokemon/seaking/shiny.pal" +INCLUDE "gfx/pokemon/staryu/normal.pal" +INCLUDE "gfx/pokemon/staryu/shiny.pal" +INCLUDE "gfx/pokemon/starmie/normal.pal" +INCLUDE "gfx/pokemon/starmie/shiny.pal" +INCLUDE "gfx/pokemon/mr__mime/normal.pal" +INCLUDE "gfx/pokemon/mr__mime/shiny.pal" +INCLUDE "gfx/pokemon/scyther/normal.pal" +INCLUDE "gfx/pokemon/scyther/shiny.pal" +INCLUDE "gfx/pokemon/jynx/normal.pal" +INCLUDE "gfx/pokemon/jynx/shiny.pal" +INCLUDE "gfx/pokemon/electabuzz/normal.pal" +INCLUDE "gfx/pokemon/electabuzz/shiny.pal" +INCLUDE "gfx/pokemon/magmar/normal.pal" +INCLUDE "gfx/pokemon/magmar/shiny.pal" +INCLUDE "gfx/pokemon/pinsir/normal.pal" +INCLUDE "gfx/pokemon/pinsir/shiny.pal" +INCLUDE "gfx/pokemon/tauros/normal.pal" +INCLUDE "gfx/pokemon/tauros/shiny.pal" +INCLUDE "gfx/pokemon/magikarp/normal.pal" +INCLUDE "gfx/pokemon/magikarp/shiny.pal" +INCLUDE "gfx/pokemon/gyarados/normal.pal" +INCLUDE "gfx/pokemon/gyarados/shiny.pal" +INCLUDE "gfx/pokemon/lapras/normal.pal" +INCLUDE "gfx/pokemon/lapras/shiny.pal" +INCLUDE "gfx/pokemon/ditto/normal.pal" +INCLUDE "gfx/pokemon/ditto/shiny.pal" +INCLUDE "gfx/pokemon/eevee/normal.pal" +INCLUDE "gfx/pokemon/eevee/shiny.pal" +INCLUDE "gfx/pokemon/vaporeon/normal.pal" +INCLUDE "gfx/pokemon/vaporeon/shiny.pal" +INCLUDE "gfx/pokemon/jolteon/normal.pal" +INCLUDE "gfx/pokemon/jolteon/shiny.pal" +INCLUDE "gfx/pokemon/flareon/normal.pal" +INCLUDE "gfx/pokemon/flareon/shiny.pal" +INCLUDE "gfx/pokemon/porygon/normal.pal" +INCLUDE "gfx/pokemon/porygon/shiny.pal" +INCLUDE "gfx/pokemon/omanyte/normal.pal" +INCLUDE "gfx/pokemon/omanyte/shiny.pal" +INCLUDE "gfx/pokemon/omastar/normal.pal" +INCLUDE "gfx/pokemon/omastar/shiny.pal" +INCLUDE "gfx/pokemon/kabuto/normal.pal" +INCLUDE "gfx/pokemon/kabuto/shiny.pal" +INCLUDE "gfx/pokemon/kabutops/normal.pal" +INCLUDE "gfx/pokemon/kabutops/shiny.pal" +INCLUDE "gfx/pokemon/aerodactyl/normal.pal" +INCLUDE "gfx/pokemon/aerodactyl/shiny.pal" +INCLUDE "gfx/pokemon/snorlax/normal.pal" +INCLUDE "gfx/pokemon/snorlax/shiny.pal" +INCLUDE "gfx/pokemon/articuno/normal.pal" +INCLUDE "gfx/pokemon/articuno/shiny.pal" +INCLUDE "gfx/pokemon/zapdos/normal.pal" +INCLUDE "gfx/pokemon/zapdos/shiny.pal" +INCLUDE "gfx/pokemon/moltres/normal.pal" +INCLUDE "gfx/pokemon/moltres/shiny.pal" +INCLUDE "gfx/pokemon/dratini/normal.pal" +INCLUDE "gfx/pokemon/dratini/shiny.pal" +INCLUDE "gfx/pokemon/dragonair/normal.pal" +INCLUDE "gfx/pokemon/dragonair/shiny.pal" +INCLUDE "gfx/pokemon/dragonite/normal.pal" +INCLUDE "gfx/pokemon/dragonite/shiny.pal" +INCLUDE "gfx/pokemon/mewtwo/normal.pal" +INCLUDE "gfx/pokemon/mewtwo/shiny.pal" +INCLUDE "gfx/pokemon/mew/normal.pal" +INCLUDE "gfx/pokemon/mew/shiny.pal" +INCLUDE "gfx/pokemon/chikorita/normal.pal" +INCLUDE "gfx/pokemon/chikorita/shiny.pal" +INCLUDE "gfx/pokemon/bayleef/normal.pal" +INCLUDE "gfx/pokemon/bayleef/shiny.pal" +INCLUDE "gfx/pokemon/meganium/normal.pal" +INCLUDE "gfx/pokemon/meganium/shiny.pal" +INCLUDE "gfx/pokemon/cyndaquil/normal.pal" +INCLUDE "gfx/pokemon/cyndaquil/shiny.pal" +INCLUDE "gfx/pokemon/quilava/normal.pal" +INCLUDE "gfx/pokemon/quilava/shiny.pal" +INCLUDE "gfx/pokemon/typhlosion/normal.pal" +INCLUDE "gfx/pokemon/typhlosion/shiny.pal" +INCLUDE "gfx/pokemon/totodile/normal.pal" +INCLUDE "gfx/pokemon/totodile/shiny.pal" +INCLUDE "gfx/pokemon/croconaw/normal.pal" +INCLUDE "gfx/pokemon/croconaw/shiny.pal" +INCLUDE "gfx/pokemon/feraligatr/normal.pal" +INCLUDE "gfx/pokemon/feraligatr/shiny.pal" +INCLUDE "gfx/pokemon/sentret/normal.pal" +INCLUDE "gfx/pokemon/sentret/shiny.pal" +INCLUDE "gfx/pokemon/furret/normal.pal" +INCLUDE "gfx/pokemon/furret/shiny.pal" +INCLUDE "gfx/pokemon/hoothoot/normal.pal" +INCLUDE "gfx/pokemon/hoothoot/shiny.pal" +INCLUDE "gfx/pokemon/noctowl/normal.pal" +INCLUDE "gfx/pokemon/noctowl/shiny.pal" +INCLUDE "gfx/pokemon/ledyba/normal.pal" +INCLUDE "gfx/pokemon/ledyba/shiny.pal" +INCLUDE "gfx/pokemon/ledian/normal.pal" +INCLUDE "gfx/pokemon/ledian/shiny.pal" +INCLUDE "gfx/pokemon/spinarak/normal.pal" +INCLUDE "gfx/pokemon/spinarak/shiny.pal" +INCLUDE "gfx/pokemon/ariados/normal.pal" +INCLUDE "gfx/pokemon/ariados/shiny.pal" +INCLUDE "gfx/pokemon/crobat/normal.pal" +INCLUDE "gfx/pokemon/crobat/shiny.pal" +INCLUDE "gfx/pokemon/chinchou/normal.pal" +INCLUDE "gfx/pokemon/chinchou/shiny.pal" +INCLUDE "gfx/pokemon/lanturn/normal.pal" +INCLUDE "gfx/pokemon/lanturn/shiny.pal" +INCLUDE "gfx/pokemon/pichu/normal.pal" +INCLUDE "gfx/pokemon/pichu/shiny.pal" +INCLUDE "gfx/pokemon/cleffa/normal.pal" +INCLUDE "gfx/pokemon/cleffa/shiny.pal" +INCLUDE "gfx/pokemon/igglybuff/normal.pal" +INCLUDE "gfx/pokemon/igglybuff/shiny.pal" +INCLUDE "gfx/pokemon/togepi/normal.pal" +INCLUDE "gfx/pokemon/togepi/shiny.pal" +INCLUDE "gfx/pokemon/togetic/normal.pal" +INCLUDE "gfx/pokemon/togetic/shiny.pal" +INCLUDE "gfx/pokemon/natu/normal.pal" +INCLUDE "gfx/pokemon/natu/shiny.pal" +INCLUDE "gfx/pokemon/xatu/normal.pal" +INCLUDE "gfx/pokemon/xatu/shiny.pal" +INCLUDE "gfx/pokemon/mareep/normal.pal" +INCLUDE "gfx/pokemon/mareep/shiny.pal" +INCLUDE "gfx/pokemon/flaaffy/normal.pal" +INCLUDE "gfx/pokemon/flaaffy/shiny.pal" +INCLUDE "gfx/pokemon/ampharos/normal.pal" +INCLUDE "gfx/pokemon/ampharos/shiny.pal" +INCLUDE "gfx/pokemon/bellossom/normal.pal" +INCLUDE "gfx/pokemon/bellossom/shiny.pal" +INCLUDE "gfx/pokemon/marill/normal.pal" +INCLUDE "gfx/pokemon/marill/shiny.pal" +INCLUDE "gfx/pokemon/azumarill/normal.pal" +INCLUDE "gfx/pokemon/azumarill/shiny.pal" +INCLUDE "gfx/pokemon/sudowoodo/normal.pal" +INCLUDE "gfx/pokemon/sudowoodo/shiny.pal" +INCLUDE "gfx/pokemon/politoed/normal.pal" +INCLUDE "gfx/pokemon/politoed/shiny.pal" +INCLUDE "gfx/pokemon/hoppip/normal.pal" +INCLUDE "gfx/pokemon/hoppip/shiny.pal" +INCLUDE "gfx/pokemon/skiploom/normal.pal" +INCLUDE "gfx/pokemon/skiploom/shiny.pal" +INCLUDE "gfx/pokemon/jumpluff/normal.pal" +INCLUDE "gfx/pokemon/jumpluff/shiny.pal" +INCLUDE "gfx/pokemon/aipom/normal.pal" +INCLUDE "gfx/pokemon/aipom/shiny.pal" +INCLUDE "gfx/pokemon/sunkern/normal.pal" +INCLUDE "gfx/pokemon/sunkern/shiny.pal" +INCLUDE "gfx/pokemon/sunflora/normal.pal" +INCLUDE "gfx/pokemon/sunflora/shiny.pal" +INCLUDE "gfx/pokemon/yanma/normal.pal" +INCLUDE "gfx/pokemon/yanma/shiny.pal" +INCLUDE "gfx/pokemon/wooper/normal.pal" +INCLUDE "gfx/pokemon/wooper/shiny.pal" +INCLUDE "gfx/pokemon/quagsire/normal.pal" +INCLUDE "gfx/pokemon/quagsire/shiny.pal" +INCLUDE "gfx/pokemon/espeon/normal.pal" +INCLUDE "gfx/pokemon/espeon/shiny.pal" +INCLUDE "gfx/pokemon/umbreon/normal.pal" +INCLUDE "gfx/pokemon/umbreon/shiny.pal" +INCLUDE "gfx/pokemon/murkrow/normal.pal" +INCLUDE "gfx/pokemon/murkrow/shiny.pal" +INCLUDE "gfx/pokemon/slowking/normal.pal" +INCLUDE "gfx/pokemon/slowking/shiny.pal" +INCLUDE "gfx/pokemon/misdreavus/normal.pal" +INCLUDE "gfx/pokemon/misdreavus/shiny.pal" +INCLUDE "gfx/pokemon/unown/normal.pal" +INCLUDE "gfx/pokemon/unown/shiny.pal" +INCLUDE "gfx/pokemon/wobbuffet/normal.pal" +INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" +INCLUDE "gfx/pokemon/girafarig/normal.pal" +INCLUDE "gfx/pokemon/girafarig/shiny.pal" +INCLUDE "gfx/pokemon/pineco/normal.pal" +INCLUDE "gfx/pokemon/pineco/shiny.pal" +INCLUDE "gfx/pokemon/forretress/normal.pal" +INCLUDE "gfx/pokemon/forretress/shiny.pal" +INCLUDE "gfx/pokemon/dunsparce/normal.pal" +INCLUDE "gfx/pokemon/dunsparce/shiny.pal" +INCLUDE "gfx/pokemon/gligar/normal.pal" +INCLUDE "gfx/pokemon/gligar/shiny.pal" +INCLUDE "gfx/pokemon/steelix/normal.pal" +INCLUDE "gfx/pokemon/steelix/shiny.pal" +INCLUDE "gfx/pokemon/snubbull/normal.pal" +INCLUDE "gfx/pokemon/snubbull/shiny.pal" +INCLUDE "gfx/pokemon/granbull/normal.pal" +INCLUDE "gfx/pokemon/granbull/shiny.pal" +INCLUDE "gfx/pokemon/qwilfish/normal.pal" +INCLUDE "gfx/pokemon/qwilfish/shiny.pal" +INCLUDE "gfx/pokemon/scizor/normal.pal" +INCLUDE "gfx/pokemon/scizor/shiny.pal" +INCLUDE "gfx/pokemon/shuckle/normal.pal" +INCLUDE "gfx/pokemon/shuckle/shiny.pal" +INCLUDE "gfx/pokemon/heracross/normal.pal" +INCLUDE "gfx/pokemon/heracross/shiny.pal" +INCLUDE "gfx/pokemon/sneasel/normal.pal" +INCLUDE "gfx/pokemon/sneasel/shiny.pal" +INCLUDE "gfx/pokemon/teddiursa/normal.pal" +INCLUDE "gfx/pokemon/teddiursa/shiny.pal" +INCLUDE "gfx/pokemon/ursaring/normal.pal" +INCLUDE "gfx/pokemon/ursaring/shiny.pal" +INCLUDE "gfx/pokemon/slugma/normal.pal" +INCLUDE "gfx/pokemon/slugma/shiny.pal" +INCLUDE "gfx/pokemon/magcargo/normal.pal" +INCLUDE "gfx/pokemon/magcargo/shiny.pal" +INCLUDE "gfx/pokemon/swinub/normal.pal" +INCLUDE "gfx/pokemon/swinub/shiny.pal" +INCLUDE "gfx/pokemon/piloswine/normal.pal" +INCLUDE "gfx/pokemon/piloswine/shiny.pal" +INCLUDE "gfx/pokemon/corsola/normal.pal" +INCLUDE "gfx/pokemon/corsola/shiny.pal" +INCLUDE "gfx/pokemon/remoraid/normal.pal" +INCLUDE "gfx/pokemon/remoraid/shiny.pal" +INCLUDE "gfx/pokemon/octillery/normal.pal" +INCLUDE "gfx/pokemon/octillery/shiny.pal" +INCLUDE "gfx/pokemon/delibird/normal.pal" +INCLUDE "gfx/pokemon/delibird/shiny.pal" +INCLUDE "gfx/pokemon/mantine/normal.pal" +INCLUDE "gfx/pokemon/mantine/shiny.pal" +INCLUDE "gfx/pokemon/skarmory/normal.pal" +INCLUDE "gfx/pokemon/skarmory/shiny.pal" +INCLUDE "gfx/pokemon/houndour/normal.pal" +INCLUDE "gfx/pokemon/houndour/shiny.pal" +INCLUDE "gfx/pokemon/houndoom/normal.pal" +INCLUDE "gfx/pokemon/houndoom/shiny.pal" +INCLUDE "gfx/pokemon/kingdra/normal.pal" +INCLUDE "gfx/pokemon/kingdra/shiny.pal" +INCLUDE "gfx/pokemon/phanpy/normal.pal" +INCLUDE "gfx/pokemon/phanpy/shiny.pal" +INCLUDE "gfx/pokemon/donphan/normal.pal" +INCLUDE "gfx/pokemon/donphan/shiny.pal" +INCLUDE "gfx/pokemon/porygon2/normal.pal" +INCLUDE "gfx/pokemon/porygon2/shiny.pal" +INCLUDE "gfx/pokemon/stantler/normal.pal" +INCLUDE "gfx/pokemon/stantler/shiny.pal" +INCLUDE "gfx/pokemon/smeargle/normal.pal" +INCLUDE "gfx/pokemon/smeargle/shiny.pal" +INCLUDE "gfx/pokemon/tyrogue/normal.pal" +INCLUDE "gfx/pokemon/tyrogue/shiny.pal" +INCLUDE "gfx/pokemon/hitmontop/normal.pal" +INCLUDE "gfx/pokemon/hitmontop/shiny.pal" +INCLUDE "gfx/pokemon/smoochum/normal.pal" +INCLUDE "gfx/pokemon/smoochum/shiny.pal" +INCLUDE "gfx/pokemon/elekid/normal.pal" +INCLUDE "gfx/pokemon/elekid/shiny.pal" +INCLUDE "gfx/pokemon/magby/normal.pal" +INCLUDE "gfx/pokemon/magby/shiny.pal" +INCLUDE "gfx/pokemon/miltank/normal.pal" +INCLUDE "gfx/pokemon/miltank/shiny.pal" +INCLUDE "gfx/pokemon/blissey/normal.pal" +INCLUDE "gfx/pokemon/blissey/shiny.pal" +INCLUDE "gfx/pokemon/raikou/normal.pal" +INCLUDE "gfx/pokemon/raikou/shiny.pal" +INCLUDE "gfx/pokemon/entei/normal.pal" +INCLUDE "gfx/pokemon/entei/shiny.pal" +INCLUDE "gfx/pokemon/suicune/normal.pal" +INCLUDE "gfx/pokemon/suicune/shiny.pal" +INCLUDE "gfx/pokemon/larvitar/normal.pal" +INCLUDE "gfx/pokemon/larvitar/shiny.pal" +INCLUDE "gfx/pokemon/pupitar/normal.pal" +INCLUDE "gfx/pokemon/pupitar/shiny.pal" +INCLUDE "gfx/pokemon/tyranitar/normal.pal" +INCLUDE "gfx/pokemon/tyranitar/shiny.pal" +INCLUDE "gfx/pokemon/lugia/normal.pal" +INCLUDE "gfx/pokemon/lugia/shiny.pal" +INCLUDE "gfx/pokemon/ho_oh/normal.pal" +INCLUDE "gfx/pokemon/ho_oh/shiny.pal" +INCLUDE "gfx/pokemon/celebi/normal.pal" +INCLUDE "gfx/pokemon/celebi/shiny.pal" + +; 252 + RGB 30, 26, 11 + RGB 23, 16, 00 +; 252 shiny + RGB 30, 26, 11 + RGB 23, 16, 00 + +; Egg + RGB 30, 26, 11 + RGB 23, 16, 00 +; Egg shiny + RGB 30, 26, 11 + RGB 23, 16, 00 + +; 254 + RGB 30, 26, 11 + RGB 23, 16, 00 +; 254 shiny + RGB 30, 26, 11 + RGB 23, 16, 00 + +; 255 + RGB 23, 23, 23 + RGB 17, 17, 17 +; 255 shiny + RGB 23, 23, 23 + RGB 17, 17, 17 + +; b0ce diff --git a/gfx/trainer_palettes.asm b/data/palettes/trainer_palettes.asm index c943e49d7..c943e49d7 100644 --- a/gfx/trainer_palettes.asm +++ b/data/palettes/trainer_palettes.asm diff --git a/gfx/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 58631e09a..58631e09a 100644 --- a/gfx/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm diff --git a/gfx/pokemon/unown_pic_pointers.asm b/data/pokemon/unown_pic_pointers.asm index 1ae0da6b6..1ae0da6b6 100644 --- a/gfx/pokemon/unown_pic_pointers.asm +++ b/data/pokemon/unown_pic_pointers.asm diff --git a/data/sprites/framesets.asm b/data/sprite_anims/framesets.asm index 24b058859..24b058859 100755 --- a/data/sprites/framesets.asm +++ b/data/sprite_anims/framesets.asm diff --git a/data/sprites/oam.asm b/data/sprite_anims/oam.asm index 99adc9df3..99adc9df3 100644 --- a/data/sprites/oam.asm +++ b/data/sprite_anims/oam.asm diff --git a/data/sprites/sequences.asm b/data/sprite_anims/sequences.asm index 70544a60a..70544a60a 100644 --- a/data/sprites/sequences.asm +++ b/data/sprite_anims/sequences.asm diff --git a/gfx/trainer_pic_pointers.asm b/data/trainers/pic_pointers.asm index 201b44200..201b44200 100644 --- a/gfx/trainer_pic_pointers.asm +++ b/data/trainers/pic_pointers.asm diff --git a/docs/move_anim_commands.md b/docs/battle_anim_commands.md index 308c4c45e..4a11391db 100644 --- a/docs/move_anim_commands.md +++ b/docs/battle_anim_commands.md @@ -1,6 +1,6 @@ -# Move Animation Commands +# Battle Animation Commands -Defined in [macros/scripts/move_anim.asm](/macros/scripts/move_anim.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). +Defined in [macros/scripts/battle_anims.asm](/macros/scripts/battle_anims.asm) and [data/moves/move_anims.asm:BattleAnimations](/data/moves/move_anims.asm). ## `$00`−`$EF`: `anim_wait` *length* diff --git a/docs/event_commands.md b/docs/event_commands.md index 151d74b54..b4314bd24 100644 --- a/docs/event_commands.md +++ b/docs/event_commands.md @@ -1,6 +1,6 @@ # Event Commands -Defined in [macros/scripts/event.asm](/macros/scripts/event.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). +Defined in [macros/scripts/events.asm](/macros/scripts/events.asm) and [engine/scripting.asm:ScriptCommandTable](/engine/scripting.asm). ## `$00`: `scall` *script* diff --git a/docs/pic_animations.md b/docs/pic_animations.md index 531282c13..ba11a1dc1 100644 --- a/docs/pic_animations.md +++ b/docs/pic_animations.md @@ -1,7 +1,6 @@ # Pic Animations -Defined in [macros/scripts/gfx_anim.asm](/macros/scripts/gfx_anim.asm) and [engine/anims/anim_commands.asm:BattleAnimCommands](/engine/anims/anim_commands.asm). - +Defined in [macros/scripts/gfx_anims.asm](/macros/scripts/gfx_anims.asm). Pic animations are assembled in 3 parts: @@ -20,12 +19,12 @@ Pic animations are assembled in 3 parts: Animation data is in these files: -- gfx/pics/anims.asm: +- [gfx/pokemon/anims.asm](/gfx/pokemon/anims.asm): Main animations (played everywhere) -- gfx/pics/extras.asm: +- [gfx/pokemon/extras.asm](/gfx/pokemon/extras.asm): Extra animations, appended to the main animation. Used in the status screen (blinking, tail wags etc.) -- gfx/pics/unown_anims.asm and gfx/pics/unown_extras.asm: +- [gfx/pokemon/unown_anims.asm](/gfx/pokemon/unown_anims.asm) and [gfx/pokemon/unown_extras.asm](/gfx/pokemon/unown_extras.asm): Unown has its own animation data despite having an entry in the main tables. diff --git a/engine/routines/battlestart_copytilemapatonce.asm b/engine/battle/battlestart_copytilemapatonce.asm index 2952e833b..2952e833b 100644 --- a/engine/routines/battlestart_copytilemapatonce.asm +++ b/engine/battle/battlestart_copytilemapatonce.asm diff --git a/engine/routines/checkbattlescene.asm b/engine/battle/checkbattlescene.asm index b63f00907..b63f00907 100644 --- a/engine/routines/checkbattlescene.asm +++ b/engine/battle/checkbattlescene.asm diff --git a/engine/routines/consumehelditem.asm b/engine/battle/consumehelditem.asm index a6f7766fb..a6f7766fb 100644 --- a/engine/routines/consumehelditem.asm +++ b/engine/battle/consumehelditem.asm diff --git a/engine/routines/returntobattle_useball.asm b/engine/battle/returntobattle_useball.asm index e6e33f900..e6e33f900 100644 --- a/engine/routines/returntobattle_useball.asm +++ b/engine/battle/returntobattle_useball.asm diff --git a/engine/routines/updatebattlehuds.asm b/engine/battle/updatebattlehuds.asm index ec7f662e8..ec7f662e8 100644 --- a/engine/routines/updatebattlehuds.asm +++ b/engine/battle/updatebattlehuds.asm diff --git a/engine/anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 1977f9112..875849ce3 100644 --- a/engine/anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -351,7 +351,7 @@ RunBattleAnimCommand: ; cc25f BattleAnimCommands:: ; cc2a4 (33:42a4) -; entries correspond to macros/move_anim.asm enumeration +; entries correspond to macros/scripts/battle_anims.asm enumeration dw BattleAnimCmd_Obj dw BattleAnimCmd_1GFX dw BattleAnimCmd_2GFX diff --git a/engine/anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index ab4a8036b..ab4a8036b 100644 --- a/engine/anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm diff --git a/engine/anims/engine.asm b/engine/battle_anims/engine.asm index ae3bdde28..ae3bdde28 100755 --- a/engine/anims/engine.asm +++ b/engine/battle_anims/engine.asm diff --git a/engine/anims/functions.asm b/engine/battle_anims/functions.asm index e5b2b16c4..ea9fb70b3 100755 --- a/engine/anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -451,7 +451,7 @@ GetBallAnimPal: ; cd249 (33:5249) ret ; cd26c (33:526c) -INCLUDE "data/anims/ball_colors.asm" +INCLUDE "data/battle_anims/ball_colors.asm" BattleAnimFunction_10: ; cd284 (33:5284) call BattleAnim_AnonJumptable diff --git a/engine/routines/getpokeballwobble.asm b/engine/battle_anims/getpokeballwobble.asm index 7fb4d3e38..7fb4d3e38 100755 --- a/engine/routines/getpokeballwobble.asm +++ b/engine/battle_anims/getpokeballwobble.asm diff --git a/engine/anims/helpers.asm b/engine/battle_anims/helpers.asm index a692211d3..a692211d3 100755 --- a/engine/anims/helpers.asm +++ b/engine/battle_anims/helpers.asm diff --git a/engine/color.asm b/engine/color.asm index 53c727eef..f4a420f1c 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -1218,8 +1218,9 @@ INCLUDE "data/palettes/hp_bar.pal" ExpBarPalette: INCLUDE "data/palettes/exp_bar.pal" -INCLUDE "gfx/pokemon/palette_pointers.asm" -INCLUDE "gfx/trainer_palettes.asm" +INCLUDE "data/palettes/pokemon_palettes.asm" + +INCLUDE "data/palettes/trainer_palettes.asm" LoadMapPals: farcall LoadSpecialMapPalette diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 965d9f0ef..2ebeb67fa 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -468,6 +468,6 @@ ReadMonMenuIcon: ; 8eab3 INCLUDE "data/pokemon/menu_icons.asm" -INCLUDE "gfx/icon_pointers.asm" +INCLUDE "data/icon_pointers.asm" INCLUDE "gfx/icons.asm" diff --git a/engine/movement.asm b/engine/movement.asm index 66c501909..bec089978 100644 --- a/engine/movement.asm +++ b/engine/movement.asm @@ -1,5 +1,5 @@ MovementPointers: ; 5075 -; entries correspond to macros/movement.asm enumeration +; entries correspond to macros/scripts/movement.asm enumeration dw Movement_turn_head_down ; 00 dw Movement_turn_head_up ; 01 dw Movement_turn_head_left ; 02 diff --git a/engine/scripting.asm b/engine/scripting.asm index 9818bbac3..826267f6b 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -64,7 +64,7 @@ RunScriptCommand: ScriptCommandTable: -; entries correspond to macros/event.asm enumeration +; entries correspond to macros/scripts/events.asm enumeration dw Script_scall ; 00 dw Script_farscall ; 01 dw Script_ptcall ; 02 diff --git a/engine/sprites.asm b/engine/sprites.asm index cc579a914..b52c9642b 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -551,13 +551,13 @@ BrokenGetStdGraphics: ; 8d1ac ; 8d1c4 -INCLUDE "data/sprites/sequences.asm" +INCLUDE "data/sprite_anims/sequences.asm" INCLUDE "engine/sprite_anims.asm" -INCLUDE "data/sprites/framesets.asm" +INCLUDE "data/sprite_anims/framesets.asm" -INCLUDE "data/sprites/oam.asm" +INCLUDE "data/sprite_anims/oam.asm" BrokenStdGFXPointers: ; Broken 2bpp pointers diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm index fa631ae4e..1305fab5b 100755 --- a/engine/trade_animation.asm +++ b/engine/trade_animation.asm @@ -236,7 +236,7 @@ DoTradeAnimation: ; 29082 ; 290af .JumpTable: ; 290af -; entries correspond to macros/trade_anim.asm enumeration +; entries correspond to macros/scripts/trade_anims.asm enumeration dw TradeAnim_AdvanceScriptPointer ; 00 dw TradeAnim_ShowGivemonData ; 01 dw TradeAnim_ShowGetmonData ; 02 diff --git a/engine/routines/kurt_selectquantity_interpretjoypad.asm b/event/kurt_selectquantity_interpretjoypad.asm index 12a43e325..12a43e325 100644 --- a/engine/routines/kurt_selectquantity_interpretjoypad.asm +++ b/event/kurt_selectquantity_interpretjoypad.asm diff --git a/gfx/anims.asm b/gfx/anims.asm deleted file mode 100644 index 8306518cc..000000000 --- a/gfx/anims.asm +++ /dev/null @@ -1,41 +0,0 @@ -AnimObj00GFX: ; 84a2e -AnimObjHitGFX: INCBIN "gfx/anims/hit.2bpp.lz" -AnimObjCutGFX: INCBIN "gfx/anims/cut.2bpp.lz" -AnimObjFireGFX: INCBIN "gfx/anims/fire.2bpp.lz" -AnimObjWaterGFX: INCBIN "gfx/anims/water.2bpp.lz" -AnimObjLightningGFX: INCBIN "gfx/anims/lightning.2bpp.lz" -AnimObjSmokeGFX: INCBIN "gfx/anims/smoke.2bpp.lz" -AnimObjExplosionGFX: INCBIN "gfx/anims/explosion.2bpp.lz" -AnimObjIceGFX: INCBIN "gfx/anims/ice.2bpp.lz" -AnimObjRocksGFX: INCBIN "gfx/anims/rocks.2bpp.lz" -AnimObjPoisonGFX: INCBIN "gfx/anims/poison.2bpp.lz" -AnimObjPlantGFX: INCBIN "gfx/anims/plant.2bpp.lz" -AnimObjPokeBallGFX: INCBIN "gfx/anims/pokeball.2bpp.lz" -AnimObjBubbleGFX: INCBIN "gfx/anims/bubble.2bpp.lz" -AnimObjNoiseGFX: INCBIN "gfx/anims/noise.2bpp.lz" -AnimObjReflectGFX: INCBIN "gfx/anims/reflect.2bpp.lz" -AnimObjPowderGFX: INCBIN "gfx/anims/powder.2bpp.lz" -AnimObjBeamGFX: INCBIN "gfx/anims/beam.2bpp.lz" -AnimObjSpeedGFX: INCBIN "gfx/anims/speed.2bpp.lz" -AnimObjChargeGFX: INCBIN "gfx/anims/charge.2bpp.lz" -AnimObjWindGFX: INCBIN "gfx/anims/wind.2bpp.lz" -AnimObjWhipGFX: INCBIN "gfx/anims/whip.2bpp.lz" -AnimObjRopeGFX: INCBIN "gfx/anims/rope.2bpp.lz" -AnimObjEggGFX: INCBIN "gfx/anims/egg.2bpp.lz" -AnimObjPsychicGFX: INCBIN "gfx/anims/psychic.2bpp.lz" -AnimObjSandGFX: INCBIN "gfx/anims/sand.2bpp.lz" -AnimObjWebGFX: INCBIN "gfx/anims/web.2bpp.lz" -AnimObjHazeGFX: INCBIN "gfx/anims/haze.2bpp.lz" -AnimObjHornGFX: INCBIN "gfx/anims/horn.2bpp.lz" -AnimObjFlowerGFX: INCBIN "gfx/anims/flower.2bpp.lz" -AnimObjMiscGFX: INCBIN "gfx/anims/misc.2bpp.lz" -AnimObjSkyAttackGFX: INCBIN "gfx/anims/skyattack.2bpp.lz" -AnimObjGlobeGFX: INCBIN "gfx/anims/globe.2bpp.lz" -AnimObjShapesGFX: INCBIN "gfx/anims/shapes.2bpp.lz" -AnimObjStatusGFX: INCBIN "gfx/anims/status.2bpp.lz" -AnimObjObjectsGFX: INCBIN "gfx/anims/objects.2bpp.lz" -AnimObjShineGFX: INCBIN "gfx/anims/shine.2bpp.lz" -AnimObjAngelsGFX: INCBIN "gfx/anims/angels.2bpp.lz" -AnimObjWaveGFX: INCBIN "gfx/anims/wave.2bpp.lz" -AnimObjAeroblastGFX: INCBIN "gfx/anims/aeroblast.2bpp.lz" -; 8640e diff --git a/gfx/battle_anims.asm b/gfx/battle_anims.asm new file mode 100644 index 000000000..52ac4e6b5 --- /dev/null +++ b/gfx/battle_anims.asm @@ -0,0 +1,41 @@ +AnimObj00GFX: ; 84a2e +AnimObjHitGFX: INCBIN "gfx/battle_anims/hit.2bpp.lz" +AnimObjCutGFX: INCBIN "gfx/battle_anims/cut.2bpp.lz" +AnimObjFireGFX: INCBIN "gfx/battle_anims/fire.2bpp.lz" +AnimObjWaterGFX: INCBIN "gfx/battle_anims/water.2bpp.lz" +AnimObjLightningGFX: INCBIN "gfx/battle_anims/lightning.2bpp.lz" +AnimObjSmokeGFX: INCBIN "gfx/battle_anims/smoke.2bpp.lz" +AnimObjExplosionGFX: INCBIN "gfx/battle_anims/explosion.2bpp.lz" +AnimObjIceGFX: INCBIN "gfx/battle_anims/ice.2bpp.lz" +AnimObjRocksGFX: INCBIN "gfx/battle_anims/rocks.2bpp.lz" +AnimObjPoisonGFX: INCBIN "gfx/battle_anims/poison.2bpp.lz" +AnimObjPlantGFX: INCBIN "gfx/battle_anims/plant.2bpp.lz" +AnimObjPokeBallGFX: INCBIN "gfx/battle_anims/pokeball.2bpp.lz" +AnimObjBubbleGFX: INCBIN "gfx/battle_anims/bubble.2bpp.lz" +AnimObjNoiseGFX: INCBIN "gfx/battle_anims/noise.2bpp.lz" +AnimObjReflectGFX: INCBIN "gfx/battle_anims/reflect.2bpp.lz" +AnimObjPowderGFX: INCBIN "gfx/battle_anims/powder.2bpp.lz" +AnimObjBeamGFX: INCBIN "gfx/battle_anims/beam.2bpp.lz" +AnimObjSpeedGFX: INCBIN "gfx/battle_anims/speed.2bpp.lz" +AnimObjChargeGFX: INCBIN "gfx/battle_anims/charge.2bpp.lz" +AnimObjWindGFX: INCBIN "gfx/battle_anims/wind.2bpp.lz" +AnimObjWhipGFX: INCBIN "gfx/battle_anims/whip.2bpp.lz" +AnimObjRopeGFX: INCBIN "gfx/battle_anims/rope.2bpp.lz" +AnimObjEggGFX: INCBIN "gfx/battle_anims/egg.2bpp.lz" +AnimObjPsychicGFX: INCBIN "gfx/battle_anims/psychic.2bpp.lz" +AnimObjSandGFX: INCBIN "gfx/battle_anims/sand.2bpp.lz" +AnimObjWebGFX: INCBIN "gfx/battle_anims/web.2bpp.lz" +AnimObjHazeGFX: INCBIN "gfx/battle_anims/haze.2bpp.lz" +AnimObjHornGFX: INCBIN "gfx/battle_anims/horn.2bpp.lz" +AnimObjFlowerGFX: INCBIN "gfx/battle_anims/flower.2bpp.lz" +AnimObjMiscGFX: INCBIN "gfx/battle_anims/misc.2bpp.lz" +AnimObjSkyAttackGFX: INCBIN "gfx/battle_anims/skyattack.2bpp.lz" +AnimObjGlobeGFX: INCBIN "gfx/battle_anims/globe.2bpp.lz" +AnimObjShapesGFX: INCBIN "gfx/battle_anims/shapes.2bpp.lz" +AnimObjStatusGFX: INCBIN "gfx/battle_anims/status.2bpp.lz" +AnimObjObjectsGFX: INCBIN "gfx/battle_anims/objects.2bpp.lz" +AnimObjShineGFX: INCBIN "gfx/battle_anims/shine.2bpp.lz" +AnimObjAngelsGFX: INCBIN "gfx/battle_anims/angels.2bpp.lz" +AnimObjWaveGFX: INCBIN "gfx/battle_anims/wave.2bpp.lz" +AnimObjAeroblastGFX: INCBIN "gfx/battle_anims/aeroblast.2bpp.lz" +; 8640e diff --git a/gfx/anims/aeroblast.2bpp.lz.2f07c4ea b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea Binary files differindex 5e203cb63..5e203cb63 100644 --- a/gfx/anims/aeroblast.2bpp.lz.2f07c4ea +++ b/gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea diff --git a/gfx/anims/aeroblast.png b/gfx/battle_anims/aeroblast.png Binary files differindex 1fdc07c2f..1fdc07c2f 100644 --- a/gfx/anims/aeroblast.png +++ b/gfx/battle_anims/aeroblast.png diff --git a/gfx/anims/angels.2bpp.lz.b026d81e b/gfx/battle_anims/angels.2bpp.lz.b026d81e Binary files differindex 61d89d224..61d89d224 100644 --- a/gfx/anims/angels.2bpp.lz.b026d81e +++ b/gfx/battle_anims/angels.2bpp.lz.b026d81e diff --git a/gfx/anims/angels.png b/gfx/battle_anims/angels.png Binary files differindex ef38c61d2..ef38c61d2 100644 --- a/gfx/anims/angels.png +++ b/gfx/battle_anims/angels.png diff --git a/gfx/anims/beam.2bpp.lz.80b6d613 b/gfx/battle_anims/beam.2bpp.lz.80b6d613 Binary files differindex 1ce9ab82c..1ce9ab82c 100644 --- a/gfx/anims/beam.2bpp.lz.80b6d613 +++ b/gfx/battle_anims/beam.2bpp.lz.80b6d613 diff --git a/gfx/anims/beam.png b/gfx/battle_anims/beam.png Binary files differindex 32a3b1967..32a3b1967 100755 --- a/gfx/anims/beam.png +++ b/gfx/battle_anims/beam.png diff --git a/gfx/anims/bubble.2bpp.lz.03b8ac99 b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99 Binary files differindex 3d546191a..3d546191a 100644 --- a/gfx/anims/bubble.2bpp.lz.03b8ac99 +++ b/gfx/battle_anims/bubble.2bpp.lz.03b8ac99 diff --git a/gfx/anims/bubble.png b/gfx/battle_anims/bubble.png Binary files differindex b6febb0a8..b6febb0a8 100644 --- a/gfx/anims/bubble.png +++ b/gfx/battle_anims/bubble.png diff --git a/gfx/anims/charge.2bpp.lz.95d3ea98 b/gfx/battle_anims/charge.2bpp.lz.95d3ea98 Binary files differindex 32c82243c..32c82243c 100644 --- a/gfx/anims/charge.2bpp.lz.95d3ea98 +++ b/gfx/battle_anims/charge.2bpp.lz.95d3ea98 diff --git a/gfx/anims/charge.png b/gfx/battle_anims/charge.png Binary files differindex 90cb72f9f..90cb72f9f 100644 --- a/gfx/anims/charge.png +++ b/gfx/battle_anims/charge.png diff --git a/gfx/anims/cut.2bpp.lz.03d343ed b/gfx/battle_anims/cut.2bpp.lz.03d343ed Binary files differindex 740a48799..740a48799 100644 --- a/gfx/anims/cut.2bpp.lz.03d343ed +++ b/gfx/battle_anims/cut.2bpp.lz.03d343ed diff --git a/gfx/anims/cut.png b/gfx/battle_anims/cut.png Binary files differindex e227ad413..e227ad413 100644 --- a/gfx/anims/cut.png +++ b/gfx/battle_anims/cut.png diff --git a/gfx/anims/egg.2bpp.lz.41dd1a53 b/gfx/battle_anims/egg.2bpp.lz.41dd1a53 Binary files differindex fb55f2edc..fb55f2edc 100644 --- a/gfx/anims/egg.2bpp.lz.41dd1a53 +++ b/gfx/battle_anims/egg.2bpp.lz.41dd1a53 diff --git a/gfx/anims/egg.png b/gfx/battle_anims/egg.png Binary files differindex 38aab505d..38aab505d 100644 --- a/gfx/anims/egg.png +++ b/gfx/battle_anims/egg.png diff --git a/gfx/anims/explosion.2bpp.lz.55fc334f b/gfx/battle_anims/explosion.2bpp.lz.55fc334f Binary files differindex 4303302a1..4303302a1 100644 --- a/gfx/anims/explosion.2bpp.lz.55fc334f +++ b/gfx/battle_anims/explosion.2bpp.lz.55fc334f diff --git a/gfx/anims/explosion.png b/gfx/battle_anims/explosion.png Binary files differindex 0af9f1a0d..0af9f1a0d 100644 --- a/gfx/anims/explosion.png +++ b/gfx/battle_anims/explosion.png diff --git a/gfx/anims/fire.2bpp.lz.d7701cda b/gfx/battle_anims/fire.2bpp.lz.d7701cda Binary files differindex e15e9f9bb..e15e9f9bb 100644 --- a/gfx/anims/fire.2bpp.lz.d7701cda +++ b/gfx/battle_anims/fire.2bpp.lz.d7701cda diff --git a/gfx/anims/fire.png b/gfx/battle_anims/fire.png Binary files differindex 19f01141b..19f01141b 100644 --- a/gfx/anims/fire.png +++ b/gfx/battle_anims/fire.png diff --git a/gfx/anims/flower.2bpp.lz.1bc2e9d2 b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2 Binary files differindex ef628afb4..ef628afb4 100644 --- a/gfx/anims/flower.2bpp.lz.1bc2e9d2 +++ b/gfx/battle_anims/flower.2bpp.lz.1bc2e9d2 diff --git a/gfx/anims/flower.png b/gfx/battle_anims/flower.png Binary files differindex 61b4f58ce..61b4f58ce 100644 --- a/gfx/anims/flower.png +++ b/gfx/battle_anims/flower.png diff --git a/gfx/anims/globe.2bpp.lz.710dbb8e b/gfx/battle_anims/globe.2bpp.lz.710dbb8e Binary files differindex 99fa15c6f..99fa15c6f 100644 --- a/gfx/anims/globe.2bpp.lz.710dbb8e +++ b/gfx/battle_anims/globe.2bpp.lz.710dbb8e diff --git a/gfx/anims/globe.png b/gfx/battle_anims/globe.png Binary files differindex 8d3a35683..8d3a35683 100644 --- a/gfx/anims/globe.png +++ b/gfx/battle_anims/globe.png diff --git a/gfx/anims/haze.2bpp.lz.91424607 b/gfx/battle_anims/haze.2bpp.lz.91424607 Binary files differindex e0cdc644c..e0cdc644c 100644 --- a/gfx/anims/haze.2bpp.lz.91424607 +++ b/gfx/battle_anims/haze.2bpp.lz.91424607 diff --git a/gfx/anims/haze.png b/gfx/battle_anims/haze.png Binary files differindex 8a870ba98..8a870ba98 100644 --- a/gfx/anims/haze.png +++ b/gfx/battle_anims/haze.png diff --git a/gfx/anims/hit.2bpp.lz.2b3c83f2 b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2 Binary files differindex 5d9ffbe5d..5d9ffbe5d 100644 --- a/gfx/anims/hit.2bpp.lz.2b3c83f2 +++ b/gfx/battle_anims/hit.2bpp.lz.2b3c83f2 diff --git a/gfx/anims/hit.png b/gfx/battle_anims/hit.png Binary files differindex 228066331..228066331 100644 --- a/gfx/anims/hit.png +++ b/gfx/battle_anims/hit.png diff --git a/gfx/anims/horn.2bpp.lz.48908aae b/gfx/battle_anims/horn.2bpp.lz.48908aae Binary files differindex a92f74796..a92f74796 100644 --- a/gfx/anims/horn.2bpp.lz.48908aae +++ b/gfx/battle_anims/horn.2bpp.lz.48908aae diff --git a/gfx/anims/horn.png b/gfx/battle_anims/horn.png Binary files differindex 56e8ca241..56e8ca241 100644 --- a/gfx/anims/horn.png +++ b/gfx/battle_anims/horn.png diff --git a/gfx/anims/ice.2bpp.lz.664d900f b/gfx/battle_anims/ice.2bpp.lz.664d900f Binary files differindex 3d059700b..3d059700b 100644 --- a/gfx/anims/ice.2bpp.lz.664d900f +++ b/gfx/battle_anims/ice.2bpp.lz.664d900f diff --git a/gfx/anims/ice.png b/gfx/battle_anims/ice.png Binary files differindex 62a67641e..62a67641e 100644 --- a/gfx/anims/ice.png +++ b/gfx/battle_anims/ice.png diff --git a/gfx/anims/lightning.2bpp.lz.a88fc131 b/gfx/battle_anims/lightning.2bpp.lz.a88fc131 Binary files differindex 81de5850f..81de5850f 100644 --- a/gfx/anims/lightning.2bpp.lz.a88fc131 +++ b/gfx/battle_anims/lightning.2bpp.lz.a88fc131 diff --git a/gfx/anims/lightning.png b/gfx/battle_anims/lightning.png Binary files differindex 6606fad12..6606fad12 100755 --- a/gfx/anims/lightning.png +++ b/gfx/battle_anims/lightning.png diff --git a/gfx/anims/misc.2bpp.lz.4b20c3d7 b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7 Binary files differindex d0c5f0dfc..d0c5f0dfc 100644 --- a/gfx/anims/misc.2bpp.lz.4b20c3d7 +++ b/gfx/battle_anims/misc.2bpp.lz.4b20c3d7 diff --git a/gfx/anims/misc.png b/gfx/battle_anims/misc.png Binary files differindex d7e67508e..d7e67508e 100755 --- a/gfx/anims/misc.png +++ b/gfx/battle_anims/misc.png diff --git a/gfx/anims/noise.2bpp.lz.acb4a76e b/gfx/battle_anims/noise.2bpp.lz.acb4a76e Binary files differindex e195da453..e195da453 100644 --- a/gfx/anims/noise.2bpp.lz.acb4a76e +++ b/gfx/battle_anims/noise.2bpp.lz.acb4a76e diff --git a/gfx/anims/noise.png b/gfx/battle_anims/noise.png Binary files differindex 17540a5e8..17540a5e8 100755 --- a/gfx/anims/noise.png +++ b/gfx/battle_anims/noise.png diff --git a/gfx/anims/objects.2bpp.lz.83f812de b/gfx/battle_anims/objects.2bpp.lz.83f812de Binary files differindex 1a52d6350..1a52d6350 100644 --- a/gfx/anims/objects.2bpp.lz.83f812de +++ b/gfx/battle_anims/objects.2bpp.lz.83f812de diff --git a/gfx/anims/objects.png b/gfx/battle_anims/objects.png Binary files differindex 91ea435b8..91ea435b8 100755 --- a/gfx/anims/objects.png +++ b/gfx/battle_anims/objects.png diff --git a/gfx/anims/plant.2bpp.lz.4a00c417 b/gfx/battle_anims/plant.2bpp.lz.4a00c417 Binary files differindex 589fc48b6..589fc48b6 100644 --- a/gfx/anims/plant.2bpp.lz.4a00c417 +++ b/gfx/battle_anims/plant.2bpp.lz.4a00c417 diff --git a/gfx/anims/plant.png b/gfx/battle_anims/plant.png Binary files differindex ec1125054..ec1125054 100644 --- a/gfx/anims/plant.png +++ b/gfx/battle_anims/plant.png diff --git a/gfx/anims/poison.2bpp.lz.fc7dc9c1 b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1 Binary files differindex df2cbe604..df2cbe604 100644 --- a/gfx/anims/poison.2bpp.lz.fc7dc9c1 +++ b/gfx/battle_anims/poison.2bpp.lz.fc7dc9c1 diff --git a/gfx/anims/poison.png b/gfx/battle_anims/poison.png Binary files differindex ebbbc52be..ebbbc52be 100755 --- a/gfx/anims/poison.png +++ b/gfx/battle_anims/poison.png diff --git a/gfx/anims/pokeball.2bpp.lz.c58f7e01 b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01 Binary files differindex e09b082db..e09b082db 100644 --- a/gfx/anims/pokeball.2bpp.lz.c58f7e01 +++ b/gfx/battle_anims/pokeball.2bpp.lz.c58f7e01 diff --git a/gfx/anims/pokeball.png b/gfx/battle_anims/pokeball.png Binary files differindex 47edf2190..47edf2190 100755 --- a/gfx/anims/pokeball.png +++ b/gfx/battle_anims/pokeball.png diff --git a/gfx/anims/powder.2bpp.lz.bfd566bb b/gfx/battle_anims/powder.2bpp.lz.bfd566bb Binary files differindex 375d0bf9c..375d0bf9c 100644 --- a/gfx/anims/powder.2bpp.lz.bfd566bb +++ b/gfx/battle_anims/powder.2bpp.lz.bfd566bb diff --git a/gfx/anims/powder.png b/gfx/battle_anims/powder.png Binary files differindex b2cb4d459..b2cb4d459 100644 --- a/gfx/anims/powder.png +++ b/gfx/battle_anims/powder.png diff --git a/gfx/anims/psychic.2bpp.lz.d80f285c b/gfx/battle_anims/psychic.2bpp.lz.d80f285c Binary files differindex d6402dd3d..d6402dd3d 100644 --- a/gfx/anims/psychic.2bpp.lz.d80f285c +++ b/gfx/battle_anims/psychic.2bpp.lz.d80f285c diff --git a/gfx/anims/psychic.png b/gfx/battle_anims/psychic.png Binary files differindex a6d22db2f..a6d22db2f 100644 --- a/gfx/anims/psychic.png +++ b/gfx/battle_anims/psychic.png diff --git a/gfx/anims/reflect.2bpp.lz.9a9c822d b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d Binary files differindex a563de1a8..a563de1a8 100644 --- a/gfx/anims/reflect.2bpp.lz.9a9c822d +++ b/gfx/battle_anims/reflect.2bpp.lz.9a9c822d diff --git a/gfx/anims/reflect.png b/gfx/battle_anims/reflect.png Binary files differindex 48fbd7d0d..48fbd7d0d 100644 --- a/gfx/anims/reflect.png +++ b/gfx/battle_anims/reflect.png diff --git a/gfx/anims/rocks.2bpp.lz.73d0153e b/gfx/battle_anims/rocks.2bpp.lz.73d0153e Binary files differindex d5481ea6e..d5481ea6e 100644 --- a/gfx/anims/rocks.2bpp.lz.73d0153e +++ b/gfx/battle_anims/rocks.2bpp.lz.73d0153e diff --git a/gfx/anims/rocks.png b/gfx/battle_anims/rocks.png Binary files differindex d7fe76b2f..d7fe76b2f 100755 --- a/gfx/anims/rocks.png +++ b/gfx/battle_anims/rocks.png diff --git a/gfx/anims/rope.2bpp.lz.209d63dd b/gfx/battle_anims/rope.2bpp.lz.209d63dd Binary files differindex f7d6a480f..f7d6a480f 100644 --- a/gfx/anims/rope.2bpp.lz.209d63dd +++ b/gfx/battle_anims/rope.2bpp.lz.209d63dd diff --git a/gfx/anims/rope.png b/gfx/battle_anims/rope.png Binary files differindex a12553c7a..a12553c7a 100644 --- a/gfx/anims/rope.png +++ b/gfx/battle_anims/rope.png diff --git a/gfx/anims/sand.2bpp.lz.c87c0eaa b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa Binary files differindex 3508a1f58..3508a1f58 100644 --- a/gfx/anims/sand.2bpp.lz.c87c0eaa +++ b/gfx/battle_anims/sand.2bpp.lz.c87c0eaa diff --git a/gfx/anims/sand.png b/gfx/battle_anims/sand.png Binary files differindex a54db235d..a54db235d 100755 --- a/gfx/anims/sand.png +++ b/gfx/battle_anims/sand.png diff --git a/gfx/anims/shapes.2bpp.lz.262d77f0 b/gfx/battle_anims/shapes.2bpp.lz.262d77f0 Binary files differindex d7d48020f..d7d48020f 100644 --- a/gfx/anims/shapes.2bpp.lz.262d77f0 +++ b/gfx/battle_anims/shapes.2bpp.lz.262d77f0 diff --git a/gfx/anims/shapes.png b/gfx/battle_anims/shapes.png Binary files differindex b99fc601a..b99fc601a 100644 --- a/gfx/anims/shapes.png +++ b/gfx/battle_anims/shapes.png diff --git a/gfx/anims/shine.2bpp.lz.5fb79056 b/gfx/battle_anims/shine.2bpp.lz.5fb79056 Binary files differindex 3e47170b1..3e47170b1 100644 --- a/gfx/anims/shine.2bpp.lz.5fb79056 +++ b/gfx/battle_anims/shine.2bpp.lz.5fb79056 diff --git a/gfx/anims/shine.png b/gfx/battle_anims/shine.png Binary files differindex 1b7e9834b..1b7e9834b 100644 --- a/gfx/anims/shine.png +++ b/gfx/battle_anims/shine.png diff --git a/gfx/anims/skyattack.2bpp.lz.31738ab8 b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8 Binary files differindex e0412dd81..e0412dd81 100644 --- a/gfx/anims/skyattack.2bpp.lz.31738ab8 +++ b/gfx/battle_anims/skyattack.2bpp.lz.31738ab8 diff --git a/gfx/anims/skyattack.png b/gfx/battle_anims/skyattack.png Binary files differindex e731c691c..e731c691c 100644 --- a/gfx/anims/skyattack.png +++ b/gfx/battle_anims/skyattack.png diff --git a/gfx/anims/smoke.2bpp.lz.aa05905e b/gfx/battle_anims/smoke.2bpp.lz.aa05905e Binary files differindex bf26fed2b..bf26fed2b 100644 --- a/gfx/anims/smoke.2bpp.lz.aa05905e +++ b/gfx/battle_anims/smoke.2bpp.lz.aa05905e diff --git a/gfx/anims/smoke.png b/gfx/battle_anims/smoke.png Binary files differindex 1b09874ba..1b09874ba 100644 --- a/gfx/anims/smoke.png +++ b/gfx/battle_anims/smoke.png diff --git a/gfx/anims/speed.2bpp.lz.1732b364 b/gfx/battle_anims/speed.2bpp.lz.1732b364 Binary files differindex 5d09f9a6a..5d09f9a6a 100644 --- a/gfx/anims/speed.2bpp.lz.1732b364 +++ b/gfx/battle_anims/speed.2bpp.lz.1732b364 diff --git a/gfx/anims/speed.png b/gfx/battle_anims/speed.png Binary files differindex e219b38c9..e219b38c9 100644 --- a/gfx/anims/speed.png +++ b/gfx/battle_anims/speed.png diff --git a/gfx/anims/status.2bpp.lz.0c0aa13e b/gfx/battle_anims/status.2bpp.lz.0c0aa13e Binary files differindex e5ce7df8a..e5ce7df8a 100644 --- a/gfx/anims/status.2bpp.lz.0c0aa13e +++ b/gfx/battle_anims/status.2bpp.lz.0c0aa13e diff --git a/gfx/anims/status.png b/gfx/battle_anims/status.png Binary files differindex cb8527963..cb8527963 100644 --- a/gfx/anims/status.png +++ b/gfx/battle_anims/status.png diff --git a/gfx/anims/water.2bpp.lz.7b52ed12 b/gfx/battle_anims/water.2bpp.lz.7b52ed12 Binary files differindex 6a81bbb65..6a81bbb65 100644 --- a/gfx/anims/water.2bpp.lz.7b52ed12 +++ b/gfx/battle_anims/water.2bpp.lz.7b52ed12 diff --git a/gfx/anims/water.png b/gfx/battle_anims/water.png Binary files differindex 4e3c3b719..4e3c3b719 100644 --- a/gfx/anims/water.png +++ b/gfx/battle_anims/water.png diff --git a/gfx/anims/wave.2bpp.lz.bee99402 b/gfx/battle_anims/wave.2bpp.lz.bee99402 Binary files differindex d94a5cb35..d94a5cb35 100644 --- a/gfx/anims/wave.2bpp.lz.bee99402 +++ b/gfx/battle_anims/wave.2bpp.lz.bee99402 diff --git a/gfx/anims/wave.png b/gfx/battle_anims/wave.png Binary files differindex 55d4faa5f..55d4faa5f 100644 --- a/gfx/anims/wave.png +++ b/gfx/battle_anims/wave.png diff --git a/gfx/anims/web.2bpp.lz.80e3d480 b/gfx/battle_anims/web.2bpp.lz.80e3d480 Binary files differindex 84b4018e5..84b4018e5 100644 --- a/gfx/anims/web.2bpp.lz.80e3d480 +++ b/gfx/battle_anims/web.2bpp.lz.80e3d480 diff --git a/gfx/anims/web.png b/gfx/battle_anims/web.png Binary files differindex 2aeffef0e..2aeffef0e 100644 --- a/gfx/anims/web.png +++ b/gfx/battle_anims/web.png diff --git a/gfx/anims/whip.2bpp.lz.d80d8d6e b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e Binary files differindex da62ba918..da62ba918 100644 --- a/gfx/anims/whip.2bpp.lz.d80d8d6e +++ b/gfx/battle_anims/whip.2bpp.lz.d80d8d6e diff --git a/gfx/anims/whip.png b/gfx/battle_anims/whip.png Binary files differindex 92d7ded6f..92d7ded6f 100644 --- a/gfx/anims/whip.png +++ b/gfx/battle_anims/whip.png diff --git a/gfx/anims/wind.2bpp.lz.5a785180 b/gfx/battle_anims/wind.2bpp.lz.5a785180 Binary files differindex 9c2769b83..9c2769b83 100644 --- a/gfx/anims/wind.2bpp.lz.5a785180 +++ b/gfx/battle_anims/wind.2bpp.lz.5a785180 diff --git a/gfx/anims/wind.png b/gfx/battle_anims/wind.png Binary files differindex b02031392..b02031392 100644 --- a/gfx/anims/wind.png +++ b/gfx/battle_anims/wind.png diff --git a/gfx/pics.asm b/gfx/pics.asm index f14bfa42c..37aac234e 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -6,17 +6,17 @@ INCLUDE "includes.asm" SECTION "Pic Pointers", ROMX -INCLUDE "gfx/pokemon/pic_pointers.asm" +INCLUDE "data/pokemon/pic_pointers.asm" SECTION "Unown Pic Pointers", ROMX -INCLUDE "gfx/pokemon/unown_pic_pointers.asm" +INCLUDE "data/pokemon/unown_pic_pointers.asm" SECTION "Trainer Pic Pointers", ROMX -INCLUDE "gfx/trainer_pic_pointers.asm" +INCLUDE "data/trainers/pic_pointers.asm" SECTION "Pics 1", ROMX diff --git a/gfx/pokemon/palette_pointers.asm b/gfx/pokemon/palette_pointers.asm deleted file mode 100644 index 4ba114413..000000000 --- a/gfx/pokemon/palette_pointers.asm +++ /dev/null @@ -1,541 +0,0 @@ -PokemonPalettes: ; a8ce - -; 000 - RGB 30, 22, 17 - RGB 16, 14, 19 -; 000 shiny - RGB 30, 22, 17 - RGB 16, 14, 19 - -BulbasaurPalette: INCLUDE "gfx/pokemon/bulbasaur/normal.pal" -BulbasaurShinyPalette: INCLUDE "gfx/pokemon/bulbasaur/shiny.pal" -IvysaurPalette: INCLUDE "gfx/pokemon/ivysaur/normal.pal" -IvysaurShinyPalette: INCLUDE "gfx/pokemon/ivysaur/shiny.pal" -VenusaurPalette: INCLUDE "gfx/pokemon/venusaur/normal.pal" -VenusaurShinyPalette: INCLUDE "gfx/pokemon/venusaur/shiny.pal" -CharmanderPalette: INCLUDE "gfx/pokemon/charmander/normal.pal" -CharmanderShinyPalette: INCLUDE "gfx/pokemon/charmander/shiny.pal" -CharmeleonPalette: INCLUDE "gfx/pokemon/charmeleon/normal.pal" -CharmeleonShinyPalette: INCLUDE "gfx/pokemon/charmeleon/shiny.pal" -CharizardPalette: INCLUDE "gfx/pokemon/charizard/normal.pal" -CharizardShinyPalette: INCLUDE "gfx/pokemon/charizard/shiny.pal" -SquirtlePalette: INCLUDE "gfx/pokemon/squirtle/normal.pal" -SquirtleShinyPalette: INCLUDE "gfx/pokemon/squirtle/shiny.pal" -WartortlePalette: INCLUDE "gfx/pokemon/wartortle/normal.pal" -WartortleShinyPalette: INCLUDE "gfx/pokemon/wartortle/shiny.pal" -BlastoisePalette: INCLUDE "gfx/pokemon/blastoise/normal.pal" -BlastoiseShinyPalette: INCLUDE "gfx/pokemon/blastoise/shiny.pal" -CaterpiePalette: INCLUDE "gfx/pokemon/caterpie/normal.pal" -CaterpieShinyPalette: INCLUDE "gfx/pokemon/caterpie/shiny.pal" -MetapodPalette: INCLUDE "gfx/pokemon/metapod/normal.pal" -MetapodShinyPalette: INCLUDE "gfx/pokemon/metapod/shiny.pal" -ButterfreePalette: INCLUDE "gfx/pokemon/butterfree/normal.pal" -ButterfreeShinyPalette: INCLUDE "gfx/pokemon/butterfree/shiny.pal" -WeedlePalette: INCLUDE "gfx/pokemon/weedle/normal.pal" -WeedleShinyPalette: INCLUDE "gfx/pokemon/weedle/shiny.pal" -KakunaPalette: INCLUDE "gfx/pokemon/kakuna/normal.pal" -KakunaShinyPalette: INCLUDE "gfx/pokemon/kakuna/shiny.pal" -BeedrillPalette: INCLUDE "gfx/pokemon/beedrill/normal.pal" -BeedrillShinyPalette: INCLUDE "gfx/pokemon/beedrill/shiny.pal" -PidgeyPalette: INCLUDE "gfx/pokemon/pidgey/normal.pal" -PidgeyShinyPalette: INCLUDE "gfx/pokemon/pidgey/shiny.pal" -PidgeottoPalette: INCLUDE "gfx/pokemon/pidgeotto/normal.pal" -PidgeottoShinyPalette: INCLUDE "gfx/pokemon/pidgeotto/shiny.pal" -PidgeotPalette: INCLUDE "gfx/pokemon/pidgeot/normal.pal" -PidgeotShinyPalette: INCLUDE "gfx/pokemon/pidgeot/shiny.pal" -RattataPalette: INCLUDE "gfx/pokemon/rattata/normal.pal" -RattataShinyPalette: INCLUDE "gfx/pokemon/rattata/shiny.pal" -RaticatePalette: INCLUDE "gfx/pokemon/raticate/normal.pal" -RaticateShinyPalette: INCLUDE "gfx/pokemon/raticate/shiny.pal" -SpearowPalette: INCLUDE "gfx/pokemon/spearow/normal.pal" -SpearowShinyPalette: INCLUDE "gfx/pokemon/spearow/shiny.pal" -FearowPalette: INCLUDE "gfx/pokemon/fearow/normal.pal" -FearowShinyPalette: INCLUDE "gfx/pokemon/fearow/shiny.pal" -EkansPalette: INCLUDE "gfx/pokemon/ekans/normal.pal" -EkansShinyPalette: INCLUDE "gfx/pokemon/ekans/shiny.pal" -ArbokPalette: INCLUDE "gfx/pokemon/arbok/normal.pal" -ArbokShinyPalette: INCLUDE "gfx/pokemon/arbok/shiny.pal" -PikachuPalette: INCLUDE "gfx/pokemon/pikachu/normal.pal" -PikachuShinyPalette: INCLUDE "gfx/pokemon/pikachu/shiny.pal" -RaichuPalette: INCLUDE "gfx/pokemon/raichu/normal.pal" -RaichuShinyPalette: INCLUDE "gfx/pokemon/raichu/shiny.pal" -SandshrewPalette: INCLUDE "gfx/pokemon/sandshrew/normal.pal" -SandshrewShinyPalette: INCLUDE "gfx/pokemon/sandshrew/shiny.pal" -SandslashPalette: INCLUDE "gfx/pokemon/sandslash/normal.pal" -SandslashShinyPalette: INCLUDE "gfx/pokemon/sandslash/shiny.pal" -NidoranFPalette: INCLUDE "gfx/pokemon/nidoran_f/normal.pal" -NidoranFShinyPalette: INCLUDE "gfx/pokemon/nidoran_f/shiny.pal" -NidorinaPalette: INCLUDE "gfx/pokemon/nidorina/normal.pal" -NidorinaShinyPalette: INCLUDE "gfx/pokemon/nidorina/shiny.pal" -NidoqueenPalette: INCLUDE "gfx/pokemon/nidoqueen/normal.pal" -NidoqueenShinyPalette: INCLUDE "gfx/pokemon/nidoqueen/shiny.pal" -NidoranMPalette: INCLUDE "gfx/pokemon/nidoran_m/normal.pal" -NidoranMShinyPalette: INCLUDE "gfx/pokemon/nidoran_m/shiny.pal" -NidorinoPalette: INCLUDE "gfx/pokemon/nidorino/normal.pal" -NidorinoShinyPalette: INCLUDE "gfx/pokemon/nidorino/shiny.pal" -NidokingPalette: INCLUDE "gfx/pokemon/nidoking/normal.pal" -NidokingShinyPalette: INCLUDE "gfx/pokemon/nidoking/shiny.pal" -ClefairyPalette: INCLUDE "gfx/pokemon/clefairy/normal.pal" -ClefairyShinyPalette: INCLUDE "gfx/pokemon/clefairy/shiny.pal" -ClefablePalette: INCLUDE "gfx/pokemon/clefable/normal.pal" -ClefableShinyPalette: INCLUDE "gfx/pokemon/clefable/shiny.pal" -VulpixPalette: INCLUDE "gfx/pokemon/vulpix/normal.pal" -VulpixShinyPalette: INCLUDE "gfx/pokemon/vulpix/shiny.pal" -NinetalesPalette: INCLUDE "gfx/pokemon/ninetales/normal.pal" -NinetalesShinyPalette: INCLUDE "gfx/pokemon/ninetales/shiny.pal" -JigglypuffPalette: INCLUDE "gfx/pokemon/jigglypuff/normal.pal" -JigglypuffShinyPalette: INCLUDE "gfx/pokemon/jigglypuff/shiny.pal" -WigglytuffPalette: INCLUDE "gfx/pokemon/wigglytuff/normal.pal" -WigglytuffShinyPalette: INCLUDE "gfx/pokemon/wigglytuff/shiny.pal" -ZubatPalette: INCLUDE "gfx/pokemon/zubat/normal.pal" -ZubatShinyPalette: INCLUDE "gfx/pokemon/zubat/shiny.pal" -GolbatPalette: INCLUDE "gfx/pokemon/golbat/normal.pal" -GolbatShinyPalette: INCLUDE "gfx/pokemon/golbat/shiny.pal" -OddishPalette: INCLUDE "gfx/pokemon/oddish/normal.pal" -OddishShinyPalette: INCLUDE "gfx/pokemon/oddish/shiny.pal" -GloomPalette: INCLUDE "gfx/pokemon/gloom/normal.pal" -GloomShinyPalette: INCLUDE "gfx/pokemon/gloom/shiny.pal" -VileplumePalette: INCLUDE "gfx/pokemon/vileplume/normal.pal" -VileplumeShinyPalette: INCLUDE "gfx/pokemon/vileplume/shiny.pal" -ParasPalette: INCLUDE "gfx/pokemon/paras/normal.pal" -ParasShinyPalette: INCLUDE "gfx/pokemon/paras/shiny.pal" -ParasectPalette: INCLUDE "gfx/pokemon/parasect/normal.pal" -ParasectShinyPalette: INCLUDE "gfx/pokemon/parasect/shiny.pal" -VenonatPalette: INCLUDE "gfx/pokemon/venonat/normal.pal" -VenonatShinyPalette: INCLUDE "gfx/pokemon/venonat/shiny.pal" -VenomothPalette: INCLUDE "gfx/pokemon/venomoth/normal.pal" -VenomothShinyPalette: INCLUDE "gfx/pokemon/venomoth/shiny.pal" -DiglettPalette: INCLUDE "gfx/pokemon/diglett/normal.pal" -DiglettShinyPalette: INCLUDE "gfx/pokemon/diglett/shiny.pal" -DugtrioPalette: INCLUDE "gfx/pokemon/dugtrio/normal.pal" -DugtrioShinyPalette: INCLUDE "gfx/pokemon/dugtrio/shiny.pal" -MeowthPalette: INCLUDE "gfx/pokemon/meowth/normal.pal" -MeowthShinyPalette: INCLUDE "gfx/pokemon/meowth/shiny.pal" -PersianPalette: INCLUDE "gfx/pokemon/persian/normal.pal" -PersianShinyPalette: INCLUDE "gfx/pokemon/persian/shiny.pal" -PsyduckPalette: INCLUDE "gfx/pokemon/psyduck/normal.pal" -PsyduckShinyPalette: INCLUDE "gfx/pokemon/psyduck/shiny.pal" -GolduckPalette: INCLUDE "gfx/pokemon/golduck/normal.pal" -GolduckShinyPalette: INCLUDE "gfx/pokemon/golduck/shiny.pal" -MankeyPalette: INCLUDE "gfx/pokemon/mankey/normal.pal" -MankeyShinyPalette: INCLUDE "gfx/pokemon/mankey/shiny.pal" -PrimeapePalette: INCLUDE "gfx/pokemon/primeape/normal.pal" -PrimeapeShinyPalette: INCLUDE "gfx/pokemon/primeape/shiny.pal" -GrowlithePalette: INCLUDE "gfx/pokemon/growlithe/normal.pal" -GrowlitheShinyPalette: INCLUDE "gfx/pokemon/growlithe/shiny.pal" -ArcaninePalette: INCLUDE "gfx/pokemon/arcanine/normal.pal" -ArcanineShinyPalette: INCLUDE "gfx/pokemon/arcanine/shiny.pal" -PoliwagPalette: INCLUDE "gfx/pokemon/poliwag/normal.pal" -PoliwagShinyPalette: INCLUDE "gfx/pokemon/poliwag/shiny.pal" -PoliwhirlPalette: INCLUDE "gfx/pokemon/poliwhirl/normal.pal" -PoliwhirlShinyPalette: INCLUDE "gfx/pokemon/poliwhirl/shiny.pal" -PoliwrathPalette: INCLUDE "gfx/pokemon/poliwrath/normal.pal" -PoliwrathShinyPalette: INCLUDE "gfx/pokemon/poliwrath/shiny.pal" -AbraPalette: INCLUDE "gfx/pokemon/abra/normal.pal" -AbraShinyPalette: INCLUDE "gfx/pokemon/abra/shiny.pal" -KadabraPalette: INCLUDE "gfx/pokemon/kadabra/normal.pal" -KadabraShinyPalette: INCLUDE "gfx/pokemon/kadabra/shiny.pal" -AlakazamPalette: INCLUDE "gfx/pokemon/alakazam/normal.pal" -AlakazamShinyPalette: INCLUDE "gfx/pokemon/alakazam/shiny.pal" -MachopPalette: INCLUDE "gfx/pokemon/machop/normal.pal" -MachopShinyPalette: INCLUDE "gfx/pokemon/machop/shiny.pal" -MachokePalette: INCLUDE "gfx/pokemon/machoke/normal.pal" -MachokeShinyPalette: INCLUDE "gfx/pokemon/machoke/shiny.pal" -MachampPalette: INCLUDE "gfx/pokemon/machamp/normal.pal" -MachampShinyPalette: INCLUDE "gfx/pokemon/machamp/shiny.pal" -BellsproutPalette: INCLUDE "gfx/pokemon/bellsprout/normal.pal" -BellsproutShinyPalette: INCLUDE "gfx/pokemon/bellsprout/shiny.pal" -WeepinbellPalette: INCLUDE "gfx/pokemon/weepinbell/normal.pal" -WeepinbellShinyPalette: INCLUDE "gfx/pokemon/weepinbell/shiny.pal" -VictreebelPalette: INCLUDE "gfx/pokemon/victreebel/normal.pal" -VictreebelShinyPalette: INCLUDE "gfx/pokemon/victreebel/shiny.pal" -TentacoolPalette: INCLUDE "gfx/pokemon/tentacool/normal.pal" -TentacoolShinyPalette: INCLUDE "gfx/pokemon/tentacool/shiny.pal" -TentacruelPalette: INCLUDE "gfx/pokemon/tentacruel/normal.pal" -TentacruelShinyPalette: INCLUDE "gfx/pokemon/tentacruel/shiny.pal" -GeodudePalette: INCLUDE "gfx/pokemon/geodude/normal.pal" -GeodudeShinyPalette: INCLUDE "gfx/pokemon/geodude/shiny.pal" -GravelerPalette: INCLUDE "gfx/pokemon/graveler/normal.pal" -GravelerShinyPalette: INCLUDE "gfx/pokemon/graveler/shiny.pal" -GolemPalette: INCLUDE "gfx/pokemon/golem/normal.pal" -GolemShinyPalette: INCLUDE "gfx/pokemon/golem/shiny.pal" -PonytaPalette: INCLUDE "gfx/pokemon/ponyta/normal.pal" -PonytaShinyPalette: INCLUDE "gfx/pokemon/ponyta/shiny.pal" -RapidashPalette: INCLUDE "gfx/pokemon/rapidash/normal.pal" -RapidashShinyPalette: INCLUDE "gfx/pokemon/rapidash/shiny.pal" -SlowpokePalette: INCLUDE "gfx/pokemon/slowpoke/normal.pal" -SlowpokeShinyPalette: INCLUDE "gfx/pokemon/slowpoke/shiny.pal" -SlowbroPalette: INCLUDE "gfx/pokemon/slowbro/normal.pal" -SlowbroShinyPalette: INCLUDE "gfx/pokemon/slowbro/shiny.pal" -MagnemitePalette: INCLUDE "gfx/pokemon/magnemite/normal.pal" -MagnemiteShinyPalette: INCLUDE "gfx/pokemon/magnemite/shiny.pal" -MagnetonPalette: INCLUDE "gfx/pokemon/magneton/normal.pal" -MagnetonShinyPalette: INCLUDE "gfx/pokemon/magneton/shiny.pal" -FarfetchDPalette: INCLUDE "gfx/pokemon/farfetch_d/normal.pal" -FarfetchDShinyPalette: INCLUDE "gfx/pokemon/farfetch_d/shiny.pal" -DoduoPalette: INCLUDE "gfx/pokemon/doduo/normal.pal" -DoduoShinyPalette: INCLUDE "gfx/pokemon/doduo/shiny.pal" -DodrioPalette: INCLUDE "gfx/pokemon/dodrio/normal.pal" -DodrioShinyPalette: INCLUDE "gfx/pokemon/dodrio/shiny.pal" -SeelPalette: INCLUDE "gfx/pokemon/seel/normal.pal" -SeelShinyPalette: INCLUDE "gfx/pokemon/seel/shiny.pal" -DewgongPalette: INCLUDE "gfx/pokemon/dewgong/normal.pal" -DewgongShinyPalette: INCLUDE "gfx/pokemon/dewgong/shiny.pal" -GrimerPalette: INCLUDE "gfx/pokemon/grimer/normal.pal" -GrimerShinyPalette: INCLUDE "gfx/pokemon/grimer/shiny.pal" -MukPalette: INCLUDE "gfx/pokemon/muk/normal.pal" -MukShinyPalette: INCLUDE "gfx/pokemon/muk/shiny.pal" -ShellderPalette: INCLUDE "gfx/pokemon/shellder/normal.pal" -ShellderShinyPalette: INCLUDE "gfx/pokemon/shellder/shiny.pal" -CloysterPalette: INCLUDE "gfx/pokemon/cloyster/normal.pal" -CloysterShinyPalette: INCLUDE "gfx/pokemon/cloyster/shiny.pal" -GastlyPalette: INCLUDE "gfx/pokemon/gastly/normal.pal" -GastlyShinyPalette: INCLUDE "gfx/pokemon/gastly/shiny.pal" -HaunterPalette: INCLUDE "gfx/pokemon/haunter/normal.pal" -HaunterShinyPalette: INCLUDE "gfx/pokemon/haunter/shiny.pal" -GengarPalette: INCLUDE "gfx/pokemon/gengar/normal.pal" -GengarShinyPalette: INCLUDE "gfx/pokemon/gengar/shiny.pal" -OnixPalette: INCLUDE "gfx/pokemon/onix/normal.pal" -OnixShinyPalette: INCLUDE "gfx/pokemon/onix/shiny.pal" -DrowzeePalette: INCLUDE "gfx/pokemon/drowzee/normal.pal" -DrowzeeShinyPalette: INCLUDE "gfx/pokemon/drowzee/shiny.pal" -HypnoPalette: INCLUDE "gfx/pokemon/hypno/normal.pal" -HypnoShinyPalette: INCLUDE "gfx/pokemon/hypno/shiny.pal" -KrabbyPalette: INCLUDE "gfx/pokemon/krabby/normal.pal" -KrabbyShinyPalette: INCLUDE "gfx/pokemon/krabby/shiny.pal" -KinglerPalette: INCLUDE "gfx/pokemon/kingler/normal.pal" -KinglerShinyPalette: INCLUDE "gfx/pokemon/kingler/shiny.pal" -VoltorbPalette: INCLUDE "gfx/pokemon/voltorb/normal.pal" -VoltorbShinyPalette: INCLUDE "gfx/pokemon/voltorb/shiny.pal" -ElectrodePalette: INCLUDE "gfx/pokemon/electrode/normal.pal" -ElectrodeShinyPalette: INCLUDE "gfx/pokemon/electrode/shiny.pal" -ExeggcutePalette: INCLUDE "gfx/pokemon/exeggcute/normal.pal" -ExeggcuteShinyPalette: INCLUDE "gfx/pokemon/exeggcute/shiny.pal" -ExeggutorPalette: INCLUDE "gfx/pokemon/exeggutor/normal.pal" -ExeggutorShinyPalette: INCLUDE "gfx/pokemon/exeggutor/shiny.pal" -CubonePalette: INCLUDE "gfx/pokemon/cubone/normal.pal" -CuboneShinyPalette: INCLUDE "gfx/pokemon/cubone/shiny.pal" -MarowakPalette: INCLUDE "gfx/pokemon/marowak/normal.pal" -MarowakShinyPalette: INCLUDE "gfx/pokemon/marowak/shiny.pal" -HitmonleePalette: INCLUDE "gfx/pokemon/hitmonlee/normal.pal" -HitmonleeShinyPalette: INCLUDE "gfx/pokemon/hitmonlee/shiny.pal" -HitmonchanPalette: INCLUDE "gfx/pokemon/hitmonchan/normal.pal" -HitmonchanShinyPalette: INCLUDE "gfx/pokemon/hitmonchan/shiny.pal" -LickitungPalette: INCLUDE "gfx/pokemon/lickitung/normal.pal" -LickitungShinyPalette: INCLUDE "gfx/pokemon/lickitung/shiny.pal" -KoffingPalette: INCLUDE "gfx/pokemon/koffing/normal.pal" -KoffingShinyPalette: INCLUDE "gfx/pokemon/koffing/shiny.pal" -WeezingPalette: INCLUDE "gfx/pokemon/weezing/normal.pal" -WeezingShinyPalette: INCLUDE "gfx/pokemon/weezing/shiny.pal" -RhyhornPalette: INCLUDE "gfx/pokemon/rhyhorn/normal.pal" -RhyhornShinyPalette: INCLUDE "gfx/pokemon/rhyhorn/shiny.pal" -RhydonPalette: INCLUDE "gfx/pokemon/rhydon/normal.pal" -RhydonShinyPalette: INCLUDE "gfx/pokemon/rhydon/shiny.pal" -ChanseyPalette: INCLUDE "gfx/pokemon/chansey/normal.pal" -ChanseyShinyPalette: INCLUDE "gfx/pokemon/chansey/shiny.pal" -TangelaPalette: INCLUDE "gfx/pokemon/tangela/normal.pal" -TangelaShinyPalette: INCLUDE "gfx/pokemon/tangela/shiny.pal" -KangaskhanPalette: INCLUDE "gfx/pokemon/kangaskhan/normal.pal" -KangaskhanShinyPalette: INCLUDE "gfx/pokemon/kangaskhan/shiny.pal" -HorseaPalette: INCLUDE "gfx/pokemon/horsea/normal.pal" -HorseaShinyPalette: INCLUDE "gfx/pokemon/horsea/shiny.pal" -SeadraPalette: INCLUDE "gfx/pokemon/seadra/normal.pal" -SeadraShinyPalette: INCLUDE "gfx/pokemon/seadra/shiny.pal" -GoldeenPalette: INCLUDE "gfx/pokemon/goldeen/normal.pal" -GoldeenShinyPalette: INCLUDE "gfx/pokemon/goldeen/shiny.pal" -SeakingPalette: INCLUDE "gfx/pokemon/seaking/normal.pal" -SeakingShinyPalette: INCLUDE "gfx/pokemon/seaking/shiny.pal" -StaryuPalette: INCLUDE "gfx/pokemon/staryu/normal.pal" -StaryuShinyPalette: INCLUDE "gfx/pokemon/staryu/shiny.pal" -StarmiePalette: INCLUDE "gfx/pokemon/starmie/normal.pal" -StarmieShinyPalette: INCLUDE "gfx/pokemon/starmie/shiny.pal" -MrMimePalette: INCLUDE "gfx/pokemon/mr__mime/normal.pal" -MrMimeShinyPalette: INCLUDE "gfx/pokemon/mr__mime/shiny.pal" -ScytherPalette: INCLUDE "gfx/pokemon/scyther/normal.pal" -ScytherShinyPalette: INCLUDE "gfx/pokemon/scyther/shiny.pal" -JynxPalette: INCLUDE "gfx/pokemon/jynx/normal.pal" -JynxShinyPalette: INCLUDE "gfx/pokemon/jynx/shiny.pal" -ElectabuzzPalette: INCLUDE "gfx/pokemon/electabuzz/normal.pal" -ElectabuzzShinyPalette: INCLUDE "gfx/pokemon/electabuzz/shiny.pal" -MagmarPalette: INCLUDE "gfx/pokemon/magmar/normal.pal" -MagmarShinyPalette: INCLUDE "gfx/pokemon/magmar/shiny.pal" -PinsirPalette: INCLUDE "gfx/pokemon/pinsir/normal.pal" -PinsirShinyPalette: INCLUDE "gfx/pokemon/pinsir/shiny.pal" -TaurosPalette: INCLUDE "gfx/pokemon/tauros/normal.pal" -TaurosShinyPalette: INCLUDE "gfx/pokemon/tauros/shiny.pal" -MagikarpPalette: INCLUDE "gfx/pokemon/magikarp/normal.pal" -MagikarpShinyPalette: INCLUDE "gfx/pokemon/magikarp/shiny.pal" -GyaradosPalette: INCLUDE "gfx/pokemon/gyarados/normal.pal" -GyaradosShinyPalette: INCLUDE "gfx/pokemon/gyarados/shiny.pal" -LaprasPalette: INCLUDE "gfx/pokemon/lapras/normal.pal" -LaprasShinyPalette: INCLUDE "gfx/pokemon/lapras/shiny.pal" -DittoPalette: INCLUDE "gfx/pokemon/ditto/normal.pal" -DittoShinyPalette: INCLUDE "gfx/pokemon/ditto/shiny.pal" -EeveePalette: INCLUDE "gfx/pokemon/eevee/normal.pal" -EeveeShinyPalette: INCLUDE "gfx/pokemon/eevee/shiny.pal" -VaporeonPalette: INCLUDE "gfx/pokemon/vaporeon/normal.pal" -VaporeonShinyPalette: INCLUDE "gfx/pokemon/vaporeon/shiny.pal" -JolteonPalette: INCLUDE "gfx/pokemon/jolteon/normal.pal" -JolteonShinyPalette: INCLUDE "gfx/pokemon/jolteon/shiny.pal" -FlareonPalette: INCLUDE "gfx/pokemon/flareon/normal.pal" -FlareonShinyPalette: INCLUDE "gfx/pokemon/flareon/shiny.pal" -PorygonPalette: INCLUDE "gfx/pokemon/porygon/normal.pal" -PorygonShinyPalette: INCLUDE "gfx/pokemon/porygon/shiny.pal" -OmanytePalette: INCLUDE "gfx/pokemon/omanyte/normal.pal" -OmanyteShinyPalette: INCLUDE "gfx/pokemon/omanyte/shiny.pal" -OmastarPalette: INCLUDE "gfx/pokemon/omastar/normal.pal" -OmastarShinyPalette: INCLUDE "gfx/pokemon/omastar/shiny.pal" -KabutoPalette: INCLUDE "gfx/pokemon/kabuto/normal.pal" -KabutoShinyPalette: INCLUDE "gfx/pokemon/kabuto/shiny.pal" -KabutopsPalette: INCLUDE "gfx/pokemon/kabutops/normal.pal" -KabutopsShinyPalette: INCLUDE "gfx/pokemon/kabutops/shiny.pal" -AerodactylPalette: INCLUDE "gfx/pokemon/aerodactyl/normal.pal" -AerodactylShinyPalette: INCLUDE "gfx/pokemon/aerodactyl/shiny.pal" -SnorlaxPalette: INCLUDE "gfx/pokemon/snorlax/normal.pal" -SnorlaxShinyPalette: INCLUDE "gfx/pokemon/snorlax/shiny.pal" -ArticunoPalette: INCLUDE "gfx/pokemon/articuno/normal.pal" -ArticunoShinyPalette: INCLUDE "gfx/pokemon/articuno/shiny.pal" -ZapdosPalette: INCLUDE "gfx/pokemon/zapdos/normal.pal" -ZapdosShinyPalette: INCLUDE "gfx/pokemon/zapdos/shiny.pal" -MoltresPalette: INCLUDE "gfx/pokemon/moltres/normal.pal" -MoltresShinyPalette: INCLUDE "gfx/pokemon/moltres/shiny.pal" -DratiniPalette: INCLUDE "gfx/pokemon/dratini/normal.pal" -DratiniShinyPalette: INCLUDE "gfx/pokemon/dratini/shiny.pal" -DragonairPalette: INCLUDE "gfx/pokemon/dragonair/normal.pal" -DragonairShinyPalette: INCLUDE "gfx/pokemon/dragonair/shiny.pal" -DragonitePalette: INCLUDE "gfx/pokemon/dragonite/normal.pal" -DragoniteShinyPalette: INCLUDE "gfx/pokemon/dragonite/shiny.pal" -MewtwoPalette: INCLUDE "gfx/pokemon/mewtwo/normal.pal" -MewtwoShinyPalette: INCLUDE "gfx/pokemon/mewtwo/shiny.pal" -MewPalette: INCLUDE "gfx/pokemon/mew/normal.pal" -MewShinyPalette: INCLUDE "gfx/pokemon/mew/shiny.pal" -ChikoritaPalette: INCLUDE "gfx/pokemon/chikorita/normal.pal" -ChikoritaShinyPalette: INCLUDE "gfx/pokemon/chikorita/shiny.pal" -BayleefPalette: INCLUDE "gfx/pokemon/bayleef/normal.pal" -BayleefShinyPalette: INCLUDE "gfx/pokemon/bayleef/shiny.pal" -MeganiumPalette: INCLUDE "gfx/pokemon/meganium/normal.pal" -MeganiumShinyPalette: INCLUDE "gfx/pokemon/meganium/shiny.pal" -CyndaquilPalette: INCLUDE "gfx/pokemon/cyndaquil/normal.pal" -CyndaquilShinyPalette: INCLUDE "gfx/pokemon/cyndaquil/shiny.pal" -QuilavaPalette: INCLUDE "gfx/pokemon/quilava/normal.pal" -QuilavaShinyPalette: INCLUDE "gfx/pokemon/quilava/shiny.pal" -TyphlosionPalette: INCLUDE "gfx/pokemon/typhlosion/normal.pal" -TyphlosionShinyPalette: INCLUDE "gfx/pokemon/typhlosion/shiny.pal" -TotodilePalette: INCLUDE "gfx/pokemon/totodile/normal.pal" -TotodileShinyPalette: INCLUDE "gfx/pokemon/totodile/shiny.pal" -CroconawPalette: INCLUDE "gfx/pokemon/croconaw/normal.pal" -CroconawShinyPalette: INCLUDE "gfx/pokemon/croconaw/shiny.pal" -FeraligatrPalette: INCLUDE "gfx/pokemon/feraligatr/normal.pal" -FeraligatrShinyPalette: INCLUDE "gfx/pokemon/feraligatr/shiny.pal" -SentretPalette: INCLUDE "gfx/pokemon/sentret/normal.pal" -SentretShinyPalette: INCLUDE "gfx/pokemon/sentret/shiny.pal" -FurretPalette: INCLUDE "gfx/pokemon/furret/normal.pal" -FurretShinyPalette: INCLUDE "gfx/pokemon/furret/shiny.pal" -HoothootPalette: INCLUDE "gfx/pokemon/hoothoot/normal.pal" -HoothootShinyPalette: INCLUDE "gfx/pokemon/hoothoot/shiny.pal" -NoctowlPalette: INCLUDE "gfx/pokemon/noctowl/normal.pal" -NoctowlShinyPalette: INCLUDE "gfx/pokemon/noctowl/shiny.pal" -LedybaPalette: INCLUDE "gfx/pokemon/ledyba/normal.pal" -LedybaShinyPalette: INCLUDE "gfx/pokemon/ledyba/shiny.pal" -LedianPalette: INCLUDE "gfx/pokemon/ledian/normal.pal" -LedianShinyPalette: INCLUDE "gfx/pokemon/ledian/shiny.pal" -SpinarakPalette: INCLUDE "gfx/pokemon/spinarak/normal.pal" -SpinarakShinyPalette: INCLUDE "gfx/pokemon/spinarak/shiny.pal" -AriadosPalette: INCLUDE "gfx/pokemon/ariados/normal.pal" -AriadosShinyPalette: INCLUDE "gfx/pokemon/ariados/shiny.pal" -CrobatPalette: INCLUDE "gfx/pokemon/crobat/normal.pal" -CrobatShinyPalette: INCLUDE "gfx/pokemon/crobat/shiny.pal" -ChinchouPalette: INCLUDE "gfx/pokemon/chinchou/normal.pal" -ChinchouShinyPalette: INCLUDE "gfx/pokemon/chinchou/shiny.pal" -LanturnPalette: INCLUDE "gfx/pokemon/lanturn/normal.pal" -LanturnShinyPalette: INCLUDE "gfx/pokemon/lanturn/shiny.pal" -PichuPalette: INCLUDE "gfx/pokemon/pichu/normal.pal" -PichuShinyPalette: INCLUDE "gfx/pokemon/pichu/shiny.pal" -CleffaPalette: INCLUDE "gfx/pokemon/cleffa/normal.pal" -CleffaShinyPalette: INCLUDE "gfx/pokemon/cleffa/shiny.pal" -IgglybuffPalette: INCLUDE "gfx/pokemon/igglybuff/normal.pal" -IgglybuffShinyPalette: INCLUDE "gfx/pokemon/igglybuff/shiny.pal" -TogepiPalette: INCLUDE "gfx/pokemon/togepi/normal.pal" -TogepiShinyPalette: INCLUDE "gfx/pokemon/togepi/shiny.pal" -TogeticPalette: INCLUDE "gfx/pokemon/togetic/normal.pal" -TogeticShinyPalette: INCLUDE "gfx/pokemon/togetic/shiny.pal" -NatuPalette: INCLUDE "gfx/pokemon/natu/normal.pal" -NatuShinyPalette: INCLUDE "gfx/pokemon/natu/shiny.pal" -XatuPalette: INCLUDE "gfx/pokemon/xatu/normal.pal" -XatuShinyPalette: INCLUDE "gfx/pokemon/xatu/shiny.pal" -MareepPalette: INCLUDE "gfx/pokemon/mareep/normal.pal" -MareepShinyPalette: INCLUDE "gfx/pokemon/mareep/shiny.pal" -FlaaffyPalette: INCLUDE "gfx/pokemon/flaaffy/normal.pal" -FlaaffyShinyPalette: INCLUDE "gfx/pokemon/flaaffy/shiny.pal" -AmpharosPalette: INCLUDE "gfx/pokemon/ampharos/normal.pal" -AmpharosShinyPalette: INCLUDE "gfx/pokemon/ampharos/shiny.pal" -BellossomPalette: INCLUDE "gfx/pokemon/bellossom/normal.pal" -BellossomShinyPalette: INCLUDE "gfx/pokemon/bellossom/shiny.pal" -MarillPalette: INCLUDE "gfx/pokemon/marill/normal.pal" -MarillShinyPalette: INCLUDE "gfx/pokemon/marill/shiny.pal" -AzumarillPalette: INCLUDE "gfx/pokemon/azumarill/normal.pal" -AzumarillShinyPalette: INCLUDE "gfx/pokemon/azumarill/shiny.pal" -SudowoodoPalette: INCLUDE "gfx/pokemon/sudowoodo/normal.pal" -SudowoodoShinyPalette: INCLUDE "gfx/pokemon/sudowoodo/shiny.pal" -PolitoedPalette: INCLUDE "gfx/pokemon/politoed/normal.pal" -PolitoedShinyPalette: INCLUDE "gfx/pokemon/politoed/shiny.pal" -HoppipPalette: INCLUDE "gfx/pokemon/hoppip/normal.pal" -HoppipShinyPalette: INCLUDE "gfx/pokemon/hoppip/shiny.pal" -SkiploomPalette: INCLUDE "gfx/pokemon/skiploom/normal.pal" -SkiploomShinyPalette: INCLUDE "gfx/pokemon/skiploom/shiny.pal" -JumpluffPalette: INCLUDE "gfx/pokemon/jumpluff/normal.pal" -JumpluffShinyPalette: INCLUDE "gfx/pokemon/jumpluff/shiny.pal" -AipomPalette: INCLUDE "gfx/pokemon/aipom/normal.pal" -AipomShinyPalette: INCLUDE "gfx/pokemon/aipom/shiny.pal" -SunkernPalette: INCLUDE "gfx/pokemon/sunkern/normal.pal" -SunkernShinyPalette: INCLUDE "gfx/pokemon/sunkern/shiny.pal" -SunfloraPalette: INCLUDE "gfx/pokemon/sunflora/normal.pal" -SunfloraShinyPalette: INCLUDE "gfx/pokemon/sunflora/shiny.pal" -YanmaPalette: INCLUDE "gfx/pokemon/yanma/normal.pal" -YanmaShinyPalette: INCLUDE "gfx/pokemon/yanma/shiny.pal" -WooperPalette: INCLUDE "gfx/pokemon/wooper/normal.pal" -WooperShinyPalette: INCLUDE "gfx/pokemon/wooper/shiny.pal" -QuagsirePalette: INCLUDE "gfx/pokemon/quagsire/normal.pal" -QuagsireShinyPalette: INCLUDE "gfx/pokemon/quagsire/shiny.pal" -EspeonPalette: INCLUDE "gfx/pokemon/espeon/normal.pal" -EspeonShinyPalette: INCLUDE "gfx/pokemon/espeon/shiny.pal" -UmbreonPalette: INCLUDE "gfx/pokemon/umbreon/normal.pal" -UmbreonShinyPalette: INCLUDE "gfx/pokemon/umbreon/shiny.pal" -MurkrowPalette: INCLUDE "gfx/pokemon/murkrow/normal.pal" -MurkrowShinyPalette: INCLUDE "gfx/pokemon/murkrow/shiny.pal" -SlowkingPalette: INCLUDE "gfx/pokemon/slowking/normal.pal" -SlowkingShinyPalette: INCLUDE "gfx/pokemon/slowking/shiny.pal" -MisdreavusPalette: INCLUDE "gfx/pokemon/misdreavus/normal.pal" -MisdreavusShinyPalette: INCLUDE "gfx/pokemon/misdreavus/shiny.pal" -UnownPalette: INCLUDE "gfx/pokemon/unown/normal.pal" -UnownShinyPalette: INCLUDE "gfx/pokemon/unown/shiny.pal" -WobbuffetPalette: INCLUDE "gfx/pokemon/wobbuffet/normal.pal" -WobbuffetShinyPalette: INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" -GirafarigPalette: INCLUDE "gfx/pokemon/girafarig/normal.pal" -GirafarigShinyPalette: INCLUDE "gfx/pokemon/girafarig/shiny.pal" -PinecoPalette: INCLUDE "gfx/pokemon/pineco/normal.pal" -PinecoShinyPalette: INCLUDE "gfx/pokemon/pineco/shiny.pal" -ForretressPalette: INCLUDE "gfx/pokemon/forretress/normal.pal" -ForretressShinyPalette: INCLUDE "gfx/pokemon/forretress/shiny.pal" -DunsparcePalette: INCLUDE "gfx/pokemon/dunsparce/normal.pal" -DunsparceShinyPalette: INCLUDE "gfx/pokemon/dunsparce/shiny.pal" -GligarPalette: INCLUDE "gfx/pokemon/gligar/normal.pal" -GligarShinyPalette: INCLUDE "gfx/pokemon/gligar/shiny.pal" -SteelixPalette: INCLUDE "gfx/pokemon/steelix/normal.pal" -SteelixShinyPalette: INCLUDE "gfx/pokemon/steelix/shiny.pal" -SnubbullPalette: INCLUDE "gfx/pokemon/snubbull/normal.pal" -SnubbullShinyPalette: INCLUDE "gfx/pokemon/snubbull/shiny.pal" -GranbullPalette: INCLUDE "gfx/pokemon/granbull/normal.pal" -GranbullShinyPalette: INCLUDE "gfx/pokemon/granbull/shiny.pal" -QwilfishPalette: INCLUDE "gfx/pokemon/qwilfish/normal.pal" -QwilfishShinyPalette: INCLUDE "gfx/pokemon/qwilfish/shiny.pal" -ScizorPalette: INCLUDE "gfx/pokemon/scizor/normal.pal" -ScizorShinyPalette: INCLUDE "gfx/pokemon/scizor/shiny.pal" -ShucklePalette: INCLUDE "gfx/pokemon/shuckle/normal.pal" -ShuckleShinyPalette: INCLUDE "gfx/pokemon/shuckle/shiny.pal" -HeracrossPalette: INCLUDE "gfx/pokemon/heracross/normal.pal" -HeracrossShinyPalette: INCLUDE "gfx/pokemon/heracross/shiny.pal" -SneaselPalette: INCLUDE "gfx/pokemon/sneasel/normal.pal" -SneaselShinyPalette: INCLUDE "gfx/pokemon/sneasel/shiny.pal" -TeddiursaPalette: INCLUDE "gfx/pokemon/teddiursa/normal.pal" -TeddiursaShinyPalette: INCLUDE "gfx/pokemon/teddiursa/shiny.pal" -UrsaringPalette: INCLUDE "gfx/pokemon/ursaring/normal.pal" -UrsaringShinyPalette: INCLUDE "gfx/pokemon/ursaring/shiny.pal" -SlugmaPalette: INCLUDE "gfx/pokemon/slugma/normal.pal" -SlugmaShinyPalette: INCLUDE "gfx/pokemon/slugma/shiny.pal" -MagcargoPalette: INCLUDE "gfx/pokemon/magcargo/normal.pal" -MagcargoShinyPalette: INCLUDE "gfx/pokemon/magcargo/shiny.pal" -SwinubPalette: INCLUDE "gfx/pokemon/swinub/normal.pal" -SwinubShinyPalette: INCLUDE "gfx/pokemon/swinub/shiny.pal" -PiloswinePalette: INCLUDE "gfx/pokemon/piloswine/normal.pal" -PiloswineShinyPalette: INCLUDE "gfx/pokemon/piloswine/shiny.pal" -CorsolaPalette: INCLUDE "gfx/pokemon/corsola/normal.pal" -CorsolaShinyPalette: INCLUDE "gfx/pokemon/corsola/shiny.pal" -RemoraidPalette: INCLUDE "gfx/pokemon/remoraid/normal.pal" -RemoraidShinyPalette: INCLUDE "gfx/pokemon/remoraid/shiny.pal" -OctilleryPalette: INCLUDE "gfx/pokemon/octillery/normal.pal" -OctilleryShinyPalette: INCLUDE "gfx/pokemon/octillery/shiny.pal" -DelibirdPalette: INCLUDE "gfx/pokemon/delibird/normal.pal" -DelibirdShinyPalette: INCLUDE "gfx/pokemon/delibird/shiny.pal" -MantinePalette: INCLUDE "gfx/pokemon/mantine/normal.pal" -MantineShinyPalette: INCLUDE "gfx/pokemon/mantine/shiny.pal" -SkarmoryPalette: INCLUDE "gfx/pokemon/skarmory/normal.pal" -SkarmoryShinyPalette: INCLUDE "gfx/pokemon/skarmory/shiny.pal" -HoundourPalette: INCLUDE "gfx/pokemon/houndour/normal.pal" -HoundourShinyPalette: INCLUDE "gfx/pokemon/houndour/shiny.pal" -HoundoomPalette: INCLUDE "gfx/pokemon/houndoom/normal.pal" -HoundoomShinyPalette: INCLUDE "gfx/pokemon/houndoom/shiny.pal" -KingdraPalette: INCLUDE "gfx/pokemon/kingdra/normal.pal" -KingdraShinyPalette: INCLUDE "gfx/pokemon/kingdra/shiny.pal" -PhanpyPalette: INCLUDE "gfx/pokemon/phanpy/normal.pal" -PhanpyShinyPalette: INCLUDE "gfx/pokemon/phanpy/shiny.pal" -DonphanPalette: INCLUDE "gfx/pokemon/donphan/normal.pal" -DonphanShinyPalette: INCLUDE "gfx/pokemon/donphan/shiny.pal" -Porygon2Palette: INCLUDE "gfx/pokemon/porygon2/normal.pal" -Porygon2ShinyPalette: INCLUDE "gfx/pokemon/porygon2/shiny.pal" -StantlerPalette: INCLUDE "gfx/pokemon/stantler/normal.pal" -StantlerShinyPalette: INCLUDE "gfx/pokemon/stantler/shiny.pal" -SmearglePalette: INCLUDE "gfx/pokemon/smeargle/normal.pal" -SmeargleShinyPalette: INCLUDE "gfx/pokemon/smeargle/shiny.pal" -TyroguePalette: INCLUDE "gfx/pokemon/tyrogue/normal.pal" -TyrogueShinyPalette: INCLUDE "gfx/pokemon/tyrogue/shiny.pal" -HitmontopPalette: INCLUDE "gfx/pokemon/hitmontop/normal.pal" -HitmontopShinyPalette: INCLUDE "gfx/pokemon/hitmontop/shiny.pal" -SmoochumPalette: INCLUDE "gfx/pokemon/smoochum/normal.pal" -SmoochumShinyPalette: INCLUDE "gfx/pokemon/smoochum/shiny.pal" -ElekidPalette: INCLUDE "gfx/pokemon/elekid/normal.pal" -ElekidShinyPalette: INCLUDE "gfx/pokemon/elekid/shiny.pal" -MagbyPalette: INCLUDE "gfx/pokemon/magby/normal.pal" -MagbyShinyPalette: INCLUDE "gfx/pokemon/magby/shiny.pal" -MiltankPalette: INCLUDE "gfx/pokemon/miltank/normal.pal" -MiltankShinyPalette: INCLUDE "gfx/pokemon/miltank/shiny.pal" -BlisseyPalette: INCLUDE "gfx/pokemon/blissey/normal.pal" -BlisseyShinyPalette: INCLUDE "gfx/pokemon/blissey/shiny.pal" -RaikouPalette: INCLUDE "gfx/pokemon/raikou/normal.pal" -RaikouShinyPalette: INCLUDE "gfx/pokemon/raikou/shiny.pal" -EnteiPalette: INCLUDE "gfx/pokemon/entei/normal.pal" -EnteiShinyPalette: INCLUDE "gfx/pokemon/entei/shiny.pal" -SuicunePalette: INCLUDE "gfx/pokemon/suicune/normal.pal" -SuicuneShinyPalette: INCLUDE "gfx/pokemon/suicune/shiny.pal" -LarvitarPalette: INCLUDE "gfx/pokemon/larvitar/normal.pal" -LarvitarShinyPalette: INCLUDE "gfx/pokemon/larvitar/shiny.pal" -PupitarPalette: INCLUDE "gfx/pokemon/pupitar/normal.pal" -PupitarShinyPalette: INCLUDE "gfx/pokemon/pupitar/shiny.pal" -TyranitarPalette: INCLUDE "gfx/pokemon/tyranitar/normal.pal" -TyranitarShinyPalette: INCLUDE "gfx/pokemon/tyranitar/shiny.pal" -LugiaPalette: INCLUDE "gfx/pokemon/lugia/normal.pal" -LugiaShinyPalette: INCLUDE "gfx/pokemon/lugia/shiny.pal" -HoOhPalette: INCLUDE "gfx/pokemon/ho_oh/normal.pal" -HoOhShinyPalette: INCLUDE "gfx/pokemon/ho_oh/shiny.pal" -CelebiPalette: INCLUDE "gfx/pokemon/celebi/normal.pal" -CelebiShinyPalette: INCLUDE "gfx/pokemon/celebi/shiny.pal" - -; 252 - RGB 30, 26, 11 - RGB 23, 16, 00 -; 252 shiny - RGB 30, 26, 11 - RGB 23, 16, 00 - -; Egg - RGB 30, 26, 11 - RGB 23, 16, 00 -; Egg shiny - RGB 30, 26, 11 - RGB 23, 16, 00 - -; 254 - RGB 30, 26, 11 - RGB 23, 16, 00 -; 254 shiny - RGB 30, 26, 11 - RGB 23, 16, 00 - -; 255 - RGB 23, 23, 23 - RGB 17, 17, 17 -; 255 shiny - RGB 23, 23, 23 - RGB 17, 17, 17 - -; b0ce diff --git a/macros.asm b/macros.asm index cce53b45f..f24d2f5a7 100644 --- a/macros.asm +++ b/macros.asm @@ -11,13 +11,13 @@ INCLUDE "macros/tilesets.asm" INCLUDE "macros/scripts/audio.asm" INCLUDE "macros/scripts/maps.asm" -INCLUDE "macros/scripts/event.asm" +INCLUDE "macros/scripts/events.asm" INCLUDE "macros/scripts/text.asm" INCLUDE "macros/scripts/movement.asm" INCLUDE "macros/scripts/effect_commands.asm" -INCLUDE "macros/scripts/move_anim.asm" -INCLUDE "macros/scripts/trade_anim.asm" -INCLUDE "macros/scripts/gfx_anim.asm" +INCLUDE "macros/scripts/battle_anims.asm" +INCLUDE "macros/scripts/trade_anims.asm" +INCLUDE "macros/scripts/gfx_anims.asm" percent EQUS "* $ff / 100" diff --git a/macros/scripts/move_anim.asm b/macros/scripts/battle_anims.asm index a058e41fa..3c054d460 100644 --- a/macros/scripts/move_anim.asm +++ b/macros/scripts/battle_anims.asm @@ -5,7 +5,7 @@ endc db \1 endm -; BattleAnimCommands indexes (see engine/anims/anim_commands.asm) +; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) enum_start $d0 enum anim_obj_command ; $d0 diff --git a/macros/scripts/event.asm b/macros/scripts/events.asm index 1bf6b8622..1bf6b8622 100644 --- a/macros/scripts/event.asm +++ b/macros/scripts/events.asm diff --git a/macros/scripts/gfx_anim.asm b/macros/scripts/gfx_anims.asm index a3fa710a0..a3fa710a0 100644 --- a/macros/scripts/gfx_anim.asm +++ b/macros/scripts/gfx_anims.asm diff --git a/macros/scripts/trade_anim.asm b/macros/scripts/trade_anims.asm index 4b0291eea..4b0291eea 100644 --- a/macros/scripts/trade_anim.asm +++ b/macros/scripts/trade_anims.asm @@ -40,7 +40,7 @@ INCLUDE "engine/billspctop.asm" INCLUDE "engine/routines/getbreedmonlevelgrowth.asm" INCLUDE "event/bug_contest/caught_mon.asm" INCLUDE "engine/item_effects.asm" -INCLUDE "engine/routines/getpokeballwobble.asm" +INCLUDE "engine/battle_anims/getpokeballwobble.asm" INCLUDE "engine/routines/knowsmove.asm" @@ -118,11 +118,11 @@ INCLUDE "engine/prof_oaks_pc.asm" INCLUDE "engine/decorations.asm" INCLUDE "engine/routines/leveluphappinessmod.asm" INCLUDE "data/trainers/trainer_dvs.asm" -INCLUDE "engine/routines/returntobattle_useball.asm" -INCLUDE "engine/routines/consumehelditem.asm" +INCLUDE "engine/battle/returntobattle_useball.asm" +INCLUDE "engine/battle/consumehelditem.asm" INCLUDE "data/moves/move_effects_pointers.asm" INCLUDE "data/moves/move_effects.asm" -INCLUDE "engine/routines/kurt_selectquantity_interpretjoypad.asm" +INCLUDE "event/kurt_selectquantity_interpretjoypad.asm" SECTION "bankA", ROMX @@ -246,7 +246,7 @@ INCLUDE "engine/init_hof_credits.asm" INCLUDE "mobile/get_trainer_class.asm" INCLUDE "engine/battle/sliding_intro.asm" INCLUDE "mobile/print_opp_message.asm" -INCLUDE "engine/routines/checkbattlescene.asm" +INCLUDE "engine/battle/checkbattlescene.asm" INCLUDE "engine/gbc_only.asm" INCLUDE "event/poke_seer.asm" @@ -308,7 +308,7 @@ INCLUDE "engine/debug.asm" SECTION "bank21", ROMX INCLUDE "engine/printer.asm" -INCLUDE "gfx/anims.asm" +INCLUDE "gfx/battle_anims.asm" INCLUDE "event/halloffame.asm" @@ -330,7 +330,7 @@ INCLUDE "engine/timeofdaypals.asm" INCLUDE "engine/battle/battle_transition.asm" INCLUDE "event/field_moves.asm" INCLUDE "event/magnet_train.asm" -INCLUDE "engine/routines/battlestart_copytilemapatonce.asm" +INCLUDE "engine/battle/battlestart_copytilemapatonce.asm" INCLUDE "engine/sprites.asm" INCLUDE "engine/mon_icons.asm" @@ -389,7 +389,7 @@ INCLUDE "engine/battle/trainer_scripts.asm" SECTION "bank32", ROMX -INCLUDE "engine/anims/bg_effects.asm" +INCLUDE "engine/battle_anims/bg_effects.asm" INCLUDE "data/moves/move_anims.asm" INCLUDE "event/poisonstep_pals.asm" @@ -400,14 +400,14 @@ INCBIN "gfx/credits/theend.2bpp" SECTION "Move Animations", ROMX INCLUDE "event/bug_contest/display_stats.asm" -INCLUDE "engine/anims/anim_commands.asm" -INCLUDE "engine/anims/engine.asm" -INCLUDE "data/anims/objects.asm" -INCLUDE "engine/anims/functions.asm" -INCLUDE "engine/anims/helpers.asm" -INCLUDE "data/anims/framesets.asm" -INCLUDE "data/anims/oam.asm" -INCLUDE "data/anims/object_gfx.asm" +INCLUDE "engine/battle_anims/anim_commands.asm" +INCLUDE "engine/battle_anims/engine.asm" +INCLUDE "data/battle_anims/objects.asm" +INCLUDE "engine/battle_anims/functions.asm" +INCLUDE "engine/battle_anims/helpers.asm" +INCLUDE "data/battle_anims/framesets.asm" +INCLUDE "data/battle_anims/oam.asm" +INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX @@ -554,7 +554,7 @@ INCLUDE "text/phone/extra2.asm" SECTION "bank5E", ROMX -INCLUDE "engine/routines/updatebattlehuds.asm" +INCLUDE "engine/battle/updatebattlehuds.asm" SECTION "mobile_5e", ROMX diff --git a/maps/map_headers.asm b/maps/map_headers.asm index d3724aa22..9053329d7 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -382,7 +382,7 @@ MapGroup_Lavender: map_header Route12SuperRodHouse, TILESET_HOUSE_1, INDOOR, ROUTE_12, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE -MapGroup_Silver : +MapGroup_Silver: map_header Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, 0, PALETTE_AUTO, FISHGROUP_POND map_header SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE |
