Document Veilstone Department Store (#796)

Author: innocenthedgehog

asm/macros/scrcmd.inc

@@ -2652,6 +2652,22 @@
     .short \destVarID
     .endm
 
+    .macro GivePoketchApp
+    CallCommonScript 0x7D9
+    .endm
+
+    .macro GiveAccessoryWaitForConfirm
+    CallCommonScript 0x7DF
+    .endm
+
+    .macro MessageBagIsFull
+    CallCommonScript 0x7E1
+    .endm
+
+    .macro GiveItemQuantity
+    CallCommonScript 0x7FC
+    .endm
+
     .macro ScrCmd_Unused_1D4 arg0, arg1, arg2
     .short 468
     .short \arg0

generated/vars_flags.txt

@@ -183,7 +183,7 @@ FLAG_UNK_0x00B5
 FLAG_UNK_0x00B6
 FLAG_UNK_0x00B7
 FLAG_UNK_0x00B8
-FLAG_UNK_0x00B9
+FLAG_VEILSTONE_STORE_B1F_SPOKEN_TO_PROF_ROWAN
 FLAG_TEAM_GALACTIC_LEFT_LAKE_VERITY
 FLAG_UNK_0x00BB
 FLAG_UNK_0x00BC
@@ -259,7 +259,7 @@ FLAG_UNK_0x0101
 FLAG_UNK_0x0102
 FLAG_UNK_0x0103
 FLAG_UNK_0x0104
-FLAG_UNK_0x0105
+FLAG_VEILSTONE_STORE_5F_RECEIVED_STICKY_BARB
 FLAG_UNK_0x0106
 FLAG_UNK_0x0107
 FLAG_UNK_0x0108
@@ -295,7 +295,7 @@ FLAG_MESPRIT_CAUGHT
 FLAG_AZELF_CAUGHT
 FLAG_UXIE_CAUGHT
 FLAG_UNK_0x0128
-FLAG_UNK_0x0129
+FLAG_VEILSTONE_STORE_1F_RECEIVED_MASK
 FLAG_UNK_0x012A
 FLAG_UNK_0x012B
 FLAG_UNK_0x012C
@@ -387,7 +387,7 @@ FLAG_UNK_0x0181
 FLAG_UNK_0x0182
 FLAG_UNK_0x0183
 FLAG_UNK_0x0184
-FLAG_UNK_0x0185
+FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN
 FLAG_UNK_0x0186
 FLAG_UNK_0x0187
 FLAG_UNK_0x0188
@@ -4361,7 +4361,7 @@ VAR_UNK_0x4103
 VAR_UNK_0x4104
 VAR_UNK_0x4105
 VAR_UNK_0x4106
-VAR_UNK_0x4107
+VAR_VEILSTONE_STORE_MASK
 VAR_UNK_0x4108
 VAR_UNK_0x4109
 VAR_UNK_0x410A

res/field/events/events_veilstone_store_b1f.json

@@ -150,7 +150,7 @@
             "graphics_id": "OBJ_EVENT_GFX_PROF_ROWAN",
             "movement_type": "MOVEMENT_TYPE_LOOK_SOUTH",
             "trainer_type": "TRAINER_TYPE_NONE",
-            "flag": "FLAG_UNK_0x0185",
+            "flag": "FLAG_VEILSTONE_STORE_B1F_HIDE_PROF_ROWAN",
             "script": 7,
             "initial_dir": 1,
             "data": [],

res/field/scripts/scripts_amity_square.s

@@ -397,7 +397,7 @@ AmitySquare_FollowerMon_PickUp_GiveAccessory:
     WaitCry
     ScrCmd_27C 2, LOCALID_ITEM_OR_ACCESSORY_ID
     IncrementGameRecord RECORD_UNK_051
-    CallCommonScript 0x7DF
+    GiveAccessoryWaitForConfirm
     CloseMessage
     ReleaseAll
     End
@@ -1002,7 +1002,7 @@ AmitySquare_GiftMan_AccessoryGift:
     ShowYesNoMenu VAR_RESULT
     GoToIfEq VAR_RESULT, MENU_NO, AmitySquare_GiftMan_DeclinedGift
     SetVar LOCALID_COUNT, 1
-    CallCommonScript 0x7DF
+    GiveAccessoryWaitForConfirm
     GoTo AmitySquare_GiftMan_ReceivedGift
     End
 
@@ -1019,7 +1019,7 @@ AmitySquare_Unused2:
     End
 
 AmitySquare_GiftMan_CannotFitItem:
-    CallCommonScript 0x7E1
+    MessageBagIsFull
     CloseMessage
     ReleaseAll
     End

res/field/scripts/scripts_canalave_city_gym.s

@@ -53,7 +53,7 @@ _00BF:
     SetVar VAR_0x8004, ITEM_TM91
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _00FD
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x0092
     BufferItemName 0, VAR_0x8004
     BufferTMHMMoveName 1, VAR_0x8004
@@ -64,7 +64,7 @@ _00BF:
     End
 
 _00FD:
-    CallCommonScript 0x7E1
+    MessageBagIsFull
     CloseMessage
     ReleaseAll
     End

res/field/scripts/scripts_canalave_city_southeast_house.s

@@ -15,7 +15,7 @@ _000A:
     SetVar VAR_0x8004, ITEM_TM48
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _005C
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x00C9
     GoTo _0051
     End
@@ -28,7 +28,7 @@ _0051:
     End
 
 _005C:
-    CallCommonScript 0x7E1
+    MessageBagIsFull
     CloseMessage
     ReleaseAll
     End

res/field/scripts/scripts_celestic_town_cave.s

@@ -127,7 +127,7 @@ _01C3:
     Message 13
     SetVar VAR_0x8004, ITEM_HM03
     SetVar VAR_0x8005, 1
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x01AC
     ClearFlag FLAG_UNK_0x01C3
     SetFlag FLAG_DUMMY_2445

res/field/scripts/scripts_celestic_town_northwest_house.s

@@ -56,7 +56,7 @@ _0093:
     SetVar VAR_0x8004, ITEM_CHOICE_SPECS
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0174
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x0134
     Message 3
     GoTo _0153
@@ -67,7 +67,7 @@ _00D3:
     SetVar VAR_0x8004, ITEM_BLACKGLASSES
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0174
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x0135
     Message 4
     GoTo _015E
@@ -78,7 +78,7 @@ _0113:
     SetVar VAR_0x8004, ITEM_WISE_GLASSES
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _0174
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x0136
     Message 5
     GoTo _0169

res/field/scripts/scripts_celestic_town_pokecenter_1f.s

@@ -49,12 +49,12 @@ _0084:
     SetVar VAR_0x8004, ITEM_GREAT_BALL
     SetVar VAR_0x8005, 1
     GoToIfCannotFitItem VAR_0x8004, VAR_0x8005, VAR_RESULT, _00B6
-    CallCommonScript 0x7FC
+    GiveItemQuantity
     SetFlag FLAG_UNK_0x0AA1
     GoTo _00C0
 
 _00B6:
-    CallCommonScript 0x7E1
+    MessageBagIsFull
     CloseMessage
     ReleaseAll
     End

res/field/scripts/scripts_celestic_town_southwest_house.s

@@ -14,7 +14,7 @@ _000A:
     GoToIfEq VAR_RESULT, 1, _003A
     Message 0
     SetVar VAR_0x8004, POKETCH_APPID_ANALOGWATCH
-    CallCommonScript 0x7D9
+    GivePoketchApp
     WaitABXPadPress
     CloseMessage
     ReleaseAll