Document map scripts for mart vendors (#792)

2026-04-26 00:32:20 -05:00 · 2025-10-04 03:38:55 +01:00 · 2025-10-04 03:38:55 +01:00 · 658b403fc2
commit 658b403fc2
parent 75b153bf02
49 changed files with 212 additions and 210 deletions
--- a/asm/macros/scrcmd.inc
+++ b/asm/macros/scrcmd.inc
@ -3253,7 +3253,7 @@
    CallCommonScript 0x7D2
    .endm

-    .macro GenericVendorGreeting
+    .macro VendorGreeting
    CallCommonScript 0x7E3
    .endm

--- a/generated/map_headers.txt
+++ b/generated/map_headers.txt
@ -79,7 +79,7 @@ MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_2F
 MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_3F
 MAP_HEADER_ETERNA_CITY_CONDOMINIUMS_4F
 MAP_HEADER_ROUTE_206_CYCLING_ROAD_NORTH_GATE
-MAP_HEADER_ETERNA_CITY_NORTH_HOUSE
+MAP_HEADER_ETERNA_CITY_HERB_SHOP
 MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE
 MAP_HEADER_ETERNA_CITY_EAST_HOUSE
 MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE
--- a/generated/text_banks.txt
+++ b/generated/text_banks.txt
@ -100,7 +100,7 @@ TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_2F
 TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_3F
 TEXT_BANK_ETERNA_CITY_CONDOMINIUMS_4F
 TEXT_BANK_ROUTE_206_CYCLING_ROAD_NORTH_GATE
-TEXT_BANK_ETERNA_CITY_NORTH_HOUSE
+TEXT_BANK_ETERNA_CITY_HERB_SHOP
 TEXT_BANK_ETERNA_CITY_SOUTH_HOUSE
 TEXT_BANK_ETERNA_CITY_EAST_HOUSE
 TEXT_BANK_ETERNA_CITY_UNDERGROUND_MAN_HOUSE
--- a/include/data/map_headers.h
+++ b/include/data/map_headers.h
@ -1795,17 +1795,17 @@ static const MapHeader sMapHeaders[] = {
        .isEscapeRopeAllowed = FALSE,
        .isFlyAllowed = FALSE,
    },
-    [MAP_HEADER_ETERNA_CITY_NORTH_HOUSE] = {
+    [MAP_HEADER_ETERNA_CITY_HERB_SHOP] = {
        .areaDataArchiveID = 0x14,
        .unk_01 = 0xF,
        .mapMatrixID = 170,
-        .scriptsArchiveID = scripts_eterna_city_north_house,
-        .initScriptsArchiveID = scripts_init_eterna_city_north_house,
-        .msgArchiveID = TEXT_BANK_ETERNA_CITY_NORTH_HOUSE,
+        .scriptsArchiveID = scripts_eterna_city_herb_shop,
+        .initScriptsArchiveID = scripts_init_eterna_city_herb_shop,
+        .msgArchiveID = TEXT_BANK_ETERNA_CITY_HERB_SHOP,
        .dayMusicID = SEQ_CITY04_D,
        .nightMusicID = SEQ_CITY04_N,
        .wildEncountersArchiveID = ENCOUNTERS_NONE,
-        .eventsArchiveID = events_eterna_city_north_house,
+        .eventsArchiveID = events_eterna_city_herb_shop,
        .mapLabelTextID = LocationNames_Text_EternaCity,
        .mapLabelWindowID = 0x6,
        .weather = OVERWORLD_WEATHER_CLEAR,
--- a/res/field/events/events_eterna_city.json
+++ b/res/field/events/events_eterna_city.json
@ -619,7 +619,7 @@
        {
            "x": 316,
            "z": 521,
-            "dest_header_id": "MAP_HEADER_ETERNA_CITY_NORTH_HOUSE",
+            "dest_header_id": "MAP_HEADER_ETERNA_CITY_HERB_SHOP",
            "dest_warp_id": 0
        },
        {
--- a/res/field/events/events_eterna_city_north_house.json
+++ b/res/field/events/events_eterna_city_north_house.json
@ -2,7 +2,7 @@
    "bg_events": [],
    "object_events": [
        {
-            "id": "ETERNA_CITY_NORTH_HOUSE_EXPERT_F_0",
+            "id": "ETERNA_CITY_HERB_SHOP_EXPERT_F_0",
            "graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
            "movement_type": "MOVEMENT_TYPE_LOOK_RIGHT",
            "trainer_type": "TRAINER_TYPE_NONE",
@ -17,7 +17,7 @@
            "y": 0
        },
        {
-            "id": "ETERNA_CITY_NORTH_HOUSE_CASHIER_F_1",
+            "id": "ETERNA_CITY_HERB_SHOP_CASHIER_F_1",
            "graphics_id": "OBJ_EVENT_GFX_CASHIER_F",
            "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
            "trainer_type": "TRAINER_TYPE_NONE",
@ -32,7 +32,7 @@
            "y": 0
        },
        {
-            "id": "ETERNA_CITY_NORTH_HOUSE_EXPERT_M_2",
+            "id": "ETERNA_CITY_HERB_SHOP_EXPERT_M_2",
            "graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
            "movement_type": "MOVEMENT_TYPE_LOOK_NORTH_AND_EAST",
            "trainer_type": "TRAINER_TYPE_NONE",
--- a/res/field/events/meson.build
+++ b/res/field/events/meson.build
@ -86,7 +86,7 @@ events_files = files(
    'events_eterna_city_condominiums_3f.json',
    'events_eterna_city_condominiums_4f.json',
    'events_route_206_cycling_road_north_gate.json',
-    'events_eterna_city_north_house.json',
+    'events_eterna_city_herb_shop.json',
    'events_eterna_city_south_house.json',
    'events_eterna_city_east_house.json',
    'events_eterna_city_underground_man_house.json',
--- a/res/field/events/zone_event.order
+++ b/res/field/events/zone_event.order
@ -78,7 +78,7 @@ events_eterna_city_condominiums_2f
 events_eterna_city_condominiums_3f
 events_eterna_city_condominiums_4f
 events_route_206_cycling_road_north_gate
-events_eterna_city_north_house
+events_eterna_city_herb_shop
 events_eterna_city_south_house
 events_eterna_city_east_house
 events_eterna_city_underground_man_house
--- a/res/field/scripts/meson.build
+++ b/res/field/scripts/meson.build
@ -94,7 +94,7 @@ scr_seq_files = files(
    'scripts_eterna_city_condominiums_3f.s',
    'scripts_eterna_city_condominiums_4f.s',
    'scripts_route_206_cycling_road_north_gate.s',
-    'scripts_eterna_city_north_house.s',
+    'scripts_eterna_city_herb_shop.s',
    'scripts_eterna_city_south_house.s',
    'scripts_eterna_city_east_house.s',
    'scripts_eterna_city_underground_man_house.s',
@ -594,7 +594,7 @@ scr_seq_files = files(
    'scripts_init_eterna_city_condominiums_3f.s',
    'scripts_init_eterna_city_condominiums_4f.s',
    'scripts_init_route_206_cycling_road_north_gate.s',
-    'scripts_init_eterna_city_north_house.s',
+    'scripts_init_eterna_city_herb_shop.s',
    'scripts_init_eterna_city_south_house.s',
    'scripts_init_eterna_city_east_house.s',
    'scripts_init_eterna_city_underground_man_house.s',
--- a/res/field/scripts/scripts.order
+++ b/res/field/scripts/scripts.order
@ -87,7 +87,7 @@ scripts_eterna_city_condominiums_2f
 scripts_eterna_city_condominiums_3f
 scripts_eterna_city_condominiums_4f
 scripts_route_206_cycling_road_north_gate
-scripts_eterna_city_north_house
+scripts_eterna_city_herb_shop
 scripts_eterna_city_south_house
 scripts_eterna_city_east_house
 scripts_eterna_city_underground_man_house
@ -587,7 +587,7 @@ scripts_init_eterna_city_condominiums_2f
 scripts_init_eterna_city_condominiums_3f
 scripts_init_eterna_city_condominiums_4f
 scripts_init_route_206_cycling_road_north_gate
-scripts_init_eterna_city_north_house
+scripts_init_eterna_city_herb_shop
 scripts_init_eterna_city_south_house
 scripts_init_eterna_city_east_house
 scripts_init_eterna_city_underground_man_house
--- a/res/field/scripts/scripts_canalave_city_mart.s
+++ b/res/field/scripts/scripts_canalave_city_mart.s
@ -1,50 +1,51 @@
 #include "macros/scrcmd.inc"
+#include "generated/items.h"
 #include "res/text/bank/canalave_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0056
+    ScriptEntry CanalaveCityMart_CommonVendor
+    ScriptEntry CanalaveCityMart_SpecialtyVendor
+    ScriptEntry CanalaveCityMart_Lady
+    ScriptEntry CanalaveCityMart_Pokefan
    ScriptEntryEnd

-_0012:
+CanalaveCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+CanalaveCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_CANALAVE
    ReleaseAll
    End

-_003E:
+CanalaveCityMart_Lady:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    BufferItemName 0, 24
-    Message 0
+    BufferItemName 0, ITEM_MAX_POTION //Unused?
+    Message CanalaveCityMart_Text_ThatsTheRepeatBall
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0056:
+CanalaveCityMart_Pokefan:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    BufferItemName 0, 57
-    Message 1
+    BufferItemName 0, ITEM_X_ATTACK //Unused?
+    Message CanalaveCityMart_Text_ShouldTakeReviveToIronIsland
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_celestic_town_northwest_house.s
+++ b/res/field/scripts/scripts_celestic_town_northwest_house.s
@ -13,7 +13,7 @@ _0012:
    LockAll
    FacePlayer
    Message 0
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -23,7 +23,7 @@ _002B:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -33,7 +33,7 @@ _0041:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
    ReleaseAll
--- a/res/field/scripts/scripts_eterna_city_north_house.s
+++ b/res/field/scripts/scripts_eterna_city_north_house.s
@ -1,37 +1,37 @@
 #include "macros/scrcmd.inc"
-#include "res/text/bank/eterna_city_north_house.h"
+#include "res/text/bank/eterna_city_herb_shop.h"


-    ScriptEntry _000E
-    ScriptEntry _0023
-    ScriptEntry _0036
+    ScriptEntry EternaCityHerbShop_Vendor
+    ScriptEntry EternaCityHerbShop_ExpertF
+    ScriptEntry EternaCityHerbShop_ExpertM
    ScriptEntryEnd

-_000E:
+EternaCityHerbShop_Vendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message EternaCityHerbShop_Text_Welcome
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_HOUSE
    ReleaseAll
    End

-_0023:
+EternaCityHerbShop_ExpertF:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message EternaCityHerbShop_Text_YourPokemonWontLikeThem
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0036:
+EternaCityHerbShop_ExpertM:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 2
+    Message EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_eterna_city_mart.s
+++ b/res/field/scripts/scripts_eterna_city_mart.s
@ -1,50 +1,51 @@
 #include "macros/scrcmd.inc"
+#include "generated/items.h"
 #include "res/text/bank/eterna_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _005B
+    ScriptEntry EternaCityMart_CommonVendor
+    ScriptEntry EternaCityMart_SpecialtyVendor
+    ScriptEntry EternaCityMart_Guitarist
+    ScriptEntry EternaCityMart_Hiker
    ScriptEntryEnd

-_0012:
+EternaCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+EternaCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_MART
    ReleaseAll
    End

-_003E:
-    BufferItemName 0, 26
-    BufferItemName 1, 0x14A
+EternaCityMart_Guitarist:
+    BufferItemName 0, ITEM_SUPER_POTION //Unused?
+    BufferItemName 1, ITEM_TM03         //Unused?
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message EternaCityMart_Text_GardeniaIsTooMuch
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_005B:
+EternaCityMart_Hiker:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message EternaCityMart_Text_EscapeRopeIsIndispensable
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_fight_area_mart.s
+++ b/res/field/scripts/scripts_fight_area_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
--- a/res/field/scripts/scripts_floaroma_town_mart.s
+++ b/res/field/scripts/scripts_floaroma_town_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/floaroma_town_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry FloaromaTownMart_CommonVendor
+    ScriptEntry FloaromaTownMart_SpecialtyVendor
+    ScriptEntry FloaromaTownMart_Beauty
+    ScriptEntry FloaromaTownMart_SchoolGirl
    ScriptEntryEnd

-_0012:
+FloaromaTownMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+FloaromaTownMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_FLOAROMA
    ReleaseAll
    End

-_003E:
+FloaromaTownMart_Beauty:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message FloaromaTownMart_Text_DressUpPokemonWithAccessories
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+FloaromaTownMart_SchoolGirl:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message FloaromaTownMart_Text_CantBuyBerriesAtMarts
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_hearthome_city_mart.s
+++ b/res/field/scripts/scripts_hearthome_city_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/hearthome_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry HearthomeCityMart_CommonVendor
+    ScriptEntry HearthomeCityMart_SpecialtyVendor
+    ScriptEntry HearthomeCityMart_Hiker
+    ScriptEntry HearthomeCityMart_Beauty
    ScriptEntryEnd

-_0012:
+HearthomeCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+HearthomeCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_HEARTHOME
    ReleaseAll
    End

-_003E:
+HearthomeCityMart_Hiker:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+HearthomeCityMart_Beauty:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message HearthomeCityMart_Text_FindAccessoriesInAmitySquare
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_init_eterna_city_north_house.s
+++ b/res/field/scripts/scripts_init_eterna_city_north_house.s
--- a/res/field/scripts/scripts_jubilife_city_mart.s
+++ b/res/field/scripts/scripts_jubilife_city_mart.s
@ -2,58 +2,58 @@
 #include "res/text/bank/jubilife_city_mart.h"


-    ScriptEntry _0016
-    ScriptEntry _002C
-    ScriptEntry _0042
-    ScriptEntry _0055
-    ScriptEntry _0068
+    ScriptEntry JubilifeCityMart_CommonVendor
+    ScriptEntry JubilifeCityMart_SpecialtyVendor
+    ScriptEntry JubilifeCityMart_Guitarist
+    ScriptEntry JubilifeCityMart_Pokefan
+    ScriptEntry JubilifeCityMart_Beauty
    ScriptEntryEnd

-_0016:
+JubilifeCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_002C:
+JubilifeCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_JUBILIFE
    ReleaseAll
    End

-_0042:
+JubilifeCityMart_Guitarist:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message JubilifeCityMart_Text_WastedMoneyOnPokeBalls
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0055:
+JubilifeCityMart_Pokefan:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message JubilifeCityMart_Text_PackSomePotions
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0068:
+JubilifeCityMart_Beauty:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 2
+    Message JubilifeCityMart_Text_JustUseARepel
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_oreburgh_city_mart.s
+++ b/res/field/scripts/scripts_oreburgh_city_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/oreburgh_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry OreburghCityMart_CommonVendor
+    ScriptEntry OreburghCityMart_SpecialtyVendor
+    ScriptEntry OreburghCityMart_Hiker
+    ScriptEntry OreburghCityMart_Collector
    ScriptEntryEnd

-_0012:
+OreburghCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+OreburghCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_OREBURGH
    ReleaseAll
    End

-_003E:
+OreburghCityMart_Hiker:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message OreburghCityMart_Text_MoreBadgesMoreItems
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+OreburghCityMart_Collector:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_pastoria_city_mart.s
+++ b/res/field/scripts/scripts_pastoria_city_mart.s
@ -2,57 +2,57 @@
 #include "res/text/bank/pastoria_city_mart.h"


-    ScriptEntry _0016
-    ScriptEntry _002C
-    ScriptEntry _0042
-    ScriptEntry _0055
-    ScriptEntry _0068
+    ScriptEntry PastoriaCityMart_CommonVendor
+    ScriptEntry PastoriaCityMart_SpecialtyVendor
+    ScriptEntry PastoriaCityMart_BugCatcher
+    ScriptEntry PastoriaCityMart_SchoolGirl
+    ScriptEntry PastoriaCityMart_CroagunkCarving
    ScriptEntryEnd

-_0016:
+PastoriaCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_002C:
+PastoriaCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_PASTORIA
    ReleaseAll
    End

-_0042:
+PastoriaCityMart_BugCatcher:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message PastoriaCityMart_Text_CroagunkIsOfficialCityMascot
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0055:
+PastoriaCityMart_SchoolGirl:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message PastoriaCityMart_Text_AreYouUsingBallCapsules
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0068:
+PastoriaCityMart_CroagunkCarving:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
-    Message 2
+    Message PastoriaCityMart_Text_LooksLikeItsSeepingPoison
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
+++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s
@ -100,7 +100,7 @@ _0128:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -110,7 +110,7 @@ _013E:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE
    ReleaseAll
--- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
+++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s
@ -22,7 +22,7 @@ _002C:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -32,7 +32,7 @@ _0042:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_POKEMON_LEAGUE
    ReleaseAll
--- a/res/field/scripts/scripts_resort_area_mart.s
+++ b/res/field/scripts/scripts_resort_area_mart.s
@ -9,7 +9,7 @@ _000A:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
--- a/res/field/scripts/scripts_sandgem_town_mart.s
+++ b/res/field/scripts/scripts_sandgem_town_mart.s
@ -2,17 +2,17 @@
 #include "res/text/bank/sandgem_town_mart.h"


-    ScriptEntry SandgemTownMart_Vendor
+    ScriptEntry SandgemTownMart_CommonVendor
    ScriptEntry SandgemTownMart_Dummy
    ScriptEntry SandgemTownMart_Breeder
    ScriptEntry SandgemTownMart_SchoolBoy
    ScriptEntryEnd

-SandgemTownMart_Vendor:
+SandgemTownMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon 0
    ReleaseAll
--- a/res/field/scripts/scripts_snowpoint_city_mart.s
+++ b/res/field/scripts/scripts_snowpoint_city_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/snowpoint_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry SnowpointCityMart_CommonVendor
+    ScriptEntry SnowpointCityMart_SpecialtyVendor
+    ScriptEntry SnowpointCityMart_Youngster
+    ScriptEntry SnowpointCityMart_SnowpointLady
    ScriptEntryEnd

-_0012:
+SnowpointCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+SnowpointCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SNOWPOINT
    ReleaseAll
    End

-_003E:
+SnowpointCityMart_Youngster:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message SnowpointCityMart_Text_UsingTmsForEliteFour
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+SnowpointCityMart_SnowpointLady:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message SnowpointCityMart_Text_KeepSomeIceHeals
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_solaceon_town_mart.s
+++ b/res/field/scripts/scripts_solaceon_town_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/solaceon_town_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry SolaceonTownMart_CommonVendor
+    ScriptEntry SolaceonTownMart_SpecialtyVendor
+    ScriptEntry SolaceonTownMart_NinjaBoy
+    ScriptEntry SolaceonTownMart_Pokefan
    ScriptEntryEnd

-_0012:
+SolaceonTownMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+SolaceonTownMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SOLACEON
    ReleaseAll
    End

-_003E:
+SolaceonTownMart_NinjaBoy:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message SolaceonTownMart_Text_NeedPCToSealPokeBalls
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+SolaceonTownMart_Pokefan:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message SolaceonTownMart_Text_ConsiderSuperRepels
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_sunyshore_city.s
+++ b/res/field/scripts/scripts_sunyshore_city.s
@ -610,7 +610,7 @@ _0791:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    GetDayOfWeek VAR_RESULT
    SetVar VAR_0x8008, VAR_RESULT
--- a/res/field/scripts/scripts_sunyshore_city_mart.s
+++ b/res/field/scripts/scripts_sunyshore_city_mart.s
@ -2,47 +2,47 @@
 #include "res/text/bank/sunyshore_city_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _003E
-    ScriptEntry _0051
+    ScriptEntry SunyshoreCityMart_CommonVendor
+    ScriptEntry SunyshoreCityMart_SpecialtyVendor
+    ScriptEntry SunyshoreCityMart_RuinManiac
+    ScriptEntry SunyshoreCityMart_Sailor
    ScriptEntryEnd

-_0012:
+SunyshoreCityMart_CommonVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
    End

-_0028:
+SunyshoreCityMart_SpecialtyVendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SUNYSHORE
    ReleaseAll
    End

-_003E:
+SunyshoreCityMart_RuinManiac:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message SunyshoreCityMart_Text_VictoryRoadIsHarrowing
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_0051:
+SunyshoreCityMart_Sailor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_sunyshore_market.s
+++ b/res/field/scripts/scripts_sunyshore_market.s
@ -70,7 +70,7 @@ SunyshoreMarket_SealShop:
    CheckItem ITEM_SEAL_CASE, 1, VAR_RESULT
    GoToIfEq VAR_RESULT, FALSE, SunyshoreMarket_NoSealCase
    Message SunyshoreMarket_Text_ALittleTimeIfYouWill
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    Call SunyshoreMarket_OpenSealShopMenu
    ReleaseAll
--- a/res/field/scripts/scripts_survival_area_mart.s
+++ b/res/field/scripts/scripts_survival_area_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
--- a/res/field/scripts/scripts_unk_1087.s
+++ b/res/field/scripts/scripts_unk_1087.s
@ -9,7 +9,7 @@ _000A:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -19,7 +19,7 @@ _0020:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
    ReleaseAll
--- a/res/field/scripts/scripts_veilstone_store_1f.s
+++ b/res/field/scripts/scripts_veilstone_store_1f.s
@ -46,7 +46,7 @@ _005B:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT
    ReleaseAll
@ -56,7 +56,7 @@ _0071:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_LEFT
    ReleaseAll
--- a/res/field/scripts/scripts_veilstone_store_2f.s
+++ b/res/field/scripts/scripts_veilstone_store_2f.s
@ -150,7 +150,7 @@ _0198:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_UP
    ReleaseAll
@ -160,7 +160,7 @@ _01AE:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_MID
    ReleaseAll
--- a/res/field/scripts/scripts_veilstone_store_3f.s
+++ b/res/field/scripts/scripts_veilstone_store_3f.s
@ -108,7 +108,7 @@ _0127:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_UP
    ReleaseAll
@ -118,7 +118,7 @@ _013D:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_DOWN
    ReleaseAll
--- a/res/field/scripts/scripts_veilstone_store_4f.s
+++ b/res/field/scripts/scripts_veilstone_store_4f.s
@ -108,7 +108,7 @@ _0127:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartDecor MART_DECOR_ID_VEILSTONE_4F_UP
    ReleaseAll
@ -118,7 +118,7 @@ _013D:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartDecor MART_DECOR_ID_VEILSTONE_4F_DOWN
    ReleaseAll
--- a/res/field/scripts/scripts_veilstone_store_b1f.s
+++ b/res/field/scripts/scripts_veilstone_store_b1f.s
@ -106,7 +106,7 @@ _00E8:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    GenericVendorGreeting
+    VendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_B1F
    ReleaseAll
--- a/res/text/canalave_city_mart.json
+++ b/res/text/canalave_city_mart.json
@ -2,7 +2,7 @@
  "key": 51920,
  "messages": [
    {
-      "id": "pl_msg_00000055_00000",
+      "id": "CanalaveCityMart_Text_ThatsTheRepeatBall",
      "en_US": [
        "A Poké Ball that makes it easy to\n",
        "catch the same kinds of Pokémon...\r",
@ -10,7 +10,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000055_00001",
+      "id": "CanalaveCityMart_Text_ShouldTakeReviveToIronIsland",
      "en_US": [
        "I should take a Revive out to\n",
        "everyone training on Iron Island.\r",
--- a/res/text/eterna_city_north_house.json
+++ b/res/text/eterna_city_north_house.json
@ -2,14 +2,14 @@
  "key": 37922,
  "messages": [
    {
-      "id": "pl_msg_00000102_00000",
+      "id": "EternaCityHerbShop_Text_Welcome",
      "en_US": [
        "Welcome to the Herb Shop, home of\n",
        "effective yet inexpensive medicine."
      ]
    },
    {
-      "id": "pl_msg_00000102_00001",
+      "id": "EternaCityHerbShop_Text_YourPokemonWontLikeThem",
      "en_US": [
        "Herbal meds work most impressively.\n",
        "But your Pokémon won’t like them.\f",
@ -17,7 +17,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000102_00002",
+      "id": "EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough",
      "en_US": [
        "Someone ought to invent herbal\n",
        "medicine that isn’t bitter.\r",
--- a/res/text/eterna_city_mart.json
+++ b/res/text/eterna_city_mart.json
@ -2,7 +2,7 @@
  "key": 51728,
  "messages": [
    {
-      "id": "pl_msg_00000086_00000",
+      "id": "EternaCityMart_Text_GardeniaIsTooMuch",
      "en_US": [
        "The more Gym Badges you have, the\n",
        "better they treat you at Poké Marts.\r",
@ -17,7 +17,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000086_00001",
+      "id": "EternaCityMart_Text_EscapeRopeIsIndispensable",
      "en_US": [
        "An Escape Rope is indispensable!\r",
        "I wish I’d had one when I got into a \n",
--- a/res/text/floaroma_town_mart.json
+++ b/res/text/floaroma_town_mart.json
@ -2,7 +2,7 @@
  "key": 20273,
  "messages": [
    {
-      "id": "pl_msg_00000570_00000",
+      "id": "FloaromaTownMart_Text_DressUpPokemonWithAccessories",
      "en_US": [
        "I’m going to dress up my Pokémon with\n",
        "cute Accessories and take it to the\f",
@ -12,7 +12,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000570_00001",
+      "id": "FloaromaTownMart_Text_CantBuyBerriesAtMarts",
      "en_US": [
        "You can’t buy Berries or Accessories\n",
        "at Poké Marts.\r",
--- a/res/text/hearthome_city_mart.json
+++ b/res/text/hearthome_city_mart.json
@ -2,7 +2,7 @@
  "key": 18993,
  "messages": [
    {
-      "id": "pl_msg_00000107_00000",
+      "id": "HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges",
      "en_US": [
        "The item Revive is something I could\n",
        "use now.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000107_00001",
+      "id": "HearthomeCityMart_Text_FindAccessoriesInAmitySquare",
      "en_US": [
        "Do you know Amity Square?\n",
        "It’s a happy and cheerful place.\r",
--- a/res/text/jubilife_city_mart.json
+++ b/res/text/jubilife_city_mart.json
@ -2,7 +2,7 @@
  "key": 51888,
  "messages": [
    {
-      "id": "pl_msg_00000024_00000",
+      "id": "JubilifeCityMart_Text_WastedMoneyOnPokeBalls",
      "en_US": [
        "Aww, man.\n",
        "I wasted money on some Poké Balls.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000024_00001",
+      "id": "JubilifeCityMart_Text_PackSomePotions",
      "en_US": [
        "The one thing you must remember is to\n",
        "pack some Potions.\r",
@ -20,7 +20,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000024_00002",
+      "id": "JubilifeCityMart_Text_JustUseARepel",
      "en_US": [
        "Potions are important, but sometimes,\n",
        "it’s better to simply avoid battles.\r",
--- a/res/text/oreburgh_city_mart.json
+++ b/res/text/oreburgh_city_mart.json
@ -2,7 +2,7 @@
  "key": 19185,
  "messages": [
    {
-      "id": "pl_msg_00000066_00000",
+      "id": "OreburghCityMart_Text_MoreBadgesMoreItems",
      "en_US": [
        "The Badges that Pokémon Gyms give you\n",
        "are a measure of a Trainer’s worth.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000066_00001",
+      "id": "OreburghCityMart_Text_TwoStaffOfferDifferentMerchandise",
      "en_US": [
        "The Poké Mart is staffed by a lady and\n",
        "a young fellow.\r",
--- a/res/text/pastoria_city_mart.json
+++ b/res/text/pastoria_city_mart.json
@ -2,7 +2,7 @@
  "key": 19025,
  "messages": [
    {
-      "id": "pl_msg_00000132_00000",
+      "id": "PastoriaCityMart_Text_CroagunkIsOfficialCityMascot",
      "en_US": [
        "The Pokémon CROAGUNK is the city’s\n",
        "official mascot.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000132_00001",
+      "id": "PastoriaCityMart_Text_AreYouUsingBallCapsules",
      "en_US": [
        "Put Seals on the Capsule, then put\n",
        "it on a Poké Ball...\r",
@ -22,7 +22,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000132_00002",
+      "id": "PastoriaCityMart_Text_LooksLikeItsSeepingPoison",
      "en_US": [
        "It’s a wood carving of the Pokémon\n",
        "CROAGUNK.\r",
--- a/res/text/snowpoint_city_mart.json
+++ b/res/text/snowpoint_city_mart.json
@ -2,7 +2,7 @@
  "key": 19377,
  "messages": [
    {
-      "id": "pl_msg_00000177_00000",
+      "id": "SnowpointCityMart_Text_UsingTmsForEliteFour",
      "en_US": [
        "I’m using Technical Machines to teach\n",
        "moves to my Pokémon.\r",
@ -15,7 +15,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000177_00001",
+      "id": "SnowpointCityMart_Text_KeepSomeIceHeals",
      "en_US": [
        "If your Pokémon gets frozen, it will\n",
        "thaw out after a while.\r",
--- a/res/text/solaceon_town_mart.json
+++ b/res/text/solaceon_town_mart.json
@ -2,7 +2,7 @@
  "key": 53200,
  "messages": [
    {
-      "id": "pl_msg_00000576_00000",
+      "id": "SolaceonTownMart_Text_NeedPCToSealPokeBalls",
      "en_US": [
        "Someone gave me a Seal Case.\n",
        "Now, I’m off to a Pokémon Center.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000576_00001",
+      "id": "SolaceonTownMart_Text_ConsiderSuperRepels",
      "en_US": [
        "If you’re not totally happy with Repel,\n",
        "consider moving up to a Super Repel."
--- a/res/text/sunyshore_city_mart.json
+++ b/res/text/sunyshore_city_mart.json
@ -2,7 +2,7 @@
  "key": 52112,
  "messages": [
    {
-      "id": "pl_msg_00000163_00000",
+      "id": "SunyshoreCityMart_Text_VictoryRoadIsHarrowing",
      "en_US": [
        "I’ve heard about Victory Road, which\n",
        "leads to the Pokémon League.\r",
@ -13,7 +13,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000163_00001",
+      "id": "SunyshoreCityMart_Text_BuyBallSealsAtSunyshoreMarket",
      "en_US": [
        "I shall buy Seals for decorating Poké\n",
        "Balls at the Sunyshore Market.\r",
--- a/src/overlay007/shop_menu.c
+++ b/src/overlay007/shop_menu.c
@ -456,7 +456,7 @@ static u8 Shop_Exit(FieldSystem *fieldSystem, ShopMenu *shopMenu)
        Strbuf_Free(shopMenu->strbuf);

        if (shopMenu->martType == MART_TYPE_NORMAL && MapHeader_GetMapLabelTextID(fieldSystem->location->mapId) != LocationNames_Text_VeilstoneStore
-            && fieldSystem->location->mapId != MAP_HEADER_ETERNA_CITY_NORTH_HOUSE
+            && fieldSystem->location->mapId != MAP_HEADER_ETERNA_CITY_HERB_SHOP
            && fieldSystem->location->mapId != MAP_HEADER_CELESTIC_TOWN_NORTHWEST_HOUSE) {
            if (shopMenu->itemPurchaseCount != 0 && shopMenu->itemSoldCount != 0) {
                journalEntryLocationEvent = JournalEntry_CreateEventBusinessAtMart(HEAP_ID_FIELD2);