Clean up some data, using macros for multiline list entries

This commit is contained in:
Rangi 2020-07-14 10:21:18 -04:00
parent aa97e196dd
commit f37cf959c9
298 changed files with 5274 additions and 5646 deletions

View file

@ -1,57 +1,59 @@
SpriteFacingAndAnimationTable:
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 0
dw SpriteFacingDownAndWalking, SpriteOAMParameters ; facing down, walk animation frame 1
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; facing down, walk animation frame 2
dw SpriteFacingDownAndWalking, SpriteOAMParametersFlipped ; facing down, walk animation frame 3
dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 0
dw SpriteFacingUpAndWalking, SpriteOAMParameters ; facing up, walk animation frame 1
dw SpriteFacingUpAndStanding, SpriteOAMParameters ; facing up, walk animation frame 2
dw SpriteFacingUpAndWalking, SpriteOAMParametersFlipped ; facing up, walk animation frame 3
dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 0
dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 1
dw SpriteFacingLeftAndStanding, SpriteOAMParameters ; facing left, walk animation frame 2
dw SpriteFacingLeftAndWalking, SpriteOAMParameters ; facing left, walk animation frame 3
dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 0
dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 1
dw SpriteFacingLeftAndStanding, SpriteOAMParametersFlipped ; facing right, walk animation frame 2
dw SpriteFacingLeftAndWalking, SpriteOAMParametersFlipped ; facing right, walk animation frame 3
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; ---
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; This table is used for sprites $a and $b.
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; All orientation and animation parameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; lead to the same result. Used for immobile
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; sprites like items on the ground
dw SpriteFacingDownAndStanding, SpriteOAMParameters ; ---
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
dw SpriteFacingDownAndStanding, SpriteOAMParameters
; This table is used for overworld sprites $1-$9.
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0
dw .WalkingDown, .NormalOAM ; facing down, walk animation frame 1
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2
dw .WalkingDown, .FlippedOAM ; facing down, walk animation frame 3
dw .StandingUp, .NormalOAM ; facing up, walk animation frame 0
dw .WalkingUp, .NormalOAM ; facing up, walk animation frame 1
dw .StandingUp, .NormalOAM ; facing up, walk animation frame 2
dw .WalkingUp, .FlippedOAM ; facing up, walk animation frame 3
dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 0
dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 1
dw .StandingLeft, .NormalOAM ; facing left, walk animation frame 2
dw .WalkingLeft, .NormalOAM ; facing left, walk animation frame 3
dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 0
dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 1
dw .StandingLeft, .FlippedOAM ; facing right, walk animation frame 2
dw .WalkingLeft, .FlippedOAM ; facing right, walk animation frame 3
; The rest of this table is used for sprites $a and $b.
; All orientation and animation parameters lead to the same result.
; Used for immobile sprites like items on the ground.
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 0
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 1
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 2
dw .StandingDown, .NormalOAM ; facing down, walk animation frame 3
dw .StandingDown, .NormalOAM ; facing up, walk animation frame 0
dw .StandingDown, .NormalOAM ; facing up, walk animation frame 1
dw .StandingDown, .NormalOAM ; facing up, walk animation frame 2
dw .StandingDown, .NormalOAM ; facing up, walk animation frame 3
dw .StandingDown, .NormalOAM ; facing left, walk animation frame 0
dw .StandingDown, .NormalOAM ; facing left, walk animation frame 1
dw .StandingDown, .NormalOAM ; facing left, walk animation frame 2
dw .StandingDown, .NormalOAM ; facing left, walk animation frame 3
dw .StandingDown, .NormalOAM ; facing right, walk animation frame 0
dw .StandingDown, .NormalOAM ; facing right, walk animation frame 1
dw .StandingDown, .NormalOAM ; facing right, walk animation frame 2
dw .StandingDown, .NormalOAM ; facing right, walk animation frame 3
SpriteFacingDownAndStanding:
db $00,$01,$02,$03
SpriteFacingDownAndWalking:
db $80,$81,$82,$83
SpriteFacingUpAndStanding:
db $04,$05,$06,$07
SpriteFacingUpAndWalking:
db $84,$85,$86,$87
SpriteFacingLeftAndStanding:
db $08,$09,$0a,$0b
SpriteFacingLeftAndWalking:
db $88,$89,$8a,$8b
; four tile ids compose an overworld sprite
.StandingDown: db $00, $01, $02, $03
.WalkingDown: db $80, $81, $82, $83
.StandingUp: db $04, $05, $06, $07
.WalkingUp: db $84, $85, $86, $87
.StandingLeft: db $08, $09, $0a, $0b
.WalkingLeft: db $88, $89, $8a, $8b
SpriteOAMParameters:
db $00,$00, $00 ; top left
db $00,$08, $00 ; top right
db $08,$00, OAMFLAG_CANBEMASKED ; bottom left
db $08,$08, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
SpriteOAMParametersFlipped:
db $00,$08, OAMFLAG_VFLIPPED
db $00,$00, OAMFLAG_VFLIPPED
db $08,$08, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED
db $08,$00, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA
.NormalOAM:
; y, x, attributes
db 0, 0, $00 ; top left
db 0, 8, $00 ; top right
db 8, 0, OAMFLAG_CANBEMASKED ; bottom left
db 8, 8, OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right
.FlippedOAM:
; y, x, attributes
db 0, 8, OAMFLAG_VFLIPPED ; top left
db 0, 0, OAMFLAG_VFLIPPED ; top right
db 8, 8, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED ; bottom left
db 8, 0, OAMFLAG_VFLIPPED | OAMFLAG_CANBEMASKED | OAMFLAG_ENDOFDATA ; bottom right

View file

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