The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
106
gfx/pics.asm
|
|
@ -346,7 +346,7 @@ BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic"
|
|||
BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic"
|
||||
Rival1Pic:: INCBIN "gfx/trainers/rival1.pic"
|
||||
ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic"
|
||||
ChiefPic:: INCBIN "gfx/trainers/chief.pic"
|
||||
ChiefPic:: INCBIN "gfx/trainers/chief.pic"
|
||||
ScientistPic:: INCBIN "gfx/trainers/scientist.pic"
|
||||
GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic"
|
||||
RocketPic:: INCBIN "gfx/trainers/rocket.pic"
|
||||
|
|
@ -385,57 +385,51 @@ BlottlePicFront:: INCBIN "gfx/pokemon/front/blottle.pic"
|
|||
BlottlePicBack:: INCBIN "gfx/pokemon/back/blottleb.pic"
|
||||
PendrakenPicFront:: INCBIN "gfx/pokemon/front/pendraken.pic"
|
||||
PendrakenPicBack:: INCBIN "gfx/pokemon/back/pendrakenb.pic"
|
||||
KonyaPicFront:: INCBIN "gfx/pokemon/front/konya.pic"
|
||||
KonyaPicBack:: INCBIN "gfx/pokemon/back/konyab.pic"
|
||||
MikonPicFront:: INCBIN "gfx/pokemon/front/mikon.pic"
|
||||
MikonPicBack:: INCBIN "gfx/pokemon/back/mikonb.pic"
|
||||
GyopinPicFront:: INCBIN "gfx/pokemon/front/gyopin.pic"
|
||||
GyopinPicBack:: INCBIN "gfx/pokemon/back/gyopinb.pic"
|
||||
PuchikoonPicFront:: INCBIN "gfx/pokemon/front/puchikoon.pic"
|
||||
PuchikoonPicBack:: INCBIN "gfx/pokemon/back/puchikoonb.pic"
|
||||
CoinpurPicFront:: INCBIN "gfx/pokemon/front/coinpur.pic"
|
||||
CoinpurPicBack:: INCBIN "gfx/pokemon/back/coinpurb.pic"
|
||||
VulpiiiPicFront:: INCBIN "gfx/pokemon/front/vulpiii.pic"
|
||||
VulpiiiPicBack:: INCBIN "gfx/pokemon/back/vulpiiib.pic"
|
||||
OrfryPicFront:: INCBIN "gfx/pokemon/front/orfry.pic"
|
||||
OrfryPicBack:: INCBIN "gfx/pokemon/back/orfryb.pic"
|
||||
KoltaPicFront:: INCBIN "gfx/pokemon/front/kolta.pic"
|
||||
KoltaPicBack:: INCBIN "gfx/pokemon/back/koltab.pic"
|
||||
WeirduckPicFront:: INCBIN "gfx/pokemon/front/weirduck.pic"
|
||||
WeirduckPicBack:: INCBIN "gfx/pokemon/back/weirduckb.pic"
|
||||
BlastykePicFront:: INCBIN "gfx/pokemon/front/blastyke.pic"
|
||||
BlastykePicBack:: INCBIN "gfx/pokemon/back/blastykeb.pic"
|
||||
TotartlePicFront:: INCBIN "gfx/pokemon/front/totartle.pic"
|
||||
TotartlePicBack:: INCBIN "gfx/pokemon/back/totartleb.pic"
|
||||
MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic"
|
||||
MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic"
|
||||
BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic"
|
||||
BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic"
|
||||
GuardiaPicFront:: INCBIN "gfx/pokemon/front/guardia.pic"
|
||||
GuardiaPicBack:: INCBIN "gfx/pokemon/back/guardiab.pic"
|
||||
MadaamuPicFront:: INCBIN "gfx/pokemon/front/madaamu.pic"
|
||||
MadaamuPicBack:: INCBIN "gfx/pokemon/back/madaamub.pic"
|
||||
PurakkusuPicFront:: INCBIN "gfx/pokemon/front/purakkusu.pic"
|
||||
PurakkusuPicBack:: INCBIN "gfx/pokemon/back/purakkusub.pic"
|
||||
MonjaPicFront:: INCBIN "gfx/pokemon/front/monja.pic"
|
||||
MonjaPicBack:: INCBIN "gfx/pokemon/back/monjab.pic"
|
||||
LuxwanPicFront:: INCBIN "gfx/pokemon/front/luxwan.pic"
|
||||
LuxwanPicBack:: INCBIN "gfx/pokemon/back/luxwanb.pic"
|
||||
TriculesPicFront:: INCBIN "gfx/pokemon/front/tricules.pic"
|
||||
TriculesPicBack:: INCBIN "gfx/pokemon/back/triculesb.pic"
|
||||
TangrowthPicFront:: INCBIN "gfx/pokemon/front/tangrowth.pic"
|
||||
TangrowthPicBack:: INCBIN "gfx/pokemon/back/tangrowthb.pic"
|
||||
LickilickyPicFront:: INCBIN "gfx/pokemon/front/lickilicky.pic"
|
||||
LickilickyPicBack:: INCBIN "gfx/pokemon/back/lickilickyb.pic"
|
||||
MeltanPicFront:: INCBIN "gfx/pokemon/front/meltan.pic"
|
||||
MeltanPicBack:: INCBIN "gfx/pokemon/back/meltanb.pic"
|
||||
MeltanPicFront:: INCBIN "gfx/pokemon/front/meltan.pic"
|
||||
MeltanPicBack:: INCBIN "gfx/pokemon/back/meltanb.pic"
|
||||
MelmetalPicFront:: INCBIN "gfx/pokemon/front/melmetal.pic"
|
||||
MelmetalPicBack:: INCBIN "gfx/pokemon/back/melmetalb.pic"
|
||||
|
||||
SECTION "Pics 8", ROMX
|
||||
|
||||
BarundaPicFront:: INCBIN "gfx/pokemon/front/barunda.pic"
|
||||
BarundaPicBack:: INCBIN "gfx/pokemon/back/barundab.pic"
|
||||
CactusPicFront:: INCBIN "gfx/pokemon/front/cactus.pic"
|
||||
CactusPicBack:: INCBIN "gfx/pokemon/back/cactusb.pic"
|
||||
CrockyPicFront:: INCBIN "gfx/pokemon/front/crocky.pic"
|
||||
CrockyPicBack:: INCBIN "gfx/pokemon/back/crockyb.pic"
|
||||
BalumbaPicFront:: INCBIN "gfx/pokemon/front/balumba.pic"
|
||||
BalumbaPicBack:: INCBIN "gfx/pokemon/back/balumbab.pic"
|
||||
CactormusPicFront:: INCBIN "gfx/pokemon/front/cactormus.pic"
|
||||
CactormusPicBack:: INCBIN "gfx/pokemon/back/cactormusb.pic"
|
||||
GavillainPicFront:: INCBIN "gfx/pokemon/front/gavillain.pic"
|
||||
GavillainPicBack:: INCBIN "gfx/pokemon/back/gavillainb.pic"
|
||||
TrampelPicFront:: INCBIN "gfx/pokemon/front/trampel.pic"
|
||||
TrampelPicBack:: INCBIN "gfx/pokemon/back/trampelb.pic"
|
||||
DeerPicFront:: INCBIN "gfx/pokemon/front/deer.pic"
|
||||
DeerPicBack:: INCBIN "gfx/pokemon/back/deerb.pic"
|
||||
RamoosePicFront:: INCBIN "gfx/pokemon/front/ramoose.pic"
|
||||
RamoosePicBack:: INCBIN "gfx/pokemon/back/ramooseb.pic"
|
||||
BuuPicFront:: INCBIN "gfx/pokemon/front/buu.pic"
|
||||
BuuPicBack:: INCBIN "gfx/pokemon/back/buub.pic"
|
||||
JaggPicFront:: INCBIN "gfx/pokemon/front/jagg.pic"
|
||||
JaggPicBack:: INCBIN "gfx/pokemon/back/jaggb.pic"
|
||||
SharpoonPicFront:: INCBIN "gfx/pokemon/front/sharpoon.pic"
|
||||
SharpoonPicBack:: INCBIN "gfx/pokemon/back/sharpoonb.pic"
|
||||
NidoreignPicFront:: INCBIN "gfx/pokemon/front/nidoreign.pic"
|
||||
NidoreignPicBack:: INCBIN "gfx/pokemon/back/nidoreignb.pic"
|
||||
KotoraPicFront:: INCBIN "gfx/pokemon/front/kotora.pic"
|
||||
|
|
@ -444,20 +438,20 @@ GaotoraPicFront:: INCBIN "gfx/pokemon/front/gaotora.pic"
|
|||
GaotoraPicBack:: INCBIN "gfx/pokemon/back/gaotorab.pic"
|
||||
GorotoraPicFront:: INCBIN "gfx/pokemon/front/gorotora.pic"
|
||||
GorotoraPicBack:: INCBIN "gfx/pokemon/back/gorotorab.pic"
|
||||
SkimperPicFront:: INCBIN "gfx/pokemon/front/skimper.pic"
|
||||
SkimperPicBack:: INCBIN "gfx/pokemon/back/skimperb.pic"
|
||||
BawliguaPicFront:: INCBIN "gfx/pokemon/front/bawligua.pic"
|
||||
BawliguaPicBack:: INCBIN "gfx/pokemon/back/bawliguab.pic"
|
||||
CryithanPicFront:: INCBIN "gfx/pokemon/front/cryithan.pic"
|
||||
CryithanPicBack:: INCBIN "gfx/pokemon/back/cryithanb.pic"
|
||||
SqueamataPicFront:: INCBIN "gfx/pokemon/front/squeamata.pic"
|
||||
SqueamataPicBack:: INCBIN "gfx/pokemon/back/squeamatab.pic"
|
||||
MinistarePicFront:: INCBIN "gfx/pokemon/front/ministare.pic"
|
||||
MinistarePicBack:: INCBIN "gfx/pokemon/back/ministareb.pic"
|
||||
IguanarchPicFront:: INCBIN "gfx/pokemon/front/iguanarch.pic"
|
||||
IguanarchPicBack:: INCBIN "gfx/pokemon/back/iguanarchb.pic"
|
||||
GorochuPicFront:: INCBIN "gfx/pokemon/front/gorochu.pic"
|
||||
GorochuPicBack:: INCBIN "gfx/pokemon/back/gorochub.pic"
|
||||
DecillaPicFront:: INCBIN "gfx/pokemon/front/decilla.pic"
|
||||
DecillaPicBack:: INCBIN "gfx/pokemon/back/decillab.pic"
|
||||
GyaoonPicFront:: INCBIN "gfx/pokemon/front/gyaoon.pic"
|
||||
GyaoonPicBack:: INCBIN "gfx/pokemon/back/gyaoonb.pic"
|
||||
OmegaPicFront:: INCBIN "gfx/pokemon/front/omega.pic"
|
||||
OmegaPicBack:: INCBIN "gfx/pokemon/back/omegab.pic"
|
||||
GawarhedPicFront:: INCBIN "gfx/pokemon/front/gawarhed.pic"
|
||||
GawarhedPicBack:: INCBIN "gfx/pokemon/back/gawarhedb.pic"
|
||||
OmegadgePicFront:: INCBIN "gfx/pokemon/front/omegadge.pic"
|
||||
OmegadgePicBack:: INCBIN "gfx/pokemon/back/omegadgeb.pic"
|
||||
KokanaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic"
|
||||
KokanaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic"
|
||||
ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic"
|
||||
|
|
@ -495,18 +489,18 @@ GlaceonPicFront:: INCBIN "gfx/pokemon/front/glaceon.pic"
|
|||
GlaceonPicBack:: INCBIN "gfx/pokemon/back/glaceonb.pic"
|
||||
SylveonPicFront:: INCBIN "gfx/pokemon/front/sylveon.pic"
|
||||
SylveonPicBack:: INCBIN "gfx/pokemon/back/sylveonb.pic"
|
||||
TsubomittoPicFront:: INCBIN "gfx/pokemon/front/tsubomitto.pic"
|
||||
TsubomittoPicBack:: INCBIN "gfx/pokemon/back/tsubomittob.pic"
|
||||
SteelixPicFront:: INCBIN "gfx/pokemon/front/steelix.pic"
|
||||
SteelixPicBack:: INCBIN "gfx/pokemon/back/steelixb.pic"
|
||||
BlisseyPicFront:: INCBIN "gfx/pokemon/front/blissey.pic"
|
||||
BlisseyPicBack:: INCBIN "gfx/pokemon/back/blisseyb.pic"
|
||||
HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic"
|
||||
BellignanPicFront:: INCBIN "gfx/pokemon/front/bellignan.pic"
|
||||
BellignanPicBack:: INCBIN "gfx/pokemon/back/bellignanb.pic"
|
||||
SteelixPicFront:: INCBIN "gfx/pokemon/front/steelix.pic"
|
||||
SteelixPicBack:: INCBIN "gfx/pokemon/back/steelixb.pic"
|
||||
BlisseyPicFront:: INCBIN "gfx/pokemon/front/blissey.pic"
|
||||
BlisseyPicBack:: INCBIN "gfx/pokemon/back/blisseyb.pic"
|
||||
HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic"
|
||||
HitmontopPicBack:: INCBIN "gfx/pokemon/back/hitmontopb.pic"
|
||||
CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic"
|
||||
CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic"
|
||||
AnimonPicFront:: INCBIN "gfx/pokemon/front/animon.pic"
|
||||
AnimonPicBack:: INCBIN "gfx/pokemon/back/animonb.pic"
|
||||
CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic"
|
||||
CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic"
|
||||
MimmeoPicFront:: INCBIN "gfx/pokemon/front/mimmeo.pic"
|
||||
MimmeoPicBack:: INCBIN "gfx/pokemon/back/mimmeob.pic"
|
||||
BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic"
|
||||
BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic"
|
||||
Porygon2PicFront:: INCBIN "gfx/pokemon/front/porygon2.pic"
|
||||
|
|
@ -521,10 +515,10 @@ ElectivirePicFront:: INCBIN "gfx/pokemon/front/electivire.pic"
|
|||
ElectivirePicBack:: INCBIN "gfx/pokemon/back/electivireb.pic"
|
||||
MagmortarPicFront:: INCBIN "gfx/pokemon/front/magmortar.pic"
|
||||
MagmortarPicBack:: INCBIN "gfx/pokemon/back/magmortarb.pic"
|
||||
TaabanPicFront:: INCBIN "gfx/pokemon/front/taaban.pic"
|
||||
TaabanPicBack:: INCBIN "gfx/pokemon/back/taabanb.pic"
|
||||
KasanagiPicFront:: INCBIN "gfx/pokemon/front/kasanagi.pic"
|
||||
KasanagiPicBack:: INCBIN "gfx/pokemon/back/kasanagib.pic"
|
||||
DisturbanPicFront:: INCBIN "gfx/pokemon/front/disturban.pic"
|
||||
DisturbanPicBack:: INCBIN "gfx/pokemon/back/disturbanb.pic"
|
||||
PupalPicFront:: INCBIN "gfx/pokemon/front/pupal.pic"
|
||||
PupalPicBack:: INCBIN "gfx/pokemon/back/pupalb.pic"
|
||||
CarapthorPicFront:: INCBIN "gfx/pokemon/front/carapthor.pic"
|
||||
CarapthorPicBack:: INCBIN "gfx/pokemon/back/carapthorb.pic"
|
||||
MagnezonePicFront:: INCBIN "gfx/pokemon/front/magnezone.pic"
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 442 B |
|
Before Width: | Height: | Size: 625 B After Width: | Height: | Size: 625 B |
|
Before Width: | Height: | Size: 491 B After Width: | Height: | Size: 491 B |
|
Before Width: | Height: | Size: 455 B After Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 509 B After Width: | Height: | Size: 509 B |
|
Before Width: | Height: | Size: 584 B After Width: | Height: | Size: 584 B |
|
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 205 B |
|
Before Width: | Height: | Size: 212 B After Width: | Height: | Size: 212 B |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 266 B |
|
Before Width: | Height: | Size: 464 B After Width: | Height: | Size: 464 B |
|
Before Width: | Height: | Size: 502 B After Width: | Height: | Size: 502 B |
|
Before Width: | Height: | Size: 196 B After Width: | Height: | Size: 196 B |
|
Before Width: | Height: | Size: 523 B After Width: | Height: | Size: 523 B |
|
Before Width: | Height: | Size: 149 B After Width: | Height: | Size: 149 B |
|
Before Width: | Height: | Size: 528 B After Width: | Height: | Size: 528 B |
|
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 517 B |
|
Before Width: | Height: | Size: 454 B After Width: | Height: | Size: 454 B |
|
Before Width: | Height: | Size: 182 B After Width: | Height: | Size: 182 B |
|
Before Width: | Height: | Size: 606 B After Width: | Height: | Size: 649 B |
|
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 598 B |
|
Before Width: | Height: | Size: 490 B After Width: | Height: | Size: 490 B |
|
Before Width: | Height: | Size: 556 B After Width: | Height: | Size: 556 B |
|
Before Width: | Height: | Size: 932 B After Width: | Height: | Size: 932 B |
|
Before Width: | Height: | Size: 723 B After Width: | Height: | Size: 723 B |
|
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 565 B |
|
Before Width: | Height: | Size: 472 B After Width: | Height: | Size: 472 B |
|
Before Width: | Height: | Size: 886 B After Width: | Height: | Size: 886 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 984 B After Width: | Height: | Size: 984 B |
|
Before Width: | Height: | Size: 613 B After Width: | Height: | Size: 613 B |
|
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 813 B |
|
Before Width: | Height: | Size: 890 B After Width: | Height: | Size: 944 B |
|
Before Width: | Height: | Size: 837 B After Width: | Height: | Size: 875 B |
|
Before Width: | Height: | Size: 641 B After Width: | Height: | Size: 641 B |
|
Before Width: | Height: | Size: 892 B After Width: | Height: | Size: 892 B |
|
Before Width: | Height: | Size: 841 B After Width: | Height: | Size: 903 B |
|
Before Width: | Height: | Size: 893 B After Width: | Height: | Size: 893 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 516 B |
|
Before Width: | Height: | Size: 761 B After Width: | Height: | Size: 761 B |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 869 B After Width: | Height: | Size: 869 B |
|
Before Width: | Height: | Size: 724 B After Width: | Height: | Size: 724 B |
|
Before Width: | Height: | Size: 945 B After Width: | Height: | Size: 945 B |
|
Before Width: | Height: | Size: 605 B After Width: | Height: | Size: 605 B |
|
Before Width: | Height: | Size: 898 B After Width: | Height: | Size: 982 B |
|
Before Width: | Height: | Size: 642 B After Width: | Height: | Size: 642 B |
|
Before Width: | Height: | Size: 228 B After Width: | Height: | Size: 228 B |
|
Before Width: | Height: | Size: 363 B After Width: | Height: | Size: 363 B |
|
Before Width: | Height: | Size: 673 B After Width: | Height: | Size: 673 B |
|
Before Width: | Height: | Size: 629 B After Width: | Height: | Size: 629 B |
|
Before Width: | Height: | Size: 771 B After Width: | Height: | Size: 771 B |
|
Before Width: | Height: | Size: 552 B After Width: | Height: | Size: 552 B |
|
Before Width: | Height: | Size: 561 B After Width: | Height: | Size: 561 B |
|
Before Width: | Height: | Size: 594 B After Width: | Height: | Size: 594 B |
|
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 534 B |
|
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
|
Before Width: | Height: | Size: 549 B After Width: | Height: | Size: 549 B |
|
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 256 B |
|
Before Width: | Height: | Size: 516 B After Width: | Height: | Size: 516 B |