thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-04 20:51:02 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few bug fixes

Browse source 
- Fixed a bug where attempting to Fly on Celeste Hill caused a huge memory corruption effect. Oops.

- Fixed text issues on Route 1 and Museum 2F

- Tidied up trainer parties a little more
This commit is contained in:
Martha Schilling 2023-07-12 14:16:41 +01:00
parent 85e1701879
commit 0852d5f725
15 changed files with 106 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/map_constants.asm
View file

@ -100,7 +100,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const CELESTE_HILL, 11, 11 ; $4D - Was copy of above & unused
map_const ROUTE_7_GATE, 3, 4 ; $4E
map_const UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4F
map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $50 - was UNDERGROUND_PATH_ROUTE_7_COPY
map_const CITRINE_ROCKET_HOUSE, 5, 5 ; $50 - was UNDERGROUND_PATH_ROUTE_7_COPY
map_const ROUTE_8_GATE, 3, 4 ; $51
map_const UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $52
map_const ROCK_TUNNEL_POKECENTER, 7, 4 ; $53

3
data/maps/dungeon_maps.asm
View file

@ -13,6 +13,9 @@ DungeonMaps1:
db DIGLETTS_CAVE
db UNDERWATER_TUNNEL
db CINNABAR_VOLCANO_FLOORS
db CELESTE_HILL
db CELESTE_HILL_OUTSIDE
db CELESTE_HILL_CAVE
db -1 ; end
; GetBattleTransitionID_IsDungeonMap checks if wCurMap

8
data/maps/names.asm
View file

@ -54,7 +54,9 @@ PokemonMansionName: db "<PKMN> MANSION@"
SafariZoneName: db "SAFARI ZONE@"
CeruleanCaveName: db "CERULEAN CAVE@"
PowerPlantName: db "POWER PLANT@"
FarawayIslandName: db "FARAWAY ISLAND@"
FarawayIslandName: db "FARAWAY ISLAND@"
UnderwaterTunnelName: db "UNDERWATER TUNNEL@"
BrunswickTrailName: db "BRUNSWICK TRAIL@"
CelesteHillName: db "CELESTE HILL@"
BrunswickTrailName: db "BRUNSWICK TRAIL@"
BrunswickGrottoName: db "BRUNSWICK GROTTO@"
GarnetCavernName: db "GARNET CAVERN@"
CelesteHillName: db "CELESTE HILL@"

2
data/maps/objects/BrunswickGrotto.asm
View file

@ -1,5 +1,5 @@
BrunswickGrotto_Object:
db $0 ; border block
db $3 ; border block
def_warp_events
warp_event 24, 23, BRUNSWICK_TRAIL, 2

2
data/maps/objects/CelesteHillCave.asm
View file

@ -4,7 +4,7 @@ CelesteHillCave_Object:
def_warp_events
warp_event 18, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 35, CELESTE_HILL_OUTSIDE, 3
warp_event 19, 25, CELESTE_HILL_CAVE, 4
warp_event 19, 23, CELESTE_HILL_CAVE, 4
warp_event 2, 16, CELESTE_HILL_CAVE, 3
warp_event 37, 13, CELESTE_HILL_OUTSIDE, 4
warp_event 5, 3, CELESTE_HILL_OUTSIDE, 5

6
data/maps/objects/Museum2F.asm
View file

@ -5,8 +5,8 @@ Museum2F_Object:
warp_event 7, 7, MUSEUM_1F, 5
def_bg_events
bg_event 11, 2, 6 ; Museum2FText6
bg_event 2, 5, 7 ; Museum2FText7
bg_event 11, 2, 7 ; Museum2FText6
bg_event 2, 5, 8 ; Museum2FText7
def_object_events
object_event 1, 7, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person
@ -14,6 +14,6 @@ Museum2F_Object:
object_event 7, 5, SPRITE_SCIENTIST, STAY, DOWN, 3 ; person
object_event 11, 5, SPRITE_BRUNETTE_GIRL, STAY, NONE, 4 ; person
object_event 12, 5, SPRITE_HIKER, STAY, DOWN, 5 ; person
object_event 12, 3, SPRITE_SCIENTIST, STAY, UP, 8 ; person
object_event 12, 3, SPRITE_SCIENTIST, STAY, UP, 6 ; person
def_warps_to MUSEUM_2F

