pss 9; static symbols

13 files changed, 677 insertions, 919 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
deleted file mode 100644
index d768a042e..000000000
--- a/asm/pokemon_storage_system.s
+++ /dev/null
@@ -1,319 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	@ file boundary?
-
-	thumb_func_start sub_8096BE4
-sub_8096BE4: @ 8096BE4
-	ldr r3, _08096BF4 @ =gUnknown_203982C
-	str r0, [r3]
-	str r1, [r0]
-	movs r1, 0
-	strb r2, [r0, 0x5]
-	strb r1, [r0, 0x4]
-	bx lr
-	.align 2, 0
-_08096BF4: .4byte gUnknown_203982C
-	thumb_func_end sub_8096BE4
-
-	thumb_func_start sub_8096BF8
-sub_8096BF8: @ 8096BF8
-	push {r4,r5,lr}
-	ldr r2, _08096C3C @ =gUnknown_203982C
-	ldr r1, [r2]
-	ldrb r0, [r1, 0x4]
-	cmp r0, 0
-	beq _08096C36
-	movs r4, 0
-	ldrb r1, [r1, 0x4]
-	cmp r4, r1
-	bcs _08096C2E
-	adds r5, r2, 0
-_08096C0E:
-	ldr r0, [r5]
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, [r0]
-	adds r0, r1
-	ldr r1, [r0, 0x10]
-	bl _call_via_r1
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r0, [r5]
-	ldrb r0, [r0, 0x4]
-	cmp r4, r0
-	bcc _08096C0E
-_08096C2E:
-	ldr r0, _08096C3C @ =gUnknown_203982C
-	ldr r1, [r0]
-	movs r0, 0
-	strb r0, [r1, 0x4]
-_08096C36:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08096C3C: .4byte gUnknown_203982C
-	thumb_func_end sub_8096BF8
-
-	thumb_func_start sub_8096C40
-sub_8096C40: @ 8096C40
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	mov r9, r0
-	mov r10, r3
-	ldr r0, [sp, 0x24]
-	ldr r3, [sp, 0x28]
-	ldr r4, [sp, 0x2C]
-	ldr r5, [sp, 0x30]
-	ldr r6, [sp, 0x34]
-	lsls r1, 16
-	lsrs r1, 16
-	mov r12, r1
-	lsls r2, 16
-	lsrs r2, 16
-	str r2, [sp]
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	lsls r3, 16
-	lsrs r3, 16
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	ldr r0, _08096CC0 @ =gUnknown_203982C
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x4]
-	adds r1, r0, 0
-	ldrb r7, [r2, 0x5]
-	cmp r1, r7
-	bcs _08096CC8
-	adds r0, 0x1
-	strb r0, [r2, 0x4]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, [r2]
-	adds r1, r0
-	lsls r0, r4, 1
-	strh r0, [r1, 0x8]
-	ldr r2, [sp]
-	lsls r0, r2, 5
-	add r0, r12
-	lsls r0, 1
-	add r0, r9
-	str r0, [r1, 0x4]
-	adds r0, r3, 0
-	muls r0, r6
-	add r0, r8
-	lsls r0, 1
-	add r0, r10
-	str r0, [r1]
-	strh r5, [r1, 0xC]
-	strh r6, [r1, 0xA]
-	ldr r0, _08096CC4 @ =sub_8096CDC
-	str r0, [r1, 0x10]
-	movs r0, 0x1
-	b _08096CCA
-	.align 2, 0
-_08096CC0: .4byte gUnknown_203982C
-_08096CC4: .4byte sub_8096CDC
-_08096CC8:
-	movs r0, 0
-_08096CCA:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8096C40
-
-	thumb_func_start sub_8096CDC
-sub_8096CDC: @ 8096CDC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r5, 0
-	b _08096D06
-_08096CE4:
-	ldr r0, [r4]
-	ldr r1, [r4, 0x4]
-	ldrh r2, [r4, 0x8]
-	lsrs r2, 1
-	bl CpuSet
-	ldr r0, [r4, 0x4]
-	adds r0, 0x40
-	str r0, [r4, 0x4]
-	ldrh r1, [r4, 0xA]
-	lsls r1, 1
-	ldr r0, [r4]
-	adds r0, r1
-	str r0, [r4]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_08096D06:
-	ldrh r0, [r4, 0xC]
-	cmp r5, r0
-	bcc _08096CE4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8096CDC
-
-	thumb_func_start sub_8096D14
-sub_8096D14: @ 8096D14
-	push {r4-r7,lr}
-	mov r12, r0
-	ldr r0, [sp, 0x14]
-	lsls r1, 16
-	lsrs r6, r1, 16
-	lsls r2, 16
-	lsrs r4, r2, 16
-	lsls r3, 16
-	lsrs r3, 16
-	lsls r0, 16
-	lsrs r5, r0, 16
-	ldr r0, _08096D60 @ =gUnknown_203982C
-	ldr r2, [r0]
-	ldrb r0, [r2, 0x4]
-	adds r1, r0, 0
-	ldrb r7, [r2, 0x5]
-	cmp r1, r7
-	bcs _08096D68
-	adds r0, 0x1
-	strb r0, [r2, 0x4]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, [r2]
-	adds r1, r0
-	lsls r0, r3, 1
-	strh r0, [r1, 0x8]
-	lsls r0, r4, 5
-	adds r0, r6
-	lsls r0, 1
-	add r0, r12
-	str r0, [r1, 0x4]
-	strh r5, [r1, 0xC]
-	ldr r0, _08096D64 @ =sub_8096D70
-	str r0, [r1, 0x10]
-	movs r0, 0x1
-	b _08096D6A
-	.align 2, 0
-_08096D60: .4byte gUnknown_203982C
-_08096D64: .4byte sub_8096D70
-_08096D68:
-	movs r0, 0
-_08096D6A:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8096D14
-
-	thumb_func_start sub_8096D70
-sub_8096D70: @ 8096D70
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r6, r0, 0
-	movs r0, 0
-	ldrh r1, [r6, 0xC]
-	cmp r0, r1
-	bcs _08096DFE
-	movs r7, 0x80
-	lsls r7, 5
-	mov r5, sp
-	ldr r2, _08096DBC @ =0x040000d4
-	mov r8, r2
-	movs r1, 0x81
-	lsls r1, 24
-	mov r10, r1
-_08096D96:
-	ldr r2, [r6, 0x4]
-	ldrh r3, [r6, 0x8]
-	mov r12, r2
-	adds r0, 0x1
-	mov r9, r0
-	cmp r3, r7
-	bhi _08096DC0
-	movs r0, 0
-	strh r0, [r5]
-	mov r2, sp
-	mov r0, r8
-	str r2, [r0]
-	mov r1, r12
-	str r1, [r0, 0x4]
-	lsrs r0, r3, 1
-	mov r2, r10
-	orrs r0, r2
-	mov r1, r8
-	b _08096DE8
-	.align 2, 0
-_08096DBC: .4byte 0x040000d4
-_08096DC0:
-	movs r4, 0
-	strh r4, [r5]
-	ldr r1, _08096E10 @ =0x040000d4
-	mov r0, sp
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	ldr r0, _08096E14 @ =0x81000800
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	adds r2, r7
-	subs r3, r7
-	cmp r3, r7
-	bhi _08096DC0
-	strh r4, [r5]
-	mov r0, sp
-	str r0, [r1]
-	str r2, [r1, 0x4]
-	lsrs r0, r3, 1
-	mov r2, r10
-	orrs r0, r2
-_08096DE8:
-	str r0, [r1, 0x8]
-	ldr r0, [r1, 0x8]
-	mov r0, r12
-	adds r0, 0x40
-	str r0, [r6, 0x4]
-	mov r1, r9
-	lsls r0, r1, 16
-	lsrs r0, 16
-	ldrh r2, [r6, 0xC]
-	cmp r0, r2
-	bcc _08096D96
-_08096DFE:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08096E10: .4byte 0x040000d4
-_08096E14: .4byte 0x81000800
-	thumb_func_end sub_8096D70
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/data/pokemon_storage_system.s b/data/pokemon_storage_system.s
deleted file mode 100644
index 995797638..000000000
--- a/data/pokemon_storage_system.s
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "constants/maps.h"
-#include "constants/species.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2
diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h
index 2f6cf20f1..4a1cda7aa 100644
--- a/include/pokemon_storage_system_internal.h
+++ b/include/pokemon_storage_system_internal.h
@@ -206,14 +206,14 @@ struct UnkStruct_2000020
     u8 unk_05;
 };
 
-struct UnkStorageStruct
+struct PSS_ItemIconSprite
 {
     struct Sprite *sprite;
     u8 *tiles;
     u16 palIndex;
-    u8 unk8;
-    u8 unk9;
-    u8 unk10;
+    u8 cursorArea;
+    u8 cursorPos;
+    u8 active;
 };
 
 struct PssQuestLogBuffer
@@ -366,7 +366,7 @@ struct PokemonStorageSystemData
     /* 21db */ u8 itemName[20];
     /* 21ef */ u8 inBoxMovingMode;
     /* 21f0 */ u16 field_2200;
-    /* 21f4 */ struct UnkStorageStruct field_2204[MAX_ITEM_ICONS];
+    /* 21f4 */ struct PSS_ItemIconSprite itemIconSprites[MAX_ITEM_ICONS];
     /* 2224 */ u16 movingItem;
     /* 2226 */ u16 field_2236;
     /* 2228 */ struct PssQuestLogBuffer qlogBuffer;
diff --git a/ld_script.txt b/ld_script.txt
index 2c7f2339c..178474863 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -136,7 +136,7 @@ SECTIONS {
         src/pokemon_storage_system_6.o(.text);
         src/pokemon_storage_system_7.o(.text);
         src/pokemon_storage_system_8.o(.text);
-        asm/pokemon_storage_system.o(.text);
+        src/pokemon_storage_system_9.o(.text);
         src/pokemon_icon.o(.text);
         src/script_movement.o(.text);
         src/fldeff_cut.o(.text);
diff --git a/src/pokemon_storage_system_2.c b/src/pokemon_storage_system_2.c
index 827d4338a..0f3166903 100644
--- a/src/pokemon_storage_system_2.c
+++ b/src/pokemon_storage_system_2.c
@@ -22,25 +22,25 @@ struct PSS_MenuStringPtrs
     const u8 *desc;
 };
 
-EWRAM_DATA u8 sPreviousBoxOption = 0;
-EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_20397AC = NULL;
-
-void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
-void sub_808C9C4(u8 curBox);
-void sub_808CBA4(void);
-void sub_808CC10(void);
-void sub_808CC44(void);
-void sub_808CC74(void);
-void sub_808CCFC(const u8 *a0, u16 x, u16 y);
-void sub_808CD64(struct Sprite * sprite);
+static EWRAM_DATA u8 sPreviousBoxOption = 0;
+static EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_20397AC = NULL;
+
+static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr);
+static void sub_808C9C4(u8 curBox);
+static void sub_808CBA4(void);
+static void sub_808CC10(void);
+static void sub_808CC44(void);
+static void sub_808CC74(void);
+static void sub_808CCFC(const u8 *a0, u16 x, u16 y);
+static void sub_808CD64(struct Sprite * sprite);
 
 // Forward declarations
 
-const u16 gBoxSelectionPopupPalette[];
-const u16 gBoxSelectionPopupCenterTiles[];
-const u16 gBoxSelectionPopupSidesTiles[];
+static const u16 gBoxSelectionPopupPalette[];
+static const u16 gBoxSelectionPopupCenterTiles[];
+static const u16 gBoxSelectionPopupSidesTiles[];
 
-const struct PSS_MenuStringPtrs gUnknown_83CDA20[] = {
+static const struct PSS_MenuStringPtrs gUnknown_83CDA20[] = {
     {gText_WithdrawPokemon, gText_WithdrawMonDescription},
     {gText_DepositPokemon,  gText_DepositMonDescription },
     {gText_MovePokemon,     gText_MoveMonDescription    },
@@ -94,7 +94,7 @@ void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 zero1, u8 zero
     RemoveWindow(windowId);
 }
 
-void sub_808BFE0(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr3, u8 *buffer)
+static void sub_808BFE0(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr3, u8 *buffer)
 {
     u32 var;
     u8 windowId;
@@ -118,7 +118,7 @@ void sub_808BFE0(const u8 *string, void *dst, u16 arg2, u8 arg3, u8 clr2, u8 clr
     RemoveWindow(windowId);
 }
 
-u8 CountMonsInBox(u8 boxId)
+static u8 CountMonsInBox(u8 boxId)
 {
     u16 i, count;
 
@@ -198,7 +198,7 @@ u8 CountPartyMons(void)
     return count;
 }
 
-u8 *StringCopyAndFillWithSpaces(u8 *dst, const u8 *src, u16 n)
+static u8 *StringCopyAndFillWithSpaces(u8 *dst, const u8 *src, u16 n)
 {
     u8 *str;
 
@@ -209,7 +209,7 @@ u8 *StringCopyAndFillWithSpaces(u8 *dst, const u8 *src, u16 n)
     return str;
 }
 
-void sub_808C25C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, u16 src_left, u16 src_top, u16 dest_width, u16 dest_height, u16 src_width)
+static void sub_808C25C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, u16 src_left, u16 src_top, u16 dest_width, u16 dest_height, u16 src_width)
 {
     u16 i;
 
@@ -224,7 +224,7 @@ void sub_808C25C(u16 *dest, u16 dest_left, u16 dest_top, const u16 *src, u16 src
     }
 }
 
-void sub_808C2D8(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height)
+static void sub_808C2D8(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height)
 {
     u16 i;
 
@@ -234,7 +234,7 @@ void sub_808C2D8(u16 *dest, u16 dest_left, u16 dest_top, u16 width, u16 height)
         Dma3FillLarge16_(0, dest, width);
 }
 
-void Task_PokemonStorageSystemPC(u8 taskId)
+static void Task_PokemonStorageSystemPC(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -351,7 +351,7 @@ void ShowPokemonStorageSystemPC(void)
     ScriptContext2_Enable();
 }
 
-void FieldCb_ReturnToPcMenu(void)
+static void FieldCb_ReturnToPcMenu(void)
 {
     u8 taskId;
     MainCallback vblankCb = gMain.vblankCallback;
@@ -365,7 +365,7 @@ void FieldCb_ReturnToPcMenu(void)
     FadeInFromBlack();
 }
 
