New macro, fixes many functions, more names

include/functions.h

@@ -2051,20 +2051,20 @@ void Interface_ChangeAlpha(u16 param_1);
 // void func_8010F1A8(void);
 // void func_80110038(void);
 // void func_80111CB4(void);
-// void func_801129E4(void);
-void func_80112AFC(GlobalContext* globalCtx);
-void Interface_LoadItemIcon(GlobalContext* globalCtx, u32 arg1);
+// void Interface_SetSceneRestrictions(void);
+void Interface_InitMinigame(GlobalContext* globalCtx);
+void Interface_LoadItemIcon(GlobalContext* globalCtx, u8 arg1);
 // void func_80112BE4(void);
 // void func_80112C0C(void);
 u8 Item_Give(GlobalContext* globalCtx, u8 param_2);
-// void func_801143CC(void);
-s32 func_80114978(u8 arg0);
-void func_801149A0(s16 arg0, s16 arg1);
-// void func_80114A9C(void);
-// void func_80114B84(void);
+// void Item_CheckObtainabilityImpl(void);
+s32 Item_CheckObtainability(u8 arg0);
+void Inventory_DeleteItem(s16 arg0, s16 arg1);
+// void Inventory_UnequipItem(void);
+// void Inventory_ReplaceItem(void);
 // void func_80114CA0(void);
-s32 Interface_HasEmptyBottle(void);
-s32 Interface_HasItemInBottle(u8 itemId);
+s32 Inventory_HasEmptyBottle(void);
+s32 Inventory_HasItemInBottle(u8 itemId);
 // void func_80114FD0(void);
 // void func_80115130(void);
 // void func_801152B8(void);

include/macros.h

@@ -66,6 +66,8 @@
 #define INV_CONTENT_VOID(item) ((void)0, gSaveContext.save.inventory.items)[SLOT(item)]
 
 #define CUR_FORM ((gSaveContext.save.playerForm == PLAYER_FORM_HUMAN) ? 0 : gSaveContext.save.playerForm)
+#define CUR_FORM_BTN_ITEM(btn) ((u8)((btn) == 0 ? gSaveContext.save.equips.buttonItems[CUR_FORM][btn] : gSaveContext.save.equips.buttonItems[0][btn]))
+#define CUR_FORM_CBTN_SLOT(btn) ((u8)((btn) == 0 ? gSaveContext.save.equips.cButtonSlots[CUR_FORM][btn] : gSaveContext.save.equips.cButtonSlots[0][btn]))
 
 #define ALL_EQUIP_VALUE(equip) ((gSaveContext.save.inventory.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])
 #define CUR_EQUIP_VALUE(equip) ((gSaveContext.save.equips.equipment & gEquipMasks[equip]) >> gEquipShifts[equip])

include/variables.h

@@ -1043,8 +1043,8 @@ extern UNK_PTR D_801BF5C0;
 // extern UNK_TYPE1 D_801BF79E;
 // extern UNK_TYPE2 D_801BF884;
 // extern UNK_TYPE2 D_801BF888;
-// extern UNK_TYPE2 D_801BF88C;
-// extern UNK_TYPE2 D_801BF890;
+// extern UNK_TYPE2 sHBAScoreTier;
+// extern UNK_TYPE2 sMinigameScoreDigits;
 // extern UNK_TYPE2 D_801BF898;
 // extern UNK_TYPE2 D_801BF89C;
 // extern UNK_TYPE2 sMagicBarOutlinePrimRed;

src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c

