From 0de38858f641934699ce934e2bdb3dc1495baec9 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Fri, 16 Jun 2017 17:46:13 -0500
Subject: decompile sub_8121E10 - sub_8122838

---
 src/battle_party_menu.c | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

(limited to 'src/battle_party_menu.c')

diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 7b4eb0258..c2183e6bb 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -4,6 +4,7 @@
 #include "main.h"
 #include "menu.h"
 #include "palette.h"
+#include "party_menu.h"
 #include "pokemon.h"
 #include "songs.h"
 #include "sound.h"
@@ -12,28 +13,7 @@
 #include "task.h"
 #include "text.h"
 
-#define DATA_COUNT (6)
-
 extern u8 ewram[];
-
-struct Unk201B000
-{
-    //u8 filler0[0x260];
-    struct Pokemon unk0[6];
-    u8 filler258[1];
-    u8 unk259;
-    u8 filler25A[6];
-    u8 unk260;
-    u8 unk261;
-    u8 filler262[2];
-    s16 unk264[DATA_COUNT * 2];  // This may be a union
-    u8 filler27C[2];
-    s16 unk27E;
-    s16 unk280;
-    s16 unk282;
-};
-
-#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
 #define UNK_201606C_ARRAY (ewram + 0x1606C) // lazy define but whatever.
 
 extern u8 IsLinkDoubleBattle(void);
@@ -61,7 +41,7 @@ extern void sub_806C994();
 extern void sub_806BF74();
 extern void sub_806AEDC(void);
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
-extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(u8), int);
+extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int);
 extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
 extern u8 *sub_8040D08();
 extern void sub_8040B8C(void);
@@ -589,7 +569,7 @@ static void Task_8095330(u8 taskId)
     }
 }
 
-static void Task_809535C(u8 taskId)
+static void Task_809535C(void)
 {
     gPaletteFade.bufferTransferDisabled = TRUE;
     sub_806AF4C(1, 0xFF, SetUpBattlePokemonMenu, 5);
-- 
cgit v1.2.3


From 14b1a94d7266cc24447d34145decf818e930e747 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sat, 17 Jun 2017 21:38:01 -0500
Subject: finish decompiling choose_party

---
 src/battle_party_menu.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/battle_party_menu.c')

diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 074ebbce0..0fbe2b0e3 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -46,7 +46,6 @@ extern void sub_806C994();
 extern void sub_806BF74();
 extern void sub_806AEDC(void);
 extern TaskFunc PartyMenuGetPopupMenuFunc(u8, const struct PartyPopupMenu *, const struct PartyMenuItem *, u8);
-extern void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int);
 extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
 extern u8 *sub_8040D08();
 extern void sub_8040B8C(void);
-- 
cgit v1.2.3