diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/cable_club.inc | 22 | ||||
| -rw-r--r-- | data/scripts/pokeblocks.inc | 2 | ||||
| -rw-r--r-- | data/scripts/secret_base.inc | 14 | ||||
| -rw-r--r-- | data/scripts/tv.inc | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index eeecf2d75..dd024ecff 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -47,7 +47,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B19:: @ 8276B19 gotoram OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A - msgbox gUnknown_08273178, MSGBOX_NPC + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC end OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 @@ -64,7 +64,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23 end OldaleTown_PokemonCenter_2F_EventScript_276B62:: @ 8276B62 - msgbox gUnknown_08273178, MSGBOX_DEFAULT + msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT release end @@ -707,13 +707,13 @@ OldaleTown_PokemonCenter_2F_EventScript_277328:: @ 8277328 release end -OldaleTown_PokemonCenter_2F_EventScript_277335:: @ 8277335 - msgbox gUnknown_0827306F, MSGBOX_DEFAULT +CableClub_EventScript_WirelessClubAdjustements:: @ 8277335 + msgbox gText_SorryWirelessClubAdjustments, MSGBOX_DEFAULT release end OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F - msgbox gUnknown_082730BC, MSGBOX_DEFAULT + msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT releaseall end @@ -977,7 +977,7 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B lock faceplayer setvar VAR_FRONTIER_FACILITY, 8 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1052,12 +1052,12 @@ OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626 OldaleTown_PokemonCenter_2F_EventScript_27764C:: @ 827764C msgbox OldaleTown_PokemonCenter_2F_Text_27893E, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_27765A:: @ 827765A msgbox OldaleTown_PokemonCenter_2F_Text_27897B, MSGBOX_DEFAULT - goto OldaleTown_PokemonCenter_2F_EventScript_273755 + goto EventScript_CableClub_SetVarResult0 end OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 @@ -1068,7 +1068,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277668:: @ 8277668 OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672 lock faceplayer - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements msgbox OldaleTown_PokemonCenter_2F_Text_279937, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27769A @@ -1085,7 +1085,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4 lock faceplayer setvar VAR_FRONTIER_FACILITY, 9 - goto_if_unset FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_2F_EventScript_277335 + goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements specialvar VAR_RESULT, sub_813990C compare VAR_RESULT, 1 goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_27731B @@ -1856,7 +1856,7 @@ OldaleTown_PokemonCenter_2F_Text_278A39: @ 8278A39 .string "Oh…\n" .string "Excuse me!$" -OldaleTown_PokemonCenter_1F_Text_278A48: @ 8278A48 +CableClub_Text_PlayerIsWaiting: @ 8278A48 .string "It appears as if {STR_VAR_1} is playing\n" .string "right now.\l" .string "Go for it!$" diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index a26ecb4c9..3269ec233 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -679,7 +679,7 @@ EventScript_PblocLink_DifferentSelections: @ 8294183 EventScript_PblocLink_CloseLink: @ 8294190 special CloseLink - msgbox gUnknown_08272D9C, MSGBOX_DEFAULT + msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT releaseall end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index 81bd388f8..02d331611 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -336,7 +336,7 @@ EventScript_275A50:: @ 8275A50 compare VAR_RESULT, 6 goto_if_eq EventScript_275A91 bufferpartymonnick 0, VAR_RESULT - msgbox gText_23B704, MSGBOX_YESNO + msgbox gText_UseSecretPower, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq EventScript_275CDE msgbox Text_MonUsedHM, MSGBOX_DEFAULT @@ -354,12 +354,12 @@ EventScript_275A86:: @ 8275A86 end EventScript_275A91:: @ 8275A91 - msgbox gText_23B6E0, MSGBOX_DEFAULT + msgbox gText_SmallIndentInWall, MSGBOX_DEFAULT releaseall end EventScript_275A9B:: @ 8275A9B - msgbox gText_23B73E, MSGBOX_DEFAULT + msgbox gText_DiscoveredSmallCavern, MSGBOX_DEFAULT goto EventScript_275B5B end @@ -1087,19 +1087,19 @@ Text_276835: @ 8276835 .string "Up to ten SECRET BASE locations\n" .string "may be registered.$" -Text_27692B: @ 827692B +SecretBase_Text_BattleTowerShield: @ 827692B .string "A shield of {STR_VAR_2} that marks winning\n" .string "{STR_VAR_1} times in a row at the BATTLE TOWER.$" -Text_276974: @ 8276974 +SecretBase_Text_ToyTV: @ 8276974 .string "A realistic toy TV. It could be easily\n" .string "mistaken for the real thing.$" -Text_2769B8: @ 82769B8 +SecretBase_Text_SeedotTV: @ 82769B8 .string "A toy TV shaped like a SEEDOT.\n" .string "It looks ready to roll away on its own…$" -Text_2769FF: @ 82769FF +SecretBase_Text_SkittyTV: @ 82769FF .string "A toy TV shaped like a SKITTY.\n" .string "It looks ready to stroll away…$" diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 4a276ffc0..a91237257 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -30,7 +30,7 @@ EventScript_27EE54:: @ 827EE54 EventScript_27EE8A:: @ 827EE8A special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT special TurnOffTVScreen releaseall end @@ -69,7 +69,7 @@ EventScript_27EED0:: @ 827EED0 EventScript_27EED8:: @ 827EED8 special GetMomOrDadStringForTVMessage - msgbox gUnknown_08272BCF, MSGBOX_DEFAULT + msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT goto EventScript_27EED0 end |