mirror of
https://github.com/thornAvery/jep-hack.git
synced 2025-09-16 18:20:50 +12: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 KiB
NASM
155 lines
9 KiB
NASM
SECTION "Sprites 1", ROMX
|
|
|
|
ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp"
|
|
ChrisBikeSpriteGFX:: INCBIN "gfx/sprites/chris_bike.2bpp"
|
|
GameboyKidSpriteGFX:: INCBIN "gfx/sprites/gameboy_kid.2bpp"
|
|
RivalSpriteGFX:: INCBIN "gfx/sprites/rival.2bpp"
|
|
OakSpriteGFX:: INCBIN "gfx/sprites/oak.2bpp"
|
|
RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp"
|
|
BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp"
|
|
BillSpriteGFX:: INCBIN "gfx/sprites/bill.2bpp"
|
|
ElderSpriteGFX:: INCBIN "gfx/sprites/elder.2bpp"
|
|
JanineSpriteGFX:: INCBIN "gfx/sprites/janine.2bpp"
|
|
KurtSpriteGFX:: INCBIN "gfx/sprites/kurt.2bpp"
|
|
MomSpriteGFX:: INCBIN "gfx/sprites/mom.2bpp"
|
|
BlaineSpriteGFX:: INCBIN "gfx/sprites/blaine.2bpp"
|
|
RedsMomSpriteGFX:: INCBIN "gfx/sprites/reds_mom.2bpp"
|
|
DaisySpriteGFX:: INCBIN "gfx/sprites/daisy.2bpp"
|
|
ElmSpriteGFX:: INCBIN "gfx/sprites/elm.2bpp"
|
|
WillSpriteGFX:: INCBIN "gfx/sprites/will.2bpp"
|
|
FalknerSpriteGFX:: INCBIN "gfx/sprites/falkner.2bpp"
|
|
WhitneySpriteGFX:: INCBIN "gfx/sprites/whitney.2bpp"
|
|
BugsySpriteGFX:: INCBIN "gfx/sprites/bugsy.2bpp"
|
|
MortySpriteGFX:: INCBIN "gfx/sprites/morty.2bpp"
|
|
ChuckSpriteGFX:: INCBIN "gfx/sprites/chuck.2bpp"
|
|
JasmineSpriteGFX:: INCBIN "gfx/sprites/jasmine.2bpp"
|
|
PryceSpriteGFX:: INCBIN "gfx/sprites/pryce.2bpp"
|
|
ClairSpriteGFX:: INCBIN "gfx/sprites/clair.2bpp"
|
|
BrockSpriteGFX:: INCBIN "gfx/sprites/brock.2bpp"
|
|
KarenSpriteGFX:: INCBIN "gfx/sprites/karen.2bpp"
|
|
BrunoSpriteGFX:: INCBIN "gfx/sprites/bruno.2bpp"
|
|
MistySpriteGFX:: INCBIN "gfx/sprites/misty.2bpp"
|
|
LanceSpriteGFX:: INCBIN "gfx/sprites/lance.2bpp"
|
|
SurgeSpriteGFX:: INCBIN "gfx/sprites/surge.2bpp"
|
|
ErikaSpriteGFX:: INCBIN "gfx/sprites/erika.2bpp"
|
|
KogaSpriteGFX:: INCBIN "gfx/sprites/koga.2bpp"
|
|
SabrinaSpriteGFX:: INCBIN "gfx/sprites/sabrina.2bpp"
|
|
CooltrainerMSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_m.2bpp"
|
|
CooltrainerFSpriteGFX:: INCBIN "gfx/sprites/cooltrainer_f.2bpp"
|
|
BugCatcherSpriteGFX:: INCBIN "gfx/sprites/bug_catcher.2bpp"
|
|
TwinSpriteGFX:: INCBIN "gfx/sprites/twin.2bpp"
|
|
YoungsterSpriteGFX:: INCBIN "gfx/sprites/youngster.2bpp"
|
|
LassSpriteGFX:: INCBIN "gfx/sprites/lass.2bpp"
|
|
TeacherSpriteGFX:: INCBIN "gfx/sprites/teacher.2bpp"
|
|
BeautySpriteGFX:: INCBIN "gfx/sprites/beauty.2bpp"
|
|
SuperNerdSpriteGFX:: INCBIN "gfx/sprites/super_nerd.2bpp"
|
|
RockerSpriteGFX:: INCBIN "gfx/sprites/rocker.2bpp"
|
|
|
|
|
|
SECTION "Sprites 2", ROMX
|
|
|
|
PokefanMSpriteGFX:: INCBIN "gfx/sprites/pokefan_m.2bpp"
|
|
PokefanFSpriteGFX:: INCBIN "gfx/sprites/pokefan_f.2bpp"
|
|
GrampsSpriteGFX:: INCBIN "gfx/sprites/gramps.2bpp"
|
|
GrannySpriteGFX:: INCBIN "gfx/sprites/granny.2bpp"
|
|
SwimmerGuySpriteGFX:: INCBIN "gfx/sprites/swimmer_guy.2bpp"
|
|
SwimmerGirlSpriteGFX:: INCBIN "gfx/sprites/swimmer_girl.2bpp"
|
|
BigSnorlaxSpriteGFX:: INCBIN "gfx/sprites/big_snorlax.2bpp"
|
|
SurfingPikachuSpriteGFX:: INCBIN "gfx/sprites/surfing_pikachu.2bpp"
|
|
RocketSpriteGFX:: INCBIN "gfx/sprites/rocket.2bpp"
|
|
RocketGirlSpriteGFX:: INCBIN "gfx/sprites/rocket_girl.2bpp"
|
|
NurseSpriteGFX:: INCBIN "gfx/sprites/nurse.2bpp"
|
|
LinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/link_receptionist.2bpp"
|
|
ClerkSpriteGFX:: INCBIN "gfx/sprites/clerk.2bpp"
|
|
FisherSpriteGFX:: INCBIN "gfx/sprites/fisher.2bpp"
|
|
FishingGuruSpriteGFX:: INCBIN "gfx/sprites/fishing_guru.2bpp"
|
|
ScientistSpriteGFX:: INCBIN "gfx/sprites/scientist.2bpp"
|
|
KimonoGirlSpriteGFX:: INCBIN "gfx/sprites/kimono_girl.2bpp"
|
|
SageSpriteGFX:: INCBIN "gfx/sprites/sage.2bpp"
|
|
UnusedGuySpriteGFX:: INCBIN "gfx/sprites/unused_guy.2bpp"
|
|
GentlemanSpriteGFX:: INCBIN "gfx/sprites/gentleman.2bpp"
|
|
BlackBeltSpriteGFX:: INCBIN "gfx/sprites/black_belt.2bpp"
|
|
ReceptionistSpriteGFX:: INCBIN "gfx/sprites/receptionist.2bpp"
|
|
OfficerSpriteGFX:: INCBIN "gfx/sprites/officer.2bpp"
|
|
CalSpriteGFX:: INCBIN "gfx/sprites/cal.2bpp"
|
|
SlowpokeSpriteGFX:: INCBIN "gfx/sprites/slowpoke.2bpp"
|
|
CaptainSpriteGFX:: INCBIN "gfx/sprites/captain.2bpp"
|
|
BigLaprasSpriteGFX:: INCBIN "gfx/sprites/big_lapras.2bpp"
|
|
GymGuideSpriteGFX:: INCBIN "gfx/sprites/gym_guide.2bpp"
|
|
SailorSpriteGFX:: INCBIN "gfx/sprites/sailor.2bpp"
|
|
BikerSpriteGFX:: INCBIN "gfx/sprites/biker.2bpp"
|
|
PharmacistSpriteGFX:: INCBIN "gfx/sprites/pharmacist.2bpp"
|
|
MonsterSpriteGFX:: INCBIN "gfx/sprites/monster.2bpp"
|
|
FairySpriteGFX:: INCBIN "gfx/sprites/fairy.2bpp"
|
|
BirdSpriteGFX:: INCBIN "gfx/sprites/bird.2bpp"
|
|
DragonSpriteGFX:: INCBIN "gfx/sprites/dragon.2bpp"
|
|
BigOnixSpriteGFX:: INCBIN "gfx/sprites/big_onix.2bpp"
|
|
N64SpriteGFX:: INCBIN "gfx/sprites/n64.2bpp"
|
|
SudowoodoSpriteGFX:: INCBIN "gfx/sprites/sudowoodo.2bpp"
|
|
SurfSpriteGFX:: INCBIN "gfx/sprites/surf.2bpp"
|
|
PokeBallSpriteGFX:: INCBIN "gfx/sprites/poke_ball.2bpp"
|
|
PokedexSpriteGFX:: INCBIN "gfx/sprites/pokedex.2bpp"
|
|
PaperSpriteGFX:: INCBIN "gfx/sprites/paper.2bpp"
|
|
VirtualBoySpriteGFX:: INCBIN "gfx/sprites/virtual_boy.2bpp"
|
|
OldLinkReceptionistSpriteGFX:: INCBIN "gfx/sprites/old_link_receptionist.2bpp"
|
|
RockSpriteGFX:: INCBIN "gfx/sprites/rock.2bpp"
|
|
BoulderSpriteGFX:: INCBIN "gfx/sprites/boulder.2bpp"
|
|
SnesSpriteGFX:: INCBIN "gfx/sprites/snes.2bpp"
|
|
FamicomSpriteGFX:: INCBIN "gfx/sprites/famicom.2bpp"
|
|
FruitTreeSpriteGFX:: INCBIN "gfx/sprites/fruit_tree.2bpp"
|
|
GoldTrophySpriteGFX:: INCBIN "gfx/sprites/gold_trophy.2bpp"
|
|
SilverTrophySpriteGFX:: INCBIN "gfx/sprites/silver_trophy.2bpp"
|
|
KrisSpriteGFX:: INCBIN "gfx/sprites/kris.2bpp"
|
|
KrisBikeSpriteGFX:: INCBIN "gfx/sprites/kris_bike.2bpp"
|
|
KurtOutsideSpriteGFX:: INCBIN "gfx/sprites/kurt_outside.2bpp"
|
|
SuicuneSpriteGFX:: INCBIN "gfx/sprites/suicune.2bpp"
|
|
EnteiSpriteGFX:: INCBIN "gfx/sprites/entei.2bpp"
|
|
RaikouSpriteGFX:: INCBIN "gfx/sprites/raikou.2bpp"
|
|
StandingYoungsterSpriteGFX:: INCBIN "gfx/sprites/standing_youngster.2bpp"
|
|
|
|
|
|
SECTION "Sprites 3", ROMX
|
|
|
|
EnbySpriteGFX:: INCBIN "gfx/sprites/enby.2bpp"
|
|
EnbyBikeSpriteGFX:: INCBIN "gfx/sprites/enby_bike.2bpp"
|
|
ChrisRunSpriteGFX:: INCBIN "gfx/sprites/chris_run.2bpp"
|
|
KrisRunSpriteGFX:: INCBIN "gfx/sprites/kris_run.2bpp"
|
|
TopazRunSpriteGFX:: INCBIN "gfx/sprites/topaz_run.2bpp"
|
|
|
|
; SW97 Imports
|
|
TsukushiGFX:: INCBIN "gfx/sprites/tsukushi.2bpp"
|
|
MikanGFX:: INCBIN "gfx/sprites/mikan.2bpp"
|
|
MediumSpriteGFX:: INCBIN "gfx/sprites/medium.2bpp"
|
|
AgathaGFX:: INCBIN "gfx/sprites/kikuko.2bpp"
|
|
HelmetBikerGFX:: INCBIN "gfx/sprites/helmet.2bpp"
|
|
WalkerGFX:: INCBIN "gfx/sprites/hayato.2bpp"
|
|
SpaceworldGirlGFX:: INCBIN "gfx/sprites/girl.2bpp"
|
|
BanchomanGFX:: INCBIN "gfx/sprites/frowning_man.2bpp"
|
|
EnokiGFX:: INCBIN "gfx/sprites/enoki.2bpp"
|
|
ImposterOakGFX:: INCBIN "gfx/sprites/evil_okido.2bpp"
|
|
GoldSkateboardGFX:: INCBIN "gfx/sprites/gold_skateboard.2bpp"
|
|
SilverSisterGFX:: INCBIN "gfx/sprites/silvers_sister.2bpp"
|
|
|
|
SECTION "Sprites 4", ROMX ; KEP Imports go in this bank.
|
|
VoltorbGFX:: INCBIN "gfx/sprites/voltorb.2bpp"
|
|
SmallBirdGFX:: INCBIN "gfx/sprites/smallbird.2bpp"
|
|
OfficerJennyGFX:: INCBIN "gfx/sprites/officer_jenny.2bpp"
|
|
KoffingGFX:: INCBIN "gfx/sprites/koffing.2bpp"
|
|
JessieGFX:: INCBIN "gfx/sprites/jessie.2bpp"
|
|
JamesGFX:: INCBIN "gfx/sprites/james.2bpp"
|
|
GengarGFX:: INCBIN "gfx/sprites/gengar.2bpp"
|
|
GreenGFX:: INCBIN "gfx/sprites/green.2bpp"
|
|
DiglettGFX:: INCBIN "gfx/sprites/diglett.2bpp"
|
|
CatGFX:: INCBIN "gfx/sprites/cat.2bpp"
|
|
ArbokGFX:: INCBIN "gfx/sprites/arbok.2bpp"
|
|
BaobaGFX:: INCBIN "gfx/sprites/warden.2bpp"
|
|
SilphChiefGFX:: INCBIN "gfx/sprites/silph_president.2bpp"
|
|
SafariZoneWorkerGFX:: INCBIN "gfx/sprites/safari_zone_worker.2bpp"
|
|
LoreleiGFX:: INCBIN "gfx/sprites/lorelei.2bpp"
|
|
GiovanniGFX:: INCBIN "gfx/sprites/giovanni.2bpp"
|
|
ChannelerGFX:: INCBIN "gfx/sprites/channeler.2bpp"
|
|
BaldingGuyGFX:: INCBIN "gfx/sprites/balding_guy.2bpp"
|
|
GameboyGirlGFX:: INCBIN "gfx/sprites/gameboy_girl.2bpp"
|
|
OverworldPikachuGFX:: INCBIN "gfx/sprites/pikachu.2bpp"
|
|
DiveSpriteGFX:: INCBIN "gfx/sprites/dive.2bpp"
|