summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-04-11 14:34:45 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-04-11 14:34:45 -0400
commit8f8665e1dcfffaa83727e3cb814c82179aa3dbe3 (patch)
treefb1346209b13912ef04467337f8e9ba867796dd7 /src
parentec0edfd1985287212220d886dcf8243b0949bd28 (diff)
Some documentation of berry_crush
Diffstat (limited to 'src')
-rw-r--r--src/battle_controller_player.c2
-rw-r--r--src/battle_main.c10
-rw-r--r--src/battle_transition.c2
-rw-r--r--src/berry_crush.c149
-rw-r--r--src/berry_crush_2.c538
-rw-r--r--src/berry_crush_3.c321
-rw-r--r--src/field_fadetransition.c2
-rw-r--r--src/help_system_812B1E0.c2
-rw-r--r--src/link.c12
-rw-r--r--src/link_rfu_2.c16
-rw-r--r--src/mystery_gift_menu.c4
-rw-r--r--src/pokemon_jump.c2
-rw-r--r--src/strings.c18
-rw-r--r--src/trade.c4
-rw-r--r--src/trainer_card.c2
-rw-r--r--src/union_room.c24
-rw-r--r--src/union_room_battle.c4
-rw-r--r--src/union_room_chat.c2
18 files changed, 537 insertions, 577 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 97e833ffd..f65ec46c3 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -796,7 +796,7 @@ static void sub_802F610(void)
{
if (gWirelessCommType == 0)
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
diff --git a/src/battle_main.c b/src/battle_main.c
index f91386e6e..04a4a2acc 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -935,7 +935,7 @@ static void CB2_HandleStartBattle(void)
case 1:
if (gBattleTypeFlags & BATTLE_TYPE_LINK)
{
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
if (IsLinkTaskFinished())
{
@@ -1107,7 +1107,7 @@ static void CB2_PreInitMultiBattle(void)
switch (gBattleCommunication[MULTIUSE_STATE])
{
case 0:
- if (gReceivedRemoteLinkPlayers != 0 && IsLinkTaskFinished())
+ if (gReceivedRemoteLinkPlayers && IsLinkTaskFinished())
{
sub_80108C4();
SendBlock(bitmask_all_link_players_but_self(), &gBattleStruct->field_184, sizeof(gMultiPartnerParty));
@@ -1153,7 +1153,7 @@ static void CB2_PreInitMultiBattle(void)
SetMainCallback2(CB2_InitBattleInternal);
}
}
- else if (gReceivedRemoteLinkPlayers == 0)
+ else if (!gReceivedRemoteLinkPlayers)
{
gBattleTypeFlags = *savedBattleTypeFlags;
gMain.savedCallback = *savedCallback;
@@ -1190,7 +1190,7 @@ static void CB2_HandleStartMultiBattle(void)
LoadWirelessStatusIndicatorSpriteGfx();
break;
case 1:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
if (IsLinkTaskFinished())
{
@@ -3843,7 +3843,7 @@ static void ReturnFromBattleToOverworld(void)
RandomlyGivePartyPokerus(gPlayerParty);
PartySpreadPokerus(gPlayerParty);
}
- if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) || gReceivedRemoteLinkPlayers == 0)
+ if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) || !gReceivedRemoteLinkPlayers)
{
gSpecialVar_Result = gBattleOutcome;
gMain.inBattle = FALSE;
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 7c5b98a36..e7fea0865 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -3544,7 +3544,7 @@ static void BT_GenerateCircle(s16 *buffer, s16 x, s16 y, s16 radius)
s16 i;
memset(buffer, 0xA, 320);
- // 64 iterations because we only want to cover [0, π/2) discretely.
+ // 64 iterations because we only want to cover [0, π/2) discretely.
for (i = 0; i < 64; ++i)
{
s16 sinResult, cosResult, leftX, topY, bottomY, nextTopY, nextBottomY, winVal;
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 1abc97935..23b520f30 100644
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -13,28 +13,29 @@
#include "constants/songs.h"
#include "constants/items.h"
-static EWRAM_DATA struct BerryCrushGame *gUnknown_203F3DC = NULL;
+static EWRAM_DATA struct BerryCrushGame *sBerryCrushGamePtr = NULL;
-static void sub_814B860(void);
-static void sub_814BA6C(void);
-static void sub_814BA80(void);
-static void sub_814BA98(u8 taskId);
+static void BerryCrush_InitPlayerNamesAndTextSpeed(struct BerryCrushGame *game);
+static void CB2_ReturnToBerryCrushGameFromBerryPouch(void);
+static void VBlankCB_BerryCrush(void);
+static void CB2_BerryCrush(void);
+static void Task_RunBerryCrushGame(u8 taskId);
-struct BerryCrushGame *sub_814B6F0(void)
+struct BerryCrushGame *GetBerryCrushGame(void)
{
- return gUnknown_203F3DC;
+ return sBerryCrushGamePtr;
}
-u32 sub_814B6FC(MainCallback callback)
+u32 ExitBerryCrushWithCallback(MainCallback callback)
{
- if (!gUnknown_203F3DC)
+ if (sBerryCrushGamePtr == NULL)
return 2;
- if (!callback)
- callback = gUnknown_203F3DC->unk0;
+ if (callback == NULL)
+ callback = sBerryCrushGamePtr->savedCallback;
- DestroyTask(gUnknown_203F3DC->unkA);
- FREE_AND_SET_NULL(gUnknown_203F3DC);
+ DestroyTask(sBerryCrushGamePtr->taskId);
+ FREE_AND_SET_NULL(sBerryCrushGamePtr);
SetMainCallback2(callback);
if (callback == CB2_ReturnToField)
{
@@ -70,8 +71,8 @@ void StartBerryCrush(MainCallback callback)
return;
}
- gUnknown_203F3DC = AllocZeroed(sizeof(*gUnknown_203F3DC));
- if (!gUnknown_203F3DC)
+ sBerryCrushGamePtr = AllocZeroed(sizeof(*sBerryCrushGamePtr));
+ if (!sBerryCrushGamePtr)
{
SetMainCallback2(callback);
Rfu.linkman_param[0] = 0;
@@ -80,47 +81,47 @@ void StartBerryCrush(MainCallback callback)
return;
}
- gUnknown_203F3DC->unk0 = callback;
- gUnknown_203F3DC->unk8 = multiplayerId;
- gUnknown_203F3DC->unk9 = playerCount;
- sub_814BABC(gUnknown_203F3DC);
- gUnknown_203F3DC->unk12 = 1;
- gUnknown_203F3DC->unkE = 1;
- gUnknown_203F3DC->unkF = 6;
- sub_814D564(gUnknown_203F3DC->unk36, 1, -1, 0, 16, 0, 0);
- sub_814BB4C(4, 1, gUnknown_203F3DC->unk36);
- SetMainCallback2(sub_814BA80);
- gUnknown_203F3DC->unkA = CreateTask(sub_814BA98, 8);
+ sBerryCrushGamePtr->savedCallback = callback;
+ sBerryCrushGamePtr->localId = multiplayerId;
+ sBerryCrushGamePtr->playerCount = playerCount;
+ BerryCrush_InitPlayerNamesAndTextSpeed(sBerryCrushGamePtr);
+ sBerryCrushGamePtr->unk12 = 1;
+ sBerryCrushGamePtr->nextCmd = 1;
+ sBerryCrushGamePtr->afterPalFadeCmd = 6;
+ BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, TRUE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+ BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->commandParams);
+ SetMainCallback2(CB2_BerryCrush);
+ sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8);
}
-static void sub_814B860(void)
+static void CB2_ReturnToBerryCrushGameFromBerryPouch(void)
{
if (gSpecialVar_ItemId < FIRST_BERRY_INDEX || gSpecialVar_ItemId > LAST_BERRY_INDEX + 1)
gSpecialVar_ItemId = ITEM_CHERI_BERRY;
else
RemoveBagItem(gSpecialVar_ItemId, 1);
- gUnknown_203F3DC->unk68.as_four_players.others[gUnknown_203F3DC->unk8].unk0 = gSpecialVar_ItemId - FIRST_BERRY_INDEX;
- gUnknown_203F3DC->unkE = 1;
- gUnknown_203F3DC->unkF = 9;
- sub_814D564(gUnknown_203F3DC->unk36, 0, -1, 0, 16, 0, 0);
- sub_814BB4C(4, 1, gUnknown_203F3DC->unk36);
- gUnknown_203F3DC->unkA = CreateTask(sub_814BA98, 8);
- SetMainCallback2(sub_814BA80);
+ sBerryCrushGamePtr->unk68.as_four_players.others[sBerryCrushGamePtr->localId].unk0 = gSpecialVar_ItemId - FIRST_BERRY_INDEX;
+ sBerryCrushGamePtr->nextCmd = 1;
+ sBerryCrushGamePtr->afterPalFadeCmd = 9;
+ BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, FALSE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+ BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->commandParams);
+ sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8);
+ SetMainCallback2(CB2_BerryCrush);
}
-void sub_814B8F0(void)
+void CB2_BerryCrush_GoToBerryPouch(void)
{
- DestroyTask(gUnknown_203F3DC->unkA);
- InitBerryPouch(BERRYPOUCH_FROMBERRYCRUSH, sub_814B860, FALSE);
+ DestroyTask(sBerryCrushGamePtr->taskId);
+ InitBerryPouch(BERRYPOUCH_FROMBERRYCRUSH, CB2_ReturnToBerryCrushGameFromBerryPouch, FALSE);
}
-void sub_814B914(void)
+void BerryCrush_SetVBlankCallback(void)
{
- SetVBlankCallback(sub_814BA6C);
+ SetVBlankCallback(VBlankCB_BerryCrush);
}
-void sub_814B924(void)
+void BerryCrush_UnsetVBlankCallback(void)
{
SetVBlankCallback(NULL);
}
@@ -129,60 +130,60 @@ void sub_814B930(void)
{
u32 var0, var1;
- var0 = gUnknown_203F3DC->unk68.as_four_players.unk00.unk04;
+ var0 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk04;
var0 <<= 8;
var0 = sub_80D8B68(var0, 60 << 8);
- var1 = gUnknown_203F3DC->unk68.as_four_players.unk00.unk0A;
+ var1 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk0A;
var1 <<= 8;
var1 = sub_80D8B68(var1, var0) & 0xFFFF;
- gUnknown_203F3DC->unk16 = var1;
- switch (gUnknown_203F3DC->unk9)
+ sBerryCrushGamePtr->unk16 = var1;
+ switch (sBerryCrushGamePtr->playerCount)
{
case 2:
- if (gUnknown_203F3DC->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[0])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[0])
{
- gUnknown_203F3DC->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = gUnknown_203F3DC->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sBerryCrushGamePtr->unk16;
}
break;
case 3:
- if (gUnknown_203F3DC->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[1])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[1])
{
- gUnknown_203F3DC->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = gUnknown_203F3DC->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sBerryCrushGamePtr->unk16;
}
break;
case 4:
- if (gUnknown_203F3DC->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[2])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[2])
{
- gUnknown_203F3DC->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = gUnknown_203F3DC->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sBerryCrushGamePtr->unk16;
}
break;
case 5:
- if (gUnknown_203F3DC->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[3])
+ if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[3])
{
- gUnknown_203F3DC->unk25_1 = 1;
- gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = gUnknown_203F3DC->unk16;
+ sBerryCrushGamePtr->unk25_1 = 1;
+ gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sBerryCrushGamePtr->unk16;
}
break;
}
- gUnknown_203F3DC->unk1C = gUnknown_203F3DC->unk68.as_four_players.unk00.unk00;
- if (GiveBerryPowder(gUnknown_203F3DC->unk1C))
+ sBerryCrushGamePtr->unk1C = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk00;
+ if (GiveBerryPowder(sBerryCrushGamePtr->unk1C))
return;
- gUnknown_203F3DC->unk25_0 = 1;
+ sBerryCrushGamePtr->unk25_0 = 1;
}
-static void sub_814BA6C(void)
+static void VBlankCB_BerryCrush(void)
{
TransferPlttBuffer();
LoadOam();
ProcessSpriteCopyRequests();
}
-static void sub_814BA80(void)
+static void CB2_BerryCrush(void)
{
RunTasks();
RunTextPrinters();
@@ -190,39 +191,39 @@ static void sub_814BA80(void)
BuildOamBuffer();
}
-static void sub_814BA98(u8 taskId)
+static void Task_RunBerryCrushGame(u8 taskId)
{
- if (gUnknown_203F3DC->unk4)
- gUnknown_203F3DC->unk4(gUnknown_203F3DC, gUnknown_203F3DC->unk36);
+ if (sBerryCrushGamePtr->cmdCallback != NULL)
+ sBerryCrushGamePtr->cmdCallback(sBerryCrushGamePtr, sBerryCrushGamePtr->commandParams);
- sub_814D9CC(gUnknown_203F3DC);
+ sub_814D9CC(sBerryCrushGamePtr);
}
-void sub_814BABC(struct BerryCrushGame *arg0)
+void BerryCrush_InitPlayerNamesAndTextSpeed(struct BerryCrushGame *game)
{
u8 i;
- for (i = 0; i < arg0->unk9; i++)
+ for (i = 0; i < game->playerCount; i++)
{
- StringCopy(PLAYER_UNK14(arg0, i), gLinkPlayers[i].name);
- arg0->unk68.as_five_players.unk1C[i].unk14[PLAYER_NAME_LENGTH] = EOS;
+ StringCopy(BERRYCRUSH_PLAYER_NAME(game, i), gLinkPlayers[i].name);
+ game->unk68.as_five_players.players[i].unk14[PLAYER_NAME_LENGTH] = EOS;
}
for (; i < 5; i++)
{
- memset(PLAYER_UNK14(arg0, i), 1, PLAYER_NAME_LENGTH);
- arg0->unk68.as_five_players.unk1C[i].unk14[PLAYER_NAME_LENGTH] = EOS;
+ memset(BERRYCRUSH_PLAYER_NAME(game, i), 1, PLAYER_NAME_LENGTH);
+ game->unk68.as_five_players.players[i].unk14[PLAYER_NAME_LENGTH] = EOS;
}
switch (gSaveBlock2Ptr->optionsTextSpeed)
{
case OPTIONS_TEXT_SPEED_SLOW:
- arg0->textSpeed = 8;
+ game->textSpeed = 8;
break;
case OPTIONS_TEXT_SPEED_MID:
- arg0->textSpeed = 4;
+ game->textSpeed = 4;
break;
case OPTIONS_TEXT_SPEED_FAST:
- arg0->textSpeed = 1;
+ game->textSpeed = 1;
break;
}
}
diff --git a/src/berry_crush_2.c b/src/berry_crush_2.c
index 0cccd82b5..5544ca7a7 100644
--- a/src/berry_crush_2.c
+++ b/src/berry_crush_2.c
@@ -16,11 +16,11 @@
#include "strings.h"
#include "constants/songs.h"
-static u32 sub_814BBB8(struct BerryCrushGame * berryCrushGame, u8 *params);
-static u32 sub_814BC10(struct BerryCrushGame * berryCrushGame, u8 *params);
-static u32 sub_814BC74(struct BerryCrushGame * berryCrushGame, u8 *params);
-static u32 sub_814BD7C(struct BerryCrushGame * berryCrushGame, u8 *params);
-static u32 sub_814BD9C(struct BerryCrushGame * berryCrushGame, u8 *params);
+static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *r1);
+static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * berryCrushGame, u8 *params);
+static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * berryCrushGame, u8 *params);
+static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame * berryCrushGame, u8 *params);
+static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814BDBC(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814BE0C(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814BE64(struct BerryCrushGame * berryCrushGame, u8 *params);
@@ -41,8 +41,8 @@ static u32 sub_814D31C(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814D3A4(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814D468(struct BerryCrushGame * berryCrushGame, u8 *params);
static u32 sub_814D4C8(struct BerryCrushGame * berryCrushGame, u8 *params);
-void sub_814D4D8(struct BerryCrushGame * r4);
-void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5);
+static void sub_814D4D8(struct BerryCrushGame * r4);
+static void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5);
static const u8 gUnknown_846E2E0[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
static const u8 gUnknown_846E2E8[] = {0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00};
@@ -64,24 +64,24 @@ ALIGNED(4) const u8 gUnknown_846E314[][4] = {
};
static const u8 *const gUnknown_846E328[] = {
- gUnknown_841CE3C,
- gUnknown_841CE78,
- gUnknown_841CEA8,
- gUnknown_841CF14,
- gUnknown_841CF50,
- gUnknown_841CF70,
- gUnknown_841CFA0,
- gUnknown_841CFD4,
- gUnknown_841D008
+ gText_BerryCrush_AreYouReady,
+ gText_BerryCrush_WaitForOthersToChooseBerry,
+ gText_BerryCrush_GainedXUnitsOfPowder,
+ gText_BerryCrush_RecordingGameResults,
+ gText_BerryCrush_WantToPlayAgain,
+ gText_BerryCrush_NoBerries,
+ gText_BerryCrush_MemberDroppedOut,
+ gText_BerryCrush_TimeUp,
+ gText_BerryCrush_CommunicationStandby
};
-static u32 (*const gUnknown_846E34C[])(struct BerryCrushGame * berryCrushGame, u8 *params) = {
+static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * berryCrushGame, u8 *params) = {
NULL,
- sub_814BBB8,
- sub_814BC10,
- sub_814BC74,
- sub_814BD7C,
- sub_814BD9C,
+ BerryCrushCommand_BeginNormalPaletteFade,
+ BerryCrushCommand_WaitPaletteFade,
+ BerryCrushCommand_PrintMessage,
+ BerryCrushCommand_InitGfx,
+ BerryCrushCommand_TeardownGfx,
sub_814BDBC,
sub_814BE0C,
sub_814BE64,
@@ -111,118 +111,123 @@ static const u8 gUnknown_846E3B4[][4] = {
{0x04, 0x08, 0x0c, 0x11}
};
-static const u8 gUnknown_846E3C4[] = {0x05, 0x07, 0x09, 0x0c};
+static const u8 gUnknown_846E3C4[] = {5, 7, 9, 12};
-static const u8 gUnknown_846E3C8[] = {0x03, 0x07, 0x0F, 0x1F};
+static const u8 sReceivedPlayerBitmasks[] = {0x03, 0x07, 0x0F, 0x1F};
-void sub_814BB4C(u16 r5, u8 r4, u8 *r7)
+void BerryCrush_RunOrScheduleCommand(u16 command, u8 runMode, u8 *params)
{
- struct BerryCrushGame * r6 = sub_814B6F0();
+ struct BerryCrushGame * game = GetBerryCrushGame();
- if (r5 > 25)
- r5 = 0;
- switch (r4)
+ if (command > 25)
+ command = 0;
+ switch (runMode)
{
case 0:
- if (r5 != 0)
- gUnknown_846E34C[r5](r6, r7);
- if (r6->unkE > 25)
- r6->unkE = r4;
- r6->unk4 = gUnknown_846E34C[r6->unkE];
+ // Call now and set followup to game->nextCmd
+ if (command != 0)
+ sBerryCrushCommands[command](game, params);
+ if (game->nextCmd > 25)
+ game->nextCmd = 0;
+ game->cmdCallback = sBerryCrushCommands[game->nextCmd];
break;
case 1:
- r6->unk4 = gUnknown_846E34C[r5];
+ // Schedule for next frame
+ game->cmdCallback = sBerryCrushCommands[command];
break;
}
}
-static u32 sub_814BBB8(struct BerryCrushGame * r6, u8 *r1)
+static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *params)
{
- u16 r4;
- u32 r0;
-#ifndef NONMATCHING // fake match, nobody can write such code
- register u32 r2 asm("r2");
- register u32 r3 asm("r3");
+ // params points to packed values:
+ // bytes 0-3: selectedPals (bitfield)
+ // byte 4: delay
+ // byte 5: startY
+ // byte 6: stopY
+ // bytes 7-8: fade color
+ // byte 9: if TRUE, communicate on fade complete
- r2 = r1[0];
- r3 = r1[1];
- r3 <<= 8;
- r2 |= r3;
- r3 = r1[2];
- r3 <<= 16;
- r2 |= r3;
- r3 = r1[3];
- r3 <<= 24;
- r0 = r2;
- r0 |= r3;
+ u16 color;
+ u32 selectedPals;
+ selectedPals = ({
+#ifndef NONMATCHING
+ register u32 value asm("r2");
+ register u32 b asm("r3");
#else
- u32 r2;
+ u32 value;
+ u32 b;
+#endif //NONMATCHING
+ value = params[0] << 0;
+ value |= (b = params[1] << 8);
+ value |= (b = params[2] << 16);
+ value |= (b = params[3] << 24);
+ value;
+ });
+
+ params[0] = params[9];
+
+ color = params[8] << 8;
+ color |= params[7] << 0;
- r0 = T1_READ_32(r1);
-#endif
- r2 = r1[9];
- r1[0] = r2;
- r4 = r1[8] << 8;
- r2 = r1[7];
- r4 |= r2;
gPaletteFade.bufferTransferDisabled = FALSE;
- BeginNormalPaletteFade(r0, r1[4], r1[5], r1[6], r4);
+ BeginNormalPaletteFade(selectedPals, params[4], params[5], params[6], color);
UpdatePaletteFade();
- r6->unkE = 2;
+ game->nextCmd = 2;
return 0;
}
-static u32 sub_814BC10(struct BerryCrushGame * r4, u8 *r5)
+static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * game, u8 *params)
{
- switch (r4->unkC)
+ switch (game->cmdState)
{
case 0:
if (UpdatePaletteFade())
return 0;
- if(r5[0] != 0)
- ++r4->unkC;
+ if(params[0] != 0)
+ ++game->cmdState;
else
- r4->unkC = 3;
+ game->cmdState = 3;
return 0;
case 1:
LinkRfu_SetRfuFuncToSend6600();
- ++r4->unkC;
+ ++game->cmdState;
return 0;
case 2:
if (IsLinkTaskFinished())
{
- ++r4->unkC;
+ ++game->cmdState;
return 0;
}
return 0;
case 3:
- sub_814BB4C(r4->unkF, 1, NULL);
- r4->unkC = 0;
+ BerryCrush_RunOrScheduleCommand(game->afterPalFadeCmd, 1, NULL);
+ game->cmdState = 0;
return 0;
default:
- ++r4->unkC;
+ ++game->cmdState;
return 0;
}
}
-static u32 sub_814BC74(struct BerryCrushGame * r7, u8 *r5)
+static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *params)
{
- u16 r4 = r5[3];
+ u16 r4 = params[3];
r4 <<= 8;
- r4 |= r5[2];
- switch (r7->unkC)
+ r4 |= params[2];
+ switch (game->cmdState)
{
case 0:
- DrawDialogueFrame(0, 0);
- if (r5[1] & 2)
+ DrawDialogueFrame(0, FALSE);
+ if (params[1] & 2)
{
- StringExpandPlaceholders(gStringVar4, gUnknown_846E328[r5[0]]);
- AddTextPrinterParameterized2(0, 2, gStringVar4, r7->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ StringExpandPlaceholders(gStringVar4, gUnknown_846E328[params[0]]);
+ AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
}
else
{
- AddTextPrinterParameterized2(0, 2, gUnknown_846E328[r5[0]], r7->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
+ AddTextPrinterParameterized2(0, 2, gUnknown_846E328[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
}
CopyWindowToVram(0, COPYWIN_BOTH);
break;
@@ -230,7 +235,7 @@ static u32 sub_814BC74(struct BerryCrushGame * r7, u8 *r5)
if (!IsTextPrinterActive(0))
{
if (r4 == 0)
- ++r7->unkC;
+ ++game->cmdState;
break;
}
return 0;
@@ -239,33 +244,33 @@ static u32 sub_814BC74(struct BerryCrushGame * r7, u8 *r5)
return 0;
break;
case 3:
- if (r5[1] & 1)
+ if (params[1] & 1)
ClearDialogWindowAndFrame(0, TRUE);
- sub_814BB4C(r7->unkE, 1, NULL);
- r7->unkC = r5[4];
+ BerryCrush_RunOrScheduleCommand(game->nextCmd, 1, NULL);
+ game->cmdState = params[4];
return 0;
}
- ++r7->unkC;
+ ++game->cmdState;
return 0;
}
-static u32 sub_814BD7C(struct BerryCrushGame * r4, UNUSED u8 *r1)
+static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame * game, UNUSED u8 *params)
{
- if (sub_814D5C8() != 0)
- sub_814BB4C(r4->unkE, 0, r4->unk36);
+ if (BerryCrush_InitBgs() != 0)
+ BerryCrush_RunOrScheduleCommand(game->nextCmd, 0, game->commandParams);
return 0;
}
-static u32 sub_814BD9C(struct BerryCrushGame * r4, UNUSED u8 *r1)
+static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame * game, UNUSED u8 *params)
{
- if (sub_814D888() != 0)
- sub_814BB4C(r4->unkE, 0, r4->unk36);
+ if (BerryCrush_TeardownBgs() != 0)
+ BerryCrush_RunOrScheduleCommand(game->nextCmd, 0, game->commandParams);
return 0;
}
static u32 sub_814BDBC(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
- switch (r4->unkC)
+ switch (r4->cmdState)
{
case 0:
LinkRfu_SetRfuFuncToSend6600();
@@ -274,42 +279,42 @@ static u32 sub_814BDBC(struct BerryCrushGame * r4, UNUSED u8 *r1)
if (IsLinkTaskFinished())
{
PlayNewMapMusic(MUS_SLOT);
- sub_814BB4C(7, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(7, 1, NULL);
r4->unk12 = 3;
- r4->unkC = 0;
+ r4->cmdState = 0;
}
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
static u32 sub_814BE0C(struct BerryCrushGame * r4, u8 *r5)
{
- switch (r4->unkC)
+ switch (r4->cmdState)
{
default:
- ++r4->unkC;
+ ++r4->cmdState;
break;
case 0:
sub_814D4D8(r4);
sub_814D5A4(r5, 0, 1, 0, 1);
- r4->unkE = 7;
- sub_814BB4C(3, 1, NULL);
+ r4->nextCmd = 7;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
break;
case 1:
- r4->unkE = 8;
- sub_814BB4C(5, 1, NULL);
- r4->unkC = 2;
+ r4->nextCmd = 8;
+ BerryCrush_RunOrScheduleCommand(5, 1, NULL);
+ r4->cmdState = 2;
break;
}
return 0;
}
-static u32 sub_814BE64(struct BerryCrushGame * r0, UNUSED u8 *r1)
+static u32 sub_814BE64(struct BerryCrushGame * game, UNUSED u8 *params)
{
- r0->unk4 = NULL;
- SetMainCallback2(sub_814B8F0);
+ game->cmdCallback = NULL;
+ SetMainCallback2(CB2_BerryCrush_GoToBerryPouch);
return 0;
}
@@ -317,12 +322,12 @@ static u32 sub_814BE7C(struct BerryCrushGame * r5, u8 *r2)
{
u8 r3;
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
sub_814D5A4(r2, 1, 0, 0, 1);
- r5->unkE = 9;
- sub_814BB4C(3, 1, NULL);
+ r5->nextCmd = 9;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
return 0;
case 1:
LinkRfu_SetRfuFuncToSend6600();
@@ -331,7 +336,7 @@ static u32 sub_814BE7C(struct BerryCrushGame * r5, u8 *r2)
if (!IsLinkTaskFinished())
return 0;
memset(r5->unk40.unk2, 0, sizeof(r5->unk40.unk2));
- r5->unk40.unk2[0] = r5->unk68.as_four_players.others[r5->unk8].unk0;
+ r5->unk40.unk2[0] = r5->unk68.as_four_players.others[r5->localId].unk0;
SendBlock(0, r5->unk40.unk2, 2);
break;
case 3:
@@ -340,9 +345,9 @@ static u32 sub_814BE7C(struct BerryCrushGame * r5, u8 *r2)
r5->unk10 = 0;
break;
case 4:
- if (GetBlockReceivedStatus() != gUnknown_846E3C8[r5->unk9 - 2])
+ if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[r5->playerCount - 2])
return 0;
- for (r3 = 0; r3 < r5->unk9; ++r3)
+ for (r3 = 0; r3 < r5->playerCount; ++r3)
{
r5->unk68.as_four_players.others[r3].unk0 = gBlockRecvBuffer[r3][0];
if (r5->unk68.as_four_players.others[r3].unk0 > 0xB0)
@@ -355,19 +360,19 @@ static u32 sub_814BE7C(struct BerryCrushGame * r5, u8 *r2)
r5->unk20 = sub_80D8B68(r5->unk18 << 8, 0x2000);
break;
case 5:
- ClearDialogWindowAndFrame(0, 1);
- sub_814BB4C(10, 1, NULL);
+ ClearDialogWindowAndFrame(0, TRUE);
+ BerryCrush_RunOrScheduleCommand(10, 1, NULL);
r5->unk12 = 4;
- r5->unkC = 0;
+ r5->cmdState = 0;
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
static u32 sub_814BFD0(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
- switch (r4->unkC)
+ switch (r4->cmdState)
{
case 0:
sub_814DA24(r4, &r4->unk138);
@@ -396,9 +401,9 @@ static u32 sub_814BFD0(struct BerryCrushGame * r4, UNUSED u8 *r1)
case 4:
if (!IsLinkTaskFinished())
return 0;
- if (r4->unk138.unk0 < r4->unk9)
+ if (r4->unk138.unk0 < r4->playerCount)
{
- r4->unkC = 2;
+ r4->cmdState = 2;
return 0;
}
r4->unk138.unk0 = 0;
@@ -411,18 +416,18 @@ static u32 sub_814BFD0(struct BerryCrushGame * r4, UNUSED u8 *r1)
if (!IsLinkTaskFinished())
return 0;
PlaySE(SE_RU_HYUU);
- sub_814BB4C(11, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(11, 1, NULL);
r4->unk12 = 5;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
static u32 sub_814C118(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
- switch (r4->unkC)
+ switch (r4->cmdState)
{
case 0:
r4->unk2A += 4;
@@ -458,18 +463,18 @@ static u32 sub_814C118(struct BerryCrushGame * r4, UNUSED u8 *r1)
case 3:
if (!IsLinkTaskFinished())
return 0;
- sub_814BB4C(12, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(12, 1, NULL);
r4->unk12 = 6;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
static u32 sub_814C24C(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
- switch (r4-> unkC)
+ switch (r4-> cmdState)
{
case 1:
if (!IsLinkTaskFinished())
@@ -491,15 +496,15 @@ static u32 sub_814C24C(struct BerryCrushGame * r4, UNUSED u8 *r1)
r4->unk138.unk2 = 0;
r4->unk138.unk3 = 0;
r4->unk10 = 0;
- if (r4->unk8 == 0)
- sub_814BB4C(13, 1, NULL);
+ if (r4->localId == 0)
+ BerryCrush_RunOrScheduleCommand(13, 1, NULL);
else
- sub_814BB4C(14, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(14, 1, NULL);
r4->unk12 = 7;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
@@ -512,7 +517,7 @@ void sub_814C2FC(struct BerryCrushGame * r4)
s32 r2_ = 0;
s32 r0;
- for (r7 = 0; r7 < r4->unk9; ++r7)
+ for (r7 = 0; r7 < r4->playerCount; ++r7)
{
r2 = gRecvCmds[r7];
if ((r2[0] & 0xFF00) == 0x2F00
@@ -550,7 +555,7 @@ void sub_814C2FC(struct BerryCrushGame * r4)
}
if (r8 > 1)
{
- for (r7 = 0; r7 < r4->unk9; ++r7)
+ for (r7 = 0; r7 < r4->playerCount; ++r7)
{
if (r4->unk68.as_four_players.others[r7].unk4.as_2d_bytes[1][5] != 0)
{
@@ -588,7 +593,7 @@ void sub_814C4B8(struct BerryCrushGame * r3)
u16 r1 = 0;
u8 r4 = 0;
- for (r4 = 0; r4 < r3->unk9; ++r4)
+ for (r4 = 0; r4 < r3->playerCount; ++r4)
{
if (r3->unk68.as_four_players.others[r4].unk4.as_2d_bytes[1][5] != 0)
{
@@ -660,15 +665,15 @@ void sub_814C618(struct BerryCrushGame * r5)
r5->unk5C.unk02_2 = 1;
if (gMain.heldKeys & A_BUTTON)
{
- if (r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5] < r5->unk28)
- ++r5->unk68.as_four_players.others[r5->unk8].unk4.as_hwords[5];
+ if (r5->unk68.as_four_players.others[r5->localId].unk4.as_hwords[5] < r5->unk28)
+ ++r5->unk68.as_four_players.others[r5->localId].unk4.as_hwords[5];
}
- if (r5->unk8 != 0 && r5->unk5C.unk02_2 == 0)
+ if (r5->localId != 0 && r5->unk5C.unk02_2 == 0)
return;
r5->unk5C.unk00 = 2;
if (r5->unk28 % 30 == 0)
{
- if (r5->unk2E > gUnknown_846E3C4[r5->unk9 - 2])
+ if (r5->unk2E > gUnknown_846E3C4[r5->playerCount - 2])
{
++r5->unk30;
r5->unk25_4 = 1;
@@ -682,13 +687,13 @@ void sub_814C618(struct BerryCrushGame * r5)
}
if (r5->unk28 % 15 == 0)
{
- if (r5->unk34 < gUnknown_846E3B4[r5->unk9 - 2][0])
+ if (r5->unk34 < gUnknown_846E3B4[r5->playerCount - 2][0])
r5->unk25_5 = 0;
- else if (r5->unk34 < gUnknown_846E3B4[r5->unk9 - 2][1])
+ else if (r5->unk34 < gUnknown_846E3B4[r5->playerCount - 2][1])
r5->unk25_5 = 1;
- else if (r5->unk34 < gUnknown_846E3B4[r5->unk9 - 2][2])
+ else if (r5->unk34 < gUnknown_846E3B4[r5->playerCount - 2][2])
r5->unk34 = 2; // typo since r5->unk34 will be reset?
- else if (r5->unk34 < gUnknown_846E3B4[r5->unk9 - 2][3])
+ else if (r5->unk34 < gUnknown_846E3B4[r5->playerCount - 2][3])
r5->unk34 = 3; // typo since r5->unk34 will be reset?
else
r5->unk25_5 = 4;
@@ -727,7 +732,7 @@ void sub_814C7BC(struct BerryCrushGame * r5)
register u32 r4 asm("r4");
register u32 r0 asm("r0");
- for (r4 = 0; r4 < r5->unk9; r4 = (u8)r0)
+ for (r4 = 0; r4 < r5->playerCount; r4 = (u8)r0)
{
r5->unk68.as_four_players.others[r4].unk4.as_2d_bytes[1][5] = 0;
r0 = r4 + 1;
@@ -769,14 +774,14 @@ static u32 sub_814C850(struct BerryCrushGame * r4, UNUSED u8 *r1)
if (r4->unk28 >= 36000)
{
r4->unk28 = 36000;
- sub_814BB4C(16, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(16, 1, NULL);
}
else
{
- sub_814BB4C(15, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(15, 1, NULL);
}
r4->unk10 = 0;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
else
@@ -802,14 +807,14 @@ static u32 sub_814C8F8(struct BerryCrushGame * r4, UNUSED u8 *r1)
if (r4->unk28 >= 36000)
{
r4->unk28 = 36000;
- sub_814BB4C(16, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(16, 1, NULL);
}
else
{
- sub_814BB4C(15, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(15, 1, NULL);
}
r4->unk10 = 0;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
else
@@ -821,7 +826,7 @@ static u32 sub_814C8F8(struct BerryCrushGame * r4, UNUSED u8 *r1)
static u32 sub_814C990(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
- switch (r4->unkC)
+ switch (r4->cmdState)
{
case 0:
r4->unk12 = 8;
@@ -867,18 +872,18 @@ static u32 sub_814C990(struct BerryCrushGame * r4, UNUSED u8 *r1)
case 5:
if (!IsLinkTaskFinished())
return 0;
- sub_814BB4C(17, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(17, 1, NULL);
r4->unk10 = 0;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
static u32 sub_814CB20(struct BerryCrushGame * r5, u8 *r6)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
r5->unk12 = 9;
@@ -906,13 +911,13 @@ static u32 sub_814CB20(struct BerryCrushGame * r5, u8 *r6)
return 0;
ConvertIntToDecimalStringN(gStringVar1, r5->unk1C, STR_CONV_MODE_LEFT_ALIGN, 6);
sub_814D5A4(r6, 7, 1, 0, 0);
- r5->unkE = 19;
- sub_814BB4C(3, 1, NULL);
+ r5->nextCmd = 19;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r5->unk10 = 0;
- r5->unkC = 0;
+ r5->cmdState = 0;
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
@@ -923,13 +928,13 @@ static u32 sub_814CC0C(struct BerryCrushGame * r7, UNUSED u8 *r1)
s32 r4;
u8 r6; // ???
- switch (r7->unkC)
+ switch (r7->cmdState)
{
case 0:
memset(r7->unk40.unk2, 0, 2 * sizeof(u16));
- if (r7->unk68.as_four_players.others[r7->unk8].unk4.as_hwords[5] > r7->unk28)
- r7->unk68.as_four_players.others[r7->unk8].unk4.as_hwords[5] = r7->unk28;
- r7->unk40.unk2[0] = r7->unk68.as_four_players.others[r7->unk8].unk4.as_hwords[5];
+ if (r7->unk68.as_four_players.others[r7->localId].unk4.as_hwords[5] > r7->unk28)
+ r7->unk68.as_four_players.others[r7->localId].unk4.as_hwords[5] = r7->unk28;
+ r7->unk40.unk2[0] = r7->unk68.as_four_players.others[r7->localId].unk4.as_hwords[5];
SendBlock(0, r7->unk40.unk2, 2);
break;
case 1:
@@ -938,17 +943,17 @@ static u32 sub_814CC0C(struct BerryCrushGame * r7, UNUSED u8 *r1)
r7->unk10 = 0;
break;
case 2:
- if (GetBlockReceivedStatus() != gUnknown_846E3C8[r7->unk9 - 2])
+ if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[r7->playerCount - 2])
return 0;
- for (r8 = 0; r8 < r7->unk9; ++r8)
+ for (r8 = 0; r8 < r7->playerCount; ++r8)
r7->unk68.as_four_players.others[r8].unk4.as_hwords[5] = gBlockRecvBuffer[r8][0];
r7->unk10 = 0;
r7->unk40.unk2[0] = 0;
ResetBlockReceivedFlags();
- if (r7->unk8 == 0)
- r7->unkC = 3;
+ if (r7->localId == 0)
+ r7->cmdState = 3;
else
- r7->unkC = 6;
+ r7->cmdState = 6;
return 0;
case 3:
memset(
@@ -964,17 +969,17 @@ static u32 sub_814CC0C(struct BerryCrushGame * r7, UNUSED u8 *r1)
r7->unk68.as_four_players.unk00.unk08 = r2 & 0x7F;
r2 <<= 8;
r2 = sub_80D8B68(r2, 0x6400);
- r4 = (r7->unk1C * r7->unk9) << 8;
+ r4 = (r7->unk1C * r7->playerCount) << 8;
r4 = sub_80D8AE0(r4, r2);
r7->unk68.as_four_players.unk00.unk00 = r4 >> 8;
- r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[0][7] = Random() % 3;
- for (r6 = 0, r8 = 0; r8 < r7->unk9; ++r8)
+ r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[0][7] = Random() % 3;
+ for (r6 = 0, r8 = 0; r8 < r7->playerCount; ++r8)
{
- r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[0][r8] = r8;
- r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[1][r8] = r8;
+ r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[0][r8] = r8;
+ r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[1][r8] = r8;
r7->unk68.as_four_players.unk00.unk0C[0][r8] = r7->unk68.as_four_players.others[r8].unk4.as_hwords[3];
r7->unk68.as_four_players.unk00.unk0A += r7->unk68.as_four_players.unk00.unk0C[0][r8];
- switch (r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[0][7])
+ switch (r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[0][7])
{
case 0:
if (r7->unk68.as_four_players.others[r8].unk4.as_hwords[3] != 0)
@@ -1031,15 +1036,15 @@ static u32 sub_814CC0C(struct BerryCrushGame * r7, UNUSED u8 *r1)
}
break;
case 4:
- for (r6 = 0, r8 = 0; r8 < r7->unk9 - 1; ++r8)
+ for (r6 = 0, r8 = 0; r8 < r7->playerCount - 1; ++r8)
{
- for (r4_ = r7->unk9 - 1; r4_ > r8; --r4_)
+ for (r4_ = r7->playerCount - 1; r4_ > r8; --r4_)
{
u16 r0;
u8 r3;
u16 *sp00 = r7->unk68.as_four_players.unk00.unk0C[0];
- u8 *sp04 = r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[0];
- u8 *r10 = r7->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[1];
+ u8 *sp04 = r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[0];
+ u8 *r10 = r7->unk68.as_five_players.players[0].unk4.as_2d_bytes[1];
u16 *r9 = r7->unk68.as_four_players.unk00.unk0C[1];
s32 r12 = r4_ - 1;
u16 *p1 = sp00 + r12; // these have to be here
@@ -1096,19 +1101,19 @@ static u32 sub_814CC0C(struct BerryCrushGame * r7, UNUSED u8 *r1)
break;
case 7:
sub_814B930();
- sub_814BB4C(18, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(18, 1, NULL);
r7->unk12 = 11;
- r7->unkC = 0;
+ r7->cmdState = 0;
r7->unk24 = 0;
return 0;
}
- ++r7->unkC;
+ ++r7->cmdState;
return 0;
}
static u32 sub_814CFA8(struct BerryCrushGame * r5, u8 *r6)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
if (!sub_814E644(r5, &r5->unk138))
@@ -1133,7 +1138,7 @@ static u32 sub_814CFA8(struct BerryCrushGame * r5, u8 *r6)
if (r5->unk12 <= 12)
{
++r5->unk12;
- r5->unkC = 0;
+ r5->cmdState = 0;
return 0;
}
break;
@@ -1141,26 +1146,26 @@ static u32 sub_814CFA8(struct BerryCrushGame * r5, u8 *r6)
ConvertIntToDecimalStringN(gStringVar1, r5->unk1C, STR_CONV_MODE_LEFT_ALIGN, 6);
ConvertIntToDecimalStringN(gStringVar2, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 6);
sub_814D5A4(r6, 2, 3, 0, 0);
- r5->unkE = 19;
- sub_814BB4C(3, 1, NULL);
- r5->unkC = 0;
+ r5->nextCmd = 19;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
+ r5->cmdState = 0;
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
static u32 sub_814D094(struct BerryCrushGame * r5, u8 *r4)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
if (r5->unk28 >= 36000)
sub_814EB04(&r5->unk138);
sub_814D5A4(r4, 8, 0, 0, 1);
- r5->unkE = 19;
- sub_814BB4C(3, 1, NULL);
- r5->unkC = 0;
+ r5->nextCmd = 19;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
+ r5->cmdState = 0;
return 0;
case 1:
LinkRfu_SetRfuFuncToSend6600();
@@ -1168,8 +1173,8 @@ static u32 sub_814D094(struct BerryCrushGame * r5, u8 *r4)
case 2:
if (!IsLinkTaskFinished())
return 0;
- DrawDialogueFrame(0, 0);
- AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, 0, 2, 1, 3);
+ DrawDialogueFrame(0, FALSE);
+ AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_BOTH);
CreateTask(sub_80DA634, 0);
break;
@@ -1178,12 +1183,12 @@ static u32 sub_814D094(struct BerryCrushGame * r5, u8 *r4)
return 0;
break;
case 4:
- sub_814BB4C(20, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(20, 1, NULL);
r5->unk12 = 15;
- r5->unkC = 0;
+ r5->cmdState = 0;
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
@@ -1196,14 +1201,14 @@ static u32 sub_814D188(struct BerryCrushGame * r5, u8 *r6)
s32 r0;
#endif
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
sub_814D5A4(r6, 4, 0, 0, 1);
- r5->unkE = 20;
- sub_814BB4C(3, 1, NULL);
+ r5->nextCmd = 20;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
r0 = 0;
- r5->unkC = r0; // dunno what it's doing because it's already in case 0
+ r5->cmdState = r0; // dunno what it's doing because it's already in case 0
return 0;
case 1:
DisplayYesNoMenuDefaultYes();
@@ -1223,15 +1228,15 @@ static u32 sub_814D188(struct BerryCrushGame * r5, u8 *r6)
{
r5->unk14 = 1;
}
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
sub_814D5A4(r6, 8, 0, 0, 0);
- r5->unkE = 21;
- sub_814BB4C(3, 1, NULL);
- r5->unkC = 0;
+ r5->nextCmd = 21;
+ BerryCrush_RunOrScheduleCommand(3, 1, NULL);
+ r5->cmdState = 0;
}
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
@@ -1239,7 +1244,7 @@ static u32 sub_814D240(struct BerryCrushGame * r4, UNUSED u8 *r1)
{
u8 r5 = 0;
- switch (r4->unkC)
+ switch (r4->cmdState)
{
case 0:
LinkRfu_SetRfuFuncToSend6600();
@@ -1257,28 +1262,28 @@ static u32 sub_814D240(struct BerryCrushGame * r4, UNUSED u8 *r1)
r4->unk10 = 0;
break;
case 3:
- if (GetBlockReceivedStatus() != gUnknown_846E3C8[r4->unk9 - 2])
+ if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[r4->playerCount - 2])
return 0;
- for (; r5 < r4->unk9; ++r5)
+ for (; r5 < r4->playerCount; ++r5)
r4->unk40.unkE.unk0 += gBlockRecvBuffer[r5][0];
if (r4->unk40.unkE.unk0 != 0)
- sub_814BB4C(23, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(23, 1, NULL);
else
- sub_814BB4C(22, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(22, 1, NULL);
ResetBlockReceivedFlags();
r4->unk40.unk2[0] = 0;
r4->unk40.unkE.unk0 = 0;
r4->unk10 = 0;
- r4->unkC = 0;
+ r4->cmdState = 0;
return 0;
}
- ++r4->unkC;
+ ++r4->cmdState;
return 0;
}
static u32 sub_814D31C(struct BerryCrushGame * r5, UNUSED u8 *r1)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, RGB_BLACK);
@@ -1289,7 +1294,7 @@ static u32 sub_814D31C(struct BerryCrushGame * r5, UNUSED u8 *r1)
return 0;
break;
case 2:
- ClearDialogWindowAndFrame(0, 1);
+ ClearDialogWindowAndFrame(0, TRUE);
sub_814DA04(r5);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
UpdatePaletteFade();
@@ -1297,25 +1302,25 @@ static u32 sub_814D31C(struct BerryCrushGame * r5, UNUSED u8 *r1)
case 3:
if (UpdatePaletteFade())
return 0;
- sub_814BB4C(7, 1, NULL);
+ BerryCrush_RunOrScheduleCommand(7, 1, NULL);
r5->unk12 = 3;
- r5->unkC = 0;
+ r5->cmdState = 0;
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
static u32 sub_814D3A4(struct BerryCrushGame * r5, UNUSED u8 *r1)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
- DrawDialogueFrame(0, 0);
+ DrawDialogueFrame(0, FALSE);
if (r5->unk14 == 3)
- AddTextPrinterParameterized2(0, 2, gUnknown_846E328[5], r5->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, 2, gUnknown_846E328[5], r5->textSpeed, NULL, 2, 1, 3);
else
- AddTextPrinterParameterized2(0, 2, gUnknown_846E328[6], r5->textSpeed, 0, 2, 1, 3);
+ AddTextPrinterParameterized2(0, 2, gUnknown_846E328[6], r5->textSpeed, NULL, 2, 1, 3);
CopyWindowToVram(0, COPYWIN_BOTH);
break;
case 1:
@@ -1328,18 +1333,18 @@ static u32 sub_814D3A4(struct BerryCrushGame * r5, UNUSED u8 *r1)
--r5->unk138.unk0;
else
{
- sub_814BB4C(24, 1, NULL);
- r5->unkC = 0;
+ BerryCrush_RunOrScheduleCommand(24, 1, NULL);
+ r5->cmdState = 0;
}
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
static u32 sub_814D468(struct BerryCrushGame * r5, UNUSED u8 *r1)
{
- switch (r5->unkC)
+ switch (r5->cmdState)
{
case 0:
LinkRfu_SetRfuFuncToSend6600();
@@ -1350,24 +1355,24 @@ static u32 sub_814D468(struct BerryCrushGame * r5, UNUSED u8 *r1)
Link_TryStartSend5FFF();
break;
case 2:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
return 0;
- r5->unkE = 25;
- sub_814BB4C(5, 1, NULL);
- r5->unkC = 2; // ???
+ r5->nextCmd = 25;
+ BerryCrush_RunOrScheduleCommand(5, 1, NULL);
+ r5->cmdState = 2; // ???
return 0;
}
- ++r5->unkC;
+ ++r5->cmdState;
return 0;
}
static u32 sub_814D4C8(UNUSED struct BerryCrushGame * r0, UNUSED u8 *r1)
{
- sub_814B6FC(NULL);
+ ExitBerryCrushWithCallback(NULL);
return 0;
}
-void sub_814D4D8(struct BerryCrushGame * r4)
+static void sub_814D4D8(struct BerryCrushGame * r4)
{
u8 r5 = 0;
@@ -1408,66 +1413,21 @@ void sub_814D4D8(struct BerryCrushGame * r4)
}
}
-#ifdef NONMATCHING
-void sub_814D564(u8 *r0, u32 r1, s32 r2, u32 r3, u32 r5, u32 r6, u32 r4)
+void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter, u32 selectedPals, s8 delay, u8 startY, u8 targetY, u16 palette)
{
- u8 sp[8];
- u8 *p;
-
- 1[(u32 *)sp] = r2;
- 0[(u16 *)sp] = r4;
- p = &sp[4];
- r0[0] = p[0];
- r0[1] = p[1];
- r0[2] = p[2];
- r0[3] = p[3];
- r0[4] = r3;
- r0[5] = r5;
- r0[6] = r6;
- r0[7] = sp[0];
- r0[8] = sp[1];
- r0[9] = r1;
+ params[0] = ((u8 *)&selectedPals)[0];
+ params[1] = ((u8 *)&selectedPals)[1];
+ params[2] = ((u8 *)&selectedPals)[2];
+ params[3] = ((u8 *)&selectedPals)[3];
+ params[4] = delay;
+ params[5] = startY;
+ params[6] = targetY;
+ params[7] = ((u8 *)&palette)[0];
+ params[8] = ((u8 *)&palette)[1];
+ params[9] = communicateAfter;
}
-#else
-NAKED
-void sub_814D564(u8 *r0, u32 r1, s32 r2, u32 r3, u32 r5, u32 r6, u32 r4)
-{
- asm_unified("\n\
- push {r4-r6,lr}\n\
- sub sp, 0x8\n\
- str r2, [sp, 0x4]\n\
- ldr r5, [sp, 0x18]\n\
- ldr r6, [sp, 0x1C]\n\
- ldr r4, [sp, 0x20]\n\
- mov r2, sp\n\
- strh r4, [r2]\n\
- add r4, sp, 0x4\n\
- ldrb r2, [r4]\n\
- strb r2, [r0]\n\
- ldrb r2, [r4, 0x1]\n\
- strb r2, [r0, 0x1]\n\
- ldrb r2, [r4, 0x2]\n\
- strb r2, [r0, 0x2]\n\
- ldrb r2, [r4, 0x3]\n\
- strb r2, [r0, 0x3]\n\
- strb r3, [r0, 0x4]\n\
- strb r5, [r0, 0x5]\n\
- strb r6, [r0, 0x6]\n\
- mov r2, sp\n\
- ldrb r2, [r2]\n\
- strb r2, [r0, 0x7]\n\
- mov r2, sp\n\
- ldrb r2, [r2, 0x1]\n\
- strb r2, [r0, 0x8]\n\
- strb r1, [r0, 0x9]\n\
- add sp, 0x8\n\
- pop {r4-r6}\n\
- pop {r0}\n\
- bx r0");
-}
-#endif
-void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5)
+static void sub_814D5A4(u8 *r0, u32 r1, u32 r2, u32 r3, u32 r5)
{
u8 sp[4];
diff --git a/src/berry_crush_3.c b/src/berry_crush_3.c
index f4a232de2..077cfc1c3 100644
--- a/src/berry_crush_3.c
+++ b/src/berry_crush_3.c
@@ -37,7 +37,7 @@ static void sub_814EFFC(struct Sprite * sprite);
static void sub_814F044(struct Sprite * sprite);
static void sub_814F0D8(struct Sprite * sprite);
-static const struct BgTemplate gUnknown_846E3CC[] = {
+static const struct BgTemplate sBgTemplates[] = {
{
.bg = 0,
.charBaseIndex = 2,
@@ -251,7 +251,7 @@ static const u16 gUnknown_846F2EC[] = {
5, 6, 7, 8, 9
};
-static const struct CompressedSpriteSheet gUnknown_846F2F8[] = {
+static const struct CompressedSpriteSheet sSpriteSheets[] = {
{gUnknown_846E4D0, 0x0800, 1},
{gUnknown_846E7FC, 0x0e00, 2},
{gUnknown_846EB78, 0x0700, 3},
@@ -259,7 +259,7 @@ static const struct CompressedSpriteSheet gUnknown_846F2F8[] = {
{}
};
-static const struct SpritePalette gUnknown_846F320[] = {
+static const struct SpritePalette sSpritePals[] = {
{gUnknown_846E470, 1},
{gUnknown_846E490, 2},
{gUnknown_846E4B0, 4},
@@ -403,7 +403,7 @@ static const struct SpriteTemplate gUnknown_846F470 = {
.callback = SpriteCallbackDummy
};
-static const struct DigitObjUtilTemplate gUnknown_846F488[] = {
+static const struct DigitObjUtilTemplate sDigitObjTemplates[] = {
{
.strConvMode = 1,
.shape = SPRITE_SHAPE(8x16),
@@ -413,8 +413,8 @@ static const struct DigitObjUtilTemplate gUnknown_846F488[] = {
.xDelta = 8,
.x = 156,
.y = 0,
- .spriteSheet = {.compressed = &gUnknown_846F2F8[3]},
- .spritePal = &gUnknown_846F320[2],
+ .spriteSheet = {.compressed = &sSpriteSheets[3]},
+ .spritePal = &sSpritePals[2],
}, {
.strConvMode = 0,
.shape = SPRITE_SHAPE(8x16),
@@ -424,8 +424,8 @@ static const struct DigitObjUtilTemplate gUnknown_846F488[] = {
.xDelta = 8,
.x = 180,
.y = 0,
- .spriteSheet = {.compressed = &gUnknown_846F2F8[3]},
- .spritePal = &gUnknown_846F320[2],
+ .spriteSheet = {.compressed = &sSpriteSheets[3]},
+ .spritePal = &sSpritePals[2],
}, {
.strConvMode = 0,
.shape = SPRITE_SHAPE(8x16),
@@ -435,12 +435,12 @@ static const struct DigitObjUtilTemplate gUnknown_846F488[] = {
.xDelta = 8,
.x = 204,
.y = 0,
- .spriteSheet = {.compressed = &gUnknown_846F2F8[3]},
- .spritePal = &gUnknown_846F320[2],
+ .spriteSheet = {.compressed = &sSpriteSheets[3]},
+ .spritePal = &sSpritePals[2],
}
};
-static const u8 *const gUnknown_846F4B8[] = {
+static const u8 *const sBCRankingHeaders[] = {
gText_SpaceTimes,
gText_XDotY,
gText_StrVar1Berry,
@@ -449,13 +449,13 @@ static const u8 *const gUnknown_846F4B8[] = {
gText_PressingPowerRankings
};
-int sub_814D5C8(void)
+int BerryCrush_InitBgs(void)
{
- struct BerryCrushGame * var0 = sub_814B6F0();
- if (!var0)
+ struct BerryCrushGame * game = GetBerryCrushGame();
+ if (game == NULL)
return -1;
- switch (var0->unkC)
+ switch (game->cmdState)
{
case 0:
SetVBlankCallback(NULL);
@@ -475,11 +475,11 @@ int sub_814D5C8(void)
FreeAllSpritePalettes();
break;
case 3:
- ResetBgsAndClearDma3BusyFlags(0);
- InitBgsFromTemplates(0, gUnknown_846E3CC, NELEMS(gUnknown_846E3CC));
- SetBgTilemapBuffer(1, var0->unk1C0);
- SetBgTilemapBuffer(2, var0->unk21C0);
- SetBgTilemapBuffer(3, var0->unk31C0);
+ ResetBgsAndClearDma3BusyFlags(FALSE);
+ InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates));
+ SetBgTilemapBuffer(1, game->bg1Buffer);
+ SetBgTilemapBuffer(2, game->bg2Buffer);
+ SetBgTilemapBuffer(3, game->bg3Buffer);
ChangeBgX(0, 0, 0);
ChangeBgY(0, 0, 0);
ChangeBgX(2, 0, 0);
@@ -508,8 +508,8 @@ int sub_814D5C8(void)
InitStandardTextBoxWindows();
ResetBg0();
- sub_814EB38(var0);
- sub_814EBB0(var0);
+ sub_814EB38(game);
+ sub_814EBB0(game);
gPaletteFade.bufferTransferDisabled = TRUE;
break;
case 7:
@@ -517,7 +517,7 @@ int sub_814D5C8(void)
CopyToBgTilemapBuffer(1, gBerryCrushGrinderTopTilemap, 0, 0);
CopyToBgTilemapBuffer(2, gBerryCrushContainerCapTilemap, 0, 0);
CopyToBgTilemapBuffer(3, gBerryCrushBackgroundTilemap, 0, 0);
- sub_814EC80(var0);
+ sub_814EC80(game);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
CopyBgTilemapBufferToVram(3);
@@ -525,7 +525,7 @@ int sub_814D5C8(void)
case 8:
LoadWirelessStatusIndicatorSpriteGfx();
CreateWirelessStatusIndicatorSprite(0, 0);
- sub_814ECE0(var0);
+ sub_814ECE0(game);
SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);
ChangeBgX(1, 0, 0);
ChangeBgY(1, 0, 0);
@@ -538,22 +538,22 @@ int sub_814D5C8(void)
ShowBg(2);
ShowBg(3);
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
- sub_814B914();
- var0->unkC = 0;
+ BerryCrush_SetVBlankCallback();
+ game->cmdState = 0;
return 1;
}
- var0->unkC++;
+ game->cmdState++;
return 0;
}
-int sub_814D888(void)
+int BerryCrush_TeardownBgs(void)
{
- struct BerryCrushGame * var0 = sub_814B6F0();
+ struct BerryCrushGame * var0 = GetBerryCrushGame();
if (!var0)
return -1;
- switch (var0->unkC)
+ switch (var0->cmdState)
{
case 0:
LinkRfu_SetRfuFuncToSend6600();
@@ -599,21 +599,21 @@ int sub_814D888(void)
DigitObjUtil_Teardown();
break;
case 7:
- var0->unkC = 0;
+ var0->cmdState = 0;
return 1;
}
- var0->unkC++;
+ var0->cmdState++;
return 0;
}
-int sub_814D9CC(struct BerryCrushGame * arg0)
+int sub_814D9CC(struct BerryCrushGame * game)
{
- gSpriteCoordOffsetY = arg0->unk2A + arg0->unk2C;
+ gSpriteCoordOffsetY = game->unk2A + game->unk2C;
SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);
- if (arg0->unk12 == 7)
+ if (game->unk12 == 7)
{
- sub_814EAD4(&arg0->unk138, arg0->unk28);
+ sub_814EAD4(&game->unk138, game->unk28);
}
return 0;
@@ -637,7 +637,7 @@ void sub_814DA24(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
s16 var5;
u32 var6;
- for (i = 0; i < arg0->unk9; i++)
+ for (i = 0; i < arg0->playerCount; i++)
{
spriteId = AddItemIconObjectWithCustomObjectTemplate(
&gUnknown_846F470,
@@ -705,7 +705,7 @@ void sub_814DB84(struct Sprite * sprite)
void sub_814DC24(struct BerryCrushGame * arg0, UNUSED struct BerryCrushGame_138 * arg1)
{
u8 i;
- for (i = 0; i < arg0->unk9; i++)
+ for (i = 0; i < arg0->playerCount; i++)
{
FreeSpritePaletteByTag(gUnknown_846F2EC[i]);
FreeSpriteTilesByTag(gUnknown_846F2EC[i]);
@@ -721,7 +721,7 @@ void sub_814DC5C(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
sp4 = 0;
var4E = &arg0->unk40.unkE;
- for (i = 0; i < arg0->unk9; i++)
+ for (i = 0; i < arg0->playerCount; i++)
{
var = var4E->unkA >> (i * 3);
var &= 7;
@@ -788,7 +788,7 @@ bool32 sub_814DE50(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg
{
u8 i;
- for (i = 0; i < arg0->unk9; i++)
+ for (i = 0; i < arg0->playerCount; i++)
{
if (!arg1->unk24[i]->invisible)
return FALSE;
@@ -831,72 +831,72 @@ static void sub_814DF44(u8 windowId, u8 left, u8 colorId, const u8 *string)
AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string);
}
-static void sub_814DFA4(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 sp18)
+static void sub_814DFA4(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
{
- u8 r8 = 0;
- u8 sp1C = 0;
- u8 sp20 = 0;
- u8 r2;
- s32 r3;
- u8 r7;
- union BerryCrushGame_68 * sp24 = &sp0C->unk68;
- s32 sp30;
-
- for (; r8 < sp0C->unk9; r8++)
+ u8 i = 0;
+ u8 linkPlayerId = 0;
+ u8 linkIdToPrint = 0;
+ u8 j;
+ s32 score;
+ u8 realX;
+ union BerryCrushGame_68 * bcPlayers = &game->unk68;
+ s32 realX2;
+
+ for (; i < game->playerCount; i++)
{
DynamicPlaceholderTextUtil_Reset();
- switch (sp10)
+ switch (command)
{
case 0:
- sp1C = sp24->as_five_players.unk1C[0].unk4.as_2d_bytes[sp10][r8];
- if (r8 != 0 && sp24->as_four_players.unk00.unk0C[sp10][r8] != sp24->as_four_players.unk00.unk0C[sp10][r8 - 1])
+ linkPlayerId = bcPlayers->as_five_players.players[0].unk4.as_2d_bytes[command][i];
+ if (i != 0 && bcPlayers->as_four_players.unk00.unk0C[command][i] != bcPlayers->as_four_players.unk00.unk0C[command][i - 1])
{
- sp20 = r8;
+ linkIdToPrint = i;
}
- ConvertIntToDecimalStringN(gStringVar1, sp24->as_four_players.unk00.unk0C[sp10][r8], STR_CONV_MODE_RIGHT_ALIGN, 4);
- r7 = sp14 - GetStringWidth(2, gUnknown_846F4B8[sp10], -1) - 4;
- AddTextPrinterParameterized3(sp0C->unk138.unk82, 2, r7, sp18 + 14 * r8, sBerryCrushTextColorTable[0], 0, gUnknown_846F4B8[sp10]);
- AddTextPrinterParameterized3(sp0C->unk138.unk82, 2, r7 - 24, sp18 + 14 * r8, sBerryCrushTextColorTable[0], 0, gStringVar1);
+ ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.unk0C[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4);
+ realX = x - GetStringWidth(2, sBCRankingHeaders[command], -1) - 4;
+ AddTextPrinterParameterized3(game->unk138.unk82, 2, realX, y + 14 * i, sBerryCrushTextColorTable[0], 0, sBCRankingHeaders[command]);
+ AddTextPrinterParameterized3(game->unk138.unk82, 2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar1);
break;
case 1:
- sp1C = sp24->as_five_players.unk1C[0].unk4.as_2d_bytes[sp10][r8];
- if (r8 != 0 && sp24->as_four_players.unk00.unk0C[sp10][r8] != sp24->as_four_players.unk00.unk0C[sp10][r8 - 1])
+ linkPlayerId = bcPlayers->as_five_players.players[0].unk4.as_2d_bytes[command][i];
+ if (i != 0 && bcPlayers->as_four_players.unk00.unk0C[command][i] != bcPlayers->as_four_players.unk00.unk0C[command][i - 1])
{
- sp20 = r8;
+ linkIdToPrint = i;
}
- ConvertIntToDecimalStringN(gStringVar1, sp24->as_four_players.unk00.unk0C[sp10][r8] >> 4, STR_CONV_MODE_RIGHT_ALIGN, 3);
- r3 = 0;
- r7 = sp24->as_four_players.unk00.unk0C[sp10][r8] & 15;
- for (r2 = 0; r2 < 4; r2++)
+ ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.unk0C[command][i] >> 4, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ score = 0;
+ realX = bcPlayers->as_four_players.unk00.unk0C[command][i] & 15;
+ for (j = 0; j < 4; j++)
{
- if ((r7 >> (3 - r2)) & 1)
- r3 += gUnknown_846E450[r2];
+ if ((realX >> (3 - j)) & 1)
+ score += gUnknown_846E450[j];
}
- r7 = r3 / 1000000u;
- ConvertIntToDecimalStringN(gStringVar2, r7, STR_CONV_MODE_LEADING_ZEROS, 2);
- StringExpandPlaceholders(gStringVar4, gUnknown_846F4B8[sp10]);
- sp30 = sp14 - 4;
- AddTextPrinterParameterized3(sp0C->unk138.unk82, 2, sp30 - GetStringWidth(2, gStringVar4, 0), sp18 + 14 * r8, sBerryCrushTextColorTable[0], 0, gStringVar4);
+ realX = score / 1000000u;
+ ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2);
+ StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
+ realX2 = x - 4;
+ AddTextPrinterParameterized3(game->unk138.unk82, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
break;
case 2:
- sp1C = r8;
- sp20 = r8;
- r2 = sp0C->unk68.as_five_players.unk1C[r8].unk14[12];
- if (r2 >= LAST_BERRY_INDEX - FIRST_BERRY_INDEX + 2)
- r2 = 0;
- StringCopy(gStringVar1, gBerries[r2].name);
- StringExpandPlaceholders(gStringVar4, gUnknown_846F4B8[sp10]);
- AddTextPrinterParameterized3(sp0C->unk138.unk82, 2, sp14 - GetStringWidth(2, gStringVar4, -1) - 4, sp18 + 14 * r8, sBerryCrushTextColorTable[0], 0, gStringVar4);
+ linkPlayerId = i;
+ linkIdToPrint = i;
+ j = game->unk68.as_five_players.players[i].unk14[12];
+ if (j >= LAST_BERRY_INDEX - FIRST_BERRY_INDEX + 2)
+ j = 0;
+ StringCopy(gStringVar1, gBerries[j].name);
+ StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
+ AddTextPrinterParameterized3(game->unk138.unk82, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
break;
}
- if (sp1C == sp0C->unk8)
+ if (linkPlayerId == game->localId)
StringCopy(gStringVar3, gText_1_ClrLtGryShdwBlk_Dynamic0);
else
StringCopy(gStringVar3, gText_1_Dynamic0);
- gStringVar3[0] = sp20 + CHAR_1;
- DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, PLAYER_UNK14(sp0C, sp1C));
+ gStringVar3[0] = linkIdToPrint + CHAR_1;
+ DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, BERRYCRUSH_PLAYER_NAME(game, linkPlayerId));
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3);
- AddTextPrinterParameterized3(sp0C->unk138.unk82, 2, 4, sp18 + 14 * r8, sBerryCrushTextColorTable[0], 0, gStringVar4);
+ AddTextPrinterParameterized3(game->unk138.unk82, 2, 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
}
}
@@ -963,7 +963,7 @@ bool32 sub_814E644(struct BerryCrushGame * r4, struct BerryCrushGame_138 * r6)
switch (r6->unk80)
{
case 0:
- r5 = r4->unk9 - 2;
+ r5 = r4->playerCount - 2;
sub_814EB04(r6);
memcpy(&template, &gUnknown_846E428[r4->unk12 - 11], sizeof(struct WindowTemplate));
if (r4->unk12 == 13)
@@ -981,17 +981,17 @@ bool32 sub_814E644(struct BerryCrushGame * r4, struct BerryCrushGame_138 * r6)
DrawStdFrameWithCustomTileAndPalette(r6->unk82, 0, 541, 13);
break;
case 3:
- r5 = r4->unk9 - 2;
+ r5 = r4->playerCount - 2;
switch (r4->unk12)
{
case 11:
sub_814DF44(r6->unk82, 22, 3, gText_PressesRankings);
- sub_814DFA4(r4, 0, 0xB0, 8 * gUnknown_846E448[0][r5] - r4->unk9 * 14);
+ sub_814DFA4(r4, 0, 0xB0, 8 * gUnknown_846E448[0][r5] - r4->playerCount * 14);
r6->unk80 = 5;
return FALSE;
case 12:
- sub_814DF44(r6->unk82, 22, 4, gUnknown_846F4B8[r4->unk68.as_five_players.unk1C[0].unk4.as_2d_bytes[0][7] + 3]);
- sub_814DFA4(r4, 1, 0xB0, 8 * gUnknown_846E448[0][r5] - r4->unk9 * 14);
+ sub_814DF44(r6->unk82, 22, 4, sBCRankingHeaders[r4->unk68.as_five_players.players[0].unk4.as_2d_bytes[0][7] + 3]);
+ sub_814DFA4(r4, 1, 0xB0, 8 * gUnknown_846E448[0][r5] - r4->playerCount * 14);
r6->unk80 = 5;
return FALSE;
case 13:
@@ -1142,65 +1142,64 @@ void sub_814EB04(struct BerryCrushGame_138 * r0)
DigitObjUtil_HideOrShow(0, 1);
}
-static void sub_814EB38(struct BerryCrushGame * r5)
+static void sub_814EB38(struct BerryCrushGame * game)
{
- u8 r6;
+ u8 i;
- for (r6 = 0; r6 < r5->unk9; ++r6)
+ for (i = 0; i < game->playerCount; ++i)
{
- r5->unk138.unkC[r6] = &gUnknown_846F294[gUnknown_846F280[r5->unk9 - 2][r6]];
- r5->unk138.unk83[r6] = AddWindow(&gUnknown_846E3F8[r5->unk138.unkC[r6]->unk0]);
- PutWindowTilemap(r5->unk138.unk83[r6]);
- FillWindowPixelBuffer(r5->unk138.unk83[r6], 0);
+ game->unk138.unkC[i] = &gUnknown_846F294[gUnknown_846F280[game->playerCount - 2][i]];
+ game->unk138.unk83[i] = AddWindow(&gUnknown_846E3F8[game->unk138.unkC[i]->unk0]);
+ PutWindowTilemap(game->unk138.unk83[i]);
+ FillWindowPixelBuffer(game->unk138.unk83[i], PIXEL_FILL(0));
}
}
-static void sub_814EBB0(struct BerryCrushGame * r6)
+static void sub_814EBB0(struct BerryCrushGame * game)
{
- u8 r7, r2;
- u8 *r4;
+ u8 i;
- for (r7 = 0; r7 < r6->unk9; ++r7)
+ for (i = 0; i < game->playerCount; ++i)
{
- PutWindowTilemap(r6->unk138.unk83[r7]);
- if (r7 == r6->unk8)
+ PutWindowTilemap(game->unk138.unk83[i]);
+ if (i == game->localId)
{
AddTextPrinterParameterized4(
- r6->unk138.unk83[r7],
+ game->unk138.unk83[i],
2,
- 36 - GetStringWidth(2, PLAYER_UNK14(r6, r7), 0) / 2u,
+ 36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u,
1,
0,
0,
sBerryCrushTextColorTable[1],
0,
- PLAYER_UNK14(r6, r7)
+ BERRYCRUSH_PLAYER_NAME(game, i)
);
}
else
{
AddTextPrinterParameterized4(
- r6->unk138.unk83[r7],
+ game->unk138.unk83[i],
2,
- 36 - GetStringWidth(2, PLAYER_UNK14(r6, r7), 0) / 2u,
+ 36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u,
1,
0,
0,
sBerryCrushTextColorTable[2],
0,
- PLAYER_UNK14(r6, r7)
+ BERRYCRUSH_PLAYER_NAME(game, i)
);
}
- CopyWindowToVram(r6->unk138.unk83[r7], COPYWIN_BOTH);
+ CopyWindowToVram(game->unk138.unk83[i], COPYWIN_BOTH);
}
CopyBgTilemapBufferToVram(0);
}
-static void sub_814EC80(struct BerryCrushGame * r6)
+static void sub_814EC80(struct BerryCrushGame * game)
{
- u8 r5 = 0;
+ u8 i = 0;
const u32 *r0 = gUnknown_8EB0ADC;
-#ifndef NONMATCHING // r4, r5, r6 register roulette
+#ifndef NONMATCHING // r4, i, game register roulette
register u8 *r4 asm("r4") = gDecompressionBuffer;
register u32 r0_ asm("r0");
#else
@@ -1209,14 +1208,14 @@ static void sub_814EC80(struct BerryCrushGame * r6)
#endif
LZ77UnCompWram(r0, r4);
- for (; r5 < r6->unk9; ++r5)
+ for (; i < game->playerCount; ++i)
{
- r0_ = r6->unk138.unkC[r5]->unk0;
+ r0_ = game->unk138.unkC[i]->unk0;
CopyToBgTilemapBufferRect(
3,
&r4[r0_ * 40],
- r6->unk138.unkC[r5]->unk1,
- r6->unk138.unkC[r5]->unk2,
+ game->unk138.unkC[i]->unk1,
+ game->unk138.unkC[i]->unk2,
10,
2
);
@@ -1224,69 +1223,69 @@ static void sub_814EC80(struct BerryCrushGame * r6)
CopyBgTilemapBufferToVram(3);
}
-static void sub_814ECE0(struct BerryCrushGame * r6)
+static void sub_814ECE0(struct BerryCrushGame * game)
{
- u8 r5 = 0;
- u8 r2;
+ u8 i = 0;
+ u8 spriteId;
- r6->unk2A = -104;
- r6->unk2C = 0;
+ game->unk2A = -104;
+ game->unk2C = 0;
gSpriteCoordOffsetX = 0;
gSpriteCoordOffsetY = -104;
- for (; r5 < 4; ++r5)
- LoadCompressedSpriteSheet(&gUnknown_846F2F8[r5]);
- LoadSpritePalettes(gUnknown_846F320);
- r2 = CreateSprite(&gUnknown_846F410, 120, 88, 5);
- r6->unk138.unk20 = &gSprites[r2];
- r6->unk138.unk20->oam.priority = 3;
- r6->unk138.unk20->coordOffsetEnabled = TRUE;
- r6->unk138.unk20->animPaused = TRUE;
- for (r5 = 0; r5 < r6->unk9; ++r5)
+ for (; i < 4; ++i)
+ LoadCompressedSpriteSheet(&sSpriteSheets[i]);
+ LoadSpritePalettes(sSpritePals);
+ spriteId = CreateSprite(&gUnknown_846F410, 120, 88, 5);
+ game->unk138.unk20 = &gSprites[spriteId];
+ game->unk138.unk20->oam.priority = 3;
+ game->unk138.unk20->coordOffsetEnabled = TRUE;
+ game->unk138.unk20->animPaused = TRUE;
+ for (i = 0; i < game->playerCount; ++i)
{
- r2 = CreateSprite(
+ spriteId = CreateSprite(
&gUnknown_846F428,
- r6->unk138.unkC[r5]->unk4 + 120,
- r6->unk138.unkC[r5]->unk6 + 32,
+ game->unk138.unkC[i]->unk4 + 120,
+ game->unk138.unkC[i]->unk6 + 32,
0
);
- r6->unk138.unk24[r5] = &gSprites[r2];
- r6->unk138.unk24[r5]->oam.priority = 1;
- r6->unk138.unk24[r5]->invisible = TRUE;
- r6->unk138.unk24[r5]->coordOffsetEnabled = TRUE;
- r6->unk138.unk24[r5]->animPaused = TRUE;
+ game->unk138.unk24[i] = &gSprites[spriteId];
+ game->unk138.unk24[i]->oam.priority = 1;
+ game->unk138.unk24[i]->invisible = TRUE;
+ game->unk138.unk24[i]->coordOffsetEnabled = TRUE;
+ game->unk138.unk24[i]->animPaused = TRUE;
}
- for (r5 = 0; r5 < NELEMS(r6->unk138.unk4C); ++r5)
+ for (i = 0; i < NELEMS(game->unk138.unk4C); ++i)
{
- r2 = CreateSprite(
+ spriteId = CreateSprite(
&gUnknown_846F440,
- gUnknown_846F2D6[r5][0] + 120,
- gUnknown_846F2D6[r5][1] + 136,
+ gUnknown_846F2D6[i][0] + 120,
+ gUnknown_846F2D6[i][1] + 136,
6
);
- r6->unk138.unk4C[r5] = &gSprites[r2];
- r6->unk138.unk4C[r5]->oam.priority = 3;
- r6->unk138.unk4C[r5]->invisible = TRUE;
- r6->unk138.unk4C[r5]->animPaused = TRUE;
- r6->unk138.unk4C[r5]->data[0] = r5;
+ game->unk138.unk4C[i] = &gSprites[spriteId];
+ game->unk138.unk4C[i]->oam.priority = 3;
+ game->unk138.unk4C[i]->invisible = TRUE;
+ game->unk138.unk4C[i]->animPaused = TRUE;
+ game->unk138.unk4C[i]->data[0] = i;
}
- for (r5 = 0; r5 < NELEMS(r6->unk138.unk78); ++r5)
+ for (i = 0; i < NELEMS(game->unk138.unk78); ++i)
{
- r2 = CreateSprite(
+ spriteId = CreateSprite(
&gUnknown_846F458,
- 24 * r5 + 176,
+ 24 * i + 176,
8,
0
);
- r6->unk138.unk78[r5] = &gSprites[r2];
- r6->unk138.unk78[r5]->oam.priority = 0;
- r6->unk138.unk78[r5]->invisible = FALSE;
- r6->unk138.unk78[r5]->animPaused = FALSE;
+ game->unk138.unk78[i] = &gSprites[spriteId];
+ game->unk138.unk78[i]->oam.priority = 0;
+ game->unk138.unk78[i]->invisible = FALSE;
+ game->unk138.unk78[i]->animPaused = FALSE;
}
- DigitObjUtil_CreatePrinter(0, 0, &gUnknown_846F488[0]);
- DigitObjUtil_CreatePrinter(1, 0, &gUnknown_846F488[1]);
- DigitObjUtil_CreatePrinter(2, 0, &gUnknown_846F488[2]);
- if (r6->unk12 == 1)
- sub_814EB04(&r6->unk138);
+ DigitObjUtil_CreatePrinter(0, 0, &sDigitObjTemplates[0]);
+ DigitObjUtil_CreatePrinter(1, 0, &sDigitObjTemplates[1]);
+ DigitObjUtil_CreatePrinter(2, 0, &sDigitObjTemplates[2]);
+ if (game->unk12 == 1)
+ sub_814EB04(&game->unk138);
}
static void sub_814EF10(struct BerryCrushGame * r5)
@@ -1307,7 +1306,7 @@ static void sub_814EF10(struct BerryCrushGame * r5)
DigitObjUtil_DeletePrinter(0);
for (r4 = 0; r4 < NELEMS(r5->unk138.unk4C); ++r4)
DestroySprite(r5->unk138.unk4C[r4]);
- for (r4 = 0; r4 < r5->unk9; ++r4)
+ for (r4 = 0; r4 < r5->playerCount; ++r4)
DestroySprite(r5->unk138.unk24[r4]);
if (r5->unk138.unk20->inUse)
DestroySprite(r5->unk138.unk20);
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 478c89bad..7f89bc8b5 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -668,7 +668,7 @@ static void Task_ReturnFromLinkRoomWarp(u8 taskId)
}
break;
case 2:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
diff --git a/src/help_system_812B1E0.c b/src/help_system_812B1E0.c
index f3ec0ba85..d9ee16cfa 100644
--- a/src/help_system_812B1E0.c
+++ b/src/help_system_812B1E0.c
@@ -1880,7 +1880,7 @@ bool8 HelpSystem_UpdateHasntSeenIntro(void)
bool8 sub_812B45C(void)
{
- if (gReceivedRemoteLinkPlayers == 1)
+ if (gReceivedRemoteLinkPlayers == TRUE)
return FALSE;
return TRUE;
}
diff --git a/src/link.c b/src/link.c
index 2d53969e7..eac984b47 100644
--- a/src/link.c
+++ b/src/link.c
@@ -380,7 +380,7 @@ void OpenLink(void)
{
sub_80F86F4();
}
- gReceivedRemoteLinkPlayers = 0;
+ gReceivedRemoteLinkPlayers = FALSE;
for (i = 0; i < MAX_LINK_PLAYERS; i++)
{
gRemoteLinkPlayersNotReceived[i] = TRUE;
@@ -515,9 +515,9 @@ void HandleReceiveRemoteLinkPlayer(u8 who)
{
count += gRemoteLinkPlayersNotReceived[i];
}
- if (count == 0 && gReceivedRemoteLinkPlayers == 0)
+ if (count == 0 && !gReceivedRemoteLinkPlayers)
{
- gReceivedRemoteLinkPlayers = 1;
+ gReceivedRemoteLinkPlayers = TRUE;
}
}
@@ -1678,7 +1678,7 @@ bool8 HandleLinkConnection(void)
void SetWirelessCommType1(void)
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
gWirelessCommType = 1;
}
@@ -1686,7 +1686,7 @@ void SetWirelessCommType1(void)
static void SetWirelessCommType0(void)
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
gWirelessCommType = 0;
}
@@ -1694,7 +1694,7 @@ static void SetWirelessCommType0(void)
void SetWirelessCommType0_UnusedCopy(void)
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
gWirelessCommType = 0;
}
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index 2d35f0ecd..77672f5d8 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -712,7 +712,7 @@ static bool32 sub_80F911C(void)
if (!lman.acceptSlot_flag)
{
LinkRfu_Shutdown();
- gReceivedRemoteLinkPlayers = 0;
+ gReceivedRemoteLinkPlayers = FALSE;
return FALSE;
}
}
@@ -985,7 +985,7 @@ static void RfuHandleReceiveCommand(u8 unused)
switch (gRecvCmds[i][0] & 0xff00)
{
case RFU_COMMAND_0x7800:
- if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers != 0)
+ if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers)
return;
// fallthrough
case RFU_COMMAND_0x7700:
@@ -1017,7 +1017,7 @@ static void RfuHandleReceiveCommand(u8 unused)
{
Rfu.cmd_8800_recvbuf[i].receiving = 2;
Rfu_SetBlockReceivedFlag(i);
- if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers != 0 && Rfu.parent_child == MODE_CHILD)
+ if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers && Rfu.parent_child == MODE_CHILD)
ValidateAndReceivePokemonSioInfo(gBlockRecvBuffer);
}
}
@@ -1035,11 +1035,11 @@ static void RfuHandleReceiveCommand(u8 unused)
case RFU_COMMAND_0xed00:
if (Rfu.parent_child == MODE_CHILD)
{
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
if (gRecvCmds[i][1] & gRfuLinkStatus->connSlotFlag)
{
- gReceivedRemoteLinkPlayers = 0;
+ gReceivedRemoteLinkPlayers = FALSE;
rfu_LMAN_requestChangeAgbClockMaster();
Rfu.unk_ce4 = gRecvCmds[i][2];
}
@@ -1283,7 +1283,7 @@ static void RfuFunc_End5F00_PowerDownRfu(void)
{
rfu_clearAllSlot();
rfu_LMAN_powerDownRFU();
- gReceivedRemoteLinkPlayers = 0;
+ gReceivedRemoteLinkPlayers = FALSE;
Rfu.isShuttingDown = TRUE;
Rfu.RfuFunc = NULL;
}
@@ -1682,7 +1682,7 @@ static void sub_80FA834(u8 taskId)
break;
case 6:
DestroyTask(taskId);
- gReceivedRemoteLinkPlayers = 1;
+ gReceivedRemoteLinkPlayers = TRUE;
Rfu.unk_ce8 = FALSE;
rfu_LMAN_setLinkRecovery(1, 600);
if (Rfu.unionRoomChatters)
@@ -1836,7 +1836,7 @@ static void sub_80FACF0(u8 taskId)
{
ReceiveRfuLinkPlayers((const struct SioInfo *)gBlockRecvBuffer);
ResetBlockReceivedFlag(0);
- gReceivedRemoteLinkPlayers = 1;
+ gReceivedRemoteLinkPlayers = TRUE;
DestroyTask(taskId);
}
break;
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c
index 7a13ee225..3c4766dcd 100644
--- a/src/mystery_gift_menu.c
+++ b/src/mystery_gift_menu.c
@@ -1252,7 +1252,7 @@ void task00_mystery_gift(u8 taskId)
data->state = 6;
break;
case 6:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
ClearScreenInBg0(TRUE);
data->state = 7;
@@ -1600,7 +1600,7 @@ void task00_mystery_gift(u8 taskId)
}
break;
case 30:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
ClearScreenInBg0(1);
data->state = 31;
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 063176151..2b2d77d91 100644
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -234,7 +234,7 @@ static void sub_8147A34(u8 taskId)
u16 packet[6];
s16 *data = gTasks[taskId].data;
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
if (gRecvCmds[0][1] == 0x7FFF)
data[11] = gRecvCmds[0][2];
diff --git a/src/strings.c b/src/strings.c
index 29bbd2fdf..eefd52b90 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1023,15 +1023,15 @@ const u8 gText_WantToPlayAgain[] = _("Want to play again?");
const u8 gText_SomeoneDroppedOut[] = _("Somebody dropped out.\nThe link will be canceled.");
const u8 gText_SpacePoints[] = _(" points");
const u8 gText_CommunicationStandby3[] = _("Communication standby…");
-ALIGNED(4) const u8 gUnknown_841CE3C[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");
-ALIGNED(4) const u8 gUnknown_841CE78[] = _("Please wait while each member\nchooses a BERRY.");
-ALIGNED(4) const u8 gUnknown_841CEA8[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
-ALIGNED(4) const u8 gUnknown_841CF14[] = _("Recording your game results in the\nsave file.\nPlease wait.");
-ALIGNED(4) const u8 gUnknown_841CF50[] = _("Want to play BERRY CRUSH again?");
-ALIGNED(4) const u8 gUnknown_841CF70[] = _("You have no BERRIES.\nThe game will be canceled.");
-ALIGNED(4) const u8 gUnknown_841CFA0[] = _("A member dropped out.\nThe game will be canceled.");
-ALIGNED(4) const u8 gUnknown_841CFD4[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p");
-ALIGNED(4) const u8 gUnknown_841D008[] = _("Communication standby…");
+ALIGNED(4) const u8 gText_BerryCrush_AreYouReady[] = _("Are you ready to BERRY-CRUSH?\nPlease pick a BERRY for use.\p");
+ALIGNED(4) const u8 gText_BerryCrush_WaitForOthersToChooseBerry[] = _("Please wait while each member\nchooses a BERRY.");
+ALIGNED(4) const u8 gText_BerryCrush_GainedXUnitsOfPowder[] = _("{PAUSE_MUSIC}{PLAY_BGM MUS_FANFA1}You ended up with {STR_VAR_1} units of\nsilky-smooth BERRY POWDER.{RESUME_MUSIC}\pYour total amount of BERRY POWDER\nis {STR_VAR_2}.\p");
+ALIGNED(4) const u8 gText_BerryCrush_RecordingGameResults[] = _("Recording your game results in the\nsave file.\nPlease wait.");
+ALIGNED(4) const u8 gText_BerryCrush_WantToPlayAgain[] = _("Want to play BERRY CRUSH again?");
+ALIGNED(4) const u8 gText_BerryCrush_NoBerries[] = _("You have no BERRIES.\nThe game will be canceled.");
+ALIGNED(4) const u8 gText_BerryCrush_MemberDroppedOut[] = _("A member dropped out.\nThe game will be canceled.");
+ALIGNED(4) const u8 gText_BerryCrush_TimeUp[] = _("Time's up.\pGood BERRY POWDER could not be\nmade…\p");
+ALIGNED(4) const u8 gText_BerryCrush_CommunicationStandby[] = _("Communication standby…");
ALIGNED(4) const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[] = _("1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}");
const u8 gText_1_Dynamic0[] = _("1. {DYNAMIC 0x00}");
ALIGNED(4) const u8 gText_SpaceTimes[] = _(" times");
diff --git a/src/trade.c b/src/trade.c
index b23ac974f..7da209d60 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -1233,7 +1233,7 @@ static void TradeMenuCB_13(void)
}
else
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
Free(sSpriteTextTileBuffer);
FreeAllWindowBuffers();
@@ -2686,7 +2686,7 @@ s32 Trade_CalcLinkPlayerCompatibilityParam(void)
s32 val;
u16 version;
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
val = 0;
version = (gLinkPlayers[GetMultiplayerId() ^ 1].version & 0xFF);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index f7b92d929..98799b502 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -1765,7 +1765,7 @@ static bool8 Task_DrawFlippedCardSide(struct Task* task)
return FALSE;
}
sTrainerCardDataPtr->flipDrawState++;
- } while (gReceivedRemoteLinkPlayers == 0);
+ } while (!gReceivedRemoteLinkPlayers);
return FALSE;
}
diff --git a/src/union_room.c b/src/union_room.c
index 48c25f274..1eb5f3ed1 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -1034,7 +1034,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
}
else
{
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
UpdateGameData_GroupLockedIn(TRUE);
CreateTask_RunScriptAndFadeToActivity();
@@ -1385,7 +1385,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
}
break;
case 6:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
RfuSetErrorStatus(0, 0);
@@ -2233,7 +2233,7 @@ static void Task_MEvent_Leader(u8 taskId)
{
data->state = 13;
}
- else if (gReceivedRemoteLinkPlayers != 0)
+ else if (gReceivedRemoteLinkPlayers)
{
UpdateGameData_GroupLockedIn(TRUE);
data->state++;
@@ -2365,7 +2365,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
data->state = 5;
break;
case 5:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
data->state = 10;
@@ -2530,7 +2530,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId)
data->state = 5;
break;
case 5:
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity;
data->state = 12;
@@ -2855,7 +2855,7 @@ static void Task_RunUnionRoom(u8 taskId)
break;
}
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
{
CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
CreateTask(Task_ExchangeCards, 5);
@@ -2872,7 +2872,7 @@ static void Task_RunUnionRoom(u8 taskId)
}
break;
case 30:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
HandleCancelTrade(FALSE);
UpdateUnionGroupMemberFacing(taskData[0], taskData[1], data->field_0);
@@ -2888,7 +2888,7 @@ static void Task_RunUnionRoom(u8 taskId)
var5 = ListMenuHandler_AllItemsAvailable(&data->textState, &data->topListMenuWindowId, &data->topListMenuListMenuId, &sWindowTemplate_InviteToActivity, &sListMenuTemplate_InviteToActivity);
if (var5 != -1)
{
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
data->state = 28;
}
@@ -2947,7 +2947,7 @@ static void Task_RunUnionRoom(u8 taskId)
data->state = 29;
break;
case 29:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
StringCopy(gStringVar4, gUnknown_8458434);
data->state = 28;
@@ -3064,7 +3064,7 @@ static void Task_RunUnionRoom(u8 taskId)
else
UnionRoom_ScheduleFieldMessageWithFollowupState(30, gUnknown_84585E8[playerGender]);
}
- if (gReceivedRemoteLinkPlayers != 0)
+ if (gReceivedRemoteLinkPlayers)
data->state = 16;
break;
case 11:
@@ -3079,7 +3079,7 @@ static void Task_RunUnionRoom(u8 taskId)
HandleCancelTrade(FALSE);
data->state = 2;
}
- else if (gReceivedRemoteLinkPlayers != 0)
+ else if (gReceivedRemoteLinkPlayers)
{
CreateTrainerCardInBuffer(gBlockSendBuffer, TRUE);
CreateTask(Task_ExchangeCards, 5);
@@ -3168,7 +3168,7 @@ static void Task_RunUnionRoom(u8 taskId)
break;
case 36:
// You said no
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
sPlayerCurrActivity = IN_UNION_ROOM;
UnionRoom_ScheduleFieldMessageWithFollowupState(37, gStringVar4);
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index 3d06b3fe2..3d5ef39eb 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -190,7 +190,7 @@ void CB2_UnionRoomBattle(void)
}
break;
case 6:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
gMain.state++;
}
@@ -202,7 +202,7 @@ void CB2_UnionRoomBattle(void)
}
break;
case 8:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
gMain.state++;
}
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 4ac4c62cb..5d19dc9cd 100644
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -543,7 +543,7 @@ static void ChatEntryRoutine_AskQuitChatting(void)
}
break;
case 5:
- if (gReceivedRemoteLinkPlayers == 0)
+ if (!gReceivedRemoteLinkPlayers)
{
GoToRoutine(CHATENTRYROUTINE_SAVEANDEXIT);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 08:18:13 +0000