From 43cd1d23be3042484024c5cb51cd43484bf387d0 Mon Sep 17 00:00:00 2001
From: Montblanc <montmoguri@gmail.com>
Date: Tue, 27 Jan 2026 22:03:52 -0800
Subject: [PATCH] Add R button graphic prompt for boxes access

---
 graphics/party_menu/new/r_button_boxes.png | Bin 0 -> 237 bytes
 src/data/party_menu.h                      |  37 +++++++++++
 src/party_menu.c                           |  72 ++++++++++++++++-----
 3 files changed, 94 insertions(+), 15 deletions(-)
 create mode 100644 graphics/party_menu/new/r_button_boxes.png

diff --git a/graphics/party_menu/new/r_button_boxes.png b/graphics/party_menu/new/r_button_boxes.png
new file mode 100644
index 0000000000000000000000000000000000000000..622b3b28e84a7a9cc0de6c5e9854fd0431f8d033
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4ats1|LR^9L
z+ULnp=e+Ly?+MzQ{rvyEsIBLsj!nsaK4tCu??H3+7GJyf+)MNOR*B?mQxu(?#0>)T
zfO@h$T^vI^I^Rz8<YQ3eVELW(_y57k4cuvLkMFD$P?VbGs(C@Ihr6Ud{ZLTG2ls=*
zXO}fZmdnZB`t{;KapsKof-<b%_}tcQPh|bHS4H{F(WN!|N8)EFM|l3ySU0a%f$8%h
jKVI&B*FX{1kIxv-q;UM?QeCnFXf1=MtDnm{r-UW|YcgIJ

literal 0
HcmV?d00001

diff --git a/src/data/party_menu.h b/src/data/party_menu.h
index 60112c72bfb9..9718d28d0e5f 100644
--- a/src/data/party_menu.h
+++ b/src/data/party_menu.h
@@ -1141,6 +1141,43 @@ static const struct SpriteTemplate sSpriteTemplate_Cursor =
     .callback = SpriteCB_Cursor,
 };
 
+static const u32 sRButtonBoxes_Gfx[] = INCBIN_U32("graphics/party_menu/new/r_button_boxes.4bpp.smol");
+
+static const struct OamData sOamData_RButtonBoxes =
+{
+    .y = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(64x32),
+    .x = 0,
+    .matrixNum = 0,
+    .size = SPRITE_SIZE(64x32),
+    .tileNum = 0,
+    .priority = 1,
+    .paletteNum = 0,
+    .affineParam = 0,
+};
+
+static const struct CompressedSpriteSheet sSpriteSheet_RButtonBoxes =
+{
+    .data = sRButtonBoxes_Gfx, 
+    .size = (64 * 32) / 2, 
+    .tag = TAG_R_BUTTON_BOXES
+};
+
+static const struct SpriteTemplate sSpriteTemplate_RButtonBoxes =
+{
+    .tileTag = TAG_R_BUTTON_BOXES,
+    .paletteTag = TAG_CURSOR,
+    .oam = &sOamData_RButtonBoxes,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
 static const struct OamData sOamData_MenuPokeball =
 {
     .y = 0,
diff --git a/src/party_menu.c b/src/party_menu.c
index e04407541340..1637443fea14 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -139,7 +139,8 @@ enum {
     TAG_POKEBALL_SMALL,
     TAG_STATUS_ICONS,
     TAG_HELD_ITEM = 55120,
-    TAG_CURSOR
+    TAG_CURSOR,
+    TAG_R_BUTTON_BOXES = 55130,
 };
 
 enum {
@@ -209,6 +210,7 @@ struct PartyMenuInternal
     // bin2c, the utility used to encode the compressed palette data.
     u16 palBuffer[BG_PLTT_SIZE / sizeof(u16)];
     s16 data[16];
+    u8 rButtonToBoxesSpriteId;
 };
 
 struct PartyMenuBox
@@ -264,6 +266,8 @@ static void LoadPartyMenuWindows(void);
 static void InitPartyMenuBoxes(u8);
 static void LoadPartyMenuBoxes(u8);
 static void LoadPartyMenuPokeballGfx(void);
+static void LoadRButtonToBoxesSpriteGfx(void);
+static void CreateRButtonToBoxesSprite(void);
 static bool8 CreatePartyMonSpritesLoop(void);
 static bool8 RenderPartyMenuBoxes(void);
 static void CreateCancelConfirmPokeballSprites(void);
@@ -540,6 +544,7 @@ static void InitPartyMenu(u8 menuType, u8 layout, u8 partyAction, bool8 keepCurs
         sPartyMenuInternal->exitCallback = NULL;
         sPartyMenuInternal->lastSelectedSlot = 0;
         sPartyMenuInternal->cursorSpriteId = 0x3fff;
+        sPartyMenuInternal->rButtonToBoxesSpriteId = SPRITE_NONE;
 
         if (menuType == PARTY_MENU_TYPE_CHOOSE_HALF)
             sPartyMenuInternal->chooseHalf = TRUE;
@@ -687,10 +692,14 @@ static bool8 ShowPartyMenu(void)
         gMain.state++;
         break;
     case 14:
-        LoadMonIconPalettes();
+        LoadRButtonToBoxesSpriteGfx();
         gMain.state++;
         break;
     case 15:
+        LoadMonIconPalettes();
+        gMain.state++;
+        break;
+    case 16:
         if (CreatePartyMonSpritesLoop())
         {
             if (CalculatePlayerPartyCount() != 0
@@ -705,35 +714,39 @@ static bool8 ShowPartyMenu(void)
             gMain.state++;
         }
         break;
-    case 16:
+    case 17:
         if (RenderPartyMenuBoxes())
         {
             sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
-    case 17:
+    case 18:
         CreateCancelConfirmPokeballSprites();
         gMain.state++;
         break;
-    case 18:
+    case 19:
+        CreateRButtonToBoxesSprite();
+        gMain.state++;
+        break;
+    case 20:
         CreateCancelConfirmWindows(sPartyMenuInternal->chooseHalf);
         gMain.state++;
         break;
-    case 19:
+    case 21:
         gMain.state++;
         break;
-    case 20:
+    case 22:
         CreateTask(sPartyMenuInternal->task, 0);
         DisplayPartyMenuStdMessage(sPartyMenuInternal->messageId);
         gMain.state++;
         break;
-    case 21:
+    case 23:
         BlendPalettes(PALETTES_ALL, 16, 0);
         gPaletteFade.bufferTransferDisabled = FALSE;
         gMain.state++;
         break;
-    case 22:
+    case 24:
         BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         gMain.state++;
         break;
@@ -801,37 +814,45 @@ static bool8 ReloadPartyMenu(void)
         gMain.state++;
         break;
     case 12:
-        LoadMonIconPalettes();
+        LoadRButtonToBoxesSpriteGfx();
         gMain.state++;
         break;
     case 13:
+        LoadMonIconPalettes();
+        gMain.state++;
+        break;
+    case 14:
         if (CreatePartyMonSpritesLoop())
         {
             sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
-    case 14:
+    case 15:
         if (RenderPartyMenuBoxes())
         {
             sPartyMenuInternal->data[0] = 0;
             gMain.state++;
         }
         break;
-    case 15:
+    case 16:
         CreateCancelConfirmPokeballSprites();
         gMain.state++;
         break;
-    case 16:
+    case 17:
+        CreateRButtonToBoxesSprite();
+        gMain.state++;
+        break;
+    case 18:
         CreateCancelConfirmWindows(sPartyMenuInternal->chooseHalf);
         gMain.state++;
         break;
-    case 17:
+    case 19:
         BlendPalettes(PALETTES_ALL, 16, RGB_WHITEALPHA);
         gPaletteFade.bufferTransferDisabled = FALSE;
         gMain.state++;
         break;
-    case 18:
+    case 20:
         BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITEALPHA);
         gMain.state++;
         break;
@@ -4683,6 +4704,27 @@ static void LoadPartyMenuPokeballGfx(void)
     LoadSpritePalette(&sSpritePalette_MenuPokeball);
 }
 
+static void LoadRButtonToBoxesSpriteGfx(void)
+{
+    LoadCompressedSpriteSheet(&sSpriteSheet_RButtonBoxes);
+}
+
+static void CreateRButtonToBoxesSprite(void)
+{
+    if (PARTY_MENU_PC_ACCESS
+     && gPartyMenu.action == PARTY_ACTION_CHOOSE_MON
+     && gPartyMenu.layout == PARTY_LAYOUT_SINGLE
+     && (gPartyMenu.menuType == PARTY_MENU_TYPE_FIELD
+      || gPartyMenu.menuType == PARTY_MENU_TYPE_DAYCARE))
+    {
+        sPartyMenuInternal->rButtonToBoxesSpriteId = CreateSprite(&sSpriteTemplate_RButtonBoxes, 165, 164, 0);
+    }
+    else
+    {
+        sPartyMenuInternal->rButtonToBoxesSpriteId = SPRITE_NONE;
+    }
+}
+
 static void CreatePartyMonStatusSprite(struct Pokemon *mon, struct PartyMenuBox *menuBox)
 {
     if (GetMonData(mon, MON_DATA_SPECIES) != SPECIES_NONE)