Merge pull request #457 from AsparagusEduardo/canfititem

Document functions and script commands adjacent to CanFitItem
2026-04-26 00:32:20 -05:00 · 2025-04-02 20:52:54 -07:00 · 2025-04-02 20:52:54 -07:00 · 083c68cd64
commit 083c68cd64
parent 2372c0b723 bebd201102
87 changed files with 627 additions and 711 deletions
--- a/asm/macros/scrcmd.inc
+++ b/asm/macros/scrcmd.inc
@ -761,11 +761,12 @@
    .short \destVarID
    .endm

-    .macro ScrCmd_07D arg0, arg1, arg2
+    // destVarID will be set to TRUE if the player has space for at least 'count' items of the specified type in their bag
+    .macro CanFitItem item, count, destVarID
    .short 125
-    .short \arg0
-    .short \arg1
-    .short \arg2
+    .short \item
+    .short \count
+    .short \destVarID
    .endm

    // destVarID will be set to TRUE if the player has at least 'count' items of the specified type in their bag
@ -4803,3 +4804,8 @@
    .set F_ACCEPT_SCRIPT_ENTRIES, FALSE
    .short 0xFD13
    .endm
+
+    .macro GoToIfCannotFitItem item, count, destVarID, offset
+    CanFitItem \item, \count, \destVarID
+    GoToIfEq \destVarID, FALSE, \offset
+    .endm
--- a/generated/items.txt
+++ b/generated/items.txt
@ -53,14 +53,14 @@ ITEM_PP_UP
 ITEM_ZINC
 ITEM_PP_MAX
 ITEM_OLD_GATEAU
-ITEM_GUARD_SPEC_
+ITEM_GUARD_SPEC
 ITEM_DIRE_HIT
 ITEM_X_ATTACK
 ITEM_X_DEFENSE
 ITEM_X_SPEED
 ITEM_X_ACCURACY
 ITEM_X_SPECIAL
-ITEM_X_SP__DEF
+ITEM_X_SP_DEF
 ITEM_POKE_DOLL
 ITEM_FLUFFY_TAIL
 ITEM_BLUE_FLUTE
--- a/include/data/mart_items.h
+++ b/include/data/mart_items.h
@ -127,11 +127,11 @@ const u16 VeilstoneDeptStoreStock_2F_UP[] = {
    ITEM_X_SPEED,
    ITEM_X_ATTACK,
    ITEM_X_DEFENSE,
-    ITEM_GUARD_SPEC_,
+    ITEM_GUARD_SPEC,
    ITEM_DIRE_HIT,
    ITEM_X_ACCURACY,
    ITEM_X_SPECIAL,
-    ITEM_X_SP__DEF,
+    ITEM_X_SP_DEF,
    SHOP_ITEM_END
 };

--- a/include/struct_defs/struct_0204C4D0_sub3.h
+++ b/include/struct_defs/struct_0204C4D0_sub3.h
@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_0204C4D0_SUB3_H

 typedef struct {
-    int unk_00;
+    int item;
    int unk_04;
 } UnkStruct_0204C4D0_sub3;

--- a/include/unk_0204E75C.h
+++ b/include/unk_0204E75C.h
@ -5,7 +5,7 @@

 BOOL ScrCmd_AddItem(ScriptContext *ctx);
 BOOL ScrCmd_RemoveItem(ScriptContext *ctx);
-BOOL ScrCmd_07D(ScriptContext *param0);
+BOOL ScrCmd_CanFitItem(ScriptContext *ctx);
 BOOL ScrCmd_CheckItem(ScriptContext *ctx);
 BOOL ScrCmd_2FE(ScriptContext *param0);
 BOOL ScrCmd_07F(ScriptContext *param0);
--- a/res/field/scripts/scripts_amity_square.s
+++ b/res/field/scripts/scripts_amity_square.s
@ -331,39 +331,39 @@ _041A:
    End

 _0490:
-    SetVar 0x409F, 176
+    SetVar 0x409F, ITEM_MAGOST_BERRY
    Return

 _0498:
-    SetVar 0x409F, 175
+    SetVar 0x409F, ITEM_CORNN_BERRY
    Return

 _04A0:
-    SetVar 0x409F, 177
+    SetVar 0x409F, ITEM_RABUTA_BERRY
    Return

 _04A8:
-    SetVar 0x409F, 178
+    SetVar 0x409F, ITEM_NOMEL_BERRY
    Return

 _04B0:
-    SetVar 0x409F, 179
+    SetVar 0x409F, ITEM_SPELON_BERRY
    Return

 _04B8:
-    SetVar 0x409F, 180
+    SetVar 0x409F, ITEM_PAMTRE_BERRY
    Return

 _04C0:
-    SetVar 0x409F, 181
+    SetVar 0x409F, ITEM_WATMEL_BERRY
    Return

 _04C8:
-    SetVar 0x409F, 182
+    SetVar 0x409F, ITEM_DURIN_BERRY
    Return

 _04D0:
-    SetVar 0x409F, 183
+    SetVar 0x409F, ITEM_BELUE_BERRY
    Return

 _04D8:
@ -377,16 +377,14 @@ _04D8:
 _04FB:
    SetVar 0x8004, 0x409F
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0595
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0595
    GoTo _054D
    End

 _0524:
    SetVar 0x8004, 0x409F
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _05DD
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _05DD
    GoTo _054D
    End

@ -1013,8 +1011,7 @@ _10E1:
    ShowYesNoMenu 0x800C
    GoToIfEq 0x800C, MENU_NO, _1161
    SetVar 0x8005, 5
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _1172
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _1172
    BufferPlayerName 0
    ScrCmd_33D 1, 0x8004
    PlaySound SEQ_FANFA4
--- a/res/field/scripts/scripts_cafe.s
+++ b/res/field/scripts/scripts_cafe.s
@ -63,9 +63,8 @@ _00BB:
    End

 _00E4:
-    SetVar 0x8004, 33
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0143
+    SetVar 0x8004, ITEM_MOOMOO_MILK
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0143
    ScrCmd_334 35, 0x8006
    ScrCmd_1A3 0x8006
    UpdateMoneyDisplay
--- a/res/field/scripts/scripts_canalave_city_gym.s
+++ b/res/field/scripts/scripts_canalave_city_gym.s
@ -51,10 +51,9 @@ _0016:
    GoTo _00BF

 _00BF:
-    SetVar 0x8004, 0x1A2
+    SetVar 0x8004, ITEM_TM91
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00FD
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00FD
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0092
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_canalave_city_southeast_house.s
+++ b/res/field/scripts/scripts_canalave_city_southeast_house.s
@ -13,10 +13,9 @@ _000A:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00C9, _0051
    Message 0
-    SetVar 0x8004, 0x177
+    SetVar 0x8004, ITEM_TM48
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _005C
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _005C
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00C9
    GoTo _0051
--- a/res/field/scripts/scripts_celestic_town_northwest_house.s
+++ b/res/field/scripts/scripts_celestic_town_northwest_house.s
@ -54,10 +54,9 @@ _0057:
 _0093:
    GoToIfSet FLAG_UNK_0x0134, _0153
    Message 2
-    SetVar 0x8004, 0x129
+    SetVar 0x8004, ITEM_CHOICE_SPECS
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0174
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0174
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0134
    Message 3
@ -66,10 +65,9 @@ _0093:
 _00D3:
    GoToIfSet FLAG_UNK_0x0135, _015E
    Message 2
-    SetVar 0x8004, 240
+    SetVar 0x8004, ITEM_BLACKGLASSES
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0174
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0174
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0135
    Message 4
@ -78,10 +76,9 @@ _00D3:
 _0113:
    GoToIfSet FLAG_UNK_0x0136, _0169
    Message 2
-    SetVar 0x8004, 0x10B
+    SetVar 0x8004, ITEM_WISE_GLASSES
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0174
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0174
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0136
    Message 5
--- a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s
+++ b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s
@ -48,10 +48,9 @@ _0044:

 _0084:
    Message 3
