finish party_menu

asm/trade.s

@@ -725,7 +725,7 @@ _080777B8:
 	b _08077B22
 	.pool
 _080777E8:
-	bl sub_81B5D30
+	bl LoadHeldItemIcons
 	ldr r0, =gUnknown_0203229C
 	ldr r1, [r0]
 	adds r0, r1, 0
@@ -1343,7 +1343,7 @@ _08077D80:
 	b _080780D8
 	.pool
 _08077DB0:
-	bl sub_81B5D30
+	bl LoadHeldItemIcons
 	ldr r0, =gUnknown_0203229C
 	ldr r1, [r0]
 	adds r0, r1, 0

data/party_menu.s

@@ -69,11 +69,11 @@ gUnknown_086156B8:: @ 86156B8
 
 	.align 2
 gUnknown_086156C4:: @ 86156C4
-	.4byte sub_81B2658, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c
+	.4byte BlitBitmapToPartyWindow_Default1, 0x0d280b18, 0x08201420, 0x08081440, 0x08182526, 0x08182535, 0x03302318, 0x1040220c
 
 	.align 2
 gUnknown_086156E4:: @ 86156E4
-	.4byte sub_81B26BC, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d
+	.4byte BlitBitmapToPartyWindow_Default2, 0x0d280316, 0x08200c1e, 0x08080c3e, 0x08180c66, 0x08180c75, 0x03300a58, 0x1040044d
 
 	.align 2
 gUnknown_08615704:: @ 8615704

include/party_menu.h

@@ -27,10 +27,10 @@ enum
 };
 
 struct Struct203CEC8 {
-    MainCallback unk0;
+    MainCallback exitCallback;
     TaskFunc unk4;
     u8 unk8_0:4;
-    u8 unk8_1:2;
+    u8 mode:2;
     u8 unk8_2:2;
     s8 unk9;
     s8 unkA;

include/pokemon_storage_system.h

@@ -84,5 +84,6 @@ u32 GetBoxMonDataFromAnyBox(u8 boxId, u8 monPosition, u32 request);
 bool8 CheckFreePokemonStorageSpace(void);
 u8 StorageGetCurrentBox(void);
 u8 sub_80D214C(struct BoxPokemon *a, u8 b, u8 c, u8 d);
+bool32 sub_80D23A8(u16 move);
 
 #endif // GUARD_POKEMON_STORAGE_SYSTEM_H

include/pokemon_summary_screen.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
+extern u8 gUnknown_0203CF20;
+
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void sub_81C4F98(u8, void(*)(void));
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);

ld_script.txt

@@ -277,7 +277,6 @@ SECTIONS {
         src/save_location.o(.text);
         src/item_icon.o(.text);
         src/party_menu.o(.text);
-        asm/party_menu.o(.text);
         src/battle_tent.o(.text);
         src/unk_text_util_2.o(.text);
         src/multiboot.o(.text);

src/battle_script_commands.c

@@ -59,7 +59,7 @@ extern void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocat
 extern void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s
 extern u8* GetMonNickname(struct Pokemon* mon, u8* dst); // party_menu
 extern void sub_81B8E80(u8 battlerId, u8, u8); // party menu
-extern bool8 sub_81B1250(void); // ?
+extern bool8 IsMultiBattle(void); // ?
 extern u8 sub_813B21C(void);
 extern u16 get_unknown_box_id(void);
 
@@ -7609,7 +7609,7 @@ static void atk8F_forcerandomswitch(void)
             }
             *(gBattleStruct->monToSwitchIntoId + gBattlerTarget) = i;
 
-            if (!sub_81B1250())
+            if (!IsMultiBattle())
                 sub_803BDA0(gBattlerTarget);
 
             if ((gBattleTypeFlags & BATTLE_TYPE_LINK && gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER)

src/pokemon_summary_screen.c

@@ -129,7 +129,7 @@ struct UnkStruct_61CC04
 };
 
 // forward declarations
-bool8 sub_81B1250(void);
+bool8 IsMultiBattle(void);
 static bool8 SummaryScreen_LoadGraphics(void);
 static void SummaryScreen_LoadingCB2(void);
 static void InitBGs(void);
@@ -1500,7 +1500,7 @@ static void sub_81C0604(u8 taskId, s8 a)
             }
             r4_2 = sub_80D214C(pssData->monList.boxMons, pssData->curMonIndex, pssData->maxMonIndex, a);
         }
-        else if (sub_81B1250() == 1)
+        else if (IsMultiBattle() == 1)
         {
             r4_2 = sub_81C09B4(a);
         }
@@ -3254,7 +3254,7 @@ static void PrintHeldItemName(void)
     const u8 *text;
     int offset;
 
-    if (pssData->summary.item == ITEM_ENIGMA_BERRY && sub_81B1250() == TRUE && (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5))
+    if (pssData->summary.item == ITEM_ENIGMA_BERRY && IsMultiBattle() == TRUE && (pssData->curMonIndex == 1 || pssData->curMonIndex == 4 || pssData->curMonIndex == 5))
     {
         text = ItemId_GetName(ITEM_ENIGMA_BERRY);
     }

sym_ewram.txt

@@ -362,49 +362,7 @@ gUnknown_0203CD88: @ 203CD88
 	.include "src/list_menu.o"
 	.include "src/dynamic_placeholder_text_util.o"
 	.include "src/item_icon.o"
-
+	.include "src/party_menu.o"
-gUnknown_0203CEC4: @ 203CEC4
-	.space 0x4
-
-gUnknown_0203CEC8: @ 203CEC8
-	.space 0xE
-
-gUnknown_0203CED6: @ 203CED6
-	.space 0x6
-
-gUnknown_0203CEDC: @ 203CEDC
-	.space 0x4
-
-gUnknown_0203CEE0: @ 203CEE0
-	.space 0x4
-
-gUnknown_0203CEE4: @ 203CEE4
-	.space 0x4
-
-gUnknown_0203CEE8: @ 203CEE8
-	.space 0x1
-
-gUnknown_0203CEE9: @ 203CEE9
-	.space 0x3
-
-gPostMenuFieldCallback: @ 203CEEC
-	.space 0x4
-
-gUnknown_0203CEF0: @ 203CEF0
-	.space 0x4
-
-gUnknown_0203CEF4: @ 203CEF4
-	.space 0x4
-
-gSelectedOrderFromParty: @ 203CEF8
-	.space 0x4
-
-gUnknown_0203CEFC: @ 203CEFC
-	.space 0x4
-
-gUnknown_0203CF00: @ 203CF00
-	.space 0x4
-
 	.include "src/fossil_specials.o"
 	.include "src/fldeff_groundshake.o"
 	.include "src/pokemon_summary_screen.o"