4
data/maps/objects/Route1.asm
View file

@ -4,12 +4,12 @@ Route1_Object:
def_warp_events
def_bg_events
bg_event 9, 27, 3 ; Route1Text3
bg_event 9, 27, 4 ; Route1Text3
def_object_events
object_event 5, 24, SPRITE_YOUNGSTER, WALK, UP_DOWN, 1 ; person
object_event 15, 13, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 2 ; person
object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 4 ; oak
object_event 10, 25, SPRITE_OAK, STAY, RIGHT, 3 ; oak
def_warps_to ROUTE_1

17
data/maps/town_map_entries.asm
View file

@ -19,7 +19,7 @@ ExternalMapEntries:
external_map 10, 5, SaffronCityName
external_map 2, 15, CinnabarIslandName
external_map 0, 2, IndigoPlateauName
external_map 7, 9, CitrineCityName
external_map 7, 10, CitrineCityName
external_map 2, 10, Route1Name
external_map 2, 6, Route2Name
external_map 4, 3, Route3Name
@ -45,7 +45,7 @@ ExternalMapEntries:
external_map 0, 6, Route23Name
external_map 10, 1, Route24Name
external_map 11, 0, Route25Name
external_map 7, 10, BrunswickTrailName
external_map 6, 11, BrunswickTrailName
external_map 12, 0, SeaCottageName
assert_table_length FIRST_INDOOR_MAP
@ -70,7 +70,9 @@ InternalMapEntries:
internal_map VIRIDIAN_PRE_GYM, 10, 2, ViridianCityName
internal_map DAYCARE, 10, 4, Route5Name
internal_map UNDERGROUND_PATH_ROUTE_6, 10, 8, Route6Name
internal_map CELESTE_HILL, 6, 10, CelesteHillName
internal_map CELESTE_HILL, 7, 9, CelesteHillName
internal_map UNDERGROUND_PATH_ROUTE_7, 8, 5, Route7Name
internal_map CITRINE_ROCKET_HOUSE, 7, 10, CitrineCityName
internal_map UNDERGROUND_PATH_ROUTE_8, 11, 5, Route8Name
internal_map ROCK_TUNNEL_1F, 14, 3, RockTunnelName
internal_map POWER_PLANT, 15, 4, PowerPlantName
@ -92,12 +94,15 @@ InternalMapEntries:
internal_map UNDERGROUND_PATH_WEST_EAST, 10, 5, UndergroundPathName
internal_map CELADON_HOTEL, 7, 5, CeladonCityName
internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName
internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName
internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGrottoName
internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName
internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName
internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName
internal_map SAFARI_ZONE_GATE, 8, 12, SafariZoneName
internal_map FUCHSIA_MEETING_ROOM, 8, 13, FuchsiaCityName
internal_map SEAFOAM_ISLANDS_B4F, 5, 15, SeafoamIslandsName
internal_map CITRINE_POKECENTER, 7, 10, CitrineCityName
internal_map POKEMON_MANSION_1F, 2, 15, PokemonMansionName
internal_map CINNABAR_MART, 2, 15, CinnabarIslandName
internal_map INDIGO_PLATEAU_LOBBY, 0, 2, IndigoPlateauName
@ -113,7 +118,9 @@ InternalMapEntries:
internal_map VERMILION_TRADE_HOUSE, 10, 9, VermilionCityName
internal_map DIGLETTS_CAVE, 3, 4, DiglettsCaveName
internal_map VICTORY_ROAD_3F, 0, 4, VictoryRoadName
internal_map ROCKET_HIDEOUT_B1F, 7, 5, RocketHQName
internal_map ROCKET_HIDEOUT_ELEVATOR, 7, 5, RocketHQName
internal_map CITRINE_MART, 7, 10, CitrineCityName
internal_map GARNET_CAVERN_B1F, 6, 10, GarnetCavernName
internal_map SILPH_CO_8F, 10, 5, SilphCoName
internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName
internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName
@ -122,6 +129,7 @@ InternalMapEntries:
internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName
internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName
internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName
internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName
internal_map AGATHAS_ROOM, 0, 2, PokemonLeagueName
@ -129,4 +137,5 @@ InternalMapEntries:
internal_map GIOVANNIS_ROOM, 2, 8, ViridianCityName
internal_map BATTLE_TENT, 7, 9, CitrineCityName
internal_map MT_MOON_SQUARE_HOUSE, 6, 1, MountMoonName
internal_map CELESTE_HILL_OUTSIDE, 7, 9, CelesteHillName
db -1 ; end