-    SetVar 0x8004, 3
+    SetVar 0x8004, ITEM_GREAT_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00B6
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00B6
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0AA1
    GoTo _00C0
--- a/res/field/scripts/scripts_eterna_city_condominiums_2f.s
+++ b/res/field/scripts/scripts_eterna_city_condominiums_2f.s
@ -14,10 +14,9 @@ _000E:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00C2, _005D
    Message 0
-    SetVar 0x8004, 0x18A
+    SetVar 0x8004, ITEM_TM67
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0053
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0053
    SetFlag FLAG_UNK_0x00C2
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_eterna_city_condominiums_4f.s
+++ b/res/field/scripts/scripts_eterna_city_condominiums_4f.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x0076, _004B
    Message 0
-    SetVar 0x8004, 0x14B
+    SetVar 0x8004, ITEM_TM04
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0056
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0056
    SetFlag FLAG_UNK_0x0076
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_eterna_city_gym.s
+++ b/res/field/scripts/scripts_eterna_city_gym.s
@ -89,10 +89,9 @@ _0094:
    End

 _0119:
-    SetVar 0x8004, 0x19D
+    SetVar 0x8004, ITEM_TM86
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0157
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0157
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0074
    BufferItemName 0, 0x8004
@ -118,10 +117,9 @@ _0161:
    End

 _0177:
-    SetVar 0x8004, 0x19D
+    SetVar 0x8004, ITEM_TM86
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _01B7
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _01B7
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0074
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_eterna_city_south_house.s
+++ b/res/field/scripts/scripts_eterna_city_south_house.s
@ -21,10 +21,9 @@ _0006:
    ApplyMovement 0, _0158
    WaitMovement
    Message 1
-    SetVar 0x8004, 252
+    SetVar 0x8004, ITEM_UPGRADE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0091
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0091
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0119
    Message 2
--- a/res/field/scripts/scripts_eterna_forest.s
+++ b/res/field/scripts/scripts_eterna_forest.s
@ -140,10 +140,9 @@ _0198:
    WaitMovement
    BufferPlayerName 0
    Message 5
-    SetVar 0x8004, 218
+    SetVar 0x8004, ITEM_SOOTHE_BELL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _01EA
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _01EA
    GoTo _01DB
    End

--- a/res/field/scripts/scripts_fight_area_mart.s
+++ b/res/field/scripts/scripts_fight_area_mart.s
@ -28,10 +28,9 @@ _002A:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00D5, _0071
    Message 0
-    SetVar 0x8004, 232
+    SetVar 0x8004, ITEM_SCOPE_LENS
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _007C
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _007C
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00D5
    GoTo _0071
--- a/res/field/scripts/scripts_floaroma_meadow.s
+++ b/res/field/scripts/scripts_floaroma_meadow.s
@ -130,10 +130,9 @@ _010E:
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x009F
    Message 8
-    SetVar 0x8004, 94
+    SetVar 0x8004, ITEM_HONEY
    SetVar 0x8005, 10
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _01AD
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _01AD
    CallCommonScript 0x7FC
    Message 9
    GoTo _01B0
@ -206,9 +205,8 @@ _026A:
    End

 _0293:
-    SetVar 0x8004, 94
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _02D5
+    SetVar 0x8004, ITEM_HONEY
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _02D5
    ScrCmd_1A3 0x8006
    UpdateMoneyDisplay
    PlayFanfare SEQ_SE_DP_REGI
--- a/res/field/scripts/scripts_floaroma_town_middle_house.s
+++ b/res/field/scripts/scripts_floaroma_town_middle_house.s
@ -38,10 +38,9 @@ _0057:

 _0062:
    Message 2
-    SetVar 0x8004, 0x19F
+    SetVar 0x8004, ITEM_TM88
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _009F
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _009F
    SetFlag FLAG_UNK_0x0083
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_flower_shop.s
+++ b/res/field/scripts/scripts_flower_shop.s
@ -15,10 +15,9 @@ _000E:
    GoToIfSet FLAG_UNK_0x0AAA, _0059
    Message 0
    GetRandom 0x8004, 5
-    AddVar 0x8004, 149
+    AddVar 0x8004, ITEM_CHERI_BERRY /* Cheri, Chesto, Pecha, Rawst or Aspear */
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0064
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0064
    SetFlag FLAG_UNK_0x0AAA
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_fuego_ironworks_building.s
+++ b/res/field/scripts/scripts_fuego_ironworks_building.s
@ -18,10 +18,9 @@ _0010:
    GoToIfSet FLAG_UNK_0x00DB, _00A9
    GoToIfSet FLAG_UNK_0x0138, _0062
    Message 0
-    SetVar 0x8004, 91
+    SetVar 0x8004, ITEM_STAR_PIECE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _01F3
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _01F3
    SetFlag FLAG_UNK_0x0138
    CallCommonScript 0x7FC
    GoTo _0062
--- a/res/field/scripts/scripts_galactic_hq_4f.s
+++ b/res/field/scripts/scripts_galactic_hq_4f.s
@ -39,9 +39,9 @@ _0074:
    CheckWonBattle 0x800C
    GoToIfEq 0x800C, FALSE, _00E1
    Message 2
-    SetVar 0x8004, 1
+    SetVar 0x8004, ITEM_MASTER_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
+    CanFitItem 0x8004, 0x8005, 0x800C
    CallIfEq 0x800C, 1, _00DB
    Message 3
    CloseMessage
--- a/res/field/scripts/scripts_game_corner.s
+++ b/res/field/scripts/scripts_game_corner.s
@ -201,8 +201,7 @@ _02BB:
 GameCorner_GiveTM64:
    SetVar 0x8004, ITEM_TM64
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0327
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0327
    GoTo _02F3
    End

--- a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s
+++ b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s
@ -14,10 +14,9 @@ _000E:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00CA, _0053
    Message 0
-    SetVar 0x8004, 0x1A3
+    SetVar 0x8004, ITEM_TM92
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _005E
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _005E
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00CA
    GoTo _0053
--- a/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s
+++ b/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x013A, _0055
    Message 0
-    SetVar 0x8004, 69
+    SetVar 0x8004, ITEM_WHITE_FLUTE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _004B
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _004B
    SetFlag FLAG_UNK_0x013A
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_great_marsh_6.s
+++ b/res/field/scripts/scripts_great_marsh_6.s
@ -22,29 +22,28 @@ _000A:
    End

 _005B:
-    SetVar 0x8004, 72
+    SetVar 0x8004, ITEM_RED_SHARD
    GoTo _0093
    End

 _0069:
-    SetVar 0x8004, 73
+    SetVar 0x8004, ITEM_BLUE_SHARD
    GoTo _0093
    End

 _0077:
-    SetVar 0x8004, 74
+    SetVar 0x8004, ITEM_YELLOW_SHARD
    GoTo _0093
    End

 _0085:
-    SetVar 0x8004, 75
+    SetVar 0x8004, ITEM_GREEN_SHARD
    GoTo _0093
    End

 _0093:
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00C7
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00C7
    SetFlag FLAG_UNK_0x0AB4
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s
+++ b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s
@ -72,10 +72,9 @@ _0096:
    GoTo _012B

 _012B:
-    SetVar 0x8004, 0x188
+    SetVar 0x8004, ITEM_TM65
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0169
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0169
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x007D
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s
+++ b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s
@ -87,10 +87,9 @@ _00BB:
    GoTo _0158

 _0158:
-    SetVar 0x8004, 0x188
+    SetVar 0x8004, ITEM_TM65
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0196
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0196
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x007D
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s
+++ b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s
@ -27,10 +27,9 @@ _0039:
    FacePlayer
    GoToIfSet FLAG_UNK_0x008D, _0083
    Message 0
-    SetVar 0x8004, 0x1C1
+    SetVar 0x8004, ITEM_POFFIN_CASE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _008E
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _008E
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x008D
    Message 1
