shithub: pokecrystal

Info  •  Files  •  Log  •  Branches

Sprite data values match GetSpriteLength return values and are not limited to multiples of 4

--- a/data/sprites/sprites.asm

+++ b/data/sprites/sprites.asm

@@ -1,111 +1,110 @@

 overworld_sprite: MACRO

 ; pointer, length, type, palette

 	dw \1

-	db \2 * 4 tiles, BANK(\1)

-	db \3, \4

+	db \2 tiles, BANK(\1), \3, \4

 ENDM

 OverworldSprites: ; 14736

 ; entries correspond to SPRITE_* constants

-	overworld_sprite ChrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite ChrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite GameboyKidSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN

-	overworld_sprite SilverSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite OakSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite RedSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BlueSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BillSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite ElderSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite JanineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite KurtSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite MomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BlaineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite RedsMomSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite DaisySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite ElmSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite WillSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED

-	overworld_sprite FalknerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite WhitneySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BugsySpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite MortySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite ChuckSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite JasmineSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite PryceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite ClairSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BrockSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite KarenSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE

-	overworld_sprite BrunoSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite MistySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite LanceSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite SurgeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite ErikaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite KogaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite SabrinaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite CooltrainerMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite CooltrainerFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite BugCatcherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite TwinSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite YoungsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite LassSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite TeacherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BuenaSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite SuperNerdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite RockerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite PokefanMSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite PokefanFSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite GrampsSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite GrannySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite SwimmerGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite SwimmerGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite BigSnorlaxSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE

-	overworld_sprite SurfingPikachuSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite RocketSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite RocketGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite NurseSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED

-	overworld_sprite LinkReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite ClerkSpriteGFX, 3, WALKING_SPRITE, PAL_OW_GREEN

-	overworld_sprite FisherSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite FishingGuruSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite ScientistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite KimonoGirlSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite SageSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite UnusedGuySpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED

-	overworld_sprite GentlemanSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite BlackBeltSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite ReceptionistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite OfficerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite CalSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite SlowpokeSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite CaptainSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite BigLaprasSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE

-	overworld_sprite GymGuySpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite SailorSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite BikerSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BROWN

-	overworld_sprite PharmacistSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite MonsterSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite FairySpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BirdSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite DragonSpriteGFX, 3, WALKING_SPRITE, PAL_OW_RED

-	overworld_sprite BigOnixSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN

-	overworld_sprite N64SpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN

-	overworld_sprite SudowoodoSpriteGFX, 3, STANDING_SPRITE, PAL_OW_GREEN

-	overworld_sprite SurfSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite PokeBallSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite PokedexSpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN

-	overworld_sprite PaperSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE

-	overworld_sprite VirtualBoySpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite OldLinkReceptionistSpriteGFX, 3, STANDING_SPRITE, PAL_OW_RED

-	overworld_sprite RockSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK

-	overworld_sprite BoulderSpriteGFX, 1, STILL_SPRITE, PAL_OW_ROCK

-	overworld_sprite SnesSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE

-	overworld_sprite FamicomSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite FruitTreeSpriteGFX, 1, STILL_SPRITE, PAL_OW_TREE

-	overworld_sprite GoldTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_BROWN

-	overworld_sprite SilverTrophySpriteGFX, 1, STILL_SPRITE, PAL_OW_SILVER

-	overworld_sprite KrisSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite KrisBikeSpriteGFX, 3, WALKING_SPRITE, PAL_OW_BLUE

-	overworld_sprite KurtOutsideSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BROWN

-	overworld_sprite SuicuneSpriteGFX, 1, STILL_SPRITE, PAL_OW_BLUE

-	overworld_sprite EnteiSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite RaikouSpriteGFX, 1, STILL_SPRITE, PAL_OW_RED

-	overworld_sprite StandingYoungsterSpriteGFX, 3, STANDING_SPRITE, PAL_OW_BLUE

+	overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN

+	overworld_sprite SilverSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BillSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite ElderSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite JanineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite KurtSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite MomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BlaineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite RedsMomSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite DaisySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite ElmSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite WillSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED

+	overworld_sprite FalknerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite WhitneySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BugsySpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite MortySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite ChuckSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite JasmineSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite PryceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite ClairSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BrockSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite KarenSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE

+	overworld_sprite BrunoSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite MistySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite LanceSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite SurgeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite ErikaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite KogaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite SabrinaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite CooltrainerMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite CooltrainerFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite BugCatcherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite TwinSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite YoungsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite LassSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite TeacherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BuenaSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite SuperNerdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite RockerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite PokefanMSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite PokefanFSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite GrampsSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite GrannySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite SwimmerGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite SwimmerGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite BigSnorlaxSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE

+	overworld_sprite SurfingPikachuSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite RocketSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite RocketGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite NurseSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED

+	overworld_sprite LinkReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite ClerkSpriteGFX, 12, WALKING_SPRITE, PAL_OW_GREEN

+	overworld_sprite FisherSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite FishingGuruSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite ScientistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite KimonoGirlSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite SageSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite UnusedGuySpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED

+	overworld_sprite GentlemanSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite BlackBeltSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite ReceptionistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite OfficerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite CalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite SlowpokeSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite CaptainSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite BigLaprasSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE

+	overworld_sprite GymGuySpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite SailorSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite BikerSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN

+	overworld_sprite PharmacistSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite MonsterSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite FairySpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BirdSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite DragonSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED

+	overworld_sprite BigOnixSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN

+	overworld_sprite N64SpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN

+	overworld_sprite SudowoodoSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN

+	overworld_sprite SurfSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite PokeBallSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite PokedexSpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN

+	overworld_sprite PaperSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE

+	overworld_sprite VirtualBoySpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite OldLinkReceptionistSpriteGFX, 12, STANDING_SPRITE, PAL_OW_RED

+	overworld_sprite RockSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK

+	overworld_sprite BoulderSpriteGFX, 4, STILL_SPRITE, PAL_OW_ROCK

+	overworld_sprite SnesSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE

+	overworld_sprite FamicomSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite FruitTreeSpriteGFX, 4, STILL_SPRITE, PAL_OW_TREE

+	overworld_sprite GoldTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_BROWN

+	overworld_sprite SilverTrophySpriteGFX, 4, STILL_SPRITE, PAL_OW_SILVER

+	overworld_sprite KrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite KrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE

+	overworld_sprite KurtOutsideSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BROWN

+	overworld_sprite SuicuneSpriteGFX, 4, STILL_SPRITE, PAL_OW_BLUE

+	overworld_sprite EnteiSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite RaikouSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED

+	overworld_sprite StandingYoungsterSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE