dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some documentation of berry_crush

Browse Source
This commit is contained in:
PikalaxALT
2020-04-11 14:34:45 -04:00
parent ec0edfd198
commit 8f8665e1dc
20 changed files with 580 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/berry_crush.h
+35 -24
View File
@@ -1,6 +1,18 @@
#ifndef GUARD_BERRY_CRUSH_H
#define GUARD_BERRY_CRUSH_H
enum {
BCTEXT_AREYOUREADY,
BCTEXT_WAITFOROTHERS,
BCTEXT_GAINEDPOWDER,
BCTEXT_RECORDINGRESULTS,
BCTEXT_ASKPLAYAGAIN,
BCTEXT_CANCEL_NOBERRIES,
BCTEXT_CANCEL_DROPPEDOUT,
BCTEXT_TIMEUP,
BCTEXT_COMMSTANDBY,
};
struct BerryCrushGame_Player
{
u16 unk0;
@@ -68,7 +80,7 @@ union BerryCrushGame_68
struct BerryCrushGame_68_y
{
u8 filler00[28];
struct BerryCrushGame_Player unk1C[5];
struct BerryCrushGame_Player players[5];
u8 fillerBC[20];
} as_five_players;
};
@@ -107,16 +119,16 @@ struct BerryCrushGame_138
struct BerryCrushGame
{
MainCallback unk0;
u32 (*unk4)(struct BerryCrushGame *, u8 *);
u8 unk8;
u8 unk9;
u8 unkA;
MainCallback savedCallback;
u32 (*cmdCallback)(struct BerryCrushGame *, u8 *);
u8 localId;
u8 playerCount;
u8 taskId;
u8 textSpeed;
u8 unkC;
u8 cmdState;
u8 unkD;
u8 unkE;
u8 unkF;
u8 nextCmd;
u8 afterPalFadeCmd;
u16 unk10;
u16 unk12;
u16 unk14;
@@ -140,36 +152,35 @@ struct BerryCrushGame
s16 unk30;
s16 unk32;
s16 unk34;
u8 unk36[0xA];
u8 commandParams[10];
struct BerryCrushGame_40 unk40;
struct BerryCrushGame_5C unk5C;
union BerryCrushGame_68 unk68;
struct BerryCrushGame_138 unk138;
u8 unk1C0[0x1000];
u8 bg1Buffer[0x1000];
u8 unk11C0[0x1000];
u8 unk21C0[0x1000];
u8 unk31C0[0x1000];
u8 bg2Buffer[0x1000];
u8 bg3Buffer[0x1000];
};
#define PLAYER_UNK14(game, i) \
#define BERRYCRUSH_PLAYER_NAME(game, i) \
((u8 *)(game) \
+ offsetof(struct BerryCrushGame, unk68) \
+ offsetof(struct BerryCrushGame_68_x, unk30) \
+ sizeof(struct BerryCrushGame_Player) * (i))
struct BerryCrushGame *sub_814B6F0(void);
struct BerryCrushGame *GetBerryCrushGame(void);
void StartBerryCrush(MainCallback callback);
u32 sub_814B6FC(MainCallback callback);
void sub_814B8F0(void);
void sub_814B914(void);
void sub_814B924(void);
u32 ExitBerryCrushWithCallback(MainCallback callback);
void CB2_BerryCrush_GoToBerryPouch(void);
void BerryCrush_SetVBlankCallback(void);
void BerryCrush_UnsetVBlankCallback(void);
void sub_814B930(void);
void sub_814BABC(struct BerryCrushGame *arg0);
void sub_814BB4C(u16, u8, u8 *);
void sub_814D564(u8 *, u32, s32, u32, u32, u32, u32);
void BerryCrush_RunOrScheduleCommand(u16 command, u8 runMode, u8 *params);
void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter, u32 selectedPals, s8 delay, u8 startY, u8 targetY, u16 palette);
int sub_814D9CC(struct BerryCrushGame *arg0);
int sub_814D5C8(void);
int sub_814D888(void);
int BerryCrush_InitBgs(void);
int BerryCrush_TeardownBgs(void);
void sub_814DA24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
void sub_814DC24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
void sub_814DC5C(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
include/strings.h
+9 -9
View File
@@ -1149,15 +1149,15 @@ extern const u8 gUnknown_841DF99[];
extern const u8 gUnknown_841DFA0[];
// berry_crush
extern const u8 gUnknown_841CE3C[];
extern const u8 gUnknown_841CE78[];
extern const u8 gUnknown_841CEA8[];
extern const u8 gUnknown_841CF14[];
extern const u8 gUnknown_841CF50[];
extern const u8 gUnknown_841CF70[];
extern const u8 gUnknown_841CFA0[];
extern const u8 gUnknown_841CFD4[];
extern const u8 gUnknown_841D008[];
extern const u8 gText_BerryCrush_AreYouReady[];
extern const u8 gText_BerryCrush_WaitForOthersToChooseBerry[];
extern const u8 gText_BerryCrush_GainedXUnitsOfPowder[];
extern const u8 gText_BerryCrush_RecordingGameResults[];
extern const u8 gText_BerryCrush_WantToPlayAgain[];
extern const u8 gText_BerryCrush_NoBerries[];
extern const u8 gText_BerryCrush_MemberDroppedOut[];
extern const u8 gText_BerryCrush_TimeUp[];
extern const u8 gText_BerryCrush_CommunicationStandby[];
extern const u8 gText_1_ClrLtGryShdwBlk_Dynamic0[];
extern const u8 gText_1_Dynamic0[];
extern const u8 gText_SpaceTimes[];
src/battle_controller_player.c
+1 -1
View File
@@ -796,7 +796,7 @@ static void sub_802F610(void)
{
if (gWirelessCommType == 0)
{
if (gReceivedRemoteLinkPlayers == 0)
if (!gReceivedRemoteLinkPlayers)
{
m4aSongNumStop(SE_HINSI);
gMain.inBattle = 0;
src/battle_main.c
+5 -5
View File
@@ -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;
src/battle_transition.c
+1 -1
View File
@@ -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;
src/berry_crush.c
+75 -74
View File
@@ -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;
}
}
src/berry_crush_2.c
+249 -289
View File
File diff suppressed because it is too large Load Diff
src/berry_crush_3.c
+159 -160
View File
@@ -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;
u8 i = 0;
u8 linkPlayerId = 0;
u8 linkIdToPrint = 0;
u8 j;
s32 score;
u8 realX;
union BerryCrushGame_68 * bcPlayers = &game->unk68;
s32 realX2;
for (; r8 < sp0C->unk9; r8++)
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);
src/field_fadetransition.c
+1 -1
View File
@@ -668,7 +668,7 @@ static void Task_ReturnFromLinkRoomWarp(u8 taskId)
}
break;
case 2:
if (gReceivedRemoteLinkPlayers == 0)
if (!gReceivedRemoteLinkPlayers)
{
WarpIntoMap();
SetMainCallback2(CB2_LoadMap);
src/help_system_812B1E0.c
+1 -1
View File
@@ -1880,7 +1880,7 @@ bool8 HelpSystem_UpdateHasntSeenIntro(void)
bool8 sub_812B45C(void)
{
if (gReceivedRemoteLinkPlayers == 1)
if (gReceivedRemoteLinkPlayers == TRUE)
return FALSE;
return TRUE;
}
src/link.c
+6 -6
View File
@@ -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;
}
src/link_rfu_2.c
+8 -8
View File
@@ -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;
src/mystery_gift_menu.c
+2 -2
View File
@@ -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;
src/pokemon_jump.c
+1 -1
View File
@@ -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];
src/strings.c
+9 -9
View File
@@ -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");
src/trade.c
+2 -2
View File
@@ -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);
src/trainer_card.c
+1 -1
View File
@@ -1765,7 +1765,7 @@ static bool8 Task_DrawFlippedCardSide(struct Task* task)
return FALSE;
}
sTrainerCardDataPtr->flipDrawState++;
} while (gReceivedRemoteLinkPlayers == 0);
} while (!gReceivedRemoteLinkPlayers);
return FALSE;
}
src/union_room.c
+12 -12
View File
@@ -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);
src/union_room_battle.c
+2 -2
View File
@@ -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++;
}
src/union_room_chat.c
+1 -1
View File
@@ -543,7 +543,7 @@ static void ChatEntryRoutine_AskQuitChatting(void)
}
break;
case 5:
if (gReceivedRemoteLinkPlayers == 0)
if (!gReceivedRemoteLinkPlayers)
{
GoToRoutine(CHATENTRYROUTINE_SAVEANDEXIT);
}