--- a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s
+++ b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s
@ -12,12 +12,11 @@ _000A:
    LockAll
    FacePlayer
    GoToIfSet FLAG_UNK_0x008C, _0054
-    BufferItemName 0, 253
+    BufferItemName 0, ITEM_SHELL_BELL
    Message 0
-    SetVar 0x8004, 253
+    SetVar 0x8004, ITEM_SHELL_BELL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0064
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0064
    SetFlag FLAG_UNK_0x008C
    CallCommonScript 0x7E0
    CloseMessage
@ -25,7 +24,7 @@ _000A:
    End

 _0054:
-    BufferItemName 0, 253
+    BufferItemName 0, ITEM_SHELL_BELL
    Message 1
    WaitABXPadPress
    CloseMessage
--- a/res/field/scripts/scripts_iron_island_house.s
+++ b/res/field/scripts/scripts_iron_island_house.s
@ -26,10 +26,9 @@ _0035:
    LockAll
    FacePlayer
    Message 0
-    SetVar 0x8004, 233
+    SetVar 0x8004, ITEM_METAL_COAT
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00A8
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00A8
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x011D
    Message 1
--- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s
+++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s
@ -50,12 +50,11 @@ _0063:
    LockAll
    FacePlayer
    GoToIfSet FLAG_UNK_0x00BF, _00B7
-    BufferItemName 0, 217
+    BufferItemName 0, ITEM_QUICK_CLAW
    Message 3
-    SetVar 0x8004, 217
+    SetVar 0x8004, ITEM_QUICK_CLAW
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00AD
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00AD
    SetFlag FLAG_UNK_0x00BF
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s
+++ b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x007E, _004B
    Message 0
-    SetVar 0x8004, 230
+    SetVar 0x8004, ITEM_FOCUS_BAND
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0056
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0056
    SetFlag FLAG_UNK_0x007E
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_jubilife_tv_1f.s
+++ b/res/field/scripts/scripts_jubilife_tv_1f.s
@ -134,31 +134,30 @@ _0194:
    End

 _01DD:
-    SetVar 0x8003, 2
+    SetVar 0x8003, ITEM_ULTRA_BALL
    GoTo _021B
    End

 _01EB:
-    SetVar 0x8003, 51
+    SetVar 0x8003, ITEM_PP_UP
    GoTo _021B

 _01F7:
-    SetVar 0x8003, 216
+    SetVar 0x8003, ITEM_EXP_SHARE
    GoTo _021B

 _0203:
-    SetVar 0x8003, 29
+    SetVar 0x8003, ITEM_MAX_REVIVE
    GoTo _021B

 _020F:
-    SetVar 0x8003, 1
+    SetVar 0x8003, ITEM_MASTER_BALL
    GoTo _021B

 _021B:
    SetVar 0x8004, 0x8003
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0246
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0246
    CallCommonScript 0x7FC
    GoTo _0269

--- a/res/field/scripts/scripts_mt_coronet_2f.s
+++ b/res/field/scripts/scripts_mt_coronet_2f.s
@ -50,10 +50,9 @@ _0036:
    ApplyMovement 5, _018C
    WaitMovement
    Message 2
-    SetVar 0x8004, 68
+    SetVar 0x8004, ITEM_BLACK_FLUTE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00F2
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00F2
    CallCommonScript 0x7FC
    Call _00E5
    CallCommonScript 0x808
@ -153,10 +152,9 @@ _01A0:

 _01BE:
    Message 5
-    SetVar 0x8004, 68
+    SetVar 0x8004, ITEM_BLACK_FLUTE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _01F0
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _01F0
    CallCommonScript 0x7FC
    Call _00E5
    ReleaseAll
--- a/res/field/scripts/scripts_oreburgh_city.s
+++ b/res/field/scripts/scripts_oreburgh_city.s
@ -289,10 +289,9 @@ _0376:
    FacePlayer
    GoToIfSet FLAG_UNK_0x0109, _03BD
    Message 17
-    SetVar 0x8004, 26
+    SetVar 0x8004, ITEM_SUPER_POTION
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _03C8
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _03C8
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0109
    GoTo _03BD
--- a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s
+++ b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s
@ -25,10 +25,9 @@ _0025:
    FacePlayer
    GoToIfSet FLAG_UNK_0x010A, _006C
    Message 1
-    SetVar 0x8004, 3
+    SetVar 0x8004, ITEM_GREAT_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0077
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0077
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x010A
    GoTo _006C
--- a/res/field/scripts/scripts_oreburgh_city_gym.s
+++ b/res/field/scripts/scripts_oreburgh_city_gym.s
@ -46,10 +46,9 @@ _000E:
    End

 _00BB:
-    SetVar 0x8004, 0x193
+    SetVar 0x8004, ITEM_TM76
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00F9
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00F9
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0075
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s
+++ b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s
@ -36,10 +36,9 @@ _0034:
    CheckPartyHasSpecies 0x800C, SPECIES_GEODUDE
    GoToIfEq 0x800C, 0, _0096
    Message 3
-    SetVar 0x8004, 14
+    SetVar 0x8004, ITEM_HEAL_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _008C
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _008C
    SetFlag FLAG_UNK_0x00C1
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s
+++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s
@ -34,12 +34,11 @@ _0038:
    LockAll
    FacePlayer
    GoToIfSet FLAG_UNK_0x00C0, _008C
-    BufferItemName 0, 13
+    BufferItemName 0, ITEM_DUSK_BALL
    Message 2
-    SetVar 0x8004, 13
+    SetVar 0x8004, ITEM_DUSK_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0082
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0082
    SetFlag FLAG_UNK_0x00C0
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s
+++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s
@ -12,12 +12,11 @@ _000A:
    LockAll
    FacePlayer
    GoToIfSet FLAG_UNK_0x007C, _0054
-    BufferItemName 0, 238
+    BufferItemName 0, ITEM_HARD_STONE
    Message 0
-    SetVar 0x8004, 238
+    SetVar 0x8004, ITEM_HARD_STONE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0064
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0064
    SetFlag FLAG_UNK_0x007C
    CallCommonScript 0x7E0
    CloseMessage
@ -25,7 +24,7 @@ _000A:
    End

 _0054:
-    BufferItemName 0, 238
+    BufferItemName 0, ITEM_HARD_STONE
    Message 1
    WaitABXPadPress
    CloseMessage
--- a/res/field/scripts/scripts_oreburgh_mine_b1f.s
+++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s
@ -49,10 +49,9 @@ _0055:
    End

 _0073:
-    SetVar 0x8004, 0x12A
+    SetVar 0x8004, ITEM_FLAME_PLATE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0114
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0114
    CallCommonScript 0x7FC
    Message 5
    CloseMessage
--- a/res/field/scripts/scripts_pal_park_lobby.s
+++ b/res/field/scripts/scripts_pal_park_lobby.s
@ -642,7 +642,7 @@ _0928:
    Return

 _0984:
-    ScrCmd_07D 0x8006, 1, 0x8007
+    CanFitItem 0x8006, 1, 0x8007
    CallIfNe 0x8007, 0, _09A1
    SetVar 0x800C, 0x2710
    Return
@ -655,107 +655,107 @@ _09A1:
    Return

 _09B6:
-    SetVar 0x8006, 149
+    SetVar 0x8006, ITEM_CHERI_BERRY
    Return

 _09BE:
-    SetVar 0x8006, 150
+    SetVar 0x8006, ITEM_CHESTO_BERRY
    Return

 _09C6:
-    SetVar 0x8006, 151
+    SetVar 0x8006, ITEM_PECHA_BERRY
    Return

 _09CE:
-    SetVar 0x8006, 152
+    SetVar 0x8006, ITEM_RAWST_BERRY
    Return

 _09D6:
-    SetVar 0x8006, 153
+    SetVar 0x8006, ITEM_ASPEAR_BERRY
    Return

 _09DE:
-    SetVar 0x8006, 154
+    SetVar 0x8006, ITEM_LEPPA_BERRY
    Return

 _09E6:
