diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index 7e1d2ebe..060d1f60 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -7,8 +7,8 @@ CitrineCity_Object: warp_event 15, 17, CITRINE_POKECENTER, 1 warp_event 15, 27, CITRINE_MART, 1 warp_event 22, 5, GARNET_CAVERN_1F, 1 - warp_event 39, 31, VERMILION_CITY, 6 - warp_event 39, 30, VERMILION_CITY, 6 + warp_event 35, 31, VERMILION_CITY, 6 + warp_event 35, 30, VERMILION_CITY, 6 def_bg_events bg_event 16, 27, 5 ; Citrine Shop diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index d3c2dedf..c78a5bb9 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -1,84 +1,84 @@ ; gyms except giovanni begin here 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, 22, OMANYTE, 22, KABUTO, 23, DECILLA, 25, ONIX, 0 ; 2 - db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3 - db $FF, 39, GOLEM, 38, OMANYTE, 38, KABUTO, 39, NIDOREIGN, 41, GYAOON, 0 ; 4 - db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5 - db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0 ; 6 - db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0 ; 7 (unused) + 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, 25, 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, NIDOREIGN, 40, GYAOON, 0, ; 4 + db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, NIDOREIGN, 43, GYAOON, 0 ; 5 + db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, NIDOREIGN, 47, GYAOON, 0 ; 6 + db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, NIDOREIGN, 48, KLEAVOR, 50, GYAOON, 0 ; 7 (unused) db $FF, 66, GOLEM, 67, OMASTAR, 67, KABUTOPS, 66, ARCANINE_H, 67, KLEAVOR, 70, GYAOON, 0 ; 8 (postgame) MistyData: - db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges - db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1 - db $FF, 22, HORSEA, 22, CHEEP, 22, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2 - db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3 - db $FF, 39, SEADRA, 38, JABETTA, 38, SEAKING, 39, GOLDUCK, 41, 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, VAPOREON, 67, TAUROS_PA, 66, TOTARTLE, 67, GOLDUCK, 70, GYARADOS, 0 ; 8 (postgame) + db $FF, 10, STARYU, 11, GYOPIN, 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 + 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, VAPOREON, 67, TAUROS_PA, 66, TOTARTLE, 67, GOLDUCK, 70, GYARADOS, 0 ; 8 (postgame) LtSurgeData: - db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges - db $FF, 19, VOLTORB, 18, PIKACHU, 19, MAGNETITE, 21, ELECTABUZZ, 0 ; 1 - db $FF, 22, VOLTORB, 22, GAOTORA, 22, MAGNETITE, 23, ELECTABUZZ, 25, GOROCHU, 0 ; 2 - db $FF, 28, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0 ; 3 - db $FF, 39, ELECTRODE, 38, GOROTORA, 38, MAGNETON, 39, ELECTABUZZ, 41, 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 - db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused) - db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, GOLEM_A, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame) + db $FF, 10, VOLTORB, 11, PIKACHU, 13, MAGNETITE, 0 ; 0 badges + db $FF, 19, VOLTORB, 18, PIKACHU, 19, MAGNETITE, 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, 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 + db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused) + db $FF, 66, GOROTORA, 67, ELECTIVIRE, 67, JOLTEON, 66, GOLEM_A, 67, GOROCHU, 70, ZAPDOS, 0 ; 8 (postgame) ErikaData: - db $FF, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0 ; 0 badges - db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, TANGELA, 21, GLOOM, 0 ; 1 - db $FF, 22, BELLSPROUT, 22, PARASECT, 22, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2 - db $FF, 28, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3 - db $FF, 38, VICTREEBEL, 38, PARASECT, 39, TOEDSCRUEL, 39, BELLOSSOM, 41, TANGROWTH, 0 ; 4 - db $FF, 40, VICTREEBEL, 40, PARASECT, 41, TOEDSCRUEL, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5 - db $FF, 44, VICTREEBEL, 44, PARASECT, 45, TOEDSCRUEL, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6 - db $FF, 46, VICTREEBEL, 46, PARASECT, 47, TOEDSCRUEL, 48, BELLOSSOM, 48, EXEGGUTOR, 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, 10, BELLSPROUT, 11, MONJA, 13, GLOOM, 0 ; 0 badges + db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, MONJA, 21, GLOOM, 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, 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) KogaData: - db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges - db $FF, 19, VENONAT, 18, GRIMER, 19, KOFFING, 21, NIDORINO, 0 ; 1 - db $FF, 22, GOLBAT, 22, NIDORINO, 22, GRIMER, 23, KOFFING, 25, VENOMOTH, 0 ; 2 - db $FF, 28, GOLBAT, 28, NIDORINO, 28, GRIMER, 29, KOFFING, 31, VENOMOTH, 0 ; 3 - db $FF, 38, TENTACRUEL, 39, VENOMOTH, 38, MUK, 39, WEEZING, 41, CROBAT, 0 ; 4 - db $FF, 40, TENTACRUEL, 41, VENOMOTH, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5 - db $FF, 44, TENTACRUEL, 45, VENOMOTH, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6 - db $FF, 46, TENTACRUEL, 46, NIDOKING, 47, VENOMOTH, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 - db $FF, 66, TSUBOMITTO, 67, NIDOKING, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame) + db $FF, 10, VENONAT, 11, KOFFING, 13, NIDORINO, 0 ; 0 badges + 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 + db $FF, 66, TSUBOMITTO, 67, NIDOKING, 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?) - db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 - db $FF, 22, PONYTA, 22, VULPIX, 22, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2 - db $FF, 28, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, FLAREON, 31, MAGMAR, 0 ; 3 - db $FF, 38, PONYTA, 39, NINETALES, 38, FLAREON, 39, ARCANINE, 41, MAGMORTAR, 0 ; 4 - 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, NINETALES, 67, TAUROS_PB, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame) + db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused?) + db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 + db $FF, 22, PONYTA, 21, VULPIX, 21, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2 + db $FF, 29, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, CHARMELEON, 31, MAGMAR, 0 ; 3 + db $FF, 38, PONYTA, 37, NINETALES, 37, FLAREON, 38, ARCANINE, 40, MAGMORTAR, 0 ; 4 + 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, NINETALES, 67, TAUROS_PB, 67, ARCANINE, 66, CHARIZARD, 67, MAGMORTAR, 70, MOLTRES, 0 ; 8 (postgame) SabrinaData: - db $FF, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges - db $FF, 19, DROWZEE, 18, SLOWPOKE, 19, KADABRA, 21, MR_MIME, 0 ; 1 - db $FF, 22, DROWZEE, 22, SLOWPOKE, 22, EXEGGCUTE, 23, KADABRA, 25, MR_MIME, 0 ; 2 - db $FF, 28, MR_MIME, 28, SLOWPOKE, 28, EXEGGCUTE, 29, HYPNO, 31, ALAKAZAM, 0 ; 3 - db $FF, 38, ESPEON, 39, MR_MIME, 38, SLOWKING, 39, HYPNO, 41, ALAKAZAM, 0 ; 4 - db $FF, 40, ESPEON, 41, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5 - db $FF, 44, ESPEON, 45, MR_RIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6 - db $FF, 46, ESPEON, 47, 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, 10, DROWZEE, 11, SLOWPOKE, 13, KADABRA, 0 ; 0 badges + 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, 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) GiovanniData: ; is not scaled as he is always fought last ; Rocket Hideout B4F - db $FF, 29, BEEDRILL, 32, RHYHORN, 31, KANGASKHAN, 37, PERSIAN, 0 + db $FF, 30, BEEDRILL, 32, RHYHORN, 32, KANGASKHAN, 34, PERSIAN, 0 ; Silph Co. 11F db $FF, 37, KANGASKHAN, 36, NIDOKING, 37, NIDOQUEEN, 40, PERSIAN, 42, RHYDON, 0 ; Viridian Gym diff --git a/gfx/pokemon/front/animon.png b/gfx/pokemon/front/animon.png index a30bb8fd..92df84e7 100644 Binary files a/gfx/pokemon/front/animon.png and b/gfx/pokemon/front/animon.png differ diff --git a/gfx/pokemon/front/annihilape.png b/gfx/pokemon/front/annihilape.png index 849ae04a..d7844ef3 100644 Binary files a/gfx/pokemon/front/annihilape.png and b/gfx/pokemon/front/annihilape.png differ diff --git a/gfx/pokemon/front/bellossom.png b/gfx/pokemon/front/bellossom.png index a31fe6ae..c4cc7661 100644 Binary files a/gfx/pokemon/front/bellossom.png and b/gfx/pokemon/front/bellossom.png differ diff --git a/gfx/pokemon/front/espeon.png b/gfx/pokemon/front/espeon.png index 1f668ef4..4906164c 100644 Binary files a/gfx/pokemon/front/espeon.png and b/gfx/pokemon/front/espeon.png differ diff --git a/maps/CeladonGym.blk b/maps/CeladonGym.blk index c330efcd..dcecc50c 100644 --- a/maps/CeladonGym.blk +++ b/maps/CeladonGym.blk @@ -1 +1 @@ -38:93353=33;?>3344356344321 \ No newline at end of file +38:933<3=33;?>3344356344321 \ No newline at end of file diff --git a/maps/CitrineCity.blk b/maps/CitrineCity.blk index d3ee22cb..f70c5af1 100644 --- a/maps/CitrineCity.blk +++ b/maps/CitrineCity.blk @@ -1,34 +1,34 @@ -G>>>>hi(,,)>>>>gFCCZ[(,,)CCC>>>>>>'>>>>>>>> \ No newline at end of file +n'meCTTTTT<-'eCxxxxxGxC>>>>>>'>>>>>>CC \ No newline at end of file diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index 5e9ddcdc..253a8380 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -154,8 +154,8 @@ CeruleanCityScript1: jr .done .Charmander cp STARTER1 ; changes start here - ld a, $0D jr nz, .Pikachu + ld a, $0D jr .done .Pikachu ; cp STARTER4 diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index ecfeec2b..300a5e90 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -155,17 +155,17 @@ PokemonTower2Text1: ld a, [wRivalStarter] cp STARTER2 jr nz, .NotSquirtle - ld a, $6 + ld a, $06 jr .done .NotSquirtle cp STARTER3 jr nz, .Charmander - ld a, $7 + ld a, $07 jr .done .Charmander cp STARTER1 ; changes start here - ld a, $8 jr nz, .Pikachu + ld a, $08 jr .done .Pikachu ; cp STARTER4 @@ -173,7 +173,7 @@ PokemonTower2Text1: ld a, $0A jr .done .Eevee - ld a, $9 + ld a, $09 jr .done .done ld [wTrainerNo], a diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index ba1707ed..fbb08c3a 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -112,8 +112,8 @@ SSAnne2Script1: jr .done .Charmander cp STARTER1 ; changes start here - ld a, $3 jr nz, .Pikachu + ld a, $3 jr .done .Pikachu ; cp STARTER4 diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index c6f97639..686d6146 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -197,8 +197,8 @@ SilphCo7Script3: jr .asm_51cc0 .Charmander cp STARTER1 ; changes start here - ld a, $0D jr nz, .Pikachu + ld a, $0D jr .asm_51cc0 .Pikachu ; cp STARTER4 diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 9c6551cf..3d12ea78 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -83,10 +83,9 @@ _TM21NoRoomText:: done _CeladonGymBattleText2:: - text "Hey!" - - para "You are not" - line "allowed in here!" + text "Do you think a" ; imported from Crystal + line "girls-only GYM" + cont "is rare?" done _CeladonGymEndBattleText2:: @@ -95,9 +94,9 @@ _CeladonGymEndBattleText2:: prompt _CeladonGymAfterBattleText2:: - text "Bleaah!" - line "I hope ERIKA" - cont "wipes you out!" + text "I was a little" + line "careless, that's" + cont "all!" done _CeladonGymBattleText3:: @@ -121,8 +120,9 @@ _CeladonGymAfterBattleText3:: done _CeladonGymBattleText4:: - text "Aren't you the" - line "peeping Tom?" + text "Were you looking" ; imported from Crystal + line "at these flowers" + cont "or at me?" done _CeladonGymEndBattleText4:: @@ -131,9 +131,9 @@ _CeladonGymEndBattleText4:: prompt _CeladonGymAfterBattleText4:: - text "Oh, you weren't" - line "peeping? We get a" - cont "lot of gawkers!" + text "How do I go about" + line "becoming ladylike" + cont "like ERIKA?" done _CeladonGymBattleText5::