summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/pokemon/pkmn_pic_banks.asm34
-rw-r--r--gfx/pokemon/pkmn_pics.asm1
2 files changed, 15 insertions, 20 deletions
diff --git a/gfx/pokemon/pkmn_pic_banks.asm b/gfx/pokemon/pkmn_pic_banks.asm
index 81b899e..2eae839 100644
--- a/gfx/pokemon/pkmn_pic_banks.asm
+++ b/gfx/pokemon/pkmn_pic_banks.asm
@@ -1,20 +1,16 @@
-MonSpriteBankList::
-MonSpriteBankListStart::
-SECTION "PKMN Sprite Bank List", ROMX[$725C], BANK[$14]
-
-; DEX Entry ROM bank
-; i <= entry in list? --> use rom bank
-db DEX_RAICHU, $15
-db DEX_DUGTRIO, $16
-db DEX_GOLONE, $17
-db DEX_CRAB, $18
-db DEX_STARMIE, $19
-db DEX_FREEZER, $1A
-db DEX_JARANRA, $1B
-db DEX_KOUNYA, $1C
-db DEX_BOMBSEEKER, $1D
-db DEX_NYULA, $1E
-db $FF, $1F
-db $FF, $20
+; TODO: PIC_* constants?
-MonSpriteBankListEnd:: \ No newline at end of file
+MonSpriteBankList::
+ ; last mon in bank, bank #
+ db DEX_RAICHU, BANK(RaichuPicFront)
+ db DEX_DUGTRIO, BANK(DugtrioPicFront)
+ db DEX_GOLONE, BANK(GolonePicFront)
+ db DEX_CRAB, BANK(CrabPicFront)
+ db DEX_STARMIE, BANK(StarmiePicFront)
+ db DEX_FREEZER, BANK(FreezerPicFront)
+ db DEX_JARANRA, BANK(JaranraPicFront)
+ db DEX_KOUNYA, BANK(KounyaPicFront)
+ db DEX_BOMBSEEKER, BANK(BombseekerPicFront)
+ db DEX_NYULA, BANK(NyulaPicFront)
+ db $ff, BANK(LeafyPicFront)
+ db $ff, BANK(LeafyPicFront) + 1
diff --git a/gfx/pokemon/pkmn_pics.asm b/gfx/pokemon/pkmn_pics.asm
index 16e6d35..dffe357 100644
--- a/gfx/pokemon/pkmn_pics.asm
+++ b/gfx/pokemon/pkmn_pics.asm
@@ -1,4 +1,3 @@
-
SECTION "PKMN Pics RB 0x15", ROMX[$4000], BANK[$15]
FushigidanePicFront:: INCBIN "gfx/pokemon/fushigidane/front.pic" ; 0x054000--0x0540bc
FushigidanePicBack:: INCBIN "gfx/pokemon/fushigidane/back.pic" ; 0x0540bc--0x0541ca