Rename objects

3 files changed, 17 insertions, 21 deletions

diff --git a/src/menu/figurine_menu.c b/src/menu/figurine_menu.c
index 6e7ee26b..5a15d133 100644
--- a/src/menu/figurine_menu.c
+++ b/src/menu/figurine_menu.c
@@ -17,7 +17,6 @@ extern const struct {
     u8 filler[7];
     u8 unk7;
 } gUnk_080FC3E4[];
-extern u32 gUnk_02002B0E;
 
 void sub_080A4DA8(u32);
 void sub_080A4B44(void);
@@ -146,10 +145,10 @@ void FigurineMenu0_Type2(void) {
     Sound sound;
 
     if (gMenu.field_0x0 != 0) {
-        gFigurineMenu.unk20 += 1;
+        gFigurineMenu.unk20++;
         switch (gFigurineMenu.unk20) {
             case 0x40:
-                gFigurineMenu.duplicate = WriteBit(&gUnk_02002B0E, gFigurineMenu.figure_idx);
+                gFigurineMenu.duplicate = WriteBit(&gSave.stats.filler4[4], gFigurineMenu.figure_idx);
                 gMenu.column_idx = 1;
             default:
                 bVar1 = gFigurineMenu.unk20 >> 2;
@@ -329,7 +328,7 @@ void FigurineMenu_080A4978(void) {
             r0 += 0x20;
             gOamCmd.y = r0;
             DrawDirect(sub_080A4978_draw_constant, 1);
-            r0 = gMain.ticks.HWORD & 0x10;
+            r0 = gMain.ticks & 0x10;
             r4 = (r0) ? 4 : 2;
             gOamCmd.x = 0xe8;
             gOamCmd.y = 0x1a;
@@ -339,7 +338,7 @@ void FigurineMenu_080A4978(void) {
             DrawDirect(sub_080A4978_draw_constant, r4 + 1);
         }
     }
-    if (gMain.ticks.HWORD & 0x10) {
+    if (gMain.ticks & 0x10) {
         if (gMenu.column_idx & 0x10) {
             if (gFigurineMenu.unk1e) {
                 gOamCmd.y = 0x10;
@@ -589,7 +588,7 @@ void sub_080A4DA8(u32 param_1) {
 void sub_080A4DB8(u32 param_1) {
     const struct_08128AD8* ptr;
 
-    sub_08056250();
+    DisableVBlankDMA();
     MemClear(&gBG0Buffer, 0x800);
     MemClear(&gBG1Buffer, 0x800);
     MemClear(&gBG2Buffer, 0x800);
diff --git a/src/menu/kinstone_menu.c b/src/menu/kinstone_menu.c
index 814c1b39..8e78e296 100644
--- a/src/menu/kinstone_menu.c
+++ b/src/menu/kinstone_menu.c
@@ -43,7 +43,6 @@ typedef struct {
 extern const u32 gUnk_080CA06C[];
 extern const u8 gGlobalGfxAndPalettes[];
 extern u8 gTextGfxBuffer[];
-extern u8 gUnk_02002AC0[];
 
 u32 sub_080A44E0(WStruct*, u8*, u32);
 u32 sub_080A4418(u32, u32);
@@ -180,11 +179,11 @@ NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc", void Kins
     switch (gInput.unk4) {
         case 0x20:
         case 0x40:
-            tmp3 -= 1;
+            tmp3--;
             break;
         case 0x10:
         case 0x80:
-            tmp3 += 1;
+            tmp3++;
             break;
         case 1:
             if (gMenu.column_idx == 2) {
@@ -301,13 +300,11 @@ void KinstoneMenu_Type5(void) {
     kinstoneMenu_Type5_Overlays[gMenu.overlayType]();
 }
 
-extern u8 gUnk_02002C81[];
-
 void KinstoneMenu_Type5_Overlay0(void) {
     gMenu.column_idx = 5;
-    WriteBit((u32*)gUnk_02002C81, gFuseInfo._3);
-    if (99 < ++gUnk_02002C81[-298]) {
-        gUnk_02002C81[-299] = 1;
+    WriteBit(gSave.unk241, gFuseInfo._3);
+    if (++gSave.unk117 > 99) {
+        gSave.didAllFusions = 1;
     }
     KinstoneMenu_080A4468();
     SoundReq(SFX_TASK_COMPLETE);
@@ -324,7 +321,7 @@ void KinstoneMenu_Type5_Overlay1(void) {
 }
 
 void KinstoneMenu_Type5_Overlay2(void) {
-    gMenu.transitionTimer -= 1;
+    gMenu.transitionTimer--;
     if (gMenu.transitionTimer != 0) {
         gKinstoneMenu.unk18 += gKinstoneMenu.unk1a;
         gKinstoneMenu.unk1a += 0x20;
@@ -332,7 +329,7 @@ void KinstoneMenu_Type5_Overlay2(void) {
         gMenu.column_idx = 6;
         gMenu.overlayType = 3;
         gMenu.transitionTimer = 79;
-        CreateObject(OBJECT_B3, 1, 0);
+        CreateObject(KINSTONE_SPARK, 1, 0);
         SoundReq(SFX_1CA);
     }
 }
@@ -359,7 +356,7 @@ void KinstoneMenu_080A4054(void) {
     KinstoneMenu_080A4080();
     for (uVar2 = 0; uVar2 < 0x10; uVar2++) {
         if (gMapDataBottomSpecial[uVar2].unk_01 != 0) {
-            gMapDataBottomSpecial[uVar2].unk_01 -= 1;
+            gMapDataBottomSpecial[uVar2].unk_01--;
         }
     }
 }
@@ -398,7 +395,7 @@ void KinstoneMenu_080A4080(void) {
     gOamCmd.x = 0xb8;
     gOamCmd._8 = 0x4a0;
     DrawDirect(t, 1);
-    uVar1 = gMain.ticks.HWORD >> 2 & 0xe;
+    uVar1 = gMain.ticks >> 2 & 0xe;
     temp = &gUnk_08128110[uVar1];
     gOamCmd.x = 10 - temp[0];
     gOamCmd._8 = 0x4e0;
@@ -439,7 +436,7 @@ NONMATCH("asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc", void K
                 switch (gMenu.column_idx) {
                     case 3:
                     case 4:
-                        uVar3 -= 1;
+                        uVar3--;
                         break;
                     default:
                         break;
@@ -609,7 +606,7 @@ u32 KinstoneMenu_080A4494(void) {
         psVar1->charColor = 0;
         psVar1->bgColor = 5;
         psVar1->unk1 = 0;
-        sub_080A44E0(psVar1, gUnk_02002AC0, 0x80);
+        sub_080A44E0(psVar1, gSave.name, 0x80);
 #if NON_MATCHING
         ret = sub_080A44E0(psVar1, sub_08002632(gFuseInfo.ent) >> 0x20, 0xa0);
 #else
diff --git a/src/menu/pause_menu.c b/src/menu/pause_menu.c
index 45012f83..6a64c87d 100644
--- a/src/menu/pause_menu.c
+++ b/src/menu/pause_menu.c
@@ -511,7 +511,7 @@ void PauseMenu_ItemMenu_Draw(void) {
         entry = &gItemMenuTable[slot];
         gOamCmd.x = entry->x;
         gOamCmd.y = entry->y;
-        tmp = entry->type + ((gMain.ticks.HWORD & 0x10) != 0 ? 3 : 4);
+        tmp = entry->type + ((gMain.ticks & 0x10) != 0 ? 3 : 4);
         DrawDirect(sub_080A5384_draw_constant0, tmp);
     }
     {