From f52d3b6ce4a92dea43b33e23e5e0f9820886649d Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Thu, 1 Jun 2023 14:09:45 -0400
Subject: [PATCH] Correct item_menu/bg.pg colors, combine list tilemaps

---
 graphics/item_menu/bag_pal1.pal               |  51 --------------
 graphics/item_menu/bagmap_0.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_1.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_2.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_3.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_4.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_5.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_6.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_7.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_8.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_9.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_A.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bagmap_B.bin               | Bin 36 -> 0 bytes
 graphics/item_menu/bg.png                     | Bin 539 -> 661 bytes
 .../item_menu/{bag_pal2.pal => bg_female.pal} |   0
 graphics/item_menu/list.bin                   | Bin 0 -> 432 bytes
 src/graphics.c                                |   4 +-
 src/item_menu.c                               |  64 ++++++++----------
 18 files changed, 32 insertions(+), 87 deletions(-)
 delete mode 100644 graphics/item_menu/bag_pal1.pal
 delete mode 100644 graphics/item_menu/bagmap_0.bin
 delete mode 100644 graphics/item_menu/bagmap_1.bin
 delete mode 100644 graphics/item_menu/bagmap_2.bin
 delete mode 100644 graphics/item_menu/bagmap_3.bin
 delete mode 100644 graphics/item_menu/bagmap_4.bin
 delete mode 100644 graphics/item_menu/bagmap_5.bin
 delete mode 100644 graphics/item_menu/bagmap_6.bin
 delete mode 100644 graphics/item_menu/bagmap_7.bin
 delete mode 100644 graphics/item_menu/bagmap_8.bin
 delete mode 100644 graphics/item_menu/bagmap_9.bin
 delete mode 100644 graphics/item_menu/bagmap_A.bin
 delete mode 100644 graphics/item_menu/bagmap_B.bin
 rename graphics/item_menu/{bag_pal2.pal => bg_female.pal} (100%)
 create mode 100644 graphics/item_menu/list.bin