-    SetVar 0x8006, 155
+    SetVar 0x8006, ITEM_ORAN_BERRY
    Return

 _09EE:
-    SetVar 0x8006, 156
+    SetVar 0x8006, ITEM_PERSIM_BERRY
    Return

 _09F6:
-    SetVar 0x8006, 159
+    SetVar 0x8006, ITEM_FIGY_BERRY
    Return

 _09FE:
-    SetVar 0x8006, 160
+    SetVar 0x8006, ITEM_WIKI_BERRY
    Return

 _0A06:
-    SetVar 0x8006, 161
+    SetVar 0x8006, ITEM_MAGO_BERRY
    Return

 _0A0E:
-    SetVar 0x8006, 162
+    SetVar 0x8006, ITEM_AGUAV_BERRY
    Return

 _0A16:
-    SetVar 0x8006, 163
+    SetVar 0x8006, ITEM_IAPAPA_BERRY
    Return

 _0A1E:
-    SetVar 0x8006, 164
+    SetVar 0x8006, ITEM_RAZZ_BERRY
    Return

 _0A26:
-    SetVar 0x8006, 165
+    SetVar 0x8006, ITEM_BLUK_BERRY
    Return

 _0A2E:
-    SetVar 0x8006, 166
+    SetVar 0x8006, ITEM_NANAB_BERRY
    Return

 _0A36:
-    SetVar 0x8006, 167
+    SetVar 0x8006, ITEM_WEPEAR_BERRY
    Return

 _0A3E:
-    SetVar 0x8006, 168
+    SetVar 0x8006, ITEM_PINAP_BERRY
    Return

 _0A46:
-    SetVar 0x8006, 157
+    SetVar 0x8006, ITEM_LUM_BERRY
    Return

 _0A4E:
-    SetVar 0x8006, 158
+    SetVar 0x8006, ITEM_SITRUS_BERRY
    Return

 _0A56:
-    SetVar 0x8006, 169
+    SetVar 0x8006, ITEM_POMEG_BERRY
    Return

 _0A5E:
-    SetVar 0x8006, 170
+    SetVar 0x8006, ITEM_KELPSY_BERRY
    Return

 _0A66:
-    SetVar 0x8006, 171
+    SetVar 0x8006, ITEM_QUALOT_BERRY
    Return

 _0A6E:
-    SetVar 0x8006, 172
+    SetVar 0x8006, ITEM_HONDEW_BERRY
    Return

 _0A76:
-    SetVar 0x8006, 173
+    SetVar 0x8006, ITEM_GREPA_BERRY
    Return

 _0A7E:
-    SetVar 0x8006, 174
+    SetVar 0x8006, ITEM_TAMATO_BERRY
    Return

    .byte 0
--- a/res/field/scripts/scripts_pastoria_city_gym.s
+++ b/res/field/scripts/scripts_pastoria_city_gym.s
@ -74,10 +74,9 @@ _0076:
    End

 _010D:
-    SetVar 0x8004, 0x17E
+    SetVar 0x8004, ITEM_TM55
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _014B
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _014B
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x009C
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_pastoria_city_middle_house.s
+++ b/res/field/scripts/scripts_pastoria_city_middle_house.s
@ -33,10 +33,9 @@ _004A:
    GoToIfEq 0x800C, 0, _009C
    GoToIfEq 0x800C, 1, _00A7
    Message 4
-    SetVar 0x8004, 215
+    SetVar 0x8004, ITEM_MACHO_BRACE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00B2
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00B2
    SetFlag FLAG_UNK_0x011C
    CallCommonScript 0x7FC
    GoTo _00BD
--- a/res/field/scripts/scripts_pastoria_city_northeast_house.s
+++ b/res/field/scripts/scripts_pastoria_city_northeast_house.s
@ -51,12 +51,11 @@ _00CC:
    End

 _00D7:
-    SetVar 0x8004, 0x104
+    SetVar 0x8004, ITEM_RED_SCARF
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CC
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CC
    BufferPartyMonSpecies 0, 0x8000
-    BufferItemName 1, 0x104
+    BufferItemName 1, ITEM_RED_SCARF
    Message 4
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0140
@ -67,12 +66,11 @@ _00D7:
    End

 _0118:
-    SetVar 0x8004, 0x105
+    SetVar 0x8004, ITEM_BLUE_SCARF
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CC
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CC
    BufferPartyMonSpecies 0, 0x8000
-    BufferItemName 1, 0x105
+    BufferItemName 1, ITEM_BLUE_SCARF
    Message 4
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0141
@ -83,12 +81,11 @@ _0118:
    End

 _0159:
-    SetVar 0x8004, 0x106
+    SetVar 0x8004, ITEM_PINK_SCARF
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CC
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CC
    BufferPartyMonSpecies 0, 0x8000
-    BufferItemName 1, 0x106
+    BufferItemName 1, ITEM_PINK_SCARF
    Message 4
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0142
@ -99,12 +96,11 @@ _0159:
    End

 _019A:
-    SetVar 0x8004, 0x107
+    SetVar 0x8004, ITEM_GREEN_SCARF
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CC
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CC
    BufferPartyMonSpecies 0, 0x8000
-    BufferItemName 1, 0x107
+    BufferItemName 1, ITEM_GREEN_SCARF
    Message 4
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0143
@ -115,12 +111,11 @@ _019A:
    End

 _01DB:
-    SetVar 0x8004, 0x108
+    SetVar 0x8004, ITEM_YELLOW_SCARF
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CC
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CC
    BufferPartyMonSpecies 0, 0x8000
-    BufferItemName 1, 0x108
+    BufferItemName 1, ITEM_YELLOW_SCARF
    Message 4
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0144
--- a/res/field/scripts/scripts_pastoria_city_southwest_house.s
+++ b/res/field/scripts/scripts_pastoria_city_southwest_house.s
@ -14,10 +14,9 @@ _000A:
    GoToIfSet FLAG_UNK_0x0AA3, _0055
    Message 0
    GetRandom 0x8004, 17
-    AddVar 0x8004, 184
+    AddVar 0x8004, ITEM_OCCA_BERRY /* Random type berry */
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0060
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0060
    SetFlag FLAG_UNK_0x0AA3
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_pokemon_mansion_maids_room.s
+++ b/res/field/scripts/scripts_pokemon_mansion_maids_room.s
@ -14,10 +14,9 @@ _000E:
    FacePlayer
    GoToIfSet FLAG_UNK_0x0139, _005D
    Message 0
-    SetVar 0x8004, 218
+    SetVar 0x8004, ITEM_SOOTHE_BELL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0053
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0053
    SetFlag FLAG_UNK_0x0139
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_route_201.s
+++ b/res/field/scripts/scripts_route_201.s
@ -1219,10 +1219,9 @@ _0E47:
    FacePlayer
    GoToIfSet FLAG_UNK_0x006C, _0E8C
    Message 55
-    SetVar 0x8004, 17
+    SetVar 0x8004, ITEM_POTION
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0E97
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0E97
    SetFlag FLAG_UNK_0x006C
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_route_204_north.s
+++ b/res/field/scripts/scripts_route_204_north.s
@ -24,10 +24,9 @@ _0021:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00C5, _0066
    Message 1
-    SetVar 0x8004, 0x195
+    SetVar 0x8004, ITEM_TM78
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0071
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0071
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00C5
    GoTo _0066
--- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s
+++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s
@ -99,10 +99,9 @@ _0102:
    BufferNumber 1, 0x8004
    GoToIfLt 0x8004, 35, _015F
    Message 5
-    SetVar 0x8004, 216
+    SetVar 0x8004, ITEM_EXP_SHARE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _014A
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _014A
    SetFlag FLAG_UNK_0x010B
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_route_208.s
+++ b/res/field/scripts/scripts_route_208.s
@ -32,10 +32,9 @@ _0070:
    FacePlayer
    GoToIfSet FLAG_UNK_0x013F, _00B5
    Message 0
