Factor out data/sprites/

This commit is contained in:
Rangi 2020-07-03 16:58:55 -04:00
parent 962722746e
commit 62e137f6ce
5 changed files with 363 additions and 362 deletions

View file

@ -188,364 +188,3 @@ SpriteSets:
db SPRITE_BUG_CATCHER
db SPRITE_BALL
db SPRITE_OMANYTE
SpriteSheetPointerTable:
; SPRITE_RED
dw RedSprite
db $c0 ; byte count
db BANK(RedSprite)
; SPRITE_BLUE
dw BlueSprite
db $c0 ; byte count
db BANK(BlueSprite)
; SPRITE_OAK
dw OakSprite
db $c0 ; byte count
db BANK(OakSprite)
; SPRITE_BUG_CATCHER
dw BugCatcherSprite
db $c0 ; byte count
db BANK(BugCatcherSprite)
; SPRITE_SLOWBRO
dw SlowbroSprite
db $c0 ; byte count
db BANK(SlowbroSprite)
; SPRITE_LASS
dw LassSprite
db $c0 ; byte count
db BANK(LassSprite)
; SPRITE_BLACK_HAIR_BOY_1
dw BlackHairBoy1Sprite
db $c0 ; byte count
db BANK(BlackHairBoy1Sprite)
; SPRITE_LITTLE_GIRL
dw LittleGirlSprite
db $c0 ; byte count
db BANK(LittleGirlSprite)
; SPRITE_BIRD
dw BirdSprite
db $c0 ; byte count
db BANK(BirdSprite)
; SPRITE_FAT_BALD_GUY
dw FatBaldGuySprite
db $c0 ; byte count
db BANK(FatBaldGuySprite)
; SPRITE_GAMBLER
dw GamblerSprite
db $c0 ; byte count
db BANK(GamblerSprite)
; SPRITE_BLACK_HAIR_BOY_2
dw BlackHairBoy2Sprite
db $c0 ; byte count
db BANK(BlackHairBoy2Sprite)
; SPRITE_GIRL
dw GirlSprite
db $c0 ; byte count
db BANK(GirlSprite)
; SPRITE_HIKER
dw HikerSprite
db $c0 ; byte count
db BANK(HikerSprite)
; SPRITE_FOULARD_WOMAN
dw FoulardWomanSprite
db $c0 ; byte count
db BANK(FoulardWomanSprite)
; SPRITE_GENTLEMAN
dw GentlemanSprite
db $c0 ; byte count
db BANK(GentlemanSprite)
; SPRITE_DAISY
dw DaisySprite
db $c0 ; byte count
db BANK(DaisySprite)
; SPRITE_BIKER
dw BikerSprite
db $c0 ; byte count
db BANK(BikerSprite)
; SPRITE_SAILOR
dw SailorSprite
db $c0 ; byte count
db BANK(SailorSprite)
; SPRITE_COOK
dw CookSprite
db $c0 ; byte count
db BANK(CookSprite)
; SPRITE_BIKE_SHOP_GUY
dw BikeShopGuySprite
db $c0 ; byte count
db BANK(BikeShopGuySprite)
; SPRITE_MR_FUJI
dw MrFujiSprite
db $c0 ; byte count
db BANK(MrFujiSprite)
; SPRITE_GIOVANNI
dw GiovanniSprite
db $c0 ; byte count
db BANK(GiovanniSprite)
; SPRITE_ROCKET
dw RocketSprite
db $c0 ; byte count
db BANK(RocketSprite)
; SPRITE_MEDIUM
dw MediumSprite
db $c0 ; byte count
db BANK(MediumSprite)
; SPRITE_WAITER
dw WaiterSprite
db $c0 ; byte count
db BANK(WaiterSprite)
; SPRITE_ERIKA
dw ErikaSprite
db $c0 ; byte count
db BANK(ErikaSprite)
; SPRITE_MOM_GEISHA
dw MomGeishaSprite
db $c0 ; byte count
db BANK(MomGeishaSprite)
; SPRITE_BRUNETTE_GIRL
dw BrunetteGirlSprite
db $c0 ; byte count
db BANK(BrunetteGirlSprite)
; SPRITE_LANCE
dw LanceSprite
db $c0 ; byte count
db BANK(LanceSprite)
; SPRITE_OAK_SCIENTIST_AIDE
dw OakAideSprite
db $c0 ; byte count
db BANK(OakAideSprite)
; SPRITE_OAK_AIDE
dw OakAideSprite
db $c0 ; byte count
db BANK(OakAideSprite)
; SPRITE_ROCKER
dw RockerSprite
db $c0 ; byte count
db BANK(RockerSprite)
; SPRITE_SWIMMER
dw SwimmerSprite
db $c0 ; byte count
db BANK(SwimmerSprite)
; SPRITE_WHITE_PLAYER
dw WhitePlayerSprite
db $c0 ; byte count
db BANK(WhitePlayerSprite)
; SPRITE_GYM_HELPER
dw GymHelperSprite
db $c0 ; byte count
db BANK(GymHelperSprite)
; SPRITE_OLD_PERSON
dw OldPersonSprite
db $c0 ; byte count
db BANK(OldPersonSprite)
; SPRITE_MART_GUY
dw MartGuySprite
db $c0 ; byte count
db BANK(MartGuySprite)
; SPRITE_FISHER
dw FisherSprite
db $c0 ; byte count
db BANK(FisherSprite)
; SPRITE_OLD_MEDIUM_WOMAN
dw OldMediumWomanSprite
db $c0 ; byte count
db BANK(OldMediumWomanSprite)
; SPRITE_NURSE
dw NurseSprite
db $c0 ; byte count
db BANK(NurseSprite)
; SPRITE_CABLE_CLUB_WOMAN
dw CableClubWomanSprite
db $c0 ; byte count
db BANK(CableClubWomanSprite)
; SPRITE_MR_MASTERBALL
dw MrMasterballSprite
db $c0 ; byte count
db BANK(MrMasterballSprite)
; SPRITE_LAPRAS_GIVER
dw LaprasGiverSprite
db $c0 ; byte count
db BANK(LaprasGiverSprite)
; SPRITE_WARDEN
dw WardenSprite
db $c0 ; byte count
db BANK(WardenSprite)
; SPRITE_SS_CAPTAIN
dw SsCaptainSprite
db $c0 ; byte count
db BANK(SsCaptainSprite)
; SPRITE_FISHER2
dw Fisher2Sprite
db $c0 ; byte count
db BANK(Fisher2Sprite)
; SPRITE_BLACKBELT
dw BlackbeltSprite
db $c0 ; byte count
db BANK(BlackbeltSprite)
; SPRITE_GUARD
dw GuardSprite
db $c0 ; byte count
db BANK(GuardSprite)
; $32
dw GuardSprite
db $c0 ; byte count
db BANK(GuardSprite)
; SPRITE_MOM
dw MomSprite
db $c0 ; byte count
db BANK(MomSprite)
; SPRITE_BALDING_GUY
dw BaldingGuySprite
db $c0 ; byte count
db BANK(BaldingGuySprite)
; SPRITE_YOUNG_BOY
dw YoungBoySprite
db $c0 ; byte count
db BANK(YoungBoySprite)
; SPRITE_GAMEBOY_KID
dw GameboyKidSprite
db $c0 ; byte count
db BANK(GameboyKidSprite)
; SPRITE_GAMEBOY_KID_COPY
dw GameboyKidSprite
db $c0 ; byte count
db BANK(GameboyKidSprite)
; SPRITE_CLEFAIRY
dw ClefairySprite
db $c0 ; byte count
db BANK(ClefairySprite)
; SPRITE_AGATHA
dw AgathaSprite
db $c0 ; byte count
db BANK(AgathaSprite)
; SPRITE_BRUNO
dw BrunoSprite
db $c0 ; byte count
db BANK(BrunoSprite)
; SPRITE_LORELEI
dw LoreleiSprite
db $c0 ; byte count
db BANK(LoreleiSprite)
; SPRITE_SEEL
dw SeelSprite
db $c0 ; byte count
db BANK(SeelSprite)
; SPRITE_BALL
dw BallSprite
db $40 ; byte count
db BANK(BallSprite)
; SPRITE_OMANYTE
dw OmanyteSprite
db $40 ; byte count
db BANK(OmanyteSprite)
; SPRITE_BOULDER
dw BoulderSprite
db $40 ; byte count
db BANK(BoulderSprite)
; SPRITE_PAPER_SHEET
dw PaperSheetSprite
db $40 ; byte count
db BANK(PaperSheetSprite)
; SPRITE_BOOK_MAP_DEX
dw BookMapDexSprite
db $40 ; byte count
db BANK(BookMapDexSprite)
; SPRITE_CLIPBOARD
dw ClipboardSprite
db $40 ; byte count
db BANK(ClipboardSprite)
; SPRITE_SNORLAX
dw SnorlaxSprite
db $40 ; byte count
db BANK(SnorlaxSprite)
; SPRITE_OLD_AMBER_COPY
dw OldAmberSprite
db $40 ; byte count
db BANK(OldAmberSprite)
; SPRITE_OLD_AMBER
dw OldAmberSprite
db $40 ; byte count
db BANK(OldAmberSprite)
; SPRITE_LYING_OLD_MAN_UNUSED_1
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)
; SPRITE_LYING_OLD_MAN_UNUSED_2
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)
; SPRITE_LYING_OLD_MAN
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)