2
data/maps/town_map_order.asm
View file

@ -51,7 +51,7 @@ TownMapOrder:
db INDIGO_PLATEAU
db CITRINE_CITY
db BRUNSWICK_TRAIL
db GARNET_CAVERN_1F
db CELESTE_HILL
db FARAWAY_ISLAND_OUTSIDE
db BATTLE_TENT
TownMapOrderEnd:

7
data/trainers/parties.asm
View file

@ -345,7 +345,7 @@ EngineerData:
db 21, KOTORA, VOLTORB, 0
db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, ELECTRODE, GOLEM_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...
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...
; Super Rod encounter showcase, basically
FisherData:
@ -462,12 +462,13 @@ PsychicData:
db 65, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0
; Electric specialist with depressingly little representation.
; Not even a Silph Gauntlet entry! What a joke!
RockerData:
; Vermilion Gym
db 20, VOLTORB, MAGNEMITE, MAGNETITE, 0
; Route 12
db 29, VOLTORB, ELECTRODE, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, ELECTIVIRE, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
; Psychic, Poison, and a little bit of Voltorb.
JugglerData:
@ -577,7 +578,7 @@ RocketData:
db 15, EKANS, ZUBAT, 0
; Game Corner
db 22, ZUBAT, KOFFING, RATICATE, ARBOK, 0
; Rocket Hideout B1F WHY THE FUCK WAS IT AN L42 HYPNO N SHITE WTFFFFF BRO
; Rocket Hideout B1F
db 22, DROWZEE, KOFFING, ARBOK, 0
; Rocket Hideout B1F
db 21, RATICATE, RATICATE, 0

31
data/trainers/rival_parties.asm
View file

@ -28,37 +28,40 @@ 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, SANDSHREW, 22, VULPIX, 20, MAGNETITE, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, SHELLDER, 25, RAICHU, 0
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNETITE, 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
db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, MAGNETON, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, ALAKAZAM, 37, NINETALES, 35, CLOYSTER, 40, GOROCHU, 0
db $FF, 38, SANDSLASH, 35, MAGNETON, 37, NINETALES, 35, ALAKAZAM, 40, UMBREON, 0
db $FF, 38, SANDSLASH, 35, NINETALES, 37, CLOYSTER, 35, ALAKAZAM, 40, GOROCHU, 0
; Route 22
db $FF, 47, PIDGEOT, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
db $FF, 47, PIDGEOT, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
db $FF, 47, PIDGEOT, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, MAGNEZONE, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, CLOYSTER, 53, GOROCHU, 0
db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, MAGNEZONE, 47, NINETALES, 50, ALAKAZAM, 53, UMBREON, 0
db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, NINETALES, 47, CLOYSTER, 50, ALAKAZAM, 53, GOROCHU, 0
Green3Data:
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, GYARADOS, 63, ARCANINE, 65, VENUSAUR, 0
db $FF, 61, PIDGEOT, 59, ALAKAZAM, 61, RHYPERIOR, 61, EXEGGUTOR, 63, GYARADOS, 65, CHARIZARD, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 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, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, ARCANINE, 83, EXEGGUTOR, 85, TOTARTLE, 0
db $FF, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, GYARADOS, 83, ARCANINE, 85, VENUSAUR, 0
db $FF, 81, PURAKKUSU, 79, ALAKAZAM, 81, GYAOON, 81, EXEGGUTOR, 83, GYARADOS, 85, CHARIZARD, 0
db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, MAGNEZONE, 85, UMBREON, 0
db $FF, 81, GUARDIA, 79, ALAKAZAM, 81, TANGROWTH, 81, NINETALES, 83, CLOYSTER, 85, GOROCHU, 0
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, 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
ProfOakData:
db $FF, 66, TAUROS, 67, GYARADOS, 68, ARCANINE, 68, EXEGGUTOR, 70, NIDOKING, 70, TOTARTLE, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, GYARADOS, 68, ARCANINE, 70, NIDOKING, 70, VENUSAUR, 0
db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 70, NIDOKING, 70, CHARIZARD, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 68, GYARADOS, 70, NIDOKING, 70, ESPEON, 0
db $FF, 66, TAUROS, 67, EXEGGUTOR, 68, ARCANINE, 68, GYARADOS, 70, NIDOKING, 70, GOROCHU, 0
db $FF, 66, TAUROS, 67, MAGNEZONE, 67, NIDOKING, 70, TOTARTLE, 70, CHARIZARD, 70, VENUSAUR, 0
db $FF, 66, TAUROS, 67, MAGNEZONE, 67, NIDOKING, 70, CHARIZARD, 70, VENUSAUR, 70, TOTARTLE, 0
; with Oak's teams, he uses his original unused team with Nidoking added on.
; his teams weren't changed in Yellow, so what I've decided to do is give him all 3 starters that weren't chosen.
; he should also use a Magnezone here, since his other team mirrors Blue's in many ways, and Magnezone avoids type overlap.

