khuxkm
/
pokered-rematch
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #162 from Helios-vmg/text-corrections 

Replaced $xx in text .asm files with "<xxx>" for consistency
This commit is contained in:
yenatch 2017-08-01 16:45:26 -04:00 committed by GitHub
parent 7a9a1b1e55 5c39c6c5cb
commit a1ca8aa239
52 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
text.asm
View File

@ -2239,7 +2239,7 @@ _CoinsScatteredText::
prompt
_GettingPumpedText::
text $5a, "'s"
text "<USER>'s"
line "getting pumped!"
prompt

2
text/maps/agatha.asm
View File

@ -17,7 +17,7 @@ _AgathaBeforeBattleText::
cont "wrong! #MON"
cont "are for fighting!"
para $52, "! I'll show"
para "<PLAYER>! I'll show"
line "you how a real"
cont "trainer fights!"
done

2
text/maps/bills_house.asm
View File

@ -54,7 +54,7 @@ _BillThankYouText::
prompt
_SSTicketReceivedText::
text $52, " received"
text "<PLAYER> received"
line "an @"
TX_RAM wcf4b
text "!@@"

6
text/maps/blues_house.asm
View File

@ -1,6 +1,6 @@
_DaisyInitialText::
text "Hi ",$52,"!"
line $53," is out at"
text "Hi <PLAYER>!"
line "<RIVAL> is out at"
cont "Grandpa's lab."
done
@ -12,7 +12,7 @@ _DaisyOfferMapText::
prompt
_GotMapText::
text $52," got a"
text "<PLAYER> got a"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/bruno.asm
View File

@ -11,7 +11,7 @@ _BrunoBeforeBattleText::
line "trained with"
cont "my #MON!"
para $52, "!"
para "<PLAYER>!"
para "We will grind you"
line "down with our"

2
text/maps/celadon_city.asm
View File

@ -40,7 +40,7 @@ _TM41PreText::
prompt
_ReceivedTM41Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

6
text/maps/celadon_dept_store_roof.asm
View File

@ -14,7 +14,7 @@ _CeladonMartRoofText_484f3::
line "from me!@@"
_CeladonMartRoofText_484f9::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"
@ -40,7 +40,7 @@ _CeladonMartRoofText_48504::
line "from me!@@"
_CeladonMartRoofText_4850a::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"
@ -66,7 +66,7 @@ _CeladonMartRoofText_48515::
line "from me!@@"
_ReceivedTM49Text::
text $52, " received"
text "<PLAYER> received"
line "TM49!@@"
_CeladonMartRoofText_48520::

2
text/maps/celadon_diner.asm
View File

@ -42,7 +42,7 @@ _CeladonDinerText_491a7::
prompt
_ReceivedCoinCaseText::
text $52, " received"
text "<PLAYER> received"
line "a @"
TX_RAM wcf4b
text "!@@"

6
text/maps/celadon_game_corner.asm
View File

@ -64,7 +64,7 @@ _CeladonGameCornerText_48d9c::
prompt
_Received10CoinsText::
text $52, " received"
text "<PLAYER> received"
line "10 coins!@@"
_CeladonGameCornerText_48da7::
@ -121,7 +121,7 @@ _CeladonGameCornerText_48e26::
prompt
_Received20CoinsText::
text $52, " received"
text "<PLAYER> received"
line "20 coins!@@"
_CeladonGameCornerText_48e31::
@ -143,7 +143,7 @@ _CeladonGameCornerText_48e88::
prompt
_CeladonGameCornerText_48e8d::
text $52, " received"
text "<PLAYER> received"
line "20 coins!@@"
_CeladonGameCornerText_48e93::

2
text/maps/celadon_gym.asm
View File

@ -62,7 +62,7 @@ _CeladonGymText9::
done
_ReceivedTM21Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

10
text/maps/cerulean_city.asm
View File

@ -1,6 +1,6 @@
_CeruleanCityText_19668::
text $53, ": Yo!"
line $52, "!"
text "<RIVAL>: Yo!"
line "<PLAYER>!"
para "You're still"
line "struggling along"
@ -13,7 +13,7 @@ _CeruleanCityText_19668::
para "Here, let me see"
line "what you caught,"
cont $52, "!"
cont "<PLAYER>!"
done
_CeruleanCityText_1966d::
@ -29,7 +29,7 @@ _CeruleanCityText_19672::
prompt
_CeruleanCityText_19677::
text $53, ": Hey,"
text "<RIVAL>: Hey,"
line "guess what?"
para "I went to BILL's"
@ -69,7 +69,7 @@ _CeruleanCityText_196d9::
done
_ReceivedTM28Text::
text $52, " recovered"
text "<PLAYER> recovered"
line "TM28!@@"
_ReceivedTM28Text2::

2
text/maps/cerulean_gym.asm
View File

@ -46,7 +46,7 @@ _CeruleanGymText_5c7c8::
done
_ReceivedTM11Text::
text $52, " received"
text "<PLAYER> received"
line "TM11!@@"
_CeruleanGymText_5c7d3::

22
text/maps/champion.asm
View File

@ -1,9 +1,9 @@
_GaryChampionIntroText::
text $53, ": Hey!"
text "<RIVAL>: Hey!"
para "I was looking"
line "forward to seeing"
cont "you, ", $52, "!"
cont "you, <PLAYER>!"
para "My rival should"
line "be strong to keep"
@ -24,7 +24,7 @@ _GaryChampionIntroText::
para "I'm the #MON"
line "LEAGUE champion!"
para $52, "! Do you"
para "<PLAYER>! Do you"
line "know what that"
cont "means?"
@ -54,11 +54,11 @@ _GaryVictoryText::
line "I won, I won!"
para "I'm too good for"
line "you, ", $52, "!"
line "you, <PLAYER>!"
para "You did well to"
line "even reach me,"
cont $53, ", the"
cont "<RIVAL>, the"
cont "#MON genius!"
para "Nice try, loser!"
@ -82,7 +82,7 @@ _GaryText_76103::
done
_GaryText2::
text "OAK: ", $52, "!"
text "OAK: <PLAYER>!"
done
_GaryText_76120::
@ -99,12 +99,12 @@ _GaryText_76120::
TX_RAM wcd6d
text "!"
para $52, ", you have"
para "<PLAYER>, you have"
line "come of age!"
done
_GaryText_76125::
text "OAK: ", $53, "! I'm"
text "OAK: <RIVAL>! I'm"
line "disappointed!"
para "I came when I"
@ -115,7 +115,7 @@ _GaryText_76125::
line "here, you had"
cont "already lost!"
para $53, "! Do you"
para "<RIVAL>! Do you"
line "understand why"
cont "you lost?"
@ -130,7 +130,7 @@ _GaryText_76125::
done
_GaryText_7612a::
text "OAK: ", $52, "!"
text "OAK: <PLAYER>!"
para "You understand"
line "that your victory"
@ -141,6 +141,6 @@ _GaryText_7612a::
line "with your #MON"
cont "is marvelous!"
para $52, "!"
para "<PLAYER>!"
line "Come with me!"
done

4
text/maps/cinnabar_gym.asm
View File

@ -42,7 +42,7 @@ _BlaineBadgeText::
done
_ReceivedTM38Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"
@ -204,6 +204,6 @@ _CinnabarGymText_75ac2::
done
_CinnabarGymText_75ac7::
text $52, "! You beat"
text "<PLAYER>! You beat"
line "that fire brand!"
done

2
text/maps/cinnabar_lab_fossil_room.asm
View File

@ -58,7 +58,7 @@ _Lab4Text_610b3::
text "So! You hurry and"
line "give me that!"
para $52, " handed"
para "<PLAYER> handed"
line "over @"
TX_RAM wcd6d
text "!"

2
text/maps/cinnabar_lab_metronome_room.asm
View File

