From 07230ba68e7c556dcde129295f3ca3421249c122 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sat, 22 Jul 2023 16:51:16 -0700
Subject: [PATCH] continue to clean up functions and add ewram

---
 include/dungeon.h           |  2 ++
 include/text_util.h         |  2 +-
 src/code_8009804.c          |  2 +-
 src/code_8012A18_1.c        |  2 +-
 src/code_801EE10_1.c        |  2 +-
 src/code_8069E0C.c          |  4 +--
 src/code_809447C.c          |  2 +-
 src/code_8094F88.c          | 17 +++++-----
 src/code_80958E8.c          |  4 +--
 src/dungeon.c               |  2 +-
 src/friend_rescue.c         |  2 +-
 src/ground_main.c           | 22 +++++++------
 src/load_screen.c           |  2 +-
 src/luminous_cave.c         |  2 +-
 src/other_menus.c           |  3 +-
 src/party_list_menu.c       |  2 +-
 src/pokemon_mid.c           |  3 +-
 src/rescue_password_menu.c  | 27 ++++++----------
 src/rescue_team_info.c      |  4 +--
 src/save_menu.c             |  2 +-
 src/thank_you_wonder_mail.c |  2 +-
 src/unk_menu_203B360.c      |  2 +-
 sym_ewram.txt               | 62 ++++++-------------------------------
 sym_ewram2.txt              | 14 ++-------
 24 files changed, 67 insertions(+), 121 deletions(-)

diff --git a/include/dungeon.h b/include/dungeon.h
index defd98a07..c5af3f4d7 100644
--- a/include/dungeon.h
+++ b/include/dungeon.h
@@ -39,7 +39,9 @@ const u8 *GetDungeonName1(u8 dungeon);
 u32 sub_80908D8(struct DungeonLocation *dungeon);
 u8 sub_8090910(struct DungeonLocation *dungeon, u32 param_2);
 bool8 sub_809095C(u8 dungeon);
+u32 GetMaxItemsAllowed(u8 dungeon);
 s8 GetRescuesAllowed(u8 dungeon);
 bool8 HasCheckpoint(u8 dungeon);
+s32 GetDungeonFloorCount(u8 dungeon);
 
 #endif //GUARD_DUNGEON_H
diff --git a/include/text_util.h b/include/text_util.h
index 736af98bf..cbd3d882d 100644
--- a/include/text_util.h
+++ b/include/text_util.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_TEXT_UTIL_H
 #define GUARD_TEXT_UTIL_H
 
-void sub_80922B4(u8 *buffer, u8 *string, s32 size);
+void sub_80922B4(u8 *buffer, const u8 *string, s32 size);
 u32 sub_80922E4(u32 r0);
 void CopyStringtoBuffer(u8 *buffer, u8 *string);
 void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size);
diff --git a/src/code_8009804.c b/src/code_8009804.c
index ac7c81aee..98364c50b 100644
--- a/src/code_8009804.c
+++ b/src/code_8009804.c
@@ -5,7 +5,7 @@ extern u8 gUnknown_202D238[4];
 extern s32 gUnknown_202D23C;
 extern u16 gUnknown_202B038[4][32][32];
 extern u8 gUnknown_80B88CC[];
