6 files changed, 21 insertions, 21 deletions
diff --git a/include/battle.h b/include/battle.h
index 94596c75e..d155ca5a0 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -175,7 +175,7 @@ struct ProtectStruct
     u32 targetNotAffected:1;
     u32 chargingTurn:1;
     u32 fleeFlag:2; // For RunAway and Smoke Ball.
-    u32 usedImprisionedMove:1;
+    u32 usedImprisonedMove:1;
     u32 loveImmobility:1;
     u32 usedDisabledMove:1;
     u32 usedTauntedMove:1;
diff --git a/include/battle_scripts.h b/include/battle_scripts.h
index a23fa6948..5f314401a 100644
--- a/include/battle_scripts.h
+++ b/include/battle_scripts.h
@@ -88,8 +88,8 @@ extern const u8 BattleScript_IngrainTurnHeal[];
 extern const u8 BattleScript_AtkDefDown[];
 extern const u8 BattleScript_KnockedOff[];
 extern const u8 BattleScript_MoveUsedIsImprisoned[];
-extern const u8 BattleScript_SelectingImprisionedMove[];
-extern const u8 BattleScript_SelectingImprisionedMoveInPalace[];
+extern const u8 BattleScript_SelectingImprisonedMove[];
+extern const u8 BattleScript_SelectingImprisonedMoveInPalace[];
 extern const u8 BattleScript_GrudgeTakesPp[];
 extern const u8 BattleScript_MagicCoatBounce[];
 extern const u8 BattleScript_SnatchedMove[];
diff --git a/include/battle_util.h b/include/battle_util.h
index 71bb22a00..0756a387a 100644
--- a/include/battle_util.h
+++ b/include/battle_util.h
@@ -6,7 +6,7 @@
 #define MOVE_LIMITATION_DISABLED                (1 << 2)
 #define MOVE_LIMITATION_TORMENTED               (1 << 3)
 #define MOVE_LIMITATION_TAUNT                   (1 << 4)
-#define MOVE_LIMITATION_IMPRISION               (1 << 5)
+#define MOVE_LIMITATION_IMPRISON               (1 << 5)
 
 #define ABILITYEFFECT_ON_SWITCHIN                0x0
 #define ABILITYEFFECT_ENDTURN                    0x1
@@ -44,7 +44,7 @@
 u8 GetBattlerForBattleScript(u8 caseId);
 void PressurePPLose(u8 target, u8 attacker, u16 move);
 void PressurePPLoseOnUsingPerishSong(u8 attacker);
-void PressurePPLoseOnUsingImprision(u8 attacker);
+void PressurePPLoseOnUsingImprison(u8 attacker);
 void MarkAllBattlersForControllerExec(void); // unused
 void MarkBattlerForControllerExec(u8 battlerId);
 void sub_803F850(u8 arg0);
diff --git a/include/menu.h b/include/menu.h
index aca462468..947f97a68 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -25,23 +25,23 @@ void InitStandardTextBoxWindows(void);
 void sub_8197200(void);
 u16 RunTextPrintersAndIsPrinter0Active(void);
 void sub_81973A4(void);
-void NewMenuHelpers_DrawDialogueFrame(u8, u8);
-void sub_819746C(u8 windowId, bool8 copyToVram);
+void DrawDialogueFrame(u8, u8);
+void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram);
 u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor);
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
 void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
-void sub_8197434(u8 windowId, bool8 copyToVram);
+void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
-void DisplayYesNoMenu(void);
+void DisplayYesNoMenuDefaultYes(void);
 u32 GetPlayerTextSpeed(void);
 u8 GetPlayerTextSpeedDelay(void);
 void sub_81978B0(u16 arg0);
 void AddTextPrinterWithCallbackForMessage(bool8 a1, void (*callback)(struct TextPrinterTemplate *, u16));
 void sub_8199DF0(u32 bg, u8 a1, int a2, int a3);
 void AddTextPrinterParameterized3(u8 windowId, u8 fontId, u8 left, u8 top, const u8 *color, s8 speed, const u8 *str);
-void sub_8198070(u8 windowId, bool8 copyToVram);
+void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
 void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
-void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
+void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
 void schedule_bg_copy_tilemap_to_vram(u8 bgNum);
 void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
 u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
@@ -60,9 +60,9 @@ s8 ProcessMenuInput_other(void);
 void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
 void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const u8 *color, s8 speed, const u8 *str);
-void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u8 a3);
+void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 a2, u8 a3);
 void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds);
-void sub_8197DF8(u8 windowId, bool8 copyToVram);
+void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram);
 u16 sub_8198AA4(u8, u8, u8, u8, u8, u8, u16);
 void *malloc_and_decompress(const void *src, u32 *sizeOut);
 u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode);
@@ -75,13 +75,13 @@ u8 GetStartMenuWindowId(void);
 void sub_819A2BC(u8, u8);
 u8 Menu_MoveCursor(s8 cursorDelta);
 u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
-void NewMenuHelpers_DrawStdWindowFrame(u8 windowId, bool8 CopyToVram);
+void DrawStdWindowFrame(u8 windowId, bool8 CopyToVram);
 u8 sub_81979C4(u8 a1);
 u8 sub_81983AC(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);
 void sub_819786C(u8 windowId, bool8 copyToVram);
 void AddTextPrinterForMessage_2(bool8 allowSkippingDelayWithButtonPress);
 void RemoveStartMenuWindow(void);
-void sub_8197948(u8 initialCursorPos);
+void DisplayYesNoMenuWithDefault(u8 initialCursorPos);
 void sub_819A344(u8 a0, u8 *dest, u8 color);
 void RemoveMapNamePopUpWindow(void);
 u8 GetMapNamePopUpWindowId(void);
diff --git a/include/siirtc.h b/include/siirtc.h
index 5864f95b8..de4fd634d 100644
--- a/include/siirtc.h
+++ b/include/siirtc.h
@@ -39,10 +39,10 @@ struct SiiRtcInfo
     u8 alarmMinute;
 };
 
-void SiiRtcUnprotect();
-void SiiRtcProtect();
-u8 SiiRtcProbe();
-bool8 SiiRtcReset();
+void SiiRtcUnprotect(void);
+void SiiRtcProtect(void);
+u8 SiiRtcProbe(void);
+bool8 SiiRtcReset(void);
 bool8 SiiRtcGetStatus(struct SiiRtcInfo *rtc);
 bool8 SiiRtcSetStatus(struct SiiRtcInfo *rtc);
 bool8 SiiRtcGetDateTime(struct SiiRtcInfo *rtc);
diff --git a/include/window.h b/include/window.h
index 25573ac3e..10e447789 100644
--- a/include/window.h
+++ b/include/window.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_WINDOW_H
 #define GUARD_WINDOW_H
 
+#define PIXEL_FILL(num) ((num) | ((num) << 4))
+
 enum
 {
     WINDOW_BG,
@@ -73,6 +75,4 @@ extern u32 filler_03002F58;
 extern u32 filler_03002F5C;
 extern u32 filler_03002F64;
 
-extern u8 gUnknown_03002F60;
-
 #endif // GUARD_WINDOW_H