polish and bug fix

9 files changed, 64 insertions, 66 deletions

diff --git a/asm/script_menu.s b/asm/script_menu.s
index 4a5f2e858..59af843f1 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -271,7 +271,7 @@ _0809CB32:
 	movs r1, 0x2
 	movs r2, 0x8
 	movs r3, 0x2
-	bl PrintMultichoiceListItems
+	bl MultichoiceList_PrintItems
 	b _0809CB7A
 	.align 2, 0
 _0809CB54: .4byte sub_809D6D4
@@ -290,7 +290,7 @@ _0809CB5C:
 	movs r1, 0x2
 	movs r2, 0x8
 	movs r3, 0x2
-	bl PrintMultichoiceListItems
+	bl MultichoiceList_PrintItems
 _0809CB7A:
 	movs r0, 0xE
 	str r0, [sp]
@@ -833,7 +833,7 @@ _0809CF08:
 	movs r1, 0x1
 	adds r2, r5, 0
 	movs r3, 0x10
-	bl MultichoiceGridPrintItems
+	bl MultichoiceGrid_PrintItems
 	ldrb r0, [r4, 0x14]
 	str r5, [sp]
 	str r7, [sp, 0x4]
@@ -843,7 +843,7 @@ _0809CF08:
 	movs r1, 0x1
 	movs r2, 0
 	movs r3, 0x1
-	bl MultichoiceGridInitCursor
+	bl MultichoiceGrid_InitCursor
 	movs r0, 0
 	bl ScheduleBgCopyTilemapToVram
 _0809CFB8:
diff --git a/include/menu.h b/include/menu.h
index 7c7e164ae..6d8de3274 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -35,14 +35,14 @@ void BlitMoveInfoIcon(u8 windowId, u8 iconId, u16 x, u16 y);
 
 // menu
 s8 Menu_ProcessInputGridLayout(void);
-u8 MultichoiceGridInitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos);
-void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs);
+u8 MultichoiceGrid_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos);
+void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs);
 void DestroyYesNoMenu(void);
 s8 Menu_ProcessInputNoWrapClearOnChoose(void);
 void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8 top, u16 baseTileNum, u8 paletteNum, u8 initialCursorPos);
 void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *orderArray);
 void UnionRoomAndTradeMenuPrintOptions(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
-void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing);
+void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing);
 void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs);
 s8 Menu_ProcessInputNoWrapAround_other(void);
 s8 Menu_ProcessInput_other(void);
diff --git a/include/palette.h b/include/palette.h
index 78f398873..06b9b1f6f 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -43,7 +43,7 @@ struct PaletteFadeControl
 
 extern struct PaletteFadeControl gPaletteFade;
 extern u32 gPlttBufferTransferPending;
-extern u8 *gPaletteDecompressionBuffer;
+extern u8 *gUnknown_203AAB0;
 extern u16 gPlttBufferUnfaded[PLTT_BUFFER_SIZE];
 extern u16 gPlttBufferFaded[PLTT_BUFFER_SIZE];
 
diff --git a/include/sound.h b/include/sound.h
index e720fc1a2..e5736fad8 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -12,7 +12,6 @@ void StopMapMusic(void);
 void FadeOutMapMusic(u8 speed);
 void FadeOutAndPlayNewMapMusic(u16 songNum, u8 speed);
 void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed);
-void FadeInNewMapMusic(u16 songNum, u8 speed);
 bool8 IsNotWaitingForBGMStop(void);
 void PlayFanfareByFanfareNum(u8 fanfareNum);
 bool8 WaitFanfare(bool8 stop);
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 9c6115044..aca56ef4c 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -52,8 +52,8 @@ static void StartSweetScentFieldEffect(void)
     u8 taskId;
 
     PlaySE(SE_W260);
-    gPaletteDecompressionBuffer = (u8 *)Alloc(0x400);
-    CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
+    gUnknown_203AAB0 = (u8 *)Alloc(0x400);
+    CpuFastSet(gPlttBufferUnfaded, gUnknown_203AAB0, 0x100);
     CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB(31, 0, 0));
     taskId = CreateTask(TrySweetScentEncounter, 0);
