Document map scripts for Sandgem Mart (#776)

2026-03-21 17:55:13 -05:00 · 2025-09-21 01:40:01 +01:00 · 2025-09-21 01:40:01 +01:00 · e2fcab79a9
commit e2fcab79a9
parent 29faf16275
29 changed files with 62 additions and 58 deletions
--- a/asm/macros/scrcmd.inc
+++ b/asm/macros/scrcmd.inc
@ -3253,6 +3253,10 @@
    CallCommonScript 0x7D2
    .endm

+    .macro GenericVendorGreeting
+    CallCommonScript 0x7E3
+    .endm
+
    .macro PlayElevatorAnimation elevatorDir, loopCount
    .short 572
    .short \elevatorDir
--- a/res/field/scripts/scripts_canalave_city_mart.s
+++ b/res/field/scripts/scripts_canalave_city_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_CANALAVE
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -23,7 +23,7 @@ _002B:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -33,7 +33,7 @@ _0041:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
    ReleaseAll
--- a/res/field/scripts/scripts_common.s
+++ b/res/field/scripts/scripts_common.s
@ -1141,7 +1141,7 @@ _0FA7:
    End

 CommonScript_VendorGreetingGeneric:
-    Message pl_msg_00000213_00037
+    Message CommonStrings_Text_VendorGreetingGeneric
    ReturnCommonScript
    End

--- a/res/field/scripts/scripts_eterna_city_mart.s
+++ b/res/field/scripts/scripts_eterna_city_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_MART
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
--- a/res/field/scripts/scripts_floaroma_town_mart.s
+++ b/res/field/scripts/scripts_floaroma_town_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_FLOAROMA
    ReleaseAll
--- a/res/field/scripts/scripts_hearthome_city_mart.s
+++ b/res/field/scripts/scripts_hearthome_city_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_HEARTHOME
    ReleaseAll
--- a/res/field/scripts/scripts_jubilife_city_mart.s
+++ b/res/field/scripts/scripts_jubilife_city_mart.s
@ -13,7 +13,7 @@ _0016:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -23,7 +23,7 @@ _002C:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_JUBILIFE
    ReleaseAll
--- a/res/field/scripts/scripts_oreburgh_city_mart.s
+++ b/res/field/scripts/scripts_oreburgh_city_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_OREBURGH
    ReleaseAll
--- a/res/field/scripts/scripts_pastoria_city_mart.s
+++ b/res/field/scripts/scripts_pastoria_city_mart.s
@ -13,7 +13,7 @@ _0016:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -23,7 +23,7 @@ _002C:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_PASTORIA
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -110,7 +110,7 @@ _013E:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -32,7 +32,7 @@ _0042:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
--- a/res/field/scripts/scripts_sandgem_town_mart.s
+++ b/res/field/scripts/scripts_sandgem_town_mart.s
@ -2,40 +2,40 @@
 #include "res/text/bank/sandgem_town_mart.h"


-    ScriptEntry _0012
-    ScriptEntry _0028
-    ScriptEntry _002A
-    ScriptEntry _003D
+    ScriptEntry SandgemTownMart_Vendor
+    ScriptEntry SandgemTownMart_Dummy
+    ScriptEntry SandgemTownMart_Breeder
+    ScriptEntry SandgemTownMart_SchoolBoy
    ScriptEntryEnd

-_0012:
+SandgemTownMart_Vendor:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon 0
    ReleaseAll
    End

-_0028:
+SandgemTownMart_Dummy:
    End

-_002A:
+SandgemTownMart_Breeder:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 0
+    Message SandgemTownMart_Text_BuyLotsOfPotions
    WaitABXPadPress
    CloseMessage
    ReleaseAll
    End

-_003D:
+SandgemTownMart_SchoolBoy:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    Message 1
+    Message SandgemTownMart_Text_TossAPokeBall
    WaitABXPadPress
    CloseMessage
    ReleaseAll
--- a/res/field/scripts/scripts_snowpoint_city_mart.s
+++ b/res/field/scripts/scripts_snowpoint_city_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SNOWPOINT
    ReleaseAll
--- a/res/field/scripts/scripts_solaceon_town_mart.s
+++ b/res/field/scripts/scripts_solaceon_town_mart.s
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SOLACEON
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
@ -12,7 +12,7 @@ _0012:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -22,7 +22,7 @@ _0028:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_SUNYSHORE
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartCommon
    ReleaseAll
@ -19,7 +19,7 @@ _0020:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_1F_RIGHT
    ReleaseAll
@ -56,7 +56,7 @@ _0071:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_2F_UP
    ReleaseAll
@ -160,7 +160,7 @@ _01AE:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_3F_UP
    ReleaseAll
@ -118,7 +118,7 @@ _013D:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartDecor MART_DECOR_ID_VEILSTONE_4F_UP
    ReleaseAll
@ -118,7 +118,7 @@ _013D:
    PlayFanfare SEQ_SE_CONFIRM
    LockAll
    FacePlayer
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    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
-    CallCommonScript 0x7E3
+    GenericVendorGreeting
    CloseMessageWithoutErasing
    PokeMartSpecialties MART_SPECIALTIES_ID_VEILSTONE_B1F
    ReleaseAll
--- a/res/text/common_strings.json
+++ b/res/text/common_strings.json
@ -256,7 +256,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000213_00037",
+      "id": "CommonStrings_Text_VendorGreetingGeneric",
      "en_US": [
        "Welcome!\n",
        "What do you need?"
--- a/res/text/sandgem_town_mart.json
+++ b/res/text/sandgem_town_mart.json
@ -2,7 +2,7 @@
  "key": 53008,
  "messages": [
    {
-      "id": "pl_msg_00000562_00000",
+      "id": "SandgemTownMart_Text_BuyLotsOfPotions",
      "en_US": [
        "If a Pokémon loses all its HP,\n",
        "it can’t battle anymore.\r",
@ -11,7 +11,7 @@
      ]
    },
    {
-      "id": "pl_msg_00000562_00001",
+      "id": "SandgemTownMart_Text_TossAPokeBall",
      "en_US": [
        "If you come across a Pokémon you’ve\n",
        "just gotta have, toss a Poké Ball!\r",