diff --git a/graphics/item_menu/bag_pal1.pal b/graphics/item_menu/bag_pal1.pal
deleted file mode 100644
index e94c83852..000000000
--- a/graphics/item_menu/bag_pal1.pal
+++ /dev/null
@@ -1,51 +0,0 @@
-JASC-PAL
-0100
-48
-0 65 90
-255 0 255
-41 57 82
-65 180 164
-255 0 255
-255 0 255
-106 205 197
-246 205 115
-238 230 172
-255 255 205
-222 139 74
-148 148 148
-238 230 172
-106 106 106
-213 180 82
-205 65 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-189 213 213
-238 255 255
-222 246 255
-255 255 255
-164 222 255
-16 172 222
-0 82 115
-0 115 139
-0 123 197
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-0 0 0
-189 213 213
-238 255 255
-222 246 255
-255 255 255
-164 222 255
-24 82 180
-0 90 131
-24 82 180
-24 82 180
diff --git a/graphics/item_menu/bagmap_0.bin b/graphics/item_menu/bagmap_0.bin
deleted file mode 100644
index 94c0af766f249188308f328dfd95d76523012fc7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;J;3NP!SO5$N0Hpu`

diff --git a/graphics/item_menu/bagmap_1.bin b/graphics/item_menu/bagmap_1.bin
deleted file mode 100644
index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N;2{7x82}Hu0Mh^f

diff --git a/graphics/item_menu/bagmap_2.bin b/graphics/item_menu/bagmap_2.bin
deleted file mode 100644
index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N5Fh|K82}V|0TTcK

diff --git a/graphics/item_menu/bagmap_3.bin b/graphics/item_menu/bagmap_3.bin
deleted file mode 100644
index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N;2{7x82}Hu0Mh^f

diff --git a/graphics/item_menu/bagmap_4.bin b/graphics/item_menu/bagmap_4.bin
deleted file mode 100644
index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N5Fh|K82}V|0TTcK

diff --git a/graphics/item_menu/bagmap_5.bin b/graphics/item_menu/bagmap_5.bin
deleted file mode 100644
index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N;2{7x82}Hu0Mh^f

diff --git a/graphics/item_menu/bagmap_6.bin b/graphics/item_menu/bagmap_6.bin
deleted file mode 100644
index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N5Fh|K82}V|0TTcK

diff --git a/graphics/item_menu/bagmap_7.bin b/graphics/item_menu/bagmap_7.bin
deleted file mode 100644
index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N;2{7x82}Hu0Mh^f

diff --git a/graphics/item_menu/bagmap_8.bin b/graphics/item_menu/bagmap_8.bin
deleted file mode 100644
index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N5Fh|K82}V|0TTcK

diff --git a/graphics/item_menu/bagmap_9.bin b/graphics/item_menu/bagmap_9.bin
deleted file mode 100644
index ff1b44740858ce61a11b5a2ec4ad6eab857ff386..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N;2{7x82}Hu0Mh^f

diff --git a/graphics/item_menu/bagmap_A.bin b/graphics/item_menu/bagmap_A.bin
deleted file mode 100644
index 167c246f8967e8860e985f6278c4d5aea1f89ecc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmd;N5Fh|K82}V|0TTcK

diff --git a/graphics/item_menu/bagmap_B.bin b/graphics/item_menu/bagmap_B.bin
deleted file mode 100644
index 4da8f8ff5162390833dbf2715235a150a9fd79c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36
Ncmb1TkRt$%82~6g0x<vp

diff --git a/graphics/item_menu/bg.png b/graphics/item_menu/bg.png
index a9a96948fa30ff4b093ed97e97b2003e1331afee..e0921d83a928f3732ec9acc7ae39d0bfaae08fbb 100644
GIT binary patch
delta 600
zcmbQuGL?0LgcJue0|SGZFF!YsVk{1FcVbv~PUa<$Ghw2tNj;Fp1beSuefR(Wy>I`4
zV9CAz0&DIu1QjzBcQaHU#Z(LwK~pagw1pw68At+A$hjBifc9?oba4#v=-fK};-qE;
z9@m*SC9mvCm7iN!|K`{K`kf-ehT=*aZ{M5V=Tuy*(0I-AQh4<D>idmOFW5Ba9Q-)9
z{?$6|-Y_1v)r?P9cqto5=SaRX627yfk7X)DWLVSew1D#lr@a<PX|ObYRcx}YtEl9!
za5($HI&;F=2_3Vf7MC@Lwaq)iwr^FTxcwH+Pd_vday$ypS3K~*<w5;K2C1FqLRSu{
zHzo1^nc3(R(C^10$9Zb;X2%6>_c`Vn%S>0i*4+9)<==_VbGMag<Y=tw*efW%L^MPq
zW9mYQH%8JKSMM4{c!-qG^w45lm8$SLE-kECVKqDR8>vi#muymuaqn)JrZM*_l-LS*
ztYnMOmvUryxFf3}wN?1p%};gpvHa%qFFfbTP`$fljp*Ow4Rx-(_JJ1@=H1J?P<n_#
zZ65n6-j>e2Cl&ZVT>3ZZi|VelfDV4k(#iH|2U4R-ayrz*Q=araeg5|K%NTF(2Wy1d
z!(QDGIn>;E{`oVr_omIlP04>+@}~X>7AVdZ%=sCwARz7@mF+0-BQhaQ#X^dK(fDn4
zjorJ;+AK02LQi&SzH9GhYn*=QxqsmFqkj{6|FcJzZP@rfiH{!??VhfFF6*2UngDI}
B|KR`t

delta 477
zcmV<30V4jD1)Btr7!3pi0002<z2XW0001zNGBkhlCTYk300E{+L_t(Ijg^(LZo)7S
zhW$>N5bEoALCjGRu+k2lm?BlINO=W6K`S<-lqGXEuU#socfNCSHWx(xB?-OnKF5cP
zF_0q9%dO=2*NPH9z<Oitx|Ol(5vVi(S|)%rr~q_)lhF*DnnH%LV~A#`B_KM6Xoh;i
zu=jtEIR>ov58nYFWXI3T<qJpA9!h^VpTfBS<Q**p0XxQF?23VW&AGvGise%VHw5p=
zQ1FNkieapG<2%?C5Qdegclc;x$JjMBEM+|yilxDAj9YPUNa`JaZshu6;;;Y;lgHKe
z93yE32vGsK<vDPHK<!^R57H2m1Kj*Oe3ySRL&!S=aXbuc5<nW_!MBe9Y3NuHpA*0;
z2G5Dl3DA$BGjf05hf~Oz1uUxSXtvJ+@b7BT_eXPn7Wml_Q0qV#(s>5(i?>@YPL?zQ
z48g%AFFgkc+Zu0txx3<Y@d|%0%UxR-E%XIzEEF~jG;|0W`vABm2CN5xZfL_V!be4u
z8$h5N=#ap=$#B9e{R~YR2#5yX!Ij=>+OY2i!wI+NI&9$t;5{2)J3CrEMXUb@&<aFE
T-qEb200000NkvXXu0mjf?KaXW

diff --git a/graphics/item_menu/bag_pal2.pal b/graphics/item_menu/bg_female.pal
similarity index 100%
rename from graphics/item_menu/bag_pal2.pal
rename to graphics/item_menu/bg_female.pal
diff --git a/graphics/item_menu/list.bin b/graphics/item_menu/list.bin
new file mode 100644
index 0000000000000000000000000000000000000000..4ef10fcc38fc0cbbb67bd88e07991745de6195c1
GIT binary patch
literal 432
ncmd;J;3NP!SU4GY2tbe-0t6sP&8RuJLy40?mO+jHG-dz*Ah`@l

literal 0
HcmV?d00001

diff --git a/src/graphics.c b/src/graphics.c
index 5e9b02303..f4433f49d 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1078,8 +1078,8 @@ const u32 gStatusPal_Icons[] = INCBIN_U32("graphics/interface/status_icons.gbapa
 const u32 gBagBg_Gfx[] = INCBIN_U32("graphics/item_menu/bg.4bpp.lz");
 const u32 gBagBg_Tilemap[] = INCBIN_U32("graphics/item_menu/bg.bin.lz");
 const u32 gBagBg_ItemPC_Tilemap[] = INCBIN_U32("graphics/item_menu/bg_item_pc.bin.lz");
-const u32 gBagBgPalette[] = INCBIN_U32("graphics/item_menu/bag_pal1.gbapal.lz"); // palette 1 (Boy + misc Pal)
-const u32 gBagBgPalette_FemaleOverride[] = INCBIN_U32("graphics/item_menu/bag_pal2.gbapal.lz"); // palette 2 (Girl)
+const u32 gBagBgPalette[] = INCBIN_U32("graphics/item_menu/bg.gbapal.lz"); // palette 1 (Boy + misc Pal)
+const u32 gBagBgPalette_FemaleOverride[] = INCBIN_U32("graphics/item_menu/bg_female.gbapal.lz"); // palette 2 (Girl)
 
 const u32 gBagMale_Gfx[] = INCBIN_U32("graphics/interface/bag_male.4bpp.lz");
 const u32 gBagFemale_Gfx[] = INCBIN_U32("graphics/interface/bag_female.4bpp.lz");
diff --git a/src/item_menu.c b/src/item_menu.c
index ed7eef046..c45f693d8 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -109,7 +109,7 @@ static void BeginMovingItemInPocket(u8 taskId, s16 itemIndex);
 static void Task_MoveItemInPocket_HandleInput(u8 taskId);
 static void ExecuteMoveItemInPocket(u8 taskId, u32 itemIndex);
 static void AbortMovingItemInPocket(u8 taskId, u32 itemIndex);
-static void CopyBagListBgTileRowToTilemapBuffer(u8 a0);
+static void DrawItemListRow(u8 row);
 static void Task_ItemContext_FieldOrBattle(u8 taskId);
 static void Task_FieldItemContextMenuHandleInput(u8 taskId);
 static void Task_ItemMenuAction_Use(u8 taskId);
@@ -185,20 +185,10 @@ static const u8 *const sPocketNames[] = {
     gText_PokeBalls2
 };
 
-static const u16 sBagListBgTiles[][18] = {
-    INCBIN_U16("graphics/item_menu/bagmap_0.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_1.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_2.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_3.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_4.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_5.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_6.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_7.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_8.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_9.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_A.bin"),
-    INCBIN_U16("graphics/item_menu/bagmap_B.bin")
-};
+#define LIST_TILES_WIDTH  18
+#define LIST_TILES_HEIGHT 12
+
+static const u16 sItemListTilemap[LIST_TILES_WIDTH * LIST_TILES_HEIGHT] = INCBIN_U16("graphics/item_menu/list.bin");
 
 static const struct MenuAction sItemMenuContextActions[] = {
     [ITEMMENUACTION_USE] = {gOtherText_Use, {.void_u8 = Task_ItemMenuAction_Use}},
@@ -309,6 +299,10 @@ static const struct ScrollArrowsTemplate sPocketSwitchArrowPairTemplate = {
 
 static const u8 sBlit_SelectButton[] = INCBIN_U8("graphics/interface/select_button.4bpp");
 
+#define tSwitchDir     data[11]
+#define tSwitchCounter data[12]
+#define tSwitchState   data[13]
+
 void GoToBagMenu(u8 location, u8 pocket, MainCallback bagCallback)
 {
     u8 i;
@@ -327,8 +321,8 @@ void GoToBagMenu(u8 location, u8 pocket, MainCallback bagCallback)
         sBagMenuDisplay->itemOriginalLocation = 0xFF;
         sBagMenuDisplay->itemMenuIcon = 0;
         sBagMenuDisplay->inhibitItemDescriptionPrint = FALSE;
-        sBagMenuDisplay->pocketScrollArrowsTask = 0xFF;
-        sBagMenuDisplay->pocketSwitchArrowsTask = 0xFF;
+        sBagMenuDisplay->pocketScrollArrowsTask = TASK_NONE;
+        sBagMenuDisplay->pocketSwitchArrowsTask = TASK_NONE;
         if (location == ITEMMENULOCATION_ITEMPC)
             sBagMenuDisplay->pocketSwitchMode = 1;
         else if (location == ITEMMENULOCATION_OLD_MAN)
@@ -1152,9 +1146,9 @@ static u8 ProcessPocketSwitchInput(u8 taskId, u8 pocketId)
 static void SwitchPockets(u8 taskId, s16 direction, bool16 a2)
 {
     s16 *data = gTasks[taskId].data;
-    data[13] = 0;
-    data[12] = 0;
-    data[11] = direction;
+    tSwitchState = 0;
+    tSwitchCounter = 0;
+    tSwitchDir = direction;
     if (!a2)
     {
         ClearWindowTilemap(0);
@@ -1176,35 +1170,36 @@ static void Task_AnimateSwitchPockets(u8 taskId)
     s16 *data = gTasks[taskId].data;
     if (!MenuHelpers_IsLinkActive() && !BagIsTutorial())
     {
-        switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket + data[11]))
+        switch (ProcessPocketSwitchInput(taskId, gBagMenuState.pocket + tSwitchDir))
         {
         case 1:
-            gBagMenuState.pocket += data[11];
+            gBagMenuState.pocket += tSwitchDir;
             SwitchTaskToFollowupFunc(taskId);
             SwitchPockets(taskId, -1, TRUE);
             return;
         case 2:
-            gBagMenuState.pocket += data[11];
+            gBagMenuState.pocket += tSwitchDir;
             SwitchTaskToFollowupFunc(taskId);
             SwitchPockets(taskId,  1, TRUE);
             return;
         }
     }
-    switch (data[13])
+    switch (tSwitchState)
     {
     case 0:
-        if (data[12] != 0x7FFF)
+        // Animate the item list being revealed from the bottom row up
+        if (tSwitchCounter != SHRT_MAX)
         {
-            data[12]++;
-            CopyBagListBgTileRowToTilemapBuffer(data[12]);
-            if (data[12] == 12)
-                data[12] = 0x7FFF;
+            tSwitchCounter++;
+            DrawItemListRow(tSwitchCounter);
+            if (tSwitchCounter == LIST_TILES_HEIGHT)
+                tSwitchCounter = SHRT_MAX;
         }
-        if (data[12] == 0x7FFF)
-            data[13]++;
+        if (tSwitchCounter == SHRT_MAX)
+            tSwitchState++;
         break;
     case 1:
-        gBagMenuState.pocket += data[11];
+        gBagMenuState.pocket += tSwitchDir;
         PrintBagPocketName();
         Bag_BuildListMenuTemplate(gBagMenuState.pocket);
         data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]);
@@ -1332,9 +1327,10 @@ static void UpdateQuantityToTossOrDeposit(s16 value, u8 ndigits)
     BagPrintTextOnWindow(r6, FONT_SMALL, gStringVar4, 4, 10, 1, 0, 0, 1);
 }
 
-static void CopyBagListBgTileRowToTilemapBuffer(u8 frame)
+// row of 0 is the bottom row in the list, up to LIST_TILES_HEIGHT at the top
+static void DrawItemListRow(u8 row)
 {
-    CopyToBgTilemapBufferRect(1, sBagListBgTiles[12 - frame], 11, 13 - frame, 18, 1);
+    CopyToBgTilemapBufferRect(1, &sItemListTilemap[(LIST_TILES_HEIGHT - row) * LIST_TILES_WIDTH], 11, 1 + LIST_TILES_HEIGHT - row, LIST_TILES_WIDTH, 1);
     ScheduleBgCopyTilemapToVram(1);
 }