diff --git a/include/constants/sa1/items.h b/include/constants/sa1/items.h
index 6065fbe720..f42d42f846 100644
--- a/include/constants/sa1/items.h
+++ b/include/constants/sa1/items.h
@@ -1,6 +1,3 @@
-#ifndef GUARD_CONSTANTS_ITEMS_H
-#define GUARD_CONSTANTS_ITEMS_H
-
 #if (GAME == GAME_SA1)
 #define ITEM__ONE_UP          0
 #define ITEM__SHIELD          1
@@ -13,15 +10,7 @@
 #define ITEM__MP_8            8
 #define ITEM__MP_9            9
 #define ITEM__MP_10           10
-
-#if (GAME == GAME_SA1)
-#define ITEM__COUNT 11
-#else
-#define ITEM__MP_11 11
-#define ITEM__MP_12 12
-
-#define ITEM__COUNT 13
-#endif
+#define ITEM__COUNT           11
 #elif (GAME == GAME_SA2)
 #define ITEM__ONE_UP          0
 #define ITEM__SHIELD          1
@@ -37,6 +26,7 @@
 #define ITEM__MP_ATTACK       11
 #define ITEM__MP_ATTACK_2     12
 #define ITEM__MP_RANDOM       13
-#endif
+#define ITEM__COUNT           13
+//#endif
 
 #endif // GUARD_CONSTANTS_ITEMS_H
\ No newline at end of file
diff --git a/src/game/sa1/menus/title_screen.c b/src/game/sa1/menus/title_screen.c
index 066fe4e241..9f440dd475 100644
--- a/src/game/sa1/menus/title_screen.c
+++ b/src/game/sa1/menus/title_screen.c
@@ -146,8 +146,8 @@ void Task_SegaLogoInit(void)
     logo = TASK_DATA(gCurTask);
     gDispCnt |= DISPCNT_BG2_ON;
     logo->unk0++;
-    SA2_LABEL(sub_8007858)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);
-    SA2_LABEL(sub_80078D4)(2U, (160 - logo->unk0), 160, (u16)gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
+    SA2_LABEL(Bg2_SetWindowRegionExtended)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);
+    SA2_LABEL(Bg2_SetWindowRegion)(2U, (160 - logo->unk0), 160, (u16)gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
 
     if (logo->unk0 == 160) {
         gCurTask->main = sub_800D3E0;
@@ -155,14 +155,14 @@ void Task_SegaLogoInit(void)
     }
 }
 
-void Task_800D11C(void)
+void Task_SegaLogoScrollOut(void)
 {
     SegaLogo *logo;
 
     logo = TASK_DATA(gCurTask);
     logo->unk0++;
-    SA2_LABEL(sub_80078D4)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
-    SA2_LABEL(sub_8007858)
+    SA2_LABEL(Bg2_SetWindowRegion)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
+    SA2_LABEL(Bg2_SetWindowRegionExtended)
     (2U, (160 - logo->unk0), 160, gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);
 
     if (logo->unk0 == 160) {
@@ -228,8 +228,8 @@ void Task_800D268(void)
 
     logo->unk0 += 2;
     if (logo->unk0 < 280) {
-        SA2_LABEL(sub_80078D4)(2, 0, 40, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
-        SA2_LABEL(sub_80078D4)(2, 120, 160, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
+        SA2_LABEL(Bg2_SetWindowRegion)(2, 0, 40, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
+        SA2_LABEL(Bg2_SetWindowRegion)(2, 120, 160, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
 
 #if !PORTABLE
         // BUG: For some reason this currently overwrites memory it shouldn't be able to access.
@@ -239,7 +239,7 @@ void Task_800D268(void)
             SA2_LABEL(sub_8007958)(2U, 40, 120, (s16)(280 - logo->unk0), -1, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
         } else {
             SA2_LABEL(sub_8007958)(2U, 40, (64 - logo->unk0), (280 - logo->unk0), -1, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
-            SA2_LABEL(sub_80078D4)(2U, (64 - logo->unk0), 120, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
+            SA2_LABEL(Bg2_SetWindowRegion)(2U, (64 - logo->unk0), 120, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
         }
 #endif
     } else {