@@ -219,7 +219,7 @@ s32 func_80BECFBC(EnAkindonuts* this) {
             return 0x9A;
 
         case 3:
-            func_801149A0(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
+            Inventory_DeleteItem(ITEM_DEED_OCEAN, SLOT(ITEM_DEED_OCEAN));
             return 0x7;
     }
     return 0;
@@ -321,7 +321,7 @@ s32 func_80BED27C(EnAkindonuts* this) {
 }
 
 s32 func_80BED2FC(EnAkindonuts* this) {
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return 2;
     }
 
@@ -335,7 +335,7 @@ s32 func_80BED2FC(EnAkindonuts* this) {
 }
 
 s32 func_80BED35C(EnAkindonuts* this) {
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return 2;
     }
 

src/overlays/actors/ovl_En_Cow/z_en_cow.c

@@ -241,7 +241,7 @@ void EnCow_GiveMilk(EnCow* this, GlobalContext* globalCtx) {
 
 void EnCow_CheckForEmptyBottle(EnCow* this, GlobalContext* globalCtx) {
     if ((func_80152498(&globalCtx->msgCtx) == 5) && func_80147624(globalCtx)) {
-        if (Interface_HasEmptyBottle()) {
+        if (Inventory_HasEmptyBottle()) {
             func_80151938(globalCtx, 0x32C9); // Text to give milk.
             this->actionFunc = EnCow_GiveMilk;
         } else {
@@ -298,7 +298,7 @@ void EnCow_Idle(EnCow* this, GlobalContext* globalCtx) {
         if (func_801A5100() == 4) {
             if (!(gSaveContext.save.weekEventReg[87] & 1)) {
                 gSaveContext.save.weekEventReg[87] |= 1;
-                if (Interface_HasEmptyBottle()) {
+                if (Inventory_HasEmptyBottle()) {
                     this->actor.textId = 0x32C9; // Text to give milk.
                 } else {
                     this->actor.textId = 0x32CA; // Text if you don't have an empty bottle.

src/overlays/actors/ovl_En_Dnp/z_en_dnp.c

@@ -375,7 +375,7 @@ void EnDnp_Init(Actor* thisx, GlobalContext* globalCtx) {
         this->actor.world.rot.x = this->actor.shape.rot.x;
         this->actor.cutscene = 0x10;
         this->actionFunc = func_80B3D47C;
-    } else if (((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_0) && !Interface_HasItemInBottle(ITEM_DEKU_PRINCESS) &&
+    } else if (((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_0) && !Inventory_HasItemInBottle(ITEM_DEKU_PRINCESS) &&
                 !(gSaveContext.save.weekEventReg[23] & 0x20)) ||
                ((ENDNP_GET_7(&this->actor) == ENDNP_GET_7_2) && (gSaveContext.save.weekEventReg[23] & 0x20))) {
         Actor_SetScale(&this->actor, 0.0085f);

src/overlays/actors/ovl_En_Dnq/z_en_dnq.c

@@ -346,7 +346,7 @@ void func_80A52DC8(EnDnq* this, GlobalContext* globalCtx) {
 
     if (!(gSaveContext.save.weekEventReg[23] & 0x20)) {
         this->unk_390 = 70.0f;
-        if (Interface_HasItemInBottle(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) &&
+        if (Inventory_HasItemInBottle(ITEM_DEKU_PRINCESS) && !func_801690CC(globalCtx) &&
             (func_80152498(&globalCtx->msgCtx) == 0) && (ActorCutscene_GetCurrentIndex() == -1)) {
             if ((DECR(this->unk_384) == 0) && (gSaveContext.save.weekEventReg[29] & 0x40)) {
                 func_801518B0(globalCtx, 0x969, NULL);

src/overlays/actors/ovl_En_GirlA/z_en_girla.c

@@ -185,7 +185,7 @@ void EnGirlA_Destroy(Actor* thisx, GlobalContext* globalCtx) {
 }
 
 s32 EnGirlA_CanBuyPotionRed(GlobalContext* globalCtx, EnGirlA* this) {
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
@@ -195,7 +195,7 @@ s32 EnGirlA_CanBuyPotionRed(GlobalContext* globalCtx, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuyPotionGreen(GlobalContext* globalCtx, EnGirlA* this) {
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
@@ -208,7 +208,7 @@ s32 EnGirlA_CanBuyPotionBlue(GlobalContext* globalCtx, EnGirlA* this) {
     if (!(gSaveContext.save.weekEventReg[53] & 8)) {
         return CANBUY_RESULT_CANNOT_GET_NOW;
     }
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
     if (!(gSaveContext.save.weekEventReg[53] & 0x10)) {
@@ -240,7 +240,7 @@ s32 EnGirlA_CanBuyNuts(GlobalContext* globalCtx, EnGirlA* this) {
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
-    if (func_80114978(ITEM_NUT) == ITEM_NONE) {
+    if (Item_CheckObtainability(ITEM_NUT) == ITEM_NONE) {
         return CANBUY_RESULT_SUCCESS_1;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -263,7 +263,7 @@ s32 EnGirlA_CanBuyStick(GlobalContext* globalCtx, EnGirlA* this) {
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
-    if (func_80114978(ITEM_STICK) == ITEM_NONE) {
+    if (Item_CheckObtainability(ITEM_STICK) == ITEM_NONE) {
         return CANBUY_RESULT_SUCCESS_1;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -322,7 +322,7 @@ s32 EnGirlA_CanBuyBombchus(GlobalContext* globalCtx, EnGirlA* this) {
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {
         return CANBUY_RESULT_NEED_RUPEES;
     }
-    if (func_80114978(ITEM_BOMBCHU) == ITEM_NONE) {
+    if (Item_CheckObtainability(ITEM_BOMBCHU) == ITEM_NONE) {
         return CANBUY_RESULT_SUCCESS_1;
     }
     return CANBUY_RESULT_SUCCESS_2;
@@ -366,7 +366,7 @@ s32 EnGirlA_CanBuyShieldMirror(GlobalContext* globalCtx, EnGirlA* this) {
 }
 
 s32 EnGirlA_CanBuyFairy(GlobalContext* globalCtx, EnGirlA* this) {
-    if (!Interface_HasEmptyBottle()) {
+    if (!Inventory_HasEmptyBottle()) {
         return CANBUY_RESULT_NEED_EMPTY_BOTTLE;
     }
     if (gSaveContext.save.playerData.rupees < globalCtx->msgCtx.unk1206C) {

src/overlays/actors/ovl_En_In/z_en_in.c

@@ -793,7 +793,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
                     if (msgCtx->choiceIndex == 0) {
                         func_8019F208();
                         if (gSaveContext.save.playerData.rupees >= globalCtx->msgCtx.unk1206C) {
-                            if (Interface_HasEmptyBottle()) {
+                            if (Inventory_HasEmptyBottle()) {
                                 this->actionFunc = func_808F3C40;
                                 func_800B8A1C(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
                                 Rupees_ChangeBy(-globalCtx->msgCtx.unk1206C);
@@ -939,7 +939,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
                     break;
                 case 0x347E:
                     func_808F35D8(this, globalCtx);
-                    if (Interface_HasEmptyBottle()) {
+                    if (Inventory_HasEmptyBottle()) {
                         this->actionFunc = func_808F3B40;
                         func_800B8A1C(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
                         ret = true;
@@ -1045,7 +1045,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
                     if (msgCtx->choiceIndex == 0) {
                         func_8019F208();
                         if (gSaveContext.save.playerData.rupees >= globalCtx->msgCtx.unk1206C) {
-                            if (Interface_HasEmptyBottle()) {
+                            if (Inventory_HasEmptyBottle()) {
                                 this->actionFunc = func_808F3C40;
                                 func_800B8A1C(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
                                 Rupees_ChangeBy(-globalCtx->msgCtx.unk1206C);
@@ -1143,7 +1143,7 @@ s32 func_808F4414(GlobalContext* globalCtx, EnIn* this, s32 arg2) {
                     break;
                 case 0x34A1:
                     func_808F35D8(this, globalCtx);
-                    if (Interface_HasEmptyBottle()) {
+                    if (Inventory_HasEmptyBottle()) {
                         this->actionFunc = func_808F3B40;
                         func_800B8A1C(&this->actor, globalCtx, 0x92, 500.0f, 100.0f);
                         ret = true;

src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

@@ -713,7 +713,7 @@ void EnMa4_InitHorsebackGame(EnMa4* this, GlobalContext* globalCtx) {
     globalCtx->interfaceCtx.unk_280 = 1;
     func_8010E9F0(4, 0);
     gSaveContext.save.weekEventReg[0x8] |= 0x01;
-    func_80112AFC(globalCtx);
+    Interface_InitMinigame(globalCtx);
     player->stateFlags1 |= 0x20;
     this->actionFunc = EnMa4_SetupHorsebackGameWait;
 }

src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c

@@ -332,7 +332,7 @@ void func_809C6C2C(EnSyatekiMan* this, GlobalContext* globalCtx) {
                 globalCtx->msgCtx.unk11F22 = 0x43;
                 globalCtx->msgCtx.unk12023 = 4;
                 player->actor.freezeTimer = 0;
-                func_80112AFC(globalCtx);
+                Interface_InitMinigame(globalCtx);
                 globalCtx->interfaceCtx.hbaAmmo = 80;
                 func_80123F2C(globalCtx, 80);
                 this->unk_26A = 1;
@@ -654,7 +654,7 @@ void func_809C7620(EnSyatekiMan* this, GlobalContext* globalCtx) {
                 globalCtx->msgCtx.unk12023 = 4;
                 player->actor.freezeTimer = 0;
                 this->unk_27E = 0;
-                func_80112AFC(globalCtx);
+                Interface_InitMinigame(globalCtx);
                 func_80123F2C(globalCtx, 0x63);
                 this->unk_26A = 1;
                 func_801A2BB8(NA_BGM_MINI_GAME_2);

src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c

@@ -670,7 +670,7 @@ s32 EnTalkGibud_PresentedItemMatchesRequest(EnTalkGibud* this, GlobalContext* gl
                 return EN_TALK_GIBUD_REQUESTED_ITEM_NOT_ENOUGH_AMMO;
             }
         }
-        if (Interface_HasItemInBottle(requestedItem->item)) {
+        if (Inventory_HasItemInBottle(requestedItem->item)) {
             return EN_TALK_GIBUD_REQUESTED_ITEM_MET;
         }
     }

src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c

@@ -249,7 +249,7 @@ s32 func_80C10B0C(EnThiefbird* this, GlobalContext* globalCtx) {
     }
 
     if (isItemFound) {
-        func_801149A0(itemId2, slotId);
+        Inventory_DeleteItem(itemId2, slotId);
         this->unk_3E8 = D_060033B0;
         if (!func_80152498(&globalCtx->msgCtx)) {
             func_801518B0(globalCtx, 0xF4, NULL);
@@ -266,7 +266,7 @@ s32 func_80C10B0C(EnThiefbird* this, GlobalContext* globalCtx) {
 
         itemId1 = phi_a3 + (ITEM_SWORD_KOKIRI - 1);
         if (phi_a3 == 4) {
-            func_801149A0(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY);
+            Inventory_DeleteItem(ITEM_SWORD_GREAT_FAIRY, SLOT_SWORD_GREAT_FAIRY);
             this->unk_3E8 = D_06003D58;
             itemId1 = ITEM_SWORD_GREAT_FAIRY;
         } else {

src/overlays/actors/ovl_En_Trt/z_en_trt.c

@@ -397,7 +397,7 @@ void EnTrt_Goodbye(EnTrt* this, GlobalContext* globalCtx) {
 void EnTrt_SetupTryToGiveRedPotion(EnTrt* this, GlobalContext* globalCtx) {
     if (func_80152498(&globalCtx->msgCtx) == 5 && func_80147624(globalCtx)) {
         if (this->textId == 0x88F) {
-            if (Interface_HasEmptyBottle() || !(gSaveContext.save.weekEventReg[0xC] & 0x10)) {
+            if (Inventory_HasEmptyBottle() || !(gSaveContext.save.weekEventReg[0xC] & 0x10)) {
                 if (this->cutsceneState == ENTRT_CUTSCENESTATE_PLAYING) {
                     ActorCutscene_Stop(this->cutscene);
                     this->cutsceneState = ENTRT_CUTSCENESTATE_STOPPED;
@@ -418,7 +418,7 @@ void EnTrt_SetupTryToGiveRedPotion(EnTrt* this, GlobalContext* globalCtx) {
                 EnTrt_SetupStartShopping(globalCtx, this, 0);
             } else if (gSaveContext.save.weekEventReg[0x54] & 0x40) {
                 this->textId = 0x83B;
-                if (Interface_HasItemInBottle(ITEM_POTION_RED)) {
+                if (Inventory_HasItemInBottle(ITEM_POTION_RED)) {
                     EnTrt_SetupStartShopping(globalCtx, this, false);
                 } else {
                     this->actionFunc = EnTrt_TryToGiveRedPotion;
@@ -730,7 +730,7 @@ void EnTrt_SelectItem(EnTrt* this, GlobalContext* globalCtx) {
                 }
             }
         } else if (talkState == 5 && func_80147624(globalCtx)) {
-            if (!Interface_HasEmptyBottle()) {
+            if (!Inventory_HasEmptyBottle()) {
                 play_sound(NA_SE_SY_ERROR);
                 EnTrt_SetupCannotBuy(globalCtx, this, 0x846);
             } else {
@@ -941,7 +941,7 @@ void EnTrt_TryToGiveRedPotionAfterSurprised(EnTrt* this, GlobalContext* globalCt
 
     this->blinkFunc = EnTrt_Blink;
     if (talkState == 6 && func_80147624(globalCtx)) {
-        if (Interface_HasEmptyBottle() || !(gSaveContext.save.weekEventReg[0xC] & 0x10)) {
+        if (Inventory_HasEmptyBottle() || !(gSaveContext.save.weekEventReg[0xC] & 0x10)) {
             if (this->cutsceneState == ENTRT_CUTSCENESTATE_PLAYING) {
                 ActorCutscene_Stop(this->cutscene);
                 this->cutsceneState = ENTRT_CUTSCENESTATE_STOPPED;
@@ -960,7 +960,7 @@ void EnTrt_TryToGiveRedPotionAfterSurprised(EnTrt* this, GlobalContext* globalCt
 void EnTrt_TryToGiveRedPotion(EnTrt* this, GlobalContext* globalCtx) {
     if (func_80152498(&globalCtx->msgCtx) == 5 && func_80147624(globalCtx)) {
         if (this->textId == 0x83C) {
-            if (Interface_HasEmptyBottle()) {
+            if (Inventory_HasEmptyBottle()) {
                 if (this->cutsceneState == ENTRT_CUTSCENESTATE_PLAYING) {
                     ActorCutscene_Stop(this->cutscene);
                     this->cutsceneState = ENTRT_CUTSCENESTATE_STOPPED;

tools/disasm/functions.txt

@@ -2106,21 +2106,21 @@
     0x8010F1A8:("func_8010F1A8",),
     0x80110038:("func_80110038",),
     0x80111CB4:("func_80111CB4",),
-    0x801129E4:("func_801129E4",),
+    0x801129E4:("Interface_SetSceneRestrictions",),
     0x80112AF4:("func_80112AF4",),
-    0x80112AFC:("func_80112AFC",),
+    0x80112AFC:("Interface_InitMinigame",),
     0x80112B40:("Interface_LoadItemIcon",),
     0x80112BE4:("func_80112BE4",),
     0x80112C0C:("func_80112C0C",),
     0x80112E80:("Item_Give",),
-    0x801143CC:("func_801143CC",),
-    0x80114978:("func_80114978",),
-    0x801149A0:("func_801149A0",),
-    0x80114A9C:("func_80114A9C",),
-    0x80114B84:("func_80114B84",),
+    0x801143CC:("Item_CheckObtainabilityImpl",),
+    0x80114978:("Item_CheckObtainability",),
+    0x801149A0:("Inventory_DeleteItem",),
+    0x80114A9C:("Inventory_UnequipItem",),
+    0x80114B84:("Inventory_ReplaceItem",),
     0x80114CA0:("func_80114CA0",),
-    0x80114E90:("Interface_HasEmptyBottle",),
-    0x80114F2C:("Interface_HasItemInBottle",),
+    0x80114E90:("Inventory_HasEmptyBottle",),
+    0x80114F2C:("Inventory_HasItemInBottle",),
     0x80114FD0:("func_80114FD0",),
     0x80115130:("func_80115130",),
     0x801152B8:("func_801152B8",),

tools/disasm/variables.txt

@@ -1066,8 +1066,8 @@
     0x801BF6C0:("sRestrictionFlags","RestrictionFlags","[113]",0x1c4),
     0x801BF884:("D_801BF884","UNK_TYPE2","",0x2),
     0x801BF888:("D_801BF888","UNK_TYPE2","",0x2),
-    0x801BF88C:("D_801BF88C","UNK_TYPE2","",0x2),
-    0x801BF890:("D_801BF890","UNK_TYPE2","",0x2),
+    0x801BF88C:("sHBAScoreTier","UNK_TYPE2","",0x2),
+    0x801BF890:("sMinigameScoreDigits","UNK_TYPE2","",0x2),
     0x801BF898:("D_801BF898","UNK_TYPE2","",0x2),
     0x801BF89C:("D_801BF89C","UNK_TYPE2","",0x2),
     0x801BF8A0:("sMagicBarOutlinePrimRed","UNK_TYPE2","",0x2),

tools/sizes/code_functions.csv

@@ -1620,21 +1620,21 @@ asm/non_matchings/code/z_parameter/func_8010F0D4.s,func_8010F0D4,0x8010F0D4,0x35
 asm/non_matchings/code/z_parameter/func_8010F1A8.s,func_8010F1A8,0x8010F1A8,0x3A4
 asm/non_matchings/code/z_parameter/func_80110038.s,func_80110038,0x80110038,0x71F
 asm/non_matchings/code/z_parameter/func_80111CB4.s,func_80111CB4,0x80111CB4,0x34C
-asm/non_matchings/code/z_parameter/func_801129E4.s,func_801129E4,0x801129E4,0x44
+asm/non_matchings/code/z_parameter/Interface_SetSceneRestrictions.s,Interface_SetSceneRestrictions,0x801129E4,0x44
 asm/non_matchings/code/z_parameter/func_80112AF4.s,func_80112AF4,0x80112AF4,0x2
-asm/non_matchings/code/z_parameter/func_80112AFC.s,func_80112AFC,0x80112AFC,0x11
+asm/non_matchings/code/z_parameter/Interface_InitMinigame.s,Interface_InitMinigame,0x80112AFC,0x11
 asm/non_matchings/code/z_parameter/Interface_LoadItemIcon.s,Interface_LoadItemIcon,0x80112B40,0x29
 asm/non_matchings/code/z_parameter/func_80112BE4.s,func_80112BE4,0x80112BE4,0xA
 asm/non_matchings/code/z_parameter/func_80112C0C.s,func_80112C0C,0x80112C0C,0x9D
 asm/non_matchings/code/z_parameter/Item_Give.s,Item_Give,0x80112E80,0x553
-asm/non_matchings/code/z_parameter/func_801143CC.s,func_801143CC,0x801143CC,0x16B
-asm/non_matchings/code/z_parameter/func_80114978.s,func_80114978,0x80114978,0xA
-asm/non_matchings/code/z_parameter/func_801149A0.s,func_801149A0,0x801149A0,0x3F
-asm/non_matchings/code/z_parameter/func_80114A9C.s,func_80114A9C,0x80114A9C,0x3A
-asm/non_matchings/code/z_parameter/func_80114B84.s,func_80114B84,0x80114B84,0x47
+asm/non_matchings/code/z_parameter/Item_CheckObtainabilityImpl.s,Item_CheckObtainabilityImpl,0x801143CC,0x16B
+asm/non_matchings/code/z_parameter/Item_CheckObtainability.s,Item_CheckObtainability,0x80114978,0xA
+asm/non_matchings/code/z_parameter/Inventory_DeleteItem.s,Inventory_DeleteItem,0x801149A0,0x3F
+asm/non_matchings/code/z_parameter/Inventory_UnequipItem.s,Inventory_UnequipItem,0x80114A9C,0x3A
+asm/non_matchings/code/z_parameter/Inventory_ReplaceItem.s,Inventory_ReplaceItem,0x80114B84,0x47
 asm/non_matchings/code/z_parameter/func_80114CA0.s,func_80114CA0,0x80114CA0,0x7C
-asm/non_matchings/code/z_parameter/Interface_HasEmptyBottle.s,Interface_HasEmptyBottle,0x80114E90,0x27
-asm/non_matchings/code/z_parameter/Interface_HasItemInBottle.s,Interface_HasItemInBottle,0x80114F2C,0x29
+asm/non_matchings/code/z_parameter/Inventory_HasEmptyBottle.s,Inventory_HasEmptyBottle,0x80114E90,0x27
+asm/non_matchings/code/z_parameter/Inventory_HasItemInBottle.s,Inventory_HasItemInBottle,0x80114F2C,0x29
 asm/non_matchings/code/z_parameter/func_80114FD0.s,func_80114FD0,0x80114FD0,0x58
 asm/non_matchings/code/z_parameter/func_80115130.s,func_80115130,0x80115130,0x62
 asm/non_matchings/code/z_parameter/func_801152B8.s,func_801152B8,0x801152B8,0x44