@ -7,7 +7,7 @@ _TM35PreReceiveText::
prompt
_ReceivedTM35Text::
text $52, " received "
text "<PLAYER> received "
line "@"
TX_RAM wcf4b
text "!@@"

14
text/maps/copycats_house_2f.asm
View File

@ -1,11 +1,11 @@
_CopycatsHouse2FText_5ccd4::
text $52, ": Hi! Do"
text "<PLAYER>: Hi! Do"
line "you like #MON?"
para $52, ": Uh no, I"
para "<PLAYER>: Uh no, I"
line "just asked you."
para $52, ": Huh?"
para "<PLAYER>: Huh?"
line "You're strange!"
para "COPYCAT: Hmm?"
@ -27,7 +27,7 @@ _TM31PreReceiveText::
prompt
_ReceivedTM31Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"
@ -41,12 +41,12 @@ _TM31ExplanationText1::
line "#MON!@@"
_TM31ExplanationText2::
text $52, ": Hi!"
text "<PLAYER>: Hi!"
line "Thanks for TM31!"
para $52, ": Pardon?"
para "<PLAYER>: Pardon?"
para $52, ": Is it"
para "<PLAYER>: Is it"
line "that fun to mimic"
cont "my every move?"

2
text/maps/daycare_1.asm
View File

@ -46,7 +46,7 @@ _DayCareOweMoneyText::
done
_DayCareGotMonBackText::
text $52, " got"
text "<PLAYER> got"
line "@"
TX_RAM wDayCareMonName
text " back!"

4
text/maps/fuchsia_fishing_house.asm
View File

@ -17,7 +17,7 @@ _FuchsiaHouse3Text_561c2::
para "Take this and"
line "fish, young one!"
para $52, " received"
para "<PLAYER> received"
line "a @"
TX_RAM wcf4b
text "!@@"
@ -29,7 +29,7 @@ _FuchsiaHouse3Text_56212::
_FuchsiaHouse3Text_56217::
text "Hello there,"
line $52, "!"
line "<PLAYER>!"
para "How are the fish"
line "biting?"

2
text/maps/fuchsia_gym_2.asm
View File

@ -25,7 +25,7 @@ _FuchsiaGymText9::
done
_ReceivedTM06Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

4
text/maps/fujis_house.asm
View File

@ -34,7 +34,7 @@ _LavenderHouse1Text4::
text "NIDORINO: Gaoo!@@"
_LavenderHouse1Text_1d94c::
text "MR.FUJI: ", $52, "."
text "MR.FUJI: <PLAYER>."
para "Your #DEX quest"
line "may fail without"
@ -46,7 +46,7 @@ _LavenderHouse1Text_1d94c::
prompt
_ReceivedFluteText::
text $52, " received"
text "<PLAYER> received"
line "a @"
TX_RAM wcf4b
text "!@@"

6
text/maps/lance.asm
View File

@ -24,7 +24,7 @@ _LanceBeforeBattleText::
para "Your LEAGUE"
line "challenge ends"
cont "with me, ", $52, "!"
cont "with me, <PLAYER>!"
done
_LanceEndBattleText::
@ -39,7 +39,7 @@ _LanceAfterBattleText::
text "I still can't"
line "believe my"
cont "dragons lost to"
cont "you, ", $52, "!"
cont "you, <PLAYER>!"
para "You are now the"
line "#MON LEAGUE"
@ -54,7 +54,7 @@ _LanceAfterBattleText::
line "another trainer!"
cont "His name is..."
para $53, "!"
para "<RIVAL>!"
line "He beat the ELITE"
cont "FOUR before you!"

2
text/maps/mr_psychics_house.asm
View File

@ -6,7 +6,7 @@ _TM29PreReceiveText::
prompt
_ReceivedTM29Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/mt_moon_b2f.asm
View File

@ -9,7 +9,7 @@ _MtMoon3Text_49f64::
done
_MtMoon3Text_49f6f::
text $52, " got the"
text "<PLAYER> got the"
line "@"
TX_RAM wcf4b
text "!@@"

4
text/maps/oaks_lab.asm
View File

@ -10,7 +10,7 @@ _OaksLabText40::
cont "greedy like you!"
para "Go ahead and"
line "choose, ", $52, "!"
line "choose, <PLAYER>!"
done
_OaksLabText41::
@ -49,7 +49,7 @@ _OaksLabMonEnergeticText::
prompt
_OaksLabReceivedMonText::
text $52, " received"
text "<PLAYER> received"
line "a @"
TX_RAM wcd6d
text "!@@"

4
text/maps/pallet_town.asm
View File

@ -47,9 +47,9 @@ _PalletTownText5::
done
_PalletTownText6::
text $52,"'s house "
text "<PLAYER>'s house "
done
_PalletTownText7::
text $53,"'s house "
text "<RIVAL>'s house "
done

4
text/maps/pewter_gym_2.asm
View File

@ -18,7 +18,7 @@ _TM34PreReceiveText::
done
_ReceivedTM34Text::
text $52, " received"
text "<PLAYER> received"
line "TM34!@@"
_TM34ExplanationText::
@ -57,7 +57,7 @@ _PewterGymText_5c4bc::
line "victory, here's"
cont "the BOULDERBADGE!"
para $52, " received"
para "<PLAYER> received"
line "the BOULDERBADGE!@@"
_PewterGymText_5c4c1::

6
text/maps/pokemon_tower_2f.asm
View File

@ -1,6 +1,6 @@
_PokemonTower2Text_6062d::
text $53, ": Hey,"
line $52, "! What"
text "<RIVAL>: Hey,"
line "<PLAYER>! What"
cont "brings you here?"
cont "Your #MON"
cont "don't look dead!"
@ -19,7 +19,7 @@ _PokemonTower2Text_60632::
prompt
_PokemonTower2Text_60637::
text $53, ": Well,"
text "<RIVAL>: Well,"
line "look at all your"
cont "wimpy #MON!"

2
text/maps/pokemon_tower_5f.asm
View File

@ -66,6 +66,6 @@ _PokemonTower5Text7::
text "Entered purified,"
line "protected zone!"
para $52, "'s #MON"
para "<PLAYER>'s #MON"
line "are fully healed!"
done

2
text/maps/route_1.asm
View File

@ -13,7 +13,7 @@ _Route1ViridianMartSampleText::
prompt
_Route1Text_1cae8::
text $52, " got"
text "<PLAYER> got"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/route_12_gate_upstairs.asm
View File

@ -9,7 +9,7 @@ _TM39PreReceiveText::
prompt
_ReceivedTM39Text::
text $52, " received"
text "<PLAYER> received"
line "TM39!@@"
_TM39ExplanationText::

4
text/maps/route_12_house.asm
View File

@ -16,7 +16,7 @@ _Route12HouseText_564c5::
para "Take this and"
line "fish, young one!"
para $52, " received"
para "<PLAYER> received"
line "a @"
TX_RAM wcf4b
text "!@@"
@ -39,7 +39,7 @@ _Route12HouseText_564cf::
_Route12HouseText_564d4::
text "Hello there,"
line $52, "!"
line "<PLAYER>!"
para "Use the SUPER ROD"
line "in any water!"

2
text/maps/route_16_house.asm
View File

@ -9,7 +9,7 @@ _Route16HouseText3::
prompt
_ReceivedHM02Text::
text $52, " received"
text "<PLAYER> received"
line "HM02!@@"
_HM02ExplanationText::

12
text/maps/route_22.asm
View File

@ -1,6 +1,6 @@
_Route22RivalBeforeBattleText1::
text $53, ": Hey!"
line $52, "!"
text "<RIVAL>: Hey!"
line "<PLAYER>!"
para "You're going to"
line "#MON LEAGUE?"
@ -38,7 +38,7 @@ _Route22RivalDefeatedText1::
prompt
_Route22Text_511bc::
text $53, ": What?"
text "<RIVAL>: What?"
line "Why do I have 2"
cont "#MON?"
@ -47,8 +47,8 @@ _Route22Text_511bc::
prompt
_Route22RivalBeforeBattleText2::
text $53, ": What?"
line $52, "! What a"
text "<RIVAL>: What?"
line "<PLAYER>! What a"
cont "surprise to see"
cont "you here!"
@ -72,7 +72,7 @@ _Route22RivalAfterBattleText2::
line "up! I'm ready for"
cont "#MON LEAGUE!"
para $52, ", you need"
para "<PLAYER>, you need"
line "more practice!"
para "But hey, you know"

2
text/maps/route_24_1.asm
View File

@ -10,7 +10,7 @@ _Route24Text_51515::
prompt
_Route24Text_5151a::
text $52, " received"
text "<PLAYER> received"
line "a @"
TX_RAM wcf4b
text "!@@"

2
text/maps/safari_zone_entrance.asm
View File

@ -20,7 +20,7 @@ SafariZoneEntranceText_9e747::
line "special # BALL"
cont "here."
para $52, " received"
para "<PLAYER> received"
line "30 SAFARI BALLs!@@"
_SafariZoneEntranceText_75360::

2
text/maps/safari_zone_secret_house.asm
View File

@ -15,7 +15,7 @@ _SecretHouseText_4a350::
prompt
_ReceivedHM03Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/saffron_gym.asm
View File

@ -55,7 +55,7 @@ _SaffronGymText_5d173::
done
ReceivedTM46Text::
text $52, " received"
text "<PLAYER> received"
line "TM46!@@"
_TM46ExplanationText::

4
text/maps/silph_co_11f.asm
View File

@ -20,7 +20,7 @@ _SilphCoPresidentText::
prompt
_ReceivedSilphCoMasterBallText::
text $52, " got a"
text "<PLAYER> got a"
line "@"
TX_RAM wcf4b
text "!@@"
@ -87,7 +87,7 @@ _SilphCo10Text_62335::
para "But, TEAM ROCKET"
line "will never fall!"
para $52, "! Never"
para "<PLAYER>! Never"
line "forget that all"
cont "#MON exist"
cont "for TEAM ROCKET!"

2
text/maps/silph_co_2f.asm
View File

@ -10,7 +10,7 @@ _SilphCo2Text_59ded::
prompt
_ReceivedTM36Text::
text $52, " got"
text "<PLAYER> got"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/silph_co_3f.asm
View File

@ -4,7 +4,7 @@ _SilphCo3Text_59ff9::
done
_SilphCo3Text_59ffe::
text $52, "! You and"
text "<PLAYER>! You and"
line "your #MON"
cont "saved us!"
done

12
text/maps/silph_co_7f.asm
View File

@ -145,12 +145,12 @@ _SilphCo7AfterBattleText4::
done
_SilphCo7Text_51ebe::
text $53, ": What"
line "kept you ", $52, "?"
text "<RIVAL>: What"
line "kept you <PLAYER>?"
done
_SilphCo7Text_51ec3::
text $53, ": Hahaha!"
text "<RIVAL>: Hahaha!"
line "I thought you'd"
cont "turn up if I"
cont "waited here!"
@ -173,7 +173,7 @@ _SilphCo7Text_51ec8::
prompt
_SilphCo7Text_51ecd::
text $53, ": How can"
text "<RIVAL>: How can"
line "I put this?"
para "You're not good"
@ -182,7 +182,7 @@ _SilphCo7Text_51ecd::
prompt
_SilphCo7Text_51ed2::
text "Well, ", $52, "!"
text "Well, <PLAYER>!"
para "I'm moving on up"
line "and ahead!"
@ -202,7 +202,7 @@ _SilphCo7Text_51ed2::
line "world's most"
cont "powerful trainer!"
para $52, ", well"
para "<PLAYER>, well"
line "good luck to you!"
cont "Don't sweat it!"
cont "Smell ya!"

10
text/maps/ss_anne_2.asm
View File

@ -9,13 +9,13 @@ _SSAnne2Text1::
done
_SSAnneRivalBeforeBattleText::
text $53, ": Bonjour!"
line $52, "!"
text "<RIVAL>: Bonjour!"
line "<PLAYER>!"
para "Imagine seeing"
line "you here!"
para $52, ", were you"
para "<PLAYER>, were you"
line "really invited?"
para "So how's your"
@ -40,7 +40,7 @@ _SSAnneRivalDefeatedText::
prompt
_SSAnneRivalWonText::
text $52, "! What are"
text "<PLAYER>! What are"
line "you, seasick?"
para "You should shape"
@ -48,7 +48,7 @@ _SSAnneRivalWonText::
prompt
_SSAnneRivalCaptainText::
text $53, ": I heard"
text "<RIVAL>: I heard"
line "there was a CUT"
cont "master on board."

4
text/maps/ss_anne_7.asm
View File

@ -3,7 +3,7 @@ _SSAnne7RubText::
line "I feel hideous..."
cont "Urrp! Seasick..."
para $52, " rubbed"
para "<PLAYER> rubbed"
line "the CAPTAIN's"
cont "back!"
@ -31,7 +31,7 @@ _ReceivingHM01Text::
prompt
_ReceivedHM01Text::
text $52, " got"
text "<PLAYER> got"
line "@"
TX_RAM wcf4b
text "!@@"

4
text/maps/vermilion_fishing_house.asm
View File

@ -16,7 +16,7 @@ _VermilionHouse2Text_560b6::
para "Take this and"
line "fish, young one!"
para $52, " received"
para "<PLAYER> received"
line "an @"
TX_RAM wcf4b
text "!@@"
@ -39,7 +39,7 @@ _VermilionHouse2Text_560c0::
_VermilionHouse2Text_560c5::
text "Hello there,"
line $52, "!"
line "<PLAYER>!"
para "How are the fish"
line "biting?"

2
text/maps/vermilion_gym_2.asm
View File

@ -24,7 +24,7 @@ _VermilionGymText_5cb77::
done
_ReceivedTM24Text::
text $52, " received "
text "<PLAYER> received "
line "@"
TX_RAM wcf4b
text "!@@"

2
text/maps/victory_road_2f.asm
View File

@ -29,7 +29,7 @@ _VictoryRoad2EndBattleText2::
prompt
_VictoryRoad2AfterBattleText2::
text $53, " also came"
text "<RIVAL> also came"
line "through here!"
done

2
text/maps/viridian_city.asm
View File

@ -83,7 +83,7 @@ _ViridianCityText_191ca::
prompt
_ReceivedTM42Text::
text $52, " received"
text "<PLAYER> received"
line "TM42!@@"
_TM42Explanation::

2
text/maps/viridian_gym.asm
View File

@ -60,7 +60,7 @@ _ViridianGymText12::
done
_ReceivedTM27Text::
text $52, " received"
text "<PLAYER> received"
line "TM27!@@"
_TM27ExplanationText::

2
text/maps/viridian_mart.asm
View File

@ -16,7 +16,7 @@ ViridianMartParcelQuestText::
line "Will you take it"
cont "to him?"
para $52, " got"
para "<PLAYER> got"
line "OAK's PARCEL!@@"
_ViridianMartText2::

4
text/maps/wardens_house.asm
View File

@ -18,7 +18,7 @@ _WardenGibberishText3::
done
_WardenTeethText1::
text $52, " gave the"
text "<PLAYER> gave the"
line "GOLD TEETH to the"
cont "WARDEN!@@"
@ -42,7 +42,7 @@ _WardenThankYouText::
prompt
_ReceivedHM04Text::
text $52, " received"
text "<PLAYER> received"
line "@"
TX_RAM wcf4b
text "!@@"

2
text/oakspeech.asm
View File

@ -42,7 +42,7 @@ _IntroduceRivalText::
prompt
_OakSpeechText3::
text $52,"!"
text "<PLAYER>!"
para "Your very own"
line "#MON legend is"