From e614dd1278c9dbdfa546cba77757f76541378c13 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Wed, 27 Dec 2017 01:58:36 -0500 Subject: [PATCH] =?UTF-8?q?gfx/pokemon/animation.asm=20=E2=86=92=20engine/?= =?UTF-8?q?pic=5Fanimation.asm=20Correct=20comment=20in=20constants/pokemo?= =?UTF-8?q?n=5Fconstants.asm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- constants/pokemon_constants.asm | 2 +- constants/pokemon_data_constants.asm | 2 +- gfx/pokemon/animation.asm => engine/pic_animation.asm | 0 main.asm | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename gfx/pokemon/animation.asm => engine/pic_animation.asm (100%) diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index b29c310e6..53de0a3cd 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -6,12 +6,12 @@ ; - EggMovePointers (see data/pokemon/egg_move_pointers.asm) ; - PokemonCries (see data/pokemon/cries.asm) ; - MonMenuIcons (see data/pokemon/menu_icons.asm) +; - PokemonPicPointers (see data/pokemon/pic_pointers.asm) ; - PokemonPalettes (see data/pokemon/palettes.asm) ; - PokedexDataPointerTable (see data/pokemon/dex_entry_pointers.asm) ; - AlphabeticalPokedexOrder (see data/pokemon/dex_order_alpha.asm) ; - NewPokedexOrder (see data/pokemon/dex_order_new.asm) ; - Pokered_MonIndices (see data/time_capsule/mon_order.asm) -; - PokemonPicPointers (see gfx/pokemon/pic_pointers.asm) ; - AnimationPointers (see gfx/pokemon/anim_pointers.asm) ; - AnimationExtraPointers (see gfx/pokemon/extra_pointers.asm) ; - BitmasksPointers (see gfx/pokemon/bitmask_pointers.asm) diff --git a/constants/pokemon_data_constants.asm b/constants/pokemon_data_constants.asm index 4fe24b512..c9eb84041 100644 --- a/constants/pokemon_data_constants.asm +++ b/constants/pokemon_data_constants.asm @@ -149,7 +149,7 @@ FISHSWARM_QWILFISH EQU 1 FISHSWARM_REMORAID EQU 2 -; PokeAnims indexes (see gfx/pokemon/animation.asm) +; PokeAnims indexes (see engine/pic_animation.asm) const_def const ANIM_MON_SLOW const ANIM_MON_NORMAL diff --git a/gfx/pokemon/animation.asm b/engine/pic_animation.asm similarity index 100% rename from gfx/pokemon/animation.asm rename to engine/pic_animation.asm diff --git a/main.asm b/main.asm index 098edb7d1..727453db8 100644 --- a/main.asm +++ b/main.asm @@ -413,7 +413,7 @@ INCLUDE "data/battle_anims/object_gfx.asm" SECTION "Pic Animations 1", ROMX -INCLUDE "gfx/pokemon/animation.asm" +INCLUDE "engine/pic_animation.asm" INCLUDE "gfx/pokemon/anim_pointers.asm" INCLUDE "gfx/pokemon/anims.asm" INCLUDE "gfx/pokemon/extra_pointers.asm"