360
data/sprites/sprites.asm Normal file
View file

@ -0,0 +1,360 @@
SpriteSheetPointerTable:
; SPRITE_RED
dw RedSprite
db $c0 ; byte count
db BANK(RedSprite)
; SPRITE_BLUE
dw BlueSprite
db $c0 ; byte count
db BANK(BlueSprite)
; SPRITE_OAK
dw OakSprite
db $c0 ; byte count
db BANK(OakSprite)
; SPRITE_BUG_CATCHER
dw BugCatcherSprite
db $c0 ; byte count
db BANK(BugCatcherSprite)
; SPRITE_SLOWBRO
dw SlowbroSprite
db $c0 ; byte count
db BANK(SlowbroSprite)
; SPRITE_LASS
dw LassSprite
db $c0 ; byte count
db BANK(LassSprite)
; SPRITE_BLACK_HAIR_BOY_1
dw BlackHairBoy1Sprite
db $c0 ; byte count
db BANK(BlackHairBoy1Sprite)
; SPRITE_LITTLE_GIRL
dw LittleGirlSprite
db $c0 ; byte count
db BANK(LittleGirlSprite)
; SPRITE_BIRD
dw BirdSprite
db $c0 ; byte count
db BANK(BirdSprite)
; SPRITE_FAT_BALD_GUY
dw FatBaldGuySprite
db $c0 ; byte count
db BANK(FatBaldGuySprite)
; SPRITE_GAMBLER
dw GamblerSprite
db $c0 ; byte count
db BANK(GamblerSprite)
; SPRITE_BLACK_HAIR_BOY_2
dw BlackHairBoy2Sprite
db $c0 ; byte count
db BANK(BlackHairBoy2Sprite)
; SPRITE_GIRL
dw GirlSprite
db $c0 ; byte count
db BANK(GirlSprite)
; SPRITE_HIKER
dw HikerSprite
db $c0 ; byte count
db BANK(HikerSprite)
; SPRITE_FOULARD_WOMAN
dw FoulardWomanSprite
db $c0 ; byte count
db BANK(FoulardWomanSprite)
; SPRITE_GENTLEMAN
dw GentlemanSprite
db $c0 ; byte count
db BANK(GentlemanSprite)
; SPRITE_DAISY
dw DaisySprite
db $c0 ; byte count
db BANK(DaisySprite)
; SPRITE_BIKER
dw BikerSprite
db $c0 ; byte count
db BANK(BikerSprite)
; SPRITE_SAILOR
dw SailorSprite
db $c0 ; byte count
db BANK(SailorSprite)
; SPRITE_COOK
dw CookSprite
db $c0 ; byte count
db BANK(CookSprite)
; SPRITE_BIKE_SHOP_GUY
dw BikeShopGuySprite
db $c0 ; byte count
db BANK(BikeShopGuySprite)
; SPRITE_MR_FUJI
dw MrFujiSprite
db $c0 ; byte count
db BANK(MrFujiSprite)
; SPRITE_GIOVANNI
dw GiovanniSprite
db $c0 ; byte count
db BANK(GiovanniSprite)
; SPRITE_ROCKET
dw RocketSprite
db $c0 ; byte count
db BANK(RocketSprite)
; SPRITE_MEDIUM
dw MediumSprite
db $c0 ; byte count
db BANK(MediumSprite)
; SPRITE_WAITER
dw WaiterSprite
db $c0 ; byte count
db BANK(WaiterSprite)
; SPRITE_ERIKA
dw ErikaSprite
db $c0 ; byte count
db BANK(ErikaSprite)
; SPRITE_MOM_GEISHA
dw MomGeishaSprite
db $c0 ; byte count
db BANK(MomGeishaSprite)
; SPRITE_BRUNETTE_GIRL
dw BrunetteGirlSprite
db $c0 ; byte count
db BANK(BrunetteGirlSprite)
; SPRITE_LANCE
dw LanceSprite
db $c0 ; byte count
db BANK(LanceSprite)
; SPRITE_OAK_SCIENTIST_AIDE
dw OakAideSprite
db $c0 ; byte count
db BANK(OakAideSprite)
; SPRITE_OAK_AIDE
dw OakAideSprite
db $c0 ; byte count
db BANK(OakAideSprite)
; SPRITE_ROCKER
dw RockerSprite
db $c0 ; byte count
db BANK(RockerSprite)
; SPRITE_SWIMMER
dw SwimmerSprite
db $c0 ; byte count
db BANK(SwimmerSprite)
; SPRITE_WHITE_PLAYER
dw WhitePlayerSprite
db $c0 ; byte count
db BANK(WhitePlayerSprite)
; SPRITE_GYM_HELPER
dw GymHelperSprite
db $c0 ; byte count
db BANK(GymHelperSprite)
; SPRITE_OLD_PERSON
dw OldPersonSprite
db $c0 ; byte count
db BANK(OldPersonSprite)
; SPRITE_MART_GUY
dw MartGuySprite
db $c0 ; byte count
db BANK(MartGuySprite)
; SPRITE_FISHER
dw FisherSprite
db $c0 ; byte count
db BANK(FisherSprite)
; SPRITE_OLD_MEDIUM_WOMAN
dw OldMediumWomanSprite
db $c0 ; byte count
db BANK(OldMediumWomanSprite)
; SPRITE_NURSE
dw NurseSprite
db $c0 ; byte count
db BANK(NurseSprite)
; SPRITE_CABLE_CLUB_WOMAN
dw CableClubWomanSprite
db $c0 ; byte count
db BANK(CableClubWomanSprite)
; SPRITE_MR_MASTERBALL
dw MrMasterballSprite
db $c0 ; byte count
db BANK(MrMasterballSprite)
; SPRITE_LAPRAS_GIVER
dw LaprasGiverSprite
db $c0 ; byte count
db BANK(LaprasGiverSprite)
; SPRITE_WARDEN
dw WardenSprite
db $c0 ; byte count
db BANK(WardenSprite)
; SPRITE_SS_CAPTAIN
dw SsCaptainSprite
db $c0 ; byte count
db BANK(SsCaptainSprite)
; SPRITE_FISHER2
dw Fisher2Sprite
db $c0 ; byte count
db BANK(Fisher2Sprite)
; SPRITE_BLACKBELT
dw BlackbeltSprite
db $c0 ; byte count
db BANK(BlackbeltSprite)
; SPRITE_GUARD
dw GuardSprite
db $c0 ; byte count
db BANK(GuardSprite)
; $32
dw GuardSprite
db $c0 ; byte count
db BANK(GuardSprite)
; SPRITE_MOM
dw MomSprite
db $c0 ; byte count
db BANK(MomSprite)
; SPRITE_BALDING_GUY
dw BaldingGuySprite
db $c0 ; byte count
db BANK(BaldingGuySprite)
; SPRITE_YOUNG_BOY
dw YoungBoySprite
db $c0 ; byte count
db BANK(YoungBoySprite)
; SPRITE_GAMEBOY_KID
dw GameboyKidSprite
db $c0 ; byte count
db BANK(GameboyKidSprite)
; SPRITE_GAMEBOY_KID_COPY
dw GameboyKidSprite
db $c0 ; byte count
db BANK(GameboyKidSprite)
; SPRITE_CLEFAIRY
dw ClefairySprite
db $c0 ; byte count
db BANK(ClefairySprite)
; SPRITE_AGATHA
dw AgathaSprite
db $c0 ; byte count
db BANK(AgathaSprite)
; SPRITE_BRUNO
dw BrunoSprite
db $c0 ; byte count
db BANK(BrunoSprite)
; SPRITE_LORELEI
dw LoreleiSprite
db $c0 ; byte count
db BANK(LoreleiSprite)
; SPRITE_SEEL
dw SeelSprite
db $c0 ; byte count
db BANK(SeelSprite)
; SPRITE_BALL
dw BallSprite
db $40 ; byte count
db BANK(BallSprite)
; SPRITE_OMANYTE
dw OmanyteSprite
db $40 ; byte count
db BANK(OmanyteSprite)
; SPRITE_BOULDER
dw BoulderSprite
db $40 ; byte count
db BANK(BoulderSprite)
; SPRITE_PAPER_SHEET
dw PaperSheetSprite
db $40 ; byte count
db BANK(PaperSheetSprite)
; SPRITE_BOOK_MAP_DEX
dw BookMapDexSprite
db $40 ; byte count
db BANK(BookMapDexSprite)
; SPRITE_CLIPBOARD
dw ClipboardSprite
db $40 ; byte count
db BANK(ClipboardSprite)
; SPRITE_SNORLAX
dw SnorlaxSprite
db $40 ; byte count
db BANK(SnorlaxSprite)
; SPRITE_OLD_AMBER_COPY
dw OldAmberSprite
db $40 ; byte count
db BANK(OldAmberSprite)
; SPRITE_OLD_AMBER
dw OldAmberSprite
db $40 ; byte count
db BANK(OldAmberSprite)
; SPRITE_LYING_OLD_MAN_UNUSED_1
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)
; SPRITE_LYING_OLD_MAN_UNUSED_2
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)
; SPRITE_LYING_OLD_MAN
dw LyingOldManSprite
db $40 ; byte count
db BANK(LyingOldManSprite)

View file

@ -438,3 +438,5 @@ GetSplitMapSpriteSetID:
ret
INCLUDE "data/maps/sprite_sets.asm"
INCLUDE "data/sprites/sprites.asm"

View file

@ -3,7 +3,7 @@ INCLUDE "constants.asm"
SECTION "bank1", ROMX
INCLUDE "data/sprite_facings.asm"
INCLUDE "data/sprites/facings.asm"
INCLUDE "engine/events/black_out.asm"
MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"