Merge pull request #701 from Henny022p/cleanup/250302HEADmaster

Various code cleanup changes

4 files changed, 30 insertions, 23 deletions

diff --git a/src/menu/figurineMenu.c b/src/menu/figurineMenu.c
index 88c289f7..881dc803 100644
--- a/src/menu/figurineMenu.c
+++ b/src/menu/figurineMenu.c
@@ -8,19 +8,22 @@
 
 #include "common.h"
 #include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "main.h"
 #include "menu.h"
 #include "message.h"
 #include "object.h"
-#include "pauseMenu.h"
+#include "asm.h"
+#include "sound.h"
+#include "room.h"
+#include "player.h"
 #include "save.h"
 #include "screen.h"
-#include "sound.h"
 #include "subtask.h"
-#include "subtask2.h"
 #include "ui.h"
+#include "affine.h"
+#include "pauseMenu.h"
+#include "fade.h"
 
 void sub_080A4DA8(u32);
 void sub_080A4B44(void);
@@ -380,9 +383,9 @@ void FigurineMenu_080A4978(void) {
                 LoadPalettes(fig->pal, 0x16, 9);
                 gfx = fig->gfx;
                 if (fig->size < 0) {
-                    LZ77UnCompVram(gfx, (void*)0x6014000);
+                    LZ77UnCompVram(gfx, OBJ_VRAM0 + 0x4000);
                 } else {
-                    LoadResourceAsync(gfx, 0x6014000, fig->size);
+                    LoadResourceAsync(gfx, OBJ_VRAM0 + 0x4000, fig->size);
                 }
             }
         }
@@ -442,7 +445,6 @@ const struct_08128184 gUnk_08128184 = {
     0xffu,
 };
 
