diff --git a/README.md b/README.md index 0831d261..ad33b878 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ New Pokemon The Kanto Expansion Pak's ethos is to add every "Kanto-related" Pokemon to RBY without fundamentally changing the grander metagame. What's defined as "Kanto-related" is a Pokemon that evolves from an existing Kanto Pokemon, made an appearance in a Kanto-based game (LGPE), is a regional variant, or was a Kanto-related Pokemon cut during the development of an official game. With this criteria, we get: -- The 34 known prototype Pokemon that were cut from Red and Green; eg. Gorochu, Kotora +- 35 known prototype Pokemon that were cut from Red and Green; eg. Gorochu, Kotora - Evolutions or pre-evolutions of a Kanto Pokemon found in a future generation eg. Steelix, Glaceon, Kleavor, Annihilape - Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo of Gold and Silver; eg. Luxwan, Bellignan - All fully-evolved regional variants of Kanto Pokemon; eg. Alolan Muk, Galarian Slowbro, Hisuian Arcanine, Paldean Tauros @@ -164,7 +164,7 @@ QoL Enhancements - A feminine character option is now available, featuring the sprite from Pokemon Anniversary Red, which is based on Green's manga appearance. - To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal. - The protagonist is also referred to in a gender neutral manner. This changes like, 2-3 lines in the whole game. -- All 151 original Pokemon, plus an additional 99, can be obtained without the use of trading or glitches, including Mew! +- All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew! - Various moves have had their animations altered to be less intensive for photosensitive individuals, including every animation that was dimmed on the 3DS (Most notably Blizzard and Thunderbolt). This was done with the aim of also improving the move's animations overall, so some look a little flashier. - Full list includes Body Slam, Glare, Disable, Blizzard, BubbleBeam, Confusion, Dream Eater, Explosion, Guillotine, Hyper Beam, Mega Kick, Mega Punch, Psychic, Reflect, Rock Slide, Selfdestruct, Spore, and Thunderbolt. - PureRGB's AI enhancements are ported over; said hack was made by Vortiene. In general, it isn't as stupid as it was before. @@ -336,7 +336,7 @@ Accessing Regional variants ==== Adding regional variants was difficult; we hit the exact Pokemon cap by cutting their pre-evolutions. However, we managed to implement them quite nicely! -Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will trade you a regional variant in exchange for a Kantonian one. This goes as follows: +Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will trade you a regional variant in exchange for a Kantonian one. These trades will be able to be repeated after every Elite 4 victory. This goes as follows: - Viridian City: Raticate - Pewter City: Golem - Cerulean City: Ninetales @@ -403,7 +403,7 @@ Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espe Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross) -Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio +Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Gorillaimo, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back) diff --git a/constants/event_constants.asm b/constants/event_constants.asm index bbf76e9d..a64a17b2 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -762,8 +762,11 @@ const EVENT_BEAT_MANSION_4_TRAINER_0 const EVENT_BEAT_MANSION_4_TRAINER_1 -; Safari Zone events +; Safari Zone events, also used as a jank compression method for Celeste Hill Cave's trainers const_next $880 + const_skip + const EVENT_BEAT_CELESTE_HILL_CAVE_BEAUTY ; Mina + const EVENT_BEAT_CELESTE_HILL_CAVE_COOLTRAINER_M ; Primo const EVENT_GOT_HM03 const EVENT_GOT_MELTAN @@ -898,6 +901,23 @@ DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1 const EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE const_skip 8 const EVENT_BEAT_ARTICUNO + ; ends at $9DB + +; Celeste Hill / Brunswick Glade Trainers + const_next $9E0 + const_skip + ; Celeste Hill Outside + const EVENT_BEAT_CELESTE_HILL_OUTSIDE_BEAUTY ; Selphy + const EVENT_BEAT_CELESTE_HILL_OUTSIDE_COOLTRAINER_M ; Will + const EVENT_BEAT_CELESTE_HILL_OUTSIDE_GENTLEMAN ; Fan Club Chairman + + ; Brunswick Glade + const_next $9F0 + const_skip + const EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F ; Leaf + const EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN ; Fuji + const EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY ; Ariana + const EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M ; Trace ; End of events const_next $A00 diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index 6fbd32e9..abc8c98f 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -176,7 +176,7 @@ const DEX_WEEZING_G ; (170) const DEX_TANGELA ; 114 (171) const DEX_TANGROWTH ; (172) - const DEX_RAMOOSE ; (173) + const DEX_RAMOOSE ; (173) const DEX_HITMONLEE ; 106 (174) - Saffron City const DEX_HITMONCHAN ; 107 (175) const DEX_HITMONTOP ; (176) @@ -192,7 +192,7 @@ const DEX_STARMIE ; 121 (186) const DEX_BLASTYKE ; (187) const DEX_BLASTOISE ; 9 (188) - const DEX_SHARPOON ; (189) + const DEX_SHARPOON ; (189) const DEX_EXEGGCUTE ; 102 (190) - Safari Zone const DEX_EXEGGUTOR ; 103 (191) const DEX_EXEGGUTOR_A ; (192) @@ -212,47 +212,48 @@ const DEX_TAUROS_PA ; (206) const DEX_CHANSEY ; 113 (207) const DEX_BLISSEY ; (208) - const DEX_CACTORMUS ; (209) - Rare/Special Pokemon - const DEX_MR_MIME ; 122 (210) - const DEX_MR_RIME ; (211) - const DEX_JYNX ; 124 (212) - const DEX_BUU ; (213) - const DEX_ELECTABUZZ ; 125 (214) - const DEX_ELECTIVIRE ; (215) - const DEX_MAGMAR ; 126 (216) - const DEX_MAGMORTAR ; (217) - const DEX_LAPRAS ; 131 (218) - const DEX_DITTO ; 132 (219) - const DEX_MIMMEO ; (220) - const DEX_PORYGON ; 137 (221) - const DEX_PORYGON2 ; (222) - const DEX_PORYGONZ ; (223) - const DEX_OMANYTE ; 138 (224) - const DEX_OMASTAR ; 139 (225) - const DEX_KABUTO ; 140 (226) - const DEX_KABUTOPS ; 141 (227) - const DEX_AERODACTYL ; 142 (228) - const DEX_DECILLA ; (229) - const DEX_GAWARHED ; (230) - const DEX_OMEGADGE ; (231) - const DEX_SNORLAX ; 143 (232) - const DEX_SCREAM_TAIL ; (233) - Paradoxes, (Pseudo-)Legendary and Mythical Pokemon - const DEX_SANDY_SHOCKS ; (234) - const DEX_SQUEAMATA ; (235) - const DEX_MINISTARE ; (236) - const DEX_IGUANARCH ; (237) - const DEX_DRATINI ; 147 (238) - const DEX_DRAGONAIR ; 148 (239) - const DEX_DRAGONITE ; 149 (240) - const DEX_ARTICUNO ; 144 (241) - const DEX_ARTICUNO_G ; (242) - const DEX_ZAPDOS ; 145 (243) - const DEX_ZAPDOS_G ; (244) - const DEX_MOLTRES ; 146 (245) - const DEX_MOLTRES_G ; (246) - const DEX_MEWTWO ; 150 (247) - const DEX_MEW ; 151 (248) - const DEX_MELTAN ; (249) - const DEX_MELMETAL ; (250) + const DEX_GORILLAIMO ; (209) - Rare/Special Pokemon + const DEX_CACTORMUS ; (210) + const DEX_MR_MIME ; 122 (211) + const DEX_MR_RIME ; (212) + const DEX_JYNX ; 124 (213) + const DEX_BUU ; (214) + const DEX_ELECTABUZZ ; 125 (215) + const DEX_ELECTIVIRE ; (216) + const DEX_MAGMAR ; 126 (217) + const DEX_MAGMORTAR ; (218) + const DEX_LAPRAS ; 131 (219) + const DEX_DITTO ; 132 (220) + const DEX_MIMMEO ; (221) + const DEX_PORYGON ; 137 (222) + const DEX_PORYGON2 ; (223) + const DEX_PORYGONZ ; (224) + const DEX_OMANYTE ; 138 (225) + const DEX_OMASTAR ; 139 (226) + const DEX_KABUTO ; 140 (227) + const DEX_KABUTOPS ; 141 (228) + const DEX_AERODACTYL ; 142 (229) + const DEX_DECILLA ; (230) + const DEX_GAWARHED ; (231) + const DEX_OMEGADGE ; (232) + const DEX_SNORLAX ; 143 (233) + const DEX_SCREAM_TAIL ; (234) - Paradoxes, (Pseudo-)Legendary and Mythical Pokemon + const DEX_SANDY_SHOCKS ; (235) + const DEX_SQUEAMATA ; (236) + const DEX_MINISTARE ; (237) + const DEX_IGUANARCH ; (238) + const DEX_DRATINI ; 147 (239) + const DEX_DRAGONAIR ; 148 (240) + const DEX_DRAGONITE ; 149 (241) + const DEX_ARTICUNO ; 144 (242) + const DEX_ARTICUNO_G ; (243) + const DEX_ZAPDOS ; 145 (244) + const DEX_ZAPDOS_G ; (245) + const DEX_MOLTRES ; 146 (246) + const DEX_MOLTRES_G ; (247) + const DEX_MEWTWO ; 150 (248) + const DEX_MEW ; 151 (249) + const DEX_MELTAN ; (250) + const DEX_MELMETAL ; (251) DEF NUM_POKEMON EQU const_value - 1 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index f8789e4e..c2c74bd6 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -257,9 +257,10 @@ const TAUROS_P ; $F8 const TAUROS_PA ; $F9 const TAUROS_PB ; $FA - const FOSSIL_KABUTOPS ; $FB (was B6) - const FOSSIL_AERODACTYL ; $FC (was B7) - const MON_GHOST ; $FD (was B8) + const GORILLAIMO ; $FB + const FOSSIL_KABUTOPS ; $FC (was B6) + const FOSSIL_AERODACTYL ; $FD (was B7) + const MON_GHOST ; $FE (was B8) DEF NUM_POKEMON_INDEXES EQU const_value - 1 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index b0080372..ab5ad0b3 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -138,8 +138,8 @@ PokemonCries:: mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE_H mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL - mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCOOL (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCRUEL (incomplete) + mon_cry CRY_DIGLETT, -22, 353 ; TOEDSCOOL + mon_cry CRY_SLOWKING, -38, 704 ; TOEDSCRUEL mon_cry CRY_BLASTOISE, 147, 128 ; BLOTTLE mon_cry CRY_BLASTOISE, 60, 128 ; PENDRAKEN mon_cry CRY_GOLEM, 147, 224 ; RIBBITO @@ -213,6 +213,7 @@ PokemonCries:: mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS_PA mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY + mon_cry CRY_RHYDON, 17, 383 ; GORILLAIMO mon_cry CRY_NIDORAN_M, 128, 144 ; CACTORMUS mon_cry CRY_KRABBY, 8, 192 ; MR_MIME mon_cry CRY_KRABBY, -256, 232 ; MR_RIME @@ -254,4 +255,4 @@ PokemonCries:: mon_cry CRY_PARAS, 153, 383 ; MEWTWO mon_cry CRY_PARAS, 238, 383 ; MEW mon_cry CRY_NATU, -18, 89 ; MELTAN - mon_cry CRY_RHYDON, 240, 224 ; MELMETAL (revise if possible) + mon_cry CRY_AMPHAROS, 158, 592 ; MELMETAL diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 1c3c8853..85358a8c 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -64,5 +64,5 @@ HiddenItemCoords: hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber hidden_item DAYCARE, 4, 1 ; Daycare PC hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone - hidden_item BRUNSWICK_TRAIL, 23, 11 ; Solar Beam TM below Cactus + hidden_item BRUNSWICK_TRAIL, 24, 11 ; Solar Beam TM next to Cactus db -1 ; end diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index 264188f9..6cc05fe6 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -671,5 +671,5 @@ MtMoonSquareHiddenItems: db -1 BrunswickTrailHiddenItems: - hidden_object 23, 11, TM_SOLARBEAM, HiddenItems + hidden_object 24, 11, TM_SOLARBEAM, HiddenItems db -1 diff --git a/data/maps/objects/BrunswickGlade.asm b/data/maps/objects/BrunswickGlade.asm index 0b5f7342..c593e222 100644 --- a/data/maps/objects/BrunswickGlade.asm +++ b/data/maps/objects/BrunswickGlade.asm @@ -8,7 +8,7 @@ BrunswickGlade_Object: warp_event 9, 0, BRUNSWICK_GROTTO, 2 def_bg_events - bg_event 14, 24, 8 ; Sign + bg_event 14, 24, 12 ; Sign def_object_events object_event 32, 25, SPRITE_BIRD, STAY, DOWN, 1 @@ -18,5 +18,9 @@ BrunswickGlade_Object: object_event 5, 21, SPRITE_POKE_BALL, STAY, NONE, 5, LEAF_STONE ; itemball2 object_event 22, 15, SPRITE_POKE_BALL, STAY, NONE, 6, REVIVE ; itemball3 object_event 9, 33, SPRITE_POKE_BALL, STAY, NONE, 7, HYPER_POTION ; itemball4 + object_event 16, 8, SPRITE_COOLTRAINER_F, STAY, DOWN, 8, OPP_COOLTRAINER_F, 6 ; Leaf reference Trainer + object_event 7, 28, SPRITE_GENTLEMAN, STAY, UP, 9, OPP_GENTLEMAN, 6 ; Fuji reference Trainer + object_event 15, 30, SPRITE_BEAUTY, STAY, RIGHT, 10, OPP_BEAUTY, 19 ; Ariana reference Trainer + object_event 31, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 11, OPP_COOLTRAINER_M, 13 ; Trace reference Trainer def_warps_to BRUNSWICK_GLADE \ No newline at end of file diff --git a/data/maps/objects/CelesteHillCave.asm b/data/maps/objects/CelesteHillCave.asm index 02d5003d..a457622d 100644 --- a/data/maps/objects/CelesteHillCave.asm +++ b/data/maps/objects/CelesteHillCave.asm @@ -13,5 +13,7 @@ CelesteHillCave_Object: def_bg_events def_object_events + object_event 22, 14, SPRITE_BEAUTY, STAY, DOWN, 1, OPP_BEAUTY, 17 ; Mina reference Trainer + object_event 21, 5, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_COOLTRAINER_M, 12 ; Primo reference Trainer def_warps_to CELESTE_HILL_CAVE diff --git a/data/maps/objects/CelesteHillOutside.asm b/data/maps/objects/CelesteHillOutside.asm index 6416966a..40601ba4 100644 --- a/data/maps/objects/CelesteHillOutside.asm +++ b/data/maps/objects/CelesteHillOutside.asm @@ -14,5 +14,9 @@ CelesteHillOutside_Object: def_bg_events def_object_events + object_event 30, 16, SPRITE_BEAUTY, STAY, LEFT, 1, OPP_BEAUTY, 18 ; Selphy reference Trainer + object_event 19, 31, SPRITE_COOLTRAINER_M, STAY, RIGHT, 2, OPP_COOLTRAINER_M, 14 ; Will reference Trainer + object_event 11, 16, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 7; Fan Club Chairman reference Trainer + def_warps_to CELESTE_HILL_OUTSIDE diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 5d89b712..0d47b0cc 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -208,6 +208,7 @@ INCLUDE "data/pokemon/base_stats/taurospb.asm" INCLUDE "data/pokemon/base_stats/taurospa.asm" INCLUDE "data/pokemon/base_stats/chansey.asm" INCLUDE "data/pokemon/base_stats/blissey.asm" +INCLUDE "data/pokemon/base_stats/gorillaimo.asm" INCLUDE "data/pokemon/base_stats/cactormus.asm" INCLUDE "data/pokemon/base_stats/mrmime.asm" INCLUDE "data/pokemon/base_stats/mrrime.asm" diff --git a/data/pokemon/base_stats/dragonair.asm b/data/pokemon/base_stats/dragonair.asm index c2f43411..e7ae9eb3 100644 --- a/data/pokemon/base_stats/dragonair.asm +++ b/data/pokemon/base_stats/dragonair.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/dragonair.pic", 0, 1 ; sprite dimensions dw DragonairPicFront, DragonairPicBack - db WRAP, LEER, THUNDER_WAVE, NO_MOVE ; level 1 learnset + db WRAP, LEER, THUNDER_WAVE, TAKE_DOWN ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/dratini.asm b/data/pokemon/base_stats/dratini.asm index 0cc5dbce..9d6daa8b 100644 --- a/data/pokemon/base_stats/dratini.asm +++ b/data/pokemon/base_stats/dratini.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/dratini.pic", 0, 1 ; sprite dimensions dw DratiniPicFront, DratiniPicBack - db WRAP, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db WRAP, LEER, TAKE_DOWN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/fearow.asm b/data/pokemon/base_stats/fearow.asm index 51d3d5ea..f79fb6a2 100644 --- a/data/pokemon/base_stats/fearow.asm +++ b/data/pokemon/base_stats/fearow.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/fearow.pic", 0, 1 ; sprite dimensions dw FearowPicFront, FearowPicBack - db PECK, GROWL, LEER, NO_MOVE ; level 1 learnset + db PECK, GROWL, LEER, RAGE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/gorillaimo.asm b/data/pokemon/base_stats/gorillaimo.asm new file mode 100644 index 00000000..71d9f29d --- /dev/null +++ b/data/pokemon/base_stats/gorillaimo.asm @@ -0,0 +1,26 @@ + db DEX_GORILLAIMO ; pokedex id + + db 130, 100, 75, 65, 40 + ; hp atk def spd spc + + db NORMAL, FIGHTING ; type + db 45 ; catch rate + db 204 ; base exp + + INCBIN "gfx/pokemon/front/gorillaimo.pic", 0, 1 ; sprite dimensions + dw GorillaimoPicFront, GorillaimoPicBack + + db COMET_PUNCH, GROWL, UPPERCUT, NO_MOVE ; level 1 learnset + db GROWTH_SLOW ; growth rate + + ; tm/hm learnset + tmhm MEGA_PUNCH, MEGA_KICK, TOXIC, BODY_SLAM, TAKE_DOWN, \ + DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, HYPER_BEAM, SUBMISSION, \ + COUNTER, SEISMIC_TOSS, RAGE, THUNDERBOLT, THUNDER, \ + EARTHQUAKE, FISSURE, DIG, MIMIC, DOUBLE_TEAM, \ + BIDE, METRONOME, SWIFT, SKULL_BASH, REST, \ + THUNDER_WAVE, ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH + ; end + + db BANK(GorillaimoPicFront) + assert BANK(GorillaimoPicFront) == BANK(GorillaimoPicBack) diff --git a/data/pokemon/base_stats/ivysaur.asm b/data/pokemon/base_stats/ivysaur.asm index 37b60c0a..a41c6bbd 100644 --- a/data/pokemon/base_stats/ivysaur.asm +++ b/data/pokemon/base_stats/ivysaur.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ivysaur.pic", 0, 1 ; sprite dimensions dw IvysaurPicFront, IvysaurPicBack - db TACKLE, GROWL, LEECH_SEED, NO_MOVE ; level 1 learnset + db TACKLE, GROWL, VINE_WHIP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/jigglypuff.asm b/data/pokemon/base_stats/jigglypuff.asm index 99ad737c..013a4996 100644 --- a/data/pokemon/base_stats/jigglypuff.asm +++ b/data/pokemon/base_stats/jigglypuff.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jigglypuff.pic", 0, 1 ; sprite dimensions dw JigglypuffPicFront, JigglypuffPicBack - db SING, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db SING, BIDE, POUND, NO_MOVE ; level 1 learnset db GROWTH_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/poliwag.asm b/data/pokemon/base_stats/poliwag.asm index 45b052e9..dcda5631 100644 --- a/data/pokemon/base_stats/poliwag.asm +++ b/data/pokemon/base_stats/poliwag.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/poliwag.pic", 0, 1 ; sprite dimensions dw PoliwagPicFront, PoliwagPicBack - db BUBBLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, BIDE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/poliwhirl.asm b/data/pokemon/base_stats/poliwhirl.asm index bd27aa4b..c77d6038 100644 --- a/data/pokemon/base_stats/poliwhirl.asm +++ b/data/pokemon/base_stats/poliwhirl.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/poliwhirl.pic", 0, 1 ; sprite dimensions dw PoliwhirlPicFront, PoliwhirlPicBack - db BUBBLE, HYPNOSIS, WATER_GUN, NO_MOVE ; level 1 learnset + db BUBBLE, HYPNOSIS, WATER_GUN, BIDE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/totartle.asm b/data/pokemon/base_stats/totartle.asm index 6b88f9f6..f8edfba5 100644 --- a/data/pokemon/base_stats/totartle.asm +++ b/data/pokemon/base_stats/totartle.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/totartle.pic", 0, 1 ; sprite dimensions dw TotartlePicFront, TotartlePicBack - db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset + db TACKLE, TAIL_WHIP, BUBBLE, LEER ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/venusaur.asm b/data/pokemon/base_stats/venusaur.asm index 4d46fa91..90636e11 100644 --- a/data/pokemon/base_stats/venusaur.asm +++ b/data/pokemon/base_stats/venusaur.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/venusaur.pic", 0, 1 ; sprite dimensions dw VenusaurPicFront, VenusaurPicBack - db TACKLE, GROWL, LEECH_SEED, VINE_WHIP ; level 1 learnset + db TACKLE, GROWL, VINE_WHIP, LEECH_SEED ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index bee21710..5f34f851 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -259,6 +259,7 @@ CryData:: mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB + mon_cry SFX_CRY_00, $00, $00 ; Gorillaimo mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil) mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil) mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index af8caa05..af2b8d29 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -250,6 +250,7 @@ PokedexEntryPointers: dw TaurosPDexEntry dw TaurosPADexEntry dw TaurosPBDexEntry + dw GorillaimoDexEntry dw MissingNoDexEntry dw MissingNoDexEntry dw MissingNoDexEntry @@ -2016,4 +2017,11 @@ MoltresGDexEntry: dw 1460 text_far _MoltresGDexEntry text_end + +GorillaimoDexEntry: + db "GREAT APE@" + db 7,11 + dw 4080 + text_far _GorillaimoDexEntry + text_end \ No newline at end of file diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 02df0061..76656719 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -250,6 +250,7 @@ PokedexOrder: db DEX_TAUROS_P db DEX_TAUROS_PA db DEX_TAUROS_PB + db DEX_GORILLAIMO db 0 ; MISSINGNO. db 0 ; MISSINGNO. db 0 ; MISSINGNO. diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 99f6e906..871b8d12 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -262,6 +262,7 @@ EvosMovesPointerTable: dw TaurosPEvosMoves dw TaurosPAEvosMoves dw TaurosPBEvosMoves + dw GorillaimoEvosMoves dw FossilKabutopsEvosMoves dw FossilAerodactylEvosMoves dw MonGhostEvosMoves @@ -314,6 +315,7 @@ ClefairyEvosMoves: db 13, SING db 18, DOUBLESLAP db 24, MINIMIZE + db 28, TAKE_DOWN ; Prototype db 31, METRONOME db 35, BODY_SLAM db 39, DEFENSE_CURL @@ -325,11 +327,14 @@ SpearowEvosMoves: db EV_LEVEL, 20, FEAROW db 0 ; Learnset + db 5, RAGE ; Prototype - it's balanced cus spearow has the defence of a wet napkin db 9, LEER db 15, FURY_ATTACK db 22, MIRROR_MOVE db 29, DRILL_PECK db 36, AGILITY + db 43, TAKE_DOWN ; Prototype + db 50, WHIRLWIND ; Prototype, comedy db 0 VoltorbEvosMoves: @@ -351,13 +356,17 @@ NidokingEvosMoves: db 8, HORN_ATTACK db 14, POISON_STING db 23, THRASH + db 28, MEGA_PUNCH ; Prototype db 36, EARTHQUAKE + db 49, DOUBLE_EDGE ; Prototype + db 57, MEGA_KICK ; Prototype db 0 SlowbroEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BIDE db 18, DISABLE db 22, HEADBUTT db 27, GROWL @@ -372,13 +381,19 @@ IvysaurEvosMoves: db EV_LEVEL, 32, VENUSAUR db 0 ; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 38, GROWTH - db 46, SLEEP_POWDER - db 54, SOLARBEAM + db 8, VINE_WHIP + db 14, LEECH_SEED + db 21, POISONPOWDER + db 24, GROWTH + db 28, RAZOR_LEAF + db 31, TAKE_DOWN ; Prototype + db 34, BODY_SLAM + db 39, SLEEP_POWDER + db 43, MEGA_DRAIN ; Prototype + db 48, PETAL_DANCE + db 52, DOUBLE_EDGE + db 57, TOXIC + db 62, SOLARBEAM db 0 ExeggutorEvosMoves: @@ -447,6 +462,7 @@ NidoranFEvosMoves: db 23, TAIL_WHIP db 30, BITE db 38, FURY_SWIPES + db 46, TAKE_DOWN ; Prototype db 0 NidoqueenEvosMoves: @@ -456,7 +472,10 @@ NidoqueenEvosMoves: db 8, SCRATCH db 14, POISON_STING db 23, BODY_SLAM + db 28, MEGA_PUNCH ; Prototype db 36, EARTHQUAKE + db 49, DOUBLE_EDGE ; Prototype + db 57, MEGA_KICK ; Prototype db 0 CuboneEvosMoves: @@ -534,6 +553,7 @@ ShellderEvosMoves: db EV_ITEM, ICE_STONE, 1, CLOYSTER db 0 ; Learnset + db 10, BIDE ; Prototype db 18, SUPERSONIC db 23, CLAMP db 30, AURORA_BEAM @@ -662,10 +682,12 @@ GrowlitheEvosMoves: db EV_ITEM, FIRE_STONE, 1, ARCANINE db 0 ; Learnset + db 10, RAGE db 18, EMBER db 23, LEER db 30, TAKE_DOWN db 39, AGILITY + db 44, DOUBLE_EDGE ; Prototype db 50, FLAMETHROWER db 0 @@ -680,17 +702,21 @@ OnixEvosMoves: db 25, RAGE db 33, SLAM db 43, HARDEN + db 50, FISSURE ; Prototype db 0 FearowEvosMoves: ; Evolutions db 0 ; Learnset + db 5, RAGE db 9, LEER db 15, FURY_ATTACK db 25, MIRROR_MOVE db 34, DRILL_PECK db 43, AGILITY + db 50, TAKE_DOWN ; Prototype + db 56, WHIRLWIND ; Prototype, comedy db 0 PidgeyEvosMoves: @@ -712,6 +738,7 @@ SlowpokeEvosMoves: db EV_LEVEL, 37, SLOWBRO db 0 ; Learnset + db 10, BIDE db 18, DISABLE db 22, HEADBUTT db 27, GROWL @@ -766,11 +793,14 @@ MachokeEvosMoves: db EV_TRADE, 1, MACHAMP db 0 ; Learnset + db 15, COUNTER db 20, LOW_KICK db 25, LEER db 36, FOCUS_ENERGY db 44, SEISMIC_TOSS db 52, SUBMISSION + db 60, MEGA_PUNCH ; Prototype + db 66, MEGA_KICK ; Prototype db 0 MrMimeEvosMoves: @@ -815,6 +845,7 @@ ArbokEvosMoves: db 27, GLARE db 36, SCREECH db 47, ACID + db 54, TOXIC ; Prototype db 0 ParasectEvosMoves: @@ -827,6 +858,7 @@ ParasectEvosMoves: db 30, SPORE db 39, SLASH db 48, GROWTH + db 57, SWORDS_DANCE ; Prototype db 0 PsyduckEvosMoves: @@ -968,6 +1000,8 @@ MankeyEvosMoves: db 33, SEISMIC_TOSS db 39, THRASH db 45, SCREECH + db 51, SUBMISSION + db 58, COUNTER db 0 SeelEvosMoves: @@ -1084,6 +1118,7 @@ DragoniteEvosMoves: db 35, SLAM db 45, DRAGON_RAGE db 60, HYPER_BEAM + db 65, THUNDER db 0 CactormusEvosMoves: @@ -1212,6 +1247,7 @@ MeowthEvosMoves: db 26, FURY_SWIPES db 33, SCREECH db 38, SLASH + db 43, DOUBLE_TEAM db 0 KrabbyEvosMoves: @@ -1351,6 +1387,7 @@ DratiniEvosMoves: db 30, SLAM db 40, DRAGON_RAGE db 50, HYPER_BEAM + db 55, THUNDER db 0 DragonairEvosMoves: @@ -1363,6 +1400,7 @@ DragonairEvosMoves: db 35, SLAM db 45, DRAGON_RAGE db 55, HYPER_BEAM + db 60, THUNDER db 0 KabutoEvosMoves: @@ -1489,13 +1527,14 @@ JigglypuffEvosMoves: db EV_ITEM, MOON_STONE, 1, WIGGLYTUFF db 0 ; Learnset - db 9, POUND + db 9, COUNTER ; Prototype - Pound made L1 because lol imagine using puff otherwise db 14, DISABLE db 19, DEFENSE_CURL db 24, DOUBLESLAP db 29, REST db 34, BODY_SLAM - db 39, DOUBLE_EDGE + db 39, TAKE_DOWN ; Prototype + db 44, DOUBLE_EDGE db 0 WigglytuffEvosMoves: @@ -1572,11 +1611,14 @@ MachopEvosMoves: db EV_LEVEL, 28, MACHOKE db 0 ; Learnset + db 15, COUNTER ; Prototype db 20, LOW_KICK db 25, LEER db 32, FOCUS_ENERGY db 39, SEISMIC_TOSS db 46, SUBMISSION + db 53, MEGA_PUNCH ; Prototype + db 60, MEGA_KICK ; Prototype db 0 ZubatEvosMoves: @@ -1603,6 +1645,7 @@ EkansEvosMoves: db 24, GLARE db 31, SCREECH db 38, ACID + db 45, TOXIC ; Prototype db 0 ParasEvosMoves: @@ -1616,6 +1659,7 @@ ParasEvosMoves: db 27, SPORE db 34, SLASH db 41, GROWTH + db 48, SWORDS_DANCE db 0 PoliwhirlEvosMoves: @@ -1667,6 +1711,9 @@ BeedrillEvosMoves: db 25, RAGE db 30, PIN_MISSILE db 35, AGILITY + db 40, SWORDS_DANCE ; Prototype + db 45, TAKE_DOWN ; Prototype + db 50, TOXIC ; Prototype db 0 LuxwanEvosMoves: @@ -1706,6 +1753,8 @@ PrimeapeEvosMoves: db 37, SEISMIC_TOSS db 45, SCREECH db 46, THRASH + db 54, SUBMISSION + db 62, COUNTER db 0 DugtrioEvosMoves: @@ -1799,17 +1848,23 @@ ButterfreeEvosMoves: db 23, WHIRLWIND db 28, GUST db 34, PSYBEAM + db 40, MEGA_DRAIN ; Prototype + db 45, TAKE_DOWN ; Prototype + db 50, HYPER_BEAM ; Prototype db 0 MachampEvosMoves: ; Evolutions db 0 ; Learnset + db 15, COUNTER ; Prototype db 20, LOW_KICK db 25, LEER db 36, FOCUS_ENERGY db 44, SEISMIC_TOSS db 52, SUBMISSION + db 60, MEGA_PUNCH ; Prototype + db 66, MEGA_KICK ; Prototype db 0 WeirduckEvosMoves: @@ -2017,6 +2072,7 @@ PersianEvosMoves: db 26, FURY_SWIPES db 35, SCREECH db 40, SLASH + db 45, DOUBLE_TEAM db 0 MarowakEvosMoves: @@ -2112,26 +2168,38 @@ BulbasaurEvosMoves: db EV_LEVEL, 16, IVYSAUR db 0 ; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 20, POISONPOWDER - db 27, RAZOR_LEAF - db 34, GROWTH - db 41, SLEEP_POWDER - db 48, SOLARBEAM + db 8, VINE_WHIP + db 14, LEECH_SEED + db 19, POISONPOWDER + db 22, GROWTH + db 25, RAZOR_LEAF + db 28, TAKE_DOWN ; Prototype + db 32, BODY_SLAM + db 37, SLEEP_POWDER + db 41, MEGA_DRAIN ; Prototype + db 44, PETAL_DANCE + db 48, DOUBLE_EDGE + db 52, TOXIC + db 58, SOLARBEAM db 0 VenusaurEvosMoves: ; Evolutions db 0 ; Learnset - db 7, LEECH_SEED - db 13, VINE_WHIP - db 22, POISONPOWDER - db 30, RAZOR_LEAF - db 43, GROWTH - db 55, SLEEP_POWDER - db 65, SOLARBEAM + db 8, VINE_WHIP + db 14, LEECH_SEED + db 21, POISONPOWDER + db 24, GROWTH + db 28, RAZOR_LEAF + db 31, TAKE_DOWN ; Prototype + db 36, BODY_SLAM + db 41, SLEEP_POWDER + db 45, MEGA_DRAIN ; Prototype + db 53, PETAL_DANCE + db 56, DOUBLE_EDGE + db 62, TOXIC + db 66, SOLARBEAM db 0 TentacruelEvosMoves: @@ -2159,6 +2227,8 @@ OrfryEvosMoves: db 26, WATERFALL db 30, HORN_DRILL db 34, AGILITY + db 40, DOUBLE_EDGE ; Prototype + db 44, SWORDS_DANCE ; Tradeback move db 0 GoldeenEvosMoves: @@ -2172,6 +2242,8 @@ GoldeenEvosMoves: db 29, WATERFALL db 34, HORN_DRILL db 39, AGILITY + db 44, DOUBLE_EDGE ; Prototype + db 50, SWORDS_DANCE ; Tradeback move db 0 SeakingEvosMoves: @@ -2184,7 +2256,8 @@ SeakingEvosMoves: db 29, WATERFALL db 37, HORN_DRILL db 41, AGILITY - db 46, SWORDS_DANCE + db 46, DOUBLE_EDGE ; Prototype + db 52, SWORDS_DANCE ; Tradeback move db 0 KotoraEvosMoves: @@ -2314,8 +2387,10 @@ NidorinaEvosMoves: db 27, TAIL_WHIP db 36, BITE db 46, FURY_SWIPES + db 55, TAKE_DOWN ; Prototype db 0 +; Needs Body Slam, Mega Punch, Double-Edge, and Fissure distributed GeodudeEvosMoves: ; Evolutions db EV_LEVEL, 25, GRAVELER @@ -2407,10 +2482,17 @@ CharmanderEvosMoves: ; Learnset db 9, EMBER db 15, LEER - db 22, RAGE - db 30, SLASH - db 38, FLAMETHROWER - db 46, FIRE_SPIN + db 19, RAGE + db 22, HEADBUTT + db 25, FIRE_SPIN + db 29, TAKE_DOWN + db 33, SEISMIC_TOSS + db 37, FLAMETHROWER + db 41, MEGA_PUNCH + db 44, SLASH + db 48, DOUBLE_EDGE + db 51, MEGA_KICK + db 57, FIRE_BLAST db 0 SquirtleEvosMoves: @@ -2420,10 +2502,16 @@ SquirtleEvosMoves: ; Learnset db 8, BUBBLE db 15, WATER_GUN - db 22, BITE - db 28, WITHDRAW + db 18, BITE + db 21, WITHDRAW + db 25, BUBBLEBEAM + db 28, TAKE_DOWN + db 31, BODY_SLAM db 35, SKULL_BASH - db 42, HYDRO_PUMP + db 39, MEGA_PUNCH + db 43, HYDRO_PUMP + db 47, DOUBLE_EDGE + db 52, MEGA_KICK db 0 CharmeleonEvosMoves: @@ -2433,10 +2521,17 @@ CharmeleonEvosMoves: ; Learnset db 9, EMBER db 15, LEER - db 24, RAGE - db 33, SLASH - db 42, FLAMETHROWER - db 56, FIRE_SPIN + db 21, RAGE + db 24, HEADBUTT + db 28, FIRE_SPIN + db 32, TAKE_DOWN + db 37, SEISMIC_TOSS + db 41, FLAMETHROWER + db 45, MEGA_PUNCH + db 49, SLASH + db 53, DOUBLE_EDGE + db 57, MEGA_KICK + db 63, FIRE_BLAST db 0 WartortleEvosMoves: @@ -2446,10 +2541,16 @@ WartortleEvosMoves: ; Learnset db 8, BUBBLE db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW + db 20, BITE + db 23, WITHDRAW + db 28, BUBBLEBEAM + db 31, TAKE_DOWN + db 35, BODY_SLAM db 39, SKULL_BASH - db 47, HYDRO_PUMP + db 44, MEGA_PUNCH + db 48, HYDRO_PUMP + db 53, DOUBLE_EDGE + db 58, MEGA_KICK db 0 CharizardEvosMoves: @@ -2458,10 +2559,19 @@ CharizardEvosMoves: ; Learnset db 9, EMBER db 15, LEER - db 24, RAGE - db 36, SLASH - db 46, FLAMETHROWER - db 55, FIRE_SPIN + db 21, RAGE + db 24, HEADBUTT + db 28, FIRE_SPIN + db 32, TAKE_DOWN + db 36, WING_ATTACK + db 41, SEISMIC_TOSS + db 45, FLAMETHROWER + db 49, MEGA_PUNCH + db 53, SLASH + db 57, DOUBLE_EDGE + db 62, MEGA_KICK + db 66, FIRE_BLAST + db 70, DRAGON_RAGE db 0 TotartleEvosMoves: @@ -2470,13 +2580,19 @@ TotartleEvosMoves: ; Learnset db 8, BUBBLE db 15, WATER_GUN - db 24, BITE - db 31, WITHDRAW + db 20, BITE + db 23, WITHDRAW + db 28, BUBBLEBEAM + db 31, TAKE_DOWN + db 35, BODY_SLAM db 42, SKULL_BASH - db 46, HYDRO_PUMP - db 50, COMET_PUNCH - db 54, LEER - db 60, PETAL_DANCE + db 45, COMET_PUNCH + db 49, MEGA_PUNCH + db 53, HYDRO_PUMP + db 57, DOUBLE_EDGE + db 62, MEGA_KICK + db 66, PETAL_DANCE + db 70, BLIZZARD db 0 ArticunoGEvosMoves: @@ -2748,6 +2864,7 @@ SteelixEvosMoves: db 33, SLAM db 38, IRON_HEAD db 43, HARDEN + db 50, FISSURE ; Prototype db 0 BlisseyEvosMoves: @@ -2843,6 +2960,7 @@ SlowkingEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BIDE db 18, DISABLE db 22, HEADBUTT db 27, GROWL @@ -2910,6 +3028,9 @@ CarapthorEvosMoves: db 25, SWIFT db 30, MEGA_PUNCH db 35, SUBSTITUTE + db 40, SEISMIC_TOSS + db 45, TAKE_DOWN + db 50, SUBMISSION db 0 MagnezoneEvosMoves: @@ -2941,6 +3062,8 @@ AnnihilapeEvosMoves: db 45, SCREECH db 46, THRASH db 50, NIGHT_SHADE + db 54, SUBMISSION + db 62, COUNTER db 0 ScreamTailEvosMoves: @@ -3085,11 +3208,13 @@ ArcanineHEvosMoves: ; Evolutions db 0 ; Learnset + db 10, RAGE db 18, EMBER ; no growlithe-hisui db 23, LEER db 30, TAKE_DOWN db 35, ROCK_SLIDE db 39, AGILITY + db 44, DOUBLE_EDGE db 50, FLAMETHROWER db 0 @@ -3185,6 +3310,7 @@ PersianAEvosMoves: db 35, NASTY_PLOT db 40, SLASH db 46, NIGHT_SLASH + db 50, DOUBLE_TEAM db 0 GolemAEvosMoves: @@ -3218,6 +3344,7 @@ SlowbroGEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BIDE db 18, DISABLE db 22, HEADBUTT db 27, GROWL @@ -3232,6 +3359,7 @@ SlowkingGEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BIDE db 18, DISABLE db 22, HEADBUTT db 27, GROWL @@ -3324,6 +3452,19 @@ TaurosPBEvosMoves: db 51, FIRE_SPIN db 0 +GorillaimoEvosMoves: +; Evolutions + db 0 +; Learnset + db 7, ROAR + db 15, BITE + db 22, THUNDERPUNCH ; In King Kong vs. Godzilla (1962), King Kong has an affinity for using electricity. He's not only immune to electricity, but is also powered up by it, so Gorillaimo would be given Lightning Rod/Motor Drive as an ability if it were brought into a later generation. + db 29, SEISMIC_TOSS + db 35, BODY_SLAM + db 42, AMNESIA + db 49, SUBMISSION + db 0 + FossilKabutopsEvosMoves: ; Evolutions db 0 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index c2e4ba0a..13053cb4 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -208,6 +208,7 @@ MonPartyData: nybble ICON_QUADRUPED ; Tauros-PA nybble ICON_FAIRY ; Chansey nybble ICON_FAIRY ; Blissey + nybble ICON_MON ; Gorillaimo nybble ICON_GRASS ; Cactormus nybble ICON_MON ; Mr.Mime nybble ICON_MON ; Mr.Rime diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 0d2c779b..c6144ce8 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -250,6 +250,7 @@ MonsterNames:: db "TAUROS@@@@" ; Paldean, Combat db "TAUROS@@@@" ; Paldean, Aqua db "TAUROS@@@@" ; Paldean, Blaze + db "GORILLAIMO" db "MISSINGNO." db "MISSINGNO." db "MISSINGNO." diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 0bf4aaec..c932daac 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -987,6 +987,16 @@ _TaurosPADexEntry:: next "of water from the" next "tips of its horns" dex + +_GorillaimoDexEntry:: + text "Intelligent enough" + next "to craft items of" + next "clothing. Ancient" + + page "scripture shows a" + next "giant GORILLAIMO" + next "battling GAWARHED" + dex _MissingNoDexEntry:: ; unused text "This is a newly" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 5dd0f70d..c5e0be6b 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -209,6 +209,7 @@ MonsterPalettes: db PAL_CYANMON ; TAUROS_PA db PAL_PINKMON ; CHANSEY db PAL_PINKMON ; BLISSEY + db PAL_BROWNMON ; GORILLAIMO db PAL_GREENMON ; CACTORMUS db PAL_PINKMON ; MR_MIME db PAL_CYANMON ; MR_RIME diff --git a/data/pokemon/tradeback_moves.asm b/data/pokemon/tradeback_moves.asm index 50ff302b..7001797f 100644 --- a/data/pokemon/tradeback_moves.asm +++ b/data/pokemon/tradeback_moves.asm @@ -255,6 +255,7 @@ TradebackMovesPointerTable: dw TaurosPTradebackMoves dw TaurosPATradebackMoves dw TaurosPBTradebackMoves + dw GorillaimoTradebackMoves dw FossilKabutopsTradebackMoves dw FossilAerodactylTradebackMoves dw MonGhostTradebackMoves @@ -2218,6 +2219,13 @@ TaurosPBTradebackMoves: db 1, QUICK_ATTACK db 0 +GorillaimoTradebackMoves: + db 1, HEADBUTT, + db 1, DEFENSE_CURL + db 1, KARATE_CHOP + db 1, FOCUS_ENERGY + db 0 + FossilKabutopsTradebackMoves: db 0 diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 046dd306..7e549c81 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -85,7 +85,7 @@ YoungsterData: db 17, RATTATA, SPEAROW, RATICATE, 0 db 18, NIDORAN_M, NIDORINO, 0 ; Silph Gauntlet 1F (Viridian Forest) - db 62, RATICATE, ARBOK, SLOWBRO, FEAROW, NIDOKING, VENUSAUR, 0 + db 56, RATICATE, ARBOK, SLOWBRO, FEAROW, NIDOKING, VENUSAUR, 0 ; Suffers heavily from limited Bug-types. Variety mainly comes from stripping them down and specialising them. BugCatcherData: @@ -106,7 +106,7 @@ BugCatcherData: 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, TRICULES, KLEAVOR, 0 + db 56, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, TRICULES, KLEAVOR, 0 ; Route 9 db 19, BUTTERFREE, BEEDRILL, 0 db 20, PUPAL, VENONAT, BEEDRILL, 0 @@ -142,7 +142,7 @@ LassData: db 23, LEAFEON, 0 db 23, ODDISH, GLOOM, 0 ; Silph Gauntlet 2F (Mt. Moon) - db 63, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0 + db 57, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0 ; Pretty much a Fisher with Machops and the random Vermilion Gym featuring. SailorData: @@ -158,7 +158,7 @@ SailorData: ; Vermilion Gym db 21, KOTORA, GAOTORA, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0 + db 58, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0 ; One of the most varied trainers in the game. No criticisms. JrTrainerMData: @@ -172,7 +172,7 @@ JrTrainerMData: db 16, WEEPINBELL, 0 ; Joe from School of Hard Knocks, Indigo League Ep9, featured in Yellow db 16, SPEAROW, RATICATE, 0 ; Silph Gauntlet 1F (Viridian Forest) - db 62, DUGTRIO, ANNIHILAPE, SANDSLASH, GOLEM, CROBAT, ARCANINE, 0 + db 56, DUGTRIO, ANNIHILAPE, SANDSLASH, GOLEM, CROBAT, ARCANINE, 0 ; Route 9 db 21, GROWLITHE, CHARMANDER, 0 db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0 @@ -218,7 +218,7 @@ JrTrainerFData: ; Route 20 db 30, TENTACOOL, HORSEA, SEEL, 0 ; Silph Gauntlet 1F (Viridian Forest) - db 62, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0 + db 56, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0 ; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon. ; Squeamata seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s. @@ -235,7 +235,7 @@ PokemaniacData: ; Rock Tunnel 1F db 23, CUBONE, SLOWPOKE, 0 ; Silph Gauntlet 2F (Mt. Moon) - db 63, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0 + db 57, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0 ; The Super Nerd has some weird choices, but I think they're mostly inorganic Pokemon, except for Fire-types that the Cinnabar Gym Trainers use. SuperNerdData: @@ -251,7 +251,7 @@ SuperNerdData: db 30, PORYGON, 0 ; db 25, GRIMER, KOFFING, KABUTO, OMANYTE, 0 ; ; Silph Gauntlet 2F (Mt. Moon) - db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0 + db 57, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0 ; Cinnabar Gym db 36, VULPIX, NINETALES, CHARIZARD, 0 db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0 @@ -285,7 +285,7 @@ HikerData: db 20, ZUBAT, DIGLETT, ONIX, 0 db 21, GEODUDE, GRAVELER, 0 ; Silph Gauntlet 2F (Mt. Moon) - db 63, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0 + db 57, STEELIX, GOLEM, MACHAMP, CROBAT, DUGTRIO, GUARDIA, 0 ; Poison Pokemon. Poison Pokemon everywhere. ; Much of this seems to represent the pollution caused by petrol gas. @@ -318,12 +318,12 @@ BikerData: db 28, GRIMER, GRIMER, SEADRA, 0 db 29, MAGMAR, 0 ; Silph Gauntlet 4F (Lavender Tower) - db 65, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0 + db 59, GOROTORA, MUK_A, WEEZING, FLAREON, KINGDRA, CHARIZARD, 0 ; Fire specialist BurglarData: ; Silph Gauntlet 4F (Lavender Tower) - db 65, RAPIDASH, CROAKOZUNA, ARCANINE, PERSIAN_A, WEEZING, MAGMORTAR, 0 + db 59, RAPIDASH, CROAKOZUNA, ARCANINE, PERSIAN_A, WEEZING, MAGMORTAR, 0 ; Unused db 33, GROWLITHE, 0 db 28, VULPIX, CHARMANDER, PONYTA, 0 @@ -346,7 +346,7 @@ EngineerData: db 21, KOTORA, VOLTORB, 0 db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, ELECTRODE, SANDSLASH_A, ELECTIVIRE, 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 58, ELECTRODE, SANDSLASH_A, ELECTIVIRE, 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: @@ -367,9 +367,9 @@ FisherData: ; Route 12 db 24, BLASTYKE, WIGLETT, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0 + db 58, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0 ; Brunswick Trail - db 65, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0 + db 57, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0 ; God this took forever to remove repeats from ; Surf encounter extravaganza @@ -394,7 +394,7 @@ SwimmerData: db 33, BLASTYKE, STARYU, WARTORTLE, 0 db 32, POLIWHIRL, TENTACOOL, GOLDUCK, 0 ; Silph Gauntlet 5F (Safari Zone) - db 66, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0 + db 60, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0 ; Fighting specialist, very odd. CueBallData: @@ -411,7 +411,7 @@ CueBallData: ; Route 21 db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0 ; Silph Gauntlet 5F (Safari Zone) - db 66, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, TENTACRUEL, 0 + db 60, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, GORILLAIMO, 0 ; Big variety, kind of aimless; seems to be a counterparts thing. GamblerData: @@ -423,7 +423,7 @@ GamblerData: ; Route 8 db 22, POLIWAG, RIBBITO, POLIWHIRL, 0 ; Silph Gauntlet 4F (Lavender Tower) - db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0 + db 59, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0 ; Route 8 db 24, CACTORMUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead. @@ -446,7 +446,7 @@ BeautyData: db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine db 29, BULBASAUR, IVYSAUR, 0 ; Silph Gauntlet 2F (Mt. Moon) - db 63, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0 + db 57, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0 ; Route 19 db 27, POLIWAG, GOLDEEN, SEAKING, 0 db 30, BLASTYKE, GOLDUCK, 0 @@ -454,11 +454,11 @@ BeautyData: ; Route 20 db 30, KINGDRA, 0 ; Close to the Trader ; Brunswick Trail - db 66, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0 + db 58, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0 ; Celeste Hill? - db 66, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina - db 65, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy - db 67, MUK, ARBOK, VILEPLUME, 0 ; Ariana + db 60, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina + db 62, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy + db 63, MUK, ARBOK, VILEPLUME, 0 ; Ariana ; yep psychic yep psychic yep psychic PsychicData: @@ -468,7 +468,7 @@ PsychicData: db 33, SLOWKING, SLOWBRO, 0 ; not as strong as it looks, has no good attacks db 38, JYNX, 0 ; Silph Gauntlet 5F (Safari Zone) - db 66, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 + db 60, SLOWBRO, EXEGGUTOR, STARMIE, MR_RIME, ESPEON, ALAKAZAM, 0 ; Electric specialist with depressingly little representation. RockerData: @@ -477,7 +477,7 @@ RockerData: ; Route 12 db 29, VOLTORB, ELECTRODE, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0 + db 58, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0 ; Psychic, Poison, and a little bit of Voltorb. JugglerData: @@ -491,7 +491,7 @@ JugglerData: ; Victory Road 2F db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster ; Silph Gauntlet 5F (Safari Zone) - db 66, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0 + db 60, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0 ; Fuchsia Gym db 38, UMBREON, 0 ; Fuchsia Gym @@ -510,7 +510,7 @@ TamerData: ; Victory Road 2F db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0 ; Silph Gauntlet 5F (Safari Zone) - db 66, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0 + db 60, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0 ; yep bird yep bird yep bird yep bird ; If nothing else, just make them less agonising to fight. @@ -533,9 +533,9 @@ BirdKeeperData: ; Route 20 db 30, FEAROW, LUXWAN, PIDGEOTTO, 0 ; Brunswick Trail - db 65, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0 + db 57, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0 ; Silph Gauntlet 1F (Viridian Forest) - db 62, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0 + db 56, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0 ; Route 14 db 28, PIDGEY, DODUO, PIDGEOTTO, 0 db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0 @@ -545,13 +545,13 @@ BirdKeeperData: ; Uses Silph products and Steel-types ChiefData: ; Silph Gauntlet 7F - db $FF, 71, ELECTRODE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0 + db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, 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, MIMMEO, GAVILLAIN, WEEZING, 0 + db 59, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0 ; Silph Co. 2F (unused) db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 db 28, MAGNETITE, VOLTORB, MAGNETON, 0 @@ -610,7 +610,7 @@ RocketData: db 26, VOLTORB, KOFFING, DROWZEE, 0 db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0 ; Silph Gauntlet 4F (Lavender Tower) - db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0 + db 59, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0 ; Silph Co. 2F - cut db 29, CUBONE, ZUBAT, 0 db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0 @@ -649,7 +649,7 @@ CooltrainerMData: db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0 db 43, KINGLER, TENTACRUEL, BLASTOISE, 0 ; Silph Gauntlet 5F (Safari Zone) - db 66, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0 + db 60, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0 ; Victory Road 1F db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0 ; Unused @@ -662,9 +662,9 @@ CooltrainerMData: ; Celadon Condominiums Morimoto - Team is LGPE's with +10 Levels each. db 64, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0 ; Brunswick Trail / Glade - db 68, RATICATE, POLIWRATH, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo - db 67, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace - db 70, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will + db 60, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo + db 57, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace + db 60, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will ; Equally varied, nothing to say CooltrainerFData: @@ -674,7 +674,7 @@ CooltrainerFData: 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 + db 60, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0 ; Victory Road 1F db 44, PERSIAN, NINETALES, BELLOSSOM, 0 ; Unused - reuse somewhere? celeste, etc? @@ -682,7 +682,7 @@ CooltrainerFData: ; db 45, NIDORINA, NIDOQUEEN, 0 ; db 43, PERSIAN, NINETALES, RAICHU, 0 ; Brunswick Glade/grotto etc, whatever desired - db 68, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf + db 60, PIDGEOT, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf ; "Dignified" Pokemon associated with the privileged class. GentlemanData: @@ -692,12 +692,12 @@ GentlemanData: ; SS Anne 2F Rooms/Vermilion Gym db 23, PIKACHU, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0 + db 58, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0 ; SS Anne 2F Rooms db 17, KOLTA, GROWLITHE, 0 ; Celeste Hill? - db 69, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji - db 67, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman + db 56, NIDOKING, GOLDUCK, GUARDIA, PIDGEOT, DODRIO, BEEDRILL, 0 ; Fuji + db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman ChannelerData: ; Unused @@ -709,7 +709,7 @@ ChannelerData: db 23, VULPIII, GASTLY, 0 db 24, VULPIX, 0 ; Silph Gauntlet 4F (Lavender Tower) - db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0 + db 59, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0 ; Pokémon Tower 3F db 25, GASTLY, HAUNTER, 0 ; Pokémon Tower 4F, now unused @@ -744,7 +744,7 @@ StudentData: db 4, PIDGEY, RATTATA, 0 db 6, CLEFAIRY, 0 ; Silph Gauntlet 1F (Viridian Forest) - db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0 ; all Normal types that Yujirou doesn't use + db 56, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0 ; all Normal types that Yujirou doesn't use ; Celadon University db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0 @@ -753,7 +753,7 @@ FirefighterData: ; Cerulean Gym db 15, POLIWAG, CHEEP, SQUIRTLE, 0 ; Silph Gauntlet 3F (S.S Anne) - db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 + db 58, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; Cinnabar Volcano db 36, WARTORTLE, MAROWAK, POLITOED, 0 db 35, SANDSLASH, OMANYTE, SEAKING, CROAKOZUNA, 0 @@ -766,15 +766,13 @@ JuniorData: JackData: ; Celadon Mansion Roof House db 25, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru. -; Silph Gauntlet 7F (Chief's Office) -; 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 db $FF, 30, MEOWTH, 26, EKANS, 24, LICKITUNG, 26, KOFFING, 0 ; Rocket Hideout db $FF, 34, MEOWTH, 30, ARBOK, 27, LICKITUNG, 30, WEEZING, 27, VICTREEBEL, 0 ; Pokemon Tower db $FF, 42, MEOWTH, 38, ARBOK, 36, LICKILICKY, 38, WEEZING, 36, VICTREEBEL, 35, GYARADOS, 0 ; Silph Co. - db $FF, 80, MEOWTH, 75, ARBOK, 73, LICKILICKY, 75, WEEZING, 73, VICTREEBEL, 71, GYARADOS, 0 ; Citrine Rocket House + db $FF, 72, MEOWTH, 67, ARBOK, 65, LICKILICKY, 67, WEEZING, 65, VICTREEBEL, 63, GYARADOS, 0 ; Citrine Rocket House INCLUDE "data/trainers/scaled_parties.asm" INCLUDE "data/trainers/rival_parties.asm" diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 314ae0a3..60de4e4a 100644 --- a/data/trainers/rival_parties.asm +++ b/data/trainers/rival_parties.asm @@ -44,24 +44,24 @@ Green2Data: db $FF, 48, SANDSLASH, 47, EXEGGCUTE, 47, NINETALES, 48, 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, MAGNEZONE, 63, NINETALES, 65, UMBREON, 0 - db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, CLOYSTER, 65, GOROCHU, 0 + db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, ARCANINE, 61, EXEGGUTOR, 63, TOTARTLE, 0 + db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, GYARADOS, 61, ARCANINE, 63, VENUSAUR, 0 + db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, EXEGGUTOR, 61, GYARADOS, 63, CHARIZARD, 0 + db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, MAGNEZONE, 61, NINETALES, 63, UMBREON, 0 + db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, NINETALES, 61, CLOYSTER, 63, GOROCHU, 0 ; post-game rematch teams, based on FRLG team - db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0 - db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0 - db $FF, 77, TRICULES, 78, ALAKAZAM, 77, IGUANARCH, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0 - db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, MAGNEZONE, 78, NINETALES, 80, UMBREON, 0 - db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, CLOYSTER, 80, GOROCHU, 0 + db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, ARCANINE, 73, EXEGGUTOR, 75, TOTARTLE, 0 + db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, GYARADOS, 73, ARCANINE, 75, VENUSAUR, 0 + db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, EXEGGUTOR, 73, GYARADOS, 75, CHARIZARD, 0 + db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, MAGNEZONE, 73, NINETALES, 75, UMBREON, 0 + db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, NINETALES, 73, CLOYSTER, 75, 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, 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 + db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0 + db $FF, 61, TAUROS, 62, EXEGGUTOR, 63, GYARADOS, 63, ARCANINE, 64, NIDOKING, 65, VENUSAUR, 0 + db $FF, 61, TAUROS, 62, ARCANINE, 63, EXEGGUTOR, 63, GYARADOS, 64, NIDOKING, 65, CHARIZARD, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, TOTARTLE, 65, CHARIZARD, 65, VENUSAUR, 0 + db $FF, 61, TAUROS, 62, MAGNEZONE, 62, NIDOKING, 65, CHARIZARD, 65, VENUSAUR, 65, 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. diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 035c618a..30a86936 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -10,7 +10,7 @@ BrockData: 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) + db $FF, 62, GOLEM, 61, GAWARHED, 61, ARCANINE_H, 62, OMASTAR, 62, KABUTOPS, 65, STEELIX, 0 ; 8 (postgame) MistyData: db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0 ; 0 badges @@ -21,7 +21,7 @@ MistyData: db $FF, 41, SEADRA, 40, CROAKOZUNA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5 db $FF, 45, KINGDRA, 44, CROAKOZUNA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6 db $FF, 47, KINGDRA, 46, CROAKOZUNA, 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) + db $FF, 62, KINGDRA, 62, GOLDUCK, 61, TAUROS_PA, 61, VAPOREON, 62, TOTARTLE, 65, STARMIE, 0 ; 8 (postgame) LtSurgeData: db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges @@ -32,7 +32,7 @@ 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, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0 ; 8 (postgame) + db $FF, 62, GOROTORA, 62, MAGNEZONE, 61, GOLEM_A, 62, ELECTIVIRE, 61, JOLTEON, 65, GOROCHU, 0 ; 8 (postgame) ErikaData: db $FF, 11, BELLSPROUT, 12, ODDISH, 14, TANGELA, 0 ; 0 badges (unused) @@ -43,7 +43,7 @@ ErikaData: 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) + db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame) KogaData: db $FF, 11, VENONAT, 12, ZUBAT, 14, KOFFING, 0 ; 0 badges (unused) @@ -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, BELLIGNAN, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused) - db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame) + db $FF, 62, VENOMOTH, 61, BELLIGNAN, 61, SLOWBRO_G, 62, MUK, 62, WEEZING, 65, CROBAT, 0 ; 8 (postgame) SabrinaData: db $FF, 11, SLOWPOKE, 12, DROWZEE, 14, KADABRA, 0 ; 0 badges (unused) @@ -65,7 +65,7 @@ SabrinaData: db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5 db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6 db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) - db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame) + db $FF, 62, EXEGGUTOR, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame) BlaineData: db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused) @@ -76,7 +76,7 @@ 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, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame) + db $FF, 62, RAPIDASH, 62, ARCANINE, 61, TAUROS_PB, 61, FLAREON, 62, CHARIZARD, 65, MAGMORTAR, 0 ; 8 (postgame) GiovanniData: ; is not scaled as he is always fought last ; Rocket Hideout B4F @@ -87,24 +87,24 @@ GiovanniData: ; is not scaled as he is always fought last db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0 LoreleiData: - db $FF, 53, DEWGONG, 52, CLOYSTER, 52, BUU, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0 + db $FF, 51, DEWGONG, 50, CLOYSTER, 50, BUU, 52, JYNX, 52, GLACEON, 54, LAPRAS, 0 ; post-game rematch team (currently unused) - db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0 + db $FF, 63, DEWGONG, 64, CLOYSTER, 63, NINETALES_A, 64, JYNX, 64, GLACEON, 66, LAPRAS, 0 BrunoData: - db $FF, 55, JABETTA, 54, STEELIX, 54, TRICULES, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0 + db $FF, 53, JABETTA, 52, STEELIX, 52, GORILLAIMO, 54, HITMONCHAN, 56, HITMONLEE, 56, MACHAMP, 0 ; post-game rematch team (currently unused) - db $FF, 70, JABETTA, 69, STEELIX, 69, SIRFETCHD, 71, TRICULES, 71, HITMONTOP, 73, MACHAMP, 0 + db $FF, 65, JABETTA, 66, STEELIX, 65, SIRFETCHD, 66, GORILLAIMO, 66, HITMONTOP, 68, MACHAMP, 0 AgathaData: - db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, GENGAR, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0 ; Agatha has double Gengars in every single battle in the main-series, it's fine here... + db $FF, 55, ANNIHILAPE, 54, CROBAT, 54, GENGAR, 56, ARBOK, 56, UMBREON, 58, GENGAR, 0 ; Agatha has double Gengars in every single battle in the main-series, it's fine here... ; post-game rematch team (currently unused) - db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0 + db $FF, 67, ANNIHILAPE, 68, CROBAT, 67, MAROWAK_A, 68, ARBOK, 68, UMBREON, 70, GENGAR, 0 LanceData: - db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, KINGDRA, 60, IGUANARCH, 60, AERODACTYL, 62, DRAGONITE, 0 + db $FF, 57, GAVILLAIN, 56, GYARADOS, 56, KINGDRA, 58, IGUANARCH, 58, AERODACTYL, 60, DRAGONITE, 0 ; post-game rematch team (currently unused) - db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, IGUANARCH, 77, DRAGONITE, 0 + db $FF, 69, GAVILLAIN, 70, GYARADOS, 69, EXEGGUTOR_A, 70, KINGDRA, 70, IGUANARCH, 72, DRAGONITE, 0 YujirouData: ; was unused juggler db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0 @@ -117,7 +117,7 @@ YujirouData: ; was unused juggler db $FF, 45, PERSIAN, 44, TAUROS, 44, CHANSEY, 45, LUXWAN, 47, LICKILICKY, 0 ; 7 db $FF, 47, PERSIAN, 46, TAUROS, 46, BLISSEY, 48, LUXWAN, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 ; post-game rematch team - db $FF, 66, PERSIAN, 65, TAUROS, 66, BLISSEY, 65, LUXWAN, 66, SNORLAX, 69, LICKILICKY, 0 + db $FF, 61, PERSIAN, 60, TAUROS, 60, BLISSEY, 61, LUXWAN, 61, SNORLAX, 64, LICKILICKY, 0 BlackbeltData: ; Koichi parties @@ -129,12 +129,12 @@ BlackbeltData: db $FF, 39, MACHOKE, 39, PRIMEAPE, 42, HITMONLEE, 42, HITMONCHAN, 42, HITMONTOP, 0 ; 5 db $FF, 43, MACHAMP, 43, PRIMEAPE, 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, 66, MACHAMP, 66, ANNIHILAPE, 66, TAUROS_P, 70, HITMONLEE, 70, HITMONCHAN, 70, HITMONTOP, 0 ; Postgame + db $FF, 50, MACHAMP, 50, CARAPTHOR, 50, ANNIHILAPE, 53, HITMONLEE, 53, HITMONCHAN, 53, HITMONTOP, 0 ; 8 + db $FF, 60, MACHAMP, 60, ANNIHILAPE, 60, TAUROS_P, 65, HITMONLEE, 65, HITMONCHAN, 65, HITMONTOP, 0 ; Postgame ; Fighting Dojo Trainers db 31, CHEEP, CHEEP, JABETTA, 0 db 32, MACHOKE, MACHAMP, 0 - db 36, SIRFETCHD, 0 + db 35, GORILLAIMO, 0 db 31, MACHOP, MANKEY, PRIMEAPE, 0 ; Viridian Gym - changed to fit the Ground-type gym theme db 40, SANDSLASH, GOLEM, 0 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index 63eba2f3..1d3aa0f8 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -4,159 +4,1035 @@ ; db 0 SpecialTrainerMoves: - ; db BUG_CATCHER, 15 - ; db 2, 2, TACKLE - ; db 2, 3, STRING_SHOT - ; db 0 -; commenting the Bug Catcher and Youngster out as they don't exist in R/B - - ; db YOUNGSTER, 14 - ; db 1, 4, FISSURE - ; db 0 - - -; NOTE: update this to match their new teams - - db BROCK, 1 - db 5, 3, BIND - db 5, 4, BIDE + db YUJIROU, 1 ; Yujirou 0 badges + db 3, 4, LICK db 0 - - db MISTY, 1 - db 5, 4, BUBBLEBEAM + + db YUJIROU, 2 ; Yujirou 1 badge + db 3, 4, LICK db 0 - - db LT_SURGE, 1 - db 5, 1, THUNDERBOLT - db 5, 2, MEGA_PUNCH - db 5, 3, MEGA_KICK - db 5, 4, GROWL + + db YUJIROU, 3 ; Yujirou 2 badges + db 1, 1, BITE + db 3, 4, CUT + db 4, 4, LICK db 0 - - db ERIKA, 1 - db 4, 3, MEGA_DRAIN - db 1, 1, RAZOR_LEAF - db 2, 1, PETAL_DANCE + + db YUJIROU, 4 ; Yujirou 3 badges + db 2, 1, DIG + db 3, 4, THUNDER_WAVE + db 4, 2, PECK + db 4, 3, CUT + db 5, 3, WRAP + db 5, 4, LICK db 0 - - db KOGA, 1 - db 1, 1, TOXIC - db 2, 1, TOXIC - db 3, 1, TOXIC - db 3, 2, DOUBLE_EDGE - db 1, 1, LEECH_LIFE - db 1, 2, DOUBLE_TEAM - db 1, 3, PSYCHIC_M - db 1, 4, TOXIC + + db YUJIROU, 5 ; Yujirou 4 badges + db 1, 1, BUBBLEBEAM + db 1, 3, SCREECH + db 1, 4, BODY_SLAM + db 2, 4, DIG + db 3, 1, SING + db 3, 3, THUNDER_WAVE + db 4, 2, PECK + db 4, 3, CUT + db 5, 2, SWORDS_DANCE + db 5, 3, WRAP + db 5, 4, LICK db 0 - - db BLAINE, 1 - db 2, 2, FLAMETHROWER - db 2, 4, CONFUSE_RAY - db 3, 2, FLAMETHROWER - db 5, 2, FIRE_BLAST - db 3, 1, REFLECT + + db YUJIROU, 6 ; Yujirou 5 badges + db 1, 1, BUBBLEBEAM + db 1, 2, BODY_SLAM + db 1, 3, THUNDERBOLT + db 2, 2, SUPER_FANG + db 2, 4, DIG + db 3, 1, SOFTBOILED + db 3, 2, EGG_BOMB + db 3, 4, PSYCHIC_M + db 4, 1, FLY + db 4, 2, CUT + db 5, 1, WRAP + db 5, 2, SWORDS_DANCE + db 5, 3, STOMP + db 5, 4, LICK db 0 - - db SABRINA, 1 - db 2, 4, PSYWAVE - db 3, 1, PSYWAVE + + db YUJIROU, 7 ; Yujirou 6 badges + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 2, 1, FIRE_BLAST + db 2, 2, TAKE_DOWN + db 3, 1, SOFTBOILED + db 3, 3, PSYCHIC_M + db 3, 4, ICE_BEAM + db 4, 1, FLY + db 5, 1, WRAP + db 5, 2, SWORDS_DANCE + db 5, 3, STOMP + db 5, 4, LICK db 0 - - db GIOVANNI, 3 - db 2, 3, FISSURE - db 2, 2, DOUBLE_TEAM - db 3, 1, EARTHQUAKE - db 3, 3, THUNDER - db 4, 1, SLASH - db 4, 2, THUNDER - db 5, 1, EARTHQUAKE - db 5, 2, LEER - db 5, 3, THUNDER - db 6, 1, ROCK_SLIDE + + db YUJIROU, 8 ; Yujirou 7 badges + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 2, 1, FIRE_BLAST + db 2, 4, TAKE_DOWN + db 3, 2, ICE_BEAM + db 3, 3, PSYCHIC_M + db 3, 4, SOFTBOILED + db 5, 1, WRAP + db 5, 2, SWORDS_DANCE + db 5, 3, STOMP + db 5, 4, EARTHQUAKE + db 0 + + db YUJIROU, 9 ; Yujirou 8 badges + db 1, 1, BUBBLEBEAM + db 1, 2, THUNDERBOLT + db 2, 1, FIRE_BLAST + db 2, 4, FISSURE + db 3, 2, ICE_BEAM + db 3, 3, PSYCHIC_M + db 3, 4, SOFTBOILED + db 5, 3, BLIZZARD + db 5, 4, AMNESIA + db 6, 1, WRAP + db 6, 2, SWORDS_DANCE + db 6, 3, HYPER_BEAM db 6, 4, EARTHQUAKE db 0 - db LORELEI, 1 - db 1, 2, SURF - db 2, 1, ICE_BEAM - db 2, 3, EXPLOSION - db 2, 4, SURF - db 3, 1, BLIZZARD - db 4, 1, BLIZZARD - db 4, 2, PSYCHIC_M - db 4, 3, LOVELY_KISS - db 5, 2, SUBMISSION + db BROCK, 1 ; Brock 0 badges + db 3, 3, BIND + db 3, 4, BIDE + db 0 + + db BROCK, 2 ; Brock 1 badge + db 2, 3, WATER_GUN + db 2, 4, ABSORB + db 3, 4, BIDE + db 4, 1, BIDE + db 0 + + db BROCK, 3 ; Brock 2 badges + db 2, 4, BIDE + db 3, 2, BUBBLEBEAM + db 3, 4, ABSORB + db 4, 4, BIDE + db 5, 4, DIG + db 0 + + db BROCK, 4 ; Brock 3 badges + db 1, 4, MEGA_PUNCH + db 2, 4, BIDE + db 3, 2, BUBBLEBEAM + db 3, 4, ABSORB + db 4, 3, TAKE_DOWN + db 4, 4, BIDE + db 5, 3, DIG + db 5, 4, ROCK_SLIDE + db 0 + + db BROCK, 5 ; Brock 4 badges + db 1, 3, MEGA_PUNCH + db 2, 1, SURF + db 2, 4, HORN_ATTACK + db 3, 2, BUBBLEBEAM + db 4, 1, SUBSTITUTE + db 4, 2, TAKE_DOWN + db 5, 1, ROCK_SLIDE + db 5, 2, DIG + db 5, 3, BIND + db 0 + + db BROCK, 6 ; Brock 5 badges + db 1, 1, MEGA_PUNCH + db 1, 3, ROCK_SLIDE + db 2, 3, SURF + db 2, 4, ICE_BEAM + db 3, 1, SURF + db 3, 3, SWORDS_DANCE + db 4, 1, SUBSTITUTE + db 4, 4, DOUBLE_EDGE + db 5, 1, ROCK_SLIDE + db 5, 2, DIG + db 5, 4, BIND + db 0 + + db BROCK, 7 ; Brock 6 badges + db 1, 1, MEGA_PUNCH + db 1, 2, ROCK_SLIDE + db 2, 2, SURF + db 2, 3, ICE_BEAM + db 3, 1, SURF + db 3, 3, SWORDS_DANCE + db 4, 1, ROCK_SLIDE + db 4, 3, DOUBLE_EDGE + db 4, 4, SUBSTITUTE + db 5, 1, ROCK_SLIDE + db 5, 2, DIG + db 5, 4, BIND + db 0 + + db JESSIE_JAMES, 1 ; Mt. Moon J&J + db 3, 3, POISON_GAS + db 0 + + db RIVAL1, 11 ; Cerulean City Rival w/Wartortle + db 2, 2, THUNDER_WAVE + db 0 + + db RIVAL1, 12 ; Cerulean City Rival w/Ivysaur + db 2, 2, THUNDER_WAVE + db 0 + + db RIVAL1, 13 ; Cerulean City Rival w/Charmeleon + db 2, 2, THUNDER_WAVE + db 0 + + db RIVAL1, 15 ; Cerulean City Rival w/Pikachu + db 4, 1, THUNDERSHOCK + db 0 + + db MISTY, 1 ; Misty 0 badges + db 1, 2, SMOKESCREEN + db 1, 3, LEER + db 2, 3, PECK + db 3, 4, BUBBLEBEAM + db 0 + + db MISTY, 2 ; Misty 1 badge + db 1, 3, LEER + db 2, 3, PECK + db 3, 2, SCRATCH + db 4, 1, SWIFT + db 4, 4, BUBBLEBEAM + db 0 + + db MISTY, 3 ; Misty 2 badges + db 1, 3, LEER + db 2, 2, DOUBLE_TEAM + db 3, 2, TAIL_WHIP + db 3, 4, PECK + db 4, 2, SCRATCH + db 5, 1, SWIFT + db 5, 4, BUBBLEBEAM + db 0 + + db RIVAL2, 1 ; SS Anne Rival w/Wartortle + db 3, 1, THUNDER_WAVE + db 0 + + db RIVAL2, 2 ; SS Anne Rival w/Ivysaur + db 3, 1, THUNDER_WAVE + db 0 + + db RIVAL2, 3 ; SS Anne Rival w/Charmeleon + db 3, 1, THUNDER_WAVE + db 0 + + db RIVAL2, 5 ; SS Anne Rival w/Pikachu + db 4, 2, THUNDERSHOCK + db 0 + + db LT_SURGE, 1 ; Surge 0 badges + db 1, 3, THUNDER_WAVE + db 2, 2, THUNDERSHOCK + db 3, 4, THUNDERBOLT + db 0 + + db LT_SURGE, 2 ; Surge 1 badge + db 1, 4, THUNDER_WAVE + db 2, 1, THUNDERSHOCK + db 3, 4, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 5, 4, THUNDER_WAVE + db 0 + + db LT_SURGE, 3 ; Surge 2 badges + db 2, 4, THUNDER_WAVE + db 3, 1, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 4, 4, THUNDER_WAVE + db 5, 1, THUNDERBOLT + db 5, 2, MEGA_PUNCH + db 5, 4, DOUBLE_TEAM + db 0 + + db LT_SURGE, 4 ; Surge 3 badges + db 1, 2, SWIFT + db 2, 1, THUNDERSHOCK + db 2, 3, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 4, 4, THUNDER_WAVE + db 5, 1, THUNDERBOLT + db 5, 2, MEGA_PUNCH + db 5, 4, DOUBLE_TEAM + db 0 + + db LT_SURGE, 5 ; Surge 4 badges + db 1, 2, SWIFT + db 2, 1, BODY_SLAM + db 2, 2, THUNDER_WAVE + db 2, 3, THUNDER + db 3, 2, SWIFT + db 4, 1, PSYCHIC_M + db 4, 2, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 5, 1, THUNDERBOLT + db 5, 2, MEGA_PUNCH + db 5, 4, SURF + db 0 + + db LT_SURGE, 6 ; Surge 5 badges + db 1, 1, SCREECH + db 1, 4, THUNDER + db 2, 1, BODY_SLAM + db 2, 2, THUNDER_WAVE + db 3, 1, THUNDERSHOCK + db 4, 1, PSYCHIC_M + db 4, 2, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 5, 1, THUNDERBOLT + db 5, 2, MEGA_PUNCH + db 5, 4, SURF + db 0 + + db LT_SURGE, 7 ; Surge 6 badges + db 1, 1, SCREECH + db 1, 4, THUNDER + db 2, 1, BODY_SLAM + db 2, 2, THUNDER_WAVE + db 3, 2, SWIFT + db 4, 1, PSYCHIC_M + db 4, 2, EARTHQUAKE + db 4, 4, THUNDERBOLT + db 5, 1, THUNDERBOLT + db 5, 2, MEGA_PUNCH + db 5, 4, SURF + db 0 + + db RIVAL2, 6 ; Pokemon Tower Rival w/Wartortle + db 1, 4, MIMIC + db 3, 3, LEECH_SEED + db 3, 4, CONFUSION + db 4, 1, THUNDER_WAVE + db 0 + + db RIVAL2, 7 ; Pokemon Tower Rival w/Ivysaur + db 1, 4, MIMIC + db 2, 3, BUBBLEBEAM + db 2, 4, BIDE + db 4, 1, THUNDER_WAVE + db 5, 1, CUT + db 0 + + db RIVAL2, 8 ; Pokemon Tower Rival w/Charmeleon + db 1, 4, MIMIC + db 2, 3, LEECH_SEED + db 2, 4, CONFUSION + db 3, 3, BUBBLEBEAM + db 3, 4, BIDE + db 4, 1, THUNDER_WAVE + db 5, 4, CUT + db 0 + + db RIVAL2, 9 ; Pokemon Tower Rival w/Eevee + db 1, 1, PECK + db 3, 3, EMBER + db 4, 1, CUT + db 4, 4, DIG + db 5, 4, BODY_SLAM + db 0 + + db RIVAL2, 10 ; Pokemon Tower Rival w/Raichu + db 1, 1, PECK + db 2, 3, EMBER + db 4, 1, CUT + db 4, 4, DIG + db 5, 2, DOUBLE_TEAM + db 5, 4, QUICK_ATTACK + db 0 + + db JACK, 1 + db 1, 4, LEER + db 3, 4, MEGA_PUNCH + db 4, 3, CUT + db 0 + + db JESSIE_JAMES, 2 ; Rocket Hideout J&J + db 2, 1, WRAP + db 3, 1, WRAP + db 0 + + db GIOVANNI, 1 ; Rocket Hideout Giovanni + db 1, 1, FURY_ATTACK + db 1, 2, STRING_SHOT + DB 1, 4, POISON_STING + db 3, 2, MEGA_PUNCH + db 3, 4, TAIL_WHIP + db 4, 1, TAKE_DOWN + db 4, 4, SCREECH + db 0 + + db ERIKA, 2 ; Erika 1 badge + db 1, 3, VINE_WHIP + db 3, 2, CUT + db 4, 4, MEGA_DRAIN + db 0 + + db ERIKA, 3 ; Erika 2 badges + db 1, 2, GROWTH + db 1, 4, VINE_WHIP + db 1, 1, CUT + db 4, 2, CUT + db 5, 3, MEGA_DRAIN + db 0 + + db ERIKA, 4 ; Erika 3 badges + db 1, 1, GROWTH + db 1, 3, VINE_WHIP + db 2, 1, MEGA_DRAIN + db 2, 2, CUT + db 2, 4, SPORE + db 3, 3, SAND_ATTACK + db 4, 2, MEGA_DRAIN + db 5, 2, MEGA_DRAIN + db 5, 4, ACID + db 0 + + db ERIKA, 5 ; Erika 4 badges + db 1, 3, ACID + db 2, 1, CUT + db 2, 3, MEGA_DRAIN + db 3, 2, SAND_ATTACK + db 3, 4, VINE_WHIP + db 4, 2, MEGA_DRAIN + db 4, 3, BIND + db 5, 2, MEGA_DRAIN + db 5, 4, ACID + db 0 + + db ERIKA, 6 ; Erika 5 badges + db 1, 3, ACID + db 2, 2, MEGA_DRAIN + db 3, 1, EARTHQUAKE + db 3, 3, VINE_WHIP + db 4, 2, MEGA_DRAIN + db 4, 4, ACID + db 5, 1, BIND + db 5, 2, MEGA_DRAIN + db 5, 4, ROCK_SLIDE + db 0 + + db ERIKA, 7 ; Erika 6 badges + db 1, 3, ACID + db 2, 2, MEGA_DRAIN + db 3, 1, EARTHQUAKE + db 3, 3, VINE_WHIP + db 4, 2, MEGA_DRAIN + db 4, 4, ACID + db 5, 1, BIND + db 5, 2, MEGA_DRAIN + db 5, 4, ROCK_SLIDE + db 0 + + db JESSIE_JAMES, 3 ; Pokemon Tower J&J + db 2, 1, WRAP + db 3, 1, WRAP + db 5, 3, STUN_SPORE + db 5, 4, ACID + db 0 + + db KOGA, 2 ; Koga 1 badge + db 3, 4, SMOKESCREEN + db 4, 2, TOXIC + db 4, 3, SCREECH + db 0 + + db KOGA, 3 ; Koga 2 badges + db 2, 4, WATER_GUN + db 3, 2, POUND + db 4, 1, TOXIC + db 5, 2, TOXIC + db 5, 3, SCREECH + db 0 + + db KOGA, 4 ; Koga 3 badges + db 1, 1, CONFUSION + db 1, 3, MEGA_DRAIN + db 2, 2, TOXIC + db 2, 4, ACID + db 3, 1, BODY_SLAM + db 3, 2, DISABLE + db 4, 4, TOXIC + db 5, 1, WING_ATTACK + db 5, 2, TOXIC + db 5, 4, SCREECH + db 0 + + db KOGA, 5 ; Koga 4 badges + db 1, 1, TOXIC + db 1, 3, MEGA_DRAIN + db 2, 1, TOXIC + db 2, 2, SURF + db 2, 3, WRAP + db 3, 3, BODY_SLAM + db 3, 4, TOXIC + db 4, 4, TOXIC + db 5, 1, TOXIC + db 5, 2, FLY + db 5, 3, SLUDGE + db 0 + + db KOGA, 6 ; Koga 5 badges + db 1, 1, TOXIC + db 1, 3, MEGA_DRAIN + db 2, 1, TOXIC + db 2, 2, SURF + db 2, 4, WRAP + db 3, 3, BODY_SLAM + db 3, 4, TOXIC + db 4, 1, TOXIC + db 5, 1, TOXIC + db 5, 2, FLY + db 0 + + db BLACKBELT, 2 ; Koichi 1 badge + db 2, 3, TACKLE + db 3, 4, TACKLE + db 4, 3, TACKLE + db 0 + + db BLACKBELT, 3 ; Koichi 2 badges + db 3, 3, TACKLE + db 4, 4, TACKLE + db 5, 3, TACKLE + db 0 + + db BLACKBELT, 4 ; Koichi 3 badges + db 2, 3, LEER + db 2, 4, UPPERCUT + db 3, 3, MEGA_KICK + db 3, 4, MIMIC + db 4, 4, MEGA_PUNCH + db 5, 3, TACKLE + db 5, 4, DIG + db 0 + + db BLACKBELT, 5 ; Koichi 4 badges + db 1, 4, ROCK_SLIDE + db 2, 2, LEER + db 2, 3, DIG + db 2, 4, SEISMIC_TOSS + db 3, 1, MIMIC + db 3, 3, MEGA_KICK + db 5, 2, DIG + db 0 + + db BLACKBELT, 6 ; Koichi 5 badges + db 1, 4, ROCK_SLIDE + db 2, 1, LOW_KICK + db 2, 2, LEER + db 2, 3, DIG + db 3, 1, MIMIC + db 3, 3, MEGA_KICK + db 5, 2, DIG + db 0 + + db BLACKBELT, 7 ; Koichi 6 badges + db 1, 3, ROCK_SLIDE + db 1, 4, EARTHQUAKE + db 2, 1, LOW_KICK + db 2, 2, LEER + db 2, 3, DIG + db 3, 2, MIMIC + db 3, 4, MEGA_KICK + db 5, 1, ROLLING_KICK + db 5, 2, DIG + db 0 + + db BLACKBELT, 8 ; Koichi 7 badges + db 1, 1, ROCK_SLIDE + db 1, 2, LOW_KICK + db 1, 3, EARTHQUAKE + db 2, 1, PIN_MISSILE + db 2, 2, UPPERCUT + db 3, 1, LOW_KICK + db 3, 2, ROCK_SLIDE + db 3, 3, DIG + db 4, 1, MIMIC + db 4, 2, MEGA_KICK + db 4, 3, MEDITATE + db 5, 1, COUNTER + db 5, 4, UPPERCUT + db 6, 1, DIG + db 0 + + db BLACKBELT, 9 ; Koichi 8 badges + db 1, 1, ROCK_SLIDE + db 1, 2, EARTHQUAKE + db 1, 3, SUBMISSION + db 2, 1, PIN_MISSILE + db 2, 2, UPPERCUT + db 3, 1, LOW_KICK + db 3, 3, ROCK_SLIDE + db 3, 4, DIG + db 4, 1, MIMIC + db 4, 2, MEDITATE + db 5, 3, UPPERCUT + db 6, 4, DIG + db 0 + + db RIVAL2, 11 ; Silph Co. Rival w/Totartle + db 1, 3, FLY + db 1, 4, MIMIC + db 3, 1, DIG + db 4, 2, BARRAGE + db 4, 4, CONFUSION + db 5, 2, THUNDER_WAVE + db 6, 1, BODY_SLAM + db 6, 2, MEGA_DRAIN + db 6, 3, SURF + db 0 + + db RIVAL2, 12 ; Silph Co. Rival w/Venusaur + db 1, 3, FLY + db 1, 4, MIMIC + db 3, 1, SURF + db 4, 1, DIG + db 5, 2, THUNDER_WAVE + db 6, 2, BODY_SLAM + db 6, 3, GROWTH + db 0 + + db RIVAL2, 13 ; Silph Co. Rival w/Charizard + db 1, 3, FLY + db 1, 4, MIMIC + db 3, 2, BARRAGE + db 3, 4, CONFUSION + db 4, 1, SURF + db 5, 2, THUNDER_WAVE + db 6, 1, FLY + db 6, 2, BODY_SLAM + db 6, 3, FLAMETHROWER + db 0 + + db RIVAL2, 14 ; Silph Co. Rival w/Umbreon + db 1, 3, DIG + db 1, 4, SWORDS_DANCE + db 2, 2, BARRAGE + db 2, 4, CONFUSION + db 3, 2, SWIFT + db 4, 1, CONFUSE_RAY + db 4, 4, FLAMETHROWER + db 5, 2, THUNDER_WAVE + db 6, 2, BODY_SLAM + db 0 + + db RIVAL2, 15 ; Silph Co. Rival w/Raichu + db 1, 3, DIG + db 1, 4, SWORDS_DANCE + db 2, 1, BARRAGE + db 2, 4, CONFUSION + db 3, 1, CONFUSE_RAY + db 3, 4, FLAMETHROWER + db 5, 2, THUNDER_WAVE db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 4, DOUBLE_TEAM + db 0 + + db JESSIE_JAMES, 4 ; Silph Co. J&J + db 1, 2, SAND_ATTACK + db 3, 4, WRAP + db 5, 3, ACID + db 5, 4, STUN_SPORE + db 6, 1, SURF + db 0 + + db GIOVANNI, 2 ; Silph Co. Giovanni + db 1, 2, DOUBLE_EDGE + db 1, 3, POISON_STING + db 2, 3, MEGA_PUNCH + db 3, 1, SUBSTITUTE + db 3, 2, SEISMIC_TOSS + db 4, 1, DOUBLE_KICK + db 5, 1, DOUBLE_KICK + db 6, 1, THUNDERBOLT + db 6, 2, BUBBLEBEAM + db 0 + + db SABRINA, 2 ; Sabrina 1 badge + db 1, 3, WATER_GUN + db 3, 1, PSYWAVE + db 4, 3, PSYWAVE + db 4, 4, REFLECT + db 0 + + db SABRINA, 3 ; Sabrina 2 badges + db 1, 4, WATER_GUN + db 3, 3, LEECH_SEED + db 3, 4, CONFUSION + db 4, 1, PSYWAVE + db 5, 3, PSYWAVE + db 5, 4, REFLECT + db 0 + + db SABRINA, 4 ; Sabrina 3 badges + db 1, 4, WATER_GUN + db 2, 3, PSYWAVE + db 2, 4, REFLECT + db 3, 3, CONFUSION + db 5, 1, REFLECT + db 0 + + db SABRINA, 5 ; Sabrina 4 badges + db 1, 1, QUICK_ATTACK + db 1, 4, SAND_ATTACK + db 2, 1, PSYWAVE + db 2, 3, SUBSTITUTE + db 3, 3, PSYCHIC_M + db 3, 4, SURF + db 4, 1, HYPNOSIS + db 4, 3, REFLECT + db 5, 1, REFLECT + db 0 + + db SABRINA, 6 ; Sabrina 5 badges + db 1, 1, QUICK_ATTACK + db 1, 4, SAND_ATTACK + db 2, 2, PSYWAVE + db 2, 4, SUBSTITUTE + db 3, 3, PSYCHIC_M + db 3, 4, SURF + db 4, 1, HYPNOSIS + db 4, 3, REFLECT + db 0 + + db SABRINA, 7 ; Sabrina 6 badges + db 1, 3, SAND_ATTACK + db 1, 4, QUICK_ATTACK + db 2, 2, PSYWAVE + db 2, 4, SUBSTITUTE + db 3, 2, PSYCHIC_M + db 3, 3, SURF + db 4, 2, HYPNOSIS + db 4, 4, REFLECT + db 0 + + db BLAINE, 3 ; Blaine 2 badges + db 2, 3, EMBER + db 3, 4, DIG + db 4, 1, CUT + db 5, 2, LEER + db 5, 3, SMOG + db 5, 4, FIRE_PUNCH + db 0 + + db BLAINE, 4 ; Blaine 3 badges + db 1, 1, EMBER + db 2, 2, EMBER + db 3, 2, DIG + db 4, 1, CUT + db 4, 4, GROWL + db 5, 2, LEER + db 5, 3, SMOG + db 5, 4, FIRE_PUNCH + db 0 + + db BLAINE, 5 ; Blaine 4 badges + db 2, 1, FLAMETHROWER + db 2, 2, DOUBLE_TEAM + db 2, 4, CONFUSE_RAY + db 3, 1, FIRE_BLAST + db 3, 2, SAND_ATTACK + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 5, 1, FIRE_BLAST + db 5, 2, SMOG + db 5, 4, FIRE_PUNCH + db 0 + + db BLAINE, 6 ; Blaine 5 badges + db 1, 2, STOMP + db 2, 1, FLAMETHROWER + db 2, 2, DOUBLE_TEAM + db 2, 4, CONFUSE_RAY + db 3, 1, FIRE_BLAST + db 3, 2, SAND_ATTACK + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 5, 1, FIRE_BLAST + db 5, 2, SMOG + db 0 + + db BLAINE, 7 ; Blaine 6 badges + db 1, 1, FIRE_SPIN + db 1, 2, STOMP + db 2, 1, FLAMETHROWER + db 2, 2, FIRE_SPIN + db 2, 4, CONFUSE_RAY + db 3, 4, FIRE_BLAST + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 5, 1, FIRE_BLAST + db 5, 2, SMOG + db 0 + + db GIOVANNI, 3 ; Gym Leader Giovanni + db 1, 1, BUBBLEBEAM + db 1, 2, EARTHQUAKE + db 2, 1, FISSURE + db 2, 2, EARTHQUAKE + db 3, 1, FIRE_BLAST + db 3, 2, ICE_BEAM + db 3, 3, SKULL_BASH + db 3, 4, BONEMERANG + db 4, 1, ROCK_SLIDE + db 4, 3, DOUBLE_KICK + db 5, 1, THUNDERBOLT + db 5, 3, DOUBLE_KICK + db 6, 1, FISSURE + db 6, 3, STOMP + db 6, 4, EARTHQUAKE + db 0 + + db RIVAL2, 16 ; Route 22 Rival w/Totartle + db 1, 2, SAND_ATTACK + db 1, 3, FLY + db 1, 4, DOUBLE_EDGE + db 2, 2, STRENGTH + db 3, 1, FIRE_BLAST + db 3, 2, DIG + db 4, 1, PSYCHIC_M + db 4, 2, SLEEP_POWDER + db 4, 4, SOLARBEAM + db 5, 1, THUNDER_WAVE + db 6, 1, BODY_SLAM + db 6, 2, MEGA_DRAIN + db 6, 3, SURF + db 6, 4, ICE_BEAM + db 0 + + db RIVAL2, 17 ; Route 22 Rival w/Venusaur + db 1, 2, SAND_ATTACK + db 1, 3, FLY + db 1, 4, DOUBLE_EDGE + db 2, 2, STRENGTH + db 3, 3, SURF + db 4, 1, FIRE_BLAST + db 4, 2, DIG + db 4, 3, AGILITY + db 5, 1, THUNDER_WAVE + db 6, 1, BODY_SLAM + db 6, 2, LEECH_SEED + db 0 + + db RIVAL2, 18 ; Route 22 Rival w/Charizard + db 1, 2, SAND_ATTACK + db 1, 3, FLY + db 1, 4, DOUBLE_EDGE + db 2, 2, STRENGTH + db 3, 2, HYPNOSIS + db 3, 3, PSYCHIC_M + db 4, 2, ICE_BEAM + db 4, 3, SURF + db 5, 1, THUNDER_WAVE + db 6, 1, FLY + db 6, 2, BODY_SLAM + db 0 + + db RIVAL2, 19 ; Route 22 Rival w/Umbreon + db 1, 1, SAND_ATTACK + db 1, 2, SLASH + db 1, 4, SWORDS_DANCE + db 2, 2, HYPNOSIS + db 2, 3, PSYCHIC_M + db 3, 1, THUNDERBOLT + db 3, 2, DOUBLE_TEAM + db 4, 1, CONFUSE_RAY + db 4, 2, REFLECT + db 4, 4, FIRE_BLAST + db 5, 1, THUNDER_WAVE + db 6, 1, BODY_SLAM + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL2, 20 ; Route 22 Rival w/Raichu + db 1, 1, SAND_ATTACK + db 1, 2, SLASH + db 1, 4, SWORDS_DANCE + db 2, 2, HYPNOSIS + db 2, 3, PSYCHIC_M + db 3, 1, CONFUSE_RAY + db 3, 2, REFLECT + db 3, 4, FIRE_BLAST + db 4, 1, SELFDESTRUCT + db 4, 4, ICE_BEAM + db 5, 1, THUNDER_WAVE + db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 4, SURF + db 0 + + db LORELEI, 1 + db 1, 1, SURF + db 1, 3, HORN_DRILL + db 2, 1, EXPLOSION + db 2, 3, ICE_BEAM + db 3, 1, BLIZZARD + db 3, 2, PSYCHIC_M + db 3, 3, BODY_SLAM + db 3, 4, MIST + db 4, 1, LOVELY_KISS + db 4, 3, PSYCHIC_M + db 4, 4, COUNTER + db 5, 1, BODY_SLAM + db 5, 2, REST + db 6, 1, HYPER_BEAM + db 6, 2, THUNDERBOLT db 6, 3, BLIZZARD db 0 db BRUNO, 1 - db 1, 1, LOW_KICK - db 1, 2, ROCK_SLIDE - db 2, 1, ROCK_SLIDE - db 2, 3, EARTHQUAKE - db 3, 1, AMNESIA - db 3, 3, SURF - db 3, 4, ICE_BEAM - db 4, 1, JUMP_KICK - db 5, 1, BIND - db 5, 2, EARTHQUAKE - db 5, 3, SWORDS_DANCE - db 6, 2, KARATE_CHOP - db 6, 1, EARTHQUAKE - db 6, 4, ROCK_SLIDE + db 1, 3, MEDITATE + db 2, 1, EARTHQUAKE + db 2, 2, ROCK_SLIDE + db 2, 4, EXPLOSION + db 3, 1, THUNDERBOLT + db 4, 1, SUBMISSION + db 5, 1, BODY_SLAM + db 5, 2, MEDITATE + db 6, 1, BODY_SLAM + db 6, 2, EARTHQUAKE + db 6, 3, ROCK_SLIDE db 0 db AGATHA, 1 - db 1, 2, HYDRO_PUMP - db 1, 3, NIGHT_SLASH - db 1, 1, SUBMISSION - db 3, 1, WRAP - db 3, 4, SLEEP_POWDER - db 4, 1, TOXIC - db 4, 3, DOUBLE_TEAM - db 5, 1, EARTHQUAKE - db 5, 3, SWORDS_DANCE + db 1, 1, LOW_KICK + db 1, 2, ROCK_SLIDE + db 1, 3, MEGA_PUNCH + db 2, 1, MEGA_DRAIN + db 2, 3, CONFUSE_RAY + db 2, 4, FLY + db 3, 1, THUNDERBOLT + db 3, 2, EXPLOSION + db 4, 1, WRAP + db 4, 4, EARTHQUAKE + db 5, 1, REST + db 5, 3, TOXIC + db 6, 1, THUNDERBOLT + db 6, 2, MEGA_DRAIN + db 6, 4, PSYCHIC_M db 0 db LANCE, 1 - db 1, 2, EARTHQUAKE - db 2, 3, BLIZZARD - db 4, 1, THUNDERBOLT - db 5, 1, EARTHQUAKE - db 6, 1, BLIZZARD + db 1, 2, THUNDERBOLT + db 1, 4, ROCK_SLIDE + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 3, 1, ICE_BEAM + db 3, 2, HYPER_BEAM + db 4, 1, SLASH + db 4, 2, SURF + db 4, 4, BODY_SLAM + db 5, 1, ROCK_THROW + db 5, 2, SKY_ATTACK + db 5, 3, DOUBLE_EDGE + db 5, 4, FIRE_BLAST + db 6, 2, BLIZZARD + db 6, 3, FIRE_BLAST db 0 - db RIVAL3, 1 - db 3, 1, EARTHQUAKE - db 3, 2, ROCK_SLIDE + db RIVAL3, 1 ; Champion Rival w/Totartle + db 1, 1, FLY + db 1, 2, SKY_ATTACK + db 1, 3, DOUBLE_EDGE + db 2, 1, THUNDER_WAVE + db 3, 2, BODY_SLAM db 4, 1, FIRE_BLAST - db 5, 1, SLEEP_POWDER - db 5, 2, EXPLOSION - db 5, 3, PSYCHIC_M - db 6, 1, BLIZZARD + db 4, 2, DIG + db 4, 3, AGILITY + db 4, 4, DOUBLE_EDGE + db 5, 1, PSYCHIC_M + db 5, 2, SLEEP_POWDER + db 5, 4, SOLARBEAM + db 6, 2, BLIZZARD + db 6, 3, BODY_SLAM db 0 - db RIVAL3, 2 - db 3, 1, EARTHQUAKE - db 3, 2, ROCK_SLIDE - db 4, 1, THUNDERBOLT - db 4, 2, BLIZZARD + db RIVAL3, 2 ; Champion Rival w/Venusaur + db 1, 1, FLY + db 1, 2, SKY_ATTACK + db 1, 3, DOUBLE_EDGE + db 2, 1, THUNDER_WAVE + db 3, 2, BODY_SLAM + db 4, 1, BLIZZARD + db 4, 2, THUNDERBOLT db 5, 1, FIRE_BLAST - db 6, 4, HYPER_BEAM + db 5, 2, DIG + db 5, 3, AGILITY + db 5, 4, DOUBLE_EDGE + db 6, 1, SOLARBEAM + db 6, 3, BODY_SLAM db 0 - db RIVAL3, 3 - db 3, 1, EARTHQUAKE - db 3, 2, ROCK_SLIDE - db 4, 1, SLEEP_POWDER - db 4, 2, EXPLOSION - db 4, 3, PSYCHIC_M - db 5, 1, THUNDERBOLT - db 5, 2, BLIZZARD - db 6, 1, EARTHQUAKE + db RIVAL3, 3 ; Champion Rival w/Charizard + db 1, 1, FLY + db 1, 2, SKY_ATTACK + db 1, 3, DOUBLE_EDGE + db 2, 1, THUNDER_WAVE + db 3, 2, BODY_SLAM + db 4, 1, PSYCHIC_M + db 4, 2, SLEEP_POWDER + db 4, 4, SOLARBEAM + db 5, 1, BLIZZARD + db 5, 2, THUNDERBOLT + db 6, 1, FLY + db 6, 3, FIRE_BLAST + db 6, 4, EARTHQUAKE + db 0 + + db RIVAL3, 4 ; Champion Rival w/Umbreon + db 1, 1, SAND_ATTACK + db 1, 2, SLASH + db 1, 4, SWORDS_DANCE + db 2, 1, THUNDER_WAVE + db 3, 1, PSYCHIC_M + db 3, 2, SLEEP_POWDER + db 3, 4, SOLARBEAM + db 4, 1, THUNDER_WAVE + db 4, 3, THUNDERBOLT + db 5, 1, CONFUSE_RAY + db 5, 2, REFLECT + db 5, 4, FIRE_BLAST + db 6, 1, BODY_SLAM + db 6, 3, QUICK_ATTACK + db 0 + + db RIVAL3, 5 ; Champion Rival w/Raichu + db 1, 1, SAND_ATTACK + db 1, 2, SLASH + db 1, 4, SWORDS_DANCE + db 2, 1, THUNDER_WAVE + db 3, 1, PSYCHIC_M + db 3, 2, SLEEP_POWDER + db 3, 4, SOLARBEAM + db 4, 1, CONFUSE_RAY + db 4, 2, REFLECT + db 4, 4, FIRE_BLAST + db 5, 1, EXPLOSION + db 5, 3, SURF + db 5, 4, BLIZZARD + db 6, 1, THUNDERBOLT + db 6, 2, BODY_SLAM + db 6, 3, THUNDER_WAVE + db 6, 4, SURF db 0 db -1 ; end diff --git a/data/wild/maps/BrunswickGrotto.asm b/data/wild/maps/BrunswickGrotto.asm index a1467d0a..92233d41 100644 --- a/data/wild/maps/BrunswickGrotto.asm +++ b/data/wild/maps/BrunswickGrotto.asm @@ -7,7 +7,7 @@ BrunswickGrottoWildMons: db 51, VENOMOTH db 53, PARASECT db 53, PARASECT - db 53, CACTORMUS + db 53, GORILLAIMO db 54, SCYTHER db 54, PINSIR db 55, PINSIR diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 30ab2f73..5fabb7e7 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -9,7 +9,7 @@ Route15WildMons: db 26, GAOTORA db 30, VENOMOTH db 28, TANGELA - db 30, TANGELA + db 28, GORILLAIMO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index f09813a2..a0d13c62 100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -7,7 +7,7 @@ SafariZoneCenterWildMons: db 24, CUBONE db 25, SLOWPOKE db 21, LICKITUNG - db 23, RAMOOSE + db 23, GORILLAIMO db 23, CHANSEY db 23, TRAMPEL end_grass_wildmons diff --git a/engine/events/pokedex_rating.asm b/engine/events/pokedex_rating.asm index d52ddff4..b096aaaf 100644 --- a/engine/events/pokedex_rating.asm +++ b/engine/events/pokedex_rating.asm @@ -70,7 +70,7 @@ DexRatingsTable: dbw 200, DexRatingText_Own180To199 dbw 215, DexRatingText_Own200To214 dbw 230, DexRatingText_Own215To229 - dbw 250, DexRatingText_Own230To249 + dbw 251, DexRatingText_Own230To249 dbw NUM_POKEMON + 1, DexRatingText_OwnComplete DexRatingText_Own0To14: diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 4d296006..52761814 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -386,9 +386,6 @@ BadgeBlkDataLengths: db 6 ; Earth Badge DeterminePaletteID: - bit TRANSFORMED, a ; a is battle status 3 - ld a, PAL_PURPLEMON ; if the mon has used Transform, use Ditto's palette - ret nz ld a, [hl] DeterminePaletteIDOutOfBattle: ld [wd11e], a diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 21f29bd5..723b1845 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -202,7 +202,7 @@ HandlePokedexListMenu: ld de, PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld b, 251 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. + ld b, 252 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. .maxSeenPokemonLoop ld a, [hld] ld c, 8 diff --git a/gfx/pics.asm b/gfx/pics.asm index d3759d0b..2b05b246 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -584,6 +584,8 @@ BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic" BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic" SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic" SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic" +GorillaimoPicFront:: INCBIN "gfx/pokemon/front/gorillaimo.pic" +GorillaimoPicBack:: INCBIN "gfx/pokemon/back/gorillaimob.pic" LancePic:: INCBIN "gfx/trainers/lance.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" diff --git a/gfx/pokemon/back/gorillaimob.png b/gfx/pokemon/back/gorillaimob.png new file mode 100644 index 00000000..943f4e59 Binary files /dev/null and b/gfx/pokemon/back/gorillaimob.png differ diff --git a/gfx/pokemon/front/gorillaimo.png b/gfx/pokemon/front/gorillaimo.png new file mode 100644 index 00000000..03e8d3ae Binary files /dev/null and b/gfx/pokemon/front/gorillaimo.png differ diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png index b2882abd..fa5bbb27 100644 Binary files a/gfx/tilesets/ship_port.png and b/gfx/tilesets/ship_port.png differ diff --git a/ram/wram.asm b/ram/wram.asm index cdd0e219..74cce97a 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2021,7 +2021,10 @@ wRedsHouse2FCurScript:: db wViridianMartCurScript:: db wRoute22GateCurScript:: db wCeruleanCityCurScript:: db - ds 5 +wCelesteHillOutsideCurScript:: db +wCelesteHillCaveCurScript:: db +wBrunswickGladeCurScript:: db + ds 2 wSSAnneBowCurScript:: db wViridianForestCurScript:: db wMuseum1FCurScript:: db diff --git a/scripts/BrunswickGlade.asm b/scripts/BrunswickGlade.asm index aa64323c..7047f003 100644 --- a/scripts/BrunswickGlade.asm +++ b/scripts/BrunswickGlade.asm @@ -1,15 +1,42 @@ BrunswickGlade_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ld hl, BrunswickGladeTrainerHeaders + ld de, BrunswickGlade_ScriptPointers + ld a, [wBrunswickGladeCurScript] + call ExecuteCurMapScriptInTable + ld [wBrunswickGladeCurScript], a + ret + +BrunswickGlade_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle BrunswickGlade_TextPointers: dw GZapRun1 dw GZapRun2 dw GZapRun3 + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw PickUpItemText + dw BrunswickGladeTrainer1 + dw BrunswickGladeTrainer2 + dw BrunswickGladeTrainer3 + dw BrunswickGladeTrainer4 dw BrunswickGladeSign1 - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText - dw PickUpItemText + +BrunswickGladeTrainerHeaders: + def_trainers +BrunswickGladeTrainerHeader0: + trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_F, 1, BrunswickGladeBattleText1, BrunswickGladeEndBattleText1, BrunswickGladeAfterBattleText1 +BrunswickGladeTrainerHeader2: ; don't ask + trainer EVENT_BEAT_BRUNSWICK_GLADE_GENTLEMAN, 4, BrunswickGladeBattleText3, BrunswickGladeEndBattleText3, BrunswickGladeAfterBattleText3 +BrunswickGladeTrainerHeader1: + trainer EVENT_BEAT_BRUNSWICK_GLADE_BEAUTY, 4, BrunswickGladeBattleText2, BrunswickGladeEndBattleText2, BrunswickGladeAfterBattleText2 +BrunswickGladeTrainerHeader3: + trainer EVENT_BEAT_BRUNSWICK_GLADE_COOLTRAINER_M, 3, BrunswickGladeBattleText4, BrunswickGladeEndBattleText4, BrunswickGladeAfterBattleText4 + db -1 ; end GZapRun1: text_far _BirdBattleText @@ -90,19 +117,81 @@ GZapRun3: jp TextScriptEnd GZapGladeRunText: - text "It ran away" - line "again..." - done + text_far _GZapGladeRunText text_end BrunswickGladeSign1: - text "BRUNSWICK GLADE" - line "The lush..." - - para "The sign has been" - line "kicked in. It's" - cont "impossible to" - cont "read..." - done + text_far _BrunswickGladeSign text_end +BrunswickGladeTrainer1: + text_asm + ld hl, BrunswickGladeTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +BrunswickGladeTrainer2: + text_asm + ld hl, BrunswickGladeTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +BrunswickGladeTrainer3: + text_asm + ld hl, BrunswickGladeTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +BrunswickGladeTrainer4: + text_asm + ld hl, BrunswickGladeTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +BrunswickGladeBattleText1: + text_far _BrunswickGladeBattleText1 + text_end + +BrunswickGladeEndBattleText1: + text_far _BrunswickGladeEndBattleText1 + text_end + +BrunswickGladeAfterBattleText1: + text_far _BrunswickGladeAfterBattleText1 + text_end + +BrunswickGladeBattleText2: + text_far _BrunswickGladeBattleText2 + text_end + +BrunswickGladeEndBattleText2: + text_far _BrunswickGladeEndBattleText2 + text_end + +BrunswickGladeAfterBattleText2: + text_far _BrunswickGladeAfterBattleText2 + text_end + +BrunswickGladeBattleText3: + text_far _BrunswickGladeBattleText3 + text_end + +BrunswickGladeEndBattleText3: + text_far _BrunswickGladeEndBattleText3 + text_end + +BrunswickGladeAfterBattleText3: + text_far _BrunswickGladeAfterBattleText3 + text_end + +BrunswickGladeBattleText4: + text_far _BrunswickGladeBattleText4 + text_end + +BrunswickGladeEndBattleText4: + text_far _BrunswickGladeEndBattleText4 + text_end + +BrunswickGladeAfterBattleText4: + text_far _BrunswickGladeAfterBattleText4 + text_end diff --git a/scripts/CelesteHillCave.asm b/scripts/CelesteHillCave.asm index c309034e..3e1495a8 100644 --- a/scripts/CelesteHillCave.asm +++ b/scripts/CelesteHillCave.asm @@ -1,6 +1,62 @@ CelesteHillCave_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ld hl, CelesteHillCaveTrainerHeaders + ld de, CelesteHillCave_ScriptPointers + ld a, [wCelesteHillCaveCurScript] + call ExecuteCurMapScriptInTable + ld [wCelesteHillCaveCurScript], a + ret + +CelesteHillCave_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle CelesteHillCave_TextPointers: + dw CelesteHillCaveTrainer1 + dw CelesteHillCaveTrainer2 + +CelesteHillCaveTrainerHeaders: + def_trainers +CelesteHillCaveTrainerHeader0: + trainer EVENT_BEAT_CELESTE_HILL_CAVE_BEAUTY, 2, CelesteHillCaveBattleText1, CelesteHillCaveEndBattleText1, CelesteHillCaveAfterBattleText1 +CelesteHillCaveTrainerHeader1: + trainer EVENT_BEAT_CELESTE_HILL_CAVE_COOLTRAINER_M, 4, CelesteHillCaveBattleText2, CelesteHillCaveEndBattleText2, CelesteHillCaveAfterBattleText2 + db -1 ; end + +CelesteHillCaveTrainer1: + text_asm + ld hl, CelesteHillCaveTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +CelesteHillCaveTrainer2: + text_asm + ld hl, CelesteHillCaveTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +CelesteHillCaveBattleText1: + text_far _CelesteHillCaveBattleText1 + text_end + +CelesteHillCaveEndBattleText1: + text_far _CelesteHillCaveEndBattleText1 + text_end + +CelesteHillCaveAfterBattleText1: + text_far _CelesteHillCaveAfterBattleText1 + text_end + +CelesteHillCaveBattleText2: + text_far _CelesteHillCaveBattleText2 + text_end + +CelesteHillCaveEndBattleText2: + text_far _CelesteHillCaveEndBattleText2 + text_end + +CelesteHillCaveAfterBattleText2: + text_far _CelesteHillCaveAfterBattleText2 + text_end - text_end ; unused diff --git a/scripts/CelesteHillOutside.asm b/scripts/CelesteHillOutside.asm index a12c4a0d..3c86a22f 100644 --- a/scripts/CelesteHillOutside.asm +++ b/scripts/CelesteHillOutside.asm @@ -1,6 +1,82 @@ CelesteHillOutside_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ld hl, CelesteHillOutsideTrainerHeaders + ld de, CelesteHillOutside_ScriptPointers + ld a, [wCelesteHillOutsideCurScript] + call ExecuteCurMapScriptInTable + ld [wCelesteHillOutsideCurScript], a + ret + +CelesteHillOutside_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle CelesteHillOutside_TextPointers: + dw CelesteHillOutsideTrainer1 + dw CelesteHillOutsideTrainer2 + dw CelesteHillOutsideTrainer3 - text_end ; unused +CelesteHillOutsideTrainerHeaders: + def_trainers +CelesteHillOutsideTrainerHeader0: + trainer EVENT_BEAT_CELESTE_HILL_OUTSIDE_BEAUTY, 2, CelesteHillOutsideBattleText1, CelesteHillOutsideEndBattleText1, CelesteHillOutsideAfterBattleText1 +CelesteHillOutsideTrainerHeader1: + trainer EVENT_BEAT_CELESTE_HILL_OUTSIDE_COOLTRAINER_M, 4, CelesteHillOutsideBattleText2, CelesteHillOutsideEndBattleText2, CelesteHillOutsideAfterBattleText2 +CelesteHillOutsideTrainerHeader2: + trainer EVENT_BEAT_CELESTE_HILL_OUTSIDE_GENTLEMAN, 4, CelesteHillOutsideBattleText3, CelesteHillOutsideEndBattleText3, CelesteHillOutsideAfterBattleText3 + db -1 ; end + +CelesteHillOutsideTrainer1: + text_asm + ld hl, CelesteHillOutsideTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +CelesteHillOutsideTrainer2: + text_asm + ld hl, CelesteHillOutsideTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +CelesteHillOutsideTrainer3: + text_asm + ld hl, CelesteHillOutsideTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +CelesteHillOutsideBattleText1: + text_far _CelesteHillOutsideBattleText1 + text_end + +CelesteHillOutsideEndBattleText1: + text_far _CelesteHillOutsideEndBattleText1 + text_end + +CelesteHillOutsideAfterBattleText1: + text_far _CelesteHillOutsideAfterBattleText1 + text_end + +CelesteHillOutsideBattleText2: + text_far _CelesteHillOutsideBattleText2 + text_end + +CelesteHillOutsideEndBattleText2: + text_far _CelesteHillOutsideEndBattleText2 + text_end + +CelesteHillOutsideAfterBattleText2: + text_far _CelesteHillOutsideAfterBattleText2 + text_end + +CelesteHillOutsideBattleText3: + text_far _CelesteHillOutsideBattleText3 + text_end + +CelesteHillOutsideEndBattleText3: + text_far _CelesteHillOutsideEndBattleText3 + text_end + +CelesteHillOutsideAfterBattleText3: + text_far _CelesteHillOutsideAfterBattleText3 + text_end \ No newline at end of file diff --git a/text.asm b/text.asm index 388cf9ab..03b17ca7 100644 --- a/text.asm +++ b/text.asm @@ -298,6 +298,9 @@ INCLUDE "text/GiovannisRoom.asm" INCLUDE "text/CitrineCity.asm" INCLUDE "text/MtMoonSquare.asm" INCLUDE "text/CinnabarVolcanoFloors.asm" +INCLUDE "text/CelesteHillOutside.asm" +INCLUDE "text/CelesteHillCave.asm" +INCLUDE "text/BrunswickGlade.asm" SECTION "Pokédex Text", ROMX diff --git a/text/BrunswickGlade.asm b/text/BrunswickGlade.asm new file mode 100644 index 00000000..949f60ec --- /dev/null +++ b/text/BrunswickGlade.asm @@ -0,0 +1,107 @@ +_BrunswickGladeSign:: + text "BRUNSWICK GLADE" + line "The lush..." + + para "The sign has been" + line "kicked in. It's" + cont "impossible to" + cont "read..." + done + +_GZapGladeRunText:: + text "It ran away" + line "again..." + done + +_BrunswickGladeBattleText1:: ; Leaf + text "You're from" + line "PALLET TOWN?" + cont "So am I!" + done + +_BrunswickGladeEndBattleText1:: + text "Dang it!" ; Taken from Smash Ultimate when a Pokemon faints. Cryptid moment. + prompt + +_BrunswickGladeAfterBattleText1:: + text "PALLET TOWN is" ; Later in the series, this lore is retroactively added. Here, we're using it for worldbuilding. + line "known for its" + cont "strong trainers!" + + para "A RATTATA snuck" ; Masters lore + line "into my kitchen" + cont "once! They're" + cont "everywhere!" + done + +_BrunswickGladeBattleText2:: ; Ariana - uses stad2 quotes + text "That sharp gaze..." + + para "You seem rather" + line "competent." + done + +_BrunswickGladeEndBattleText2:: + text "I can't" + line "look them in" + cont "the face after" + cont "this!" + prompt + +_BrunswickGladeAfterBattleText2:: + text "Have you thought" + line "about working" + cont "for TEAM ROCKET?" + + para "No? Forget I" + line "said anything." + done + +_BrunswickGladeBattleText3:: ; Fuji + text "You seem to have" + line "raised your #-" + cont "MON with love" + cont "and care." + + para "Let's see how" + line "they battle!" + done + +_BrunswickGladeEndBattleText3:: + text "Hm..." + prompt + +_BrunswickGladeAfterBattleText3:: + text "I've made many" + line "mistakes in my" + cont "life." + + para "But as long as" + line "I learn and do" + cont "do better, that" + cont "is what truly" + cont "matters." + done + +_BrunswickGladeBattleText4:: ; Trace + text "Whoa!" + + para "Oh, you're not" + line "that bird #-" + cont "MON!" + done + +_BrunswickGladeEndBattleText4:: + text "Whoa!" + line "Seriously?" + prompt + +_BrunswickGladeAfterBattleText4:: + text "That #MON" + line "looked angry!" + cont "It booked it" + cont "right past me!" + + para "Think you can" + line "quell it?" + done diff --git a/text/CelesteHillCave.asm b/text/CelesteHillCave.asm new file mode 100644 index 00000000..fb58d735 --- /dev/null +++ b/text/CelesteHillCave.asm @@ -0,0 +1,41 @@ +_CelesteHillCaveBattleText1:: + text "Want to try" + line "battling my" + cont "fairy #MON?" + done + +_CelesteHillCaveEndBattleText1:: + text "I'm" + line "shocked at" + cont "your strength!" + prompt + +_CelesteHillCaveAfterBattleText1:: + text "I should catch" + line "my ferry. I'm" + cont "getting a bit" + cont "homesick!" + done + +_CelesteHillCaveBattleText2:: + text "All righty, here" + line "goes! The super" + cont "# DUDE SHOW!" + done + +_CelesteHillCaveEndBattleText2:: + text "...!" + line "You are not an" + cont "ordinary TRAINER!" + prompt + +_CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV + text "Hm? You don't" + line "know me? Argh," + cont "that can't be" + cont "true!" + + para "You're just busy" + line "right now, aren't" + cont "you? Right?" + done diff --git a/text/CelesteHillOutside.asm b/text/CelesteHillOutside.asm new file mode 100644 index 00000000..44d4d50f --- /dev/null +++ b/text/CelesteHillOutside.asm @@ -0,0 +1,101 @@ +_CelesteHillOutsideBattleText1:: ; Selphy + text "Huh? What do" + line "you intend to" + cont "do with me?" + done + +_CelesteHillOutsideEndBattleText1:: + text "Oh..." + line "I was afraid that" + cont "you meant to harm" + cont "me." + prompt + +_CelesteHillOutsideAfterBattleText1:: + text "Sigh...I'm tired" + line "of this. Where's" + cont "my butler?" + done + +_CelesteHillOutsideBattleText2:: ; Will + text "I've trained all" + line "around the world!" + cont "I can only keep" + cont "getting better!" + done + +_CelesteHillOutsideEndBattleText2:: + text "I..." + line "I can't believe" + cont "it..." + prompt + +_CelesteHillOutsideAfterBattleText2:: + text "I won't let this" + line "sway me. One day," + cont "I will join the" + cont "ELITE FOUR!" + done + +_CelesteHillOutsideBattleText3:: ; Fan Club Chairman + text "I've heard that a" + line "beautiful #MON" + cont "resides here." + + para "Do you know" + line "about it?" + done + +_CelesteHillOutsideEndBattleText3:: + text "How" + line "disappointing..." + prompt + +_CelesteHillOutsideAfterBattleText3:: + text "Once, I was a" + line "fierce trainer!" + cont "My victory was" + cont "assured!" + + para "...but I'm too" + line "rusty. Perhaps" + cont "I should try" + cont "something else..." ; Contest allusion for RSE + done + +_HikerNPC:: + text "Urgh...hey, kid." + line "Hear me out for" + cont "a sec, would ya?" + + para "I used to love" + line "climbing up this" + cont "hill, but after" + cont "getting attacked" + cont "by that nasty-" + cont "looking bird, I" + cont "can't go back!" + + para "It had this real" + line "mean look on its" + cont "face, and its" + cont "huge wings looked" + cont "like they were on" + cont "fire!" + + para "You look tough." + line "If you ever find" + cont "a #MON like" + cont "that, teach it a" + cont "lesson for me," + cont "would ya?" + done + +_CelesteSign:: + text "CELESTE HILL" + line "BIRDWATCHING" + + para "The writing is" + line "slightly faded." + done + \ No newline at end of file diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index b10c84e2..123d67ae 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -48,7 +48,7 @@ _ViridianCityText_19175:: ; undoing localisation change line "be so mean!" para "I'm sorry, but" - cont "he hasn't sobered" + line "he hasn't sobered" cont "up yet..." done