diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-06-04 09:10:09 -0400 |
| commit | 75ab879fd876d35eac8498296994278e213b6e7a (patch) | |
| tree | b9763615e9771ac5dce777031a80b57b12d9cac2 /src | |
| parent | e82080d42bbb81b2add8bef5c073cc353dfea307 (diff) | |
| parent | 2d3210dc1129e3d60a9d138838dc867d8b106b41 (diff) | |
Merge remote-tracking branch 'origin/master' into modern_ld
Diffstat (limited to 'src')
33 files changed, 2764 insertions, 2255 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index ff9e64cb9..e24434a0e 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1532,7 +1532,7 @@ void AnimAirWaveProjectile(struct Sprite *sprite) { sprite->data[0] = 8; task->data[5] = 4; - a = MathUtil_Inv16(0x1000); + a = Q_8_8_inv(0x1000); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -1551,8 +1551,8 @@ void AnimAirWaveProjectile(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[6] = 0; sprite->data[5] = 0; - sprite->data[3] = MathUtil_Mul16(MathUtil_Mul16(b, a), MathUtil_Inv16(0x1C0)); - sprite->data[4] = MathUtil_Mul16(MathUtil_Mul16(c, a), MathUtil_Inv16(0x1C0)); + sprite->data[3] = Q_8_8_mul(Q_8_8_mul(b, a), Q_8_8_inv(0x1C0)); + sprite->data[4] = Q_8_8_mul(Q_8_8_mul(c, a), Q_8_8_inv(0x1C0)); sprite->callback = AnimAirWaveProjectile_Step1; } } @@ -1643,18 +1643,18 @@ void AnimTask_AirCutterProjectile(u8 taskId) else xDiff = attackerX - targetX; - gTasks[taskId].data[5] = MathUtil_Mul16(xDiff, MathUtil_Inv16(gBattleAnimArgs[2] & ~1)); - gTasks[taskId].data[6] = MathUtil_Mul16(gTasks[taskId].data[5], 0x80); + gTasks[taskId].data[5] = Q_8_8_mul(xDiff, Q_8_8_inv(gBattleAnimArgs[2] & ~1)); + gTasks[taskId].data[6] = Q_8_8_mul(gTasks[taskId].data[5], 0x80); gTasks[taskId].data[7] = gBattleAnimArgs[2]; if (targetY >= attackerY) { yDiff = targetY - attackerY; - gTasks[taskId].data[8] = MathUtil_Mul16(yDiff, MathUtil_Inv16(gTasks[taskId].data[5])) & ~1; + gTasks[taskId].data[8] = Q_8_8_mul(yDiff, Q_8_8_inv(gTasks[taskId].data[5])) & ~1; } else { yDiff = attackerY - targetY; - gTasks[taskId].data[8] = MathUtil_Mul16(yDiff, MathUtil_Inv16(gTasks[taskId].data[5])) | 1; + gTasks[taskId].data[8] = Q_8_8_mul(yDiff, Q_8_8_inv(gTasks[taskId].data[5])) | 1; } gTasks[taskId].data[3] = gBattleAnimArgs[3]; diff --git a/src/battle_interface.c b/src/battle_interface.c index 1df525967..cd4445fad 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -19,9 +19,6 @@ #undef abs #define abs(a) ((a) < 0 ? -(a) : (a)) -#define Q_24_8(n) ((s32)((n) * 256)) -#define Q_24_8_TO_INT(n) ((int)((n) >> 8)) - struct TestingBar { s32 maxValue; diff --git a/src/berry.c b/src/berry.c index c5b8af7f8..680f21e3d 100644 --- a/src/berry.c +++ b/src/berry.c @@ -867,50 +867,50 @@ const struct Berry gBerries[] = { }; -const struct BerryCrushStats gBerryCrushStats[] = { - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 20}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 50, 30}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 60, 50}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - { 80, 70}, - {100, 100}, - {100, 100}, - {100, 100}, - {100, 100}, - {100, 100}, - {130, 150}, - {130, 150}, - {130, 150}, - {130, 150}, - {130, 150}, - {160, 250}, - {160, 250}, - {160, 250}, - {160, 250}, - {160, 250}, - {180, 500}, - {180, 500}, - {180, 500}, - {180, 500}, - {180, 500}, - {200, 750}, - {200, 750}, - {150, 200} +const struct BerryCrushStats gBerryCrush_BerryData[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { 50, 20}, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { 50, 30}, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { 60, 50}, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { 80, 70}, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = {100, 100}, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = {130, 150}, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = {160, 250}, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = {180, 500}, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = {200, 750}, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = {200, 750}, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = {150, 200} }; // Leftover from R/S diff --git a/src/berry_crush.c b/src/berry_crush.c index 05be05802..f2c54297b 100644 --- a/src/berry_crush.c +++ b/src/berry_crush.c @@ -14,6 +14,7 @@ #include "item_menu_icons.h" #include "link.h" #include "link_rfu.h" +#include "list_menu.h" #include "math_util.h" #include "menu.h" #include "minigame_countdown.h" @@ -30,336 +31,471 @@ #include "constants/songs.h" #include "constants/items.h" +#define MAX_TIME (10 * 60 * 60) // Timer can go up to 9:59:59 + +#define TAG_CRUSHER_BASE 1 +#define PALTAG_EFFECT 2 // The next two gfx tags share this pal tag +#define GFXTAG_IMPACT 2 +#define GFXTAG_SPARKLE 3 +#define TAG_TIMER_DIGITS 4 +#define TAG_PLAYER1_BERRY 5 +#define TAG_PLAYER2_BERRY 6 +#define TAG_PLAYER3_BERRY 7 +#define TAG_PLAYER4_BERRY 8 +#define TAG_PLAYER5_BERRY 9 + #define TAG_COUNTDOWN 0x1000 +#define CRUSHER_START_Y (-104) + enum { - BCTEXT_AREYOUREADY, - BCTEXT_WAITFOROTHERS, - BCTEXT_GAINEDPOWDER, - BCTEXT_RECORDINGRESULTS, - BCTEXT_ASKPLAYAGAIN, - BCTEXT_CANCEL_NOBERRIES, - BCTEXT_CANCEL_DROPPEDOUT, - BCTEXT_TIMEUP, - BCTEXT_COMMSTANDBY, + RUN_CMD, + SCHEDULE_CMD, }; 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, + MSG_PICK_BERRY, + MSG_WAIT_PICK, + MSG_POWDER, + MSG_SAVING, + MSG_PLAY_AGAIN, + MSG_NO_BERRIES, + MSG_DROPPED, + MSG_TIMES_UP, + MSG_COMM_STANDBY, }; +enum { + CMD_NONE = 0, + CMD_FADE, + CMD_WAIT_FADE, + CMD_PRINT_MSG, + CMD_SHOW_GAME, + CMD_HIDE_GAME, + CMD_READY_BEGIN, + CMD_ASK_PICK_BERRY, + CMD_PICK_BERRY, + CMD_WAIT_BERRIES, + CMD_DROP_BERRIES, + CMD_DROP_LID, + CMD_COUNTDOWN, + CMD_PLAY_GAME_LEADER, + CMD_PLAY_GAME_MEMBER, + CMD_FINISH_GAME, + CMD_TIMES_UP, + CMD_CALC_RESULTS, + CMD_SHOW_RESULTS, + CMD_SAVE, + CMD_ASK_PLAY_AGAIN, + CMD_COMM_PLAY_AGAIN, + CMD_PLAY_AGAIN_YES, + CMD_PLAY_AGAIN_NO, + CMD_CLOSE_LINK, + CMD_QUIT, +}; + +// Args for Cmd_BeginNormalPaletteFade +#define bSelectedPals(i) args[0 + i] +#define bDelay args[4] +#define bStartY args[5] +#define bTargetY args[6] +#define bPalette(i) args[7 + i] +#define bCommunicateAfter args[9] + +// Args for Cmd_WaitPaletteFade +#define bWaitFadeCommAfter args[0] + +// Args for Cmd_PrintMessage +#define bMsgId args[0] +#define bFlags args[1] +#define bKeys(i) args[2 + i] +#define bNextCmdState args[4] + +#define F_MSG_CLEAR (1 << 0) +#define F_MSG_EXPAND (1 << 1) + +// Main states for the game. Many are assigned but never checked +enum { + STATE_INIT = 1, + STATE_RESET, + STATE_PICK_BERRY, + STATE_DROP_BERRIES, + STATE_DROP_LID, + STATE_COUNTDOWN, + STATE_PLAYING, + STATE_FINISHED, + STATE_TIMES_UP, + STATE_10, // Unused + STATE_RESULTS_PRESSES, + STATE_RESULTS_RANDOM, + STATE_RESULTS_CRUSHING, + STATE_14, // Unused + STATE_PLAY_AGAIN, +}; + +#define RESULTS_STATE_START STATE_RESULTS_PRESSES +#define RESULTS_STATE_END STATE_RESULTS_CRUSHING + +// IDs for each results page that shows in succession at the game's end. +// Only 3 pages are shown for a given game. Presses and Crushing are always shown 1st and 3rd. +// The 2nd page is random, and can be rankings for either Neatness, Cooperative, or Power. +enum { + RESULTS_PAGE_PRESSES, + RESULTS_PAGE_RANDOM, + RESULTS_PAGE_CRUSHING, + NUM_RESULTS_PAGES, +}; +// Random pages, see above +// "Neatness" is how many of the player's inputs were at a regular interval +// "Cooperative" is how often the player pressed A at the same time as others +// "Power" is how much of the time the player spent pressing A +enum { + RESULTS_PAGE_NEATNESS, + RESULTS_PAGE_COOPERATIVE, + RESULTS_PAGE_POWER, + NUM_RANDOM_RESULTS_PAGES +}; + +#define PLAY_AGAIN_YES 0 +#define PLAY_AGAIN_NO 1 +#define PLAY_AGAIN_NO_BERRIES 3 + +enum { + COLORID_GRAY, + COLORID_BLACK, + COLORID_LIGHT_GRAY, + COLORID_BLUE, + COLORID_GREEN, + COLORID_RED, +}; + +// Flags for the inputFlags field +// Field is 16 bits; 3 bits for each player, last bit is unused +// The first two bits are interchangeable +// Needlessly complicated system, the inputState field is sufficient by itself +#define F_INPUT_HIT_A (1 << 0) +#define F_INPUT_HIT_B (1 << 1) +#define F_INPUT_HIT_SYNC (1 << 2) // Input at same time as another player +#define INPUT_FLAGS_PER_PLAYER 3 +#define INPUT_FLAG_MASK ((1 << INPUT_FLAGS_PER_PLAYER) - 1) + +// Values for the inputState field +enum { + INPUT_STATE_NONE, + INPUT_STATE_HIT, // Hit the crusher + INPUT_STATE_HIT_SYNC, // Hit the crusher at same time as another player +}; + +// No reason for this to be 2 +// Simply a flag for whether a given player has sent their data this round +// Data is only sent if the player is the leader or if they pressed A +#define SEND_GAME_STATE 2 + struct BerryCrushGame_Player { - u8 unk0[PLAYER_NAME_LENGTH + 1 + 4]; - u16 unkC; - u16 unkE; - u16 unk10; - u16 unk12; - u16 unk14; - u16 unk16; - u16 unk18; - u16 unk1A; - u8 unk1B; - u8 unk1C; + u8 name[PLAYER_NAME_LENGTH + 1 + 4]; + u16 berryId; + u16 inputTime; + u16 neatInputStreak; + u16 timeSincePrevInput; + u16 maxNeatInputStreak; + u16 numAPresses; + u16 numSyncedAPresses; + u16 timePressingA; + u8 inputFlags; + u8 inputState; }; -struct BerryCrushGame_4E -{ - u16 unk0; - u16 unk2; - u8 unk4_0:1; - u8 unk4_1:1; - u8 unk4_2:1; - u8 unk4_3:5; - s8 unk5; - u16 unk6; - u16 unk8; - u16 unkA; - u16 unkC; +struct BerryCrushGame_LocalState +{ + u16 sendFlag; + bool8 endGame:1; + bool8 bigSparkle:1; + bool8 pushedAButton:1; + u8 playerPressedAFlags:5; + s8 vibration; + u16 depth; + u16 timer; + u16 inputFlags; + u16 sparkleAmount; }; -struct BerryCrushGame_40 +struct BerryCrushGame_LinkState { - s16 unk0; - s16 unk2; - s16 unk4; - s16 unk6; - s16 unk8; - s16 unkA; - s16 unkC; - s16 unkE; + u16 rfuCmd; + u16 sendFlag; + bool8 endGame:1; + bool8 bigSparkle:1; + bool8 pushedAButton:1; + u8 playerPressedAFlags:5; + s8 vibration; + u16 depth; + u16 timer; + u16 inputFlags; + u16 sparkleAmount; }; -struct BerryCrushGame_5C -{ - u16 unk00; - u8 unk02_0:1; - u8 unk02_1:1; - u8 pushedAButton:1; - u8 unk02_3:5; - s8 unk03; - u16 unk04; - u16 unk06; - u16 unk08; - u16 unk0A; +// Flags for the inputFlags field +// Field is 16 bits; 3 bits for each player, last bit is unused +// The first two bits are interchangeable +// Needlessly complicated system, the inputState field is sufficient by itself +#define F_INPUT_HIT_A (1 << 0) +#define F_INPUT_HIT_B (1 << 1) +#define F_INPUT_HIT_SYNC (1 << 2) // Input at same time as another player +#define INPUT_FLAGS_PER_PLAYER 3 +#define INPUT_FLAG_MASK ((1 << INPUT_FLAGS_PER_PLAYER) - 1) + +struct BerryCrushGame_Results +{ + u32 powder; + u16 time; + u16 targetPressesPerSec; // Never read + u16 silkiness; + u16 totalAPresses; + u16 stats[2][MAX_RFU_PLAYERS]; + u8 playerIdsRanked[2][MAX_RFU_PLAYERS + 3]; }; -struct BerryCrushGame_68 -{ - u32 unk00; - u16 unk04; - u16 unk06; - u16 unk08; - u16 unk0A; - // 0: Number of A presses - // 1: Neatness - u16 stats[2][5]; - u8 unk20[2][8]; -}; +// playerIdsRanked above has 3 additional elements after the players. +// Only 1 of these 2*3 is ever used, and it stores the id for which +// random results page to show. Its define below is for readability. +#define randomPageId playerIdsRanked[0][7] -struct BerryCrushPlayerSeatCoords +struct BerryCrushPlayerCoords { - u8 unk0; - u8 unk1; - u8 unk2; - s16 unk4; - s16 unk6; - s16 unk8; - s16 unkA; + u8 playerId; + u8 windowGfxX; + u8 windowGfxY; + s16 impactXOffset; + s16 impactYOffset; + s16 berryXOffset; + s16 berryXDest; }; -struct BerryCrushGame_138 +struct BerryCrushGame_Gfx { - u8 animBerryIdx; - u8 unk1; - u8 unk2; - u8 unk3; + u8 counter; + u8 vibrationIdx; + u8 numVibrations; + bool8 vibrating; s16 minutes; s16 secondsInt; s16 secondsFrac; - const struct BerryCrushPlayerSeatCoords *seatCoords[5]; + const struct BerryCrushPlayerCoords *playerCoords[MAX_RFU_PLAYERS]; struct Sprite *coreSprite; - struct Sprite *impactSprites[5]; - struct Sprite *berrySprites[5]; + struct Sprite *impactSprites[MAX_RFU_PLAYERS]; + struct Sprite *berrySprites[MAX_RFU_PLAYERS]; struct Sprite *sparkleSprites[11]; struct Sprite *timerSprites[2]; - u8 unk80; - u8 filler81; - u8 unk82; - u8 unk83[5]; - u16 bgBuffers[4][0x800]; + u8 resultsState; + u8 unused; + u8 resultsWindowId; + u8 nameWindowIds[MAX_RFU_PLAYERS]; + u16 bgBuffers[4][BG_SCREEN_SIZE]; }; +struct BerryCrushGame; + +typedef u32 (*CmdFunc)(struct BerryCrushGame * game, u8 * args); + struct BerryCrushGame { MainCallback savedCallback; - u32 (*cmdCallback)(struct BerryCrushGame *, u8 *); + CmdFunc cmdCallback; u8 localId; u8 playerCount; u8 mainTask; u8 textSpeed; u8 cmdState; - u8 unkD; + u8 unused; // Never read u8 nextCmd; u8 afterPalFadeCmd; - u16 unk10; + u16 cmdTimer; u16 gameState; - u16 unk14; + u16 playAgainState; u16 pressingSpeed; - s16 unk18; - s16 unk1A; + s16 targetAPresses; + s16 totalAPresses; s32 powder; - s32 unk20; - u8 unk24; - u8 unk25_0:1; - u8 unk25_1:1; - u8 unk25_2:1; - u8 unk25_3:1; - u8 unk25_4:1; - u8 unk25_5:3; - u16 unk26; + s32 targetDepth; + u8 newDepth; + bool8 noRoomForPowder:1; // Never read + bool8 newRecord:1; + bool8 playedSound:1; + bool8 endGame:1; + bool8 bigSparkle:1; + u8 sparkleAmount:3; + u16 leaderTimer; u16 timer; s16 depth; s16 vibration; - s16 unk2E; - s16 unk30; - s16 unk32; - s16 unk34; - u8 commandParams[0xC]; + s16 bigSparkleCounter; + s16 numBigSparkles; + s16 numBigSparkleChecks; + s16 sparkleCounter; + u8 commandParams[12]; u16 sendCmd[6]; u16 recvCmd[7]; - struct BerryCrushGame_5C localState; - struct BerryCrushGame_68 unk68; - struct BerryCrushGame_Player unk98[5]; - struct BerryCrushGame_138 spritesManager; + struct BerryCrushGame_LocalState localState; + struct BerryCrushGame_Results results; + struct BerryCrushGame_Player players[5]; + struct BerryCrushGame_Gfx gfx; }; -static EWRAM_DATA struct BerryCrushGame *sBerryCrushGamePtr = NULL; - -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); -static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_AskPickBerry(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_GoToBerryPouch(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_Countdown(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_PlayGame_Master(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_PlayGame_Slave(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_TabulateResults(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_SaveTheGame(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_AskPlayAgain(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_CommunicatePlayAgainResponses(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_PlayAgainFailureMessage(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_GracefulExit(struct BerryCrushGame * game, u8 *params); -static u32 BerryCrushCommand_Quit(struct BerryCrushGame * game, u8 *params); -static void sub_814D4D8(struct BerryCrushGame * game); -static void BerryCrush_SetShowMessageParams(u8 *params, u8 stringId, u8 flags, u16 waitKeys, u8 followupCmd); -static void FramesToMinSec(struct BerryCrushGame_138 * arg0, u16 arg1); +static EWRAM_DATA struct BerryCrushGame *sGame = NULL; + +static void SetNamesAndTextSpeed(struct BerryCrushGame *game); +static void GetBerryFromBag(void); +static void VBlankCB(void); +static void MainCB(void); +static void MainTask(u8 taskId); +static u32 Cmd_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_WaitPaletteFade(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_AskPickBerry(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_DropLid(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_Countdown(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_PlayGame_Leader(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_PlayGame_Member(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_FinishGame(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_HandleTimeUp(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_TabulateResults(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_ShowResults(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_AskPlayAgain(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_PlayAgain(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_StopGame(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_CloseLink(struct BerryCrushGame * game, u8 *args); +static u32 Cmd_Quit(struct BerryCrushGame * game, u8 *args); +static void ResetGame(struct BerryCrushGame * game); +static void SetPrintMessageArgs(u8 *args, u8 stringId, u8 flags, u16 waitKeys, u8 followupCmd); +static void FramesToMinSec(struct BerryCrushGame_Gfx * gfx, u16 frames); static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string); -static void PrintBerryCrushResultWindow(struct BerryCrushGame * sp0C, u8 sp10, u8 sp14, u8 r3); -static void sub_814E32C(struct BerryCrushGame * r8); +static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 y); +static void printCrushingResults(struct BerryCrushGame * game); static void Task_ShowBerryCrushRankings(u8 r4); -static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 * r4, u16 r1); -static void sub_814EB38(struct BerryCrushGame * r5); -static void sub_814EBB0(struct BerryCrushGame * r6); -static void sub_814EC80(struct BerryCrushGame * r6); -static void sub_814ECE0(struct BerryCrushGame * r6); -static void sub_814EF10(struct BerryCrushGame * r5); -static void SpriteCB_BerryCrushImpact(struct Sprite * sprite); -static void sub_814EFFC(struct Sprite * sprite); -static void sub_814F044(struct Sprite * sprite); -static void sub_814F0D8(struct Sprite * sprite); -struct BerryCrushGame *GetBerryCrushGame(void); -void StartBerryCrush(MainCallback callback); -u32 ExitBerryCrushWithCallback(MainCallback callback); -void CB2_BerryCrush_GoToBerryPouch(void); -void BerryCrush_SetVBlankCallback(void); -void BerryCrush_UnsetVBlankCallback(void); -void BerryCrush_UpdateSav2Records(void); -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 BerryCrush_InitBgs(void); -int BerryCrush_TeardownBgs(void); -void BerryCrush_CreateBerrySprites(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); -bool32 sub_814DE50(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_814DA04(struct BerryCrushGame *arg0); -void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 *arg0); -void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite); -void ShowBerryCrushRankings(void); - -static const u8 gUnknown_846E2E0[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; -static const u8 gUnknown_846E2E8[] = {0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00}; - -static const s8 gUnknown_846E2F0[][7] = { - {0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00}, - {0x04, 0x02, 0x00, 0xff, 0x00, 0x00, 0x00}, - {0x04, 0x02, 0x00, 0xfe, 0x00, 0x00, 0x00}, - {0x06, 0x03, 0x01, 0xff, 0xfd, 0xff, 0x00}, - {0x06, 0x04, 0x01, 0xfe, 0xfc, 0xfe, 0x00}, +static void PrintTimer(struct BerryCrushGame_Gfx * gfx, u16 frames); +static void CreatePlayerNameWindows(struct BerryCrushGame * game); +static void DrawPlayerNameWindows(struct BerryCrushGame * game); +static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame * game); +static void CreateGameSprites(struct BerryCrushGame * game); +static void DestroyGameSprites(struct BerryCrushGame * game); +static void SpriteCB_Impact(struct Sprite * sprite); +static void SpriteCB_Sparkle_End(struct Sprite * sprite); +static void SpriteCB_Sparkle(struct Sprite * sprite); +static void SpriteCB_Sparkle_Init(struct Sprite * sprite); +static struct BerryCrushGame *GetBerryCrushGame(void); +static u32 QuitBerryCrush(MainCallback callback); +static void ChooseBerry(void); +static void BerryCrush_SetVBlankCallback(void); +static void BerryCrush_InitVBlankCB(void); +static void SaveResults(void); +static void RunOrScheduleCommand(u16 command, u8 runMode, u8 *args); +static void SetPaletteFadeArgs(u8 *args, bool8 communicateAfter, u32 selectedPals, s8 delay, u8 startY, u8 targetY, u16 palette); +static s32 UpdateGame(struct BerryCrushGame *game); +static s32 ShowGameDisplay(void); +static s32 HideGameDisplay(void); +static void CreateBerrySprites(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *spritesManager); +static void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *gfx); +static void UpdateInputEffects(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *gfx); +static bool32 AreEffectsFinished(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *gfx); +static bool32 OpenResultsWindow(struct BerryCrushGame *game, struct BerryCrushGame_Gfx *spriteManager); +static void CloseResultsWindow(struct BerryCrushGame *game); +static void ResetCrusherPos(struct BerryCrushGame *game); +static void HideTimer(struct BerryCrushGame_Gfx *gfx); +static void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite); + +static const u8 sBitTable[] = { + 1 << 0, + 1 << 1, + 1 << 2, + 1 << 3, + 1 << 4, + 1 << 5, + 1 << 6, + 1 << 7, }; -ALIGNED(4) const u8 gUnknown_846E314[][4] = { - {0x03, 0x02, 0x01, 0x00}, - {0x03, 0x03, 0x01, 0x00}, - {0x03, 0x03, 0x02, 0x00}, - {0x03, 0x04, 0x02, 0x00}, - {0x03, 0x05, 0x03, 0x00} +// Additional A presses are counted depending on the number of players +// The bonus of 5 is unobtainable +static const u8 sSyncPressBonus[MAX_RFU_PLAYERS] = {0, 1, 2, 3, 5 }; + +ALIGNED(4) +static const s8 sIntroOutroVibrationData[][7] = { + { 4, 1, 0, -1, 0, 0, 0}, + { 4, 2, 0, -1, 0, 0, 0}, + { 4, 2, 0, -2, 0, 0, 0}, + { 6, 3, 1, -1, -3, -1, 0}, + { 6, 4, 1, -2, -4, -2, 0}, }; -static const u8 *const sBerryCrushMessages[] = { - gText_BerryCrush_AreYouReady, - gText_BerryCrush_WaitForOthersToChooseBerry, - gText_BerryCrush_GainedXUnitsOfPowder, - gText_BerryCrush_RecordingGameResults, - gText_BerryCrush_WantToPlayAgain, - gText_BerryCrush_NoBerries, - gText_BerryCrush_MemberDroppedOut, - gText_BerryCrush_TimeUp, - gText_BerryCrush_CommunicationStandby +ALIGNED(4) +const u8 sVibrationData[MAX_RFU_PLAYERS][4] = { + { 3, 2, 1, 0}, + { 3, 3, 1, 0}, + { 3, 3, 2, 0}, + { 3, 4, 2, 0}, + { 3, 5, 3, 0} }; -static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * berryCrushGame, u8 *params) = { - NULL, - BerryCrushCommand_BeginNormalPaletteFade, - BerryCrushCommand_WaitPaletteFade, - BerryCrushCommand_PrintMessage, - BerryCrushCommand_InitGfx, - BerryCrushCommand_TeardownGfx, - BerryCrushCommand_SignalReadyToBegin, - BerryCrushCommand_AskPickBerry, - BerryCrushCommand_GoToBerryPouch, - BerryCrushCommand_WaitForOthersToPickBerries, - BerryCrushCommand_DropBerriesIntoCrusher, - BerryCrushCommand_DropLid, - BerryCrushCommand_Countdown, - BerryCrushCommand_PlayGame_Master, - BerryCrushCommand_PlayGame_Slave, - BerryCrushCommand_FinishGame, - BerryCrushCommand_HandleTimeUp, - BerryCrushCommand_TabulateResults, - BerryCrushCommand_ShowResults, - BerryCrushCommand_SaveTheGame, - BerryCrushCommand_AskPlayAgain, - BerryCrushCommand_CommunicatePlayAgainResponses, - BerryCrushCommand_FadeOutToPlayAgain, - BerryCrushCommand_PlayAgainFailureMessage, - BerryCrushCommand_GracefulExit, - BerryCrushCommand_Quit +static const u8 *const sMessages[] = { + [MSG_PICK_BERRY] = gText_BerryCrush_AreYouReady, + [MSG_WAIT_PICK] = gText_BerryCrush_WaitForOthersToChooseBerry, + [MSG_POWDER] = gText_BerryCrush_GainedXUnitsOfPowder, + [MSG_SAVING] = gText_BerryCrush_RecordingGameResults, + [MSG_PLAY_AGAIN] = gText_BerryCrush_WantToPlayAgain, + [MSG_NO_BERRIES] = gText_BerryCrush_NoBerries, + [MSG_DROPPED] = gText_BerryCrush_MemberDroppedOut, + [MSG_TIMES_UP] = gText_BerryCrush_TimeUp, + [MSG_COMM_STANDBY] = gText_BerryCrush_CommunicationStandby }; -static const u8 gUnknown_846E3B4[][4] = { - {0x02, 0x04, 0x06, 0x07}, - {0x03, 0x05, 0x08, 0x0b}, - {0x03, 0x07, 0x0b, 0x0f}, - {0x04, 0x08, 0x0c, 0x11} +static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * berryCrushGame, u8 *args) = { + [CMD_NONE] = NULL, + [CMD_FADE] = Cmd_BeginNormalPaletteFade, + [CMD_WAIT_FADE] = Cmd_WaitPaletteFade, + [CMD_PRINT_MSG] = Cmd_PrintMessage, + [CMD_SHOW_GAME] = Cmd_ShowGameDisplay, + [CMD_HIDE_GAME] = Cmd_HideGameDisplay, + [CMD_READY_BEGIN] = Cmd_SignalReadyToBegin, + [CMD_ASK_PICK_BERRY] = Cmd_AskPickBerry, + [CMD_PICK_BERRY] = Cmd_GoToBerryPouch, + [CMD_WAIT_BERRIES] = Cmd_WaitForOthersToPickBerries, + [CMD_DROP_BERRIES] = Cmd_DropBerriesIntoCrusher, + [CMD_DROP_LID] = Cmd_DropLid, + [CMD_COUNTDOWN] = Cmd_Countdown, + [CMD_PLAY_GAME_LEADER] = Cmd_PlayGame_Leader, + [CMD_PLAY_GAME_MEMBER] = Cmd_PlayGame_Member, + [CMD_FINISH_GAME] = Cmd_FinishGame, + [CMD_TIMES_UP] = Cmd_HandleTimeUp, + [CMD_CALC_RESULTS] = Cmd_TabulateResults, + [CMD_SHOW_RESULTS] = Cmd_ShowResults, + [CMD_SAVE] = Cmd_SaveGame, + [CMD_ASK_PLAY_AGAIN] = Cmd_AskPlayAgain, + [CMD_COMM_PLAY_AGAIN] = Cmd_CommunicatePlayAgainResponses, + [CMD_PLAY_AGAIN_YES] = Cmd_PlayAgain, + [CMD_PLAY_AGAIN_NO] = Cmd_StopGame, + [CMD_CLOSE_LINK] = Cmd_CloseLink, + [CMD_QUIT] = Cmd_Quit }; -static const u8 gUnknown_846E3C4[] = {5, 7, 9, 12}; +static const u8 sSparkleThresholds[MAX_RFU_PLAYERS - 1][4] = { + {2, 4, 6, 7}, // 2 players + {3, 5, 8, 11}, // 3 players + {3, 7, 11, 15}, // 4 players + {4, 8, 12, 17}, // 5 players +}; + +static const u8 sBigSparkleThresholds[MAX_RFU_PLAYERS - 1] = {5, 7, 9, 12}; -static const u8 sReceivedPlayerBitmasks[] = {0x03, 0x07, 0x0F, 0x1F}; +static const u8 sReceivedPlayerBitmasks[MAX_RFU_PLAYERS - 1] = {0x03, 0x07, 0x0F, 0x1F}; static const struct BgTemplate sBgTemplates[] = { { @@ -398,31 +534,12 @@ static const struct BgTemplate sBgTemplates[] = { }; static const u8 sBerryCrushTextColorTable[][3] = { - { - TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GRAY, - TEXT_COLOR_LIGHT_GRAY - }, { - TEXT_COLOR_TRANSPARENT, - TEXT_COLOR_WHITE, - TEXT_COLOR_DARK_GRAY - }, { - TEXT_COLOR_TRANSPARENT, - TEXT_COLOR_LIGHT_GRAY, - TEXT_COLOR_RED - }, { - TEXT_COLOR_WHITE, - TEXT_COLOR_BLUE, - TEXT_COLOR_LIGHT_BLUE - }, { - TEXT_COLOR_WHITE, - TEXT_COLOR_GREEN, - TEXT_COLOR_LIGHT_GREEN - }, { - TEXT_COLOR_WHITE, - TEXT_COLOR_RED, - TEXT_COLOR_LIGHT_RED - } + [COLORID_GRAY] = { TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_LIGHT_GRAY }, + [COLORID_BLACK] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GRAY }, + [COLORID_LIGHT_GRAY] = { TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_RED }, + [COLORID_BLUE] = { TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE }, + [COLORID_GREEN] = { TEXT_COLOR_WHITE, TEXT_COLOR_GREEN, TEXT_COLOR_LIGHT_GREEN }, + [COLORID_RED] = { TEXT_COLOR_WHITE, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED } }; static const struct WindowTemplate sWindowTemplate_BerryCrushRankings = { @@ -435,7 +552,7 @@ static const struct WindowTemplate sWindowTemplate_BerryCrushRankings = { .baseBlock = 0x001 }; -static const struct WindowTemplate gUnknown_846E3F8[] = { +static const struct WindowTemplate sWindowTemplates_PlayerNames[] = { { .bg = 0, .tilemapLeft = 0, @@ -479,8 +596,9 @@ static const struct WindowTemplate gUnknown_846E3F8[] = { }, DUMMY_WIN_TEMPLATE }; -static const struct WindowTemplate gUnknown_846E428[] = { - { +static const struct WindowTemplate sWindowTemplates_Results[] = { + + [STATE_RESULTS_PRESSES - RESULTS_STATE_START] = { .bg = 0, .tilemapLeft = 4, .tilemapTop = 2, @@ -488,7 +606,8 @@ static const struct WindowTemplate gUnknown_846E428[] = { .height = 16, .paletteNum = 0xF, .baseBlock = 0x001 - }, { + }, + [STATE_RESULTS_RANDOM - RESULTS_STATE_START] = { .bg = 0, .tilemapLeft = 4, .tilemapTop = 2, @@ -496,7 +615,8 @@ static const struct WindowTemplate gUnknown_846E428[] = { .height = 16, .paletteNum = 0xF, .baseBlock = 0x001 - }, { + }, + [STATE_RESULTS_CRUSHING - RESULTS_STATE_START] = { .bg = 0, .tilemapLeft = 3, .tilemapTop = 2, @@ -507,14 +627,13 @@ static const struct WindowTemplate gUnknown_846E428[] = { }, DUMMY_WIN_TEMPLATE }; -static const u8 gUnknown_846E448[][4] = { - { 6, 8, 9, 11 }, - { 12, 14, 15, 16} +static const u8 sResultsWindowHeights[][MAX_RFU_PLAYERS - 1] = { + { 6, 8, 9, 11 }, // "Presses" and "Neatness/Cooperative/Power" pages + { 12, 14, 15, 16 }, // "Crushing" page }; static const u32 sPressingSpeedConversionTable[] = { - // Decimal point is vertically aligned with the pixel - // directly between the >< below. + // Hundred-millionths of a second 50000000, // 50 25000000, // 25 12500000, // 12.5 @@ -525,41 +644,83 @@ static const u32 sPressingSpeedConversionTable[] = { 390625 // 0.390625 }; -static const u16 sBerryCrushCorePal[] = INCBIN_U16("graphics/link_games/unk_846E4D0.gbapal"); -static const u16 sBerryCrushImpactAndSparklesPal[] = INCBIN_U16("graphics/link_games/unk_846E7FC.gbapal"); -static const u16 sBerryCrushTImerPal[] = INCBIN_U16("graphics/link_games/unk_846ECC4.gbapal"); +static const u16 sBerryCrushCorePal[] = INCBIN_U16("graphics/berry_crush/crusher_base.gbapal"); +static const u16 sBerryCrushImpactAndSparklesPal[] = INCBIN_U16("graphics/berry_crush/impact.gbapal"); +static const u16 sBerryCrushTimerPal[] = INCBIN_U16("graphics/berry_crush/timer_digits.gbapal"); -static const u32 sBerryCrushCoreTiles[] = INCBIN_U32("graphics/link_games/unk_846E4D0.4bpp.lz"); -static const u32 sBerryCrushImpactTiles[] = INCBIN_U32("graphics/link_games/unk_846E7FC.4bpp.lz"); -static const u32 sBerryCrushPowderSparklesTiles[] = INCBIN_U32("graphics/link_games/unk_846EB78.4bpp.lz"); -static const u32 sBerryCrushTimerTiles[] = INCBIN_U32("graphics/link_games/unk_846ECC4.4bpp.lz"); +static const u32 sBerryCrushCoreTiles[] = INCBIN_U32("graphics/berry_crush/crusher_base.4bpp.lz"); +static const u32 sBerryCrushImpactTiles[] = INCBIN_U32("graphics/berry_crush/impact.4bpp.lz"); +static const u32 sBerryCrushPowderSparklesTiles[] = INCBIN_U32("graphics/berry_crush/sparkle.4bpp.lz"); +static const u32 sBerryCrushTimerTiles[] = INCBIN_U32("graphics/berry_crush/timer_digits.4bpp.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 gBerryCrushBackgroundTilemap[] = INCBIN_U32("graphics/link_games/unk_846F058.bin.lz"); +static const u32 sCrusherTop_Tilemap[] = INCBIN_U32("graphics/berry_crush/crusher_top.bin.lz"); +static const u32 sContainerCap_Tilemap[] = INCBIN_U32("graphics/berry_crush/container_cap.bin.lz"); +static const u32 sBg_Tilemap[] = INCBIN_U32("graphics/berry_crush/bg.bin.lz"); -static const u8 gUnknown_846F280[][5] = { +// Takes the number of players - 2 and a player id and returns the +// index into sPlayerCoords where that player should be seated +static const u8 gUnknown_846F280[MAX_RFU_PLAYERS - 1][MAX_RFU_PLAYERS] = { {1, 3}, {0, 1, 3}, {1, 3, 2, 4}, {0, 1, 3, 2, 4} }; -static const struct BerryCrushPlayerSeatCoords gUnknown_846F294[] = { - {0, 0, 0, 0, -16, 0, 0}, - {1, 0, 3, -28, -4, -24, 16}, - {2, 0, 6, -16, 20, -8, 16}, - {3, 20, 3, 28, -4, 32, -8}, - {4, 20, 6, 16, 20, 16, -8} +static const struct BerryCrushPlayerCoords sPlayerCoords[] = { + { + .playerId = 0, + .windowGfxX = 0, + .windowGfxY = 0, + .impactXOffset = 0, + .impactYOffset = -16, + .berryXOffset = 0, + .berryXDest = 0 + }, + { + .playerId = 1, + .windowGfxX = 0, + .windowGfxY = 3, + .impactXOffset = -28, + .impactYOffset = -4, + .berryXOffset = -24, + .berryXDest = 16 + }, + { + .playerId = 2, + .windowGfxX = 0, + .windowGfxY = 6, + .impactXOffset = -16, + .impactYOffset = 20, + .berryXOffset = -8, + .berryXDest = 16 + }, + { + .playerId = 3, + .windowGfxX = 20, + .windowGfxY = 3, + .impactXOffset = 28, + .impactYOffset = -4, + .berryXOffset = 32, + .berryXDest = -8 + }, + { + .playerId = 4, + .windowGfxX = 20, + .windowGfxY = 6, + .impactXOffset = 16, + .impactYOffset = 20, + .berryXOffset = 16, + .berryXDest = -8 + }, }; -static const s8 gUnknown_846F2D0[][2] = { +static const s8 sImpactCoords[][2] = { { 0, 0}, {-1, 0}, { 1, 1} }; -static const s8 gUnknown_846F2D6[][2] = { +static const s8 sSparkleCoords[][2] = { { 0, 0}, {-16, -4}, { 16, -4}, @@ -574,37 +735,41 @@ static const s8 gUnknown_846F2D6[][2] = { }; static const u16 sPlayerBerrySpriteTags[] = { - 5, 6, 7, 8, 9 + TAG_PLAYER1_BERRY, + TAG_PLAYER2_BERRY, + TAG_PLAYER3_BERRY, + TAG_PLAYER4_BERRY, + TAG_PLAYER5_BERRY, }; static const struct CompressedSpriteSheet sSpriteSheets[] = { - {sBerryCrushCoreTiles, 0x0800, 1}, - {sBerryCrushImpactTiles, 0x0e00, 2}, - {sBerryCrushPowderSparklesTiles, 0x0700, 3}, - {sBerryCrushTimerTiles, 0x02c0, 4}, + {sBerryCrushCoreTiles, 0x0800, TAG_CRUSHER_BASE}, + {sBerryCrushImpactTiles, 0x0e00, GFXTAG_IMPACT}, + {sBerryCrushPowderSparklesTiles, 0x0700, GFXTAG_SPARKLE}, + {sBerryCrushTimerTiles, 0x02c0, TAG_TIMER_DIGITS}, {} }; static const struct SpritePalette sSpritePals[] = { - {sBerryCrushCorePal, 1}, - {sBerryCrushImpactAndSparklesPal, 2}, - {sBerryCrushTImerPal, 4}, + {sBerryCrushCorePal, TAG_CRUSHER_BASE}, + {sBerryCrushImpactAndSparklesPal, PALTAG_EFFECT}, + {sBerryCrushTimerPal, TAG_TIMER_DIGITS}, {} }; -static const union AnimCmd gUnknown_846F340[] = { +static const union AnimCmd sAnim_CrusherBase[] = { ANIMCMD_FRAME(0x00, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846F348[] = { +static const union AnimCmd sAnim_Impact_Small[] = { ANIMCMD_FRAME(0x00, 4), ANIMCMD_FRAME(0x10, 4), ANIMCMD_FRAME(0x20, 4), ANIMCMD_END }; -static const union AnimCmd gUnknown_846F358[] = { +static const union AnimCmd sAnim_Impact_Big[] = { ANIMCMD_FRAME(0x30, 2), ANIMCMD_FRAME(0x40, 2), ANIMCMD_FRAME(0x50, 2), @@ -612,7 +777,7 @@ static const union AnimCmd gUnknown_846F358[] = { ANIMCMD_END }; -static const union AnimCmd gUnknown_846F36C[] = { +static const union AnimCmd sAnim_Sparkle_Small[] = { ANIMCMD_FRAME(0x00, 2), ANIMCMD_FRAME(0x04, 2), ANIMCMD_FRAME(0x08, 2), @@ -622,7 +787,7 @@ static const union AnimCmd gUnknown_846F36C[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd gUnknown_846F388[] = { +static const union AnimCmd sAnim_Sparkle_Big[] = { ANIMCMD_FRAME(0x18, 4), ANIMCMD_FRAME(0x1c, 4), ANIMCMD_FRAME(0x20, 4), @@ -634,59 +799,59 @@ static const union AnimCmd gUnknown_846F388[] = { ANIMCMD_JUMP(0) }; -static const union AnimCmd gUnknown_846F3AC[] = { +static const union AnimCmd sAnim_Timer[] = { ANIMCMD_FRAME(0x14, 0), ANIMCMD_END }; -static const union AnimCmd gUnknown_846F3B4[] = { +static const union AnimCmd sAnim_PlayerBerry[] = { ANIMCMD_FRAME(0x00, 0), ANIMCMD_END }; -static const union AffineAnimCmd gUnknown_846F3BC[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), +static const union AffineAnimCmd sAffineAnim_PlayerBerry_0[] = { + AFFINEANIMCMD_FRAME(Q_8_8(1.0), Q_8_8(1.0), 0, 0), AFFINEANIMCMD_FRAME(0, 0, 2, 1), AFFINEANIMCMD_JUMP(1) }; -static const union AffineAnimCmd gUnknown_846F3D4[] = { - AFFINEANIMCMD_FRAME(256, 256, 0, 0), +static const union AffineAnimCmd sAffineAnim_PlayerBerry_1[] = { + AFFINEANIMCMD_FRAME(Q_8_8(1.0), Q_8_8(1.0), 0, 0), AFFINEANIMCMD_FRAME(0, 0, -2, 1), AFFINEANIMCMD_JUMP(1) }; static const union AnimCmd *const sAnimTable_BerryCrushCore[] = { - gUnknown_846F340 + sAnim_CrusherBase }; static const union AnimCmd *const sAnimTable_BerryCrushImpact[] = { - gUnknown_846F348, - gUnknown_846F358 + sAnim_Impact_Small, + sAnim_Impact_Big }; static const union AnimCmd *const sAnimTable_BerryCrushPowderSparkles[] = { - gUnknown_846F36C, - gUnknown_846F388 + sAnim_Sparkle_Small, + sAnim_Sparkle_Big }; static const union AnimCmd *const sAnimTable_BerryCrushTimer[] = { - gUnknown_846F3AC + sAnim_Timer }; -static const union AnimCmd *const gUnknown_846F404[] = { - gUnknown_846F3B4 +static const union AnimCmd *const sAnimTable_PlayerBerry[] = { + sAnim_PlayerBerry }; -static const union AffineAnimCmd *const gUnknown_846F408[] = { - gUnknown_846F3BC, - gUnknown_846F3D4 +static const union AffineAnimCmd *const sAffineAnimTable_PlayerBerry[] = { + sAffineAnim_PlayerBerry_0, + sAffineAnim_PlayerBerry_1 }; static const struct SpriteTemplate sSpriteTemplate_BerryCrushCore = { - .tileTag = 1, - .paletteTag = 1, + .tileTag = TAG_CRUSHER_BASE, + .paletteTag = TAG_CRUSHER_BASE, .oam = &gOamData_AffineOff_ObjNormal_64x64, .anims = sAnimTable_BerryCrushCore, .affineAnims = gDummySpriteAffineAnimTable, @@ -694,17 +859,17 @@ static const struct SpriteTemplate sSpriteTemplate_BerryCrushCore = { }; static const struct SpriteTemplate sSpriteTemplate_BerryCrushImpact = { - .tileTag = 2, - .paletteTag = 2, + .tileTag = GFXTAG_IMPACT, + .paletteTag = PALTAG_EFFECT, .oam = &gOamData_AffineOff_ObjNormal_32x32, .anims = sAnimTable_BerryCrushImpact, .affineAnims = gDummySpriteAffineAnimTable, - .callback = SpriteCB_BerryCrushImpact + .callback = SpriteCB_Impact }; static const struct SpriteTemplate sSpriteTemplate_BerryCrushPowderSparkles = { - .tileTag = 3, - .paletteTag = 2, + .tileTag = GFXTAG_SPARKLE, + .paletteTag = PALTAG_EFFECT, .oam = &gOamData_AffineOff_ObjNormal_16x16, .anims = sAnimTable_BerryCrushPowderSparkles, .affineAnims = gDummySpriteAffineAnimTable, @@ -712,8 +877,8 @@ static const struct SpriteTemplate sSpriteTemplate_BerryCrushPowderSparkles = { }; static const struct SpriteTemplate sSpriteTemplate_BerryCrushTimer = { - .tileTag = 4, - .paletteTag = 4, + .tileTag = TAG_TIMER_DIGITS, + .paletteTag = TAG_TIMER_DIGITS, .oam = &gOamData_AffineOff_ObjNormal_8x16, .anims = sAnimTable_BerryCrushTimer, .affineAnims = gDummySpriteAffineAnimTable, @@ -721,11 +886,11 @@ static const struct SpriteTemplate sSpriteTemplate_BerryCrushTimer = { }; static const struct SpriteTemplate sSpriteTemplate_PlayerBerry = { - .tileTag = 5, - .paletteTag = 5, + .tileTag = TAG_PLAYER1_BERRY, + .paletteTag = TAG_PLAYER1_BERRY, .oam = &gOamData_AffineDouble_ObjNormal_32x32, - .anims = gUnknown_846F404, - .affineAnims = gUnknown_846F408, + .anims = sAnimTable_PlayerBerry, + .affineAnims = sAffineAnimTable_PlayerBerry, .callback = SpriteCallbackDummy }; @@ -767,29 +932,30 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] = { }; static const u8 *const sBCRankingHeaders[] = { - gText_SpaceTimes, - gText_XDotY, - gText_StrVar1Berry, - gText_NeatnessRankings, - gText_CooperativeRankings, - gText_PressingPowerRankings + [RESULTS_PAGE_PRESSES] = gText_SpaceTimes, + [RESULTS_PAGE_RANDOM] = gText_XDotY, + [RESULTS_PAGE_CRUSHING] = gText_StrVar1Berry, + + [RESULTS_PAGE_NEATNESS + NUM_RESULTS_PAGES] = gText_NeatnessRankings, + [RESULTS_PAGE_COOPERATIVE + NUM_RESULTS_PAGES] = gText_CooperativeRankings, + [RESULTS_PAGE_POWER + NUM_RESULTS_PAGES] = gText_PressingPowerRankings }; -struct BerryCrushGame *GetBerryCrushGame(void) +static struct BerryCrushGame *GetBerryCrushGame(void) { - return sBerryCrushGamePtr; + return sGame; } -u32 ExitBerryCrushWithCallback(MainCallback callback) +static u32 QuitBerryCrush(MainCallback callback) { - if (sBerryCrushGamePtr == NULL) + if (sGame == NULL) return 2; if (callback == NULL) - callback = sBerryCrushGamePtr->savedCallback; + callback = sGame->savedCallback; - DestroyTask(sBerryCrushGamePtr->mainTask); - FREE_AND_SET_NULL(sBerryCrushGamePtr); + DestroyTask(sGame->mainTask); + FREE_AND_SET_NULL(sGame); SetMainCallback2(callback); if (callback == CB2_ReturnToField) { @@ -800,6 +966,15 @@ u32 ExitBerryCrushWithCallback(MainCallback callback) return 0; } +#define ERROR_EXIT(exitCallback) \ + { \ + SetMainCallback2(exitCallback); \ + Rfu.linkman_param[0] = 0; \ + Rfu.linkman_param[1] = 0; \ + Rfu.errorState = 1; \ + } + + void StartBerryCrush(MainCallback callback) { u8 playerCount = 0; @@ -807,10 +982,7 @@ void StartBerryCrush(MainCallback callback) if (!gReceivedRemoteLinkPlayers || gWirelessCommType == 0) { - SetMainCallback2(callback); - Rfu.linkman_param[0] = 0; - Rfu.linkman_param[1] = 0; - Rfu.errorState = 1; + ERROR_EXIT(callback); return; } @@ -818,126 +990,121 @@ void StartBerryCrush(MainCallback callback) multiplayerId = GetMultiplayerId(); if (playerCount < 2 || multiplayerId >= playerCount) { - SetMainCallback2(callback); - Rfu.linkman_param[0] = 0; - Rfu.linkman_param[1] = 0; - Rfu.errorState = 1; + ERROR_EXIT(callback); return; } - sBerryCrushGamePtr = AllocZeroed(sizeof(struct BerryCrushGame)); - if (!sBerryCrushGamePtr) + sGame = AllocZeroed(sizeof(struct BerryCrushGame)); + if (!sGame) { - SetMainCallback2(callback); - Rfu.linkman_param[0] = 0; - Rfu.linkman_param[1] = 0; - Rfu.errorState = 1; + ERROR_EXIT(callback); return; } - sBerryCrushGamePtr->savedCallback = callback; - sBerryCrushGamePtr->localId = multiplayerId; - sBerryCrushGamePtr->playerCount = playerCount; - BerryCrush_InitPlayerNamesAndTextSpeed(sBerryCrushGamePtr); - sBerryCrushGamePtr->gameState = 1; - sBerryCrushGamePtr->nextCmd = BCCMD_BeginNormalPaletteFade; - sBerryCrushGamePtr->afterPalFadeCmd = BCCMD_SignalReadyToBegin; - BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, TRUE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - BerryCrush_RunOrScheduleCommand(BCCMD_InitGfx, 1, sBerryCrushGamePtr->commandParams); - SetMainCallback2(CB2_BerryCrush); - sBerryCrushGamePtr->mainTask = CreateTask(Task_RunBerryCrushGame, 8); + sGame->savedCallback = callback; + sGame->localId = multiplayerId; + sGame->playerCount = playerCount; + SetNamesAndTextSpeed(sGame); + sGame->gameState = STATE_INIT; + sGame->nextCmd = CMD_FADE; + sGame->afterPalFadeCmd = CMD_READY_BEGIN; + SetPaletteFadeArgs(sGame->commandParams, TRUE, PALETTES_ALL, 0, 16, 0, RGB_BLACK); + RunOrScheduleCommand(CMD_SHOW_GAME, SCHEDULE_CMD, sGame->commandParams); + SetMainCallback2(MainCB); + sGame->mainTask = CreateTask(MainTask, 8); } -static void CB2_ReturnToBerryCrushGameFromBerryPouch(void) +static void GetBerryFromBag(void) { if (gSpecialVar_ItemId < FIRST_BERRY_INDEX || gSpecialVar_ItemId > LAST_BERRY_INDEX + 1) gSpecialVar_ItemId = FIRST_BERRY_INDEX; else RemoveBagItem(gSpecialVar_ItemId, 1); - sBerryCrushGamePtr->unk98[sBerryCrushGamePtr->localId].unkC = gSpecialVar_ItemId - FIRST_BERRY_INDEX; - sBerryCrushGamePtr->nextCmd = BCCMD_BeginNormalPaletteFade; - sBerryCrushGamePtr->afterPalFadeCmd = BCCMD_WaitForOthersToPickBerries; - BerryCrush_SetPaletteFadeParams(sBerryCrushGamePtr->commandParams, FALSE, 0xFFFFFFFF, 0, 16, 0, RGB_BLACK); - BerryCrush_RunOrScheduleCommand(BCCMD_InitGfx, 1, sBerryCrushGamePtr->commandParams); - sBerryCrushGamePtr->mainTask = CreateTask(Task_RunBerryCrushGame, 8); - SetMainCallback2(CB2_BerryCrush); + sGame->players[sGame->localId].berryId = gSpecialVar_ItemId - FIRST_BERRY_INDEX; + sGame->nextCmd = CMD_FADE; + sGame->afterPalFadeCmd = CMD_WAIT_BERRIES; + SetPaletteFadeArgs(sGame->commandParams, FALSE, PALETTES_ALL, 0, 16, 0, RGB_BLACK); + RunOrScheduleCommand(CMD_SHOW_GAME, SCHEDULE_CMD, sGame->commandParams); + sGame->mainTask = CreateTask(MainTask, 8); + SetMainCallback2(MainCB); } -void CB2_BerryCrush_GoToBerryPouch(void) +static void ChooseBerry(void) { - DestroyTask(sBerryCrushGamePtr->mainTask); - InitBerryPouch(BERRYPOUCH_FROMBERRYCRUSH, CB2_ReturnToBerryCrushGameFromBerryPouch, FALSE); + DestroyTask(sGame->mainTask); + InitBerryPouch(BERRYPOUCH_FROMBERRYCRUSH, GetBerryFromBag, FALSE); } -void BerryCrush_SetVBlankCallback(void) +static void BerryCrush_SetVBlankCallback(void) { - SetVBlankCallback(VBlankCB_BerryCrush); + SetVBlankCallback(VBlankCB); } -void BerryCrush_UnsetVBlankCallback(void) +static void BerryCrush_InitVBlankCB(void) { SetVBlankCallback(NULL); } -void BerryCrush_UpdateSav2Records(void) +static void SaveResults(void) { - u32 var0, var1; + u32 time, presses; - var0 = sBerryCrushGamePtr->unk68.unk04; - var0 <<= 8; - var0 = MathUtil_Div32(var0, 60 << 8); - var1 = sBerryCrushGamePtr->unk68.unk0A; - var1 <<= 8; - var1 = MathUtil_Div32(var1, var0) & 0xFFFF; - sBerryCrushGamePtr->pressingSpeed = var1; - switch (sBerryCrushGamePtr->playerCount) + time = sGame->results.time; + time = Q_24_8(time); + time = Q_24_8_div(time, Q_24_8(60)); + presses = sGame->results.totalAPresses; + presses = Q_24_8(presses); + presses = Q_24_8_div(presses, time) & 0xFFFF; + sGame->pressingSpeed = presses; + + switch (sGame->playerCount) { case 2: - if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[0]) + if (sGame->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[0]) { - sBerryCrushGamePtr->unk25_1 = 1; - gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sBerryCrushGamePtr->pressingSpeed; + sGame->newRecord = TRUE; + gSaveBlock2Ptr->berryCrush.berryCrushResults[0] = sGame->pressingSpeed; } break; case 3: - if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[1]) + if (sGame->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[1]) { - sBerryCrushGamePtr->unk25_1 = 1; - gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sBerryCrushGamePtr->pressingSpeed; + sGame->newRecord = TRUE; + gSaveBlock2Ptr->berryCrush.berryCrushResults[1] = sGame->pressingSpeed; } break; case 4: - if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[2]) + if (sGame->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[2]) { - sBerryCrushGamePtr->unk25_1 = 1; - gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sBerryCrushGamePtr->pressingSpeed; + sGame->newRecord = TRUE; + gSaveBlock2Ptr->berryCrush.berryCrushResults[2] = sGame->pressingSpeed; } break; case 5: - if (sBerryCrushGamePtr->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[3]) + if (sGame->pressingSpeed > gSaveBlock2Ptr->berryCrush.berryCrushResults[3]) { - sBerryCrushGamePtr->unk25_1 = 1; - gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sBerryCrushGamePtr->pressingSpeed; + sGame->newRecord = TRUE; + gSaveBlock2Ptr->berryCrush.berryCrushResults[3] = sGame->pressingSpeed; } break; } - sBerryCrushGamePtr->powder = sBerryCrushGamePtr->unk68.unk00; - if (GiveBerryPowder(sBerryCrushGamePtr->powder)) + sGame->powder = sGame->results.powder; + if (GiveBerryPowder(sGame->powder)) return; - sBerryCrushGamePtr->unk25_0 = 1; + sGame->noRoomForPowder = TRUE; } -static void VBlankCB_BerryCrush(void) +static void VBlankCB(void) { TransferPlttBuffer(); LoadOam(); ProcessSpriteCopyRequests(); } -static void CB2_BerryCrush(void) +static void MainCB(void) { RunTasks(); RunTextPrinters(); @@ -945,27 +1112,27 @@ static void CB2_BerryCrush(void) BuildOamBuffer(); } -static void Task_RunBerryCrushGame(u8 taskId) +static void MainTask(u8 taskId) { - if (sBerryCrushGamePtr->cmdCallback != NULL) - sBerryCrushGamePtr->cmdCallback(sBerryCrushGamePtr, sBerryCrushGamePtr->commandParams); + if (sGame->cmdCallback != NULL) + sGame->cmdCallback(sGame, sGame->commandParams); - sub_814D9CC(sBerryCrushGamePtr); + UpdateGame(sGame); } -void BerryCrush_InitPlayerNamesAndTextSpeed(struct BerryCrushGame *game) +static void SetNamesAndTextSpeed(struct BerryCrushGame *game) { u8 i; for (i = 0; i < game->playerCount; i++) { - StringCopy(game->unk98[i].unk0, gLinkPlayers[i].name); - game->unk98[i].unk0[PLAYER_NAME_LENGTH] = EOS; + StringCopy(game->players[i].name, gLinkPlayers[i].name); + game->players[i].name[PLAYER_NAME_LENGTH] = EOS; } for (; i < 5; i++) { - memset(game->unk98[i].unk0, 1, PLAYER_NAME_LENGTH); - game->unk98[i].unk0[PLAYER_NAME_LENGTH] = EOS; + memset(game->players[i].name, 1, PLAYER_NAME_LENGTH); + game->players[i].name[PLAYER_NAME_LENGTH] = EOS; } switch (gSaveBlock2Ptr->optionsTextSpeed) @@ -982,32 +1149,34 @@ void BerryCrush_InitPlayerNamesAndTextSpeed(struct BerryCrushGame *game) } } -void BerryCrush_RunOrScheduleCommand(u16 command, u8 runMode, u8 *params) +// GF file break + +static void RunOrScheduleCommand(u16 command, u8 runMode, u8 *args) { struct BerryCrushGame * game = GetBerryCrushGame(); if (command >= NELEMS(sBerryCrushCommands)) - command = 0; + command = CMD_NONE; switch (runMode) { - case 0: + case RUN_CMD: // Call now and set followup to game->nextCmd - if (command != 0) - sBerryCrushCommands[command](game, params); + if (command != CMD_NONE) + sBerryCrushCommands[command](game, args); if (game->nextCmd >= NELEMS(sBerryCrushCommands)) - game->nextCmd = 0; + game->nextCmd = CMD_NONE; game->cmdCallback = sBerryCrushCommands[game->nextCmd]; break; - case 1: + case SCHEDULE_CMD: // Schedule for next frame game->cmdCallback = sBerryCrushCommands[command]; break; } } -static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_BeginNormalPaletteFade(struct BerryCrushGame * game, u8 *args) { - // params points to packed values: + // args points to packed values: // bytes 0-3: selectedPals (bitfield) // byte 4: delay // byte 5: startY @@ -1018,46 +1187,47 @@ static u32 BerryCrushCommand_BeginNormalPaletteFade(struct BerryCrushGame * game u16 color; u32 selectedPals[2]; - selectedPals[0] = (u32)params[0]; - selectedPals[1] = (u32)params[1]; - selectedPals[1] <<= 8; + selectedPals[0] = (u32)bSelectedPals(0); + selectedPals[1] = (u32)bSelectedPals(1); + selectedPals[1] <<= 8; selectedPals[0] |= selectedPals[1]; - selectedPals[1] = (u32)params[2]; - selectedPals[1] <<= 16; + selectedPals[1] = (u32)bSelectedPals(2); + selectedPals[1] <<= 16; selectedPals[0] |= selectedPals[1]; - selectedPals[1] = (u32)params[3]; - selectedPals[1] <<= 24; + selectedPals[1] = (u32)bSelectedPals(3); + selectedPals[1] <<= 24; selectedPals[0] |= selectedPals[1]; - params[0] = params[9]; - color = params[8]; + bWaitFadeCommAfter = bCommunicateAfter; + + color = bPalette(1); color <<= 8; - color |= params[7]; + color |= bPalette(0); gPaletteFade.bufferTransferDisabled = FALSE; - BeginNormalPaletteFade(selectedPals[0], params[4], params[5], params[6], color); + BeginNormalPaletteFade(selectedPals[0], bDelay, bStartY, bTargetY, color); UpdatePaletteFade(); - game->nextCmd = BCCMD_WaitPaletteFade; + game->nextCmd = CMD_WAIT_FADE; return 0; } -static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_WaitPaletteFade(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { case 0: if (UpdatePaletteFade()) return 0; - if(params[0] != 0) + if (bWaitFadeCommAfter) ++game->cmdState; else game->cmdState = 3; return 0; case 1: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); ++game->cmdState; return 0; case 2: @@ -1068,7 +1238,7 @@ static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * game, u8 *p } return 0; case 3: - BerryCrush_RunOrScheduleCommand(game->afterPalFadeCmd, 1, NULL); + RunOrScheduleCommand(game->afterPalFadeCmd, SCHEDULE_CMD, NULL); game->cmdState = 0; return 0; default: @@ -1077,78 +1247,85 @@ static u32 BerryCrushCommand_WaitPaletteFade(struct BerryCrushGame * game, u8 *p } } -static u32 BerryCrushCommand_PrintMessage(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_PrintMessage(struct BerryCrushGame * game, u8 *args) { - u16 waitKeys; + // args[0]: msg id + // args[1]: flags + // args[2]: keys lo + // args[3]: keys hi + // args[4]: follow-up cmd state + + u16 keys; + + keys = bKeys(1); + keys <<= 8; + keys |= bKeys(0) << 0; - waitKeys = params[3]; - waitKeys <<= 8; - waitKeys |= params[2] << 0; switch (game->cmdState) { case 0: DrawDialogueFrame(0, FALSE); - if (params[1] & 2) + if (bFlags & F_MSG_EXPAND) { - StringExpandPlaceholders(gStringVar4, sBerryCrushMessages[params[0]]); + StringExpandPlaceholders(gStringVar4, sMessages[bMsgId]); AddTextPrinterParameterized2(0, 2, gStringVar4, game->textSpeed, 0, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } else { - AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[params[0]], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); + AddTextPrinterParameterized2(0, 2, sMessages[bMsgId], game->textSpeed, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); } CopyWindowToVram(0, COPYWIN_BOTH); break; case 1: if (!IsTextPrinterActive(0)) { - if (waitKeys == 0) + if (keys == 0) ++game->cmdState; break; } return 0; case 2: - if (!(waitKeys & gMain.newKeys)) + if (!JOY_NEW(keys)) return 0; break; case 3: - if (params[1] & 1) + if (bFlags & F_MSG_CLEAR) ClearDialogWindowAndFrame(0, TRUE); - BerryCrush_RunOrScheduleCommand(game->nextCmd, 1, NULL); - game->cmdState = params[4]; + RunOrScheduleCommand(game->nextCmd, SCHEDULE_CMD, NULL); + game->cmdState = bNextCmdState; return 0; } ++game->cmdState; return 0; } -static u32 BerryCrushCommand_InitGfx(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_ShowGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) { - if (BerryCrush_InitBgs() != 0) - BerryCrush_RunOrScheduleCommand(game->nextCmd, 0, game->commandParams); + if (ShowGameDisplay()) + RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); return 0; } -static u32 BerryCrushCommand_TeardownGfx(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_HideGameDisplay(struct BerryCrushGame * game, UNUSED u8 *args) { - if (BerryCrush_TeardownBgs() != 0) - BerryCrush_RunOrScheduleCommand(game->nextCmd, 0, game->commandParams); + if (HideGameDisplay()) + RunOrScheduleCommand(game->nextCmd, RUN_CMD, game->commandParams); return 0; } -static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_SignalReadyToBegin(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 1: if (IsLinkTaskFinished()) { PlayNewMapMusic(MUS_GAME_CORNER); - BerryCrush_RunOrScheduleCommand(BCCMD_AskPickBerry, 1, NULL); - game->gameState = 3; + RunOrScheduleCommand(CMD_ASK_PICK_BERRY, SCHEDULE_CMD, NULL); + game->gameState = STATE_PICK_BERRY; game->cmdState = 0; } return 0; @@ -1157,7 +1334,7 @@ static u32 BerryCrushCommand_SignalReadyToBegin(struct BerryCrushGame * game, UN return 0; } -static u32 BerryCrushCommand_AskPickBerry(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_AskPickBerry(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { @@ -1165,72 +1342,72 @@ static u32 BerryCrushCommand_AskPickBerry(struct BerryCrushGame * game, u8 *para ++game->cmdState; break; case 0: - sub_814D4D8(game); - BerryCrush_SetShowMessageParams(params, BCTEXT_AREYOUREADY, 1, 0, BCCMD_BeginNormalPaletteFade); - game->nextCmd = BCCMD_AskPickBerry; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); + ResetGame(game); + SetPrintMessageArgs(args, MSG_PICK_BERRY, F_MSG_CLEAR, 0, CMD_FADE); + game->nextCmd = CMD_ASK_PICK_BERRY; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); break; case 1: - game->nextCmd = BCCMD_GoToBerryPouch; - BerryCrush_RunOrScheduleCommand(BCCMD_TeardownGfx, 1, NULL); + game->nextCmd = CMD_PICK_BERRY; + RunOrScheduleCommand(CMD_HIDE_GAME, SCHEDULE_CMD, NULL); game->cmdState = 2; break; } return 0; } -static u32 BerryCrushCommand_GoToBerryPouch(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_GoToBerryPouch(struct BerryCrushGame * game, UNUSED u8 *args) { game->cmdCallback = NULL; - SetMainCallback2(CB2_BerryCrush_GoToBerryPouch); + SetMainCallback2(ChooseBerry); return 0; } -static u32 BerryCrushCommand_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame * game, u8 *args) { u8 i; switch (game->cmdState) { case 0: - BerryCrush_SetShowMessageParams(params, BCTEXT_WAITFOROTHERS, 0, 0, BCCMD_BeginNormalPaletteFade); - game->nextCmd = BCCMD_WaitForOthersToPickBerries; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); + SetPrintMessageArgs(args, MSG_WAIT_PICK, 0, 0, CMD_FADE); + game->nextCmd = CMD_WAIT_BERRIES; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); return 0; case 1: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 2: if (!IsLinkTaskFinished()) return 0; memset(game->sendCmd, 0, sizeof(game->sendCmd)); - game->sendCmd[0] = game->unk98[game->localId].unkC; + game->sendCmd[0] = game->players[game->localId].berryId; SendBlock(0, game->sendCmd, 2); break; case 3: if (!IsLinkTaskFinished()) return 0; - game->unk10 = 0; + game->cmdTimer = 0; break; case 4: if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[game->playerCount - 2]) return 0; for (i = 0; i < game->playerCount; ++i) { - game->unk98[i].unkC = gBlockRecvBuffer[i][0]; - if (game->unk98[i].unkC > 0xB0) - game->unk98[i].unkC = 0; - game->unk18 += gBerryCrushStats[game->unk98[i].unkC].unk0; - game->powder += gBerryCrushStats[game->unk98[i].unkC].powder; + game->players[i].berryId = gBlockRecvBuffer[i][0]; + if (game->players[i].berryId > LAST_BERRY_INDEX + 1) + game->players[i].berryId = 0; + game->targetAPresses += gBerryCrush_BerryData[game->players[i].berryId].difficulty; + game->powder += gBerryCrush_BerryData[game->players[i].berryId].powder; } - game->unk10 = 0; + game->cmdTimer = 0; ResetBlockReceivedFlags(); - game->unk20 = MathUtil_Div32(game->unk18 << 8, 0x2000); + game->targetDepth = Q_24_8_div(Q_24_8(game->targetAPresses), Q_24_8(32)); break; case 5: ClearDialogWindowAndFrame(0, TRUE); - BerryCrush_RunOrScheduleCommand(BCCMD_DropBerriesIntoCrusher, 1, NULL); - game->gameState = 4; + RunOrScheduleCommand(CMD_DROP_BERRIES, SCHEDULE_CMD, NULL); + game->gameState = STATE_DROP_BERRIES; game->cmdState = 0; return 0; } @@ -1238,54 +1415,54 @@ static u32 BerryCrushCommand_WaitForOthersToPickBerries(struct BerryCrushGame * return 0; } -static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_DropBerriesIntoCrusher(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: - BerryCrush_CreateBerrySprites(game, &game->spritesManager); - LinkRfu_SetRfuFuncToSend6600(); + CreateBerrySprites(game, &game->gfx); + Rfu_SetLinkStandbyCallback(); break; case 1: if (!IsLinkTaskFinished()) return 0; - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk1 = 0; - game->spritesManager.unk2 = 0; - game->spritesManager.unk3 = 0; + game->gfx.counter = 0; + game->gfx.vibrationIdx = 0; + game->gfx.numVibrations = 0; + game->gfx.vibrating = 0; break; case 2: - game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback = SpriteCB_DropBerryIntoCrusher; - game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->affineAnimPaused = FALSE; + game->gfx.berrySprites[game->gfx.counter]->callback = SpriteCB_DropBerryIntoCrusher; + game->gfx.berrySprites[game->gfx.counter]->affineAnimPaused = FALSE; PlaySE(SE_BALL_THROW); break; case 3: - if (game->spritesManager.berrySprites[game->spritesManager.animBerryIdx]->callback == SpriteCB_DropBerryIntoCrusher) + if (game->gfx.berrySprites[game->gfx.counter]->callback == SpriteCB_DropBerryIntoCrusher) return 0; - game->spritesManager.berrySprites[game->spritesManager.animBerryIdx] = NULL; - ++game->spritesManager.animBerryIdx; - LinkRfu_SetRfuFuncToSend6600(); + game->gfx.berrySprites[game->gfx.counter] = NULL; + ++game->gfx.counter; + Rfu_SetLinkStandbyCallback(); break; case 4: if (!IsLinkTaskFinished()) return 0; - if (game->spritesManager.animBerryIdx < game->playerCount) + if (game->gfx.counter < game->playerCount) { game->cmdState = 2; return 0; } - game->spritesManager.animBerryIdx = 0; + game->gfx.counter = 0; break; case 5: - BerryCrushFreeBerrySpriteGfx(game, &game->spritesManager); - LinkRfu_SetRfuFuncToSend6600(); + BerryCrushFreeBerrySpriteGfx(game, &game->gfx); + Rfu_SetLinkStandbyCallback(); break; case 6: if (!IsLinkTaskFinished()) return 0; PlaySE(SE_FALL); - BerryCrush_RunOrScheduleCommand(BCCMD_DropLid, 1, NULL); - game->gameState = 5; + RunOrScheduleCommand(CMD_DROP_LID, SCHEDULE_CMD, NULL); + game->gameState = STATE_DROP_LID; game->cmdState = 0; return 0; } @@ -1293,7 +1470,7 @@ static u32 BerryCrushCommand_DropBerriesIntoCrusher(struct BerryCrushGame * game return 0; } -static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_DropLid(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { @@ -1302,37 +1479,37 @@ static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, UNUSED u8 *p if (game->depth < 0) return 0; game->depth = 0; - game->spritesManager.unk1 = 4; - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0]; + game->gfx.vibrationIdx = 4; + game->gfx.counter = 0; + game->gfx.numVibrations = sIntroOutroVibrationData[game->gfx.vibrationIdx][0]; PlaySE(SE_M_STRENGTH); break; case 1: - game->vibration = gUnknown_846E2F0[game->spritesManager.unk1][game->spritesManager.animBerryIdx]; + game->vibration = sIntroOutroVibrationData[game->gfx.vibrationIdx][game->gfx.counter]; SetGpuReg(REG_OFFSET_BG0VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG2VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG3VOFS, -game->vibration); - ++game->spritesManager.animBerryIdx; - if (game->spritesManager.animBerryIdx < game->spritesManager.unk2) + ++game->gfx.counter; + if (game->gfx.counter < game->gfx.numVibrations) return 0; - if (game->spritesManager.unk1 == 0) + if (game->gfx.vibrationIdx == 0) break; - --game->spritesManager.unk1; - game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0]; - game->spritesManager.animBerryIdx = 0; + --game->gfx.vibrationIdx; + game->gfx.numVibrations = sIntroOutroVibrationData[game->gfx.vibrationIdx][0]; + game->gfx.counter = 0; return 0; case 2: game->vibration = 0; SetGpuReg(REG_OFFSET_BG0VOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0); SetGpuReg(REG_OFFSET_BG3VOFS, 0); - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 3: if (!IsLinkTaskFinished()) return 0; - BerryCrush_RunOrScheduleCommand(BCCMD_Countdown, 1, NULL); - game->gameState = 6; + RunOrScheduleCommand(CMD_COUNTDOWN, SCHEDULE_CMD, NULL); + game->gameState = STATE_COUNTDOWN; game->cmdState = 0; return 0; } @@ -1340,12 +1517,12 @@ static u32 BerryCrushCommand_DropLid(struct BerryCrushGame * game, UNUSED u8 *p return 0; } -static u32 BerryCrushCommand_Countdown(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_Countdown(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game-> cmdState) { case 0: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 1: if (!IsLinkTaskFinished()) @@ -1355,21 +1532,21 @@ static u32 BerryCrushCommand_Countdown(struct BerryCrushGame * game, UNUSED u8 case 2: if (IsMinigameCountdownRunning()) return 0; - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 3: if (!IsLinkTaskFinished()) return 0; - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk1 = 0; - game->spritesManager.unk2 = 0; - game->spritesManager.unk3 = 0; - game->unk10 = 0; + game->gfx.counter = 0; + game->gfx.vibrationIdx = 0; + game->gfx.numVibrations = 0; + game->gfx.vibrating = FALSE; + game->cmdTimer = 0; if (game->localId == 0) - BerryCrush_RunOrScheduleCommand(BCCMD_PlayGame_Master, 1, NULL); + RunOrScheduleCommand(CMD_PLAY_GAME_LEADER, SCHEDULE_CMD, NULL); else - BerryCrush_RunOrScheduleCommand(BCCMD_PlayGame_Slave, 1, NULL); - game->gameState = 7; + RunOrScheduleCommand(CMD_PLAY_GAME_MEMBER, SCHEDULE_CMD, NULL); + game->gameState = STATE_PLAYING; game->cmdState = 0; return 0; } @@ -1377,333 +1554,368 @@ static u32 BerryCrushCommand_Countdown(struct BerryCrushGame * game, UNUSED u8 return 0; } -static void BerryCrush_ProcessGamePartnerInput(struct BerryCrushGame * game) +static void HandlePartnerInput(struct BerryCrushGame * game) { - u8 numPressedA = 0; - u16 r3; - u16 *curRecvCmd; + u8 numPlayersPressed = 0; u8 i = 0; - s32 r2_ = 0; - s32 r0; + u16 timeDiff; + s32 temp = 0; + struct BerryCrushGame_LinkState *linkState; for (i = 0; i < game->playerCount; ++i) { - curRecvCmd = gRecvCmds[i]; - if ((curRecvCmd[0] & 0xFF00) == 0x2F00 - && curRecvCmd[1] == 2) + linkState = (struct BerryCrushGame_LinkState *)gRecvCmds[i]; + + if ((linkState->rfuCmd & 0xFF00) != RFUCMD_SEND_PACKET) + continue; + if (linkState->sendFlag != SEND_GAME_STATE) + continue; + + if (linkState->pushedAButton) { - if ((u8)curRecvCmd[2] & 4) // pushedAButton + game->localState.playerPressedAFlags |= sBitTable[i]; + game->players[i].inputState = 1; + ++game->players[i].numAPresses; + ++numPlayersPressed; + timeDiff = game->timer - game->players[i].inputTime; + + // If the interval between inputs is regular, the input is considered "neat" + // This counts toward the player's neatness score + if (timeDiff >= game->players[i].timeSincePrevInput - 1 + && timeDiff <= game->players[i].timeSincePrevInput + 1) { - game->localState.unk02_3 |= gUnknown_846E2E0[i]; - game->unk98[i].unk1C = 1; - ++game->unk98[i].unk16; - ++numPressedA; - r3 = game->timer - game->unk98[i].unkE; - if (r3 >= game->unk98[i].unk12 - 1 && r3 <= game->unk98[i].unk12 + 1) - { - ++game->unk98[i].unk10; - game->unk98[i].unk12 = r3; - if (game->unk98[i].unk10 > game->unk98[i].unk14) - game->unk98[i].unk14 = game->unk98[i].unk10; - } - else - { - game->unk98[i].unk10 = 0; - game->unk98[i].unk12 = r3; - } - game->unk98[i].unkE = game->timer; - if (++game->unk98[i].unk1B > 2) - game->unk98[i].unk1B = 0; + // On neat input streak + ++game->players[i].neatInputStreak; + game->players[i].timeSincePrevInput = timeDiff; + if (game->players[i].neatInputStreak > game->players[i].maxNeatInputStreak) + game->players[i].maxNeatInputStreak = game->players[i].neatInputStreak; } else { - game->unk98[i].unk1C = 0; + // End neat input streak + game->players[i].neatInputStreak = 0; + game->players[i].timeSincePrevInput = timeDiff; } + + game->players[i].inputTime = game->timer; + ++game->players[i].inputFlags; + if (game->players[i].inputFlags > F_INPUT_HIT_B) + game->players[i].inputFlags = 0; } - } - if (numPressedA > 1) - { - for (i = 0; i < game->playerCount; ++i) + else { - if (game->unk98[i].unk1C != 0) - { - game->unk98[i].unk1C |= 2; - ++game->unk98[i].unk18; - } + game->players[i].inputState = INPUT_STATE_NONE; } } - if (numPressedA != 0) + if (numPlayersPressed > 1) { - game->unk2E += numPressedA; - numPressedA += gUnknown_846E2E8[numPressedA - 1]; - game->unk34 += numPressedA; - game->unk1A += numPressedA; - r0 = game->unk18; - r2_ = game->unk1A; - if (r0 - r2_ > 0) - { - r2_ <<= 8; - r2_ = MathUtil_Div32(r2_, game->unk20); - r2_ >>= 8; - game->unk24 = r2_; - } - else + // For each player that pressed A, flag their input as synchronous + // This is used to change their impact sprite to a big impact + for (i = 0; i < game->playerCount; ++i) { - game->unk24 = 32; - game->localState.unk02_0 = 1; + if (game->players[i].inputState == INPUT_STATE_NONE) + continue; + game->players[i].inputState |= INPUT_STATE_HIT_SYNC; + ++game->players[i].numSyncedAPresses; } } + if (numPlayersPressed == 0) + return; + + game->bigSparkleCounter += numPlayersPressed; + numPlayersPressed += sSyncPressBonus[numPlayersPressed - 1]; + game->sparkleCounter += numPlayersPressed; + game->totalAPresses += numPlayersPressed; + if (game->targetAPresses - game->totalAPresses > 0) + { + temp = game->totalAPresses; + temp = Q_24_8(temp); + temp = Q_24_8_div(temp, game->targetDepth); + temp = Q_24_8_TO_INT(temp); + game->newDepth = (u8)temp; + return; + } + + // Target number of A presses has been reached, game is complete + game->newDepth = 32; + game->localState.endGame = TRUE; } static void BerryCrush_BuildLocalState(struct BerryCrushGame * game) { - u8 count = 0; + u8 numPlayersPressed = 0; u16 r1 = 0; u8 i = 0; for (i = 0; i < game->playerCount; ++i) { - if (game->unk98[i].unk1C != 0) + if (game->players[i].inputState != 0) { - ++count; - r1 = game->unk98[i].unk1B + 1; - if (game->unk98[i].unk1C & 2) + ++numPlayersPressed; + r1 = game->players[i].inputFlags + 1; + if (game->players[i].inputState & 2) r1 |= 4; r1 <<= 3 * i; - game->localState.unk08 |= r1; + game->localState.inputFlags |= r1; } } - game->localState.unk04 = game->unk24; - if (count == 0) + game->localState.depth = game->newDepth; + if (numPlayersPressed == 0) { - if (game->spritesManager.unk3 != 0) - ++game->spritesManager.animBerryIdx; + if (game->gfx.vibrating != 0) + ++game->gfx.counter; } - else if (game->spritesManager.unk3 != 0) + else if (game->gfx.vibrating != 0) { - if (count != game->spritesManager.unk1) + if (numPlayersPressed != game->gfx.vibrationIdx) { - game->spritesManager.unk1 = count - 1; - game->spritesManager.unk2 = gUnknown_846E314[count - 1][0]; + game->gfx.vibrationIdx = numPlayersPressed - 1; + game->gfx.numVibrations = sVibrationData[numPlayersPressed - 1][0]; } else { - ++game->spritesManager.animBerryIdx; + ++game->gfx.counter; } } else { - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk1 = count - 1; - game->spritesManager.unk2 = gUnknown_846E314[count - 1][0]; - game->spritesManager.unk3 = 1; + game->gfx.counter = 0; + game->gfx.vibrationIdx = numPlayersPressed - 1; + game->gfx.numVibrations = sVibrationData[numPlayersPressed - 1][0]; + game->gfx.vibrating = 1; } - if (game->spritesManager.unk3 != 0) + if (game->gfx.vibrating != 0) { - if (game->spritesManager.animBerryIdx >= game->spritesManager.unk2) + if (game->gfx.counter >= game->gfx.numVibrations) { - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk1 = 0; - game->spritesManager.unk2 = 0; - game->spritesManager.unk3 = 0; + game->gfx.counter = 0; + game->gfx.vibrationIdx = 0; + game->gfx.numVibrations = 0; + game->gfx.vibrating = 0; r1 = 0; } else { - r1 = gUnknown_846E314[game->spritesManager.unk1][game->spritesManager.animBerryIdx + 1]; + r1 = sVibrationData[game->gfx.vibrationIdx][game->gfx.counter + 1]; } - game->localState.unk03 = r1; + game->localState.vibration = r1; } else { - game->localState.unk03 = 0; + game->localState.vibration = 0; } - game->localState.unk06 = game->unk26; + game->localState.timer = game->leaderTimer; } -static void BerryCrush_HandlePlayerInput(struct BerryCrushGame * game) +static void HandlePlayerInput(struct BerryCrushGame * game) { if (JOY_NEW(A_BUTTON)) game->localState.pushedAButton = TRUE; + if (JOY_HELD(A_BUTTON)) { - if (game->unk98[game->localId].unk1A < game->timer) - ++game->unk98[game->localId].unk1A; + if (game->players[game->localId].timePressingA < game->timer) + ++game->players[game->localId].timePressingA; } + + // Only send data to other players if you are the leader or you pressed A if (game->localId != 0 && !game->localState.pushedAButton) return; - game->localState.unk00 = 2; + game->localState.sendFlag = SEND_GAME_STATE; + + // Every 30 frames, check whether the sparkles produced should be big, + // depending on how many A presses there were in that time if (game->timer % 30 == 0) { - if (game->unk2E > gUnknown_846E3C4[game->playerCount - 2]) + if (game->bigSparkleCounter > sBigSparkleThresholds[game->playerCount - 2]) { - ++game->unk30; - game->unk25_4 = 1; + ++game->numBigSparkles; + game->bigSparkle = TRUE; } else { - game->unk25_4 = 0; + game->bigSparkle = FALSE; } - game->unk2E = 0; - ++game->unk32; + game->bigSparkleCounter = 0; + ++game->numBigSparkleChecks; } + + // Every 15 frames, update the amount of sparkles that should be produced, + // depending on how many A presses there were in that time (including the bonus) if (game->timer % 15 == 0) { - if (game->unk34 < gUnknown_846E3B4[game->playerCount - 2][0]) - game->unk25_5 = 0; - else if (game->unk34 < gUnknown_846E3B4[game->playerCount - 2][1]) - game->unk25_5 = 1; - else if (game->unk34 < gUnknown_846E3B4[game->playerCount - 2][2]) - game->unk34 = 2; // typo since game->unk34 will be reset? - else if (game->unk34 < gUnknown_846E3B4[game->playerCount - 2][3]) - game->unk34 = 3; // typo since game->unk34 will be reset? + // BUG: The wrong field is used twice below + // As a result, only a sparkleAmount of 0, 1, or 4 is attainable +#ifdef BUGFIX +#define field sparkleAmount +#else +#define field sparkleCounter +#endif + if (game->sparkleCounter < sSparkleThresholds[game->playerCount - 2][0]) + game->sparkleAmount = 0; + else if (game->sparkleCounter < sSparkleThresholds[game->playerCount - 2][1]) + game->sparkleAmount = 1; + else if (game->sparkleCounter < sSparkleThresholds[game->playerCount - 2][2]) + game->field = 2; + else if (game->sparkleCounter < sSparkleThresholds[game->playerCount - 2][3]) + game->field = 3; else - game->unk25_5 = 4; - game->unk34 = 0; + game->sparkleAmount = 4; + game->sparkleCounter = 0; +#undef field } else { - ++game->unk10; - if (game->unk10 > 60) + ++game->cmdTimer; + if (game->cmdTimer > 60) { - if (game->unk10 > 70) + if (game->cmdTimer > 70) { - sub_80FBA44(); - game->unk10 = 0; + ClearRecvCommands(); + game->cmdTimer = 0; } - else if (game->localState.unk02_3 == 0) + else if (game->localState.playerPressedAFlags == 0) { - sub_80FBA44(); - game->unk10 = 0; + ClearRecvCommands(); + game->cmdTimer = 0; } } } - if (game->timer >= 36000) - game->localState.unk02_0 = 1; - game->localState.unk02_1 = game->unk25_4; - game->localState.unk0A = game->unk25_5; + if (game->timer >= MAX_TIME) + game->localState.endGame = TRUE; + game->localState.bigSparkle = game->bigSparkle; + game->localState.sparkleAmount = game->sparkleAmount; memcpy(&game->sendCmd, &game->localState, sizeof(game->sendCmd)); - RfuPrepareSend0x2f00(game->sendCmd); + Rfu_SendPacket(game->sendCmd); } -static void BerryCrush_UpdateGameState(struct BerryCrushGame * game) +static void RecvLinkData(struct BerryCrushGame * game) { u8 i = 0; - struct BerryCrushGame_4E * r4_ = NULL; + struct BerryCrushGame_LinkState * linkState = NULL; for (i = 0; i < game->playerCount; ++i) - game->unk98[i].unk1C = 0; - if ((gRecvCmds[0][0] & 0xFF00) != 0x2F00 || gRecvCmds[0][1] != 2) + game->players[i].inputState = INPUT_STATE_NONE; + + if ((gRecvCmds[0][0] & 0xFF00) != RFUCMD_SEND_PACKET) { - game->unk25_2 = 0; + game->playedSound = FALSE; return; } - memcpy(game->recvCmd, gRecvCmds[0], 14); - r4_ = (struct BerryCrushGame_4E *)&game->recvCmd; - game->depth = r4_->unk6; - game->vibration = r4_->unk5; - game->timer = r4_->unk8; - sub_814DC5C(game, &game->spritesManager); - if (r4_->unk4_0) - game->unk25_3 = 1; + if (gRecvCmds[0][1] != SEND_GAME_STATE) + { + game->playedSound = FALSE; + return; + } + + memcpy(game->recvCmd, gRecvCmds[0], sizeof(game->recvCmd)); + linkState = (struct BerryCrushGame_LinkState *)&game->recvCmd; + game->depth = linkState->depth; + game->vibration = linkState->vibration; + game->timer = linkState->timer; + UpdateInputEffects(game, &game->gfx); + + if (linkState->endGame) + game->endGame = TRUE; } -static u32 BerryCrushCommand_PlayGame_Master(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_PlayGame_Leader(struct BerryCrushGame * game, UNUSED u8 *args) { memset(&game->localState, 0, sizeof(game->localState)); memset(&game->recvCmd, 0, sizeof(game->recvCmd)); - BerryCrush_UpdateGameState(game); + RecvLinkData(game); SetGpuReg(REG_OFFSET_BG0VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG2VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG3VOFS, -game->vibration); - if (game->unk25_3) + if (game->endGame) { - if (game->timer >= 36000) + if (game->timer >= MAX_TIME) { - game->timer = 36000; - BerryCrush_RunOrScheduleCommand(BCCMD_HandleTimeUp, 1, NULL); + game->timer = MAX_TIME; + RunOrScheduleCommand(CMD_TIMES_UP, SCHEDULE_CMD, NULL); } else { - BerryCrush_RunOrScheduleCommand(BCCMD_FinishGame, 1, NULL); + RunOrScheduleCommand(CMD_FINISH_GAME, SCHEDULE_CMD, NULL); } - game->unk10 = 0; + game->cmdTimer = 0; game->cmdState = 0; return 0; } else { - ++game->unk26; - BerryCrush_ProcessGamePartnerInput(game); + ++game->leaderTimer; + HandlePartnerInput(game); BerryCrush_BuildLocalState(game); - BerryCrush_HandlePlayerInput(game); + HandlePlayerInput(game); return 0; } } -static u32 BerryCrushCommand_PlayGame_Slave(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_PlayGame_Member(struct BerryCrushGame * game, UNUSED u8 *args) { memset(&game->localState, 0, sizeof(game->localState)); memset(&game->recvCmd, 0, sizeof(game->recvCmd)); - BerryCrush_UpdateGameState(game); + RecvLinkData(game); SetGpuReg(REG_OFFSET_BG0VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG2VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG3VOFS, -game->vibration); - if (game->unk25_3) + if (game->endGame) { - if (game->timer >= 36000) + if (game->timer >= MAX_TIME) { - game->timer = 36000; - BerryCrush_RunOrScheduleCommand(BCCMD_HandleTimeUp, 1, NULL); + game->timer = MAX_TIME; + RunOrScheduleCommand(CMD_TIMES_UP, SCHEDULE_CMD, NULL); } else { - BerryCrush_RunOrScheduleCommand(BCCMD_FinishGame, 1, NULL); + RunOrScheduleCommand(CMD_FINISH_GAME, SCHEDULE_CMD, NULL); } - game->unk10 = 0; + game->cmdTimer = 0; game->cmdState = 0; return 0; } else { - BerryCrush_HandlePlayerInput(game); + HandlePlayerInput(game); return 0; } } -static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, UNUSED u8 *params) +// Game was 'won', crusher was pushed down fully before time was up +static u32 Cmd_FinishGame(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: - game->gameState = 8; + game->gameState = STATE_FINISHED; PlaySE(SE_M_STRENGTH); - BlendPalettes(0xFFFFFFFF, 8, RGB(31, 31, 0)); - game->spritesManager.animBerryIdx = 2; + BlendPalettes(PALETTES_ALL, 8, RGB(31, 31, 0)); + game->gfx.counter = 2; break; case 1: - if (--game->spritesManager.animBerryIdx != 255) + if (--game->gfx.counter != UINT8_MAX) return 0; - BlendPalettes(0xFFFFFFFF, 0, RGB(31, 31, 0)); - game->spritesManager.unk1 = 4; - game->spritesManager.animBerryIdx = 0; - game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0]; + BlendPalettes(PALETTES_ALL, 0, RGB(31, 31, 0)); + game->gfx.vibrationIdx = 4; + game->gfx.counter = 0; + game->gfx.numVibrations = sIntroOutroVibrationData[game->gfx.vibrationIdx][0]; break; case 2: - game->vibration = gUnknown_846E2F0[game->spritesManager.unk1][game->spritesManager.animBerryIdx]; + game->vibration = sIntroOutroVibrationData[game->gfx.vibrationIdx][game->gfx.counter]; SetGpuReg(REG_OFFSET_BG0VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG2VOFS, -game->vibration); SetGpuReg(REG_OFFSET_BG3VOFS, -game->vibration); - if (++game->spritesManager.animBerryIdx < game->spritesManager.unk2) + if (++game->gfx.counter < game->gfx.numVibrations) return 0; - if (game->spritesManager.unk1 != 0) + if (game->gfx.vibrationIdx != 0) { - --game->spritesManager.unk1; - game->spritesManager.unk2 = gUnknown_846E2F0[game->spritesManager.unk1][0]; - game->spritesManager.animBerryIdx = 0; + --game->gfx.vibrationIdx; + game->gfx.numVibrations = sIntroOutroVibrationData[game->gfx.vibrationIdx][0]; + game->gfx.counter = 0; return 0; } break; @@ -1714,16 +1926,16 @@ static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, UNUSED u8 SetGpuReg(REG_OFFSET_BG3VOFS, 0); break; case 4: - if (!sub_814DE50(game, &game->spritesManager)) + if (!AreEffectsFinished(game, &game->gfx)) return 0; - LinkRfu_SetRfuFuncToSend6600(); - game->unk10 = 0; + Rfu_SetLinkStandbyCallback(); + game->cmdTimer = 0; break; case 5: if (!IsLinkTaskFinished()) return 0; - BerryCrush_RunOrScheduleCommand(BCCMD_TabulateResults, 1, NULL); - game->unk10 = 0; + RunOrScheduleCommand(CMD_CALC_RESULTS, SCHEDULE_CMD, NULL); + game->cmdTimer = 0; game->cmdState = 0; return 0; } @@ -1731,27 +1943,27 @@ static u32 BerryCrushCommand_FinishGame(struct BerryCrushGame * game, UNUSED u8 return 0; } -static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_HandleTimeUp(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { case 0: - game->gameState = 9; + game->gameState = STATE_TIMES_UP; PlaySE(SE_FAILURE); - BlendPalettes(0xFFFFFFFF, 8, RGB(31, 0, 0)); - game->spritesManager.animBerryIdx = 4; + BlendPalettes(PALETTES_ALL, 8, RGB(31, 0, 0)); + game->gfx.counter = 4; break; case 1: - if (--game->spritesManager.animBerryIdx != 255) + if (--game->gfx.counter != UINT8_MAX) return 0; - BlendPalettes(0xFFFFFFFF, 0, RGB(31, 0, 0)); - game->spritesManager.animBerryIdx = 0; + BlendPalettes(PALETTES_ALL, 0, RGB(31, 0, 0)); + game->gfx.counter = 0; break; case 2: - if (!sub_814DE50(game, &game->spritesManager)) + if (!AreEffectsFinished(game, &game->gfx)) return 0; - LinkRfu_SetRfuFuncToSend6600(); - game->unk10 = 0; + Rfu_SetLinkStandbyCallback(); + game->cmdTimer = 0; SetGpuReg(REG_OFFSET_BG0VOFS, 0); SetGpuReg(REG_OFFSET_BG2VOFS, 0); SetGpuReg(REG_OFFSET_BG3VOFS, 0); @@ -1760,10 +1972,10 @@ static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *para if (!IsLinkTaskFinished()) return 0; ConvertIntToDecimalStringN(gStringVar1, game->powder, STR_CONV_MODE_LEFT_ALIGN, 6); - BerryCrush_SetShowMessageParams(params, BCTEXT_TIMEUP, 1, 0, 0); - game->nextCmd = BCCMD_SaveTheGame; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); - game->unk10 = 0; + SetPrintMessageArgs(args, MSG_TIMES_UP, F_MSG_CLEAR, 0, CMD_NONE); + game->nextCmd = CMD_SAVE; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); + game->cmdTimer = 0; game->cmdState = 0; return 0; } @@ -1771,116 +1983,136 @@ static u32 BerryCrushCommand_HandleTimeUp(struct BerryCrushGame * game, u8 *para return 0; } -static u32 BerryCrushCommand_TabulateResults(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_TabulateResults(struct BerryCrushGame * game, UNUSED u8 *args) { - u8 i, j, r3; - s32 r2; - s32 r4; - u16 r6; + u8 i, j, tempPlayerId; + s32 temp1, temp2; + u16 tempStat; switch (game->cmdState) { case 0: memset(game->sendCmd, 0, 2 * sizeof(u16)); - if (game->unk98[game->localId].unk1A > game->timer) - game->unk98[game->localId].unk1A = game->timer; - game->sendCmd[0] = game->unk98[game->localId].unk1A; + if (game->players[game->localId].timePressingA > game->timer) + game->players[game->localId].timePressingA = game->timer; + game->sendCmd[0] = game->players[game->localId].timePressingA; SendBlock(0, game->sendCmd, 2); break; case 1: if (!IsLinkTaskFinished()) return 0; - game->unk10 = 0; + game->cmdTimer = 0; break; case 2: if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[game->playerCount - 2]) return 0; for (i = 0; i < game->playerCount; ++i) - game->unk98[i].unk1A = gBlockRecvBuffer[i][0]; - game->unk10 = 0; + game->players[i].timePressingA = gBlockRecvBuffer[i][0]; + game->cmdTimer = 0; game->sendCmd[0] = 0; ResetBlockReceivedFlags(); + + // If player is not leader, skip the steps + // where the results are calculated and sent. + // Group members just read the results sent + // to them by the leader. if (game->localId == 0) game->cmdState = 3; else game->cmdState = 6; return 0; case 3: - memset(&game->unk68, 0, sizeof(struct BerryCrushGame_68)); - game->unk68.unk04 = game->timer; - game->unk68.unk06 = game->unk18 / (game->timer / 60); - // (unk30 * 50 / unk32) + 50 - r2 = MathUtil_Mul32(game->unk30 << 8, 50 << 8); - r2 = MathUtil_Div32(r2, game->unk32 << 8) + (50 << 8); - r2 >>= 8; - game->unk68.unk08 = r2 & 0x7F; - // powder + playerCount * (r2 / 100) - r2 <<= 8; - r2 = MathUtil_Div32(r2, 100 << 8); - r4 = (game->powder * game->playerCount) << 8; - r4 = MathUtil_Mul32(r4, r2); - game->unk68.unk00 = r4 >> 8; - game->unk68.unk20[0][7] = Random() % 3; + memset(&game->results, 0, sizeof(struct BerryCrushGame_Results)); + game->results.time = game->timer; + game->results.targetPressesPerSec = game->targetAPresses / (game->timer / 60); + + // Calculate silkiness + // Silkiness is the percentage of times big sparkles were produced when possible, + // which itself depends on the number of A presses every 30 frames + // (numBigSparkles * 50 / numBigSparkleChecks) + 50 + temp1 = Q_24_8_mul(Q_24_8(game->numBigSparkles), Q_24_8(50)); + temp1 = Q_24_8_div(temp1, Q_24_8(game->numBigSparkleChecks)) + Q_24_8(50); + temp1 = Q_24_8_TO_INT(temp1); + game->results.silkiness = temp1 & 0x7F; + + // Calculate amount of powder + temp1 = Q_24_8(temp1); + temp1 = Q_24_8_div(temp1, Q_24_8(100)); + temp2 = Q_24_8(game->powder * game->playerCount); + temp2 = Q_24_8_mul(temp2, temp1); + game->results.powder = Q_24_8_TO_INT(temp2); + + // Choose random second results page + game->results.randomPageId = Random() % NUM_RANDOM_RESULTS_PAGES; for (i = 0; i < game->playerCount; ++i) { - game->unk68.unk20[0][i] = i; - game->unk68.unk20[1][i] = i; - game->unk68.stats[0][i] = game->unk98[i].unk16; - game->unk68.unk0A += game->unk68.stats[0][i]; - switch (game->unk68.unk20[0][7]) + game->results.playerIdsRanked[0][i] = i; + game->results.playerIdsRanked[1][i] = i; + game->results.stats[RESULTS_PAGE_PRESSES][i] = game->players[i].numAPresses; + game->results.totalAPresses += game->results.stats[RESULTS_PAGE_PRESSES][i]; + + // Calculate value for random second results page + switch (game->results.randomPageId) { - case 0: - if (game->unk98[i].unk16 != 0) + case RESULTS_PAGE_NEATNESS: + if (game->players[i].numAPresses != 0) { - r2 = game->unk98[i].unk14; - r2 <<= 8; - r2 = MathUtil_Mul32(r2, 0x6400); - r4 = game->unk98[i].unk16; - r4 <<= 8; - r4 = MathUtil_Div32(r2, r4); + // Calculate percentage of inputs that were in largest "neat" streak + // "Neat" inputs are those done at a regular interval + temp1 = game->players[i].maxNeatInputStreak; + temp1 = Q_24_8(temp1); + temp1 = Q_24_8_mul(temp1, Q_24_8(100)); + temp2 = game->players[i].numAPresses; + temp2 = Q_24_8(temp2); + temp2 = Q_24_8_div(temp1, temp2); } else { - r4 = 0; + temp2 = 0; } break; - case 1: - if (game->unk98[i].unk16 != 0) + case RESULTS_PAGE_COOPERATIVE: + if (game->players[i].numAPresses != 0) { - r2 = game->unk98[i].unk18; - r2 <<= 8; - r2 = MathUtil_Mul32(r2, 0x6400); - r4 = game->unk98[i].unk16; - r4 <<= 8; - r4 = MathUtil_Div32(r2, r4); + // Calculate percentage of inputs that were + // done at the same time as another player + temp1 = game->players[i].numSyncedAPresses; + temp1 = Q_24_8(temp1); + temp1 = Q_24_8_mul(temp1, Q_24_8(100)); + temp2 = game->players[i].numAPresses; + temp2 = Q_24_8(temp2); + temp2 = Q_24_8_div(temp1, temp2); } else { - r4 = 0; + temp2 = 0; } break; - case 2: - if (game->unk98[i].unk16 == 0) + case RESULTS_PAGE_POWER: + if (game->players[i].numAPresses == 0) { - r4 = 0; + temp2 = 0; } - else if (game->unk98[i].unk1A >= game->timer) + else if (game->players[i].timePressingA >= game->timer) { - r4 = 0x6400; + // Spent 100% of the time pressing A + temp2 = Q_24_8(100); } else { - r2 = game->unk98[i].unk1A; - r2 <<= 8; - r2 = MathUtil_Mul32(r2, 0x6400); - r4 = game->timer; - r4 <<= 8; - r4 = MathUtil_Div32(r2, r4); + // Calculate percentage of time the + // player spent pressing A + temp1 = game->players[i].timePressingA; + temp1 = Q_24_8(temp1); + temp1 = Q_24_8_mul(temp1, Q_24_8(100)); + temp2 = game->timer; + temp2 = Q_24_8(temp2); + temp2 = Q_24_8_div(temp1, temp2); } break; } - r4 >>= 4; - game->unk68.stats[1][i] = r4; + temp2 >>= 4; + game->results.stats[RESULTS_PAGE_RANDOM][i] = temp2; } break; case 4: @@ -1888,78 +2120,70 @@ static u32 BerryCrushCommand_TabulateResults(struct BerryCrushGame * game, UNUSE { for (j = game->playerCount - 1; j > i; --j) { - if (game->unk68.stats[0][j - 1] < game->unk68.stats[0][j]) + if (game->results.stats[RESULTS_PAGE_PRESSES][j - 1] < game->results.stats[RESULTS_PAGE_PRESSES][j]) { - r6 = game->unk68.stats[0][j]; - game->unk68.stats[0][j] = game->unk68.stats[0][j - 1]; - game->unk68.stats[0][j - 1] = r6; - r3 = game->unk68.unk20[0][j]; - game->unk68.unk20[0][j] = game->unk68.unk20[0][j - 1]; - game->unk68.unk20[0][j - 1] = r3; + SWAP(game->results.stats[RESULTS_PAGE_PRESSES][j], game->results.stats[RESULTS_PAGE_PRESSES][j - 1], tempStat); + SWAP(game->results.playerIdsRanked[0][j], game->results.playerIdsRanked[0][j - 1], tempPlayerId); } - if (game->unk68.stats[1][j - 1] < game->unk68.stats[1][j]) + if (game->results.stats[RESULTS_PAGE_RANDOM][j - 1] < game->results.stats[RESULTS_PAGE_RANDOM][j]) { - r6 = game->unk68.stats[1][j]; - game->unk68.stats[1][j] = game->unk68.stats[1][j - 1]; - game->unk68.stats[1][j - 1] = r6; - r3 = game->unk68.unk20[1][j]; - game->unk68.unk20[1][j] = game->unk68.unk20[1][j - 1]; - game->unk68.unk20[1][j - 1] = r3; + SWAP(game->results.stats[RESULTS_PAGE_RANDOM][j], game->results.stats[RESULTS_PAGE_RANDOM][j - 1], tempStat); + SWAP(game->results.playerIdsRanked[1][j], game->results.playerIdsRanked[1][j - 1], tempPlayerId); } } } - SendBlock(0, &game->unk68, sizeof(struct BerryCrushGame_68)); + SendBlock(0, &game->results, sizeof(struct BerryCrushGame_Results)); break; case 5: if (!IsLinkTaskFinished()) return 0; - game->unk10 = 0; + game->cmdTimer = 0; break; case 6: if (GetBlockReceivedStatus() != 1) return 0; - memset(&game->unk68, 0, sizeof(struct BerryCrushGame_68)); - memcpy(&game->unk68, gBlockRecvBuffer, sizeof(struct BerryCrushGame_68)); + memset(&game->results, 0, sizeof(struct BerryCrushGame_Results)); + memcpy(&game->results, gBlockRecvBuffer, sizeof(struct BerryCrushGame_Results)); ResetBlockReceivedFlags(); - game->unk10 = 0; + game->cmdTimer = 0; break; case 7: - BerryCrush_UpdateSav2Records(); - BerryCrush_RunOrScheduleCommand(BCCMD_ShowResults, 1, NULL); - game->gameState = 11; + SaveResults(); + RunOrScheduleCommand(CMD_SHOW_RESULTS, SCHEDULE_CMD, NULL); + game->gameState = STATE_RESULTS_PRESSES; game->cmdState = 0; - game->unk24 = 0; + game->newDepth = 0; return 0; } ++game->cmdState; return 0; } -static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_ShowResults(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { case 0: - if (!sub_814E644(game, &game->spritesManager)) + if (!OpenResultsWindow(game, &game->gfx)) return 0; break; case 1: CopyBgTilemapBufferToVram(0); - game->spritesManager.animBerryIdx = 30; + game->gfx.counter = 30; break; case 2: - if (game->spritesManager.animBerryIdx != 0) + if (game->gfx.counter != 0) { - --game->spritesManager.animBerryIdx; + --game->gfx.counter; return 0; } if (!JOY_NEW(A_BUTTON)) return 0; PlaySE(SE_SELECT); - sub_814E80C(game); + CloseResultsWindow(game); break; case 3: - if (game->gameState <= 12) + if (game->gameState <= STATE_RESULTS_RANDOM) { ++game->gameState; game->cmdState = 0; @@ -1969,9 +2193,9 @@ static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame * game, u8 *param case 4: ConvertIntToDecimalStringN(gStringVar1, game->powder, STR_CONV_MODE_LEFT_ALIGN, 6); ConvertIntToDecimalStringN(gStringVar2, GetBerryPowder(), STR_CONV_MODE_LEFT_ALIGN, 6); - BerryCrush_SetShowMessageParams(params, BCTEXT_GAINEDPOWDER, 3, 0, 0); - game->nextCmd = BCCMD_SaveTheGame; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); + SetPrintMessageArgs(args, MSG_POWDER, F_MSG_CLEAR | F_MSG_EXPAND, 0, CMD_NONE); + game->nextCmd = CMD_SAVE; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); game->cmdState = 0; return 0; } @@ -1979,36 +2203,36 @@ static u32 BerryCrushCommand_ShowResults(struct BerryCrushGame * game, u8 *param return 0; } -static u32 BerryCrushCommand_SaveTheGame(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_SaveGame(struct BerryCrushGame * game, u8 *args) { switch (game->cmdState) { case 0: - if (game->timer >= 36000) - BerryCrush_HideTimerSprites(&game->spritesManager); - BerryCrush_SetShowMessageParams(params, BCTEXT_COMMSTANDBY, 0, 0, BCCMD_BeginNormalPaletteFade); - game->nextCmd = BCCMD_SaveTheGame; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); + if (game->timer >= MAX_TIME) + HideTimer(&game->gfx); + SetPrintMessageArgs(args, MSG_COMM_STANDBY, 0, 0, CMD_FADE); + game->nextCmd = CMD_SAVE; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); game->cmdState = 0; return 0; case 1: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 2: if (!IsLinkTaskFinished()) return 0; DrawDialogueFrame(0, FALSE); - AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY); CopyWindowToVram(0, COPYWIN_BOTH); - CreateTask(Task_SaveGame_UpdatedLinkRecords, 0); + CreateTask(Task_LinkSave, 0); break; case 3: - if (FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords)) + if (FuncIsActiveTask(Task_LinkSave)) return 0; break; case 4: - BerryCrush_RunOrScheduleCommand(BCCMD_AskPlayAgain, 1, NULL); - game->gameState = 15; + RunOrScheduleCommand(CMD_ASK_PLAY_AGAIN, SCHEDULE_CMD, NULL); + game->gameState = STATE_PLAY_AGAIN; game->cmdState = 0; return 0; } @@ -2016,41 +2240,41 @@ static u32 BerryCrushCommand_SaveTheGame(struct BerryCrushGame * game, u8 *param return 0; } -static u32 BerryCrushCommand_AskPlayAgain(struct BerryCrushGame * game, u8 *params) +static u32 Cmd_AskPlayAgain(struct BerryCrushGame * game, u8 *args) { - s8 r4 = 0; + s8 input = 0; switch (game->cmdState) { case 0: - BerryCrush_SetShowMessageParams(params, BCTEXT_ASKPLAYAGAIN, 0, 0, BCCMD_BeginNormalPaletteFade); - game->nextCmd = BCCMD_AskPlayAgain; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); - game->cmdState = 0; // dunno what it's doing because it's already in case 0 + SetPrintMessageArgs(args, MSG_PLAY_AGAIN, 0, 0, CMD_FADE); + game->nextCmd = CMD_ASK_PLAY_AGAIN; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); + game->cmdState = 0; // State is progressed by CMD_PRINT_MSG return 0; case 1: DisplayYesNoMenuDefaultYes(); break; case 2: - r4 = Menu_ProcessInputNoWrapClearOnChoose(); - if (r4 != -2) + input = Menu_ProcessInputNoWrapClearOnChoose(); + if (input != LIST_CANCEL) { memset(game->sendCmd, 0, sizeof(game->sendCmd)); - if (r4 == 0) + if (input == 0) { - if (CheckHasAtLeastOneBerry()) - game->unk14 = 0; + if (HasAtLeastOneBerry()) + game->playAgainState = PLAY_AGAIN_YES; else - game->unk14 = 3; + game->playAgainState = PLAY_AGAIN_NO_BERRIES; } else { - game->unk14 = 1; + game->playAgainState = PLAY_AGAIN_NO; } ClearDialogWindowAndFrame(0, TRUE); - BerryCrush_SetShowMessageParams(params, BCTEXT_COMMSTANDBY, 0, 0, 0); - game->nextCmd = BCCMD_CommunicatePlayAgainResponses; - BerryCrush_RunOrScheduleCommand(BCCMD_PrintMessage, 1, NULL); + SetPrintMessageArgs(args, MSG_COMM_STANDBY, 0, 0, CMD_NONE); + game->nextCmd = CMD_COMM_PLAY_AGAIN; + RunOrScheduleCommand(CMD_PRINT_MSG, SCHEDULE_CMD, NULL); game->cmdState = 0; } return 0; @@ -2059,40 +2283,46 @@ static u32 BerryCrushCommand_AskPlayAgain(struct BerryCrushGame * game, u8 *para return 0; } -static u32 BerryCrushCommand_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame * game, UNUSED u8 *args) { u8 i = 0; switch (game->cmdState) { case 0: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 1: if (!IsLinkTaskFinished()) return 0; - game->sendCmd[0] = game->unk14; + + // Send player's Yes/No response to partners + game->sendCmd[0] = game->playAgainState; game->recvCmd[0] = 0; SendBlock(0, game->sendCmd, sizeof(u16)); break; case 2: if (!IsLinkTaskFinished()) return 0; - game->unk10 = 0; + game->cmdTimer = 0; break; case 3: + // Wait for partners responses if (GetBlockReceivedStatus() != sReceivedPlayerBitmasks[game->playerCount - 2]) return 0; - for (; i < game->playerCount; ++i) + + // Read partners responses + for (i = 0; i < game->playerCount; ++i) game->recvCmd[0] += gBlockRecvBuffer[i][0]; - if (game->recvCmd[0] != 0) - BerryCrush_RunOrScheduleCommand(BCCMD_PlayAgainFailureMessage, 1, NULL); + + if (game->recvCmd[0] != PLAY_AGAIN_YES) + RunOrScheduleCommand(CMD_PLAY_AGAIN_NO, SCHEDULE_CMD, NULL); else - BerryCrush_RunOrScheduleCommand(BCCMD_FadeOutToPlayAgain, 1, NULL); + RunOrScheduleCommand(CMD_PLAY_AGAIN_YES, SCHEDULE_CMD, NULL); ResetBlockReceivedFlags(); game->sendCmd[0] = 0; game->recvCmd[0] = 0; - game->unk10 = 0; + game->cmdTimer = 0; game->cmdState = 0; return 0; } @@ -2100,12 +2330,12 @@ static u32 BerryCrushCommand_CommunicatePlayAgainResponses(struct BerryCrushGame return 0; } -static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_PlayAgain(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: - BeginNormalPaletteFade(0xFFFFFFFF, 1, 0, 0x10, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 1, 0, 0x10, RGB_BLACK); UpdatePaletteFade(); break; case 1: @@ -2114,15 +2344,15 @@ static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame * game, UN break; case 2: ClearDialogWindowAndFrame(0, TRUE); - sub_814DA04(game); - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); + ResetCrusherPos(game); + BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK); UpdatePaletteFade(); break; case 3: if (UpdatePaletteFade()) return 0; - BerryCrush_RunOrScheduleCommand(BCCMD_AskPickBerry, 1, NULL); - game->gameState = 3; + RunOrScheduleCommand(CMD_ASK_PICK_BERRY, SCHEDULE_CMD, NULL); + game->gameState = STATE_PICK_BERRY; game->cmdState = 0; return 0; } @@ -2130,29 +2360,29 @@ static u32 BerryCrushCommand_FadeOutToPlayAgain(struct BerryCrushGame * game, UN return 0; } -static u32 BerryCrushCommand_PlayAgainFailureMessage(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_StopGame(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: DrawDialogueFrame(0, FALSE); - if (game->unk14 == 3) - AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[BCTEXT_CANCEL_NOBERRIES], game->textSpeed, NULL, 2, 1, 3); + if (game->playAgainState == PLAY_AGAIN_NO_BERRIES) + AddTextPrinterParameterized2(0, 2, sMessages[MSG_NO_BERRIES], game->textSpeed, NULL, 2, 1, 3); else - AddTextPrinterParameterized2(0, 2, sBerryCrushMessages[BCTEXT_CANCEL_DROPPEDOUT], game->textSpeed, NULL, 2, 1, 3); + AddTextPrinterParameterized2(0, 2, sMessages[MSG_DROPPED], game->textSpeed, NULL, 2, 1, 3); CopyWindowToVram(0, COPYWIN_BOTH); break; case 1: if (IsTextPrinterActive(0)) return 0; - game->spritesManager.animBerryIdx = 120; + game->gfx.counter = 120; break; case 2: - if (game->spritesManager.animBerryIdx != 0) - --game->spritesManager.animBerryIdx; + if (game->gfx.counter != 0) + --game->gfx.counter; else { - BerryCrush_RunOrScheduleCommand(BCCMD_GracefulExit, 1, NULL); + RunOrScheduleCommand(CMD_CLOSE_LINK, SCHEDULE_CMD, NULL); game->cmdState = 0; } return 0; @@ -2161,12 +2391,12 @@ static u32 BerryCrushCommand_PlayAgainFailureMessage(struct BerryCrushGame * gam return 0; } -static u32 BerryCrushCommand_GracefulExit(struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_CloseLink(struct BerryCrushGame * game, UNUSED u8 *args) { switch (game->cmdState) { case 0: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 1: if (!IsLinkTaskFinished()) @@ -2176,86 +2406,88 @@ static u32 BerryCrushCommand_GracefulExit(struct BerryCrushGame * game, UNUSED u case 2: if (gReceivedRemoteLinkPlayers) return 0; - game->nextCmd = BCCMD_Quit; - BerryCrush_RunOrScheduleCommand(BCCMD_TeardownGfx, 1, NULL); - game->cmdState = 2; // ??? + game->nextCmd = CMD_QUIT; + RunOrScheduleCommand(CMD_HIDE_GAME, SCHEDULE_CMD, NULL); + game->cmdState = 2; // State is not progressed return 0; } ++game->cmdState; return 0; } -static u32 BerryCrushCommand_Quit(UNUSED struct BerryCrushGame * game, UNUSED u8 *params) +static u32 Cmd_Quit(UNUSED struct BerryCrushGame * game, UNUSED u8 *args) { - ExitBerryCrushWithCallback(NULL); + QuitBerryCrush(NULL); return 0; } -static void sub_814D4D8(struct BerryCrushGame * game) +static void ResetGame(struct BerryCrushGame * game) { - u8 r5 = 0; + u8 i = 0; IncrementGameStat(GAME_STAT_BERRY_CRUSH_POINTS); - game->unkD = 0; - game->unk10 = 0; - game->gameState = 2; - game->unk14 = 0; + game->unused = 0; + game->cmdTimer = 0; + game->gameState = STATE_RESET; + game->playAgainState = PLAY_AGAIN_YES; game->powder = 0; - game->unk18 = 0; - game->unk1A = 0; - game->unk20 = 0; - game->unk24 = 0; - game->unk25_0 = 0; - game->unk25_1 = 0; - game->unk25_2 = 0; - game->unk25_3 = FALSE; - game->unk25_4 = 0; - game->unk25_5 = 0; - game->unk26 = 0; + game->targetAPresses = 0; + game->totalAPresses = 0; + game->targetDepth = 0; + game->newDepth = 0; + game->noRoomForPowder = FALSE; + game->newRecord = FALSE; + game->playedSound = FALSE; + game->endGame = FALSE; + game->bigSparkle = FALSE; + game->sparkleAmount = 0; + game->leaderTimer = 0; game->timer = 0; - game->unk2E = 0; - game->unk32 = -1; - game->unk30 = 0; - game->unk34 = 0; - for (; r5 < 5; ++r5) + game->bigSparkleCounter = 0; + game->numBigSparkleChecks = -1; + game->numBigSparkles = 0; + game->sparkleCounter = 0; + for (i = 0; i < MAX_RFU_PLAYERS; ++i) { - game->unk98[r5].unkC = -1; - game->unk98[r5].unkE = 0; - game->unk98[r5].unk10 = 0; - game->unk98[r5].unk12 = 1; - game->unk98[r5].unk14 = 0; - game->unk98[r5].unk16 = 0; - game->unk98[r5].unk18 = 0; - game->unk98[r5].unk1A = 0; - game->unk98[r5].unk1B = 0; - game->unk98[r5].unk1C = 0; + game->players[i].berryId = -1; + game->players[i].inputTime = 0; + game->players[i].neatInputStreak = 0; + game->players[i].timeSincePrevInput = 1; + game->players[i].maxNeatInputStreak = 0; + game->players[i].numAPresses = 0; + game->players[i].numSyncedAPresses = 0; + game->players[i].timePressingA = 0; + game->players[i].inputFlags = 0; + game->players[i].inputState = INPUT_STATE_NONE; } } -void BerryCrush_SetPaletteFadeParams(u8 *params, bool8 communicateAfter, u32 selectedPals, s8 delay, u8 startY, u8 targetY, u16 palette) +static void SetPaletteFadeArgs(u8 *args, bool8 communicateAfter, u32 selectedPals, s8 delay, u8 startY, u8 targetY, u16 palette) { - params[0] = ((u8 *)&selectedPals)[0]; - params[1] = ((u8 *)&selectedPals)[1]; - params[2] = ((u8 *)&selectedPals)[2]; - params[3] = ((u8 *)&selectedPals)[3]; - params[4] = delay; - params[5] = startY; - params[6] = targetY; - params[7] = ((u8 *)&palette)[0]; - params[8] = ((u8 *)&palette)[1]; - params[9] = communicateAfter; + bSelectedPals(0) = ((u8 *)&selectedPals)[0]; + bSelectedPals(1) = ((u8 *)&selectedPals)[1]; + bSelectedPals(2) = ((u8 *)&selectedPals)[2]; + bSelectedPals(3) = ((u8 *)&selectedPals)[3]; + bDelay = delay; + bStartY = startY; + bTargetY = targetY; + bPalette(0) = ((u8 *)&palette)[0]; + bPalette(1) = ((u8 *)&palette)[1]; + bCommunicateAfter = communicateAfter; } -void BerryCrush_SetShowMessageParams(u8 *params, u8 stringId, u8 flags, u16 waitKeys, u8 followupCmd) +static void SetPrintMessageArgs(u8 *args, u8 stringId, u8 flags, u16 waitKeys, u8 followupCmd) { - params[0] = stringId; - params[1] = flags; - params[2] = ((u8 *)&waitKeys)[0]; - params[3] = ((u8 *)&waitKeys)[1]; - params[4] = followupCmd; + bMsgId = stringId; + bFlags = flags; + bKeys(0) = ((u8 *)&waitKeys)[0]; + bKeys(1) = ((u8 *)&waitKeys)[1]; + bNextCmdState = followupCmd; } -int BerryCrush_InitBgs(void) +// GF file break + +static s32 ShowGameDisplay(void) { struct BerryCrushGame * game = GetBerryCrushGame(); if (game == NULL) @@ -2283,9 +2515,9 @@ int BerryCrush_InitBgs(void) case 3: ResetBgsAndClearDma3BusyFlags(FALSE); InitBgsFromTemplates(0, sBgTemplates, NELEMS(sBgTemplates)); - SetBgTilemapBuffer(1, game->spritesManager.bgBuffers[0]); - SetBgTilemapBuffer(2, game->spritesManager.bgBuffers[2]); - SetBgTilemapBuffer(3, game->spritesManager.bgBuffers[3]); + SetBgTilemapBuffer(1, game->gfx.bgBuffers[0]); + SetBgTilemapBuffer(2, game->gfx.bgBuffers[2]); + SetBgTilemapBuffer(3, game->gfx.bgBuffers[3]); ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); ChangeBgX(2, 0, 0); @@ -2306,24 +2538,24 @@ int BerryCrush_InitBgs(void) CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); - DecompressAndCopyTileDataToVram(1, gUnknown_8EAFFC0, 0, 0, 0); + DecompressAndCopyTileDataToVram(1, gBerryCrush_Crusher_Gfx, 0, 0, 0); break; case 6: if (FreeTempTileDataBuffersIfPossible()) return 0; InitStandardTextBoxWindows(); - ResetBg0(); - sub_814EB38(game); - sub_814EBB0(game); + InitTextBoxGfxAndPrinters(); + CreatePlayerNameWindows(game); + DrawPlayerNameWindows(game); gPaletteFade.bufferTransferDisabled = TRUE; break; case 7: - LoadPalette(gUnknown_8EAFEA0, 0, 0x180); - CopyToBgTilemapBuffer(1, gBerryCrushGrinderTopTilemap, 0, 0); - CopyToBgTilemapBuffer(2, gBerryCrushContainerCapTilemap, 0, 0); - CopyToBgTilemapBuffer(3, gBerryCrushBackgroundTilemap, 0, 0); - sub_814EC80(game); + LoadPalette(gBerryCrush_Crusher_Pal, 0, 0x180); + CopyToBgTilemapBuffer(1, sCrusherTop_Tilemap, 0, 0); + CopyToBgTilemapBuffer(2, sContainerCap_Tilemap, 0, 0); + CopyToBgTilemapBuffer(3, sBg_Tilemap, 0, 0); + CopyPlayerNameWindowGfxToBg(game); CopyBgTilemapBufferToVram(1); CopyBgTilemapBufferToVram(2); CopyBgTilemapBufferToVram(3); @@ -2331,14 +2563,14 @@ int BerryCrush_InitBgs(void) case 8: LoadWirelessStatusIndicatorSpriteGfx(); CreateWirelessStatusIndicatorSprite(0, 0); - sub_814ECE0(game); + CreateGameSprites(game); SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY); ChangeBgX(1, 0, 0); ChangeBgY(1, 0, 0); break; case 9: gPaletteFade.bufferTransferDisabled = FALSE; - BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK); + BlendPalettes(PALETTES_ALL, 16, RGB_BLACK); ShowBg(0); ShowBg(1); ShowBg(2); @@ -2353,16 +2585,16 @@ int BerryCrush_InitBgs(void) return 0; } -int BerryCrush_TeardownBgs(void) +static s32 HideGameDisplay(void) { - struct BerryCrushGame * var0 = GetBerryCrushGame(); - if (!var0) + struct BerryCrushGame * game = GetBerryCrushGame(); + if (!game) return -1; - switch (var0->cmdState) + switch (game->cmdState) { case 0: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); break; case 1: if (!IsLinkTaskFinished()) @@ -2370,7 +2602,7 @@ int BerryCrush_TeardownBgs(void) // fall through. The original author forgot to use "break" here // because this will call BeginNormalPaletteFade() twice. case 2: - BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); + BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK); UpdatePaletteFade(); break; case 3: @@ -2401,47 +2633,62 @@ int BerryCrush_TeardownBgs(void) break; case 6: DestroyWirelessStatusIndicatorSprite(); - sub_814EF10(var0); - DigitObjUtil_Teardown(); + DestroyGameSprites(game); + DigitObjUtil_Free(); break; case 7: - var0->cmdState = 0; + game->cmdState = 0; return 1; } - var0->cmdState++; + game->cmdState++; return 0; } -int sub_814D9CC(struct BerryCrushGame * game) +static s32 UpdateGame(struct BerryCrushGame * game) { gSpriteCoordOffsetY = game->depth + game->vibration; SetGpuReg(REG_OFFSET_BG1VOFS, -gSpriteCoordOffsetY); - if (game->gameState == 7) + if (game->gameState == STATE_PLAYING) { - BerryCrush_PrintTimeOnSprites(&game->spritesManager, game->timer); + PrintTimer(&game->gfx, game->timer); } return 0; } -void sub_814DA04(struct BerryCrushGame * game) +static void ResetCrusherPos(struct BerryCrushGame * game) { - game->depth = -104; + game->depth = CRUSHER_START_Y; game->vibration = 0; gSpriteCoordOffsetX = 0; - gSpriteCoordOffsetY = -104; -} - -void BerryCrush_CreateBerrySprites(struct BerryCrushGame * game, struct BerryCrushGame_138 * spritesManager) + gSpriteCoordOffsetY = CRUSHER_START_Y; +} + +// Sprite data for berry sprites. Identical to fields for sparkle sprites +#define sX data[0] +#define sYSpeed data[1] +#define sYAccel data[2] +#define sXSpeed data[3] +#define sSinIdx data[4] +#define sSinSpeed data[5] +#define sAmplitude data[6] +// The last element (data[7]) is a bitfield. +// The first 15 bits are the y coord to stop at. +// The last bit is a flag for whether or not to move horizontally too +#define sBitfield data[7] +#define MASK_TARGET_Y 0x7FFF +#define F_MOVE_HORIZ 0x8000 + +static void CreateBerrySprites(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * spritesManager) { u8 i; u8 spriteId; - s16 var0, var1; + s16 distance, var1; s16 *data; - int var3; - s16 var5; - u32 var6; + s32 amplitude; + s16 speed; + u32 var2; for (i = 0; i < game->playerCount; i++) { @@ -2449,58 +2696,58 @@ void BerryCrush_CreateBerrySprites(struct BerryCrushGame * game, struct BerryCru &sSpriteTemplate_PlayerBerry, sPlayerBerrySpriteTags[i], sPlayerBerrySpriteTags[i], - game->unk98[i].unkC + FIRST_BERRY_INDEX); + game->players[i].berryId + FIRST_BERRY_INDEX); spritesManager->berrySprites[i] = &gSprites[spriteId]; spritesManager->berrySprites[i]->oam.priority = 3; spritesManager->berrySprites[i]->affineAnimPaused = TRUE; - spritesManager->berrySprites[i]->pos1.x = spritesManager->seatCoords[i]->unk8 + 120; + spritesManager->berrySprites[i]->pos1.x = spritesManager->playerCoords[i]->berryXOffset + 120; spritesManager->berrySprites[i]->pos1.y = -16; data = spritesManager->berrySprites[i]->data; - var5 = 512; - data[1] = var5; - data[2] = 32; - data[7] = 112; - var0 = spritesManager->seatCoords[i]->unkA - spritesManager->seatCoords[i]->unk8; - var3 = var0; - if (var0 < 0) - var3 += 3; - - data[6] = var3 >> 2; - var0 *= 128; - var6 = var5 + 32; - var6 = var6 / 2; - var1 = MathUtil_Div16Shift(7, 0x3F80, var6); - data[0] = (u16)spritesManager->berrySprites[i]->pos1.x * 128; - data[3] = MathUtil_Div16Shift(7, var0, var1); - var1 = MathUtil_Mul16Shift(7, var1, 85); - data[4] = 0; - data[5] = MathUtil_Div16Shift(7, 0x3F80, var1); - data[7] |= 0x8000; - if (spritesManager->seatCoords[i]->unk8 < 0) + speed = Q_8_8(2.0); + sYSpeed = speed; + sYAccel = Q_8_8(0.125); + sBitfield = 112; // Setting bits in MASK_TARGET_Y + distance = spritesManager->playerCoords[i]->berryXDest - spritesManager->playerCoords[i]->berryXOffset; + amplitude = distance; + if (distance < 0) + amplitude += 3; + + sAmplitude = amplitude >> 2; + distance = Q_N_S(7, distance); + var2 = speed + Q_8_8(0.125); + var2 = var2 / 2; // go from Q8.8 to Q9.7 + var1 = Q_N_S_div(7, Q_N_S(7, 127), var2); + sX = Q_N_S(7, (u16)spritesManager->berrySprites[i]->pos1.x); + sXSpeed = Q_N_S_div(7, distance, var1); + var1 = Q_N_S_mul(7, var1, Q_N_S(7, 0.666666667)); + sSinIdx = 0; + sSinSpeed = Q_N_S_div(7, Q_N_S(7, 127), var1); + sBitfield |= F_MOVE_HORIZ; + if (spritesManager->playerCoords[i]->berryXOffset < 0) StartSpriteAffineAnim(spritesManager->berrySprites[i], 1); } } -void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite) +static void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite) { s16 *data = sprite->data; - data[1] += data[2]; - sprite->pos2.y += data[1] >> 8; - if (data[7] & 0x8000) + sYSpeed += sYAccel; + sprite->pos2.y += Q_8_8_TO_INT(sYSpeed); + if (sBitfield & F_MOVE_HORIZ) { - sprite->data[0] += data[3]; - data[4] += data[5]; - sprite->pos2.x = Sin(data[4] >> 7, data[6]); - if ((data[7] & 0x8000) && (data[4] >> 7) > 126) + sprite->sX += sXSpeed; + sSinIdx += sSinSpeed; + sprite->pos2.x = Sin(Q_N_S_TO_INT(7, sSinIdx), sAmplitude); + if ((sBitfield & F_MOVE_HORIZ) && Q_N_S_TO_INT(7, sSinIdx) > 126) { sprite->pos2.x = 0; - data[7] &= 0x7FFF; + sBitfield &= MASK_TARGET_Y; } } - sprite->pos1.x = data[0] >> 7; - if (sprite->pos1.y + sprite->pos2.y >= (data[7] & 0x7FFF)) + sprite->pos1.x = Q_N_S_TO_INT(7, sX); + if (sprite->pos1.y + sprite->pos2.y >= (sBitfield & MASK_TARGET_Y)) { sprite->callback = SpriteCallbackDummy; FreeSpriteOamMatrix(sprite); @@ -2508,127 +2755,143 @@ void SpriteCB_DropBerryIntoCrusher(struct Sprite * sprite) } } -void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame * arg0, UNUSED struct BerryCrushGame_138 * arg1) +#undef sX +#undef sYSpeed +#undef sYAccel +#undef sXSpeed +#undef sSinIdx +#undef sSinSpeed +#undef sAmplitude +#undef sBitfield +#undef MASK_TARGET_Y +#undef F_MOVE_HORIZ + +static void BerryCrushFreeBerrySpriteGfx(struct BerryCrushGame * game, UNUSED struct BerryCrushGame_Gfx * gfx) { u8 i; - for (i = 0; i < arg0->playerCount; i++) + for (i = 0; i < game->playerCount; i++) { FreeSpritePaletteByTag(sPlayerBerrySpriteTags[i]); FreeSpriteTilesByTag(sPlayerBerrySpriteTags[i]); } } -void sub_814DC5C(struct BerryCrushGame * game, struct BerryCrushGame_138 * manager) +static void UpdateInputEffects(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * gfx) { - u8 sp4; - struct BerryCrushGame_4E * var4E; + u8 numPlayersPressed; + struct BerryCrushGame_LinkState * linkState; u8 i; - u16 var, var2; + u16 temp1, xModifier; - sp4 = 0; - var4E = (struct BerryCrushGame_4E *)&game->recvCmd; + numPlayersPressed = 0; + linkState = (struct BerryCrushGame_LinkState *)&game->recvCmd; for (i = 0; i < game->playerCount; i++) { - var = var4E->unkA >> (i * 3); - var &= 7; - if (var) +#define flags temp1 + flags = linkState->inputFlags >> (i * INPUT_FLAGS_PER_PLAYER); + flags &= INPUT_FLAG_MASK; + if (flags) { - sp4++; - if (var & 0x4) - StartSpriteAnim(manager->impactSprites[i], 1); + numPlayersPressed++; + if (flags & F_INPUT_HIT_SYNC) + StartSpriteAnim(gfx->impactSprites[i], 1); else - StartSpriteAnim(manager->impactSprites[i], 0); + StartSpriteAnim(gfx->impactSprites[i], 0); - manager->impactSprites[i]->invisible = FALSE; - manager->impactSprites[i]->animPaused = FALSE; - manager->impactSprites[i]->pos2.x = gUnknown_846F2D0[(var % 4) - 1][0]; - manager->impactSprites[i]->pos2.y = gUnknown_846F2D0[(var % 4) - 1][1]; + gfx->impactSprites[i]->invisible = FALSE; + gfx->impactSprites[i]->animPaused = FALSE; + gfx->impactSprites[i]->pos2.x = sImpactCoords[(flags % (NELEMS(sImpactCoords) + 1)) - 1][0]; + gfx->impactSprites[i]->pos2.y = sImpactCoords[(flags % (NELEMS(sImpactCoords) + 1)) - 1][1]; +#undef flags } } - if (sp4 == 0) + if (numPlayersPressed == 0) { - game->unk25_2 = 0; + game->playedSound = FALSE; } else { - var = (u8)(game->timer % 3); - var2 = var; - for (i = 0; i < var4E->unkC * 2 + 3; i++) +#define yModifier temp1 + yModifier = (u8)(game->timer % 3); + xModifier = yModifier; + for (i = 0; i < linkState->sparkleAmount * 2 + 3; i++) { - if (manager->sparkleSprites[i]->invisible) + if (gfx->sparkleSprites[i]->invisible) { - manager->sparkleSprites[i]->callback = sub_814F0D8; - manager->sparkleSprites[i]->pos1.x = gUnknown_846F2D6[i][0] + 120; - manager->sparkleSprites[i]->pos1.y = gUnknown_846F2D6[i][1] + 136 - (var * 4); - manager->sparkleSprites[i]->pos2.x = gUnknown_846F2D6[i][0] + (gUnknown_846F2D6[i][0] / (var2 * 4)); - manager->sparkleSprites[i]->pos2.y = gUnknown_846F2D6[i][1]; - if (var4E->unk4_1) - StartSpriteAnim(manager->sparkleSprites[i], 1); + gfx->sparkleSprites[i]->callback = SpriteCB_Sparkle_Init; + gfx->sparkleSprites[i]->pos1.x = sSparkleCoords[i][0] + 120; + gfx->sparkleSprites[i]->pos1.y = sSparkleCoords[i][1] + 136 - (yModifier * 4); + gfx->sparkleSprites[i]->pos2.x = sSparkleCoords[i][0] + (sSparkleCoords[i][0] / (xModifier * 4)); + gfx->sparkleSprites[i]->pos2.y = sSparkleCoords[i][1]; + if (linkState->bigSparkle) + StartSpriteAnim(gfx->sparkleSprites[i], 1); else - StartSpriteAnim(manager->sparkleSprites[i], 0); + StartSpriteAnim(gfx->sparkleSprites[i], 0); - var++; - if (var > 3) - var = 0; + yModifier++; + if (yModifier > 3) + yModifier = 0; } } - if (game->unk25_2) +#undef yModifier + + if (game->playedSound) { - game->unk25_2 = 0; + game->playedSound = FALSE; } else { - if (sp4 == 1) + if (numPlayersPressed == 1) PlaySE(SE_MUD_BALL); else PlaySE(SE_BREAKABLE_DOOR); - game->unk25_2 = 1; + game->playedSound = TRUE; } } } -bool32 sub_814DE50(struct BerryCrushGame * arg0, struct BerryCrushGame_138 * arg1) +static bool32 AreEffectsFinished(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * gfx) { u8 i; - for (i = 0; i < arg0->playerCount; i++) + for (i = 0; i < game->playerCount; i++) { - if (!arg1->impactSprites[i]->invisible) + if (!gfx->impactSprites[i]->invisible) return FALSE; } - for (i = 0; i < 11; i++) + for (i = 0; i < NELEMS(gfx->sparkleSprites); i++) { - if (!arg1->sparkleSprites[i]->invisible) + if (!gfx->sparkleSprites[i]->invisible) return FALSE; } - if (arg0->vibration != 0) - arg0->vibration = 0; + if (game->vibration != 0) + game->vibration = 0; return TRUE; } -static void FramesToMinSec(struct BerryCrushGame_138 * manager, u16 frames) +static void FramesToMinSec(struct BerryCrushGame_Gfx * gfx, u16 frames) { u8 i = 0; u32 fractionalFrames = 0; - s16 r3 = 0; + s16 frac_secs = 0; - manager->minutes = frames / 3600; - manager->secondsInt = (frames % 3600) / 60; - r3 = MathUtil_Mul16((frames % 60) << 8, 4); + gfx->minutes = frames / 3600; + gfx->secondsInt = (frames % 3600) / 60; + frac_secs = Q_8_8_mul(Q_8_8(frames % 60), Q_8_8(0.016666667)); for (i = 0; i < 8; i++) { - if ((r3 >> (7 - i)) & 1) + if ((frac_secs >> (7 - i)) & 1) fractionalFrames += sPressingSpeedConversionTable[i]; } - manager->secondsFrac = fractionalFrames / 1000000; + gfx->secondsFrac = fractionalFrames / 1000000; } static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string) @@ -2637,7 +2900,7 @@ static void PrintTextCentered(u8 windowId, u8 left, u8 colorId, const u8 *string AddTextPrinterParameterized3(windowId, 2, left, 0, sBerryCrushTextColorTable[colorId], 0, string); } -static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command, u8 x, u8 y) +static void PrintResultsText(struct BerryCrushGame * game, u8 command, u8 x, u8 y) { u8 i = 0; u8 linkPlayerId = 0; @@ -2645,27 +2908,27 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command u8 j; s32 score; u8 realX; - struct BerryCrushGame_68 * bcPlayers = &game->unk68; + struct BerryCrushGame_Results * bcPlayers = &game->results; s32 realX2; - for (; i < game->playerCount; i++) + for (i = 0; i < game->playerCount; i++) { DynamicPlaceholderTextUtil_Reset(); switch (command) { - case 0: + case RESULTS_PAGE_PRESSES: // Number of presses - linkPlayerId = bcPlayers->unk20[command][i]; + linkPlayerId = bcPlayers->playerIdsRanked[command][i]; if (i != 0 && bcPlayers->stats[command][i] != bcPlayers->stats[command][i - 1]) linkIdToPrint = i; ConvertIntToDecimalStringN(gStringVar1, bcPlayers->stats[command][i], STR_CONV_MODE_RIGHT_ALIGN, 4); realX = x - GetStringWidth(2, sBCRankingHeaders[command], -1) - 4; - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, realX, y + 14 * i, sBerryCrushTextColorTable[0], 0, sBCRankingHeaders[command]); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar1); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, sBCRankingHeaders[command]); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX - 24, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar1); break; - case 1: + case RESULTS_PAGE_RANDOM: // Neatness - linkPlayerId = bcPlayers->unk20[command][i]; + linkPlayerId = bcPlayers->playerIdsRanked[command][i]; if (i != 0 && bcPlayers->stats[command][i] != bcPlayers->stats[command][i - 1]) linkIdToPrint = i; ConvertIntToDecimalStringN(gStringVar1, bcPlayers->stats[command][i] >> 4, STR_CONV_MODE_RIGHT_ALIGN, 3); @@ -2680,18 +2943,18 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command ConvertIntToDecimalStringN(gStringVar2, realX, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); realX2 = x - 4; - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, realX2 - GetStringWidth(2, gStringVar4, 0), y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); break; - case 2: + case RESULTS_PAGE_CRUSHING: // Berry names linkPlayerId = i; linkIdToPrint = i; - j = game->unk98[i].unkC; + j = game->players[i].berryId; if (j >= LAST_BERRY_INDEX - FIRST_BERRY_INDEX + 2) j = 0; StringCopy(gStringVar1, gBerries[j].name); StringExpandPlaceholders(gStringVar4, sBCRankingHeaders[command]); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x - GetStringWidth(2, gStringVar4, -1) - 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); break; } if (linkPlayerId == game->localId) @@ -2699,45 +2962,45 @@ static void PrintBerryCrushResultWindow(struct BerryCrushGame * game, u8 command else StringCopy(gStringVar3, gText_1_Dynamic0); gStringVar3[0] = linkIdToPrint + CHAR_1; - DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->unk98[linkPlayerId].unk0); + DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, game->players[linkPlayerId].name); DynamicPlaceholderTextUtil_ExpandPlaceholders(gStringVar4, gStringVar3); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 4, y + 14 * i, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 4, y + 14 * i, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); } } -static void sub_814E32C(struct BerryCrushGame * game) +static void printCrushingResults(struct BerryCrushGame * game) { u8 i = 0; u8 x = 0; u32 score = 0; - struct BerryCrushGame_68 *players = &game->unk68; - u8 y = GetWindowAttribute(game->spritesManager.unk82, WINDOW_HEIGHT) * 8 - 42; + struct BerryCrushGame_Results *players = &game->results; + u8 y = GetWindowAttribute(game->gfx.resultsWindowId, WINDOW_HEIGHT) * 8 - 42; - FramesToMinSec(&game->spritesManager, players->unk04); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_TimeColon); + FramesToMinSec(&game->gfx, players->time); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimeColon); x = 190 - (u8)GetStringWidth(2, gText_SpaceSec, 0); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gText_SpaceSec); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceSec); x -= 32; - ConvertIntToDecimalStringN(gStringVar1, game->spritesManager.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); - ConvertIntToDecimalStringN(gStringVar2, game->spritesManager.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); + ConvertIntToDecimalStringN(gStringVar1, game->gfx.secondsInt, STR_CONV_MODE_LEADING_ZEROS, 2); + ConvertIntToDecimalStringN(gStringVar2, game->gfx.secondsFrac, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_XDotY2); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); x -= (u8)GetStringWidth(2, gText_SpaceMin, 0) + 3; - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gText_SpaceMin); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_SpaceMin); x -= 9; - ConvertIntToDecimalStringN(gStringVar1, game->spritesManager.minutes, STR_CONV_MODE_LEADING_ZEROS, 1); + ConvertIntToDecimalStringN(gStringVar1, game->gfx.minutes, STR_CONV_MODE_LEADING_ZEROS, 1); StringExpandPlaceholders(gStringVar4, gText_StrVar1); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); y += 14; - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_PressingSpeed); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed); x = 190 - (u8)GetStringWidth(2, gText_TimesPerSec, 0); - AddTextPrinterParameterized3(game->spritesManager.unk82, 3, x, y, sBerryCrushTextColorTable[0], 0, gText_TimesPerSec); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 3, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec); for (i = 0; i < 8; ++i) if (((u8)game->pressingSpeed >> (7 - i)) & 1) @@ -2746,84 +3009,89 @@ static void sub_814E32C(struct BerryCrushGame * game) ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); StringExpandPlaceholders(gStringVar4, gText_XDotY3); x -= 38; - if (game->unk25_1) - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[5], 0, gStringVar4); + if (game->newRecord) + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_RED], 0, gStringVar4); else - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); y += 14; - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, 2, y, sBerryCrushTextColorTable[0], 0, gText_Silkiness); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 2, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gText_Silkiness); - ConvertIntToDecimalStringN(gStringVar1, players->unk08, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, players->silkiness, STR_CONV_MODE_RIGHT_ALIGN, 3); StringExpandPlaceholders(gStringVar4, gText_Var1Percent); x = 190 - (u8)GetStringWidth(2, gStringVar4, 0); - AddTextPrinterParameterized3(game->spritesManager.unk82, 2, x, y, sBerryCrushTextColorTable[0], 0, gStringVar4); + AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4); } -bool32 sub_814E644(struct BerryCrushGame * game, struct BerryCrushGame_138 * spriteManager) +static bool32 OpenResultsWindow(struct BerryCrushGame * game, struct BerryCrushGame_Gfx * spriteManager) { u8 playerCountMinus2; struct WindowTemplate template; - switch (spriteManager->unk80) + switch (spriteManager->resultsState) { case 0: playerCountMinus2 = game->playerCount - 2; - BerryCrush_HideTimerSprites(spriteManager); - memcpy(&template, &gUnknown_846E428[game->gameState - 11], sizeof(struct WindowTemplate)); - if (game->gameState == 13) - template.height = gUnknown_846E448[1][playerCountMinus2]; + HideTimer(spriteManager); +// template = sWindowTemplates_Results[game->gameState - STATE_RESULTS_PRESSES]; + memcpy(&template, &sWindowTemplates_Results[game->gameState - STATE_RESULTS_PRESSES], sizeof(struct WindowTemplate)); + if (game->gameState == STATE_RESULTS_CRUSHING) + template.height = sResultsWindowHeights[1][playerCountMinus2]; else - template.height = gUnknown_846E448[0][playerCountMinus2]; - spriteManager->unk82 = AddWindow(&template); + template.height = sResultsWindowHeights[0][playerCountMinus2]; + spriteManager->resultsWindowId = AddWindow(&template); break; case 1: - PutWindowTilemap(spriteManager->unk82); - FillWindowPixelBuffer(spriteManager->unk82, PIXEL_FILL(0)); + PutWindowTilemap(spriteManager->resultsWindowId); + FillWindowPixelBuffer(spriteManager->resultsWindowId, PIXEL_FILL(0)); break; case 2: - TextWindow_SetStdFrame0_WithPal(spriteManager->unk82, 0x21D, 0xD0); - DrawStdFrameWithCustomTileAndPalette(spriteManager->unk82, FALSE, 541, 13); + TextWindow_SetStdFrame0_WithPal(spriteManager->resultsWindowId, 0x21D, 0xD0); + DrawStdFrameWithCustomTileAndPalette(spriteManager->resultsWindowId, FALSE, 541, 13); break; case 3: playerCountMinus2 = game->playerCount - 2; switch (game->gameState) { - case 11: - PrintTextCentered(spriteManager->unk82, 22, 3, gText_PressesRankings); - PrintBerryCrushResultWindow(game, 0, 0xB0, 8 * gUnknown_846E448[0][playerCountMinus2] - game->playerCount * 14); - spriteManager->unk80 = 5; + case STATE_RESULTS_PRESSES: + PrintTextCentered(spriteManager->resultsWindowId, 22, COLORID_BLUE, gText_PressesRankings); + PrintResultsText(game, RESULTS_PAGE_PRESSES, 0xB0, 8 * sResultsWindowHeights[0][playerCountMinus2] - game->playerCount * 14); + spriteManager->resultsState = 5; return FALSE; - case 12: - PrintTextCentered(spriteManager->unk82, 22, 4, sBCRankingHeaders[game->unk68.unk20[0][7] + 3]); - PrintBerryCrushResultWindow(game, 1, 0xB0, 8 * gUnknown_846E448[0][playerCountMinus2] - game->playerCount * 14); - spriteManager->unk80 = 5; + case STATE_RESULTS_RANDOM: + PrintTextCentered(spriteManager->resultsWindowId, 22, COLORID_GREEN, sBCRankingHeaders[game->results.randomPageId + 3]); + PrintResultsText(game, RESULTS_PAGE_RANDOM, 0xB0, 8 * sResultsWindowHeights[0][playerCountMinus2] - game->playerCount * 14); + spriteManager->resultsState = 5; return FALSE; - case 13: - PrintTextCentered(spriteManager->unk82, 24, 3, gText_CrushingResults); - PrintBerryCrushResultWindow(game, 2, 0xC0, 0x10); + case STATE_RESULTS_CRUSHING: + PrintTextCentered(spriteManager->resultsWindowId, 24, COLORID_BLUE, gText_CrushingResults); + PrintResultsText(game, RESULTS_PAGE_CRUSHING, 0xC0, 0x10); break; } break; case 4: - sub_814E32C(game); + printCrushingResults(game); break; case 5: - CopyWindowToVram(spriteManager->unk82, COPYWIN_BOTH); - spriteManager->unk80 = 0; + CopyWindowToVram(spriteManager->resultsWindowId, COPYWIN_BOTH); + spriteManager->resultsState = 0; return TRUE; } - ++spriteManager->unk80; + ++spriteManager->resultsState; return FALSE; } -void sub_814E80C(struct BerryCrushGame * game) +static void CloseResultsWindow(struct BerryCrushGame * game) { - ClearStdWindowAndFrameToTransparent(game->spritesManager.unk82, 1); - RemoveWindow(game->spritesManager.unk82); - sub_814EBB0(game); + ClearStdWindowAndFrameToTransparent(game->gfx.resultsWindowId, TRUE); + RemoveWindow(game->gfx.resultsWindowId); + DrawPlayerNameWindows(game); } +#define tState data[0] +#define tWindowId data[1] +#define tPressingSpeeds(i) data[2 + (i)] // data[2]-[5], for different group sizes + static void Task_ShowBerryCrushRankings(u8 taskId) { u8 i = 0, j, xPos, yPos; @@ -2831,33 +3099,33 @@ static void Task_ShowBerryCrushRankings(u8 taskId) s16 *data = gTasks[taskId].data; u8 *str; - switch (data[0]) + switch (tState) { case 0: - data[1] = AddWindow(&sWindowTemplate_BerryCrushRankings); - PutWindowTilemap(data[1]); - FillWindowPixelBuffer(data[1], PIXEL_FILL(0)); - TextWindow_SetStdFrame0_WithPal(data[1], 0x21D, 0xD0); - DrawStdFrameWithCustomTileAndPalette(data[1], 0, 0x21D, 0xD); + tWindowId = AddWindow(&sWindowTemplate_BerryCrushRankings); + PutWindowTilemap(tWindowId); + FillWindowPixelBuffer(tWindowId, PIXEL_FILL(0)); + TextWindow_SetStdFrame0_WithPal(tWindowId, 0x21D, 0xD0); + DrawStdFrameWithCustomTileAndPalette(tWindowId, 0, 0x21D, 0xD); break; case 1: xPos = 96 - GetStringWidth(2, gText_BerryCrush2, -1) / 2u; AddTextPrinterParameterized3( - data[1], + tWindowId, 2, xPos, 2, - sBerryCrushTextColorTable[3], + sBerryCrushTextColorTable[COLORID_BLUE], 0, gText_BerryCrush2 ); xPos = 96 - GetStringWidth(2, gText_PressingSpeedRankings, -1) / 2u; AddTextPrinterParameterized3( - data[1], + tWindowId, 2, xPos, 18, - sBerryCrushTextColorTable[3], + sBerryCrushTextColorTable[COLORID_BLUE], 0, gText_PressingSpeedRankings ); @@ -2867,55 +3135,55 @@ static void Task_ShowBerryCrushRankings(u8 taskId) ConvertIntToDecimalStringN(gStringVar1, i + 2, STR_CONV_MODE_LEFT_ALIGN, 1); StringExpandPlaceholders(gStringVar4, gText_Var1Players); AddTextPrinterParameterized3( - data[1], + tWindowId, 2, 4, yPos, - sBerryCrushTextColorTable[0], + sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4 ); for (j = 0; j < 8; ++j) { - if (((data[i + 2] & 0xFF) >> (7 - j)) & 1) + if (((tPressingSpeeds(i) & 0xFF) >> (7 - j)) & 1) score += sPressingSpeedConversionTable[j]; } - ConvertIntToDecimalStringN(gStringVar1, (u16)data[i + 2] >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); + ConvertIntToDecimalStringN(gStringVar1, (u16)tPressingSpeeds(i) >> 8, STR_CONV_MODE_RIGHT_ALIGN, 3); ConvertIntToDecimalStringN(gStringVar2, score / 1000000, STR_CONV_MODE_LEADING_ZEROS, 2); str = StringExpandPlaceholders(gStringVar4, gText_XDotY3); *str++ = CHAR_SPACE; StringCopy(str, gText_TimesPerSec); xPos = 192 - (u8)GetStringWidth(3, gStringVar4, 0); AddTextPrinterParameterized3( - data[1], + tWindowId, 3, xPos, yPos, - sBerryCrushTextColorTable[0], + sBerryCrushTextColorTable[COLORID_GRAY], 0, gStringVar4 ); yPos += 14; score = 0; } - CopyWindowToVram(data[1], COPYWIN_BOTH); + CopyWindowToVram(tWindowId, COPYWIN_BOTH); break; case 2: - if (gMain.newKeys & (A_BUTTON | B_BUTTON)) + if (JOY_NEW(A_BUTTON | B_BUTTON)) break; else return; case 3: - ClearStdWindowAndFrameToTransparent(data[1], 1); - ClearWindowTilemap(data[1]); - RemoveWindow(data[1]); + ClearStdWindowAndFrameToTransparent(tWindowId, TRUE); + ClearWindowTilemap(tWindowId); + RemoveWindow(tWindowId); DestroyTask(taskId); EnableBothScriptContexts(); ScriptContext2_Disable(); - data[0] = 0; + tState = 0; return; } - ++data[0]; + ++tState; } void ShowBerryCrushRankings(void) @@ -2924,95 +3192,96 @@ void ShowBerryCrushRankings(void) ScriptContext2_Enable(); taskId = CreateTask(Task_ShowBerryCrushRankings, 0); - gTasks[taskId].data[2] = gSaveBlock2Ptr->berryCrush.berryCrushResults[0]; - gTasks[taskId].data[3] = gSaveBlock2Ptr->berryCrush.berryCrushResults[1]; - gTasks[taskId].data[4] = gSaveBlock2Ptr->berryCrush.berryCrushResults[2]; - gTasks[taskId].data[5] = gSaveBlock2Ptr->berryCrush.berryCrushResults[3]; + gTasks[taskId].tPressingSpeeds(0) = gSaveBlock2Ptr->berryCrush.berryCrushResults[0]; + gTasks[taskId].tPressingSpeeds(1) = gSaveBlock2Ptr->berryCrush.berryCrushResults[1]; + gTasks[taskId].tPressingSpeeds(2) = gSaveBlock2Ptr->berryCrush.berryCrushResults[2]; + gTasks[taskId].tPressingSpeeds(3) = gSaveBlock2Ptr->berryCrush.berryCrushResults[3]; } -static void BerryCrush_PrintTimeOnSprites(struct BerryCrushGame_138 * manager, u16 frames) +static void PrintTimer(struct BerryCrushGame_Gfx * gfx, u16 frames) { - FramesToMinSec(manager, frames); - DigitObjUtil_PrintNumOn(0, manager->minutes); - DigitObjUtil_PrintNumOn(1, manager->secondsInt); - DigitObjUtil_PrintNumOn(2, manager->secondsFrac); + FramesToMinSec(gfx, frames); + DigitObjUtil_PrintNumOn(0, gfx->minutes); + DigitObjUtil_PrintNumOn(1, gfx->secondsInt); + DigitObjUtil_PrintNumOn(2, gfx->secondsFrac); } -void BerryCrush_HideTimerSprites(struct BerryCrushGame_138 * manager) +static void HideTimer(struct BerryCrushGame_Gfx * gfx) { - manager->timerSprites[0]->invisible = TRUE; - manager->timerSprites[1]->invisible = TRUE; + gfx->timerSprites[0]->invisible = TRUE; + gfx->timerSprites[1]->invisible = TRUE; DigitObjUtil_HideOrShow(2, 1); DigitObjUtil_HideOrShow(1, 1); DigitObjUtil_HideOrShow(0, 1); } -static void sub_814EB38(struct BerryCrushGame * game) +static void CreatePlayerNameWindows(struct BerryCrushGame * game) { u8 i; for (i = 0; i < game->playerCount; ++i) { - game->spritesManager.seatCoords[i] = &gUnknown_846F294[gUnknown_846F280[game->playerCount - 2][i]]; - game->spritesManager.unk83[i] = AddWindow(&gUnknown_846E3F8[game->spritesManager.seatCoords[i]->unk0]); - PutWindowTilemap(game->spritesManager.unk83[i]); - FillWindowPixelBuffer(game->spritesManager.unk83[i], PIXEL_FILL(0)); + game->gfx.playerCoords[i] = &sPlayerCoords[gUnknown_846F280[game->playerCount - 2][i]]; + game->gfx.nameWindowIds[i] = AddWindow(&sWindowTemplates_PlayerNames[game->gfx.playerCoords[i]->playerId]); + PutWindowTilemap(game->gfx.nameWindowIds[i]); + FillWindowPixelBuffer(game->gfx.nameWindowIds[i], PIXEL_FILL(0)); } } -static void sub_814EBB0(struct BerryCrushGame * game) +static void DrawPlayerNameWindows(struct BerryCrushGame * game) { u8 i; for (i = 0; i < game->playerCount; ++i) { - PutWindowTilemap(game->spritesManager.unk83[i]); + PutWindowTilemap(game->gfx.nameWindowIds[i]); if (i == game->localId) { AddTextPrinterParameterized4( - game->spritesManager.unk83[i], + game->gfx.nameWindowIds[i], 2, - 36 - GetStringWidth(2, game->unk98[i].unk0, 0) / 2u, + 36 - GetStringWidth(2, game->players[i].name, 0) / 2u, 1, 0, 0, - sBerryCrushTextColorTable[1], + sBerryCrushTextColorTable[COLORID_BLACK], 0, - game->unk98[i].unk0 + game->players[i].name ); } else { AddTextPrinterParameterized4( - game->spritesManager.unk83[i], + game->gfx.nameWindowIds[i], 2, - 36 - GetStringWidth(2, game->unk98[i].unk0, 0) / 2u, + 36 - GetStringWidth(2, game->players[i].name, 0) / 2u, 1, 0, 0, - sBerryCrushTextColorTable[2], + sBerryCrushTextColorTable[COLORID_LIGHT_GRAY], 0, - game->unk98[i].unk0 + game->players[i].name ); } - CopyWindowToVram(game->spritesManager.unk83[i], COPYWIN_BOTH); + CopyWindowToVram(game->gfx.nameWindowIds[i], COPYWIN_BOTH); } CopyBgTilemapBufferToVram(0); } -static void sub_814EC80(struct BerryCrushGame * game) +// Each player name window border uses a color that corresponds to a slot of the crusher lid +static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame * game) { u8 i = 0; - u8 *r4; + u8 *crusherGfx; - LZ77UnCompWram(gUnknown_8EB0ADC, gDecompressionBuffer); - for (r4 = gDecompressionBuffer; i < game->playerCount; ++i) + LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer); + for (crusherGfx = gDecompressionBuffer; i < game->playerCount; ++i) { CopyToBgTilemapBufferRect( 3, - &r4[game->spritesManager.seatCoords[i]->unk0 * 40], - game->spritesManager.seatCoords[i]->unk1, - game->spritesManager.seatCoords[i]->unk2, + &crusherGfx[game->gfx.playerCoords[i]->playerId * 40], + game->gfx.playerCoords[i]->windowGfxX, + game->gfx.playerCoords[i]->windowGfxY, 10, 2 ); @@ -3020,52 +3289,60 @@ static void sub_814EC80(struct BerryCrushGame * game) CopyBgTilemapBufferToVram(3); } -static void sub_814ECE0(struct BerryCrushGame * game) +static void CreateGameSprites(struct BerryCrushGame * game) { u8 i = 0; u8 spriteId; - game->depth = -104; + game->depth = CRUSHER_START_Y; game->vibration = 0; gSpriteCoordOffsetX = 0; - gSpriteCoordOffsetY = -104; - for (; i < 4; ++i) + gSpriteCoordOffsetY = CRUSHER_START_Y; + for (i = 0; i < NELEMS(sSpriteSheets) - 1; ++i) LoadCompressedSpriteSheet(&sSpriteSheets[i]); LoadSpritePalettes(sSpritePals); + + // Create sprite for crusher base spriteId = CreateSprite(&sSpriteTemplate_BerryCrushCore, 120, 88, 5); - game->spritesManager.coreSprite = &gSprites[spriteId]; - game->spritesManager.coreSprite->oam.priority = 3; - game->spritesManager.coreSprite->coordOffsetEnabled = TRUE; - game->spritesManager.coreSprite->animPaused = TRUE; + game->gfx.coreSprite = &gSprites[spriteId]; + game->gfx.coreSprite->oam.priority = 3; + game->gfx.coreSprite->coordOffsetEnabled = TRUE; + game->gfx.coreSprite->animPaused = TRUE; + + // Create sprites for the impact effect for (i = 0; i < game->playerCount; ++i) { spriteId = CreateSprite( &sSpriteTemplate_BerryCrushImpact, - game->spritesManager.seatCoords[i]->unk4 + 120, - game->spritesManager.seatCoords[i]->unk6 + 32, + game->gfx.playerCoords[i]->impactXOffset + 120, + game->gfx.playerCoords[i]->impactYOffset + 32, 0 ); - game->spritesManager.impactSprites[i] = &gSprites[spriteId]; - game->spritesManager.impactSprites[i]->oam.priority = 1; - game->spritesManager.impactSprites[i]->invisible = TRUE; - game->spritesManager.impactSprites[i]->coordOffsetEnabled = TRUE; - game->spritesManager.impactSprites[i]->animPaused = TRUE; + game->gfx.impactSprites[i] = &gSprites[spriteId]; + game->gfx.impactSprites[i]->oam.priority = 1; + game->gfx.impactSprites[i]->invisible = TRUE; + game->gfx.impactSprites[i]->coordOffsetEnabled = TRUE; + game->gfx.impactSprites[i]->animPaused = TRUE; } - for (i = 0; i < NELEMS(game->spritesManager.sparkleSprites); ++i) + + // Create sprites for sparkle effect + for (i = 0; i < NELEMS(game->gfx.sparkleSprites); ++i) { spriteId = CreateSprite( &sSpriteTemplate_BerryCrushPowderSparkles, - gUnknown_846F2D6[i][0] + 120, - gUnknown_846F2D6[i][1] + 136, + sSparkleCoords[i][0] + 120, + sSparkleCoords[i][1] + 136, 6 ); - game->spritesManager.sparkleSprites[i] = &gSprites[spriteId]; - game->spritesManager.sparkleSprites[i]->oam.priority = 3; - game->spritesManager.sparkleSprites[i]->invisible = TRUE; - game->spritesManager.sparkleSprites[i]->animPaused = TRUE; - game->spritesManager.sparkleSprites[i]->data[0] = i; + game->gfx.sparkleSprites[i] = &gSprites[spriteId]; + game->gfx.sparkleSprites[i]->oam.priority = 3; + game->gfx.sparkleSprites[i]->invisible = TRUE; + game->gfx.sparkleSprites[i]->animPaused = TRUE; + game->gfx.sparkleSprites[i]->data[0] = i; } - for (i = 0; i < NELEMS(game->spritesManager.timerSprites); ++i) + + // Create sprites for timer + for (i = 0; i < NELEMS(game->gfx.timerSprites); ++i) { spriteId = CreateSprite( &sSpriteTemplate_BerryCrushTimer, @@ -3073,43 +3350,44 @@ static void sub_814ECE0(struct BerryCrushGame * game) 8, 0 ); - game->spritesManager.timerSprites[i] = &gSprites[spriteId]; - game->spritesManager.timerSprites[i]->oam.priority = 0; - game->spritesManager.timerSprites[i]->invisible = FALSE; - game->spritesManager.timerSprites[i]->animPaused = FALSE; + game->gfx.timerSprites[i] = &gSprites[spriteId]; + game->gfx.timerSprites[i]->oam.priority = 0; + game->gfx.timerSprites[i]->invisible = FALSE; + game->gfx.timerSprites[i]->animPaused = FALSE; } DigitObjUtil_CreatePrinter(0, 0, &sDigitObjTemplates[0]); DigitObjUtil_CreatePrinter(1, 0, &sDigitObjTemplates[1]); DigitObjUtil_CreatePrinter(2, 0, &sDigitObjTemplates[2]); - if (game->gameState == 1) - BerryCrush_HideTimerSprites(&game->spritesManager); + + if (game->gameState == STATE_INIT) + HideTimer(&game->gfx); } -static void sub_814EF10(struct BerryCrushGame * r5) +static void DestroyGameSprites(struct BerryCrushGame * game) { - u8 r4 = 0; + u8 i = 0; - FreeSpriteTilesByTag(4); - FreeSpriteTilesByTag(3); - FreeSpriteTilesByTag(2); - FreeSpriteTilesByTag(1); - FreeSpritePaletteByTag(4); - FreeSpritePaletteByTag(2); - FreeSpritePaletteByTag(1); - for (; r4 < NELEMS(r5->spritesManager.timerSprites); ++r4) - DestroySprite(r5->spritesManager.timerSprites[r4]); + FreeSpriteTilesByTag(TAG_TIMER_DIGITS); + FreeSpriteTilesByTag(GFXTAG_SPARKLE); + FreeSpriteTilesByTag(GFXTAG_IMPACT); + FreeSpriteTilesByTag(TAG_CRUSHER_BASE); + FreeSpritePaletteByTag(TAG_TIMER_DIGITS); + FreeSpritePaletteByTag(PALTAG_EFFECT); + FreeSpritePaletteByTag(TAG_CRUSHER_BASE); + for (; i < NELEMS(game->gfx.timerSprites); ++i) + DestroySprite(game->gfx.timerSprites[i]); DigitObjUtil_DeletePrinter(2); DigitObjUtil_DeletePrinter(1); DigitObjUtil_DeletePrinter(0); - for (r4 = 0; r4 < NELEMS(r5->spritesManager.sparkleSprites); ++r4) - DestroySprite(r5->spritesManager.sparkleSprites[r4]); - for (r4 = 0; r4 < r5->playerCount; ++r4) - DestroySprite(r5->spritesManager.impactSprites[r4]); - if (r5->spritesManager.coreSprite->inUse) - DestroySprite(r5->spritesManager.coreSprite); + for (i = 0; i < NELEMS(game->gfx.sparkleSprites); ++i) + DestroySprite(game->gfx.sparkleSprites[i]); + for (i = 0; i < game->playerCount; ++i) + DestroySprite(game->gfx.impactSprites[i]); + if (game->gfx.coreSprite->inUse) + DestroySprite(game->gfx.coreSprite); } -static void SpriteCB_BerryCrushImpact(struct Sprite * sprite) +static void SpriteCB_Impact(struct Sprite * sprite) { if (sprite->animEnded) { @@ -3118,7 +3396,7 @@ static void SpriteCB_BerryCrushImpact(struct Sprite * sprite) } } -static void sub_814EFFC(struct Sprite * sprite) +static void SpriteCB_Sparkle_End(struct Sprite * sprite) { u8 r1 = 0; SpriteCallback r5 = SpriteCallbackDummy; @@ -3132,51 +3410,79 @@ static void sub_814EFFC(struct Sprite * sprite) sprite->callback = r5; } -static void sub_814F044(struct Sprite * sprite) +// Redefining from above +#define sX data[0] +#define sYSpeed data[1] +#define sYAccel data[2] +#define sXSpeed data[3] +#define sSinIdx data[4] +#define sSinSpeed data[5] +#define sAmplitude data[6] +// The last element (data[7]) is a bitfield. +// The first 15 bits are the y coord to stop at. +// The last bit is a flag for whether or not to move on the x too +#define sBitfield data[7] +#define MASK_TARGET_Y 0x7FFF +#define F_MOVE_HORIZ 0x8000 + +static void SpriteCB_Sparkle(struct Sprite * sprite) { - s16 *r4 = sprite->data; + s16 *data = sprite->data; - r4[1] += r4[2]; - sprite->pos2.y += r4[1] >> 8; - if (r4[7] & 0x8000) + sYSpeed += sYAccel; + sprite->pos2.y += Q_8_8_TO_INT(sYSpeed); + if (sBitfield & F_MOVE_HORIZ) { - sprite->data[0] += r4[3]; - r4[4] += r4[5]; - sprite->pos2.x = Sin(r4[4] >> 7, r4[6]); - if (r4[7] & 0x8000 && r4[4] >> 7 > 126) + sprite->sX += sXSpeed; + sSinIdx += sSinSpeed; + sprite->pos2.x = Sin(Q_N_S_TO_INT(7, sSinIdx), sAmplitude); + if ((sBitfield & F_MOVE_HORIZ) && Q_N_S_TO_INT(7, sSinIdx) > 126) { sprite->pos2.x = 0; - r4[7] &= 0x7FFF; + sBitfield &= MASK_TARGET_Y; } } - sprite->pos1.x = r4[0] >> 7; - if (sprite->pos1.y + sprite->pos2.y > (r4[7] & 0x7FFF)) - sprite->callback = sub_814EFFC; -} - -static void sub_814F0D8(struct Sprite * sprite) -{ - s16 *r7 = sprite->data; - s16 r4, r5; - s32 r2; - u32 r8 = 0; - - r2 = 640; - r7[1] = r2; - r7[2] = 32; - r7[7] = 168; - r4 = sprite->pos2.x * 128; - r5 = MathUtil_Div16Shift(7, (168 - sprite->pos1.y) << 7, (r2 + 32) >> 1); - sprite->data[0] = sprite->pos1.x << 7; - r7[3] = MathUtil_Div16Shift(7, r4, r5); - r2 = MathUtil_Mul16Shift(7, r5, 85); - r7[4] = r8; - r7[5] = MathUtil_Div16Shift(7, 0x3F80, r2); - r7[6] = sprite->pos2.x / 4; - r7[7] |= 0x8000; - sprite->pos2.y = r8; - sprite->pos2.x = r8; - sprite->callback = sub_814F044; + sprite->pos1.x = Q_N_S_TO_INT(7, sX); + if (sprite->pos1.y + sprite->pos2.y > (sBitfield & MASK_TARGET_Y)) + sprite->callback = SpriteCB_Sparkle_End; +} + +static void SpriteCB_Sparkle_Init(struct Sprite * sprite) +{ + s16 *data = sprite->data; + s16 xMult, var; + s16 targetY; + s32 speed; + u32 zero = 0; + + speed = Q_8_8(2.5); + sYSpeed = speed; + sYAccel = Q_8_8(0.125); + targetY = 168; + sBitfield = targetY; + xMult = Q_N_S(7, sprite->pos2.x); + var = Q_N_S_div(7, Q_N_S(7, targetY - (u16) sprite->pos1.y), (speed + Q_8_8(0.125)) >> 1); + sprite->sX = Q_N_S(7, (u16)sprite->pos1.x); + sXSpeed = Q_N_S_div(7, xMult, var); + speed = Q_N_S_mul(7, var, Q_N_S(7, 0.666666667)); + sSinIdx = zero; + sSinSpeed = Q_N_S_div(7, Q_N_S(7, 127), speed); + sAmplitude = sprite->pos2.x / 4; + sBitfield |= F_MOVE_HORIZ; + sprite->pos2.y = zero; + sprite->pos2.x = zero; + sprite->callback = SpriteCB_Sparkle; sprite->animPaused = FALSE; sprite->invisible = FALSE; } + +#undef sX +#undef sYSpeed +#undef sYAccel +#undef sXSpeed +#undef sSinIdx +#undef sSinSpeed +#undef sAmplitude +#undef sBitfield +#undef MASK_TARGET_Y +#undef F_MOVE_HORIZ diff --git a/src/cable_club.c b/src/cable_club.c index 34b023281..791f04a07 100644 --- a/src/cable_club.c +++ b/src/cable_club.c @@ -516,7 +516,7 @@ u8 CreateTask_ReestablishLinkInCableClubRoom(void) gLinkType = LINKTYPE_MULTI_BATTLE; break; case USING_TRADE_CENTER: - gLinkType = LINKTYPE_0x1111; + gLinkType = LINKTYPE_TRADE; break; case USING_RECORD_CORNER: gLinkType = LINKTYPE_0x3322; @@ -659,7 +659,7 @@ static void Task_StartWirelessCableClubBattle(u8 taskId) for (i = 0; i < GetLinkPlayerCount(); i++) { gLinkPlayers[i] = *(struct LinkPlayer *)gBlockRecvBuffer[i]; - IntlConvertLinkPlayerName(&gLinkPlayers[i]); + ConvertLinkPlayerName(&gLinkPlayers[i]); ResetBlockReceivedFlag(i); } data[0] = 4; @@ -859,7 +859,7 @@ static void Task_StartWirelessCableClubTrade(u8 taskId) case 0: ScriptContext2_Enable(); FadeScreen(FADE_TO_BLACK, 0); - Rfu_set_zero(); + ClearLinkRfuCallback(); data[0]++; break; case 1: diff --git a/src/daycare.c b/src/daycare.c index 97190c1d6..1c3f24ba3 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -32,6 +32,8 @@ // Combination of RSE's Day-Care (re-used on Four Island), FRLG's Day-Care, and egg_hatch.c +extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; + struct EggHatchData { u8 eggSpriteID; diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c index 852c386ac..3f7128513 100644 --- a/src/digit_obj_util.c +++ b/src/digit_obj_util.c @@ -74,7 +74,7 @@ bool32 DigitObjUtil_Init(u32 count) u32 i; if (sOamWork != NULL) - DigitObjUtil_Teardown(); + DigitObjUtil_Free(); sOamWork = Alloc(sizeof(*sOamWork)); if (sOamWork == NULL) @@ -97,7 +97,7 @@ bool32 DigitObjUtil_Init(u32 count) return TRUE; } -void DigitObjUtil_Teardown(void) +void DigitObjUtil_Free(void) { if (sOamWork != NULL) { diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c index 35562bde7..53af1f48c 100644 --- a/src/dodrio_berry_picking.c +++ b/src/dodrio_berry_picking.c @@ -299,7 +299,7 @@ static void sub_8150A84(u8 taskId) case 2: if (!sub_8155E68()) { - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); gUnknown_203F3E0->unk0C++; } break; @@ -412,7 +412,7 @@ static void sub_8150CF4(void) gUnknown_203F3E0->unk10++; break; case 1: - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); gUnknown_203F3E0->unk10++; break; case 2: @@ -424,7 +424,7 @@ static void sub_8150CF4(void) case 3: if (!IsMinigameCountdownRunning()) { - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); gUnknown_203F3E0->unk10++; } break; @@ -1023,12 +1023,12 @@ static void sub_815184C(void) { if (gUnknown_203F3E0->unk128 != 0) { - sub_80FBA44(); + ClearRecvCommands(); gUnknown_203F3E0->unk124 = 0; } else if (gUnknown_203F3E0->unk124 > 70) { - sub_80FBA44(); + ClearRecvCommands(); gUnknown_203F3E0->unk124 = 0; } } @@ -1089,12 +1089,12 @@ static void sub_8151A5C(void) { if (gUnknown_203F3E0->unk128 != 0) { - sub_80FBA44(); + ClearRecvCommands(); gUnknown_203F3E0->unk124 = 0; } else if (gUnknown_203F3E0->unk124 > 70) { - sub_80FBA44(); + ClearRecvCommands(); gUnknown_203F3E0->unk124 = 0; } } diff --git a/src/dodrio_berry_picking_2.c b/src/dodrio_berry_picking_2.c index aa9f65042..e5e263647 100644 --- a/src/dodrio_berry_picking_2.c +++ b/src/dodrio_berry_picking_2.c @@ -1431,12 +1431,12 @@ static void sub_8155A78(void) case 2: if (!IsDma3ManagerBusyWithBgCopy()) { - CreateTask(Task_SaveGame_UpdatedLinkRecords, 0); + CreateTask(Task_LinkSave, 0); gUnknown_203F440->state++; } break; case 3: - if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords)) + if (!FuncIsActiveTask(Task_LinkSave)) gUnknown_203F440->state++; break; default: @@ -1577,7 +1577,7 @@ static void sub_8155EA0(void) ChangeBgX(3, 0, 0); ChangeBgY(3, 0, 0); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); SetBgTilemapBuffer(3, gUnknown_203F440->tilemapBuffers[0]); SetBgTilemapBuffer(1, gUnknown_203F440->tilemapBuffers[1]); diff --git a/src/dodrio_berry_picking_3.c b/src/dodrio_berry_picking_3.c index fec1d62f7..3bd538f94 100644 --- a/src/dodrio_berry_picking_3.c +++ b/src/dodrio_berry_picking_3.c @@ -8,7 +8,7 @@ void sub_815A5BC(s32 a0) struct Padded_U8 data[2]; data[0].value = 1; data[1].value = a0; - RfuPrepareSend0x2f00(data); + Rfu_SendPacket(data); } u8 sub_815A5E8(s32 a0) @@ -114,7 +114,7 @@ void sub_815A61C(struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0 packet.unkA_3 = arg6; packet.unkB_1 = arg7; packet.unkB_0 = arg8; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } u32 sub_815A950(u32 unused, struct DodrioSubstruct_31A0 * arg0, struct DodrioSubstruct_31A0_2C * arg1, struct DodrioSubstruct_31A0_2C * arg2, struct DodrioSubstruct_31A0_2C * arg3, struct DodrioSubstruct_31A0_2C * arg4, struct DodrioSubstruct_31A0_2C * arg5, u8 *arg6, u32 *arg7, u32 *arg8) @@ -192,7 +192,7 @@ void sub_815AAD8(u8 arg0) struct UnkPacket3 packet; packet.id = 3; packet.unk4 = arg0; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } u32 sub_815AB04(u32 arg0, u8 *arg1) @@ -223,7 +223,7 @@ void sub_815AB3C(u32 arg0) struct UnkPacket4 packet; packet.id = 4; packet.unk4 = arg0; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } u32 sub_815AB60(u32 arg0) diff --git a/src/evolution_scene.c b/src/evolution_scene.c index 0eb36b523..ffbec26ba 100644 --- a/src/evolution_scene.c +++ b/src/evolution_scene.c @@ -26,6 +26,8 @@ #include "constants/songs.h" #include "constants/pokemon.h" +extern struct Evolution gEvolutionTable[][EVOS_PER_MON]; + struct EvoInfo { u8 preEvoSpriteId; @@ -545,8 +547,6 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) { s32 i; struct Pokemon* shedinja = &gPlayerParty[gPlayerPartyCount]; - const struct Evolution *evos; - const struct Evolution *evos2; CopyMon(&gPlayerParty[gPlayerPartyCount], mon, sizeof(struct Pokemon)); SetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, (&gEvolutionTable[preEvoSpecies][1].targetSpecies)); @@ -567,12 +567,8 @@ static void CreateShedinja(u16 preEvoSpecies, struct Pokemon* mon) CalculateMonStats(&gPlayerParty[gPlayerPartyCount]); CalculatePlayerPartyCount(); - // can't match it otherwise, ehh - evos2 = gEvolutionTable[0]; - evos = evos2 + EVOS_PER_MON * preEvoSpecies; - - GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos[1].targetSpecies), FLAG_SET_SEEN); - GetSetPokedexFlag(SpeciesToNationalPokedexNum(evos[1].targetSpecies), FLAG_SET_CAUGHT); + GetSetPokedexFlag(SpeciesToNationalPokedexNum(gEvolutionTable[preEvoSpecies][1].targetSpecies), FLAG_SET_SEEN); + GetSetPokedexFlag(SpeciesToNationalPokedexNum(gEvolutionTable[preEvoSpecies][1].targetSpecies), FLAG_SET_CAUGHT); if (GetMonData(shedinja, MON_DATA_SPECIES) == SPECIES_SHEDINJA && GetMonData(shedinja, MON_DATA_LANGUAGE) == LANGUAGE_JAPANESE diff --git a/src/graphics.c b/src/graphics.c index 04a6f6206..03986a03f 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1414,7 +1414,7 @@ const u32 gTradeGba_Gfx[] = INCBIN_U32("graphics/link/gba.4bpp"); const u16 gUnknown_8EAFE80[] = INCBIN_U16("graphics/interface/blank2.gbapal"); -const u16 gUnknown_8EAFEA0[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal"); +const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/berry_crush.gbapal"); const u16 gUnknown_8EAFF60[] = INCBIN_U16("graphics/unknown/unknown_EAFF60.gbapal"); -const u32 gUnknown_8EAFFC0[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz"); -const u32 gUnknown_8EB0ADC[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz"); +const u32 gBerryCrush_Crusher_Gfx[] = INCBIN_U32("graphics/berry_crush/berry_crush.4bpp.lz"); +const u32 gBerryCrush_Crusher_Tilemap[] = INCBIN_U32("graphics/berry_crush/data_EB0ADC.bin.lz"); diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c index e6f8b72ec..d2c7555e2 100644 --- a/src/hall_of_fame.c +++ b/src/hall_of_fame.c @@ -1198,7 +1198,7 @@ static bool8 DrawHofBackground(void) break; case 3: InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); break; case 4: SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON); diff --git a/src/item.c b/src/item.c index 801c7d689..0df45cbd3 100644 --- a/src/item.c +++ b/src/item.c @@ -139,7 +139,7 @@ bool8 CheckBagHasItem(u16 itemId, u16 count) return FALSE; } -bool8 CheckHasAtLeastOneBerry(void) +bool8 HasAtLeastOneBerry(void) { u8 itemId; bool8 exists; diff --git a/src/link.c b/src/link.c index 2a242dde9..d2d9e630f 100644 --- a/src/link.c +++ b/src/link.c @@ -226,7 +226,7 @@ bool8 IsWirelessAdapterConnected(void) return FALSE; SetWirelessCommType1(); - sub_80F86F4(); + InitRFUAPI(); sub_80FB128(TRUE); if (rfu_LMAN_REQBN_softReset_and_checkID() == RFU_ID) { @@ -321,10 +321,10 @@ static void InitLocalLinkPlayer(void) gLocalLinkPlayer.language = gGameLanguage; gLocalLinkPlayer.version = gGameVersion + 0x4000; gLocalLinkPlayer.lp_field_2 = 0x8000; - gLocalLinkPlayer.name[8] = IsNationalPokedexEnabled(); + gLocalLinkPlayer.progressFlags = IsNationalPokedexEnabled(); if (FlagGet(FLAG_SYS_CAN_LINK_WITH_RS)) { - gLocalLinkPlayer.name[8] |= 0x10; + gLocalLinkPlayer.progressFlags |= 0x10; } } @@ -378,7 +378,7 @@ void OpenLink(void) } else { - sub_80F86F4(); + InitRFUAPI(); } gReceivedRemoteLinkPlayers = FALSE; for (i = 0; i < MAX_LINK_PLAYERS; i++) @@ -602,11 +602,11 @@ void ProcessRecvCmds(u8 unused) *linkPlayer = block->linkPlayer; if ((linkPlayer->version & 0xFF) == VERSION_RUBY || (linkPlayer->version & 0xFF) == VERSION_SAPPHIRE) { - linkPlayer->name[10] = 0; - linkPlayer->name[9] = 0; - linkPlayer->name[8] = 0; + linkPlayer->progressFlagsCopy = 0; + linkPlayer->neverRead = 0; + linkPlayer->progressFlags = 0; } - IntlConvertLinkPlayerName(linkPlayer); + ConvertLinkPlayerName(linkPlayer); if (strcmp(block->magic1, sASCIIGameFreakInc) != 0 || strcmp(block->magic2, sASCIIGameFreakInc) != 0) { @@ -749,7 +749,7 @@ void ClearLinkCallback_2(void) { if (gWirelessCommType) { - Rfu_set_zero(); + ClearLinkRfuCallback(); } else { @@ -1003,7 +1003,7 @@ bool8 Link_PrepareCmd0xCCCC_Rfu0xA100(u8 blockRequestType) { if (gWirelessCommType == 1) { - return LinkRfu_PrepareCmd0xA100(blockRequestType); + return Rfu_SendBlockRequest(blockRequestType); } if (gLinkCallback == NULL) { @@ -1309,7 +1309,7 @@ void Link_StartSend5FFFwithParam(u16 a0) { if (gWirelessCommType == 1) { - Rfu_BeginBuildAndSendCommand5F(); + Rfu_SetCloseLinkCallback(); } else { @@ -1326,7 +1326,7 @@ void SetCloseLinkCallback(void) { if (gWirelessCommType == 1) { - Rfu_BeginBuildAndSendCommand5F(); + Rfu_SetCloseLinkCallback(); } else { @@ -1381,7 +1381,7 @@ void SetLinkStandbyCallback(void) { if (gWirelessCommType == 1) { - LinkRfu_SetRfuFuncToSend6600(); + Rfu_SetLinkStandbyCallback(); } else { @@ -1441,12 +1441,12 @@ static void CheckErrorStatus(void) } } -void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 unk_06) +void SetLinkErrorFromRfu(u32 status, u8 lastSendQueueCount, u8 lastRecvQueueCount, u8 isConnectionError) { sLinkErrorBuffer.status = status; sLinkErrorBuffer.lastSendQueueCount = lastSendQueueCount; sLinkErrorBuffer.lastRecvQueueCount = lastRecvQueueCount; - sLinkErrorBuffer.unk_06 = unk_06; + sLinkErrorBuffer.unk_06 = isConnectionError; } void CB2_LinkError(void) @@ -1619,7 +1619,7 @@ bool8 HasLinkErrorOccurred(void) return gLinkErrorOccurred; } -void PrepareLocalLinkPlayerBlock(void) +void LocalLinkPlayerToBlock(void) { struct LinkPlayerBlock * block; @@ -1640,7 +1640,7 @@ void LinkPlayerFromBlock(u32 who) block = (struct LinkPlayerBlock *)gBlockRecvBuffer[who_]; player = &gLinkPlayers[who_]; *player = block->linkPlayer; - IntlConvertLinkPlayerName(player); + ConvertLinkPlayerName(player); if (strcmp(block->magic1, sASCIIGameFreakInc) != 0 || strcmp(block->magic2, sASCIIGameFreakInc) != 0) { SetMainCallback2(CB2_LinkError); @@ -1718,9 +1718,9 @@ bool32 LinkRecvQueueLengthMoreThan2(void) return FALSE; } -void IntlConvertLinkPlayerName(struct LinkPlayer * player) +void ConvertLinkPlayerName(struct LinkPlayer * player) { - player->name[10] = player->name[8]; + player->progressFlagsCopy = player->progressFlags; // ? Perhaps relocating for a longer name field ConvertInternationalString(player->name, player->language); } diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c index cf23098d7..d2c605d7b 100644 --- a/src/link_rfu_2.c +++ b/src/link_rfu_2.c @@ -20,8 +20,22 @@ struct SioInfo u8 fill_a0[0x5c]; }; -static EWRAM_DATA struct InitializeParametersTag sRfuReqConfig = {}; -static EWRAM_DATA struct UnkLinkRfuStruct_02022B44 gUnknown_203AC08 = {}; +struct RfuDebug +{ + u8 fill_00[6]; + u16 unk_06; + u8 fill_08[6]; + vu8 unk_0e; + u8 unk_0f; + u8 fill_10[0x54]; + u16 unk_64; + u8 fill_66[0x1d]; + u8 unk_83; + u8 fill_84[0x58]; +}; + +static EWRAM_DATA INIT_PARAM sRfuReqConfig = {}; +static EWRAM_DATA struct RfuDebug sRfuDebug = {}; static u32 gf_rfu_REQ_api[RFU_API_BUFF_SIZE_RAM / 4]; static u8 sResendBlock8[14]; @@ -35,18 +49,18 @@ static void sub_80F8AA4(void); static void sub_80F8AEC(void); static void MscCallback_Child(u16 a0); static void MSCCallback_SetUnkCDB(u16 a0); -static void sub_80F906C(void); +static void UpdateBackupQueue(void); static void RfuHandleReceiveCommand(u8 unused); static void ResetSendDataManager(struct RfuBlockSend *data); static void RfuPrepareSendBuffer(u16 command); -static void RfuFunc_HandleBlockSend(void); -static void RfuFunc_SendNextBlock(void); -static void RfuFunc_SendLastBlock(void); +static void HandleBlockSend(void); +static void SendNextBlock(void); +static void SendLastBlock(void); static void CallRfuFunc(void); -static void sub_80FA738(void); -static s32 sub_80FA788(void); +static void UpdateChildStatuses(void); +static s32 GetRfuRecvStatus(void); static void sub_80FA834(u8 taskId); -static void sub_80FA9D0(u16 a0); +static void ClearSelectedLinkPlayerIds(u16 disconnectMask); static void ValidateAndReceivePokemonSioInfo(void * a0); static void Task_ExchangeLinkPlayers(u8 taskId); static void sub_80FACF0(u8 taskId); @@ -57,10 +71,10 @@ static u8 GetPartnerIndexByNameAndTrainerID(const u8 *trainerName, u16 trainerId static void RfuReqDisconnectSlot(u32 bmDisconnectSlot); static void sub_80FBE20(u32 a0, u32 a1); static void sub_80FC028(u8 taskId); -static void rfu_dbg_clear(void); +static void Debug_PrintEmpty(void); static void Task_idle(u8 taskId); -static const struct InitializeParametersTag sRfuReqConfigTemplate = { +static const INIT_PARAM sRfuReqConfigTemplate = { .maxMFrame = 4, .MC_TimerCount = 32, .availSlot_flag = 0, @@ -115,21 +129,45 @@ static const u8 gUnknown_843EC38[] = { 2, 2, 3 }; -static const u8 gUnknown_843EC41[] = { - 0, 1, 1, 2, - 1, 2, 2, 3, - 1, 2, 2, 3, - 2, 3, 3, 4 +static const u8 sNumSetBits[] = { + [0x0] = 0, + [0x1] = 1, + [0x2] = 1, + [0x3] = 2, + [0x4] = 1, + [0x5] = 2, + [0x6] = 2, + [0x7] = 3, + [0x8] = 1, + [0x9] = 2, + [0xA] = 2, + [0xB] = 3, + [0xC] = 2, + [0xD] = 3, + [0xE] = 3, + [0xF] = 4 }; -static const u8 gUnknown_843EC51[] = { - 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 +static const u8 sNumTrailingZeroes[] = { + [0x0] = 0, + [0x1] = 0, + [0x2] = 1, + [0x3] = 0, + [0x4] = 2, + [0x5] = 0, + [0x6] = 1, + [0x7] = 0, + [0x8] = 3, + [0x9] = 0, + [0xA] = 1, + [0xB] = 0, + [0xC] = 2, + [0xD] = 0, + [0xE] = 1, + [0xF] = 0 }; -static const struct { - u8 *buffer; - u32 size; -} gUnknown_843EC64[] = { +static const struct BlockRequest sBlockRequests[] = { { gBlockSendBuffer, 200 }, { gBlockSendBuffer, 200 }, { gBlockSendBuffer, 100 }, @@ -139,7 +177,7 @@ static const struct { static const u16 sAcceptedSerialNos[] = { 0x0002, // Pokemon FR/LG/EM - 0x7f7d, + RFU_SERIAL_7F7D, 0xFFFF }; @@ -171,12 +209,12 @@ static const TaskFunc gUnknown_843ED88[] = { sub_80FACF0 }; -static void rfu_dbg_print_str(const void *string, u8 x, u8 y) +static void Debug_PrintString(const void *string, u8 x, u8 y) { // debug? } -static void rfu_dbg_print_num(u16 num, u8 x, u8 y, u8 ndigits) +static void Debug_PrintNum(u16 num, u8 x, u8 y, u8 ndigits) { } @@ -192,13 +230,13 @@ void ResetLinkRfuGFLayer(void) { Rfu.errorState = 0; } - for (i = 0; i < 5; i++) + for (i = 0; i < MAX_RFU_PLAYERS; i++) { - ResetSendDataManager(Rfu.cmd_8800_recvbuf + i); + ResetSendDataManager(&Rfu.recvBlock[i]); } - ResetSendDataManager(&Rfu.cmd_8800_sendbuf); - RFU_queue_20_70_reset(&Rfu.unk_124); - RFU_queue_40_14_reset(&Rfu.sendQueue); + ResetSendDataManager(&Rfu.sendBlock); + RfuRecvQueue_Reset(&Rfu.recvQueue); + RfuSendQueue_Reset(&Rfu.sendQueue); CpuFill16(0, gSendCmd, sizeof gSendCmd); CpuFill16(0, gRecvCmds, sizeof gRecvCmds); CpuFill16(0, gLinkPlayers, sizeof gLinkPlayers); @@ -208,7 +246,7 @@ void InitRFU(void) { IntrFunc serialIntr = gIntrTable[1]; IntrFunc timerIntr = gIntrTable[2]; - sub_80F86F4(); + InitRFUAPI(); rfu_REQ_stopMode(); rfu_waitREQComplete(); REG_IME = 0; @@ -217,11 +255,12 @@ void InitRFU(void) REG_IME = INTR_FLAG_VBLANK; } -void sub_80F86F4(void) +void InitRFUAPI(void) { if (!rfu_initializeAPI(gf_rfu_REQ_api, RFU_API_BUFF_SIZE_RAM, gIntrTable + 1, TRUE)) { gLinkType = 0; + // ClearSavedLinkPlayers(); // Em fix sub_80FB128(FALSE); ResetLinkRfuGFLayer(); rfu_setTimerInterrupt(3, gIntrTable + 2); @@ -230,7 +269,7 @@ void sub_80F86F4(void) static void Task_LinkLeaderSearchForChildren(u8 taskId) { - sub_80FA738(); + UpdateChildStatuses(); switch (Rfu.state) { case 0: @@ -248,13 +287,13 @@ static void Task_LinkLeaderSearchForChildren(u8 taskId) case 3: break; case 4: - rfu_LMAN_stopManager(0); + rfu_LMAN_stopManager(FALSE); Rfu.state = 5; break; case 5: break; case 18: - Rfu.unk_cdb = 0; + Rfu.unk_cdb = FALSE; rfu_LMAN_setMSCCallback(MSCCallback_SetUnkCDB); sub_80F8AA4(); sub_80F8AEC(); @@ -266,22 +305,24 @@ static void Task_LinkLeaderSearchForChildren(u8 taskId) } } -static u8 sub_80F886C(u8 idx) +static u8 CountTrailingZeroes(u8 acceptSlot) { - return gUnknown_843EC51[idx]; + return sNumTrailingZeroes[acceptSlot]; } -static void sub_80F887C(s32 r2, s32 r5) +static void ReassignPartnerIds(s32 before, s32 after) { u8 i; u8 r4 = 1; - s32 r1 = r2; + s32 beforeBak = before; s32 r6 = 0; - if (r5 == -1) + if (after == -1) { - for (i = 0; i < RFU_CHILD_MAX; r2 >>= 1, i++) + // First Time Init + // UB: linkPlayerIdx may be uninitialized + for (i = 0; i < RFU_CHILD_MAX; before >>= 1, i++) { - if (r2 & 1) + if (before & 1) { Rfu.linkPlayerIdx[i] = r4; r4++; @@ -290,13 +331,15 @@ static void sub_80F887C(s32 r2, s32 r5) } else { - for (i = 0; i < RFU_CHILD_MAX; r1 >>= 1, i++) + // Delete before flags + for (i = 0; i < RFU_CHILD_MAX; beforeBak >>= 1, i++) { - if (!(r1 & 1)) + if (!(beforeBak & 1)) { Rfu.linkPlayerIdx[i] = 0; } } + // Get highest retained index for (r4 = 4; r4 != 0; r4--) { for (i = 0; i < RFU_CHILD_MAX && Rfu.linkPlayerIdx[i] != r4; i++); @@ -305,9 +348,10 @@ static void sub_80F887C(s32 r2, s32 r5) r6 = r4; } } - for (r5 &= ~r2, i = 0; i < RFU_CHILD_MAX; r5 >>= 1, i++) + // Replace with new flags + for (after &= ~before, i = 0; i < RFU_CHILD_MAX; after >>= 1, i++) { - if (r5 & 1) + if (after & 1) { Rfu.linkPlayerIdx[i] = r6++; } @@ -337,13 +381,13 @@ static void Task_JoinGroupSearchForParent(u8 taskId) gTasks[taskId].data[1] = 10; break; case 11: - switch (sub_80FA788()) + switch (GetRfuRecvStatus()) { - case 5: + case RFU_STATUS_JOIN_GROUP_OK: Rfu.state = 12; break; - case 6: - case 9: + case RFU_STATUS_JOIN_GROUP_NO: + case RFU_STATUS_LEAVE_GROUP: rfu_LMAN_requestChangeAgbClockMaster(); Rfu.unk_ce4 = 2; DestroyTask(taskId); @@ -355,13 +399,13 @@ static void Task_JoinGroupSearchForParent(u8 taskId) u8 bmChildSlot = 1 << Rfu.child_slot; rfu_clearSlot(TYPE_NI_SEND | TYPE_NI_RECV, Rfu.child_slot); rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f)); - rfu_UNI_setSendData(bmChildSlot, Rfu.unk_4c, sizeof(Rfu.unk_4c)); + rfu_UNI_setSendData(bmChildSlot, Rfu.lastCmdBeforeCommInterrupt, sizeof(Rfu.lastCmdBeforeCommInterrupt)); gTasks[taskId].data[1] = 8; DestroyTask(taskId); - if (gUnknown_203AC08.unk_0f == 0) + if (sRfuDebug.unk_0f == 0) { - rfu_dbg_clear(); - gUnknown_203AC08.unk_0f++; + Debug_PrintEmpty(); + sRfuDebug.unk_0f++; } CreateTask(sub_80FA834, 5); break; @@ -377,7 +421,7 @@ static void sub_80F8AA4(void) { if (acceptSlot & 1) { - rfu_setRecvBuffer(TYPE_UNI, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i])); + rfu_setRecvBuffer(TYPE_UNI, i, Rfu.main_UNI_recvBuffer[i], sizeof(Rfu.main_UNI_recvBuffer[i])); rfu_clearSlot(TYPE_UNI_SEND | TYPE_UNI_RECV, i); } acceptSlot >>= 1; @@ -388,19 +432,19 @@ static void sub_80F8AEC(void) { u8 acceptSlot = lman.acceptSlot_flag; rfu_UNI_setSendData(acceptSlot, Rfu.recvCmds, sizeof(Rfu.recvCmds)); - Rfu.unk_cda = sub_80F886C(acceptSlot); + Rfu.unk_cda = CountTrailingZeroes(acceptSlot); Rfu.bm_PartnerFlags = acceptSlot; - sub_80F887C(acceptSlot, -1); + ReassignPartnerIds(acceptSlot, -1); Rfu.parent_child = MODE_PARENT; } static void Task_LinkRfu_UnionRoomListen(u8 taskId) { - if (GetHostRFUtgtGname()->activity == (ACTIVITY_PLYRTALK | IN_UNION_ROOM) && RfuGetErrorStatus() == 4) + if (GetHostRFUtgtGname()->activity == (ACTIVITY_PLYRTALK | IN_UNION_ROOM) && RfuGetStatus() == 4) { rfu_REQ_disconnect(lman.acceptSlot_flag); rfu_waitREQComplete(); - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); } switch (Rfu.state) { @@ -412,14 +456,14 @@ static void Task_LinkRfu_UnionRoomListen(u8 taskId) case 1: break; case 17: - rfu_LMAN_establishConnection(2, 0, 240, (u16*)sAcceptedSerialNos); + rfu_LMAN_establishConnection(MODE_P_C_SWITCH, 0, 240, (u16*)sAcceptedSerialNos); rfu_LMAN_setMSCCallback(MscCallback_Child); Rfu.state = 18; break; case 18: break; case 13: - if (rfu_UNI_setSendData(1 << Rfu.child_slot, Rfu.unk_4c, sizeof(Rfu.unk_4c)) == 0) + if (rfu_UNI_setSendData(1 << Rfu.child_slot, Rfu.lastCmdBeforeCommInterrupt, sizeof(Rfu.lastCmdBeforeCommInterrupt)) == 0) { Rfu.parent_child = MODE_CHILD; DestroyTask(taskId); @@ -440,7 +484,7 @@ static void Task_LinkRfu_UnionRoomListen(u8 taskId) case 15: break; case 16: - Rfu.unk_cdb = 0; + Rfu.unk_cdb = FALSE; rfu_LMAN_setMSCCallback(MSCCallback_SetUnkCDB); UpdateGameData_GroupLockedIn(1); sub_80F8AA4(); @@ -449,7 +493,7 @@ static void Task_LinkRfu_UnionRoomListen(u8 taskId) gTasks[taskId].data[1] = 8; Rfu.parent_child = MODE_PARENT; CreateTask(sub_80FA834, 5); - Rfu.unk_ce8 = TRUE; + Rfu.foundNewLeaderMaybe = TRUE; DestroyTask(taskId); break; } @@ -462,25 +506,25 @@ void LinkRfu_CreateConnectionAsParent(void) void LinkRfu_StopManagerBeforeEnteringChat(void) { - rfu_LMAN_stopManager(0); + rfu_LMAN_stopManager(FALSE); } static void MscCallback_Child(u16 unused) { s32 i; - for (i = 0; i < 14; i++) + for (i = 0; i < BACKUP_QUEUE_SLOT_LENGTH; i++) { - Rfu.unk_4c[i] = 0; + Rfu.lastCmdBeforeCommInterrupt[i] = 0; } rfu_REQ_recvData(); rfu_waitREQComplete(); if (gRfuSlotStatusUNI[Rfu.child_slot]->recv.newDataFlag) { - Rfu.unk_cd0++; - RFU_queue_20_70_recv(&Rfu.unk_124, Rfu.unk_c3f); - gUnknown_203AC08.unk_06++; - sub_80F906C(); + Rfu.sem_UNI_SendRecv++; + RfuRecvQueue_Enqueue(&Rfu.recvQueue, Rfu.unk_c3f); + sRfuDebug.unk_06++; + UpdateBackupQueue(); rfu_UNI_readySendData(Rfu.child_slot); rfu_UNI_clearRecvNewDataFlag(Rfu.child_slot); } @@ -489,7 +533,7 @@ static void MscCallback_Child(u16 unused) static void MSCCallback_SetUnkCDB(u16 unused) { - Rfu.unk_cdb = 1; + Rfu.unk_cdb = TRUE; } void LinkRfu_Shutdown(void) @@ -504,7 +548,7 @@ void LinkRfu_Shutdown(void) { if (FuncIsActiveTask(Task_LinkLeaderSearchForChildren) == TRUE) { - DestroyTask(Rfu.unk_67); + DestroyTask(Rfu.searchTaskId); ResetLinkRfuGFLayer(); } } @@ -512,7 +556,7 @@ void LinkRfu_Shutdown(void) { if (FuncIsActiveTask(Task_JoinGroupSearchForParent) == TRUE) { - DestroyTask(Rfu.unk_67); + DestroyTask(Rfu.searchTaskId); ResetLinkRfuGFLayer(); } } @@ -520,7 +564,7 @@ void LinkRfu_Shutdown(void) { if (FuncIsActiveTask(Task_LinkRfu_UnionRoomListen) == TRUE) { - DestroyTask(Rfu.unk_67); + DestroyTask(Rfu.searchTaskId); ResetLinkRfuGFLayer(); } } @@ -537,10 +581,10 @@ static void CreateTask_LinkLeaderSearchForChildren(void) { if (QL_IS_PLAYBACK_STATE) return; - Rfu.unk_67 = CreateTask(Task_LinkLeaderSearchForChildren, 1); + Rfu.searchTaskId = CreateTask(Task_LinkLeaderSearchForChildren, 1); } -static bool8 RfuStateIs7AndPlayerIsChild(void) +static bool8 ContactedByParentAttemptingToReconnect(void) { if (Rfu.state == 7 && Rfu.parentId) { @@ -563,7 +607,7 @@ static void CreateTask_JoinGroupSearchForParent(void) { if (QL_IS_PLAYBACK_STATE) return; - Rfu.unk_67 = CreateTask(Task_JoinGroupSearchForParent, 1); + Rfu.searchTaskId = CreateTask(Task_JoinGroupSearchForParent, 1); } bool8 LmanAcceptSlotFlagIsNotZero(void) @@ -596,6 +640,7 @@ void sub_80F8FA0(void) Rfu.state = 14; } +UNUSED static void sub_80F8FAC(u8 a0) { u8 i; @@ -611,14 +656,14 @@ static void sub_80F8FAC(u8 a0) } } -static void sub_80F8FD4(void) +static void MoveRecvCmdsToRfuBuffer(void) { s32 i, j; - for (i = 0; i < 5; i++) + for (i = 0; i < MAX_RFU_PLAYERS; i++) { GF_RFU_MANAGER *ptr = &Rfu; - for (j = 0; j < 7; j++) + for (j = 0; j < CMD_LENGTH - 1; j++) { ptr->recvCmds[i][j][1] = gRecvCmds[i][j] >> 8; ptr->recvCmds[i][j][0] = gRecvCmds[i][j]; @@ -627,37 +672,37 @@ static void sub_80F8FD4(void) CpuFill16(0, gRecvCmds, sizeof gRecvCmds); } -static void sub_80F9038(void) +static void MoveSendCmdToFirstRecvCmd(void) { s32 i; - for (i = 0; i < 7; i++) + for (i = 0; i < CMD_LENGTH - 1; i++) { gRecvCmds[0][i] = gSendCmd[i]; } - for (i = 0; i < 7; i++) + for (i = 0; i < CMD_LENGTH - 1; i++) { gSendCmd[i] = 0; } } -static void sub_80F906C(void) +static void UpdateBackupQueue(void) { - if (Rfu.unk_c3c) + if (Rfu.linkRecovered) { - u8 r2 = RFU_queue_2_14_send(&Rfu.unk_c1c, Rfu.unk_4c); - if (Rfu.unk_c1c.count == 0) + bool8 backupEmpty = RfuBackupQueue_Dequeue(&Rfu.backupQueue, Rfu.lastCmdBeforeCommInterrupt); + if (Rfu.backupQueue.count == 0) { - Rfu.unk_c3c = 0; + Rfu.linkRecovered = FALSE; } - if (r2) + if (backupEmpty) { return; } } - if (Rfu.unk_c3c == 0) + if (!Rfu.linkRecovered) { - RFU_queue_40_14_send(&Rfu.sendQueue, Rfu.unk_4c); - RFU_queue_2_14_recv(&Rfu.unk_c1c, Rfu.unk_4c); + RfuSendQueue_Dequeue(&Rfu.sendQueue, Rfu.lastCmdBeforeCommInterrupt); + RfuBackupQueue_Enqueue(&Rfu.backupQueue, Rfu.lastCmdBeforeCommInterrupt); } } @@ -670,9 +715,9 @@ bool32 IsRfuRecvQueueEmpty(void) { return FALSE; } - for (i = 0; i < 5; i++) + for (i = 0; i < MAX_RFU_PLAYERS; i++) { - for (j = 0; j < 7; j++) + for (j = 0; j < CMD_LENGTH - 1; j++) { if (gRecvCmds[i][j] != 0) { @@ -693,7 +738,7 @@ static bool32 sub_80F911C(void) } else { - Rfu.unk_cdb = 0; + Rfu.unk_cdb = FALSE; if ((Rfu.bm_PartnerFlags & gRfuLinkStatus->connSlotFlag) == Rfu.bm_PartnerFlags && (Rfu.bm_PartnerFlags & gRfuLinkStatus->connSlotFlag)) { if (!Rfu.unk_cdc) @@ -704,7 +749,7 @@ static bool32 sub_80F911C(void) Rfu.bm_DisconnectSlot = 0; if (Rfu.unk_ce4 == 1) { - RfuSetErrorStatus(2, 0x8000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x8000); GetLinkmanErrorParams(0x8000); return FALSE; } @@ -715,7 +760,7 @@ static bool32 sub_80F911C(void) return FALSE; } } - sub_80F8FD4(); + MoveRecvCmdsToRfuBuffer(); rfu_UNI_readySendData(Rfu.unk_cda); rfu_LMAN_REQ_sendData(TRUE); } @@ -723,7 +768,7 @@ static bool32 sub_80F911C(void) { rfu_REQ_PARENT_resumeRetransmitAndChange(); } - Rfu.unk_0e = 1; + Rfu.unk_0e = TRUE; } } return FALSE; @@ -737,10 +782,10 @@ static bool32 sub_80F9204(void) u16 j; u8 retval; - if (Rfu.state >= 20 && Rfu.unk_0e == 1) + if (Rfu.state >= 20 && Rfu.unk_0e == TRUE) { rfu_waitREQComplete(); - while (Rfu.unk_cdb == 0) + while (!Rfu.unk_cdb) { if (Rfu.errorState != 0) { @@ -752,30 +797,30 @@ static bool32 sub_80F9204(void) if ((lman.parentAck_flag & Rfu.bm_PartnerFlags) == Rfu.bm_PartnerFlags) { Rfu.unk_cdc = 0; - gUnknown_203AC08.unk_06++; + sRfuDebug.unk_06++; flags = lman.acceptSlot_flag; for (i = 0; i < RFU_CHILD_MAX; i++) { if (flags & 1) { - if (Rfu.unk_14[i][1]) + if (Rfu.main_UNI_recvBuffer[i][1]) { - if (Rfu.unk_cee[i] != 0xFF && (Rfu.unk_14[i][0] >> 5) != ((Rfu.unk_cee[i] + 1) & 7)) + if (Rfu.unk_cee[i] != 0xFF && (Rfu.main_UNI_recvBuffer[i][0] >> 5) != ((Rfu.unk_cee[i] + 1) & 7)) { if (++Rfu.unk_cea[i] > 4) GetLinkmanErrorParams(0x8100); } else { - Rfu.unk_cee[i] = Rfu.unk_14[i][0] / 32; + Rfu.unk_cee[i] = Rfu.main_UNI_recvBuffer[i][0] / 32; Rfu.unk_cea[i] = 0; - Rfu.unk_14[i][0] &= 0x1f; + Rfu.main_UNI_recvBuffer[i][0] &= 0x1f; r0 = Rfu.linkPlayerIdx[i]; for (j = 0; j < 7; j++) { - gRecvCmds[r0][j] = (Rfu.unk_14[i][(j << 1) + 1] << 8) | Rfu.unk_14[i][(j << 1) + 0]; - Rfu.unk_14[i][(j << 1) + 1] = 0; - Rfu.unk_14[i][(j << 1) + 0] = 0; + gRecvCmds[r0][j] = (Rfu.main_UNI_recvBuffer[i][(j << 1) + 1] << 8) | Rfu.main_UNI_recvBuffer[i][(j << 1) + 0]; + Rfu.main_UNI_recvBuffer[i][(j << 1) + 1] = 0; + Rfu.main_UNI_recvBuffer[i][(j << 1) + 0] = 0; } } } @@ -783,58 +828,58 @@ static bool32 sub_80F9204(void) } flags >>= 1; } - sub_80F9038(); + MoveSendCmdToFirstRecvCmd(); RfuHandleReceiveCommand(0); CallRfuFunc(); - if (Rfu.unk_ce5 && !Rfu.unk_cd9) + if (Rfu.bmChatLeaderMaybe && !Rfu.linkClosing) { - gUnknown_203AC08.unk_0e = 0; + sRfuDebug.unk_0e = FALSE; rfu_clearSlot(TYPE_UNI_SEND | TYPE_UNI_RECV, Rfu.unk_cda); for (i = 0; i < RFU_CHILD_MAX; i++) { - if ((Rfu.unk_ce5 >> i) & 1) + if ((Rfu.bmChatLeaderMaybe >> i) & 1) { - rfu_setRecvBuffer(TYPE_UNI, i, Rfu.unk_14[i], sizeof(Rfu.unk_14[i])); + rfu_setRecvBuffer(TYPE_UNI, i, Rfu.main_UNI_recvBuffer[i], sizeof(Rfu.main_UNI_recvBuffer[i])); } } - sub_80F887C(Rfu.bm_PartnerFlags, Rfu.bm_PartnerFlags | Rfu.unk_ce5); - Rfu.unk_ce9 = Rfu.unk_ce5; - Rfu.bm_PartnerFlags |= Rfu.unk_ce5; - Rfu.unk_ce5 = 0; + ReassignPartnerIds(Rfu.bm_PartnerFlags, Rfu.bm_PartnerFlags | Rfu.bmChatLeaderMaybe); + Rfu.unk_ce9 = Rfu.bmChatLeaderMaybe; + Rfu.bm_PartnerFlags |= Rfu.bmChatLeaderMaybe; + Rfu.bmChatLeaderMaybe = 0; rfu_UNI_setSendData(Rfu.bm_PartnerFlags, Rfu.recvCmds, sizeof(Rfu.recvCmds)); - Rfu.unk_cda = sub_80F886C(Rfu.bm_PartnerFlags); + Rfu.unk_cda = CountTrailingZeroes(Rfu.bm_PartnerFlags); CreateTask(Task_ExchangeLinkPlayers, 0); } } else { Rfu.unk_cdc = 1; - Rfu.unk_0e = 0; + Rfu.unk_0e = FALSE; } - Rfu.unk_0e = 0; + Rfu.unk_0e = FALSE; } retval = Rfu.unk_cdc; return gRfuLinkStatus->sendSlotUNIFlag ? retval & 1 : FALSE; } -static void sub_80F94BC(u16 *a0, u8 *a1) +static void RfuBufferSendCmd(u16 *sendCmd, u8 *rfuSendBuf) { s32 i; - if (a0[0]) + if (sendCmd[0]) { - a0[0] |= (Rfu.unk_102 << 5); + sendCmd[0] |= (Rfu.unk_102 << 5); Rfu.unk_102 = (Rfu.unk_102 + 1) & 7; for (i = 0; i < 7; i++) { - a1[2 * i + 1] = a0[i] >> 8; - a1[2 * i + 0] = a0[i]; + rfuSendBuf[2 * i + 1] = sendCmd[i] >> 8; + rfuSendBuf[2 * i + 0] = sendCmd[i]; } } else { for (i = 0; i < 14; i++) - a1[i] = 0; + rfuSendBuf[i] = 0; } } @@ -842,16 +887,16 @@ static bool32 RfuProcessEnqueuedRecvBlock(void) { u8 i; u8 j; - u8 sp00[MAX_RFU_PLAYERS * (2 * (CMD_LENGTH - 1))]; - u8 sp48[2 * (CMD_LENGTH - 1)]; - u8 switchval; + u8 recvBuf[MAX_RFU_PLAYERS * (2 * (CMD_LENGTH - 1))]; + u8 sendBuf[2 * (CMD_LENGTH - 1)]; + u8 status; - RFU_queue_20_70_send(&Rfu.unk_124, sp00); + RfuRecvQueue_Dequeue(&Rfu.recvQueue, recvBuf); for (i = 0; i < MAX_RFU_PLAYERS; i++) { for (j = 0; j < CMD_LENGTH - 1; j++) { - gRecvCmds[i][j] = (sp00[i * 14 + (j << 1) + 1] << 8) | sp00[i * 14 + (j << 1) + 0]; + gRecvCmds[i][j] = (recvBuf[i * 14 + (j << 1) + 1] << 8) | recvBuf[i * 14 + (j << 1) + 0]; } } RfuHandleReceiveCommand(0); @@ -859,26 +904,28 @@ static bool32 RfuProcessEnqueuedRecvBlock(void) { rfu_REQ_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag); rfu_waitREQComplete(); - switchval = RfuGetErrorStatus(); - if (switchval != 1 && switchval != 6 && switchval != 9) - RfuSetErrorStatus(2, 0x9000); + status = RfuGetStatus(); + if (status != RFU_STATUS_FATAL_ERROR + && status != RFU_STATUS_JOIN_GROUP_NO + && status != RFU_STATUS_LEAVE_GROUP) + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x9000); rfu_clearAllSlot(); gReceivedRemoteLinkPlayers = FALSE; Rfu.RfuFunc = NULL; if (Rfu.unk_ce4 == 1) { - RfuSetErrorStatus(2, 0x9000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x9000); GetLinkmanErrorParams(0x9000); } lman.state = lman.next_state = 0; Rfu.unk_ce4 = 0; } - if (Rfu.unk_cd0) + if (Rfu.sem_UNI_SendRecv) { - Rfu.unk_cd0--; + Rfu.sem_UNI_SendRecv--; CallRfuFunc(); - sub_80F94BC(gSendCmd, sp48); - RFU_queue_40_14_recv(&Rfu.sendQueue, sp48); + RfuBufferSendCmd(gSendCmd, sendBuf); + RfuSendQueue_Enqueue(&Rfu.sendQueue, sendBuf); for (i = 0; i < CMD_LENGTH - 1; i++) gSendCmd[i] = 0; } @@ -887,47 +934,47 @@ static bool32 RfuProcessEnqueuedRecvBlock(void) static void HandleSendFailure(u8 unused, u32 flags) { - s32 i, j; + s32 i, j, temp; - const u8 *r10 = Rfu.cmd_8800_sendbuf.payload; - for (i = 0; i < Rfu.cmd_8800_sendbuf.count; i++) + const u8 *payload = Rfu.sendBlock.payload; + for (i = 0; i < Rfu.sendBlock.count; i++) { if (!(flags & 1)) { - sResendBlock16[0] = RFU_COMMAND_0x8900 | i; + sResendBlock16[0] = RFUCMD_SEND_BLOCK_STEP | i; for (j = 0; j < 7; j++) { - sResendBlock16[j + 1] = (r10[12 * i + (j << 1) + 1] << 8) | r10[12 * i + (j << 1) + 0]; + temp = j << 1; + sResendBlock16[j + 1] = (payload[12 * i + temp + 1] << 8) | payload[12 * i + temp + 0]; } for (j = 0; j < 7; j++) { - sResendBlock8[2 * j + 1] = sResendBlock16[j] >> 8; - sResendBlock8[2 * j + 0] = sResendBlock16[j]; - - j++;j--; // Needed to match; + temp = j << 1; + sResendBlock8[temp + 1] = sResendBlock16[j] >> 8; + sResendBlock8[temp + 0] = sResendBlock16[j]; } - RFU_queue_40_14_recv(&Rfu.sendQueue, sResendBlock8); - Rfu.cmd_8800_sendbuf.failedFlags |= (1 << i); + RfuSendQueue_Enqueue(&Rfu.sendQueue, sResendBlock8); + Rfu.sendBlock.failedFlags |= (1 << i); } flags >>= 1; } } -void Rfu_SetBlockReceivedFlag(u8 a0) +void Rfu_SetBlockReceivedFlag(u8 linkPlayerId) { - if (Rfu.parent_child == MODE_PARENT && a0) - Rfu.unk_61[a0] = 1; + if (Rfu.parent_child == MODE_PARENT && linkPlayerId != 0) + Rfu.numBlocksReceived[linkPlayerId] = 1; else - Rfu.unk_5c[a0] = 1; + Rfu.blockReceived[linkPlayerId] = TRUE; } -void Rfu_ResetBlockReceivedFlag(u8 a0) +void Rfu_ResetBlockReceivedFlag(u8 linkPlayerId) { - Rfu.unk_5c[a0] = 0; - Rfu.cmd_8800_recvbuf[a0].receiving = 0; + Rfu.blockReceived[linkPlayerId] = FALSE; + Rfu.recvBlock[linkPlayerId].receiving = RFU_RECV_IDLE; } -static u8 sub_80F9770(const u8 *a0) +static u8 RfuChildSetReceivedPlayerOrder(const u8 *template) { u8 i; @@ -935,21 +982,21 @@ static u8 sub_80F9770(const u8 *a0) return FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { - Rfu.linkPlayerIdx[i] = a0[i]; + Rfu.linkPlayerIdx[i] = template[i]; } - return a0[Rfu.child_slot]; + return template[Rfu.child_slot]; } static void RfuFunc_SendKeysToRfu(void) { - static u8 gUnknown_3001188; + static u8 heldKeyCount; if (gReceivedRemoteLinkPlayers && gHeldKeyCodeToSend != LINK_KEY_CODE_NULL && gLinkTransferringData != TRUE) { - gUnknown_3001188++; - gHeldKeyCodeToSend |= (gUnknown_3001188 << 8); - RfuPrepareSendBuffer(RFU_COMMAND_0xbe00); + heldKeyCount++; + gHeldKeyCodeToSend |= (heldKeyCount << 8); + RfuPrepareSendBuffer(RFUCMD_SEND_HELD_KEYS); } } @@ -969,7 +1016,7 @@ void StartSendingKeysToRfu(void) Rfu.RfuFunc = RfuFunc_SendKeysToRfu; } -void Rfu_set_zero(void) +void ClearLinkRfuCallback(void) { Rfu.RfuFunc = NULL; } @@ -983,55 +1030,55 @@ static void RfuHandleReceiveCommand(u8 unused) { switch (gRecvCmds[i][0] & 0xff00) { - case RFU_COMMAND_0x7800: + case RFUCMD_PLAYERS_LIST_2: if (Rfu.parent_child == MODE_CHILD && gReceivedRemoteLinkPlayers) return; // fallthrough - case RFU_COMMAND_0x7700: + case RFUCMD_PLAYERS_LIST: if (gRfuLinkStatus->parentChild == MODE_CHILD) { Rfu.playerCount = gRecvCmds[i][1]; - Rfu.unk_cce = sub_80F9770((u8 *)(gRecvCmds[i] + 2)); + Rfu.multiplayerId = RfuChildSetReceivedPlayerOrder((u8 *)(gRecvCmds[i] + 2)); } break; - case RFU_COMMAND_0x8800: - if (Rfu.cmd_8800_recvbuf[i].receiving == 0) + case RFUCMD_SEND_BLOCK_INIT: + if (Rfu.recvBlock[i].receiving == RFU_RECV_IDLE) { - Rfu.cmd_8800_recvbuf[i].next = 0; - Rfu.cmd_8800_recvbuf[i].count = gRecvCmds[i][1]; - Rfu.cmd_8800_recvbuf[i].owner = gRecvCmds[i][2]; - Rfu.cmd_8800_recvbuf[i].receivedFlags = 0; - Rfu.cmd_8800_recvbuf[i].receiving = 1; - Rfu.unk_5c[i] = 0; + Rfu.recvBlock[i].next = 0; + Rfu.recvBlock[i].count = gRecvCmds[i][1]; + Rfu.recvBlock[i].owner = gRecvCmds[i][2]; + Rfu.recvBlock[i].receivedFlags = 0; + Rfu.recvBlock[i].receiving = RFU_RECV_RECEIVING; + Rfu.blockReceived[i] = FALSE; } break; - case RFU_COMMAND_0x8900: - if (Rfu.cmd_8800_recvbuf[i].receiving == 1) + case RFUCMD_SEND_BLOCK_STEP: + if (Rfu.recvBlock[i].receiving == RFU_RECV_RECEIVING) { - Rfu.cmd_8800_recvbuf[i].next = gRecvCmds[i][0] & 0xff; - Rfu.cmd_8800_recvbuf[i].receivedFlags |= (1 << Rfu.cmd_8800_recvbuf[i].next); + Rfu.recvBlock[i].next = gRecvCmds[i][0] & 0xff; + Rfu.recvBlock[i].receivedFlags |= (1 << Rfu.recvBlock[i].next); for (j = 0; j < 6; j++) - gBlockRecvBuffer[i][Rfu.cmd_8800_recvbuf[i].next * 6 + j] = gRecvCmds[i][j + 1]; - if (Rfu.cmd_8800_recvbuf[i].receivedFlags == sAllBlocksReceived[Rfu.cmd_8800_recvbuf[i].count]) + gBlockRecvBuffer[i][Rfu.recvBlock[i].next * 6 + j] = gRecvCmds[i][j + 1]; + if (Rfu.recvBlock[i].receivedFlags == sAllBlocksReceived[Rfu.recvBlock[i].count]) { - Rfu.cmd_8800_recvbuf[i].receiving = 2; + Rfu.recvBlock[i].receiving = RFU_RECV_FINISHED; Rfu_SetBlockReceivedFlag(i); if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && gReceivedRemoteLinkPlayers && Rfu.parent_child == MODE_CHILD) ValidateAndReceivePokemonSioInfo(gBlockRecvBuffer); } } break; - case RFU_COMMAND_0xa100: - Rfu_InitBlockSend(gUnknown_843EC64[gRecvCmds[i][1]].buffer, (u16)gUnknown_843EC64[gRecvCmds[i][1]].size); + case RFUCMD_SEND_BLOCK_REQ: + Rfu_InitBlockSend(sBlockRequests[gRecvCmds[i][1]].address, (u16)sBlockRequests[gRecvCmds[i][1]].size); break; - case RFU_COMMAND_0x5f00: - Rfu.cmd5f00Ack[i] = 1; + case RFUCMD_READY_CLOSE_LINK: + Rfu.readyCloseLink[i] = TRUE; break; - case RFU_COMMAND_0x6600: - if (Rfu.cmd_6600_count == gRecvCmds[i][1]) - Rfu.cmd_6600_recvd[i] = 1; + case RFUCMD_READY_EXIT_STANDBY: + if (Rfu.resendExitStandbyCount == gRecvCmds[i][1]) + Rfu.readyExitStandby[i] = TRUE; break; - case RFU_COMMAND_0xed00: + case RFUCMD_PARENT_DISCONNECT: if (Rfu.parent_child == MODE_CHILD) { if (gReceivedRemoteLinkPlayers) @@ -1043,61 +1090,61 @@ static void RfuHandleReceiveCommand(u8 unused) Rfu.unk_ce4 = gRecvCmds[i][2]; } Rfu.playerCount = gRecvCmds[i][3]; - sub_80FA9D0(gRecvCmds[i][1]); + ClearSelectedLinkPlayerIds(gRecvCmds[i][1]); } } else { - RfuPrepareSendBuffer(RFU_COMMAND_0xee00); + RfuPrepareSendBuffer(RFUCMD_CHILD_DISCONNECT); gSendCmd[1] = gRecvCmds[i][1]; gSendCmd[2] = gRecvCmds[i][2]; gSendCmd[3] = gRecvCmds[i][3]; } break; - case RFU_COMMAND_0xee00: + case RFUCMD_CHILD_DISCONNECT: if (Rfu.parent_child == MODE_PARENT) { Rfu.bm_DisconnectSlot |= gRecvCmds[i][1]; Rfu.unk_ce4 = gRecvCmds[i][2]; - sub_80FA9D0(gRecvCmds[i][1]); + ClearSelectedLinkPlayerIds(gRecvCmds[i][1]); } break; - case RFU_COMMAND_0xbe00: + case RFUCMD_SEND_HELD_KEYS: gLinkPartnersHeldKeys[i] = gRecvCmds[i][1]; break; } - if (Rfu.parent_child == MODE_PARENT && Rfu.unk_61[i]) + if (Rfu.parent_child == MODE_PARENT && Rfu.numBlocksReceived[i]) { - if (Rfu.unk_61[i] == 4) + if (Rfu.numBlocksReceived[i] == 4) { - Rfu.unk_5c[i] = 1; - Rfu.unk_61[i] = 0; + Rfu.blockReceived[i] = TRUE; + Rfu.numBlocksReceived[i] = 0; } else - Rfu.unk_61[i]++; + Rfu.numBlocksReceived[i]++; } } } -static bool8 Cmd8000recvIsFinished(void) +static bool8 AreNoPlayersReceiving(void) { s32 i; for (i = 0; i < 5; i++) { - if (Rfu.cmd_8800_recvbuf[i].receiving) + if (Rfu.recvBlock[i].receiving != RFU_RECV_IDLE) return FALSE; } return TRUE; } -static bool8 sub_80F9C78(void) +static bool8 AreAllPlayersFinishedReceiving(void) { s32 i; for (i = 0; i < Rfu.playerCount; i++) { - if (Rfu.cmd_8800_recvbuf[i].receiving != 2 || Rfu.unk_5c[i] != 1) + if (Rfu.recvBlock[i].receiving != RFU_RECV_FINISHED || Rfu.blockReceived[i] != TRUE) return FALSE; } return TRUE; @@ -1111,7 +1158,7 @@ static void ResetSendDataManager(struct RfuBlockSend *data) data->receivedFlags = 0; data->sending = 0; data->owner = 0; - data->receiving = 0; + data->receiving = RFU_RECV_IDLE; } u8 Rfu_GetBlockReceivedStatus(void) @@ -1121,7 +1168,7 @@ u8 Rfu_GetBlockReceivedStatus(void) for (i = 0; i < 5; i++) { - if (Rfu.cmd_8800_recvbuf[i].receiving == 2 && Rfu.unk_5c[i] == 1) + if (Rfu.recvBlock[i].receiving == RFU_RECV_FINISHED && Rfu.blockReceived[i] == TRUE) { flags |= (1 << i); } @@ -1138,130 +1185,130 @@ static void RfuPrepareSendBuffer(u16 command) gSendCmd[0] = command; switch (command) { - case RFU_COMMAND_0x8800: - gSendCmd[1] = Rfu.cmd_8800_sendbuf.count; - gSendCmd[2] = Rfu.cmd_8800_sendbuf.owner + 0x80; + case RFUCMD_SEND_BLOCK_INIT: + gSendCmd[1] = Rfu.sendBlock.count; + gSendCmd[2] = Rfu.sendBlock.owner + 0x80; break; - case RFU_COMMAND_0xa100: - if (Cmd8000recvIsFinished()) + case RFUCMD_SEND_BLOCK_REQ: + if (AreNoPlayersReceiving()) gSendCmd[1] = Rfu.cmdA100_blockRequestType; break; - case RFU_COMMAND_0x7700: - case RFU_COMMAND_0x7800: + case RFUCMD_PLAYERS_LIST: + case RFUCMD_PLAYERS_LIST_2: tmp = Rfu.bm_PartnerFlags ^ Rfu.bm_DisconnectSlot; - Rfu.playerCount = gUnknown_843EC41[tmp] + 1; + Rfu.playerCount = sNumSetBits[tmp] + 1; gSendCmd[1] = Rfu.playerCount; buff = (u8 *)(gSendCmd + 2); for (i = 0; i < RFU_CHILD_MAX; i++) buff[i] = Rfu.linkPlayerIdx[i]; break; - case RFU_COMMAND_0x6600: - case RFU_COMMAND_0x5f00: - gSendCmd[1] = Rfu.cmd_6600_count; + case RFUCMD_READY_EXIT_STANDBY: + case RFUCMD_READY_CLOSE_LINK: + gSendCmd[1] = Rfu.resendExitStandbyCount; break; - case RFU_COMMAND_0x2f00: + case RFUCMD_SEND_PACKET: for (i = 0; i < 6; i++) - gSendCmd[1 + i] = Rfu.unk_f2[i]; + gSendCmd[1 + i] = Rfu.packet[i]; break; - case RFU_COMMAND_0xbe00: + case RFUCMD_SEND_HELD_KEYS: gSendCmd[1] = gHeldKeyCodeToSend; break; - case RFU_COMMAND_0xee00: + case RFUCMD_CHILD_DISCONNECT: break; - case RFU_COMMAND_0xed00: + case RFUCMD_PARENT_DISCONNECT: break; } } -void RfuPrepareSend0x2f00(void * data) +void Rfu_SendPacket(void * data) { - if (gSendCmd[0] == 0 && !RfuIsErrorStatus1or2()) + if (IsSendCmdComplete() && !RfuHasErrored()) { - memcpy(Rfu.unk_f2, data, sizeof(Rfu.unk_f2)); - RfuPrepareSendBuffer(RFU_COMMAND_0x2f00); + memcpy(Rfu.packet, data, sizeof(Rfu.packet)); + RfuPrepareSendBuffer(RFUCMD_SEND_PACKET); } } bool32 Rfu_InitBlockSend(const u8 *src, size_t size) { - bool8 r4; + bool8 sizeHasModulo; AGB_ASSERT_EX(size<=252, ABSPATH("rfu.c"), 1793); if (Rfu.RfuFunc != NULL) return FALSE; if (gSendCmd[0] != 0) return FALSE; - if (Rfu.cmd_8800_sendbuf.sending != 0) + if (Rfu.sendBlock.sending != 0) { - gUnknown_203AC08.unk_83++; + sRfuDebug.unk_83++; return FALSE; } - r4 = (size % 12) != 0; - Rfu.cmd_8800_sendbuf.owner = GetMultiplayerId(); - Rfu.cmd_8800_sendbuf.sending = 1; - Rfu.cmd_8800_sendbuf.count = (size / 12) + r4; - Rfu.cmd_8800_sendbuf.next = 0; + sizeHasModulo = (size % 12) != 0; + Rfu.sendBlock.owner = GetMultiplayerId(); + Rfu.sendBlock.sending = 1; + Rfu.sendBlock.count = (size / 12) + sizeHasModulo; + Rfu.sendBlock.next = 0; if (size > 0x100) // should never be reached - Rfu.cmd_8800_sendbuf.payload = src; + Rfu.sendBlock.payload = src; else { if (src != gBlockSendBuffer) memcpy(gBlockSendBuffer, src, size); - Rfu.cmd_8800_sendbuf.payload = gBlockSendBuffer; + Rfu.sendBlock.payload = gBlockSendBuffer; } - RfuPrepareSendBuffer(RFU_COMMAND_0x8800); - Rfu.RfuFunc = RfuFunc_HandleBlockSend; - Rfu.unk_5b = 0; + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_INIT); + Rfu.RfuFunc = HandleBlockSend; + Rfu.sendBlockInitDelay = 0; return TRUE; } -static void RfuFunc_HandleBlockSend(void) +static void HandleBlockSend(void) { - if (gSendCmd[0] == 0) + if (IsSendCmdComplete()) { - RfuPrepareSendBuffer(RFU_COMMAND_0x8800); + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_INIT); if (Rfu.parent_child == MODE_PARENT) { - if (++Rfu.unk_5b > 2) - Rfu.RfuFunc = RfuFunc_SendNextBlock; + if (++Rfu.sendBlockInitDelay > 2) + Rfu.RfuFunc = SendNextBlock; } else { - if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == RFU_COMMAND_0x8800) - Rfu.RfuFunc = RfuFunc_SendNextBlock; + if ((gRecvCmds[GetMultiplayerId()][0] & 0xff00) == RFUCMD_SEND_BLOCK_INIT) + Rfu.RfuFunc = SendNextBlock; } } } -static void RfuFunc_SendNextBlock(void) +static void SendNextBlock(void) { s32 i; - const u8 *src = Rfu.cmd_8800_sendbuf.payload; - gSendCmd[0] = RFU_COMMAND_0x8900 | Rfu.cmd_8800_sendbuf.next; + const u8 *src = Rfu.sendBlock.payload; + gSendCmd[0] = RFUCMD_SEND_BLOCK_STEP | Rfu.sendBlock.next; for (i = 0; i < 7; i++) - gSendCmd[i + 1] = (src[(i << 1) + Rfu.cmd_8800_sendbuf.next * 12 + 1] << 8) | src[(i << 1) + Rfu.cmd_8800_sendbuf.next * 12 + 0]; - Rfu.cmd_8800_sendbuf.next++; - if (Rfu.cmd_8800_sendbuf.count <= Rfu.cmd_8800_sendbuf.next) + gSendCmd[i + 1] = (src[(i << 1) + Rfu.sendBlock.next * 12 + 1] << 8) | src[(i << 1) + Rfu.sendBlock.next * 12 + 0]; + Rfu.sendBlock.next++; + if (Rfu.sendBlock.count <= Rfu.sendBlock.next) { - Rfu.cmd_8800_sendbuf.sending = 0; - Rfu.RfuFunc = RfuFunc_SendLastBlock; + Rfu.sendBlock.sending = 0; + Rfu.RfuFunc = SendLastBlock; } } -static void RfuFunc_SendLastBlock(void) +static void SendLastBlock(void) { - const u8 *src = Rfu.cmd_8800_sendbuf.payload; + const u8 *src = Rfu.sendBlock.payload; u8 mpId = GetMultiplayerId(); s32 i; if (Rfu.parent_child == MODE_CHILD) { - gSendCmd[0] = RFU_COMMAND_0x8900 | (Rfu.cmd_8800_sendbuf.count - 1); + gSendCmd[0] = RFUCMD_SEND_BLOCK_STEP | (Rfu.sendBlock.count - 1); for (i = 0; i < 7; i++) - gSendCmd[i + 1] = (src[(i << 1) + (Rfu.cmd_8800_sendbuf.count - 1) * 12 + 1] << 8) | src[(i << 1) + (Rfu.cmd_8800_sendbuf.count - 1) * 12 + 0]; - if ((u8)gRecvCmds[mpId][0] == Rfu.cmd_8800_sendbuf.count - 1) + gSendCmd[i + 1] = (src[(i << 1) + (Rfu.sendBlock.count - 1) * 12 + 1] << 8) | src[(i << 1) + (Rfu.sendBlock.count - 1) * 12 + 0]; + if ((u8)gRecvCmds[mpId][0] == Rfu.sendBlock.count - 1) { - if (Rfu.cmd_8800_recvbuf[mpId].receivedFlags != sAllBlocksReceived[Rfu.cmd_8800_recvbuf[mpId].count]) + if (Rfu.recvBlock[mpId].receivedFlags != sAllBlocksReceived[Rfu.recvBlock[mpId].count]) { - HandleSendFailure(mpId, Rfu.cmd_8800_recvbuf[mpId].receivedFlags); - gUnknown_203AC08.unk_64++; + HandleSendFailure(mpId, Rfu.recvBlock[mpId].receivedFlags); + sRfuDebug.unk_64++; } else Rfu.RfuFunc = NULL; @@ -1271,14 +1318,14 @@ static void RfuFunc_SendLastBlock(void) Rfu.RfuFunc = NULL; } -bool8 LinkRfu_PrepareCmd0xA100(u8 blockRequestType) +bool8 Rfu_SendBlockRequest(u8 blockRequestType) { Rfu.cmdA100_blockRequestType = blockRequestType; - RfuPrepareSendBuffer(RFU_COMMAND_0xa100); + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_REQ); return TRUE; } -static void RfuFunc_End5F00_PowerDownRfu(void) +static void OnDisconnect_PowerDownRfu(void) { rfu_clearAllSlot(); rfu_LMAN_powerDownRFU(); @@ -1287,14 +1334,14 @@ static void RfuFunc_End5F00_PowerDownRfu(void) Rfu.RfuFunc = NULL; } -static void RfuFunc_End5F00_ParentDisconnect(void) +static void DisconnectRfu(void) { rfu_REQ_disconnect(gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag); rfu_waitREQComplete(); - RfuFunc_End5F00_PowerDownRfu(); + OnDisconnect_PowerDownRfu(); } -static void RfuFunc_End5F00(void) +static void TryDisconnectRfu(void) { if (Rfu.parent_child == MODE_CHILD) { @@ -1302,7 +1349,7 @@ static void RfuFunc_End5F00(void) Rfu.unk_ce4 = 2; } else - Rfu.RfuFunc = RfuFunc_End5F00_ParentDisconnect; + Rfu.RfuFunc = DisconnectRfu; } void LinkRfu_FatalError(void) @@ -1312,7 +1359,8 @@ void LinkRfu_FatalError(void) Rfu.bm_DisconnectSlot = gRfuLinkStatus->connSlotFlag | gRfuLinkStatus->linkLossSlotFlag; } -static void RfuFunc_WaitAck5F00(void) +// RFU equivalent of LinkCB_WaitCloseLink +static void WaitAllReadyToCloseLink(void) { s32 i; u8 playerCount = Rfu.playerCount; @@ -1320,7 +1368,7 @@ static void RfuFunc_WaitAck5F00(void) for (i = 0; i < MAX_RFU_PLAYERS; i++) { - if (Rfu.cmd5f00Ack[i]) + if (Rfu.readyCloseLink[i]) count++; } if (count == playerCount) @@ -1329,87 +1377,88 @@ static void RfuFunc_WaitAck5F00(void) if (Rfu.parent_child == MODE_CHILD) { Rfu.errorState = 3; - RfuFunc_End5F00(); + TryDisconnectRfu(); } else - Rfu.RfuFunc = RfuFunc_End5F00; + Rfu.RfuFunc = TryDisconnectRfu; } } -static void RfuFunc_BuildCommand5F00(void) +static void SendReadyCloseLink(void) { - if (gSendCmd[0] == 0 && !Rfu.unk_ce8) + if (IsSendCmdComplete() && !Rfu.foundNewLeaderMaybe) { - RfuPrepareSendBuffer(RFU_COMMAND_0x5f00); - Rfu.RfuFunc = RfuFunc_WaitAck5F00; + RfuPrepareSendBuffer(RFUCMD_READY_CLOSE_LINK); + Rfu.RfuFunc = WaitAllReadyToCloseLink; } } -static void Task_WaitRfuFuncAndSetBuildCmd5F00(u8 taskId) +static void Task_TryReadyCloseLink(u8 taskId) { if (Rfu.RfuFunc == NULL) { - Rfu.unk_cd9 = 1; - Rfu.RfuFunc = RfuFunc_BuildCommand5F00; + Rfu.linkClosing = TRUE; + Rfu.RfuFunc = SendReadyCloseLink; DestroyTask(taskId); } } -void Rfu_BeginBuildAndSendCommand5F(void) +void Rfu_SetCloseLinkCallback(void) { - if (!FuncIsActiveTask(Task_WaitRfuFuncAndSetBuildCmd5F00)) - CreateTask(Task_WaitRfuFuncAndSetBuildCmd5F00, 5); + if (!FuncIsActiveTask(Task_TryReadyCloseLink)) + CreateTask(Task_TryReadyCloseLink, 5); } -static void RfuFunc_Send6600_3(void) +static void SendReadyExitStandbyUntilAllReady(void) { u8 playerCount; u8 i; if (GetMultiplayerId() != 0) // child { - if (Rfu.unk_124.count == 0 && Rfu.cmd_6600_timer > 60) + if (Rfu.recvQueue.count == 0 && Rfu.resendExitStandbyTimer > 60) { - RfuPrepareSendBuffer(RFU_COMMAND_0x6600); - Rfu.cmd_6600_timer = 0; + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); + Rfu.resendExitStandbyTimer = 0; } } playerCount = GetLinkPlayerCount(); for (i = 0; i < playerCount; i++) { - if (Rfu.cmd_6600_recvd[i] == 0) + if (Rfu.readyExitStandby[i] == 0) break; } if (i == playerCount) { for (i = 0; i < MAX_RFU_PLAYERS; i++) - Rfu.cmd_6600_recvd[i] = 0; - Rfu.cmd_6600_count++; + Rfu.readyExitStandby[i] = 0; + Rfu.resendExitStandbyCount++; Rfu.RfuFunc = NULL; } - Rfu.cmd_6600_timer++; + Rfu.resendExitStandbyTimer++; } -static void RfuFunc_Send6600_2(void) +static void LinkLeaderReadyToExitStandby(void) { - if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0) + if (Rfu.recvQueue.count == 0 && IsSendCmdComplete()) { - RfuPrepareSendBuffer(RFU_COMMAND_0x6600); - Rfu.RfuFunc = RfuFunc_Send6600_3; + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); + Rfu.RfuFunc = SendReadyExitStandbyUntilAllReady; } } -static void RfuFunc_Send6600_1(void) +// RFU equivalent of LinkCB_Standby and LinkCB_StandbyForAll +static void Rfu_LinkStandby(void) { u8 i; u8 playerCount; if (GetMultiplayerId() != 0) // child { - if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0) + if (Rfu.recvQueue.count == 0 && IsSendCmdComplete()) { - RfuPrepareSendBuffer(RFU_COMMAND_0x6600); - Rfu.RfuFunc = RfuFunc_Send6600_3; + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); + Rfu.RfuFunc = SendReadyExitStandbyUntilAllReady; } } else // parent @@ -1417,30 +1466,30 @@ static void RfuFunc_Send6600_1(void) playerCount = GetLinkPlayerCount(); for (i = 1; i < playerCount; i++) { - if (Rfu.cmd_6600_recvd[i] == 0) + if (Rfu.readyExitStandby[i] == 0) break; } if (i == playerCount) { - if (Rfu.unk_124.count == 0 && gSendCmd[0] == 0) + if (Rfu.recvQueue.count == 0 && IsSendCmdComplete()) { - RfuPrepareSendBuffer(RFU_COMMAND_0x6600); - Rfu.RfuFunc = RfuFunc_Send6600_2; + RfuPrepareSendBuffer(RFUCMD_READY_EXIT_STANDBY); + Rfu.RfuFunc = LinkLeaderReadyToExitStandby; } } } } -void LinkRfu_SetRfuFuncToSend6600(void) +void Rfu_SetLinkStandbyCallback(void) { if (Rfu.RfuFunc == NULL) { - Rfu.RfuFunc = RfuFunc_Send6600_1; - Rfu.cmd_6600_timer = 0; + Rfu.RfuFunc = Rfu_LinkStandby; + Rfu.resendExitStandbyTimer = 0; } } -bool32 RfuSerialNumberIsValid(u32 serialNo) +bool32 IsRfuSerialNumberValid(u32 serialNo) { s32 i; for (i = 0; sAcceptedSerialNos[i] != serialNo; i++) @@ -1451,25 +1500,25 @@ bool32 RfuSerialNumberIsValid(u32 serialNo) return TRUE; } -u8 ToggleLMANlinkRecovery(bool32 a0) +u8 ToggleLMANlinkRecovery(bool32 enable) { - if (!a0) - return rfu_LMAN_setLinkRecovery(0, 0); - rfu_LMAN_setLinkRecovery(1, 600); + if (!enable) + return rfu_LMAN_setLinkRecovery(FALSE, 0); + rfu_LMAN_setLinkRecovery(TRUE, 600); return 0; } -void sub_80FA4A8(void) +void Rfu_UnionRoomChat_StopLinkManager(void) { - Rfu.unk_cd9 = 1; - rfu_LMAN_stopManager(0); + Rfu.linkClosing = TRUE; + rfu_LMAN_stopManager(FALSE); } u8 LinkRfu_GetMultiplayerId(void) { if (Rfu.parent_child == MODE_PARENT) return 0; - return Rfu.unk_cce; + return Rfu.multiplayerId; } u8 GetRfuPlayerCount(void) @@ -1488,22 +1537,23 @@ static void CallRfuFunc(void) Rfu.RfuFunc(); } -static bool8 sub_80FA528(void) +static bool8 CheckForLeavingGroupMembers(void) { s32 i; bool8 retval = FALSE; for (i = 0; i < RFU_CHILD_MAX; i++) { - if (Rfu.unk_cd1[i] < 5 || Rfu.unk_cd1[i] > 6) + if (Rfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK + || Rfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO) { if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) { - if (Rfu.unk_cd5[i] == 8) + if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_LEAVE_GROUP_NOTICE) { - Rfu.unk_cd1[i] = 9; - Rfu.unk_cd5[i] = 10; + Rfu.partnerSendStatuses[i] = RFU_STATUS_LEAVE_GROUP; + Rfu.partnerRecvStatuses[i] = RFU_STATUS_10; rfu_clearSlot(TYPE_NI_RECV, i); - rfu_NI_setSendData(1 << i, 8, Rfu.unk_cd1 + i, 1); + rfu_NI_setSendData(1 << i, 8, &Rfu.partnerSendStatuses[i], 1); retval = TRUE; } @@ -1523,10 +1573,10 @@ bool32 sub_80FA5D4(void) s32 i; for (i = 0; i < RFU_CHILD_MAX; i++) { - if (Rfu.unk_cd5[i] == 11) + if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_11) { flags |= (1 << i); - Rfu.unk_cd5[i] = 0; + Rfu.partnerRecvStatuses[i] = RFU_STATUS_OK; } } if (flags) @@ -1536,18 +1586,18 @@ bool32 sub_80FA5D4(void) } for (i = 0; i < RFU_CHILD_MAX; i++) { - if (Rfu.unk_cd5[i] == 10 || Rfu.unk_cd5[i] == 11) + if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_10 || Rfu.partnerRecvStatuses[i] == RFU_STATUS_11) return TRUE; } return FALSE; } -bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName) +bool32 CheckTrainerHasLeftByIdAndName(u16 trainerId, const u8 *trainerName) { u8 r1 = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId); if (r1 == 0xFF) return TRUE; - if (Rfu.unk_cd1[r1] == 9) + if (Rfu.partnerSendStatuses[r1] == RFU_STATUS_LEAVE_GROUP) return TRUE; return FALSE; } @@ -1555,16 +1605,16 @@ bool32 TrainerIdAndNameStillInPartnersList(u16 trainerId, const u8 *trainerName) void SendByteToPartnerByIdAndName(u8 value, u16 trainerId, const u8 *trainerName) { u8 slotNo = GetPartnerIndexByNameAndTrainerID(trainerName, trainerId); - Rfu.unk_cd1[slotNo] = value; + Rfu.partnerSendStatuses[slotNo] = value; rfu_clearSlot(TYPE_NI_SEND, slotNo); - rfu_NI_setSendData(1 << slotNo, 8, Rfu.unk_cd1 + slotNo, 1); + rfu_NI_setSendData(1 << slotNo, 8, Rfu.partnerSendStatuses + slotNo, 1); } -void LinkRfuNIsend8(void) +void SendLeaveGroupNotice(void) { - Rfu.unk_c85 = 8; + Rfu.sendStatus = RFU_STATUS_LEAVE_GROUP_NOTICE; rfu_clearSlot(TYPE_NI_SEND, Rfu.child_slot); - rfu_NI_setSendData(1 << Rfu.child_slot, 8, &Rfu.unk_c85, 1); + rfu_NI_setSendData(1 << Rfu.child_slot, 8, &Rfu.sendStatus, 1); } u32 WaitSendByteToPartnerByIdAndName(u16 trainerId, const u8 *trainerName) @@ -1577,26 +1627,26 @@ u32 WaitSendByteToPartnerByIdAndName(u16 trainerId, const u8 *trainerName) return 0; } -static void sub_80FA738(void) +static void UpdateChildStatuses(void) { s32 i; - sub_80FA528(); + CheckForLeavingGroupMembers(); for (i = 0; i < RFU_CHILD_MAX; i++) { if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_FAILED) { - if (Rfu.unk_cd5[i] == 10) - Rfu.unk_cd5[i] = 11; + if (Rfu.partnerRecvStatuses[i] == RFU_STATUS_10) + Rfu.partnerRecvStatuses[i] = RFU_STATUS_11; rfu_clearSlot(TYPE_NI_SEND, i); } } } -static s32 sub_80FA788(void) +static s32 GetRfuRecvStatus(void) { - s32 retval = 0; - if (Rfu.unk_c85 == 8) + s32 retval = RFU_STATUS_OK; + if (Rfu.sendStatus == RFU_STATUS_LEAVE_GROUP_NOTICE) { if (gRfuSlotStatusNI[Rfu.child_slot]->send.state == SLOT_STATE_SEND_SUCCESS || gRfuSlotStatusNI[Rfu.child_slot]->send.state == SLOT_STATE_SEND_FAILED) rfu_clearSlot(TYPE_NI_SEND, Rfu.child_slot); @@ -1604,13 +1654,13 @@ static s32 sub_80FA788(void) if (gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_SUCCESS || gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN) { rfu_clearSlot(TYPE_NI_RECV, Rfu.child_slot); - RfuSetErrorStatus(Rfu.unk_c86, 0); - retval = Rfu.unk_c86; + RfuSetStatus(Rfu.recvStatus, 0); + retval = Rfu.recvStatus; } else if (gRfuSlotStatusNI[Rfu.child_slot]->recv.state == SLOT_STATE_RECV_FAILED) { rfu_clearSlot(TYPE_NI_RECV, Rfu.child_slot); - retval = 6; + retval = RFU_STATUS_JOIN_GROUP_NO; } return retval; } @@ -1619,18 +1669,18 @@ static void sub_80FA834(u8 taskId) { s32 i; - if (Rfu.unk_f1 == 1 || Rfu.unk_f1 == 2) + if (Rfu.status == RFU_STATUS_FATAL_ERROR || Rfu.status == RFU_STATUS_CONNECTION_ERROR) { - Rfu.unk_ce8 = FALSE; + Rfu.foundNewLeaderMaybe = FALSE; DestroyTask(taskId); } switch (gTasks[taskId].data[0]) { case 0: - if (Cmd8000recvIsFinished()) + if (AreNoPlayersReceiving()) { ResetBlockReceivedFlags(); - PrepareLocalLinkPlayerBlock(); + LocalLinkPlayerToBlock(); gTasks[taskId].data[0]++; } break; @@ -1638,16 +1688,16 @@ static void sub_80FA834(u8 taskId) if (Rfu.parent_child == MODE_PARENT) { if (gReceivedRemoteLinkPlayers) - RfuPrepareSendBuffer(RFU_COMMAND_0x7800); + RfuPrepareSendBuffer(RFUCMD_PLAYERS_LIST_2); else - RfuPrepareSendBuffer(RFU_COMMAND_0x7700); + RfuPrepareSendBuffer(RFUCMD_PLAYERS_LIST); gTasks[taskId].data[0] = 101; } else gTasks[taskId].data[0] = 2; break; case 101: - if (gSendCmd[0] == 0) + if (IsSendCmdComplete()) gTasks[taskId].data[0] = 2; break; case 2: @@ -1657,10 +1707,10 @@ static void sub_80FA834(u8 taskId) case 3: if (Rfu.parent_child == MODE_PARENT) { - if (Cmd8000recvIsFinished()) + if (AreNoPlayersReceiving()) { Rfu.cmdA100_blockRequestType = 0; - RfuPrepareSendBuffer(RFU_COMMAND_0xa100); + RfuPrepareSendBuffer(RFUCMD_SEND_BLOCK_REQ); gTasks[taskId].data[0]++; } } @@ -1668,7 +1718,7 @@ static void sub_80FA834(u8 taskId) gTasks[taskId].data[0]++; break; case 4: - if (sub_80F9C78()) + if (AreAllPlayersFinishedReceiving()) gTasks[taskId].data[0]++; break; case 5: @@ -1682,7 +1732,7 @@ static void sub_80FA834(u8 taskId) case 6: DestroyTask(taskId); gReceivedRemoteLinkPlayers = TRUE; - Rfu.unk_ce8 = FALSE; + Rfu.foundNewLeaderMaybe = FALSE; rfu_LMAN_setLinkRecovery(1, 600); if (Rfu.unionRoomChatters) { @@ -1690,7 +1740,7 @@ static void sub_80FA834(u8 taskId) { if ((Rfu.unionRoomChatters >> i) & 1) { - Rfu.unk_ce5 = 1 << i; + Rfu.bmChatLeaderMaybe = 1 << i; Rfu.unionRoomChatters ^= (1 << i); } } @@ -1699,13 +1749,13 @@ static void sub_80FA834(u8 taskId) } } -static void sub_80FA9D0(u16 a0) +static void ClearSelectedLinkPlayerIds(u16 disconnectMask) { s32 i; for (i = 0; i < RFU_CHILD_MAX; i++) { - if ((a0 >> i) & 1) + if ((disconnectMask >> i) & 1) Rfu.linkPlayerIdx[i] = 0; } } @@ -1719,7 +1769,7 @@ static void ReceiveRfuLinkPlayers(const struct SioInfo *chunk) for (i = 0; i < MAX_RFU_PLAYERS; i++) { gLinkPlayers[i] = chunk->linkPlayers[i]; - IntlConvertLinkPlayerName(gLinkPlayers + i); + ConvertLinkPlayerName(gLinkPlayers + i); } } @@ -1739,23 +1789,23 @@ static void Task_ExchangeLinkPlayers(u8 taskId) struct LinkPlayerBlock *r2; struct SioInfo *r5; u8 r4 = Rfu.linkPlayerIdx[gUnknown_843EC38[Rfu.unk_ce9]]; - if (Rfu.unk_f1 == 1 || Rfu.unk_f1 == 2) + if (Rfu.status == 1 || Rfu.status == 2) { - Rfu.unk_ce8 = FALSE; + Rfu.foundNewLeaderMaybe = FALSE; DestroyTask(taskId); } switch (gTasks[taskId].data[0]) { case 0: - if (gSendCmd[0] == 0) + if (IsSendCmdComplete()) { ResetBlockReceivedFlag(r4); - RfuPrepareSendBuffer(RFU_COMMAND_0x7800); + RfuPrepareSendBuffer(RFUCMD_PLAYERS_LIST_2); gTasks[taskId].data[0]++; } break; case 1: - if (gSendCmd[0] == 0) + if (IsSendCmdComplete()) gTasks[taskId].data[0]++; break; case 2: @@ -1764,7 +1814,7 @@ static void Task_ExchangeLinkPlayers(u8 taskId) ResetBlockReceivedFlag(r4); r2 = (struct LinkPlayerBlock *)gBlockRecvBuffer[r4]; gLinkPlayers[r4] = r2->linkPlayer; - IntlConvertLinkPlayerName(gLinkPlayers + r4); + ConvertLinkPlayerName(gLinkPlayers + r4); gTasks[taskId].data[0]++; } break; @@ -1792,16 +1842,16 @@ static void Task_ExchangeLinkPlayers(u8 taskId) { CpuFill16(0, gBlockRecvBuffer, sizeof(struct SioInfo)); ResetBlockReceivedFlag(0); - Rfu.unk_ce8 = FALSE; + Rfu.foundNewLeaderMaybe = FALSE; if (Rfu.unionRoomChatters) { for (i = 0; i < RFU_CHILD_MAX; i++) { if ((Rfu.unionRoomChatters >> i) & 1) { - Rfu.unk_ce5 = 1 << i; + Rfu.bmChatLeaderMaybe = 1 << i; Rfu.unionRoomChatters ^= (1 << i); - Rfu.unk_ce8 = TRUE; + Rfu.foundNewLeaderMaybe = TRUE; break; } } @@ -1814,14 +1864,14 @@ static void Task_ExchangeLinkPlayers(u8 taskId) static void sub_80FACF0(u8 taskId) { - if (Rfu.unk_f1 == 1 || Rfu.unk_f1 == 2) + if (Rfu.status == RFU_STATUS_FATAL_ERROR || Rfu.status == RFU_STATUS_CONNECTION_ERROR) DestroyTask(taskId); switch (gTasks[taskId].data[0]) { case 0: - if (Rfu.playerCount) + if (Rfu.playerCount != 0) { - PrepareLocalLinkPlayerBlock(); + LocalLinkPlayerToBlock(); SendBlock(0, gBlockSendBuffer, sizeof(struct LinkPlayerBlock)); gTasks[taskId].data[0]++; } @@ -1850,15 +1900,20 @@ static void RfuCheckErrorStatus(void) gWirelessCommType = 2; SetMainCallback2(CB2_LinkError); gMain.savedCallback = CB2_LinkError; - SetLinkErrorFromRfu((Rfu.linkman_msg << 16) | (Rfu.linkman_param[0] << 8) | Rfu.linkman_param[1], Rfu.unk_124.count, Rfu.sendQueue.count, RfuGetErrorStatus() == 2); + SetLinkErrorFromRfu( + (Rfu.linkman_msg << 16) | (Rfu.linkman_param[0] << 8) | Rfu.linkman_param[1], + Rfu.recvQueue.count, + Rfu.sendQueue.count, + RfuGetStatus() == RFU_STATUS_CONNECTION_ERROR + ); Rfu.errorState = 2; CloseLink(); } - else if (Rfu.sendQueue.full == 1 || Rfu.unk_124.full == 1) + else if (Rfu.sendQueue.full == TRUE || Rfu.recvQueue.full == TRUE) { if (lman.childClockSlave_flag) rfu_LMAN_requestChangeAgbClockMaster(); - RfuSetErrorStatus(1, 0x7000); + RfuSetStatus(RFU_STATUS_FATAL_ERROR, 0x7000); GetLinkmanErrorParams(0x7000); } } @@ -1882,13 +1937,13 @@ bool32 LinkRfuMain1(void) { switch (Rfu.parent_child) { - case 1: + case MODE_PARENT: sub_80F911C(); break; - case 0: + case MODE_CHILD: retval = RfuProcessEnqueuedRecvBlock(); break; - case 2: + case MODE_P_C_SWITCH: rfu_REQ_recvData_then_sendData(); break; } @@ -1916,7 +1971,7 @@ static void CopyPlayerNameToUnameBuffer(void) void ClearAndInitHostRFUtgtGname(void) { memset(&gHostRFUtgtGnameBuffer, 0, RFU_GAME_NAME_LENGTH); - InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, 0, FALSE, 0); + InitHostRFUtgtGname(&gHostRFUtgtGnameBuffer, ACTIVITY_NONE, FALSE, 0); } void SetHostRFUtgtGname(u8 activity, u32 child_sprite_genders, u32 started) @@ -2034,9 +2089,9 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count) struct GFtgtGname *structPtr = (void *)&gRfuLinkStatus->partner[i].gname; if (structPtr->activity == GetHostRFUtgtGname()->activity) { - Rfu.unk_cd1[i] = 0; - Rfu.unk_cd5[i] = 0; - rfu_setRecvBuffer(TYPE_NI, i, Rfu.unk_cd5 + i, 1); + Rfu.partnerSendStatuses[i] = RFU_STATUS_OK; + Rfu.partnerRecvStatuses[i] = RFU_STATUS_OK; + rfu_setRecvBuffer(TYPE_NI, i, Rfu.partnerRecvStatuses + i, 1); } else { @@ -2079,7 +2134,7 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count) else sub_80FB174(); } - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); break; case 0x34: break; @@ -2088,7 +2143,7 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count) case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET: break; case LMAN_MSG_LMAN_API_ERROR_RETURN: - RfuSetErrorStatus(1, msg); + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); GetLinkmanErrorParams(msg); Rfu.isShuttingDown = TRUE; break; @@ -2097,8 +2152,8 @@ static void LmanCallback_Parent2(u8 msg, u8 param_count) case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA: case LMAN_MSG_RFU_FATAL_ERROR: GetLinkmanErrorParams(msg); - RfuSetErrorStatus(1, msg); - Rfu.unk_cdb = 1; + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); + Rfu.unk_cdb = TRUE; break; } } @@ -2121,38 +2176,38 @@ static void LmanCallback_Child(u8 msg, u8 param_count) Rfu.child_slot = lman.param[0]; break; case LMAN_MSG_CONNECT_PARENT_FAILED: - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); break; case LMAN_MSG_CHILD_NAME_SEND_COMPLETED: Rfu.state = 11; - Rfu.unk_c85 = 0; - Rfu.unk_c86 = 0; - rfu_setRecvBuffer(TYPE_NI, Rfu.child_slot, &Rfu.unk_c86, 1); + Rfu.sendStatus = RFU_STATUS_OK; + Rfu.recvStatus = RFU_STATUS_OK; + rfu_setRecvBuffer(TYPE_NI, Rfu.child_slot, &Rfu.recvStatus, 1); rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f)); break; case LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED: - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); break; case LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED: Rfu.linkLossRecoveryState = 2; - if (Rfu.unk_c86 == 6) + if (Rfu.recvStatus == RFU_STATUS_JOIN_GROUP_NO) break; case LMAN_MSG_LINK_RECOVERY_FAILED_AND_DISCONNECTED: if (Rfu.linkLossRecoveryState != 2) Rfu.linkLossRecoveryState = 4; - if (Rfu.unk_c86 != 9) - RfuSetErrorStatus(2, msg); - rfu_dbg_print_str("LINK LOSS DISCONNECT!", 5, 5); + if (Rfu.recvStatus != RFU_STATUS_LEAVE_GROUP) + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); + Debug_PrintString("LINK LOSS DISCONNECT!", 5, 5); if (gReceivedRemoteLinkPlayers == 1) GetLinkmanErrorParams(msg); break; case LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY: Rfu.linkLossRecoveryState = 1; - rfu_dbg_print_str("LINK LOSS RECOVERY NOW", 5, 5); + Debug_PrintString("LINK LOSS RECOVERY NOW", 5, 5); break; case LMAN_MSG_LINK_RECOVERY_SUCCESSED: Rfu.linkLossRecoveryState = 3; - Rfu.unk_c3c = 1; + Rfu.linkRecovered = 1; break; case 0x34: break; @@ -2161,7 +2216,7 @@ static void LmanCallback_Child(u8 msg, u8 param_count) case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET: break; case LMAN_MSG_LMAN_API_ERROR_RETURN: - RfuSetErrorStatus(1, msg); + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); GetLinkmanErrorParams(msg); Rfu.isShuttingDown = TRUE; break; @@ -2169,9 +2224,9 @@ static void LmanCallback_Child(u8 msg, u8 param_count) case LMAN_MSG_WATCH_DOG_TIMER_ERROR: case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA: case LMAN_MSG_RFU_FATAL_ERROR: - RfuSetErrorStatus(1, msg); + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); GetLinkmanErrorParams(msg); - Rfu.unk_cdb = 1; + Rfu.unk_cdb = TRUE; break; } } @@ -2218,20 +2273,20 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) Rfu.state = 17; break; case LMAN_MSG_NEW_CHILD_CONNECT_DETECTED: - RfuSetErrorStatus(4, 0); + RfuSetStatus(RFU_STATUS_NEW_CHILD_DETECTED, 0); break; case LMAN_MSG_NEW_CHILD_CONNECT_ACCEPTED: - if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && Rfu.unk_cd9 == 0) + if (GetHostRFUtgtGname()->activity == (ACTIVITY_CHAT | IN_UNION_ROOM) && !Rfu.linkClosing) { u8 bmAcceptSlot = GetNewChildrenInUnionRoomChat(lman.param[0]); if (bmAcceptSlot != 0) { - r1 = 1 << sub_80F886C(bmAcceptSlot); - if (Rfu.unionRoomChatters == 0 && !Rfu.unk_ce8) + r1 = 1 << CountTrailingZeroes(bmAcceptSlot); + if (Rfu.unionRoomChatters == 0 && !Rfu.foundNewLeaderMaybe) { - Rfu.unk_ce5 = r1; + Rfu.bmChatLeaderMaybe = r1; Rfu.unionRoomChatters |= (r1 ^ bmAcceptSlot); - Rfu.unk_ce8 = TRUE; + Rfu.foundNewLeaderMaybe = TRUE; } else { @@ -2258,11 +2313,11 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) case LMAN_MSG_END_WAIT_CHILD_NAME: if (GetHostRFUtgtGname()->activity != (ACTIVITY_CHAT | IN_UNION_ROOM) && lman.acceptCount > 1) { - r1 = 1 << sub_80F886C(lman.param[0]); + r1 = 1 << CountTrailingZeroes(lman.param[0]); rfu_REQ_disconnect(lman.acceptSlot_flag ^ r1); rfu_waitREQComplete(); } - if (Rfu.state == 0xF) + if (Rfu.state == 15) Rfu.state = 16; break; case LMAN_MSG_PARENT_FOUND: @@ -2282,16 +2337,16 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) } else { - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); } break; case LMAN_MSG_CHILD_NAME_SEND_COMPLETED: Rfu.state = 13; - RfuSetErrorStatus(3, 0); + RfuSetStatus(RFU_STATUS_CHILD_SEND_COMPLETE, 0); rfu_setRecvBuffer(TYPE_UNI, Rfu.child_slot, Rfu.unk_c3f, sizeof(Rfu.unk_c3f)); break; case LMAN_MSG_CHILD_NAME_SEND_FAILED_AND_DISCONNECTED: - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); break; case LMAN_MSG_LINK_LOSS_DETECTED_AND_START_RECOVERY: if (lman.acceptSlot_flag & lman.param[0]) @@ -2300,7 +2355,7 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) case LMAN_MSG_LINK_RECOVERY_SUCCESSED: Rfu.linkLossRecoveryState = 3; if (gRfuLinkStatus->parentChild == MODE_CHILD) - Rfu.unk_c3c = 1; + Rfu.linkRecovered = 1; break; case LMAN_MSG_LINK_LOSS_DETECTED_AND_DISCONNECTED: Rfu.linkLossRecoveryState = 2; @@ -2328,7 +2383,7 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) if (gRfuLinkStatus->parentChild == MODE_NEUTRAL && lman.pcswitch_flag == 0 && FuncIsActiveTask(Task_LinkRfu_UnionRoomListen) == TRUE) Rfu.state = 17; - RfuSetErrorStatus(2, msg); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, msg); break; case LMAN_MSG_LINK_DISCONNECTED_BY_USER: Rfu.bm_DisconnectSlot = 0; @@ -2338,7 +2393,7 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) case LMAN_MSG_MANAGER_FORCED_STOPPED_AND_RFU_RESET: break; case LMAN_MSG_LMAN_API_ERROR_RETURN: - RfuSetErrorStatus(1, msg); + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); GetLinkmanErrorParams(msg); Rfu.isShuttingDown = TRUE; break; @@ -2347,8 +2402,8 @@ static void LmanCallback_Parent(u8 msg, u8 param_count) case LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA: case LMAN_MSG_RFU_FATAL_ERROR: GetLinkmanErrorParams(msg); - RfuSetErrorStatus(1, msg); - Rfu.unk_cdb = 0; + RfuSetStatus(RFU_STATUS_FATAL_ERROR, msg); + Rfu.unk_cdb = FALSE; break; } } @@ -2358,29 +2413,29 @@ void sub_80FB9D0(void) Rfu.unk_ce4 = 2; } -void RfuSetErrorStatus(u8 a0, u16 msg) +void RfuSetStatus(u8 status, u16 msg) { - Rfu.unk_f1 = a0; + Rfu.status = status; Rfu.linkman_msg = msg; } -u8 RfuGetErrorStatus(void) +u8 RfuGetStatus(void) { - return Rfu.unk_f1; + return Rfu.status; } -bool32 RfuIsErrorStatus1or2(void) +bool32 RfuHasErrored(void) { - u32 var = RfuGetErrorStatus(); - if (var == 1 || var == 2) + u32 status = RfuGetStatus(); + if (status == RFU_STATUS_FATAL_ERROR || status == RFU_STATUS_CONNECTION_ERROR) return TRUE; else return FALSE; } -bool32 GetRfuUnkCE8(void) +bool32 RfuHasFoundNewLeader(void) { - return Rfu.unk_ce8; + return Rfu.foundNewLeaderMaybe; } bool8 Rfu_IsMaster(void) @@ -2393,7 +2448,7 @@ void RFUVSync(void) rfu_LMAN_syncVBlank(); } -void sub_80FBA44(void) +void ClearRecvCommands(void) { CpuFill32(0, gRecvCmds, sizeof(gRecvCmds)); } @@ -2416,7 +2471,7 @@ static void sub_80FBA78(void) SetVBlankCallback(sub_80FBA64); if (IsWirelessAdapterConnected()) { - gLinkType = LINKTYPE_0x1111; + gLinkType = LINKTYPE_TRADE; SetWirelessCommType1(); OpenLink(); SeedRng(gMain.vblankCounter2); @@ -2441,13 +2496,13 @@ bool32 IsUnionRoomListenTaskActive(void) void LinkRfu_CreateIdleTask(void) { if (!FuncIsActiveTask(Task_idle)) - Rfu.unk_66 = CreateTask(Task_idle, 0); + Rfu.idleTaskId = CreateTask(Task_idle, 0); } void LinkRfu_DestroyIdleTask(void) { if (FuncIsActiveTask(Task_idle) == TRUE) - DestroyTask(Rfu.unk_66); + DestroyTask(Rfu.idleTaskId); } static void sub_80FBB74(void) @@ -2486,7 +2541,7 @@ void InitializeRfuLinkManager_EnterUnionRoom(void) sRfuReqConfig = sRfuReqConfigTemplate; sRfuReqConfig.linkRecovery_enable = 0; sRfuReqConfig.linkRecovery_period = 600; - Rfu.unk_67 = CreateTask(Task_LinkRfu_UnionRoomListen, 1); + Rfu.searchTaskId = CreateTask(Task_LinkRfu_UnionRoomListen, 1); } static u16 ReadU16(const void *ptr) @@ -2510,7 +2565,7 @@ static u8 GetPartnerIndexByNameAndTrainerID(const u8 *trainerName, u16 trainerId for (i = 0; i < RFU_CHILD_MAX; i++) { u16 partnerTrainerId = ReadU16(((struct GFtgtGname *)gRfuLinkStatus->partner[i].gname)->unk_00.playerTrainerId); - if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[i].serialNo) + if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[i].serialNo) && !StringCompare(trainerName, gRfuLinkStatus->partner[i].uname) && trainerId == partnerTrainerId) { @@ -2530,7 +2585,7 @@ static void RfuReqDisconnectSlot(u32 bmDisconnectSlot) Rfu.bm_PartnerFlags &= ~(bmDisconnectSlot); rfu_clearSlot(TYPE_UNI_SEND, Rfu.unk_cda); rfu_UNI_setSendData(Rfu.bm_PartnerFlags, Rfu.recvCmds, 70); - Rfu.unk_cda = sub_80F886C(Rfu.bm_PartnerFlags); + Rfu.unk_cda = CountTrailingZeroes(Rfu.bm_PartnerFlags); } void RequestDisconnectSlotByTrainerNameAndId(const u8 *trainerName, u16 trainerId) @@ -2559,12 +2614,12 @@ void sub_80FBD6C(u32 a0) static void sub_80FBDB8(u8 taskId) { - if (gSendCmd[0] == 0 && !Rfu.unk_ce8) + if (IsSendCmdComplete() && !Rfu.foundNewLeaderMaybe) { - RfuPrepareSendBuffer(RFU_COMMAND_0xed00); + RfuPrepareSendBuffer(RFUCMD_PARENT_DISCONNECT); gSendCmd[1] = gTasks[taskId].data[0]; gSendCmd[2] = gTasks[taskId].data[1]; - Rfu.playerCount -= gUnknown_843EC41[gTasks[taskId].data[0]]; + Rfu.playerCount -= sNumSetBits[gTasks[taskId].data[0]]; gSendCmd[3] = Rfu.playerCount; DestroyTask(taskId); } @@ -2590,7 +2645,7 @@ static void Task_RfuReconnectWithParent(u8 taskId) { s16 *data = gTasks[taskId].data; - if (RfuStateIs7AndPlayerIsChild()) + if (ContactedByParentAttemptingToReconnect()) { u8 id = GetPartnerIndexByNameAndTrainerID((u8*)data, ReadU16(&data[8])); if (id != 0xFF) @@ -2607,7 +2662,7 @@ static void Task_RfuReconnectWithParent(u8 taskId) } else { - RfuSetErrorStatus(2, 0x7000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x7000); DestroyTask(taskId); } } @@ -2624,7 +2679,7 @@ static void Task_RfuReconnectWithParent(u8 taskId) if (data[15] > 240) { - RfuSetErrorStatus(2, 0x7000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x7000); DestroyTask(taskId); } } @@ -2634,7 +2689,7 @@ void CreateTask_RfuReconnectWithParent(const u8 *trainerName, u16 trainerId) u8 taskId; s16 *data; - Rfu.unk_f1 = 0; + Rfu.status = RFU_STATUS_OK; taskId = CreateTask(Task_RfuReconnectWithParent, 3); data = gTasks[taskId].data; StringCopy((u8*)(data), trainerName); @@ -2654,7 +2709,7 @@ static bool32 ShouldRejectPartnerConnectionBasedOnActivity(s16 activity, struct } else if (activity == (ACTIVITY_TRADE | IN_UNION_ROOM)) { - struct GFtgtGname *myTradeGname = (struct GFtgtGname *)&Rfu.unk_104.gname; + struct GFtgtGname *myTradeGname = (struct GFtgtGname *)&Rfu.tgtData.gname; if (myTradeGname->species == SPECIES_EGG) { if (partnerGname->species == myTradeGname->species) @@ -2675,19 +2730,19 @@ static bool32 ShouldRejectPartnerConnectionBasedOnActivity(s16 activity, struct static void sub_80FC028(u8 taskId) { - if (Rfu.unk_f1 == 4) + if (Rfu.status == RFU_STATUS_NEW_CHILD_DETECTED) DestroyTask(taskId); if (++gTasks[taskId].data[0] > 300) { - RfuSetErrorStatus(2, 0x7000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x7000); DestroyTask(taskId); } if (Rfu.parentId != 0 && lman.parent_child == MODE_CHILD) { - u16 trainerId = ReadU16(((struct GFtgtGname *)&Rfu.unk_104.gname)->unk_00.playerTrainerId); - u8 id = GetPartnerIndexByNameAndTrainerID(Rfu.unk_104.uname, trainerId); + u16 trainerId = ReadU16(((struct GFtgtGname *)&Rfu.tgtData.gname)->unk_00.playerTrainerId); + u8 id = GetPartnerIndexByNameAndTrainerID(Rfu.tgtData.uname, trainerId); if (id != 0xFF) { if (!ShouldRejectPartnerConnectionBasedOnActivity(gTasks[taskId].data[1], (struct GFtgtGname *)&gRfuLinkStatus->partner[id].gname)) @@ -2700,7 +2755,7 @@ static void sub_80FC028(u8 taskId) } else { - RfuSetErrorStatus(2, 0x7000); + RfuSetStatus(RFU_STATUS_CONNECTION_ERROR, 0x7000); DestroyTask(taskId); } } @@ -2712,9 +2767,9 @@ void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 activity) u8 taskId, taskId2; Rfu.unk_ccf = 0; - Rfu.unk_f1 = 0; - StringCopy(Rfu.unk_104.uname, name); - memcpy(Rfu.unk_104.gname, structPtr, RFU_GAME_NAME_LENGTH); + Rfu.status = RFU_STATUS_OK; + StringCopy(Rfu.tgtData.uname, name); + memcpy(Rfu.tgtData.gname, structPtr, RFU_GAME_NAME_LENGTH); rfu_LMAN_forceChangeSP(); taskId = CreateTask(sub_80FC028, 2); gTasks[taskId].data[1] = activity; @@ -2731,7 +2786,7 @@ void sub_80FC114(const u8 *name, struct GFtgtGname *structPtr, u8 activity) } } -bool8 sub_80FC1B0(void) +bool8 IsRfuRecoveringFromLinkLoss(void) { if (Rfu.linkLossRecoveryState == 1) return TRUE; @@ -2745,19 +2800,19 @@ bool32 sub_80FC1CC(void) for (i = 0; i < RFU_CHILD_MAX; i++) { - if ((lman.acceptSlot_flag >> i) & 1 && Rfu.unk_cd1[i] == 0) + if ((lman.acceptSlot_flag >> i) & 1 && Rfu.partnerSendStatuses[i] == 0) return FALSE; } return TRUE; } -static void rfu_dbg_clear(void) +static void Debug_PrintEmpty(void) { s32 i; for (i = 0; i < 20; i++) - rfu_dbg_print_str(" ", 0, i); + Debug_PrintString(" ", 0, i); } static const char gUnknown_843EE47[16] = { @@ -2773,44 +2828,44 @@ static const char gUnknown_843EE57[9] = { static const char gUnknown_843EE60[] = {' ', '\0'}; static const char gUnknown_843EE62[] = {'*', '\0'}; -static void rfu_dbg_print_status(void) +static void Debug_PrintStatus(void) { s32 i, j; - rfu_dbg_print_num(GetBlockReceivedStatus(), 0x1C, 0x13, 2); - rfu_dbg_print_num(gRfuLinkStatus->connSlotFlag, 0x14, 1, 1); - rfu_dbg_print_num(gRfuLinkStatus->linkLossSlotFlag, 0x17, 1, 1); + Debug_PrintNum(GetBlockReceivedStatus(), 0x1C, 0x13, 2); + Debug_PrintNum(gRfuLinkStatus->connSlotFlag, 0x14, 1, 1); + Debug_PrintNum(gRfuLinkStatus->linkLossSlotFlag, 0x17, 1, 1); if (Rfu.parent_child == MODE_PARENT) { for (i = 0; i < RFU_CHILD_MAX; i++) { if ((gRfuLinkStatus->getNameFlag >> i) & 1) { - rfu_dbg_print_num(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4); - rfu_dbg_print_str((void*) &gRfuLinkStatus->partner[i].gname, 6, i + 3); - rfu_dbg_print_str(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); + Debug_PrintNum(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4); + Debug_PrintString((void *) &gRfuLinkStatus->partner[i].gname, 6, i + 3); + Debug_PrintString(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); } } for (i = 0; i < RFU_CHILD_MAX; i++) { for (j = 0; j < 14; j++) { - rfu_dbg_print_num(Rfu.unk_14[i][j], j * 2, i + 11, 2); + Debug_PrintNum(Rfu.main_UNI_recvBuffer[i][j], j * 2, i + 11, 2); } } - rfu_dbg_print_str("NOWSLOT", 1, 0xF); + Debug_PrintString("NOWSLOT", 1, 0xF); } else if (gRfuLinkStatus->connSlotFlag != 0 && gRfuLinkStatus->getNameFlag != 0) { for (i = 0; i < RFU_CHILD_MAX; i++) { - rfu_dbg_print_num(0, 1, i + 3, 4); - rfu_dbg_print_str(gUnknown_843EE47, 6, i + 3); - rfu_dbg_print_str(gUnknown_843EE57, 0x16, i + 3); + Debug_PrintNum(0, 1, i + 3, 4); + Debug_PrintString(gUnknown_843EE47, 6, i + 3); + Debug_PrintString(gUnknown_843EE57, 0x16, i + 3); } - rfu_dbg_print_num(gRfuLinkStatus->partner[Rfu.child_slot].serialNo, 1, 3, 4); - rfu_dbg_print_str(gRfuLinkStatus->partner[Rfu.child_slot].gname, 6, 3); - rfu_dbg_print_str(gRfuLinkStatus->partner[Rfu.child_slot].uname, 0x16, 3); + Debug_PrintNum(gRfuLinkStatus->partner[Rfu.child_slot].serialNo, 1, 3, 4); + Debug_PrintString(gRfuLinkStatus->partner[Rfu.child_slot].gname, 6, 3); + Debug_PrintString(gRfuLinkStatus->partner[Rfu.child_slot].uname, 0x16, 3); } else { @@ -2818,16 +2873,16 @@ static void rfu_dbg_print_status(void) { if (gRfuLinkStatus->partner[i].slot != 0xFF) { - rfu_dbg_print_num(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4); - rfu_dbg_print_num(gRfuLinkStatus->partner[i].id, 6, i + 3, 4); - rfu_dbg_print_str(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); + Debug_PrintNum(gRfuLinkStatus->partner[i].serialNo, 1, i + 3, 4); + Debug_PrintNum(gRfuLinkStatus->partner[i].id, 6, i + 3, 4); + Debug_PrintString(gRfuLinkStatus->partner[i].uname, 0x16, i + 3); } } for (; i < RFU_CHILD_MAX; i++) { - rfu_dbg_print_num(0, 1, i + 3, 4); - rfu_dbg_print_str(gUnknown_843EE47, 6, i + 3); - rfu_dbg_print_str(gUnknown_843EE57, 0x16, i + 3); + Debug_PrintNum(0, 1, i + 3, 4); + Debug_PrintString(gUnknown_843EE47, 6, i + 3); + Debug_PrintString(gUnknown_843EE57, 0x16, i + 3); } } } @@ -2846,14 +2901,14 @@ static const char gUnknown_843EEA8[][8] = { "SEARCH" }; -static u32 sub_80FC44C(void) +static u32 GetRfuSendQueueLength(void) { return Rfu.sendQueue.count; } u32 GetRfuRecvQueueLength(void) { - return Rfu.unk_124.count; + return Rfu.recvQueue.count; } static void Task_idle(u8 taskId) diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c index 7aac44593..91695dfc9 100644 --- a/src/link_rfu_3.c +++ b/src/link_rfu_3.c @@ -13,22 +13,83 @@ static const u16 gWirelessLinkIconPalette[] = INCBIN_U16("graphics/interface/wir static const u32 gWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireless_link_icon.4bpp.lz"); static const u8 sWireless_ASCIItoRSETable[] = { - 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, + EOS, + 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f, - 0x00, 0xab, 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00, - 0x00, 0x00, 0xb2, 0xf1, 0x00, 0xae, 0xad, 0xba, - 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, - 0xa9, 0xaa, 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, - 0x00, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, - 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, - 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, - 0xd2, 0xd3, 0xd4, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, - 0x00, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, - 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, - 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, - 0xec, 0xed, 0xee, 0x2d, 0x2f, 0x30, 0x31, 0x32, + [' '] = CHAR_SPACE, + ['!'] = CHAR_EXCL_MARK, + 0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xb2, 0xf1, 0x00, + ['-'] = CHAR_HYPHEN, + ['.'] = CHAR_PERIOD, + ['/'] = CHAR_SLASH, + ['0'] = CHAR_0, + ['1'] = CHAR_1, + ['2'] = CHAR_2, + ['3'] = CHAR_3, + ['4'] = CHAR_4, + ['5'] = CHAR_5, + ['6'] = CHAR_6, + ['7'] = CHAR_7, + ['8'] = CHAR_8, + ['9'] = CHAR_9, + 0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x00, + ['A'] = CHAR_A, + ['B'] = CHAR_B, + ['C'] = CHAR_C, + ['D'] = CHAR_D, + ['E'] = CHAR_E, + ['F'] = CHAR_F, + ['G'] = CHAR_G, + ['H'] = CHAR_H, + ['I'] = CHAR_I, + ['J'] = CHAR_J, + ['K'] = CHAR_K, + ['L'] = CHAR_L, + ['M'] = CHAR_M, + ['N'] = CHAR_N, + ['O'] = CHAR_O, + ['P'] = CHAR_P, + ['Q'] = CHAR_Q, + ['R'] = CHAR_R, + ['S'] = CHAR_S, + ['T'] = CHAR_T, + ['U'] = CHAR_U, + ['V'] = CHAR_V, + ['W'] = CHAR_W, + ['X'] = CHAR_X, + ['Y'] = CHAR_Y, + ['Z'] = CHAR_Z, + 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00, + ['a'] = CHAR_a, + ['b'] = CHAR_b, + ['c'] = CHAR_c, + ['d'] = CHAR_d, + ['e'] = CHAR_e, + ['f'] = CHAR_f, + ['g'] = CHAR_g, + ['h'] = CHAR_h, + ['i'] = CHAR_i, + ['j'] = CHAR_j, + ['k'] = CHAR_k, + ['l'] = CHAR_l, + ['m'] = CHAR_m, + ['n'] = CHAR_n, + ['o'] = CHAR_o, + ['p'] = CHAR_p, + ['q'] = CHAR_q, + ['r'] = CHAR_r, + ['s'] = CHAR_s, + ['t'] = CHAR_t, + ['u'] = CHAR_u, + ['v'] = CHAR_v, + ['w'] = CHAR_w, + ['x'] = CHAR_x, + ['y'] = CHAR_y, + ['z'] = CHAR_z, + 0x2d, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, @@ -48,53 +109,118 @@ static const u8 sWireless_ASCIItoRSETable[] = { }; static const u8 sWireless_RSEtoASCIITable[] = { - 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, - 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, - 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, - 0x9d, 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, - 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, - 0xec, 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, - 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, - 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, - 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, - 0x84, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, - 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, - 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, - 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, - 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, - 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, - 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, - 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, - 0xfb, 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, - 0x04, 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, - 0xaf, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, - 0x37, 0x38, 0x39, 0x21, 0xdf, 0xa1, 0xb0, 0xa5, - 0xde, 0x24, 0x2a, 0xa2, 0xa3, 0x22, 0x23, 0x20, - 0xa4, 0x20, 0x2f, 0x41, 0x42, 0x43, 0x44, 0x45, - 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, - 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, - 0x56, 0x57, 0x58, 0x59, 0x5a, 0x61, 0x62, 0x63, - 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, - 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, - 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x20, - 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00 + [CHAR_SPACE] = ' ', + 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, + 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, + 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, + 0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, + 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, + 0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0x7d, + 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0x08, + 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, + 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, + 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x84, + 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, + 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, + 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, + 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, + 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, + 0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xa8, + 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xf3, + 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, + 0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0x04, + 0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xaf, + [CHAR_0] = '0', + [CHAR_1] = '1', + [CHAR_2] = '2', + [CHAR_3] = '3', + [CHAR_4] = '4', + [CHAR_5] = '5', + [CHAR_6] = '6', + [CHAR_7] = '7', + [CHAR_8] = '8', + [CHAR_9] = '9', + [CHAR_EXCL_MARK] = '!', + 0xdf, 0xa1, 0xb0, 0xa5, 0xde, 0x24, 0x2a, + 0xa2, 0xa3, 0x22, 0x23, 0x20, 0xa4, 0x20, + [CHAR_SLASH] = '/', + [CHAR_A] = 'A', + [CHAR_B] = 'B', + [CHAR_C] = 'C', + [CHAR_D] = 'D', + [CHAR_E] = 'E', + [CHAR_F] = 'F', + [CHAR_G] = 'G', + [CHAR_H] = 'H', + [CHAR_I] = 'I', + [CHAR_J] = 'J', + [CHAR_K] = 'K', + [CHAR_L] = 'L', + [CHAR_M] = 'M', + [CHAR_N] = 'N', + [CHAR_O] = 'O', + [CHAR_P] = 'P', + [CHAR_Q] = 'Q', + [CHAR_R] = 'R', + [CHAR_S] = 'S', + [CHAR_T] = 'T', + [CHAR_U] = 'U', + [CHAR_V] = 'V', + [CHAR_W] = 'W', + [CHAR_X] = 'X', + [CHAR_Y] = 'Y', + [CHAR_Z] = 'Z', + [CHAR_a] = 'a', + [CHAR_b] = 'b', + [CHAR_c] = 'c', + [CHAR_d] = 'd', + [CHAR_e] = 'e', + [CHAR_f] = 'f', + [CHAR_g] = 'g', + [CHAR_h] = 'h', + [CHAR_i] = 'i', + [CHAR_j] = 'j', + [CHAR_k] = 'k', + [CHAR_l] = 'l', + [CHAR_m] = 'm', + [CHAR_n] = 'n', + [CHAR_o] = 'o', + [CHAR_p] = 'p', + [CHAR_q] = 'q', + [CHAR_r] = 'r', + [CHAR_s] = 's', + [CHAR_t] = 't', + [CHAR_u] = 'u', + [CHAR_v] = 'v', + [CHAR_w] = 'w', + [CHAR_x] = 'x', + [CHAR_y] = 'y', + [CHAR_z] = 'z', + 0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, + [CHAR_DYNAMIC_PLACEHOLDER] = ' ', + [CHAR_KEYPAD_ICON] = ' ', + [CHAR_EXTRA_EMOJI] = ' ', + [CHAR_PROMPT_SCROLL] = ' ', + [CHAR_PROMPT_CLEAR] = ' ', + [EXT_CTRL_CODE_BEGIN] = ' ', + [PLACEHOLDER_BEGIN] = ' ', + [CHAR_NEWLINE] = ' ', + [EOS] = 0 }; static const struct OamData sWirelessStatusIndicatorOamData = - { - .y = 0, - .affineMode = ST_OAM_AFFINE_OFF, - .objMode = ST_OAM_OBJ_NORMAL, - .bpp = ST_OAM_4BPP, - .shape = SPRITE_SHAPE(16x16), - .x = 0, - .size = SPRITE_SIZE(16x16), - .tileNum = 0, - .priority = 0, - .paletteNum = 0, - }; +{ + .y = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, + .shape = SPRITE_SHAPE(16x16), + .x = 0, + .size = SPRITE_SIZE(16x16), + .tileNum = 0, + .priority = 0, + .paletteNum = 0, +}; static const union AnimCmd sWirelessStatusIndicatorAnim0[] = { // 3 bars @@ -154,23 +280,25 @@ static const struct SpritePalette sWirelessStatusIndicatorSpritePalette = { }; static const struct SpriteTemplate sWirelessStatusIndicatorSpriteTemplate = { - 0xD431, - 0xD432, - &sWirelessStatusIndicatorOamData, - sWirelessStatusIndicatorAnims, - NULL, - gDummySpriteAffineAnimTable, - SpriteCallbackDummy + .tileTag = 0xD431, + .paletteTag = 0xD432, + .oam = &sWirelessStatusIndicatorOamData, + .anims = sWirelessStatusIndicatorAnims, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy }; -void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue) +// A bunch of FIFO queues + +void RfuRecvQueue_Reset(struct RfuRecvQueue *queue) { s32 i; s32 j; - for (i = 0; i < 20; i++) + for (i = 0; i < RECV_QUEUE_NUM_SLOTS; i++) { - for (j = 0; j < 70; j++) + for (j = 0; j < RECV_QUEUE_SLOT_LENGTH; j++) { queue->slots[i][j] = 0; } @@ -178,124 +306,124 @@ void RFU_queue_20_70_reset(struct UnkRfuStruct_2_Sub_124 *queue) queue->send_slot = 0; queue->recv_slot = 0; queue->count = 0; - queue->full = 0; + queue->full = FALSE; } -void RFU_queue_40_14_reset(struct RfuSendQueue *ptr) +void RfuSendQueue_Reset(struct RfuSendQueue *queue) { s32 i; s32 j; - for (i = 0; i < 40; i++) + for (i = 0; i < SEND_QUEUE_NUM_SLOTS; i++) { - for (j = 0; j < 14; j++) + for (j = 0; j < SEND_QUEUE_SLOT_LENGTH; j++) { - ptr->slots[i][j] = 0; + queue->slots[i][j] = 0; } } - ptr->send_slot = 0; - ptr->recv_slot = 0; - ptr->count = 0; - ptr->full = 0; + queue->send_slot = 0; + queue->recv_slot = 0; + queue->count = 0; + queue->full = FALSE; } -static void RFU_queue_2_256_reset(struct UnkRfuStruct_Sub_Unused *ptr) +static void RfuUnusedQueue_Reset(struct RfuUnusedQueue *queue) { s32 i; s32 j; - for (i = 0; i < 2; i++) + for (i = 0; i < UNUSED_QUEUE_NUM_SLOTS; i++) { - for (j = 0; j < 256; j++) + for (j = 0; j < UNUSED_QUEUE_SLOT_LENGTH; j++) { - ptr->slots[i][j] = 0; + queue->slots[i][j] = 0; } } - ptr->send_slot = 0; - ptr->recv_slot = 0; - ptr->count = 0; - ptr->full = 0; + queue->send_slot = 0; + queue->recv_slot = 0; + queue->count = 0; + queue->full = FALSE; } -void RFU_queue_20_70_recv(struct UnkRfuStruct_2_Sub_124 *queue, u8 *data) +void RfuRecvQueue_Enqueue(struct RfuRecvQueue *queue, u8 *src) { s32 i; u16 imeBak; u8 count; - if (queue->count < 20) + if (queue->count < RECV_QUEUE_NUM_SLOTS) { imeBak = REG_IME; REG_IME = 0; count = 0; - for (i = 0; i < 70; i += 14) + for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i += RECV_QUEUE_SLOT_LENGTH / MAX_RFU_PLAYERS) { - if (data[i] == 0 && data[i + 1] == 0) + if (src[i] == 0 && src[i + 1] == 0) { count++; } } - if (count != 5) + if (count != MAX_RFU_PLAYERS) { - for (i = 0; i < 70; i++) + for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++) { - queue->slots[queue->recv_slot][i] = data[i]; + queue->slots[queue->recv_slot][i] = src[i]; } queue->recv_slot++; - queue->recv_slot %= 20; + queue->recv_slot %= RECV_QUEUE_NUM_SLOTS; queue->count++; - for (i = 0; i < 70; i++) + for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++) { - data[i] = 0; + src[i] = 0; } } REG_IME = imeBak; } else { - queue->full = 1; + queue->full = TRUE; } } -void RFU_queue_40_14_recv(struct RfuSendQueue *queue, u8 *data) +void RfuSendQueue_Enqueue(struct RfuSendQueue *queue, u8 *src) { s32 i; u16 imeBak; - if (queue->count < 40) + if (queue->count < SEND_QUEUE_NUM_SLOTS) { imeBak = REG_IME; REG_IME = 0; - for (i = 0; i < 14; i++) + for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++) { - if (data[i] != 0) + if (src[i] != 0) { break; } } - if (i != 14) + if (i != SEND_QUEUE_SLOT_LENGTH) { - for (i = 0; i < 14; i++) + for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++) { - queue->slots[queue->recv_slot][i] = data[i]; + queue->slots[queue->recv_slot][i] = src[i]; } queue->recv_slot++; - queue->recv_slot %= 40; + queue->recv_slot %= SEND_QUEUE_NUM_SLOTS; queue->count++; - for (i = 0; i < 14; i++) + for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++) { - data[i] = 0; + src[i] = 0; } } REG_IME = imeBak; } else { - queue->full = 1; + queue->full = TRUE; } } -bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 *queue, u8 *dest) +bool8 RfuRecvQueue_Dequeue(struct RfuRecvQueue *queue, u8 *dest) { u16 imeBak; s32 i; @@ -304,63 +432,63 @@ bool8 RFU_queue_20_70_send(struct UnkRfuStruct_2_Sub_124 *queue, u8 *dest) REG_IME = 0; if (queue->recv_slot == queue->send_slot || queue->full) { - for (i = 0; i < 70; i++) + for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++) { dest[i] = 0; } REG_IME = imeBak; return FALSE; } - for (i = 0; i < 70; i++) + for (i = 0; i < RECV_QUEUE_SLOT_LENGTH; i++) { dest[i] = queue->slots[queue->send_slot][i]; } queue->send_slot++; - queue->send_slot %= 20; + queue->send_slot %= RECV_QUEUE_NUM_SLOTS; queue->count--; REG_IME = imeBak; return TRUE; } -bool8 RFU_queue_40_14_send(struct RfuSendQueue *queue, u8 *dest) +bool8 RfuSendQueue_Dequeue(struct RfuSendQueue *queue, u8 *dest) { s32 i; u16 imeBak; - if (queue->recv_slot == queue->send_slot || queue->full != 0) + if (queue->recv_slot == queue->send_slot || queue->full) { return FALSE; } imeBak = REG_IME; REG_IME = 0; - for (i = 0; i < 14; i++) + for (i = 0; i < SEND_QUEUE_SLOT_LENGTH; i++) { dest[i] = queue->slots[queue->send_slot][i]; } queue->send_slot++; - queue->send_slot %= 40; + queue->send_slot %= SEND_QUEUE_NUM_SLOTS; queue->count--; REG_IME = imeBak; return TRUE; } -void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *queue, const u8 *data) +void RfuBackupQueue_Enqueue(struct RfuBackupQueue *queue, const u8 *dest) { s32 i; - if (data[1] == 0) + if (dest[1] == 0) { - RFU_queue_2_14_send(queue, NULL); + RfuBackupQueue_Dequeue(queue, NULL); } else { - for (i = 0; i < 14; i++) + for (i = 0; i < BACKUP_QUEUE_SLOT_LENGTH; i++) { - queue->slots[queue->recv_slot][i] = data[i]; + queue->slots[queue->recv_slot][i] = dest[i]; } queue->recv_slot++; - queue->recv_slot %= 2; - if (queue->count < 2) + queue->recv_slot %= BACKUP_QUEUE_NUM_SLOTS; + if (queue->count < BACKUP_QUEUE_NUM_SLOTS) { queue->count++; } @@ -371,7 +499,7 @@ void RFU_queue_2_14_recv(struct UnkRfuStruct_2_Sub_c1c *queue, const u8 *data) } } -bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *queue, u8 *dest) +bool8 RfuBackupQueue_Dequeue(struct RfuBackupQueue *queue, u8 *dest) { s32 i; @@ -381,38 +509,38 @@ bool8 RFU_queue_2_14_send(struct UnkRfuStruct_2_Sub_c1c *queue, u8 *dest) } if (dest != NULL) { - for (i = 0; i < 14; i++) + for (i = 0; i < BACKUP_QUEUE_SLOT_LENGTH; i++) { dest[i] = queue->slots[queue->send_slot][i]; } } queue->send_slot++; - queue->send_slot %= 2; + queue->send_slot %= BACKUP_QUEUE_NUM_SLOTS; queue->count--; return TRUE; } -static void RFU_queue_2_256_recv(struct UnkRfuStruct_Sub_Unused *queue, u8 *data) +static void RfuUnusedQueue_Dequeue(struct RfuUnusedQueue *queue, u8 *dest) { s32 i; - if (queue->count < 2) + if (queue->count < UNUSED_QUEUE_NUM_SLOTS) { - for (i = 0; i < 256; i++) + for (i = 0; i < UNUSED_QUEUE_SLOT_LENGTH; i++) { - queue->slots[queue->recv_slot][i] = data[i]; + queue->slots[queue->recv_slot][i] = dest[i]; } queue->recv_slot++; - queue->recv_slot %= 2; + queue->recv_slot %= UNUSED_QUEUE_NUM_SLOTS; queue->count++; } else { - queue->full = 1; + queue->full = TRUE; } } -static bool8 RFU_queue_2_256_send(struct UnkRfuStruct_Sub_Unused *queue, u8 *send) +static bool8 RfuUnusedQueue_Enqueue(struct RfuUnusedQueue *queue, u8 *dest) { s32 i; @@ -420,16 +548,17 @@ static bool8 RFU_queue_2_256_send(struct UnkRfuStruct_Sub_Unused *queue, u8 *sen { return FALSE; } - for (i = 0; i < 256; i++) + for (i = 0; i < UNUSED_QUEUE_SLOT_LENGTH; i++) { - send[i] = queue->slots[queue->send_slot][i]; + dest[i] = queue->slots[queue->send_slot][i]; } queue->send_slot++; - queue->send_slot %= 2; + queue->send_slot %= UNUSED_QUEUE_NUM_SLOTS; queue->count--; return TRUE; } +UNUSED static void sub_80FC9B8(u8 *q1, u8 mode) { s32 i; @@ -476,26 +605,26 @@ static void sub_80FC9B8(u8 *q1, u8 mode) } } -static void PkmnStrToASCII(u8 *q1, const u8 *q2) +static void PkmnStrToASCII(u8 *dest, const u8 *src) { s32 i; - for (i = 0; q2[i] != EOS; i++) + for (i = 0; src[i] != EOS; i++) { - q1[i] = sWireless_RSEtoASCIITable[q2[i]]; + dest[i] = sWireless_RSEtoASCIITable[src[i]]; } - q1[i] = 0; + dest[i] = 0; } -static void ASCIIToPkmnStr(u8 *q1, const u8 *q2) +static void ASCIIToPkmnStr(u8 *dest, const u8 *src) { s32 i; - for (i = 0; q2[i] != 0; i++) + for (i = 0; src[i] != 0; i++) { - q1[i] = sWireless_ASCIItoRSETable[q2[i]]; + dest[i] = sWireless_ASCIItoRSETable[src[i]]; } - q1[i] = EOS; + dest[i] = EOS; } static u8 GetConnectedChildStrength(u8 maxFlags) @@ -552,7 +681,7 @@ void InitHostRFUtgtGname(struct GFtgtGname *data, u8 activity, bool32 started, s data->unk_00.version = GAME_VERSION; data->unk_00.hasNews = FALSE; data->unk_00.hasCard = FALSE; - data->unk_00.unk_00_6 = 0; + data->unk_00.unknown = FALSE; data->unk_00.isChampion = FlagGet(FLAG_SYS_CAN_LINK_WITH_RS); data->unk_00.hasNationalDex = IsNationalPokedexEnabled(); data->unk_00.gameClear = FlagGet(FLAG_SYS_GAME_CLEAR); @@ -572,7 +701,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx) if (lman.parent_child == MODE_PARENT) { retVal = TRUE; - if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1)) + if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo) && ((gRfuLinkStatus->getNameFlag >> idx) & 1)) { memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH); memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH); @@ -586,7 +715,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx) else { retVal = FALSE; - if (RfuSerialNumberIsValid(gRfuLinkStatus->partner[idx].serialNo)) + if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[idx].serialNo)) { memcpy(gname, &gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH); memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH); @@ -609,7 +738,7 @@ bool8 LinkRfu_GetNameIfCompatible(struct GFtgtGname *gname, u8 *uname, u8 idx) bool8 LinkRfu_GetNameIfSerial7F7D(struct GFtgtGname *gname, u8 *uname, u8 idx) { bool8 retVal = FALSE; - if (gRfuLinkStatus->partner[idx].serialNo == 0x7F7D) + if (gRfuLinkStatus->partner[idx].serialNo == RFU_SERIAL_7F7D) { memcpy(gname, gRfuLinkStatus->partner[idx].gname, RFU_GAME_NAME_LENGTH); memcpy(uname, gRfuLinkStatus->partner[idx].uname, RFU_USER_NAME_LENGTH); @@ -629,37 +758,46 @@ void LinkRfu3_SetGnameUnameFromStaticBuffers(struct GFtgtGname *gname, u8 *uname memcpy(uname, gHostRFUtgtUnameBuffer, RFU_USER_NAME_LENGTH); } +#define sNextAnimNum data[0] +#define sSavedAnimNum data[1] +#define sCurrAnimNum data[2] +#define sFrameDelay data[3] +#define sFrameIdx data[4] +#define sTileStart data[6] +#define sValidator data[7] +#define STATUS_INDICATOR_ACTIVE 0x1234 // Used to validate active indicator + void CreateWirelessStatusIndicatorSprite(u8 x, u8 y) { u8 sprId; if (x == 0 && y == 0) { - x = 0xE7; - y = 0x08; + x = 231; + y = 8; } if (gRfuLinkStatus->parentChild == MODE_PARENT) { sprId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0); - gSprites[sprId].data[7] = 0x1234; - gSprites[sprId].data[6] = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); + gSprites[sprId].sValidator = STATUS_INDICATOR_ACTIVE; + gSprites[sprId].sTileStart = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); gSprites[sprId].invisible = TRUE; gWirelessStatusIndicatorSpriteId = sprId; } else { gWirelessStatusIndicatorSpriteId = CreateSprite(&sWirelessStatusIndicatorSpriteTemplate, x, y, 0); - gSprites[gWirelessStatusIndicatorSpriteId].data[7] = 0x1234; - gSprites[gWirelessStatusIndicatorSpriteId].data[6] = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); + gSprites[gWirelessStatusIndicatorSpriteId].sValidator = STATUS_INDICATOR_ACTIVE; + gSprites[gWirelessStatusIndicatorSpriteId].sTileStart = GetSpriteTileStartByTag(sWirelessStatusIndicatorSpriteSheet.tag); gSprites[gWirelessStatusIndicatorSpriteId].invisible = TRUE; } } void DestroyWirelessStatusIndicatorSprite(void) { - if (gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gSprites[gWirelessStatusIndicatorSpriteId].sValidator == STATUS_INDICATOR_ACTIVE) { - gSprites[gWirelessStatusIndicatorSpriteId].data[7] = 0; + gSprites[gWirelessStatusIndicatorSpriteId].sValidator = 0; DestroySprite(&gSprites[gWirelessStatusIndicatorSpriteId]); gMain.oamBuffer[125] = gDummyOamData; CpuCopy16(&gDummyOamData, (struct OamData *)OAM + 125, sizeof(struct OamData)); @@ -693,17 +831,17 @@ static u8 GetParentSignalStrength(void) static void SetAndRestartWirelessStatusIndicatorAnim(struct Sprite *sprite, s32 signalStrengthAnimNum) { - if (sprite->data[2] != signalStrengthAnimNum) + if (sprite->sCurrAnimNum != signalStrengthAnimNum) { - sprite->data[2] = signalStrengthAnimNum; - sprite->data[3] = 0; - sprite->data[4] = 0; + sprite->sCurrAnimNum = signalStrengthAnimNum; + sprite->sFrameDelay = 0; + sprite->sFrameIdx = 0; } } void UpdateWirelessStatusIndicatorSprite(void) { - if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].data[7] == 0x1234) + if (gWirelessStatusIndicatorSpriteId != 0xFF && gSprites[gWirelessStatusIndicatorSpriteId].sValidator == STATUS_INDICATOR_ACTIVE) { struct Sprite *sprite = &gSprites[gWirelessStatusIndicatorSpriteId]; u8 signalStrength = RFU_LINK_ICON_LEVEL4_MAX; @@ -722,57 +860,65 @@ void UpdateWirelessStatusIndicatorSprite(void) { signalStrength = GetParentSignalStrength(); } - if (sub_80FC1B0() == TRUE) + if (IsRfuRecoveringFromLinkLoss() == TRUE) { - sprite->data[0] = 4; + sprite->sNextAnimNum = 4; } else if (signalStrength <= RFU_LINK_ICON_LEVEL1_MAX) { - sprite->data[0] = 3; + sprite->sNextAnimNum = 3; } else if (signalStrength >= RFU_LINK_ICON_LEVEL2_MIN && signalStrength <= RFU_LINK_ICON_LEVEL2_MAX) { - sprite->data[0] = 2; + sprite->sNextAnimNum = 2; } else if (signalStrength >= RFU_LINK_ICON_LEVEL3_MIN && signalStrength <= RFU_LINK_ICON_LEVEL3_MAX) { - sprite->data[0] = 1; + sprite->sNextAnimNum = 1; } else if (signalStrength >= RFU_LINK_ICON_LEVEL4_MIN) { - sprite->data[0] = 0; + sprite->sNextAnimNum = 0; } - if (sprite->data[0] != sprite->data[1]) + if (sprite->sNextAnimNum != sprite->sSavedAnimNum) { - SetAndRestartWirelessStatusIndicatorAnim(sprite, sprite->data[0]); - sprite->data[1] = sprite->data[0]; + SetAndRestartWirelessStatusIndicatorAnim(sprite, sprite->sNextAnimNum); + sprite->sSavedAnimNum = sprite->sNextAnimNum; } - if (sprite->anims[sprite->data[2]][sprite->data[4]].frame.duration < sprite->data[3]) + if (sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].frame.duration < sprite->sFrameDelay) { - sprite->data[4]++; - sprite->data[3] = 0; - if (sprite->anims[sprite->data[2]][sprite->data[4]].type == -2) + sprite->sFrameIdx++; + sprite->sFrameDelay = 0; + if (sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].type == -2) // ANIMCMD_JUMP { - sprite->data[4] = 0; + sprite->sFrameIdx = 0; } } else { - sprite->data[3]++; + sprite->sFrameDelay++; } gMain.oamBuffer[125] = sWirelessStatusIndicatorOamData; gMain.oamBuffer[125].x = sprite->pos1.x + sprite->centerToCornerVecX; gMain.oamBuffer[125].y = sprite->pos1.y + sprite->centerToCornerVecY; gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum; - gMain.oamBuffer[125].tileNum = sprite->data[6] + sprite->anims[sprite->data[2]][sprite->data[4]].frame.imageValue; + gMain.oamBuffer[125].tileNum = sprite->sTileStart + sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].frame.imageValue; CpuCopy16(gMain.oamBuffer + 125, (struct OamData *)OAM + 125, sizeof(struct OamData)); - if (RfuGetErrorStatus() == 1) + if (RfuGetStatus() == RFU_STATUS_FATAL_ERROR) { DestroyWirelessStatusIndicatorSprite(); } } } +#undef sNextAnimNum +#undef sSavedAnimNum +#undef sCurrAnimNum +#undef sFrameDelay +#undef sFrameIdx +#undef sTileStart +#undef sValidator + static void CopyTrainerRecord(struct TrainerNameRecord *dest, u32 trainerId, const u8 *name) { int i; diff --git a/src/math_util.c b/src/math_util.c index f77c82608..767e4d93d 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -1,6 +1,7 @@ #include "global.h" +#include "math_util.h" -s16 MathUtil_Mul16(s16 x, s16 y) +s16 Q_8_8_mul(s16 x, s16 y) { s32 result; @@ -10,7 +11,7 @@ s16 MathUtil_Mul16(s16 x, s16 y) return result; } -s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y) +s16 Q_N_S_mul(u8 s, s16 x, s16 y) { s32 result; @@ -20,7 +21,7 @@ s16 MathUtil_Mul16Shift(u8 s, s16 x, s16 y) return result; } -s32 MathUtil_Mul32(s32 x, s32 y) +s32 Q_24_8_mul(s32 x, s32 y) { s64 result; @@ -30,7 +31,7 @@ s32 MathUtil_Mul32(s32 x, s32 y) return result; } -s16 MathUtil_Div16(s16 x, s16 y) +s16 Q_8_8_div(s16 x, s16 y) { if (y == 0) { @@ -39,7 +40,7 @@ s16 MathUtil_Div16(s16 x, s16 y) return (x << 8) / y; } -s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y) +s16 Q_N_S_div(u8 s, s16 x, s16 y) { if (y == 0) { @@ -48,7 +49,7 @@ s16 MathUtil_Div16Shift(u8 s, s16 x, s16 y) return (x << s) / y; } -s32 MathUtil_Div32(s32 x, s32 y) +s32 Q_24_8_div(s32 x, s32 y) { s64 _x; @@ -61,7 +62,7 @@ s32 MathUtil_Div32(s32 x, s32 y) return _x / y; } -s16 MathUtil_Inv16(s16 y) +s16 Q_8_8_inv(s16 y) { s32 x; @@ -69,7 +70,7 @@ s16 MathUtil_Inv16(s16 y) return x / y; } -s16 MathUtil_Inv16Shift(u8 s, s16 y) +s16 Q_N_S_inv(u8 s, s16 y) { s32 x; @@ -77,7 +78,7 @@ s16 MathUtil_Inv16Shift(u8 s, s16 y) return x / y; } -s32 MathUtil_Inv32(s32 y) +s32 Q_24_8_inv(s32 y) { s64 x; diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 2c455b57a..8290930d7 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -1270,7 +1270,7 @@ void task00_mystery_gift(u8 taskId) switch (mevent_client_do_exec(&data->curPromptWindowId)) { case 6: // done - Rfu_BeginBuildAndSendCommand5F(); + Rfu_SetCloseLinkCallback(); data->prevPromptWindowId = data->curPromptWindowId; data->state = 13; break; @@ -1633,7 +1633,7 @@ void task00_mystery_gift(u8 taskId) } break; case 33: - Rfu_BeginBuildAndSendCommand5F(); + Rfu_SetCloseLinkCallback(); StringCopy(gStringVar1, gLinkPlayers[1].name); data->state = 34; break; diff --git a/src/naming_screen.c b/src/naming_screen.c index 2f40cf2aa..f239620cf 100644 --- a/src/naming_screen.c +++ b/src/naming_screen.c @@ -496,7 +496,7 @@ static void NamingScreen_InitBGs(void) ChangeBgY(3, 0, 0); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); for (i = 0; i < NELEMS(gUnknown_83E22A0) - 1; i++) sNamingScreenData->windows[i] = AddWindow(&gUnknown_83E22A0[i]); diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 556d83a69..2d7e8c4b4 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -388,7 +388,7 @@ void FreeAllOverworldWindowBuffers(void) FreeAllWindowBuffers(); } -void ResetBg0(void) +void InitTextBoxGfxAndPrinters(void) { ChangeBgX(0, 0, 0); ChangeBgY(0, 0, 0); diff --git a/src/oak_speech.c b/src/oak_speech.c index 96ba0adee..3779090a3 100644 --- a/src/oak_speech.c +++ b/src/oak_speech.c @@ -534,7 +534,7 @@ static void Task_OaksSpeech1(u8 taskId) case 4: gPaletteFade.bufferTransferDisabled = TRUE; InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); Menu_LoadStdPalAt(0xD0); LoadPalette(sHelpDocsPalette, 0x000, 0x080); LoadPalette(stdpal_get(2) + 15, 0x000, 0x002); @@ -1418,8 +1418,8 @@ static void Task_OakSpeech39(u8 taskId) PlaySE(SE_WARP_IN); r0 = data[2]; data[2] -= 32; - x = MathUtil_Inv16(r0 - 8); - y = MathUtil_Inv16(data[2] - 16); + x = Q_8_8_inv(r0 - 8); + y = Q_8_8_inv(data[2] - 16); SetBgAffine(2, 0x7800, 0x5400, 0x78, 0x54, x, y, 0); if (data[2] <= 96) { @@ -1566,7 +1566,7 @@ static void CB2_ReturnFromNamingScreen(void) case 3: FreeAllWindowBuffers(); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); LoadPalette(sHelpDocsPalette, 0, 0xe0); break; case 4: diff --git a/src/overworld.c b/src/overworld.c index 66ca5e336..a330ace3e 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1345,7 +1345,7 @@ static void InitOverworldBgs(void) SetBgTilemapBuffer(2, gBGTilemapBuffers1); SetBgTilemapBuffer(3, gBGTilemapBuffers3); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); sub_8069348(); } @@ -1363,7 +1363,7 @@ static void InitOverworldBgs_NoResetHeap(void) SetBgTilemapBuffer(2, gBGTilemapBuffers1); SetBgTilemapBuffer(3, gBGTilemapBuffers3); InitStandardTextBoxWindows(); - ResetBg0(); + InitTextBoxGfxAndPrinters(); sub_8069348(); } diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c index 853ec4f26..45634ad9c 100644 --- a/src/pokemon_jump.c +++ b/src/pokemon_jump.c @@ -244,7 +244,7 @@ static void sub_8147A34(u8 taskId) memset(packet, 0, sizeof(packet)); packet[0] = 0x7FFF; packet[1] = data[12]; - RfuPrepareSend0x2f00(packet); + Rfu_SendPacket(packet); } } else diff --git a/src/pokemon_jump_2.c b/src/pokemon_jump_2.c index a219459c1..a771b8fcc 100644 --- a/src/pokemon_jump_2.c +++ b/src/pokemon_jump_2.c @@ -1002,12 +1002,12 @@ static bool32 sub_814881C(void) case 2: if (sub_8149804()) { - CreateTask(Task_SaveGame_UpdatedLinkRecords, 6); + CreateTask(Task_LinkSave, 6); gUnknown_203F3D4->unk8++; } break; case 3: - if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords)) + if (!FuncIsActiveTask(Task_LinkSave)) { sub_814A6CC(); gUnknown_203F3D4->unk8++; @@ -1882,7 +1882,7 @@ static int sub_81497A8(void) static bool32 sub_8149804(void) { - return !Rfu.unk_124.count && !Rfu.sendQueue.count; + return !Rfu.recvQueue.count && !Rfu.sendQueue.count; } static int sub_8149834(u8 *arg0) diff --git a/src/pokemon_jump_3.c b/src/pokemon_jump_3.c index 04d9ad439..978c4ab71 100644 --- a/src/pokemon_jump_3.c +++ b/src/pokemon_jump_3.c @@ -17,7 +17,7 @@ void sub_8149A6C(struct PokemonJump1_MonInfo *arg0) packet.species = arg0->species; packet.otId = arg0->otId; packet.personality = arg0->personality; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } bool32 sub_8149A90(int multiplayerId, struct PokemonJump1_MonInfo *arg0) @@ -51,7 +51,7 @@ void sub_8149AE0(u32 arg0) struct UnkPacket2 packet; packet.id = 2; packet.unk4 = arg0; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } struct UnkPacket3 @@ -79,7 +79,7 @@ void sub_8149AF8(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) packet.unk2 = arg0->unk10; packet.unk3_1 = arg0->unk14; packet.unk4 = arg0->unkE; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } bool32 sub_8149B7C(struct PokemonJump1_82E4 *arg0, struct PokemonJump1Sub *arg1) @@ -125,7 +125,7 @@ void sub_8149BF4(struct PokemonJump1_82E4 *arg0, u8 arg1, u16 arg2) packet.unk4 = arg0->unkE; packet.unk6 = arg1; packet.unk8 = arg2; - RfuPrepareSend0x2f00(&packet); + Rfu_SendPacket(&packet); } bool32 sub_8149C24(struct PokemonJump1_82E4 *arg0, int multiplayerId, u8 *arg2, u16 *arg3) diff --git a/src/pokemon_jump_4.c b/src/pokemon_jump_4.c index b197ebeef..4725e3fc2 100644 --- a/src/pokemon_jump_4.c +++ b/src/pokemon_jump_4.c @@ -55,7 +55,7 @@ void sub_8149CEC(struct PokemonJump2 *arg0) void sub_8149D24(void) { FreeAllWindowBuffers(); - DigitObjUtil_Teardown(); + DigitObjUtil_Free(); } static void sub_8149D34(struct PokemonJump2 *arg0) diff --git a/src/save.c b/src/save.c index 353ad5cb2..3ce4025bf 100644 --- a/src/save.c +++ b/src/save.c @@ -844,7 +844,7 @@ u32 TryWriteSpecialSaveSection(u8 sector, u8* src) return 1; } -void Task_SaveGame_UpdatedLinkRecords(u8 taskId) +void Task_LinkSave(u8 taskId) { switch (gTasks[taskId].data[0]) { diff --git a/src/start_menu.c b/src/start_menu.c index 6280ba7b4..4f901c25d 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -941,11 +941,11 @@ static void task50_after_link_battle_save(u8 taskId) DestroyTask(taskId); break; case 5: - CreateTask(Task_SaveGame_UpdatedLinkRecords, 5); + CreateTask(Task_LinkSave, 5); data[0] = 6; break; case 6: - if (!FuncIsActiveTask(Task_SaveGame_UpdatedLinkRecords)) + if (!FuncIsActiveTask(Task_LinkSave)) data[0] = 3; break; } diff --git a/src/tileset_anims.c b/src/tileset_anims.c index 04e129049..fcf6a6038 100644 --- a/src/tileset_anims.c +++ b/src/tileset_anims.c @@ -17,117 +17,121 @@ static void (*sSecondaryTilesetAnimCallback)(u16); static void _InitPrimaryTilesetAnimation(void); static void _InitSecondaryTilesetAnimation(void); -static const u16 gUnknown_83A73E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_0.bin"); -static const u16 gUnknown_83A7460[] = INCBIN_U16("graphics/tileset_anims/anim_0_1.bin"); -static const u16 gUnknown_83A74E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_2.bin"); -static const u16 gUnknown_83A7560[] = INCBIN_U16("graphics/tileset_anims/anim_0_3.bin"); -static const u16 gUnknown_83A75E0[] = INCBIN_U16("graphics/tileset_anims/anim_0_4.bin"); - -static const u16 *const gUnknown_83A7660[] = { - gUnknown_83A73E0, - gUnknown_83A7460, - gUnknown_83A74E0, - gUnknown_83A7560, - gUnknown_83A75E0 +// palette: general 00 +static const u16 sTilesetAnims_General_Flower_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/0.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/1.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/2.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/3.4bpp"); +static const u16 sTilesetAnims_General_Flower_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/flower/4.4bpp"); + +static const u16 *const sTilesetAnims_General_Flower[] = { + sTilesetAnims_General_Flower_Frame0, + sTilesetAnims_General_Flower_Frame1, + sTilesetAnims_General_Flower_Frame2, + sTilesetAnims_General_Flower_Frame3, + sTilesetAnims_General_Flower_Frame4 }; -static const u16 gUnknown_83A7674[] = INCBIN_U16("graphics/tileset_anims/anim_1_0.bin"); -static const u16 gUnknown_83A7C74[] = INCBIN_U16("graphics/tileset_anims/anim_1_1.bin"); -static const u16 gUnknown_83A8274[] = INCBIN_U16("graphics/tileset_anims/anim_1_2.bin"); -static const u16 gUnknown_83A8874[] = INCBIN_U16("graphics/tileset_anims/anim_1_3.bin"); -static const u16 gUnknown_83A8E74[] = INCBIN_U16("graphics/tileset_anims/anim_1_4.bin"); -static const u16 gUnknown_83A9474[] = INCBIN_U16("graphics/tileset_anims/anim_1_5.bin"); -static const u16 gUnknown_83A9A74[] = INCBIN_U16("graphics/tileset_anims/anim_1_6.bin"); -static const u16 gUnknown_83AA074[] = INCBIN_U16("graphics/tileset_anims/anim_1_7.bin"); - -static const u16 *const gUnknown_83AA654[] = { - gUnknown_83A7674, - gUnknown_83A7C74, - gUnknown_83A8274, - gUnknown_83A8874, - gUnknown_83A8E74, - gUnknown_83A9474, - gUnknown_83A9A74, - gUnknown_83AA074 +// palette: general 04 +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/water_current_landwatersedge/7.4bpp"); + +static const u16 *const sTilesetAnims_General_Water_Current_LandWatersEdge[] = { + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame0, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame1, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame2, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame3, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame4, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame5, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame6, + sTilesetAnims_General_Water_Current_LandWatersEdge_Frame7 }; -static const u16 gUnknown_83AA674[] = INCBIN_U16("graphics/tileset_anims/anim_2_0.bin"); -static const u16 gUnknown_83AA8B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_1.bin"); -static const u16 gUnknown_83AAAF4[] = INCBIN_U16("graphics/tileset_anims/anim_2_2.bin"); -static const u16 gUnknown_83AAD34[] = INCBIN_U16("graphics/tileset_anims/anim_2_3.bin"); -static const u16 gUnknown_83AAF74[] = INCBIN_U16("graphics/tileset_anims/anim_2_4.bin"); -static const u16 gUnknown_83AB1B4[] = INCBIN_U16("graphics/tileset_anims/anim_2_5.bin"); -static const u16 gUnknown_83AB3F4[] = INCBIN_U16("graphics/tileset_anims/anim_2_6.bin"); -static const u16 gUnknown_83AB634[] = INCBIN_U16("graphics/tileset_anims/anim_2_7.bin"); - -static const u16 *const gUnknown_83AB874[] = { - gUnknown_83AA674, - gUnknown_83AA8B4, - gUnknown_83AAAF4, - gUnknown_83AAD34, - gUnknown_83AAF74, - gUnknown_83AB1B4, - gUnknown_83AB3F4, - gUnknown_83AB634 +// palette: general 04 +static const u16 sTilesetAnims_General_SandWatersEdge_Frame0[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/0.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame1[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/1.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame2[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/2.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame3[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/3.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame4[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/4.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame5[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/5.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame6[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/6.4bpp"); +static const u16 sTilesetAnims_General_SandWatersEdge_Frame7[] = INCBIN_U16("data/tilesets/primary/general/anim/sandwatersedge/7.4bpp"); + +static const u16 *const sTilesetAnims_General_SandWatersEdge[] = { + sTilesetAnims_General_SandWatersEdge_Frame0, + sTilesetAnims_General_SandWatersEdge_Frame1, + sTilesetAnims_General_SandWatersEdge_Frame2, + sTilesetAnims_General_SandWatersEdge_Frame3, + sTilesetAnims_General_SandWatersEdge_Frame4, + sTilesetAnims_General_SandWatersEdge_Frame5, + sTilesetAnims_General_SandWatersEdge_Frame6, + sTilesetAnims_General_SandWatersEdge_Frame7 }; -static const u16 gUnknown_83AB894[] = INCBIN_U16("graphics/tileset_anims/anim_3_0.bin"); -static const u16 gUnknown_83AB994[] = INCBIN_U16("graphics/tileset_anims/anim_3_1.bin"); -static const u16 gUnknown_83ABA94[] = INCBIN_U16("graphics/tileset_anims/anim_3_2.bin"); -static const u16 gUnknown_83ABB94[] = INCBIN_U16("graphics/tileset_anims/anim_3_3.bin"); -static const u16 gUnknown_83ABC94[] = INCBIN_U16("graphics/tileset_anims/anim_3_4.bin"); +// palette: general 00 +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/3.4bpp"); +static const u16 sTilesetAnims_CeladonCity_Fountain_Frame4[] = INCBIN_U16("data/tilesets/secondary/celadon_city/anim/fountain/4.4bpp"); static const u16 gUnknown_83ABD94[16] = {}; -static const u16 *const gUnknown_83ABDB4[] = { - gUnknown_83AB894, - gUnknown_83AB994, - gUnknown_83ABA94, - gUnknown_83ABB94, - gUnknown_83ABC94 +static const u16 *const sTilesetAnims_CeladonCity_Fountain[] = { + sTilesetAnims_CeladonCity_Fountain_Frame0, + sTilesetAnims_CeladonCity_Fountain_Frame1, + sTilesetAnims_CeladonCity_Fountain_Frame2, + sTilesetAnims_CeladonCity_Fountain_Frame3, + sTilesetAnims_CeladonCity_Fountain_Frame4 }; -static const u16 gUnknown_83ABDC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_0.bin"); -static const u16 gUnknown_83ABEC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_1.bin"); -static const u16 gUnknown_83ABFC8[] = INCBIN_U16("graphics/tileset_anims/anim_4_2.bin"); -static const u16 gUnknown_83AC0C8[] = INCBIN_U16("graphics/tileset_anims/anim_4_3.bin"); -static const u16 gUnknown_83AC1C8[0x10] = {}; - -static const u16 *const gUnknown_83AC1E8[] = { - gUnknown_83ABDC8, - gUnknown_83ABEC8, - gUnknown_83ABFC8, - gUnknown_83AC0C8 +static const u16 sTilesetAnims_SilphCo_Fountain_Frame0[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/0.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame1[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/1.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame2[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/2.4bpp"); +static const u16 sTilesetAnims_SilphCo_Fountain_Frame3[] = INCBIN_U16("data/tilesets/secondary/silph_co/anim/fountain/3.4bpp"); +static const u16 gUnknown_83AC1C8[16] = {}; + +static const u16 *const sTilesetAnims_SilphCo_Fountain[] = { + sTilesetAnims_SilphCo_Fountain_Frame0, + sTilesetAnims_SilphCo_Fountain_Frame1, + sTilesetAnims_SilphCo_Fountain_Frame2, + sTilesetAnims_SilphCo_Fountain_Frame3 }; -static const u16 gUnknown_83AC1F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_0.bin"); -static const u16 gUnknown_83AC2F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_1.bin"); -static const u16 gUnknown_83AC3F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_2.bin"); -static const u16 gUnknown_83AC4F8[] = INCBIN_U16("graphics/tileset_anims/anim_5_3.bin"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame0[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/0.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame1[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/1.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame2[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/2.4bpp"); +static const u16 sTilesetAnims_MtEmber_Steam_Frame3[] = INCBIN_U16("data/tilesets/secondary/mt_ember/anim/steam/3.4bpp"); -static const u16 *const gUnknown_83AC5F8[] = { - gUnknown_83AC1F8, - gUnknown_83AC2F8, - gUnknown_83AC3F8, - gUnknown_83AC4F8 +static const u16 *const sTilesetAnims_MtEmber_Steam[] = { + sTilesetAnims_MtEmber_Steam_Frame0, + sTilesetAnims_MtEmber_Steam_Frame1, + sTilesetAnims_MtEmber_Steam_Frame2, + sTilesetAnims_MtEmber_Steam_Frame3 }; -static const u16 gUnknown_83AC608[] = INCBIN_U16("graphics/tileset_anims/anim_6_0.bin"); -static const u16 gUnknown_83AC6E8[] = INCBIN_U16("graphics/tileset_anims/anim_6_1.bin"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame0[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/0.4bpp"); +static const u16 sTilesetAnims_VermilionGym_MotorizedDoor_Frame1[] = INCBIN_U16("data/tilesets/secondary/vermilion_gym/anim/motorizeddoor/1.4bpp"); -static const u16 *const gUnknown_83AC7C8[] = { - gUnknown_83AC608, - gUnknown_83AC6E8 +static const u16 *const sTilesetAnims_VermilionGym_MotorizedDoor[] = { + sTilesetAnims_VermilionGym_MotorizedDoor_Frame0, + sTilesetAnims_VermilionGym_MotorizedDoor_Frame1 }; -static const u16 gUnknown_83AC7D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_0.bin"); -static const u16 gUnknown_83AC850[] = INCBIN_U16("graphics/tileset_anims/anim_7_1.bin"); -static const u16 gUnknown_83AC8D0[] = INCBIN_U16("graphics/tileset_anims/anim_7_2.bin"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame0[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/0.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame1[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/1.4bpp"); +static const u16 sTilesetAnims_CeladonGym_Flowers_Frame2[] = INCBIN_U16("data/tilesets/secondary/celadon_gym/anim/flowers/2.4bpp"); -static const u16 *const gUnknown_83AC950[] = { - gUnknown_83AC7D0, - gUnknown_83AC850, - gUnknown_83AC8D0, - gUnknown_83AC850 +static const u16 *const sTilesetAnims_CeladonGym_Flowers[] = { + sTilesetAnims_CeladonGym_Flowers_Frame0, + sTilesetAnims_CeladonGym_Flowers_Frame1, + sTilesetAnims_CeladonGym_Flowers_Frame2, + sTilesetAnims_CeladonGym_Flowers_Frame1 }; static void ResetTilesetAnimBuffer(void) @@ -201,128 +205,128 @@ static void _InitSecondaryTilesetAnimation(void) gMapHeader.mapLayout->secondaryTileset->callback(); } -static void sub_80700A4(u16 timer) +static void QueueAnimTiles_General_Flower(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83A7660[timer % NELEMS(gUnknown_83A7660)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Flower[timer % NELEMS(sTilesetAnims_General_Flower)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(508)), 4 * TILE_SIZE_4BPP); } -static void sub_80700D0(u16 timer) +static void QueueAnimTiles_General_Water_Current_LandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AA654[timer % NELEMS(gUnknown_83AA654)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 0x600); + AppendTilesetAnimToBuffer(sTilesetAnims_General_Water_Current_LandWatersEdge[timer % NELEMS(sTilesetAnims_General_Water_Current_LandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(416)), 48 * TILE_SIZE_4BPP); } -static void sub_80700F8(u16 timer) +static void QueueAnimTiles_General_SandWatersEdge(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AB874[timer % NELEMS(gUnknown_83AB874)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 0x240); + AppendTilesetAnimToBuffer(sTilesetAnims_General_SandWatersEdge[timer % NELEMS(sTilesetAnims_General_SandWatersEdge)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(464)), 18 * TILE_SIZE_4BPP); } -static void sub_8070120(u16 timer) +static void TilesetAnim_General(u16 timer) { if (timer % 8 == 0) - sub_80700F8(timer >> 3); + QueueAnimTiles_General_SandWatersEdge(timer >> 3); if (timer % 16 == 1) - sub_80700D0(timer >> 4); + QueueAnimTiles_General_Water_Current_LandWatersEdge(timer >> 4); if (timer % 16 == 2) - sub_80700A4(timer >> 4); + QueueAnimTiles_General_Flower(timer >> 4); } void InitTilesetAnim_General(void) { sPrimaryTilesetAnimCounter = 0; sPrimaryTilesetAnimCounterMax = 640; - sPrimaryTilesetAnimCallback = sub_8070120; + sPrimaryTilesetAnimCallback = TilesetAnim_General; } -static void sub_807017C(u16 timer) +static void QueueAnimTiles_CeladonCity_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83ABDB4[timer % NELEMS(gUnknown_83ABDB4)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonCity_Fountain[timer % NELEMS(sTilesetAnims_CeladonCity_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(744)), 8 * TILE_SIZE_4BPP); } -static void sub_80701AC(u16 timer) +static void TilesetAnim_CeladonCity(u16 timer) { if (timer % 12 == 0) - sub_807017C(timer / 12); + QueueAnimTiles_CeladonCity_Fountain(timer / 12); } void InitTilesetAnim_CeladonCity(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 120; - sSecondaryTilesetAnimCallback = sub_80701AC; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonCity; } -static void sub_80701FC(u16 timer) +static void QueueAnimTiles_SilphCo_Fountain(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC1E8[timer % NELEMS(gUnknown_83AC1E8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_SilphCo_Fountain[timer % NELEMS(sTilesetAnims_SilphCo_Fountain)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(976)), 8 * TILE_SIZE_4BPP); } -static void sub_8070224(u16 timer) +static void TilesetAnim_SilphCo(u16 timer) { if (timer % 10 == 0) - sub_80701FC(timer / 10); + QueueAnimTiles_SilphCo_Fountain(timer / 10); } void InitTilesetAnim_SilphCo(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 160; - sSecondaryTilesetAnimCallback = sub_8070224; + sSecondaryTilesetAnimCallback = TilesetAnim_SilphCo; } -static void sub_8070274(u16 timer) +static void QueueAnimTiles_MtEmber_Steam(u16 timer) { - AppendTilesetAnimToBuffer(gUnknown_83AC5F8[timer % NELEMS(gUnknown_83AC5F8)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 0x100); + AppendTilesetAnimToBuffer(sTilesetAnims_MtEmber_Steam[timer % NELEMS(sTilesetAnims_MtEmber_Steam)], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(896)), 8 * TILE_SIZE_4BPP); } -static void sub_807029C(u16 timer) +static void TilesetAnim_MtEmber(u16 timer) { if (timer % 16 == 0) - sub_8070274(timer >> 4); + QueueAnimTiles_MtEmber_Steam(timer >> 4); } void InitTilesetAnim_MtEmber(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_807029C; + sSecondaryTilesetAnimCallback = TilesetAnim_MtEmber; } -static void sub_80702DC(u16 timer) +static void QueueAnimTiles_VermilionGym_MotorizedDoor(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC7C8); + u16 i = timer % NELEMS(sTilesetAnims_VermilionGym_MotorizedDoor); - AppendTilesetAnimToBuffer(gUnknown_83AC7C8[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 0xE0); + AppendTilesetAnimToBuffer(sTilesetAnims_VermilionGym_MotorizedDoor[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(880)), 7 * TILE_SIZE_4BPP); } -static void sub_8070304(u16 timer) +static void TilesetAnim_VermilionGym(u16 timer) { if (timer % 2 == 0) - sub_80702DC(timer >> 1); + QueueAnimTiles_VermilionGym_MotorizedDoor(timer >> 1); } void InitTilesetAnim_VermilionGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 240; - sSecondaryTilesetAnimCallback = sub_8070304; + sSecondaryTilesetAnimCallback = TilesetAnim_VermilionGym; } -static void sub_8070340(u16 timer) +static void QueueAnimTiles_CeladonGym_Flowers(u16 timer) { - u16 i = timer % NELEMS(gUnknown_83AC950); + u16 i = timer % NELEMS(sTilesetAnims_CeladonGym_Flowers); - AppendTilesetAnimToBuffer(gUnknown_83AC950[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 0x80); + AppendTilesetAnimToBuffer(sTilesetAnims_CeladonGym_Flowers[i], (u16 *)(BG_VRAM + TILE_OFFSET_4BPP(739)), 4 * TILE_SIZE_4BPP); } -static void sub_8070368(u16 timer) +static void TilesetAnim_CeladonGym(u16 timer) { if (timer % 16 == 0) - sub_8070340(timer >> 4); + QueueAnimTiles_CeladonGym_Flowers(timer >> 4); } void InitTilesetAnim_CeladonGym(void) { sSecondaryTilesetAnimCounter = 0; sSecondaryTilesetAnimCounterMax = 256; - sSecondaryTilesetAnimCallback = sub_8070368; + sSecondaryTilesetAnimCallback = TilesetAnim_CeladonGym; } diff --git a/src/trade.c b/src/trade.c index 656cba37b..4893f5724 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2623,7 +2623,7 @@ static u32 TestWhetherSelectedMonCanBeTraded(struct Pokemon * party, int partyCo if ((player->version & 0xFF) != VERSION_RUBY && (player->version & 0xFF) != VERSION_SAPPHIRE) { - if ((player->name[10] & 0xF) == 0) + if ((player->progressFlagsCopy & 0xF) == 0) { if (species2[cursorPos] == SPECIES_EGG) { @@ -2697,11 +2697,11 @@ s32 Trade_CalcLinkPlayerCompatibilityParam(void) if (val > 0) { - if (gLinkPlayers[GetMultiplayerId()].name[10] & 0xF0) + if (gLinkPlayers[GetMultiplayerId()].progressFlagsCopy & 0xF0) { if (val == 2) { - if (gLinkPlayers[GetMultiplayerId() ^ 1].name[10] & 0xF0) + if (gLinkPlayers[GetMultiplayerId() ^ 1].progressFlagsCopy & 0xF0) { return 0; } diff --git a/src/union_room.c b/src/union_room.c index f19eba38d..575fcd60e 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -861,7 +861,9 @@ static void Task_TryBecomeLinkLeader(u8 taskId) } break; case 11: - switch (UnionRoomHandleYesNo(&data->textState, TrainerIdAndNameStillInPartnersList(ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), data->field_0->arr[data->playerCount].gname_uname.uname))) + switch (UnionRoomHandleYesNo(&data->textState, CheckTrainerHasLeftByIdAndName( + ReadAsU16(data->field_0->arr[data->playerCount].gname_uname.gname.unk_00.playerTrainerId), + data->field_0->arr[data->playerCount].gname_uname.uname))) { case 0: LoadWirelessStatusIndicatorSpriteGfx(); @@ -928,7 +930,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) else if (val == 2) { // Disconnect - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); data->state = 4; } break; @@ -1027,7 +1029,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId) gSpecialVar_Result = 8; break; case 26: - if (RfuIsErrorStatus1or2()) + if (RfuHasErrored()) { data->state = 29; } @@ -1152,7 +1154,7 @@ static bool8 Leader_SetStateIfMemberListChanged(struct UnkStruct_Leader * data, data->state = state1; break; case UNION_ROOM_SPAWN_OUT: - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); RedrawListMenu(data->listTaskId); data->state = state2; return TRUE; @@ -1387,7 +1389,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) if (gReceivedRemoteLinkPlayers) { sPlayerCurrActivity = data->field_0->arr[data->leaderId].gname_uname.gname.activity; - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); switch (sPlayerCurrActivity) { case ACTIVITY_BATTLE: @@ -1407,7 +1409,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) } } - switch (RfuGetErrorStatus()) + switch (RfuGetStatus()) { case 1: data->state = 12; @@ -1421,7 +1423,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) GetGroupLeaderSentAnOKMessage(gStringVar4, sPlayerCurrActivity); if (PrintOnTextbox(&data->textState, gStringVar4)) { - RfuSetErrorStatus(7, 0); + RfuSetStatus(RFU_STATUS_WAIT_ACK_JOIN_GROUP, 0); StringCopy(gStringVar1, sUnionRoomActivityStringPtrs[sPlayerCurrActivity]); StringExpandPlaceholders(gStringVar4, gUnknown_8457700); } @@ -1432,7 +1434,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) { if (PrintOnTextbox(&data->textState, gStringVar4)) { - RfuSetErrorStatus(12, 0); + RfuSetStatus(RFU_STATUS_ACK_JOIN_GROUP, 0); data->delayBeforePrint = 0; } } @@ -1443,7 +1445,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; } - if (!RfuGetErrorStatus() && JOY_NEW(B_BUTTON)) + if (!RfuGetStatus() && JOY_NEW(B_BUTTON)) data->state = 7; break; case 7: @@ -1451,10 +1453,10 @@ static void Task_TryJoinLinkGroup(u8 taskId) data->state = 8; break; case 8: - switch (UnionRoomHandleYesNo(&data->textState, RfuGetErrorStatus())) + switch (UnionRoomHandleYesNo(&data->textState, RfuGetStatus())) { case 0: - LinkRfuNIsend8(); + SendLeaveGroupNotice(); data->state = 9; RedrawListMenu(data->listTaskId); break; @@ -1470,7 +1472,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) } break; case 9: - if (RfuGetErrorStatus()) + if (RfuGetStatus()) data->state = 6; break; case 10: @@ -1494,7 +1496,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; case 13: DestroyWirelessStatusIndicatorSprite(); - if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()])) + if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()])) { gSpecialVar_Result = 6; data->state = 23; @@ -1507,7 +1509,7 @@ static void Task_TryJoinLinkGroup(u8 taskId) break; case 15: DestroyWirelessStatusIndicatorSprite(); - if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetErrorStatus()])) + if (PrintOnTextbox(&data->textState, gUnknown_8457754[RfuGetStatus()])) { gSpecialVar_Result = 8; data->state = 23; @@ -2180,7 +2182,7 @@ static void Task_MEvent_Leader(u8 taskId) } else if (val == 2) { - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); data->state = 2; } break; @@ -2228,7 +2230,7 @@ static void Task_MEvent_Leader(u8 taskId) } break; case 15: - if (RfuGetErrorStatus() == 1 || RfuGetErrorStatus() == 2) + if (RfuGetStatus() == 1 || RfuGetStatus() == 2) { data->state = 13; } @@ -2370,7 +2372,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) data->state = 10; } - switch (RfuGetErrorStatus()) + switch (RfuGetStatus()) { case 1: case 2: @@ -2379,7 +2381,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) break; case 5: AddTextPrinterToWindow1(gUnknown_84576AC); - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); break; } break; @@ -2396,7 +2398,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId) data->state++; break; case 9: - if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetErrorStatus()])) + if (MG_PrintTextOnWindow1AndWaitButton(&data->textState, gUnknown_8457838[RfuGetStatus()])) { DestroyWirelessStatusIndicatorSprite(); DestroyTask(taskId); @@ -2535,7 +2537,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) data->state = 12; } - switch (RfuGetErrorStatus()) + switch (RfuGetStatus()) { case 1: case 2: @@ -2544,7 +2546,7 @@ static void Task_CardOrNewsOverWireless(u8 taskId) break; case 5: AddTextPrinterToWindow1(gUnknown_845777C); - RfuSetErrorStatus(0, 0); + RfuSetStatus(RFU_STATUS_OK, 0); break; } break; @@ -2837,7 +2839,7 @@ static void Task_RunUnionRoom(u8 taskId) break; case 25: UR_RunTextPrinters_CheckPrinter0Active(); - switch (RfuGetErrorStatus()) + switch (RfuGetStatus()) { case 4: HandleCancelTrade(TRUE); @@ -2898,7 +2900,7 @@ static void Task_RunUnionRoom(u8 taskId) if (var5 == -2 || var5 == IN_UNION_ROOM) { data->playerSendBuffer[0] = IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); StringCopy(gStringVar4, gUnknown_845842C[gLinkPlayers[0].gender]); data->state = 32; } @@ -2913,7 +2915,7 @@ static void Task_RunUnionRoom(u8 taskId) else { data->playerSendBuffer[0] = sPlayerCurrActivity | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 27; } } @@ -2942,7 +2944,7 @@ static void Task_RunUnionRoom(u8 taskId) data->playerSendBuffer[0] = ACTIVITY_TRADE | IN_UNION_ROOM; data->playerSendBuffer[1] = sUnionRoomTrade.species; data->playerSendBuffer[2] = sUnionRoomTrade.level; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 29; break; case 29: @@ -3032,7 +3034,7 @@ static void Task_RunUnionRoom(u8 taskId) } break; case 21: - switch (RfuGetErrorStatus()) + switch (RfuGetStatus()) { case 4: HandleCancelTrade(TRUE); @@ -3054,7 +3056,7 @@ static void Task_RunUnionRoom(u8 taskId) taskData[3]++; break; case 22: - if (RfuIsErrorStatus1or2()) + if (RfuHasErrored()) { playerGender = GetUnionRoomPlayerGender(taskData[1], data->field_0); UpdateGameDataWithActivitySpriteGendersFlag(ACTIVITY_PLYRTALK | IN_UNION_ROOM, 0, TRUE); @@ -3073,7 +3075,7 @@ static void Task_RunUnionRoom(u8 taskId) data->recvActivityRequest[0] = 0; break; case 12: - if (RfuIsErrorStatus1or2()) + if (RfuHasErrored()) { HandleCancelTrade(FALSE); data->state = 2; @@ -3130,32 +3132,32 @@ static void Task_RunUnionRoom(u8 taskId) if (!HasAtLeastTwoMonsOfLevel30OrLower()) { data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 10; StringCopy(gStringVar4, gUnknown_84584C0); } else { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 13; } } else if (sPlayerCurrActivity == (ACTIVITY_CARD | IN_UNION_ROOM)) { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); ViewURoomPartnerTrainerCard(gStringVar4, data, MODE_PARENT); data->state = 40; } else { - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 13; } break; case 1: case -1: data->playerSendBuffer[0] = ACTIVITY_DECLINE | IN_UNION_ROOM; - RfuPrepareSend0x2f00(data->playerSendBuffer); + Rfu_SendPacket(data->playerSendBuffer); data->state = 10; GetYouDeclinedTheOfferMessage(gStringVar4, sPlayerCurrActivity); break; @@ -3418,7 +3420,7 @@ void var_800D_set_xB(void) static void ReceiveUnionRoomActivityPacket(struct UnkStruct_URoom * uroom) { - if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == RFU_COMMAND_0x2f00) + if (gRecvCmds[1][1] != 0 && (gRecvCmds[1][0] & 0xFF00) == RFUCMD_SEND_PACKET) { uroom->recvActivityRequest[0] = gRecvCmds[1][1]; if (gRecvCmds[1][1] == (ACTIVITY_TRADE | IN_UNION_ROOM)) diff --git a/src/union_room_chat.c b/src/union_room_chat.c index 85df5cd39..524ce7e89 100644 --- a/src/union_room_chat.c +++ b/src/union_room_chat.c @@ -324,7 +324,7 @@ static void ChatEntryRoutine_Join(void) sWork->routineState++; // fall through case 1: - if (IsLinkTaskFinished() && !GetRfuUnkCE8()) + if (IsLinkTaskFinished() && !RfuHasFoundNewLeader()) { if (SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) sWork->routineState++; @@ -527,14 +527,14 @@ static void ChatEntryRoutine_AskQuitChatting(void) sWork->routineState = 3; break; case 0: - sub_80FA4A8(); + Rfu_UnionRoomChat_StopLinkManager(); PrepareSendBuffer_Disband(sWork->sendMessageBuffer); sWork->routineState = 4; break; } break; case 4: - if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) + if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) { if (sWork->multiplayerId == 0) sWork->routineState = 6; @@ -577,15 +577,15 @@ static void ChatEntryRoutine_ExitChat(void) } break; case 3: - if (IsLinkTaskFinished() && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) + if (IsLinkTaskFinished() && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) sWork->routineState++; break; case 4: - if ((GetBlockReceivedStatus() & 1) && !GetRfuUnkCE8()) + if ((GetBlockReceivedStatus() & 1) && !RfuHasFoundNewLeader()) sWork->routineState++; break; case 5: - if (IsLinkTaskFinished() && !GetRfuUnkCE8()) + if (IsLinkTaskFinished() && !RfuHasFoundNewLeader()) { SetCloseLinkCallback(); sWork->exitDelayTimer = 0; @@ -620,7 +620,7 @@ static void ChatEntryRoutine_Drop(void) } break; case 1: - if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !GetRfuUnkCE8()) + if (!RunDisplaySubtask(0) && IsLinkTaskFinished() && !RfuHasFoundNewLeader()) { SetCloseLinkCallback(); sWork->exitDelayTimer = 0; @@ -666,7 +666,7 @@ static void ChatEntryRoutine_Disbanded(void) } break; case 2: - if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !GetRfuUnkCE8()) + if (RunDisplaySubtask(0) != TRUE && IsLinkTaskFinished() && !RfuHasFoundNewLeader()) { SetCloseLinkCallback(); sWork->exitDelayTimer = 0; @@ -704,7 +704,7 @@ static void ChatEntryRoutine_SendMessage(void) sWork->routineState++; // fall through case 1: - if (IsLinkTaskFinished() == TRUE && !GetRfuUnkCE8() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) + if (IsLinkTaskFinished() == TRUE && !RfuHasFoundNewLeader() && SendBlock(0, sWork->sendMessageBuffer, sizeof(sWork->sendMessageBuffer))) sWork->routineState++; break; case 2: @@ -1355,7 +1355,7 @@ static void Task_ReceiveChatMessage(u8 taskId) } tBlockReceivedStatus = GetBlockReceivedStatus(); - if (!tBlockReceivedStatus && GetRfuUnkCE8()) + if (!tBlockReceivedStatus && RfuHasFoundNewLeader()) return; tI = 0; @@ -1409,7 +1409,7 @@ static void Task_ReceiveChatMessage(u8 taskId) // You're the leader, and the person who left is not you if (GetLinkPlayerCount() == 2) { - sub_80FA4A8(); + Rfu_UnionRoomChat_StopLinkManager(); sWork->exitType = CHATEXIT_LEADER_LAST; DestroyTask(taskId); return; @@ -1433,7 +1433,7 @@ static void Task_ReceiveChatMessage(u8 taskId) DestroyTask(taskId); break; case 2: - if (!GetRfuUnkCE8()) + if (!RfuHasFoundNewLeader()) { if (sWork->multiplayerId == 0) sub_80FB030(sWork->linkPlayerCount); |