pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use "battle_anims" and "sprite_anims" for clarity, not just "anims"

Browse Source
This commit is contained in:
Remy Oukaour 2017-12-26 18:45:04 -05:00
parent b5417fafec
commit 35a3a19fda
132 changed files with 1967 additions and 1969 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Makefile
View File

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

3
constants.asm
View File

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

12
constants/animation_constants.asm → constants/battle_anim_constants.asm
View File

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

41
constants/icon_constants.asm Normal file
View File

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

2
constants/pokemon_constants.asm
View File

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

43
constants/pokemon_data_constants.asm
View File

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

6
constants/sprite_anim_constants.asm
View File

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

1271
data/anims/framesets.asm
View File

File diff suppressed because it is too large Load Diff

0
data/anims/ball_colors.asm → data/battle_anims/ball_colors.asm
View File

1270
data/battle_anims/framesets.asm Executable file
View File

File diff suppressed because it is too large Load Diff

0
data/anims/oam.asm → data/battle_anims/oam.asm
View File

0
data/anims/object_gfx.asm → data/battle_anims/object_gfx.asm
View File

0
data/anims/objects.asm → data/battle_anims/objects.asm
View File

0
gfx/icon_pointers.asm → data/icon_pointers.asm
View File

541
data/palettes/pokemon_palettes.asm Normal file
View File

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

0
gfx/trainer_palettes.asm → data/palettes/trainer_palettes.asm
View File

0
gfx/pokemon/pic_pointers.asm → data/pokemon/pic_pointers.asm
View File

0
gfx/pokemon/unown_pic_pointers.asm → data/pokemon/unown_pic_pointers.asm
View File

0
data/sprites/framesets.asm → data/sprite_anims/framesets.asm
View File

0
data/sprites/oam.asm → data/sprite_anims/oam.asm
View File

0
data/sprites/sequences.asm → data/sprite_anims/sequences.asm
View File

0
gfx/trainer_pic_pointers.asm → data/trainers/pic_pointers.asm
View File

4
docs/move_anim_commands.md → docs/battle_anim_commands.md
View File

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

2
docs/event_commands.md
View File

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

9
docs/pic_animations.md
View File

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

0
engine/routines/battlestart_copytilemapatonce.asm → engine/battle/battlestart_copytilemapatonce.asm
View File

0
engine/routines/checkbattlescene.asm → engine/battle/checkbattlescene.asm
View File

0
engine/routines/consumehelditem.asm → engine/battle/consumehelditem.asm
View File

0
engine/routines/returntobattle_useball.asm → engine/battle/returntobattle_useball.asm
View File

0
engine/routines/updatebattlehuds.asm → engine/battle/updatebattlehuds.asm
View File

2
engine/anims/anim_commands.asm → engine/battle_anims/anim_commands.asm
View File

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

0
engine/anims/bg_effects.asm → engine/battle_anims/bg_effects.asm
View File

0
engine/anims/engine.asm → engine/battle_anims/engine.asm
View File

2
engine/anims/functions.asm → engine/battle_anims/functions.asm
View File

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

0
engine/routines/getpokeballwobble.asm → engine/battle_anims/getpokeballwobble.asm
View File

0
engine/anims/helpers.asm → engine/battle_anims/helpers.asm
View File

5
engine/color.asm
View File

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

2
engine/mon_icons.asm
View File

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

2
engine/movement.asm
View File

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

2
engine/scripting.asm
View File

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

6
engine/sprites.asm
View File

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

2
engine/trade_animation.asm
View File

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

0
engine/routines/kurt_selectquantity_interpretjoypad.asm → event/kurt_selectquantity_interpretjoypad.asm
View File

41
gfx/anims.asm
View File

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

41
gfx/battle_anims.asm Normal file
View File

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

0
gfx/anims/aeroblast.2bpp.lz.2f07c4ea → gfx/battle_anims/aeroblast.2bpp.lz.2f07c4ea
View File

0
gfx/anims/aeroblast.png → gfx/battle_anims/aeroblast.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 187 B

0
gfx/anims/angels.2bpp.lz.b026d81e → gfx/battle_anims/angels.2bpp.lz.b026d81e
View File

0
gfx/anims/angels.png → gfx/battle_anims/angels.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 363 B

After

Width:  |  Height:  |  Size: 363 B

0
gfx/anims/beam.2bpp.lz.80b6d613 → gfx/battle_anims/beam.2bpp.lz.80b6d613
View File

0
gfx/anims/beam.png → gfx/battle_anims/beam.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 562 B

After

Width:  |  Height:  |  Size: 562 B

0
gfx/anims/bubble.2bpp.lz.03b8ac99 → gfx/battle_anims/bubble.2bpp.lz.03b8ac99
View File

0
gfx/anims/bubble.png → gfx/battle_anims/bubble.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 237 B

After

Width:  |  Height:  |  Size: 237 B

0
gfx/anims/charge.2bpp.lz.95d3ea98 → gfx/battle_anims/charge.2bpp.lz.95d3ea98
View File

0
gfx/anims/charge.png → gfx/battle_anims/charge.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 188 B

After

Width:  |  Height:  |  Size: 188 B

0
gfx/anims/cut.2bpp.lz.03d343ed → gfx/battle_anims/cut.2bpp.lz.03d343ed
View File

0
gfx/anims/cut.png → gfx/battle_anims/cut.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 170 B

0
gfx/anims/egg.2bpp.lz.41dd1a53 → gfx/battle_anims/egg.2bpp.lz.41dd1a53
View File

0
gfx/anims/egg.png → gfx/battle_anims/egg.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 200 B

