diff --git a/3DS Border/KEPBorder.png b/3DS Border/KEPBorder.png index 3f7643b2..d34ec177 100644 Binary files a/3DS Border/KEPBorder.png and b/3DS Border/KEPBorder.png differ diff --git a/README.md b/README.md index 187d61cb..01604e04 100644 --- a/README.md +++ b/README.md @@ -261,8 +261,6 @@ Comprehensive list can be found on Discord. - Occasionally, menu text sets itself to scroll. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly -- LAST_MAP isn't updated properly when sailing from Vermilion to Citrine - After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle @@ -285,7 +283,7 @@ New Pokemon: - Electabuzz -> Electivire | Use Thunder Stone - Farfetch'd -> Luxwan | L24 - Gloom -> Bellossom | Use Leaf Stone -- Golbat -> Crobat | L44 +- Golbat -> Crobat | L40 - Lickitung -> Lickilicky | L32 - Magmar -> Magmortar | Use Fire Stone - Magneton -> Magnezone | Use Thunder Stone @@ -322,7 +320,7 @@ Kanto Prototype Pokemon: - Psyduck -> Weirduck -> Golduck | L22, L33 - Raichu -> Gorochu | Trade - Ribbito -> Croakozuna | L30 -- Squeamata -> Ministare -> Iguanarch | L30, L50 +- Squeamata -> Ministare -> Iguanarch | L30, L55 - Vulpiii -> Vulpix | L15 - Wartortle -> Totartle | L36, replaces Blastoise @@ -384,7 +382,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * HeadBoiSkye - Helped with writing NPC dialogue and Pokédex entries for new Pokémon such as Gyopin. * ZumiIsawhat? - Restorations of prototype OST. * FrenchOrange - Reconstructions of various overworld prototype sprites. -* Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). +* Helix Chamber (RacieBeep & Orchid) - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png) and below. * Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI and Pokedex stats page. Assisted in bug fixes. Used their sprite sheet generator. * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual. @@ -400,15 +398,19 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Dr. Lava - Translations of some content used in this hack, particularly the 1996 Pokedex book's entries for DYKG. * Nob Ogasawara - Prototype Pokemon names, produced for DYKG. -Helix Chamber 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, Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck +Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espeon (back), Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking (back), Slowking-G, Sylveon (back), Tangrowth, Tauros-P (all forms), Toedscool, Toedscruel, Umbreon (back), Weezing-G, Wiglett, Zapdos-G -Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Exeggutor-A, Gentlarva, Glaceon, Golem-A, Hitmontop, Iguanarch, Kleavor, Leafeon, Lickilicky, Marowak-A, Melmetal, Meltan, Moltres-G, Mr. Rime, Muk-A, Ninetales-A, Perrserker, Persian-A, Politoed, Porygon-Z, Pupal, Raichu-A, Rapidash-G, Raticate-A, Rhyperior, Sandslash-A, Sandy Shocks, Scizor, Sirfetch’d, Slowbro-G, Slowking-G, Tangrowth, Toedscool, Toedscruel, Weezing-G, Wiglett, Zapdos-G +Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross) -Martha’s Against Humanity sprites: Bellignan (with help from PvK), Mimmeo, Sylveon (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, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P, 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) -Official sprites: Crobat, Disturban, Espeon (edited by Martha’s Against Humanity), Slowking, Steelix, Tricules (edited by Martha’s Against Humanity), Umbreon (edited by Martha’s Against Humanity) +Orchid: Luxwan (back), Buu (back) + +Zeta_Null: Porygon (front) + +Official sprites: Crobat (front, edited by Martha’s Against Humanity), Disturban, Espeon (front, edited by Martha’s Against Humanity), Slowking (front), Steelix (front), Tricules, Umbreon (front, edited by Martha’s Against Humanity) Original README.md proceeding; # Pokémon Red and Blue [![Build Status][ci-badge]][ci] diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index a5e2c584..334908e3 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -94,6 +94,7 @@ const CRED_ENI const CRED_VORT const CRED_PRET + const CRED_DR_LAVA DEF NUM_CRED_STRINGS EQU const_value const_def -1, -1 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 07a46bcc..c94c40e0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -136,7 +136,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70 map_const LANCES_ROOM, 13, 13 ; $73 - map_const FARAWAY_ISLAND_OUTSIDE, 15, 18 ; $74 - Was UNUSED_MAP_72 + map_const FARAWAY_ISLAND_OUTSIDE, 15, 20 ; $74 - Was UNUSED_MAP_72 map_const FARAWAY_ISLAND_INSIDE, 15, 11 ; $75 - Was UNUSED_MAP_73 map_const POKEMON_MANSION_B2F, 15, 12 ; $76 - Was UNUSED_MAP_74 map_const MT_MOON_CRATER, 25, 25 ; $77 - Was UNUSED_MAP_75 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 8d458072..b0080372 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -239,7 +239,7 @@ PokemonCries:: mon_cry CRY_GRIMER, 85, 129 ; SNORLAX mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS - mon_cry CRY_BULBASAUR, 99, 192 ; SQUEAMATA + mon_cry CRY_BULBASAUR, 100, 320 ; SQUEAMATA mon_cry CRY_BULBASAUR, 64, 320 ; MINISTARE mon_cry CRY_BULBASAUR, 32, 320 ; IGUANARCH mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index 1ef3f2f1..1008c0ed 100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -45,6 +45,6 @@ CreditsOrder: db CRED_KEP_THANKS, CRED_FRRF, CRED_MISTY, CRED_THORNAVERY, CRED_TEXT_FADE db CRED_KEP_THANKS, CRED_PRET, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE db CRED_KEP_THANKS, CRED_SKYE, CRED_BLUEZANGOOSE, CRED_CHATOT, CRED_TEXT_FADE - db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON + db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_DR_LAVA, CRED_TEXT_FADE_MON db CRED_COPYRIGHT, CRED_TEXT_FADE_MON db CRED_THE_END diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index d6d469be..4ed3585a 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -95,6 +95,7 @@ CreditsTextPointers: dw CredEni dw CredVort dw CredPret + dw CredDrLava assert_table_length NUM_CRED_STRINGS CredVersion: @@ -284,4 +285,6 @@ CredEni: CredVort: db -3, "VORTIENE@" CredPret: - db -4, "PRET ET AL@" + db -2, "PRET@" +CredDrLava: + db -3, "DR.LAVA@" diff --git a/data/pokemon/base_stats/beedrill.asm b/data/pokemon/base_stats/beedrill.asm index 1335e22b..971fff25 100644 --- a/data/pokemon/base_stats/beedrill.asm +++ b/data/pokemon/base_stats/beedrill.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/beedrill.pic", 0, 1 ; sprite dimensions dw BeedrillPicFront, BeedrillPicBack - db FURY_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db FURY_ATTACK, POISON_STING, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/bellossom.asm b/data/pokemon/base_stats/bellossom.asm index 1f991445..c1a85ccc 100644 --- a/data/pokemon/base_stats/bellossom.asm +++ b/data/pokemon/base_stats/bellossom.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/bellossom.pic", 0, 1 ; sprite dimensions dw BellossomPicFront, BellossomPicBack - db ABSORB, STUN_SPORE, PETAL_DANCE, NO_MOVE ; level 1 learnset + db STUN_SPORE, SLEEP_POWDER, ABSORB, PETAL_DANCE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/bittybat.asm index 5aeb223d..c11c4e4e 100644 --- a/data/pokemon/base_stats/bittybat.asm +++ b/data/pokemon/base_stats/bittybat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/bittybat.pic", 0, 1 ; sprite dimensions dw BittybatPicFront, BittybatPicBack - db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/butterfree.asm b/data/pokemon/base_stats/butterfree.asm index b99f932b..462673b8 100644 --- a/data/pokemon/base_stats/butterfree.asm +++ b/data/pokemon/base_stats/butterfree.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/butterfree.pic", 0, 1 ; sprite dimensions dw ButterfreePicFront, ButterfreePicBack - db CONFUSION, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db CONFUSION, TACKLE, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/carapthor.asm b/data/pokemon/base_stats/carapthor.asm index 4ed854f0..df189a51 100644 --- a/data/pokemon/base_stats/carapthor.asm +++ b/data/pokemon/base_stats/carapthor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions dw CarapthorPicFront, CarapthorPicBack - db COMET_PUNCH, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset + db UPPERCUT, LEECH_LIFE, STRING_SHOT, HARDEN ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/croakozuna.asm b/data/pokemon/base_stats/croakozuna.asm index d302e842..ede1bac5 100644 --- a/data/pokemon/base_stats/croakozuna.asm +++ b/data/pokemon/base_stats/croakozuna.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/croakozuna.pic", 0, 1 ; sprite dimensions dw CroakozunaPicFront, CroakozunaPicBack - db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, NO_MOVE ; level 1 learnset + db DOUBLE_TEAM, DOUBLESLAP, BUBBLE, MEDITATE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/crobat.asm b/data/pokemon/base_stats/crobat.asm index f65c4228..9b037371 100644 --- a/data/pokemon/base_stats/crobat.asm +++ b/data/pokemon/base_stats/crobat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/crobat.pic", 0, 1 ; sprite dimensions dw CrobatPicFront, CrobatPicBack - db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/disturban.asm b/data/pokemon/base_stats/disturban.asm index d1e785f0..c003eb43 100644 --- a/data/pokemon/base_stats/disturban.asm +++ b/data/pokemon/base_stats/disturban.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions dw DisturbanPicFront, DisturbanPicBack - db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset + db WITHDRAW, SUPERSONIC, CLAMP, BITE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/doduo.asm b/data/pokemon/base_stats/doduo.asm index 5616ff69..62c0dc53 100644 --- a/data/pokemon/base_stats/doduo.asm +++ b/data/pokemon/base_stats/doduo.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/doduo.pic", 0, 1 ; sprite dimensions dw DoduoPicFront, DoduoPicBack - db PECK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/gaotora.asm b/data/pokemon/base_stats/gaotora.asm index 689dab60..392e7240 100644 --- a/data/pokemon/base_stats/gaotora.asm +++ b/data/pokemon/base_stats/gaotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/gaotora.pic", 0, 1 ; sprite dimensions dw GaotoraPicFront, GaotoraPicBack - db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/golbat.asm b/data/pokemon/base_stats/golbat.asm index 90230067..ca2270ae 100644 --- a/data/pokemon/base_stats/golbat.asm +++ b/data/pokemon/base_stats/golbat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/golbat.pic", 0, 1 ; sprite dimensions dw GolbatPicFront, GolbatPicBack - db LEECH_LIFE, SCREECH, BITE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/golduck.asm b/data/pokemon/base_stats/golduck.asm index 3314c452..48e167ec 100644 --- a/data/pokemon/base_stats/golduck.asm +++ b/data/pokemon/base_stats/golduck.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/golduck.pic", 0, 1 ; sprite dimensions dw GolduckPicFront, GolduckPicBack - db SCRATCH, TAIL_WHIP, DISABLE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, AMNESIA, DISABLE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/gorotora.asm b/data/pokemon/base_stats/gorotora.asm index fb24cc29..d1cb3190 100644 --- a/data/pokemon/base_stats/gorotora.asm +++ b/data/pokemon/base_stats/gorotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/gorotora.pic", 0, 1 ; sprite dimensions dw GorotoraPicFront, GorotoraPicBack - db THUNDERSHOCK, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/guardia.asm b/data/pokemon/base_stats/guardia.asm index 43a63497..b1adbcee 100644 --- a/data/pokemon/base_stats/guardia.asm +++ b/data/pokemon/base_stats/guardia.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/guardia.pic", 0, 1 ; sprite dimensions dw GuardiaPicFront, GuardiaPicBack - db BONE_CLUB, TAIL_WHIP, GROWL, HEADBUTT ; level 1 learnset + db BONE_CLUB, GROWL, LEER, TAIL_WHIP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/hitmontop.asm b/data/pokemon/base_stats/hitmontop.asm index f1d9fc01..5f0aea28 100644 --- a/data/pokemon/base_stats/hitmontop.asm +++ b/data/pokemon/base_stats/hitmontop.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/hitmontop.pic", 0, 1 ; sprite dimensions dw HitmontopPicFront, HitmontopPicBack - db ROLLING_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db ROLLING_KICK, FOCUS_ENERGY, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/iguanarch.asm b/data/pokemon/base_stats/iguanarch.asm index a3cc4ed4..b45a15ad 100644 --- a/data/pokemon/base_stats/iguanarch.asm +++ b/data/pokemon/base_stats/iguanarch.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions dw IguanarchPicFront, IguanarchPicBack - db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, LEER, BITE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/jabetta.asm b/data/pokemon/base_stats/jabetta.asm index 15f42ff9..804fb04d 100644 --- a/data/pokemon/base_stats/jabetta.asm +++ b/data/pokemon/base_stats/jabetta.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jabetta.pic", 0, 1 ; sprite dimensions dw JabettaPicFront, JabettaPicBack - db BUBBLE, PECK, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, PECK, COUNTER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/kingdra.asm b/data/pokemon/base_stats/kingdra.asm index a13e70cc..008e82be 100644 --- a/data/pokemon/base_stats/kingdra.asm +++ b/data/pokemon/base_stats/kingdra.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kingdra.pic", 0, 1 ; sprite dimensions dw KingdraPicFront, KingdraPicBack - db BUBBLE, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset + db BUBBLE, SMOKESCREEN, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/kotora.asm b/data/pokemon/base_stats/kotora.asm index 3f584eaf..ff4c2369 100644 --- a/data/pokemon/base_stats/kotora.asm +++ b/data/pokemon/base_stats/kotora.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/kotora.pic", 0, 1 ; sprite dimensions dw KotoraPicFront, KotoraPicBack - db THUNDERSHOCK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/lickilicky.asm b/data/pokemon/base_stats/lickilicky.asm index 9360cd66..0a7a13a9 100644 --- a/data/pokemon/base_stats/lickilicky.asm +++ b/data/pokemon/base_stats/lickilicky.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/lickilicky.pic", 0, 1 ; sprite dimensions dw LickilickyPicFront, LickilickyPicBack - db WRAP, SUPERSONIC, NO_MOVE, NO_MOVE ; level 1 learnset + db WRAP, SUPERSONIC, STOMP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/luxwan.asm b/data/pokemon/base_stats/luxwan.asm index b77fd8c3..7b4e7520 100644 --- a/data/pokemon/base_stats/luxwan.asm +++ b/data/pokemon/base_stats/luxwan.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions dw LuxwanPicFront, LuxwanPicBack - db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, SAND_ATTACK, LEER, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magnetite.asm b/data/pokemon/base_stats/magnetite.asm index a15e6512..f69a558b 100644 --- a/data/pokemon/base_stats/magnetite.asm +++ b/data/pokemon/base_stats/magnetite.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magnetite.pic", 0, 1 ; sprite dimensions dw MagnetitePicFront, MagnetitePicBack - db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magneton.asm b/data/pokemon/base_stats/magneton.asm index 29a80d5f..db4cef9b 100644 --- a/data/pokemon/base_stats/magneton.asm +++ b/data/pokemon/base_stats/magneton.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magneton.pic", 0, 1 ; sprite dimensions dw MagnetonPicFront, MagnetonPicBack - db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/magnezone.asm b/data/pokemon/base_stats/magnezone.asm index 25435484..20bcd0fa 100644 --- a/data/pokemon/base_stats/magnezone.asm +++ b/data/pokemon/base_stats/magnezone.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/magnezone.pic", 0, 1 ; sprite dimensions dw MagnezonePicFront, MagnezonePicBack - db TACKLE, SONICBOOM, THUNDERSHOCK, NO_MOVE ; level 1 learnset + db TACKLE, THUNDERSHOCK, SONICBOOM, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/melmetal.asm b/data/pokemon/base_stats/melmetal.asm index f009148b..7f54fe61 100644 --- a/data/pokemon/base_stats/melmetal.asm +++ b/data/pokemon/base_stats/melmetal.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/melmetal.pic", 0, 1 ; sprite dimensions dw MelmetalPicFront, MelmetalPicBack - db THUNDERSHOCK, HARDEN, THUNDER_WAVE, TAIL_WHIP ; level 1 learnset + db THUNDERSHOCK, HARDEN, TAIL_WHIP, HEADBUTT ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ministare.asm b/data/pokemon/base_stats/ministare.asm index 942422b4..5450b99e 100644 --- a/data/pokemon/base_stats/ministare.asm +++ b/data/pokemon/base_stats/ministare.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions dw MinistarePicFront, MinistarePicBack - db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, TAIL_WHIP, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/mrrime.asm b/data/pokemon/base_stats/mrrime.asm index b79420a8..dbbf1278 100644 --- a/data/pokemon/base_stats/mrrime.asm +++ b/data/pokemon/base_stats/mrrime.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/mr.rime.pic", 0, 1 ; sprite dimensions dw MrRimePicFront, MrRimePicBack - db CONFUSION, REFLECT, NO_MOVE, NO_MOVE ; level 1 learnset + db CONFUSION, BARRIER, REFLECT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoking.asm b/data/pokemon/base_stats/nidoking.asm index e0094618..0799d962 100644 --- a/data/pokemon/base_stats/nidoking.asm +++ b/data/pokemon/base_stats/nidoking.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoking.pic", 0, 1 ; sprite dimensions dw NidokingPicFront, NidokingPicBack - db TACKLE, HORN_ATTACK, POISON_STING, THRASH ; level 1 learnset + db TACKLE, HORN_ATTACK, FOCUS_ENERGY, THRASH ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/nidoreign.asm b/data/pokemon/base_stats/nidoreign.asm index a9c89110..c2520653 100644 --- a/data/pokemon/base_stats/nidoreign.asm +++ b/data/pokemon/base_stats/nidoreign.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/nidoreign.pic", 0, 1 ; sprite dimensions dw NidoreignPicFront, NidoreignPicBack - db TACKLE, SPIKE_CANNON, POISON_STING, THRASH ; level 1 learnset + db TACKLE, POISON_STING, DOUBLE_KICK, SPIKE_CANNON ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/omastar.asm b/data/pokemon/base_stats/omastar.asm index 13118b68..4382f8f7 100644 --- a/data/pokemon/base_stats/omastar.asm +++ b/data/pokemon/base_stats/omastar.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/omastar.pic", 0, 1 ; sprite dimensions dw OmastarPicFront, OmastarPicBack - db WATER_GUN, WITHDRAW, HORN_ATTACK, NO_MOVE ; level 1 learnset + db WATER_GUN, WITHDRAW, ROCK_THROW, HORN_ATTACK ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/pendraken.asm b/data/pokemon/base_stats/pendraken.asm index 276a275a..7b257222 100644 --- a/data/pokemon/base_stats/pendraken.asm +++ b/data/pokemon/base_stats/pendraken.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/pendraken.pic", 0, 1 ; sprite dimensions dw PendrakenPicFront, PendrakenPicBack - db CONSTRICT, SMOKESCREEN, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, SMOKESCREEN, BUBBLE, WRAP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/perrserker.asm b/data/pokemon/base_stats/perrserker.asm index 7514c3a9..514b5454 100644 --- a/data/pokemon/base_stats/perrserker.asm +++ b/data/pokemon/base_stats/perrserker.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/perrserker.pic", 0, 1 ; sprite dimensions dw PerrserkerPicFront, PerrserkerPicBack - db GROWL, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, GROWL, BITE, SCREECH ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/politoed.asm b/data/pokemon/base_stats/politoed.asm index 58592cbb..45f5d124 100644 --- a/data/pokemon/base_stats/politoed.asm +++ b/data/pokemon/base_stats/politoed.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/politoed.pic", 0, 1 ; sprite dimensions dw PolitoedPicFront, PolitoedPicBack - db HYPNOSIS, WATER_GUN, DOUBLESLAP, NO_MOVE ; level 1 learnset + db HYPNOSIS, WATER_GUN, DOUBLESLAP, BODY_SLAM ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ponyta.asm b/data/pokemon/base_stats/ponyta.asm index a17fc6a3..3f42aae7 100644 --- a/data/pokemon/base_stats/ponyta.asm +++ b/data/pokemon/base_stats/ponyta.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ponyta.pic", 0, 1 ; sprite dimensions dw PonytaPicFront, PonytaPicBack - db EMBER, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/scizor.asm b/data/pokemon/base_stats/scizor.asm index f3c5eb16..5381e056 100644 --- a/data/pokemon/base_stats/scizor.asm +++ b/data/pokemon/base_stats/scizor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/scizor.pic", 0, 1 ; sprite dimensions dw ScizorPicFront, ScizorPicBack - db QUICK_ATTACK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db QUICK_ATTACK, IRON_HEAD, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/sharpoon.asm b/data/pokemon/base_stats/sharpoon.asm index b0f71c29..3553f128 100644 --- a/data/pokemon/base_stats/sharpoon.asm +++ b/data/pokemon/base_stats/sharpoon.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions dw SharpoonPicFront, SharpoonPicBack - db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db BITE, LEER, WATER_GUN, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/tangrowth.asm b/data/pokemon/base_stats/tangrowth.asm index c23add24..f842fa1b 100644 --- a/data/pokemon/base_stats/tangrowth.asm +++ b/data/pokemon/base_stats/tangrowth.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/tangrowth.pic", 0, 1 ; sprite dimensions dw TangrowthPicFront, TangrowthPicBack - db CONSTRICT, BIND, NO_MOVE, NO_MOVE ; level 1 learnset + db CONSTRICT, BIND, ABSORB, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/tauros.asm b/data/pokemon/base_stats/tauros.asm index 15f7751e..d3ec7d98 100644 --- a/data/pokemon/base_stats/tauros.asm +++ b/data/pokemon/base_stats/tauros.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/tauros.pic", 0, 1 ; sprite dimensions dw TaurosPicFront, TaurosPicBack - db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurosp.asm b/data/pokemon/base_stats/taurosp.asm index 10627b46..a0fa1279 100644 --- a/data/pokemon/base_stats/taurosp.asm +++ b/data/pokemon/base_stats/taurosp.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospcombat.pic", 0, 1 ; sprite dimensions dw TaurosPPicFront, TaurosPPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurospa.asm b/data/pokemon/base_stats/taurospa.asm index 52dabb4a..5afddeea 100644 --- a/data/pokemon/base_stats/taurospa.asm +++ b/data/pokemon/base_stats/taurospa.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospaqua.pic", 0, 1 ; sprite dimensions dw TaurosPAPicFront, TaurosPAPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/taurospb.asm b/data/pokemon/base_stats/taurospb.asm index 77a60350..14df4bcd 100644 --- a/data/pokemon/base_stats/taurospb.asm +++ b/data/pokemon/base_stats/taurospb.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/taurospblaze.pic", 0, 1 ; sprite dimensions dw TaurosPBPicFront, TaurosPBPicBack - db DOUBLE_KICK, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db DOUBLE_KICK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/toedscruel.asm b/data/pokemon/base_stats/toedscruel.asm index e0a9395c..210af29d 100644 --- a/data/pokemon/base_stats/toedscruel.asm +++ b/data/pokemon/base_stats/toedscruel.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/toedscruel.pic", 0, 1 ; sprite dimensions dw ToedscruelPicFront, ToedscruelPicBack - db ABSORB, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db ABSORB, SUPERSONIC, WRAP, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/totartle.asm b/data/pokemon/base_stats/totartle.asm index 4da90085..6b88f9f6 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, NO_MOVE ; level 1 learnset + db TACKLE, TAIL_WHIP, BUBBLE, WATER_GUN ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/trampel.asm b/data/pokemon/base_stats/trampel.asm index 5596476c..9c999c0f 100644 --- a/data/pokemon/base_stats/trampel.asm +++ b/data/pokemon/base_stats/trampel.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/trampel.pic", 0, 1 ; sprite dimensions dw TrampelPicFront, TrampelPicBack - db TACKLE, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset + db TACKLE, GROWL, HORN_ATTACK, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/wugtrio.asm b/data/pokemon/base_stats/wugtrio.asm index 1b935f81..4a20bd1d 100644 --- a/data/pokemon/base_stats/wugtrio.asm +++ b/data/pokemon/base_stats/wugtrio.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/wugtrio.pic", 0, 1 ; sprite dimensions dw WugtrioPicFront, WugtrioPicBack - db WATER_GUN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db WATER_GUN, SAND_ATTACK, WRAP, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/zubat.asm b/data/pokemon/base_stats/zubat.asm index cc8fe9a2..79f4117e 100644 --- a/data/pokemon/base_stats/zubat.asm +++ b/data/pokemon/base_stats/zubat.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/zubat.pic", 0, 1 ; sprite dimensions dw ZubatPicFront, ZubatPicBack - db LEECH_LIFE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db LEECH_LIFE, TACKLE, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 31f3a472..33adab56 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -890,13 +890,13 @@ _ZubatDexEntry:: ; new entry dex _EkansDexEntry:: ; new entry - text "It flicks its" + text "EKANS flicks its" next "tongue to check" - next "for danger. If" + next "for danger. If it" - page "it eats RATTATA," - next "it can go without" - next "food for a month" + page "eats a RATTATA, it" + next "won't need to eat" + next "again for a month" dex _ParasDexEntry:: ; new entry diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 5629a741..99f6e906 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -272,11 +272,13 @@ RhydonEvosMoves: db EV_ITEM, PROTECTOR, 1, RHYPERIOR db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 48, LEER + db 55, EARTHQUAKE db 64, TAKE_DOWN db 0 @@ -313,6 +315,7 @@ ClefairyEvosMoves: db 18, DOUBLESLAP db 24, MINIMIZE db 31, METRONOME + db 35, BODY_SLAM db 39, DEFENSE_CURL db 48, LIGHT_SCREEN db 0 @@ -348,6 +351,7 @@ NidokingEvosMoves: db 8, HORN_ATTACK db 14, POISON_STING db 23, THRASH + db 36, EARTHQUAKE db 0 SlowbroEvosMoves: @@ -414,12 +418,14 @@ GrimerEvosMoves: db EV_LEVEL, 38, MUK db 0 ; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 42, HARDEN - db 48, SCREECH - db 55, ACID_ARMOR + db 11, POISON_GAS + db 15, ACID + db 19, MINIMIZE + db 24, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 41, ACID_ARMOR + db 47, HAZE db 0 GengarEvosMoves: @@ -450,6 +456,7 @@ NidoqueenEvosMoves: db 8, SCRATCH db 14, POISON_STING db 23, BODY_SLAM + db 36, EARTHQUAKE db 0 CuboneEvosMoves: @@ -472,11 +479,13 @@ RhyhornEvosMoves: db EV_LEVEL, 42, RHYDON db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 45, HORN_DRILL - db 50, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 45, LEER + db 50, EARTHQUAKE db 55, TAKE_DOWN db 0 @@ -567,9 +576,9 @@ ScytherEvosMoves: db 20, FOCUS_ENERGY db 24, DOUBLE_TEAM db 29, SLASH + db 32, WING_ATTACK db 35, SWORDS_DANCE db 42, AGILITY - db 50, WING_ATTACK db 0 StaryuEvosMoves: @@ -618,14 +627,15 @@ TangelaEvosMoves: db EV_LEVEL, 44, TANGROWTH db 0 ; Learnset - db 24, BIND - db 27, ABSORB - db 29, VINE_WHIP - db 32, POISONPOWDER - db 36, STUN_SPORE - db 39, SLEEP_POWDER - db 45, SLAM - db 48, GROWTH + db 13, BIND + db 19, ABSORB + db 24, VINE_WHIP + db 28, POISONPOWDER + db 31, STUN_SPORE + db 34, SLEEP_POWDER + db 40, SLAM + db 46, GROWTH + db 52, NIGHT_SHADE db 0 GawarhedEvosMoves: @@ -642,6 +652,8 @@ NidoreignEvosMoves: ; Evolutions db 0 ; Learnset + db 36, ROCK_SLIDE + db 43, BODY_SLAM db 50, THRASH db 0 @@ -732,6 +744,7 @@ GravelerEvosMoves: db 29, HARDEN db 36, EARTHQUAKE db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 ChanseyEvosMoves: @@ -808,6 +821,7 @@ ParasectEvosMoves: ; Evolutions db 0 ; Learnset + db 6, ABSORB db 13, STUN_SPORE db 20, LEECH_LIFE db 30, SPORE @@ -820,7 +834,7 @@ PsyduckEvosMoves: db EV_LEVEL, 22, WEIRDUCK db 0 ; Learnset - db 14, TAIL_WHIP + db 12, TAIL_WHIP db 15, AMNESIA db 18, DISABLE db 26, CONFUSION @@ -851,6 +865,7 @@ GolemEvosMoves: db 29, HARDEN db 36, EARTHQUAKE db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 BalumbaEvosMoves: @@ -905,12 +920,12 @@ MagnetonEvosMoves: db EV_ITEM, THUNDER_STONE, 1, MAGNEZONE db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 38, THUNDER_WAVE - db 46, SWIFT - db 54, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 24, THUNDER_WAVE + db 38, SWIFT + db 45, SCREECH db 0 KoffingEvosMoves: @@ -918,11 +933,11 @@ KoffingEvosMoves: db EV_LEVEL, 35, WEEZING db 0 ; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 45, HAZE - db 48, EXPLOSION + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 41, EXPLOSION db 0 RamooseEvosMoves: @@ -960,11 +975,12 @@ SeelEvosMoves: db EV_LEVEL, 34, DEWGONG db 0 ; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 40, REST - db 45, TAKE_DOWN - db 50, ICE_BEAM + db 15, POWDER_SNOW + db 20, GROWL + db 25, AURORA_BEAM + db 30, REST + db 35, TAKE_DOWN + db 40, ICE_BEAM db 0 DiglettEvosMoves: @@ -984,8 +1000,8 @@ TaurosEvosMoves: db 0 ; Learnset db 21, STOMP - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, BODY_SLAM db 44, RAGE db 51, TAKE_DOWN db 0 @@ -994,12 +1010,13 @@ TrampelEvosMoves: ; Evolutions db 0 ; Learnset - db 10, HORN_ATTACK - db 23, STOMP - db 30, RAGE - db 38, FURY_ATTACK + db 16, STOMP + db 23, RAGE + db 30, FURY_ATTACK + db 38, BODY_SLAM db 44, LEER db 50, ROAR + db 56, EARTHQUAKE db 0 GavillainEvosMoves: @@ -1008,10 +1025,11 @@ GavillainEvosMoves: ; Learnset db 7, SUPERSONIC db 12, BITE - db 20, DRAGON_RAGE - db 24, SLASH - db 30, SCREECH - db 38, GLARE + db 20, THUNDERSHOCK + db 24, DRAGON_RAGE + db 30, SLASH + db 35, SCREECH + db 41, GLARE db 46, CONFUSE_RAY db 0 @@ -1086,11 +1104,11 @@ SharpoonEvosMoves: ; Evolutions db 0 ; Learnset - db 15, WATER_GUN - db 24, SCREECH - db 29, HORN_ATTACK - db 34, FURY_ATTACK - db 38, BRUTAL_SWING + db 15, SCREECH + db 24, HORN_ATTACK + db 29, BRUTAL_SWING + db 34, SMART_STRIKE + db 38, FURY_ATTACK db 42, IRON_HEAD db 49, HYDRO_PUMP db 55, HORN_DRILL @@ -1102,10 +1120,9 @@ BittybatEvosMoves: db 0 ; Learnset db 7, WING_ATTACK - db 14, GUST - db 18, CONFUSE_RAY - db 22, BITE - db 26, TACKLE + db 12, GUST + db 18, BITE + db 22, CONFUSE_RAY db 30, DISABLE db 34, HAZE db 0 @@ -1115,12 +1132,12 @@ DoduoEvosMoves: db EV_LEVEL, 31, DODRIO db 0 ; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 36, RAGE - db 40, TRI_ATTACK - db 44, AGILITY + db 11, FURY_ATTACK + db 20, QUICK_ATTACK + db 24, RAGE + db 28, DRILL_PECK + db 33, TRI_ATTACK + db 38, AGILITY db 0 PoliwagEvosMoves: @@ -1140,6 +1157,7 @@ JynxEvosMoves: ; Evolutions db 0 ; Learnset + db 13, POWDER_SNOW db 18, LICK db 23, DOUBLESLAP db 31, ICE_PUNCH @@ -1187,11 +1205,13 @@ MeowthEvosMoves: db EV_LEVEL, 28, PERSIAN db 0 ; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 33, FURY_SWIPES - db 44, SLASH + db 5, PAY_DAY + db 8, TAIL_WHIP + db 12, SAND_ATTACK + db 21, BITE + db 26, FURY_SWIPES + db 33, SCREECH + db 38, SLASH db 0 KrabbyEvosMoves: @@ -1244,10 +1264,10 @@ VulpiiiEvosMoves: ; Learnset db 7, QUICK_ATTACK db 14, ROAR - db 21, DOUBLE_TEAM - db 28, CONFUSE_RAY - db 35, FLAMETHROWER - db 42, FIRE_SPIN + db 19, DOUBLE_TEAM + db 25, CONFUSE_RAY + db 31, FLAMETHROWER + db 38, FIRE_SPIN db 0 VulpixEvosMoves: @@ -1255,8 +1275,9 @@ VulpixEvosMoves: db EV_ITEM, FIRE_STONE, 1, NINETALES db 0 ; Learnset - db 16, QUICK_ATTACK - db 21, ROAR + db 7, QUICK_ATTACK + db 14, ROAR + db 21, DOUBLE_TEAM db 28, CONFUSE_RAY db 35, FLAMETHROWER db 42, FIRE_SPIN @@ -1301,22 +1322,23 @@ RibbitoEvosMoves: db 19, WATER_GUN db 24, FEINT_ATTACK db 31, SUBSTITUTE - db 41, KOWTOW_CLEAVE - db 49, HYDRO_PUMP - db 53, NIGHT_SLASH + db 37, KOWTOW_CLEAVE + db 44, HYDRO_PUMP + db 50, NIGHT_SLASH db 0 CroakozunaEvosMoves: ; Evolutions db 0 ; Learnset + db 7, BUBBLE db 13, MEDITATE db 19, WATER_GUN - db 26, FEINT_ATTACK - db 31, SUBSTITUTE - db 45, KOWTOW_CLEAVE - db 53, HYDRO_PUMP - db 58, NIGHT_SLASH + db 24, FEINT_ATTACK + db 35, SUBSTITUTE + db 41, KOWTOW_CLEAVE + db 49, HYDRO_PUMP + db 53, NIGHT_SLASH db 0 DratiniEvosMoves: @@ -1348,6 +1370,7 @@ KabutoEvosMoves: db EV_LEVEL, 40, KABUTOPS db 0 ; Learnset + db 21, ROCK_THROW db 34, ABSORB db 39, SLASH db 44, LEER @@ -1358,6 +1381,7 @@ KabutopsEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 34, ABSORB db 39, SLASH db 46, LEER @@ -1384,20 +1408,21 @@ SeadraEvosMoves: db 19, SMOKESCREEN db 24, LEER db 30, WATER_GUN + db 32, PIN_MISSILE db 41, AGILITY db 52, HYDRO_PUMP db 0 MinistareEvosMoves: ; Evolutions - db EV_LEVEL, 50, IGUANARCH + db EV_LEVEL, 55, IGUANARCH db 0 ; Learnset db 10, LEER db 20, BITE - db 30, GLARE - db 40, DRAGON_RAGE - db 50, SLASH + db 35, GLARE + db 45, DRAGON_RAGE + db 55, SLASH db 0 IguanarchEvosMoves: @@ -1406,9 +1431,9 @@ IguanarchEvosMoves: ; Learnset db 10, LEER db 20, BITE - db 30, GLARE - db 40, DRAGON_RAGE - db 50, SLASH + db 35, GLARE + db 45, DRAGON_RAGE + db 60, SLASH db 0 SandshrewEvosMoves: @@ -1420,6 +1445,7 @@ SandshrewEvosMoves: db 17, SLASH db 24, POISON_STING db 31, SWIFT + db 35, EARTHQUAKE db 38, FURY_SWIPES db 0 @@ -1431,6 +1457,7 @@ SandslashEvosMoves: db 17, SLASH db 27, POISON_STING db 36, SWIFT + db 42, EARTHQUAKE db 47, FURY_SWIPES db 0 @@ -1439,6 +1466,7 @@ OmanyteEvosMoves: db EV_LEVEL, 40, OMASTAR db 0 ; Learnset + db 21, ROCK_THROW db 34, HORN_ATTACK db 39, LEER db 46, SPIKE_CANNON @@ -1449,6 +1477,7 @@ OmastarEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 34, HORN_ATTACK db 39, LEER db 44, SPIKE_CANNON @@ -1555,11 +1584,13 @@ ZubatEvosMoves: db EV_LEVEL, 23, GOLBAT db 0 ; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 28, WING_ATTACK - db 36, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 24, CONFUSE_RAY + db 29, DISABLE + db 34, HAZE db 0 EkansEvosMoves: @@ -1579,6 +1610,7 @@ ParasEvosMoves: db EV_LEVEL, 24, PARASECT db 0 ; Learnset + db 6, ABSORB db 13, STUN_SPORE db 20, LEECH_LIFE db 27, SPORE @@ -1620,13 +1652,16 @@ KakunaEvosMoves: db EV_LEVEL, 10, BEEDRILL db 0 ; Learnset + db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 BeedrillEvosMoves: ; Evolutions db 0 ; Learnset - db 12, FURY_ATTACK + db 10, FURY_ATTACK db 16, FOCUS_ENERGY db 20, TWINEEDLE db 25, RAGE @@ -1650,12 +1685,12 @@ DodrioEvosMoves: ; Evolutions db 0 ; Learnset - db 20, GROWL - db 24, FURY_ATTACK - db 30, DRILL_PECK - db 39, RAGE - db 45, TRI_ATTACK - db 51, AGILITY + db 11, FURY_ATTACK + db 20, QUICK_ATTACK + db 24, RAGE + db 28, DRILL_PECK + db 36, TRI_ATTACK + db 42, AGILITY db 0 PrimeapeEvosMoves: @@ -1700,11 +1735,12 @@ DewgongEvosMoves: ; Evolutions db 0 ; Learnset - db 30, GROWL - db 35, AURORA_BEAM - db 44, REST - db 50, TAKE_DOWN - db 56, ICE_BEAM + db 15, POWDER_SNOW + db 20, GROWL + db 25, AURORA_BEAM + db 30, REST + db 39, TAKE_DOWN + db 45, ICE_BEAM db 0 TriculesEvosMoves: @@ -1724,14 +1760,14 @@ PendrakenEvosMoves: ; Evolutions db 0 ; Learnset - db 10, BUBBLE - db 14, WRAP - db 24, FAIRY_WIND - db 29, HYPNOSIS - db 32, SUPERSONIC - db 44, DAZZLE_GLEAM - db 50, HAZE - db 54, HYDRO_PUMP + db 8, BUBBLE + db 13, WRAP + db 19, FAIRY_WIND + db 23, HYPNOSIS + db 27, SUPERSONIC + db 35, DAZZLE_GLEAM + db 42, HAZE + db 47, HYDRO_PUMP db 0 CaterpieEvosMoves: @@ -1747,6 +1783,8 @@ MetapodEvosMoves: db 0 ; Learnset db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 ButterfreeEvosMoves: @@ -1776,27 +1814,33 @@ MachampEvosMoves: WeirduckEvosMoves: ; Evolutions - db EV_LEVEL, 35, GOLDUCK + db EV_LEVEL, 33, GOLDUCK db 0 ; Learnset + db 12, TAIL_WHIP + db 15, AMNESIA db 22, SUPERSONIC db 25, DISABLE - db 29, CONFUSION - db 34, GLARE + db 28, CONFUSION + db 32, GLARE db 39, FURY_SWIPES db 41, PSYBEAM - db 55, HYDRO_PUMP + db 46, HYDRO_PUMP db 0 GolduckEvosMoves: ; Evolutions db 0 ; Learnset - db 28, TAIL_WHIP - db 31, DISABLE - db 39, CONFUSION - db 48, FURY_SWIPES - db 59, HYDRO_PUMP + db 12, TAIL_WHIP + db 15, AMNESIA + db 22, SUPERSONIC + db 25, DISABLE + db 28, CONFUSION + db 32, GLARE + db 42, FURY_SWIPES + db 47, PSYBEAM + db 52, HYDRO_PUMP db 0 HypnoEvosMoves: @@ -1813,14 +1857,17 @@ HypnoEvosMoves: GolbatEvosMoves: ; Evolutions - db EV_LEVEL, 44, CROBAT + db EV_LEVEL, 40, CROBAT db 0 ; Learnset - db 10, SUPERSONIC - db 15, BITE - db 21, CONFUSE_RAY - db 32, WING_ATTACK - db 43, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 26, CONFUSE_RAY + db 32, DISABLE + db 38, SCREECH + db 42, HAZE db 0 MewtwoEvosMoves: @@ -1879,12 +1926,14 @@ MukEvosMoves: ; Evolutions db 0 ; Learnset - db 30, POISON_GAS - db 33, MINIMIZE - db 37, SLUDGE - db 45, HARDEN - db 53, SCREECH - db 60, ACID_ARMOR + db 11, POISON_GAS + db 15, ACID + db 19, MINIMIZE + db 24, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 46, ACID_ARMOR + db 53, HAZE db 0 DecillaEvosMoves: @@ -1921,12 +1970,12 @@ MagnetiteEvosMoves: db EV_LEVEL, 30, MAGNETON db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 24, THUNDER_WAVE + db 36, SWIFT + db 42, SCREECH db 0 ElectrodeEvosMoves: @@ -1950,22 +1999,24 @@ WeezingEvosMoves: ; Evolutions db 0 ; Learnset - db 32, SLUDGE - db 39, SMOKESCREEN - db 43, SELFDESTRUCT - db 49, HAZE - db 53, EXPLOSION + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 46, EXPLOSION db 0 PersianEvosMoves: ; Evolutions db 0 ; Learnset - db 12, BITE - db 17, PAY_DAY - db 24, SCREECH - db 37, FURY_SWIPES - db 51, SLASH + db 5, PAY_DAY + db 8, TAIL_WHIP + db 12, SAND_ATTACK + db 21, BITE + db 26, FURY_SWIPES + db 35, SCREECH + db 40, SLASH db 0 MarowakEvosMoves: @@ -1987,6 +2038,9 @@ GuardiaEvosMoves: ; Evolutions db 0 ; Learnset + db 10, BONE_CLUB + db 13, TAIL_WHIP + db 18, HEADBUTT db 25, LEER db 33, FOCUS_ENERGY db 41, THRASH @@ -2101,7 +2155,7 @@ OrfryEvosMoves: ; Learnset db 7, SUPERSONIC db 12, HORN_ATTACK - db 16, FURY_ATTACK + db 18, FURY_ATTACK db 26, WATERFALL db 30, HORN_DRILL db 34, AGILITY @@ -2112,24 +2166,25 @@ GoldeenEvosMoves: db EV_LEVEL, 33, SEAKING db 0 ; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 37, WATERFALL - db 45, HORN_DRILL - db 54, AGILITY + db 7, SUPERSONIC + db 12, HORN_ATTACK + db 20, FURY_ATTACK + db 29, WATERFALL + db 34, HORN_DRILL + db 39, AGILITY db 0 SeakingEvosMoves: ; Evolutions db 0 ; Learnset - db 19, SUPERSONIC - db 24, HORN_ATTACK - db 30, FURY_ATTACK - db 39, WATERFALL - db 48, HORN_DRILL - db 54, AGILITY + db 7, SUPERSONIC + db 12, HORN_ATTACK + db 20, FURY_ATTACK + db 29, WATERFALL + db 37, HORN_DRILL + db 41, AGILITY + db 46, SWORDS_DANCE db 0 KotoraEvosMoves: @@ -2188,24 +2243,26 @@ PonytaEvosMoves: db EV_LEVEL, 40, RAPIDASH db 0 ; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 43, TAKE_DOWN - db 48, AGILITY + db 7, QUICK_ATTACK + db 14, GROWL + db 24, STOMP + db 31, FLAMETHROWER + db 37, AGILITY + db 43, FIRE_SPIN + db 47, TAKE_DOWN db 0 RapidashEvosMoves: ; Evolutions db 0 ; Learnset - db 30, TAIL_WHIP - db 32, STOMP - db 35, GROWL - db 39, FIRE_SPIN - db 47, TAKE_DOWN - db 55, AGILITY + db 7, QUICK_ATTACK + db 14, GROWL + db 24, STOMP + db 31, FLAMETHROWER + db 37, AGILITY + db 46, FIRE_SPIN + db 52, TAKE_DOWN db 0 RattataEvosMoves: @@ -2270,6 +2327,7 @@ GeodudeEvosMoves: db 26, HARDEN db 31, EARTHQUAKE db 36, EXPLOSION + db 41, ROCK_SLIDE db 0 PorygonEvosMoves: @@ -2287,6 +2345,7 @@ AerodactylEvosMoves: ; Evolutions db 0 ; Learnset + db 21, ROCK_THROW db 33, SUPERSONIC db 38, BITE db 45, TAKE_DOWN @@ -2311,12 +2370,12 @@ MagnemiteEvosMoves: db EV_LEVEL, 20, MAGNETITE db 0 ; Learnset - db 21, SONICBOOM - db 25, THUNDERSHOCK - db 29, SUPERSONIC - db 35, THUNDER_WAVE - db 41, SWIFT - db 47, SCREECH + db 6, THUNDERSHOCK + db 11, SONICBOOM + db 16, SUPERSONIC + db 21, THUNDER_WAVE + db 33, SWIFT + db 39, SCREECH db 0 SqueamataEvosMoves: @@ -2409,7 +2468,8 @@ TotartleEvosMoves: ; Evolutions db 0 ; Learnset - db 18, WATER_GUN + db 8, BUBBLE + db 15, WATER_GUN db 24, BITE db 31, WITHDRAW db 42, SKULL_BASH @@ -2540,7 +2600,7 @@ ScizorEvosMoves: ; Learnset db 17, LEER db 20, FOCUS_ENERGY - db 24, IRON_HEAD + db 24, DOUBLE_TEAM db 29, SLASH db 35, SWORDS_DANCE db 42, AGILITY @@ -2551,11 +2611,13 @@ RhyperiorEvosMoves: ; Evolutions db 0 ; Learnset - db 30, STOMP - db 35, TAIL_WHIP - db 40, FURY_ATTACK - db 48, HORN_DRILL - db 55, LEER + db 20, STOMP + db 25, TAIL_WHIP + db 30, FURY_ATTACK + db 35, ROCK_SLIDE + db 40, HORN_DRILL + db 48, LEER + db 55, EARTHQUAKE db 64, TAKE_DOWN db 0 @@ -2640,14 +2702,15 @@ TangrowthEvosMoves: ; Evolutions db 0 ; Learnset - db 24, BIND - db 27, ABSORB - db 29, VINE_WHIP - db 32, POISONPOWDER - db 36, STUN_SPORE - db 39, SLEEP_POWDER - db 45, SLAM - db 48, GROWTH + db 13, BIND + db 19, ABSORB + db 24, VINE_WHIP + db 28, POISONPOWDER + db 31, STUN_SPORE + db 34, SLEEP_POWDER + db 40, SLAM + db 50, GROWTH + db 56, NIGHT_SHADE db 0 KleavorEvosMoves: @@ -2666,7 +2729,10 @@ KleavorEvosMoves: BellignanEvosMoves: ; Evolutions db 0 -; Learnset +; Learnset + db 13, WRAP + db 15, POISONPOWDER + db 18, SLEEP_POWDER db 40, LOVELY_KISS db 48, SOLARBEAM db 0 @@ -2701,7 +2767,6 @@ HitmontopEvosMoves: ; Evolutions db 0 ; Learnset - db 7, FOCUS_ENERGY db 33, QUICK_ATTACK db 38, COUNTER db 43, AGILITY @@ -2713,14 +2778,15 @@ CrobatEvosMoves: ; Evolutions db 0 ; Learnset - db 7, GUST - db 10, SUPERSONIC - db 15, BITE - db 17, QUICK_ATTACK - db 21, CONFUSE_RAY - db 26, SLUDGE - db 32, WING_ATTACK - db 43, HAZE + db 7, WING_ATTACK + db 12, GUST + db 14, SUPERSONIC + db 20, BITE + db 26, CONFUSE_RAY + db 32, DISABLE + db 38, SCREECH + db 42, SLUDGE + db 46, HAZE db 50, AGILITY db 0 @@ -2828,6 +2894,9 @@ PupalEvosMoves: db EV_LEVEL, 10, CARAPTHOR db 0 ; Learnset + db 7, HARDEN + db 8, HARDEN + db 9, HARDEN db 0 CarapthorEvosMoves: @@ -2911,8 +2980,8 @@ WugtrioEvosMoves: db 15, SAND_ATTACK db 19, WRAP db 24, HEADBUTT - db 31, DIG - db 40, HYDRO_PUMP + db 35, DIG + db 47, HYDRO_PUMP db 0 ToedscoolEvosMoves: @@ -2948,29 +3017,28 @@ PerrserkerEvosMoves: ; Evolutions db 0 ; Learnset - db 8, SCRATCH - db 12, PAY_DAY - db 17, BITE - db 25, SMART_STRIKE - db 29, FURY_SWIPES - db 32, SCREECH - db 36, SLASH - db 40, METAL_SOUND - db 45, IRON_HEAD + db 5, PAY_DAY + db 8, BITE + db 12, FURY_SWIPES + db 21, SMART_STRIKE + db 26, SCREECH + db 35, METAL_SOUND + db 40, SLASH + db 46, IRON_HEAD db 0 SirfetchdEvosMoves: ; Evolutions db 0 ; Learnset - db 7, LEER - db 15, DOUBLE_KICK - db 23, BRUTAL_SWING - db 31, LOW_KICK - db 39, SWORDS_DANCE - db 44, JUMP_KICK - db 49, ROLLING_KICK - db 55, HI_JUMP_KICK + db 13, LEER + db 17, DOUBLE_KICK + db 21, BRUTAL_SWING + db 25, SWORDS_DANCE + db 29, LOW_KICK + db 33, JUMP_KICK + db 41, ROLLING_KICK + db 45, HI_JUMP_KICK db 0 MrRimeEvosMoves: @@ -3002,14 +3070,12 @@ MelmetalEvosMoves: db 0 ; Learnset db 9, TAIL_WHIP - db 16, HEADBUTT - db 18, THUNDER_WAVE - db 20, THUNDERSHOCK - db 27, THUNDERPUNCH - db 36, ACID_ARMOR - db 45, MAGNET_BOMB - db 51, MEGA_PUNCH - db 63, SMART_STRIKE + db 18, HEADBUTT + db 27, THUNDER_WAVE + db 36, THUNDERPUNCH + db 45, ACID_ARMOR + db 54, MAGNET_BOMB + db 63, MEGA_PUNCH db 72, IRON_HEAD db 81, SUBMISSION db 90, HYPER_BEAM @@ -3098,90 +3164,94 @@ DugtrioAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, GROWL - db 20, SLASH - db 31, DIG - db 35, IRON_HEAD - db 39, EARTHQUAKE - db 43, FISSURE + db 15, GROWL + db 19, DIG + db 24, SAND_ATTACK + db 30, IRON_HEAD + db 35, SLASH + db 43, EARTHQUAKE + db 47, FISSURE db 0 PersianAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, BITE - db 14, FURY_SWIPES - db 17, SCREECH - db 22, FEINT_ATTACK - db 30, PAY_DAY - db 33, SLASH - db 38, NASTY_PLOT - db 49, NIGHT_SLASH + db 5, PAY_DAY + db 8, BITE + db 12, FURY_SWIPES + db 21, FEINT_ATTACK + db 26, SCREECH + db 35, NASTY_PLOT + db 40, SLASH + db 46, NIGHT_SLASH db 0 GolemAEvosMoves: ; Evolutions db 0 ; Learnset + db 11, DEFENSE_CURL db 16, ROCK_THROW - db 22, THUNDERPUNCH - db 24, SELFDESTRUCT - db 36, EXPLOSION - db 40, DOUBLE_EDGE + db 21, SELFDESTRUCT + db 29, THUNDERPUNCH + db 36, DOUBLE_EDGE + db 43, EXPLOSION + db 50, ROCK_SLIDE db 0 RapidashGEvosMoves: ; Evolutions db 0 ; Learnset - db 30, TAIL_WHIP - db 32, CONFUSION - db 35, FAIRY_WIND - db 39, AGILITY - db 42, PSYBEAM - db 46, STOMP - db 47, TAKE_DOWN - db 52, DAZZLE_GLEAM - db 55, PSYCHIC_M + db 7, QUICK_ATTACK + db 14, FAIRY_WIND + db 24, STOMP + db 31, PSYBEAM + db 37, AGILITY + db 46, DAZZLE_GLEAM + db 52, TAKE_DOWN + db 56, PSYCHIC_M db 0 SlowbroGEvosMoves: ; Evolutions db 0 ; Learnset - db 8, ACID - db 14, CONFUSION - db 22, DISABLE - db 30, HEADBUTT - db 38, AMNESIA - db 42, PSYCHIC_M + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, ACID + db 37, WITHDRAW + db 44, AMNESIA + db 49, SLUDGE + db 55, PSYCHIC_M db 0 SlowkingGEvosMoves: ; Evolutions db 0 ; Learnset - db 8, ACID - db 14, CONFUSION - db 22, DISABLE - db 30, HEADBUTT - db 38, AMNESIA - db 42, PSYCHIC_M + db 18, DISABLE + db 22, HEADBUTT + db 27, GROWL + db 33, ACID + db 44, AMNESIA + db 55, PSYCHIC_M db 0 MukAEvosMoves: ; Evolutions db 0 ; Learnset - db 6, HARDEN - db 12, MINIMIZE - db 18, DISABLE + db 11, POISON_GAS + db 15, MINIMIZE + db 19, SLUDGE db 24, BRUTAL_SWING - db 30, SCREECH - db 36, NIGHT_SLASH - db 42, ACID_ARMOR - db 48, SLUDGE + db 29, HARDEN + db 35, SCREECH + db 46, NIGHT_SLASH + db 53, ACID_ARMOR db 0 ExeggutorAEvosMoves: @@ -3204,7 +3274,7 @@ MarowakAEvosMoves: db 25, LEER db 33, EMBER db 41, THRASH - db 46, BONEMERANG + db 48, BONEMERANG db 55, FLAMETHROWER db 0 @@ -3212,21 +3282,22 @@ WeezingGEvosMoves: ; Evolutions db 0 ; Learnset - db 32, SLUDGE - db 37, SMOKESCREEN - db 40, SELFDESTRUCT - db 43, DAZZLE_GLEAM - db 49, HAZE - db 53, EXPLOSION + db 9, FAIRY_WIND + db 17, SLUDGE + db 21, SMOKESCREEN + db 25, SELFDESTRUCT + db 33, HAZE + db 39, DAZZLE_GLEAM + db 46, EXPLOSION db 0 TaurosPEvosMoves: ; Evolutions db 0 ; Learnset - db 21, ROLLING_KICK - db 28, TAIL_WHIP - db 35, LEER + db 21, LOW_KICK + db 28, LEER + db 35, ROLLING_KICK db 44, RAGE db 51, JUMP_KICK db 0 @@ -3236,8 +3307,8 @@ TaurosPAEvosMoves: db 0 ; Learnset db 21, LOW_KICK - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, WATER_GUN db 44, RAGE db 51, HYDRO_PUMP db 0 @@ -3247,8 +3318,8 @@ TaurosPBEvosMoves: db 0 ; Learnset db 21, LOW_KICK - db 28, TAIL_WHIP - db 35, LEER + db 28, LEER + db 35, FLAMETHROWER db 44, RAGE db 51, FIRE_SPIN db 0 diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 3ecfa64b..5dd0f70d 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -115,7 +115,7 @@ MonsterPalettes: db PAL_REDMON ; ARCANINE_H db PAL_BROWNMON ; FARFETCHD db PAL_BROWNMON ; LUXWAN - db PAL_BROWNMON ; SIRFETCHD + db PAL_GREENMON ; SIRFETCHD db PAL_YELLOWMON ; DROWZEE db PAL_YELLOWMON ; HYPNO db PAL_GREYMON ; MAGNEMITE diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 184b4d90..ba42e2dd 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -75,7 +75,7 @@ Citrine_Coll:: coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21, $39, $3C, $48, $49, $58, $59 Celeste_Coll:: - coll_tiles $1e, $20, $2e, $30, $34, $37, $39, $40, $51, $52, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c + coll_tiles $20, $2e, $30, $37, $39, $40, $51, $53, $5a, $5c, $5e, $5f, $09, $08, $18, $19, $0c, $1c RocketHouse_Coll:: coll_tiles $13, $31, $01, $53 diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 5a097dc1..1237f6ce 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -15,7 +15,6 @@ DoorTileIDPointers: dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co. dbw CITRINE, .CitrineDoorTileIDs dbw CELESTE, .CelesteDoorTileIDs - dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs db -1 ; end MACRO door_tiles @@ -66,6 +65,3 @@ ENDM .CelesteDoorTileIDs: door_tiles $0C, $1C - -.SeagallopPortDoorTileIDs: - door_tiles $0E, $1E diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm index ec0d8fc8..a339d044 100644 --- a/data/tilesets/pair_collision_tile_ids.asm +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -6,6 +6,9 @@ TilePairCollisionsLand:: db CAVERN, $20, $05 db CAVERN, $41, $05 + db CELESTE, $30, $2E + db CELESTE, $18, $2E + db CELESTE, $5E, $2E db FOREST, $30, $2E db CAVERN, $2A, $05 db CAVERN, $05, $21 diff --git a/data/tilesets/warp_carpet_tile_ids.asm b/data/tilesets/warp_carpet_tile_ids.asm index 1b8ebbbe..443a8a01 100644 --- a/data/tilesets/warp_carpet_tile_ids.asm +++ b/data/tilesets/warp_carpet_tile_ids.asm @@ -12,10 +12,10 @@ MACRO warp_carpet_tiles ENDM .FacingDownWarpTiles: - warp_carpet_tiles $01, $12, $17, $3D, $04, $18, $33 + warp_carpet_tiles $01, $0B, $12, $16, $23, $17, $3D, $04, $18, $33, $51, $52 .FacingUpWarpTiles: - warp_carpet_tiles $01, $5C + warp_carpet_tiles $01, $34, $36, $5C, $5F, .FacingLeftWarpTiles: warp_carpet_tiles $1A, $4B diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 0282b6b6..4e4423b6 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -107,7 +107,7 @@ ENDM warp_tiles $1B, $1C, $0B, $0C, $58, $59 .CelesteWarpTileIDs: - warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better + warp_tiles $5A, $5C .RocketHouseWarpTileIDs: warp_tiles diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index 16d3dbe8..7aa6600a 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -8,8 +8,8 @@ DiglettsCaveWildMons: db 16, DIGLETT db 21, DIGLETT db 22, DIGLETT - db 29, DUGTRIO - db 31, DUGTRIO + db 28, DUGTRIO + db 30, DUGTRIO end_grass_wildmons def_water_wildmons 5 ; encounter rate @@ -21,6 +21,6 @@ DiglettsCaveWildMons: db 15, WIGLETT db 21, WIGLETT db 22, WIGLETT - db 29, WUGTRIO - db 31, WUGTRIO + db 28, WUGTRIO + db 30, WUGTRIO end_water_wildmons diff --git a/gfx/blocksets/celeste.bst b/gfx/blocksets/celeste.bst index bb0f6fae..c9304c13 100644 Binary files a/gfx/blocksets/celeste.bst and b/gfx/blocksets/celeste.bst differ diff --git a/gfx/pics.asm b/gfx/pics.asm index 4b65398c..d3759d0b 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -468,8 +468,6 @@ MoltresGPicFront:: INCBIN "gfx/pokemon/front/moltresg.pic" MoltresGPicBack:: INCBIN "gfx/pokemon/back/moltresgb.pic" PerrserkerPicFront:: INCBIN "gfx/pokemon/front/perrserker.pic" PerrserkerPicBack:: INCBIN "gfx/pokemon/back/perrserkerb.pic" -SirfetchdPicFront:: INCBIN "gfx/pokemon/front/sirfetchd.pic" -SirfetchdPicBack:: INCBIN "gfx/pokemon/back/sirfetchdb.pic" MrRimePicFront:: INCBIN "gfx/pokemon/front/mr.rime.pic" MrRimePicBack:: INCBIN "gfx/pokemon/back/mr.rimeb.pic" @@ -584,6 +582,8 @@ MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic" MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic" 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" LancePic:: INCBIN "gfx/trainers/lance.pic" YujirouPic:: INCBIN "gfx/trainers/yujirou.pic" diff --git a/gfx/pokemon/back/blisseyb.png b/gfx/pokemon/back/blisseyb.png index 6f63aa52..b3661ab8 100644 Binary files a/gfx/pokemon/back/blisseyb.png and b/gfx/pokemon/back/blisseyb.png differ diff --git a/gfx/pokemon/back/carapthorb.png b/gfx/pokemon/back/carapthorb.png index 96b4d1eb..b29d5ef2 100644 Binary files a/gfx/pokemon/back/carapthorb.png and b/gfx/pokemon/back/carapthorb.png differ diff --git a/gfx/pokemon/back/espeonb.png b/gfx/pokemon/back/espeonb.png index 76879c0c..d9a75fcc 100644 Binary files a/gfx/pokemon/back/espeonb.png and b/gfx/pokemon/back/espeonb.png differ diff --git a/gfx/pokemon/back/glaceonb.png b/gfx/pokemon/back/glaceonb.png index 9ad0b6c1..61787efa 100644 Binary files a/gfx/pokemon/back/glaceonb.png and b/gfx/pokemon/back/glaceonb.png differ diff --git a/gfx/pokemon/back/hitmontopb.png b/gfx/pokemon/back/hitmontopb.png index 9bf21a7b..a1d9b1fc 100644 Binary files a/gfx/pokemon/back/hitmontopb.png and b/gfx/pokemon/back/hitmontopb.png differ diff --git a/gfx/pokemon/back/kleavorb.png b/gfx/pokemon/back/kleavorb.png index 2d2a5ad8..249de7fb 100644 Binary files a/gfx/pokemon/back/kleavorb.png and b/gfx/pokemon/back/kleavorb.png differ diff --git a/gfx/pokemon/back/lickilickyb.png b/gfx/pokemon/back/lickilickyb.png index 09aad09a..f4ce0da4 100644 Binary files a/gfx/pokemon/back/lickilickyb.png and b/gfx/pokemon/back/lickilickyb.png differ diff --git a/gfx/pokemon/back/magnezoneb.png b/gfx/pokemon/back/magnezoneb.png index 5d4868ed..43c14135 100644 Binary files a/gfx/pokemon/back/magnezoneb.png and b/gfx/pokemon/back/magnezoneb.png differ diff --git a/gfx/pokemon/back/melmetalb.png b/gfx/pokemon/back/melmetalb.png index 65b26c79..748814eb 100644 Binary files a/gfx/pokemon/back/melmetalb.png and b/gfx/pokemon/back/melmetalb.png differ diff --git a/gfx/pokemon/back/moltresgb.png b/gfx/pokemon/back/moltresgb.png index 54b9663b..1230abdf 100644 Binary files a/gfx/pokemon/back/moltresgb.png and b/gfx/pokemon/back/moltresgb.png differ diff --git a/gfx/pokemon/back/mr.rimeb.png b/gfx/pokemon/back/mr.rimeb.png index cf863f49..df686629 100644 Binary files a/gfx/pokemon/back/mr.rimeb.png and b/gfx/pokemon/back/mr.rimeb.png differ diff --git a/gfx/pokemon/back/perrserkerb.png b/gfx/pokemon/back/perrserkerb.png index 88a3540c..cad15ef2 100644 Binary files a/gfx/pokemon/back/perrserkerb.png and b/gfx/pokemon/back/perrserkerb.png differ diff --git a/gfx/pokemon/back/pupalb.png b/gfx/pokemon/back/pupalb.png index 1c8d830f..d41dd004 100644 Binary files a/gfx/pokemon/back/pupalb.png and b/gfx/pokemon/back/pupalb.png differ diff --git a/gfx/pokemon/back/rhyperiorb.png b/gfx/pokemon/back/rhyperiorb.png index 8b4f49c7..07edf19e 100644 Binary files a/gfx/pokemon/back/rhyperiorb.png and b/gfx/pokemon/back/rhyperiorb.png differ diff --git a/gfx/pokemon/back/sandyshocksb.png b/gfx/pokemon/back/sandyshocksb.png index 2b776bba..fc4bb6bc 100644 Binary files a/gfx/pokemon/back/sandyshocksb.png and b/gfx/pokemon/back/sandyshocksb.png differ diff --git a/gfx/pokemon/back/screamtailb.png b/gfx/pokemon/back/screamtailb.png index f8d0426e..823c1504 100644 Binary files a/gfx/pokemon/back/screamtailb.png and b/gfx/pokemon/back/screamtailb.png differ diff --git a/gfx/pokemon/back/slowbrogb.png b/gfx/pokemon/back/slowbrogb.png index a34ca4e3..776e0372 100644 Binary files a/gfx/pokemon/back/slowbrogb.png and b/gfx/pokemon/back/slowbrogb.png differ diff --git a/gfx/pokemon/back/taurospcombatb.png b/gfx/pokemon/back/taurospcombatb.png index 782fca20..c4f66f7e 100644 Binary files a/gfx/pokemon/back/taurospcombatb.png and b/gfx/pokemon/back/taurospcombatb.png differ diff --git a/gfx/pokemon/back/toedscoolb.png b/gfx/pokemon/back/toedscoolb.png index dc282006..29a5f6f2 100644 Binary files a/gfx/pokemon/back/toedscoolb.png and b/gfx/pokemon/back/toedscoolb.png differ diff --git a/gfx/pokemon/back/umbreonb.png b/gfx/pokemon/back/umbreonb.png index 693dba94..31ab72df 100644 Binary files a/gfx/pokemon/back/umbreonb.png and b/gfx/pokemon/back/umbreonb.png differ diff --git a/gfx/pokemon/front/carapthor.png b/gfx/pokemon/front/carapthor.png index b773f773..c69a5a22 100644 Binary files a/gfx/pokemon/front/carapthor.png and b/gfx/pokemon/front/carapthor.png differ diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 68ec471b..993fd202 100644 Binary files a/gfx/pokemon/front/porygon.png and b/gfx/pokemon/front/porygon.png differ diff --git a/gfx/pokemon/front/rapidashg.png b/gfx/pokemon/front/rapidashg.png index 6abaf335..e345a154 100644 Binary files a/gfx/pokemon/front/rapidashg.png and b/gfx/pokemon/front/rapidashg.png differ diff --git a/gfx/pokemon/front/sirfetchd.png b/gfx/pokemon/front/sirfetchd.png index e08bf848..d4ab5b73 100644 Binary files a/gfx/pokemon/front/sirfetchd.png and b/gfx/pokemon/front/sirfetchd.png differ diff --git a/gfx/tilesets/celeste.png b/gfx/tilesets/celeste.png index c888552d..2a50e000 100644 Binary files a/gfx/tilesets/celeste.png and b/gfx/tilesets/celeste.png differ diff --git a/gfx/tilesets/ship_port.png b/gfx/tilesets/ship_port.png index fa5bbb27..b2882abd 100644 Binary files a/gfx/tilesets/ship_port.png and b/gfx/tilesets/ship_port.png differ diff --git a/home/overworld.asm b/home/overworld.asm index 88768280..604c1d37 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -773,6 +773,12 @@ ExtraWarpCheck:: jr z, .useFunction2 cp SHIP_PORT ; Vermilion Port tileset jr z, .useFunction2 + cp SEAGALLOPPORT ; Ferry Port tileset + jr z, .useFunction2 + cp CITRINE ; Citrine tileset + jr z, .useFunction2 + cp CELESTE ; Celeste/Faraway tileset + jr z, .useFunction2 cp PLATEAU ; Indigo Plateau tileset jr z, .useFunction2 .useFunction1 diff --git a/maps/BrunswickGlade.blk b/maps/BrunswickGlade.blk index 857ba53c..166aee27 100644 --- a/maps/BrunswickGlade.blk +++ b/maps/BrunswickGlade.blk @@ -1,2 +1,2 @@ Xg;"Z7bbb -7 $g)g. 7779 g):7 )I( g,,_(gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY \ No newline at end of file +7 $g)g. 7779 g):7 )I8 g_:gg_)#g_.bZU_}}}}I_UgU_;_U._8_bUg7.L8_aU_6igbhgY \ No newline at end of file diff --git a/maps/CelesteHill.blk b/maps/CelesteHill.blk index b6b79066..22b8510f 100644 --- a/maps/CelesteHill.blk +++ b/maps/CelesteHill.blk @@ -1 +1 @@ -@B@B@B@$.%B@B@B@aU_aB@iaaiB@jjjB@s)BDEFYDEF \ No newline at end of file +@B@B@B@$.%B@B@B@aU_aB@iiB@jVVVVB@)BDEFYDEF \ No newline at end of file diff --git a/maps/CelesteHillOutside.blk b/maps/CelesteHillOutside.blk index b366f25a..90b92bba 100644 --- a/maps/CelesteHillOutside.blk +++ b/maps/CelesteHillOutside.blk @@ -1 +1 @@ -,X,,a(,.geanjsUg.ggg)aggcj,g.s,(((g_dH9:g!)gggg%gg)g./,((((AAAAB@C(EEE?B@Bdsggg@B@Bggggggg@B@Bggg@BD?>gg<=CFD?>gjV/@ABgDFg<>_DdFgDFg%0ggAAAg/sV,AAABsV/sV@AAABAAAAB@CD?ACFEEE?B@BDdFggg@B@Bggggggg@B@Bggg@BD?>gg<=CFD?>gAB----@BADFEF-l--@BDE?CF----<=@ANA@CGF-----@DEFADFAB--k--@-DEEEEGF-----@-pYk--k-DE \ No newline at end of file +@BB@BB@BB@BnB@B(nXB@B'n((*BDF*(((B+F*+bCF-@C''bAAB--@BACEF--@B<>AB----@BADFEF-l--@BDE?CF----<=@ANA@CGF-----@DEFADFAB-----@-DEEEEGF-l---@--pk---l-DE--pmmm-----------------k---- \ No newline at end of file diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 283a2672..308ccb40 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -210,6 +210,36 @@ ResetLegendaryPokemon: ld a, HS_MEWTWO call ShowThis .skipGalarianBirdsAndMewtwo + + ; trade flags are in groups based on the + ; ordering in data/events/trades.asm + ; the numbering follows LSB -> MSB + ; (ie, trades 8 and 9 are the rightmost two bits) + + ; trades 0-7 + ; ld b, %11111111 + ; ld a, [wCompletedInGameTradeFlags] + ; and b + ; ld [wCompletedInGameTradeFlags], a + + ; trades 8-15 + ld b, %00000011 + ld a, [wCompletedInGameTradeFlags+1] + and b + ld [wCompletedInGameTradeFlags+1], a + + ; trades 16-23 + ld b, %00000000 + ld a, [wCompletedInGameTradeFlags+2] + and b + ld [wCompletedInGameTradeFlags+2], a + + ; trades 24-31 + ld b, %00000000 + ld a, [wCompletedInGameTradeFlags+3] + and b + ld [wCompletedInGameTradeFlags+3], a + ; We set this last to save on processing earlier in the script. SetEvent EVENT_POST_GAME_ATTAINED ret diff --git a/text/AgathasRoom.asm b/text/AgathasRoom.asm index 8177348b..ebb41fe3 100644 --- a/text/AgathasRoom.asm +++ b/text/AgathasRoom.asm @@ -47,9 +47,8 @@ _AgathaRematchText:: text "So you've come!" para "It's not in my" - line "character to" - cont "lose over and" - cont "over." + line "character to lose" + cont "over and over." para "Give this battle" line "everything you" @@ -73,10 +72,8 @@ _AgathaRematchAfterBattleText:: para "Just like you and" line "." - para "What are you" - line "waiting for?" - - para "Off to the next" - line "room!" + para "So, what are you" + line "waiting for? Off" + cont "to the next room!" done diff --git a/text/BrunosRoom.asm b/text/BrunosRoom.asm index 874ff723..e3e810a3 100644 --- a/text/BrunosRoom.asm +++ b/text/BrunosRoom.asm @@ -44,14 +44,12 @@ _BrunoRematchText:: cont "from here!" para "Now it's time to" - line "show you the" - cont "power of my" - cont "#MON!" + line "show you the true" + cont "power of my team!" - para "They've been" - line "training just" - cont "as hard as" - cont "yours, surely!" + para "We have trained" + line "just as hard as" + cont "you have, surely!" para "Hoo hah!" diff --git a/text/LancesRoom.asm b/text/LancesRoom.asm index 079d68b4..aa17ad6e 100644 --- a/text/LancesRoom.asm +++ b/text/LancesRoom.asm @@ -1,6 +1,6 @@ _LanceBeforeBattleText:: text "Ah! I heard about" - line "you !" + line "you, !" para "I lead the ELITE" line "FOUR! You can" @@ -65,10 +65,8 @@ _LanceAfterBattleText:: _LanceRematchText:: text "I'm glad you've" - line "come." - - para "Thanks to you," - line "the #MON" + line "come. Thanks to" + cont "you, the #MON" cont "LEAGUE's rep has" cont "really taken off!" @@ -91,12 +89,11 @@ _LanceRematchAfterBattleText:: line "dragon brigade is" cont "weak..." - para "Hm? I'm saying" + para "I'm saying that" line "your strength is" cont "truly incredible!" - para "Now then..." - line "." + para "Now, ." para "You know what's" line "next, don't you?" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 4ee81c68..868cb7f3 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -41,11 +41,11 @@ _LoreleiRematchText:: text "Welcome to the" line "#MON LEAGUE!" - para "Hey, fantastic" - line "timing! I was" - cont "just thinking" + para "Fantastic timing!" + line "I was thinking" cont "how I'd like to" - cont "battle you." + cont "battle you just" + cont "now." para "I hope you're" line "ready!"