Kaleido opens, do actions, add external file to XML, fix item names, add prototypes to gfx.h

8 files changed, 191 insertions, 38 deletions

diff --git a/mm/assets/xml/interface/icon_item_vtx_static.xml b/mm/assets/xml/interface/icon_item_vtx_static.xml
index 37ccb0063..2c7bfe219 100644
--- a/mm/assets/xml/interface/icon_item_vtx_static.xml
+++ b/mm/assets/xml/interface/icon_item_vtx_static.xml
@@ -1,4 +1,5 @@
 <Root>
+    <ExternalFile XmlPath="archives/icon_item_static.xml" OutPath="assets/archives/icon_item_static"/>
     <File Name="icon_item_vtx_static" Segment="11">
         <DList Name="gItemNamePanelDL" Offset="0x0"/>
         <DList Name="gZButtonIconDL" Offset="0x90"/>
diff --git a/mm/include/gfx.h b/mm/include/gfx.h
index 499679cbf..6657831f1 100644
--- a/mm/include/gfx.h
+++ b/mm/include/gfx.h
@@ -235,6 +235,15 @@ Gfx* Gfx_PrimColor(GraphicsContext* gfxCtx, s32 lodfrac, s32 r, s32 g, s32 b, s3
 void func_8012CF0C(GraphicsContext* gfxCtx, s32 clearFb, s32 clearZb, u8 r, u8 g, u8 b);
 void func_8012D374(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b);
 void func_8012D40C(f32* param_1, f32* param_2, s16* param_3);
+void gSPSegment(void* value, int segNum, uintptr_t target);
+void gSPSegmentLoadRes(void* value, int segNum, uintptr_t target);
+void gDPSetTextureImage(Gfx* pkt, u32 format, u32 size, u32 width, uintptr_t i);
+void gDPSetTextureImageFB(Gfx* pkt, u32 format, u32 size, u32 width, int fb);
+void gSPDisplayList(Gfx* pkt, Gfx* dl);
+void gSPDisplayListOffset(Gfx* pkt, Gfx* dl, int offset);
+void gSPVertex(Gfx* pkt, uintptr_t v, int n, int v0);
+void gSPInvalidateTexCache(Gfx* pkt, uintptr_t texAddr);
+
 
 extern Gfx gSetupDLs[SETUPDL_MAX][6];
 extern Gfx gEmptyDL[];
diff --git a/mm/include/z64interface.h b/mm/include/z64interface.h
index 0fc19bf9b..401ab72af 100644
--- a/mm/include/z64interface.h
+++ b/mm/include/z64interface.h
@@ -272,7 +272,7 @@ void Inventory_UpdateItem(struct PlayState* play, s16 slot, s16 item);
 void Interface_SetAButtonDoAction(struct PlayState* play, u16 aButtonDoAction);
 void Interface_SetBButtonDoAction(struct PlayState* play, s16 bButtonDoAction);
 void Interface_SetTatlCall(struct PlayState* play, u16 tatlCallState);
-void Interface_LoadBButtonDoActionLabel(struct PlayState* play, s16 bButtonDoAction);
+void Interface_LoadButtonDoActionLabel(struct PlayState* play, s16 doAction, s16 button, s16 state);
 s32 Health_ChangeBy(struct PlayState* play, s16 healthChange);
 void Health_GiveHearts(s16 hearts);
 void Rupees_ChangeBy(s16 rupeeChange);
diff --git a/mm/src/code/sys_cmpdma.c b/mm/src/code/sys_cmpdma.c
index 9e1a66d2e..1b267a963 100644
--- a/mm/src/code/sys_cmpdma.c
+++ b/mm/src/code/sys_cmpdma.c
@@ -98,6 +98,7 @@ void CmpDma_LoadFile(uintptr_t segmentVrom, s32 id, void* dst, size_t size) {
 }
 
 void CmpDma_LoadAllFiles(uintptr_t segmentVrom, void* dst, size_t size) {
+    return;
     uintptr_t rom = DmaMgr_TranslateVromToRom(segmentVrom);
     u32 i;
     u32 end;
diff --git a/mm/src/code/z_message.c b/mm/src/code/z_message.c
index 6265033e8..202dd6575 100644
--- a/mm/src/code/z_message.c
+++ b/mm/src/code/z_message.c
@@ -3109,7 +3109,7 @@ void Message_OpenText(PlayState* play, u16 textId) {
     }
 
     if (textId == 0xFF) {
-        Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+        Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
         play->msgCtx.hudVisibility = gSaveContext.hudVisibility;
         Interface_SetHudVisibility(HUD_VISIBILITY_A_B_C);
         gSaveContext.save.unk_06 = 20;
@@ -3580,7 +3580,7 @@ void Message_DisplayOcarinaStaffImpl(PlayState* play, u16 ocarinaAction) {
     msgCtx->textboxColorAlphaCurrent = msgCtx->textboxColorAlphaTarget;
 
     if (!noStop) {
-        Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+        Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
         noStop = gSaveContext.hudVisibility;
         Interface_SetHudVisibility(HUD_VISIBILITY_B_ALT);
         gSaveContext.hudVisibility = noStop;
@@ -5710,7 +5710,7 @@ void Message_Update(PlayState* play) {
                             Message_CloseTextbox(play);
                             play->msgCtx.ocarinaMode = OCARINA_MODE_END;
                             gSaveContext.prevHudVisibility = HUD_VISIBILITY_A_B;
-                            Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+                            Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
                             GameState_SetFramerateDivisor(&play->state, 2);
                             if (ShrinkWindow_Letterbox_GetSizeTarget() != 0) {
                                 ShrinkWindow_Letterbox_SetSizeTarget(0);
diff --git a/mm/src/code/z_parameter.c b/mm/src/code/z_parameter.c
index 6fed21326..ebb8f1483 100644
--- a/mm/src/code/z_parameter.c
+++ b/mm/src/code/z_parameter.c
@@ -12,6 +12,7 @@
 #include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
 #include "overlays/actors/ovl_En_Mm3/z_en_mm3.h"
 #include "interface/week_static/week_static.h"
+#include "BenPort.h"
 
 #include <string.h>
 
@@ -2381,7 +2382,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
                 Message_CloseTextbox(play);
                 if (play->msgCtx.choiceIndex != 0) {
                     Audio_PlaySfx_MessageCancel();
-                    Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+                    Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
                     Interface_SetHudVisibility(HUD_VISIBILITY_A_B);
                     sPictoState = PICTO_BOX_STATE_LENS;
                     REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH);
@@ -2420,7 +2421,7 @@ void Interface_UpdateButtonsPart1(PlayState* play) {
         } else if (play->actorCtx.flags & ACTORCTX_FLAG_PICTO_BOX_ON) {
             // Related to pictograph
             if (!CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) {
-                Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+                Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
                 Interface_SetHudVisibility(HUD_VISIBILITY_A_B);
                 sPictoState = PICTO_BOX_STATE_LENS;
             } else {
@@ -3319,7 +3320,7 @@ void Interface_SetAButtonDoAction(PlayState* play, u16 aButtonDoAction) {
         interfaceCtx->aButtonDoAction = aButtonDoAction;
         interfaceCtx->aButtonState = A_BTN_STATE_1;
         interfaceCtx->aButtonRoll = 0.0f;
-        Interface_LoadAButtonDoActionLabel(interfaceCtx, aButtonDoAction, 1);
+        Interface_LoadButtonDoActionLabel(play, aButtonDoAction, A_BUTTON_ACTION, ACTION_SUB);
         if (pauseCtx->state != PAUSE_STATE_OFF) {
             interfaceCtx->aButtonState = A_BTN_STATE_3;
         }
@@ -3338,12 +3339,7 @@ void Interface_SetBButtonDoAction(PlayState* play, s16 bButtonDoAction) {
         } else {
             interfaceCtx->bButtonDoAction = bButtonDoAction;
             if (interfaceCtx->bButtonDoAction != DO_ACTION_NONE) {
-                osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, 1);
-                // BENTODO
-                //DmaMgr_SendRequestImpl(&interfaceCtx->dmaRequest, interfaceCtx->doActionSegment + 0x600,
-                //                       (bButtonDoAction * 0x180) + SEGMENT_ROM_START(do_action_static), 0x180, 0,
-                 //                      &interfaceCtx->loadQueue, NULL);
-                osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
+                Interface_LoadButtonDoActionLabel(play, interfaceCtx->bButtonDoAction, B_BUTTON_ACTION, ACTION_SUB);
             }
 
             interfaceCtx->bButtonDoActionActive = true;
@@ -3375,19 +3371,30 @@ void Interface_SetTatlCall(PlayState* play, u16 tatlCallState) {
     }
 }
 
-void Interface_LoadBButtonDoActionLabel(PlayState* play, s16 bButtonDoAction) {
+void Interface_LoadButtonDoActionLabel(PlayState* play, s16 action, s16 button, s16 state) {
+    static void* sDoActionTextures[] = { gDoActionAttackENGTex, gDoActionCheckENGTex };
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
 
-    interfaceCtx->unk_224 = bButtonDoAction;
+    // OTRTODO: Validate btn states Eg. A_BTN_STATE_4
+    if (action >= DO_ACTION_MAX) {
+        action = DO_ACTION_NONE;
+    }
 
-    osCreateMesgQueue(&play->interfaceCtx.loadQueue, &play->interfaceCtx.loadMsg, 1);
-    // BENTODO
-    //DmaMgr_SendRequestImpl(&interfaceCtx->dmaRequest, interfaceCtx->doActionSegment + 0x480,
-    //                       (bButtonDoAction * 0x180) + SEGMENT_ROM_START(do_action_static), 0x180, 0,
-    //                       &interfaceCtx->loadQueue, NULL);
-    osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK);
+    if (button == 1) {
+        interfaceCtx->unk_224 = action;
+        interfaceCtx->unk_222 = 1;
+    }
+
+    char* path = action != DO_ACTION_NONE ? doActionTbl[action] : gEmptyTexture;
 
-    interfaceCtx->unk_222 = 1;
+    switch (state) {
+        case 0:
+            interfaceCtx->doActionSegment[button].mainTex = path;
+            break;
+        case 1:
+            interfaceCtx->doActionSegment[button].subTex = path;
+            break;
+    }
 }
 
 /**
@@ -4134,7 +4141,7 @@ s16 D_801BFB0C[] = { 0x23, 0x23, 0x33, 0x23 };
 void Interface_DrawAmmoCount(PlayState* play, s16 button, s16 alpha) {
     u8 i;
     u16 ammo;
-
+    return; //BENTODO
     OPEN_DISPS(play->state.gfxCtx);
 
     i = ((void)0, GET_CUR_FORM_BTN_ITEM(button));
@@ -4212,8 +4219,8 @@ void Interface_DrawBButtonIcons(PlayState* play) {
             gDPPipeSync(OVERLAY_DISP++);
             gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
                               PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
-
-            Interface_DrawAmmoCount(play, EQUIP_SLOT_B, interfaceCtx->bAlpha);
+            // BENTODO
+            //Interface_DrawAmmoCount(play, EQUIP_SLOT_B, interfaceCtx->bAlpha);
         }
     } else if ((!interfaceCtx->bButtonDoActionActive && (interfaceCtx->unk_222 == 0)) ||
                ((interfaceCtx->bButtonDoActionActive &&
@@ -4328,7 +4335,6 @@ void Interface_DrawCButtonIcons(PlayState* play) {
 
 void Interface_DrawAButton(PlayState* play) {
     // BENTODO: Something here crashes somtimes?
-    return;
     InterfaceContext* interfaceCtx = &play->interfaceCtx;
     s16 aAlpha;
 
diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
index 02f011807..36e19faa8 100644
--- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
+++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_item.c
@@ -306,10 +306,17 @@ void KaleidoScope_DrawItemSelect(PlayState* play) {
                         pauseCtx->itemVtx[j + 0].v.ob[1] - 32;
                 }
             }
-
+            int itemId = gSaveContext.save.saveInfo.inventory.items[i];
+            // BENTODO re add when the table is in C
+            if (CHECK_QUEST_ITEM(itemId) /*|| !gPlayerFormItemRestrictions[GET_PLAYER_FORM][(s32)itemId] */) {
+                gDPSetGrayscaleColor(POLY_OPA_DISP++, 109, 109, 109, 255);
+                gSPGrayscale(POLY_OPA_DISP++, true);
+            }
             gSPVertex(POLY_OPA_DISP++, &pauseCtx->itemVtx[j + 0], 4, 0);
-            KaleidoScope_DrawTexQuadRGBA32(
-                play->state.gfxCtx, gItemIcons[((void)0, gSaveContext.save.saveInfo.inventory.items[i])], 32, 32, 0);
+            KaleidoScope_DrawTexQuadRGBA32(play->state.gfxCtx, gItemIcons[itemId], 32, 32, 0);
+            gSPGrayscale(POLY_OPA_DISP++, false);
+            //KaleidoScope_DrawTexQuadRGBA32(
+            //    play->state.gfxCtx, gItemIcons[((void)0, gSaveContext.save.saveInfo.inventory.items[i])], 32, 32, 0);
         }
     }
 
diff --git a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
index 66710080e..f101d78d6 100644
--- a/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
+++ b/mm/src/overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope_NES.c
@@ -13,7 +13,9 @@
 #include "interface/icon_item_gameover_static/icon_item_gameover_static.h"
 #include "interface/icon_item_jpn_static/icon_item_jpn_static.h"
 #include "interface/icon_item_vtx_static/icon_item_vtx_static.h"
-
+#include "BenPort.h"
+#include "gfxdebuggerbridge.h"
+#include "archives/item_name_static/item_name_static.h"
 // Page Textures (Background of Page):
 // Broken up into multiple textures.
 // Numbered by column/row.
@@ -253,9 +255,132 @@ void Kaleido_LoadMapNameStatic(void* segment, u32 texIndex) {
 void Kaleido_LoadMapNameStaticLarge(void* segment, u32 texIndex) {
     CmpDma_LoadFile(SEGMENT_ROM_START(map_name_static), texIndex, segment, 0xA00);
 }
-
+static const char* gItemNameStatics[] = {
+    gItemNameOcarinaOfTimeENGTex,
+    gItemNameHerosBowENGTex,
+    gItemNameFireArrowENGTex,
+    gItemNameIceArrowENGTex,
+    gItemNameLightArrowENGTex,
+    gItemNameFairyOcarinaJPNTex,
+    gItemNameBombENGTex,
+    gItemNameBombchuENGTex,
+    gItemNameDekuStickENGTex,
+    gItemNameDekuNutENGTex,
+    gItemNameMagicBeansENGTex,
+    gItemNameLongshotJPNTex,
+    gItemNamePowderKegENGTex,
+    gItemNamePictographBoxENGTex,
+    gItemNameLensOfTruthENGTex,
+    gItemNameHookshotENGTex,
+    gItemNameGreatFairysSwordENGTex,
+    gItemNameFairySlingshotJPNTex,
+    gItemNameEmptyBottleENGTex,
+    gItemNameRedPotionENGTex,
+    gItemNameGreenPotionENGTex,
+    gItemNameBluePotionENGTex,
+    gItemNameFairyENGTex,
+    gItemNameDekuPrincessENGTex,
+    gItemNameFullMilkENGTex,
+    gItemNameHalfMilkENGTex,
+    gItemNameFishENGTex,
+    gItemNameBugENGTex,
+    gItemNameBlueFireENGTex,
+    gItemNamePoeENGTex,
+    gItemNameBigPoeENGTex,
+    gItemNameSpringWaterENGTex,
+    gItemNameHotSpringWaterENGTex,
+    gItemNameZoraEggENGTex,
+    gItemNameGoldDustENGTex,
+    gItemNameMagicalMushroomENGTex,
+    gItemNameSeaHorseENGTex,
+    gItemNameChateauRomaniENGTex,
+    gItemNameHylianLoachJPNTex,
+    gItemNameObabasDrinkJPNTex,
+    gItemNameMoonsTearENGTex,
+    gItemNameLandTitleDeedENGTex,
+    gItemNameSwampTitleDeedENGTex,
+    gItemNameMountainTitleDeedENGTex,
+    gItemNameOceanTitleDeedENGTex,
+    gItemNameRoomKeyENGTex,
+    gItemNameSpecialDeliveryToMamaENGTex,
+    gItemNameLetterToKafeiENGTex,
+    gItemNamePendantOfMemoriesENGTex,
+    gItemNameMoonsStoneJPNTex,
+    gItemNameDekuMaskENGTex,
+    gItemNameGoronMaskENGTex,
+    gItemNameZoraMaskENGTex,
+    gItemNameFierceDeitysMaskENGTex,
+    gItemNameMaskOfTruthENGTex,
+    gItemNameKafeisMaskENGTex,
+    gItemNameAllNightMaskENGTex,
+    gItemNameBunnyHoodENGTex,
+    gItemNameKeatonMaskENGTex,
+    gItemNameGarosMaskENGTex,
+    gItemNameRomanisMaskENGTex,
+    gItemNameCircusLeadersMaskENGTex,
+    gItemNamePostmansHatENGTex,
+    gItemNameCouplesMaskENGTex,
+    gItemNameGreatFairysMaskENGTex,
+    gItemNameGibdoMaskENGTex,
+    gItemNameDonGerosMaskENGTex,
+    gItemNameKamarosMaskENGTex,
+    gItemNameCaptainsHatENGTex,
+    gItemNameStoneMaskENGTex,
+    gItemNameBremenMaskENGTex,
+    gItemNameBlastMaskENGTex,
+    gItemNameMaskOfScentsENGTex,
+    gItemNameGiantsMaskENGTex,
+    gItemNameWindMedallionJPNTex,
+    gItemNameFireMedallionJPNTex,
+    gItemNameIceMedallionJPNTex,
+    gItemNameKokiriSwordENGTex,
+    gItemNameRazorSwordENGTex,
+    gItemNameGildedSwordENGTex,
+    gItemNameBrokenGiantsKnifeJPNTex,
+    gItemNameHerosShieldENGTex,
+    gItemNameMirrorShieldENGTex,
+    gItemNameQuiver30ENGTex,
+    gItemNameQuiver40ENGTex,
+    gItemNameQuiver50ENGTex,
+    gItemNameBombBag20ENGTex,
+    gItemNameBombBag30ENGTex,
+    gItemNameBombBag40ENGTex,
+    gItemNameBigKey1JPNTex,
+    gItemNameBigKey2JPNTex,
+    gItemNameBigKey3JPNTex,
+    gItemNameBigKey4JPNTex,
+    gItemNameOdolwasRemainsENGTex,
+    gItemNameGohtsRemainsENGTex,
+    gItemNameGyorgsRemainsENGTex,
+    gItemNameTwinmoldsRemainsENGTex,
+    gItemNameSonataOfAwakeningENGTex,
+    gItemNameGoronLullabyENGTex,
+    gItemNameNewWaveBossaNovaENGTex,
+    gItemNameElegyOfEmptynessENGTex,
+    gItemNameOathToOrderENGTex,
+    gItemNameNocturneOfShadowJPNTex,
+    gItemNameSongOfTimeENGTex,
+    gItemNameSongOfHealingENGTex,
+    gItemNameEponasSongENGTex,
+    gItemNameSongOfSoaringENGTex,
+    gItemNameSongOfStormsENGTex,
+    gItemNameSunsSongJPNTex,
+    gItemNameBombersNotebookENGTex,
+    gItemNameGoldSkulltulaJPNTex,
+    gItemNamePieceOfHeartENGTex,
+    gItemNamePieceOfHeartJPNTex,
+    gItemNameSunsSong2JPNTex,
+    gItemNameSongOfTimeJPNTex,
+    gItemNameLullabyIntroENGTex,
+    gItemNameBigKeyENGTex,
+    gItemNameCompassENGTex,
+    gItemNameDungeonMapENGTex,
+    gItemNameStrayFairiesENGTex,
+};
 void Kaleido_LoadItemNameStatic(void* segment, u32 texIndex) {
-    CmpDma_LoadFile(SEGMENT_ROM_START(item_name_static), texIndex, segment, 0x400);
+    void* tex = ResourceMgr_LoadTexOrDListByName(gItemNameStatics[texIndex]);
+    memcpy(segment, tex, 0x400);
+    //CmpDma_LoadFile(SEGMENT_ROM_START(item_name_static), texIndex, segment, 0x400);
 }
 
 void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, s16 cursorSpecialPos) {
@@ -969,7 +1094,8 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
             } else {
                 gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
             }
-
+            // BENTODO is this the right way to do this?
+            gSPInvalidateTexCache(POLY_OPA_DISP++, pauseCtx->nameSegment);
             POLY_OPA_DISP = Gfx_DrawTexQuad4b(POLY_OPA_DISP, pauseCtx->nameSegment, G_IM_FMT_IA, 128, 16, 0);
         }
     } else if ((pauseCtx->mainState <= PAUSE_MAIN_STATE_SONG_PLAYBACK) ||
@@ -1051,6 +1177,7 @@ void KaleidoScope_DrawInfoPanel(PlayState* play) {
             gDPPipeSync(POLY_OPA_DISP++);
             gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
 
+
             POLY_OPA_DISP = Gfx_DrawTexQuad4b(POLY_OPA_DISP, gPauseToEquipENGTex, G_IM_FMT_IA, 64, 16, 4);
         } else if ((pauseCtx->pageIndex == PAUSE_MAP) && sInDungeonScene) {
             // No code in this case
@@ -1124,7 +1251,7 @@ void KaleidoScope_UpdateNamePanel(PlayState* play) {
         pauseCtx->namedItem = pauseCtx->cursorItem[pauseCtx->pageIndex];
         namedItem = pauseCtx->namedItem;
 
-        osCreateMesgQueue(&pauseCtx->loadQueue, &pauseCtx->loadMsg, 1);
+        //osCreateMesgQueue(&pauseCtx->loadQueue, &pauseCtx->loadMsg, 1);
 
         if (pauseCtx->namedItem != PAUSE_ITEM_NONE) {
             if ((pauseCtx->pageIndex == PAUSE_MAP) && !sInDungeonScene) {
@@ -1410,7 +1537,7 @@ void KaleidoScope_UpdateOwlWarpNamePanel(PlayState* play) {
         pauseCtx->namedItem = pauseCtx->cursorItem[pauseCtx->pageIndex];
         texIndex = pauseCtx->namedItem;
 
-        osCreateMesgQueue(&pauseCtx->loadQueue, &pauseCtx->loadMsg, 1);
+        //osCreateMesgQueue(&pauseCtx->loadQueue, &pauseCtx->loadMsg, 1);
 
         if (pauseCtx->namedItem != PAUSE_ITEM_NONE) {
             if ((pauseCtx->pageIndex == PAUSE_MAP) && !sInDungeonScene) {
@@ -2793,7 +2920,7 @@ void KaleidoScope_UpdateOpening(PlayState* play) {
         pauseCtx->mainState = PAUSE_MAIN_STATE_IDLE;
         pauseCtx->state++; // PAUSE_STATE_MAIN
         pauseCtx->alpha = 255;
-        Interface_LoadBButtonDoActionLabel(play, DO_ACTION_RETURN);
+        Interface_LoadButtonDoActionLabel(play, DO_ACTION_RETURN, B_BUTTON_ACTION, ACTION_MAIN);
     } else if (pauseCtx->switchPageTimer == 64) {
         pauseCtx->pageIndex = sPageSwitchNextPageIndex[pauseCtx->nextPageMode];
         pauseCtx->nextPageMode = (pauseCtx->pageIndex * 2) + 1;
@@ -2867,7 +2994,9 @@ void KaleidoScope_Update(PlayState* play) {
 
             for (itemId = 0; itemId <= ITEM_BOW_FIRE; itemId++) {
                 if (!gPlayerFormItemRestrictions[GET_PLAYER_FORM][(s32)itemId]) {
-                    KaleidoScope_GrayOutTextureRGBA32(Lib_SegmentedToVirtual(gItemIcons[(s32)itemId]), 0x400);
+                    //void* tex = ResourceMgr_LoadTexOrDListByName(gItemIcons[(s32)itemId]);
+                    //KaleidoScope_GrayOutTextureRGBA32(tex, 0x400);
+                    //KaleidoScope_GrayOutTextureRGBA32(Lib_SegmentedToVirtual(gItemIcons[(s32)itemId]), 0x400);
                 }
             }
 
@@ -3603,7 +3732,7 @@ void KaleidoScope_Update(PlayState* play) {
             func_80143324(play, &play->skyboxCtx, play->skyboxId);
 
             if ((msgCtx->msgMode != 0) && (msgCtx->currentTextId == 0xFF)) {
-                Interface_LoadBButtonDoActionLabel(play, DO_ACTION_STOP);
+                Interface_LoadButtonDoActionLabel(play, DO_ACTION_STOP, B_BUTTON_ACTION, ACTION_MAIN);
                 Interface_SetAButtonDoAction(play, DO_ACTION_STOP);
                 Interface_SetHudVisibility(HUD_VISIBILITY_A_B_C);
             } else {