summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_bg.c19
-rw-r--r--src/battle_dome.c2
-rw-r--r--src/battle_main.c4
-rw-r--r--src/battle_pike.c26
-rw-r--r--src/battle_script_commands.c4
-rw-r--r--src/battle_tower.c53
-rwxr-xr-xsrc/berry_crush.c50
-rw-r--r--src/digit_obj_util.c450
-rw-r--r--src/dodrio_berry_picking.c6
-rw-r--r--src/event_object_movement.c2
-rw-r--r--src/field_player_avatar.c130
-rw-r--r--src/fldeff_misc.c2
-rw-r--r--src/frontier_util.c6
-rw-r--r--src/hall_of_fame.c8
-rwxr-xr-xsrc/item_use.c4
-rw-r--r--src/minigame_countdown.c636
-rwxr-xr-xsrc/party_menu.c10
-rw-r--r--src/pokemon.c6
-rwxr-xr-xsrc/pokemon_jump.c654
-rw-r--r--src/rom_8034C54.c453
-rw-r--r--src/rom_81520A8.c4
-rw-r--r--src/union_room_battle.c6
22 files changed, 1284 insertions, 1251 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 01d05e68d..00c504bfd 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -691,6 +691,25 @@ static const struct BattleBackground gBattleTerrainTable[] =
},
};
+static void sub_8035648(void);
+
+// Unused
+static void sub_8035608(void)
+{
+ u8 spriteId;
+
+ ResetSpriteData();
+ spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0);
+ gSprites[spriteId].invisible = TRUE;
+ SetMainCallback2(sub_8035648);
+}
+
+static void sub_8035648(void)
+{
+ AnimateSprites();
+ BuildOamBuffer();
+}
+
void BattleInitBgsAndWindows(void)
{
ResetBgsAndClearDma3BusyFlags(0);
diff --git a/src/battle_dome.c b/src/battle_dome.c
index 746d195d9..e4947825d 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -2578,7 +2578,7 @@ static void CreateDomeOpponentMons(u16 tournamentTrainerId)
// Create mon if it was selected, starting from back
for (i = FRONTIER_PARTY_SIZE - 1; i >= 0; i--)
{
- if (selectedMonBits & 4)
+ if (selectedMonBits & (1 << (FRONTIER_PARTY_SIZE - 1)))
{
CreateDomeOpponentMon(monsCount, tournamentTrainerId, i, otId);
monsCount++;
diff --git a/src/battle_main.c b/src/battle_main.c
index 0f6ec40a4..e3eea60d0 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4425,7 +4425,7 @@ static void HandleTurnActionSelectionState(void)
RecordedBattle_ClearBattlerAction(gActiveBattler, 1);
gBattleCommunication[gActiveBattler] = STATE_SELECTION_SCRIPT;
*(gBattleStruct->selectionScriptFinished + gActiveBattler) = FALSE;
- gBattleBufferB[gActiveBattler][1] = 0;
+ gBattleBufferB[gActiveBattler][1] = B_ACTION_USE_MOVE;
*(gBattleStruct->stateIdAfterSelScript + gActiveBattler) = STATE_WAIT_ACTION_CHOSEN;
return;
}
@@ -4553,7 +4553,7 @@ static void HandleTurnActionSelectionState(void)
case STATE_SELECTION_SCRIPT_MAY_RUN:
if (*(gBattleStruct->selectionScriptFinished + gActiveBattler))
{
- if (gBattleBufferB[gActiveBattler][1] == 13)
+ if (gBattleBufferB[gActiveBattler][1] == B_ACTION_NOTHING_FAINTED)
{
gHitMarker |= HITMARKER_RUN;
gChosenActionByBattler[gActiveBattler] = B_ACTION_RUN;
diff --git a/src/battle_pike.c b/src/battle_pike.c
index 9bc7254ec..6b31419a5 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -874,20 +874,20 @@ static bool8 TryInflictRandomStatus(void)
{
u8 j, i;
u8 count;
- u8 indices[3];
+ u8 indices[FRONTIER_PARTY_SIZE];
u32 status;
u16 species;
bool8 statusChosen;
struct Pokemon *mon;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
indices[i] = i;
for (j = 0; j < 10; j++)
{
u8 temp, id;
- i = Random() % 3;
- id = Random() % 3;
+ i = Random() % FRONTIER_PARTY_SIZE;
+ id = Random() % FRONTIER_PARTY_SIZE;
SWAP(indices[i], indices[id], temp);
}
@@ -921,7 +921,7 @@ static bool8 TryInflictRandomStatus(void)
{
status = sStatusFlags;
j = 0;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{
mon = &gPlayerParty[indices[i]];
if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -963,7 +963,7 @@ static bool8 TryInflictRandomStatus(void)
}
j = 0;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{
mon = &gPlayerParty[indices[i]];
if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -995,7 +995,7 @@ static bool8 AtLeastOneHealthyMon(void)
count = 3;
healthyMonsCount = 0;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{
struct Pokemon *mon = &gPlayerParty[i];
if (GetAilmentFromStatus(GetMonData(mon, MON_DATA_STATUS)) == AILMENT_NONE
@@ -1262,23 +1262,23 @@ static void Task_DoStatusInflictionScreenFlash(u8 taskId)
static void TryHealMons(u8 healCount)
{
u8 j, i, k;
- u8 indices[3];
+ u8 indices[FRONTIER_PARTY_SIZE];
if (healCount == 0)
return;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
indices[i] = i;
for (k = 0; k < 10; k++)
{
u8 temp;
- i = Random() % 3;
- j = Random() % 3;
+ i = Random() % FRONTIER_PARTY_SIZE;
+ j = Random() % FRONTIER_PARTY_SIZE;
SWAP(indices[i], indices[j], temp);
}
- for (i = 0; i < 3; i++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{
bool32 canBeHealed = FALSE;
struct Pokemon *mon = &gPlayerParty[indices[i]];
@@ -1483,7 +1483,7 @@ static bool8 AtLeastTwoAliveMons(void)
mon = &gPlayerParty[0];
countDead = 0;
- for (i = 0; i < 3; i++, mon++)
+ for (i = 0; i < FRONTIER_PARTY_SIZE; i++, mon++)
{
if (GetMonData(mon, MON_DATA_HP) == 0)
countDead++;
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 729cce0c9..84f2b1f4d 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -8925,7 +8925,7 @@ static void Cmd_jumpifnopursuitswitchdmg(void)
for (i = 0; i < gBattlersCount; i++)
{
if (gBattlerByTurnOrder[i] == gBattlerTarget)
- gActionsByTurnOrder[i] = 11;
+ gActionsByTurnOrder[i] = B_ACTION_TRY_FINISH;
}
gCurrentMove = MOVE_PURSUIT;
@@ -10005,7 +10005,7 @@ static void Cmd_pursuitrelated(void)
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
&& !(gAbsentBattlerFlags & gBitTable[gActiveBattler])
- && gChosenActionByBattler[gActiveBattler] == 0
+ && gChosenActionByBattler[gActiveBattler] == B_ACTION_USE_MOVE
&& gChosenMoveByBattler[gActiveBattler] == MOVE_PURSUIT)
{
gActionsByTurnOrder[gActiveBattler] = 11;
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 4890e7a05..4695d9aa0 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -24,6 +24,7 @@
#include "tv.h"
#include "battle_factory.h"
#include "constants/apprentice.h"
+#include "constants/battle_dome.h"
#include "constants/battle_frontier.h"
#include "constants/battle_frontier_mons.h"
#include "constants/battle_tent_mons.h"
@@ -2054,7 +2055,7 @@ void DoSpecialTrainerBattle(void)
if (VarGet(VAR_FRONTIER_BATTLE_MODE) == FRONTIER_MODE_DOUBLES)
gBattleTypeFlags |= BATTLE_TYPE_DOUBLE;
if (gTrainerBattleOpponent_A == TRAINER_FRONTIER_BRAIN)
- FillFrontierTrainerParty(2);
+ FillFrontierTrainerParty(DOME_BATTLE_PARTY_SIZE);
CreateTask(Task_StartBattleAfterTransition, 1);
sub_806E694(0);
BattleTransition_StartOnField(sub_80B100C(3));
@@ -2211,12 +2212,12 @@ static void nullsub_116(void)
static void GetApprenticeMultiPartnerParty(u16 trainerId)
{
s32 i, count;
- u32 validSpecies[3];
+ u32 validSpecies[MULTI_PARTY_SIZE];
u16 species1 = GetMonData(&gPlayerParty[0], MON_DATA_SPECIES, NULL);
u16 species2 = GetMonData(&gPlayerParty[1], MON_DATA_SPECIES, NULL);
count = 0;
- for (i = 0; i < 3; i++)
+ for (i = 0; i < MULTI_PARTY_SIZE; i++)
{
u16 apprenticeSpecies = gSaveBlock2Ptr->apprentices[trainerId - TRAINER_RECORD_MIXING_APPRENTICE].party[i].species;
if (apprenticeSpecies != species1 && apprenticeSpecies != species2)
@@ -2340,7 +2341,7 @@ static void LoadMultiPartnerCandidatesData(void)
&& gSaveBlock2Ptr->apprentices[i].lvlMode - 1 == lvlMode)
{
k = 0;
- for (j = 0; j < 3; j++)
+ for (j = 0; j < MULTI_PARTY_SIZE; j++)
{
if (species1 != gSaveBlock2Ptr->apprentices[i].party[j].species
&& species2 != gSaveBlock2Ptr->apprentices[i].party[j].species)
@@ -2948,26 +2949,26 @@ static void FillPartnerParty(u16 trainerId)
if (trainerId == TRAINER_STEVEN_PARTNER)
{
- for (i = 0; i < 3; i++)
+ for (i = 0; i < MULTI_PARTY_SIZE; i++)
{
do
{
j = Random32();
} while (IsShinyOtIdPersonality(STEVEN_OTID, j) || sStevenMons[i].nature != GetNatureFromPersonality(j));
- CreateMon(&gPlayerParty[3 + i],
+ CreateMon(&gPlayerParty[MULTI_PARTY_SIZE + i],
sStevenMons[i].species,
sStevenMons[i].level,
sStevenMons[i].fixedIV,
TRUE, i, // BUG: personality was stored in the 'j' variable. As a result, Steven's pokemon do not have the intended natures.
OT_ID_PRESET, STEVEN_OTID);
for (j = 0; j < PARTY_SIZE; j++)
- SetMonData(&gPlayerParty[3 + i], MON_DATA_HP_EV + j, &sStevenMons[i].evs[j]);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_HP_EV + j, &sStevenMons[i].evs[j]);
for (j = 0; j < MAX_MON_MOVES; j++)
- SetMonMoveSlot(&gPlayerParty[3 + i], sStevenMons[i].moves[j], j);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_NAME, gTrainers[TRAINER_STEVEN].trainerName);
+ SetMonMoveSlot(&gPlayerParty[MULTI_PARTY_SIZE + i], sStevenMons[i].moves[j], j);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_NAME, gTrainers[TRAINER_STEVEN].trainerName);
j = MALE;
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j);
- CalculateMonStats(&gPlayerParty[3 + i]);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_GENDER, &j);
+ CalculateMonStats(&gPlayerParty[MULTI_PARTY_SIZE + i]);
}
}
else if (trainerId == TRAINER_EREADER)
@@ -2980,10 +2981,10 @@ static void FillPartnerParty(u16 trainerId)
level = SetFacilityPtrsGetLevel();
ivs = GetFrontierTrainerFixedIvs(trainerId);
otID = Random32();
- for (i = 0; i < 2; i++)
+ for (i = 0; i < FRONTIER_MULTI_PARTY_SIZE; i++)
{
monId = gSaveBlock2Ptr->frontier.trainerIds[i + 18];
- CreateMonWithEVSpreadNatureOTID(&gPlayerParty[3 + i],
+ CreateMonWithEVSpreadNatureOTID(&gPlayerParty[MULTI_PARTY_SIZE + i],
gFacilityTrainerMons[monId].species,
level,
gFacilityTrainerMons[monId].nature,
@@ -2993,23 +2994,23 @@ static void FillPartnerParty(u16 trainerId)
friendship = MAX_FRIENDSHIP;
for (j = 0; j < MAX_MON_MOVES; j++)
{
- SetMonMoveSlot(&gPlayerParty[3 + i], gFacilityTrainerMons[monId].moves[j], j);
+ SetMonMoveSlot(&gPlayerParty[MULTI_PARTY_SIZE + i], gFacilityTrainerMons[monId].moves[j], j);
if (gFacilityTrainerMons[monId].moves[j] == MOVE_FRUSTRATION)
friendship = 0;
}
- SetMonData(&gPlayerParty[3 + i], MON_DATA_FRIENDSHIP, &friendship);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_FRIENDSHIP, &friendship);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_HELD_ITEM, &gBattleFrontierHeldItems[gFacilityTrainerMons[monId].itemTableId]);
for (j = 0; j < PLAYER_NAME_LENGTH + 1; j++)
trainerName[j] = gFacilityTrainers[trainerId].trainerName[j];
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_NAME, &trainerName);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_NAME, &trainerName);
j = IsFrontierTrainerFemale(trainerId);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_GENDER, &j);
}
}
else if (trainerId < TRAINER_RECORD_MIXING_APPRENTICE)
{
trainerId -= TRAINER_RECORD_MIXING_FRIEND;
- for (i = 0; i < 2; i++)
+ for (i = 0; i < FRONTIER_MULTI_PARTY_SIZE; i++)
{
struct EmeraldBattleTowerRecord *record = &gSaveBlock2Ptr->frontier.towerRecords[trainerId];
struct BattleTowerPokemon monData = record->party[gSaveBlock2Ptr->frontier.trainerIds[18 + i]];
@@ -3027,20 +3028,20 @@ static void FillPartnerParty(u16 trainerId)
if (monData.nickname[0] == EXT_CTRL_CODE_BEGIN && monData.nickname[1] == EXT_CTRL_CODE_JPN)
trainerName[5] = EOS;
}
- CreateBattleTowerMon2(&gPlayerParty[3 + i], &monData, TRUE);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_NAME, trainerName);
+ CreateBattleTowerMon2(&gPlayerParty[MULTI_PARTY_SIZE + i], &monData, TRUE);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_NAME, trainerName);
j = IsFrontierTrainerFemale(trainerId + TRAINER_RECORD_MIXING_FRIEND);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_GENDER, &j);
}
}
else
{
trainerId -= TRAINER_RECORD_MIXING_APPRENTICE;
- for (i = 0; i < 2; i++)
+ for (i = 0; i < FRONTIER_MULTI_PARTY_SIZE; i++)
{
- CreateApprenticeMon(&gPlayerParty[3 + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.trainerIds[18 + i]);
+ CreateApprenticeMon(&gPlayerParty[MULTI_PARTY_SIZE + i], &gSaveBlock2Ptr->apprentices[trainerId], gSaveBlock2Ptr->frontier.trainerIds[18 + i]);
j = IsFrontierTrainerFemale(trainerId + TRAINER_RECORD_MIXING_APPRENTICE);
- SetMonData(&gPlayerParty[3 + i], MON_DATA_OT_GENDER, &j);
+ SetMonData(&gPlayerParty[MULTI_PARTY_SIZE + i], MON_DATA_OT_GENDER, &j);
}
}
}
@@ -3351,7 +3352,7 @@ static void SetNextBattleTentOpponent(void)
static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
{
s32 i, j;
- u16 chosenMonIndices[4];
+ u16 chosenMonIndices[MAX_FRONTIER_PARTY_SIZE];
u8 friendship;
u8 level = SetTentPtrsGetLevel();
u8 fixedIV = 0;
diff --git a/src/berry_crush.c b/src/berry_crush.c
index 542888631..a67d1548e 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -19,9 +19,9 @@
#include "menu.h"
#include "overworld.h"
#include "palette.h"
-#include "pokemon_jump.h"
+#include "minigame_countdown.h"
#include "random.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
#include "save.h"
#include "scanline_effect.h"
#include "script.h"
@@ -714,14 +714,14 @@ static const struct SpriteTemplate gUnknown_082F436C =
.callback = SpriteCallbackDummy
};
-static const struct UnkStruct3 gUnknown_082F4384[] =
+static const struct DigitObjUtilTemplate gUnknown_082F4384[] =
{
{
- .field_0_0 = 1,
+ .strConvMode = 1,
.shape = 2,
.size = 0,
.priority = 0,
- .field_1 = 2,
+ .oamCount = 2,
.xDelta = 8,
.x = 156,
.y = 0,
@@ -729,11 +729,11 @@ static const struct UnkStruct3 gUnknown_082F4384[] =
.spritePal = gUnknown_082F422C,
},
{
- .field_0_0 = 0,
+ .strConvMode = 0,
.shape = 2,
.size = 0,
.priority = 0,
- .field_1 = 2,
+ .oamCount = 2,
.xDelta = 8,
.x = 180,
.y = 0,
@@ -741,11 +741,11 @@ static const struct UnkStruct3 gUnknown_082F4384[] =
.spritePal = gUnknown_082F422C,
},
{
- .field_0_0 = 0,
+ .strConvMode = 0,
.shape = 2,
.size = 0,
.priority = 0,
- .field_1 = 2,
+ .oamCount = 2,
.xDelta = 8,
.x = 204,
.y = 0,
@@ -1036,7 +1036,7 @@ int sub_802104C(void)
case 1:
CpuFill16(0, (void *)OAM, OAM_SIZE);
gReservedSpritePaletteCount = 0;
- sub_8034C54(3);
+ DigitObjUtil_Init(3);
break;
case 2:
ResetPaletteFade();
@@ -1165,7 +1165,7 @@ int sub_802130C(void)
case 6:
DestroyWirelessStatusIndicatorSprite();
sub_8022960(var0);
- sub_8034CC8();
+ DigitObjUtil_Free();
break;
case 7:
var0->unkC = 0;
@@ -1701,18 +1701,18 @@ void ShowBerryCrushRankings(void)
void sub_8022524(struct BerryCrushGame_138 *r4, u16 r1)
{
sub_8021944(r4, r1);
- sub_8035044(0, r4->unk4);
- sub_8035044(1, r4->unk6);
- sub_8035044(2, r4->unk8);
+ DigitObjUtil_PrintNumOn(0, r4->unk4);
+ DigitObjUtil_PrintNumOn(1, r4->unk6);
+ DigitObjUtil_PrintNumOn(2, r4->unk8);
}
void sub_8022554(struct BerryCrushGame_138 *r0)
{
r0->unk78[0]->invisible = TRUE;
r0->unk78[1]->invisible = TRUE;
- sub_803547C(2, 1);
- sub_803547C(1, 1);
- sub_803547C(0, 1);
+ DigitObjUtil_HideOrShow(2, 1);
+ DigitObjUtil_HideOrShow(1, 1);
+ DigitObjUtil_HideOrShow(0, 1);
}
void sub_8022588(struct BerryCrushGame *r5)
@@ -1855,9 +1855,9 @@ void sub_8022730(struct BerryCrushGame *r6)
r6->unk138.unk78[r5]->invisible = FALSE;
r6->unk138.unk78[r5]->animPaused = FALSE;
}
- sub_8034D14(0, 0, &gUnknown_082F4384[0]);
- sub_8034D14(1, 0, &gUnknown_082F4384[1]);
- sub_8034D14(2, 0, &gUnknown_082F4384[2]);
+ DigitObjUtil_CreatePrinter(0, 0, &gUnknown_082F4384[0]);
+ DigitObjUtil_CreatePrinter(1, 0, &gUnknown_082F4384[1]);
+ DigitObjUtil_CreatePrinter(2, 0, &gUnknown_082F4384[2]);
if (r6->unk12 == 1)
sub_8022554(&r6->unk138);
}
@@ -1875,9 +1875,9 @@ void sub_8022960(struct BerryCrushGame *r5)
FreeSpritePaletteByTag(1);
for (; r4 < ARRAY_COUNT(r5->unk138.unk78); ++r4)
DestroySprite(r5->unk138.unk78[r4]);
- sub_80353DC(2);
- sub_80353DC(1);
- sub_80353DC(0);
+ DigitObjUtil_DeletePrinter(2);
+ DigitObjUtil_DeletePrinter(1);
+ DigitObjUtil_DeletePrinter(0);
for (r4 = 0; r4 < ARRAY_COUNT(r5->unk138.unk4C); ++r4)
DestroySprite(r5->unk138.unk4C[r4]);
for (r4 = 0; r4 < r5->unk9; ++r4)
@@ -2317,10 +2317,10 @@ static u32 sub_80232EC(struct BerryCrushGame *r4, __attribute__((unused)) u8 *r
case 1:
if (!IsLinkTaskFinished())
return 0;
- sub_802EB24(0x1000, 0x1000, 120, 80, 0);
+ StartMinigameCountdown(0x1000, 0x1000, 120, 80, 0);
break;
case 2:
- if (sub_802EB84())
+ if (IsMinigameCountdownRunning())
return 0;
// fallthrough
case 0:
diff --git a/src/digit_obj_util.c b/src/digit_obj_util.c
new file mode 100644
index 000000000..fe5d49e69
--- /dev/null
+++ b/src/digit_obj_util.c
@@ -0,0 +1,450 @@
+#include "global.h"
+#include "digit_obj_util.h"
+#include "malloc.h"
+#include "decompress.h"
+#include "main.h"
+#include "battle_main.h"
+
+struct DigitPrinter
+{
+ bool8 isActive;
+ u8 firstOamId;
+ u8 strConvMode;
+ u8 oamCount;
+ u8 palTagIndex;
+ u8 size;
+ u8 shape;
+ u8 priority;
+ u8 xDelta;
+ u8 tilesPerImage;
+ u16 tileStart;
+ s16 x;
+ s16 y;
+ u16 tileTag;
+ u16 palTag;
+ u32 pow10;
+ s32 lastPrinted;
+};
+
+struct DigitPrinterAlloc
+{
+ u32 count;
+ struct DigitPrinter *array;
+};
+
+// this file's functions
+static u8 GetFirstOamId(u8 oamCount);;
+static void CopyWorkToOam(struct DigitPrinter *objWork);
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign);
+static bool32 SharesTileWithAnyActive(u32 id);
+static bool32 SharesPalWithAnyActive(u32 id);
+
+// ewram
+static EWRAM_DATA struct DigitPrinterAlloc *sOamWork = {0};
+
+// const rom data
+static const u8 sTilesPerImage[4][4] =
+{
+ [ST_OAM_SQUARE] = {
+ [ST_OAM_SIZE_0] = 0x01, // SPRITE_SIZE_8x8
+ [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_16x16
+ [ST_OAM_SIZE_2] = 0x10, // SPRITE_SIZE_32x32
+ [ST_OAM_SIZE_3] = 0x40 // SPRITE_SIZE_64x64
+ },
+ [ST_OAM_H_RECTANGLE] = {
+ [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_16x8
+ [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_32x8
+ [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_32x16
+ [ST_OAM_SIZE_3] = 0x20 // SPRITE_SIZE_64x32
+ },
+ [ST_OAM_V_RECTANGLE] = {
+ [ST_OAM_SIZE_0] = 0x02, // SPRITE_SIZE_8x16
+ [ST_OAM_SIZE_1] = 0x04, // SPRITE_SIZE_8x32
+ [ST_OAM_SIZE_2] = 0x08, // SPRITE_SIZE_16x32
+ [ST_OAM_SIZE_3] = 0x20 // SPRITE_SIZE_32x64
+ }
+};
+
+// code
+bool32 DigitObjUtil_Init(u32 count)
+{
+ u32 i;
+
+ if (sOamWork != NULL)
+ DigitObjUtil_Free();
+
+ sOamWork = Alloc(sizeof(*sOamWork));
+ if (sOamWork == NULL)
+ return FALSE;
+
+ sOamWork->array = Alloc(sizeof(struct DigitPrinter) * count);
+ if (sOamWork->array == NULL)
+ {
+ Free(sOamWork);
+ return FALSE;
+ }
+
+ sOamWork->count = count;
+ for (i = 0; i < count; i++)
+ {
+ sOamWork->array[i].isActive = FALSE;
+ sOamWork->array[i].firstOamId = 0xFF;
+ }
+
+ return TRUE;
+}
+
+void DigitObjUtil_Free(void)
+{
+ if (sOamWork != NULL)
+ {
+ if (sOamWork->array != NULL)
+ {
+ u32 i;
+
+ for (i = 0; i < sOamWork->count; i++)
+ DigitObjUtil_DeletePrinter(i);
+
+ Free(sOamWork->array);
+ }
+
+ FREE_AND_SET_NULL(sOamWork);
+ }
+}
+
+bool32 DigitObjUtil_CreatePrinter(u32 id, s32 num, const struct DigitObjUtilTemplate *template)
+{
+ u32 i;
+
+ if (sOamWork == NULL)
+ return FALSE;
+ if (sOamWork->array[id].isActive)
+ return FALSE;
+
+ sOamWork->array[id].firstOamId = GetFirstOamId(template->oamCount);
+ if (sOamWork->array[id].firstOamId == 0xFF)
+ return FALSE;
+
+ sOamWork->array[id].tileStart = GetSpriteTileStartByTag(template->spriteSheet->tag);
+ if (sOamWork->array[id].tileStart == 0xFFFF)
+ {
+ if (template->spriteSheet->size != 0)
+ {
+ sOamWork->array[id].tileStart = LoadSpriteSheet(template->spriteSheet);
+ }
+ else
+ {
+ struct CompressedSpriteSheet compSpriteSheet;
+
+ compSpriteSheet = *(struct CompressedSpriteSheet*)(template->spriteSheet);
+ compSpriteSheet.size = GetDecompressedDataSize(template->spriteSheet->data);
+ sOamWork->array[id].tileStart = LoadCompressedSpriteSheet(&compSpriteSheet);
+ }
+
+ if (sOamWork->array[id].tileStart == 0xFFFF)
+ return FALSE;
+ }
+
+ sOamWork->array[id].palTagIndex = IndexOfSpritePaletteTag(template->spritePal->tag);
+ if (sOamWork->array[id].palTagIndex == 0xFF)
+ sOamWork->array[id].palTagIndex = LoadSpritePalette(template->spritePal);
+
+ sOamWork->array[id].strConvMode = template->strConvMode;
+ sOamWork->array[id].oamCount = template->oamCount;
+ sOamWork->array[id].x = template->x;
+ sOamWork->array[id].y = template->y;
+ sOamWork->array[id].shape = template->shape;
+ sOamWork->array[id].size = template->size;
+ sOamWork->array[id].priority = template->priority;
+ sOamWork->array[id].xDelta = template->xDelta;
+ sOamWork->array[id].tilesPerImage = GetTilesPerImage(template->shape, template->size);
+ sOamWork->array[id].tileTag = template->spriteSheet->tag;
+ sOamWork->array[id].palTag = template->spritePal->tag;
+ sOamWork->array[id].isActive = TRUE;
+
+ // Decimal left shift
+ sOamWork->array[id].pow10 = 1;
+ for (i = 1; i < template->oamCount; i++)
+ sOamWork->array[id].pow10 *= 10;
+
+ CopyWorkToOam(&sOamWork->array[id]);
+ DigitObjUtil_PrintNumOn(id, num);
+
+ return TRUE;
+}
+
+static void CopyWorkToOam(struct DigitPrinter *objWork)
+{
+ u32 i;
+ u32 oamId = objWork->firstOamId;
+ u32 x = objWork->x;
+ u32 oamCount = objWork->oamCount + 1;
+
+ CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
+ for (i = 0, oamId = objWork->firstOamId; i < oamCount; i++, oamId++)
+ {
+ gMain.oamBuffer[oamId].y = objWork->y;
+ gMain.oamBuffer[oamId].x = x;
+ gMain.oamBuffer[oamId].shape = objWork->shape;
+ gMain.oamBuffer[oamId].size = objWork->size;
+ gMain.oamBuffer[oamId].tileNum = objWork->tileStart;
+ gMain.oamBuffer[oamId].priority = objWork->priority;
+ gMain.oamBuffer[oamId].paletteNum = objWork->palTagIndex;
+
+ x += objWork->xDelta;
+ }
+
+ oamId--;
+ gMain.oamBuffer[oamId].x = objWork->x - objWork->xDelta;
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+ gMain.oamBuffer[oamId].tileNum = objWork->tileStart + (objWork->tilesPerImage * 10);
+}
+
+void DigitObjUtil_PrintNumOn(u32 id, s32 num)
+{
+ bool32 sign;
+
+ if (sOamWork == NULL)
+ return;
+ if (!sOamWork->array[id].isActive)
+ return;
+
+ sOamWork->array[id].lastPrinted = num;
+ if (num < 0)
+ {
+ sign = TRUE;
+ num *= -1;
+ }
+ else
+ {
+ sign = FALSE;
+ }
+
+ switch (sOamWork->array[id].strConvMode)
+ {
+ case 0:
+ default:
+ DrawNumObjsLeadingZeros(&sOamWork->array[id], num, sign);
+ break;
+ case 1:
+ DrawNumObjsMinusInFront(&sOamWork->array[id], num, sign);
+ break;
+ case 2:
+ DrawNumObjsMinusInBack(&sOamWork->array[id], num, sign);
+ break;
+ }
+}
+
+static void DrawNumObjsLeadingZeros(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+ u32 pow10 = objWork->pow10;
+ u32 oamId = objWork->firstOamId;
+
+ while (pow10 != 0)
+ {
+ u32 digit = num / pow10;
+ num -= (digit * pow10);
+ pow10 /= 10;
+
+ gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+ oamId++;
+ }
+
+ if (sign)
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+ else
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+static void DrawNumObjsMinusInFront(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+ u32 pow10 = objWork->pow10;
+ static int oamId;
+ static int curDigit;
+ static int firstDigit;
+
+ oamId = objWork->firstOamId;
+ curDigit = 0;
+ firstDigit = -1;
+
+ while (pow10 != 0)
+ {
+ u32 digit = num / pow10;
+ num -= (digit * pow10);
+ pow10 /= 10;
+
+ if (digit != 0 || firstDigit != -1 || pow10 == 0)
+ {
+ gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+ if (firstDigit == -1)
+ firstDigit = curDigit;
+ }
+ else
+ {
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+ }
+
+ oamId++;
+ curDigit++;
+ }
+
+ if (sign)
+ {
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+ gMain.oamBuffer[oamId].x = objWork->x + ((firstDigit - 1) * objWork->xDelta);
+ }
+ else
+ {
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+ }
+}
+
+static void DrawNumObjsMinusInBack(struct DigitPrinter *objWork, s32 num, bool32 sign)
+{
+ u32 pow10 = objWork->pow10;
+ u32 oamId = objWork->firstOamId;
+ bool32 printingDigits = FALSE;
+ s32 nsprites = 0;
+
+ while (pow10 != 0)
+ {
+ u32 digit = num / pow10;
+ num -= (digit * pow10);
+ pow10 /= 10;
+
+ if (digit != 0 || printingDigits || pow10 == 0)
+ {
+ printingDigits = TRUE;
+ gMain.oamBuffer[oamId].tileNum = (digit * objWork->tilesPerImage) + objWork->tileStart;
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+ oamId++;
+ nsprites++;
+ }
+ }
+
+ while (nsprites < objWork->oamCount)
+ {
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+ oamId++;
+ nsprites++;
+ }
+
+ if (sign)
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+ else
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+}
+
+void DigitObjUtil_DeletePrinter(u32 id)
+{
+ s32 oamId, oamCount, i;
+
+ if (sOamWork == NULL)
+ return;
+ if (!sOamWork->array[id].isActive)
+ return;
+
+ oamCount = sOamWork->array[id].oamCount + 1;
+ oamId = sOamWork->array[id].firstOamId;
+
+ for (i = 0; i < oamCount; i++, oamId++)
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+
+ if (!SharesTileWithAnyActive(id))
+ FreeSpriteTilesByTag(sOamWork->array[id].tileTag);
+ if (!SharesPalWithAnyActive(id))
+ FreeSpritePaletteByTag(sOamWork->array[id].palTag);
+
+ sOamWork->array[id].isActive = FALSE;
+}
+
+void DigitObjUtil_HideOrShow(u32 id, bool32 hide)
+{
+ s32 oamId, oamCount, i;
+
+ if (sOamWork == NULL)
+ return;
+ if (!sOamWork->array[id].isActive)
+ return;
+
+ oamCount = sOamWork->array[id].oamCount + 1;
+ oamId = sOamWork->array[id].firstOamId;
+ if (hide)
+ {
+ for (i = 0; i < oamCount; i++, oamId++)
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
+ }
+ else
+ {
+ for (i = 0; i < oamCount; i++, oamId++)
+ gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
+
+ DigitObjUtil_PrintNumOn(id, sOamWork->array[id].lastPrinted);
+ }
+}
+
+static u8 GetFirstOamId(u8 oamCount)
+{
+ u32 i;
+ u16 firstOamId = 64;
+
+ for (i = 0; i < sOamWork->count; i++)
+ {
+ if (!sOamWork->array[i].isActive)
+ {
+ if (sOamWork->array[i].firstOamId != 0xFF && sOamWork->array[i].oamCount <= oamCount)
+ return sOamWork->array[i].firstOamId;
+ }
+ else
+ {
+ firstOamId += 1 + sOamWork->array[i].oamCount;
+ }
+ }
+
+ if (firstOamId + oamCount + 1 > 128)
+ return 0xFF;
+ else
+ return firstOamId;
+}
+
+static bool32 SharesTileWithAnyActive(u32 id)
+{
+ u32 i;
+
+ for (i = 0; i < sOamWork->count; i++)
+ {
+ if (sOamWork->array[i].isActive && i != id
+ && sOamWork->array[i].tileTag == sOamWork->array[id].tileTag)
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+static bool32 SharesPalWithAnyActive(u32 id)
+{
+ u32 i;
+
+ for (i = 0; i < sOamWork->count; i++)
+ {
+ if (sOamWork->array[i].isActive && i != id
+ && sOamWork->array[i].palTag == sOamWork->array[id].palTag)
+ {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
+u8 GetTilesPerImage(u32 shape, u32 size)
+{
+ return sTilesPerImage[shape][size];
+}
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 40074e0af..936c1828f 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -12,7 +12,7 @@
#include "m4a.h"
#include "main.h"
#include "palette.h"
-#include "pokemon_jump.h"
+#include "minigame_countdown.h"
#include "random.h"
#include "save.h"
#include "script.h"
@@ -667,7 +667,7 @@ static void sub_8024E38(void)
switch (gUnknown_02022C98->unk10)
{
case 0:
- sub_802EB24(7, 8, 120, 80, 0);
+ StartMinigameCountdown(7, 8, 120, 80, 0);
gUnknown_02022C98->unk10++;
break;
case 1:
@@ -682,7 +682,7 @@ static void sub_8024E38(void)
}
break;
case 3:
- if (!sub_802EB84())
+ if (!IsMinigameCountdownRunning())
{
gUnknown_02022C98->unk10++;
}
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 464e6acec..09cdd94cd 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1754,7 +1754,7 @@ static void SetPlayerAvatarObjectEventIdAndObjectId(u8 objectEventId, u8 spriteI
gPlayerAvatar.objectEventId = objectEventId;
gPlayerAvatar.spriteId = spriteId;
gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gObjectEvents[objectEventId].graphicsId);
- SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, 0x20);
+ SetPlayerAvatarExtraStateTransition(gObjectEvents[objectEventId].graphicsId, PLAYER_AVATAR_FLAG_5);
}
void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId)
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index ebab51ed8..35bbb1e03 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -59,8 +59,8 @@ static bool8 ForcedMovement_SlideSouth(void);
static bool8 ForcedMovement_SlideNorth(void);
static bool8 ForcedMovement_SlideWest(void);
static bool8 ForcedMovement_SlideEast(void);
-static bool8 ForcedMovement_0xBB(void);
-static bool8 ForcedMovement_0xBC(void);
+static bool8 ForcedMovement_MatJump(void);
+static bool8 ForcedMovement_MatSpin(void);
static bool8 ForcedMovement_MuddySlope(void);
static void MovePlayerNotOnBike(u8, u16);
@@ -99,10 +99,10 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a);
static void sub_808C280(struct ObjectEvent *);
static void StartStrengthAnim(u8, u8);
-static void Task_BumpBoulder(u8 taskId);
-static u8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
-static u8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static void Task_PushBoulder(u8 taskId);
+static u8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static u8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
+static u8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject);
static void DoPlayerMatJump(void);
static void DoPlayerAvatarSecretBaseMatJump(u8 taskId);
@@ -182,8 +182,8 @@ static bool8 (*const sForcedMovementFuncs[])(void) =
ForcedMovement_SlideWest,
ForcedMovement_SlideEast,
ForcedMovement_PushedSouthByCurrent,
- ForcedMovement_0xBB,
- ForcedMovement_0xBC,
+ ForcedMovement_MatJump,
+ ForcedMovement_MatSpin,
ForcedMovement_MuddySlope,
};
@@ -211,16 +211,16 @@ static const u8 sAcroBikeTrickCollisionTypes[] = {
COLLISION_HORIZONTAL_RAIL,
};
-static void (*const gUnknown_084974B8[])(struct ObjectEvent *) =
+static void (*const sPlayerAvatarTransitionFuncs[])(struct ObjectEvent *) =
{
- PlayerAvatarTransition_Normal,
- PlayerAvatarTransition_MachBike,
- PlayerAvatarTransition_AcroBike,
- PlayerAvatarTransition_Surfing,
- PlayerAvatarTransition_Underwater,
- PlayerAvatarTransition_ReturnToField,
- PlayerAvatarTransition_Dummy,
- PlayerAvatarTransition_Dummy,
+ [PLAYER_AVATAR_STATE_NORMAL] = PlayerAvatarTransition_Normal,
+ [PLAYER_AVATAR_STATE_MACH_BIKE] = PlayerAvatarTransition_MachBike,
+ [PLAYER_AVATAR_STATE_ACRO_BIKE] = PlayerAvatarTransition_AcroBike,
+ [PLAYER_AVATAR_STATE_SURFING] = PlayerAvatarTransition_Surfing,
+ [PLAYER_AVATAR_STATE_UNDERWATER] = PlayerAvatarTransition_Underwater,
+ [PLAYER_AVATAR_STATE_FIELD_MOVE] = PlayerAvatarTransition_ReturnToField,
+ [PLAYER_AVATAR_STATE_FISHING] = PlayerAvatarTransition_Dummy,
+ [PLAYER_AVATAR_STATE_WATERING] = PlayerAvatarTransition_Dummy,
};
static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
@@ -259,23 +259,23 @@ static const u8 sFRLGAvatarGfxIds[] = {OBJ_EVENT_GFX_RED, OBJ_EVENT_GFX_LEAF};
static const u8 sRSAvatarGfxIds[] = {OBJ_EVENT_GFX_LINK_RS_BRENDAN, OBJ_EVENT_GFX_LINK_RS_MAY};
-static const u8 gUnknown_0849750C[2][5][2] =
+static const u8 sPlayerAvatarGfxToStateFlag[2][5][2] =
{
- //male
+ [MALE] =
{
- {OBJ_EVENT_GFX_BRENDAN_NORMAL, 1},
- {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, 2},
- {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, 4},
- {OBJ_EVENT_GFX_BRENDAN_SURFING, 8},
- {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, 16},
+ {OBJ_EVENT_GFX_BRENDAN_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_BRENDAN_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_BRENDAN_ACRO_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
+ {OBJ_EVENT_GFX_BRENDAN_SURFING, PLAYER_AVATAR_FLAG_SURFING},
+ {OBJ_EVENT_GFX_BRENDAN_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
},
- //female
+ [FEMALE] =
{
- {OBJ_EVENT_GFX_MAY_NORMAL, 1},
- {OBJ_EVENT_GFX_MAY_MACH_BIKE, 2},
- {OBJ_EVENT_GFX_MAY_ACRO_BIKE, 4},
- {OBJ_EVENT_GFX_MAY_SURFING, 8},
- {OBJ_EVENT_GFX_MAY_UNDERWATER, 16},
+ {OBJ_EVENT_GFX_MAY_NORMAL, PLAYER_AVATAR_FLAG_ON_FOOT},
+ {OBJ_EVENT_GFX_MAY_MACH_BIKE, PLAYER_AVATAR_FLAG_MACH_BIKE},
+ {OBJ_EVENT_GFX_MAY_ACRO_BIKE, PLAYER_AVATAR_FLAG_ACRO_BIKE},
+ {OBJ_EVENT_GFX_MAY_SURFING, PLAYER_AVATAR_FLAG_SURFING},
+ {OBJ_EVENT_GFX_MAY_UNDERWATER, PLAYER_AVATAR_FLAG_UNDERWATER},
}
};
@@ -287,11 +287,11 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) = //Duplicate of
MetatileBehavior_IsEastArrowWarp,
};
-static bool8 (*const gUnknown_08497530[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) =
+static bool8 (*const sPushBoulderFuncs[])(struct Task *, struct ObjectEvent *, struct ObjectEvent *) =
{
- sub_808C3A4,
- do_boulder_dust,
- sub_808C484,
+ PushBoulder_Start,
+ PushBoulder_Move,
+ PushBoulder_End,
};
static bool8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct ObjectEvent *) =
@@ -547,13 +547,13 @@ static bool8 ForcedMovement_SlideEast(void)
return ForcedMovement_Slide(DIR_EAST, PlayerGoSpeed2);
}
-static bool8 ForcedMovement_0xBB(void)
+static bool8 ForcedMovement_MatJump(void)
{
DoPlayerMatJump();
return TRUE;
}
-static bool8 ForcedMovement_0xBC(void)
+static bool8 ForcedMovement_MatSpin(void)
{
DoPlayerMatSpin();
return TRUE;
@@ -807,23 +807,23 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
void SetPlayerAvatarTransitionFlags(u16 transitionFlags)
{
- gPlayerAvatar.unk1 |= transitionFlags;
+ gPlayerAvatar.transitionFlags |= transitionFlags;
DoPlayerAvatarTransition();
}
static void DoPlayerAvatarTransition(void)
{
u8 i;
- u8 flags = gPlayerAvatar.unk1;
+ u8 flags = gPlayerAvatar.transitionFlags;
if (flags != 0)
{
- for (i = 0; i < 8; i++, flags >>= 1)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarTransitionFuncs); i++, flags >>= 1)
{
if (flags & 1)
- gUnknown_084974B8[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
+ sPlayerAvatarTransitionFuncs[i](&gObjectEvents[gPlayerAvatar.objectEventId]);
}
- gPlayerAvatar.unk1 = 0;
+ gPlayerAvatar.transitionFlags = 0;
}
}
@@ -1186,12 +1186,12 @@ void sub_808BC90(s16 x, s16 y)
MoveObjectEventToMapCoords(&gObjectEvents[gPlayerAvatar.objectEventId], x, y);
}
-u8 TestPlayerAvatarFlags(u8 a)
+u8 TestPlayerAvatarFlags(u8 flag)
{
- return gPlayerAvatar.flags & a;
+ return gPlayerAvatar.flags & flag;
}
-u8 sub_808BCD0(void)
+u8 GetPlayerAvatarFlags(void)
{
return gPlayerAvatar.flags;
}
@@ -1335,32 +1335,32 @@ static u8 GetPlayerAvatarStateTransitionByGraphicsId(u8 graphicsId, u8 gender)
{
u8 i;
- for (i = 0; i < 5; i++)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
- if (gUnknown_0849750C[gender][i][0] == graphicsId)
- return gUnknown_0849750C[gender][i][1];
+ if (sPlayerAvatarGfxToStateFlag[gender][i][0] == graphicsId)
+ return sPlayerAvatarGfxToStateFlag[gender][i][1];
}
- return 1;
+ return PLAYER_AVATAR_FLAG_ON_FOOT;
}
u8 GetPlayerAvatarGraphicsIdByCurrentState(void)
{
u8 i;
- u8 r5 = gPlayerAvatar.flags;
+ u8 flags = gPlayerAvatar.flags;
- for (i = 0; i < 5; i++)
+ for (i = 0; i < ARRAY_COUNT(sPlayerAvatarGfxToStateFlag[0]); i++)
{
- if (gUnknown_0849750C[gPlayerAvatar.gender][i][1] & r5)
- return gUnknown_0849750C[gPlayerAvatar.gender][i][0];
+ if (sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][1] & flags)
+ return sPlayerAvatarGfxToStateFlag[gPlayerAvatar.gender][i][0];
}
return 0;
}
-void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 b)
+void SetPlayerAvatarExtraStateTransition(u8 graphicsId, u8 transitionFlag)
{
- u8 unk = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
+ u8 stateFlag = GetPlayerAvatarStateTransitionByGraphicsId(graphicsId, gPlayerAvatar.gender);
- gPlayerAvatar.unk1 |= unk | b;
+ gPlayerAvatar.transitionFlags |= stateFlag | transitionFlag;
DoPlayerAvatarTransition();
}
@@ -1384,7 +1384,7 @@ void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
playerObjEventTemplate.flagId = 0;
objectEventId = SpawnSpecialObjectEvent(&playerObjEventTemplate);
objectEvent = &gObjectEvents[objectEventId];
- objectEvent->isPlayer = 1;
+ objectEvent->isPlayer = TRUE;
objectEvent->warpArrowSpriteId = CreateWarpArrowSprite();
ObjectEventTurn(objectEvent, direction);
ClearPlayerAvatarInfo();
@@ -1453,22 +1453,22 @@ static void sub_808C280(struct ObjectEvent *objectEvent)
static void StartStrengthAnim(u8 a, u8 b)
{
- u8 taskId = CreateTask(Task_BumpBoulder, 0xFF);
+ u8 taskId = CreateTask(Task_PushBoulder, 0xFF);
gTasks[taskId].data[1] = a;
gTasks[taskId].data[2] = b;
- Task_BumpBoulder(taskId);
+ Task_PushBoulder(taskId);
}
-static void Task_BumpBoulder(u8 taskId)
+static void Task_PushBoulder(u8 taskId)
{
- while (gUnknown_08497530[gTasks[taskId].data[0]](&gTasks[taskId],
+ while (sPushBoulderFuncs[gTasks[taskId].data[0]](&gTasks[taskId],
&gObjectEvents[gPlayerAvatar.objectEventId],
&gObjectEvents[gTasks[taskId].data[1]]))
;
}
-static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_Start(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
ScriptContext2_Enable();
gPlayerAvatar.preventStep = TRUE;
@@ -1476,7 +1476,7 @@ static bool8 sub_808C3A4(struct Task *task, struct ObjectEvent *playerObject, st
return FALSE;
}
-static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_Move(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
if (ObjectEventIsHeldMovementActive(playerObject))
{
@@ -1506,7 +1506,7 @@ static bool8 do_boulder_dust(struct Task *task, struct ObjectEvent *playerObject
return FALSE;
}
-static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
+static bool8 PushBoulder_End(struct Task *task, struct ObjectEvent *playerObject, struct ObjectEvent *strengthObject)
{
if (ObjectEventCheckHeldMovementStatus(playerObject)
&& ObjectEventCheckHeldMovementStatus(strengthObject))
@@ -1515,7 +1515,7 @@ static bool8 sub_808C484(struct Task *task, struct ObjectEvent *playerObject, st
ObjectEventClearHeldMovementIfFinished(strengthObject);
gPlayerAvatar.preventStep = FALSE;
ScriptContext2_Disable();
- DestroyTask(FindTaskIdByFunc(Task_BumpBoulder));
+ DestroyTask(FindTaskIdByFunc(Task_PushBoulder));
}
return FALSE;
}
@@ -1545,7 +1545,7 @@ static u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct ObjectEvent
if (task->data[1] > 1)
{
gPlayerAvatar.preventStep = FALSE;
- gPlayerAvatar.unk1 |= 0x20;
+ gPlayerAvatar.transitionFlags |= PLAYER_AVATAR_FLAG_5;
DestroyTask(FindTaskIdByFunc(DoPlayerAvatarSecretBaseMatJump));
}
}
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 60d1ea072..def86ab1b 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -1260,7 +1260,7 @@ static void Task_WateringBerryTreeAnim_2(u8 taskId)
static void Task_WateringBerryTreeAnim_3(u8 taskId)
{
- SetPlayerAvatarTransitionFlags(sub_808BCD0());
+ SetPlayerAvatarTransitionFlags(GetPlayerAvatarFlags());
DestroyTask(taskId);
EnableBothScriptContexts();
}
diff --git a/src/frontier_util.c b/src/frontier_util.c
index f46c60391..668771375 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -94,7 +94,7 @@ static const u8 sFrontierBrainStreakAppearances[NUM_FRONTIER_FACILITIES][4] =
[FRONTIER_FACILITY_PYRAMID] = {21, 70, 35, 0},
};
-static const struct FrontierBrainMon sFrontierBrainsMons[][2][3] =
+static const struct FrontierBrainMon sFrontierBrainsMons[][2][FRONTIER_PARTY_SIZE] =
{
[FRONTIER_FACILITY_TOWER] =
{
@@ -1778,9 +1778,9 @@ void ResetWinStreaks(void)
s32 battleMode, lvlMode;
gSaveBlock2Ptr->frontier.winStreakActiveFlags = 0;
- for (battleMode = 0; battleMode < 4; battleMode++)
+ for (battleMode = 0; battleMode < FRONTIER_MODE_COUNT; battleMode++)
{
- for (lvlMode = 0; lvlMode < 2; lvlMode++)
+ for (lvlMode = 0; lvlMode < FRONTIER_LVL_TENT; lvlMode++)
{
gSaveBlock2Ptr->frontier.towerWinStreaks[battleMode][lvlMode] = 0;
if (battleMode < FRONTIER_MODE_MULTIS)
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 065d25582..05e4ed0aa 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -155,7 +155,7 @@ static const struct CompressedSpritePalette sHallOfFame_ConfettiSpritePalette[]
{},
};
-static const s16 sHallOfFame_MonFullTeamPositions[6][4] =
+static const s16 sHallOfFame_MonFullTeamPositions[PARTY_SIZE][4] =
{
{120, 210, 120, 40},
{326, 220, 56, 40},
@@ -165,7 +165,7 @@ static const s16 sHallOfFame_MonFullTeamPositions[6][4] =
{310, -92, 40, 88}
};
-static const s16 sHallOfFame_MonHalfTeamPositions[3][4] =
+static const s16 sHallOfFame_MonHalfTeamPositions[PARTY_SIZE / 2][4] =
{
{120, 234, 120, 64},
{326, 244, 56, 64},
@@ -544,7 +544,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
u16 currMonId = gTasks[taskId].tDisplayedMonId;
struct HallofFameMon* currMon = &sHofMonPtr->mon[currMonId];
- if (gTasks[taskId].tMonNumber > 3)
+ if (gTasks[taskId].tMonNumber > PARTY_SIZE / 2)
{
xPos = sHallOfFame_MonFullTeamPositions[currMonId][0];
yPos = sHallOfFame_MonFullTeamPositions[currMonId][1];
@@ -893,7 +893,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
u16 spriteId;
s16 posX, posY;
- if (gTasks[taskId].tMonNo > 3)
+ if (gTasks[taskId].tMonNo > PARTY_SIZE / 2)
{
posX = sHallOfFame_MonFullTeamPositions[i][2];
posY = sHallOfFame_MonFullTeamPositions[i][3];
diff --git a/src/item_use.c b/src/item_use.c
index 954d4b26f..73d6f6ffe 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -221,9 +221,9 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
static void ItemUseOnFieldCB_Bike(u8 taskId)
{
if (!ItemId_GetSecondaryId(gSpecialVar_ItemId))
- GetOnOffBike(2);
+ GetOnOffBike(PLAYER_AVATAR_FLAG_MACH_BIKE);
else
- GetOnOffBike(4);
+ GetOnOffBike(PLAYER_AVATAR_FLAG_ACRO_BIKE);
ScriptUnfreezeObjectEvents();
ScriptContext2_Disable();
DestroyTask(taskId);
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
new file mode 100644
index 000000000..be1c42e29
--- /dev/null
+++ b/src/minigame_countdown.c
@@ -0,0 +1,636 @@
+#include "global.h"
+#include "decompress.h"
+#include "link.h"
+#include "link_rfu.h"
+#include "sound.h"
+#include "task.h"
+#include "trig.h"
+#include "constants/songs.h"
+
+extern const struct OamData gOamData_AffineOff_ObjNormal_32x32;
+
+static void sub_802E6D0(u8 taskId);
+static void sub_802E83C(u8 taskId);
+static void sub_802E8C8(u8 taskId);
+static void sub_802EA50(u8 taskId);
+static void sub_802EAB0(u8 taskId);
+static void sub_802EB98(u8 taskId);
+static void Task_MinigameCountdown(u8 taskId);
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId);
+static bool32 IsStartGraphicAnimRunning(u8 spriteId);
+static void Load321StartGfx(u16 tileTag, u16 palTag);
+static u8 CreateNumberSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority);
+static void CreateStartSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2);
+static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3);
+static void SpriteCB_Start(struct Sprite *sprite);
+
+static const u16 sSpritePal_321Start_2[] = INCBIN_U16("graphics/link_games/321start_2.gbapal");
+static const u32 sSpriteSheet_321Start_2[] = INCBIN_U32("graphics/link_games/321start_2.4bpp.lz");
+
+static const struct CompressedSpriteSheet gUnknown_082FE6C8[] =
+{
+ {sSpriteSheet_321Start_2, 0xC00, 0x2000},
+ {},
+};
+
+static const struct SpritePalette gUnknown_082FE6D8[] =
+{
+ {sSpritePal_321Start_2, 0x2000},
+ {},
+};
+
+static const union AnimCmd sSpriteAnim_82FE6E8[] =
+{
+ ANIMCMD_FRAME(0, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE6F0[] =
+{
+ ANIMCMD_FRAME(16, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE6F8[] =
+{
+ ANIMCMD_FRAME(32, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE700[] =
+{
+ ANIMCMD_FRAME(64, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE708[] =
+{
+ ANIMCMD_FRAME(48, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sSpriteAnim_82FE710[] =
+{
+ ANIMCMD_FRAME(80, 0),
+ ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_82FE718[] =
+{
+ sSpriteAnim_82FE6E8,
+ sSpriteAnim_82FE6F0,
+ sSpriteAnim_82FE6F8,
+ sSpriteAnim_82FE700,
+ sSpriteAnim_82FE708,
+ sSpriteAnim_82FE710
+};
+
+static const struct SpriteTemplate gUnknown_082FE730[] =
+{
+ {
+ .tileTag = 0x2000,
+ .paletteTag = 0x2000,
+ .oam = &gOamData_AffineOff_ObjNormal_32x32,
+ .anims = sSpriteAnimTable_82FE718,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy,
+ },
+};
+
+static const TaskFunc gUnknown_082FE748[][4] =
+{
+ {
+ sub_802E83C,
+ sub_802E8C8,
+ sub_802EA50,
+ sub_802EAB0
+ },
+};
+
+static const u16 sSpritePal_321Start[] = INCBIN_U16("graphics/link_games/321start.gbapal");
+static const u32 sSpriteSheet_321Start[] = INCBIN_U32("graphics/link_games/321start.4bpp.lz");
+
+// Unused
+static u32 sub_802E63C(u8 funcSetId, u8 taskPriority)
+{
+ u8 taskId = CreateTask(sub_802E6D0, taskPriority);
+ struct Task *task = &gTasks[taskId];
+
+ task->data[0] = 1;
+ task->data[1] = funcSetId;
+ gUnknown_082FE748[funcSetId][0](taskId);
+ return taskId;
+}
+
+static bool32 sub_802E688(void)
+{
+ u8 taskId = FindTaskIdByFunc(sub_802E6D0);
+ if (taskId == 0xFF)
+ return FALSE;
+
+ gTasks[taskId].data[0] = 2;
+ return TRUE;
+}
+
+static bool32 sub_802E6BC(void)
+{
+ return FuncIsActiveTask(sub_802E6D0);
+}
+
+static void sub_802E6D0(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+
+ switch (data[0])
+ {
+ case 2:
+ gUnknown_082FE748[data[1]][2](taskId);
+ data[0] = 3;
+ break;
+ case 3:
+ gUnknown_082FE748[data[1]][3](taskId);
+ break;
+ case 4:
+ gUnknown_082FE748[data[1]][1](taskId);
+ DestroyTask(taskId);
+ break;
+ }
+}
+
+static void sub_802E75C(u8 taskId, s16 *data)
+{
+ u8 i;
+ struct Sprite *sprite;
+
+ LoadCompressedSpriteSheet(&gUnknown_082FE6C8[data[3]]);
+ LoadSpritePalette(&gUnknown_082FE6D8[data[4]]);
+ for (i = 0; i < data[8]; i++)
+ data[13 + i] = CreateSprite(&gUnknown_082FE730[data[2]], data[9], data[10], data[7]);
+ for (i = 0; i < data[8]; i++)
+ {
+ sprite = &gSprites[data[13 + i]];
+ sprite->oam.priority = data[6];
+ sprite->invisible = TRUE;
+ sprite->data[1] = data[5];
+ sprite->data[3] = taskId;
+ sprite->data[4] = i;
+ sprite->data[5] = data[13];
+ }
+}
+
+static void sub_802E83C(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ data[2] = 0;
+ data[3] = 0;
+ data[4] = 0;
+ data[5] = 60;
+ data[6] = 0;
+ data[7] = 0;
+ data[8] = 3;
+ data[9] = 120;
+ data[10] = 88;
+ sub_802E75C(taskId, data);
+
+ StartSpriteAnim(&gSprites[data[14]], 4);
+ gSprites[data[14]].pos2.x = -32;
+
+ StartSpriteAnim(&gSprites[data[15]], 5);
+ gSprites[data[15]].pos2.x = 32;
+}
+
+static void sub_802E8C8(u8 taskId)
+{
+ u8 i = 0;
+ s16 *data = gTasks[taskId].data;
+
+ for (i = 0; i < data[8]; i++)
+ DestroySprite(&gSprites[data[13 + i]]);
+ FreeSpriteTilesByTag(gUnknown_082FE6C8[data[3]].tag);
+ FreeSpritePaletteByTag(gUnknown_082FE6D8[data[4]].tag);
+}
+
+static void sub_802E938(struct Sprite *sprite)
+{
+ s16 *data = gTasks[sprite->data[3]].data;
+
+ if (data[11] % data[5] != 0)
+ return;
+ if (data[11] == data[10])
+ return;
+
+ data[10] = data[11];
+ switch (sprite->data[2])
+ {
+ case 0:
+ sprite->invisible = FALSE;
+ case 1:
+ case 2:
+ PlaySE(SE_KON);
+ StartSpriteAnim(sprite, sprite->data[2]);
+ break;
+ case 3:
+ PlaySE(SE_PIN);
+ StartSpriteAnim(sprite, sprite->data[2]);
+ gSprites[data[14]].invisible = FALSE;
+ gSprites[data[15]].invisible = FALSE;
+ break;
+ case 4:
+ sprite->invisible = TRUE;
+ gSprites[data[14]].invisible = TRUE;
+ gSprites[data[15]].invisible = TRUE;
+ data[0] = 4;
+ return;
+ }
+ sprite->data[2]++;
+}
+
+static void sub_802EA50(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ PlaySE(SE_KON);
+ gSprites[data[13]].callback = sub_802E938;
+ gSprites[data[13]].invisible = FALSE;
+ gTasks[taskId].data[0] = 3;
+}
+
+static void sub_802EAB0(u8 taskId)
+{
+ u16 packet[6];
+ s16 *data = gTasks[taskId].data;
+
+ if (gReceivedRemoteLinkPlayers != 0)
+ {
+ if (gRecvCmds[0][1] == 0x7FFF)
+ data[11] = gRecvCmds[0][2];
+ if (GetMultiplayerId() == 0)
+ {
+ data[12]++;
+ memset(packet, 0, sizeof(packet));
+ packet[0] = 0x7FFF;
+ packet[1] = data[12];
+ sub_800FE50(packet);
+ }
+ }
+ else
+ {
+ data[11]++;
+ }
+}
+
+#define tState data[0]
+#define tTilesTag data[2]
+#define tPalTag data[3]
+#define tX data[4]
+#define tY data[5]
+#define tSubpriority data[6]
+#define tSpriteId1 data[7]
+#define tSpriteId2 data[8]
+#define tSpriteId3 data[9]
+
+void StartMinigameCountdown(s16 tilesTag, s16 palTag, s16 x, s16 y, u8 subpriority)
+{
+ u8 taskId = CreateTask(Task_MinigameCountdown, 80);
+ gTasks[taskId].tTilesTag = tilesTag;
+ gTasks[taskId].tPalTag = palTag;
+ gTasks[taskId].tX = x;
+ gTasks[taskId].tY = y;
+ gTasks[taskId].tSubpriority = subpriority;
+}
+
+bool32 IsMinigameCountdownRunning(void)
+{
+ return FuncIsActiveTask(Task_MinigameCountdown);
+}
+
+static void Task_MinigameCountdown(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+
+ switch (tState)
+ {
+ case 0:
+ Load321StartGfx(tTilesTag, tPalTag);
+ tSpriteId1 = CreateNumberSprite(tTilesTag, tPalTag, tX, tY, tSubpriority);
+ CreateStartSprite(tTilesTag, tPalTag, tX, tY, tSubpriority, &tSpriteId2, &tSpriteId3);
+ tState++;
+ break;
+ case 1:
+ if (!RunMinigameCountdownDigitsAnim(tSpriteId1))
+ {
+ InitStartGraphic(tSpriteId1, tSpriteId2, tSpriteId3);
+ FreeSpriteOamMatrix(&gSprites[tSpriteId1]);
+ DestroySprite(&gSprites[tSpriteId1]);
+ tState++;
+ }
+ break;
+ case 2:
+ if (!IsStartGraphicAnimRunning(tSpriteId2))
+ {
+ DestroySprite(&gSprites[tSpriteId2]);
+ DestroySprite(&gSprites[tSpriteId3]);
+ FreeSpriteTilesByTag(tTilesTag);
+ FreeSpritePaletteByTag(tPalTag);
+ DestroyTask(taskId);
+ }
+ break;
+ }
+}
+
+static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
+{
+ struct Sprite *sprite = &gSprites[spriteId];
+
+ switch (sprite->data[0])
+ {
+ case 0:
+ sub_8007E18(sprite, 0x800, 0x1A);
+ sprite->data[0]++;
+ // fallthrough
+ case 1:
+ if (sprite->data[2] == 0)
+ PlaySE(SE_KON2);
+ if (++sprite->data[2] >= 20)
+ {
+ sprite->data[2] = 0;
+ StartSpriteAffineAnim(sprite, 1);
+ sprite->data[0]++;
+ }
+ break;
+ case 2:
+ if (sprite->affineAnimEnded)
+ sprite->data[0]++;
+ break;
+ case 3:
+ if (++sprite->data[2] >= 4)
+ {
+ sprite->data[2] = 0;
+ sprite->data[0]++;
+ StartSpriteAffineAnim(sprite, 2);
+ }
+ break;
+ case 4:
+ sprite->pos1.y -= 4;
+ if (++sprite->data[2] >= 8)
+ {
+ if (sprite->data[4] <= 1)
+ {
+ StartSpriteAnim(sprite, sprite->data[4] + 1);
+ sprite->data[2] = 0;
+ sprite->data[0]++;
+ }
+ else
+ {
+ sprite->data[0] = 7;
+ return FALSE;
+ }
+ }
+ break;
+ case 5:
+ sprite->pos1.y += 4;
+ if (++sprite->data[2] >= 8)
+ {
+ sprite->data[2] = 0;
+ StartSpriteAffineAnim(sprite, 3);
+ sprite->data[0]++;
+ }
+ break;
+ case 6:
+ if (sprite->affineAnimEnded)
+ {
+ sprite->data[4]++;
+ sprite->data[0] = 1;
+ }
+ break;
+ case 7:
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+// First argument is unused.
+static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3)
+{
+ gSprites[spriteId2].pos2.y = -40;
+ gSprites[spriteId3].pos2.y = -40;
+ gSprites[spriteId2].invisible = FALSE;
+ gSprites[spriteId3].invisible = FALSE;
+ gSprites[spriteId2].callback = SpriteCB_Start;
+ gSprites[spriteId3].callback = SpriteCB_Start;
+}
+
+static bool32 IsStartGraphicAnimRunning(u8 spriteId)
+{
+ return gSprites[spriteId].callback == SpriteCB_Start;
+}
+
+static void SpriteCB_Start(struct Sprite *sprite)
+{
+ int y;
+ s16 *data = sprite->data;
+
+ switch (data[0])
+ {
+ case 0:
+ data[4] = 64;
+ data[5] = sprite->pos2.y << 4;
+ data[0]++;
+ case 1:
+ data[5] += data[4];
+ data[4]++;
+ sprite->pos2.y = data[5] >> 4;
+ if (sprite->pos2.y >= 0)
+ {
+ PlaySE(SE_KON2);
+ sprite->pos2.y = 0;
+ data[0]++;
+ }
+ break;
+ case 2:
+ data[1] += 12;
+ if (data[1] >= 128)
+ {
+ PlaySE(SE_KON2);
+ data[1] = 0;
+ data[0]++;
+ }
+ y = gSineTable[data[1]];
+ sprite->pos2.y = -(y >> 4);
+ break;
+ case 3:
+ data[1] += 16;
+ if (data[1] >= 128)
+ {
+ PlaySE(SE_KON2);
+ data[1] = 0;
+ data[0]++;
+ }
+ sprite->pos2.y = -(gSineTable[data[1]] >> 5);
+ break;
+ case 4:
+ if (++data[1] > 40)
+ sprite->callback = SpriteCallbackDummy;
+ break;
+ }
+}
+
+static void Load321StartGfx(u16 tileTag, u16 palTag)
+{
+ struct CompressedSpriteSheet spriteSheet = {sSpriteSheet_321Start, 0xE00, 0};
+ struct SpritePalette spritePalette = {sSpritePal_321Start, 0};
+
+ spriteSheet.tag = tileTag;
+ spritePalette.tag = palTag;
+
+ LoadCompressedSpriteSheet(&spriteSheet);
+ LoadSpritePalette(&spritePalette);
+}
+
+static const struct OamData sOamData_Numbers =
+{
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_DOUBLE,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = 0,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(32x32),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(32x32),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0
+};
+
+static const struct OamData sOamData_Start =
+{
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = 0,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(64x32),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(64x32),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0,
+ .affineParam = 0
+};
+
+static const union AnimCmd sAnim_Numbers_Three[] =
+{
+ ANIMCMD_FRAME(0, 1),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_Numbers_Two[] =
+{
+ ANIMCMD_FRAME(16, 1),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_Numbers_One[] =
+{
+ ANIMCMD_FRAME(32, 1),
+ ANIMCMD_END
+};
+
+static const union AnimCmd *const sAnimTable_Numbers[] =
+{
+ sAnim_Numbers_Three,
+ sAnim_Numbers_Two,
+ sAnim_Numbers_One
+};
+
+static const union AnimCmd sAnim_StartLeft[] =
+{
+ ANIMCMD_FRAME(48, 1),
+ ANIMCMD_END
+};
+
+static const union AnimCmd sAnim_StartRight[] =
+{
+ ANIMCMD_FRAME(80, 1),
+ ANIMCMD_END
+};
+
+static const union AnimCmd *const sAnimTable_Start[] =
+{
+ sAnim_StartLeft,
+ sAnim_StartRight
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_0[] =
+{
+ AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+ AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_1[] =
+{
+ AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+ AFFINEANIMCMD_FRAME(16, -16, 0, 8),
+ AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_2[] =
+{
+ AFFINEANIMCMD_FRAME(-18, 18, 0, 8),
+ AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd sAffineAnim_Numbers_3[] =
+{
+ AFFINEANIMCMD_FRAME( 6, -6, 0, 8),
+ AFFINEANIMCMD_FRAME( -4, 4, 0, 8),
+ AFFINEANIMCMD_FRAME(256, 256, 0, 0),
+ AFFINEANIMCMD_END
+};
+
+static const union AffineAnimCmd *const sAffineAnimTable_Numbers[] =
+{
+ sAffineAnim_Numbers_0,
+ sAffineAnim_Numbers_1,
+ sAffineAnim_Numbers_2,
+ sAffineAnim_Numbers_3
+};
+
+static u8 CreateNumberSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority)
+{
+ struct SpriteTemplate spriteTemplate =
+ {
+ .oam = &sOamData_Numbers,
+ .anims = sAnimTable_Numbers,
+ .affineAnims = sAffineAnimTable_Numbers,
+ .callback = SpriteCallbackDummy,
+ };
+
+ spriteTemplate.tileTag = tileTag;
+ spriteTemplate.paletteTag = palTag;
+ return CreateSprite(&spriteTemplate, x, y, subpriority);
+}
+
+static void CreateStartSprite(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2)
+{
+ struct SpriteTemplate spriteTemplate =
+ {
+ .oam = &sOamData_Start,
+ .anims = sAnimTable_Start,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy,
+ };
+
+ spriteTemplate.tileTag = tileTag;
+ spriteTemplate.paletteTag = palTag;
+ *spriteId1 = CreateSprite(&spriteTemplate, x - 32, y, subpriority);
+ *spriteId2 = CreateSprite(&spriteTemplate, x + 32, y, subpriority);
+
+ gSprites[*spriteId1].invisible = TRUE;
+ gSprites[*spriteId2].invisible = TRUE;
+ StartSpriteAnim(&gSprites[*spriteId2], 1);
+}
diff --git a/src/party_menu.c b/src/party_menu.c
index 0a119f03d..43bdc46ec 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -152,7 +152,7 @@ EWRAM_DATA u8 gSelectedMonPartyId = 0;
EWRAM_DATA MainCallback gPostMenuFieldCallback = NULL;
static EWRAM_DATA u16 *sSlot1TilemapBuffer = 0; // for switching party slots
static EWRAM_DATA u16 *sSlot2TilemapBuffer = 0; //
-EWRAM_DATA u8 gSelectedOrderFromParty[4] = {0};
+EWRAM_DATA u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE] = {0};
static EWRAM_DATA u16 sPartyMenuItemId = 0;
static EWRAM_DATA u16 sUnused_0203CEFE = 0;
EWRAM_DATA u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2] = {0}; // bits 0-3 are the current pos of Slot 1, 4-7 are Slot 2, and so on
@@ -5624,9 +5624,9 @@ static u8 GetMaxBattleEntries(void)
switch (VarGet(VAR_FRONTIER_FACILITY))
{
case FACILITY_MULTI_OR_EREADER:
- return 3;
+ return MULTI_PARTY_SIZE;
case FACILITY_UNION_ROOM:
- return 2;
+ return UNION_ROOM_PARTY_SIZE;
default: // Battle Frontier
return gSpecialVar_0x8005;
}
@@ -5639,7 +5639,7 @@ static u8 GetMinBattleEntries(void)
case FACILITY_MULTI_OR_EREADER:
return 1;
case FACILITY_UNION_ROOM:
- return 2;
+ return UNION_ROOM_PARTY_SIZE;
default: // Battle Frontier
return gSpecialVar_0x8005;
}
@@ -6074,7 +6074,7 @@ static void Task_MultiPartnerPartySlideIn(u8 taskId)
SlideMultiPartyMenuBoxSpritesOneStep(taskId);
if (tXPos == 0)
{
- for (i = 3; i < PARTY_SIZE; i++)
+ for (i = MULTI_PARTY_SIZE; i < PARTY_SIZE; i++)
{
if (gMultiPartnerParty[i - MULTI_PARTY_SIZE].species != SPECIES_NONE)
AnimateSelectedPartyIcon(sPartyMenuBoxes[i].monSpriteId, 0);
diff --git a/src/pokemon.c b/src/pokemon.c
index ec29af02d..87ea2551f 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -4394,7 +4394,7 @@ u8 CalculatePlayerPartyCount(void)
{
gPlayerPartyCount = 0;
- while (gPlayerPartyCount < 6
+ while (gPlayerPartyCount < PARTY_SIZE
&& GetMonData(&gPlayerParty[gPlayerPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{
gPlayerPartyCount++;
@@ -4407,7 +4407,7 @@ u8 CalculateEnemyPartyCount(void)
{
gEnemyPartyCount = 0;
- while (gEnemyPartyCount < 6
+ while (gEnemyPartyCount < PARTY_SIZE
&& GetMonData(&gEnemyParty[gEnemyPartyCount], MON_DATA_SPECIES, NULL) != SPECIES_NONE)
{
gEnemyPartyCount++;
@@ -4494,7 +4494,7 @@ void CreateSecretBaseEnemyParty(struct SecretBase *secretBaseRecord)
SetMonData(&gEnemyParty[i], MON_DATA_HELD_ITEM, &gBattleResources->secretBase->party.heldItems[i]);
- for (j = 0; j < 6; j++)
+ for (j = 0; j < NUM_STATS; j++)
SetMonData(&gEnemyParty[i], MON_DATA_HP_EV + j, &gBattleResources->secretBase->party.EVs[i]);
for (j = 0; j < MAX_MON_MOVES; j++)
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 6c76b15a6..f2f416c35 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -12,9 +12,10 @@
#include "link_rfu.h"
#include "main.h"
#include "menu.h"
+#include "minigame_countdown.h"
#include "palette.h"
#include "random.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
#include "save.h"
#include "script.h"
#include "sound.h"
@@ -289,21 +290,8 @@ static void sub_802D5E4(void);
static void sub_802D72C(void);
static void sub_802D688(void);
static void Task_ShowPokemonJumpRecords(u8 taskId);
-static void sub_802E6D0(u8 taskId);
-static void sub_802EB98(u8 taskId);
static void sub_802E500(u16 windowId, int width);
static void TruncateToFirstWordOnly(u8 *str);
-static void sub_802EF50(u16 tileTag, u16 palTag);
-static u8 sub_802EFA8(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority);
-static void sub_802EFFC(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2);
-static bool32 sub_802EC98(u8 spriteId);
-static bool32 sub_802EE30(u8 spriteId);
-static void sub_802EDCC(u8 spriteId1, u8 spriteId2, u8 spriteId3);
-static void sub_802EE5C(struct Sprite *sprite);
-static void sub_802E83C(u8 taskId);
-static void sub_802E8C8(u8 taskId);
-static void sub_802EA50(u8 taskId);
-static void sub_802EAB0(u8 taskId);
EWRAM_DATA static struct PokemonJump1 *gUnknown_02022CFC = NULL;
EWRAM_DATA static struct PokemonJump2 *gUnknown_02022D00 = NULL;
@@ -2807,13 +2795,13 @@ static void sub_802CF50(struct PokemonJump2 *arg0, int arg1)
static void sub_802D044(struct PokemonJump2 *arg0)
{
- sub_802EB24(9, 7, 120, 80, 0);
+ StartMinigameCountdown(9, 7, 120, 80, 0);
sub_802CD3C(arg0);
}
static bool32 sub_802D068(void)
{
- return sub_802EB84();
+ return IsMinigameCountdownRunning();
}
static void sub_802D074(struct PokemonJump2 *arg0)
@@ -2831,7 +2819,7 @@ static void sub_802D074(struct PokemonJump2 *arg0)
static void sub_802D0AC(void)
{
FreeAllWindowBuffers();
- sub_8034CC8();
+ DigitObjUtil_Free();
}
static void sub_802D0BC(struct PokemonJump2 *arg0)
@@ -3515,37 +3503,37 @@ static int sub_802DCCC(u8 flags)
static void sub_802DD08(void)
{
- struct UnkStruct3 unkStruct;
- struct UnkStruct3 *ptr = &unkStruct; // This temp variable is needed to match, don't ask me why.
+ struct DigitObjUtilTemplate template;
+ struct DigitObjUtilTemplate *ptr = &template; // This temp variable is needed to match, don't ask me why.
ptr->shape = SPRITE_SHAPE(8x8);
ptr->size = SPRITE_SIZE(8x8);
- ptr->field_0_0 = 0;
+ ptr->strConvMode = 0;
ptr->priority = 1;
- ptr->field_1 = 5;
+ ptr->oamCount = 5;
ptr->xDelta = 8;
ptr->x = 108;
ptr->y = 6;
ptr->spriteSheet = (void*) &gUnknown_082FE1EC;
ptr->spritePal = &gUnknown_082FE1F4;
- sub_8034C54(2);
- sub_8034D14(0, 0, ptr);
+ DigitObjUtil_Init(2);
+ DigitObjUtil_CreatePrinter(0, 0, ptr);
- unkStruct.field_1 = 4;
- unkStruct.x = 30;
- unkStruct.y = 6;
- sub_8034D14(1, 0, &unkStruct);
+ template.oamCount = 4;
+ template.x = 30;
+ template.y = 6;
+ DigitObjUtil_CreatePrinter(1, 0, &template);
}
static void sub_802DD64(int arg0)
{
- sub_8035044(0, arg0);
+ DigitObjUtil_PrintNumOn(0, arg0);
}
static void sub_802DD74(u16 arg0)
{
- sub_8035044(1, arg0);
+ DigitObjUtil_PrintNumOn(1, arg0);
}
static void sub_802DD88(u8 multiplayerId)
@@ -3987,611 +3975,3 @@ static void TruncateToFirstWordOnly(u8 *str)
}
}
}
-
-static const u16 gPkmnJump321StartPal1[] = INCBIN_U16("graphics/link_games/pkmnjump_321start1.gbapal");
-static const u32 gPkmnJump321StartGfx1[] = INCBIN_U32("graphics/link_games/pkmnjump_321start1.4bpp.lz");
-
-static const struct CompressedSpriteSheet gUnknown_082FE6C8[] =
-{
- {gPkmnJump321StartGfx1, 0xC00, 0x2000},
- {},
-};
-
-static const struct SpritePalette gUnknown_082FE6D8[] =
-{
- {gPkmnJump321StartPal1, 0x2000},
- {},
-};
-
-static const union AnimCmd sSpriteAnim_82FE6E8[] =
-{
- ANIMCMD_FRAME(0, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE6F0[] =
-{
- ANIMCMD_FRAME(16, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE6F8[] =
-{
- ANIMCMD_FRAME(32, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE700[] =
-{
- ANIMCMD_FRAME(64, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE708[] =
-{
- ANIMCMD_FRAME(48, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FE710[] =
-{
- ANIMCMD_FRAME(80, 0),
- ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FE718[] =
-{
- sSpriteAnim_82FE6E8,
- sSpriteAnim_82FE6F0,
- sSpriteAnim_82FE6F8,
- sSpriteAnim_82FE700,
- sSpriteAnim_82FE708,
- sSpriteAnim_82FE710
-};
-
-static const struct SpriteTemplate gUnknown_082FE730[] =
-{
- {
- .tileTag = 0x2000,
- .paletteTag = 0x2000,
- .oam = &gOamData_AffineOff_ObjNormal_32x32,
- .anims = sSpriteAnimTable_82FE718,
- .images = NULL,
- .affineAnims = gDummySpriteAffineAnimTable,
- .callback = SpriteCallbackDummy,
- },
-};
-
-static const TaskFunc gUnknown_082FE748[][4] =
-{
- {
- sub_802E83C,
- sub_802E8C8,
- sub_802EA50,
- sub_802EAB0
- },
-};
-
-// There's only set of task functions.
-static u32 sub_802E63C(u8 funcSetId, u8 taskPriority)
-{
- u8 taskId = CreateTask(sub_802E6D0, taskPriority);
- struct Task *task = &gTasks[taskId];
-
- task->data[0] = 1;
- task->data[1] = funcSetId;
- gUnknown_082FE748[funcSetId][0](taskId);
- return taskId;
-}
-
-static bool32 sub_802E688(void)
-{
- u8 taskId = FindTaskIdByFunc(sub_802E6D0);
- if (taskId == 0xFF)
- return FALSE;
-
- gTasks[taskId].data[0] = 2;
- return TRUE;
-}
-
-static bool32 sub_802E6BC(void)
-{
- return FuncIsActiveTask(sub_802E6D0);
-}
-
-static void sub_802E6D0(u8 taskId)
-{
- s16 *data = gTasks[taskId].data;
-
- switch (data[0])
- {
- case 2:
- gUnknown_082FE748[data[1]][2](taskId);
- data[0] = 3;
- break;
- case 3:
- gUnknown_082FE748[data[1]][3](taskId);
- break;
- case 4:
- gUnknown_082FE748[data[1]][1](taskId);
- DestroyTask(taskId);
- break;
- }
-}
-
-static void sub_802E75C(u8 taskId, s16 *data)
-{
- u8 i;
- struct Sprite *sprite;
-
- LoadCompressedSpriteSheet(&gUnknown_082FE6C8[data[3]]);
- LoadSpritePalette(&gUnknown_082FE6D8[data[4]]);
- for (i = 0; i < data[8]; i++)
- data[13 + i] = CreateSprite(&gUnknown_082FE730[data[2]], data[9], data[10], data[7]);
- for (i = 0; i < data[8]; i++)
- {
- sprite = &gSprites[data[13 + i]];
- sprite->oam.priority = data[6];
- sprite->invisible = TRUE;
- sprite->data[1] = data[5];
- sprite->data[3] = taskId;
- sprite->data[4] = i;
- sprite->data[5] = data[13];
- }
-}
-
-static void sub_802E83C(u8 taskId)
-{
- s16 *data = gTasks[taskId].data;
- data[2] = 0;
- data[3] = 0;
- data[4] = 0;
- data[5] = 60;
- data[6] = 0;
- data[7] = 0;
- data[8] = 3;
- data[9] = 120;
- data[10] = 88;
- sub_802E75C(taskId, data);
-
- StartSpriteAnim(&gSprites[data[14]], 4);
- gSprites[data[14]].pos2.x = -32;
-
- StartSpriteAnim(&gSprites[data[15]], 5);
- gSprites[data[15]].pos2.x = 32;
-}
-
-static void sub_802E8C8(u8 taskId)
-{
- u8 i = 0;
- s16 *data = gTasks[taskId].data;
-
- for (i = 0; i < data[8]; i++)
- DestroySprite(&gSprites[data[13 + i]]);
- FreeSpriteTilesByTag(gUnknown_082FE6C8[data[3]].tag);
- FreeSpritePaletteByTag(gUnknown_082FE6D8[data[4]].tag);
-}
-
-static void sub_802E938(struct Sprite *sprite)
-{
- s16 *data = gTasks[sprite->data[3]].data;
-
- if (data[11] % data[5] != 0)
- return;
- if (data[11] == data[10])
- return;
-
- data[10] = data[11];
- switch (sprite->data[2])
- {
- case 0:
- sprite->invisible = FALSE;
- case 1:
- case 2:
- PlaySE(SE_KON);
- StartSpriteAnim(sprite, sprite->data[2]);
- break;
- case 3:
- PlaySE(SE_PIN);
- StartSpriteAnim(sprite, sprite->data[2]);
- gSprites[data[14]].invisible = FALSE;
- gSprites[data[15]].invisible = FALSE;
- break;
- case 4:
- sprite->invisible = TRUE;
- gSprites[data[14]].invisible = TRUE;
- gSprites[data[15]].invisible = TRUE;
- data[0] = 4;
- return;
- }
- sprite->data[2]++;
-}
-
-static void sub_802EA50(u8 taskId)
-{
- s16 *data = gTasks[taskId].data;
- PlaySE(SE_KON);
- gSprites[data[13]].callback = sub_802E938;
- gSprites[data[13]].invisible = FALSE;
- gTasks[taskId].data[0] = 3;
-}
-
-static void sub_802EAB0(u8 taskId)
-{
- u16 packet[6];
- s16 *data = gTasks[taskId].data;
-
- if (gReceivedRemoteLinkPlayers != 0)
- {
- if (gRecvCmds[0][1] == 0x7FFF)
- data[11] = gRecvCmds[0][2];
- if (GetMultiplayerId() == 0)
- {
- data[12]++;
- memset(packet, 0, sizeof(packet));
- packet[0] = 0x7FFF;
- packet[1] = data[12];
- sub_800FE50(packet);
- }
- }
- else
- {
- data[11]++;
- }
-}
-
-void sub_802EB24(s16 tileTag, s16 palTag, s16 x, s16 y, u8 subpriority)
-{
- u8 taskId = CreateTask(sub_802EB98, 0x50);
- gTasks[taskId].data[2] = tileTag;
- gTasks[taskId].data[3] = palTag;
- gTasks[taskId].data[4] = x;
- gTasks[taskId].data[5] = y;
- gTasks[taskId].data[6] = subpriority;
-}
-
-bool32 sub_802EB84(void)
-{
- return FuncIsActiveTask(sub_802EB98);
-}
-
-static void sub_802EB98(u8 taskId)
-{
- s16 *data = gTasks[taskId].data;
-
- switch (data[0])
- {
- case 0:
- sub_802EF50(data[2], data[3]);
- data[7] = sub_802EFA8(data[2], data[3], data[4], data[5], data[6]);
- sub_802EFFC(data[2], data[3], data[4], data[5], data[6], &data[8], &data[9]);
- data[0]++;
- break;
- case 1:
- if (!sub_802EC98(data[7]))
- {
- sub_802EDCC(data[7], data[8], data[9]);
- FreeSpriteOamMatrix(&gSprites[data[7]]);
- DestroySprite(&gSprites[data[7]]);
- data[0]++;
- }
- break;
- case 2:
- if (!sub_802EE30(data[8]))
- {
- DestroySprite(&gSprites[data[8]]);
- DestroySprite(&gSprites[data[9]]);
- FreeSpriteTilesByTag(data[2]);
- FreeSpritePaletteByTag(data[3]);
- DestroyTask(taskId);
- }
- break;
- }
-}
-
-static bool32 sub_802EC98(u8 spriteId)
-{
- struct Sprite *sprite = &gSprites[spriteId];
-
- switch (sprite->data[0])
- {
- case 0:
- sub_8007E18(sprite, 0x800, 0x1A);
- sprite->data[0]++;
- case 1:
- if (sprite->data[2] == 0)
- PlaySE(SE_KON2);
- if (++sprite->data[2] >= 20)
- {
- sprite->data[2] = 0;
- StartSpriteAffineAnim(sprite, 1);
- sprite->data[0]++;
- }
- break;
- case 2:
- if (sprite->affineAnimEnded)
- sprite->data[0]++;
- break;
- case 3:
- if (++sprite->data[2] >= 4)
- {
- sprite->data[2] = 0;
- sprite->data[0]++;
- StartSpriteAffineAnim(sprite, 2);
- }
- break;
- case 4:
- sprite->pos1.y -= 4;
- if (++sprite->data[2] >= 8)
- {
- if (sprite->data[4] <= 1)
- {
- StartSpriteAnim(sprite, sprite->data[4] + 1);
- sprite->data[2] = 0;
- sprite->data[0]++;
- }
- else
- {
- sprite->data[0] = 7;
- return FALSE;
- }
- }
- break;
- case 5:
- sprite->pos1.y += 4;
- if (++sprite->data[2] >= 8)
- {
- sprite->data[2] = 0;
- StartSpriteAffineAnim(sprite, 3);
- sprite->data[0]++;
- }
- break;
- case 6:
- if (sprite->affineAnimEnded)
- {
- sprite->data[4]++;
- sprite->data[0] = 1;
- }
- break;
- case 7:
- return FALSE;
- }
-
- return TRUE;
-}
-
-// First argument is unused.
-static void sub_802EDCC(u8 spriteId1, u8 spriteId2, u8 spriteId3)
-{
- gSprites[spriteId2].pos2.y = -40;
- gSprites[spriteId3].pos2.y = -40;
- gSprites[spriteId2].invisible = FALSE;
- gSprites[spriteId3].invisible = FALSE;
- gSprites[spriteId2].callback = sub_802EE5C;
- gSprites[spriteId3].callback = sub_802EE5C;
-}
-
-static bool32 sub_802EE30(u8 spriteId)
-{
- return (gSprites[spriteId].callback == sub_802EE5C);
-}
-
-static void sub_802EE5C(struct Sprite *sprite)
-{
- int y;
- s16 *data = sprite->data;
-
- switch (data[0])
- {
- case 0:
- data[4] = 64;
- data[5] = sprite->pos2.y << 4;
- data[0]++;
- case 1:
- data[5] += data[4];
- data[4]++;
- sprite->pos2.y = data[5] >> 4;
- if (sprite->pos2.y >= 0)
- {
- PlaySE(SE_KON2);
- sprite->pos2.y = 0;
- data[0]++;
- }
- break;
- case 2:
- data[1] += 12;
- if (data[1] >= 128)
- {
- PlaySE(SE_KON2);
- data[1] = 0;
- data[0]++;
- }
- y = gSineTable[data[1]];
- sprite->pos2.y = -(y >> 4);
- break;
- case 3:
- data[1] += 16;
- if (data[1] >= 128)
- {
- PlaySE(SE_KON2);
- data[1] = 0;
- data[0]++;
- }
- sprite->pos2.y = -(gSineTable[data[1]] >> 5);
- break;
- case 4:
- if (++data[1] > 40)
- sprite->callback = SpriteCallbackDummy;
- break;
- }
-}
-
-static const u16 gPkmnJump321StartPal2[] = INCBIN_U16("graphics/link_games/pkmnjump_321start2.gbapal");
-static const u32 gPkmnJump321StartGfx2[] = INCBIN_U32("graphics/link_games/pkmnjump_321start2.4bpp.lz");
-
-static void sub_802EF50(u16 tileTag, u16 palTag)
-{
- struct CompressedSpriteSheet sprSheet = {gPkmnJump321StartGfx2, 0xE00, 0};
- struct SpritePalette sprPal = {gPkmnJump321StartPal2, 0};
-
- sprSheet.tag = tileTag;
- sprPal.tag = palTag;
-
- LoadCompressedSpriteSheet(&sprSheet);
- LoadSpritePalette(&sprPal);
-}
-
-static const struct OamData sOamData_82FEBDC =
-{
- .y = 0,
- .affineMode = ST_OAM_AFFINE_DOUBLE,
- .objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
- .bpp = ST_OAM_4BPP,
- .shape = SPRITE_SHAPE(32x32),
- .x = 0,
- .matrixNum = 0,
- .size = SPRITE_SIZE(32x32),
- .tileNum = 0,
- .priority = 0,
- .paletteNum = 0,
- .affineParam = 0
-};
-
-static const struct OamData sOamData_82FEBE4 =
-{
- .y = 0,
- .affineMode = ST_OAM_AFFINE_OFF,
- .objMode = ST_OAM_OBJ_NORMAL,
- .mosaic = 0,
- .bpp = ST_OAM_4BPP,
- .shape = SPRITE_SHAPE(64x32),
- .x = 0,
- .matrixNum = 0,
- .size = SPRITE_SIZE(64x32),
- .tileNum = 0,
- .priority = 0,
- .paletteNum = 0,
- .affineParam = 0
-};
-
-static const union AnimCmd sSpriteAnim_82FEBEC[] =
-{
- ANIMCMD_FRAME(0, 1),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEBF4[] =
-{
- ANIMCMD_FRAME(16, 1),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEBFC[] =
-{
- ANIMCMD_FRAME(32, 1),
- ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FEC04[] =
-{
- sSpriteAnim_82FEBEC,
- sSpriteAnim_82FEBF4,
- sSpriteAnim_82FEBFC
-};
-
-static const union AnimCmd sSpriteAnim_82FEC10[] =
-{
- ANIMCMD_FRAME(48, 1),
- ANIMCMD_END
-};
-
-static const union AnimCmd sSpriteAnim_82FEC18[] =
-{
- ANIMCMD_FRAME(80, 1),
- ANIMCMD_END
-};
-
-static const union AnimCmd *const sSpriteAnimTable_82FEC20[] =
-{
- sSpriteAnim_82FEC10,
- sSpriteAnim_82FEC18
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC28[] =
-{
- AFFINEANIMCMD_FRAME(256, 256, 0, 0),
- AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC38[] =
-{
- AFFINEANIMCMD_FRAME(256, 256, 0, 0),
- AFFINEANIMCMD_FRAME(16, -16, 0, 8),
- AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC50[] =
-{
- AFFINEANIMCMD_FRAME(-18, 18, 0, 8),
- AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd sSpriteAffineAnim_82FEC60[] =
-{
- AFFINEANIMCMD_FRAME(6, -6, 0, 8),
- AFFINEANIMCMD_FRAME(-4, 4, 0, 8),
- AFFINEANIMCMD_FRAME(256, 256, 0, 0),
- AFFINEANIMCMD_END
-};
-
-static const union AffineAnimCmd *const sSpriteAffineAnimTable_82FEC80[] =
-{
- sSpriteAffineAnim_82FEC28,
- sSpriteAffineAnim_82FEC38,
- sSpriteAffineAnim_82FEC50,
- sSpriteAffineAnim_82FEC60
-};
-
-static u8 sub_802EFA8(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority)
-{
- u8 spriteId;
- struct SpriteTemplate sprTemplate =
- {
- .tileTag = 0,
- .paletteTag = 0,
- .oam = &sOamData_82FEBDC,
- .anims = sSpriteAnimTable_82FEC04,
- .images = NULL,
- .affineAnims = sSpriteAffineAnimTable_82FEC80,
- .callback = SpriteCallbackDummy,
- };
-
- sprTemplate.tileTag = tileTag;
- sprTemplate.paletteTag = palTag;
- spriteId = CreateSprite(&sprTemplate, x, y, subpriority);
- return spriteId;
-}
-
-static void sub_802EFFC(u16 tileTag, u16 palTag, s16 x, s16 y, u8 subpriority, s16 *spriteId1, s16 *spriteId2)
-{
- struct SpriteTemplate sprTemplate =
- {
- .tileTag = 0,
- .paletteTag = 0,
- .oam = &sOamData_82FEBE4,
- .anims = sSpriteAnimTable_82FEC20,
- .images = NULL,
- .affineAnims = gDummySpriteAffineAnimTable,
- .callback = SpriteCallbackDummy,
- };
-
- sprTemplate.tileTag = tileTag;
- sprTemplate.paletteTag = palTag;
- *spriteId1 = CreateSprite(&sprTemplate, x - 32, y, subpriority);
- *spriteId2 = CreateSprite(&sprTemplate, x + 32, y, subpriority);
-
- gSprites[*spriteId1].invisible = TRUE;
- gSprites[*spriteId2].invisible = TRUE;
- StartSpriteAnim(&gSprites[*spriteId2], 1);
-}
diff --git a/src/rom_8034C54.c b/src/rom_8034C54.c
deleted file mode 100644
index 029696526..000000000
--- a/src/rom_8034C54.c
+++ /dev/null
@@ -1,453 +0,0 @@
-#include "global.h"
-#include "rom_8034C54.h"
-#include "malloc.h"
-#include "decompress.h"
-#include "main.h"
-#include "battle_main.h"
-
-struct UnkStruct2
-{
- bool8 isActive;
- u8 firstOamId;
- u8 field_2;
- u8 oamCount;
- u8 palTagIndex;
- u8 size;
- u8 shape;
- u8 priority;
- u8 xDelta;
- u8 field_9;
- u16 tileStart;
- s16 x;
- s16 y;
- u16 tileTag;
- u16 palTag;
- u32 field_14;
- s32 field_18;
-};
-
-struct UnkStruct1
-{
- u32 count;
- struct UnkStruct2 *array;
-};
-
-// this file's functions
-static u8 sub_8035518(u8 arg0);;
-static void sub_8034EFC(struct UnkStruct2 *arg0);
-static void sub_80350B0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2);
-static bool32 SharesTileWithAnyActive(u32 id);
-static bool32 SharesPalWithAnyActive(u32 id);
-static void sub_8035648(void);
-
-// iwram
-static s32 gUnknown_03000DD4;
-static s32 gUnknown_03000DD8;
-static s32 gUnknown_03000DDC;
-
-// ewram
-static EWRAM_DATA struct UnkStruct1 *gUnknown_02022E10 = {0};
-
-// const rom data
-static const u8 gUnknown_082FF1C8[][4] =
-{
- {0x01, 0x04, 0x10, 0x40},
- {0x02, 0x04, 0x08, 0x20},
- {0x02, 0x04, 0x08, 0x20},
- {0x00, 0x00, 0x00, 0x00}
-};
-
-// code
-bool32 sub_8034C54(u32 count)
-{
- u32 i;
-
- if (gUnknown_02022E10 != NULL)
- sub_8034CC8();
-
- gUnknown_02022E10 = Alloc(sizeof(*gUnknown_02022E10));
- if (gUnknown_02022E10 == NULL)
- return FALSE;
-
- gUnknown_02022E10->array = Alloc(sizeof(struct UnkStruct2) * count);
- if (gUnknown_02022E10->array == NULL)
- {
- Free(gUnknown_02022E10);
- return FALSE;
- }
-
- gUnknown_02022E10->count = count;
- for (i = 0; i < count; i++)
- {
- gUnknown_02022E10->array[i].isActive = FALSE;
- gUnknown_02022E10->array[i].firstOamId = 0xFF;
- }
-
- return TRUE;
-}
-
-void sub_8034CC8(void)
-{
- if (gUnknown_02022E10 != NULL)
- {
- if (gUnknown_02022E10->array != NULL)
- {
- u32 i;
-
- for (i = 0; i < gUnknown_02022E10->count; i++)
- sub_80353DC(i);
-
- Free(gUnknown_02022E10->array);
- }
-
- FREE_AND_SET_NULL(gUnknown_02022E10);
- }
-}
-
-bool32 sub_8034D14(u32 id, s32 arg1, const struct UnkStruct3 *arg2)
-{
- u32 i;
-
- if (gUnknown_02022E10 == NULL)
- return FALSE;
- if (gUnknown_02022E10->array[id].isActive)
- return FALSE;
-
- gUnknown_02022E10->array[id].firstOamId = sub_8035518(arg2->field_1);
- if (gUnknown_02022E10->array[id].firstOamId == 0xFF)
- return FALSE;
-
- gUnknown_02022E10->array[id].tileStart = GetSpriteTileStartByTag(arg2->spriteSheet->tag);
- if (gUnknown_02022E10->array[id].tileStart == 0xFFFF)
- {
- if (arg2->spriteSheet->size != 0)
- {
- gUnknown_02022E10->array[id].tileStart = LoadSpriteSheet(arg2->spriteSheet);
- }
- else
- {
- struct CompressedSpriteSheet compSpriteSheet;
-
- compSpriteSheet = *(struct CompressedSpriteSheet*)(arg2->spriteSheet);
- compSpriteSheet.size = GetDecompressedDataSize(arg2->spriteSheet->data);
- gUnknown_02022E10->array[id].tileStart = LoadCompressedSpriteSheet(&compSpriteSheet);
- }
-
- if (gUnknown_02022E10->array[id].tileStart == 0xFFFF)
- return FALSE;
- }
-
- gUnknown_02022E10->array[id].palTagIndex = IndexOfSpritePaletteTag(arg2->spritePal->tag);
- if (gUnknown_02022E10->array[id].palTagIndex == 0xFF)
- gUnknown_02022E10->array[id].palTagIndex = LoadSpritePalette(arg2->spritePal);
-
- gUnknown_02022E10->array[id].field_2 = arg2->field_0_0;
- gUnknown_02022E10->array[id].oamCount = arg2->field_1;
- gUnknown_02022E10->array[id].x = arg2->x;
- gUnknown_02022E10->array[id].y = arg2->y;
- gUnknown_02022E10->array[id].shape = arg2->shape;
- gUnknown_02022E10->array[id].size = arg2->size;
- gUnknown_02022E10->array[id].priority = arg2->priority;
- gUnknown_02022E10->array[id].xDelta = arg2->xDelta;
- gUnknown_02022E10->array[id].field_9 = sub_80355F8(arg2->shape, arg2->size);
- gUnknown_02022E10->array[id].tileTag = arg2->spriteSheet->tag;
- gUnknown_02022E10->array[id].palTag = arg2->spritePal->tag;
- gUnknown_02022E10->array[id].isActive = TRUE;
- gUnknown_02022E10->array[id].field_14 = 1;
-
- for (i = 1; i < arg2->field_1; i++)
- gUnknown_02022E10->array[id].field_14 *= 10;
-
- sub_8034EFC(&gUnknown_02022E10->array[id]);
- sub_8035044(id, arg1);
-
- return TRUE;
-}
-
-static void sub_8034EFC(struct UnkStruct2 *arg0)
-{
- u32 i;
- u32 oamId = arg0->firstOamId;
- u32 x = arg0->x;
- u32 oamCount = arg0->oamCount + 1;
-
- CpuFill16(0, &gMain.oamBuffer[oamId], sizeof(struct OamData) * oamCount);
- for (i = 0, oamId = arg0->firstOamId; i < oamCount; i++, oamId++)
- {
- gMain.oamBuffer[oamId].y = arg0->y;
- gMain.oamBuffer[oamId].x = x;
- gMain.oamBuffer[oamId].shape = arg0->shape;
- gMain.oamBuffer[oamId].size = arg0->size;
- gMain.oamBuffer[oamId].tileNum = arg0->tileStart;
- gMain.oamBuffer[oamId].priority = arg0->priority;
- gMain.oamBuffer[oamId].paletteNum = arg0->palTagIndex;
-
- x += arg0->xDelta;
- }
-
- oamId--;
- gMain.oamBuffer[oamId].x = arg0->x - arg0->xDelta;
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
- gMain.oamBuffer[oamId].tileNum = arg0->tileStart + (arg0->field_9 * 10);
-}
-
-void sub_8035044(u32 id, s32 arg1)
-{
- bool32 r2;
-
- if (gUnknown_02022E10 == NULL)
- return;
- if (!gUnknown_02022E10->array[id].isActive)
- return;
-
- gUnknown_02022E10->array[id].field_18 = arg1;
- if (arg1 < 0)
- {
- r2 = TRUE;
- arg1 *= -1;
- }
- else
- {
- r2 = FALSE;
- }
-
- switch (gUnknown_02022E10->array[id].field_2)
- {
- case 0:
- default:
- sub_80350B0(&gUnknown_02022E10->array[id], arg1, r2);
- break;
- case 1:
- sub_8035164(&gUnknown_02022E10->array[id], arg1, r2);
- break;
- case 2:
- sub_80352C0(&gUnknown_02022E10->array[id], arg1, r2);
- break;
- }
-}
-
-static void sub_80350B0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
- u32 r5 = arg0->field_14;
- u32 oamId = arg0->firstOamId;
-
- while (r5 != 0)
- {
- u32 r4 = arg1 / r5;
- arg1 -= (r4 * r5);
- r5 /= 10;
-
- gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
- oamId++;
- }
-
- if (arg2)
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
- else
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-}
-
-static void sub_8035164(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
- u32 r5 = arg0->field_14;
- gUnknown_03000DD4 = arg0->firstOamId;
- gUnknown_03000DD8 = 0;
- gUnknown_03000DDC = -1;
-
- while (r5 != 0)
- {
- u32 r4 = arg1 / r5;
- arg1 -= (r4 * r5);
- r5 /= 10;
-
- if (r4 != 0 || gUnknown_03000DDC != -1 || r5 == 0)
- {
- gMain.oamBuffer[gUnknown_03000DD4].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
- gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
-
- if (gUnknown_03000DDC == -1)
- gUnknown_03000DDC = gUnknown_03000DD8;
- }
- else
- {
- gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
- }
-
- gUnknown_03000DD4++;
- gUnknown_03000DD8++;
- }
-
- if (arg2)
- {
- gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_OFF;
- gMain.oamBuffer[gUnknown_03000DD4].x = arg0->x + ((gUnknown_03000DDC - 1) * arg0->xDelta);
- }
- else
- {
- gMain.oamBuffer[gUnknown_03000DD4].affineMode = ST_OAM_AFFINE_ERASE;
- }
-}
-
-static void sub_80352C0(struct UnkStruct2 *arg0, s32 arg1, bool32 arg2)
-{
- u32 r5 = arg0->field_14;
- u32 oamId = arg0->firstOamId;
- u32 var_28 = 0;
- s32 r9 = 0;
-
- while (r5 != 0)
- {
- u32 r4 = arg1 / r5;
- arg1 -= (r4 * r5);
- r5 /= 10;
-
- if (r4 != 0 || var_28 != 0 || r5 == 0)
- {
- var_28 = 1;
- gMain.oamBuffer[oamId].tileNum = (r4 * arg0->field_9) + arg0->tileStart;
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-
- oamId++;
- r9++;
- }
- }
-
- while (r9 < arg0->oamCount)
- {
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
- oamId++;
- r9++;
- }
-
- if (arg2)
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
- else
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-}
-
-void sub_80353DC(u32 id)
-{
- s32 oamId, oamCount, i;
-
- if (gUnknown_02022E10 == NULL)
- return;
- if (!gUnknown_02022E10->array[id].isActive)
- return;
-
- oamCount = gUnknown_02022E10->array[id].oamCount + 1;
- oamId = gUnknown_02022E10->array[id].firstOamId;
-
- for (i = 0; i < oamCount; i++, oamId++)
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
-
- if (!SharesTileWithAnyActive(id))
- FreeSpriteTilesByTag(gUnknown_02022E10->array[id].tileTag);
- if (!SharesPalWithAnyActive(id))
- FreeSpritePaletteByTag(gUnknown_02022E10->array[id].palTag);
-
- gUnknown_02022E10->array[id].isActive = FALSE;
-}
-
-void sub_803547C(u32 id, bool32 arg1)
-{
- s32 oamId, oamCount, i;
-
- if (gUnknown_02022E10 == NULL)
- return;
- if (!gUnknown_02022E10->array[id].isActive)
- return;
-
- oamCount = gUnknown_02022E10->array[id].oamCount + 1;
- oamId = gUnknown_02022E10->array[id].firstOamId;
- if (arg1)
- {
- for (i = 0; i < oamCount; i++, oamId++)
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_ERASE;
- }
- else
- {
- for (i = 0; i < oamCount; i++, oamId++)
- gMain.oamBuffer[oamId].affineMode = ST_OAM_AFFINE_OFF;
-
- sub_8035044(id, gUnknown_02022E10->array[id].field_18);
- }
-}
-
-static u8 sub_8035518(u8 arg0)
-{
- u32 i;
- u16 oamCount = 64;
-
- for (i = 0; i < gUnknown_02022E10->count; i++)
- {
- if (!gUnknown_02022E10->array[i].isActive)
- {
- if (gUnknown_02022E10->array[i].firstOamId != 0xFF && gUnknown_02022E10->array[i].oamCount <= arg0)
- return gUnknown_02022E10->array[i].firstOamId;
- }
- else
- {
- oamCount += 1 + gUnknown_02022E10->array[i].oamCount;
- }
- }
-
- if (oamCount + arg0 + 1 > 128)
- return 0xFF;
- else
- return oamCount;
-}
-
-static bool32 SharesTileWithAnyActive(u32 id)
-{
- u32 i;
-
- for (i = 0; i < gUnknown_02022E10->count; i++)
- {
- if (gUnknown_02022E10->array[i].isActive && i != id
- && gUnknown_02022E10->array[i].tileTag == gUnknown_02022E10->array[id].tileTag)
- {
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-static bool32 SharesPalWithAnyActive(u32 id)
-{
- u32 i;
-
- for (i = 0; i < gUnknown_02022E10->count; i++)
- {
- if (gUnknown_02022E10->array[i].isActive && i != id
- && gUnknown_02022E10->array[i].palTag == gUnknown_02022E10->array[id].palTag)
- {
- return TRUE;
- }
- }
-
- return FALSE;
-}
-
-u8 sub_80355F8(u32 shape, u32 size)
-{
- return gUnknown_082FF1C8[shape][size];
-}
-
-static void sub_8035608(void)
-{
- u8 spriteId;
-
- ResetSpriteData();
- spriteId = CreateSprite(&gUnknown_0831AC88, 0, 0, 0);
- gSprites[spriteId].invisible = TRUE;
- SetMainCallback2(sub_8035648);
-}
-
-static void sub_8035648(void)
-{
- AnimateSprites();
- BuildOamBuffer();
-}
diff --git a/src/rom_81520A8.c b/src/rom_81520A8.c
index f6d14d49c..8b10d44d0 100644
--- a/src/rom_81520A8.c
+++ b/src/rom_81520A8.c
@@ -2,7 +2,7 @@
#include "rom_81520A8.h"
#include "malloc.h"
#include "main.h"
-#include "rom_8034C54.h"
+#include "digit_obj_util.h"
static EWRAM_DATA struct
{
@@ -138,7 +138,7 @@ static bool32 sub_81523F4(struct UnkStruct_81520A8 *structPtr, u8 arg1)
return FALSE;
structPtr->unk18 = arg1;
- structPtr->tileNum = (sub_80355F8(structPtr->oam.shape, structPtr->oam.size) * arg1) + tileStart;
+ structPtr->tileNum = (GetTilesPerImage(structPtr->oam.shape, structPtr->oam.size) * arg1) + tileStart;
return TRUE;
}
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index c80340da3..18dd7c320 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -451,15 +451,15 @@ void sub_801AAD4(void)
{
s32 i;
sub_8014210(10);
- for (i = 0; i < 2; i++)
+ for (i = 0; i < UNION_ROOM_PARTY_SIZE; i++)
{
gEnemyParty[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1];
}
- for (i = 0; i < 6; i++)
+ for (i = 0; i < PARTY_SIZE; i++)
{
ZeroMonData(&gPlayerParty[i]);
}
- for (i = 0; i < 2; i++)
+ for (i = 0; i < UNION_ROOM_PARTY_SIZE; i++)
{
gPlayerParty[i] = gEnemyParty[i];
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 16:36:24 +0000