summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-06-29 14:10:24 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-06-29 14:10:24 -0400
commit4625c38ab21e1b8abd97411b62e4a3109b2cd66e (patch)
tree70472dac8ef6c0f1d969454bc2e8ca85f0c48ebd /src
parent5587dcd9e717b6ecb3232a7e6eefdfff1614a59c (diff)
Unify party_menu.h structs
Diffstat (limited to 'src')
-rw-r--r--src/battle_message.c6
-rw-r--r--src/battle_party_menu.c110
-rw-r--r--src/choose_party.c110
-rw-r--r--src/dewford_trend.c18
-rw-r--r--src/fldeff_softboiled.c71
-rw-r--r--src/item.c28
-rw-r--r--src/link.c2
-rw-r--r--src/party_menu.c441
-rw-r--r--src/pokemon_menu.c56
-rw-r--r--src/record_mixing.c66
-rw-r--r--src/script_pokemon_util_80F99CC.c80
-rw-r--r--src/secret_base.c2
-rw-r--r--src/tv.c12
13 files changed, 489 insertions, 513 deletions
diff --git a/src/battle_message.c b/src/battle_message.c
index b8872163b..5cecc6964 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -504,10 +504,10 @@ extern u8 *de_sub_8041024(s32, u32);
StringGetEnd10(text); \
toCpy = text;
#else
-#define HANDLE_NICKNAME_STRING_CASE(bank, monIndex) \
+#define HANDLE_NICKNAME_STRING_CASE(bank, pmMonIndex) \
if (GetBattlerSide(bank) != 0) \
{ \
- GetMonData(&gEnemyParty[monIndex], MON_DATA_NICKNAME, text); \
+ GetMonData(&gEnemyParty[pmMonIndex], MON_DATA_NICKNAME, text); \
StringGetEnd10(text); \
toCpy = text; \
while (*toCpy != EOS) \
@@ -523,7 +523,7 @@ extern u8 *de_sub_8041024(s32, u32);
} \
else \
{ \
- GetMonData(&gPlayerParty[monIndex], MON_DATA_NICKNAME, text); \
+ GetMonData(&gPlayerParty[pmMonIndex], MON_DATA_NICKNAME, text); \
StringGetEnd10(text); \
toCpy = text; \
}
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c
index e0e455811..3bda9d3a6 100644
--- a/src/battle_party_menu.c
+++ b/src/battle_party_menu.c
@@ -36,7 +36,7 @@ extern u16 gBattlerPartyIndexes[];
extern u8 gBankInMenu;
extern u8 gUnknown_0202E8F4;
extern u8 gUnknown_0202E8F5;
-extern u8 gUnknown_0202E8F6;
+extern u8 gPartyMenuMessage_IsPrinting;
extern u8 gUnknown_02038470[3];
extern u8 gUnknown_02038473;
extern u8 gUnknown_020384F0;
@@ -345,83 +345,83 @@ void sub_8094E4C(void)
bool8 SetUpBattlePartyMenu(void)
{
- switch (EWRAM_1B000.setupState)
+ switch (ewram1B000.pmSetupState)
//switch (ewram1B000.unk264[0])
{
case 0:
//TODO: try to get rid of this duplicate code
if (IsLinkDoubleBattle() == TRUE)
{
- if (EWRAM_1B000.monIndex != 6)
+ if (ewram1B000.pmMonIndex != 6)
{
- TryCreatePartyMenuMonIcon(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex, &gPlayerParty[EWRAM_1B000.monIndex]);
- EWRAM_1B000.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
}
else
{
- if (EWRAM_1B000.monIndex < 6)
+ if (ewram1B000.pmMonIndex < 6)
{
- TryCreatePartyMenuMonIcon(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex, &gPlayerParty[EWRAM_1B000.monIndex]);
- EWRAM_1B000.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
}
break;
case 1:
LoadHeldItemIconGraphics();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(EWRAM_1B000.menuHandlerTaskId);
- EWRAM_1B000.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex) == 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) == 1)
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
else
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
break;
case 4:
PartyMenuPrintMonsLevelOrStatus();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
PartyMenuTryPrintMonsHP();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7:
nullsub_13();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 8:
PartyMenuDrawHPBars();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 9:
- if (DrawPartyMonBackground(EWRAM_1B000.monIndex) == 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) == 1)
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
else
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
break;
case 10:
if (gUnknown_02038473 == 3)
@@ -442,19 +442,19 @@ static void sub_8095050(u8 a, u8 b)
{
if (gUnknown_02038473 == 1)
{
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[4] = 1;
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[5] = 1;
+ gTasks[ewram1B000.menuHandlerTaskId].data[4] = 1;
+ gTasks[ewram1B000.menuHandlerTaskId].data[5] = 1;
}
else
{
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[4] = 0;
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[5] = 0;
+ gTasks[ewram1B000.menuHandlerTaskId].data[4] = 0;
+ gTasks[ewram1B000.menuHandlerTaskId].data[5] = 0;
}
}
else
{
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[4] = 2;
- gTasks[EWRAM_1B000.menuHandlerTaskId].data[5] = 2;
+ gTasks[ewram1B000.menuHandlerTaskId].data[4] = 2;
+ gTasks[ewram1B000.menuHandlerTaskId].data[5] = 2;
}
ShowPartyPopupMenu(gTasks[a].data[4], sBattlePartyPopupMenus, sBattlePartyMenuActions, 0);
@@ -479,7 +479,7 @@ void HandleBattlePartyMenu(u8 taskId)
PlaySE(SE_FAILURE);
else
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
gPokemonItemUseCallback(taskId, gSpecialVar_ItemId, Task_80952E4);
}
}
@@ -563,11 +563,11 @@ static void Task_809538C(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gUnknown_020384F0);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gUnknown_020384F0);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
GetMonNickname(&gPlayerParty[gUnknown_020384F0], gStringVar1);
- sub_8095050(EWRAM_1B000.menuHandlerTaskId, gUnknown_020384F0);
- SetTaskFuncWithFollowupFunc(EWRAM_1B000.menuHandlerTaskId, Task_HandlePopupMenuInput, HandleBattlePartyMenu);
+ sub_8095050(ewram1B000.menuHandlerTaskId, gUnknown_020384F0);
+ SetTaskFuncWithFollowupFunc(ewram1B000.menuHandlerTaskId, Task_HandlePopupMenuInput, HandleBattlePartyMenu);
SetMainCallback2(CB2_PartyMenuMain);
return;
}
@@ -613,7 +613,7 @@ static void Task_HandlePopupMenuInput(u8 taskId)
static void Task_80954C0(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
Task_BattlePartyMenuCancel(taskId);
}
@@ -624,7 +624,7 @@ static void Task_ShowSummaryScreen(u8 taskId)
if (!gPaletteFade.active)
{
DestroyTask(taskId);
- EWRAM_1B000.unk262 = 1;
+ ewram1B000.unk262 = 1;
ShowPokemonSummaryScreen(gPlayerParty, partySelection, gPlayerPartyCount - 1, Task_809535C, PSS_MODE_NO_MOVE_ORDER_EDIT);
}
}
@@ -646,19 +646,19 @@ static void Task_BattlePartyMenuShift(u8 taskId)
partySelection = sub_806CA38(taskId);
if (IsLinkDoubleBattle() == TRUE && (partySelection == 1 || partySelection == 4 || partySelection == 5))
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
StringCopy(gStringVar1, sub_8040D08());
StringExpandPlaceholders(gStringVar4, gOtherText_CantSwitchPokeWithYours);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
if (GetMonData(&gPlayerParty[partySelection], MON_DATA_HP) == 0)
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_NoEnergyLeft);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
@@ -667,36 +667,36 @@ static void Task_BattlePartyMenuShift(u8 taskId)
if (GetBattlerSide(i) == 0
&& sub_8094C20(partySelection) == gBattlerPartyIndexes[i])
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_AlreadyBattle);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
}
if (GetMonData(&gPlayerParty[partySelection], MON_DATA_IS_EGG))
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
StringExpandPlaceholders(gStringVar4, gOtherText_EGGCantBattle);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
if (sub_8094C20(partySelection) == EWRAM_1609D)
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
GetMonNickname(&gPlayerParty[partySelection], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_AlreadySelected);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
if (gUnknown_02038473 == 4)
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
sub_8040B8C();
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
@@ -705,11 +705,11 @@ static void Task_BattlePartyMenuShift(u8 taskId)
u8 r0;
u8 r4 = gBankInMenu;
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
r0 = pokemon_order_func(gBattlerPartyIndexes[r4]);
GetMonNickname(&gPlayerParty[r0], gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_CantBeSwitched);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
gTasks[taskId].func = Task_80954C0;
return;
}
diff --git a/src/choose_party.c b/src/choose_party.c
index 5ed637910..1572f3f62 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -24,7 +24,7 @@ extern u8 gPlayerPartyCount;
extern u8 gLastFieldPokeMenuOpened;
extern u8 gUnknown_020384F0;
extern struct MultiBattlePokemonTx gMultiPartnerParty[3];
-extern u8 gUnknown_0202E8F6;
+extern u8 gPartyMenuMessage_IsPrinting;
extern const u16 gBattleTowerBannedSpecies[];
EWRAM_DATA u8 gSelectedOrderFromParty[3] = {0};
@@ -80,46 +80,46 @@ bool8 SetupBattleTowerPartyMenu(void)
{
u8 i;
- switch (ewram1B000_alt.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- if (ewram1B000_alt.monIndex < gPlayerPartyCount)
+ if (ewram1B000.pmMonIndex < gPlayerPartyCount)
{
- TryCreatePartyMenuMonIcon(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex, &gPlayerParty[ewram1B000_alt.monIndex]);
- ewram1B000_alt.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 1:
LoadHeldItemIconGraphics();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(ewram1B000_alt.menuHandlerTaskId);
- ewram1B000_alt.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex) == 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) == 1)
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
else
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
}
break;
case 4:
PartyMenuPrintMonsLevelOrStatus();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
for (i = 0; i < gPlayerPartyCount; i++)
@@ -142,18 +142,18 @@ bool8 SetupBattleTowerPartyMenu(void)
DrawMonDescriptorStatus(i, 0x7E);
}
}
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7:
- if (DrawPartyMonBackground(ewram1B000_alt.monIndex) == 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) == 1)
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState = 0;
return TRUE;
}
else
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
}
break;
}
@@ -203,13 +203,13 @@ static u8 sub_81220C8(void)
{
u8 j;
- ewram1B000.unk282 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_SPECIES);
- ewram1B000.unk280 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_HELD_ITEM);
+ ewram1B000.pmUnk282 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_SPECIES);
+ ewram1B000.pmUnk280 = GetMonData(&gPlayerParty[gSelectedOrderFromParty[i] - 1], MON_DATA_HELD_ITEM);
for (j = i + 1; j < 3; j++)
{
- if (ewram1B000.unk282 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_SPECIES))
+ if (ewram1B000.pmUnk282 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_SPECIES))
return 0x12;
- if (ewram1B000.unk280 != 0 && ewram1B000.unk280 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_HELD_ITEM))
+ if (ewram1B000.pmUnk280 != 0 && ewram1B000.pmUnk280 == GetMonData(&gPlayerParty[gSelectedOrderFromParty[j] - 1], MON_DATA_HELD_ITEM))
return 0x13;
}
}
@@ -463,14 +463,14 @@ static void BattleTowerEntryMenuCallback_Enter(u8 taskId)
PlaySE(SE_FAILURE);
Menu_EraseWindowRect(20, 10, 29, 19);
Menu_DestroyCursor();
- sub_806D5A4();
- sub_806E834(gOtherText_NoMoreThreePoke, 1);
+ PartyMenuEraseMsgBoxAndFrame();
+ DisplayPartyMenuMessage(gOtherText_NoMoreThreePoke, 1);
gTasks[taskId].func = sub_8122728;
}
static void sub_8122728(u8 taskId)
{
- if (gUnknown_0202E8F6 == 1)
+ if (gPartyMenuMessage_IsPrinting == 1)
return;
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
@@ -557,23 +557,23 @@ void Debug_CopyLastThreePartyMonsToMultiPartnerParty(void)
bool8 SetupLinkMultiBattlePartyMenu(void)
{
- switch (ewram1B000_alt.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- sub_81228E8(ewram1B000_alt.menuHandlerTaskId);
- ewram1B000_alt.setupState++;
+ sub_81228E8(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 1:
LoadHeldItemIconGraphics();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- sub_8122950(ewram1B000_alt.menuHandlerTaskId);
- ewram1B000_alt.setupState++;
+ sub_8122950(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
sub_81229B8();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 4:
sub_806B908();
@@ -707,61 +707,61 @@ static void sub_8122C18(u8 taskId)
// Exactly the same as SetupBattleTowerPartyMenu except for case 6
bool8 unref_sub_8122C60(void)
{
- switch (ewram1B000_alt.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- if (ewram1B000_alt.monIndex < gPlayerPartyCount)
+ if (ewram1B000.pmMonIndex < gPlayerPartyCount)
{
- TryCreatePartyMenuMonIcon(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex, &gPlayerParty[ewram1B000_alt.monIndex]);
- ewram1B000_alt.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 1:
LoadHeldItemIconGraphics();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(ewram1B000_alt.menuHandlerTaskId);
- ewram1B000_alt.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex) == 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) == 1)
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
else
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
}
break;
case 4:
PartyMenuPrintMonsLevelOrStatus();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
sub_806BCE8();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7:
- if (DrawPartyMonBackground(ewram1B000_alt.monIndex) == 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) == 1)
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState = 0;
return TRUE;
}
else
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
}
break;
}
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 9afb7a16d..bd6f6ce43 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -161,7 +161,7 @@ static void sub_80FA46C(struct EasyChatPair *s, u16 b, u8 c)
}
}
-void sub_80FA4E4(void *a, u32 b, u8 unused)
+void ReceiveDewfordTrendData(void * a, u32 b, u8 unused)
{
u16 i;
u16 j;
@@ -171,9 +171,9 @@ void sub_80FA4E4(void *a, u32 b, u8 unused)
u16 players = GetLinkPlayerCount();
for (i = 0; i < players; i++)
- memcpy(&ARRAY_2007800[i * 5], (u8 *)a + i * b, 40);
- src = ARRAY_2007800;
- dst = ARRAY_2007900;
+ memcpy(&eLinkedDewfordTrendsBuffer[i * 5], (u8 *)a + i * b, 40);
+ src = eLinkedDewfordTrendsBuffer;
+ dst = eSavedDewfordTrendsBuffer;
r7 = 0;
for (i = 0; i < players; i++)
{
@@ -187,16 +187,16 @@ void sub_80FA4E4(void *a, u32 b, u8 unused)
}
else
{
- if (ARRAY_2007900[foo].unk0_0 < src->unk0_0)
+ if (eSavedDewfordTrendsBuffer[foo].unk0_0 < src->unk0_0)
{
- ARRAY_2007900[foo] = *src;
+ eSavedDewfordTrendsBuffer[foo] = *src;
}
}
src++;
}
}
- sub_80FA46C(ARRAY_2007900, r7, 2);
- src = ARRAY_2007900;
+ sub_80FA46C(eSavedDewfordTrendsBuffer, r7, 2);
+ src = eSavedDewfordTrendsBuffer;
dst = gSaveBlock1.easyChatPairs;
for (i = 0; i < 5; i++)
*(dst++) = *(src++);
@@ -320,7 +320,7 @@ static bool8 IsEasyChatPairEqual(u16 *words1, u16 *words2)
static s16 sub_80FA828(struct EasyChatPair *a, u16 b)
{
s16 i;
- struct EasyChatPair *s = ARRAY_2007900;
+ struct EasyChatPair *s = eSavedDewfordTrendsBuffer;
for (i = 0; i < b; i++)
{
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 1c1285ad9..b61b78f69 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -11,18 +11,10 @@
#include "task.h"
#include "ewram.h"
-struct Struct2001000 {
- u8 unk0;
- u8 unk1;
- u8 unk2;
- u8 filler3[9];
- void *unkC;
-};
-
struct Struct201C000 {
- struct Pokemon *unk0;
+ struct Pokemon *monPointer;
u8 filler4[1];
- u8 unk5;
+ u8 donorMonId;
u16 unk6;
u8 filler8[4];
s32 unkC;
@@ -40,14 +32,14 @@ struct Struct201C000 {
#endif
// extern
-extern u8 gUnknown_0202E8F6;
+extern u8 gPartyMenuMessage_IsPrinting;
extern u8 gLastFieldPokeMenuOpened;
extern u8 gUnknown_0202E8F4;
// Static
static void sub_8133D50(u8 taskId);
-static void sub_8133E74(u8 taskId);
-static void sub_8133EB8(u8 taskId);
+static void Task_ChooseNewMonForSoftboiled(u8 taskId);
+static void CantUseSoftboiled(u8 taskId);
static void sub_8133EF8(void);
bool8 SetUpFieldMove_SoftBoiled(void) {
@@ -68,60 +60,59 @@ bool8 SetUpFieldMove_SoftBoiled(void) {
}
void sub_8133D28(u8 taskid) {
- EWRAM_1000.unkC = sub_8133D50;
- EWRAM_1B000_2.unk272 = 3;
+ ePartyMenu.unkC = sub_8133D50;
+ ewram1B000.pmUnk272 = 3;
DoPokemonMenu_Switch(taskid);
}
static void sub_8133D50(u8 taskId) {
- u8 unk1, unk2;
+ u8 userPartyId, recipientPartyId;
u16 hp;
struct Pokemon *pokemon;
//struct Task *task;
struct Sprite *sprites = gSprites;
+ userPartyId = sprites[ePartyMenu.slotId].data[0];
+ recipientPartyId = sprites[ePartyMenu.slotId2].data[0];
- unk1 = sprites[EWRAM_1000.unk1].data[0];
- unk2 = sprites[EWRAM_1000.unk2].data[0];
-
- if (unk1 > 5 || unk2 > 5)
+ if (userPartyId > 5 || recipientPartyId > 5)
{
sub_806CD44(taskId);
return;
}
- EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]];
- hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
+ EWRAM_1C000.monPointer = &gPlayerParty[sprites[ePartyMenu.slotId2].data[0]];
+ hp = GetMonData(EWRAM_1C000.monPointer, MON_DATA_HP);
- if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp)
+ if (hp == 0 || userPartyId == recipientPartyId || GetMonData(EWRAM_1C000.monPointer, MON_DATA_MAX_HP) == hp)
{
- sub_8133EB8(taskId);
+ CantUseSoftboiled(taskId);
return;
}
PlaySE(SE_USE_ITEM);
- EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0];
+ EWRAM_1C000.donorMonId = gSprites[ePartyMenu.slotId].data[0];
- pokemon = &gPlayerParty[EWRAM_1C000.unk5];
- EWRAM_1C000.unk0 = pokemon;
+ pokemon = &gPlayerParty[EWRAM_1C000.donorMonId];
+ EWRAM_1C000.monPointer = pokemon;
EWRAM_1C000.unk6 = 0;
EWRAM_1C000.unkC = -0x8000;
EWRAM_1C000.unk10 = sub_8133EF8;
- gTasks[taskId].data[10] = GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP);
- gTasks[taskId].data[11] = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP);
+ gTasks[taskId].data[10] = GetMonData(EWRAM_1C000.monPointer, MON_DATA_MAX_HP);
+ gTasks[taskId].data[11] = GetMonData(EWRAM_1C000.monPointer, MON_DATA_HP);
gTasks[taskId].data[12] = gTasks[taskId].data[10] / 5;
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
gTasks[taskId].func = sub_806FA18;
- EWRAM_1B000_2.unk282 = gTasks[taskId].data[11];
+ ewram1B000.pmUnk282 = gTasks[taskId].data[11];
}
-static void sub_8133E74(u8 taskId) {
- if (gUnknown_0202E8F6)
+static void Task_ChooseNewMonForSoftboiled(u8 taskId) {
+ if (gPartyMenuMessage_IsPrinting)
{
return;
}
@@ -131,18 +122,18 @@ static void sub_8133E74(u8 taskId) {
gTasks[taskId].func = HandlePartyMenuSwitchPokemonInput;
}
-static void sub_8133EB8(u8 taskId) {
+static void CantUseSoftboiled(u8 taskId) {
gUnknown_0202E8F4 = 0;
- sub_806D5A4();
- sub_806E834(gOtherText_CantUseOnPoke, 1);
- gTasks[taskId].func = sub_8133E74;
+ PartyMenuEraseMsgBoxAndFrame();
+ DisplayPartyMenuMessage(gOtherText_CantUseOnPoke, 1);
+ gTasks[taskId].func = Task_ChooseNewMonForSoftboiled;
}
static void sub_8133EF8(void) {
sub_806CCE4();
- EWRAM_1B000_2.unk261 = 2;
- DestroySprite(&gSprites[EWRAM_1000.unk1]);
+ ewram1B000.unk261 = 2;
+ DestroySprite(&gSprites[ePartyMenu.slotId]);
Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
PrintPartyMenuPromptText(0, 0);
- SwitchTaskToFollowupFunc(EWRAM_1000.unk0);
+ SwitchTaskToFollowupFunc(ePartyMenu.unk0);
}
diff --git a/src/item.c b/src/item.c
index 8483e6d3f..a7c7e5c40 100644
--- a/src/item.c
+++ b/src/item.c
@@ -30,26 +30,6 @@ struct Item
extern u8 gCurSelectedItemSlotIndex;
extern struct BagPocket gBagPockets[NUM_BAG_POCKETS];
-// These constants are used in gItems
-enum
-{
- POCKET_NONE,
- POCKET_ITEMS,
- POCKET_POKE_BALLS,
- POCKET_TM_HM,
- POCKET_BERRIES,
- POCKET_KEY_ITEMS,
-};
-
-enum
-{
- ITEMS_POCKET,
- BALLS_POCKET,
- TMHM_POCKET,
- BERRIES_POCKET,
- KEYITEMS_POCKET
-};
-
#if ENGLISH
#include "data/item_descriptions_en.h"
#include "data/items_en.h"
@@ -132,7 +112,7 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count)
if (ItemId_GetPocket(itemId) == 0)
return FALSE;
pocket = ItemId_GetPocket(itemId) - 1;
- if (pocket != BERRIES_POCKET)
+ if (pocket != POCKET_BERRIES - 1)
slotCapacity = 99;
else
slotCapacity = 999;
@@ -144,7 +124,7 @@ bool8 CheckBagHasSpace(u16 itemId, u16 count)
{
if (gBagPockets[pocket].itemSlots[i].quantity + count <= slotCapacity)
return TRUE;
- if (pocket == TMHM_POCKET || pocket == BERRIES_POCKET)
+ if (pocket == POCKET_TM_HM - 1 || pocket == POCKET_BERRIES - 1)
return FALSE;
count -= slotCapacity - gBagPockets[pocket].itemSlots[i].quantity;
if (count == 0)
@@ -186,7 +166,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
pocket = ItemId_GetPocket(itemId) - 1;
//Copy the bag pocket
memcpy(newItems, gBagPockets[pocket].itemSlots, gBagPockets[pocket].capacity * sizeof(struct ItemSlot));
- if (pocket != BERRIES_POCKET)
+ if (pocket != POCKET_BERRIES - 1)
slotCapacity = 99;
else
slotCapacity = 999;
@@ -203,7 +183,7 @@ bool8 AddBagItem(u16 itemId, u16 count)
memcpy(gBagPockets[pocket].itemSlots, newItems, gBagPockets[pocket].capacity * sizeof(struct ItemSlot));
return TRUE;
}
- if (pocket == TMHM_POCKET || pocket == BERRIES_POCKET)
+ if (pocket == POCKET_TM_HM - 1 || pocket == POCKET_BERRIES - 1)
return FALSE;
count -= slotCapacity - newItems[i].quantity;
newItems[i].quantity = slotCapacity;
diff --git a/src/link.c b/src/link.c
index 213f9f7e3..2c79cdf13 100644
--- a/src/link.c
+++ b/src/link.c
@@ -406,7 +406,7 @@ static void LinkTestProcessKeyInput(void)
if (gMain.newKeys & A_BUTTON)
gShouldAdvanceLinkState = 1;
if (gMain.heldKeys & B_BUTTON)
- InitBlockSend(ewram4000, 0x2004);
+ InitBlockSend(gSharedMem + 0x4000, 0x2004);
if (gMain.newKeys & L_BUTTON)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(2, 0, 0));
if (gMain.newKeys & START_BUTTON)
diff --git a/src/party_menu.c b/src/party_menu.c
index dcb2ba200..255a30fe0 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -74,7 +74,7 @@ static void PartyMenuTryPrintHP(u8 monIndex, struct Pokemon *pokemon);
static void sub_806D05C(u8 taskId);
static void sub_806D15C(u8 taskId);
static void sub_806D198(u8 taskId);
-static void sub_806E884(u8 taskId);
+static void Task_PartyMenuPrintRun(u8 taskId);
static void sub_8070D90(u8 taskId);
static void sub_806D5B8(u8 taskId);
static void sub_806D014(u8 taskId);
@@ -110,7 +110,7 @@ extern u16 Random();
EWRAM_DATA u8 gUnknown_0202E8F4 = 0;
EWRAM_DATA u8 gUnknown_0202E8F5 = 0;
-EWRAM_DATA u8 gUnknown_0202E8F6 = 0;
+EWRAM_DATA u8 gPartyMenuMessage_IsPrinting = 0;
EWRAM_DATA u16 gUnknown_0202E8F8 = 0;
EWRAM_DATA u8 gPartyMenuType = 0;
@@ -556,69 +556,69 @@ void OpenPartyMenu(u8 menuType, u8 battleFlags)
// This is a Task which is repeatedly called until it eventually returns TRUE when finished.
bool8 SetupDefaultPartyMenu(void)
{
- switch (ewram1B000_alt.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- if (ewram1B000_alt.monIndex < gPlayerPartyCount)
+ if (ewram1B000.pmMonIndex < gPlayerPartyCount)
{
- TryCreatePartyMenuMonIcon(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex, &gPlayerParty[ewram1B000_alt.monIndex]);
- ewram1B000_alt.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 1:
LoadHeldItemIconGraphics();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(ewram1B000_alt.menuHandlerTaskId);
- ewram1B000_alt.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(ewram1B000_alt.menuHandlerTaskId, ewram1B000_alt.monIndex) != 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) != 1)
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
}
else
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 4:
PartyMenuPrintMonsLevelOrStatus();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
PartyMenuTryPrintMonsHP();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7:
nullsub_13();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 8:
PartyMenuDrawHPBars();
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 9:
- if (DrawPartyMonBackground(ewram1B000_alt.monIndex) == 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) == 1)
{
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.setupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState = 0;
return TRUE;
}
else
{
- ewram1B000_alt.monIndex++;
+ ewram1B000.pmMonIndex++;
break;
}
}
@@ -644,9 +644,9 @@ bool8 InitPartyMenu(void)
break;
case 2:
sub_806B4A8();
- ewram1B000_alt.setupState = 0;
- ewram1B000_alt.monIndex = 0;
- ewram1B000_alt.unk268 = 0;
+ ewram1B000.pmSetupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmUnk268 = 0;
gMain.state++;
break;
case 3:
@@ -678,19 +678,19 @@ bool8 InitPartyMenu(void)
case 9:
if (MultistepLoadFont())
{
- ewram1B000_alt.setupState = 1;
+ ewram1B000.pmSetupState = 1;
gMain.state++;
}
break;
case 10:
- if (LoadPartyMenuGraphics(ewram1B000_alt.setupState) == TRUE)
+ if (LoadPartyMenuGraphics(ewram1B000.pmSetupState) == TRUE)
{
- ewram1B000_alt.setupState = 0;
+ ewram1B000.pmSetupState = 0;
gMain.state++;
}
else
{
- ewram1B000_alt.setupState++;
+ ewram1B000.pmSetupState++;
}
break;
case 11:
@@ -1801,25 +1801,25 @@ u8 sub_806CA38(u8 taskId)
void SetupDefaultPartyMenuSwitchPokemon(u8 taskId)
{
gTasks[taskId].func = TaskDummy;
- ewram01000.unk0 = taskId;
+ ePartyMenu.unk0 = taskId;
CreateTask(HandlePartyMenuSwitchPokemonInput, 0);
- ewram01000.unk1 = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
+ ePartyMenu.slotId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
- sub_806C9C4(taskId, ewram01000.unk1);
- ewram01000.unk2 = sub_806CA00(taskId);
+ sub_806C9C4(taskId, ePartyMenu.slotId);
+ ePartyMenu.slotId2 = sub_806CA00(taskId);
- PrintPartyMenuPromptText(ewram1B000_alt.unk272, 0);
+ PrintPartyMenuPromptText(ewram1B000.pmUnk272, 0);
- sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 6, 0);
+ sub_806BF24(&gUnknown_083769A8[gSprites[ePartyMenu.slotId].data[0] * 2], gSprites[ePartyMenu.slotId].data[0], 6, 0);
ewram1B000.unk261 = 2;
}
// Handles changing the the current mon selection when choosing mons to swap places.
void ChangePartyMenuSwitchPokemonSelection(u8 taskId, s16 menuDirectionPressed)
{
- struct Sprite *sprite1 = &gSprites[ewram01000.unk1];
- struct Sprite *sprite2 = &gSprites[ewram01000.unk2];
+ struct Sprite *sprite1 = &gSprites[ePartyMenu.slotId];
+ struct Sprite *sprite2 = &gSprites[ePartyMenu.slotId2];
ChangePartyMenuSelection(taskId, menuDirectionPressed);
@@ -1834,23 +1834,23 @@ void HandlePartyMenuSwitchPokemonInput(u8 taskId)
switch (gMain.newAndRepeatedKeys)
{
case DPAD_UP:
- ChangePartyMenuSwitchPokemonSelection(ewram01000.unk0, -1);
+ ChangePartyMenuSwitchPokemonSelection(ePartyMenu.unk0, -1);
break;
case DPAD_DOWN:
- ChangePartyMenuSwitchPokemonSelection(ewram01000.unk0, 1);
+ ChangePartyMenuSwitchPokemonSelection(ePartyMenu.unk0, 1);
break;
case DPAD_LEFT:
- ChangePartyMenuSwitchPokemonSelection(ewram01000.unk0, -2);
+ ChangePartyMenuSwitchPokemonSelection(ePartyMenu.unk0, -2);
break;
case DPAD_RIGHT:
- ChangePartyMenuSwitchPokemonSelection(ewram01000.unk0, 2);
+ ChangePartyMenuSwitchPokemonSelection(ePartyMenu.unk0, 2);
break;
}
if (gMain.newKeys & A_BUTTON)
{
PlaySE(5);
- gTasks[taskId].func = ewram01000.unkC;
+ gTasks[taskId].func = ePartyMenu.unkC;
gTasks[taskId].func(taskId);
}
else if (gMain.newKeys == B_BUTTON)
@@ -1862,25 +1862,25 @@ void HandlePartyMenuSwitchPokemonInput(u8 taskId)
void sub_806CC2C(u8 taskId)
{
- DestroySprite(&gSprites[ewram01000.unk1]);
+ DestroySprite(&gSprites[ePartyMenu.slotId]);
PrintPartyMenuPromptText(0, 0);
ewram1B000.unk261 = 2;
- SwitchTaskToFollowupFunc(ewram01000.unk0);
+ SwitchTaskToFollowupFunc(ePartyMenu.unk0);
DestroyTask(taskId);
}
void sub_806CC74(u8 taskId)
{
- sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk2].data[0] * 2], gSprites[ewram01000.unk2].data[0], 3, 1);
- sub_806BF24(&gUnknown_083769A8[gSprites[ewram01000.unk1].data[0] * 2], gSprites[ewram01000.unk1].data[0], 3, 0);
+ sub_806BF24(&gUnknown_083769A8[gSprites[ePartyMenu.slotId2].data[0] * 2], gSprites[ePartyMenu.slotId2].data[0], 3, 1);
+ sub_806BF24(&gUnknown_083769A8[gSprites[ePartyMenu.slotId].data[0] * 2], gSprites[ePartyMenu.slotId].data[0], 3, 0);
sub_806CC2C(taskId);
}
void sub_806CCE4()
{
- u8 monIndex1 = gSprites[ewram01000.unk1].data[0];
- u8 monIndex2 = gSprites[ewram01000.unk2].data[0];
+ u8 monIndex1 = gSprites[ePartyMenu.slotId].data[0];
+ u8 monIndex2 = gSprites[ePartyMenu.slotId2].data[0];
if (monIndex1 <= 5)
sub_806BF24(&gUnknown_083769A8[monIndex1 * 2], monIndex1, 3, 0);
@@ -1896,8 +1896,8 @@ void sub_806CD44(u8 taskId)
void sub_806CD5C(u8 taskId)
{
- u8 monIndex1 = gSprites[ewram01000.unk1].data[0];
- u8 monIndex2 = gSprites[ewram01000.unk2].data[0];
+ u8 monIndex1 = gSprites[ePartyMenu.slotId].data[0];
+ u8 monIndex2 = gSprites[ePartyMenu.slotId2].data[0];
if (monIndex1 == monIndex2 || monIndex1 == 7 || monIndex2 == 7)
{
@@ -1912,48 +1912,48 @@ void sub_806CD5C(u8 taskId)
if (monIndex1 > monIndex2)
{
- ewram01000.unk5 = monIndex2;
- ewram01000.unk6 = monIndex1;
+ ePartyMenu.unk5 = monIndex2;
+ ePartyMenu.unk6 = monIndex1;
}
else
{
- ewram01000.unk5 = monIndex1;
- ewram01000.unk6 = monIndex2;
+ ePartyMenu.unk5 = monIndex1;
+ ePartyMenu.unk6 = monIndex2;
}
- ewram01000.unk3 = GetMonIconSpriteId(ewram01000.unk0, ewram01000.unk5);
- ewram01000.unk4 = GetMonIconSpriteId(ewram01000.unk0, ewram01000.unk6);
+ ePartyMenu.unk3 = GetMonIconSpriteId(ePartyMenu.unk0, ePartyMenu.unk5);
+ ePartyMenu.unk4 = GetMonIconSpriteId(ePartyMenu.unk0, ePartyMenu.unk6);
- var1 = ewram01000.unk5;
+ var1 = ePartyMenu.unk5;
if (!var1)
{
- gSprites[ewram01000.unk3].data[0] = -8;
- gSprites[ewram01000.unk3].data[2] = -0xA8;
- ewram01000.unk8 = var1;
- ewram01000.unkA = 11;
+ gSprites[ePartyMenu.unk3].data[0] = -8;
+ gSprites[ePartyMenu.unk3].data[2] = -0xA8;
+ ePartyMenu.unk8 = var1;
+ ePartyMenu.unkA = 11;
gTasks[taskId].func = sub_806D014;
ewram1B000.unk261 = 1;
}
else
{
- gSprites[ewram01000.unk3].data[0] = 8;
- gSprites[ewram01000.unk3].data[2] = 0xA8;
- ewram01000.unk8 = 11;
- ewram01000.unkA = 11;
+ gSprites[ePartyMenu.unk3].data[0] = 8;
+ gSprites[ePartyMenu.unk3].data[2] = 0xA8;
+ ePartyMenu.unk8 = 11;
+ ePartyMenu.unkA = 11;
gTasks[taskId].func = sub_806D118;
ewram1B000.unk261 = 1;
}
- gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
+ gSprites[ePartyMenu.unk3].callback = SpriteCB_sub_806D37C;
- gSprites[ewram01000.unk4].data[0] = 8;
- gSprites[ewram01000.unk4].data[2] = 0xA8;
- gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
+ gSprites[ePartyMenu.unk4].data[0] = 8;
+ gSprites[ePartyMenu.unk4].data[2] = 0xA8;
+ gSprites[ePartyMenu.unk4].callback = SpriteCB_sub_806D37C;
- gSprites[ewram01000.unk3].callback(&gSprites[ewram01000.unk3]);
- gSprites[ewram01000.unk4].callback(&gSprites[ewram01000.unk4]);
+ gSprites[ePartyMenu.unk3].callback(&gSprites[ePartyMenu.unk3]);
+ gSprites[ePartyMenu.unk4].callback(&gSprites[ePartyMenu.unk4]);
}
}
@@ -1966,42 +1966,42 @@ void SwapValues_s16(s16 *a, s16 *b)
void sub_806CF04(void)
{
- SwapValues_s16(&gSprites[ewram01000.unk3].x, &gSprites[ewram01000.unk4].x);
- SwapValues_s16(&gSprites[ewram01000.unk3].y, &gSprites[ewram01000.unk4].y);
- SwapValues_s16(&gSprites[ewram01000.unk3].x2, &gSprites[ewram01000.unk4].x2);
- SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]);
+ SwapValues_s16(&gSprites[ePartyMenu.unk3].x, &gSprites[ePartyMenu.unk4].x);
+ SwapValues_s16(&gSprites[ePartyMenu.unk3].y, &gSprites[ePartyMenu.unk4].y);
+ SwapValues_s16(&gSprites[ePartyMenu.unk3].x2, &gSprites[ePartyMenu.unk4].x2);
+ SwapValues_s16(&gSprites[ePartyMenu.unk3].data[0], &gSprites[ePartyMenu.unk4].data[0]);
- gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
- gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
+ gSprites[ePartyMenu.unk3].callback = SpriteCB_sub_806D37C;
+ gSprites[ePartyMenu.unk4].callback = SpriteCB_sub_806D37C;
}
void sub_806CFA0(u8 taskId, u8 b)
{
- u8 var1 = ((ewram01000.unk6 - 1) * 3) + 1;
+ u8 var1 = ((ePartyMenu.unk6 - 1) * 3) + 1;
- sub_806BA34(ewram01000.unk8, 3);
- sub_806BB3C(ewram01000.unkA, var1);
+ sub_806BA34(ePartyMenu.unk8, 3);
+ sub_806BB3C(ePartyMenu.unkA, var1);
if (!b)
{
- ewram01000.unk8--;
- ewram01000.unkA++;
+ ePartyMenu.unk8--;
+ ePartyMenu.unkA++;
}
else
{
- ewram01000.unk8++;
- ewram01000.unkA--;
+ ePartyMenu.unk8++;
+ ePartyMenu.unkA--;
}
- sub_806B9A4(ewram01000.unk8, 3, 10);
- sub_806BA94(ewram01000.unkA, var1, 0, 10);
+ sub_806B9A4(ePartyMenu.unk8, 3, 10);
+ sub_806BA94(ePartyMenu.unkA, var1, 0, 10);
}
void sub_806D014(u8 taskId)
{
sub_806CFA0(taskId, 0);
- if (ewram01000.unk8 < -13 && ewram01000.unkA > 32)
+ if (ePartyMenu.unk8 < -13 && ePartyMenu.unkA > 32)
{
sub_806CF04();
gTasks[taskId].func = sub_806D05C;
@@ -2012,38 +2012,38 @@ void sub_806D05C(u8 taskId)
{
sub_806CFA0(taskId, 1);
- if (ewram01000.unk8 == 0 && ewram01000.unkA == 11)
+ if (ePartyMenu.unk8 == 0 && ePartyMenu.unkA == 11)
gTasks[taskId].func = sub_806D198;
}
void sub_806D098(u8 a, u8 b)
{
- u8 var1 = ((ewram01000.unk5 - 1) * 3) + 1;
- u8 var2 = ((ewram01000.unk6 - 1) * 3) + 1;
+ u8 var1 = ((ePartyMenu.unk5 - 1) * 3) + 1;
+ u8 var2 = ((ePartyMenu.unk6 - 1) * 3) + 1;
- sub_806BB3C(ewram01000.unk8, var1);
- sub_806BB3C(ewram01000.unkA, var2);
+ sub_806BB3C(ePartyMenu.unk8, var1);
+ sub_806BB3C(ePartyMenu.unkA, var2);
if (!b)
{
- ewram01000.unk8++;
- ewram01000.unkA++;
+ ePartyMenu.unk8++;
+ ePartyMenu.unkA++;
}
else
{
- ewram01000.unk8--;
- ewram01000.unkA--;
+ ePartyMenu.unk8--;
+ ePartyMenu.unkA--;
}
- sub_806BA94(ewram01000.unk8, var1, 0, 10);
- sub_806BA94(ewram01000.unkA, var2, 0, 10);
+ sub_806BA94(ePartyMenu.unk8, var1, 0, 10);
+ sub_806BA94(ePartyMenu.unkA, var2, 0, 10);
}
void sub_806D118(u8 taskId)
{
sub_806D098(taskId, 0);
- if (ewram01000.unk8 > 32 && ewram01000.unkA > 32)
+ if (ePartyMenu.unk8 > 32 && ePartyMenu.unkA > 32)
{
sub_806CF04();
gTasks[taskId].func = sub_806D15C;
@@ -2054,7 +2054,7 @@ void sub_806D15C(u8 taskId)
{
sub_806D098(taskId, 1);
- if (ewram01000.unk8 == 11 && ewram01000.unkA == 11)
+ if (ePartyMenu.unk8 == 11 && ePartyMenu.unkA == 11)
gTasks[taskId].func = sub_806D198;
}
@@ -2062,35 +2062,35 @@ void sub_806D198(u8 taskId)
{
u8 spriteId;
- SetMonIconSpriteId(ewram01000.unk0, ewram01000.unk5, ewram01000.unk4);
- SetMonIconSpriteId(ewram01000.unk0, ewram01000.unk6, ewram01000.unk3);
+ SetMonIconSpriteId(ePartyMenu.unk0, ePartyMenu.unk5, ePartyMenu.unk4);
+ SetMonIconSpriteId(ePartyMenu.unk0, ePartyMenu.unk6, ePartyMenu.unk3);
- gSprites[ewram01000.unk3].x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].x;
- gSprites[ewram01000.unk3].y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk6].y;
- gSprites[ewram01000.unk3].x2 = 0;
- gSprites[ewram01000.unk3].y2 = 0;
- gSprites[ewram01000.unk3].callback = UpdateMonIconFrame_806DA38;
+ gSprites[ePartyMenu.unk3].x = gUnknown_08376678[IsDoubleBattle()][ePartyMenu.unk6].x;
+ gSprites[ePartyMenu.unk3].y = gUnknown_08376678[IsDoubleBattle()][ePartyMenu.unk6].y;
+ gSprites[ePartyMenu.unk3].x2 = 0;
+ gSprites[ePartyMenu.unk3].y2 = 0;
+ gSprites[ePartyMenu.unk3].callback = UpdateMonIconFrame_806DA38;
- gSprites[ewram01000.unk4].x = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].x;
- gSprites[ewram01000.unk4].y = gUnknown_08376678[IsDoubleBattle()][ewram01000.unk5].y;
- gSprites[ewram01000.unk4].x2 = 0;
- gSprites[ewram01000.unk4].y2 = 0;
- gSprites[ewram01000.unk4].callback = UpdateMonIconFrame_806DA38;
+ gSprites[ePartyMenu.unk4].x = gUnknown_08376678[IsDoubleBattle()][ePartyMenu.unk5].x;
+ gSprites[ePartyMenu.unk4].y = gUnknown_08376678[IsDoubleBattle()][ePartyMenu.unk5].y;
+ gSprites[ePartyMenu.unk4].x2 = 0;
+ gSprites[ePartyMenu.unk4].y2 = 0;
+ gSprites[ePartyMenu.unk4].callback = UpdateMonIconFrame_806DA38;
- spriteId = GetMonIconSpriteId(ewram01000.unk0, gSprites[ewram01000.unk2].data[0]);
+ spriteId = GetMonIconSpriteId(ePartyMenu.unk0, gSprites[ePartyMenu.slotId2].data[0]);
gSprites[spriteId].callback = UpdateMonIconFrame_806DA0C;
- SwapPokemon(&gPlayerParty[ewram01000.unk5], &gPlayerParty[ewram01000.unk6]);
+ SwapPokemon(&gPlayerParty[ePartyMenu.unk5], &gPlayerParty[ePartyMenu.unk6]);
- PartyMenuPrintMonLevelOrStatus(ewram01000.unk5, &gPlayerParty[ewram01000.unk5]);
- TryPrintPartyMenuMonNickname(ewram01000.unk5, &gPlayerParty[ewram01000.unk5]);
- PartyMenuTryPrintHP(ewram01000.unk5, &gPlayerParty[ewram01000.unk5]);
- nullsub_12(ewram01000.unk5, &gPlayerParty[ewram01000.unk5]);
+ PartyMenuPrintMonLevelOrStatus(ePartyMenu.unk5, &gPlayerParty[ePartyMenu.unk5]);
+ TryPrintPartyMenuMonNickname(ePartyMenu.unk5, &gPlayerParty[ePartyMenu.unk5]);
+ PartyMenuTryPrintHP(ePartyMenu.unk5, &gPlayerParty[ePartyMenu.unk5]);
+ nullsub_12(ePartyMenu.unk5, &gPlayerParty[ePartyMenu.unk5]);
- PartyMenuPrintMonLevelOrStatus(ewram01000.unk6, &gPlayerParty[ewram01000.unk6]);
- TryPrintPartyMenuMonNickname(ewram01000.unk6, &gPlayerParty[ewram01000.unk6]);
- PartyMenuTryPrintHP(ewram01000.unk6, &gPlayerParty[ewram01000.unk6]);
- nullsub_12(ewram01000.unk6, &gPlayerParty[ewram01000.unk6]);
+ PartyMenuPrintMonLevelOrStatus(ePartyMenu.unk6, &gPlayerParty[ePartyMenu.unk6]);
+ TryPrintPartyMenuMonNickname(ePartyMenu.unk6, &gPlayerParty[ePartyMenu.unk6]);
+ PartyMenuTryPrintHP(ePartyMenu.unk6, &gPlayerParty[ePartyMenu.unk6]);
+ nullsub_12(ePartyMenu.unk6, &gPlayerParty[ePartyMenu.unk6]);
PartyMenuDrawHPBars();
sub_806CC74(taskId);
@@ -2177,9 +2177,9 @@ void PrintPartyMenuPromptText(u8 textId, u8 b)
}
}
-void sub_806D5A4(void)
+void PartyMenuEraseMsgBoxAndFrame(void)
{
- Menu_EraseWindowRect(0, 16, 29, 19);
+ Menu_EraseWindowRect(WINDOW_LEFT - 3, 14 + 2, WINDOW_RIGHT + 3, 19);
}
void sub_806D5B8(u8 monIndex)
@@ -2481,6 +2481,7 @@ void SpriteCB_UpdateHeldItemIconPosition(struct Sprite *sprite)
sprite->y = gSprites[spriteId].y;
}
+// Soft casting of gTasks[taskId].data to u8* but big-endian.
u8 GetMonIconSpriteId(u8 taskId, u8 monIndex)
{
switch (monIndex)
@@ -2515,19 +2516,19 @@ void SetMonIconSpriteId(u8 taskId, u8 monIndex, u8 spriteId)
gTasks[taskId].data[0] = (u8)gTasks[taskId].data[0] | (spriteId << 8);
break;
case 1:
- gTasks[taskId].data[0] = (gTasks[taskId].data[0] & -0x100) | spriteId;
+ gTasks[taskId].data[0] = (gTasks[taskId].data[0] & ~0xFF) | spriteId;
break;
case 2:
gTasks[taskId].data[1] = (u8)gTasks[taskId].data[1] | (spriteId << 8);
break;
case 3:
- gTasks[taskId].data[1] = (gTasks[taskId].data[1] & -0x100) | spriteId;
+ gTasks[taskId].data[1] = (gTasks[taskId].data[1] & ~0xFF) | spriteId;
break;
case 4:
gTasks[taskId].data[2] = (u8)gTasks[taskId].data[2] | (spriteId << 8);
break;
case 5:
- gTasks[taskId].data[2] = (gTasks[taskId].data[2] & -0x100) | spriteId;
+ gTasks[taskId].data[2] = (gTasks[taskId].data[2] & ~0xFF) | spriteId;
break;
}
}
@@ -2882,26 +2883,26 @@ TaskFunc PartyMenuGetPopupMenuFunc(u8 menuIndex, const struct PartyPopupMenu *me
return menuActions[action].func;
}
-u8 sub_806E834(const u8 *message, u8 arg1)
+u8 DisplayPartyMenuMessage(const u8 *message, u8 noClearAfter)
{
u8 taskId;
- gUnknown_0202E8F6 = 1;
+ gPartyMenuMessage_IsPrinting = 1;
Menu_DrawStdWindowFrame(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
MenuPrintMessage(message, WINDOW_LEFT + 1, 15);
- taskId = CreateTask(sub_806E884, 1);
- gTasks[taskId].data[0] = arg1;
+ taskId = CreateTask(Task_PartyMenuPrintRun, 1);
+ gTasks[taskId].data[0] = noClearAfter;
return taskId;
}
-static void sub_806E884(u8 taskId)
+static void Task_PartyMenuPrintRun(u8 taskId)
{
if (Menu_UpdateWindowText())
{
- gUnknown_0202E8F6 = 0;
+ gPartyMenuMessage_IsPrinting = 0;
if (gTasks[taskId].data[0] == 0)
Menu_EraseWindowRect(WINDOW_LEFT, 14, WINDOW_RIGHT, 19);
DestroyTask(taskId);
@@ -2951,7 +2952,7 @@ void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c)
{
if (ItemIsMail(currentItem) == TRUE)
{
- sub_806E834(gOtherText_MailMustBeRemoved, 1);
+ DisplayPartyMenuMessage(gOtherText_MailMustBeRemoved, 1);
CreateTask(party_menu_link_mon_held_item_object, 5);
}
else
@@ -2959,7 +2960,7 @@ void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c)
GetMonNickname(gPartyMenu.pokemon, gStringVar1);
CopyItemName(currentItem, gStringVar2);
StringExpandPlaceholders(gStringVar4, gOtherText_AlreadyHolding);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
CreateTask(Task_ConfirmGiveHeldItem, 5);
if (ItemIsMail(newItem) == TRUE)
gUnknown_0202E8F8 = currentItem;
@@ -2983,7 +2984,7 @@ void PartyMenuTryGiveMonHeldItem(u8 taskId, u16 newItem, TaskFunc c)
void party_menu_link_mon_held_item_object(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
SetHeldItemIconVisibility(gPartyMenu.unk4, gPartyMenu.primarySelectedMonIndex);
gTasks[gPartyMenu.unk4].func = gPartyMenu.unk10;
@@ -3013,12 +3014,12 @@ void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId)
{
CopyItemName(gPartyMenu.secondarySelectedIndex, gStringVar1);
StringExpandPlaceholders(gStringVar4, gOtherText_TakenAndReplaced);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
}
}
else
{
- sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+ DisplayPartyMenuMessage(gOtherText_BagFullCannotRemoveItem, 0);
AddBagItem(gPartyMenu.secondarySelectedIndex, 1);
}
}
@@ -3035,7 +3036,7 @@ void PartyMenuTryGiveMonHeldItem_806EACC(u8 taskId)
void Task_ConfirmGiveHeldItem(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
DisplayYesNoMenu(23, 8, 1);
gTasks[taskId].func = PartyMenuTryGiveMonHeldItem_806EACC;
@@ -3047,7 +3048,7 @@ void DisplayGiveHeldItemMessage(u8 a, u16 b, u8 c)
GetMonNickname(&gPlayerParty[a], gStringVar1);
CopyItemName(b, gStringVar2);
StringExpandPlaceholders(gStringVar4, gOtherText_WasGivenToHold);
- sub_806E834(gStringVar4, c);
+ DisplayPartyMenuMessage(gStringVar4, c);
}
void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func)
@@ -3065,14 +3066,14 @@ void PartyMenuTryGiveMonMail(u8 taskId, TaskFunc func)
if (currentItem != 0)
{
- sub_806E834(gOtherText_PokeHoldingItemCantMail, 1);
+ DisplayPartyMenuMessage(gOtherText_PokeHoldingItemCantMail, 1);
CreateTask(party_menu_link_mon_held_item_object, 5);
}
else
{
GiveMailToMon2(gPartyMenu.pokemon, mail);
ClearMailStruct(mail);
- sub_806E834(gOtherText_MailTransferredMailbox, 1);
+ DisplayPartyMenuMessage(gOtherText_MailTransferredMailbox, 1);
CreateTask(party_menu_link_mon_held_item_object, 5);
}
}
@@ -3087,7 +3088,7 @@ void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func)
if (currentItem == 0)
{
StringExpandPlaceholders(gStringVar4, gOtherText_NotHoldingAnything);
- sub_806E834(gStringVar4, 0);
+ DisplayPartyMenuMessage(gStringVar4, 0);
CreateTask(party_menu_link_mon_held_item_object, 5);
}
else
@@ -3105,7 +3106,7 @@ void PartyMenuTryGiveMonHeldItem_806ECE8(u8 taskId, TaskFunc func)
}
else
{
- sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+ DisplayPartyMenuMessage(gOtherText_BagFullCannotRemoveItem, 0);
}
CreateTask(party_menu_link_mon_held_item_object, 5);
}
@@ -3116,7 +3117,7 @@ void DisplayTakeHeldItemMessage(u8 a, u16 b, u8 c)
GetMonNickname(&gPlayerParty[a], gStringVar1);
CopyItemName(b, gStringVar2);
StringExpandPlaceholders(gStringVar4, gOtherText_ReceivedTheThingFrom);
- sub_806E834(gStringVar4, c);
+ DisplayPartyMenuMessage(gStringVar4, c);
}
void DoTakeMail(u8 taskId, TaskFunc func)
@@ -3124,7 +3125,7 @@ void DoTakeMail(u8 taskId, TaskFunc func)
gTasks[taskId].func = TaskDummy;
sub_806E8D0(taskId, 0, func);
gPartyMenu.secondarySelectedIndex = GetMonData(gPartyMenu.pokemon, MON_DATA_HELD_ITEM);
- sub_806E834(gOtherText_SendRemovedMailPrompt, 1);
+ DisplayPartyMenuMessage(gOtherText_SendRemovedMailPrompt, 1);
CreateTask(Task_ConfirmTakeHeldMail, 5);
}
@@ -3137,11 +3138,11 @@ void Task_LoseMailMessage(u8 taskId)
if (AddBagItem(gPartyMenu.secondarySelectedIndex, 1) == TRUE)
{
TakeMailFromMon(gPartyMenu.pokemon);
- sub_806E834(gOtherText_MailTaken, 0);
+ DisplayPartyMenuMessage(gOtherText_MailTaken, 0);
}
else
{
- sub_806E834(gOtherText_BagFullCannotRemoveItem, 0);
+ DisplayPartyMenuMessage(gOtherText_BagFullCannotRemoveItem, 0);
}
Menu_EraseWindowRect(23, 8, 29, 13);
gTasks[taskId].func = party_menu_link_mon_held_item_object;
@@ -3160,7 +3161,7 @@ void Task_LoseMailMessage(u8 taskId)
void Task_ConfirmLoseMailMessage(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
DisplayYesNoMenu(23, 8, 1);
gTasks[taskId].func = Task_LoseMailMessage;
@@ -3175,9 +3176,9 @@ void Task_TakeHeldMail(u8 taskId)
{
Menu_EraseWindowRect(23, 8, 29, 13);
if (TakeMailFromMon2(gPartyMenu.pokemon) != 0xFF)
- sub_806E834(gOtherText_MailWasSent, 0);
+ DisplayPartyMenuMessage(gOtherText_MailWasSent, 0);
else
- sub_806E834(gOtherText_MailboxIsFull, 0);
+ DisplayPartyMenuMessage(gOtherText_MailboxIsFull, 0);
gTasks[taskId].func = party_menu_link_mon_held_item_object;
}
else
@@ -3187,14 +3188,14 @@ void Task_TakeHeldMail(u8 taskId)
if (selection == -1)
PlaySE(SE_SELECT);
Menu_EraseWindowRect(23, 8, 29, 13);
- sub_806E834(gOtherText_MailRemovedMessageLost, 1);
+ DisplayPartyMenuMessage(gOtherText_MailRemovedMessageLost, 1);
gTasks[taskId].func = Task_ConfirmLoseMailMessage;
}
}
void Task_ConfirmTakeHeldMail(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
DisplayYesNoMenu(23, 8, 1);
gTasks[taskId].func = Task_TakeHeldMail;
@@ -3236,11 +3237,11 @@ void Task_TeamMonTMMove(u8 taskId)
GetMonNickname(gPartyMenu.pokemon, gStringVar1);
gPartyMenu.unk8 = ItemIdToBattleMoveId(gPartyMenu.secondarySelectedIndex);
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
- ewram1B000.unk282 = 0;
+ ewram1B000.pmUnk282 = 0;
if (pokemon_has_move(gPartyMenu.pokemon, gPartyMenu.unk8))
{
StringExpandPlaceholders(gStringVar4, gOtherText_AlreadyKnows);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = party_menu_link_mon_held_item_object;
}
else
@@ -3252,7 +3253,7 @@ void Task_TeamMonTMMove(u8 taskId)
!CanMonLearnTMHM(gPartyMenu.pokemon, gPartyMenu.secondarySelectedIndex - 33))
{
StringExpandPlaceholders(gStringVar4, gOtherText_NotCompatible);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = party_menu_link_mon_held_item_object;
}
else
@@ -3264,7 +3265,7 @@ void Task_TeamMonTMMove(u8 taskId)
else
{
StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = sub_806F358;
}
}
@@ -3275,16 +3276,16 @@ void Task_TeamMonTMMove2(u8 taskId)
{
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
StringExpandPlaceholders(gStringVar4, gOtherText_LearnedMove);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
AdjustFriendship(gPartyMenu.pokemon, FRIENDSHIP_EVENT_LEARN_TMHM);
- if (ewram1B000.unk282 == 0 && gPartyMenu.secondarySelectedIndex < ITEM_HM01_CUT)
+ if (ewram1B000.pmUnk282 == 0 && gPartyMenu.secondarySelectedIndex < ITEM_HM01_CUT)
RemoveBagItem(gPartyMenu.secondarySelectedIndex, 1);
gTasks[taskId].func = Task_TeamMonTMMove3;
}
void Task_TeamMonTMMove3(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
PlayFanfare(MUS_LEVEL_UP);
gTasks[taskId].func = Task_TeamMonTMMove4;
@@ -3298,7 +3299,7 @@ void Task_TeamMonTMMove4(u8 taskId)
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
{
SetHeldItemIconVisibility(gPartyMenu.unk4, gPartyMenu.primarySelectedMonIndex);
- if (ewram1B000.unk282 == 1)
+ if (ewram1B000.pmUnk282 == 1)
{
TeachMonMoveInPartyMenu(taskId);
}
@@ -3313,10 +3314,10 @@ void Task_TeamMonTMMove4(u8 taskId)
void sub_806F2FC(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
SetHeldItemIconVisibility(gPartyMenu.unk4, gPartyMenu.primarySelectedMonIndex);
- if (ewram1B000.unk282 == 1)
+ if (ewram1B000.pmUnk282 == 1)
{
TeachMonMoveInPartyMenu(taskId);
}
@@ -3330,7 +3331,7 @@ void sub_806F2FC(u8 taskId)
void sub_806F358(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
DisplayYesNoMenu(23, 8, 1);
gTasks[taskId].func = sub_806F390;
@@ -3344,7 +3345,7 @@ void sub_806F390(u8 taskId)
if (selection == 0)
{
Menu_EraseWindowRect(23, 8, 29, 13);
- sub_806E834(gOtherText_WhichMoveToForget2, 1);
+ DisplayPartyMenuMessage(gOtherText_WhichMoveToForget2, 1);
gTasks[taskId].func = sub_806F44C;
}
else
@@ -3368,7 +3369,7 @@ void sub_806F3FC(u8 taskId)
void sub_806F44C(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB(0, 0, 0));
gTasks[taskId].func = sub_806F3FC;
@@ -3389,14 +3390,14 @@ void TaughtMove(u8 taskId)
GetMonNickname(gPartyMenu.pokemon, gStringVar1);
StringCopy(gStringVar2, gMoveNames[r4]);
StringExpandPlaceholders(gStringVar4, gOtherText_ForgetMove123_2);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
CreateTask(TMMoveUpdateMoveSlot, 5);
}
}
void TMMoveUpdateMoveSlot(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
RemoveMonPPBonus(gPartyMenu.pokemon, sub_809FA30());
SetMonMoveSlot(gPartyMenu.pokemon, gPartyMenu.unk8, sub_809FA30());
@@ -3412,7 +3413,7 @@ void StopTryingToTeachMove_806F588(u8 taskId)
sub_806E8D0(taskId, gSpecialVar_ItemId, sub_808B508);
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
CreateTask(StopTryingToTeachMove_806F67C, 5);
}
}
@@ -3422,13 +3423,13 @@ void StopTryingToTeachMove_806F614(u8 taskId)
Menu_EraseWindowRect(23, 8, 29, 13);
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = StopTryingToTeachMove_806F67C;
}
void StopTryingToTeachMove_806F67C(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
DisplayYesNoMenu(23, 8, 1);
gTasks[taskId].func = StopTryingToTeachMove_806F6B4;
@@ -3445,7 +3446,7 @@ void StopTryingToTeachMove_806F6B4(u8 taskId)
GetMonNickname(gPartyMenu.pokemon, gStringVar1);
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
StringExpandPlaceholders(gStringVar4, gOtherText_DidNotLearnMove2);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = sub_806F2FC;
}
else
@@ -3458,7 +3459,7 @@ void StopTryingToTeachMove_806F6B4(u8 taskId)
GetMonNickname(gPartyMenu.pokemon, gStringVar1);
StringCopy(gStringVar2, gMoveNames[gPartyMenu.unk8]);
StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = sub_806F358;
}
}
@@ -3488,7 +3489,7 @@ s16 sub_806F7E8(u8 taskId, struct BattleInterfaceStruct1 *b, s8 c)
b->unk4 = taskData[11];
b->unk8 = taskData[12] * c;
b->unk10 = 0x100;
- hpBarLevel = GetHPBarLevel(ewram1B000.unk282, b->unk0);
+ hpBarLevel = GetHPBarLevel(ewram1B000.pmUnk282, b->unk0);
if (hpBarLevel > 2)
b->unkC_0 = 4;
if (hpBarLevel == 2)
@@ -3504,8 +3505,8 @@ void sub_806F8AC(u8 taskId)
struct BattleInterfaceStruct1 sp0;
u16 sp14;
- ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, -1);
- if (ewram1B000.unk282 == -1)
+ ewram1B000.pmUnk282 = sub_806F7E8(taskId, &sp0, -1);
+ if (ewram1B000.pmUnk282 == -1)
{
gPartyMenu.unkC = 0;
if (-sp0.unk8 + sp0.unk4 > sp0.unk0)
@@ -3522,7 +3523,7 @@ void sub_806F8AC(u8 taskId)
SetMonIconAnim(GetMonIconSpriteId(gPartyMenu.unk4, gPartyMenu.primarySelectedMonIndex), gPartyMenu.pokemon);
task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + gPartyMenu.primarySelectedMonIndex * 2], 7);
ewram1B000.unk261 = 2;
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
sp14 += sp0.unk4;
SetMonData(gPartyMenu.pokemon, MON_DATA_HP, &sp14);
RemoveBagItem(gPartyMenu.secondarySelectedIndex, 1);
@@ -3531,7 +3532,7 @@ void sub_806F8AC(u8 taskId)
}
else
{
- PartyMenuDoPrintHP(gPartyMenu.primarySelectedMonIndex, IsDoubleBattle(), ewram1B000.unk282, sp0.unk0);
+ PartyMenuDoPrintHP(gPartyMenu.primarySelectedMonIndex, IsDoubleBattle(), ewram1B000.pmUnk282, sp0.unk0);
}
}
@@ -3539,32 +3540,32 @@ void sub_806FA18(u8 taskId)
{
struct BattleInterfaceStruct1 sp0;
- ewram1B000.unk282 = sub_806F7E8(taskId, &sp0, 1);
- if (ewram1B000.unk282 == -1)
+ ewram1B000.pmUnk282 = sub_806F7E8(taskId, &sp0, 1);
+ if (ewram1B000.pmUnk282 == -1)
{
PlaySE(SE_USE_ITEM);
gPartyMenu.unkC = 0;
gTasks[taskId].data[11] -= gTasks[taskId].data[12];
SetMonData(gPartyMenu.pokemon, MON_DATA_HP, &gTasks[taskId].data[11]);
- SetMonIconAnim(GetMonIconSpriteId(gPartyMenu.unk4, ewram01000.unk1), gPartyMenu.pokemon);
- gPartyMenu.primarySelectedMonIndex = gSprites[ewram01000.unk2].data[0];
+ SetMonIconAnim(GetMonIconSpriteId(gPartyMenu.unk4, ePartyMenu.slotId), gPartyMenu.pokemon);
+ gPartyMenu.primarySelectedMonIndex = gSprites[ePartyMenu.slotId2].data[0];
gPartyMenu.pokemon = &gPlayerParty[gPartyMenu.primarySelectedMonIndex];
gTasks[taskId].data[10] = GetMonData(gPartyMenu.pokemon, MON_DATA_MAX_HP);
gTasks[taskId].data[11] = GetMonData(gPartyMenu.pokemon, MON_DATA_HP);
gPartyMenu.unkC = -32768;
gPartyMenu.unk14 = gPartyMenu.unk10;
gTasks[taskId].func = sub_806F8AC;
- ewram1B000.unk282 = gTasks[taskId].data[11];
+ ewram1B000.pmUnk282 = gTasks[taskId].data[11];
}
else
{
- PartyMenuDoPrintHP(gPartyMenu.primarySelectedMonIndex, IsDoubleBattle(), ewram1B000.unk282, sp0.unk0);
+ PartyMenuDoPrintHP(gPartyMenu.primarySelectedMonIndex, IsDoubleBattle(), ewram1B000.pmUnk282, sp0.unk0);
}
}
void sub_806FB0C(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
gTasks[gPartyMenu.unk4].func = gPartyMenu.unk10;
DestroyTask(taskId);
@@ -3573,7 +3574,7 @@ void sub_806FB0C(u8 taskId)
void sub_806FB44(u8 taskId)
{
- if (gUnknown_0202E8F6 == 0)
+ if (gPartyMenuMessage_IsPrinting == 0)
{
gTasks[gPartyMenu.unk4].func = gPartyMenu.unk14;
DestroyTask(taskId);
@@ -3717,7 +3718,7 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func)
{
gUnknown_0202E8F4 = 0;
PlaySE(SE_SELECT);
- sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+ DisplayPartyMenuMessage(gOtherText_WontHaveAnyEffect, 1);
gTasks[r7].func = sub_806FB0C;
}
else
@@ -3742,7 +3743,7 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func)
gTasks[r7].data[14] = 0;
gPartyMenu.unk14 = gPartyMenu.unk10;
gTasks[r7].func = sub_806F8AC;
- ewram1B000.unk282 = gTasks[r7].data[11];
+ ewram1B000.pmUnk282 = gTasks[r7].data[11];
}
else
{
@@ -3751,7 +3752,7 @@ void UseMedicine(u8 taskId, u16 item, TaskFunc func)
RemoveBagItem(item, 1);
GetMedicineItemEffectMessage(item);
TryPrintPartyMenuMonNickname(gPartyMenu.primarySelectedMonIndex, gPartyMenu.pokemon);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[r7].func = sub_806FB0C;
}
}
@@ -3774,8 +3775,8 @@ void DoSacredAshItemEffect(u8 taskId, u16 item, TaskFunc func)
gPartyMenu.secondarySelectedIndex = item;
gPartyMenu.primarySelectedMonIndex = 0;
gPartyMenu.unk14 = sub_80701DC;
- ewram1B000.unk27E = 0;
- ewram1B000.unk280 = 0;
+ ewram1B000.pmUnk27E = 0;
+ ewram1B000.pmUnk280 = 0;
sub_8070088(taskId);
}
@@ -3812,9 +3813,9 @@ void sub_8070088(u8 taskId)
ewram1B000.unk261 = 2;
taskData[12] = GetMonData(gPartyMenu.pokemon, MON_DATA_HP) - taskData[11];
taskData[14] = 1;
- ewram1B000.unk27E = 1;
- ewram1B000.unk280 = 1;
- ewram1B000.unk282 = taskData[11];
+ ewram1B000.pmUnk27E = 1;
+ ewram1B000.pmUnk280 = 1;
+ ewram1B000.pmUnk282 = taskData[11];
gPartyMenu.unkC = -32768;
gTasks[taskId2].func = sub_806F8AC;
}
@@ -3823,7 +3824,7 @@ void sub_8070088(u8 taskId)
void sub_80701DC(u8 taskId)
{
- if (ewram1B000.unk27E == 1)
+ if (ewram1B000.pmUnk27E == 1)
{
AddBagItem(gPartyMenu.secondarySelectedIndex, 1);
if (GetMonData(&gPlayerParty[gPartyMenu.primarySelectedMonIndex], MON_DATA_SPECIES) != 0)
@@ -3831,16 +3832,16 @@ void sub_80701DC(u8 taskId)
task_pc_turn_off(&gUnknown_083769A8[IsDoubleBattle() * 12 + gPartyMenu.primarySelectedMonIndex * 2], 3);
ewram1B000.unk261 = 2;
}
- ewram1B000.unk27E = 0;
+ ewram1B000.pmUnk27E = 0;
}
gPartyMenu.primarySelectedMonIndex++;
if (gPartyMenu.primarySelectedMonIndex == 6)
{
gUnknown_0202E8F4 = 0;
- if (ewram1B000.unk280 == 0)
+ if (ewram1B000.pmUnk280 == 0)
{
gTasks[taskId].func = TaskDummy;
- sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+ DisplayPartyMenuMessage(gOtherText_WontHaveAnyEffect, 1);
CreateTask(sub_806FB0C, 8);
}
else
@@ -3928,7 +3929,7 @@ void ItemUseMoveMenu_HandleMoveSelection(u8 taskId)
{
Menu_DestroyCursor();
Menu_EraseWindowRect(19, 10, 29, 19);
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
gTasks[taskId].data[11] = Menu_GetCursorPos();
DoRecoverPP(taskId);
}
@@ -3951,9 +3952,9 @@ void DoRecoverPP(u8 taskId)
if (ExecuteTableBasedItemEffect__(gPartyMenu.primarySelectedMonIndex, gPartyMenu.secondarySelectedIndex, gTasks[taskId].data[11]))
{
- gUnknown_0202E8F4 = r5;
+ gUnknown_0202E8F4 = 0;
PlaySE(SE_SELECT);
- sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+ DisplayPartyMenuMessage(gOtherText_WontHaveAnyEffect, 1);
}
else
{
@@ -3963,7 +3964,7 @@ void DoRecoverPP(u8 taskId)
r5 = GetMonData(gPartyMenu.pokemon, MON_DATA_MOVE1 + gTasks[taskId].data[11]);
StringCopy(gStringVar1, gMoveNames[r5]);
GetMedicineItemEffectMessage(gPartyMenu.secondarySelectedIndex);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
}
gTasks[taskId].func = sub_806FB0C;
}
@@ -4020,7 +4021,7 @@ void DoRareCandyItemEffect(u8 taskId, u16 item, TaskFunc c)
if (GetMonData(gPartyMenu.pokemon, MON_DATA_LEVEL) != 100)
{
for (i = 0; i < NUM_STATS; i++)
- ewram1B000.statGrowths[i] = GetMonData(gPartyMenu.pokemon, StatDataTypes[i]);
+ ewram1B000.pmStatGrowths[i] = GetMonData(gPartyMenu.pokemon, StatDataTypes[i]);
noEffect = ExecuteTableBasedItemEffect__(gPartyMenu.primarySelectedMonIndex, item, 0);
}
else
@@ -4030,7 +4031,7 @@ void DoRareCandyItemEffect(u8 taskId, u16 item, TaskFunc c)
{
gUnknown_0202E8F4 = 0;
PlaySE(SE_SELECT);
- sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+ DisplayPartyMenuMessage(gOtherText_WontHaveAnyEffect, 1);
CreateTask(sub_806FB0C, 5);
}
else
@@ -4045,14 +4046,14 @@ void DoRareCandyItemEffect(u8 taskId, u16 item, TaskFunc c)
level = GetMonData(gPartyMenu.pokemon, MON_DATA_LEVEL);
ConvertIntToDecimalStringN(gStringVar2, level, 0, 3);
StringExpandPlaceholders(gStringVar4, gOtherText_ElevatedTo);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
CreateTask(Task_RareCandy1, 5);
}
}
void Task_RareCandy1(u8 taskId)
{
- if (WaitFanfare(0) && gUnknown_0202E8F6 == 0)
+ if (WaitFanfare(0) && gPartyMenuMessage_IsPrinting == 0)
{
if ((gMain.newKeys & A_BUTTON) || (gMain.newKeys & B_BUTTON))
{
@@ -4090,8 +4091,8 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId)
stat = GetMonData(gPartyMenu.pokemon, StatDataTypes[i]);
- ewram1B000.statGrowths[i + NUM_STATS] = stat;
- ewram1B000.statGrowths[i] = stat - ewram1B000.statGrowths[i];
+ ewram1B000.pmStatGrowths[i + NUM_STATS] = stat;
+ ewram1B000.pmStatGrowths[i] = stat - ewram1B000.pmStatGrowths[i];
x = (i / 3) * 9 + 11;
y = ((i % 3) << 1) + 1;
@@ -4105,7 +4106,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId)
*ptr++ = EXT_CTRL_CODE_BEGIN;
*ptr++ = 0x13;
*ptr++ = 0x34;
- ConvertIntToDecimalStringN(ptr, ewram1B000.statGrowths[i], 1, 2);
+ ConvertIntToDecimalStringN(ptr, ewram1B000.pmStatGrowths[i], 1, 2);
Menu_PrintText(gStringVar1, x + 1, y);
#else
Menu_PrintTextPixelCoords(StatNames[i], (x + 1) * 8, y * 8, 1);
@@ -4116,7 +4117,7 @@ void PrintStatGrowthsInLevelUpWindow(u8 taskId)
gStringVar1[0] = EXT_CTRL_CODE_BEGIN;
gStringVar1[1] = 0x14;
gStringVar1[2] = 0x06;
- ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[i], 1, 2);
+ ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.pmStatGrowths[i], 1, 2);
Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 12, y * 8, 0);
#endif
}
@@ -4135,7 +4136,7 @@ void PrintNewStatsInLevelUpWindow(u8 taskId)
stat = GetMonData(gPartyMenu.pokemon, StatDataTypes[i]);
newStatIndex = i + 6;
- ewram1B000.statGrowths[newStatIndex] = stat;
+ ewram1B000.pmStatGrowths[newStatIndex] = stat;
x = ((i / 3) * 9) + 11;
y = ((i % 3) << 1) + 1;
@@ -4144,7 +4145,7 @@ void PrintNewStatsInLevelUpWindow(u8 taskId)
gStringVar1[1] = 0x14;
gStringVar1[2] = 0x06;
- ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.statGrowths[newStatIndex], 1, 3);
+ ConvertIntToDecimalStringN(gStringVar1 + 3, ewram1B000.pmStatGrowths[newStatIndex], 1, 3);
Menu_PrintTextPixelCoords(gStringVar1, (x + 6) * 8 + 6, y * 8, 0);
}
}
@@ -4179,7 +4180,7 @@ void Task_RareCandy3(u8 taskId)
Menu_EraseWindowRect(11, 0, 29, 7);
learnedMove = MonTryLearningNewMove(gPartyMenu.pokemon, TRUE);
- ewram1B000.unk282 = 1;
+ ewram1B000.pmUnk282 = 1;
switch (learnedMove)
{
@@ -4203,7 +4204,7 @@ void Task_RareCandy3(u8 taskId)
StringCopy(gStringVar2, gMoveNames[gMoveToLearn]);
StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gPartyMenu.unk8 = gMoveToLearn;
gTasks[taskId].func = sub_806F358;
@@ -4218,7 +4219,7 @@ void Task_RareCandy3(u8 taskId)
StringCopy(gStringVar2, gMoveNames[learnedMove]);
StringExpandPlaceholders(gStringVar4, gOtherText_LearnedMove);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = Task_TeamMonTMMove3;
break;
@@ -4255,7 +4256,7 @@ void TeachMonMoveInPartyMenu(u8 taskId)
StringCopy(gStringVar2, gMoveNames[gMoveToLearn]);
StringExpandPlaceholders(gStringVar4, gOtherText_WantsToLearn);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gPartyMenu.unk8 = gMoveToLearn;
gTasks[taskId].func = sub_806F358;
@@ -4270,7 +4271,7 @@ void TeachMonMoveInPartyMenu(u8 taskId)
StringCopy(gStringVar2, gMoveNames[learnedMove]);
StringExpandPlaceholders(gStringVar4, gOtherText_LearnedMove);
- sub_806E834(gStringVar4, 1);
+ DisplayPartyMenuMessage(gStringVar4, 1);
gTasks[taskId].func = Task_TeamMonTMMove3;
break;
@@ -4295,7 +4296,7 @@ void DoEvolutionStoneItemEffect(u8 taskId, u16 evolutionStoneItem, TaskFunc c)
if (ExecuteTableBasedItemEffect__(gPartyMenu.primarySelectedMonIndex, evolutionStoneItem, 0))
{
gUnknown_0202E8F4 = 0;
- sub_806E834(gOtherText_WontHaveAnyEffect, 1);
+ DisplayPartyMenuMessage(gOtherText_WontHaveAnyEffect, 1);
CreateTask(sub_806FB0C, 5);
}
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
index 78922e80f..d50c1d820 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -51,7 +51,7 @@ extern u8 gUnknown_020297ED;
extern u8 gUnknown_020384F0;
extern u8 gUnknown_0202E8F4;
extern u8 gUnknown_0202E8F5;
-extern u8 gUnknown_0202E8F6;
+extern u8 gPartyMenuMessage_IsPrinting;
extern u8 gPokemonItemUseType;
extern u16 gUnknown_0202E8F8;
extern void (*gPokemonItemUseCallback)(u8 taskID, u16 itemID, TaskFunc func);
@@ -329,8 +329,8 @@ static void sub_8089EBC(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gUnknown_020384F0);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gUnknown_020384F0);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
gLastFieldPokeMenuOpened = gUnknown_020384F0;
sub_8089E84();
SetMainCallback2(CB2_PartyMenuMain);
@@ -352,7 +352,7 @@ static void sub_8089F44(u8 taskID)
{
u8 spriteID = gSprites[gTasks[taskID].data[3] >> 8].data[0];
DestroyTask(taskID);
- ewram1B000_alt.unk262 = 1;
+ ewram1B000.unk262 = 1;
ShowPokemonSummaryScreen(gPlayerParty, spriteID, gPlayerPartyCount - 1, sub_8089F14, PSS_MODE_NORMAL);
}
}
@@ -372,8 +372,8 @@ void DoPokemonMenu_Switch(u8 taskID)
static void PokemonMenu_Switch(u8 taskID)
{
Menu_DestroyCursor();
- ewram01000.unkC = sub_806CD5C;
- ewram01000.array[53553] = 1;
+ ePartyMenu.unkC = sub_806CD5C;
+ ePartyMenu.array[53553] = 1;
DoPokemonMenu_Switch(taskID);
}
@@ -428,7 +428,7 @@ static void sub_808A180(u8 taskID)
static void sub_808A1E0(u8 taskID)
{
- if (gUnknown_0202E8F6 != 1)
+ if (gPartyMenuMessage_IsPrinting != 1)
{
SetHeldItemIconVisibility(taskID, sub_806CA38(taskID));
PrintPartyMenuPromptText(0, 0);
@@ -480,8 +480,8 @@ static void sub_808A358(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
SetMainCallback2(CB2_PartyMenuMain);
break;
}
@@ -496,9 +496,9 @@ static void sub_808A3A4(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
- EWRAM_1B000.unk262 = 3;
+ sub_806C994(ewram1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
+ ewram1B000.unk262 = 3;
sub_8089E84();
SetMainCallback2(CB2_PartyMenuMain);
break;
@@ -544,8 +544,8 @@ static void sub_808A4D4(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
SetMainCallback2(CB2_PartyMenuMain);
break;
}
@@ -605,7 +605,7 @@ static void PokemonMenu_TakeItem(u8 taskID)
{
Menu_DestroyCursor();
Menu_EraseWindowRect(19, 0, 29, 19);
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
PartyMenuTryGiveMonHeldItem_806ECE8(taskID, sub_808A678);
}
@@ -613,7 +613,7 @@ static void PokemonMenu_TakeMail(u8 taskID)
{
Menu_DestroyCursor();
Menu_EraseWindowRect(19, 0, 29, 19);
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
DoTakeMail(taskID, sub_808A678);
}
@@ -699,7 +699,7 @@ static void PokemonMenu_CancelSubmenu(u8 taskID)
Menu_DestroyCursor();
PlaySE(SE_SELECT);
Menu_EraseWindowRect(19, 0, 29, 19);
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
sub_8089C7C(sPokeMenuCursorPos);
gTasks[taskID].func = sub_8089D94;
}
@@ -729,8 +729,8 @@ static void PokemonMenu_FieldMove(u8 taskID)
{
// can't use a field HM move without a proper badge
Menu_EraseWindowRect(19, 0, 29, 19);
- sub_806D5A4();
- sub_806E834(gOtherText_CantBeUsedBadge, 1);
+ PartyMenuEraseMsgBoxAndFrame();
+ DisplayPartyMenuMessage(gOtherText_CantBeUsedBadge, 1);
gTasks[taskID].func = sub_808AAF0;
}
else
@@ -760,7 +760,7 @@ static void PokemonMenu_FieldMove(u8 taskID)
static void sub_808AAF0(u8 taskID)
{
- if (gUnknown_0202E8F6 != 1 && (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON))
+ if (gPartyMenuMessage_IsPrinting != 1 && (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON))
{
Menu_EraseWindowRect(0, 14, 29, 19);
PokemonMenu_Cancel(taskID);
@@ -853,8 +853,8 @@ static void sub_808AD0C(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
SetMainCallback2(CB2_PartyMenuMain);
break;
}
@@ -1033,7 +1033,7 @@ void sub_808B0C0(u8 taskID)
PlaySE(SE_FAILURE);
else
{
- sub_806D5A4();
+ PartyMenuEraseMsgBoxAndFrame();
if (gPokemonItemUseType == ITEM_USE_SINGLE_MON)
gPokemonItemUseCallback(taskID, gSpecialVar_ItemId, sub_808B224);
if (gPokemonItemUseType == ITEM_USE_GIVE_ITEM)
@@ -1127,8 +1127,8 @@ static void sub_808B3A0(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gLastFieldPokeMenuOpened);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
SetMainCallback2(CB2_PartyMenuMain);
break;
}
@@ -1172,7 +1172,7 @@ static void sub_808B4A4(u8 taskID)
static void sub_808B4EC(u8 taskID)
{
- if (gUnknown_0202E8F6 != 1)
+ if (gPartyMenuMessage_IsPrinting != 1)
sub_808B224(taskID);
}
@@ -1187,8 +1187,8 @@ static void sub_808B518(void)
{
if (InitPartyMenu() == TRUE)
{
- sub_806C994(EWRAM_1B000.menuHandlerTaskId, gUnknown_020384F0);
- ChangePartyMenuSelection(EWRAM_1B000.menuHandlerTaskId, 0);
+ sub_806C994(ewram1B000.menuHandlerTaskId, gUnknown_020384F0);
+ ChangePartyMenuSelection(ewram1B000.menuHandlerTaskId, 0);
SetMainCallback2(CB2_PartyMenuMain);
break;
}
diff --git a/src/record_mixing.c b/src/record_mixing.c
index f04c2ecb0..c3c0df436 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -58,7 +58,8 @@ struct PlayerRecords
struct EasyChatPair easyChatPairs[5];
struct RecordMixingDayCareMail daycareMailRecord;
struct BattleTowerRecord battleTowerRecord;
- u16 filler11C8[0x34];
+ u16 giftItem;
+ u16 filler11CA[0x33];
};
void RecordMixing_PrepareExchangePacket(void)
@@ -66,31 +67,34 @@ void RecordMixing_PrepareExchangePacket(void)
SetPlayerSecretBaseRecordMixingParty();
sub_80C045C();
- memcpy(ewram_2018000.secretBases, recordMixingSecretBases, sizeof(ewram_2018000.secretBases));
- memcpy(ewram_2018000.tvShows, recordMixingTvShows, sizeof(ewram_2018000.tvShows));
- memcpy(ewram_2018000.pokeNews, recordMixingPokeNews, sizeof(ewram_2008000.pokeNews));
- memcpy(&ewram_2018000.mauvilleMan, recordMixingMauvilleMan, sizeof(ewram_2008000.mauvilleMan));
- memcpy(ewram_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(ewram_2018000.easyChatPairs));
+ memcpy(eSentRecord.secretBases, recordMixingSecretBases, sizeof(eSentRecord.secretBases));
+ memcpy(eSentRecord.tvShows, recordMixingTvShows, sizeof(eSentRecord.tvShows));
+ memcpy(eSentRecord.pokeNews, recordMixingPokeNews, sizeof(eSentRecord.pokeNews));
+ memcpy(&eSentRecord.mauvilleMan, recordMixingMauvilleMan, sizeof(eSentRecord.mauvilleMan));
+ memcpy(eSentRecord.easyChatPairs, recordMixingEasyChatPairs, sizeof(eSentRecord.easyChatPairs));
gDayCareMailRecord.mail[0] = gSaveBlock1.daycare.misc.mail[0];
gDayCareMailRecord.mail[1] = gSaveBlock1.daycare.misc.mail[1];
InitDaycareMailRecordMixing(gSaveBlock1.daycare.mons, &gDayCareMailRecord);
- memcpy(&ewram_2018000.daycareMailRecord, gDayCareMailPlayerRecord, sizeof(struct RecordMixingDayCareMail));
- memcpy(&ewram_2018000.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord));
+ memcpy(&eSentRecord.daycareMailRecord, gDayCareMailPlayerRecord, sizeof(struct RecordMixingDayCareMail));
+ memcpy(&eSentRecord.battleTowerRecord, gBattleTowerPlayerRecord, sizeof(struct BattleTowerRecord));
if (GetMultiplayerId() == 0)
- ewram_2018000.filler11C8[0] = GetRecordMixingGift();
+ eSentRecord.giftItem = GetRecordMixingGift();
}
-void RecordMixing_ReceiveExchangePacket(u32 a)
+void RecordMixing_ReceiveExchangePacket(u32 which)
{
- sub_80BD674(ewram_2008000.secretBases, sizeof(struct PlayerRecords), a);
- sub_80BFD44((u8 *)ewram_2008000.tvShows, sizeof(struct PlayerRecords), a);
- sub_80C0514(ewram_2008000.pokeNews, sizeof(struct PlayerRecords), a);
- sub_80B9B1C((u8 *)&ewram_2008000.mauvilleMan, sizeof(struct PlayerRecords), a);
- sub_80FA4E4(ewram_2008000.easyChatPairs, sizeof(struct PlayerRecords), a);
- sub_80B9C6C(&ewram_2008000.daycareMailRecord, sizeof(struct PlayerRecords), a, ewram_2008000.tvShows);
- sub_80B9B70(&ewram_2008000.battleTowerRecord, sizeof(struct PlayerRecords), a);
- sub_80B9F3C(ewram_2008000.filler11C8, a);
+ ReceiveSecretBasesData(eReceivedRecords.secretBases, sizeof(struct PlayerRecords), which);
+ ReceiveTvShowsData((u8 *)eReceivedRecords.tvShows, sizeof(struct PlayerRecords), which);
+ ReceivePokeNewsData(eReceivedRecords.pokeNews, sizeof(struct PlayerRecords), which);
+ ReceiveOldManData((u8 *)&eReceivedRecords.mauvilleMan, sizeof(struct PlayerRecords), which);
+ ReceiveDewfordTrendData(eReceivedRecords.easyChatPairs, sizeof(struct PlayerRecords), which);
+ ReceiveDaycareMailData(&eReceivedRecords.daycareMailRecord,
+ sizeof(struct PlayerRecords),
+ which,
+ eReceivedRecords.tvShows);
+ ReceiveBattleTowerData(&eReceivedRecords.battleTowerRecord, sizeof(struct PlayerRecords), which);
+ ReceiveGiftItem(&eReceivedRecords.giftItem, which);
}
#define tCounter data[0]
@@ -247,11 +251,11 @@ void sub_80B95F0(u8 taskId)
task->tState = 0;
task->data[5] = GetMultiplayerId_();
task->func = Task_RecordMixing_SendPacket;
- StorePtrInTaskData(&ewram_2018000, &task->data[2]);
+ StorePtrInTaskData(&eSentRecord, &task->data[2]);
subTaskId = CreateTask(Task_RecordMixing_CopyReceiveBuffer, 0x50);
task->data[10] = subTaskId;
gTasks[subTaskId].data[0] = taskId;
- StorePtrInTaskData((u8 *)&ewram_2008000, &gTasks[subTaskId].data[5]);
+ StorePtrInTaskData((u8 *)&eReceivedRecords, &gTasks[subTaskId].data[5]);
}
break;
case 5: // wait 60 frames
@@ -432,7 +436,7 @@ void sub_80B9A88(u8 *a)
}
}
-void sub_80B9B1C(u8 *a, size_t size, u8 index)
+void ReceiveOldManData(u8 *a, size_t size, u8 index)
{
u8 arr[4];
u8 *ptr;
@@ -444,7 +448,7 @@ void sub_80B9B1C(u8 *a, size_t size, u8 index)
sub_80F7F30();
}
-void sub_80B9B70(void *battleTowerRecord, u32 size, u8 index)
+void ReceiveBattleTowerData(void *battleTowerRecord, u32 size, u8 index)
{
sub_80B9A88(gUnknown_0300071C);
memcpy(battleTowerRecord + size * index, battleTowerRecord + size * gUnknown_0300071C[index], sizeof(struct BattleTowerRecord));
@@ -494,7 +498,7 @@ const u8 gUnknown_083D02BA[3][4] =
{0, 3, 2, 1},
};
-void sub_80B9C6C(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
+void ReceiveDaycareMailData(struct RecordMixingDayCareMail *src, size_t recordSize, u8 which, TVShow *shows)
{
{
u16 i, j;
@@ -615,17 +619,17 @@ void sub_80B9C6C(struct RecordMixingDayCareMail *src, size_t recordSize, u8 whic
}
}
-void sub_80B9F3C(u16 *a, u8 b)
+void ReceiveGiftItem(u16 *pItemId, u8 b)
{
- if (b != 0 && *a != 0)
+ if (b != 0 && *pItemId != 0)
{
- if (GetPocketByItemId(*a) == 5)
+ if (GetPocketByItemId(*pItemId) == POCKET_KEY_ITEMS)
{
- if (!CheckBagHasItem(*a, 1) && !CheckPCHasItem(*a, 1) && AddBagItem(*a, 1))
+ if (!CheckBagHasItem(*pItemId, 1) && !CheckPCHasItem(*pItemId, 1) && AddBagItem(*pItemId, 1))
{
- VarSet(VAR_TEMP_1, *a);
+ VarSet(VAR_TEMP_1, *pItemId);
StringCopy(gStringVar1, gLinkPlayers[0].name);
- if (*a == ITEM_EON_TICKET)
+ if (*pItemId == ITEM_EON_TICKET)
FlagSet(FLAG_SYS_HAS_EON_TICKET);
}
else
@@ -635,9 +639,9 @@ void sub_80B9F3C(u16 *a, u8 b)
}
else
{
- if (AddBagItem(*a, 1) == TRUE)
+ if (AddBagItem(*pItemId, 1) == TRUE)
{
- VarSet(VAR_TEMP_1, *a);
+ VarSet(VAR_TEMP_1, *pItemId);
StringCopy(gStringVar1, gLinkPlayers[0].name);
}
else
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 27cd8992f..6d3f79f8b 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -71,62 +71,62 @@ void OpenPartyMenuFromScriptContext(u8 taskId)
bool8 SetupContestPartyMenu(void)
{
- switch (EWRAM_1B000.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- if (EWRAM_1B000.monIndex < gPlayerPartyCount)
+ if (ewram1B000.pmMonIndex < gPlayerPartyCount)
{
- TryCreatePartyMenuMonIcon(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex, &gPlayerParty[EWRAM_1B000.monIndex]);
- EWRAM_1B000.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 1:
LoadHeldItemIconGraphics();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(EWRAM_1B000.menuHandlerTaskId);
- EWRAM_1B000.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex) != 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) != 1)
{
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
break;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
break;
}
case 4:
PartyMenuPrintMonsLevelOrStatus();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
sub_80F9C00();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7: // the only case that can return true.
- if (DrawPartyMonBackground(EWRAM_1B000.monIndex) != 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) != 1)
{
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
break;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState = 0;
return TRUE;
}
}
@@ -178,60 +178,60 @@ void HandleSelectPartyMenu(u8 var)
bool8 SetupMoveTutorPartyMenu(void)
{
- switch (EWRAM_1B000.setupState)
+ switch (ewram1B000.pmSetupState)
{
case 0:
- if (EWRAM_1B000.monIndex < gPlayerPartyCount)
+ if (ewram1B000.pmMonIndex < gPlayerPartyCount)
{
- TryCreatePartyMenuMonIcon(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex, &gPlayerParty[EWRAM_1B000.monIndex]);
- EWRAM_1B000.monIndex++;
+ TryCreatePartyMenuMonIcon(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex, &gPlayerParty[ewram1B000.pmMonIndex]);
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 1:
LoadHeldItemIconGraphics();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 2:
- CreateHeldItemIcons_806DC34(EWRAM_1B000.menuHandlerTaskId);
- EWRAM_1B000.setupState++;
+ CreateHeldItemIcons_806DC34(ewram1B000.menuHandlerTaskId);
+ ewram1B000.pmSetupState++;
break;
case 3:
- if (sub_806BD58(EWRAM_1B000.menuHandlerTaskId, EWRAM_1B000.monIndex) != 1)
+ if (sub_806BD58(ewram1B000.menuHandlerTaskId, ewram1B000.pmMonIndex) != 1)
{
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState++;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState++;
}
break;
case 4:
PartyMenuPrintMonsLevelOrStatus();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 5:
PrintPartyMenuMonNicknames();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 6:
sub_80F9E1C();
- EWRAM_1B000.setupState++;
+ ewram1B000.pmSetupState++;
break;
case 7: // the only case that can return true.
- if (DrawPartyMonBackground(EWRAM_1B000.monIndex) != 1)
+ if (DrawPartyMonBackground(ewram1B000.pmMonIndex) != 1)
{
- EWRAM_1B000.monIndex++;
+ ewram1B000.pmMonIndex++;
}
else
{
- EWRAM_1B000.monIndex = 0;
- EWRAM_1B000.setupState = 0;
+ ewram1B000.pmMonIndex = 0;
+ ewram1B000.pmSetupState = 0;
return TRUE;
}
}
diff --git a/src/secret_base.c b/src/secret_base.c
index cf09a7544..61af33926 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1517,7 +1517,7 @@ void sub_80BD610(struct SecretBaseRecord *basesA, struct SecretBaseRecord *bases
sub_80BD328(basesC, 0);
}
-void sub_80BD674(void *playerRecords, u32 size, u8 c)
+void ReceiveSecretBasesData(void *playerRecords, u32 size, u8 c)
{
if (
#if DEBUG
diff --git a/src/tv.c b/src/tv.c
index 890d3bb2c..0df2e7c54 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -1782,20 +1782,20 @@ u8 NicknameDiffersFromSpeciesName(u8 monIndex)
return TRUE;
}
#elif GERMAN
-u8 NicknameDiffersFromSpeciesName(u8 monIndex)
+u8 NicknameDiffersFromSpeciesName(u8 pmMonIndex)
{
u8 langData[4];
u32 species;
u8 *tmp;
- GetMonData(&gPlayerParty[monIndex], MON_DATA_NICKNAME, &gStringVar1);
+ GetMonData(&gPlayerParty[pmMonIndex], MON_DATA_NICKNAME, &gStringVar1);
tmp = langData;
- tmp[0] = GetMonData(&gPlayerParty[monIndex], MON_DATA_LANGUAGE, &langData);
+ tmp[0] = GetMonData(&gPlayerParty[pmMonIndex], MON_DATA_LANGUAGE, &langData);
if (tmp[0] != GAME_LANGUAGE)
return TRUE;
- species = GetMonData(&gPlayerParty[monIndex], MON_DATA_SPECIES, NULL);
+ species = GetMonData(&gPlayerParty[pmMonIndex], MON_DATA_SPECIES, NULL);
if (StringCompareWithoutExtCtrlCodes(gSpeciesNames[species], gStringVar1))
return TRUE;
@@ -2201,7 +2201,7 @@ void sub_80C04A0(void);
void sub_80C01D4(void);
void sub_80C0408(void);
-void sub_80BFD44(u8 *arg0, u32 arg1, u8 arg2)
+void ReceiveTvShowsData(u8 * arg0, u32 arg1 , u8 arg2)
{
u8 i;
ewramStruct_02007000 *ewramTVShows;
@@ -2493,7 +2493,7 @@ void sub_80C0788(void);
s8 sub_80C0730(struct PokeNews[POKE_NEWS_COUNT], u8);
void sub_80C06BC(struct PokeNews *[POKE_NEWS_COUNT], struct PokeNews *[POKE_NEWS_COUNT]);
-void sub_80C0514(void *a0, u32 a1, u8 a2)
+void ReceivePokeNewsData(void * a0, u32 a1, u8 a2)
{
ewramStruct_02007000 *struct02007000;
u8 i;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 10:24:39 +0000