-    SetVar 0x8004, 111
+    SetVar 0x8004, ITEM_ODD_KEYSTONE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00C0
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00C0
    SetFlag FLAG_UNK_0x013F
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_route_208_house.s
+++ b/res/field/scripts/scripts_route_208_house.s
@ -21,10 +21,9 @@ _001C:
    GoToIfSet FLAG_UNK_0x0AA0, _0067
    Message 0
    GetRandom 0x8004, 26
-    AddVar 0x8004, 149
+    AddVar 0x8004, ITEM_CHERI_BERRY /* Random berry from Cheri to Tamato */
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0072
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0072
    SetFlag FLAG_UNK_0x0AA0
    CallCommonScript 0x7E0
    CloseMessage
@ -117,8 +116,7 @@ _0180:
    CallIfEq 0x8000, 2, _0289
    CallIfEq 0x8000, 3, _0293
    GoToIfEq 0x800C, 0, _023C
-    ScrCmd_07D 0x8001, 1, 0x800C
-    GoToIfEq 0x800C, 0, _0233
+    GoToIfCannotFitItem 0x8001, 1, 0x800C, _0233
    CallIfEq 0x8000, 0, _029D
    CallIfEq 0x8000, 1, _02AB
    CallIfEq 0x8000, 2, _02B9
@ -147,19 +145,19 @@ _023C:
    GoTo _0229

 _0245:
-    SetVar 0x8001, 95
+    SetVar 0x8001, ITEM_GROWTH_MULCH
    GoTo _0180

 _0251:
-    SetVar 0x8001, 96
+    SetVar 0x8001, ITEM_DAMP_MULCH
    GoTo _0180

 _025D:
-    SetVar 0x8001, 97
+    SetVar 0x8001, ITEM_STABLE_MULCH
    GoTo _0180

 _0269:
-    SetVar 0x8001, 98
+    SetVar 0x8001, ITEM_GOOEY_MULCH
    GoTo _0180

 _0275:
--- a/res/field/scripts/scripts_route_209_lost_tower_5f.s
+++ b/res/field/scripts/scripts_route_209_lost_tower_5f.s
@ -14,10 +14,9 @@ _000A:
    GoToIfUnset FLAG_UNK_0x007B, _0067
    GoToIfSet FLAG_UNK_0x00A1, _005C
    Message 0
-    SetVar 0x8004, 247
+    SetVar 0x8004, ITEM_SPELL_TAG
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CF
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CF
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00A1
    GoTo _005C
@ -44,10 +43,9 @@ _0072:
    GoToIfUnset FLAG_UNK_0x007B, _00D9
    GoToIfSet FLAG_UNK_0x0116, _00C4
    Message 3
-    SetVar 0x8004, 224
+    SetVar 0x8004, ITEM_CLEANSE_TAG
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CF
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CF
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0116
    GoTo _00C4
--- a/res/field/scripts/scripts_route_210_south.s
+++ b/res/field/scripts/scripts_route_210_south.s
@ -262,10 +262,9 @@ _031F:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00C7, _0364
    Message 7
-    SetVar 0x8004, 0x17A
+    SetVar 0x8004, ITEM_TM51
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _036F
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _036F
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00C7
    GoTo _0364
--- a/res/field/scripts/scripts_route_211_east.s
+++ b/res/field/scripts/scripts_route_211_east.s
@ -19,10 +19,9 @@ _0012:
    ApplyMovement 0x800D, _0080
    WaitMovement
    Message 1
-    SetVar 0x8004, 0x194
+    SetVar 0x8004, ITEM_TM77
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0073
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0073
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00C6
    GoTo _0066
--- a/res/field/scripts/scripts_route_215.s
+++ b/res/field/scripts/scripts_route_215.s
@ -52,10 +52,9 @@ _00A0:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00CD, _00E5
    Message 1
-    SetVar 0x8004, 0x189
+    SetVar 0x8004, ITEM_TM66
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00F0
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00F0
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00CD
    GoTo _00E5
--- a/res/field/scripts/scripts_route_217_northeast_house.s
+++ b/res/field/scripts/scripts_route_217_northeast_house.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x013B, _0059
    Message 0
-    SetVar 0x8004, 247
+    SetVar 0x8004, ITEM_SPELL_TAG
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _004F
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _004F
    SetFlag FLAG_UNK_0x013B
    SetFlag FLAG_UNK_0x025F
    CallCommonScript 0x7E0
--- a/res/field/scripts/scripts_route_217_west_house.s
+++ b/res/field/scripts/scripts_route_217_west_house.s
@ -28,10 +28,9 @@ _0039:

 _0044:
    Message 1
-    SetVar 0x8004, 0x12E
+    SetVar 0x8004, ITEM_ICICLE_PLATE
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0076
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0076
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00DE
    GoTo _0039
--- a/res/field/scripts/scripts_route_221_house.s
+++ b/res/field/scripts/scripts_route_221_house.s
@ -33,8 +33,7 @@ _006D:
    BufferItemName 2, 0x8004
    Message 1
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0105
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0105
    GoTo _00C2

 _00C2:
@ -50,15 +49,15 @@ _00E7:
    End

 _00ED:
-    SetVar 0x8004, 241
+    SetVar 0x8004, ITEM_BLACK_BELT
    Return

 _00F5:
-    SetVar 0x8004, 0x10C
+    SetVar 0x8004, ITEM_EXPERT_BELT
    Return

 _00FD:
-    SetVar 0x8004, 0x113
+    SetVar 0x8004, ITEM_FOCUS_SASH
    Return

 _0105:
@ -76,8 +75,7 @@ _0114:
    BufferItemName 2, 0x8004
    Message 3
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0105
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0105
    GoTo _00C2

 _0164:
--- a/res/field/scripts/scripts_route_222.s
+++ b/res/field/scripts/scripts_route_222.s
@ -38,10 +38,9 @@ _007D:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00CE, _00C2
    Message 0
-    SetVar 0x8004, 0x17F
+    SetVar 0x8004, ITEM_TM56
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00CD
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00CD
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00CE
    GoTo _00C2
--- a/res/field/scripts/scripts_route_222_east_house.s
+++ b/res/field/scripts/scripts_route_222_east_house.s
@ -34,10 +34,9 @@ _0010:
    GoToIfEq 0x800C, 1, _00DA
    ScrCmd_1C3 0, 1, 0x8002
    Message 2
-    SetVar 0x8004, 6
+    SetVar 0x8004, ITEM_NET_BALL
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0113
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0113
    CallCommonScript 0x7FC
    ScrCmd_1C2 0x8002
    Message 3
--- a/res/field/scripts/scripts_route_225_house.s
+++ b/res/field/scripts/scripts_route_225_house.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00D9, _004B
    Message 0
-    SetVar 0x8004, 30
+    SetVar 0x8004, ITEM_FRESH_WATER
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0056
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0056
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00D9
    GoTo _004B
--- a/res/field/scripts/scripts_route_229.s
+++ b/res/field/scripts/scripts_route_229.s
@ -13,16 +13,14 @@ _000A:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00DA, _0079
    Message 0
-    SetVar 0x8004, 92
+    SetVar 0x8004, ITEM_NUGGET
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0084
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0084
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00DA
-    SetVar 0x8004, 92
+    SetVar 0x8004, ITEM_NUGGET
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0079
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0079
    Message 1
    CallCommonScript 0x7FC
    GoTo _0079
--- a/res/field/scripts/scripts_snowpoint_city_gym.s
+++ b/res/field/scripts/scripts_snowpoint_city_gym.s
@ -48,10 +48,9 @@ _0025:
    GoTo _00B0

 _00B0:
-    SetVar 0x8004, 0x18F
+    SetVar 0x8004, ITEM_TM72
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00EE
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00EE
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x009E
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_solaceon_ruins_room_2.s
+++ b/res/field/scripts/scripts_solaceon_ruins_room_2.s
@ -36,10 +36,9 @@ _004F:

 _007C:
    Message 3
