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

Berry Crush documentation, 2

Browse Source
This commit is contained in:
PikalaxALT
2020-04-11 21:47:47 -04:00
parent 8f8665e1dc
commit 4e3b3cdd3c
15 changed files with 955 additions and 931 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/berry.h
+3 -3
View File
@@ -67,11 +67,11 @@ const struct Berry * GetBerryInfo(u8 berryIdx);
extern const struct Berry gBerries[]; extern const struct Berry gBerries[];
struct UnkStruct_0858AB24 { struct BerryCrushStats {
u8 unk0; u8 unk0;
u16 unk1; u16 powder;
}; };
extern const struct UnkStruct_0858AB24 gUnknown_83DFC9C[]; extern const struct BerryCrushStats gBerryCrushStats[];
#endif // GUARD_BERRY_H #endif // GUARD_BERRY_H
include/berry_crush.h
+66 -49
View File
@@ -13,9 +13,37 @@ enum {
BCTEXT_COMMSTANDBY, BCTEXT_COMMSTANDBY,
}; };
enum {
BCCMD_BeginNormalPaletteFade = 1,
BCCMD_WaitPaletteFade,
BCCMD_PrintMessage,
BCCMD_InitGfx,
BCCMD_TeardownGfx,
BCCMD_SignalReadyToBegin,
BCCMD_AskPickBerry,
BCCMD_GoToBerryPouch,
BCCMD_WaitForOthersToPickBerries,
BCCMD_DropBerriesIntoCrusher,
BCCMD_DropLid,
BCCMD_Countdown,
BCCMD_PlayGame_Master,
BCCMD_PlayGame_Slave,
BCCMD_FinishGame,
BCCMD_HandleTimeUp,
BCCMD_TabulateResults,
BCCMD_ShowResults,
BCCMD_SaveTheGame,
BCCMD_AskPlayAgain,
BCCMD_CommunicatePlayAgainResponses,
BCCMD_FadeOutToPlayAgain,
BCCMD_PlayAgainFailureMessage,
BCCMD_GracefulExit,
BCCMD_Quit,
};
struct BerryCrushGame_Player struct BerryCrushGame_Player
{ {
u16 unk0; u16 berryId;
u16 unk2; u16 unk2;
union union
{ {
@@ -25,40 +53,26 @@ struct BerryCrushGame_Player
u8 unk14[12]; u8 unk14[12];
}; };
struct __attribute__((packed, aligned(2))) BerryCrushGame_4E
{
u16 unk0;
u16 filler2;
u8 unk4_0:1;
u8 unk4_1:1;
s8 unk5;
u16 unk6;
u16 unk8;
u16 unkA;
u16 unkC;
};
struct __attribute__((packed)) BerryCrushGame_40
{
u8 unk0[2];
u16 unk2[6];
struct BerryCrushGame_4E unkE;
};
struct BerryCrushGame_5C struct BerryCrushGame_5C
{ {
u16 unk00; u16 unk00;
u8 unk02_0:1; u8 unk02_0:1;
u8 unk02_1:1; u8 unk02_1:1;
u8 unk02_2:1; u8 pushedAButton:1;
u8 unk02_3:5; u8 unk02_3:5;
u8 unk03; s8 unk03;
u16 unk04; u16 unk04;
u16 unk06; u16 unk06;
u16 unk08; u16 unk08;
u16 unk0A; u16 unk0A;
}; };
struct __attribute__((packed, aligned(2))) BerryCrushGame_4E
{
u16 unk0;
struct BerryCrushGame_5C data;
};
union BerryCrushGame_68 union BerryCrushGame_68
{ {
struct BerryCrushGame_68_x struct BerryCrushGame_68_x
@@ -70,7 +84,9 @@ union BerryCrushGame_68
s16 unk06; s16 unk06;
u16 unk08; u16 unk08;
u16 unk0A; u16 unk0A;
u16 unk0C[2][5]; // 0: Number of A presses
// 1: Neatness
u16 stats[2][5];
u8 filler20[16]; u8 filler20[16];
} unk00; } unk00;
u8 unk30[12]; u8 unk30[12];
@@ -85,7 +101,7 @@ union BerryCrushGame_68
} as_five_players; } as_five_players;
}; };
struct BerryCrushGame_138_C struct BerryCrushPlayerSeatCoords
{ {
u8 unk0; u8 unk0;
u8 unk1; u8 unk1;
@@ -98,19 +114,19 @@ struct BerryCrushGame_138_C
struct BerryCrushGame_138 struct BerryCrushGame_138
{ {
u8 unk0; u8 animBerryIdx;
u8 unk1; u8 unk1;
u8 unk2; u8 unk2;
u8 unk3; u8 unk3;
s16 unk4; s16 minutes;
s16 unk6; s16 secondsInt;
s16 unk8; s16 secondsFrac;
const struct BerryCrushGame_138_C *unkC[5]; const struct BerryCrushPlayerSeatCoords * seatCoords[5];
struct Sprite *unk20; struct Sprite *coreSprite;
struct Sprite *unk24[5]; struct Sprite *impactSprites[5];
struct Sprite *unk38[5]; struct Sprite *berrySprites[5];
struct Sprite *unk4C[11]; struct Sprite *sparkleSprites[11];
struct Sprite *unk78[2]; struct Sprite *timerSprites[2];
u8 unk80; u8 unk80;
u8 filler81; u8 filler81;
u8 unk82; u8 unk82;
@@ -130,12 +146,12 @@ struct BerryCrushGame
u8 nextCmd; u8 nextCmd;
u8 afterPalFadeCmd; u8 afterPalFadeCmd;
u16 unk10; u16 unk10;
u16 unk12; u16 gameState;
u16 unk14; u16 unk14;
u16 unk16; u16 pressingSpeed;
s16 unk18; s16 unk18;
s16 unk1A; s16 unk1A;
int unk1C; int powder;
s32 unk20; s32 unk20;
u8 unk24; u8 unk24;
u8 unk25_0:1; u8 unk25_0:1;
@@ -145,18 +161,19 @@ struct BerryCrushGame
u8 unk25_4:1; u8 unk25_4:1;
u8 unk25_5:3; u8 unk25_5:3;
u16 unk26; u16 unk26;
u16 unk28; u16 timer;
s16 unk2A; s16 depth;
s16 unk2C; s16 vibration;
s16 unk2E; s16 unk2E;
s16 unk30; s16 unk30;
s16 unk32; s16 unk32;
s16 unk34; s16 unk34;
u8 commandParams[10]; u8 commandParams[10];
struct BerryCrushGame_40 unk40; u16 sendCmd[7];
struct BerryCrushGame_5C unk5C; u16 recvCmd[7];
struct BerryCrushGame_5C localState;
union BerryCrushGame_68 unk68; union BerryCrushGame_68 unk68;
struct BerryCrushGame_138 unk138; struct BerryCrushGame_138 spritesManager;
u8 bg1Buffer[0x1000]; u8 bg1Buffer[0x1000];
u8 unk11C0[0x1000]; u8 unk11C0[0x1000];
u8 bg2Buffer[0x1000]; u8 bg2Buffer[0x1000];
@@ -175,21 +192,21 @@ u32 ExitBerryCrushWithCallback(MainCallback callback);
void CB2_BerryCrush_GoToBerryPouch(void); void CB2_BerryCrush_GoToBerryPouch(void);
void BerryCrush_SetVBlankCallback(void); void BerryCrush_SetVBlankCallback(void);
void BerryCrush_UnsetVBlankCallback(void); void BerryCrush_UnsetVBlankCallback(void);
void sub_814B930(void); void BerryCrush_UpdateSav2Records(void);
void BerryCrush_RunOrScheduleCommand(u16 command, u8 runMode, u8 *params); 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); 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_814D9CC(struct BerryCrushGame *arg0);
int BerryCrush_InitBgs(void); int BerryCrush_InitBgs(void);
int BerryCrush_TeardownBgs(void); int BerryCrush_TeardownBgs(void);
void sub_814DA24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); void BerryCrush_CreateBerrySprites(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
void sub_814DC24(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
void sub_814DC5C(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); void sub_814DC5C(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
bool32 sub_814DE50(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); bool32 sub_814DE50(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
bool32 sub_814E644(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1); bool32 sub_814E644(struct BerryCrushGame *arg0, struct BerryCrushGame_138 *arg1);
void sub_814E80C(struct BerryCrushGame *arg0); void sub_814E80C(struct BerryCrushGame *arg0);
void sub_814DA04(struct BerryCrushGame *arg0); void sub_814DA04(struct BerryCrushGame *arg0);
void sub_814EB04(struct BerryCrushGame_138 *arg0); void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 *arg0);
void sub_814DB84(struct Sprite * sprite); void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite);
void ShowBerryCrushRankings(void); void ShowBerryCrushRankings(void);
#endif //GUARD_BERRY_CRUSH_H #endif //GUARD_BERRY_CRUSH_H
include/math_util.h
+6 -6
View File
@@ -1,11 +1,11 @@
#ifndef GUARD_MATH_UTIL_H #ifndef GUARD_MATH_UTIL_H
#define GUARD_MATH_UTIL_H #define GUARD_MATH_UTIL_H
s16 sub_80D8B90(s16 y); s16 MathUtil_Inv16(s16 y);
s16 sub_80D8AA0(s16 x, s16 y); s16 MathUtil_Mul16(s16 x, s16 y);
s32 sub_80D8B68(s32 x, s32 y); s32 MathUtil_Div32(s32 x, s32 y);
s32 sub_80D8AE0(s32 x, s32 y); s32 MathUtil_Mul32(s32 x, s32 y);
s16 sub_80D8B40(u8 s, s16 x, s16 y); s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y);
s16 sub_80D8ABC(u8 s, s16 x, s16 y); s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y);
#endif //GUARD_MATH_UTIL_H #endif //GUARD_MATH_UTIL_H
include/save.h
+1 -1
View File
@@ -114,6 +114,6 @@ bool8 sub_80DA4A0(void);
u8 Save_LoadGameData(u8 saveType); u8 Save_LoadGameData(u8 saveType);
u32 TryCopySpecialSaveSection(u8 sector, u8* dst); u32 TryCopySpecialSaveSection(u8 sector, u8* dst);
u32 TryWriteSpecialSaveSection(u8 sector, u8* src); u32 TryWriteSpecialSaveSection(u8 sector, u8* src);
void sub_80DA634(u8 taskId); void Task_SaveGame_UpdatedLinkRecords(u8 taskId);
#endif // GUARD_SAVE_H #endif // GUARD_SAVE_H
src/battle_anim_effects_2.c
+7 -7
View File
@@ -1532,7 +1532,7 @@ void AnimAirWaveProjectile(struct Sprite *sprite)
{ {
sprite->data[0] = 8; sprite->data[0] = 8;
task->data[5] = 4; task->data[5] = 4;
a = sub_80D8B90(0x1000); a = MathUtil_Inv16(0x1000);
sprite->pos1.x += sprite->pos2.x; sprite->pos1.x += sprite->pos2.x;
sprite->pos1.y += sprite->pos2.y; sprite->pos1.y += sprite->pos2.y;
sprite->pos2.y = 0; sprite->pos2.y = 0;
@@ -1551,8 +1551,8 @@ void AnimAirWaveProjectile(struct Sprite *sprite)
sprite->data[1] = 0; sprite->data[1] = 0;
sprite->data[6] = 0; sprite->data[6] = 0;
sprite->data[5] = 0; sprite->data[5] = 0;
sprite->data[3] = sub_80D8AA0(sub_80D8AA0(b, a), sub_80D8B90(0x1C0)); sprite->data[3] = MathUtil_Mul16(MathUtil_Mul16(b, a), MathUtil_Inv16(0x1C0));
sprite->data[4] = sub_80D8AA0(sub_80D8AA0(c, a), sub_80D8B90(0x1C0)); sprite->data[4] = MathUtil_Mul16(MathUtil_Mul16(c, a), MathUtil_Inv16(0x1C0));
sprite->callback = AnimAirWaveProjectile_Step1; sprite->callback = AnimAirWaveProjectile_Step1;
} }
} }
@@ -1643,18 +1643,18 @@ void AnimTask_AirCutterProjectile(u8 taskId)
else else
xDiff = attackerX - targetX; xDiff = attackerX - targetX;
gTasks[taskId].data[5] = sub_80D8AA0(xDiff, sub_80D8B90(gBattleAnimArgs[2] & ~1)); gTasks[taskId].data[5] = MathUtil_Mul16(xDiff, MathUtil_Inv16(gBattleAnimArgs[2] & ~1));
gTasks[taskId].data[6] = sub_80D8AA0(gTasks[taskId].data[5], 0x80); gTasks[taskId].data[6] = MathUtil_Mul16(gTasks[taskId].data[5], 0x80);
gTasks[taskId].data[7] = gBattleAnimArgs[2]; gTasks[taskId].data[7] = gBattleAnimArgs[2];
if (targetY >= attackerY) if (targetY >= attackerY)
{ {
yDiff = targetY - attackerY; yDiff = targetY - attackerY;
gTasks[taskId].data[8] = sub_80D8AA0(yDiff, sub_80D8B90(gTasks[taskId].data[5])) & ~1; gTasks[taskId].data[8] = MathUtil_Mul16(yDiff, MathUtil_Inv16(gTasks[taskId].data[5])) & ~1;
} }
else else
{ {
yDiff = attackerY - targetY; yDiff = attackerY - targetY;
gTasks[taskId].data[8] = sub_80D8AA0(yDiff, sub_80D8B90(gTasks[taskId].data[5])) | 1; gTasks[taskId].data[8] = MathUtil_Mul16(yDiff, MathUtil_Inv16(gTasks[taskId].data[5])) | 1;
} }
gTasks[taskId].data[3] = gBattleAnimArgs[3]; gTasks[taskId].data[3] = gBattleAnimArgs[3];
src/berry.c
+1 -1
View File
@@ -867,7 +867,7 @@ const struct Berry gBerries[] = {
}; };
const struct UnkStruct_0858AB24 gUnknown_83DFC9C[] = { const struct BerryCrushStats gBerryCrushStats[] = {
{ 50, 20}, { 50, 20},
{ 50, 20}, { 50, 20},
{ 50, 20}, { 50, 20},
src/berry_crush.c
+23 -22
View File
@@ -85,11 +85,11 @@ void StartBerryCrush(MainCallback callback)
sBerryCrushGamePtr->localId = multiplayerId; sBerryCrushGamePtr->localId = multiplayerId;
sBerryCrushGamePtr->playerCount = playerCount; sBerryCrushGamePtr->playerCount = playerCount;
BerryCrush_InitPlayerNamesAndTextSpeed(sBerryCrushGamePtr); BerryCrush_InitPlayerNamesAndTextSpeed(sBerryCrushGamePtr);
sBerryCrushGamePtr->unk12 = 1; sBerryCrushGamePtr->gameState = 1;
sBerryCrushGamePtr->nextCmd = 1; sBerryCrushGamePtr->nextCmd = BCCMD_BeginNormalPaletteFade;
sBerryCrushGamePtr->afterPalFadeCmd = 6; sBerryCrushGamePtr->afterPalFadeCmd = BCCMD_SignalReadyToBegin;
BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, TRUE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, TRUE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->commandParams); BerryCrush_RunOrScheduleCommand(BCCMD_InitGfx, 1, sBerryCrushGamePtr->commandParams);
SetMainCallback2(CB2_BerryCrush); SetMainCallback2(CB2_BerryCrush);
sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8); sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8);
} }
@@ -101,11 +101,11 @@ static void CB2_ReturnToBerryCrushGameFromBerryPouch(void)
else else
RemoveBagItem(gSpecialVar_ItemId, 1); RemoveBagItem(gSpecialVar_ItemId, 1);
sBerryCrushGamePtr->unk68.as_four_players.others[sBerryCrushGamePtr->localId].unk0 = gSpecialVar_ItemId - FIRST_BERRY_INDEX; sBerryCrushGamePtr->unk68.as_four_players.others[sBerryCrushGamePtr->localId].berryId = gSpecialVar_ItemId - FIRST_BERRY_INDEX;
sBerryCrushGamePtr->nextCmd = 1; sBerryCrushGamePtr->nextCmd = BCCMD_BeginNormalPaletteFade;
sBerryCrushGamePtr->afterPalFadeCmd = 9; sBerryCrushGamePtr->afterPalFadeCmd = BCCMD_WaitForOthersToPickBerries;
BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, FALSE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, FALSE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
BerryCrush_RunOrScheduleCommand(4, 1, sBerryCrushGamePtr->commandParams); BerryCrush_RunOrScheduleCommand(BCCMD_InitGfx, 1, sBerryCrushGamePtr->commandParams);
sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8); sBerryCrushGamePtr->taskId = CreateTask(Task_RunBerryCrushGame, 8);
SetMainCallback2(CB2_BerryCrush); SetMainCallback2(CB2_BerryCrush);
} }
@@ -126,51 +126,52 @@ void BerryCrush_UnsetVBlankCallback(void)
SetVBlankCallback(NULL); SetVBlankCallback(NULL);
} }
void sub_814B930(void) void BerryCrush_UpdateSav2Records(void)
{ {
u32 var0, var1; u32 var0, var1;
// unk0A / (unk04 / 60)
var0 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk04; var0 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk04;
var0 <<= 8; var0 <<= 8;
var0 = sub_80D8B68(var0, 60 << 8); var0 = MathUtil_Div32(var0, 60 << 8);
var1 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk0A; var1 = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk0A;
var1 <<= 8; var1 <<= 8;
var1 = sub_80D8B68(var1, var0) & 0xFFFF; var1 = MathUtil_Div32(var1, var0) & 0xFFFF;
sBerryCrushGamePtr->unk16 = var1; sBerryCrushGamePtr->pressingSpeed = var1;
switch (sBerryCrushGamePtr->playerCount) switch (sBerryCrushGamePtr->playerCount)
{ {
case 2: case 2:
if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[0]) if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[0])
{ {
sBerryCrushGamePtr->unk25_1 = 1; sBerryCrushGamePtr->unk25_1 = 1;
gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sBerryCrushGamePtr->unk16; gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sBerryCrushGamePtr->pressingSpeed;
} }
break; break;
case 3: case 3:
if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[1]) if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[1])
{ {
sBerryCrushGamePtr->unk25_1 = 1; sBerryCrushGamePtr->unk25_1 = 1;
gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sBerryCrushGamePtr->unk16; gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sBerryCrushGamePtr->pressingSpeed;
} }
break; break;
case 4: case 4:
if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[2]) if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[2])
{ {
sBerryCrushGamePtr->unk25_1 = 1; sBerryCrushGamePtr->unk25_1 = 1;
gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sBerryCrushGamePtr->unk16; gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sBerryCrushGamePtr->pressingSpeed;
} }
break; break;
case 5: case 5:
if (sBerryCrushGamePtr->unk16 > gSaveBlock2Ptr->berryCrush.berryCrushResults[3]) if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[3])
{ {
sBerryCrushGamePtr->unk25_1 = 1; sBerryCrushGamePtr->unk25_1 = 1;
gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sBerryCrushGamePtr->unk16; gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sBerryCrushGamePtr->pressingSpeed;
} }
break; break;
} }
sBerryCrushGamePtr->unk1C = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk00; sBerryCrushGamePtr->powder = sBerryCrushGamePtr->unk68.as_four_players.unk00.unk00;
if (GiveBerryPowder(sBerryCrushGamePtr->unk1C)) if (GiveBerryPowder(sBerryCrushGamePtr->powder))
return; return;
sBerryCrushGamePtr->unk25_0 = 1; sBerryCrushGamePtr->unk25_0 = 1;
src/berry_crush_2.c
+550 -549
View File
File diff suppressed because it is too large Load Diff
src/berry_crush_3.c
+280 -275
View File
@@ -21,18 +21,18 @@
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
static void sub_814DEC0(struct BerryCrushGame_138 * arg0, u16 arg1); static void FramesToMinSec(struct BerryCrushGame_138 * arg0, u16 arg1);
static void sub_814DF44(u8 windowId, u8 left, u8 colorId, const u8 *string); static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string);
static void sub_814DFA4(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 r3); static void PrintBerryCrushResultWindow(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 r3);
static void sub_814E32C(struct BerryCrushGame * r8); static void sub_814E32C(struct BerryCrushGame * r8);
static void Task_ShowBerryCrushRankings(u8 r4); static void Task_ShowBerryCrushRankings(u8 r4);
static void sub_814EAD4(struct BerryCrushGame_138 * r4, u16 r1); static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 * r4, u16 r1);
static void sub_814EB38(struct BerryCrushGame * r5); static void sub_814EB38(struct BerryCrushGame * r5);
static void sub_814EBB0(struct BerryCrushGame * r6); static void sub_814EBB0(struct BerryCrushGame * r6);
static void sub_814EC80(struct BerryCrushGame * r6); static void sub_814EC80(struct BerryCrushGame * r6);
static void sub_814ECE0(struct BerryCrushGame * r6); static void sub_814ECE0(struct BerryCrushGame * r6);
static void sub_814EF10(struct BerryCrushGame * r5); static void sub_814EF10(struct BerryCrushGame * r5);
static void sub_814EFD0(struct Sprite * sprite); static void SpriteCB_BerryCrushImpact(struct Sprite * sprite);
static void sub_814EFFC(struct Sprite * sprite); static void sub_814EFFC(struct Sprite * sprite);
static void sub_814F044(struct Sprite * sprite); static void sub_814F044(struct Sprite * sprite);
static void sub_814F0D8(struct Sprite * sprite); static void sub_814F0D8(struct Sprite * sprite);
@@ -101,7 +101,7 @@ static const u8 sBerryCrushTextColorTable[][3] = {
} }
}; };
static const struct WindowTemplate gUnknown_846E3F0 = { static const struct WindowTemplate sWindowTemplate_BerryCrushRankings = {
.bg = 0, .bg = 0,
.tilemapLeft = 3, .tilemapLeft = 3,
.tilemapTop = 4, .tilemapTop = 4,
@@ -188,25 +188,27 @@ static const u8 gUnknown_846E448[][4] = {
{ 12, 14, 15, 16} { 12, 14, 15, 16}
}; };
static const u32 gUnknown_846E450[] = { static const u32 sPressingSpeedConversionTable[] = {
50000000, // Decimal point is vertically aligned with the pixel
25000000, // directly between the >< below.
12500000, 50000000, // 50
6250000, 25000000, // 25
3125000, 12500000, // 12.5
1562500, 6250000, // 6.25
781250, 3125000, // 3.125
390625 1562500, // 1.5625
781250, // 0.78125
390625 // 0.390625
}; };
static const u16 gUnknown_846E470[] = INCBIN_U16("graphics/link_games/unk_846E4D0.gbapal"); static const u16 sBerryCrushCorePal[] = INCBIN_U16("graphics/link_games/unk_846E4D0.gbapal");
static const u16 gUnknown_846E490[] = INCBIN_U16("graphics/link_games/unk_846E7FC.gbapal"); static const u16 sBerryCrushImpactAndSparklesPal[] = INCBIN_U16("graphics/link_games/unk_846E7FC.gbapal");
static const u16 gUnknown_846E4B0[] = INCBIN_U16("graphics/link_games/unk_846ECC4.gbapal"); static const u16 sBerryCrushTImerPal[] = INCBIN_U16("graphics/link_games/unk_846ECC4.gbapal");
static const u32 gUnknown_846E4D0[] = INCBIN_U32("graphics/link_games/unk_846E4D0.4bpp.lz"); static const u32 sBerryCrushCoreTiles[] = INCBIN_U32("graphics/link_games/unk_846E4D0.4bpp.lz");
static const u32 gUnknown_846E7FC[] = INCBIN_U32("graphics/link_games/unk_846E7FC.4bpp.lz"); static const u32 sBerryCrushImpactTiles[] = INCBIN_U32("graphics/link_games/unk_846E7FC.4bpp.lz");
static const u32 gUnknown_846EB78[] = INCBIN_U32("graphics/link_games/unk_846EB78.4bpp.lz"); static const u32 sBerryCrushPowderSparklesTiles[] = INCBIN_U32("graphics/link_games/unk_846EB78.4bpp.lz");
static const u32 gUnknown_846ECC4[] = INCBIN_U32("graphics/link_games/unk_846ECC4.4bpp.lz"); static const u32 sBerryCrushTimerTiles[] = INCBIN_U32("graphics/link_games/unk_846ECC4.4bpp.lz");
static const u32 gBerryCrushGrinderTopTilemap[] = INCBIN_U32("graphics/link_games/unk_846ED90.bin.lz"); static const u32 gBerryCrushGrinderTopTilemap[] = INCBIN_U32("graphics/link_games/unk_846ED90.bin.lz");
static const u32 gBerryCrushContainerCapTilemap[] = INCBIN_U32("graphics/link_games/unk_846EEC0.bin.lz"); static const u32 gBerryCrushContainerCapTilemap[] = INCBIN_U32("graphics/link_games/unk_846EEC0.bin.lz");
@@ -219,50 +221,50 @@ static const u8 gUnknown_846F280[][5] = {
{0, 1, 3, 2, 4} {0, 1, 3, 2, 4}
}; };
static const struct BerryCrushGame_138_C gUnknown_846F294[] = { static const struct BerryCrushPlayerSeatCoords gUnknown_846F294[] = {
{0x00, 0x00, 0x00, 0x0000, 0xfff0, 0x0000, 0x0000}, {0, 0, 0, 0, -16, 0, 0},
{0x01, 0x00, 0x03, 0xffe4, 0xfffc, 0xffe8, 0x0010}, {1, 0, 3, -28, -4, -24, 16},
{0x02, 0x00, 0x06, 0xfff0, 0x0014, 0xfff8, 0x0010}, {2, 0, 6, -16, 20, -8, 16},
{0x03, 0x14, 0x03, 0x001c, 0xfffc, 0x0020, 0xfff8}, {3, 20, 3, 28, -4, 32, -8},
{0x04, 0x14, 0x06, 0x0010, 0x0014, 0x0010, 0xfff8} {4, 20, 6, 16, 20, 16, -8}
}; };
static const s8 gUnknown_846F2D0[][2] = { static const s8 gUnknown_846F2D0[][2] = {
{0x00, 0x00}, { 0, 0},
{0xff, 0x00}, {-1, 0},
{0x01, 0x01} { 1, 1}
}; };
static const s8 gUnknown_846F2D6[][2] = { static const s8 gUnknown_846F2D6[][2] = {
{0x00, 0x00}, { 0, 0},
{0xf0, 0xfc}, {-16, -4},
{0x10, 0xfc}, { 16, -4},
{0xf8, 0xfe}, { -8, -2},
{0x08, 0xfe}, { 8, -2},
{0xe8, 0xf8}, {-24, -8},
{0x18, 0xf8}, { 24, -8},
{0xe0, 0xf4}, {-32, -12},
{0x20, 0xf4}, { 32, -12},
{0xd8, 0xf0}, {-40, -16},
{0x28, 0xf0} { 40, -16}
}; };
static const u16 gUnknown_846F2EC[] = { static const u16 sPlayerBerrySpriteTags[] = {
5, 6, 7, 8, 9 5, 6, 7, 8, 9
}; };
static const struct CompressedSpriteSheet sSpriteSheets[] = { static const struct CompressedSpriteSheet sSpriteSheets[] = {
{gUnknown_846E4D0, 0x0800, 1}, {sBerryCrushCoreTiles, 0x0800, 1},
{gUnknown_846E7FC, 0x0e00, 2}, {sBerryCrushImpactTiles, 0x0e00, 2},
{gUnknown_846EB78, 0x0700, 3}, {sBerryCrushPowderSparklesTiles, 0x0700, 3},
{gUnknown_846ECC4, 0x02c0, 4}, {sBerryCrushTimerTiles, 0x02c0, 4},
{} {}
}; };
static const struct SpritePalette sSpritePals[] = { static const struct SpritePalette sSpritePals[] = {
{gUnknown_846E470, 1}, {sBerryCrushCorePal, 1},
{gUnknown_846E490, 2}, {sBerryCrushImpactAndSparklesPal, 2},
{gUnknown_846E4B0, 4}, {sBerryCrushTImerPal, 4},
{} {}
}; };
@@ -330,21 +332,21 @@ static const union AffineAnimCmd gUnknown_846F3D4[] = {
AFFINEANIMCMD_JUMP(1) AFFINEANIMCMD_JUMP(1)
}; };
static const union AnimCmd *const gUnknown_846F3EC[] = { static const union AnimCmd *const sAnimTable_BerryCrushCore[] = {
gUnknown_846F340 gUnknown_846F340
}; };
static const union AnimCmd *const gUnknown_846F3F0[] = { static const union AnimCmd *const sAnimTable_BerryCrushImpact[] = {
gUnknown_846F348, gUnknown_846F348,
gUnknown_846F358 gUnknown_846F358
}; };
static const union AnimCmd *const gUnknown_846F3F8[] = { static const union AnimCmd *const sAnimTable_BerryCrushPowderSparkles[] = {
gUnknown_846F36C, gUnknown_846F36C,
gUnknown_846F388 gUnknown_846F388
}; };
static const union AnimCmd *const gUnknown_846F400[] = { static const union AnimCmd *const sAnimTable_BerryCrushTimer[] = {
gUnknown_846F3AC gUnknown_846F3AC
}; };
@@ -358,43 +360,43 @@ static const union AffineAnimCmd *const gUnknown_846F408[] = {
}; };
static const struct SpriteTemplate gUnknown_846F410 = { static const struct SpriteTemplate sSpriteTemplate_BerryCrushCore = {
.tileTag = 1, .tileTag = 1,
.paletteTag = 1, .paletteTag = 1,
.oam = &gOamData_AffineOff_ObjNormal_64x64, .oam = &gOamData_AffineOff_ObjNormal_64x64,
.anims = gUnknown_846F3EC, .anims = sAnimTable_BerryCrushCore,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const struct SpriteTemplate gUnknown_846F428 = { static const struct SpriteTemplate sSpriteTemplate_BerryCrushImpact = {
.tileTag = 2, .tileTag = 2,
.paletteTag = 2, .paletteTag = 2,
.oam = &gOamData_AffineOff_ObjNormal_32x32, .oam = &gOamData_AffineOff_ObjNormal_32x32,
.anims = gUnknown_846F3F0, .anims = sAnimTable_BerryCrushImpact,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = sub_814EFD0 .callback = SpriteCB_BerryCrushImpact
}; };
static const struct SpriteTemplate gUnknown_846F440 = { static const struct SpriteTemplate sSpriteTemplate_BerryCrushPowderSparkles = {
.tileTag = 3, .tileTag = 3,
.paletteTag = 2, .paletteTag = 2,
.oam = &gOamData_AffineOff_ObjNormal_16x16, .oam = &gOamData_AffineOff_ObjNormal_16x16,
.anims = gUnknown_846F3F8, .anims = sAnimTable_BerryCrushPowderSparkles,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const struct SpriteTemplate gUnknown_846F458 = { static const struct SpriteTemplate sSpriteTemplate_BerryCrushTimer = {
.tileTag = 4, .tileTag = 4,
.paletteTag = 4, .paletteTag = 4,
.oam = &gOamData_AffineOff_ObjNormal_8x16, .oam = &gOamData_AffineOff_ObjNormal_8x16,
.anims = gUnknown_846F400, .anims = sAnimTable_BerryCrushTimer,
.affineAnims = gDummySpriteAffineAnimTable, .affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy .callback = SpriteCallbackDummy
}; };
static const struct SpriteTemplate gUnknown_846F470 = { static const struct SpriteTemplate sSpriteTemplate_PlayerBerry = {
.tileTag = 5, .tileTag = 5,
.paletteTag = 5, .paletteTag = 5,
.oam = &gOamData_AffineDouble_ObjNormal_32x32, .oam = &gOamData_AffineDouble_ObjNormal_32x32,
@@ -609,25 +611,25 @@ int BerryCrush_TeardownBgs(void)
int sub_814D9CC(struct BerryCrushGame * game) int sub_814D9CC(struct BerryCrushGame * game)
{ {
gSpriteCoordOffsetY = game->unk2A + game->unk2C; gSpriteCoordOffsetY = game->depth + game->vibration;
SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY); SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY);
if (game->unk12 == 7) if (game->gameState == 7)
{ {
sub_814EAD4(&game->unk138, game->unk28); BerryCrush_PrintTimeOnSprites(&game->spritesManager, game->timer);
} }
return 0; return 0;
} }
void sub_814DA04(struct BerryCrushGame * arg0) void sub_814DA04(struct BerryCrushGame * game)
{ {
arg0->unk2A = -104; game->depth = -104;
arg0->unk2C = 0; game->vibration = 0;
gSpriteCoordOffsetX = 0; gSpriteCoordOffsetX = 0;
gSpriteCoordOffsetY = -104; gSpriteCoordOffsetY = -104;
} }
void sub_814DA24(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1) void BerryCrush_CreateBerrySprites(struct BerryCrushGame * game, struct BerryCrushGame_138 * spritesManager)
{ {
u8 i; u8 i;
u8 spriteId; u8 spriteId;
@@ -637,24 +639,24 @@ void sub_814DA24(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
s16 var5; s16 var5;
u32 var6; u32 var6;
for (i = 0; i < arg0->playerCount; i++) for (i = 0; i < game->playerCount; i++)
{ {
spriteId = AddItemIconObjectWithCustomObjectTemplate( spriteId = AddItemIconObjectWithCustomObjectTemplate(
&gUnknown_846F470, &sSpriteTemplate_PlayerBerry,
gUnknown_846F2EC[i], sPlayerBerrySpriteTags[i],
gUnknown_846F2EC[i], sPlayerBerrySpriteTags[i],
arg0->unk68.as_four_players.others[i].unk0 + FIRST_BERRY_INDEX); game->unk68.as_four_players.others[i].berryId + FIRST_BERRY_INDEX);
arg1->unk38[i] = &gSprites[spriteId]; spritesManager->berrySprites[i] = &gSprites[spriteId];
arg1->unk38[i]->oam.priority = 3; spritesManager->berrySprites[i]->oam.priority = 3;
arg1->unk38[i]->affineAnimPaused = TRUE; spritesManager->berrySprites[i]->affineAnimPaused = TRUE;
arg1->unk38[i]->pos1.x = arg1->unkC[i]->unk8 + 120; spritesManager->berrySprites[i]->pos1.x = spritesManager->seatCoords[i]->unk8 + 120;
arg1->unk38[i]->pos1.y = -16; spritesManager->berrySprites[i]->pos1.y = -16;
data = arg1->unk38[i]->data; data = spritesManager->berrySprites[i]->data;
var5 = 512; var5 = 512;
data[1] = var5; data[1] = var5;
data[2] = 32; data[2] = 32;
data[7] = 112; data[7] = 112;
var0 = arg1->unkC[i]->unkA - arg1->unkC[i]->unk8; var0 = spritesManager->seatCoords[i]->unkA - spritesManager->seatCoords[i]->unk8;
var3 = var0; var3 = var0;
if (var0 < 0) if (var0 < 0)
var3 += 3; var3 += 3;
@@ -663,19 +665,19 @@ void sub_814DA24(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
var0 *= 128; var0 *= 128;
var6 = var5 + 32; var6 = var5 + 32;
var6 = var6 / 2; var6 = var6 / 2;
var1 = sub_80D8B40(7, 0x3F80, var6); var1 = MathUtil_Div16Shift(7, 0x3F80, var6);
data[0] = (u16)arg1->unk38[i]->pos1.x * 128; data[0] = (u16)spritesManager->berrySprites[i]->pos1.x * 128;
data[3] = sub_80D8B40(7, var0, var1); data[3] = MathUtil_Div16Shift(7, var0, var1);
var1 = sub_80D8ABC(7, var1, 85); var1 = MathUtil_Mul16Shift(7, var1, 85);
data[4] = 0; data[4] = 0;
data[5] = sub_80D8B40(7, 0x3F80, var1); data[5] = MathUtil_Div16Shift(7, 0x3F80, var1);
data[7] |= 0x8000; data[7] |= 0x8000;
if (arg1->unkC[i]->unk8 < 0) if (spritesManager->seatCoords[i]->unk8 < 0)
StartSpriteAffineAnim(arg1->unk38[i], 1); StartSpriteAffineAnim(spritesManager->berrySprites[i], 1);
} }
} }
void sub_814DB84(struct Sprite * sprite) void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite)
{ {
s16 *data = sprite->data; s16 *data = sprite->data;
@@ -702,17 +704,17 @@ void sub_814DB84(struct Sprite * sprite)
} }
} }
void sub_814DC24(struct BerryCrushGame * arg0, UNUSED struct BerryCrushGame_138 * arg1) void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame * arg0, UNUSED struct BerryCrushGame_138 * arg1)
{ {
u8 i; u8 i;
for (i = 0; i < arg0->playerCount; i++) for (i = 0; i < arg0->playerCount; i++)
{ {
FreeSpritePaletteByTag(gUnknown_846F2EC[i]); FreeSpritePaletteByTag(sPlayerBerrySpriteTags[i]);
FreeSpriteTilesByTag(gUnknown_846F2EC[i]); FreeSpriteTilesByTag(sPlayerBerrySpriteTags[i]);
} }
} }
void sub_814DC5C(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1) void sub_814DC5C(struct BerryCrushGame * game, struct BerryCrushGame_138 * manager)
{ {
u8 sp4; u8 sp4;
struct BerryCrushGame_4E * var4E; struct BerryCrushGame_4E * var4E;
@@ -720,47 +722,47 @@ void sub_814DC5C(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
u16 var, var2; u16 var, var2;
sp4 = 0; sp4 = 0;
var4E = &arg0->unk40.unkE; var4E = (struct BerryCrushGame_4E *)&game->recvCmd;
for (i = 0; i < arg0->playerCount; i++) for (i = 0; i < game->playerCount; i++)
{ {
var = var4E->unkA >> (i * 3); var = var4E->data.unk08 >> (i * 3);
var &= 7; var &= 7;
if (var) if (var)
{ {
sp4++; sp4++;
if (var & 0x4) if (var & 0x4)
StartSpriteAnim(arg1->unk24[i], 1); StartSpriteAnim(manager->impactSprites[i], 1);
else else
StartSpriteAnim(arg1->unk24[i], 0); StartSpriteAnim(manager->impactSprites[i], 0);
arg1->unk24[i]->invisible = FALSE; manager->impactSprites[i]->invisible = FALSE;
arg1->unk24[i]->animPaused = FALSE; manager->impactSprites[i]->animPaused = FALSE;
arg1->unk24[i]->pos2.x = gUnknown_846F2D0[(var % 4) - 1][0]; manager->impactSprites[i]->pos2.x = gUnknown_846F2D0[(var % 4) - 1][0];
arg1->unk24[i]->pos2.y = gUnknown_846F2D0[(var % 4) - 1][1]; manager->impactSprites[i]->pos2.y = gUnknown_846F2D0[(var % 4) - 1][1];
} }
} }
if (sp4 == 0) if (sp4 == 0)
{ {
arg0->unk25_2 = 0; game->unk25_2 = 0;
} }
else else
{ {
var = (u8)(arg0->unk28 % 3); var = (u8)(game->timer % 3);
var2 = var; var2 = var;
for (i = 0; i < var4E->unkC * 2 + 3; i++) for (i = 0; i < var4E->data.unk0A * 2 + 3; i++)
{ {
if (arg1->unk4C[i]->invisible) if (manager->sparkleSprites[i]->invisible)
{ {
arg1->unk4C[i]->callback = sub_814F0D8; manager->sparkleSprites[i]->callback = sub_814F0D8;
arg1->unk4C[i]->pos1.x = gUnknown_846F2D6[i][0] + 120; manager->sparkleSprites[i]->pos1.x = gUnknown_846F2D6[i][0] + 120;
arg1->unk4C[i]->pos1.y = gUnknown_846F2D6[i][1] + 136 - (var * 4); manager->sparkleSprites[i]->pos1.y = gUnknown_846F2D6[i][1] + 136 - (var * 4);
arg1->unk4C[i]->pos2.x = gUnknown_846F2D6[i][0] + (gUnknown_846F2D6[i][0] / (var2 * 4)); manager->sparkleSprites[i]->pos2.x = gUnknown_846F2D6[i][0] + (gUnknown_846F2D6[i][0] / (var2 * 4));
arg1->unk4C[i]->pos2.y = gUnknown_846F2D6[i][1]; manager->sparkleSprites[i]->pos2.y = gUnknown_846F2D6[i][1];
if (var4E->unk4_1) if (var4E->data.unk02_1)
StartSpriteAnim(arg1->unk4C[i], 1); StartSpriteAnim(manager->sparkleSprites[i], 1);
else else
StartSpriteAnim(arg1->unk4C[i], 0); StartSpriteAnim(manager->sparkleSprites[i], 0);
var++; var++;
if (var > 3) if (var > 3)
@@ -768,9 +770,9 @@ void sub_814DC5C(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
} }
} }
if (arg0->unk25_2) if (game->unk25_2)
{ {
arg0->unk25_2 = 0; game->unk25_2 = 0;
} }
else else
{ {
@@ -779,7 +781,7 @@ void sub_814DC5C(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1)
else else
PlaySE(SE_TOY_KABE); PlaySE(SE_TOY_KABE);
arg0->unk25_2 = 1; game->unk25_2 = 1;
} }
} }
} }
@@ -790,48 +792,48 @@ bool32 sub_814DE50(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg
for (i = 0; i < arg0->playerCount; i++) for (i = 0; i < arg0->playerCount; i++)
{ {
if (!arg1->unk24[i]->invisible) if (!arg1->impactSprites[i]->invisible)
return FALSE; return FALSE;
} }
for (i = 0; i < 11; i++) for (i = 0; i < 11; i++)
{ {
if (!arg1->unk4C[i]->invisible) if (!arg1->sparkleSprites[i]->invisible)
return FALSE; return FALSE;
} }
if (arg0->unk2C != 0) if (arg0->vibration != 0)
arg0->unk2C = 0; arg0->vibration = 0;
return TRUE; return TRUE;
} }
static void sub_814DEC0(struct BerryCrushGame_138 * arg0, u16 arg1) static void FramesToMinSec(struct BerryCrushGame_138 * manager, u16 frames)
{ {
u8 i = 0; u8 i = 0;
u32 r7 = 0; u32 fractionalFrames = 0;
s16 r3 = 0; s16 r3 = 0;
arg0->unk4 = arg1 / 3600; manager->minutes = frames / 3600;
arg0->unk6 = (arg1 % 3600) / 60; manager->secondsInt = (frames % 3600) / 60;
r3 = sub_80D8AA0((arg1 % 60) << 8, 4); r3 = MathUtil_Mul16((frames % 60) << 8, 4);
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
{ {
if ((r3 >> (7 - i)) & 1) if ((r3 >> (7 - i)) & 1)
r7 += gUnknown_846E450[i]; fractionalFrames += sPressingSpeedConversionTable[i];
} }
arg0->unk8 = r7 / 1000000; manager->secondsFrac = fractionalFrames / 1000000;
} }
static void sub_814DF44(u8 windowId, u8 left, u8 colorId, const u8 *string) static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string)
{ {
left = (left * 4) - (GetStringWidth(2, string, -1) / 2u); left = (left * 4) - (GetStringWidth(2, string, -1) / 2u);
AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string); AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string);
} }
static void sub_814DFA4(struct BerryCrushGame * game, u8 command, u8 x, u8 y) static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
{ {
u8 i = 0; u8 i = 0;
u8 linkPlayerId = 0; u8 linkPlayerId = 0;
@@ -848,37 +850,40 @@ static void sub_814DFA4(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
switch (command) switch (command)
{ {
case 0: case 0:
// Number of presses
linkPlayerId = bcPlayers->as_five_players.players[0].unk4.as_2d_bytes[command][i]; 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]) if (i != 0 && bcPlayers->as_four_players.unk00.stats[command][i] != bcPlayers->as_four_players.unk00.stats[command][i - 1])
{ {
linkIdToPrint = i; linkIdToPrint = i;
} }
ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.unk0C[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4); ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.stats[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4);
realX = x - GetStringWidth(2, sBCRankingHeaders[command], -1) - 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->spritesManager.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); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar1);
break; break;
case 1: case 1:
// Neatness
linkPlayerId = bcPlayers->as_five_players.players[0].unk4.as_2d_bytes[command][i]; 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]) if (i != 0 && bcPlayers->as_four_players.unk00.stats[command][i] != bcPlayers->as_four_players.unk00.stats[command][i - 1])
{ {
linkIdToPrint = i; linkIdToPrint = i;
} }
ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.unk0C[command][i] >> 4, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, bcPlayers->as_four_players.unk00.stats[command][i] >> 4, STR_CONV_MODE_RIGHT_ALIGN, 3);
score = 0; score = 0;
realX = bcPlayers->as_four_players.unk00.unk0C[command][i] & 15; realX = bcPlayers->as_four_players.unk00.stats[command][i] & 15;
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
{ {
if ((realX >> (3 - j)) & 1) if ((realX >> (3 - j)) & 1)
score += gUnknown_846E450[j]; score += sPressingSpeedConversionTable[j];
} }
realX = score / 1000000u; realX = score / 1000000u;
ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
realX2 = x - 4; realX2 = x - 4;
AddTextPrinterParameterized3(game->unk138.unk82, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
break; break;
case 2: case 2:
// Berry names
linkPlayerId = i; linkPlayerId = i;
linkIdToPrint = i; linkIdToPrint = i;
j = game->unk68.as_five_players.players[i].unk14[12]; j = game->unk68.as_five_players.players[i].unk14[12];
@@ -886,7 +891,7 @@ static void sub_814DFA4(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
j = 0; j = 0;
StringCopy(gStringVar1, gBerries[j].name); StringCopy(gStringVar1, gBerries[j].name);
StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]);
AddTextPrinterParameterized3(game->unk138.unk82, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
break; break;
} }
if (linkPlayerId == game->localId) if (linkPlayerId == game->localId)
@@ -896,127 +901,127 @@ static void sub_814DFA4(struct BerryCrushGame * game, u8 command, u8 x, u8 y)
gStringVar3[0] = linkIdToPrint + CHAR_1; gStringVar3[0] = linkIdToPrint + CHAR_1;
DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, BERRYCRUSH_PLAYER_NAME(game, linkPlayerId)); DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, BERRYCRUSH_PLAYER_NAME(game, linkPlayerId));
DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3); DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3);
AddTextPrinterParameterized3(game->unk138.unk82, 2, 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4);
} }
} }
static void sub_814E32C(struct BerryCrushGame * r8) static void sub_814E32C(struct BerryCrushGame * game)
{ {
u8 r10 = 0; u8 i = 0;
u8 r6 = 0; u8 x = 0;
u32 sp0C = 0; u32 score = 0;
union BerryCrushGame_68 *sp10 = &r8->unk68; union BerryCrushGame_68 *players = &game->unk68;
u8 r7 = GetWindowAttribute(r8->unk138.unk82, WINDOW_HEIGHT) * 8 - 42; u8 y = GetWindowAttribute(game->spritesManager.unk82, WINDOW_HEIGHT) * 8 - 42;
sub_814DEC0(&r8->unk138, sp10->as_four_players.unk00.unk04); FramesToMinSec(&game->spritesManager, players->as_four_players.unk00.unk04);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, 2, r7, sBerryCrushTextColorTable[0], 0, gText_TimeColon); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_TimeColon);
r6 = 190 - (u8)GetStringWidth(2, gText_SpaceSec, 0); x = 190 - (u8)GetStringWidth(2, gText_SpaceSec, 0);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gText_SpaceSec); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gText_SpaceSec);
r6 -= 32; x -= 32;
ConvertIntToDecimalStringN(gStringVar1, r8->unk138.unk6, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar1, game->spritesManager.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2);
ConvertIntToDecimalStringN(gStringVar2, r8->unk138.unk8, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, game->spritesManager.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_XDotY2); StringExpandPlaceholders(gStringVar4, gText_XDotY2);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4);
r6 -= (u8)GetStringWidth(2, gText_SpaceMin, 0) + 3; x -= (u8)GetStringWidth(2, gText_SpaceMin, 0) + 3;
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gText_SpaceMin); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gText_SpaceMin);
r6 -= 9; x -= 9;
ConvertIntToDecimalStringN(gStringVar1, r8->unk138.unk4, STR_CONV_MODE_LEADING_ZEROS, 1); ConvertIntToDecimalStringN(gStringVar1, game->spritesManager.minutes, STR_CONV_MODE_LEADING_ZEROS, 1);
StringExpandPlaceholders(gStringVar4, gText_StrVar1); StringExpandPlaceholders(gStringVar4, gText_StrVar1);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4);
r7 += 14; y += 14;
AddTextPrinterParameterized3(r8->unk138.unk82, 2, 2, r7, sBerryCrushTextColorTable[0], 0, gText_PressingSpeed); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_PressingSpeed);
r6 = 190 - (u8)GetStringWidth(2, gText_TimesPerSec, 0); x = 190 - (u8)GetStringWidth(2, gText_TimesPerSec, 0);
AddTextPrinterParameterized3(r8->unk138.unk82, 3, r6, r7, sBerryCrushTextColorTable[0], 0, gText_TimesPerSec); AddTextPrinterParameterized3(game->spritesManager.unk82, 3, x, y, sBerryCrushTextColorTable[0], 0, gText_TimesPerSec);
for (r10 = 0; r10 < 8; ++r10) for (i = 0; i < 8; ++i)
if (((u8)r8->unk16 >> (7 - r10)) & 1) if (((u8)game->pressingSpeed >> (7 - i)) & 1)
sp0C += *(r10 + gUnknown_846E450); // It's accessed in a different way here for unknown reason score += *(i + sPressingSpeedConversionTable); // It's accessed in a different way here for unknown reason
ConvertIntToDecimalStringN(gStringVar1, r8->unk16 >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, game->pressingSpeed >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, sp0C / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2);
StringExpandPlaceholders(gStringVar4, gText_XDotY3); StringExpandPlaceholders(gStringVar4, gText_XDotY3);
r6 -= 38; x -= 38;
if (r8->unk25_1) if (game->unk25_1)
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[5], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[5], 0, gStringVar4);
else else
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4);
r7 += 14; y += 14;
AddTextPrinterParameterized3(r8->unk138.unk82, 2, 2, r7, sBerryCrushTextColorTable[0], 0, gText_Silkiness); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_Silkiness);
ConvertIntToDecimalStringN(gStringVar1, sp10->as_four_players.unk00.unk08, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, players->as_four_players.unk00.unk08, STR_CONV_MODE_RIGHT_ALIGN, 3);
StringExpandPlaceholders(gStringVar4, gText_Var1Percent); StringExpandPlaceholders(gStringVar4, gText_Var1Percent);
r6 = 190 - (u8)GetStringWidth(2, gStringVar4, 0); x = 190 - (u8)GetStringWidth(2, gStringVar4, 0);
AddTextPrinterParameterized3(r8->unk138.unk82, 2, r6, r7, sBerryCrushTextColorTable[0], 0, gStringVar4); AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4);
} }
bool32 sub_814E644(struct BerryCrushGame * r4, struct BerryCrushGame_138 * r6) bool32 sub_814E644(struct BerryCrushGame * game, struct BerryCrushGame_138 * spriteManager)
{ {
u8 r5; u8 playerCountMinus2;
struct WindowTemplate template; struct WindowTemplate template;
switch (r6->unk80) switch (spriteManager->unk80)
{ {
case 0: case 0:
r5 = r4->playerCount - 2; playerCountMinus2 = game->playerCount - 2;
sub_814EB04(r6); BerryCrush_HideTimerSprites(spriteManager);
memcpy(&template, &gUnknown_846E428[r4->unk12 - 11], sizeof(struct WindowTemplate)); memcpy(&template, &gUnknown_846E428[game->gameState - 11], sizeof(struct WindowTemplate));
if (r4->unk12 == 13) if (game->gameState == 13)
template.height = gUnknown_846E448[1][r5]; template.height = gUnknown_846E448[1][playerCountMinus2];
else else
template.height = gUnknown_846E448[0][r5]; template.height = gUnknown_846E448[0][playerCountMinus2];
r6->unk82 = AddWindow(&template); spriteManager->unk82 = AddWindow(&template);
break; break;
case 1: case 1:
PutWindowTilemap(r6->unk82); PutWindowTilemap(spriteManager->unk82);
FillWindowPixelBuffer(r6->unk82, PIXEL_FILL(0)); FillWindowPixelBuffer(spriteManager->unk82, PIXEL_FILL(0));
break; break;
case 2: case 2:
TextWindow_SetStdFrame0_WithPal(r6->unk82, 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(spriteManager->unk82, 0x21D, 0xD0);
DrawStdFrameWithCustomTileAndPalette(r6->unk82, 0, 541, 13); DrawStdFrameWithCustomTileAndPalette(spriteManager->unk82, FALSE, 541, 13);
break; break;
case 3: case 3:
r5 = r4->playerCount - 2; playerCountMinus2 = game->playerCount - 2;
switch (r4->unk12) switch (game->gameState)
{ {
case 11: case 11:
sub_814DF44(r6->unk82, 22, 3, gText_PressesRankings); PrintTextCentered(spriteManager->unk82, 22, 3, gText_PressesRankings);
sub_814DFA4(r4, 0, 0xB0, 8 * gUnknown_846E448[0][r5] - r4->playerCount * 14); PrintBerryCrushResultWindow(game, 0, 0xB0, 8 * gUnknown_846E448[0][playerCountMinus2] - game->playerCount * 14);
r6->unk80 = 5; spriteManager->unk80 = 5;
return FALSE; return FALSE;
case 12: case 12:
sub_814DF44(r6->unk82, 22, 4, sBCRankingHeaders[r4->unk68.as_five_players.players[0].unk4.as_2d_bytes[0][7] + 3]); PrintTextCentered(spriteManager->unk82, 22, 4, sBCRankingHeaders[game->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); PrintBerryCrushResultWindow(game, 1, 0xB0, 8 * gUnknown_846E448[0][playerCountMinus2] - game->playerCount * 14);
r6->unk80 = 5; spriteManager->unk80 = 5;
return FALSE; return FALSE;
case 13: case 13:
sub_814DF44(r6->unk82, 24, 3, gText_CrushingResults); PrintTextCentered(spriteManager->unk82, 24, 3, gText_CrushingResults);
sub_814DFA4(r4, 2, 0xC0, 0x10); PrintBerryCrushResultWindow(game, 2, 0xC0, 0x10);
break; break;
} }
break; break;
case 4: case 4:
sub_814E32C(r4); sub_814E32C(game);
break; break;
case 5: case 5:
CopyWindowToVram(r6->unk82, COPYWIN_BOTH); CopyWindowToVram(spriteManager->unk82, COPYWIN_BOTH);
r6->unk80 = 0; spriteManager->unk80 = 0;
return TRUE; return TRUE;
} }
++r6->unk80; ++spriteManager->unk80;
return FALSE; return FALSE;
} }
void sub_814E80C(struct BerryCrushGame * r4) void sub_814E80C(struct BerryCrushGame * game)
{ {
ClearStdWindowAndFrameToTransparent(r4->unk138.unk82, 1); ClearStdWindowAndFrameToTransparent(game->spritesManager.unk82, 1);
RemoveWindow(r4->unk138.unk82); RemoveWindow(game->spritesManager.unk82);
sub_814EBB0(r4); sub_814EBB0(game);
} }
static void Task_ShowBerryCrushRankings(u8 taskId) static void Task_ShowBerryCrushRankings(u8 taskId)
@@ -1029,7 +1034,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
switch (data[0]) switch (data[0])
{ {
case 0: case 0:
data[1] = AddWindow(&gUnknown_846E3F0); data[1] = AddWindow(&sWindowTemplate_BerryCrushRankings);
PutWindowTilemap(data[1]); PutWindowTilemap(data[1]);
FillWindowPixelBuffer(data[1], PIXEL_FILL(0)); FillWindowPixelBuffer(data[1], PIXEL_FILL(0));
TextWindow_SetStdFrame0_WithPal(data[1], 0x21D, 0xD0); TextWindow_SetStdFrame0_WithPal(data[1], 0x21D, 0xD0);
@@ -1073,7 +1078,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
for (j = 0; j < 8; ++j) for (j = 0; j < 8; ++j)
{ {
if (((data[i + 2] & 0xFF) >> (7 - j)) & 1) if (((data[i + 2] & 0xFF) >> (7 - j)) & 1)
score += gUnknown_846E450[j]; score += sPressingSpeedConversionTable[j];
} }
ConvertIntToDecimalStringN(gStringVar1, (u16)data[i + 2] >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar1, (u16)data[i + 2] >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3);
ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2);
@@ -1125,18 +1130,18 @@ void ShowBerryCrushRankings(void)
gTasks[taskId].data[5] = gSaveBlock2Ptr->berryCrush.berryCrushResults[3]; gTasks[taskId].data[5] = gSaveBlock2Ptr->berryCrush.berryCrushResults[3];
} }
static void sub_814EAD4(struct BerryCrushGame_138 * r4, u16 r1) static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 * manager, u16 frames)
{ {
sub_814DEC0(r4, r1); FramesToMinSec(manager, frames);
DigitObjUtil_PrintNumOn(0, r4->unk4); DigitObjUtil_PrintNumOn(0, manager->minutes);
DigitObjUtil_PrintNumOn(1, r4->unk6); DigitObjUtil_PrintNumOn(1, manager->secondsInt);
DigitObjUtil_PrintNumOn(2, r4->unk8); DigitObjUtil_PrintNumOn(2, manager->secondsFrac);
} }
void sub_814EB04(struct BerryCrushGame_138 * r0) void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 * manager)
{ {
r0->unk78[0]->invisible = TRUE; manager->timerSprites[0]->invisible = TRUE;
r0->unk78[1]->invisible = TRUE; manager->timerSprites[1]->invisible = TRUE;
DigitObjUtil_HideOrShow(2, 1); DigitObjUtil_HideOrShow(2, 1);
DigitObjUtil_HideOrShow(1, 1); DigitObjUtil_HideOrShow(1, 1);
DigitObjUtil_HideOrShow(0, 1); DigitObjUtil_HideOrShow(0, 1);
@@ -1148,10 +1153,10 @@ static void sub_814EB38(struct BerryCrushGame * game)
for (i = 0; i < game->playerCount; ++i) for (i = 0; i < game->playerCount; ++i)
{ {
game->unk138.unkC[i] = &gUnknown_846F294[gUnknown_846F280[game->playerCount - 2][i]]; game->spritesManager.seatCoords[i] = &gUnknown_846F294[gUnknown_846F280[game->playerCount - 2][i]];
game->unk138.unk83[i] = AddWindow(&gUnknown_846E3F8[game->unk138.unkC[i]->unk0]); game->spritesManager.unk83[i] = AddWindow(&gUnknown_846E3F8[game->spritesManager.seatCoords[i]->unk0]);
PutWindowTilemap(game->unk138.unk83[i]); PutWindowTilemap(game->spritesManager.unk83[i]);
FillWindowPixelBuffer(game->unk138.unk83[i], PIXEL_FILL(0)); FillWindowPixelBuffer(game->spritesManager.unk83[i], PIXEL_FILL(0));
} }
} }
@@ -1161,11 +1166,11 @@ static void sub_814EBB0(struct BerryCrushGame * game)
for (i = 0; i < game->playerCount; ++i) for (i = 0; i < game->playerCount; ++i)
{ {
PutWindowTilemap(game->unk138.unk83[i]); PutWindowTilemap(game->spritesManager.unk83[i]);
if (i == game->localId) if (i == game->localId)
{ {
AddTextPrinterParameterized4( AddTextPrinterParameterized4(
game->unk138.unk83[i], game->spritesManager.unk83[i],
2, 2,
36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u, 36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u,
1, 1,
@@ -1179,7 +1184,7 @@ static void sub_814EBB0(struct BerryCrushGame * game)
else else
{ {
AddTextPrinterParameterized4( AddTextPrinterParameterized4(
game->unk138.unk83[i], game->spritesManager.unk83[i],
2, 2,
36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u, 36 - GetStringWidth(2, BERRYCRUSH_PLAYER_NAME(game, i), 0) / 2u,
1, 1,
@@ -1190,7 +1195,7 @@ static void sub_814EBB0(struct BerryCrushGame * game)
BERRYCRUSH_PLAYER_NAME(game, i) BERRYCRUSH_PLAYER_NAME(game, i)
); );
} }
CopyWindowToVram(game->unk138.unk83[i], COPYWIN_BOTH); CopyWindowToVram(game->spritesManager.unk83[i], COPYWIN_BOTH);
} }
CopyBgTilemapBufferToVram(0); CopyBgTilemapBufferToVram(0);
} }
@@ -1210,12 +1215,12 @@ static void sub_814EC80(struct BerryCrushGame * game)
LZ77UnCompWram(r0, r4); LZ77UnCompWram(r0, r4);
for (; i < game->playerCount; ++i) for (; i < game->playerCount; ++i)
{ {
r0_ = game->unk138.unkC[i]->unk0; r0_ = game->spritesManager.seatCoords[i]->unk0;
CopyToBgTilemapBufferRect( CopyToBgTilemapBufferRect(
3, 3,
&r4[r0_ * 40], &r4[r0_ * 40],
game->unk138.unkC[i]->unk1, game->spritesManager.seatCoords[i]->unk1,
game->unk138.unkC[i]->unk2, game->spritesManager.seatCoords[i]->unk2,
10, 10,
2 2
); );
@@ -1228,64 +1233,64 @@ static void sub_814ECE0(struct BerryCrushGame * game)
u8 i = 0; u8 i = 0;
u8 spriteId; u8 spriteId;
game->unk2A = -104; game->depth = -104;
game->unk2C = 0; game->vibration = 0;
gSpriteCoordOffsetX = 0; gSpriteCoordOffsetX = 0;
gSpriteCoordOffsetY = -104; gSpriteCoordOffsetY = -104;
for (; i < 4; ++i) for (; i < 4; ++i)
LoadCompressedSpriteSheet(&sSpriteSheets[i]); LoadCompressedSpriteSheet(&sSpriteSheets[i]);
LoadSpritePalettes(sSpritePals); LoadSpritePalettes(sSpritePals);
spriteId = CreateSprite(&gUnknown_846F410, 120, 88, 5); spriteId = CreateSprite(&sSpriteTemplate_BerryCrushCore, 120, 88, 5);
game->unk138.unk20 = &gSprites[spriteId]; game->spritesManager.coreSprite = &gSprites[spriteId];
game->unk138.unk20->oam.priority = 3; game->spritesManager.coreSprite->oam.priority = 3;
game->unk138.unk20->coordOffsetEnabled = TRUE; game->spritesManager.coreSprite->coordOffsetEnabled = TRUE;
game->unk138.unk20->animPaused = TRUE; game->spritesManager.coreSprite->animPaused = TRUE;
for (i = 0; i < game->playerCount; ++i) for (i = 0; i < game->playerCount; ++i)
{ {
spriteId = CreateSprite( spriteId = CreateSprite(
&gUnknown_846F428, &sSpriteTemplate_BerryCrushImpact,
game->unk138.unkC[i]->unk4 + 120, game->spritesManager.seatCoords[i]->unk4 + 120,
game->unk138.unkC[i]->unk6 + 32, game->spritesManager.seatCoords[i]->unk6 + 32,
0 0
); );
game->unk138.unk24[i] = &gSprites[spriteId]; game->spritesManager.impactSprites[i] = &gSprites[spriteId];
game->unk138.unk24[i]->oam.priority = 1; game->spritesManager.impactSprites[i]->oam.priority = 1;
game->unk138.unk24[i]->invisible = TRUE; game->spritesManager.impactSprites[i]->invisible = TRUE;
game->unk138.unk24[i]->coordOffsetEnabled = TRUE; game->spritesManager.impactSprites[i]->coordOffsetEnabled = TRUE;
game->unk138.unk24[i]->animPaused = TRUE; game->spritesManager.impactSprites[i]->animPaused = TRUE;
} }
for (i = 0; i < NELEMS(game->unk138.unk4C); ++i) for (i = 0; i < NELEMS(game->spritesManager.sparkleSprites); ++i)
{ {
spriteId = CreateSprite( spriteId = CreateSprite(
&gUnknown_846F440, &sSpriteTemplate_BerryCrushPowderSparkles,
gUnknown_846F2D6[i][0] + 120, gUnknown_846F2D6[i][0] + 120,
gUnknown_846F2D6[i][1] + 136, gUnknown_846F2D6[i][1] + 136,
6 6
); );
game->unk138.unk4C[i] = &gSprites[spriteId]; game->spritesManager.sparkleSprites[i] = &gSprites[spriteId];
game->unk138.unk4C[i]->oam.priority = 3; game->spritesManager.sparkleSprites[i]->oam.priority = 3;
game->unk138.unk4C[i]->invisible = TRUE; game->spritesManager.sparkleSprites[i]->invisible = TRUE;
game->unk138.unk4C[i]->animPaused = TRUE; game->spritesManager.sparkleSprites[i]->animPaused = TRUE;
game->unk138.unk4C[i]->data[0] = i; game->spritesManager.sparkleSprites[i]->data[0] = i;
} }
for (i = 0; i < NELEMS(game->unk138.unk78); ++i) for (i = 0; i < NELEMS(game->spritesManager.timerSprites); ++i)
{ {
spriteId = CreateSprite( spriteId = CreateSprite(
&gUnknown_846F458, &sSpriteTemplate_BerryCrushTimer,
24 * i + 176, 24 * i + 176,
8, 8,
0 0
); );
game->unk138.unk78[i] = &gSprites[spriteId]; game->spritesManager.timerSprites[i] = &gSprites[spriteId];
game->unk138.unk78[i]->oam.priority = 0; game->spritesManager.timerSprites[i]->oam.priority = 0;
game->unk138.unk78[i]->invisible = FALSE; game->spritesManager.timerSprites[i]->invisible = FALSE;
game->unk138.unk78[i]->animPaused = FALSE; game->spritesManager.timerSprites[i]->animPaused = FALSE;
} }
DigitObjUtil_CreatePrinter(0, 0, &sDigitObjTemplates[0]); DigitObjUtil_CreatePrinter(0, 0, &sDigitObjTemplates[0]);
DigitObjUtil_CreatePrinter(1, 0, &sDigitObjTemplates[1]); DigitObjUtil_CreatePrinter(1, 0, &sDigitObjTemplates[1]);
DigitObjUtil_CreatePrinter(2, 0, &sDigitObjTemplates[2]); DigitObjUtil_CreatePrinter(2, 0, &sDigitObjTemplates[2]);
if (game->unk12 == 1) if (game->gameState == 1)
sub_814EB04(&game->unk138); BerryCrush_HideTimerSprites(&game->spritesManager);
} }
static void sub_814EF10(struct BerryCrushGame * r5) static void sub_814EF10(struct BerryCrushGame * r5)
@@ -1299,20 +1304,20 @@ static void sub_814EF10(struct BerryCrushGame * r5)
FreeSpritePaletteByTag(4); FreeSpritePaletteByTag(4);
FreeSpritePaletteByTag(2); FreeSpritePaletteByTag(2);
FreeSpritePaletteByTag(1); FreeSpritePaletteByTag(1);
for (; r4 < NELEMS(r5->unk138.unk78); ++r4) for (; r4 < NELEMS(r5->spritesManager.timerSprites); ++r4)
DestroySprite(r5->unk138.unk78[r4]); DestroySprite(r5->spritesManager.timerSprites[r4]);
DigitObjUtil_DeletePrinter(2); DigitObjUtil_DeletePrinter(2);
DigitObjUtil_DeletePrinter(1); DigitObjUtil_DeletePrinter(1);
DigitObjUtil_DeletePrinter(0); DigitObjUtil_DeletePrinter(0);
for (r4 = 0; r4 < NELEMS(r5->unk138.unk4C); ++r4) for (r4 = 0; r4 < NELEMS(r5->spritesManager.sparkleSprites); ++r4)
DestroySprite(r5->unk138.unk4C[r4]); DestroySprite(r5->spritesManager.sparkleSprites[r4]);
for (r4 = 0; r4 < r5->playerCount; ++r4) for (r4 = 0; r4 < r5->playerCount; ++r4)
DestroySprite(r5->unk138.unk24[r4]); DestroySprite(r5->spritesManager.impactSprites[r4]);
if (r5->unk138.unk20->inUse) if (r5->spritesManager.coreSprite->inUse)
DestroySprite(r5->unk138.unk20); DestroySprite(r5->spritesManager.coreSprite);
} }
static void sub_814EFD0(struct Sprite * sprite) static void SpriteCB_BerryCrushImpact(struct Sprite * sprite)
{ {
if (sprite->animEnded) if (sprite->animEnded)
{ {
@@ -1369,12 +1374,12 @@ static void sub_814F0D8(struct Sprite * sprite)
r7[2] = 32; r7[2] = 32;
r7[7] = 168; r7[7] = 168;
r4 = sprite->pos2.x * 128; r4 = sprite->pos2.x * 128;
r5 = sub_80D8B40(7, (168 - sprite->pos1.y) << 7, (r2 + 32) >> 1); r5 = MathUtil_Div16Shift(7, (168 - sprite->pos1.y) << 7, (r2 + 32) >> 1);
sprite->data[0] = sprite->pos1.x << 7; sprite->data[0] = sprite->pos1.x << 7;
r7[3] = sub_80D8B40(7, r4, r5); r7[3] = MathUtil_Div16Shift(7, r4, r5);
r2 = sub_80D8ABC(7, r5, 85); r2 = MathUtil_Mul16Shift(7, r5, 85);
r7[4] = r8; r7[4] = r8;
r7[5] = sub_80D8B40(7, 0x3F80, r2); r7[5] = MathUtil_Div16Shift(7, 0x3F80, r2);
r7[6] = sprite->pos2.x / 4; r7[6] = sprite->pos2.x / 4;
r7[7] |= 0x8000; r7[7] |= 0x8000;
sprite->pos2.y = r8; sprite->pos2.y = r8;
src/dodrio_berry_picking_2.c
+2 -2
View File
@@ -1431,12 +1431,12 @@ static void sub_8155A78(void)
case 2: case 2:
if (!IsDma3ManagerBusyWithBgCopy()) if (!IsDma3ManagerBusyWithBgCopy())
{ {
CreateTask(sub_80DA634, 0); CreateTask(Task_SaveGame_UpdatedLinkRecords, 0);
gUnknown_203F440->state++; gUnknown_203F440->state++;
} }
break; break;
case 3: case 3:
if (!FuncIsActiveTask(sub_80DA634)) if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords))
gUnknown_203F440->state++; gUnknown_203F440->state++;
break; break;
default: default:
src/math_util.c
+9 -9
View File
@@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
s16 sub_80D8AA0(s16 x, s16 y) s16 MathUtil_Mul16(s16 x, s16 y)
{ {
s32 result; s32 result;
@@ -10,7 +10,7 @@ s16 sub_80D8AA0(s16 x, s16 y)
return result; return result;
} }
s16 sub_80D8ABC(u8 s, s16 x, s16 y) s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y)
{ {
s32 result; s32 result;
@@ -20,7 +20,7 @@ s16 sub_80D8ABC(u8 s, s16 x, s16 y)
return result; return result;
} }
s32 sub_80D8AE0(s32 x, s32 y) s32 MathUtil_Mul32(s32 x, s32 y)
{ {
s64 result; s64 result;
@@ -30,7 +30,7 @@ s32 sub_80D8AE0(s32 x, s32 y)
return result; return result;
} }
s16 sub_80D8B1C(s16 x, s16 y) s16 MathUtil_Div16(s16 x, s16 y)
{ {
if (y == 0) if (y == 0)
{ {
@@ -39,7 +39,7 @@ s16 sub_80D8B1C(s16 x, s16 y)
return (x << 8) / y; return (x << 8) / y;
} }
s16 sub_80D8B40(u8 s, s16 x, s16 y) s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y)
{ {
if (y == 0) if (y == 0)
{ {
@@ -48,7 +48,7 @@ s16 sub_80D8B40(u8 s, s16 x, s16 y)
return (x << s) / y; return (x << s) / y;
} }
s32 sub_80D8B68(s32 x, s32 y) s32 MathUtil_Div32(s32 x, s32 y)
{ {
s64 _x; s64 _x;
@@ -61,7 +61,7 @@ s32 sub_80D8B68(s32 x, s32 y)
return _x / y; return _x / y;
} }
s16 sub_80D8B90(s16 y) s16 MathUtil_Inv16(s16 y)
{ {
s32 x; s32 x;
@@ -69,7 +69,7 @@ s16 sub_80D8B90(s16 y)
return x / y; return x / y;
} }
s16 sub_80D8BA8(u8 s, s16 y) s16 MathUtil_Inv16Shift(u8 s, s16 y)
{ {
s32 x; s32 x;
@@ -77,7 +77,7 @@ s16 sub_80D8BA8(u8 s, s16 y)
return x / y; return x / y;
} }
s32 sub_80D8BC8(s32 y) s32 MathUtil_Inv32(s32 y)
{ {
s64 x; s64 x;
src/oak_speech.c
+2 -2
View File
@@ -1419,8 +1419,8 @@ static void Task_OakSpeech39(u8 taskId)
PlaySE(SE_TK_WARPIN); PlaySE(SE_TK_WARPIN);
r0 = data[2]; r0 = data[2];
data[2] -= 32; data[2] -= 32;
x = sub_80D8B90(r0 - 8); x = MathUtil_Inv16(r0 - 8);
y = sub_80D8B90(data[2] - 16); y = MathUtil_Inv16(data[2] - 16);
SetBgAffine(2, 0x7800, 0x5400, 0x78, 0x54, x, y, 0); SetBgAffine(2, 0x7800, 0x5400, 0x78, 0x54, x, y, 0);
if (data[2] <= 96) if (data[2] <= 96)
{ {
src/pokemon_jump_2.c
+2 -2
View File
@@ -1003,12 +1003,12 @@ static bool32 sub_814881C(void)
case 2: case 2:
if (sub_8149804()) if (sub_8149804())
{ {
CreateTask(sub_80DA634, 6); CreateTask(Task_SaveGame_UpdatedLinkRecords, 6);
gUnknown_203F3D4->unk8++; gUnknown_203F3D4->unk8++;
} }
break; break;
case 3: case 3:
if (!FuncIsActiveTask(sub_80DA634)) if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords))
{ {
sub_814A6CC(); sub_814A6CC();
gUnknown_203F3D4->unk8++; gUnknown_203F3D4->unk8++;
src/save.c
+1 -1
View File
@@ -846,7 +846,7 @@ u32 TryWriteSpecialSaveSection(u8 sector, u8* src)
return 1; return 1;
} }
void sub_80DA634(u8 taskId) void Task_SaveGame_UpdatedLinkRecords(u8 taskId)
{ {
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {
src/start_menu.c
+2 -2
View File
@@ -942,11 +942,11 @@ static void task50_after_link_battle_save(u8 taskId)
DestroyTask(taskId); DestroyTask(taskId);
break; break;
case 5: case 5:
CreateTask(sub_80DA634, 5); CreateTask(Task_SaveGame_UpdatedLinkRecords, 5);
data[0] = 6; data[0] = 6;
break; break;
case 6: case 6:
if (!FuncIsActiveTask(sub_80DA634)) if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords))
data[0] = 3; data[0] = 3;
break; break;
} }