@@ -72,7 +72,7 @@ static void TrySweetScentEncounter(u8 taskId)
             data[0] = 0;
             if (SweetScentWildEncounter() == TRUE)
             {
-                Free(gPaletteDecompressionBuffer);
+                Free(gUnknown_203AAB0);
                 DestroyTask(taskId);
             }
             else
@@ -92,9 +92,9 @@ static void FailSweetScentEncounter(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
+        CpuFastSet(gUnknown_203AAB0, gPlttBufferUnfaded, 0x100);
         sub_807B070();
-        Free(gPaletteDecompressionBuffer);
+        Free(gUnknown_203AAB0);
         ScriptContext1_SetupScript(EventScript_FailSweetScent);
         DestroyTask(taskId);
     }
diff --git a/src/menu.c b/src/menu.c
index 7d7f05032..e73c73b08 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -35,6 +35,12 @@ static EWRAM_DATA u8 sPaletteNum = 0;
 static EWRAM_DATA u8 sYesNoWindowId = 0;
 static EWRAM_DATA u8 sTopBarWindowId = 0;
 
+static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
+static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
+static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
+static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
+static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY);
+
 static const struct TextColor gUnknown_8456618 = 
 {
     .fgColor = 15,
@@ -42,12 +48,6 @@ static const struct TextColor gUnknown_8456618 =
     .shadowColor = 2,
 };
 
-static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
-static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
-static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
-static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
-static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY);
-
 void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
 {
     sTileNum = tileNum;
@@ -245,7 +245,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
 }
 
 // not used
-static void Unused_CopyTopBarWindowToVram(void)
+static void CopyTopBarWindowToVram(void)
 {
     if (sTopBarWindowId != 0xFF)
         CopyWindowToVram(sTopBarWindowId, 3);
@@ -305,7 +305,7 @@ static u8 sub_810F818(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8
     return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos);
 }
 
-static void RedrawMenuCursor(u8 oldPos, u8 newPos)
+static void Menu_RedrawCursor(u8 oldPos, u8 newPos)
 {
     u8 width, height;
 
@@ -326,7 +326,7 @@ u8 Menu_MoveCursor(s8 cursorDelta)
         sMenu.cursorPos = sMenu.minCursorPos;
     else
         sMenu.cursorPos += cursorDelta;
-    RedrawMenuCursor(oldPos, sMenu.cursorPos);
+    Menu_RedrawCursor(oldPos, sMenu.cursorPos);
     return sMenu.cursorPos;
 }
 
@@ -342,7 +342,7 @@ u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta)
     else
         sMenu.cursorPos += cursorDelta;
 
-    RedrawMenuCursor(oldPos, sMenu.cursorPos);
+    Menu_RedrawCursor(oldPos, sMenu.cursorPos);
     return sMenu.cursorPos;
 }
 
@@ -472,7 +472,7 @@ void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 i
     CopyWindowToVram(windowId, 2);
 }
 
-void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing)
+void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing)
 {
     u8 i;
 
@@ -521,16 +521,16 @@ static void sub_810FDE4(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, con
 
 struct WindowTemplate SetWindowTemplateFields(u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
 {
-    struct WindowTemplate temp;
+    struct WindowTemplate template;
 
-    temp.bg = bg;
-    temp.tilemapLeft = left;
-    temp.tilemapTop = top;
-    temp.width = width;
-    temp.height = height;
-    temp.paletteNum = paletteNum;
-    temp.baseBlock = baseBlock;
-    return temp;
+    template.bg = bg;
+    template.tilemapLeft = left;
+    template.tilemapTop = top;
+    template.width = width;
+    template.height = height;
+    template.paletteNum = paletteNum;
+    template.baseBlock = baseBlock;
+    return template;
 }
 
 // not used
@@ -564,7 +564,7 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u8 fontId, u8 left, u8
 }
 
 // not used
-static void Unused_CreateYesNoMenu2(const struct WindowTemplate *window, u8 paletteNum, u16 baseTileNum, u8 initialCursorPos)
+static void CreateYesNoMenu2(const struct WindowTemplate *window, u8 paletteNum, u16 baseTileNum, u8 initialCursorPos)
 {
     CreateYesNoMenu(window, paletteNum, 0, 0, baseTileNum, initialCursorPos, 0);
 }
@@ -583,7 +583,7 @@ void DestroyYesNoMenu(void)
     RemoveWindow(sYesNoWindowId);
 }
 
-void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs)
+void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs)
 {
     u8 width, i, j, yOffset;
 
@@ -599,7 +599,7 @@ void MultichoiceGridPrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeig
 }
 
 //not used