-    SetVar 0x8004, 75
+    SetVar 0x8004, ITEM_GREEN_SHARD
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00AE
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00AE
    SetFlag FLAG_UNK_0x00D2
    CallCommonScript 0x7E0
    CloseMessage
--- a/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s
+++ b/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s
@ -63,7 +63,7 @@ _00AE:
    CallIfEq 0x800C, 10, _01D9
    CallIfEq 0x800C, 11, _01E1
    SetVar 0x8005, 3
-    ScrCmd_07D 93, 1, 0x800C
+    CanFitItem ITEM_HEART_SCALE, 1, 0x800C
    GoToIfNe 0x800C, 0, _01E9
    SetFlag FLAG_UNK_0x0AB1
    GoToIfEq 0x800C, 0, _023F
@ -132,8 +132,7 @@ _01E9:
    End

 _0216:
-    ScrCmd_07D 93, 1, 0x800C
-    GoToIfEq 0x800C, 0, _0251
+    GoToIfCannotFitItem ITEM_HEART_SCALE, 1, 0x800C, _0251
    SetVar 0x8004, 0x4117
    SetVar 0x8005, 3
    GoTo _025C
--- a/res/field/scripts/scripts_sunyshore_city_gym_room_3.s
+++ b/res/field/scripts/scripts_sunyshore_city_gym_room_3.s
@ -56,10 +56,9 @@ _0027:
    GoTo _00BC

 _00BC:
-    SetVar 0x8004, 0x180
+    SetVar 0x8004, ITEM_TM57
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00FA
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00FA
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00B6
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_survival_area_south_house.s
+++ b/res/field/scripts/scripts_survival_area_south_house.s
@ -12,10 +12,9 @@ _0006:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00CB, _004B
    Message 0
-    SetVar 0x8004, 0x171
+    SetVar 0x8004, ITEM_TM42
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0056
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0056
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00CB
    GoTo _004B
--- a/res/field/scripts/scripts_trainers_school.s
+++ b/res/field/scripts/scripts_trainers_school.s
@ -207,10 +207,9 @@ _0269:

 _0274:
    Message 13
-    SetVar 0x8004, 17
+    SetVar 0x8004, ITEM_POTION
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _02B3
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _02B3
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0112
    GoTo _02A8
--- a/res/field/scripts/scripts_turnback_cave_giratina_room.s
+++ b/res/field/scripts/scripts_turnback_cave_giratina_room.s
@ -65,11 +65,10 @@ _00A5:
    LockAll
    GoToIfEq 0x410C, 3, _00F4
    GoToIfLt 0x410C, 15, _0100
-    SetVar 0x8004, 90
+    SetVar 0x8004, ITEM_STARDUST
 _00CB:
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _010C
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _010C
    CallCommonScript 0x7E0
    CloseMessage
    RemoveObject 1
@ -77,11 +76,11 @@ _00CB:
    End

 _00F4:
-    SetVar 0x8004, 0x145
+    SetVar 0x8004, ITEM_REAPER_CLOTH
    GoTo _00CB

 _0100:
-    SetVar 0x8004, 106
+    SetVar 0x8004, ITEM_RARE_BONE
    GoTo _00CB

 _010C:
--- a/res/field/scripts/scripts_unk_0404.s
+++ b/res/field/scripts/scripts_unk_0404.s
--- a/res/field/scripts/scripts_unk_0408.s
+++ b/res/field/scripts/scripts_unk_0408.s
@ -294,7 +294,7 @@ _0472:
    SetVar 0x8004, 0x8000
    SetVar 0x8005, 0x8001
    SetVar 0x8006, 0x8002
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
+    CanFitItem 0x8004, 0x8005, 0x800C
    GoToIfEq 0x800C, 1, _04B0
    GoToIfEq 0x800C, 0, _064F
    End
--- a/res/field/scripts/scripts_unk_0413.s
+++ b/res/field/scripts/scripts_unk_0413.s
@ -132,8 +132,7 @@ _023B:
 _0243:
    ShowYesNoMenu 0x800C
    GoToIfEq 0x800C, MENU_NO, _02F7
-    ScrCmd_07D 0x8000, 0x8001, 0x800C
-    GoToIfEq 0x800C, 0, _02CF
+    GoToIfCannotFitItem 0x8000, 0x8001, 0x800C, _02CF
    BufferNumber 1, 0x8001
    GoToIfGt 0x8001, 1, _0289
    BufferItemName 0, 0x8000
--- a/res/field/scripts/scripts_unk_0499.s
+++ b/res/field/scripts/scripts_unk_0499.s
@ -124,8 +124,7 @@ _01CE:
    ScrCmd_33D 0, 0x4000
 _01D3:
    BufferNumber 1, 0x4001
-    ScrCmd_07D 0x4000, 0x4001, 0x800C
-    GoToIfEq 0x800C, 0, _0294
+    GoToIfCannotFitItem 0x4000, 0x4001, 0x800C, _0294
    PlaySound SEQ_FANFA4
    Message 13
    AddItem 0x4000, 0x4001, 0x800C
@ -141,8 +140,7 @@ _0218:
    ScrCmd_33D 0, 0x4002
 _021D:
    BufferNumber 1, 0x4003
-    ScrCmd_07D 0x4002, 0x4003, 0x800C
-    GoToIfEq 0x800C, 0, _0294
+    GoToIfCannotFitItem 0x4002, 0x4003, 0x800C, _0294
    PlaySound SEQ_FANFA4
    Message 13
    AddItem 0x4002, 0x4003, 0x800C
@ -158,8 +156,7 @@ _0262:
    ScrCmd_33D 0, 0x4004
 _0267:
    BufferNumber 1, 0x4005
-    ScrCmd_07D 0x4004, 0x4005, 0x800C
-    GoToIfEq 0x800C, 0, _0294
+    GoToIfCannotFitItem 0x4004, 0x4005, 0x800C, _0294
    PlaySound SEQ_FANFA4
    Message 13
    AddItem 0x4004, 0x4005, 0x800C
--- a/res/field/scripts/scripts_veilstone_city.s
+++ b/res/field/scripts/scripts_veilstone_city.s
@ -1092,10 +1092,9 @@ _0C77:
    FacePlayer
    GoToIfSet FLAG_UNK_0x00CC, _0CBC
    Message 50
-    SetVar 0x8004, 0x186
+    SetVar 0x8004, ITEM_TM63
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0CC7
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0CC7
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x00CC
    GoTo _0CBC
--- a/res/field/scripts/scripts_veilstone_city_gym.s
+++ b/res/field/scripts/scripts_veilstone_city_gym.s
@ -49,10 +49,9 @@ _0022:
    End

 _00B7:
-    SetVar 0x8004, 0x183
+    SetVar 0x8004, ITEM_TM60
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _00F5
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _00F5
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x009D
    BufferItemName 0, 0x8004
--- a/res/field/scripts/scripts_veilstone_city_prize_exchange.s
+++ b/res/field/scripts/scripts_veilstone_city_prize_exchange.s
@ -32,8 +32,7 @@ _0039:
    GoToIfEq 0x800C, MENU_NO, _0039
    ScrCmd_2A9 0x800C, 0x8001
    GoToIfEq 0x800C, 0, _00F5
-    ScrCmd_07D 0x8000, 1, 0x800C
-    GoToIfEq 0x800C, 0, _00E5
+    GoToIfCannotFitItem 0x8000, 1, 0x800C, _00E5
    Message 4
    AddItem 0x8000, 1, 0x800C
    ScrCmd_2A8 0x8001
--- a/res/field/scripts/scripts_veilstone_store_5f.s
+++ b/res/field/scripts/scripts_veilstone_store_5f.s
@ -37,10 +37,9 @@ _0040:
    FacePlayer
    GoToIfSet FLAG_UNK_0x0105, _0087
    Message 2
-    SetVar 0x8004, 0x120
+    SetVar 0x8004, ITEM_STICKY_BARB
    SetVar 0x8005, 1
