summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/EverGrandeCity_PokemonLeague/scripts.inc4
-rw-r--r--data/maps/FallarborTown_Mart/scripts.inc4
-rw-r--r--data/maps/FortreeCity_DecorationShop/scripts.inc8
-rw-r--r--data/maps/FortreeCity_Mart/scripts.inc4
-rw-r--r--data/maps/LavaridgeTown_HerbShop/scripts.inc2
-rw-r--r--data/maps/LavaridgeTown_Mart/scripts.inc4
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc12
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc8
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc8
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc8
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc16
-rw-r--r--data/maps/MauvilleCity_Mart/scripts.inc4
-rw-r--r--data/maps/MossdeepCity_Mart/scripts.inc4
-rw-r--r--data/maps/OldaleTown_Mart/scripts.inc6
-rw-r--r--data/maps/PetalburgCity_Mart/scripts.inc6
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/scripts.inc4
-rw-r--r--data/maps/RustboroCity_Mart/scripts.inc6
-rw-r--r--data/maps/SlateportCity/scripts.inc18
-rw-r--r--data/maps/SlateportCity_Mart/scripts.inc4
-rw-r--r--data/maps/SootopolisCity_Mart/scripts.inc4
-rw-r--r--data/maps/VerdanturfTown_Mart/scripts.inc4
21 files changed, 69 insertions, 69 deletions
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