-static void Unused_MultichoiceGridPrintItemsCustomOrder(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs, const u8 *orderArray)
+static void MultichoiceGrid_PrintItemsCustomOrder(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHeight, u8 cols, u8 rows, const struct MenuAction *strs, const u8 *orderArray)
 {
     u8 width, i, j;
 
@@ -613,7 +613,7 @@ static void Unused_MultichoiceGridPrintItemsCustomOrder(u8 windowId, u8 fontId,
     CopyWindowToVram(windowId, 2);
 }
 
-static u8 MultichoiceGridInitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cursorHeight, u8 cols, u8 rows, u8 numChoices, u8 cursorPos)
+static u8 MultichoiceGrid_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cursorHeight, u8 cols, u8 rows, u8 numChoices, u8 cursorPos)
 {
     s32 pos;
 
@@ -632,19 +632,19 @@ static u8 MultichoiceGridInitCursorInternal(u8 windowId, u8 fontId, u8 left, u8
         sMenu.cursorPos = 0;
     else
         sMenu.cursorPos = pos;
-    MultichoiceGridComputeNewCursorPos(0, 0);
+    MultichoiceGrid_MoveCursor(0, 0);
     return sMenu.cursorPos;
 }
 
-u8 MultichoiceGridInitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos)
+u8 MultichoiceGrid_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cols, u8 rows, u8 cursorPos)
 {
     s32 cursorHeight = 16;
     u8 numChoices = cols * rows;
 
-    return MultichoiceGridInitCursorInternal(windowId, fontId, left, top, optionWidth, cursorHeight, cols, rows, numChoices, cursorPos);
+    return MultichoiceGrid_InitCursorInternal(windowId, fontId, left, top, optionWidth, cursorHeight, cols, rows, numChoices, cursorPos);
 }
 
-static void MultichoiceGridUpdateCursorPos(u8 oldCursorPos, u8 newCursorPos)
+static void MultichoiceGrid_RedrawCursor(u8 oldCursorPos, u8 newCursorPos)
 {
     u8 cursorWidth = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
     u8 cursorHeight = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
@@ -657,7 +657,7 @@ static void MultichoiceGridUpdateCursorPos(u8 oldCursorPos, u8 newCursorPos)
     AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gFameCheckerText_ListMenuCursor, xPos, yPos, 0, 0);
 }
 
-static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY)
+static u8 MultichoiceGrid_MoveCursor(s8 deltaX, s8 deltaY)
 {
     u8 oldPos = sMenu.cursorPos;
 
@@ -686,12 +686,12 @@ static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY)
     }
     else
     {
-        MultichoiceGridUpdateCursorPos(oldPos, sMenu.cursorPos);
+        MultichoiceGrid_RedrawCursor(oldPos, sMenu.cursorPos);
         return sMenu.cursorPos;
     }
 }
 
-static u8 MultichoiceGridComputeNewCursorPosIfValid(s8 deltaX, s8 deltaY)
+static u8 MultichoiceGrid_MoveCursorIfValid(s8 deltaX, s8 deltaY)
 {
     u8 oldPos = sMenu.cursorPos;
 
@@ -712,7 +712,7 @@ static u8 MultichoiceGridComputeNewCursorPosIfValid(s8 deltaX, s8 deltaY)
     }
     else
     {
-        MultichoiceGridUpdateCursorPos(oldPos, sMenu.cursorPos);
+        MultichoiceGrid_RedrawCursor(oldPos, sMenu.cursorPos);
         return sMenu.cursorPos;
     }
 }
