From a8f7c62ffeb97bdf197d684f2403a78fd00891e4 Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Thu, 13 Oct 2022 17:18:23 +0100 Subject: [PATCH] Fixing the recover bug! :D Also some minor text and trade updates, too --- data/events/trades.asm | 10 +++---- data/moves/moves.asm | 6 ++--- data/pokemon/new_dex_text.asm | 30 +++++++++++++++++++++ data/text/text_7.asm | 2 +- data/trainers/parties.asm | 39 ++++++++++++++++++---------- data/wild/grass_water.asm | 20 +++++++++----- data/wild/maps/SilphGauntlet1F.asm | 16 ++++++++++++ data/wild/maps/SilphGauntlet2F.asm | 16 ++++++++++++ data/wild/maps/SilphGauntlet3F.asm | 16 ++++++++++++ data/wild/maps/SilphGauntlet4F.asm | 16 ++++++++++++ data/wild/maps/SilphGauntlet5F.asm | 16 ++++++++++++ data/wild/maps/SilphGauntlet6F.asm | 16 ++++++++++++ main.asm | 15 +++++------ maps/FuchsiaCity.blk | 10 +++---- text/CeladonUniversityPokecenter.asm | 4 +-- text/RockTunnelPokecenter.asm | 6 ++--- 16 files changed, 189 insertions(+), 49 deletions(-) create mode 100644 data/wild/maps/SilphGauntlet1F.asm create mode 100644 data/wild/maps/SilphGauntlet2F.asm create mode 100644 data/wild/maps/SilphGauntlet3F.asm create mode 100644 data/wild/maps/SilphGauntlet4F.asm create mode 100644 data/wild/maps/SilphGauntlet5F.asm create mode 100644 data/wild/maps/SilphGauntlet6F.asm diff --git a/data/events/trades.asm b/data/events/trades.asm index cadf0600..da1297fb 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -5,12 +5,12 @@ TradeMons: db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Jynx trade replaces the useless Nidorino one db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" - db PONYTA, SEEL, TRADE_DIALOGSET_CASUAL, "SAILOR@@@@@" + db HAUNTER, KADABRA, TRADE_DIALOGSET_POLITE, "HARRY@@@@@@" ; New trade to complete the 4 main trade evos db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" - db SLOWBRO, LICKITUNG, TRADE_DIALOGSET_CASUAL, "MARC@@@@@@@" - db MACHOKE, HAUNTER, TRADE_DIALOGSET_POLITE, "GHOSUKE@@@@" ; From JP Blue - db KADABRA, GRAVELER, TRADE_DIALOGSET_POLITE, "SABURO@@@@@" ; From JP Blue + db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; From JP Blue + db MACHOKE, HAUNTER, TRADE_DIALOGSET_POLITE, "MICHELLE@@@" ; From JP Blue + db KADABRA, GRAVELER, TRADE_DIALOGSET_POLITE, "JENNY@@@@@@" ; From JP Blue db VENONAT, TANGELA, TRADE_DIALOGSET_HAPPY, "CRINKLES@@@" - db NIDORAN_M, NIDORAN_F, TRADE_DIALOGSET_HAPPY, "SPOT@@@@@@@" + db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" assert_table_length NUM_NPC_TRADES diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 58271065..86462bbc 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -115,7 +115,7 @@ Moves: move MIMIC, MIMIC_EFFECT, 0, NORMAL, 100, 10 move SCREECH, DEFENSE_DOWN2_EFFECT, 0, NORMAL, 85, 40 move DOUBLE_TEAM, EVASION_UP1_EFFECT, 0, NORMAL, 100, 15 - move RECOVER, SPLASH_EFFECT, 0, NORMAL, 100, 20 ;temporary until we fix it + move RECOVER, HEAL_EFFECT, 0, NORMAL, 100, 20 move HARDEN, DEFENSE_UP1_EFFECT, 0, NORMAL, 100, 30 move MINIMIZE, EVASION_UP1_EFFECT, 0, NORMAL, 100, 20 move SMOKESCREEN, ACCURACY_DOWN1_EFFECT, 0, NORMAL, 100, 20 @@ -145,7 +145,7 @@ Moves: move CONSTRICT, SPEED_DOWN_SIDE_EFFECT, 10, NORMAL, 100, 35 move AMNESIA, SPECIAL_UP2_EFFECT, 0, PSYCHIC_TYPE, 100, 20 move KINESIS, ACCURACY_DOWN1_EFFECT, 0, PSYCHIC_TYPE, 80, 15 - move SOFTBOILED, SPLASH_EFFECT, 0, NORMAL, 100, 10 ;temporary until we fix it + move SOFTBOILED, HEAL_EFFECT, 0, NORMAL, 100, 10 move HI_JUMP_KICK, JUMP_KICK_EFFECT, 85, FIGHTING, 90, 20 move GLARE, PARALYZE_EFFECT, 0, NORMAL, 75, 30 move DREAM_EATER, DREAM_EATER_EFFECT, 100, PSYCHIC_TYPE, 100, 15 @@ -166,7 +166,7 @@ Moves: move EXPLOSION, EXPLODE_EFFECT, 170, NORMAL, 100, 5 move FURY_SWIPES, TWO_TO_FIVE_ATTACKS_EFFECT, 18, NORMAL, 80, 15 move BONEMERANG, ATTACK_TWICE_EFFECT, 50, GROUND, 90, 10 - move REST, SPLASH_EFFECT, 0, PSYCHIC_TYPE, 100, 10 ;temporary until we fix it + move REST, HEAL_EFFECT, 0, PSYCHIC_TYPE, 100, 10 move ROCK_SLIDE, NO_ADDITIONAL_EFFECT, 75, ROCK, 90, 10 move HYPER_FANG, FLINCH_SIDE_EFFECT1, 80, NORMAL, 90, 15 move SHARPEN, ATTACK_UP1_EFFECT, 0, NORMAL, 100, 30 diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index c4361daf..17cf92fa 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -657,6 +657,36 @@ _KleavorDexEntry:: next "fall huge trees" next "in a single slice" dex + +_ArticunoGDexEntry:: + text "From its eyes," + next "it fires beams" + next "which can stun" + + page "and immobilize" + next "foes as if they" + next "had been frozen" + dex + +_ZapdosGDexEntry:: + text "Its leg muscles" + next "are so powerful" + next "that one kick can" + + page "pulverize a dump" + next "truck. It runs" + next "at over 180 mph" + dex + +_MoltresGDexEntry:: + text "The sinister aura" + next "that surrounds it" + next "is said to burn" + + page "the spirit of" + next "any creature that" + next "wanders too close" + dex _MissingNoDexEntry:: text "This is a newly" diff --git a/data/text/text_7.asm b/data/text/text_7.asm index 3c0015fc..3dfb74a6 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -202,7 +202,7 @@ _UsedCutText:: _WannaTrade4Text:: text "I'm the TRADER!" line "I love to help" - para "TRAINERs evolve" + para "trainers evolve" line "their #MON!" para "Wanna trade?" done diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 0ab475cf..cf58c0f2 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -75,8 +75,8 @@ YoungsterData: db 19, SANDSHREW, ZUBAT, 0 db 17, RATTATA, RATTATA, RATICATE, 0 db 18, NIDORAN_M, NIDORINO, 0 -; Unused - db 17, SPEAROW, RATTATA, RATTATA, SPEAROW, 0 +; Unused - this will be used in the Silph Gauntlet + db 62, RATICATE, ARBOK, SANDSLASH, FEAROW, NIDOKING, VENUSAUR, 0 BugCatcherData: ; Viridian Forest @@ -95,8 +95,8 @@ BugCatcherData: ; Route 6 db 16, WEEDLE, CATERPIE, WEEDLE, 0 db 20, BUTTERFREE, 0 -; Unused - db 18, METAPOD, CATERPIE, VENONAT, 0 +; Unused - this will be used in the Silph Gauntlet + db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0 ; Route 9 db 19, BEEDRILL, BEEDRILL, 0 db 20, CATERPIE, WEEDLE, VENONAT, 0 @@ -129,6 +129,8 @@ LassData: ; Celadon Gym db 23, BELLSPROUT, WEEPINBELL, 0 db 23, ODDISH, GLOOM, 0 +; New - this will be used in the Silph Gauntlet + ; db 62, PERSIAN, CLEFABLE, VILEPLUME, WIGGLYTUFF, POLITOED, NIDOQUEEN, 0 SailorData: ; SS Anne Stern @@ -142,6 +144,8 @@ SailorData: db 20, MACHOP, 0 ; Vermilion Gym db 21, PIKACHU, PIKACHU, 0 +; New - this will be used in the Silph Gauntlet + ; db 64, KINGDRA, MACHAMP, CLOYSTER, STARMIE, GOROCHU, TENTACRUEL, 0 JrTrainerMData: ; Pewter Gym @@ -153,8 +157,8 @@ JrTrainerMData: ; Route 6 db 20, SQUIRTLE, 0 db 16, SPEAROW, RATICATE, 0 -; Unused - db 18, DIGLETT, DIGLETT, SANDSHREW, 0 +; Unused - this will be used in the Silph Gauntlet + db 63, DUGTRIO, PRIMEAPE, SANDSLASH, BLASTOISE, NIDOKING, ARCANINE, 0 ; Route 9 db 21, GROWLITHE, CHARMANDER, 0 db 19, RATTATA, DIGLETT, EKANS, SANDSHREW, 0 @@ -198,6 +202,8 @@ JrTrainerFData: db 29, BELLSPROUT, ODDISH, TANGELA, 0 ; Route 20 db 30, TENTACOOL, HORSEA, SEEL, 0 +; New - this will be used in the Silph Gauntlet + ; db 63, TSUBOMITTO, SEAKING, MADAAMU, BELLOSSOM, GOROCHU, VENUSAUR, 0 PokemaniacData: ; Route 10 @@ -211,6 +217,8 @@ PokemaniacData: db 40, CHARMELEON, LAPRAS, LICKITUNG, 0 ; Rock Tunnel 1F db 23, CUBONE, SLOWPOKE, 0 +; New - this will be used in the Silph Gauntlet + db 66, GUARDIA, SLOWBRO, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0 SuperNerdData: ; Mt. Moon 1F @@ -224,7 +232,7 @@ SuperNerdData: ; Unused db 30, PORYGON, 0 ; - used in celadon university db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ; - used in celadon university - db 24, MAGNEMITE, VOLTORB, 0 + db 63, MAGNEZONE, MUK, KABUTOPS, OMASTAR, PORYGONZ, MAGMORTAR, 0 ; - used in Silph Gauntlet ; Cinnabar Gym db 36, VULPIX, VULPIX, NINETALES, 0 db 34, PONYTA, CHARMANDER, VULPIX, GROWLITHE, 0 @@ -253,6 +261,8 @@ HikerData: db 19, GEODUDE, MACHOP, GEODUDE, GEODUDE, 0 db 20, ONIX, ONIX, GEODUDE, 0 db 21, GEODUDE, GRAVELER, 0 +; New - this will be used in the Silph Gauntlet + db 63, STEELIX, GOLEM, MACHAMP, CROBAT, CROAKOZUNA, GUARDIA, 0 BikerData: ; Route 13 @@ -284,10 +294,12 @@ BikerData: db 26, KOFFING, KOFFING, GRIMER, KOFFING, 0 db 28, GRIMER, GRIMER, KOFFING, 0 db 29, KOFFING, MUK, 0 +; New - this will be used in the Silph Gauntlet + db 65, ELECTRODE, MUK, WEEZING, TENTACRUEL, HYPNO, HITMONTOP, 0 BurglarData: ; Unused - db 29, GROWLITHE, VULPIX, 0 + db 66, NINETALES, RAPIDASH, ARCANINE, WEEZING, MAGMORTAR, MUK, 0 ; - used in Silph Gauntlet db 33, GROWLITHE, 0 db 28, VULPIX, CHARMANDER, PONYTA, 0 ; Cinnabar Gym @@ -426,8 +438,8 @@ JugglerData: db 34, DROWZEE, HYPNO, 0 ; Victory Road 2F db 48, MR_MIME, 0 -; Unused - db 33, HYPNO, 0 +; Unused - this will be used in the Silph Gauntlet + db 65, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, GENGAR, SLOWKING, 0 ; Fuchsia Gym db 38, HYPNO, 0 db 34, DROWZEE, KADABRA, 0 @@ -441,8 +453,8 @@ TamerData: db 39, ARBOK, TAUROS, 0 ; Victory Road 2F db 44, PERSIAN, GOLDUCK, 0 -; Unused - db 42, RHYHORN, PRIMEAPE, ARBOK, TAUROS, 0 +; Unused - this will be used in the Silph Gauntlet + db 66, RHYPERIOR, ARBOK, SANDSLASH, PRIMEAPE, GOLDUCK, TAUROS, 0 BirdKeeperData: ; Route 13 @@ -504,7 +516,8 @@ ProfOakData: db $FF, 66, TAUROS, 67, ARCANINE, 68, EXEGGUTOR, 68, GYARADOS, 69, NIDOKING, 70, CHARIZARD, 0 ChiefData: -; none +; New - this will be used in the Silph Gauntlet + db $FF, 73, MAGNEZONE, 72, LAPRAS, 73, SCIZOR, 73, EXEGGUTOR, 75, PORYGON2, 77, OMEGA, 0 ScientistData: ; Unused diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 7aca95a1..1d774467 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -11,7 +11,7 @@ WildDataPointers: dw NothingWildMons ; CINNABAR_ISLAND dw NothingWildMons ; INDIGO_PLATEAU dw NothingWildMons ; SAFFRON_CITY - dw NothingWildMons ; unused + dw NothingWildMons ; CITRINE_CITY dw Route1WildMons ; ROUTE_1 dw Route2WildMons ; ROUTE_2 dw Route3WildMons ; ROUTE_3 @@ -105,13 +105,13 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons - dw NothingWildMons - dw NothingWildMons + dw Gauntlet1FWildMons + dw Gauntlet2FWildMons + dw Gauntlet3FWildMons dw VictoryRoad1FWildMons - dw NothingWildMons - dw NothingWildMons - dw NothingWildMons + dw Gauntlet4FWildMons + dw Gauntlet5FWildMons + dw Gauntlet6FWildMons dw NothingWildMons dw NothingWildMons dw NothingWildMons @@ -322,3 +322,9 @@ INCLUDE "data/wild/maps/VictoryRoad3F.asm" INCLUDE "data/wild/maps/VictoryRoad1F.asm" INCLUDE "data/wild/maps/DiglettsCave.asm" INCLUDE "data/wild/maps/CinnabarVolcano.asm" +INCLUDE "data/wild/maps/SilphGauntlet1F.asm" +INCLUDE "data/wild/maps/SilphGauntlet2F.asm" +INCLUDE "data/wild/maps/SilphGauntlet3F.asm" +INCLUDE "data/wild/maps/SilphGauntlet4F.asm" +INCLUDE "data/wild/maps/SilphGauntlet5F.asm" +INCLUDE "data/wild/maps/SilphGauntlet6F.asm" diff --git a/data/wild/maps/SilphGauntlet1F.asm b/data/wild/maps/SilphGauntlet1F.asm new file mode 100644 index 00000000..5a8b504e --- /dev/null +++ b/data/wild/maps/SilphGauntlet1F.asm @@ -0,0 +1,16 @@ +Gauntlet1FWildMons: + def_grass_wildmons 8 ; encounter rate + db 55, BUTTERFREE + db 55, BEEDRILL + db 56, VENOMOTH + db 56, PARASECT + db 56, BEEDRILL + db 57, VENOMOTH + db 57, TANGROWTH + db 58, GOROCHU + db 58, TANGROWTH + db 60, VENUSAUR + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SilphGauntlet2F.asm b/data/wild/maps/SilphGauntlet2F.asm new file mode 100644 index 00000000..280ec9df --- /dev/null +++ b/data/wild/maps/SilphGauntlet2F.asm @@ -0,0 +1,16 @@ +Gauntlet2FWildMons: + def_grass_wildmons 10 ; encounter rate + db 57, GOLEM + db 57, SANDSLASH + db 58, MACHAMP + db 58, CROBAT + db 58, SANDSLASH + db 59, MACHAMP + db 59, STEELIX + db 60, CLEFABLE + db 60, STEELIX + db 62, CHARIZARD + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SilphGauntlet3F.asm b/data/wild/maps/SilphGauntlet3F.asm new file mode 100644 index 00000000..dcbef5c7 --- /dev/null +++ b/data/wild/maps/SilphGauntlet3F.asm @@ -0,0 +1,16 @@ +Gauntlet3FWildMons: + def_grass_wildmons 15 ; encounter rate + db 59, TENTACRUEL + db 59, JABETTA + db 60, KINGLER + db 60, PENDRAKEN + db 60, JABETTA + db 61, KINGLER + db 61, GOLDUCK + db 62, GYARADOS + db 62, GOLDUCK + db 64, TOTARTLE + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SilphGauntlet4F.asm b/data/wild/maps/SilphGauntlet4F.asm new file mode 100644 index 00000000..b297b530 --- /dev/null +++ b/data/wild/maps/SilphGauntlet4F.asm @@ -0,0 +1,16 @@ +Gauntlet4FWildMons: + def_grass_wildmons 15 ; encounter rate + db 61, GENGAR + db 61, GUARDIA + db 62, NINETALES + db 62, BARUNDA + db 62, GUARDIA + db 63, NINETALES + db 63, HYPNO + db 64, ALAKAZAM + db 64, HYPNO + db 66, ALAKAZAM + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SilphGauntlet5F.asm b/data/wild/maps/SilphGauntlet5F.asm new file mode 100644 index 00000000..db72dca9 --- /dev/null +++ b/data/wild/maps/SilphGauntlet5F.asm @@ -0,0 +1,16 @@ +Gauntlet5FWildMons: + def_grass_wildmons 30 ; encounter rate + db 63, DODRIO + db 63, RHYDON + db 64, EXEGGUTOR + db 64, SCYTHER + db 64, PINSIR + db 65, KANGASKHAN + db 65, TAUROS + db 66, TRAMPEL + db 66, CHANSEY + db 68, DRAGONITE + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/data/wild/maps/SilphGauntlet6F.asm b/data/wild/maps/SilphGauntlet6F.asm new file mode 100644 index 00000000..0375164c --- /dev/null +++ b/data/wild/maps/SilphGauntlet6F.asm @@ -0,0 +1,16 @@ +Gauntlet6FWildMons: + def_grass_wildmons 10 ; encounter rate + db 65, MUK + db 65, WEEZING + db 66, ANIMON + db 66, PORYGON + db 66, WEEZING + db 67, ANIMON + db 67, MAGNEZONE + db 68, AERODACTYL + db 68, MAGNEZONE + db 70, GYAOON + end_grass_wildmons + + def_water_wildmons 0 ; encounter rate + end_water_wildmons diff --git a/main.asm b/main.asm index 06cadeb3..3c9d9fd9 100644 --- a/main.asm +++ b/main.asm @@ -189,10 +189,11 @@ SECTION "Battle Engine 7", ROMX INCLUDE "data/moves/moves.asm" INCLUDE "data/pokemon/base_stats.asm" INCLUDE "data/pokemon/cries.asm" -INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" -INCLUDE "engine/battle/trainer_ai.asm" -INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" +INCLUDE "engine/battle/unused_stats_functions.asm" +INCLUDE "engine/pokemon/evos_moves.asm" INCLUDE "engine/battle/move_effects/heal.asm" +INCLUDE "engine/battle/move_effects/transform.asm" +INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" SECTION "Battle Core", ROMX @@ -208,8 +209,6 @@ INCLUDE "engine/movie/trade.asm" INCLUDE "engine/movie/intro.asm" INCLUDE "engine/movie/trade2.asm" INCLUDE "gfx/trade.asm" -INCLUDE "engine/battle/unused_stats_functions.asm" -INCLUDE "engine/battle/move_effects/transform.asm" SECTION "Pokédex Rating", ROMX @@ -237,8 +236,6 @@ SECTION "Battle Engine 8", ROMX INCLUDE "engine/battle/init_battle_variables.asm" INCLUDE "engine/battle/move_effects/paralyze.asm" -INCLUDE "engine/battle/move_effects/reflect_light_screen.asm" - SECTION "Hidden Objects 2", ROMX @@ -253,7 +250,9 @@ INCLUDE "engine/events/hidden_objects/indigo_plateau_hq.asm" SECTION "Battle Engine 9", ROMX INCLUDE "engine/battle/experience.asm" -INCLUDE "engine/pokemon/evos_moves.asm" +INCLUDE "engine/battle/scroll_draw_trainer_pic.asm" +INCLUDE "engine/battle/trainer_ai.asm" +INCLUDE "engine/battle/draw_hud_pokeball_gfx.asm" SECTION "Diploma", ROMX diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk index 324c3018..985722f0 100644 --- a/maps/FuchsiaCity.blk +++ b/maps/FuchsiaCity.blk @@ -1,13 +1,9 @@ - !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzogmzzMUlllll11NkkkPRROUwwww11N_tnN1wwwwwwwww1_t + !zoooooz7:~zooooooznttmVUwnmnwVwVmzzznwVwVwmzzzzzzzzzzzzzzzzzzz !zzzz !znlllmz|szzzz7:~znVwwmoooooyzzzVUVzzzzzogmzzMUlllll11NkkkPRROUwwww11N_tnN1wwwwwVwww1_t -nNn ! +nNn ! !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN - - - !m_8989nNn|~0|rm1<=<=1nNn11111111m_Vw1wnN - -1ooooo1 +11 diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm index be91dddd..435bde42 100644 --- a/text/CeladonUniversityPokecenter.asm +++ b/text/CeladonUniversityPokecenter.asm @@ -11,9 +11,9 @@ _CeladonUniversityPokecenterText4:: _CuboneSalesmanText1:: text "MAN: Hey there," - line "BIG SHOT TRAINER!" + line "big shot trainer!" - para "Have I got the" + para "Have I got a" line "deal for you!" para "Strike fear into" diff --git a/text/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm index a1abab8b..5ff0435f 100644 --- a/text/RockTunnelPokecenter.asm +++ b/text/RockTunnelPokecenter.asm @@ -17,9 +17,9 @@ _DittoSalesmanText1:: line "kid! Nice to" cont "see you again!" - para "I have a very" - line "special deal" - cont "for you again!" + para "I have another" + line "very special" + cont "deal for you!" para "For a limited" line "time, you can"