diff options
37 files changed, 306 insertions, 382 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 3d7d7cbec..bba0ba05a 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -984,156 +984,12 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F .include "data/scripts/elite_four.inc" .include "data/scripts/movement.inc" .include "data/scripts/check_furniture.inc" - -SampleMessage1:: @ 81A089A - .string "Dies ist Beispiel 1.\p" - .string "Willkommen in der Welt von\n" - .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" - -SampleMessage2:: @ 81A08F1 - .string "Dies ist Beispiel 2.\p" - .string "Willkommen in der Welt von\n" - .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" - -SampleMessage3:: @ 81A0948 - .string "Dies ist Beispiel 3.\p" - .string "Willkommen in der Welt von\n" - .string "POKéMON AGB!\l" - .string "Wir hoffen, dir gefällt es hier!$" - -UnusedMixRecordsPromptText: @ 81A099F - .string "Möchtest du deine Rekorde mit\n" - .string "anderen TRAINERN austauschen?$" - -UnusedMixRecordsSeeYouAgainText: @ 81A09D2 - .string "Komm bald wieder!$" - -Text_BootUpPC: @ 81A09EC - .string "{PLAYER} schaltet den PC ein.$" - -Text_WhichPCShouldBeAccessed:: @ 81A0A01 - .string "Zugriff auf wessen PC?$" - -Text_AccessedSomeonesPC: @ 81A0A1E - .string "Verbindung zu jemandes PC hergestellt.$" - -UnknownString_81A0A35: @ 81A0A35 - .string "POKéMON-Lagerungs-System geöffnet.$" - -Text_AccessedPlayersPC: @ 81A0A54 - .string "Verbindung mit PC von {PLAYER}.$" - -Text_AccessedLanettesPC: @ 81A0A66 - .string "Verbindung zu LANETTES PC hergestellt.$" - -gText_NurseJoy_Welcome:: @ 81A0A7D - .string "Willkommen im POKéMON-CENTER!\p" - .string "Wir heilen deine POKéMON und\n" - .string "machen sie wieder fit.\p" - .string "O.K. Wir benötigen deine POKéMON.$" - -gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA - .string "Komm jederzeit wieder vorbei!$" - -gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 - .string "Danke!\p" - .string "Deine POKéMON sind wieder topfit!$" - -UnknownString_81A0B57: @ 81A0B57 - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "HANDELSCENTER.$" - -UnknownString_81A0B87: @ 81A0B87 - .string "Willkommen im POKéMON KABEL-CLUB-\n" - .string "KOLOSSEUM.$" - -UnknownString_81A0BB4: @ 81A0BB4 - .string "Willkommen in der POKéMON KABEL-CLUB-\n" - .string "ZEITKAPSEL.$" - -EverGrandeCity_PokemonLeague_Text_1A0BE4:: @ 81A0BE4 -FallarborTown_Mart_Text_1A0BE4:: @ 81A0BE4 -FortreeCity_DecorationShop_Text_1A0BE4:: @ 81A0BE4 -FortreeCity_Mart_Text_1A0BE4:: @ 81A0BE4 -LavaridgeTown_Mart_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_2F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_3F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_4F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_5F_Text_1A0BE4:: @ 81A0BE4 -MauvilleCity_Mart_Text_1A0BE4:: @ 81A0BE4 -MossdeepCity_Mart_Text_1A0BE4:: @ 81A0BE4 -OldaleTown_Mart_Text_1A0BE4:: @ 81A0BE4 -PetalburgCity_Mart_Text_1A0BE4:: @ 81A0BE4 -RustboroCity_Mart_Text_1A0BE4:: @ 81A0BE4 -SlateportCity_Mart_Text_1A0BE4:: @ 81A0BE4 -SlateportCity_Text_1A0BE4:: @ 81A0BE4 -SootopolisCity_Mart_Text_1A0BE4:: @ 81A0BE4 -VerdanturfTown_Mart_Text_1A0BE4:: @ 81A0BE4 - .string "Willkommen!\p" - .string "Kann ich dir helfen?$" - -EverGrandeCity_PokemonLeague_Text_1A0C02:: @ 81A0C02 -FallarborTown_Mart_Text_1A0C02:: @ 81A0C02 -FortreeCity_DecorationShop_Text_1A0C02:: @ 81A0C02 -FortreeCity_Mart_Text_1A0C02:: @ 81A0C02 -LavaridgeTown_HerbShop_Text_1A0C02:: @ 81A0C02 -LavaridgeTown_Mart_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStoreRooftop_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_2F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_3F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_4F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_5F_Text_1A0C02:: @ 81A0C02 -MauvilleCity_Mart_Text_1A0C02:: @ 81A0C02 -MossdeepCity_Mart_Text_1A0C02:: @ 81A0C02 -OldaleTown_Mart_Text_1A0C02:: @ 81A0C02 -PetalburgCity_Mart_Text_1A0C02:: @ 81A0C02 -Route104_PrettyPetalFlowerShop_Text_1A0C02:: @ 81A0C02 -RustboroCity_Mart_Text_1A0C02:: @ 81A0C02 -SlateportCity_Mart_Text_1A0C02:: @ 81A0C02 -SlateportCity_Text_1A0C02:: @ 81A0C02 -SootopolisCity_Mart_Text_1A0C02:: @ 81A0C02 -VerdanturfTown_Mart_Text_1A0C02:: @ 81A0C02 - .string "Bitte komm bald wieder!$" - -UnknownString_81A0C15: @ 81A0C15 - .string "Willkommen!\p" - .string "Wir bieten heute Sonderangebote an!$" - -Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 - .string "{PLAYER}{KUN}, willkommen!\p" - .string "Wie kann ich dir behilflich sein?$" - -Message_ObtainedItem: @ 81A0C68 - .string "{STR_VAR_2} erhalten!$" - -LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 - .string "Der BEUTEL ist voll...$" - -LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C -Message_PutAwayItem: @ 81A0C8C - .string "{PLAYER} packt {STR_VAR_2} in die\n" - .string "{STR_VAR_3}-TASCHE.$" - -Message_FoundOneItem: @ 81A0CB1 - .string "{PLAYER} hat {STR_VAR_2} gefunden!$" - -Text_TooBadBagIsFull: - .string "Zu schade!\n" - .string "Der BEUTEL ist voll...$" - -Message_ObtainedDecoration: @ 81A0CDE - .string "{STR_VAR_2} erhalten.$" - -Text_NoRoomLeftForAnother:: @ 81A0CEF - .string "Zu schade! Es ist kein Platz für\n" - .string "{STR_VAR_2}...$" - -Message_TransferredToPC: @ 81A0D1F - .string "{STR_VAR_2} wurde auf den PC\n" - .string "übertragen.$" + .include "data/text/sample_message.inc" + .include "data/text/record_mix.inc" + .include "data/text/pc.inc" + .include "data/text/pkmn_center_nurse.inc" + .include "data/text/mart_clerk.inc" + .include "data/text/obtain_item.inc" Text_PokemartSign:: @ 81A0D41 .string "“Ausgewählte Items für Ihren\n" diff --git a/data-de/text/mart_clerk.inc b/data-de/text/mart_clerk.inc new file mode 100644 index 000000000..b8731a5af --- /dev/null +++ b/data-de/text/mart_clerk.inc @@ -0,0 +1,15 @@ +Text_HowMayIServeYou:: @ 81A0BE4 + .string "Willkommen!\p" + .string "Kann ich dir helfen?$" + +Text_PleaseComeAgain:: @ 81A0C02 + .string "Bitte komm bald wieder!$" + +@ Unused +Text_DiscountSaleToday: @ 81A0C15 + .string "Willkommen!\p" + .string "Wir bieten heute Sonderangebote an!$" + +Text_PlayerWhatCanIDoForYou:: @ 81A0C42 + .string "{PLAYER}{KUN}, willkommen!\p" + .string "Wie kann ich dir behilflich sein?$" diff --git a/data-de/text/obtain_item.inc b/data-de/text/obtain_item.inc new file mode 100644 index 000000000..61f8c6af9 --- /dev/null +++ b/data-de/text/obtain_item.inc @@ -0,0 +1,27 @@ +Text_ObtainedTheItem: @ 81A0C68 + .string "{STR_VAR_2} erhalten!$" + +Text_TheBagIsFull:: @ 81A0C79 + .string "Der BEUTEL ist voll...$" + +Text_PutItemInPocket: @ 81A0C8C + .string "{PLAYER} packt {STR_VAR_2} in die\n" + .string "{STR_VAR_3}-TASCHE.$" + +Text_FoundOneItem: @ 81A0CB1 + .string "{PLAYER} hat {STR_VAR_2} gefunden!$" + +Text_TooBadBagIsFull: + .string "Zu schade!\n" + .string "Der BEUTEL ist voll...$" + +Text_ObtainedTheDecor: @ 81A0CDE + .string "{STR_VAR_2} erhalten.$" + +Text_NoRoomLeftForAnother:: @ 81A0CEF + .string "Zu schade! Es ist kein Platz für\n" + .string "{STR_VAR_2}...$" + +Text_TheDecorWasTransferredToThePC: @ 81A0D1F + .string "{STR_VAR_2} wurde auf den PC\n" + .string "übertragen.$" diff --git a/data-de/text/pc.inc b/data-de/text/pc.inc new file mode 100644 index 000000000..8b85a907f --- /dev/null +++ b/data-de/text/pc.inc @@ -0,0 +1,17 @@ +Text_BootUpPC: @ 81A09EC + .string "{PLAYER} schaltet den PC ein.$" + +Text_WhichPCShouldBeAccessed:: @ 81A0A01 + .string "Zugriff auf wessen PC?$" + +Text_AccessedSomeonesPC: @ 81A0A1E + .string "Verbindung zu jemandes PC hergestellt.$" + +Text_StorageSystemOpened: @ 81A0A35 + .string "POKéMON-Lagerungs-System geöffnet.$" + +Text_AccessedPlayersPC: @ 81A0A54 + .string "Verbindung mit PC von {PLAYER}.$" + +Text_AccessedLanettesPC: @ 81A0A66 + .string "Verbindung zu LANETTES PC hergestellt.$" diff --git a/data-de/text/pkmn_center_nurse.inc b/data-de/text/pkmn_center_nurse.inc new file mode 100644 index 000000000..192397cb8 --- /dev/null +++ b/data-de/text/pkmn_center_nurse.inc @@ -0,0 +1,24 @@ +gText_NurseJoy_Welcome:: @ 81A0A7D + .string "Willkommen im POKéMON-CENTER!\p" + .string "Wir heilen deine POKéMON und\n" + .string "machen sie wieder fit.\p" + .string "O.K. Wir benötigen deine POKéMON.$" + +gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA + .string "Komm jederzeit wieder vorbei!$" + +gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 + .string "Danke!\p" + .string "Deine POKéMON sind wieder topfit!$" + +UnknownString_81A0B57: @ 81A0B57 + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "HANDELSCENTER.$" + +UnknownString_81A0B87: @ 81A0B87 + .string "Willkommen im POKéMON KABEL-CLUB-\n" + .string "KOLOSSEUM.$" + +UnknownString_81A0BB4: @ 81A0BB4 + .string "Willkommen in der POKéMON KABEL-CLUB-\n" + .string "ZEITKAPSEL.$" diff --git a/data-de/text/record_mix.inc b/data-de/text/record_mix.inc new file mode 100644 index 000000000..84b4fb7f7 --- /dev/null +++ b/data-de/text/record_mix.inc @@ -0,0 +1,6 @@ +UnusedMixRecordsPromptText: @ 81A099F + .string "Möchtest du deine Rekorde mit\n" + .string "anderen TRAINERN austauschen?$" + +UnusedMixRecordsSeeYouAgainText: @ 81A09D2 + .string "Komm bald wieder!$" diff --git a/data-de/text/sample_message.inc b/data-de/text/sample_message.inc new file mode 100644 index 000000000..97aa9e7f1 --- /dev/null +++ b/data-de/text/sample_message.inc @@ -0,0 +1,17 @@ +Text_SampleMessage1:: @ 81A089A + .string "Dies ist Beispiel 1.\p" + .string "Willkommen in der Welt von\n" + .string "POKéMON AGB!\l" + .string "Wir hoffen, dir gefällt es hier!$" + +Text_SampleMessage2:: @ 81A08F1 + .string "Dies ist Beispiel 2.\p" + .string "Willkommen in der Welt von\n" + .string "POKéMON AGB!\l" + .string "Wir hoffen, dir gefällt es hier!$" + +Text_SampleMessage3:: @ 81A0948 + .string "Dies ist Beispiel 3.\p" + .string "Willkommen in der Welt von\n" + .string "POKéMON AGB!\l" + .string "Wir hoffen, dir gefällt es hier!$" diff --git a/data/event_scripts.s b/data/event_scripts.s index 9c288d27d..3edbf49b0 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -983,158 +983,12 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F .include "data/scripts/elite_four.inc" .include "data/scripts/movement.inc" .include "data/scripts/check_furniture.inc" - -SampleMessage1:: @ 81A089A - .string "This is sample message 1.\p" - .string "Welcome to the world of\n" - .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" - -SampleMessage2:: @ 81A08F1 - .string "This is sample message 2.\p" - .string "Welcome to the world of\n" - .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" - -SampleMessage3:: @ 81A0948 - .string "This is sample message 3.\p" - .string "Welcome to the world of\n" - .string "POKéMON AGB!\l" - .string "We hope you enjoy this!$" - -UnusedMixRecordsPromptText: @ 81A099F - .string "Would you like to mix records with other\n" - .string "TRAINERS?$" - -UnusedMixRecordsSeeYouAgainText: @ 81A09D2 - .string "We hope to see you again!$" - -Text_BootUpPC: @ 81A09EC - .string "{PLAYER} booted up the PC.$" - -Text_WhichPCShouldBeAccessed:: @ 81A0A01 - .string "Which PC should be accessed?$" - -Text_AccessedSomeonesPC: @ 81A0A1E - .string "Accessed someone's PC.$" - -UnknownString_81A0A35: @ 81A0A35 - .string "POKéMON Storage System opened.$" - -Text_AccessedPlayersPC: @ 81A0A54 - .string "Accessed {PLAYER}'s PC.$" - -Text_AccessedLanettesPC: @ 81A0A66 - .string "Accessed LANETTE's PC.$" - -gText_NurseJoy_Welcome:: @ 81A0A7D - .string "Hello, and welcome to the POKéMON\n" - .string "CENTER.\p" - .string "We restore your tired POKéMON to\n" - .string "full health.\p" - .string "Would you like to rest your POKéMON?$" - -gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA - .string "We hope to see you again!$" - -gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 - .string "Thank you for waiting.\p" - .string "We've restored your POKéMON to\n" - .string "full health.$" - -UnknownString_81A0B57: @ 81A0B57 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "TRADE CENTER.$" - -UnknownString_81A0B87: @ 81A0B87 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "COLOSSEUM.$" - -UnknownString_81A0BB4: @ 81A0BB4 - .string "Welcome to the POKéMON CABLE CLUB\n" - .string "TIME CAPSULE.$" - -EverGrandeCity_PokemonLeague_Text_1A0BE4:: @ 81A0BE4 -FallarborTown_Mart_Text_1A0BE4:: @ 81A0BE4 -FortreeCity_DecorationShop_Text_1A0BE4:: @ 81A0BE4 -FortreeCity_Mart_Text_1A0BE4:: @ 81A0BE4 -LavaridgeTown_Mart_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_2F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_3F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_4F_Text_1A0BE4:: @ 81A0BE4 -LilycoveCity_DepartmentStore_5F_Text_1A0BE4:: @ 81A0BE4 -MauvilleCity_Mart_Text_1A0BE4:: @ 81A0BE4 -MossdeepCity_Mart_Text_1A0BE4:: @ 81A0BE4 -OldaleTown_Mart_Text_1A0BE4:: @ 81A0BE4 -PetalburgCity_Mart_Text_1A0BE4:: @ 81A0BE4 -RustboroCity_Mart_Text_1A0BE4:: @ 81A0BE4 -SlateportCity_Mart_Text_1A0BE4:: @ 81A0BE4 -SlateportCity_Text_1A0BE4:: @ 81A0BE4 -SootopolisCity_Mart_Text_1A0BE4:: @ 81A0BE4 -VerdanturfTown_Mart_Text_1A0BE4:: @ 81A0BE4 - .string "Welcome!\p" - .string "How may I serve you?$" - -EverGrandeCity_PokemonLeague_Text_1A0C02:: @ 81A0C02 -FallarborTown_Mart_Text_1A0C02:: @ 81A0C02 -FortreeCity_DecorationShop_Text_1A0C02:: @ 81A0C02 -FortreeCity_Mart_Text_1A0C02:: @ 81A0C02 -LavaridgeTown_HerbShop_Text_1A0C02:: @ 81A0C02 -LavaridgeTown_Mart_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStoreRooftop_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_2F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_3F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_4F_Text_1A0C02:: @ 81A0C02 -LilycoveCity_DepartmentStore_5F_Text_1A0C02:: @ 81A0C02 -MauvilleCity_Mart_Text_1A0C02:: @ 81A0C02 -MossdeepCity_Mart_Text_1A0C02:: @ 81A0C02 -OldaleTown_Mart_Text_1A0C02:: @ 81A0C02 -PetalburgCity_Mart_Text_1A0C02:: @ 81A0C02 -Route104_PrettyPetalFlowerShop_Text_1A0C02:: @ 81A0C02 -RustboroCity_Mart_Text_1A0C02:: @ 81A0C02 -SlateportCity_Mart_Text_1A0C02:: @ 81A0C02 -SlateportCity_Text_1A0C02:: @ 81A0C02 -SootopolisCity_Mart_Text_1A0C02:: @ 81A0C02 -VerdanturfTown_Mart_Text_1A0C02:: @ 81A0C02 - .string "Please come again!$" - -UnknownString_81A0C15: @ 81A0C15 - .string "Welcome!\p" - .string "We're having a discount sale today!$" - -Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42 - .string "{PLAYER}{KUN}, welcome!\p" - .string "What can I do for you?$" - -Message_ObtainedItem: @ 81A0C68 - .string "Obtained the {STR_VAR_2}.$" - -LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79 - .string "The BAG is full...$" - -LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C -Message_PutAwayItem: - .string "{PLAYER} put away the {STR_VAR_2}\n" - .string "in the {STR_VAR_3} POCKET.$" - -Message_FoundOneItem: - .string "{PLAYER} found one {STR_VAR_2}!$" - -Text_TooBadBagIsFull: - .string "Too bad!\n" - .string "The BAG is full...$" - -Message_ObtainedDecoration: @ 81A0CDE - .string "Obtained the {STR_VAR_2}.$" - -Text_NoRoomLeftForAnother:: @ 81A0CEF - .string "Too bad! There's no room left for\n" - .string "another {STR_VAR_2}...$" - -Message_TransferredToPC: @ 81A0D1F - .string "The {STR_VAR_2} was transferred\n" - .string "to the PC.$" + .include "data/text/sample_message.inc" + .include "data/text/record_mix.inc" + .include "data/text/pc.inc" + .include "data/text/pkmn_center_nurse.inc" + .include "data/text/mart_clerk.inc" + .include "data/text/obtain_item.inc" Text_PokemartSign:: @ 81A0D41 .string "“Selected items for your convenience!”\n" diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index eb26844cb..61a7790d7 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -24,10 +24,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8 lock faceplayer - message EverGrandeCity_PokemonLeague_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart EverGrandeCity_PokemonLeague_Items - msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc index ba49b95f3..12d92164b 100644 --- a/data/maps/FallarborTown_Mart/scripts.inc +++ b/data/maps/FallarborTown_Mart/scripts.inc @@ -4,10 +4,10 @@ FallarborTown_Mart_MapScripts:: @ 8153966 FallarborTown_Mart_EventScript_153967:: @ 8153967 lock faceplayer - message FallarborTown_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart FallarborTown_Mart_Items - msgbox FallarborTown_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc index 9594e14c2..ec7a9a7cb 100644 --- a/data/maps/FortreeCity_DecorationShop/scripts.inc +++ b/data/maps/FortreeCity_DecorationShop/scripts.inc @@ -12,10 +12,10 @@ FortreeCity_DecorationShop_EventScript_158261:: @ 8158261 FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A lock faceplayer - message FortreeCity_DecorationShop_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_Decorations1 - msgbox FortreeCity_DecorationShop_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ FortreeCity_DecorationShop_Decorations1:: @ 8158284 FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 lock faceplayer - message FortreeCity_DecorationShop_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration FortreeCity_DecorationShop_Decorations2 - msgbox FortreeCity_DecorationShop_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc index f267791a6..c41d5edae 100644 --- a/data/maps/FortreeCity_Mart/scripts.inc +++ b/data/maps/FortreeCity_Mart/scripts.inc @@ -4,10 +4,10 @@ FortreeCity_Mart_MapScripts:: @ 8158066 FortreeCity_Mart_EventScript_158067:: @ 8158067 lock faceplayer - message FortreeCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart FortreeCity_Mart_Items - msgbox FortreeCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index 2791885d7..d0da76367 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629 message LavaridgeTown_HerbShop_Text_17615C waitmessage pokemart LavaridgeTown_HerbShop_Items - msgbox LavaridgeTown_HerbShop_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc index be6b4ef3e..4c527e155 100644 --- a/data/maps/LavaridgeTown_Mart/scripts.inc +++ b/data/maps/LavaridgeTown_Mart/scripts.inc @@ -4,10 +4,10 @@ LavaridgeTown_Mart_MapScripts:: @ 81538CA LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB lock faceplayer - message LavaridgeTown_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LavaridgeTown_Mart_Items - msgbox LavaridgeTown_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc index e39015590..5b7fafb87 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc @@ -21,10 +21,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 lock faceplayer - message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations - msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -152,7 +152,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, MSGBOX_DEFAULT + msgbox Text_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E @@ -164,7 +164,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, MSGBOX_DEFAULT + msgbox Text_PutItemInPocket, MSGBOX_DEFAULT random 64 compare VAR_RESULT, 0 goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E @@ -176,7 +176,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 additem VAR_TEMP_0 bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, MSGBOX_DEFAULT + msgbox Text_PutItemInPocket, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end @@ -192,7 +192,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A end LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 - msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C79, MSGBOX_DEFAULT + msgbox Text_TheBagIsFull, MSGBOX_DEFAULT goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc index 5b882a834..b83e23289 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F21:: @ 8159F21 LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A lock faceplayer - message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items1 - msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -43,10 +43,10 @@ LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44 LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E lock faceplayer - message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items2 - msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc index ff8687c03..d723531db 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc @@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 8159F90 LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91 lock faceplayer - message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items1 - msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8 LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8 lock faceplayer - message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items2 - msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc index 21b73ce84..33a536b85 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc @@ -16,10 +16,10 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A010:: @ 815A010 LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 lock faceplayer - message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items1 - msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -36,10 +36,10 @@ LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030 LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C lock faceplayer - message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items2 - msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc index b33bc8787..edb17848a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc @@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 815A060 LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 lock faceplayer - message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 - msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -32,10 +32,10 @@ LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078 LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 lock faceplayer - message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 - msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -57,10 +57,10 @@ LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 lock faceplayer - message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 - msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -82,10 +82,10 @@ LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 lock faceplayer - message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 - msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc index b3214b070..e2ed4c05e 100644 --- a/data/maps/MauvilleCity_Mart/scripts.inc +++ b/data/maps/MauvilleCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MauvilleCity_Mart_MapScripts:: @ 81573BD MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE lock faceplayer - message MauvilleCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart MauvilleCity_Mart_Items - msgbox MauvilleCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc index 672a53cfa..5e28e192d 100644 --- a/data/maps/MossdeepCity_Mart/scripts.inc +++ b/data/maps/MossdeepCity_Mart/scripts.inc @@ -4,10 +4,10 @@ MossdeepCity_Mart_MapScripts:: @ 815A925 MossdeepCity_Mart_EventScript_15A926:: @ 815A926 lock faceplayer - message MossdeepCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart MossdeepCity_Mart_Items - msgbox MossdeepCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 8a62100be..4edec1843 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -4,11 +4,11 @@ OldaleTown_Mart_MapScripts:: @ 8152F78 OldaleTown_Mart_EventScript_152F79:: @ 8152F79 lock faceplayer - message OldaleTown_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 - msgbox OldaleTown_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -24,7 +24,7 @@ OldaleTown_Mart_Items1:: @ 8152F9C OldaleTown_Mart_EventScript_152FA8:: @ 8152FA8 pokemart OldaleTown_Mart_Items2 - msgbox OldaleTown_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 841fbaf3e..094c2a252 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -4,11 +4,11 @@ PetalburgCity_Mart_MapScripts:: @ 81552AF PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 lock faceplayer - message PetalburgCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 - msgbox PetalburgCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -31,7 +31,7 @@ PetalburgCity_Mart_Items1:: @ 81552D0 PetalburgCity_Mart_EventScript_1552EA:: @ 81552EA pokemart PetalburgCity_Mart_Items2 - msgbox PetalburgCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index 734ff2180..ad98c5d16 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -46,10 +46,10 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 return Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C - message Route104_PrettyPetalFlowerShop_Text_1A0C42 + message Text_PlayerWhatCanIDoForYou waitmessage pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items - msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 419c93676..c47b1ee3f 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_Mart_MapScripts:: @ 8157BD3 RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 lock faceplayer - message RustboroCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 @@ -12,7 +12,7 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF pokemart RustboroCity_Mart_Items1 - msgbox RustboroCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -34,7 +34,7 @@ RustboroCity_Mart_Items1:: @ 8157C00 RustboroCity_Mart_EventScript_157C18:: @ 8157C18 pokemart RustboroCity_Mart_Items2 - msgbox RustboroCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 0735ab7ba..854462533 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -45,7 +45,7 @@ SlateportCity_EventScript_14BAB6:: @ 814BAB6 message SlateportCity_Text_164642 waitmessage pokemart SlateportCity_Items1 - msgbox SlateportCity_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -381,10 +381,10 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB SlateportCity_EventScript_14BDF2:: @ 814BDF2 lock faceplayer - message SlateportCity_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_Decorations1 - msgbox SlateportCity_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -406,10 +406,10 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 - message SlateportCity_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_Decorations2 - msgbox SlateportCity_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -437,10 +437,10 @@ SlateportCity_Decorations2:: @ 814BE40 lock faceplayer goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 - message SlateportCity_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemartdecoration SlateportCity_Decorations3 - msgbox SlateportCity_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end @@ -464,10 +464,10 @@ SlateportCity_Decorations3:: @ 814BE80 SlateportCity_EventScript_14BE9A:: @ 814BE9A lock faceplayer - message SlateportCity_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart SlateportCity_Items2 - msgbox SlateportCity_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc index 22edc532e..1cadc675b 100644 --- a/data/maps/SlateportCity_Mart/scripts.inc +++ b/data/maps/SlateportCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SlateportCity_Mart_MapScripts:: @ 8156410 SlateportCity_Mart_EventScript_156411:: @ 8156411 lock faceplayer - message SlateportCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart SlateportCity_Mart_Items - msgbox SlateportCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index cff0498da..132bca889 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -4,10 +4,10 @@ SootopolisCity_Mart_MapScripts:: @ 815B21A SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B lock faceplayer - message SootopolisCity_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart SootopolisCity_Mart_Items - msgbox SootopolisCity_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc index cf401483a..c843d78ee 100644 --- a/data/maps/VerdanturfTown_Mart/scripts.inc +++ b/data/maps/VerdanturfTown_Mart/scripts.inc @@ -4,10 +4,10 @@ VerdanturfTown_Mart_MapScripts:: @ 8153EBB VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC lock faceplayer - message VerdanturfTown_Mart_Text_1A0BE4 + message Text_HowMayIServeYou waitmessage pokemart VerdanturfTown_Mart_Items - msgbox VerdanturfTown_Mart_Text_1A0C02, MSGBOX_DEFAULT + msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT release end diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc index 5cd27302a..2be28646e 100644 --- a/data/scripts/obtain_item.inc +++ b/data/scripts/obtain_item.inc @@ -54,10 +54,10 @@ EventScript_BufferBerriesPocket: return EventScript_ObtainedItem: @ 819FEB7 - message Message_ObtainedItem + message Text_ObtainedTheItem waitfanfare waitmessage - msgbox Message_PutAwayItem + msgbox Text_PutItemInPocket setvar VAR_RESULT, TRUE return @@ -89,10 +89,10 @@ EventScript_ObtainDecorationMessage: @ 819FEE8 EventScript_ObtainedDecor: @ 819FF03 playfanfare MUS_FANFA4 - message Message_ObtainedDecoration + message Text_ObtainedTheDecor waitfanfare waitmessage - msgbox Message_TransferredToPC + msgbox Text_TheDecorWasTransferredToThePC setvar VAR_RESULT, TRUE return @@ -118,14 +118,14 @@ Std_FindItem: @ 819FF21 EventScript_PickUpItem: @ 819FF52 removeobject VAR_LAST_TALKED - message Message_FoundOneItem + message Text_FoundOneItem waitfanfare waitmessage - msgbox Message_PutAwayItem + msgbox Text_PutItemInPocket return EventScript_NoRoomToPickUpItem: @ 819FF65 - msgbox Message_ObtainedItem + msgbox Text_ObtainedTheItem msgbox Text_TooBadBagIsFull setvar VAR_RESULT, FALSE return @@ -145,16 +145,16 @@ EventScript_HiddenItem:: @ 819FF7B end EventScript_PickUpHiddenItem: - message Message_FoundOneItem + message Text_FoundOneItem waitfanfare waitmessage - msgbox Message_PutAwayItem + msgbox Text_PutItemInPocket special SetHiddenItemFlag releaseall end EventScript_NoRoomToPickUpHiddenItem: - msgbox Message_FoundOneItem + msgbox Text_FoundOneItem msgbox Text_TooBadBagIsFull setvar VAR_RESULT, FALSE releaseall diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc index 451f7fe66..91b47004d 100644 --- a/data/scripts/pc.inc +++ b/data/scripts/pc.inc @@ -36,7 +36,7 @@ EventScript_AccessPokemonStorage: playse SE_PC_LOGON call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC - msgbox UnknownString_81A0A35, MSGBOX_DEFAULT + msgbox Text_StorageSystemOpened, MSGBOX_DEFAULT special ShowPokemonStorageSystem waitstate goto EventScript_PCMainMenu diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc new file mode 100644 index 000000000..a974e7b0f --- /dev/null +++ b/data/text/mart_clerk.inc @@ -0,0 +1,15 @@ +Text_HowMayIServeYou:: @ 81A0BE4 + .string "Welcome!\p" + .string "How may I serve you?$" + +Text_PleaseComeAgain:: @ 81A0C02 + .string "Please come again!$" + +@ Unused +Text_DiscountSaleToday: @ 81A0C15 + .string "Welcome!\p" + .string "We're having a discount sale today!$" + +Text_PlayerWhatCanIDoForYou:: @ 81A0C42 + .string "{PLAYER}{KUN}, welcome!\p" + .string "What can I do for you?$" diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc new file mode 100644 index 000000000..3473487ef --- /dev/null +++ b/data/text/obtain_item.inc @@ -0,0 +1,27 @@ +Text_ObtainedTheItem: @ 81A0C68 + .string "Obtained the {STR_VAR_2}.$" + +Text_TheBagIsFull:: @ 81A0C79 + .string "The BAG is full...$" + +Text_PutItemInPocket: @ 81A0C8C + .string "{PLAYER} put away the {STR_VAR_2}\n" + .string "in the {STR_VAR_3} POCKET.$" + +Text_FoundOneItem: @ 81A0CB1 + .string "{PLAYER} found one {STR_VAR_2}!$" + +Text_TooBadBagIsFull: + .string "Too bad!\n" + .string "The BAG is full...$" + +Text_ObtainedTheDecor: @ 81A0CDE + .string "Obtained the {STR_VAR_2}.$" + +Text_NoRoomLeftForAnother:: @ 81A0CEF + .string "Too bad! There's no room left for\n" + .string "another {STR_VAR_2}...$" + +Text_TheDecorWasTransferredToThePC: @ 81A0D1F + .string "The {STR_VAR_2} was transferred\n" + .string "to the PC.$" diff --git a/data/text/pc.inc b/data/text/pc.inc new file mode 100644 index 000000000..1d350d24b --- /dev/null +++ b/data/text/pc.inc @@ -0,0 +1,17 @@ +Text_BootUpPC: @ 81A09EC + .string "{PLAYER} booted up the PC.$" + +Text_WhichPCShouldBeAccessed:: @ 81A0A01 + .string "Which PC should be accessed?$" + +Text_AccessedSomeonesPC: @ 81A0A1E + .string "Accessed someone's PC.$" + +Text_StorageSystemOpened: @ 81A0A35 + .string "POKéMON Storage System opened.$" + +Text_AccessedPlayersPC: @ 81A0A54 + .string "Accessed {PLAYER}'s PC.$" + +Text_AccessedLanettesPC: @ 81A0A66 + .string "Accessed LANETTE's PC.$" diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc new file mode 100644 index 000000000..6c63f8d93 --- /dev/null +++ b/data/text/pkmn_center_nurse.inc @@ -0,0 +1,26 @@ +gText_NurseJoy_Welcome:: @ 81A0A7D + .string "Hello, and welcome to the POKéMON\n" + .string "CENTER.\p" + .string "We restore your tired POKéMON to\n" + .string "full health.\p" + .string "Would you like to rest your POKéMON?$" + +gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA + .string "We hope to see you again!$" + +gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14 + .string "Thank you for waiting.\p" + .string "We've restored your POKéMON to\n" + .string "full health.$" + +UnknownString_81A0B57: @ 81A0B57 + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "TRADE CENTER.$" + +UnknownString_81A0B87: @ 81A0B87 + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "COLOSSEUM.$" + +UnknownString_81A0BB4: @ 81A0BB4 + .string "Welcome to the POKéMON CABLE CLUB\n" + .string "TIME CAPSULE.$" diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc new file mode 100644 index 000000000..d542d0c78 --- /dev/null +++ b/data/text/record_mix.inc @@ -0,0 +1,6 @@ +UnusedMixRecordsPromptText: @ 81A099F + .string "Would you like to mix records with other\n" + .string "TRAINERS?$" + +UnusedMixRecordsSeeYouAgainText: @ 81A09D2 + .string "We hope to see you again!$" diff --git a/data/text/sample_message.inc b/data/text/sample_message.inc new file mode 100644 index 000000000..e061b9328 --- /dev/null +++ b/data/text/sample_message.inc @@ -0,0 +1,17 @@ +Text_SampleMessage1:: @ 81A089A + .string "This is sample message 1.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" + +Text_SampleMessage2:: @ 81A08F1 + .string "This is sample message 2.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" + +Text_SampleMessage3:: @ 81A0948 + .string "This is sample message 3.\p" + .string "Welcome to the world of\n" + .string "POKéMON AGB!\l" + .string "We hope you enjoy this!$" |