-extern struct_020227E8 gUnk_020227E8[];
 extern void ShowTextBox(u32, const struct_0812816C*);
 
 void sub_080A4BA0(u32 arg1, u32 arg2) {
@@ -470,7 +472,7 @@ void sub_080A4BA0(u32 arg1, u32 arg2) {
     if (r5 <= 0 || maxFigurines < r5) {
         r5 = -1;
     } else {
-        sub_08057044(r5, gUnk_020227E8, 0x303030);
+        NumberToAsciiPad3Digits(r5, &gUnk_020227E8[0], 0x303030);
         if (FigurineMenu_isFigurineOwned(r5) == 0) {
             r5 += 0x8000;
         } else {
diff --git a/src/menu/kinstoneMenu.c b/src/menu/kinstoneMenu.c
index eecc21b6..bac34a14 100644
--- a/src/menu/kinstoneMenu.c
+++ b/src/menu/kinstoneMenu.c
@@ -7,21 +7,25 @@
 #include "area.h"
 #include "common.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "flags.h"
-#include "functions.h"
 #include "kinstone.h"
 #include "main.h"
 #include "menu.h"
 #include "message.h"
 #include "npc.h"
 #include "object.h"
+#include "asm.h"
+#include "physics.h"
 #include "room.h"
 #include "roomid.h"
 #include "save.h"
 #include "screen.h"
-#include "sound.h"
 #include "subtask.h"
 #include "ui.h"
+#include "affine.h"
+#include "fade.h"
 
 extern u32 sub_08000E44(u32);
 extern void sub_080A3B74(void);
@@ -72,15 +76,15 @@ Subtask KinstoneMenu_Type4;
 Subtask KinstoneMenu_Type5;
 
 // Belongs to subtask2.c
-const ScreenTransitionData gUnk_08128024[] = {
-    { 1, { 0, 0, 0, 0 }, 0x98, 0xf8, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0xf8, 0xf8, 0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0x1e8, 0x1a8, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0x278, 0x58, 0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0xa8, 0x1b8, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0x228, 0x398, 0, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0x2c8, 0x128, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 12, 4, 0 },
-    { 1, { 0, 0, 0, 0 }, 0x128, 0x2a8, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 12, 4, 0 },
+const Transition gUnk_08128024[] = {
+    { 1, 0, 0, 0x98, 0xf8, 0, AREA_MT_CRENEL, ROOM_MT_CRENEL_CAVERN_OF_FLAMES_ENTRANCE, 1, 12, 4, 0 },
+    { 1, 0, 0, 0xf8, 0xf8, 0, AREA_VEIL_FALLS, ROOM_VEIL_FALLS_MAIN, 1, 12, 4, 0 },
+    { 1, 0, 0, 0x1e8, 0x1a8, 0, AREA_CLOUD_TOPS, ROOM_CLOUD_TOPS_CLOUD_TOPS, 1, 12, 4, 0 },
+    { 1, 0, 0, 0x278, 0x58, 0, AREA_HYRULE_TOWN, ROOM_HYRULE_TOWN_MAIN, 1, 12, 4, 0 },
+    { 1, 0, 0, 0xa8, 0x1b8, 0, AREA_LAKE_HYLIA, ROOM_LAKE_HYLIA_MAIN, 1, 12, 4, 0 },
+    { 1, 0, 0, 0x228, 0x398, 0, AREA_CASTOR_WILDS, ROOM_CASTOR_WILDS_MAIN, 1, 12, 4, 0 },
+    { 1, 0, 0, 0x2c8, 0x128, 0, AREA_HYRULE_FIELD, ROOM_HYRULE_FIELD_SOUTH_HYRULE_FIELD, 1, 12, 4, 0 },
+    { 1, 0, 0, 0x128, 0x2a8, 0, AREA_MINISH_WOODS, ROOM_MINISH_WOODS_MAIN, 1, 12, 4, 0 },
 };
 
 u32 sub_080A3B48(void) {
diff --git a/src/menu/pauseMenu.c b/src/menu/pauseMenu.c
index 940ed787..413b93b9 100644
--- a/src/menu/pauseMenu.c
+++ b/src/menu/pauseMenu.c
@@ -7,7 +7,6 @@
 #include "pauseMenu.h"
 
 #include "common.h"
-#include "functions.h"
 #include "game.h"
 #include "item.h"
 #include "itemMetaData.h"
@@ -18,9 +17,10 @@
 #include "save.h"
 #include "screen.h"
 #include "sound.h"
-#include "structures.h"
 #include "subtask.h"
 #include "ui.h"
+#include "affine.h"
+#include "fade.h"
 
 extern void sub_080A4DB8(u32);
 
@@ -28,6 +28,7 @@ void sub_080A5128(void);
 void sub_080A51D4(void);
 bool32 sub_080A51F4(void);
 void sub_080A5F48(u32, u32);
+void sub_080A57F4(void);
 
 void Subtask_PauseMenu(void) {
     static Subtask* const pauseMenu_Variants[] = {
@@ -1073,7 +1074,7 @@ void PauseMenu_Screen_5(void) {
         paletteColor = *gUnk_02017830;
         MemCopy(gUnk_02017830 + 1, gUnk_02017830, 7 * 2);
         gUnk_02017830[7] = paletteColor;
-        gUsedPalettes |= 1 << 12;
+        USE_PALETTE(12);
     }
 }
 
diff --git a/src/menu/pauseMenuScreen6.c b/src/menu/pauseMenuScreen6.c
index e36ef549..cf74fc22 100644
--- a/src/menu/pauseMenuScreen6.c
+++ b/src/menu/pauseMenuScreen6.c
@@ -6,13 +6,13 @@
 #include "common.h"
 #include "fileselect.h"
 #include "flags.h"
-#include "functions.h"
 #include "kinstone.h"
 #include "main.h"
 #include "menu.h"
 #include "pauseMenu.h"
 #include "save.h"
 #include "screen.h"
+#include "affine.h"
 
 typedef struct {
     u8 unk0;