-    ScrCmd_07D 0x8004, 0x8005, 0x800C
-    GoToIfEq 0x800C, 0, _0092
+    GoToIfCannotFitItem 0x8004, 0x8005, 0x800C, _0092
    CallCommonScript 0x7FC
    SetFlag FLAG_UNK_0x0105
    GoTo _0087
@ -100,15 +99,15 @@ _00D5:
    GoTo _028C

 _0125:
-    SetVar 0x8001, 30
+    SetVar 0x8001, ITEM_FRESH_WATER
    GoTo _0191

 _0131:
-    SetVar 0x8001, 31
+    SetVar 0x8001, ITEM_SODA_POP
    GoTo _0191

 _013D:
-    SetVar 0x8001, 32
+    SetVar 0x8001, ITEM_LEMONADE
    GoTo _0191

 _0149:
@ -143,8 +142,7 @@ _0191:
    CallIfEq 0x8000, 1, _0153
    CallIfEq 0x8000, 2, _015D
    GoToIfEq 0x800C, 0, _0277
-    ScrCmd_07D 0x8001, 1, 0x800C
-    GoToIfEq 0x800C, 0, _0280
+    GoToIfCannotFitItem 0x8001, 1, 0x800C, _0280
    CallIfEq 0x8000, 0, _0167
    CallIfEq 0x8000, 1, _0175
    CallIfEq 0x8000, 2, _0183
@ -158,8 +156,7 @@ _0191:
    CallCommonScript 0x7FC
    GetRandom 0x800C, 64
    GoToIfNe 0x800C, 0, _026E
-    ScrCmd_07D 0x8001, 1, 0x800C
-    GoToIfEq 0x800C, 0, _0280
+    GoToIfCannotFitItem 0x8001, 1, 0x800C, _0280
    PlayFanfare SEQ_SE_DP_JIHANKI
    BufferItemName 0, 0x8001
    Message 8
--- a/res/field/scripts/scripts_veilstone_store_b1f.s
+++ b/res/field/scripts/scripts_veilstone_store_b1f.s
@ -134,8 +134,7 @@ _00FE:
 _0150:
    SetVar 0x8004, 1
    SetVar 0x8005, 200
-    ScrCmd_07D 42, 0x8004, 0x800C
-    GoToIfEq 0x800C, 0, _01FF
+    GoToIfCannotFitItem ITEM_LAVA_COOKIE, 0x8004, 0x800C, _01FF
    ScrCmd_1AB 0x800C, 200
    GoToIfEq 0x800C, 0, _020A
    Message 9
@ -145,8 +144,7 @@ _0150:
 _018F:
    SetVar 0x8004, 10
    SetVar 0x8005, 0x7D0
-    ScrCmd_07D 42, 0x8004, 0x800C
-    GoToIfEq 0x800C, 0, _01FF
+    GoToIfCannotFitItem ITEM_LAVA_COOKIE, 0x8004, 0x800C, _01FF
    ScrCmd_1AB 0x800C, 0x7D0
    GoToIfEq 0x800C, 0, _020A
    Message 10
--- a/res/items/pl_item_data.csv
+++ b/res/items/pl_item_data.csv
@ -61,7 +61,7 @@ ITEM_X_DEFENSE,550,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEM
 ITEM_X_SPEED,350,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,0,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,1,0,0,false,false,false,false,false,false,false,false,false,false,false,true,true,false,0,0,0,0,0,0,0,0,1,1,0
 ITEM_X_ACCURACY,950,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,0,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,1,0,false,false,false,false,false,false,false,false,false,false,false,true,true,false,0,0,0,0,0,0,0,0,1,1,0
 ITEM_X_SPECIAL,350,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,0,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,1,0,0,0,0,false,false,false,false,false,false,false,false,false,false,false,true,true,false,0,0,0,0,0,0,0,0,1,1,0
-ITEM_X_SP__DEF,350,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,0,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,1,0,0,0,false,false,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0
+ITEM_X_SP_DEF,350,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,0,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,1,0,0,0,false,false,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0
 ITEM_POKE_DOLL,1000,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,3,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,false,false,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0
 ITEM_FLUFFY_TAIL,1000,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,2,0,3,1,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,false,false,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0
 ITEM_BLUE_FLUTE,100,HOLD_EFFECT_NONE,0,0,0,30,0,31,false,false,POCKET_BATTLE_ITEMS,8,0,0,1,true,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,false,false,false,false,false,false,false,false,false,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0