-const struct WindowTemplate gUnknown_83CDA48 = {
+static const struct WindowTemplate gUnknown_83CDA48 = {
     .bg = 0,
     .tilemapLeft = 1,
     .tilemapTop = 1,
@@ -375,7 +375,7 @@ const struct WindowTemplate gUnknown_83CDA48 = {
     .baseBlock = 0x001
 };
 
-void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr)
+static void PSS_CreatePCMenu(u8 whichMenu, s16 *windowIdPtr)
 {
     s16 windowId;
     windowId = AddWindow(&gUnknown_83CDA48);
@@ -479,43 +479,43 @@ u8 HandleBoxChooseSelectionInput(void)
     return 200;
 }
 
-const union AnimCmd gUnknown_83CDA50[] = {
+static const union AnimCmd gUnknown_83CDA50[] = {
     ANIMCMD_FRAME( 0, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83CDA58[] = {
+static const union AnimCmd gUnknown_83CDA58[] = {
     ANIMCMD_FRAME( 4, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83CDA60[] = {
+static const union AnimCmd gUnknown_83CDA60[] = {
     ANIMCMD_FRAME( 6, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83CDA68[] = {
+static const union AnimCmd gUnknown_83CDA68[] = {
     ANIMCMD_FRAME(10, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_83CDA70[] = {
+static const union AnimCmd *const gUnknown_83CDA70[] = {
     gUnknown_83CDA50,
     gUnknown_83CDA58,
     gUnknown_83CDA60,
     gUnknown_83CDA68
 };
 
-const union AffineAnimCmd gUnknown_83CDA80[] = {
+static const union AffineAnimCmd gUnknown_83CDA80[] = {
     AFFINEANIMCMD_FRAME(224, 224, 0, 0),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const gUnknown_83CDA90[] = {
+static const union AffineAnimCmd *const gUnknown_83CDA90[] = {
     gUnknown_83CDA80
 };
 
-void sub_808C9C4(u8 curBox)
+static void sub_808C9C4(u8 curBox)
 {
     u16 i;
     u8 spriteId;
@@ -573,7 +573,7 @@ void sub_808C9C4(u8 curBox)
     }
 }
 
-void sub_808CBA4(void)
+static void sub_808CBA4(void)
 {
     u16 i;
     if (gUnknown_20397AC->unk_0000)
@@ -596,20 +596,20 @@ void sub_808CBA4(void)
     }
 }
 
-void sub_808CC10(void)
+static void sub_808CC10(void)
 {
     if (++gUnknown_20397AC->curBox >= TOTAL_BOXES_COUNT)
         gUnknown_20397AC->curBox = 0;
     sub_808CC74();
 }
 
-void sub_808CC44(void)
+static void sub_808CC44(void)
 {
     gUnknown_20397AC->curBox = (gUnknown_20397AC->curBox == 0 ? TOTAL_BOXES_COUNT - 1 : gUnknown_20397AC->curBox - 1);
     sub_808CC74();
 }
 
-void sub_808CC74(void)
+static void sub_808CC74(void)
 {
     u8 nPokemonInBox = CountMonsInBox(gUnknown_20397AC->curBox);
     u8 *boxName = StringCopy(gUnknown_20397AC->unk_0228, GetBoxNamePtr(gUnknown_20397AC->curBox));
@@ -625,13 +625,13 @@ void sub_808CC74(void)
     sub_808CCFC(gUnknown_20397AC->unk_0228, 3, 3);
 }
 
-void sub_808CCFC(const u8 *str, u16 x, u16 y)
+static void sub_808CCFC(const u8 *str, u16 x, u16 y)
 {
     u16 tileStart = GetSpriteTileStartByTag(gUnknown_20397AC->unk_0240);
     sub_808BFE0(str, (void *)(OBJ_VRAM0 + tileStart * 32 + 256 * y + 32 * x), 0x100, 4, 15, 14, gUnknown_20397AC->filler_0028);
 }
 
-void sub_808CD64(struct Sprite *sprite)
+static void sub_808CD64(struct Sprite *sprite)
 {
     if (++sprite->data[1] > 3)
     {
@@ -647,6 +647,6 @@ void sub_808CD64(struct Sprite *sprite)
 
 // Forward-declared rodata
 
-const u16 gBoxSelectionPopupPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CDA98.gbapal");
-const u16 gBoxSelectionPopupCenterTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CDAB8.4bpp");
-const u16 gBoxSelectionPopupSidesTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CE2B8.4bpp");
+static const u16 gBoxSelectionPopupPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CDA98.gbapal");
+static const u16 gBoxSelectionPopupCenterTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CDAB8.4bpp");
+static const u16 gBoxSelectionPopupSidesTiles[] = INCBIN_U16("graphics/interface/pss_unk_83CE2B8.4bpp");
diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c
index 1f9e6caf3..5e0cd7f3c 100644
--- a/src/pokemon_storage_system_3.c
+++ b/src/pokemon_storage_system_3.c
@@ -29,123 +29,123 @@
 #include "constants/vars.h"
 
 EWRAM_DATA struct PokemonStorageSystemData *sPSSData = NULL;
-EWRAM_DATA bool8 sInPartyMenu = 0;
-EWRAM_DATA u8 sCurrentBoxOption = 0;
-EWRAM_DATA u8 gUnknown_20397B6 = 0;
-EWRAM_DATA u8 sWhichToReshow = 0;
-EWRAM_DATA u8 sLastUsedBox = 0;
-EWRAM_DATA u16 gUnknown_20397BA = ITEM_NONE;
-
-void Cb_InitPSS(u8 taskId);
-void Cb_ShowPSS(u8 taskId);
-void Cb_ReshowPSS(u8 taskId);
-void Cb_MainPSS(u8 taskId);
-void Cb_ShowPartyPokemon(u8 taskId);
-void Cb_HidePartyPokemon(u8 taskId);
-void Cb_OnSelectedMon(u8 taskId);
-void Cb_MoveMon(u8 taskId);
-void Cb_PlaceMon(u8 taskId);
-void Cb_ShiftMon(u8 taskId);
-void Cb_WithdrawMon(u8 taskId);
-void Cb_DepositMenu(u8 taskId);
-void Cb_ReleaseMon(u8 taskId);
-void Cb_ShowMarkMenu(u8 taskId);
-void Cb_TakeItemForMoving(u8 taskId);
-void Cb_GiveMovingItemToMon(u8 taskId);
-void Cb_ItemToBag(u8 taskId);
-void Cb_SwitchSelectedItem(u8 taskId);
-void Cb_ShowItemInfo(u8 taskId);
-void Cb_HandleMovingMonFromParty(u8 taskId);
-void Cb_PrintCantStoreMail(u8 taskId);
-void Cb_HandleBoxOptions(u8 taskId);
-void Cb_HandleWallpapers(u8 taskId);
-void Cb_JumpBox(u8 taskId);
-void Cb_NameBox(u8 taskId);
-void Cb_ShowMonSummary(u8 taskId);
-void Cb_GiveItemFromBag(u8 taskId);
-void Cb_OnCloseBoxPressed(u8 taskId);
-void Cb_OnBPressed(u8 taskId);
-void Cb_ChangeScreen(u8 taskId);
-void GiveChosenBagItem(void);
-void FreePSSData(void);
-void SetScrollingBackground(void);
-void ScrollBackground(void);
-void LoadPSSMenuGfx(void);
-bool8 InitPSSWindows(void);
-void LoadWaveformSpritePalette(void);
-void sub_808F078(void);
-void sub_808F0F4(void);
-void sub_808F164(void);
-void RefreshCursorMonData(void);
-void BoxSetMosaic(void);
-void SpriteCB_CursorMon_Mosaic(struct Sprite * sprite);
-bool8 BoxGetMosaic(void);
-void LoadCursorMonSprite(void);
-void LoadCursorMonGfx(u16 species, u32 pid);
-void PrintCursorMonInfo(void);
-void sub_808F5E8(void);
-void sub_808F68C(void);
-void SetUpHidePartyMenu(void);
-bool8 HidePartyMenu(void);
-void sub_808F90C(bool8 species);
-void sub_808F948(void);
-void sub_808F974(void);
-void sub_808F99C(void);
-void sub_808F9FC(void);
-void sub_808FA30(u8 pos, bool8 isPartyMon);
-void sub_808FAA8(void);
-void SetUpDoShowPartyMenu(void);
-bool8 DoShowPartyMenu(void);
-void sub_808FB68(void);
-void PrintStorageActionText(u8 textId);
-void ShowYesNoWindow(s8 species);
-void ClearBottomWindow(void);
-void AddWallpaperSetsMenu(void);
-void AddWallpapersMenu(u8 wallpaperSet);
-void sub_808FDFC(void);
-void sub_808FE54(u8 species);
-void sub_808FF70(void);
-
-const u32 gPokemonStorageScrollingBGTileset[] = INCBIN_U32("graphics/interface/pss_unk_83CE438.4bpp.lz");
-const u32 gPokemonStorageScrollingBGTilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE4D0.bin.lz");
-const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CE5DC.gbapal");
-const u32 gUnknown_83CE5FC[] = INCBIN_U32("graphics/interface/pss_unk_83CE5FC.bin.lz");
-
-const u16 gUnknown_83CE6F8[] = {
+static EWRAM_DATA bool8 sInPartyMenu = 0;
+static EWRAM_DATA u8 sCurrentBoxOption = 0;
+static EWRAM_DATA u8 gUnknown_20397B6 = 0;
+static EWRAM_DATA u8 sWhichToReshow = 0;
+static EWRAM_DATA u8 sLastUsedBox = 0;
+static EWRAM_DATA u16 gUnknown_20397BA = ITEM_NONE;
+
+static void Cb_InitPSS(u8 taskId);
+static void Cb_ShowPSS(u8 taskId);
+static void Cb_ReshowPSS(u8 taskId);
+static void Cb_MainPSS(u8 taskId);
+static void Cb_ShowPartyPokemon(u8 taskId);
+static void Cb_HidePartyPokemon(u8 taskId);
+static void Cb_OnSelectedMon(u8 taskId);
+static void Cb_MoveMon(u8 taskId);
+static void Cb_PlaceMon(u8 taskId);
+static void Cb_ShiftMon(u8 taskId);
+static void Cb_WithdrawMon(u8 taskId);
+static void Cb_DepositMenu(u8 taskId);
+static void Cb_ReleaseMon(u8 taskId);
+static void Cb_ShowMarkMenu(u8 taskId);
+static void Cb_TakeItemForMoving(u8 taskId);
+static void Cb_GiveMovingItemToMon(u8 taskId);
+static void Cb_ItemToBag(u8 taskId);
+static void Cb_SwitchSelectedItem(u8 taskId);
+static void Cb_ShowItemInfo(u8 taskId);
+static void Cb_HandleMovingMonFromParty(u8 taskId);
+static void Cb_PrintCantStoreMail(u8 taskId);
+static void Cb_HandleBoxOptions(u8 taskId);
+static void Cb_HandleWallpapers(u8 taskId);
+static void Cb_JumpBox(u8 taskId);
+static void Cb_NameBox(u8 taskId);
+static void Cb_ShowMonSummary(u8 taskId);
+static void Cb_GiveItemFromBag(u8 taskId);
+static void Cb_OnCloseBoxPressed(u8 taskId);
+static void Cb_OnBPressed(u8 taskId);
+static void Cb_ChangeScreen(u8 taskId);
+static void GiveChosenBagItem(void);
+static void FreePSSData(void);
+static void SetScrollingBackground(void);
+static void ScrollBackground(void);
+static void LoadPSSMenuGfx(void);
+static bool8 InitPSSWindows(void);
+static void LoadWaveformSpritePalette(void);
+static void sub_808F078(void);
+static void sub_808F0F4(void);
+static void sub_808F164(void);
+static void RefreshCursorMonData(void);
+static void BoxSetMosaic(void);
+static void SpriteCB_CursorMon_Mosaic(struct Sprite * sprite);
+static bool8 BoxGetMosaic(void);
+static void LoadCursorMonSprite(void);
+static void LoadCursorMonGfx(u16 species, u32 pid);
+static void PrintCursorMonInfo(void);
+static void sub_808F5E8(void);
+static void sub_808F68C(void);
+static void SetUpHidePartyMenu(void);
+static bool8 HidePartyMenu(void);
+static void sub_808F90C(bool8 species);
+static void sub_808F948(void);
+static void sub_808F974(void);
+static void sub_808F99C(void);
+static void sub_808F9FC(void);
+static void sub_808FA30(u8 pos, bool8 isPartyMon);
+static void sub_808FAA8(void);
+static void SetUpDoShowPartyMenu(void);
+static bool8 DoShowPartyMenu(void);
+static void sub_808FB68(void);
+static void PrintStorageActionText(u8 textId);
+static void ShowYesNoWindow(s8 species);
+static void ClearBottomWindow(void);
+static void AddWallpaperSetsMenu(void);
+static void AddWallpapersMenu(u8 wallpaperSet);
+static void sub_808FDFC(void);
+static void sub_808FE54(u8 species);
+static void sub_808FF70(void);
+
+static const u32 gPokemonStorageScrollingBGTileset[] = INCBIN_U32("graphics/interface/pss_unk_83CE438.4bpp.lz");
+static const u32 gPokemonStorageScrollingBGTilemap[] = INCBIN_U32("graphics/interface/pss_unk_83CE4D0.bin.lz");
+static const u16 gPokemonStorageScrollingBGPalette[] = INCBIN_U16("graphics/interface/pss_unk_83CE5DC.gbapal");
+static const u32 gUnknown_83CE5FC[] = INCBIN_U32("graphics/interface/pss_unk_83CE5FC.bin.lz");
+
+static const u16 gUnknown_83CE6F8[] = {
     0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x0106, 0x0107, 0x0108,
     0x0111, 0x0112, 0x0113, 0x0114, 0x0115, 0x0116, 0x0117, 0x0118,
     0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108,
     0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118,
 };
 
-const u16 gUnknown_83CE738[] = INCBIN_U16("graphics/interface/pss_unk_83CE738.gbapal");
-const u16 gUnknown_83CE758[] = INCBIN_U16("graphics/interface/pss_unk_83CE758.gbapal");
+static const u16 gUnknown_83CE738[] = INCBIN_U16("graphics/interface/pss_unk_83CE738.gbapal");
+static const u16 gUnknown_83CE758[] = INCBIN_U16("graphics/interface/pss_unk_83CE758.gbapal");
 
-const u16 gUnknown_83CE778[] = {
+static const u16 gUnknown_83CE778[] = {
     0x014c, 0x014d, 0x014e, 0x014f, 0x0170, 0x0171, 0x0172, 0x0173, 0x0174,
     0x015c, 0x015d, 0x015e, 0x015f, 0x0180, 0x0181, 0x0182, 0x0183, 0x0184,
     0x0175, 0x0176, 0x0177, 0x0178, 0x0179, 0x017a, 0x017b, 0x017c, 0x017d,
     0x0185, 0x0186, 0x0187, 0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x018d,
 };
 
-const u16 gUnknown_83CE7C0[] = {
+static const u16 gUnknown_83CE7C0[] = {
     0x1140, 0x1141, 0x1141, 0x1142,
     0x1150, 0x1151, 0x1151, 0x1152,
     0x1160, 0x1161, 0x1161, 0x1162,
 };
 
-const u16 gUnknown_83CE7D8[] = {
+static const u16 gUnknown_83CE7D8[] = {
     0x1143, 0x1144, 0x1144, 0x1145,
     0x1153, 0x1154, 0x1154, 0x1155,
     0x1163, 0x1164, 0x1164, 0x1165,
 };
 
-const u16 gUnknown_83CE7F0[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.gbapal");
-const u16 gUnknown_83CE810[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.4bpp");
-const u16 gUnknown_83CE9D0[] = INCBIN_U16("graphics/interface/pss_unk_83CE9D0.gbapal");
-const u16 gUnknown_83CEA10[] = INCBIN_U16("graphics/interface/pss_unk_83CEA10.gbapal");
+static const u16 gUnknown_83CE7F0[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.gbapal");
+static const u16 gUnknown_83CE810[] = INCBIN_U16("graphics/interface/pss_unk_83CE810.4bpp");
+static const u16 gUnknown_83CE9D0[] = INCBIN_U16("graphics/interface/pss_unk_83CE9D0.gbapal");
+static const u16 gUnknown_83CEA10[] = INCBIN_U16("graphics/interface/pss_unk_83CEA10.gbapal");
 
-const struct WindowTemplate gUnknown_83CEA30[] = {
+static const struct WindowTemplate gUnknown_83CEA30[] = {
     {
         .bg = 1,
         .tilemapLeft = 0,
@@ -173,7 +173,7 @@ const struct WindowTemplate gUnknown_83CEA30[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-const struct BgTemplate gUnknown_83CEA50[] = {
+static const struct BgTemplate gUnknown_83CEA50[] = {
     {
         .bg = 0,
         .charBaseIndex = 0,
@@ -209,17 +209,17 @@ const struct BgTemplate gUnknown_83CEA50[] = {
     }
 };
 
-const struct SpritePalette gWaveformSpritePalette = {
+static const struct SpritePalette gWaveformSpritePalette = {
     gUnknown_83CE7F0, TAG_PAL_WAVEFORM
 };
 
-const struct SpriteSheet gWaveformSpriteSheet = {
+static const struct SpriteSheet gWaveformSpriteSheet = {
     gUnknown_83CE810, 0x01c0, TAG_TILE_WAVEFORM
 };
 
-const struct OamData gUnknown_83CEB88;
+static const struct OamData gUnknown_83CEB88;
 
-const struct SpriteTemplate sSpriteTemplate_CursorMon = {
+static const struct SpriteTemplate sSpriteTemplate_CursorMon = {
     .tileTag = TAG_TILE_2,
     .paletteTag = TAG_PAL_DAC6,
     .oam = &gUnknown_83CEB88,
@@ -229,7 +229,7 @@ const struct SpriteTemplate sSpriteTemplate_CursorMon = {
     .callback = SpriteCallbackDummy
 };
 
-const struct StorageAction gPCStorageActionTexts[] = {
+static const struct StorageAction gPCStorageActionTexts[] = {
     [PC_TEXT_EXIT_BOX] = {gText_ExitFromBox, PC_TEXT_FMT_NORMAL},
     [PC_TEXT_WHAT_YOU_DO] = {gText_WhatDoYouWantToDo, PC_TEXT_FMT_NORMAL},
     [PC_TEXT_PICK_A_THEME] = {gText_PleasePickATheme, PC_TEXT_FMT_NORMAL},
@@ -264,7 +264,7 @@ const struct StorageAction gPCStorageActionTexts[] = {
 };
 
 // Yes/No menu
-const struct WindowTemplate sYesNoWindowTemplate = {
+static const struct WindowTemplate sYesNoWindowTemplate = {
     .bg = 0,
     .tilemapLeft = 24,
     .tilemapTop = 11,
@@ -274,7 +274,7 @@ const struct WindowTemplate sYesNoWindowTemplate = {
     .baseBlock = 0x05c
 };
 
-const struct OamData gUnknown_83CEB88 = {
+static const struct OamData gUnknown_83CEB88 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -291,7 +291,7 @@ const struct OamData gUnknown_83CEB88 = {
 
 // Waveform
 
-const struct OamData gUnknown_83CEB90 = {
+static const struct OamData gUnknown_83CEB90 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -306,38 +306,38 @@ const struct OamData gUnknown_83CEB90 = {
     .paletteNum = 0
 };
 
-const union AnimCmd gUnknown_83CEB98[] = {
+static const union AnimCmd gUnknown_83CEB98[] = {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83CEBA0[] = {
+static const union AnimCmd gUnknown_83CEBA0[] = {
     ANIMCMD_FRAME(2, 8),
     ANIMCMD_FRAME(4, 8),
     ANIMCMD_FRAME(6, 8),
     ANIMCMD_JUMP(0)
 };
 
-const union AnimCmd gUnknown_83CEBB0[] = {
+static const union AnimCmd gUnknown_83CEBB0[] = {
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83CEBB8[] = {
+static const union AnimCmd gUnknown_83CEBB8[] = {
     ANIMCMD_FRAME(10, 8),
     ANIMCMD_FRAME(4, 8),
     ANIMCMD_FRAME(12, 8),
     ANIMCMD_JUMP(0)
 };
 
-const union AnimCmd *const gUnknown_83CEBC8[] = {
+static const union AnimCmd *const gUnknown_83CEBC8[] = {
     gUnknown_83CEB98,
     gUnknown_83CEBA0,
     gUnknown_83CEBB0,
     gUnknown_83CEBB8
 };
 
-const struct SpriteTemplate sSpriteTemplate_Waveform = {
+static const struct SpriteTemplate sSpriteTemplate_Waveform = {
     .tileTag = TAG_TILE_WAVEFORM,
     .paletteTag = TAG_PAL_WAVEFORM,
     .oam = &gUnknown_83CEB90,
@@ -347,7 +347,7 @@ const struct SpriteTemplate sSpriteTemplate_Waveform = {
     .callback = SpriteCallbackDummy,
 };
 
-void VblankCb_PSS(void)
+static void VblankCb_PSS(void)
 {
     LoadOam();
     ProcessSpriteCopyRequests();
@@ -356,7 +356,7 @@ void VblankCb_PSS(void)
     SetGpuReg(REG_OFFSET_BG2HOFS, sPSSData->bg2_X);
 }
 
-void Cb2_PSS(void)
+static void Cb2_PSS(void)
 {
     RunTasks();
     DoScheduledBgTilemapCopiesToVram();
@@ -403,7 +403,7 @@ void Cb2_ReturnToPSS(void)
     }
 }
 
-void ResetAllBgCoords(void)
+static void ResetAllBgCoords(void)
 {
     SetGpuReg(REG_OFFSET_BG0HOFS, 0);
     SetGpuReg(REG_OFFSET_BG0VOFS, 0);
@@ -415,7 +415,7 @@ void ResetAllBgCoords(void)
     SetGpuReg(REG_OFFSET_BG3VOFS, 0);
 }
 
-void sub_808CF10(void)
+static void sub_808CF10(void)
 {
     ResetPaletteFade();
     ResetSpriteData();
@@ -432,14 +432,14 @@ void sub_808CF10(void)
     sPSSData->unk_02C7 = FALSE;
 }
 
-void sub_808CF94(void)
+static void sub_808CF94(void)
 {
     sub_8092B50();
     sInPartyMenu = sPSSData->boxOption == BOX_OPTION_DEPOSIT;
     gUnknown_20397B6 = 0;
 }
 
-void sub_808CFC4(void)
+static void sub_808CFC4(void)
 {
     if (sPSSData->boxOption == BOX_OPTION_MOVE_ITEMS)
     {
@@ -449,13 +449,13 @@ void sub_808CFC4(void)
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG_ALL_ON | DISPCNT_OBJ_1D_MAP);
 }
 
-void SetPSSCallback(TaskFunc newFunc)
+static void SetPSSCallback(TaskFunc newFunc)
 {
     gTasks[sPSSData->taskId].func = newFunc;
     sPSSData->state = 0;
 }
 
-void Cb_InitPSS(u8 taskId)
+static void Cb_InitPSS(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -565,7 +565,7 @@ void Cb_InitPSS(u8 taskId)
     sPSSData->state++;
 }
 
-void Cb_ShowPSS(u8 taskId)
+static void Cb_ShowPSS(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -581,7 +581,7 @@ void Cb_ShowPSS(u8 taskId)
     }
 }
 
-void Cb_ReshowPSS(u8 taskId)
+static void Cb_ReshowPSS(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -598,7 +598,7 @@ void Cb_ReshowPSS(u8 taskId)
     }
 }
 
-void Cb_MainPSS(u8 taskId)
+static void Cb_MainPSS(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -861,7 +861,7 @@ void Cb_MainPSS(u8 taskId)
     }
 }
 
-void Cb_ShowPartyPokemon(u8 taskId)
+static void Cb_ShowPartyPokemon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -876,7 +876,7 @@ void Cb_ShowPartyPokemon(u8 taskId)
     }
 }
 
-void Cb_HidePartyPokemon(u8 taskId)
+static void Cb_HidePartyPokemon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -903,7 +903,7 @@ void Cb_HidePartyPokemon(u8 taskId)
     }
 }
 
-void Cb_OnSelectedMon(u8 taskId)
+static void Cb_OnSelectedMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1058,7 +1058,7 @@ void Cb_OnSelectedMon(u8 taskId)
     }
 }
 
-void Cb_MoveMon(u8 taskId)
+static void Cb_MoveMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1078,7 +1078,7 @@ void Cb_MoveMon(u8 taskId)
     }
 }
 
-void Cb_PlaceMon(u8 taskId)
+static void Cb_PlaceMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1099,7 +1099,7 @@ void Cb_PlaceMon(u8 taskId)
     }
 }
 
-void Cb_ShiftMon(u8 taskId)
+static void Cb_ShiftMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1118,7 +1118,7 @@ void Cb_ShiftMon(u8 taskId)
     }
 }
 
-void Cb_WithdrawMon(u8 taskId)
+static void Cb_WithdrawMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1171,7 +1171,7 @@ void Cb_WithdrawMon(u8 taskId)
     }
 }
 
-void Cb_DepositMenu(u8 taskId)
+static void Cb_DepositMenu(u8 taskId)
 {
     u8 boxId;
 
@@ -1238,7 +1238,7 @@ void Cb_DepositMenu(u8 taskId)
     }
 }
 
-void Cb_ReleaseMon(u8 taskId)
+static void Cb_ReleaseMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1368,7 +1368,7 @@ void Cb_ReleaseMon(u8 taskId)
     }
 }
 
-void Cb_ShowMarkMenu(u8 taskId)
+static void Cb_ShowMarkMenu(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1391,7 +1391,7 @@ void Cb_ShowMarkMenu(u8 taskId)
     }
 }
 
-void Cb_TakeItemForMoving(u8 taskId)
+static void Cb_TakeItemForMoving(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1428,7 +1428,7 @@ void Cb_TakeItemForMoving(u8 taskId)
     }
 }
 
-void Cb_GiveMovingItemToMon(u8 taskId)
+static void Cb_GiveMovingItemToMon(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1465,7 +1465,7 @@ void Cb_GiveMovingItemToMon(u8 taskId)
     }
 }
 
-void Cb_ItemToBag(u8 taskId)
+static void Cb_ItemToBag(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1513,7 +1513,7 @@ void Cb_ItemToBag(u8 taskId)
     }
 }
 
-void Cb_SwitchSelectedItem(u8 taskId)
+static void Cb_SwitchSelectedItem(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1557,7 +1557,7 @@ void Cb_SwitchSelectedItem(u8 taskId)
     }
 }
 
-void Cb_ShowItemInfo(u8 taskId)
+static void Cb_ShowItemInfo(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1600,7 +1600,7 @@ void Cb_ShowItemInfo(u8 taskId)
     }
 }
 
-void Cb_CloseBoxWhileHoldingItem(u8 taskId)
+static void Cb_CloseBoxWhileHoldingItem(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1657,7 +1657,7 @@ void Cb_CloseBoxWhileHoldingItem(u8 taskId)
     }
 }
 
-void Cb_HandleMovingMonFromParty(u8 taskId)
+static void Cb_HandleMovingMonFromParty(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1676,7 +1676,7 @@ void Cb_HandleMovingMonFromParty(u8 taskId)
     }
 }
 
-void Cb_PrintCantStoreMail(u8 taskId)
+static void Cb_PrintCantStoreMail(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1702,7 +1702,7 @@ void Cb_PrintCantStoreMail(u8 taskId)
     }
 }
 
-void Cb_HandleBoxOptions(u8 taskId)
+static void Cb_HandleBoxOptions(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1743,7 +1743,7 @@ void Cb_HandleBoxOptions(u8 taskId)
     }
 }
 
-void Cb_HandleWallpapers(u8 taskId)
+static void Cb_HandleWallpapers(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1810,7 +1810,7 @@ void Cb_HandleWallpapers(u8 taskId)
     }
 }
 
-void Cb_JumpBox(u8 taskId)
+static void Cb_JumpBox(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1856,7 +1856,7 @@ void Cb_JumpBox(u8 taskId)
     }
 }
 
-void Cb_NameBox(u8 taskId)
+static void Cb_NameBox(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1876,7 +1876,7 @@ void Cb_NameBox(u8 taskId)
     }
 }
 
-void Cb_ShowMonSummary(u8 taskId)
+static void Cb_ShowMonSummary(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1896,7 +1896,7 @@ void Cb_ShowMonSummary(u8 taskId)
     }
 }
 
-void Cb_GiveItemFromBag(u8 taskId)
+static void Cb_GiveItemFromBag(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1915,7 +1915,7 @@ void Cb_GiveItemFromBag(u8 taskId)
     }
 }
 
-void Cb_OnCloseBoxPressed(u8 taskId)
+static void Cb_OnCloseBoxPressed(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -1976,7 +1976,7 @@ void Cb_OnCloseBoxPressed(u8 taskId)
     }
 }
 
-void Cb_OnBPressed(u8 taskId)
+static void Cb_OnBPressed(u8 taskId)
 {
     switch (sPSSData->state)
     {
@@ -2037,7 +2037,7 @@ void Cb_OnBPressed(u8 taskId)
     }
 }
 
-void Cb_ChangeScreen(u8 taskId)
+static void Cb_ChangeScreen(u8 taskId)
 {
     struct Pokemon * partyMon;
     u8 mode, monIndex, maxMonIndex;
@@ -2076,7 +2076,7 @@ void Cb_ChangeScreen(u8 taskId)
     DestroyTask(taskId);
 }
 
-void GiveChosenBagItem(void)
+static void GiveChosenBagItem(void)
 {
     u16 item = gSpecialVar_ItemId;
 
@@ -2093,7 +2093,7 @@ void GiveChosenBagItem(void)
     }
 }
 
-void FreePSSData(void)
+static void FreePSSData(void)
 {
     FreeBoxPartyPokemonDropdowns();
     sub_80950A4();
@@ -2105,20 +2105,20 @@ void FreePSSData(void)
 // Graphics util
 // ******************************************************************
 
-void SetScrollingBackground(void)
+static void SetScrollingBackground(void)
 {
     SetGpuReg(REG_OFFSET_BG3CNT, BGCNT_PRIORITY(3) | BGCNT_CHARBASE(3) | BGCNT_16COLOR | BGCNT_SCREENBASE(31));
     DecompressAndLoadBgGfxUsingHeap(3, gPokemonStorageScrollingBGTileset, 0, 0, 0);
     LZ77UnCompVram(gPokemonStorageScrollingBGTilemap, (void *)BG_SCREEN_ADDR(31));
 }
 
-void ScrollBackground(void)
+static void ScrollBackground(void)
 {
     ChangeBgX(3, 128, 1);
     ChangeBgY(3, 128, 2);
 }
 
-void LoadPSSMenuGfx(void)
+static void LoadPSSMenuGfx(void)
 {
     InitBgsFromTemplates(0, gUnknown_83CEA50, NELEMS(gUnknown_83CEA50));
     DecompressAndLoadBgGfxUsingHeap(1, gPSSMenu_Gfx, 0, 0, 0);
@@ -2128,7 +2128,7 @@ void LoadPSSMenuGfx(void)
     ScheduleBgCopyTilemapToVram(1);
 }
 
-bool8 InitPSSWindows(void)
+static bool8 InitPSSWindows(void)
 {
     if (!InitWindows(gUnknown_83CEA30))
     {
@@ -2141,12 +2141,12 @@ bool8 InitPSSWindows(void)
     }
 }
 
-void LoadWaveformSpritePalette(void)
+static void LoadWaveformSpritePalette(void)
 {
     LoadSpritePalette(&gWaveformSpritePalette);
 }
 
-void sub_808F078(void)
+static void sub_808F078(void)
 {
     LoadPalette(gUnknown_8E9C3F8, 0, 0x20);
     LoadPalette(gUnknown_8E9C418, 0x20, 0x20);
@@ -2163,7 +2163,7 @@ void sub_808F078(void)
     RefreshCursorMonData();
 }
 
-void sub_808F0F4(void)
+static void sub_808F0F4(void)
 {
     sPSSData->field_D94 = CreateMonMarkingSprite_AllOff(TAG_TILE_10, TAG_PAL_DAC8, NULL);
     sPSSData->field_D94->oam.priority = 1;
@@ -2173,7 +2173,7 @@ void sub_808F0F4(void)
     sPSSData->field_DA0 = (void *)OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(TAG_TILE_10);
 }
 
-void sub_808F164(void)
+static void sub_808F164(void)
 {
     u16 i;
     struct SpriteSheet sheet = gWaveformSpriteSheet;
@@ -2186,7 +2186,7 @@ void sub_808F164(void)
     }
 }
 
-void RefreshCursorMonData(void)
+static void RefreshCursorMonData(void)
 {
     LoadCursorMonGfx(sPSSData->cursorMonSpecies, sPSSData->cursorMonPersonality);
     PrintCursorMonInfo();
@@ -2194,7 +2194,7 @@ void RefreshCursorMonData(void)
     ScheduleBgCopyTilemapToVram(0);
 }
 
-void BoxSetMosaic(void)
+static void BoxSetMosaic(void)
 {
     RefreshCursorMonData();
     if (sPSSData->cursorMonSprite)
@@ -2207,12 +2207,12 @@ void BoxSetMosaic(void)
     }
 }
 
-u8 BoxGetMosaic(void)
+static u8 BoxGetMosaic(void)
 {
     return sPSSData->cursorMonSprite->oam.mosaic;
 }
 
-void SpriteCB_CursorMon_Mosaic(struct Sprite *sprite)
+static void SpriteCB_CursorMon_Mosaic(struct Sprite *sprite)
 {
     sprite->data[0] -= sprite->data[1];
     if (sprite->data[0] < 0)
@@ -2225,7 +2225,7 @@ void SpriteCB_CursorMon_Mosaic(struct Sprite *sprite)
     }
 }
 
-void LoadCursorMonSprite(void)
+static void LoadCursorMonSprite(void)
 {
     u16 i;
     u16 tileStart;
@@ -2268,7 +2268,7 @@ void LoadCursorMonSprite(void)
     }
 }
 
-void LoadCursorMonGfx(u16 species, u32 pid)
+static void LoadCursorMonGfx(u16 species, u32 pid)
 {
     if (sPSSData->cursorMonSprite == NULL)
         return;
@@ -2287,7 +2287,7 @@ void LoadCursorMonGfx(u16 species, u32 pid)
     }
 }
 
-void PrintCursorMonInfo(void)
+static void PrintCursorMonInfo(void)
 {
     u16 i;
     u16 y;
@@ -2321,7 +2321,7 @@ void PrintCursorMonInfo(void)
     }
 }
 
-void sub_808F5E8(void)
+static void sub_808F5E8(void)
 {
     u16 i;
 
@@ -2342,7 +2342,7 @@ void sub_808F5E8(void)
     ScheduleBgCopyTilemapToVram(1);
 }
 
-void sub_808F68C(void)
+static void sub_808F68C(void)
 {
     LZ77UnCompWram(gUnknown_8E9CAEC, sPSSData->field_B0);
     LoadPalette(gPSSMenu_Pal, 0x10, 0x20);
@@ -2370,7 +2370,7 @@ void sub_808F68C(void)
     sPSSData->unk_02C7 = FALSE;
 }
 
-void SetUpShowPartyMenu(void)
+static void SetUpShowPartyMenu(void)
 {
     sPSSData->field_2C0 = 20;
     sPSSData->field_2C2 = 2;
@@ -2378,7 +2378,7 @@ void SetUpShowPartyMenu(void)
     CreatePartyMonsSprites(FALSE);
 }
 
-bool8 ShowPartyMenu(void)
+static bool8 ShowPartyMenu(void)
 {
     if (sPSSData->field_2C5 == 20)
         return FALSE;
@@ -2400,7 +2400,7 @@ bool8 ShowPartyMenu(void)
     }
 }
 
-void SetUpHidePartyMenu(void)
+static void SetUpHidePartyMenu(void)
 {
     sPSSData->field_2C0 = 0;
     sPSSData->field_2C2 = 22;
@@ -2409,7 +2409,7 @@ void SetUpHidePartyMenu(void)
         sub_80960C0();
 }
 
-bool8 HidePartyMenu(void)
+static bool8 HidePartyMenu(void)
 {
     if (sPSSData->field_2C5 != 20)
     {
@@ -2439,7 +2439,7 @@ bool8 HidePartyMenu(void)
     return FALSE;
 }
 
-void sub_808F90C(bool8 arg0)
+static void sub_808F90C(bool8 arg0)
 {
     if (arg0)
         SetBoxPartyPokemonDropdownMap2Rect(2, 0, 0, 9, 2);
@@ -2450,14 +2450,14 @@ void sub_808F90C(bool8 arg0)
     ScheduleBgCopyTilemapToVram(1);
 }
 
-void sub_808F948(void)
+static void sub_808F948(void)
 {
     sPSSData->unk_02C7 = TRUE;
     sPSSData->unk_02C8 = 30;
     sPSSData->unk_02C9 = TRUE;
 }
 
-void sub_808F974(void)
+static void sub_808F974(void)
 {
     if (sPSSData->unk_02C7)
     {
@@ -2466,7 +2466,7 @@ void sub_808F974(void)
     }
 }
 
-void sub_808F99C(void)
+static void sub_808F99C(void)
 {
     if (sPSSData->unk_02C7 && ++sPSSData->unk_02C8 > 30)
     {
@@ -2476,7 +2476,7 @@ void sub_808F99C(void)
     }
 }
 
-void sub_808F9FC(void)
+static void sub_808F9FC(void)
 {
     u8 i;
 
@@ -2487,7 +2487,7 @@ void sub_808F9FC(void)
     }
 }
 
-void sub_808FA30(u8 pos, bool8 isPartyMon)
+static void sub_808FA30(u8 pos, bool8 isPartyMon)
 {
     u16 i, j, index;
     const u16 *data;
@@ -2511,7 +2511,7 @@ void sub_808FA30(u8 pos, bool8 isPartyMon)
     }
 }
 
-void sub_808FAA8(void)
+static void sub_808FAA8(void)
 {
     sub_808F9FC();
     SetBoxPartyPokemonDropdownMap2Rect(1, 0, 0, 12, 22);
@@ -2519,14 +2519,14 @@ void sub_808FAA8(void)
     ScheduleBgCopyTilemapToVram(1);
 }
 
-void SetUpDoShowPartyMenu(void)
+static void SetUpDoShowPartyMenu(void)
 {
     sPSSData->showPartyMenuState = 0;
     PlaySE(SE_WIN_OPEN);
     SetUpShowPartyMenu();
 }
 
-bool8 DoShowPartyMenu(void)
+static bool8 DoShowPartyMenu(void)
 {
     switch (sPSSData->showPartyMenuState)
     {
@@ -2551,7 +2551,7 @@ bool8 DoShowPartyMenu(void)
     return TRUE;
 }
 
-void sub_808FB68(void)
+static void sub_808FB68(void)
 {
     SetGpuReg(REG_OFFSET_BG0CNT, BGCNT_PRIORITY(0) | BGCNT_CHARBASE(0) | BGCNT_SCREENBASE(29));
     TextWindow_SetStdFrame0_WithPal(1, 2, 208);
@@ -2559,7 +2559,7 @@ void sub_808FB68(void)
     CopyBgTilemapBufferToVram(0);
 }
 
-void PrintStorageActionText(u8 id)
+static void PrintStorageActionText(u8 id)
 {
     u8 *txtPtr;
 
@@ -2601,19 +2601,19 @@ void PrintStorageActionText(u8 id)
     ScheduleBgCopyTilemapToVram(0);
 }
 
-void ShowYesNoWindow(s8 cursorPos)
+static void ShowYesNoWindow(s8 cursorPos)
 {
     CreateYesNoMenu(&sYesNoWindowTemplate, 1, 0, 2, 0x00b, 14, 1);
     Menu_MoveCursorNoWrapAround(cursorPos);
 }
 
-void ClearBottomWindow(void)
+static void ClearBottomWindow(void)
 {
     ClearStdWindowAndFrameToTransparent(1, FALSE);
     ScheduleBgCopyTilemapToVram(0);
 }
 
-void AddWallpaperSetsMenu(void)
+static void AddWallpaperSetsMenu(void)
 {
     InitMenu();
     SetMenuText(PC_TEXT_SCENERY1);
@@ -2623,7 +2623,7 @@ void AddWallpaperSetsMenu(void)
     AddMenu();
 }
 
-void AddWallpapersMenu(u8 wallpaperSet)
+static void AddWallpapersMenu(u8 wallpaperSet)
 {
     InitMenu();
     switch (wallpaperSet)
@@ -2661,7 +2661,7 @@ u8 GetCurrentBoxOption(void)
     return sCurrentBoxOption;
 }
 
-void sub_808FDFC(void)
+static void sub_808FDFC(void)
 {
     if (!IsCursorOnBox())
     {
@@ -2678,7 +2678,7 @@ void sub_808FDFC(void)
     }
 }
 
-void sub_808FE54(u8 action)
+static void sub_808FE54(u8 action)
 {
     u16 event;
     u8 fromBox = sub_8094D34();
@@ -2769,7 +2769,7 @@ void sub_808FE54(u8 action)
     SetQuestLogEvent(event, (const void *)qlogBuffer);
 }
 
-void sub_808FF70(void)
+static void sub_808FF70(void)
 {
     if (sLastUsedBox != StorageGetCurrentBox())
     {
diff --git a/src/pokemon_storage_system_4.c b/src/pokemon_storage_system_4.c
index d75e5cb45..05226838e 100644
--- a/src/pokemon_storage_system_4.c
+++ b/src/pokemon_storage_system_4.c
@@ -12,33 +12,33 @@
 #include "constants/vars.h"
 #include "constants/flags.h"
 
-void sub_8090324(struct Sprite * sprite);
-void SetBoxSpeciesAndPersonalities(u8 boxId);
-void sub_8090A74(struct Sprite * sprite, u16 idx);
-void sub_8090AE0(struct Sprite * sprite);
-void DestroyBoxMonIcon(struct Sprite * sprite);
-void sub_80911B0(struct Sprite * sprite);
-void sub_8091420(u8 taskId);
-s8 sub_80916F4(u8 boxId);
-void LoadWallpaperGfx(u8 wallpaperId, s8 direction);
-bool32 WaitForWallpaperGfxLoad(void);
-void sub_8091984(void *buffer, const void *buffer2, s8 direction, u8 baseBlock);
-void sub_8091A24(void *buffer);
-void sub_8091A94(u8 wallpaperId);
-void sub_8091C48(u8 wallpaperId, s8 direction);
-void sub_8091E84(struct Sprite * sprite);
-void sub_8091EB8(struct Sprite * sprite);
-s16 sub_8091F60(const u8 *boxName);
-void sub_8091E34(void);
-void sub_8091EF0(void);
-void sub_8091F80(void);
-void sub_809200C(s8 direction);
-void sub_80920AC(void);
-void sub_8092164(struct Sprite * sprite);
-
-const struct OamData gUnknown_83CEC08;
-
-const struct SpriteTemplate gUnknown_83CEBF0 = {
+static void sub_8090324(struct Sprite * sprite);
+static void SetBoxSpeciesAndPersonalities(u8 boxId);
+static void sub_8090A74(struct Sprite * sprite, u16 idx);
+static void sub_8090AE0(struct Sprite * sprite);
+static void DestroyBoxMonIcon(struct Sprite * sprite);
+static void sub_80911B0(struct Sprite * sprite);
+static void sub_8091420(u8 taskId);
+static s8 sub_80916F4(u8 boxId);
+static void LoadWallpaperGfx(u8 wallpaperId, s8 direction);
+static bool32 WaitForWallpaperGfxLoad(void);
+static void sub_8091984(void *buffer, const void *buffer2, s8 direction, u8 baseBlock);
+static void sub_8091A24(void *buffer);
+static void sub_8091A94(u8 wallpaperId);
+static void sub_8091C48(u8 wallpaperId, s8 direction);
+static void sub_8091E84(struct Sprite * sprite);
+static void sub_8091EB8(struct Sprite * sprite);
+static s16 sub_8091F60(const u8 *boxName);
+static void sub_8091E34(void);
+static void sub_8091EF0(void);
+static void sub_8091F80(void);
+static void sub_809200C(s8 direction);
+static void sub_80920AC(void);
+static void sub_8092164(struct Sprite * sprite);
+
+static const struct OamData gUnknown_83CEC08;
+
+static const struct SpriteTemplate gUnknown_83CEBF0 = {
     .tileTag = TAG_TILE_12,
     .paletteTag = TAG_PAL_DAC0,
     .oam = &gUnknown_83CEC08,
@@ -48,7 +48,7 @@ const struct SpriteTemplate gUnknown_83CEBF0 = {
     .callback = SpriteCallbackDummy
 };
 
-const struct OamData gUnknown_83CEC08 = {
+static const struct OamData gUnknown_83CEC08 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -63,75 +63,75 @@ const struct OamData gUnknown_83CEC08 = {
     .paletteNum = 0
 };
 
-const union AffineAnimCmd gUnknown_83CEC10[] = {
+static const union AffineAnimCmd gUnknown_83CEC10[] = {
     AFFINEANIMCMD_FRAME(-2, -2, 0, 120),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83CEC20[] = {
+static const union AffineAnimCmd gUnknown_83CEC20[] = {
     AFFINEANIMCMD_FRAME(16, 16, 0,  0),
     AFFINEANIMCMD_FRAME(16, 16, 0, 15),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const gUnknown_83CEC38[] = {
+static const union AffineAnimCmd *const gUnknown_83CEC38[] = {
     gUnknown_83CEC10,
     gUnknown_83CEC20
 };
 
-const u16 gUnknown_83CEC40[] = INCBIN_U16("graphics/interface/pss_unk_83CEC40.gbapal");
-const u32 gUnknown_83CEC80[] = INCBIN_U32("graphics/interface/pss_unk_83CEC80.4bpp.lz");
-const u32 gUnknown_83CF050[] = INCBIN_U32("graphics/interface/pss_unk_83CF050.bin.lz");
-const u16 gUnknown_83CF12C[] = INCBIN_U16("graphics/interface/pss_unk_83CF12C.gbapal");
-const u32 gUnknown_83CF16C[] = INCBIN_U32("graphics/interface/pss_unk_83CF16C.4bpp.lz");
-const u32 gUnknown_83CF374[] = INCBIN_U32("graphics/interface/pss_unk_83CF374.bin.lz");
-const u16 gUnknown_83CF424[] = INCBIN_U16("graphics/interface/pss_unk_83CF424.gbapal");
-const u32 gUnknown_83CF464[] = INCBIN_U32("graphics/interface/pss_unk_83CF464.4bpp.lz");
-const u32 gUnknown_83CF750[] = INCBIN_U32("graphics/interface/pss_unk_83CF750.bin.lz");
-const u16 gUnknown_83CF834[] = INCBIN_U16("graphics/interface/pss_unk_83CF834.gbapal");
-const u32 gUnknown_83CF874[] = INCBIN_U32("graphics/interface/pss_unk_83CF874.4bpp.lz");
-const u32 gUnknown_83CFA94[] = INCBIN_U32("graphics/interface/pss_unk_83CFA94.bin.lz");
-const u16 gUnknown_83CFB60[] = INCBIN_U16("graphics/interface/pss_unk_83CFB60.gbapal");
-const u32 gUnknown_83CFBA0[] = INCBIN_U32("graphics/interface/pss_unk_83CFBA0.4bpp.lz");
-const u32 gUnknown_83CFEF0[] = INCBIN_U32("graphics/interface/pss_unk_83CFEF0.bin.lz");
-const u16 gUnknown_83CFFC8[] = INCBIN_U16("graphics/interface/pss_unk_83CFFC8.gbapal");
-const u32 gUnknown_83D0008[] = INCBIN_U32("graphics/interface/pss_unk_83D0008.4bpp.lz");
-const u8 sSpace_83D0338[4] = {};
-const u32 gUnknown_83D033C[] = INCBIN_U32("graphics/interface/pss_unk_83D033C.bin.lz");
-const u16 gUnknown_83D0414[] = INCBIN_U16("graphics/interface/pss_unk_83D0414.gbapal");
-const u32 gUnknown_83D0454[] = INCBIN_U32("graphics/interface/pss_unk_83D0454.4bpp.lz");
-const u32 gUnknown_83D070C[] = INCBIN_U32("graphics/interface/pss_unk_83D070C.bin.lz");
-const u16 gUnknown_83D07D8[] = INCBIN_U16("graphics/interface/pss_unk_83D07D8.gbapal");
-const u32 gUnknown_83D0818[] = INCBIN_U32("graphics/interface/pss_unk_83D0818.4bpp.lz");
-const u32 gUnknown_83D0B5C[] = INCBIN_U32("graphics/interface/pss_unk_83D0B5C.bin.lz");
-const u16 gUnknown_83D0C38[] = INCBIN_U16("graphics/interface/pss_unk_83D0C38.gbapal");
-const u32 gUnknown_83D0C78[] = INCBIN_U32("graphics/interface/pss_unk_83D0C78.4bpp.lz");
-const u32 gUnknown_83D0FFC[] = INCBIN_U32("graphics/interface/pss_unk_83D0FFC.bin.lz");
-const u16 gUnknown_83D10E4[] = INCBIN_U16("graphics/interface/pss_unk_83D10E4.gbapal");
-const u32 gUnknown_83D1124[] = INCBIN_U32("graphics/interface/pss_unk_83D1124.4bpp.lz");
-const u32 gUnknown_83D13D8[] = INCBIN_U32("graphics/interface/pss_unk_83D13D8.bin.lz");
-const u16 gUnknown_83D14B4[] = INCBIN_U16("graphics/interface/pss_unk_83D14B4.gbapal");
-const u32 gUnknown_83D14F4[] = INCBIN_U32("graphics/interface/pss_unk_83D14F4.4bpp.lz");
-const u32 gUnknown_83D1788[] = INCBIN_U32("graphics/interface/pss_unk_83D1788.bin.lz");
-const u16 gUnknown_83D1874[] = INCBIN_U16("graphics/interface/pss_unk_83D1874.gbapal");
-const u32 gUnknown_83D18B4[] = INCBIN_U32("graphics/interface/pss_unk_83D18B4.4bpp.lz");
-const u32 gUnknown_83D1B4C[] = INCBIN_U32("graphics/interface/pss_unk_83D1B4C.bin.lz");
-const u16 gUnknown_83D1C2C[] = INCBIN_U16("graphics/interface/pss_unk_83D1C2C.gbapal");
-const u8 sSpace_83D1C6C[32] = {};
-const u32 gUnknown_83D1C8C[] = INCBIN_U32("graphics/interface/pss_unk_83D1C8C.4bpp.lz");
-const u32 gUnknown_83D1EC4[] = INCBIN_U32("graphics/interface/pss_unk_83D1EC4.bin.lz");
-const u16 gUnknown_83D1F94[] = INCBIN_U16("graphics/interface/pss_unk_83D1F94.gbapal");
-const u32 gUnknown_83D1FD4[] = INCBIN_U32("graphics/interface/pss_unk_83D1FD4.4bpp.lz");
-const u32 gUnknown_83D22B8[] = INCBIN_U32("graphics/interface/pss_unk_83D22B8.bin.lz");
-const u16 gUnknown_83D239C[] = INCBIN_U16("graphics/interface/pss_unk_83D239C.gbapal");
-const u32 gUnknown_83D23DC[] = INCBIN_U32("graphics/interface/pss_unk_83D23DC.4bpp.lz");
-const u32 gUnknown_83D256C[] = INCBIN_U32("graphics/interface/pss_unk_83D256C.bin.lz");
-const u16 gUnknown_83D2614[] = INCBIN_U16("graphics/interface/pss_unk_83D2614.gbapal");
-const u32 gUnknown_83D2654[] = INCBIN_U32("graphics/interface/pss_unk_83D2654.4bpp.lz");
-const u32 gUnknown_83D277C[] = INCBIN_U32("graphics/interface/pss_unk_83D277C.bin.lz");
-const u16 gUnknown_83D2820[] = INCBIN_U16("graphics/interface/pss_unk_83D2820.bin");
-
-const u16 gUnknown_83D29D0[][2] = {
+static const u16 gUnknown_83CEC40[] = INCBIN_U16("graphics/interface/pss_unk_83CEC40.gbapal");
+static const u32 gUnknown_83CEC80[] = INCBIN_U32("graphics/interface/pss_unk_83CEC80.4bpp.lz");
+static const u32 gUnknown_83CF050[] = INCBIN_U32("graphics/interface/pss_unk_83CF050.bin.lz");
+static const u16 gUnknown_83CF12C[] = INCBIN_U16("graphics/interface/pss_unk_83CF12C.gbapal");
+static const u32 gUnknown_83CF16C[] = INCBIN_U32("graphics/interface/pss_unk_83CF16C.4bpp.lz");
+static const u32 gUnknown_83CF374[] = INCBIN_U32("graphics/interface/pss_unk_83CF374.bin.lz");
+static const u16 gUnknown_83CF424[] = INCBIN_U16("graphics/interface/pss_unk_83CF424.gbapal");
+static const u32 gUnknown_83CF464[] = INCBIN_U32("graphics/interface/pss_unk_83CF464.4bpp.lz");
+static const u32 gUnknown_83CF750[] = INCBIN_U32("graphics/interface/pss_unk_83CF750.bin.lz");
+static const u16 gUnknown_83CF834[] = INCBIN_U16("graphics/interface/pss_unk_83CF834.gbapal");
+static const u32 gUnknown_83CF874[] = INCBIN_U32("graphics/interface/pss_unk_83CF874.4bpp.lz");
+static const u32 gUnknown_83CFA94[] = INCBIN_U32("graphics/interface/pss_unk_83CFA94.bin.lz");
+static const u16 gUnknown_83CFB60[] = INCBIN_U16("graphics/interface/pss_unk_83CFB60.gbapal");
+static const u32 gUnknown_83CFBA0[] = INCBIN_U32("graphics/interface/pss_unk_83CFBA0.4bpp.lz");
+static const u32 gUnknown_83CFEF0[] = INCBIN_U32("graphics/interface/pss_unk_83CFEF0.bin.lz");
+static const u16 gUnknown_83CFFC8[] = INCBIN_U16("graphics/interface/pss_unk_83CFFC8.gbapal");
+static const u32 gUnknown_83D0008[] = INCBIN_U32("graphics/interface/pss_unk_83D0008.4bpp.lz");
+static const u8 sSpace_83D0338[4] = {};
+static const u32 gUnknown_83D033C[] = INCBIN_U32("graphics/interface/pss_unk_83D033C.bin.lz");
+static const u16 gUnknown_83D0414[] = INCBIN_U16("graphics/interface/pss_unk_83D0414.gbapal");
+static const u32 gUnknown_83D0454[] = INCBIN_U32("graphics/interface/pss_unk_83D0454.4bpp.lz");
+static const u32 gUnknown_83D070C[] = INCBIN_U32("graphics/interface/pss_unk_83D070C.bin.lz");
+static const u16 gUnknown_83D07D8[] = INCBIN_U16("graphics/interface/pss_unk_83D07D8.gbapal");
+static const u32 gUnknown_83D0818[] = INCBIN_U32("graphics/interface/pss_unk_83D0818.4bpp.lz");
+static const u32 gUnknown_83D0B5C[] = INCBIN_U32("graphics/interface/pss_unk_83D0B5C.bin.lz");
+static const u16 gUnknown_83D0C38[] = INCBIN_U16("graphics/interface/pss_unk_83D0C38.gbapal");
+static const u32 gUnknown_83D0C78[] = INCBIN_U32("graphics/interface/pss_unk_83D0C78.4bpp.lz");
+static const u32 gUnknown_83D0FFC[] = INCBIN_U32("graphics/interface/pss_unk_83D0FFC.bin.lz");
+static const u16 gUnknown_83D10E4[] = INCBIN_U16("graphics/interface/pss_unk_83D10E4.gbapal");
+static const u32 gUnknown_83D1124[] = INCBIN_U32("graphics/interface/pss_unk_83D1124.4bpp.lz");
+static const u32 gUnknown_83D13D8[] = INCBIN_U32("graphics/interface/pss_unk_83D13D8.bin.lz");
+static const u16 gUnknown_83D14B4[] = INCBIN_U16("graphics/interface/pss_unk_83D14B4.gbapal");
+static const u32 gUnknown_83D14F4[] = INCBIN_U32("graphics/interface/pss_unk_83D14F4.4bpp.lz");
+static const u32 gUnknown_83D1788[] = INCBIN_U32("graphics/interface/pss_unk_83D1788.bin.lz");
+static const u16 gUnknown_83D1874[] = INCBIN_U16("graphics/interface/pss_unk_83D1874.gbapal");
+static const u32 gUnknown_83D18B4[] = INCBIN_U32("graphics/interface/pss_unk_83D18B4.4bpp.lz");
+static const u32 gUnknown_83D1B4C[] = INCBIN_U32("graphics/interface/pss_unk_83D1B4C.bin.lz");
+static const u16 gUnknown_83D1C2C[] = INCBIN_U16("graphics/interface/pss_unk_83D1C2C.gbapal");
+static const u8 sSpace_83D1C6C[32] = {};
+static const u32 gUnknown_83D1C8C[] = INCBIN_U32("graphics/interface/pss_unk_83D1C8C.4bpp.lz");
+static const u32 gUnknown_83D1EC4[] = INCBIN_U32("graphics/interface/pss_unk_83D1EC4.bin.lz");
+static const u16 gUnknown_83D1F94[] = INCBIN_U16("graphics/interface/pss_unk_83D1F94.gbapal");
+static const u32 gUnknown_83D1FD4[] = INCBIN_U32("graphics/interface/pss_unk_83D1FD4.4bpp.lz");
+static const u32 gUnknown_83D22B8[] = INCBIN_U32("graphics/interface/pss_unk_83D22B8.bin.lz");
+static const u16 gUnknown_83D239C[] = INCBIN_U16("graphics/interface/pss_unk_83D239C.gbapal");
+static const u32 gUnknown_83D23DC[] = INCBIN_U32("graphics/interface/pss_unk_83D23DC.4bpp.lz");
+static const u32 gUnknown_83D256C[] = INCBIN_U32("graphics/interface/pss_unk_83D256C.bin.lz");
+static const u16 gUnknown_83D2614[] = INCBIN_U16("graphics/interface/pss_unk_83D2614.gbapal");
+static const u32 gUnknown_83D2654[] = INCBIN_U32("graphics/interface/pss_unk_83D2654.4bpp.lz");
+static const u32 gUnknown_83D277C[] = INCBIN_U32("graphics/interface/pss_unk_83D277C.bin.lz");
+static const u16 gUnknown_83D2820[] = INCBIN_U16("graphics/interface/pss_unk_83D2820.bin");
+
+static const u16 gUnknown_83D29D0[][2] = {
     {RGB( 7,  7,  7), RGB(31, 31, 31)},
     {RGB( 7,  7,  7), RGB(31, 31, 31)},
     {RGB( 7,  7,  7), RGB(31, 31, 31)},
@@ -150,7 +150,7 @@ const u16 gUnknown_83D29D0[][2] = {
     {RGB( 7,  7,  7), RGB(31, 31, 31)}
 };
 
-const struct WallpaperTable gWallpaperTable[] = {
+static const struct WallpaperTable gWallpaperTable[] = {
     {gUnknown_83CEC80, gUnknown_83CF050, gUnknown_83CEC40},
     {gUnknown_83CF16C, gUnknown_83CF374, gUnknown_83CF12C},
     {gUnknown_83CF464, gUnknown_83CF750, gUnknown_83CF424},
@@ -169,14 +169,14 @@ const struct WallpaperTable gWallpaperTable[] = {
     {gUnknown_83D2654, gUnknown_83D277C, gUnknown_83D2614},
 };
 
-const u16 gUnknown_83D2AD0[] = INCBIN_U16("graphics/interface/pss_unk_83D2AD0.4bpp");
-const u8 sUnref_83D2B50[] = {0xba, 0x23};
+static const u16 gUnknown_83D2AD0[] = INCBIN_U16("graphics/interface/pss_unk_83D2AD0.4bpp");
+static const u8 sUnref_83D2B50[] = {0xba, 0x23};
 
-const struct SpriteSheet gUnknown_83D2B54 = {
+static const struct SpriteSheet gUnknown_83D2B54 = {
     gUnknown_83D2AD0, 0x0080, TAG_TILE_6
 };
 
-const struct OamData gUnknown_83D2B5C = {
+static const struct OamData gUnknown_83D2B5C = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -191,22 +191,22 @@ const struct OamData gUnknown_83D2B5C = {
     .paletteNum = 0
 };
 
-const union AnimCmd gUnknown_83D2B64[] = {
+static const union AnimCmd gUnknown_83D2B64[] = {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83D2B6C[] = {
+static const union AnimCmd gUnknown_83D2B6C[] = {
     ANIMCMD_FRAME(8, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_83D2B74[] = {
+static const union AnimCmd *const gUnknown_83D2B74[] = {
     gUnknown_83D2B64,
     gUnknown_83D2B6C
 };
 
-const struct SpriteTemplate gUnknown_83D2B7C = {
+static const struct SpriteTemplate gUnknown_83D2B7C = {
     .tileTag = TAG_TILE_3,
     .paletteTag = TAG_PAL_DAC9,
     .oam = &gUnknown_83D2B5C,
@@ -216,7 +216,7 @@ const struct SpriteTemplate gUnknown_83D2B7C = {
     .callback = SpriteCallbackDummy
 };
 
-const struct OamData gUnknown_83D2B94 = {
+static const struct OamData gUnknown_83D2B94 = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -231,22 +231,22 @@ const struct OamData gUnknown_83D2B94 = {
     .paletteNum = 0
 };
 
-const union AnimCmd gUnknown_83D2B9C[] = {
+static const union AnimCmd gUnknown_83D2B9C[] = {
     ANIMCMD_FRAME(0, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd gUnknown_83D2BA4[] = {
+static const union AnimCmd gUnknown_83D2BA4[] = {
     ANIMCMD_FRAME(2, 5),
     ANIMCMD_END
 };
 
-const union AnimCmd *const gUnknown_83D2BAC[] = {
+static const union AnimCmd *const gUnknown_83D2BAC[] = {
     gUnknown_83D2B9C,
     gUnknown_83D2BA4
 };
 
-const struct SpriteTemplate gUnknown_83D2BB4 = {
+static const struct SpriteTemplate gUnknown_83D2BB4 = {
     .tileTag = TAG_TILE_6,
     .paletteTag = TAG_PAL_WAVEFORM,
     .oam = &gUnknown_83D2B94,
@@ -274,7 +274,7 @@ void sub_808FFAC(void)
     sPSSData->field_78C = 0;
 }
 
-u8 sub_8090058(void)
+static u8 sub_8090058(void)
 {
     return (IsCursorInBox() ? 2 : 1);
 }
@@ -289,7 +289,7 @@ void CreateMovingMonIcon(void)
     sPSSData->movingMonSprite->callback = sub_80911B0;
 }
 
-void sub_80900D4(u8 boxId)
+static void sub_80900D4(u8 boxId)
 {
     u8 boxPosition;
     u16 i, j, count;
@@ -343,7 +343,7 @@ void sub_80901EC(u8 boxPosition)
     }
 }
 
-void sub_809029C(s16 arg0)
+static void sub_809029C(s16 arg0)
 {
     u16 i;
 
@@ -358,7 +358,7 @@ void sub_809029C(s16 arg0)
     }
 }
 
-void sub_80902E0(struct Sprite *sprite)
+static void sub_80902E0(struct Sprite *sprite)
 {
     if (sprite->data[1] != 0)
     {
@@ -373,7 +373,7 @@ void sub_80902E0(struct Sprite *sprite)
     }
 }
 
-void sub_8090324(struct Sprite *sprite)
+static void sub_8090324(struct Sprite *sprite)
 {
     if (sprite->data[4] != 0)
     {
@@ -388,7 +388,7 @@ void sub_8090324(struct Sprite *sprite)
     }
 }
 
-void DestroyAllIconsInRow(u8 row)
+static void DestroyAllIconsInRow(u8 row)
 {
     u16 column;
     u8 boxPosition = row;
@@ -404,7 +404,7 @@ void DestroyAllIconsInRow(u8 row)
     }
 }
 
-u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
+static u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
 {
     s32 i;
     u16 y = 44;
@@ -464,7 +464,7 @@ u8 sub_80903A4(u8 row, u16 times, s16 xDelta)
     return count;
 }
 
-void sub_8090574(u8 boxId, s8 direction)
+static void sub_8090574(u8 boxId, s8 direction)
 {
     sPSSData->field_C6A = 0;
     sPSSData->field_C6B = boxId;
@@ -482,7 +482,7 @@ void sub_8090574(u8 boxId, s8 direction)
     sub_809029C(sPSSData->field_C64);
 }
 
-bool8 sub_809062C(void)
+static bool8 sub_809062C(void)
 {
     if (sPSSData->field_C60 != 0)
         sPSSData->field_C60--;
@@ -526,7 +526,7 @@ bool8 sub_809062C(void)
     return TRUE;
 }
 
-void SetBoxSpeciesAndPersonalities(u8 boxId)
+static void SetBoxSpeciesAndPersonalities(u8 boxId)
 {
     s32 i, j, boxPosition;
 
@@ -629,7 +629,7 @@ u8 sub_8090A60(void)
     return sPSSData->field_C5E;
 }
 
-void sub_8090A74(struct Sprite *sprite, u16 partyId)
+static void sub_8090A74(struct Sprite *sprite, u16 partyId)
 {
     s16 x, y;
 
@@ -647,7 +647,7 @@ void sub_8090A74(struct Sprite *sprite, u16 partyId)
     sprite->callback = sub_8090AE0;
 }
 
-void sub_8090AE0(struct Sprite *sprite)
+static void sub_8090AE0(struct Sprite *sprite)
 {
     if (sprite->data[6] != 0)
     {
@@ -892,13 +892,13 @@ void SetMovingMonPriority(u8 priority)
     sPSSData->movingMonSprite->oam.priority = priority;
 }
 
-void sub_80911B0(struct Sprite *sprite)
+static void sub_80911B0(struct Sprite *sprite)
 {
     sprite->pos1.x = sPSSData->field_CB4->pos1.x;
     sprite->pos1.y = sPSSData->field_CB4->pos1.y + sPSSData->field_CB4->pos2.y + 4;
 }
 
-u16 sub_80911D4(u16 species)
+static u16 sub_80911D4(u16 species)
 {
     u16 i, var;
 
@@ -929,7 +929,7 @@ u16 sub_80911D4(u16 species)
     return var;
 }
 
-void sub_8091290(u16 species)
+static void sub_8091290(u16 species)
 {
     u16 i;
 
@@ -969,7 +969,7 @@ struct Sprite *CreateMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u
     return &gSprites[spriteId];
 }
 
-void DestroyBoxMonIcon(struct Sprite *sprite)
+static void DestroyBoxMonIcon(struct Sprite *sprite)
 {
     sub_8091290(sprite->data[0]);
     DestroySprite(sprite);
@@ -987,7 +987,7 @@ bool8 sub_809140C(void)
     return FuncIsActiveTask(sub_8091420);
 }
 
-void sub_8091420(u8 taskId)
+static void sub_8091420(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
 
@@ -1081,7 +1081,7 @@ bool8 ScrollToBox(void)
     return TRUE;
 }
 
-s8 sub_80916F4(u8 boxId)
+static s8 sub_80916F4(u8 boxId)
 {
     u8 i;
     u8 currentBox = StorageGetCurrentBox();
@@ -1138,7 +1138,7 @@ bool8 DoWallpaperGfxChange(void)
     return TRUE;
 }
 
-void LoadWallpaperGfx(u8 boxId, s8 direction)
+static void LoadWallpaperGfx(u8 boxId, s8 direction)
 {
     u8 wallpaperId;
     const struct WallpaperTable *wallpaperGfx;
@@ -1169,7 +1169,7 @@ void LoadWallpaperGfx(u8 boxId, s8 direction)
     CopyBgTilemapBufferToVram(2);
 }
 
-bool32 WaitForWallpaperGfxLoad(void)
+static bool32 WaitForWallpaperGfxLoad(void)
 {
     if (IsDma3ManagerBusyWithBgCopy() == TRUE)
         return FALSE;
@@ -1177,7 +1177,7 @@ bool32 WaitForWallpaperGfxLoad(void)
     return TRUE;
 }
 
-void sub_8091984(void *buffer, const void *tilemap, s8 direction, u8 arg2)
+static void sub_8091984(void *buffer, const void *tilemap, s8 direction, u8 arg2)
 {
     s16 var = (arg2 * 2) + 3;
     s16 x = ((sPSSData->bg2_X / 8 + 10) + (direction * 24)) & 0x3F;
@@ -1194,7 +1194,7 @@ void sub_8091984(void *buffer, const void *tilemap, s8 direction, u8 arg2)
     FillBgTilemapBufferRect(2, 0, x, 2, 4, 0x12, 0x11);
 }
 
-void sub_8091A24(void *arg0)
+static void sub_8091A24(void *arg0)
 {
     u16 i;
     u16 *dest = arg0;
@@ -1216,7 +1216,7 @@ void sub_8091A24(void *arg0)
     }
 }
 
-void sub_8091A94(u8 boxId)
+static void sub_8091A94(u8 boxId)
 {
     u8 tagIndex;
     s16 r6;
@@ -1257,7 +1257,7 @@ void sub_8091A94(u8 boxId)
     sPSSData->field_6F8 = 0;
 }
 
-void sub_8091C48(u8 boxId, s8 direction)
+static void sub_8091C48(u8 boxId, s8 direction)
 {
     u16 r8;
     s16 x, x2;
@@ -1304,7 +1304,7 @@ void sub_8091C48(u8 boxId, s8 direction)
     }
 }
 
-void sub_8091E34(void)
+static void sub_8091E34(void)
 {
     if (sPSSData->field_6F8 == 0)
         FreeSpriteTilesByTag(TAG_TILE_4);
@@ -1315,7 +1315,7 @@ void sub_8091E34(void)
     sPSSData->field_720[1] = sPSSData->field_728[1];
 }
 
-void sub_8091E84(struct Sprite *sprite)
+static void sub_8091E84(struct Sprite *sprite)
 {
     if (sprite->data[2] != 0)
         sprite->data[2]--;
@@ -1323,7 +1323,7 @@ void sub_8091E84(struct Sprite *sprite)
         sprite->callback = SpriteCallbackDummy;
 }
 
-void sub_8091EB8(struct Sprite *sprite)
+static void sub_8091EB8(struct Sprite *sprite)
 {
     if (sprite->data[1] != 0)
     {
@@ -1338,7 +1338,7 @@ void sub_8091EB8(struct Sprite *sprite)
     }
 }
 
-void sub_8091EF0(void)
+static void sub_8091EF0(void)
 {
     u8 boxId = StorageGetCurrentBox();
     u8 wallpaperId = GetBoxWallpaper(boxId);
@@ -1348,12 +1348,12 @@ void sub_8091EF0(void)
         CpuCopy16(gUnknown_83D29D0[wallpaperId], gPlttBufferUnfaded + sPSSData->field_71E, 4);
 }
 
-s16 sub_8091F60(const u8 *string)
+static s16 sub_8091F60(const u8 *string)
 {
     return 0xB0 - GetStringWidth(1, string, 0) / 2;
 }
 
-void sub_8091F80(void)
+static void sub_8091F80(void)
 {
     u16 i;
 
@@ -1373,7 +1373,7 @@ void sub_8091F80(void)
         sub_80920FC(TRUE);
 }
 
-void sub_809200C(s8 direction)
+static void sub_809200C(s8 direction)
 {
     u16 i;
 
@@ -1400,7 +1400,7 @@ void sub_809200C(s8 direction)
     sPSSData->field_730[1]->data[7] = 1;
 }
 
-void sub_80920AC(void)
+static void sub_80920AC(void)
 {
     u16 i;
 
@@ -1436,7 +1436,7 @@ void sub_80920FC(bool8 a0)
     }
 }
 
-void sub_8092164(struct Sprite *sprite)
+static void sub_8092164(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
diff --git a/src/pokemon_storage_system_5.c b/src/pokemon_storage_system_5.c
index 052e593e8..0b707537e 100644
--- a/src/pokemon_storage_system_5.c
+++ b/src/pokemon_storage_system_5.c
@@ -9,45 +9,45 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 
-EWRAM_DATA struct Pokemon gUnknown_20397BC = {};
-EWRAM_DATA s8 sBoxCursorArea = 0;
-EWRAM_DATA s8 sBoxCursorPosition = 0;
-EWRAM_DATA bool8 sIsMonBeingMoved = FALSE;
-EWRAM_DATA u8 sMovingMonOrigBoxId = 0;
-EWRAM_DATA u8 sMovingMonOrigBoxPos = 0;
-EWRAM_DATA bool8 sCanOnlyMove = FALSE;
-EWRAM_DATA u8 gUnknown_2039826 = 0;
-
-void sub_80929B0(void);
-bool8 MonPlaceChange_Move(void);
-bool8 MonPlaceChange_Place(void);
-bool8 MonPlaceChange_Shift(void);
-bool8 sub_8092E00(void);
-bool8 sub_8092E10(void);
-bool8 sub_8092E20(void);
-bool8 sub_8092E54(void);
-void MoveMon(void);
-void PlaceMon(void);
-void SetMovedMonData(u8 boxId, u8 cursorPos);
-void SetPlacedMonData(u8 boxId, u8 cursorPos);
-void PurgeMonOrBoxMon(u8 boxId, u8 cursorPos);
-void SetShiftedMonData(u8 boxId, u8 cursorPos);
-void sub_8093A10(void);
-void SetCursorMonData(void * cursorMon, u8 mode);
-void sub_8093AAC(void);
-u8 InBoxInput_Normal(void);
-u8 InBoxInput_GrabbingMultiple(void);
-u8 InBoxInput_MovingMultiple(void);
-void AddBoxMenu(void);
-bool8 sub_8094924(void);
-bool8 sub_809494C(void);
-bool8 sub_8094A0C(void);
-void sub_8094AD8(void);
-void sub_8094C84(void);
-
-const u16 gHandCursorPalette[] = INCBIN_U16("graphics/interface/pss_unk_83D2BCC.gbapal");
-const u16 gHandCursorTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D2BEC.4bpp");
-const u16 gHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D33EC.4bpp");
+static EWRAM_DATA struct Pokemon gUnknown_20397BC = {};
+static EWRAM_DATA s8 sBoxCursorArea = 0;
+static EWRAM_DATA s8 sBoxCursorPosition = 0;
+static EWRAM_DATA bool8 sIsMonBeingMoved = FALSE;
+static EWRAM_DATA u8 sMovingMonOrigBoxId = 0;
+static EWRAM_DATA u8 sMovingMonOrigBoxPos = 0;
+static EWRAM_DATA bool8 sCanOnlyMove = FALSE;
+static EWRAM_DATA u8 gUnknown_2039826 = 0;
+
+static void sub_80929B0(void);
+static bool8 MonPlaceChange_Move(void);
+static bool8 MonPlaceChange_Place(void);
+static bool8 MonPlaceChange_Shift(void);
+static bool8 sub_8092E00(void);
+static bool8 sub_8092E10(void);
+static bool8 sub_8092E20(void);
+static bool8 sub_8092E54(void);
+static void MoveMon(void);
+static void PlaceMon(void);
+static void SetMovedMonData(u8 boxId, u8 cursorPos);
+static void SetPlacedMonData(u8 boxId, u8 cursorPos);
+static void PurgeMonOrBoxMon(u8 boxId, u8 cursorPos);
+static void SetShiftedMonData(u8 boxId, u8 cursorPos);
+static void sub_8093A10(void);
+static void SetCursorMonData(void * cursorMon, u8 mode);
+static void sub_8093AAC(void);
+static u8 InBoxInput_Normal(void);
+static u8 InBoxInput_GrabbingMultiple(void);
+static u8 InBoxInput_MovingMultiple(void);
+static void AddBoxMenu(void);
+static bool8 sub_8094924(void);
+static bool8 sub_809494C(void);
+static bool8 sub_8094A0C(void);
+static void sub_8094AD8(void);
+static void sub_8094C84(void);
+
+static const u16 gHandCursorPalette[] = INCBIN_U16("graphics/interface/pss_unk_83D2BCC.gbapal");
+static const u16 gHandCursorTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D2BEC.4bpp");
+static const u16 gHandCursorShadowTiles[] = INCBIN_U16("graphics/interface/pss_unk_83D33EC.4bpp");
 
 void sub_80922C0(void)
 {
@@ -81,7 +81,7 @@ void sub_8092340(void)
     }
 }
 
-void sub_8092398(u8 cursorArea, u8 cursorPosition, u16 *x, u16 *y)
+static void sub_8092398(u8 cursorArea, u8 cursorPosition, u16 *x, u16 *y)
 {
     switch (cursorArea)
     {
@@ -121,7 +121,7 @@ void sub_8092398(u8 cursorArea, u8 cursorPosition, u16 *x, u16 *y)
     }
 }
 
-u16 sub_8092458(void)
+static u16 sub_8092458(void)
 {
     switch (sBoxCursorArea)
     {
@@ -184,7 +184,7 @@ bool8 sub_80924A8(void)
     return TRUE;
 }
 
-void sub_8092604(u8 newCurosrArea, u8 newCursorPosition)
+static void sub_8092604(u8 newCurosrArea, u8 newCursorPosition)
 {
     u16 x, y;
 
@@ -195,7 +195,7 @@ void sub_8092604(u8 newCurosrArea, u8 newCursorPosition)
     sPSSData->field_CCE = y;
 }
 
-void sub_8092660(void)
+static void sub_8092660(void)
 {
     int r7, r0;
 
@@ -241,7 +241,7 @@ void sub_8092660(void)
     sPSSData->field_CC0 = sPSSData->field_CB4->pos1.y << 8;
 }
 
-void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
+static void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
 {
     sub_8092604(newCurosrArea, newCursorPosition);
     sub_8092660();
@@ -300,7 +300,7 @@ void sub_80927E8(u8 newCurosrArea, u8 newCursorPosition)
     }
 }
 
-void sub_80929B0(void)
+static void sub_80929B0(void)
 {
     sBoxCursorArea = sPSSData->field_CD4;
     sBoxCursorPosition = sPSSData->field_CD5;
@@ -407,7 +407,7 @@ bool8 DoMonPlaceChange(void)
     return sPSSData->monPlaceChangeFunc();
 }
 
-bool8 MonPlaceChange_Move(void)
+static bool8 MonPlaceChange_Move(void)
 {
     switch (sPSSData->monPlaceChangeState)
     {
@@ -436,7 +436,7 @@ bool8 MonPlaceChange_Move(void)
     return TRUE;
 }
 
-bool8 MonPlaceChange_Place(void)
+static bool8 MonPlaceChange_Place(void)
 {
     switch (sPSSData->monPlaceChangeState)
     {
@@ -462,7 +462,7 @@ bool8 MonPlaceChange_Place(void)
     return TRUE;
 }
 
-bool8 MonPlaceChange_Shift(void)
+static bool8 MonPlaceChange_Shift(void)
 {
     switch (sPSSData->monPlaceChangeState)
     {
@@ -497,17 +497,17 @@ bool8 MonPlaceChange_Shift(void)
     return TRUE;
 }
 
-bool8 sub_8092E00(void)
+static bool8 sub_8092E00(void)
 {
     return sub_8092E20();
 }
 
-bool8 sub_8092E10(void)
+static bool8 sub_8092E10(void)
 {
     return sub_8092E54();
 }
 
-bool8 sub_8092E20(void)
+static bool8 sub_8092E20(void)
 {
     switch (sPSSData->field_CB4->pos2.y)
     {
@@ -524,7 +524,7 @@ bool8 sub_8092E20(void)
     return TRUE;
 }
 
-bool8 sub_8092E54(void)
+static bool8 sub_8092E54(void)
 {
     switch (sPSSData->field_CB4->pos2.y)
     {
@@ -538,7 +538,7 @@ bool8 sub_8092E54(void)
     return TRUE;
 }
 
-void MoveMon(void)
+static void MoveMon(void)
 {
     switch (sBoxCursorArea)
     {
@@ -560,7 +560,7 @@ void MoveMon(void)
     sIsMonBeingMoved = TRUE;
 }
 
-void PlaceMon(void)
+static void PlaceMon(void)
 {
     u8 boxId;
 
@@ -587,7 +587,7 @@ void sub_8092F54(void)
     sub_8093A10();
 }
 
-void SetMovedMonData(u8 boxId, u8 position)
+static void SetMovedMonData(u8 boxId, u8 position)
 {
     if (boxId == TOTAL_BOXES_COUNT)
         sPSSData->movingMon = gPlayerParty[sBoxCursorPosition];
@@ -599,7 +599,7 @@ void SetMovedMonData(u8 boxId, u8 position)
     sMovingMonOrigBoxPos = position;
 }
 
-void SetPlacedMonData(u8 boxId, u8 position)
+static void SetPlacedMonData(u8 boxId, u8 position)
 {
     if (boxId == TOTAL_BOXES_COUNT)
     {
@@ -612,7 +612,7 @@ void SetPlacedMonData(u8 boxId, u8 position)
     }
 }
 
-void PurgeMonOrBoxMon(u8 boxId, u8 position)
+static void PurgeMonOrBoxMon(u8 boxId, u8 position)
 {
     if (boxId == TOTAL_BOXES_COUNT)
         ZeroMonData(&gPlayerParty[position]);
@@ -620,7 +620,7 @@ void PurgeMonOrBoxMon(u8 boxId, u8 position)
         ZeroBoxMonAt(boxId, position);
 }
 
-void SetShiftedMonData(u8 boxId, u8 position)
+static void SetShiftedMonData(u8 boxId, u8 position)
 {
     if (boxId == TOTAL_BOXES_COUNT)
         sPSSData->field_2108 = gPlayerParty[position];
@@ -970,7 +970,7 @@ bool8 IsCursorInBox(void)
     return (sBoxCursorArea == CURSOR_AREA_IN_BOX);
 }
 
-void sub_8093A10(void)
+static void sub_8093A10(void)
 {
     sPSSData->setMosaic = (sIsMonBeingMoved == FALSE);
     if (!sIsMonBeingMoved)
@@ -995,7 +995,7 @@ void sub_8093A10(void)
     }
 }
 
-void sub_8093AAC(void)
+static void sub_8093AAC(void)
 {
     if (sIsMonBeingMoved)
         SetCursorMonData(&gUnknown_20397BC, MODE_PARTY);
@@ -1003,7 +1003,7 @@ void sub_8093AAC(void)
         sub_8093A10();
 }
 
-void SetCursorMonData(void *pokemon, u8 mode)
+static void SetCursorMonData(void *pokemon, u8 mode)
 {
     u8 *txtPtr;
     u16 gender;
@@ -1141,7 +1141,7 @@ void SetCursorMonData(void *pokemon, u8 mode)
     }
 }
 
-u8 HandleInput_InBox(void)
+static u8 HandleInput_InBox(void)
 {
     switch (sPSSData->inBoxMovingMode)
     {
@@ -1155,7 +1155,7 @@ u8 HandleInput_InBox(void)
     }
 }
 
-u8 InBoxInput_Normal(void)
+static u8 InBoxInput_Normal(void)
 {
     u8 retVal;
     s8 cursorArea;
@@ -1293,7 +1293,7 @@ u8 InBoxInput_Normal(void)
     return retVal;
 }
 
-u8 InBoxInput_GrabbingMultiple(void)
+static u8 InBoxInput_GrabbingMultiple(void)
 {
     if (JOY_HELD(A_BUTTON))
     {
@@ -1368,7 +1368,7 @@ u8 InBoxInput_GrabbingMultiple(void)
     }
 }
 
-u8 InBoxInput_MovingMultiple(void)
+static u8 InBoxInput_MovingMultiple(void)
 {
     if (JOY_REPT(DPAD_UP))
     {
@@ -1449,7 +1449,7 @@ u8 InBoxInput_MovingMultiple(void)
     }
 }
 
-u8 HandleInput_InParty(void)
+static u8 HandleInput_InParty(void)
 {
     u8 retVal;
     bool8 gotoBox;
@@ -1572,7 +1572,7 @@ u8 HandleInput_InParty(void)
     return retVal;
 }
 
-u8 HandleInput_OnBox(void)
+static u8 HandleInput_OnBox(void)
 {
     u8 retVal;
     s8 cursorArea;
@@ -1643,7 +1643,7 @@ u8 HandleInput_OnBox(void)
     return retVal;
 }
 
-u8 HandleInput_OnButtons(void)
+static u8 HandleInput_OnButtons(void)
 {
     u8 retVal;
     s8 cursorArea;
@@ -1742,7 +1742,7 @@ u8 HandleInput(void)
     return 0;
 }
 
-void AddBoxMenu(void)
+static void AddBoxMenu(void)
 {
     InitMenu();
     SetMenuText(PC_TEXT_JUMP);
@@ -1751,7 +1751,7 @@ void AddBoxMenu(void)
     SetMenuText(PC_TEXT_CANCEL);
 }
 
-bool8 sub_8094924(void)
+static bool8 sub_8094924(void)
 {
     InitMenu();
     if (sPSSData->boxOption != BOX_OPTION_MOVE_ITEMS)
@@ -1760,7 +1760,7 @@ bool8 sub_8094924(void)
         return sub_8094A0C();
 }
 
-bool8 sub_809494C(void)
+static bool8 sub_809494C(void)
 {
     u16 var0 = sub_8092458();
 
@@ -1814,7 +1814,7 @@ bool8 sub_809494C(void)
     return TRUE;
 }
 
-bool8 sub_8094A0C(void)
+static bool8 sub_8094A0C(void)
 {
     if (sPSSData->cursorMonSpecies == SPECIES_EGG)
         return FALSE;
@@ -1860,13 +1860,13 @@ bool8 sub_8094A0C(void)
     return TRUE;
 }
 
-void sub_8094AB8(struct Sprite *sprite)
+static void sub_8094AB8(struct Sprite *sprite)
 {
     sprite->pos1.x = sPSSData->field_CB4->pos1.x;
     sprite->pos1.y = sPSSData->field_CB4->pos1.y + 20;
 }
 
-void sub_8094AD8(void)
+static void sub_8094AD8(void)
 {
     u16 x, y;
     u8 spriteId;
@@ -1983,7 +1983,7 @@ void sub_8094AD8(void)
     }
 }
 
-void sub_8094C84(void)
+static void sub_8094C84(void)
 {
     sCanOnlyMove = !sCanOnlyMove;
     sPSSData->field_CB4->oam.paletteNum = sPSSData->field_CD8[sCanOnlyMove];
diff --git a/src/pokemon_storage_system_6.c b/src/pokemon_storage_system_6.c
index a92fe6891..a8cca28d5 100644
--- a/src/pokemon_storage_system_6.c
+++ b/src/pokemon_storage_system_6.c
@@ -15,7 +15,7 @@ void InitMenu(void)
     sPSSData->menuWindow.baseBlock = 92;
 }
 
-const u8 *const sMenuTexts[] = {
+static const u8 *const sMenuTexts[] = {
     [PC_TEXT_CANCEL]     = gPCText_Cancel,
     [PC_TEXT_STORE]      = gPCText_Store,
     [PC_TEXT_WITHDRAW]   = gPCText_Withdraw,
diff --git a/src/pokemon_storage_system_7.c b/src/pokemon_storage_system_7.c
index 9982655e3..1b2bc045a 100644
--- a/src/pokemon_storage_system_7.c
+++ b/src/pokemon_storage_system_7.c
@@ -26,30 +26,30 @@ struct MoveMons
     struct BoxPokemon boxMons[IN_BOX_COUNT];
 };
 
-EWRAM_DATA struct MoveMons *sMoveMonsPtr = NULL;
-
-bool8 sub_8095138(void);
-bool8 sub_8095234(void);
-bool8 sub_80952A0(void);
-bool8 sub_8095314(void);
-bool8 sub_8095394(void);
-bool8 sub_80953BC(void);
-void sub_8095520(void);
-void sub_80955C4(u8 arg0, u8 arg1, u8 arg2);
-void sub_80955FC(u8 arg0, u8 arg1, u8 arg2);
-void sub_8095634(u8 arg0, u8 arg1, u8 arg2);
-void sub_809566C(u8 arg0, u8 arg1, u8 arg2);
-void sub_80956A4(u8 x, u8 y);
-void sub_809572C(u8 x, u8 y);
-void sub_8095780(u16 bgX, u16 bgY, u16 duration);
-u8 sub_8095790(void);
-void sub_80957C8(void);
-void sub_80958A0(void);
-void sub_8095918(void);
-void sub_80959A8(void);
-void sub_8095A58(void);
-
-const struct WindowTemplate gUnknown_83D35D4 = {
+static EWRAM_DATA struct MoveMons *sMoveMonsPtr = NULL;
+
+static bool8 sub_8095138(void);
+static bool8 sub_8095234(void);
+static bool8 sub_80952A0(void);
+static bool8 sub_8095314(void);
+static bool8 sub_8095394(void);
+static bool8 sub_80953BC(void);
+static void sub_8095520(void);
+static void sub_80955C4(u8 arg0, u8 arg1, u8 arg2);
+static void sub_80955FC(u8 arg0, u8 arg1, u8 arg2);
+static void sub_8095634(u8 arg0, u8 arg1, u8 arg2);
+static void sub_809566C(u8 arg0, u8 arg1, u8 arg2);
+static void sub_80956A4(u8 x, u8 y);
+static void sub_809572C(u8 x, u8 y);
+static void sub_8095780(u16 bgX, u16 bgY, u16 duration);
+static u8 sub_8095790(void);
+static void sub_80957C8(void);
+static void sub_80958A0(void);
+static void sub_8095918(void);
+static void sub_80959A8(void);
+static void sub_8095A58(void);
+
+static const struct WindowTemplate gUnknown_83D35D4 = {
     .bg = 0,
     .tilemapLeft = 10,
     .tilemapTop = 3,
@@ -108,7 +108,7 @@ bool8 sub_80950D0(void)
     return FALSE;
 }
 
-bool8 sub_8095138(void)
+static bool8 sub_8095138(void)
 {
     switch (sMoveMonsPtr->state)
     {
@@ -146,7 +146,7 @@ bool8 sub_8095138(void)
     return TRUE;
 }
 
-bool8 sub_8095234(void)
+static bool8 sub_8095234(void)
 {
     switch (sMoveMonsPtr->state)
     {
@@ -173,7 +173,7 @@ bool8 sub_8095234(void)
     return TRUE;
 }
 
-bool8 sub_80952A0(void)
+static bool8 sub_80952A0(void)
 {
     switch (sMoveMonsPtr->state)
     {
@@ -195,7 +195,7 @@ bool8 sub_80952A0(void)
     return TRUE;
 }
 
-bool8 sub_8095314(void)
+static bool8 sub_8095314(void)
 {
     u8 var1, var2;
 
@@ -227,7 +227,7 @@ bool8 sub_8095314(void)
     return TRUE;
 }
 
-bool8 sub_8095394(void)
+static bool8 sub_8095394(void)
 {
     u8 var1 = sub_80924A8();
     u8 var2 = sub_8095790();
@@ -238,7 +238,7 @@ bool8 sub_8095394(void)
         return TRUE;
 }
 
-bool8 sub_80953BC(void)
+static bool8 sub_80953BC(void)
 {
     switch (sMoveMonsPtr->state)
     {
@@ -313,7 +313,7 @@ bool8 sub_8095474(u8 arg0)
     return TRUE;
 }
 
-void sub_8095520(void)
+static void sub_8095520(void)
 {
     s16 var = (abs(sMoveMonsPtr->fromRow - sMoveMonsPtr->field_6)) - (abs(sMoveMonsPtr->fromRow - sMoveMonsPtr->toRow));
     s16 var2 = (abs(sMoveMonsPtr->fromColumn - sMoveMonsPtr->field_7)) - (abs(sMoveMonsPtr->fromColumn - sMoveMonsPtr->toColumn));
@@ -337,7 +337,7 @@ void sub_8095520(void)
     }
 }
 
-void sub_80955C4(u8 arg0, u8 arg1, u8 arg2)
+static void sub_80955C4(u8 arg0, u8 arg1, u8 arg2)
 {
     u8 var1 = arg1;
 
@@ -351,7 +351,7 @@ void sub_80955C4(u8 arg0, u8 arg1, u8 arg2)
         sub_80956A4(arg0, arg1++);
 }
 
-void sub_80955FC(u8 arg0, u8 arg1, u8 arg2)
+static void sub_80955FC(u8 arg0, u8 arg1, u8 arg2)
 {
     u8 var1 = arg1;
 
@@ -365,7 +365,7 @@ void sub_80955FC(u8 arg0, u8 arg1, u8 arg2)
         sub_80956A4(arg1++, arg0);
 }
 
-void sub_8095634(u8 arg0, u8 arg1, u8 arg2)
+static void sub_8095634(u8 arg0, u8 arg1, u8 arg2)
 {
     u8 var1 = arg1;
 
@@ -379,7 +379,7 @@ void sub_8095634(u8 arg0, u8 arg1, u8 arg2)
         sub_809572C(arg0, arg1++);
 }
 
-void sub_809566C(u8 arg0, u8 arg1, u8 arg2)
+static void sub_809566C(u8 arg0, u8 arg1, u8 arg2)
 {
     u8 var1 = arg1;
 
@@ -393,7 +393,7 @@ void sub_809566C(u8 arg0, u8 arg1, u8 arg2)
         sub_809572C(arg1++, arg0);
 }
 
-void sub_80956A4(u8 x, u8 y)
+static void sub_80956A4(u8 x, u8 y)
 {
     u8 position = x + (IN_BOX_ROWS * y);
     u16 species = GetCurrentBoxMonData(position, MON_DATA_SPECIES2);
@@ -418,7 +418,7 @@ void sub_80956A4(u8 x, u8 y)
     }
 }
 
-void sub_809572C(u8 x, u8 y)
+static void sub_809572C(u8 x, u8 y)
 {
     u8 position = x + (IN_BOX_ROWS * y);
     u16 species = GetCurrentBoxMonData(position, MON_DATA_SPECIES2);
@@ -434,14 +434,14 @@ void sub_809572C(u8 x, u8 y)
     }
 }
 
-void sub_8095780(u16 bgX, u16 bgY, u16 duration)
+static void sub_8095780(u16 bgX, u16 bgY, u16 duration)
 {
     sMoveMonsPtr->bgX = bgX;
     sMoveMonsPtr->bgY = bgY;
     sMoveMonsPtr->field_10 = duration;
 }
 
-u8 sub_8095790(void)
+static u8 sub_8095790(void)
 {
     if (sMoveMonsPtr->field_10 != 0)
     {
@@ -453,7 +453,7 @@ u8 sub_8095790(void)
     return sMoveMonsPtr->field_10;
 }
 
-void sub_80957C8(void)
+static void sub_80957C8(void)
 {
     s32 i, j;
     s32 rowCount, columnCount;
@@ -482,7 +482,7 @@ void sub_80957C8(void)
     }
 }
 
-void sub_80958A0(void)
+static void sub_80958A0(void)
 {
     s32 i, j;
     s32 rowCount = sMoveMonsPtr->minRow + sMoveMonsPtr->rowsTotal;
@@ -501,7 +501,7 @@ void sub_80958A0(void)
     }
 }
 
-void sub_8095918(void)
+static void sub_8095918(void)
 {
     s32 i, j;
     s32 rowCount = sMoveMonsPtr->minRow + sMoveMonsPtr->rowsTotal;
@@ -521,7 +521,7 @@ void sub_8095918(void)
     }
 }
 
-void sub_80959A8(void)
+static void sub_80959A8(void)
 {
     s32 i, j;
     s32 rowCount = sMoveMonsPtr->minRow + sMoveMonsPtr->rowsTotal;
@@ -542,7 +542,7 @@ void sub_80959A8(void)
     }
 }
 
-void sub_8095A58(void)
+static void sub_8095A58(void)
 {
     ChangeBgX(0, 0, 0);
     ChangeBgY(0, 0, 0);
diff --git a/src/pokemon_storage_system_8.c b/src/pokemon_storage_system_8.c
index ac3aa8a21..39bec436e 100644
--- a/src/pokemon_storage_system_8.c
+++ b/src/pokemon_storage_system_8.c
@@ -9,28 +9,28 @@
 #include "trig.h"
 #include "constants/items.h"
 
-u8 sub_80961D8(void);
-bool32 sub_8096210(u8 cursorArea, u8 cursorPos);
-u8 sub_8096258(u8 cursorArea, u8 cursorPos);
-void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos);
-void sub_8096408(u8 id, const u32 * tiles, const u32 * pal);
-void sub_80964B8(u8 id, u8 affineAnimNo);
-void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos);
-void sub_8096624(u8 id, bool8 show);
-const u32 *GetItemIconPic(u16 itemId);
-const u32 *GetItemIconPalette(u16 itemId);
-void sub_8096898(u32 x);
-void sub_809692C(struct Sprite * sprite);
-void sub_8096958(struct Sprite * sprite);
-void sub_80969BC(struct Sprite * sprite);
-void sub_80969F4(struct Sprite * sprite);
-void sub_8096A74(struct Sprite * sprite);
-void sub_8096B10(struct Sprite * sprite);
-void sub_8096BAC(struct Sprite * sprite);
-
-const u32 gUnknown_83D35DC[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp");
-
-const struct OamData gUnknown_83D365C = {
+static u8 sub_80961D8(void);
+static bool32 sub_8096210(u8 cursorArea, u8 cursorPos);
+static u8 sub_8096258(u8 cursorArea, u8 cursorPos);
+static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos);
+static void sub_8096408(u8 id, const u32 * tiles, const u32 * pal);
+static void sub_80964B8(u8 id, u8 affineAnimNo);
+static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos);
+static void sub_8096624(u8 id, bool8 show);
+static const u32 *GetItemIconPic(u16 itemId);
+static const u32 *GetItemIconPalette(u16 itemId);
+static void sub_8096898(u32 x);
+static void sub_809692C(struct Sprite * sprite);
+static void sub_8096958(struct Sprite * sprite);
+static void sub_80969BC(struct Sprite * sprite);
+static void sub_80969F4(struct Sprite * sprite);
+static void sub_8096A74(struct Sprite * sprite);
+static void sub_8096B10(struct Sprite * sprite);
+static void sub_8096BAC(struct Sprite * sprite);
+
+static const u32 gUnknown_83D35DC[] = INCBIN_U32("graphics/interface/pss_unk_83D35DC.4bpp");
+
+static const struct OamData gUnknown_83D365C = {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_NORMAL,
     .objMode = ST_OAM_OBJ_NORMAL,
@@ -46,49 +46,49 @@ const struct OamData gUnknown_83D365C = {
     .affineParam = 0
 };
 
-const union AffineAnimCmd gUnknown_83D3664[] = {
+static const union AffineAnimCmd gUnknown_83D3664[] = {
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D3674[] = {
+static const union AffineAnimCmd gUnknown_83D3674[] = {
     AFFINEANIMCMD_FRAME(88, 88, 0, 0),
     AFFINEANIMCMD_FRAME(5, 5, 0, 8),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D368C[] = {
+static const union AffineAnimCmd gUnknown_83D368C[] = {
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_FRAME(-5, -5, 0, 8),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D36A4[] = {
+static const union AffineAnimCmd gUnknown_83D36A4[] = {
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_FRAME(10, 10, 0, 12),
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D36C4[] = {
+static const union AffineAnimCmd gUnknown_83D36C4[] = {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_FRAME(-10, -10, 0, 12),
     AFFINEANIMCMD_FRAME(128, 128, 0, 0),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D36E4[] = {
+static const union AffineAnimCmd gUnknown_83D36E4[] = {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_FRAME(-5, -5, 0, 16),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd gUnknown_83D36FC[] = {
+static const union AffineAnimCmd gUnknown_83D36FC[] = {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END
 };
 
-const union AffineAnimCmd *const gUnknown_83D370C[] = {
+static const union AffineAnimCmd *const gUnknown_83D370C[] = {
     gUnknown_83D3664,
     gUnknown_83D3674,
     gUnknown_83D368C,
@@ -98,7 +98,7 @@ const union AffineAnimCmd *const gUnknown_83D370C[] = {
     gUnknown_83D36FC
 };
 
-const struct SpriteTemplate gUnknown_83D3728 = {
+static const struct SpriteTemplate gUnknown_83D3728 = {
     .tileTag = TAG_TILE_7,
     .paletteTag = TAG_PAL_DACB,
     .oam = &gUnknown_83D365C,
@@ -126,16 +126,16 @@ void sub_8095B5C(void)
         {
             spriteSheet.tag = TAG_TILE_7 + i;
             LoadCompressedSpriteSheet(&spriteSheet);
-            sPSSData->field_2204[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void*)(OBJ_VRAM0);
-            sPSSData->field_2204[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i);
-            sPSSData->field_2204[i].palIndex *= 16;
-            sPSSData->field_2204[i].palIndex += 0x100;
+            sPSSData->itemIconSprites[i].tiles = GetSpriteTileStartByTag(spriteSheet.tag) * 32 + (void*)(OBJ_VRAM0);
+            sPSSData->itemIconSprites[i].palIndex = AllocSpritePalette(TAG_PAL_DACB + i);
+            sPSSData->itemIconSprites[i].palIndex *= 16;
+            sPSSData->itemIconSprites[i].palIndex += 0x100;
             spriteTemplate.tileTag = TAG_TILE_7 + i;
             spriteTemplate.paletteTag = TAG_PAL_DACB + i;
             spriteId = CreateSprite(&spriteTemplate, 0, 0, 11);
-            sPSSData->field_2204[i].sprite = &gSprites[spriteId];
-            sPSSData->field_2204[i].sprite->invisible = TRUE;
-            sPSSData->field_2204[i].unk10 = 0;
+            sPSSData->itemIconSprites[i].sprite = &gSprites[spriteId];
+            sPSSData->itemIconSprites[i].sprite->invisible = TRUE;
+            sPSSData->itemIconSprites[i].active = 0;
         }
     }
     sPSSData->movingItem = ITEM_NONE;
@@ -326,7 +326,7 @@ void sub_80960C0(void)
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sPSSData->field_2204[i].unk10 && sPSSData->field_2204[i].unk8 == 1)
+        if (sPSSData->itemIconSprites[i].active && sPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_IN_PARTY)
             sub_80964E8(i, 7, CURSOR_AREA_BOX, 0);
     }
 }
@@ -337,11 +337,11 @@ bool8 sub_809610C(void)
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sPSSData->field_2204[i].unk10)
+        if (sPSSData->itemIconSprites[i].active)
         {
-            if (!sPSSData->field_2204[i].sprite->affineAnimEnded && sPSSData->field_2204[i].sprite->affineAnimBeginning)
+            if (!sPSSData->itemIconSprites[i].sprite->affineAnimEnded && sPSSData->itemIconSprites[i].sprite->affineAnimBeginning)
                 return TRUE;
-            if (sPSSData->field_2204[i].sprite->callback != SpriteCallbackDummy && sPSSData->field_2204[i].sprite->callback != sub_80969BC)
+            if (sPSSData->itemIconSprites[i].sprite->callback != SpriteCallbackDummy && sPSSData->itemIconSprites[i].sprite->callback != sub_80969BC)
                 return TRUE;
         }
     }
@@ -357,7 +357,7 @@ bool8 IsActiveItemMoving(void)
     {
         for (i = 0; i < MAX_ITEM_ICONS; i++)
         {
-            if (sPSSData->field_2204[i].unk10 && sPSSData->field_2204[i].unk8 == 2)
+            if (sPSSData->itemIconSprites[i].active && sPSSData->itemIconSprites[i].cursorArea == CURSOR_AREA_BOX)
                 return TRUE;
         }
     }
@@ -375,15 +375,15 @@ u16 GetMovingItem(void)
     return sPSSData->movingItem;
 }
 
-u8 sub_80961D8(void)
+static u8 sub_80961D8(void)
 {
     u8 i;
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (!sPSSData->field_2204[i].unk10)
+        if (!sPSSData->itemIconSprites[i].active)
         {
-            sPSSData->field_2204[i].unk10 = TRUE;
+            sPSSData->itemIconSprites[i].active = TRUE;
             return i;
         }
     }
@@ -391,51 +391,51 @@ u8 sub_80961D8(void)
     return MAX_ITEM_ICONS;
 }
 
-bool32 sub_8096210(u8 cursorArea, u8 cursorPos)
+static bool32 sub_8096210(u8 cursorArea, u8 cursorPos)
 {
     s32 i;
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sPSSData->field_2204[i].unk10
-            && sPSSData->field_2204[i].unk8 == cursorArea
-            && sPSSData->field_2204[i].unk9 == cursorPos)
+        if (sPSSData->itemIconSprites[i].active
+            && sPSSData->itemIconSprites[i].cursorArea == cursorArea
+            && sPSSData->itemIconSprites[i].cursorPos == cursorPos)
             return TRUE;
     }
 
     return FALSE;
 }
 
-u8 sub_8096258(u8 cursorArea, u8 cursorPos)
+static u8 sub_8096258(u8 cursorArea, u8 cursorPos)
 {
     u8 i;
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sPSSData->field_2204[i].unk10
-            && sPSSData->field_2204[i].unk8 == cursorArea
-            && sPSSData->field_2204[i].unk9 == cursorPos)
+        if (sPSSData->itemIconSprites[i].active
+            && sPSSData->itemIconSprites[i].cursorArea == cursorArea
+            && sPSSData->itemIconSprites[i].cursorPos == cursorPos)
             return i;
     }
 
     return MAX_ITEM_ICONS;
 }
 
-u8 sub_80962A8(struct Sprite *sprite)
+static u8 sub_80962A8(struct Sprite *sprite)
 {
     u8 i;
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sPSSData->field_2204[i].unk10
-            && sPSSData->field_2204[i].sprite == sprite)
+        if (sPSSData->itemIconSprites[i].active
+            && sPSSData->itemIconSprites[i].sprite == sprite)
             return i;
     }
 
     return MAX_ITEM_ICONS;
 }
 
-void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos)
+static void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos)
 {
     u8 row, column;
 
@@ -447,30 +447,30 @@ void sub_80962F0(u8 id, u8 cursorArea, u8 cursorPos)
     case CURSOR_AREA_IN_BOX:
         row = cursorPos % IN_BOX_ROWS;
         column = cursorPos / IN_BOX_ROWS;
-        sPSSData->field_2204[id].sprite->pos1.x = (24 * row) + 112;
-        sPSSData->field_2204[id].sprite->pos1.y = (24 * column) + 56;
-        sPSSData->field_2204[id].sprite->oam.priority = 2;
+        sPSSData->itemIconSprites[id].sprite->pos1.x = (24 * row) + 112;
+        sPSSData->itemIconSprites[id].sprite->pos1.y = (24 * column) + 56;
+        sPSSData->itemIconSprites[id].sprite->oam.priority = 2;
         break;
     case CURSOR_AREA_IN_PARTY:
         if (cursorPos == 0)
         {
-            sPSSData->field_2204[id].sprite->pos1.x = 116;
-            sPSSData->field_2204[id].sprite->pos1.y = 76;
+            sPSSData->itemIconSprites[id].sprite->pos1.x = 116;
+            sPSSData->itemIconSprites[id].sprite->pos1.y = 76;
         }
         else
         {
-            sPSSData->field_2204[id].sprite->pos1.x = 164;
-            sPSSData->field_2204[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28;
+            sPSSData->itemIconSprites[id].sprite->pos1.x = 164;
+            sPSSData->itemIconSprites[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28;
         }
-        sPSSData->field_2204[id].sprite->oam.priority = 1;
+        sPSSData->itemIconSprites[id].sprite->oam.priority = 1;
         break;
     }
 
-    sPSSData->field_2204[id].unk8 = cursorArea;
-    sPSSData->field_2204[id].unk9 = cursorPos;
+    sPSSData->itemIconSprites[id].cursorArea = cursorArea;
+    sPSSData->itemIconSprites[id].cursorPos = cursorPos;
 }
 
-void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal)
+static void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal)
 {
     s32 i;
 
@@ -482,20 +482,20 @@ void sub_8096408(u8 id, const u32 *itemTiles, const u32 *itemPal)
     for (i = 0; i < 3; i++)
         CpuFastCopy(sPSSData->field_22C4 + (i * 0x60), sPSSData->field_42C4 + (i * 0x80), 0x60);
 
-    CpuFastCopy(sPSSData->field_42C4, sPSSData->field_2204[id].tiles, 0x200);
+    CpuFastCopy(sPSSData->field_42C4, sPSSData->itemIconSprites[id].tiles, 0x200);
     LZ77UnCompWram(itemPal, sPSSData->field_42C4);
-    LoadPalette(sPSSData->field_42C4, sPSSData->field_2204[id].palIndex, 0x20);
+    LoadPalette(sPSSData->field_42C4, sPSSData->itemIconSprites[id].palIndex, 0x20);
 }
 
-void sub_80964B8(u8 id, u8 animNum)
+static void sub_80964B8(u8 id, u8 animNum)
 {
     if (id >= MAX_ITEM_ICONS)
         return;
 
-    StartSpriteAffineAnim(sPSSData->field_2204[id].sprite, animNum);
+    StartSpriteAffineAnim(sPSSData->itemIconSprites[id].sprite, animNum);
 }
 
-void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos)
+static void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos)
 {
     if (id >= MAX_ITEM_ICONS)
         return;
@@ -503,52 +503,52 @@ void sub_80964E8(u8 id, u8 command, u8 cursorArea, u8 cursorPos)
     switch (command)
     {
     case 0:
-        sPSSData->field_2204[id].sprite->data[0] = id;
-        sPSSData->field_2204[id].sprite->callback = sub_809692C;
+        sPSSData->itemIconSprites[id].sprite->data[0] = id;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_809692C;
         break;
     case 1:
-        sPSSData->field_2204[id].sprite->data[0] = 0;
-        sPSSData->field_2204[id].sprite->callback = sub_8096958;
+        sPSSData->itemIconSprites[id].sprite->data[0] = 0;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_8096958;
         break;
     case 2:
-        sPSSData->field_2204[id].sprite->data[0] = 0;
-        sPSSData->field_2204[id].sprite->data[6] = cursorArea;
-        sPSSData->field_2204[id].sprite->data[7] = cursorPos;
-        sPSSData->field_2204[id].sprite->callback = sub_80969F4;
+        sPSSData->itemIconSprites[id].sprite->data[0] = 0;
+        sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+        sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_80969F4;
         break;
     case 3:
-        sPSSData->field_2204[id].sprite->data[0] = 0;
-        sPSSData->field_2204[id].sprite->callback = sub_8096A74;
-        sPSSData->field_2204[id].sprite->data[6] = cursorArea;
-        sPSSData->field_2204[id].sprite->data[7] = cursorPos;
+        sPSSData->itemIconSprites[id].sprite->data[0] = 0;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_8096A74;
+        sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+        sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
         break;
     case 4:
-        sPSSData->field_2204[id].sprite->data[0] = 0;
-        sPSSData->field_2204[id].sprite->data[6] = cursorArea;
-        sPSSData->field_2204[id].sprite->data[7] = cursorPos;
-        sPSSData->field_2204[id].sprite->callback = sub_8096B10;
+        sPSSData->itemIconSprites[id].sprite->data[0] = 0;
+        sPSSData->itemIconSprites[id].sprite->data[6] = cursorArea;
+        sPSSData->itemIconSprites[id].sprite->data[7] = cursorPos;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_8096B10;
         break;
     case 7:
-        sPSSData->field_2204[id].sprite->callback = sub_8096BAC;
+        sPSSData->itemIconSprites[id].sprite->callback = sub_8096BAC;
         break;
     }
 }
 
-void sub_8096624(u8 id, bool8 show)
+static void sub_8096624(u8 id, bool8 show)
 {
     if (id >= MAX_ITEM_ICONS)
         return;
 
-    sPSSData->field_2204[id].unk10 = show;
-    sPSSData->field_2204[id].sprite->invisible = (show == FALSE);
+    sPSSData->itemIconSprites[id].active = show;
+    sPSSData->itemIconSprites[id].sprite->invisible = (show == FALSE);
 }
 
-const u32 *GetItemIconPic(u16 itemId)
+static const u32 *GetItemIconPic(u16 itemId)
 {
     return GetItemIconGfxPtr(itemId, 0);
 }
 
-const u32 *GetItemIconPalette(u16 itemId)
+static const u32 *GetItemIconPalette(u16 itemId)
 {
     return GetItemIconGfxPtr(itemId, 1);
 }
@@ -614,7 +614,7 @@ bool8 sub_80967C0(void)
     return (sPSSData->field_2236 != 25);
 }
 
-void sub_8096898(u32 x)
+static void sub_8096898(u32 x)
 {
     if (x != 0)
     {
@@ -627,7 +627,7 @@ void sub_8096898(u32 x)
     ScheduleBgCopyTilemapToVram(0);
 }
 
-void sub_809692C(struct Sprite *sprite)
+static void sub_809692C(struct Sprite *sprite)
 {
     if (sprite->affineAnimEnded)
     {
@@ -636,7 +636,7 @@ void sub_809692C(struct Sprite *sprite)
     }
 }
 
-void sub_8096958(struct Sprite *sprite)
+static void sub_8096958(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -658,14 +658,14 @@ void sub_8096958(struct Sprite *sprite)
     }
 }
 
-void sub_80969BC(struct Sprite *sprite)
+static void sub_80969BC(struct Sprite *sprite)
 {
     sprite->pos1.x = sPSSData->field_CB4->pos1.x + 4;
     sprite->pos1.y = sPSSData->field_CB4->pos1.y + sPSSData->field_CB4->pos2.y + 8;
     sprite->oam.priority = sPSSData->field_CB4->oam.priority;
 }
 
-void sub_80969F4(struct Sprite *sprite)
+static void sub_80969F4(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -690,7 +690,7 @@ void sub_80969F4(struct Sprite *sprite)
     }
 }
 
-void sub_8096A74(struct Sprite *sprite)
+static void sub_8096A74(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -717,7 +717,7 @@ void sub_8096A74(struct Sprite *sprite)
     }
 }
 
-void sub_8096B10(struct Sprite *sprite)
+static void sub_8096B10(struct Sprite *sprite)
 {
     switch (sprite->data[0])
     {
@@ -744,7 +744,7 @@ void sub_8096B10(struct Sprite *sprite)
     }
 }
 
-void sub_8096BAC(struct Sprite *sprite)
+static void sub_8096BAC(struct Sprite *sprite)
 {
     sprite->pos1.y -= 8;
     if (sprite->pos1.y + sprite->pos2.y < -16)
diff --git a/src/pokemon_storage_system_9.c b/src/pokemon_storage_system_9.c
new file mode 100644
index 000000000..0f3078127
--- /dev/null
+++ b/src/pokemon_storage_system_9.c
@@ -0,0 +1,87 @@
+#include "global.h"
+#include "gflib.h"
+#include "pokemon_storage_system_internal.h"
+
+static EWRAM_DATA struct UnkStruct_2000020 *gUnknown_203982C = NULL;
+
+static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct);
+static void sub_8096D70(struct UnkStruct_2000028 *unkStruct);
+
+void sub_8096BE4(struct UnkStruct_2000020 *arg0, struct UnkStruct_2000028 *arg1, u32 arg2)
+{
+    gUnknown_203982C = arg0;
+    arg0->unk_00 = arg1;
+    arg0->unk_05 = arg2;
+    arg0->unk_04 = 0;
+}
+
+void sub_8096BF8(void)
+{
+    u16 i;
+
+    if (gUnknown_203982C->unk_04)
+    {
+        for (i = 0; i < gUnknown_203982C->unk_04; i++)
+        {
+            struct UnkStruct_2000028 *unkStruct = &gUnknown_203982C->unk_00[i];
+            unkStruct->unk_0c(unkStruct);
+        }
+
+        gUnknown_203982C->unk_04 = 0;
+    }
+}
+
+static bool8 sub_8096C40(u8 *dest, u16 dLeft, u16 dTop, const u8 *src, u16 sLeft, u16 sTop, u16 width, u16 height, u16 unkArg)
+{
+    struct UnkStruct_2000028 *unkStruct;
+
+    if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05)
+        return FALSE;
+
+    unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++];
+    unkStruct->unk_08 = width * 2;
+    unkStruct->unk_04 = dest + 2 * (dTop * 32 + dLeft);
+    unkStruct->unk_00 = src + 2 * (sTop * unkArg + sLeft);
+    unkStruct->newField = height;
+    unkStruct->unk_0a = unkArg;
+    unkStruct->unk_0c = sub_8096CDC;
+    return TRUE;
+}
+
+static void sub_8096CDC(struct UnkStruct_2000028 *unkStruct)
+{
+    u16 i;
+
+    for (i = 0; i < unkStruct->newField; i++)
+    {
+        CpuSet(unkStruct->unk_00, unkStruct->unk_04, (unkStruct->unk_08 / 2));
+        unkStruct->unk_04 += 64;
+        unkStruct->unk_00 += (unkStruct->unk_0a * 2);
+    }
+}
+
+static bool8 sub_8096D14(void *dest, u16 dLeft, u16 dTop, u16 width, u16 height)
+{
+    struct UnkStruct_2000028 *unkStruct;
+
+    if (gUnknown_203982C->unk_04 >= gUnknown_203982C->unk_05)
+        return FALSE;
+
+    unkStruct = &gUnknown_203982C->unk_00[gUnknown_203982C->unk_04++];
+    unkStruct->unk_08 = width * 2;
+    unkStruct->unk_04 = dest + ((dTop * 32) + dLeft) * 2;
+    unkStruct->newField = height;
+    unkStruct->unk_0c = sub_8096D70;
+    return TRUE;
+}
+
+static void sub_8096D70(struct UnkStruct_2000028 *unkStruct)
+{
+    u16 i;
+
+    for (i = 0; i < unkStruct->newField; i++)
+    {
+        Dma3FillLarge_(0, unkStruct->unk_04, unkStruct->unk_08, 16);
+        unkStruct->unk_04 += 64;
+    }
+}
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 312f3f2f0..790fb435a 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -164,11 +164,8 @@ gUnknown_20386A8: @ 20386A8
 	.include "src/pokemon_storage_system_5.o"
 	.align 2
 	.include "src/pokemon_storage_system_7.o"
-
 	.align 2
-gUnknown_203982C: @ 203982C
-	.space 0x4
-
+	.include "src/pokemon_storage_system_9.o"
 	.align 2
 	.include "src/script_movement.o"
 	.align 2