100
data/trainers/scaled_parties.asm
View file

@ -1,14 +1,16 @@
; gyms except giovanni begin here
; Following a philosophy here, where every gym leader should keep their most iconic Pokemon somewhere on their team:
; 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, ONIX, 40, GYAOON, 0, ; 4
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, STEELIX, 43, GYAOON, 0 ; 5
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, STEELIX, 47, GYAOON, 0 ; 6
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, KLEAVOR, 48, STEELIX, 50, GYAOON, 0 ; 7 (unused)
db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, STEELIX, 70, GYAOON, 0 ; 8 (postgame)
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)
MistyData:
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
@ -18,8 +20,8 @@ MistyData:
db $FF, 38, SEADRA, 37, JABETTA, 37, SEAKING, 38, GOLDUCK, 40, STARMIE, 0 ; 4
db $FF, 41, SEADRA, 40, JABETTA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
db $FF, 45, KINGDRA, 44, JABETTA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, JAGG, 50, STARMIE, 0 ; 7 (unused)
db $FF, 66, STARMIE, 67, GOLDUCK, 67, TAUROS_PA, 66, TOTARTLE, 67, VAPOREON, 70, GYARADOS, 0 ; 8 (postgame)
db $FF, 47, KINGDRA, 46, JABETTA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0 ; 7 (unused)
db $FF, 67, KINGDRA, 67, GOLDUCK, 66, TAUROS_PA, 66, VAPOREON, 67, TOTARTLE, 70, STARMIE, 0 ; 8 (postgame)
LtSurgeData:
db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0 ; 0 badges
@ -30,29 +32,29 @@ LtSurgeData:
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
db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, GOLEM_A, 66, JOLTEON, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame)
db $FF, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0 ; 8 (postgame)
ErikaData:
db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0 ; 0 badges (unused)
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, MONJA, 21, GLOOM, 0 ; 1
db $FF, 10, BELLSPROUT, 11, ODDISH, 13, TANGELA, 0 ; 0 badges (unused)
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, BELLOSSOM, 40, TANGROWTH, 0 ; 4
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, 66, TOEDSCRUEL, 67, BELLOSSOM, 67, ELECTRODE_H, 66, VENUSAUR, 67, LEAFEON, 70, TANGROWTH, 0 ; 8 (postgame)
db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
KogaData:
db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges (unused)
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0 ; 1
db $FF, 22, VENONAT, 21, NIDORINO, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0 ; 2
db $FF, 29, VENOMOTH, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0 ; 3
db $FF, 38, TENTACRUEL, 37, VENOMOTH, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
db $FF, 41, TENTACRUEL, 40, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
db $FF, 45, TENTACRUEL, 44, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
db $FF, 47, TENTACRUEL, 46, NIDOKING, 46, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
db $FF, 66, TSUBOMITTO, 67, NIDOKING, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
db $FF, 10, VENONAT, 11, ZUBAT, 13, KOFFING, 0 ; 0 badges (unused)
db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, GOLBAT, 0 ; 1
db $FF, 22, VENONAT, 21, TENTACOOL, 21, GRIMER, 23, KOFFING, 25, GOLBAT, 0 ; 2
db $FF, 29, VENOMOTH, 28, TENTACOOL, 28, GRIMER, 29, KOFFING, 31, GOLBAT, 0 ; 3
db $FF, 38, VENOMOTH, 37, TENTACRUEL, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
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)
BlaineData:
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused)
@ -63,64 +65,64 @@ BlaineData:
db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6
db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused)
db $FF, 66, ARCANINE, 67, TAUROS_PB, 67, FLAREON, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame)
db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame)
SabrinaData:
db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges (unused)
db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0 ; 1
db $FF, 22, DROWZEE, 21, SLOWPOKE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
db $FF, 29, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
db $FF, 10, SLOWPOKE, 11, DROWZEE, 13, KADABRA, 0 ; 0 badges (unused)
db $FF, 19, SLOWPOKE, 18, DROWZEE, 19, KADABRA, 21, MR_MIME, 0 ; 1
db $FF, 22, SLOWPOKE, 21, DROWZEE, 21, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2
db $FF, 29, SLOWPOKE, 28, MR_MIME, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3
db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4
db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
db $FF, 45, ESPEON, 44, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
db $FF, 47, ESPEON, 46, MR_RIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
db $FF, 66, ESPEON, 67, SLOWKING, 67, HYPNO, 66, RAPIDASH_G, 67, ALAKAZAM, 70, ARTICUNO_G, 0 ; 8 (postgame)
db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame)
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 ; if persian slash is desirable, make it L47.
db $FF, 40, BEEDRILL, 42, RHYDON, 42, KANGASKHAN, 43, NIDOKING, 43, NIDOQUEEN, 45, PERSIAN, 0
; Viridian Gym
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, NIDOQUEEN, 48, GUARDIA, 48, NIDOKING, 50, RHYPERIOR, 0
LoreleiData:
db $FF, 54, DEWGONG, 53, CLOYSTER, 54, GLACEON, 55, NINETALES_A, 55, JYNX, 56, LAPRAS, 0
db $FF, 53, DEWGONG, 52, CLOYSTER, 52, NINETALES_A, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0
; post-game rematch team (currently unused)
db $FF, 74, JYNX, 73, DEWGONG, 73, CLOYSTER, 74, NINETALES_A, 75, GLACEON, 75, LAPRAS, 0
db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
BrunoData:
db $FF, 54, HITMONTOP, 55, STEELIX, 55, POLIWRATH, 56, SIRFETCHD, 56, PURAKKUSU, 58, MACHAMP, 0
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
; post-game rematch team (currently unused)
db $FF, 74, POLIWRATH, 74, HITMONTOP, 75, STEELIX, 75, SIRFETCHD, 76, PURAKKUSU, 76, MACHAMP, 78, 0
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, PURAKKUSU, 73, MACHAMP, 0
AgathaData:
db $FF, 57, ARBOK, 56, ANNIHILAPE, 56, CROBAT, 58, MAROWAK_A, 58, UMBREON, 60, GENGAR, 0
db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0
; post-game rematch team (currently unused)
db $FF, 77, ARBOK, 77, ANNIHILAPE, 76, CROBAT, 76, MAROWAK_A, 78, UMBREON, 78, GENGAR, 80, 0
db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
LanceData:
db $FF, 58, CROCKY, 57, KINGDRA, 57, AERODACTYL, 59, EXEGGUTOR_A, 59, CRYITHAN, 62, DRAGONITE, 0
db $FF, 59, CRYITHAN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, KINGDRA, 60, AERODACTYL, 62, DRAGONITE, 0
; post-game rematch team (currently unused)
db $FF, 78, CROCKY, 77, KINGDRA, 77, EXEGGUTOR_A, 79, AERODACTYL, 79, CRYITHAN, 82, DRAGONITE, 0
db $FF, 74, CRYITHAN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, AERODACTYL, 77, DRAGONITE, 0
YujirouData: ; was unused juggler
db $FF, 4, KONYA, 5, RATTATA, 9, LICKITUNG, 0
; post-game rematch team (currently unused)
; post-game rematch team
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
BlackbeltData:
; Koichi parties - unused to make space for rival teams
db 12, MACHOP, HITMONLEE, HITMONCHAN, 0 ; 0 badges
db 20, MACHOP, MANKEY, HITMONLEE, HITMONCHAN, 0 ; 1
db 24, MACHOKE, MANKEY, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 2
db 30, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 3
db 40, MACHOKE, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 4
db 42, MACHAMP, PRIMEAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 5
db 46, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, 0 ; 6
db 49, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 7
db 53, MACHAMP, ANNIHILAPE, CARAPTHOR, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 8
db 67, MACHAMP, ANNIHILAPE, TAUROS_P, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; Silph Gauntlet
; Koichi parties
db 12, HITMONLEE, HITMONCHAN, HITMONTOP, 0 ; 0 badges (unused)
db $FF, 17, MACHOP, 20, HITMONCHAN, 20, HITMONCHAN, 20, HITMONTOP, 0 ; 1
db $FF, 20, MACHOP, 20, MANKEY, 24, HITMONCHAN, 24, HITMONCHAN, 24, HITMONTOP, 0 ; 2
db $FF, 27, MACHOKE, 27, MANKEY, 30, HITMONCHAN, 30, HITMONCHAN, 30, HITMONTOP, 0 ; 3
db $FF, 36, MACHOKE, 36, PRIMEAPE, 39, HITMONCHAN, 39, HITMONCHAN, 39, HITMONTOP, 0 ; 4
db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONCHAN, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5
db $FF, 43, MACHAMP, 43, ANNIHILAPE, 46, HITMONCHAN, 46, HITMONCHAN, 46, HITMONTOP, 0 ; 6
db $FF, 46, MACHAMP, 46, CARAPTHOR, 46, ANNIHILAPE, 49, HITMONCHAN, 49, HITMONCHAN, 49, HITMONTOP, 0 ; 7
db $FF, 52, MACHAMP, 52, CARAPTHOR, 52, ANNIHILAPE, 55, HITMONCHAN, 55, HITMONCHAN, 55, HITMONTOP, 0 ; 8
db $FF, 67, MACHAMP, 67, TAUROS_P, 67, ANNIHILAPE, 70, HITMONCHAN, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame
; Fighting Dojo Trainers
db 31, CHEEP, CHEEP, JABETTA, 0
db 32, MACHOKE, MACHAMP, 0

BIN
gfx/town_map/town_map.rle
View file

Binary file not shown.

2
scripts/Museum2F.asm
View file

@ -7,9 +7,9 @@ Museum2F_TextPointers:
dw Museum2FText3
dw Museum2FText4
dw Museum2FText5
dw SeismicTossGuy
dw Museum2FText6
dw Museum2FText7
dw SeismicTossGuy
Museum2FText1:
text_far _Museum2FText1

6
scripts/Route1.asm
View file

@ -7,8 +7,8 @@ Route1_Script:
Route1_TextPointers:
dw Route1Text1
dw Route1Text2
dw Route1Text3
dw Route1OakText
dw Route1Text3
Route1Text1:
text_asm
@ -100,10 +100,10 @@ Route1OakText:
.Pikachu
cp STARTER4
jr nz, .Eevee
ld a, $4 ; If Pikachu, Espeon
ld a, $4 ; If Pikachu, all 3
jr .done
.Eevee
ld a, $5 ; If Eevee, Gorochu
ld a, $5 ; If Eevee, also all 3
jr .done
.refused
ld hl, OakNo