mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-10-21 06:17:59 +13:00
093bda0253
This adds Rock Climb functionality to Strong Arm and Dive functionality to Water Sport, as discussed in the server. HMs have been added, but we need 16bit Items to add Wind Ride, and I haven't finished their functionality.
The Rock Climb tile is a bit terrible, it's not easy to notice. Maybe change so that it works well with yellow or another colour?
This does not build due to issues with effect_commands.asm, but since Zeta is meant to be working on the mapping and Water Sport anyway, it seems to be up his alley.
I ported over much of the underwater assets Rangi was using as they looked very pretty. I imagine it'll be fun to utilise going forward. May as well, right?
I shall now lay down in a dark room.
Review: c21561ea71 (diff-5508f3b794fc68821ba35e94b6a293b2aaaa16c02a1b34fac70d03fd2f74c4b2R113)
155 lines
9.5 KiB
NASM
155 lines
9.5 KiB
NASM
MACRO overworld_sprite
|
|
; pointer, length, type, palette
|
|
dw \1
|
|
db \2 tiles, BANK(\1), \3, \4
|
|
ENDM
|
|
|
|
OverworldSprites:
|
|
; entries correspond to SPRITE_* constants
|
|
table_width NUM_SPRITEDATA_FIELDS, OverworldSprites
|
|
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 RivalSpriteGFX, 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_BLUE
|
|
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 BeautySpriteGFX, 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 GymGuideSpriteGFX, 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_EMOTE
|
|
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
|
|
overworld_sprite EnbySpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite EnbyBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite ChrisRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite KrisRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
|
overworld_sprite TopazRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
|
|
|
|
; SW97 Imports
|
|
overworld_sprite TsukushiGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite MikanGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
|
|
overworld_sprite MediumSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite AgathaGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite HelmetBikerGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite WalkerGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
|
|
overworld_sprite SpaceworldGirlGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite BanchomanGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite EnokiGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite ImposterOakGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite GoldSkateboardGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite SilverSisterGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
|
|
; KEP Imports
|
|
overworld_sprite VoltorbGFX, 12, STANDING_SPRITE, PAL_OW_RED
|
|
overworld_sprite SmallBirdGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite OfficerJennyGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
|
overworld_sprite KoffingGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite JessieGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite JamesGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
|
overworld_sprite GengarGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite GreenGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
|
|
overworld_sprite DiglettGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite CatGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite ArbokGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
|
|
overworld_sprite BaobaGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite SilphChiefGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite SafariZoneWorkerGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite LoreleiGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite GiovanniGFX, 12, WALKING_SPRITE, PAL_OW_RED
|
|
overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite BaldingGuyGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite GameboyGirlGFX, 12, STANDING_SPRITE, PAL_OW_RED
|
|
overworld_sprite OverworldPikachuGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
|
|
overworld_sprite WaterSportSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
|
|
assert_table_length NUM_OVERWORLD_SPRITES
|