diff --git a/README.md b/README.md index 531b2db1..2733fbe1 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ QoL Enhancements - To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal. - All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew! - New Pokedex entries for most Pokemon are available, sourced from the original 1996 Pokedex book by Creatures Inc., restoring a ton of old Kanto lore. Thanks to [Dr. Lava and Nob Ogasawara](http://lavacutcontent.com/1996-creatures-pokedex-translation-1/) for their incredible work translating and writing about it! -- Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu! +- Pikachu and Eevee are now starters, featuring fully functional Rival lineups. If you pick Pikachu, he picks Eevee, and if you pick Eevee, he picks Pikachu! Their growth rates have been changed to Medium Slow to give them the early-game power spike the other starters have. - Item Descriptions are available! - Press A beside surfable water, strength boulders, or cut trees to use the HMs without needing to go into the Party menu. - Running Shoes activate by holding B. Also works with the bike and Surf. diff --git a/data/pokemon/base_stats/eevee.asm b/data/pokemon/base_stats/eevee.asm index dc11b9e3..8fc21bf3 100644 --- a/data/pokemon/base_stats/eevee.asm +++ b/data/pokemon/base_stats/eevee.asm @@ -11,7 +11,7 @@ dw EeveePicFront, EeveePicBack db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \ diff --git a/data/pokemon/base_stats/espeon.asm b/data/pokemon/base_stats/espeon.asm index b3a61294..b2df92a4 100644 --- a/data/pokemon/base_stats/espeon.asm +++ b/data/pokemon/base_stats/espeon.asm @@ -11,7 +11,7 @@ dw EspeonPicFront, EspeonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, CONFUSION ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ diff --git a/data/pokemon/base_stats/flareon.asm b/data/pokemon/base_stats/flareon.asm index d044b74a..101c14d7 100644 --- a/data/pokemon/base_stats/flareon.asm +++ b/data/pokemon/base_stats/flareon.asm @@ -11,7 +11,7 @@ dw FlareonPicFront, FlareonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, EMBER ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ diff --git a/data/pokemon/base_stats/glaceon.asm b/data/pokemon/base_stats/glaceon.asm index 33c84362..07926198 100644 --- a/data/pokemon/base_stats/glaceon.asm +++ b/data/pokemon/base_stats/glaceon.asm @@ -11,7 +11,7 @@ dw GlaceonPicFront, GlaceonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, AURORA_BEAM ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, ICE_BEAM, \ diff --git a/data/pokemon/base_stats/gorochu.asm b/data/pokemon/base_stats/gorochu.asm index 86d6931f..4afa291f 100644 --- a/data/pokemon/base_stats/gorochu.asm +++ b/data/pokemon/base_stats/gorochu.asm @@ -11,7 +11,7 @@ dw GorochuPicFront, GorochuPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, HORN_DRILL, BODY_SLAM, \ diff --git a/data/pokemon/base_stats/jolteon.asm b/data/pokemon/base_stats/jolteon.asm index b7471924..7a9ab50e 100644 --- a/data/pokemon/base_stats/jolteon.asm +++ b/data/pokemon/base_stats/jolteon.asm @@ -11,7 +11,7 @@ dw JolteonPicFront, JolteonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, THUNDERSHOCK ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ diff --git a/data/pokemon/base_stats/leafeon.asm b/data/pokemon/base_stats/leafeon.asm index 0747e2f5..cac48fbb 100644 --- a/data/pokemon/base_stats/leafeon.asm +++ b/data/pokemon/base_stats/leafeon.asm @@ -11,7 +11,7 @@ dw LeafeonPicFront, LeafeonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, ABSORB ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, SWORDS_DANCE, TAKE_DOWN, DOUBLE_EDGE, \ diff --git a/data/pokemon/base_stats/pikachu.asm b/data/pokemon/base_stats/pikachu.asm index 50d3f273..6030a9a3 100644 --- a/data/pokemon/base_stats/pikachu.asm +++ b/data/pokemon/base_stats/pikachu.asm @@ -11,7 +11,7 @@ dw PikachuPicFront, PikachuPicBack db THUNDERSHOCK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ diff --git a/data/pokemon/base_stats/raichu.asm b/data/pokemon/base_stats/raichu.asm index f408f804..2d4b3d0c 100644 --- a/data/pokemon/base_stats/raichu.asm +++ b/data/pokemon/base_stats/raichu.asm @@ -11,7 +11,7 @@ dw RaichuPicFront, RaichuPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, NO_MOVE ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ diff --git a/data/pokemon/base_stats/raichua.asm b/data/pokemon/base_stats/raichua.asm index d27f995e..7db5c0dd 100644 --- a/data/pokemon/base_stats/raichua.asm +++ b/data/pokemon/base_stats/raichua.asm @@ -11,7 +11,7 @@ dw RaichuAPicFront, RaichuAPicBack db THUNDERSHOCK, GROWL, THUNDER_WAVE, CONFUSION ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ diff --git a/data/pokemon/base_stats/sylveon.asm b/data/pokemon/base_stats/sylveon.asm index 31ed215b..140291d7 100644 --- a/data/pokemon/base_stats/sylveon.asm +++ b/data/pokemon/base_stats/sylveon.asm @@ -11,7 +11,7 @@ dw SylveonPicFront, SylveonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, FAIRY_WIND ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ diff --git a/data/pokemon/base_stats/umbreon.asm b/data/pokemon/base_stats/umbreon.asm index 8be19310..897b227c 100644 --- a/data/pokemon/base_stats/umbreon.asm +++ b/data/pokemon/base_stats/umbreon.asm @@ -11,7 +11,7 @@ dw UmbreonPicFront, UmbreonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, BRUTAL_SWING ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \ diff --git a/data/pokemon/base_stats/vaporeon.asm b/data/pokemon/base_stats/vaporeon.asm index c57e6761..1416b9ee 100644 --- a/data/pokemon/base_stats/vaporeon.asm +++ b/data/pokemon/base_stats/vaporeon.asm @@ -11,7 +11,7 @@ dw VaporeonPicFront, VaporeonPicBack db TACKLE, SAND_ATTACK, QUICK_ATTACK, WATER_GUN ; level 1 learnset - db GROWTH_MEDIUM_FAST ; growth rate + db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \ diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index cc80cdec..6a15a427 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -672,7 +672,7 @@ ChannelerData: StudentData: ; Viridian Pre-Gym - db 6, PIDGEY, RATTATA, 0 + db 4, PIDGEY, RATTATA, 0 db 6, CLEFAIRY, 0 ; Silph Gauntlet 1F (Viridian Forest) db 62, CLEFABLE, PENDRAKEN, WIGGLYTUFF, BARUNDA, BELLOSSOM, SLOWKING, 0 ; may revise diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index dc767438..e7ab5045 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -105,7 +105,7 @@ LanceData: db $FF, 78, CROCKY, 77, KINGDRA, 77, EXEGGUTOR_A, 79, AERODACTYL, 79, CRYITHAN, 82, DRAGONITE, 0 YujirouData: ; was unused juggler - db $FF, 7, KONYA, 7, RATTATA, 10, LICKITUNG, 0 + db $FF, 4, KONYA, 5, RATTATA, 9, LICKITUNG, 0 ; post-game rematch team (currently unused) db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0 diff --git a/data/wild/maps/ViridianForest.asm b/data/wild/maps/ViridianForest.asm index dd4b037a..80673919 100644 --- a/data/wild/maps/ViridianForest.asm +++ b/data/wild/maps/ViridianForest.asm @@ -1,14 +1,14 @@ ViridianForestWildMons: def_grass_wildmons 8 ; encounter rate - db 6, CATERPIE - db 6, WEEDLE + db 5, CATERPIE + db 5, WEEDLE db 6, CATERPIE db 5, PIDGEY db 6, KOKANA db 6, WEEDLE db 8, KAKUNA db 8, METAPOD - db 5, PIKACHU + db 4, PIKACHU ; FIXME: Add considerations for STARTER4/Pikachu so it isn't rendered redundant. db 9, PIDGEOTTO end_grass_wildmons diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 21524ca9..aa6c2935 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -142,13 +142,14 @@ IF DEF(_DEBUG) call DebugSetPokedexEntries SetEvent EVENT_GOT_POKEDEX - ; Rival chose Squirtle, - ; Player chose Charmander. + ; Rival chose Pikachu, + ; Player chose Eevee. + ; Eevee is used to test the Celadon Mansion Roof House. ld hl, wRivalStarter - ld a, STARTER2 + ld a, STARTER4 ld [hli], a inc hl ; hl = wPlayerStarter - ld a, STARTER1 + ld a, STARTER5 ld [hl], a ret diff --git a/scripts/CeladonMansionRoofHouse.asm b/scripts/CeladonMansionRoofHouse.asm index bd564dcc..175b5421 100644 --- a/scripts/CeladonMansionRoofHouse.asm +++ b/scripts/CeladonMansionRoofHouse.asm @@ -12,6 +12,17 @@ CeladonMansion5Text1: CeladonMansion5Text2: text_asm lb bc, EEVEE, 25 + + ; Because Eevee is a starter, we don't want it to be rendered redundant by this. + ; So when the player has one, we'll give them something else. + ; I chose Pikachu, which matches how in Yellow, the Eevee matches the rival. + ; It doesn't entirely make sense given RB, but I think it's ok, and gives a similar power spike. + ld a, [wPlayerStarter] ; Load the player's starter after Eevee loads. + cp EEVEE ; Was your starter Eevee? + jr nz, .skip ; If not, skip this. + lb bc, PIKACHU, 25 ; Load in Pikachu if true. + +.skip ; Return to usual functioning. call GivePokemon jr nc, .party_full ld a, HS_CELADON_MANSION_EEVEE_GIFT