After

Width:  |  Height:  |  Size: 200 B

0
gfx/anims/explosion.2bpp.lz.55fc334f → gfx/battle_anims/explosion.2bpp.lz.55fc334f
View File

0
gfx/anims/explosion.png → gfx/battle_anims/explosion.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 B

After

Width:  |  Height:  |  Size: 157 B

0
gfx/anims/fire.2bpp.lz.d7701cda → gfx/battle_anims/fire.2bpp.lz.d7701cda
View File

0
gfx/anims/fire.png → gfx/battle_anims/fire.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 153 B

After

Width:  |  Height:  |  Size: 153 B

0
gfx/anims/flower.2bpp.lz.1bc2e9d2 → gfx/battle_anims/flower.2bpp.lz.1bc2e9d2
View File

0
gfx/anims/flower.png → gfx/battle_anims/flower.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 149 B

After

Width:  |  Height:  |  Size: 149 B

0
gfx/anims/globe.2bpp.lz.710dbb8e → gfx/battle_anims/globe.2bpp.lz.710dbb8e
View File

0
gfx/anims/globe.png → gfx/battle_anims/globe.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 292 B

After

Width:  |  Height:  |  Size: 292 B

0
gfx/anims/haze.2bpp.lz.91424607 → gfx/battle_anims/haze.2bpp.lz.91424607
View File

0
gfx/anims/haze.png → gfx/battle_anims/haze.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

0
gfx/anims/hit.2bpp.lz.2b3c83f2 → gfx/battle_anims/hit.2bpp.lz.2b3c83f2
View File

0
gfx/anims/hit.png → gfx/battle_anims/hit.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 B

After

Width:  |  Height:  |  Size: 306 B

0
gfx/anims/horn.2bpp.lz.48908aae → gfx/battle_anims/horn.2bpp.lz.48908aae
View File

0
gfx/anims/horn.png → gfx/battle_anims/horn.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 179 B

0
gfx/anims/ice.2bpp.lz.664d900f → gfx/battle_anims/ice.2bpp.lz.664d900f
View File

0
gfx/anims/ice.png → gfx/battle_anims/ice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 137 B

After

Width:  |  Height:  |  Size: 137 B

0
gfx/anims/lightning.2bpp.lz.a88fc131 → gfx/battle_anims/lightning.2bpp.lz.a88fc131
View File

0
gfx/anims/lightning.png → gfx/battle_anims/lightning.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 820 B

0
gfx/anims/misc.2bpp.lz.4b20c3d7 → gfx/battle_anims/misc.2bpp.lz.4b20c3d7
View File

0
gfx/anims/misc.png → gfx/battle_anims/misc.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
gfx/anims/noise.2bpp.lz.acb4a76e → gfx/battle_anims/noise.2bpp.lz.acb4a76e
View File

0
gfx/anims/noise.png → gfx/battle_anims/noise.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 526 B

0
gfx/anims/objects.2bpp.lz.83f812de → gfx/battle_anims/objects.2bpp.lz.83f812de
View File

0
gfx/anims/objects.png → gfx/battle_anims/objects.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 705 B

After

Width:  |  Height:  |  Size: 705 B

0
gfx/anims/plant.2bpp.lz.4a00c417 → gfx/battle_anims/plant.2bpp.lz.4a00c417
View File

0
gfx/anims/plant.png → gfx/battle_anims/plant.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 B

After

Width:  |  Height:  |  Size: 293 B

0
gfx/anims/poison.2bpp.lz.fc7dc9c1 → gfx/battle_anims/poison.2bpp.lz.fc7dc9c1
View File

0
gfx/anims/poison.png → gfx/battle_anims/poison.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 B

After

Width:  |  Height:  |  Size: 166 B

0
gfx/anims/pokeball.2bpp.lz.c58f7e01 → gfx/battle_anims/pokeball.2bpp.lz.c58f7e01
View File

0
gfx/anims/pokeball.png → gfx/battle_anims/pokeball.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 388 B

After

Width:  |  Height:  |  Size: 388 B

0
gfx/anims/powder.2bpp.lz.bfd566bb → gfx/battle_anims/powder.2bpp.lz.bfd566bb
View File

0
gfx/anims/powder.png → gfx/battle_anims/powder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 B

After

Width:  |  Height:  |  Size: 100 B

0
gfx/anims/psychic.2bpp.lz.d80f285c → gfx/battle_anims/psychic.2bpp.lz.d80f285c
View File

0
gfx/anims/psychic.png → gfx/battle_anims/psychic.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 175 B

After

Width:  |  Height:  |  Size: 175 B

0
gfx/anims/reflect.2bpp.lz.9a9c822d → gfx/battle_anims/reflect.2bpp.lz.9a9c822d
View File

0
gfx/anims/reflect.png → gfx/battle_anims/reflect.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 211 B

0
gfx/anims/rocks.2bpp.lz.73d0153e → gfx/battle_anims/rocks.2bpp.lz.73d0153e
View File

0
gfx/anims/rocks.png → gfx/battle_anims/rocks.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 669 B

After

Width:  |  Height:  |  Size: 669 B

0
gfx/anims/rope.2bpp.lz.209d63dd → gfx/battle_anims/rope.2bpp.lz.209d63dd
View File

0
gfx/anims/rope.png → gfx/battle_anims/rope.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 256 B

After

Width:  |  Height:  |  Size: 256 B

0
gfx/anims/sand.2bpp.lz.c87c0eaa → gfx/battle_anims/sand.2bpp.lz.c87c0eaa
View File

Some files were not shown because too many files have changed in this diff Show More