--- a/res/trainers/data/school_kid_esteban.json
+++ b/res/trainers/data/school_kid_esteban.json
@ -2,7 +2,7 @@
    "name": "Esteban",
    "class": "TRAINER_CLASS_SCHOOL_KID_MALE",
    "items": [
-        "ITEM_X_SP__DEF"
+        "ITEM_X_SP_DEF"
    ],
    "ai_flags": [
        "AI_FLAG_BASIC",
--- a/src/overlay097/ov97_02237694.c
+++ b/src/overlay097/ov97_02237694.c
@ -4,6 +4,7 @@
 #include <string.h>

 #include "constants/species.h"
+#include "generated/items.h"

 #include "struct_defs/struct_0202DF40.h"

@ -628,27 +629,27 @@ static void ov97_02237FF4(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct

 static void ov97_022380C8(UnkStruct_ov97_0223F550 *param0, int param1, UnkStruct_0202DF40 *param2)
 {
-    int v0;
+    int item;

    switch (param1) {
    case 3:
-        v0 = param2->unk_04.val3.unk_00;
+        item = param2->unk_04.val3.item;
        break;
    case 8:
-        v0 = 454;
+        item = ITEM_MEMBER_CARD;
        break;
    case 9:
-        v0 = 452;
+        item = ITEM_OAKS_LETTER;
        break;
    case 10:
-        v0 = 455;
+        item = ITEM_AZURE_FLUTE;
        break;
    case 12:
-        v0 = 467;
+        item = ITEM_SECRET_KEY;
        break;
    }

-    ov97_02237B0C(16, Item_FileID(v0, 1), Item_FileID(v0, 2), Item_IconNCERFile(), Item_IconNANRFile(), 1);
+    ov97_02237B0C(16, Item_FileID(item, ITEM_FILE_TYPE_ICON), Item_FileID(item, ITEM_FILE_TYPE_PALETTE), Item_IconNCERFile(), Item_IconNANRFile(), 1);
    ov97_02237C80((0 * FX32_ONE), (256 * FX32_ONE));

    param0->unk_26C = ov97_02237D14(1, param0->unk_26C, HW_LCD_WIDTH / 2, 0, 0);
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@ -890,7 +890,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
    ScrCmd_07A,
    ScrCmd_AddItem,
    ScrCmd_RemoveItem,
-    ScrCmd_07D,
+    ScrCmd_CanFitItem,
    ScrCmd_CheckItem,
    ScrCmd_07F,
    ScrCmd_GetItemPocket,
--- a/src/unk_0204B830.c
+++ b/src/unk_0204B830.c
@ -351,26 +351,26 @@ static void sub_0204BE44(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204BE84(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);

-    return Bag_CanFitItem(v0, v1->val3.unk_00, 1, 32);
+    return Bag_CanFitItem(bag, v1->val3.item, 1, HEAP_ID_FIELD_TASK);
 }

 static void sub_0204BEAC(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);
    u16 v2;
-    u16 v3 = v1->val3.unk_00;
+    u16 v3 = v1->val3.item;

-    Bag_TryAddItem(v0, v3, 1, 32);
+    Bag_TryAddItem(bag, v3, 1, HEAP_ID_FIELD_TASK);
 }

 static void sub_0204BED4(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)
 {
    UnkUnion_0204C4D0 *v0 = sub_0204B844(param0->fieldSystem);
-    u16 v1 = v0->val3.unk_00;
+    u16 v1 = v0->val3.item;

    *param1 = 379;
    *param2 = 9;
@ -381,9 +381,9 @@ static void sub_0204BED4(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static void sub_0204BF14(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)
 {
-    Bag *v0 = SaveData_GetBag(param0->fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(param0->fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(param0->fieldSystem);
-    u16 v2 = v1->val3.unk_00;
+    u16 v2 = v1->val3.item;

    *param1 = 379;
    *param2 = 5;
@ -393,7 +393,7 @@ static void sub_0204BF14(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204BF48(FieldSystem *fieldSystem, void *param1)
 {
-    return 1;
+    return TRUE;
 }

 static void sub_0204BF4C(FieldSystem *fieldSystem, void *param1)
@ -532,10 +532,10 @@ static void sub_0204C128(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204C138(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);

-    return Bag_CanFitItem(v0, 454, 1, 32);
+    return Bag_CanFitItem(bag, ITEM_MEMBER_CARD, 1, HEAP_ID_FIELD_TASK);
 }

 static void InitDarkraiEvent(FieldSystem *fieldSystem, void *dummy)
@ -574,10 +574,10 @@ static void sub_0204C1CC(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204C1FC(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);

-    return Bag_CanFitItem(v0, 452, 1, 32);
+    return Bag_CanFitItem(bag, ITEM_OAKS_LETTER, 1, HEAP_ID_FIELD_TASK);
 }

 static void InitShayminEvent(FieldSystem *fieldSystem, void *dummy)
@ -620,10 +620,10 @@ static void sub_0204C2A0(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204C2D0(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);

-    return Bag_CanFitItem(v0, 467, 1, 32);
+    return Bag_CanFitItem(bag, ITEM_SECRET_KEY, 1, HEAP_ID_FIELD_TASK);
 }

 static void InitRotomEvent(FieldSystem *fieldSystem, void *dummy)
@ -662,10 +662,10 @@ static void sub_0204C364(UnkStruct_0204B830 *param0, u16 *param1, u16 *param2)

 static BOOL sub_0204C394(FieldSystem *fieldSystem, void *param1)
 {
-    Bag *v0 = SaveData_GetBag(fieldSystem->saveData);
+    Bag *bag = SaveData_GetBag(fieldSystem->saveData);
    UnkUnion_0204C4D0 *v1 = sub_0204B844(fieldSystem);

-    return Bag_CanFitItem(v0, 455, 1, 32);
+    return Bag_CanFitItem(bag, ITEM_AZURE_FLUTE, 1, HEAP_ID_FIELD_TASK);
 }

 static void InitArceusEvent(FieldSystem *fieldSystem, void *dummy)
--- a/src/unk_0204E75C.c
+++ b/src/unk_0204E75C.c
@ -33,15 +33,15 @@ BOOL ScrCmd_RemoveItem(ScriptContext *ctx)
    return FALSE;
 }

-BOOL ScrCmd_07D(ScriptContext *param0)
+BOOL ScrCmd_CanFitItem(ScriptContext *ctx)
 {
-    FieldSystem *fieldSystem = param0->fieldSystem;
-    u16 v1 = ScriptContext_GetVar(param0);
-    u16 v2 = ScriptContext_GetVar(param0);
-    u16 *v3 = ScriptContext_GetVarPointer(param0);
+    FieldSystem *fieldSystem = ctx->fieldSystem;
+    u16 item = ScriptContext_GetVar(ctx);
+    u16 count = ScriptContext_GetVar(ctx);
+    u16 *destVar = ScriptContext_GetVarPointer(ctx);

-    *v3 = Bag_CanFitItem(SaveData_GetBag(fieldSystem->saveData), v1, v2, 4);
-    return 0;
+    *destVar = Bag_CanFitItem(SaveData_GetBag(fieldSystem->saveData), item, count, HEAP_ID_FIELD);
+    return FALSE;
 }

 BOOL ScrCmd_CheckItem(ScriptContext *ctx)
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@ -52,7 +52,7 @@ typedef struct {
    u8 unk_03;
    u8 unk_04;
    u8 unk_05;
-    u16 unk_06;
+    u16 item;
    Strbuf *unk_08;
 } UnkStruct_02072EB8;

@ -106,7 +106,7 @@ typedef struct {
    UnkStruct_0206A844 *unk_1A4;
    UnkStruct_02097728 *unk_1A8;
    UnkStruct_02028430 *unk_1AC;
-    Bag *unk_1B0;
+    Bag *bag;
    PartyManagementData *unk_1B4;
 } UnkStruct_02072334;

@ -592,7 +592,7 @@ static void sub_02072878(SysTask *param0, void *param1)

        sub_020734F4(v4, 1);

-        if (Bag_GetItemQuantity(v4->unk_1B0, v4->unk_1C[v4->unk_18].unk_06, v4->heapID) > 0) {
+        if (Bag_GetItemQuantity(v4->bag, v4->unk_1C[v4->unk_18].item, v4->heapID) > 0) {
            v4->unk_13B_6 = 1;
        } else {
            v4->unk_13B_6 = 0;
@ -906,7 +906,7 @@ static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *param1, int param
    v5 = sub_02028430(param1);

    param0->unk_1AC = v5;
-    param0->unk_1B0 = SaveData_GetBag(param1);
+    param0->bag = SaveData_GetBag(param1);

    v6 = sub_0202818C(param2);

@ -927,7 +927,7 @@ static void sub_02072F30(UnkStruct_02072334 *param0, SaveData *param1, int param
        v7->unk_01 = 1;
        v7->unk_04 = sub_02028310(v6);
        v7->unk_05 = sub_02028314(v6);
-        v7->unk_06 = Item_ForMailNumber(v7->unk_05);
+        v7->item = Item_ForMailNumber(v7->unk_05);

        Strbuf_CopyChars(v7->unk_08, sub_0202830C(v6));

@ -961,20 +961,20 @@ static void sub_02073020(UnkStruct_02072334 *param0, u8 param1)
 static BOOL sub_02073060(UnkStruct_02072334 *param0)
 {
    UnkStruct_02072EB8 *v0;
-    BOOL v1;
+    BOOL canFitItem;

    v0 = &(param0->unk_1C[param0->unk_18]);
-    v1 = Bag_CanFitItem(param0->unk_1B0, v0->unk_06, 1, param0->heapID);
+    canFitItem = Bag_CanFitItem(param0->bag, v0->item, 1, param0->heapID);

-    if (v1) {
-        Bag_TryAddItem(param0->unk_1B0, v0->unk_06, 1, param0->heapID);
+    if (canFitItem) {
+        Bag_TryAddItem(param0->bag, v0->item, 1, param0->heapID);
    }

    sub_02028470(param0->unk_1AC, 0, param0->unk_18);
    sub_02073020(param0, param0->unk_18);
    sub_02072EB8(v0, param0->unk_18);

-    return v1;
+    return canFitItem;
 }

 static void sub_020730B8(UnkStruct_02072334 *param0, u8 param1, BOOL param2)
@ -995,8 +995,8 @@ static void sub_020730B8(UnkStruct_02072334 *param0, u8 param1, BOOL param2)
    sub_020977E4(param0->unk_1AC, param0->unk_18, v2, param0->heapID);

    if (param2) {
-        if (Bag_CanFitItem(param0->unk_1B0, v0->unk_06, 1, param0->heapID)) {
-            Bag_TryAddItem(param0->unk_1B0, v0->unk_06, 1, param0->heapID);
+        if (Bag_CanFitItem(param0->bag, v0->item, 1, param0->heapID)) {
+            Bag_TryAddItem(param0->bag, v0->item, 1, param0->heapID);
        }
    }

@ -1208,7 +1208,7 @@ static int sub_02073524(UnkStruct_02072334 *param0, int param1)
        v0->unk_08 = sub_02028430(param0->fieldSystem->saveData);
        v0->unk_21 = 0;
        v0->unk_20 = param1;
-        v0->unk_24 = param0->unk_1C[param0->unk_18].unk_06;
+        v0->unk_24 = param0->unk_1C[param0->unk_18].item;

        if (param1 == 11) {
            v0->selectedMonSlot = param0->unk_17;