diff options
Diffstat (limited to 'constants')
| -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 |
5 files changed, 51 insertions, 53 deletions
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 |