@@ -732,25 +732,25 @@ static s8 sub_81105A0(void)
     else if (JOY_NEW(DPAD_UP))
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(0, -1);
+        MultichoiceGrid_MoveCursor(0, -1);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_DOWN))
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(0, 1);
+        MultichoiceGrid_MoveCursor(0, 1);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(-1, 0);
+        MultichoiceGrid_MoveCursor(-1, 0);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(1, 0);
+        MultichoiceGrid_MoveCursor(1, 0);
         return MENU_NOTHING_CHOSEN;
     }
     return MENU_NOTHING_CHOSEN;
@@ -771,25 +771,25 @@ s8 Menu_ProcessInputGridLayout(void)
     }
     else if (JOY_NEW(DPAD_UP))
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, -1))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, -1))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_DOWN))
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, 1))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, 1))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_LEFT) || GetLRKeysState() == 1)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(-1, 0))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(-1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysState() == 2)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(1, 0))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
@@ -811,25 +811,25 @@ static s8 sub_81106F4(void)
     else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(0, -1);
+        MultichoiceGrid_MoveCursor(0, -1);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(0, 1);
+        MultichoiceGrid_MoveCursor(0, 1);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(-1, 0);
+        MultichoiceGrid_MoveCursor(-1, 0);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2)
     {
         PlaySE(SE_SELECT);
-        MultichoiceGridComputeNewCursorPos(1, 0);
+        MultichoiceGrid_MoveCursor(1, 0);
         return MENU_NOTHING_CHOSEN;
     }
 
@@ -852,25 +852,25 @@ static s8 sub_81107A0(void)
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_UP)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, -1))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, -1))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_DOWN)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(0, 1))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(0, 1))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_LEFT || sub_80BF66C() == 1)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(-1, 0))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(-1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
     else if (JOY_REPT(DPAD_ANY) == DPAD_RIGHT || sub_80BF66C() == 2)
     {
-        if (oldPos != MultichoiceGridComputeNewCursorPosIfValid(1, 0))
+        if (oldPos != MultichoiceGrid_MoveCursorIfValid(1, 0))
             PlaySE(SE_SELECT);
         return MENU_NOTHING_CHOSEN;
     }
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c
index 5e2452e14..9d2a5c883 100644
--- a/src/new_menu_helpers.c
+++ b/src/new_menu_helpers.c
@@ -671,8 +671,7 @@ u8 sub_80F78E0(u8 height)
 {
     if (sStartMenuWindowId == 0xFF)
     {
-        struct WindowTemplate template;
-        template = SetWindowTemplateFields(0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D);
+        struct WindowTemplate template = SetWindowTemplateFields(0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D);
         sStartMenuWindowId = AddWindow(&template);
         PutWindowTilemap(sStartMenuWindowId);
     }
diff --git a/src/sound.c b/src/sound.c
index ba6511d1c..dc4b9f604 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -169,7 +169,7 @@ void FadeOutAndFadeInNewMapMusic(u16 songNum, u8 fadeOutSpeed, u8 fadeInSpeed)
     sMapMusicFadeInSpeed = fadeInSpeed;
 }
 
-void FadeInNewMapMusic(u16 songNum, u8 speed)
+static void FadeInNewMapMusic(u16 songNum, u8 speed)
 {
     FadeInNewBGM(songNum, speed);
     sCurrentMapMusic = songNum;
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 9312ecb7f..b968e31ee 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -1085,7 +1085,7 @@ gUnknown_2039A34: @ 2039A34
 	.include "src/save.o"
 	.include "src/mystery_event_script.o"
 
-gPaletteDecompressionBuffer: @ 203AAB0
+gUnknown_203AAB0: @ 203AAB0
 	.space 0x4
 
 gUnknown_203AAB4: @ 203AAB4