-struct FileArchive gSystemFileArchive;
+extern struct FileArchive gSystemFileArchive;
 
 struct unkStruct_202D240
 {
diff --git a/src/code_8012A18_1.c b/src/code_8012A18_1.c
index 6e7104ccc..dc3031d94 100644
--- a/src/code_8012A18_1.c
+++ b/src/code_8012A18_1.c
@@ -4,6 +4,7 @@
 #include "memory.h"
 #include "input.h"
 #include "text.h"
+#include "text_util.h"
 
 struct unkStruct_203B200
 {
@@ -34,7 +35,6 @@ extern void sub_80160F4(u32);
 bool8 IsNameEmpty(void);
 extern u32 sub_80154F0(void);
 extern void sub_80155F0(void);
-extern void sub_80922B4(u8 *, u8 *, s32);
 
 void nullsub_36(void);
 void sub_8016110(void);
diff --git a/src/code_801EE10_1.c b/src/code_801EE10_1.c
index 046722ee7..ee243ea07 100644
--- a/src/code_801EE10_1.c
+++ b/src/code_801EE10_1.c
@@ -5,6 +5,7 @@
 #include "input.h"
 #include "memory.h"
 #include "text.h"
+#include "text_util.h"
 
 struct unkStruct_203B2AC
 {
@@ -54,7 +55,6 @@ extern bool8 sub_8013938(struct MenuInputStruct*);
 extern void sub_802452C(void);
 extern void PlayMenuSoundEffect(u32);
 extern void sub_8013984(struct MenuInputStruct*);
-void sub_80922B4(u8 *buffer, u8 *string, s32 size);
 bool8 ComparePokemonNames(s16 a1, s16 a2);
 
 void sub_8024588(void);
diff --git a/src/code_8069E0C.c b/src/code_8069E0C.c
index 9b6d5a74e..3adcbba24 100644
--- a/src/code_8069E0C.c
+++ b/src/code_8069E0C.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "constants/ability.h"
 #include "constants/move_id.h"
+#include "constants/status.h"
 #include "constants/type.h"
 #include "constants/weather.h"
 #include "dungeon_entity.h"
@@ -43,7 +44,6 @@ extern void sub_806A2BC(struct Entity *, u8);
 extern void sub_804178C(u32);
 extern void sub_803F508(struct Entity *);
 extern void sub_804AC20(struct Position *);
-extern u8 sub_8092364(u8);
 extern void sub_803E46C(u32);
 extern void sub_803E708(u32 r0, u32 r1);
 
@@ -211,7 +211,7 @@ void sub_806A120(struct Entity * pokemon, struct Entity * target, struct Move* m
   struct EntityInfo *entityInfo;
 
   if ((((EntityExists(pokemon)) && (EntityExists(target))) && (pokemon != target))
-     && (entityInfo = target->info, entityInfo->protectionStatus == 0xC)) {
+     && (entityInfo = target->info, entityInfo->protectionStatus == STATUS_CONVERSION2)) {
     moveType = GetMoveTypeForMonster(pokemon, move);
     uVar2_u32 = sub_8092364(moveType);
     if (uVar2_u32 != TYPE_NONE) {
diff --git a/src/code_809447C.c b/src/code_809447C.c
index ef86245ee..71795e65d 100644
--- a/src/code_809447C.c
+++ b/src/code_809447C.c
@@ -4,6 +4,7 @@
 #include "item.h"
 #include "moves.h"
 #include "dungeon_global_data.h"
+#include "text_util.h"
 
 struct unkStruct_8113080
 {
@@ -41,7 +42,6 @@ void PrintYellowDungeonNametoBuffer(u8 *buffer, struct DungeonLocation *dungeonL
 extern void sub_80073B8(u32);
 extern void xxx_format_and_draw(s32, s32, const u8 *, ...);
 extern s32 sub_8008ED0(u8 *);
-void sub_80922B4(u8 *buffer, u8 *string, s32 size);
 extern void sub_80073E0(u32);
 
 void sub_809447C(struct unkStruct_8094924 *r0, u8 *r1)
diff --git a/src/code_8094F88.c b/src/code_8094F88.c
index b2d2532c0..123eef2da 100644
--- a/src/code_8094F88.c
+++ b/src/code_8094F88.c
@@ -13,10 +13,11 @@ EWRAM_DATA_2 struct unkStruct_203B484 *gUnknown_203B484 = {0};
 EWRAM_DATA_2 u32 *gUnknown_203B488 = {0};
 EWRAM_DATA_2 struct unkStruct_203B48C *gUnknown_203B48C = {0};
 
-extern struct unkStruct_203B480 gUnknown_2038C88;
-extern struct unkStruct_203B484 gUnknown_2039288;
-extern u32 gUnknown_20392E8;
-extern struct unkStruct_203B48C gUnknown_20393C0;
+EWRAM_DATA struct unkStruct_203B480 gUnknown_2038C88[0x20] = {0};
+EWRAM_DATA struct unkStruct_203B484 gUnknown_2039288 = {0};
+EWRAM_DATA UNUSED static u32 fill0 = {0}; // 203B484 is size 0x5C and I need to fill a gap of 0x4
+EWRAM_DATA u32 gUnknown_20392E8[0x36] = {0};
+EWRAM_DATA struct unkStruct_203B48C gUnknown_20393C0 = {0};
 
 extern void SaveDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
 extern void RestoreDungeonLocation(struct unkStruct_8094924*, struct DungeonLocation*);
@@ -32,15 +33,15 @@ extern void sub_8094D28(s32);
 
 void sub_80950BC(void)
 {
-    gUnknown_203B480 = &gUnknown_2038C88;
+    gUnknown_203B480 = gUnknown_2038C88;
     gUnknown_203B484 = &gUnknown_2039288;
-    gUnknown_203B488 = &gUnknown_20392E8;
+    gUnknown_203B488 = gUnknown_20392E8;
     gUnknown_203B48C = &gUnknown_20393C0;
 }
 
 struct unkStruct_203B480 *sub_80950F8(void)
 {
-    return &gUnknown_2038C88;
+    return gUnknown_2038C88;
 }
 
 struct unkStruct_203B484 *sub_8095100(void)
@@ -50,7 +51,7 @@ struct unkStruct_203B484 *sub_8095100(void)
 
 u32 *sub_8095108(void)
 {
-    return &gUnknown_20392E8;
+    return gUnknown_20392E8;
 }
 
 struct unkStruct_203B48C *sub_8095110(void)
diff --git a/src/code_80958E8.c b/src/code_80958E8.c
index 6aeed7d62..4ee39320f 100644
--- a/src/code_80958E8.c
+++ b/src/code_80958E8.c
@@ -10,11 +10,9 @@
 #include "pokemon.h"
 #include "code_8094F88.h"
 
-extern s32 GetDungeonFloorCount(u8);
 extern bool8 sub_809017C(struct DungeonLocation *);
 extern s16 GetBaseSpecies(s16);
 extern u8 sub_803C1D0(struct DungeonLocation *, u8);
-extern u32 GetMaxItemsAllowed(u8);
 extern bool8 sub_803C0DC(s16);
 extern void ResetMailboxSlot(u8);
 extern void ResetPelipperBoardSlot(u8);
@@ -22,7 +20,7 @@ extern void ResetJobSlot(u8);
 extern bool8 ValidateWonderMail(struct WonderMail *);
 
 EWRAM_DATA_2 struct unkStruct_203B490 *gUnknown_203B490 = {0};
-extern struct unkStruct_203B490 gUnknown_2039448;
+EWRAM_DATA struct unkStruct_203B490 gUnknown_2039448 = {0};
 
 void LoadMailInfo(void)
 {
diff --git a/src/dungeon.c b/src/dungeon.c
index ec4a5f55e..0f4714eb5 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -50,7 +50,7 @@ bool8 IsLevelResetTo1(u8 dungeon)
     return gDungeons[dungeon].levelResetTo1;
 }
 
-u8 GetMaxItemsAllowed(u8 dungeon)
+u32 GetMaxItemsAllowed(u8 dungeon)
 {
     return gDungeons[dungeon].maxItemsAllowed;
 }
diff --git a/src/friend_rescue.c b/src/friend_rescue.c
index ef6093b3d..f35a7f52e 100644
--- a/src/friend_rescue.c
+++ b/src/friend_rescue.c
@@ -3,6 +3,7 @@
 #include "constants/monster.h"
 #include "constants/wonder_mail.h"
 #include "text.h"
+#include "text_util.h"
 #include "input.h"
 #include "item.h"
 #include "team_inventory.h"
@@ -316,7 +317,6 @@ extern void sub_8035CF4(struct MenuStruct *, u32, u32);
 extern s32 sub_8037B28(u32);
 extern s32 sub_8037D64(u32, void *, void *);
 extern s32 sub_80381F4(u32, void *, void *);
-extern void sub_80922B4(u8 *buffer, u8 *string, s32 size);
 
 extern s32 CountMailType(u8 mailType);
 extern u32 GetDungeonTeamRankPts(struct DungeonLocation *, u32);
diff --git a/src/ground_main.c b/src/ground_main.c
index 373d237ed..a1ec4be11 100644
--- a/src/ground_main.c
+++ b/src/ground_main.c
@@ -4,16 +4,18 @@
 #include "debug.h"
 #include "code_80A26CC.h"
 
-extern u32 gUnknown_20398A8;
-extern u32 gUnknown_20398AC;
-extern u32 gUnknown_20398B0;
-extern u32 gUnknown_20398B4;
-extern u8 gUnknown_20398B8;
-extern u8 gUnknown_20398B9;
-extern u8 gUnknown_20398BA;
-extern u16 gUnknown_20398BE;
-extern u32 gUnknown_20398C0;
-extern s16 gUnknown_20398C4;
+EWRAM_DATA u32 gUnknown_20398A8 = {0};
+EWRAM_DATA u32 gUnknown_20398AC = {0};
+EWRAM_DATA u32 gUnknown_20398B0 = {0};
+EWRAM_DATA u32 gUnknown_20398B4 = {0};
+EWRAM_DATA u8 gUnknown_20398B8 = {0};
+EWRAM_DATA u8 gUnknown_20398B9 = {0};
+EWRAM_DATA u8 gUnknown_20398BA = {0};
+EWRAM_DATA UNUSED static u8 gUnknown_20398BB = {0}; // NOTE: Needed for matching but not used
+EWRAM_DATA u16 gUnknown_20398BC = {0};
+EWRAM_DATA u16 gUnknown_20398BE = {0};
+EWRAM_DATA u32 gUnknown_20398C0 = {0};
+EWRAM_DATA s16 gUnknown_20398C4 = {0};
 
 EWRAM_DATA_2 u8 gUnknown_203B49C = {0};
 EWRAM_DATA_2 u8 gUnknown_203B49D = {0};
diff --git a/src/load_screen.c b/src/load_screen.c
index f517a0b08..099317d45 100644
--- a/src/load_screen.c
+++ b/src/load_screen.c
@@ -7,6 +7,7 @@
 #include "memory.h"
 #include "menu.h"
 #include "text.h"
+#include "text_util.h"
 #include "pokemon.h"
 #include "save.h"
 #include "code_800D090.h"
@@ -50,7 +51,6 @@ extern u8 *sub_8098FB4();
 extern u8 *GetDungeonLocationInfo(void);
 extern u32 GetNumAdventures(void);
 extern void PrintDungeonLocationtoBuffer(u8 *, u8 *);
-extern void sub_80922B4(u8 *, const u8 *, u32);
 extern u32 sub_8001658(u32, u32);
 extern void sub_80073E0(u32);
 
diff --git a/src/luminous_cave.c b/src/luminous_cave.c
index 8625acd8e..47bef4546 100644
--- a/src/luminous_cave.c
+++ b/src/luminous_cave.c
@@ -8,6 +8,7 @@
 #include "pokemon.h"
 #include "random.h"
 #include "text.h"
+#include "text_util.h"
 #include "team_inventory.h"
 #include "menu_input.h"
 
@@ -201,7 +202,6 @@ void sub_8024DBC(void);
 void sub_8024E30(void);
 void sub_801AEE4(u32, u32);
 void sub_808F734(struct PokemonStruct *, s16);
-void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size);
 u32 sub_801602C(u32 r0, u8 *name);
 extern s32 sub_80144A4(s32 *);
 extern u32 sub_801A6E8(u32);
diff --git a/src/other_menus.c b/src/other_menus.c
index ad97a3997..9473c052d 100644
--- a/src/other_menus.c
+++ b/src/other_menus.c
@@ -45,7 +45,8 @@ struct unkStruct_203B35C
    u8 fill3A0[0x450 - 0x3A0];
    s32 unk450;
 };
-extern struct unkStruct_203B35C *gUnknown_203B35C;
+
+EWRAM_DATA_2 struct unkStruct_203B35C *gUnknown_203B35C = {0};
 
 const struct UnkTextStruct2 gUnknown_80E653C = {
    0x00, 0x00, 0x00, 0x00,
diff --git a/src/party_list_menu.c b/src/party_list_menu.c
index 78ef0a83e..0cb81baff 100644
--- a/src/party_list_menu.c
+++ b/src/party_list_menu.c
@@ -6,6 +6,7 @@
 #include "memory.h"
 #include "pokemon.h"
 #include "text.h"
+#include "text_util.h"
 #include "team_inventory.h"
 #include "constants/move.h"
 #include "code_800D090.h"
@@ -171,7 +172,6 @@ extern u32 sub_801EF38(u32);
 extern void sub_8008C54(u32);
 extern void sub_80073B8(u32);
 extern void sub_80073E0(u32);
-extern void sub_80922B4(u8 *, const u8 *, u32);
 extern void sub_808D930(u8 *, s16);
 extern s32 sub_8008ED0(u8 *);
 extern void xxx_format_and_draw(s32, s32, const u8 *, ...);
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c
index 7c30f4a0f..17f4205a2 100644
--- a/src/pokemon_mid.c
+++ b/src/pokemon_mid.c
@@ -7,6 +7,7 @@
 #include "constants/colors.h"
 #include "constants/move_id.h"
 #include "code_800D090.h"
+#include "text_util.h"
 
 extern struct MonsterDataEntry *gMonsterParameters;
 extern const char gUnknown_8107600[];
@@ -29,10 +30,8 @@ extern struct LevelData gLevelCurrentData[];
 
 
 extern s16 GetBaseSpecies(s16);
-extern void sub_80922B4(u8 *, u8 *, s32);
 extern int sprintf(char *, const char *, ...);
 extern u32 ReturnIntFromChar(u8 r0);
-extern void CopyStringtoBuffer(char *r0, char *r1);
 extern void CopyAndResetMoves(void*, void*);
 extern void sub_80943A0(void*, s32);
 extern void xxx_pokemon2_to_pokemonstruct_808DF44(struct PokemonStruct*, struct PokemonStruct2*);
diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c
index d90ba5730..62c50d584 100644
--- a/src/rescue_password_menu.c
+++ b/src/rescue_password_menu.c
@@ -11,6 +11,8 @@
 #include "code_8094F88.h"
 #include "wonder_mail.h"
 #include "menu_input.h"
+#include "dungeon.h"
+#include "main_menu.h"
 
 #define RESCUE_PASSWORD_SIZE 0x36
 
@@ -243,32 +245,23 @@ static const u8 fill0[] = "pksdir0";
 extern s32 sub_8035D74(void);
 extern void sub_80151C0(u32, u8 *);
 extern void sub_8031D70(u32, u32);
-extern u32 ConvertMenutoRescuePasswordState(u32);
-extern void sub_8039174(void);
 extern void sub_80155F0(void);
 extern void sub_8031E10(void);
-extern void DisplayPasswordAcceptScreen(void);
-
-
-extern u32 sub_8039068(u32, u8 *passwordBuffer, struct unkStruct_203B480 *r0);
-
 extern u32 sub_80154F0(void);
 extern u32 sub_8031DCC(void);
-extern void sub_80391F8(void);
-extern void sub_8031E00();
-extern void DisplayRescuePasswordError(u32);
-extern struct MainMenu *GetMainMenu(void);
-
-
+extern void sub_8031E00(void);
 extern void SetMenuItems(struct MenuStruct *, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *, u32, u32, u32);
 extern void sub_8035CF4(struct MenuStruct *r0, u32, u32);
-bool8 sub_8095298(s32);
-bool8 sub_803D204(u8 *, struct unkStruct_203B480 *);
-extern s32 GetDungeonFloorCount(u8);
-
 extern void AddSprite(struct unkSprite *, u32, u32, u32);
 extern void xxx_draw_string_80144C4(void);
 
+void DisplayRescuePasswordError(u32 error);
+void sub_8039174(void);
+void DisplayPasswordAcceptScreen(void);
+u32 sub_8039068(u32, u8 *passwordBuffer, struct unkStruct_203B480 *r0);
+void sub_80391F8(void);
+bool8 sub_803D204(u8 *, struct unkStruct_203B480 *);
+u32 ConvertMenutoRescuePasswordState(u32);
 
 void CreateRescuePasswordMenu(u32 currMenu)
 {
diff --git a/src/rescue_team_info.c b/src/rescue_team_info.c
index cd3c8f02c..9d0153b5f 100644
--- a/src/rescue_team_info.c
+++ b/src/rescue_team_info.c
@@ -1,16 +1,16 @@
 #include "global.h"
 #include "rescue_team_info.h"
 #include "code_8092334.h"
+#include "text_util.h"
 
 EWRAM_DATA_2 struct RescueTeamData *gRescueTeamInfoRef = {0};
 EWRAM_DATA struct RescueTeamData gRescueTeamInfo = {0};
 
 extern bool8 sub_80023E4(u32);
-extern void sub_80922B4(u8 *buffer, u8 *string, s32 size);
 extern void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size);
 
 extern const u8 *gRescueTeamRanks[];
-extern s32 gRescueRankMaxPoints[7];
+extern s32 gRescueRankMaxPoints[MAX_TEAM_RANKS];
 extern u8 gTeamNamePlaceholder[0x8]; // Pokemon
 
 void LoadRescueTeamInfo(void)
diff --git a/src/save_menu.c b/src/save_menu.c
index 487a7a8a8..13281deb7 100644
--- a/src/save_menu.c
+++ b/src/save_menu.c
@@ -26,7 +26,7 @@ struct unkStruct_203B360
     u32 unk1B0; // Sprite count?
 };
 
-extern struct unkStruct_203B360 *gUnknown_203B364;
+EWRAM_DATA_2 struct unkStruct_203B360 *gUnknown_203B364 = {0};
 
 const struct UnkTextStruct2 gUnknown_80E6F20 =
 {
diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c
index 8ee72cefc..86a01cd5f 100644
--- a/src/thank_you_wonder_mail.c
+++ b/src/thank_you_wonder_mail.c
@@ -11,6 +11,7 @@
 #include "input.h"
 #include "rescue_password_menu.h"
 #include "text.h"
+#include "text_util.h"
 #include "team_inventory.h"
 #include "code_800D090.h"
 #include "menu_input.h"
@@ -218,7 +219,6 @@ extern u32 sub_80144A4(s32 *r0);
 extern void SetThankYouMailMenuState(u32);
 extern struct PokemonStruct *GetPlayerPokemonStruct(void);
 extern void SetMenuItems(struct MenuStruct *menu, struct UnkTextStruct2 *, u32, const struct UnkTextStruct2 *, const struct MenuItem *entries, u32, u32, u32);
-extern void sub_80922B4(u8 *, u8 *, u32);
 extern void sub_802F204(struct unkStruct_802F204 *, u32);
 extern void sub_80151C0(u32, u8 *);
 extern void xxx_call_start_bg_music(void);
diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c
index eeb395af0..deb645bbe 100644
--- a/src/unk_menu_203B360.c
+++ b/src/unk_menu_203B360.c
@@ -26,7 +26,7 @@ struct unkStruct_203B360
     u32 unk1B0; // sprite count?
 };
 
-extern struct unkStruct_203B360 *gUnknown_203B360;
+EWRAM_DATA_2 struct unkStruct_203B360 *gUnknown_203B360 = {0};
 const struct UnkTextStruct2 gUnknown_80E6E7C = {
    0x00, 0x00, 0x00, 0x00,
    0x03,
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 8d0152375..26864e82e 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -811,58 +811,16 @@ gMoveLearnsets: /* 2038C6C */
     .include "src/game_options.o"
     .include "src/play_time.o"
 
-gUnknown_2038C88: /* 2038C88 */
-	.space 0x600
-
-gUnknown_2039288: /* 2039288 */
-	.space 0x60
-
-gUnknown_20392E8: /* 20392E8 */
-	.space 0xD8
-
-gUnknown_20393C0: /* 20393C0 */
-	.space 0x88
-
-gUnknown_2039448: /* 2039448 */
-	.space 0x330
-
-.include "src/code_8097670.o"
-.space 0x4
-.include "src/exclusive_pokemon.o"
-.space 0x4
-
-gUnknown_20398A8: /* 20398A8 */
-	.space 0x4
-
-gUnknown_20398AC: /* 20398AC */
-	.space 0x4
-
-gUnknown_20398B0: /* 20398B0 */
-	.space 0x4
-
-gUnknown_20398B4: /* 20398B4 */
-	.space 0x4
-
-gUnknown_20398B8: /* 20398B8 */
-	.space 0x1
-
-gUnknown_20398B9: /* 20398B9 */
-	.space 0x1
-
-gUnknown_20398BA: /* 20398BA */
-	.space 0x2
-
-gUnknown_20398BC: /* 20398BC */
-	.space 0x2
-
-gUnknown_20398BE: /* 20398BE */
-	.space 0x2
-
-gUnknown_20398C0: /* 20398C0 */
-	.space 0x4
-
-gUnknown_20398C4: /* 20398C4 */
-	.space 0x4
+    .include "src/code_8094F88.o"
+    .space 0x4
+    .include "src/code_80958E8.o"
+    .space 0x4
+    .include "src/code_8097670.o"
+    .space 0x4
+    .include "src/exclusive_pokemon.o"
+    .space 0x4
+    .include "src/ground_main.o"
+    .space 0x2
 
 gUnknown_20398C8: /* 20398C8 */
 	.space 0x10
diff --git a/sym_ewram2.txt b/sym_ewram2.txt
index 7ac427954..9f7cbdf2a 100644
--- a/sym_ewram2.txt
+++ b/sym_ewram2.txt
@@ -380,18 +380,10 @@ gUnknown_203B344: /* 203B344 */
 	.space 0x4
 
 .include "src/main_menu.o"
-
 .include "src/trade_items_menu.o"
-
-gUnknown_203B35C: /* 203B35C */
-	.space 0x4
-
-gUnknown_203B360: /* 203B360 */
-	.space 0x4
-
-gUnknown_203B364: /* 203B364 */
-	.space 0x4
-
+.include "src/other_menus.o"
+.include "src/unk_menu_203B360.o"
+.include "src/save_menu.o"
 .include "src/rescue_password_menu.o"
 .include "src/load_screen.o"
 .include "src/wonder_mail_main_menu.o"