summaryrefslogtreecommitdiff
path: root/src/battle_party_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_party_menu.c')
-rw-r--r--src/battle_party_menu.c76
1 files changed, 31 insertions, 45 deletions
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index 7b4eb0258..cf572642e 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -1,10 +1,16 @@
#include "global.h"
#include "battle_party_menu.h"
-#include "asm.h"
+#include "battle.h"
+#include "item_menu.h"
#include "main.h"
#include "menu.h"
+#include "menu_helpers.h"
#include "palette.h"
+#include "party_menu.h"
#include "pokemon.h"
+#include "pokemon_summary_screen.h"
+#include "rom_8077ABC.h"
+#include "rom_8094928.h"
#include "songs.h"
#include "sound.h"
#include "string_util.h"
@@ -12,28 +18,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 +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 (*)(u8), int);
extern void sub_806E7D0(u8, const struct PartyPopupMenu *);
extern u8 *sub_8040D08();
extern void sub_8040B8C(void);
@@ -73,9 +57,9 @@ extern u8 sub_803FBBC(void);
extern u16 gScriptItemId;
extern u8 gPlayerPartyCount;
-extern u8 gUnknown_02024A68;
-extern u16 gUnknown_02024A6A[];
-extern u8 gUnknown_02024E6C;
+extern u8 gNoOfAllBanks;
+extern u16 gBattlePartyID[];
+extern u8 gBankInMenu;
extern u8 gUnknown_0202E8F4;
extern u8 gUnknown_0202E8F5;
extern u8 gUnknown_0202E8F6;
@@ -84,11 +68,13 @@ extern u8 gUnknown_02038473;
extern u8 gUnknown_020384F0;
extern void (*gUnknown_03004AE4)(); //don't know types yet
extern struct PokemonStorage gPokemonStorage;
+extern void nullsub_14();
void sub_8094C98(u8, u8);
+u8 pokemon_order_func(u8);
+
static void sub_8094998(u8[3], u8);
static void sub_8094A74(u8[3], u8, u32);
-u8 pokemon_order_func(u8);
static void sub_8094D60(void);
static void Task_809527C(u8);
static void Task_80952B4(u8);
@@ -162,7 +148,7 @@ static void sub_8094998(u8 arg[3], u8 player_number)
if (!IsDoubleBattle())
{
pos = 1;
- *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)];
+ *temp = gBattlePartyID[GetBankByPlayerAI(0)];
for (i = 0; i <= 5; i++)
if (i != *temp)
temp[pos++] = i;
@@ -170,8 +156,8 @@ static void sub_8094998(u8 arg[3], u8 player_number)
else
{
pos = 2;
- *temp = gUnknown_02024A6A[battle_get_side_with_given_state(0)];
- temp[1] = gUnknown_02024A6A[battle_get_side_with_given_state(2)];
+ *temp = gBattlePartyID[GetBankByPlayerAI(0)];
+ temp[1] = gBattlePartyID[GetBankByPlayerAI(2)];
for (i = 0; i <= 5; i++)
if ((i != *temp) && (i != temp[1]))
temp[pos++] = i;
@@ -185,15 +171,15 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
{
int i, j;
u8 temp[6];
- if (!battle_side_get_owner(arg3))
+ if (!GetBankSide(arg3))
{
- i = battle_get_side_with_given_state(0);
- j = battle_get_side_with_given_state(2);
+ i = GetBankByPlayerAI(0);
+ j = GetBankByPlayerAI(2);
}
else
{
- i = battle_get_side_with_given_state(1);
- j = battle_get_side_with_given_state(3);
+ i = GetBankByPlayerAI(1);
+ j = GetBankByPlayerAI(3);
}
if (IsLinkDoubleBattle() == TRUE)
{
@@ -215,7 +201,7 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
if (!IsDoubleBattle())
{
int pos = 1;
- *temp = gUnknown_02024A6A[i];
+ *temp = gBattlePartyID[i];
for (i = 0; i <= 5; i++)
if (i != *temp)
temp[pos++] = i;
@@ -223,8 +209,8 @@ static void sub_8094A74(u8 arg[3], u8 player_number, u32 arg3)
else
{
int pos = 2;
- *temp = gUnknown_02024A6A[i];
- temp[1] = gUnknown_02024A6A[j];
+ *temp = gBattlePartyID[i];
+ temp[1] = gBattlePartyID[j];
for (i = 0; i <= 5; i++)
if ((i != *temp) && (i != temp[1]))
temp[pos++] = i;
@@ -589,7 +575,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);
@@ -701,10 +687,10 @@ static void Task_BattlePartyMenuShift(u8 taskId)
gTasks[taskId].func = Task_80954C0;
return;
}
- for (i = 0; i < gUnknown_02024A68; i++)
+ for (i = 0; i < gNoOfAllBanks; i++)
{
- if (battle_side_get_owner(i) == 0
- && sub_8094C20(partySelection) == gUnknown_02024A6A[i])
+ if (GetBankSide(i) == 0
+ && sub_8094C20(partySelection) == gBattlePartyID[i])
{
sub_806D5A4();
GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
@@ -742,10 +728,10 @@ static void Task_BattlePartyMenuShift(u8 taskId)
if (gUnknown_02038473 == 2)
{
u8 r0;
- u8 r4 = gUnknown_02024E6C;
+ u8 r4 = gBankInMenu;
sub_806D5A4();
- r0 = pokemon_order_func(gUnknown_02024A6A[r4]);
+ r0 = pokemon_order_func(gBattlePartyID[r4]);
GetMonNickname(&gPlayerParty[r0], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_CantBeSwitched);
sub_806E834(gStringVar4, 0);
@@ -754,7 +740,7 @@ static void Task_BattlePartyMenuShift(u8 taskId)
}
gUnknown_0202E8F5 = sub_8094C20(partySelection);
gUnknown_0202E8F4 = 1;
- r4 = pokemon_order_func(gUnknown_02024A6A[gUnknown_02024E6C]);
+ r4 = pokemon_order_func(gBattlePartyID[gBankInMenu]);
sub_8094C98(r4, partySelection);
sub_806E6F0(&gPlayerParty[r4], &gPlayerParty[partySelection]);
gTasks[taskId].func = Task_809527C;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 19:46:25 +0000