mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 06:38:40 +13:00
A couple of bug fixes
More still need to be done but I'm separating the commits so I don't get overwhelmed lol - Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni. - Fixes a bug where Silph could be entered before receiving the Poke Flute. - Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks. - One of the Fuchsia Gym Trainers no longer uses a repeat Arbok. - Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed. - Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite. - Chief uses a Gengar instead of Porygon2 to represent the Silph Scope. - Omega's and Giovanni 2's levels have been toned down slightly. - Lance now uses Crocky over Aerodactyl. - Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one. - Updated README with additional credits.
This commit is contained in:
Martha Schilling
parent
8cd8f1ded0
commit
c5eff723b1
16 changed files with 67 additions and 77 deletions
|
|
@ -499,7 +499,7 @@ JugglerData:
|
|||
TamerData:
|
||||
; Fuchsia Gym
|
||||
db 34, NIDOQUEEN, ARBOK, 0
|
||||
db 33, ARBOK, NIDOKING, ARBOK, 0
|
||||
db 33, ARBOK, NIDOKING, TSUBOMITTO, 0
|
||||
; Viridian Gym
|
||||
db 43, RHYDON, 0
|
||||
db 39, SANDSLASH, TRAMPEL, 0
|
||||
|
|
@ -541,7 +541,8 @@ BirdKeeperData:
|
|||
; Uses Silph products and Steel-types
|
||||
ChiefData:
|
||||
; Silph Gauntlet 7F
|
||||
db $FF, 73, PORYGON2, 72, LAPRAS, 73, SCIZOR, 73, MAGNEZONE, 75, PORYGONZ, 77, OMEGA, 0
|
||||
db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 71, GENGAR, 73, PORYGONZ, 75, OMEGA, 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:
|
||||
|
|
@ -743,17 +744,17 @@ JuniorData:
|
|||
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
|
||||
|
||||
JackData:
|
||||
; Celadon University Roof House
|
||||
db 23, MANKEY, MACHOP, SCYTHER, HITMONCHAN, 0 ; Scyther is Kage-Maru.
|
||||
; 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...
|
||||
|
||||
JessieJamesData:
|
||||
db 14, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon
|
||||
db 15, MEOWTH, EKANS, KOFFING, 0 ; Mt. Moon
|
||||
db 25, MEOWTH, EKANS, LICKITUNG, KOFFING, 0 ; Rocket Hideout
|
||||
db 27, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower
|
||||
db 37, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co.
|
||||
db $FF, 80, MEOWTH, 72, LICKILICKY, 72, ARBOK, 71, VICTREEBEL, 74, WEEZING, 76, GYARADOS, 0 ; Citrine Rocket House
|
||||
db 28, MEOWTH, LICKITUNG, ARBOK, VICTREEBEL, WEEZING, 0 ; Pokemon Tower
|
||||
db 37, MEOWTH, LICKILICKY, ARBOK, VICTREEBEL, WEEZING, GYARADOS, 0 ; Silph Co.
|
||||
db $FF, 80, MEOWTH, 73, LICKILICKY, 75, ARBOK, 73, VICTREEBEL, 75, WEEZING, 71, GYARADOS, 0 ; Citrine Rocket House
|
||||
|
||||
INCLUDE "data/trainers/scaled_parties.asm"
|
||||
INCLUDE "data/trainers/rival_parties.asm"
|
||||
|
|
|
|||
|
|
@ -82,9 +82,9 @@ GiovanniData: ; is not scaled as he is always fought last
|
|||
; Rocket Hideout B4F
|
||||
db $FF, 30, BEEDRILL, 32, RHYHORN, 32, KANGASKHAN, 34, PERSIAN, 0
|
||||
; Silph Co. 11F - did you know this team was weaker than the rival in vanilla level-wise?
|
||||
db $FF, 40, BEEDRILL, 42, RHYDON, 42, KANGASKHAN, 43, NIDOKING, 43, NIDOQUEEN, 45, PERSIAN, 0
|
||||
db $FF, 40, BEEDRILL, 40, RHYDON, 40, KANGASKHAN, 41, NIDOKING, 41, NIDOQUEEN, 43, PERSIAN, 0
|
||||
; Viridian Gym
|
||||
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0
|
||||
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0
|
||||
|
||||
LoreleiData:
|
||||
db $FF, 53, DEWGONG, 52, CLOYSTER, 52, NINETALES_A, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0
|
||||
|
|
@ -102,35 +102,35 @@ AgathaData:
|
|||
db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
|
||||
|
||||
LanceData:
|
||||
db $FF, 59, CRYITHAN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, KINGDRA, 60, AERODACTYL, 62, DRAGONITE, 0
|
||||
db $FF, 59, CROCKY, 58, GYARADOS, 58, EXEGGUTOR_A, 60, CRYITHAN, 60, KINGDRA, 62, DRAGONITE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 74, CRYITHAN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, AERODACTYL, 77, DRAGONITE, 0
|
||||
db $FF, 74, CROCKY, 73, GYARADOS, 73, EXEGGUTOR_A, 75, CRYITHAN, 75, KINGDRA, 77, DRAGONITE, 0
|
||||
|
||||
YujirouData: ; was unused juggler
|
||||
db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0
|
||||
db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 1
|
||||
db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 24, LICKITUNG, 0 ; 2
|
||||
db $FF, 29, PERSIAN, 28, RATICATE, 28, FARFETCHD, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 3
|
||||
db $FF, 38, PERSIAN, 37, RATICATE, 37, MADAAMU, 38, CHANSEY, 40, LICKITUNG, 0, ; 4
|
||||
db $FF, 41, PERSIAN, 40, TAUROS, 40, MADAAMU, 41, CHANSEY, 43, LICKITUNG, 0 ; 5
|
||||
db $FF, 45, PERSIAN, 44, TAUROS, 44, MADAAMU, 45, BLISSEY, 47, LICKILICKY, 0 ; 6
|
||||
db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 7
|
||||
db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 (clone for scaling reasons)
|
||||
db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0
|
||||
db $FF, 10, KONYA, 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
|
||||
; post-game rematch team
|
||||
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
|
||||
|
||||
BlackbeltData:
|
||||
; Koichi parties
|
||||
db 12, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
|
||||
db $FF, 17, MACHOP, 20, HITMONLEE, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
|
||||
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONLEE, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
|
||||
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
|
||||
db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONLEE, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4
|
||||
db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
|
||||
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
|
||||
db 12, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
|
||||
db $FF, 17, MACHOP, 20, HITMONLEE, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
|
||||
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONLEE, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
|
||||
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONLEE, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
|
||||
db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONLEE, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4
|
||||
db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
|
||||
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONLEE, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
|
||||
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONLEE, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
|
||||
db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONLEE, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
|
||||
db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
|
||||
db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
|
||||
; Fighting Dojo Trainers
|
||||
db 31, CHEEP, CHEEP, JABETTA, 0
|
||||
db 32, MACHOKE, MACHAMP, 0
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue