mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-20 22:28:41 +13:00
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.
This commit is contained in:
Martha Schilling
parent
57186bb2a0
commit
508a4e790e
246 changed files with 2446 additions and 2384 deletions
|
|
@ -70,7 +70,7 @@ YoungsterData:
|
|||
db 11, RATTATA, EKANS, 0
|
||||
db 14, SPEAROW, 0
|
||||
; Mt. Moon 1F
|
||||
db 10, RATTATA, SPEAROW, BITTYBAT, 0
|
||||
db 10, RATTATA, SPEAROW, ZUBAT, 0
|
||||
; Route 24
|
||||
db 14, RATTATA, EKANS, ZUBAT, 0
|
||||
; Route 25
|
||||
|
|
@ -94,22 +94,22 @@ BugCatcherData:
|
|||
db 7, CATERPIE, KAKUNA, KOKANA, 0
|
||||
db 9, VENONAT, 0
|
||||
; Route 3
|
||||
db 10, KOKANA, KASANAGI, 0 ; trimmed down to create counterpart trainers
|
||||
db 10, KOKANA, PUPAL, 0 ; trimmed down to create counterpart trainers
|
||||
db 10, WEEDLE, KAKUNA, 0
|
||||
db 10, CATERPIE, METAPOD, 0
|
||||
; Mt. Moon 1F
|
||||
db 12, PARAS, 0
|
||||
db 10, KASANAGI, PARAS, 0
|
||||
db 10, PUPAL, PARAS, 0
|
||||
; Route 24
|
||||
db 14, KOKANA, WEEDLE, 0
|
||||
; Route 6
|
||||
db 16, VENONAT, PARAS, 0 ; By this point, the player has fought like, 2 "three bugs" trainers. Toning it down.
|
||||
db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons
|
||||
; Silph Gauntlet 1F (Viridian Forest)
|
||||
db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
|
||||
db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, TRICULES, KLEAVOR, 0
|
||||
; Route 9
|
||||
db 19, BUTTERFREE, BEEDRILL, 0
|
||||
db 20, KASANAGI, VENONAT, BEEDRILL, 0
|
||||
db 20, PUPAL, VENONAT, BEEDRILL, 0
|
||||
|
||||
; A strange trainer that usually uses "cute" Pokemon, mainly Normal, Flying, and Grass types.
|
||||
; Main exception is Pikachu and the Nidorans. I think adding Kotora enhances this nicely.
|
||||
|
|
@ -158,7 +158,7 @@ SailorData:
|
|||
; Vermilion Gym
|
||||
db 21, KOTORA, GAOTORA, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 64, KINGDRA, MACHAMP, TAABAN, STARMIE, GOROTORA, TENTACRUEL, 0
|
||||
db 64, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
|
||||
|
||||
; One of the most varied trainers in the game. No criticisms.
|
||||
JrTrainerMData:
|
||||
|
|
@ -182,7 +182,7 @@ JrTrainerMData:
|
|||
; As varied as the male counterpart. Improvements come from reducing repeats.
|
||||
JrTrainerFData:
|
||||
; Cerulean Gym
|
||||
db 19, GYOPIN, GOLDEEN, 0
|
||||
db 19, ORFRY, GOLDEEN, 0
|
||||
; Route 6
|
||||
db 20, CUBONE, 0 ; Giselle from School of Hard Knocks, Indigo League Ep9, featured in Yellow
|
||||
db 16, PIDGEY, SPEAROW, FARFETCHD, 0
|
||||
|
|
@ -218,7 +218,7 @@ JrTrainerFData:
|
|||
; Route 20
|
||||
db 30, TENTACOOL, HORSEA, SEEL, 0
|
||||
; Silph Gauntlet 1F (Viridian Forest)
|
||||
db 62, TSUBOMITTO, SEAKING, TANGROWTH, MADAAMU, BELLOSSOM, GOROCHU, 0
|
||||
db 62, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0
|
||||
|
||||
; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon.
|
||||
; Skimper seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
|
||||
|
|
@ -229,9 +229,9 @@ PokemaniacData:
|
|||
; Rock Tunnel B1F
|
||||
db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
|
||||
db 22, CHARMANDER, CUBONE, 0
|
||||
db 25, SKIMPER, 0
|
||||
db 25, SQUEAMATA, 0
|
||||
; Victory Road 2F
|
||||
db 40, BAWLIGUA, LAPRAS, LICKILICKY, RHYDON, 0
|
||||
db 40, MINISTARE, LAPRAS, LICKILICKY, RHYDON, 0
|
||||
; Rock Tunnel 1F
|
||||
db 23, CUBONE, SLOWPOKE, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
|
|
@ -245,11 +245,11 @@ SuperNerdData:
|
|||
db 12, GRIMER, VOLTORB, KOFFING, 0
|
||||
; Route 8
|
||||
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
|
||||
db 22, VOLTORB, KOFFING, MAGNETITE, 0
|
||||
db 22, VOLTORB, KOFFING, MAGNEMITE, 0
|
||||
db 26, ELECTRODE, 0
|
||||
; Unused - both now used in Celadon University
|
||||
db 30, PORYGON, 0 ;
|
||||
db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ;
|
||||
db 25, GRIMER, KOFFING, KABUTO, OMANYTE, 0 ;
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
|
||||
; Cinnabar Gym
|
||||
|
|
@ -334,7 +334,7 @@ BurglarData:
|
|||
; Mansion 2F
|
||||
db 34, CHARMANDER, CHARMELEON, 0
|
||||
; Mansion 3F
|
||||
db 38, PUCHIKOON, NINETALES, 0
|
||||
db 38, KOLTA, NINETALES, 0
|
||||
; Mansion B1F
|
||||
db 34, GROWLITHE, PONYTA, 0
|
||||
|
||||
|
|
@ -344,7 +344,7 @@ EngineerData:
|
|||
db 36, GOLEM, 0
|
||||
; Route 11
|
||||
db 21, KOTORA, VOLTORB, 0
|
||||
db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
|
||||
db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 64, ELECTRODE, SANDSLASH_A, MAGNEZONE, GOROTORA, PERRSERKER, SCIZOR, 0 ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
|
||||
|
||||
|
|
@ -361,13 +361,13 @@ FisherData:
|
|||
db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0
|
||||
; Route 21
|
||||
db 28, PSYDUCK, CHEEP, KINGLER, 0
|
||||
db 31, SHELLDER, TAABAN, 0
|
||||
db 31, SHELLDER, DISTURBAN, 0
|
||||
db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0 ; he's too iconic to change
|
||||
db 33, SEAKING, JAGG, 0
|
||||
db 33, SEAKING, SHARPOON, 0
|
||||
; Route 12
|
||||
db 24, SKIMPER, WIGLETT, 0
|
||||
db 24, BLASTYKE, WIGLETT, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 64, GYARADOS, SEAKING, TAABAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
|
||||
db 64, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
|
||||
; Brunswick Trail
|
||||
db 65, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0
|
||||
|
||||
|
|
@ -377,11 +377,11 @@ SwimmerData:
|
|||
; Cerulean Gym
|
||||
db 16, HORSEA, SHELLDER, 0
|
||||
; Route 19
|
||||
db 30, TENTACOOL, TAABAN, 0
|
||||
db 30, TENTACOOL, PENDRAKEN, 0
|
||||
db 29, GOLDEEN, HORSEA, STARYU, 0
|
||||
db 30, WEIRDUCK, POLIWHIRL, 0
|
||||
db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0
|
||||
db 29, GOLDEEN, SEAKING, BAWLIGUA, 0
|
||||
db 29, GOLDEEN, SEAKING, WEIRDUCK, 0
|
||||
db 30, WIGLETT, CLOYSTER, 0
|
||||
db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0
|
||||
; Route 20
|
||||
|
|
@ -425,7 +425,7 @@ GamblerData:
|
|||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
|
||||
; Route 8
|
||||
db 24, CACTUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
|
||||
db 24, CACTORMUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
|
||||
|
||||
; Very varied, little criticism outside of minor repeats.
|
||||
; Seems to use whatever the route demands of the class, which I enjoy seeing.
|
||||
|
|
@ -433,20 +433,20 @@ GamblerData:
|
|||
BeautyData:
|
||||
; Celadon Gym
|
||||
db 21, ODDISH, BELLSPROUT, WEEPINBELL, 0
|
||||
db 24, TOEDSCOOL, MONJA, 0
|
||||
db 26, DEER, 0
|
||||
db 24, TOEDSCOOL, GLOOM, 0
|
||||
db 26, RAMOOSE, 0
|
||||
; Route 13
|
||||
db 27, RATTATA, PIKACHU, JIGGLYPUFF, 0
|
||||
db 29, CLEFAIRY, MEOWTH, 0
|
||||
; Route 20
|
||||
db 35, SEAKING, 0
|
||||
db 30, SHELLDER, TAABAN, CLOYSTER, 0
|
||||
db 30, SHELLDER, DISTURBAN, CLOYSTER, 0
|
||||
db 31, POLIWAG, SEAKING, 0
|
||||
; Route 15
|
||||
db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine
|
||||
db 29, BULBASAUR, IVYSAUR, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 64, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 63, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
|
||||
; Route 19
|
||||
db 27, POLIWAG, GOLDEEN, SEAKING, 0
|
||||
db 30, BLASTYKE, GOLDUCK, 0
|
||||
|
|
@ -469,7 +469,7 @@ PsychicData:
|
|||
; Electric specialist with depressingly little representation.
|
||||
RockerData:
|
||||
; Vermilion Gym
|
||||
db 20, VOLTORB, MAGNEMITE, MAGNETITE, 0
|
||||
db 20, VOLTORB, MAGNEMITE, KOTORA, 0
|
||||
; Route 12
|
||||
db 29, VOLTORB, ELECTRODE, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
|
|
@ -491,7 +491,7 @@ JugglerData:
|
|||
; Fuchsia Gym
|
||||
db 38, UMBREON, 0
|
||||
; Fuchsia Gym
|
||||
db 34, WEEPINBELL, TSUBOMITTO, 0
|
||||
db 34, WEEPINBELL, BELLIGNAN, 0
|
||||
|
||||
; In Japanese, they are called "Fierce Beast users", and in turn use Pokemon
|
||||
; based on those "fierce" beasts. Think lions, etc.
|
||||
|
|
@ -499,7 +499,7 @@ JugglerData:
|
|||
TamerData:
|
||||
; Fuchsia Gym
|
||||
db 34, NIDOQUEEN, ARBOK, 0
|
||||
db 33, ARBOK, NIDOKING, TSUBOMITTO, 0
|
||||
db 33, ARBOK, NIDORINA, NIDOKING, 0
|
||||
; Viridian Gym
|
||||
db 43, RHYDON, 0
|
||||
db 39, SANDSLASH, TRAMPEL, 0
|
||||
|
|
@ -520,18 +520,18 @@ BirdKeeperData:
|
|||
db 33, FEAROW, 0
|
||||
db 29, SPEAROW, FEAROW, 0
|
||||
; Route 15
|
||||
db 26, PIDGEY, DODUO, PIDGEOTTO, 0
|
||||
db 26, PIDGEOTTO, DODUO, PIDGEOTTO, 0
|
||||
db 28, FARFETCHD, DODRIO, 0
|
||||
; Route 18
|
||||
db 29, SPEAROW, FEAROW, 0
|
||||
db 34, DODRIO, 0
|
||||
db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0
|
||||
db 26, SPEAROW, DODUO, FEAROW, DODUO, 0
|
||||
; Route 20
|
||||
db 30, FEAROW, MADAAMU, PIDGEOTTO, 0
|
||||
db 30, FEAROW, LUXWAN, PIDGEOTTO, 0
|
||||
; Brunswick Trail
|
||||
db 65, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0
|
||||
; Silph Gauntlet 1F (Viridian Forest)
|
||||
db 62, FEAROW, GOLDUCK, DODRIO, SIRFETCHD, MADAAMU, AERODACTYL, 0
|
||||
db 62, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0
|
||||
; Route 14
|
||||
db 28, PIDGEY, DODUO, PIDGEOTTO, 0
|
||||
db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0
|
||||
|
|
@ -541,13 +541,13 @@ BirdKeeperData:
|
|||
; Uses Silph products and Steel-types
|
||||
ChiefData:
|
||||
; Silph Gauntlet 7F
|
||||
db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 70, GENGAR, 73, PORYGONZ, 75, OMEGA, 0
|
||||
db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0
|
||||
; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
|
||||
|
||||
; Poison- and Electric-type Pokemon
|
||||
ScientistData:
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0
|
||||
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, WEEZING, ALAKAZAM, 0
|
||||
; Silph Co. 2F
|
||||
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
|
||||
db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
|
||||
|
|
@ -566,17 +566,17 @@ ScientistData:
|
|||
; Silph Co. 9F
|
||||
db 28, VOLTORB, KOFFING, MAGNETON, 0
|
||||
; Silph Co. 10F
|
||||
db 29, MAGNETITE, KOFFING, 0
|
||||
db 29, MAGNETON, KOFFING, 0
|
||||
; Mansion 3F
|
||||
db 33, MAGNETITE, MAGNETON, DITTO, 0
|
||||
db 33, MAGNEMITE, MAGNETON, DITTO, 0
|
||||
; Mansion B1F
|
||||
db 34, MAGNEMITE, ELECTRODE, 0
|
||||
|
||||
RocketData:
|
||||
; Mt. Moon B2F
|
||||
db 13, RATTATA, BITTYBAT, 0
|
||||
db 11, SANDSHREW, RATTATA, BITTYBAT, 0
|
||||
db 12, BITTYBAT, EKANS, 0
|
||||
db 13, RATTATA, ZUBAT, 0
|
||||
db 11, SANDSHREW, RATTATA, ZUBAT, 0
|
||||
db 12, ZUBAT, EKANS, 0
|
||||
db 16, RATICATE, 0
|
||||
; Cerulean City
|
||||
db 17, MACHOP, DROWZEE, 0
|
||||
|
|
@ -658,9 +658,9 @@ CooltrainerMData:
|
|||
; Equally varied, nothing to say
|
||||
CooltrainerFData:
|
||||
; Celadon Gym
|
||||
db 24, CACTUS, GLOOM, 0
|
||||
db 24, CACTORMUS, GLOOM, 0
|
||||
; Victory Road 3F
|
||||
db 43, TSUBOMITTO, VICTREEBEL, 0
|
||||
db 43, BELLIGNAN, VICTREEBEL, 0
|
||||
db 43, PARASECT, DEWGONG, CHANSEY, 0
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
|
||||
|
|
@ -681,7 +681,7 @@ GentlemanData:
|
|||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
|
||||
; SS Anne 2F Rooms
|
||||
db 17, PUCHIKOON, GROWLITHE, 0
|
||||
db 17, KOLTA, GROWLITHE, 0
|
||||
|
||||
ChannelerData:
|
||||
; Unused
|
||||
|
|
@ -690,7 +690,7 @@ ChannelerData:
|
|||
db 23, GASTLY, GASTLY, 0
|
||||
db 24, GASTLY, 0
|
||||
; Pokémon Tower 3F
|
||||
db 23, MIKON, GASTLY, 0
|
||||
db 23, VULPIII, GASTLY, 0
|
||||
db 24, VULPIX, 0
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
|
||||
|
|
@ -728,7 +728,7 @@ StudentData:
|
|||
db 4, PIDGEY, RATTATA, 0
|
||||
db 6, CLEFAIRY, 0
|
||||
; Silph Gauntlet 1F (Viridian Forest)
|
||||
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, DEER, 0 ; all Normal types that Yujirou doesn't use
|
||||
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0 ; all Normal types that Yujirou doesn't use
|
||||
; Celadon University
|
||||
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
|
||||
|
||||
|
|
@ -740,14 +740,14 @@ FirefighterData:
|
|||
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
|
||||
|
||||
JuniorData:
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 63, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; no idea what to do with this guy's team, so I'll redo this later
|
||||
; to be removed
|
||||
db 5, BULBASAUR, 0
|
||||
|
||||
JackData:
|
||||
; Celadon Mansion Roof House
|
||||
db 23, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru.
|
||||
; Silph Gauntlet 7F (Chief's Office)
|
||||
; db 70, ANIMON, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
|
||||
; db 70, MIMMEO, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
|
||||
|
||||
JessieJamesData:
|
||||
db $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Green2Data:
|
|||
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0
|
||||
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
|
||||
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
|
||||
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNETITE, 20, SANDSHREW, 25, EEVEE, 0
|
||||
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNEMITE, 20, SANDSHREW, 25, EEVEE, 0
|
||||
db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, RAICHU, 0
|
||||
; Silph Co. 7F
|
||||
db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
|
||||
|
|
@ -50,9 +50,9 @@ Green3Data:
|
|||
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0
|
||||
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0
|
||||
; post-game rematch teams, based on FRLG team
|
||||
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
|
||||
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
|
||||
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
|
||||
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
|
||||
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
|
||||
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
|
||||
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, MAGNEZONE, 80, UMBREON, 0
|
||||
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, MAGNEZONE, 80, GOROCHU, 0
|
||||
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
; This goes for Brock's Steelix, Misty's Starmie, Surge's Gorochu, Erika's Bellossom, Koga's Crobat, Sabrina's Alakazam, Blaine's Arcanine, and Giovanni's Rhyperior.
|
||||
; In addition, for the rematches, all the leaders should have a regional variant (see the LGPE E4 rematches), plus a starter where applicable.
|
||||
BrockData:
|
||||
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges
|
||||
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
|
||||
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
|
||||
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
||||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GYAOON, 43, STEELIX, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GYAOON, 47, STEELIX, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GYAOON, 48, KLEAVOR, 50, STEELIX, 0 ; 7 (unused)
|
||||
db $FF, 67, GOLEM, 66, GYAOON, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
|
||||
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges
|
||||
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
|
||||
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
|
||||
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
|
||||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GAWARHED, 47, STEELIX, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GAWARHED, 48, KLEAVOR, 50, STEELIX, 0 ; 7 (unused)
|
||||
db $FF, 67, GOLEM, 66, GAWARHED, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
|
||||
|
||||
MistyData:
|
||||
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
|
||||
db $FF, 10, HORSEA, 11, STARYU, 13, WEIRDUCK, 0 ; 0 badges
|
||||
db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
|
||||
db $FF, 22, HORSEA, 21, CHEEP, 21, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
|
||||
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
|
||||
|
|
@ -26,8 +26,8 @@ MistyData:
|
|||
LtSurgeData:
|
||||
db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0 ; 0 badges
|
||||
db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1
|
||||
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
|
||||
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0 ; 3
|
||||
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNEMITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
|
||||
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNEMITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
|
||||
db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4
|
||||
db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5
|
||||
db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6
|
||||
|
|
@ -39,10 +39,10 @@ ErikaData:
|
|||
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, ODDISH, 21, TANGELA, 0 ; 1
|
||||
db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
|
||||
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
|
||||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
|
||||
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
|
||||
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
|
||||
|
||||
KogaData:
|
||||
|
|
@ -54,7 +54,7 @@ KogaData:
|
|||
db $FF, 41, VENOMOTH, 40, TENTACRUEL, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
||||
db $FF, 45, VENOMOTH, 44, TENTACRUEL, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
||||
db $FF, 47, VENOMOTH, 46, NIDOKING, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
|
||||
db $FF, 67, VENOMOTH, 66, TSUBOMITTO, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
|
||||
BlaineData:
|
||||
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused)
|
||||
|
|
@ -92,9 +92,9 @@ LoreleiData:
|
|||
db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
|
||||
|
||||
BrunoData:
|
||||
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
|
||||
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, TRICULES, 58, MACHAMP, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, PURAKKUSU, 73, MACHAMP, 0
|
||||
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, TRICULES, 73, MACHAMP, 0
|
||||
|
||||
AgathaData:
|
||||
db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0
|
||||
|
|
@ -102,22 +102,22 @@ AgathaData:
|
|||
db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
|
||||
|
||||
LanceData:
|
||||
db $FF, 59, CROCKY, 58, GYARADOS, 58, EXEGGUTOR_A, 60, CRYITHAN, 60, KINGDRA, 62, DRAGONITE, 0
|
||||
db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, IGUANARCH, 60, KINGDRA, 62, DRAGONITE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 74, CROCKY, 73, GYARADOS, 73, EXEGGUTOR_A, 75, CRYITHAN, 75, KINGDRA, 77, DRAGONITE, 0
|
||||
db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, IGUANARCH, 75, KINGDRA, 77, DRAGONITE, 0
|
||||
|
||||
YujirouData: ; was unused juggler
|
||||
db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0
|
||||
db $FF, 10, KONYA, 11, RATTATA, 13, LICKITUNG, 0 ; 1
|
||||
db $FF, 4, COINPUR, 5, RATTATA, 8, LICKITUNG, 0 ; 0
|
||||
db $FF, 10, COINPUR, 11, RATTATA, 13, LICKITUNG, 0 ; 1
|
||||
db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 2
|
||||
db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0 ; 3
|
||||
db $FF, 29, PERSIAN, 28, RATICATE, 28, MADAAMU, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4
|
||||
db $FF, 38, PERSIAN, 37, RATICATE, 37, MADAAMU, 38, CHANSEY, 40, LICKITUNG, 0, ; 5
|
||||
db $FF, 41, PERSIAN, 40, TAUROS, 40, MADAAMU, 41, CHANSEY, 43, LICKILICKY, 0 ; 6
|
||||
db $FF, 45, PERSIAN, 44, TAUROS, 44, MADAAMU, 45, CHANSEY, 47, LICKILICKY, 0 ; 7
|
||||
db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8
|
||||
db $FF, 29, PERSIAN, 28, RATICATE, 28, LUXWAN, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4
|
||||
db $FF, 38, PERSIAN, 37, RATICATE, 37, LUXWAN, 38, CHANSEY, 40, LICKITUNG, 0, ; 5
|
||||
db $FF, 41, PERSIAN, 40, TAUROS, 40, LUXWAN, 41, CHANSEY, 43, LICKILICKY, 0 ; 6
|
||||
db $FF, 45, PERSIAN, 44, TAUROS, 44, LUXWAN, 45, CHANSEY, 47, LICKILICKY, 0 ; 7
|
||||
db $FF, 47, PERSIAN, 46, TAUROS, 46, LUXWAN, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8
|
||||
; post-game rematch team
|
||||
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
|
||||
db $FF, 66, PERSIAN, 67, TAUROS, 67, LUXWAN, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
|
||||
|
||||
BlackbeltData:
|
||||
; Koichi parties
|
||||
|
|
@ -139,7 +139,7 @@ BlackbeltData:
|
|||
; Viridian Gym - changed to fit the Ground-type gym theme
|
||||
db 40, SANDSLASH, GOLEM, 0
|
||||
db 43, GUARDIA, 0
|
||||
db 38, CACTUS, DUGTRIO, STEELIX, 0
|
||||
db 38, CACTORMUS, DUGTRIO, STEELIX, 0
|
||||
; Victory Road 2F
|
||||
db 43, MACHOKE, MACHOP, MACHOKE, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue