diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-02 12:19:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-02 12:19:18 -0500 |
| commit | 0169a98c683d3eb803bc6bca5f5c3c5fe2b9ee5c (patch) | |
| tree | a814947a48f0bb44f4bbfcac6794517129a6c913 /data/maps | |
| parent | e8504c7a3ff69f771746e9987452be78ebf44f37 (diff) | |
| parent | 358f785a039474442bc0380f2e0ebe4a36b8d553 (diff) | |
Merge pull request #278 from GriffinRichards/doc-miscscript
Split/label some common event scripts
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc | 6 | ||||
| -rw-r--r-- | data/maps/CeladonCity_Gym/text.inc | 6 | ||||
| -rw-r--r-- | data/maps/CeruleanCity/text.inc | 3 | ||||
| -rw-r--r-- | data/maps/PokemonLeague_HallOfFame/scripts.inc | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc index 140c98958..f2b950607 100644 --- a/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc +++ b/data/maps/CeladonCity_GameCorner_PrizeRoom/text.inc @@ -29,3 +29,9 @@ CeladonCity_GameCorner_PrizeRoom_Text_NeedMoreCoins:: @ 81970D5 .string "Sorry, you'll need more COINS\n" .string "than that.$" +CeladonCity_GameCorner_PrizeRoom_Text_OopsNotEnoughRoom:: @ 81970FE + .string "おきゃくさん もう もてないよ$" + +CeladonCity_GameCorner_PrizeRoom_Text_OhFineThen:: @ 819710E + .string "あっ そう$" + diff --git a/data/maps/CeladonCity_Gym/text.inc b/data/maps/CeladonCity_Gym/text.inc index 02ded4fb0..9e372584e 100644 --- a/data/maps/CeladonCity_Gym/text.inc +++ b/data/maps/CeladonCity_Gym/text.inc @@ -1,9 +1,3 @@ -Text_SorryDontHaveAnyMore:: @ 81970FE - .string "おきゃくさん もう もてないよ$" - -Text_ISee:: @ 819710E - .string "あっ そう$" - CeladonCity_Gym_Text_ErikaIntro:: @ 8197114 .string "Hello…\n" .string "Lovely weather, isn't it?\l" diff --git a/data/maps/CeruleanCity/text.inc b/data/maps/CeruleanCity/text.inc index 06a21d302..7a940032d 100644 --- a/data/maps/CeruleanCity/text.inc +++ b/data/maps/CeruleanCity/text.inc @@ -42,7 +42,8 @@ CeruleanCity_Text_ExplainFameCheckerSmellYa:: @ 817ED5D .string "All right, this time I really am\n" .string "gone. Smell ya!$" -CeruleanCity_Text_17EDF8:: @ 817EDF8 +@ RB translation: "Heh! You're no match for my genius!" +CeruleanCity_Text_RivalVictory:: @ 817EDF8 .string "なんたって！\n" .string "おれは てんさい だからよ！$" diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index de838a669..658a176e5 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -34,7 +34,7 @@ PokemonLeague_HallOfFame_EventScript_EnterRoom:: @ 8162D70 waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD delay 40 setvar VAR_TEMP_1, 1 - call EventScript_1A651A + call EventScript_SetDefeatedEliteFourFlagsVars setrespawn SPAWN_PALLET_TOWN fadescreenspeed FADE_TO_BLACK, 24 special Special_HallOfFame |