dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

Browse Source
This commit is contained in:
GriffinR
2023-01-07 13:30:11 -05:00
parent e989879f71 6d6a876dbd
commit c91b13a12b
705 changed files with 36500 additions and 32348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bard_music.c
+2 -2
View File
@@ -51,9 +51,9 @@ void GetWordPhonemes(struct BardSong *song, u16 word)
for (i = 0; i < 6; i ++)
{
sound = &song->sound[i];
if (sound->var00 != 0xFF)
if (sound->songLengthId != 0xFF)
{
song->phonemes[i].length = sound->var01 + gBardSoundLengthTable[sound->var00];
song->phonemes[i].length = sound->songLengthOffset + gBardSoundLengthTable[sound->songLengthId];
song->phonemes[i].pitch = CalcWordPitch(word + 30, i);
song->length += song->phonemes[i].length;
}
src/battle_ai_script_commands.c
+13 -13
View File
@@ -1379,24 +1379,24 @@ static void Cmd_get_ability(void)
return;
}
if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
{
if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
{
// AI has no knowledge of opponent, so it guesses which ability.
if (Random() & 1)
AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0];
AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
else
AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1];
AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1];
}
else
{
AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[0]; // It's definitely ability 1.
AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0]; // It's definitely ability 1.
}
}
else
{
AI_THINKING_STRUCT->funcResult = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
AI_THINKING_STRUCT->funcResult = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
}
}
else
@@ -1427,15 +1427,15 @@ static void Cmd_check_ability(void)
{
ability = gBattleMons[battlerId].ability;
}
else if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
else if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != ABILITY_NONE)
{
if (gBaseStats[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != ABILITY_NONE)
{
u8 abilityDummyVariable = ability; // Needed to match.
if (gBaseStats[gBattleMons[battlerId].species].abilities[0] != abilityDummyVariable
&& gBaseStats[gBattleMons[battlerId].species].abilities[1] != abilityDummyVariable)
if (gSpeciesInfo[gBattleMons[battlerId].species].abilities[0] != abilityDummyVariable
&& gSpeciesInfo[gBattleMons[battlerId].species].abilities[1] != abilityDummyVariable)
{
ability = gBaseStats[gBattleMons[battlerId].species].abilities[0];
ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
}
else
{
@@ -1444,12 +1444,12 @@ static void Cmd_check_ability(void)
}
else
{
ability = gBaseStats[gBattleMons[battlerId].species].abilities[0];
ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[0];
}
}
else
{
ability = gBaseStats[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
ability = gSpeciesInfo[gBattleMons[battlerId].species].abilities[1]; // AI can't actually reach this part since no pokemon has ability 2 and no ability 1.
}
}
else
src/battle_ai_switch_items.c
+6 -6
View File
@@ -199,9 +199,9 @@ static bool8 FindMonThatAbsorbsOpponentsMove(void)
species = GetMonData(&party[i], MON_DATA_SPECIES);
if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0)
monAbility = gBaseStats[species].abilities[1];
monAbility = gSpeciesInfo[species].abilities[1];
else
monAbility = gBaseStats[species].abilities[0];
monAbility = gSpeciesInfo[species].abilities[0];
if (absorbingTypeAbility == monAbility && Random() & 1)
{
@@ -397,9 +397,9 @@ static bool8 FindMonWithFlagsAndSuperEffective(u8 flags, u8 moduloPercent)
species = GetMonData(&party[i], MON_DATA_SPECIES);
if (GetMonData(&party[i], MON_DATA_ABILITY_NUM) != 0)
monAbility = gBaseStats[species].abilities[1];
monAbility = gSpeciesInfo[species].abilities[1];
else
monAbility = gBaseStats[species].abilities[0];
monAbility = gSpeciesInfo[species].abilities[0];
moveFlags = AI_TypeCalc(gLastLandedMoves[gActiveBattler], species, monAbility);
if (moveFlags & flags)
@@ -703,8 +703,8 @@ u8 GetMostSuitableMonToSwitchInto(void)
&& i != *(gBattleStruct->monToSwitchIntoId + battlerIn1)
&& i != *(gBattleStruct->monToSwitchIntoId + battlerIn2))
{
u8 type1 = gBaseStats[species].type1;
u8 type2 = gBaseStats[species].type2;
u8 type1 = gSpeciesInfo[species].type1;
u8 type2 = gSpeciesInfo[species].type2;
u8 typeDmg = TYPE_MUL_NORMAL;
ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type1, type1, type2, &typeDmg);
ModulateByTypeEffectiveness(gBattleMons[opposingBattler].type2, type1, type2, &typeDmg);
src/battle_anim_effects_1.c
+5 -5
View File
@@ -4561,11 +4561,11 @@ static void AnimTipMon_Step(struct Sprite *sprite)
void AnimTask_SkullBashPosition(u8 taskId)
{
u8 a;
u8 side;
gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker];
a = GetBattlerSide(gBattleAnimAttacker);
gTasks[taskId].data[1] = a;
side = GetBattlerSide(gBattleAnimAttacker);
gTasks[taskId].data[1] = side;
gTasks[taskId].data[2] = 0;
switch (gBattleAnimArgs[0])
{
@@ -4577,7 +4577,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
gTasks[taskId].data[3] = 8;
gTasks[taskId].data[4] = 0;
gTasks[taskId].data[5] = 3;
if (a == 0)
if (side == B_SIDE_PLAYER)
gTasks[taskId].data[5] *= -1;
gTasks[taskId].func = AnimTask_SkullBashPositionSet;
@@ -4586,7 +4586,7 @@ void AnimTask_SkullBashPosition(u8 taskId)
gTasks[taskId].data[3] = 8;
gTasks[taskId].data[4] = 0x600;
gTasks[taskId].data[5] = 0xC0;
if (a == 0)
if (side == B_SIDE_PLAYER)
{
gTasks[taskId].data[4] = -gTasks[taskId].data[4];
gTasks[taskId].data[5] = -gTasks[taskId].data[5];
src/battle_controller_player.c
+4 -4
View File
@@ -1163,7 +1163,7 @@ static void Task_GiveExpToMon(u8 taskId)
u16 species = GetMonData(mon, MON_DATA_SPECIES);
u8 level = GetMonData(mon, MON_DATA_LEVEL);
u32 currExp = GetMonData(mon, MON_DATA_EXP);
u32 nextLvlExp = gExperienceTables[gBaseStats[species].growthRate][level + 1];
u32 nextLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
if (currExp + gainedExp >= nextLvlExp)
{
@@ -1206,11 +1206,11 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
u8 level = GetMonData(mon, MON_DATA_LEVEL);
u16 species = GetMonData(mon, MON_DATA_SPECIES);
u32 exp = GetMonData(mon, MON_DATA_EXP);
u32 currLvlExp = gExperienceTables[gBaseStats[species].growthRate][level];
u32 currLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
u32 expToNextLvl;
exp -= currLvlExp;
expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
expToNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLvlExp;
SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
PlaySE(SE_EXP);
gTasks[taskId].func = Task_GiveExpWithExpBar;
@@ -1242,7 +1242,7 @@ static void Task_GiveExpWithExpBar(u8 taskId)
level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
expOnNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1];
expOnNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
if (currExp + gainedExp >= expOnNextLvl)
{
src/battle_controller_player_partner.c
+4 -4
View File
@@ -321,7 +321,7 @@ static void Task_GiveExpToMon(u8 taskId)
u16 species = GetMonData(mon, MON_DATA_SPECIES);
u8 level = GetMonData(mon, MON_DATA_LEVEL);
u32 currExp = GetMonData(mon, MON_DATA_EXP);
u32 nextLvlExp = gExperienceTables[gBaseStats[species].growthRate][level + 1];
u32 nextLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
if (currExp + gainedExp >= nextLvlExp)
{
@@ -364,11 +364,11 @@ static void Task_PrepareToGiveExpWithExpBar(u8 taskId)
u8 level = GetMonData(mon, MON_DATA_LEVEL);
u16 species = GetMonData(mon, MON_DATA_SPECIES);
u32 exp = GetMonData(mon, MON_DATA_EXP);
u32 currLvlExp = gExperienceTables[gBaseStats[species].growthRate][level];
u32 currLvlExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
u32 expToNextLvl;
exp -= currLvlExp;
expToNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLvlExp;
expToNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLvlExp;
SetBattleBarStruct(battlerId, gHealthboxSpriteIds[battlerId], expToNextLvl, exp, -gainedExp);
PlaySE(SE_EXP);
gTasks[taskId].func = Task_GiveExpWithExpBar;
@@ -400,7 +400,7 @@ static void Task_GiveExpWithExpBar(u8 taskId)
level = GetMonData(&gPlayerParty[monId], MON_DATA_LEVEL);
currExp = GetMonData(&gPlayerParty[monId], MON_DATA_EXP);
species = GetMonData(&gPlayerParty[monId], MON_DATA_SPECIES);
expOnNextLvl = gExperienceTables[gBaseStats[species].growthRate][level + 1];
expOnNextLvl = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1];
if (currExp + gainedExp >= expOnNextLvl)
{
src/battle_dome.c
+25 -25
View File
@@ -2375,8 +2375,8 @@ static void InitDomeTrainers(void)
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPDEF, NULL);
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_SPEED, NULL);
rankingScores[0] += GetMonData(&gPlayerParty[trainerId], MON_DATA_MAX_HP, NULL);
monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
monTypesBits |= gBitTable[gBaseStats[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type1];
monTypesBits |= gBitTable[gSpeciesInfo[GetMonData(&gPlayerParty[trainerId], MON_DATA_SPECIES, NULL)].type2];
}
// Count the number of types in the players party, to factor into the ranking
@@ -2410,8 +2410,8 @@ static void InitDomeTrainers(void)
rankingScores[i] += statValues[STAT_SPDEF];
rankingScores[i] += statValues[STAT_SPEED];
rankingScores[i] += statValues[STAT_HP];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
}
for (monTypesCount = 0, j = 0; j < 32; j++)
@@ -2475,7 +2475,7 @@ static void InitDomeTrainers(void)
#define CALC_STAT(base, statIndex) \
{ \
u8 baseStat = gBaseStats[species].base; \
u8 baseStat = gSpeciesInfo[species].base; \
stats[statIndex] = (((2 * baseStat + ivs + evs[statIndex] / 4) * level) / 100) + 5; \
stats[statIndex] = (u8) ModifyStatByNature(nature, stats[statIndex], statIndex); \
}
@@ -2508,7 +2508,7 @@ static void CalcDomeMonStats(u16 species, int level, int ivs, u8 evBits, u8 natu
}
else
{
int n = 2 * gBaseStats[species].baseHP;
int n = 2 * gSpeciesInfo[species].baseHP;
stats[STAT_HP] = (((n + ivs + evs[STAT_HP] / 4) * level) / 100) + level + 10;
}
@@ -2777,9 +2777,9 @@ static int GetTypeEffectivenessPoints(int move, int targetSpecies, int mode)
if (move == MOVE_NONE || move == MOVE_UNAVAILABLE || gBattleMoves[move].power == 0)
return 0;
defType1 = gBaseStats[targetSpecies].type1;
defType2 = gBaseStats[targetSpecies].type2;
defAbility = gBaseStats[targetSpecies].abilities[0];
defType1 = gSpeciesInfo[targetSpecies].type1;
defType2 = gSpeciesInfo[targetSpecies].type2;
defAbility = gSpeciesInfo[targetSpecies].abilities[0];
moveType = gBattleMoves[move].type;
if (defAbility == ABILITY_LEVITATE && moveType == TYPE_GROUND)
@@ -5231,9 +5231,9 @@ static u16 GetWinningMove(int winnerTournamentId, int loserTournamentId, u8 roun
targetSpecies = gFacilityTrainerMons[DOME_MONS[loserTournamentId][k]].species;
if (var & 1)
targetAbility = gBaseStats[targetSpecies].abilities[1];
targetAbility = gSpeciesInfo[targetSpecies].abilities[1];
else
targetAbility = gBaseStats[targetSpecies].abilities[0];
targetAbility = gSpeciesInfo[targetSpecies].abilities[0];
var = AI_TypeCalc(moveIds[i * MAX_MON_MOVES + j], targetSpecies, targetAbility);
if (var & MOVE_RESULT_NOT_VERY_EFFECTIVE && var & MOVE_RESULT_SUPER_EFFECTIVE)
@@ -5910,8 +5910,8 @@ static void InitRandomTourneyTreeResults(void)
statSums[i] += statValues[STAT_SPDEF];
statSums[i] += statValues[STAT_SPEED];
statSums[i] += statValues[STAT_HP];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
monTypesBits |= gBitTable[gBaseStats[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type1];
monTypesBits |= gBitTable[gSpeciesInfo[gFacilityTrainerMons[DOME_MONS[i][j]].species].type2];
}
// Because GF hates temporary vars, trainerId acts like monTypesCount here.
@@ -6037,12 +6037,12 @@ static void DecideRoundWinners(u8 roundId)
}
}
species = gFacilityTrainerMons[DOME_MONS[tournamentId1][monId1]].species;
points1 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense
+ gBaseStats[species].baseSpeed
+ gBaseStats[species].baseSpAttack
+ gBaseStats[species].baseSpDefense) / 10;
points1 += ( gSpeciesInfo[species].baseHP
+ gSpeciesInfo[species].baseAttack
+ gSpeciesInfo[species].baseDefense
+ gSpeciesInfo[species].baseSpeed
+ gSpeciesInfo[species].baseSpAttack
+ gSpeciesInfo[species].baseSpDefense) / 10;
}
// Random part of the formula.
points1 += (Random() & 0x1F);
@@ -6060,12 +6060,12 @@ static void DecideRoundWinners(u8 roundId)
}
}
species = gFacilityTrainerMons[DOME_MONS[tournamentId2][monId1]].species;
points2 += ( gBaseStats[species].baseHP
+ gBaseStats[species].baseAttack
+ gBaseStats[species].baseDefense
+ gBaseStats[species].baseSpeed
+ gBaseStats[species].baseSpAttack
+ gBaseStats[species].baseSpDefense) / 10;
points2 += ( gSpeciesInfo[species].baseHP
+ gSpeciesInfo[species].baseAttack
+ gSpeciesInfo[species].baseDefense
+ gSpeciesInfo[species].baseSpeed
+ gSpeciesInfo[species].baseSpAttack
+ gSpeciesInfo[species].baseSpDefense) / 10;
}
// Random part of the formula.
points2 += (Random() & 0x1F);
src/battle_factory.c
+3 -3
View File
@@ -618,9 +618,9 @@ static void GetOpponentMostCommonMonType(void)
for (i = 0; i < FRONTIER_PARTY_SIZE; i++)
{
u32 species = gFacilityTrainerMons[gFrontierTempParty[i]].species;
typeCounts[gBaseStats[species].type1]++;
if (gBaseStats[species].type1 != gBaseStats[species].type2)
typeCounts[gBaseStats[species].type2]++;
typeCounts[gSpeciesInfo[species].type1]++;
if (gSpeciesInfo[species].type1 != gSpeciesInfo[species].type2)
typeCounts[gSpeciesInfo[species].type2]++;
}
// Determine which are the two most-common types.
src/battle_interface.c
+46 -18
View File
@@ -318,10 +318,17 @@ static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT]
}
};
/* v-- Origin
[0 + ][1 ]
[ ][ ]
[ ][ ]
[______________][______] 96x40
[2 ][3 ][4 ]
*/
static const struct Subsprite sUnused_Subsprites_0[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
@@ -337,7 +344,7 @@ static const struct Subsprite sUnused_Subsprites_0[] =
.priority = 1
},
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 32,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -362,10 +369,11 @@ static const struct Subsprite sUnused_Subsprites_0[] =
}
};
// This subsprite table has the same layout as above, but offset by 64 base tiles.
static const struct Subsprite sUnused_Subsprites_2[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
@@ -381,7 +389,7 @@ static const struct Subsprite sUnused_Subsprites_2[] =
.priority = 1
},
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 32,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -406,10 +414,16 @@ static const struct Subsprite sUnused_Subsprites_2[] =
}
};
/* v-- Origin
[0 + ][1 ]
[ ][ ]
[ ][ ]
[ ][ ] 96x32
*/
static const struct Subsprite sUnused_Subsprites_1[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
@@ -426,10 +440,11 @@ static const struct Subsprite sUnused_Subsprites_1[] =
}
};
// Same as above
static const struct Subsprite sUnused_Subsprites_3[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(64x32),
.size = SPRITE_SIZE(64x32),
@@ -446,10 +461,13 @@ static const struct Subsprite sUnused_Subsprites_3[] =
}
};
/* v-- Origin
[0 + ][1 ] 64x8
*/
static const struct Subsprite sHealthBar_Subsprites_Player[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -466,10 +484,14 @@ static const struct Subsprite sHealthBar_Subsprites_Player[] =
}
};
/* v-- Origin
[] [0 + ][1 ] 8x8 + 64x8
2^ ^--- Note 8px space
*/
static const struct Subsprite sHealthBar_Subsprites_Opponent[] =
{
{
.x = DISPLAY_WIDTH,
.x = -16,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -485,7 +507,7 @@ static const struct Subsprite sHealthBar_Subsprites_Opponent[] =
.priority = 1
},
{
.x = DISPLAY_WIDTH - 16,
.x = -32,
.y = 0,
.shape = SPRITE_SHAPE(8x8),
.size = SPRITE_SIZE(8x8),
@@ -507,11 +529,13 @@ static const struct SubspriteTable sHealthBar_SubspriteTables[] =
[B_SIDE_PLAYER] = {ARRAY_COUNT(sHealthBar_Subsprites_Player), sHealthBar_Subsprites_Player},
[B_SIDE_OPPONENT] = {ARRAY_COUNT(sHealthBar_Subsprites_Opponent), sHealthBar_Subsprites_Opponent}
};
/* v-- Origin
[0 ][1 ][2 ][3 ] 128x8
*/
static const struct Subsprite sStatusSummaryBar_Subsprites_Enter[] =
{
{
.x = 32 * 5,
.x = 32 * -3,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -519,7 +543,7 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_Enter[] =
.priority = 1
},
{
.x = 32 * 6,
.x = 32 * -2,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -527,7 +551,7 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_Enter[] =
.priority = 1
},
{
.x = 32 * 7,
.x = 32 * -1,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -544,10 +568,14 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_Enter[] =
}
};
/* v-- Origin
[0 ][1 ][2 ][3 ][4 ][5 ] 192x8
^-- uses same tiles --^
*/
static const struct Subsprite sStatusSummaryBar_Subsprites_Exit[] =
{
{
.x = 32 * 5,
.x = 32 * -3,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -555,7 +583,7 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_Exit[] =
.priority = 1
},
{
.x = 32 * 6,
.x = 32 * -2,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -563,7 +591,7 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_Exit[] =
.priority = 1
},
{
.x = 32 * 7,
.x = 32 * -1,
.y = 0,
.shape = SPRITE_SHAPE(32x8),
.size = SPRITE_SIZE(32x8),
@@ -2171,9 +2199,9 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem
species = GetMonData(mon, MON_DATA_SPECIES);
level = GetMonData(mon, MON_DATA_LEVEL);
exp = GetMonData(mon, MON_DATA_EXP);
currLevelExp = gExperienceTables[gBaseStats[species].growthRate][level];
currLevelExp = gExperienceTables[gSpeciesInfo[species].growthRate][level];
currExpBarValue = exp - currLevelExp;
maxExpBarValue = gExperienceTables[gBaseStats[species].growthRate][level + 1] - currLevelExp;
maxExpBarValue = gExperienceTables[gSpeciesInfo[species].growthRate][level + 1] - currLevelExp;
SetBattleBarStruct(battlerId, healthboxSpriteId, maxExpBarValue, currExpBarValue, isDoubles);
MoveBattleBar(battlerId, healthboxSpriteId, EXP_BAR, 0);
}
src/battle_main.c
+7 -7
View File
@@ -199,8 +199,8 @@ EWRAM_DATA u32 gHitMarker = 0;
EWRAM_DATA static u8 sUnusedBattlersArray[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u8 gTakenDmgByBattler[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u8 gUnusedFirstBattleVar2 = 0; // Never read
EWRAM_DATA u16 gSideStatuses[2] = {0};
EWRAM_DATA struct SideTimer gSideTimers[2] = {0};
EWRAM_DATA u16 gSideStatuses[NUM_BATTLE_SIDES] = {0};
EWRAM_DATA struct SideTimer gSideTimers[NUM_BATTLE_SIDES] = {0};
EWRAM_DATA u32 gStatuses3[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA struct DisableStruct gDisableStructs[MAX_BATTLERS_COUNT] = {0};
EWRAM_DATA u16 gPauseCounterBattle = 0;
@@ -3097,7 +3097,7 @@ static void BattleStartClearSetData(void)
gBattleStruct->runTries = 0;
gBattleStruct->safariGoNearCounter = 0;
gBattleStruct->safariPkblThrowCounter = 0;
*(&gBattleStruct->safariCatchFactor) = gBaseStats[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
*(&gBattleStruct->safariCatchFactor) = gSpeciesInfo[GetMonData(&gEnemyParty[0], MON_DATA_SPECIES)].catchRate * 100 / 1275;
gBattleStruct->safariEscapeFactor = 3;
gBattleStruct->wildVictorySong = 0;
gBattleStruct->moneyMultiplier = 1;
@@ -3332,8 +3332,8 @@ void FaintClearSetData(void)
gBattleResources->flags->flags[gActiveBattler] = 0;
gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
ClearBattlerMoveHistory(gActiveBattler);
ClearBattlerAbilityHistory(gActiveBattler);
@@ -3400,8 +3400,8 @@ static void BattleIntroDrawTrainersOrMonsSprites(void)
for (i = 0; i < sizeof(struct BattlePokemon); i++)
ptr[i] = gBattleBufferB[gActiveBattler][4 + i];
gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
hpOnSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(gActiveBattler)];
*hpOnSwitchout = gBattleMons[gActiveBattler].hp;
src/battle_pike.c
+8 -8
View File
@@ -845,21 +845,21 @@ static bool8 DoesTypePreventStatus(u16 species, u32 status)
switch (status)
{
case STATUS1_TOXIC_POISON:
if (gBaseStats[species].type1 == TYPE_STEEL || gBaseStats[species].type1 == TYPE_POISON
|| gBaseStats[species].type2 == TYPE_STEEL || gBaseStats[species].type2 == TYPE_POISON)
if (gSpeciesInfo[species].type1 == TYPE_STEEL || gSpeciesInfo[species].type1 == TYPE_POISON
|| gSpeciesInfo[species].type2 == TYPE_STEEL || gSpeciesInfo[species].type2 == TYPE_POISON)
ret = TRUE;
break;
case STATUS1_FREEZE:
if (gBaseStats[species].type1 == TYPE_ICE || gBaseStats[species].type2 == TYPE_ICE)
if (gSpeciesInfo[species].type1 == TYPE_ICE || gSpeciesInfo[species].type2 == TYPE_ICE)
ret = TRUE;
break;
case STATUS1_PARALYSIS:
if (gBaseStats[species].type1 == TYPE_GROUND || gBaseStats[species].type1 == TYPE_ELECTRIC
|| gBaseStats[species].type2 == TYPE_GROUND || gBaseStats[species].type2 == TYPE_ELECTRIC)
if (gSpeciesInfo[species].type1 == TYPE_GROUND || gSpeciesInfo[species].type1 == TYPE_ELECTRIC
|| gSpeciesInfo[species].type2 == TYPE_GROUND || gSpeciesInfo[species].type2 == TYPE_ELECTRIC)
ret = TRUE;
break;
case STATUS1_BURN:
if (gBaseStats[species].type1 == TYPE_FIRE || gBaseStats[species].type2 == TYPE_FIRE)
if (gSpeciesInfo[species].type1 == TYPE_FIRE || gSpeciesInfo[species].type2 == TYPE_FIRE)
ret = TRUE;
break;
case STATUS1_SLEEP:
@@ -1138,9 +1138,9 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate)
SetMonData(&gEnemyParty[0],
MON_DATA_EXP,
&gExperienceTables[gBaseStats[wildMons[headerId][pikeMonId].species].growthRate][monLevel]);
&gExperienceTables[gSpeciesInfo[wildMons[headerId][pikeMonId].species].growthRate][monLevel]);
if (gBaseStats[wildMons[headerId][pikeMonId].species].abilities[1])
if (gSpeciesInfo[wildMons[headerId][pikeMonId].species].abilities[1])
abilityNum = Random() % 2;
else
abilityNum = 0;
src/battle_pyramid.c
+2 -2
View File
@@ -1371,7 +1371,7 @@ void GenerateBattlePyramidWildMon(void)
}
SetMonData(&gEnemyParty[0],
MON_DATA_EXP,
&gExperienceTables[gBaseStats[wildMons[id].species].growthRate][lvl]);
&gExperienceTables[gSpeciesInfo[wildMons[id].species].growthRate][lvl]);
switch (wildMons[id].abilityNum)
{
@@ -1381,7 +1381,7 @@ void GenerateBattlePyramidWildMon(void)
break;
case ABILITY_RANDOM:
default:
if (gBaseStats[wildMons[id].species].abilities[1])
if (gSpeciesInfo[wildMons[id].species].abilities[1])
{
i = GetMonData(&gEnemyParty[0], MON_DATA_PERSONALITY, NULL) % 2;
SetMonData(&gEnemyParty[0], MON_DATA_ABILITY_NUM, &i);
src/battle_pyramid_bag.c
+2 -2
View File
@@ -160,7 +160,7 @@ static const struct ListMenuTemplate sListMenuTemplate =
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NARROW,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
enum {
@@ -645,7 +645,7 @@ static void BagCursorMoved(s32 itemIndex, bool8 onInit, struct ListMenu *list)
if (itemIndex != LIST_CANCEL)
ShowItemIcon(gSaveBlock2Ptr->frontier.pyramidBag.itemId[gSaveBlock2Ptr->frontier.lvlMode][itemIndex], gPyramidBagMenu->isAltIcon);
else
ShowItemIcon(0xFFFF, gPyramidBagMenu->isAltIcon); // Show exit arrow if on Cancel
ShowItemIcon(ITEM_LIST_END, gPyramidBagMenu->isAltIcon); // Show exit arrow if on Cancel
gPyramidBagMenu->isAltIcon ^= 1;
PrintItemDescription(itemIndex);
}
src/battle_script_commands.c
+11 -11
View File
@@ -1595,7 +1595,7 @@ u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility)
{
s32 i = 0;
u8 flags = 0;
u8 type1 = gBaseStats[targetSpecies].type1, type2 = gBaseStats[targetSpecies].type2;
u8 type1 = gSpeciesInfo[targetSpecies].type1, type2 = gSpeciesInfo[targetSpecies].type2;
u8 moveType;
if (move == MOVE_STRUGGLE)
@@ -3274,7 +3274,7 @@ static void Cmd_getexp(void)
viaExpShare++;
}
calculatedExp = gBaseStats[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
calculatedExp = gSpeciesInfo[gBattleMons[gBattlerFainted].species].expYield * gBattleMons[gBattlerFainted].level / 7;
if (viaExpShare) // at least one mon is getting exp via exp share
{
@@ -4604,8 +4604,8 @@ static void Cmd_switchindataupdate(void)
for (i = 0; i < sizeof(struct BattlePokemon); i++)
monData[i] = gBattleBufferB[gActiveBattler][4 + i];
gBattleMons[gActiveBattler].type1 = gBaseStats[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gBaseStats[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].type1 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type1;
gBattleMons[gActiveBattler].type2 = gSpeciesInfo[gBattleMons[gActiveBattler].species].type2;
gBattleMons[gActiveBattler].ability = GetAbilityBySpecies(gBattleMons[gActiveBattler].species, gBattleMons[gActiveBattler].abilityNum);
// check knocked off item
@@ -8888,10 +8888,10 @@ static void Cmd_trydobeatup(void)
gBattlescriptCurrInstr += 9;
gBattleMoveDamage = gBaseStats[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
gBattleMoveDamage = gSpeciesInfo[GetMonData(&party[gBattleCommunication[0]], MON_DATA_SPECIES)].baseAttack;
gBattleMoveDamage *= gBattleMoves[gCurrentMove].power;
gBattleMoveDamage *= (GetMonData(&party[gBattleCommunication[0]], MON_DATA_LEVEL) * 2 / 5 + 2);
gBattleMoveDamage /= gBaseStats[gBattleMons[gBattlerTarget].species].baseDefense;
gBattleMoveDamage /= gSpeciesInfo[gBattleMons[gBattlerTarget].species].baseDefense;
gBattleMoveDamage = (gBattleMoveDamage / 50) + 2;
if (gProtectStructs[gBattlerAttacker].helpingHand)
gBattleMoveDamage = gBattleMoveDamage * 15 / 10;
@@ -9568,9 +9568,9 @@ static void Cmd_pickup(void)
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM))
ability = gBaseStats[species].abilities[1];
ability = gSpeciesInfo[species].abilities[1];
else
ability = gBaseStats[species].abilities[0];
ability = gSpeciesInfo[species].abilities[0];
if (ability == ABILITY_PICKUP
&& species != SPECIES_NONE
@@ -9591,9 +9591,9 @@ static void Cmd_pickup(void)
heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM);
if (GetMonData(&gPlayerParty[i], MON_DATA_ABILITY_NUM))
ability = gBaseStats[species].abilities[1];
ability = gSpeciesInfo[species].abilities[1];
else
ability = gBaseStats[species].abilities[0];
ability = gSpeciesInfo[species].abilities[0];
if (ability == ABILITY_PICKUP
&& species != SPECIES_NONE
@@ -9831,7 +9831,7 @@ static void Cmd_handleballthrow(void)
if (gLastUsedItem == ITEM_SAFARI_BALL)
catchRate = gBattleStruct->safariCatchFactor * 1275 / 100;
else
catchRate = gBaseStats[gBattleMons[gBattlerTarget].species].catchRate;
catchRate = gSpeciesInfo[gBattleMons[gBattlerTarget].species].catchRate;
if (gLastUsedItem > ITEM_SAFARI_BALL)
{
src/battle_tower.c
+64 -65
View File
@@ -79,72 +79,71 @@ static void FillPartnerParty(u16 trainerId);
static void SetEReaderTrainerChecksum(struct BattleTowerEReaderTrainer *ereaderTrainer);
static u8 SetTentPtrsGetLevel(void);
// Const rom data.
const u16 gBattleFrontierHeldItems[] =
{
ITEM_NONE,
ITEM_KINGS_ROCK,
ITEM_SITRUS_BERRY,
ITEM_ORAN_BERRY,
ITEM_CHESTO_BERRY,
ITEM_HARD_STONE,
ITEM_FOCUS_BAND,
ITEM_PERSIM_BERRY,
ITEM_MIRACLE_SEED,
ITEM_BERRY_JUICE,
ITEM_MACHO_BRACE,
ITEM_SILVER_POWDER,
ITEM_CHERI_BERRY,
ITEM_BLACK_GLASSES,
ITEM_BLACK_BELT,
ITEM_SOUL_DEW,
ITEM_CHOICE_BAND,
ITEM_MAGNET,
ITEM_SILK_SCARF,
ITEM_WHITE_HERB,
ITEM_DEEP_SEA_SCALE,
ITEM_DEEP_SEA_TOOTH,
ITEM_MYSTIC_WATER,
ITEM_SHARP_BEAK,
ITEM_QUICK_CLAW,
ITEM_LEFTOVERS,
ITEM_RAWST_BERRY,
ITEM_LIGHT_BALL,
ITEM_POISON_BARB,
ITEM_NEVER_MELT_ICE,
ITEM_ASPEAR_BERRY,
ITEM_SPELL_TAG,
ITEM_BRIGHT_POWDER,
ITEM_LEPPA_BERRY,
ITEM_SCOPE_LENS,
ITEM_TWISTED_SPOON,
ITEM_METAL_COAT,
ITEM_MENTAL_HERB,
ITEM_CHARCOAL,
ITEM_PECHA_BERRY,
ITEM_SOFT_SAND,
ITEM_LUM_BERRY,
ITEM_DRAGON_SCALE,
ITEM_DRAGON_FANG,
ITEM_IAPAPA_BERRY,
ITEM_WIKI_BERRY,
ITEM_SEA_INCENSE,
ITEM_SHELL_BELL,
ITEM_SALAC_BERRY,
ITEM_LANSAT_BERRY,
ITEM_APICOT_BERRY,
ITEM_STARF_BERRY,
ITEM_LIECHI_BERRY,
ITEM_STICK,
ITEM_LAX_INCENSE,
ITEM_AGUAV_BERRY,
ITEM_FIGY_BERRY,
ITEM_THICK_CLUB,
ITEM_MAGO_BERRY,
ITEM_METAL_POWDER,
ITEM_PETAYA_BERRY,
ITEM_LUCKY_PUNCH,
ITEM_GANLON_BERRY
[BATTLE_FRONTIER_ITEM_NONE] = ITEM_NONE,
[BATTLE_FRONTIER_ITEM_KINGS_ROCK] = ITEM_KINGS_ROCK,
[BATTLE_FRONTIER_ITEM_SITRUS_BERRY] = ITEM_SITRUS_BERRY,
[BATTLE_FRONTIER_ITEM_ORAN_BERRY] = ITEM_ORAN_BERRY,
[BATTLE_FRONTIER_ITEM_CHESTO_BERRY] = ITEM_CHESTO_BERRY,
[BATTLE_FRONTIER_ITEM_HARD_STONE] = ITEM_HARD_STONE,
[BATTLE_FRONTIER_ITEM_FOCUS_BAND] = ITEM_FOCUS_BAND,
[BATTLE_FRONTIER_ITEM_PERSIM_BERRY] = ITEM_PERSIM_BERRY,
[BATTLE_FRONTIER_ITEM_MIRACLE_SEED] = ITEM_MIRACLE_SEED,
[BATTLE_FRONTIER_ITEM_BERRY_JUICE] = ITEM_BERRY_JUICE,
[BATTLE_FRONTIER_ITEM_MACHO_BRACE] = ITEM_MACHO_BRACE,
[BATTLE_FRONTIER_ITEM_SILVER_POWDER] = ITEM_SILVER_POWDER,
[BATTLE_FRONTIER_ITEM_CHERI_BERRY] = ITEM_CHERI_BERRY,
[BATTLE_FRONTIER_ITEM_BLACK_GLASSES] = ITEM_BLACK_GLASSES,
[BATTLE_FRONTIER_ITEM_BLACK_BELT] = ITEM_BLACK_BELT,
[BATTLE_FRONTIER_ITEM_SOUL_DEW] = ITEM_SOUL_DEW,
[BATTLE_FRONTIER_ITEM_CHOICE_BAND] = ITEM_CHOICE_BAND,
[BATTLE_FRONTIER_ITEM_MAGNET] = ITEM_MAGNET,
[BATTLE_FRONTIER_ITEM_SILK_SCARF] = ITEM_SILK_SCARF,
[BATTLE_FRONTIER_ITEM_WHITE_HERB] = ITEM_WHITE_HERB,
[BATTLE_FRONTIER_ITEM_DEEP_SEA_SCALE] = ITEM_DEEP_SEA_SCALE,
[BATTLE_FRONTIER_ITEM_DEEP_SEA_TOOTH] = ITEM_DEEP_SEA_TOOTH,
[BATTLE_FRONTIER_ITEM_MYSTIC_WATER] = ITEM_MYSTIC_WATER,
[BATTLE_FRONTIER_ITEM_SHARP_BEAK] = ITEM_SHARP_BEAK,
[BATTLE_FRONTIER_ITEM_QUICK_CLAW] = ITEM_QUICK_CLAW,
[BATTLE_FRONTIER_ITEM_LEFTOVERS] = ITEM_LEFTOVERS,
[BATTLE_FRONTIER_ITEM_RAWST_BERRY] = ITEM_RAWST_BERRY,
[BATTLE_FRONTIER_ITEM_LIGHT_BALL] = ITEM_LIGHT_BALL,
[BATTLE_FRONTIER_ITEM_POISON_BARB] = ITEM_POISON_BARB,
[BATTLE_FRONTIER_ITEM_NEVER_MELT_ICE] = ITEM_NEVER_MELT_ICE,
[BATTLE_FRONTIER_ITEM_ASPEAR_BERRY] = ITEM_ASPEAR_BERRY,
[BATTLE_FRONTIER_ITEM_SPELL_TAG] = ITEM_SPELL_TAG,
[BATTLE_FRONTIER_ITEM_BRIGHT_POWDER] = ITEM_BRIGHT_POWDER,
[BATTLE_FRONTIER_ITEM_LEPPA_BERRY] = ITEM_LEPPA_BERRY,
[BATTLE_FRONTIER_ITEM_SCOPE_LENS] = ITEM_SCOPE_LENS,
[BATTLE_FRONTIER_ITEM_TWISTED_SPOON] = ITEM_TWISTED_SPOON,
[BATTLE_FRONTIER_ITEM_METAL_COAT] = ITEM_METAL_COAT,
[BATTLE_FRONTIER_ITEM_MENTAL_HERB] = ITEM_MENTAL_HERB,
[BATTLE_FRONTIER_ITEM_CHARCOAL] = ITEM_CHARCOAL,
[BATTLE_FRONTIER_ITEM_PECHA_BERRY] = ITEM_PECHA_BERRY,
[BATTLE_FRONTIER_ITEM_SOFT_SAND] = ITEM_SOFT_SAND,
[BATTLE_FRONTIER_ITEM_LUM_BERRY] = ITEM_LUM_BERRY,
[BATTLE_FRONTIER_ITEM_DRAGON_SCALE] = ITEM_DRAGON_SCALE,
[BATTLE_FRONTIER_ITEM_DRAGON_FANG] = ITEM_DRAGON_FANG,
[BATTLE_FRONTIER_ITEM_IAPAPA_BERRY] = ITEM_IAPAPA_BERRY,
[BATTLE_FRONTIER_ITEM_WIKI_BERRY] = ITEM_WIKI_BERRY,
[BATTLE_FRONTIER_ITEM_SEA_INCENSE] = ITEM_SEA_INCENSE,
[BATTLE_FRONTIER_ITEM_SHELL_BELL] = ITEM_SHELL_BELL,
[BATTLE_FRONTIER_ITEM_SALAC_BERRY] = ITEM_SALAC_BERRY,
[BATTLE_FRONTIER_ITEM_LANSAT_BERRY] = ITEM_LANSAT_BERRY,
[BATTLE_FRONTIER_ITEM_APICOT_BERRY] = ITEM_APICOT_BERRY,
[BATTLE_FRONTIER_ITEM_STARF_BERRY] = ITEM_STARF_BERRY,
[BATTLE_FRONTIER_ITEM_LIECHI_BERRY] = ITEM_LIECHI_BERRY,
[BATTLE_FRONTIER_ITEM_STICK] = ITEM_STICK,
[BATTLE_FRONTIER_ITEM_LAX_INCENSE] = ITEM_LAX_INCENSE,
[BATTLE_FRONTIER_ITEM_AGUAV_BERRY] = ITEM_AGUAV_BERRY,
[BATTLE_FRONTIER_ITEM_FIGY_BERRY] = ITEM_FIGY_BERRY,
[BATTLE_FRONTIER_ITEM_THICK_CLUB] = ITEM_THICK_CLUB,
[BATTLE_FRONTIER_ITEM_MAGO_BERRY] = ITEM_MAGO_BERRY,
[BATTLE_FRONTIER_ITEM_METAL_POWDER] = ITEM_METAL_POWDER,
[BATTLE_FRONTIER_ITEM_PETAYA_BERRY] = ITEM_PETAYA_BERRY,
[BATTLE_FRONTIER_ITEM_LUCKY_PUNCH] = ITEM_LUCKY_PUNCH,
[BATTLE_FRONTIER_ITEM_GANLON_BERRY] = ITEM_GANLON_BERRY,
};
#include "data/battle_frontier/battle_frontier_trainer_mons.h"
@@ -3540,7 +3539,7 @@ void TrySetLinkBattleTowerEnemyPartyLevel(void)
u32 species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL);
if (species)
{
SetMonData(&gEnemyParty[i], MON_DATA_EXP, &gExperienceTables[gBaseStats[species].growthRate][enemyLevel]);
SetMonData(&gEnemyParty[i], MON_DATA_EXP, &gExperienceTables[gSpeciesInfo[species].growthRate][enemyLevel]);
CalculateMonStats(&gEnemyParty[i]);
}
}
src/berry_blender.c
+5 -5
View File
@@ -1015,7 +1015,7 @@ static bool8 LoadBerryBlenderGfx(void)
static void DrawBlenderBg(void)
{
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
ShowBg(0);
ShowBg(1);
@@ -1036,7 +1036,7 @@ static void InitBerryBlenderWindows(void)
for (i = 0; i < 5; i++)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
Menu_LoadStdPalAt(0xE0);
}
}
@@ -2283,9 +2283,9 @@ static u32 CalculatePokeblockColor(struct BlenderBerry* berries, s16 *_flavors,
j++;
}
// If all flavors are 0, or at least 3 were negative/0
// If all 5 flavors are 0, or if 4-5 flavors were negative,
// or if players used the same berry, color is black
if (j == 5 || negativeFlavors > 3)
if (j == FLAVOR_COUNT || negativeFlavors > 3)
return PBLOCK_CLR_BLACK;
for (i = 0; i < numPlayers; i++)
@@ -2683,7 +2683,7 @@ static void CB2_EndBlenderGame(void)
switch (Menu_ProcessInputNoWrapClearOnChoose())
{
case 1:
case -1:
case MENU_B_PRESSED:
sBerryBlender->yesNoAnswer = 1;
sBerryBlender->gameEndState++;
for (i = 0; i < BLENDER_MAX_PLAYERS; i++)
src/braille.c
+2 -2
View File
@@ -88,7 +88,7 @@ u16 FontFunc_Braille(struct TextPrinter *textPrinter)
subStruct->fontId = *textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.currentChar++;
return RENDER_REPEAT;
case EXT_CTRL_CODE_RESET_SIZE:
case EXT_CTRL_CODE_RESET_FONT:
return RENDER_REPEAT;
case EXT_CTRL_CODE_PAUSE:
textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar++;
@@ -109,7 +109,7 @@ u16 FontFunc_Braille(struct TextPrinter *textPrinter)
case EXT_CTRL_CODE_ESCAPE:
char_ = *++textPrinter->printerTemplate.currentChar;
break;
case EXT_CTRL_CODE_SHIFT_TEXT:
case EXT_CTRL_CODE_SHIFT_RIGHT:
textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x + *textPrinter->printerTemplate.currentChar++;
return RENDER_REPEAT;
case EXT_CTRL_CODE_SHIFT_DOWN:
src/clear_save_data_screen.c
+1 -1
View File
@@ -95,7 +95,7 @@ static void Task_ClearSaveDataScreenYesNoChoice(u8 taskId)
gTasks[taskId].func = Task_ClearSaveData;
break;
case 1:
case -1:
case MENU_B_PRESSED:
PlaySE(SE_SELECT);
DestroyTask(taskId);
SetMainCallback2(CB2_FadeAndDoReset);
src/contest.c
+4 -1
View File
@@ -525,6 +525,9 @@ static const struct SpriteTemplate sSpriteTemplates_NextTurn[CONTESTANT_COUNT] =
}
};
/* v-- Origin
[0 +][1 ] 64x8
*/
static const struct Subsprite sSubsprites_NextTurn[] =
{
{
@@ -5317,7 +5320,7 @@ static void SetMoveSpecificAnimData(u8 contestant)
switch (move)
{
case MOVE_CURSE:
if (gBaseStats[species].type1 == TYPE_GHOST || gBaseStats[species].type2 == TYPE_GHOST)
if (gSpeciesInfo[species].type1 == TYPE_GHOST || gSpeciesInfo[species].type2 == TYPE_GHOST)
gAnimMoveTurn = 0;
else
gAnimMoveTurn = 1;
src/contest_util.c
+9 -9
View File
@@ -1168,24 +1168,24 @@ static void TryCreateWirelessSprites(void)
static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId)
{
u16 windowId;
int origWidth;
int tileWidth;
int strWidth;
u8 *spriteTilePtrs[4];
u8 *dst;
struct WindowTemplate windowTemplate;
memset(&windowTemplate, 0, sizeof(windowTemplate));
windowTemplate.width = 30;
windowTemplate.width = DISPLAY_TILE_WIDTH;
windowTemplate.height = 2;
windowId = AddWindow(&windowTemplate);
FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
origWidth = GetStringWidth(FONT_NORMAL, text, 0);
strWidth = (origWidth + 9) / 8;
if (strWidth > 30)
strWidth = 30;
strWidth = GetStringWidth(FONT_NORMAL, text, 0);
tileWidth = (strWidth + 9) / 8;
if (tileWidth > DISPLAY_TILE_WIDTH)
tileWidth = DISPLAY_TILE_WIDTH;
AddTextPrinterParameterized3(windowId, FONT_NORMAL, (strWidth * 8 - origWidth) / 2, 1, sContestLinkTextColors, TEXT_SKIP_DRAW, text);
AddTextPrinterParameterized3(windowId, FONT_NORMAL, (tileWidth * 8 - strWidth) / 2, 1, sContestLinkTextColors, TEXT_SKIP_DRAW, text);
{
s32 i;
struct Sprite *sprite;
@@ -1208,7 +1208,7 @@ static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId)
CpuCopy32(src + 128, dst + 0x200, 0x20);
CpuCopy32(src + 64, dst + 0x300, 0x20);
for (i = 0; i < strWidth; i++)
for (i = 0; i < tileWidth; i++)
{
dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32];
CpuCopy32(src + 192, dst, 0x20);
@@ -1226,7 +1226,7 @@ static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId)
}
RemoveWindow(windowId);
return (DISPLAY_WIDTH - (strWidth + 2) * 8) / 2;
return (DISPLAY_WIDTH - (tileWidth + 2) * 8) / 2;
}
static void CreateResultsTextWindowSprites(void)
src/credits.c
+1 -1
View File
@@ -183,7 +183,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 9,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 12,
.paletteNum = 8,
.baseBlock = 1
src/data.c
+1 -1
View File
@@ -302,7 +302,7 @@ const union AnimCmd *const gAnims_MonPic[] =
#define SPECIES_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species}
#define SPECIES_SHINY_PAL(species, pal) [SPECIES_##species] = {pal, SPECIES_##species + SPECIES_SHINY_TAG}
#include "data/pokemon_graphics/unknown_anims.h"
#include "data/pokemon_graphics/unused_anims.h"
#include "data/pokemon_graphics/front_pic_coordinates.h"
#include "data/pokemon_graphics/still_front_pic_table.h"
#include "data/pokemon_graphics/back_pic_coordinates.h"
src/data/.gitignore
+2
View File
@@ -1 +1,3 @@
wild_encounters.h
region_map/region_map_entries.h
region_map/porymap_config.json
src/data/bard_music/actions.h
+310 -310
View File
@@ -2,628 +2,628 @@
#define GUARD_DATA_BARD_MUSIC_ACTIONS_H
const struct BardSound gBardSounds_Actions[][6] = {
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 47 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 26 },
{ .songLengthId = 2 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 47 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 47 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 47 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 48 },
{ .songLengthId = 41 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 35 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/adjectives.h
+150 -150
View File
@@ -2,292 +2,292 @@
#define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H
const struct BardSound gBardSounds_Adjectives[][6] = {
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 50 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 9 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 27 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 48 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 36 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 8 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2d, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 45 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 18 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 30 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 50 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 }
{ .songLengthId = 0 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
{ .songLengthId = 3 },
{ .songLengthId = 29 },
{ .songLengthId = 51 }
}
};
src/data/bard_music/bard_sounds.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_BARD_SOUNDS_TABLE_H
#define GUARD_BARD_SOUNDS_TABLE_H
#define NULL_BARD_SOUND { 0xff }
#define NULL_BARD_SOUND { .songLengthId = 0xff }
#include "pokemon.h"
#include "moves.h"
src/data/bard_music/battle.h
+255 -255
View File
@@ -2,508 +2,508 @@
#define GUARD_DATA_BARD_MUSIC_BATTLE_H
const struct BardSound gBardSounds_Battle[][6] = {
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 48 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 12 },
{ .songLengthId = 15 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 18 },
{ .songLengthId = 15 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 18 },
{ .songLengthId = 15 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 18 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 8 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 9 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 11 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 50 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 35 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 9 },
{ .songLengthId = 17 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 30 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 18 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x16, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 22 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
{ .songLengthId = 36 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 26 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/conditions.h
+286 -286
View File
@@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_CONDITIONS_H
const struct BardSound gBardSounds_Conditions[][6] = {
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 11 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 10 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 32 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x19, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 25 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 39 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 9 },
{ .songLengthId = 48 },
{ .songLengthId = 3 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 11 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 44 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 20 },
{ .songLengthId = 35 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 10 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 44 },
{ .songLengthId = 42 },
{ .songLengthId = 30 },
{ .songLengthId = 44 },
{ .songLengthId = 38 },
NULL_BARD_SOUND,
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 26 },
{ .songLengthId = 50 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 39 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 10 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 29 },
{ .songLengthId = 42 },
{ .songLengthId = 38 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 48 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x16, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 22 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x16, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 42 },
{ .songLengthId = 22 },
{ .songLengthId = 50 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 50 },
{ .songLengthId = 38 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 48 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/endings.h
+268 -268
View File
@@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_ENDINGS_H
const struct BardSound gBardSounds_Endings[][6] = {
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 14 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 9 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 35 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 35 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/events.h
+118 -118
View File
@@ -2,236 +2,236 @@
#define GUARD_DATA_BARD_MUSIC_EVENTS_H
const struct BardSound gBardSounds_Events[][6] = {
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 3 },
{ .songLengthId = 0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 44 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 44 },
{ .songLengthId = 33 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 9 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 42 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 9 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 42 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 48 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/feelings.h
+279 -279
View File
@@ -2,556 +2,556 @@
#define GUARD_DATA_BARD_MUSIC_FEELINGS_H
const struct BardSound gBardSounds_Feelings[][6] = {
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x19, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 25 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 26 },
{ .songLengthId = 0 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 0 },
{ .songLengthId = 30 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 0 },
{ .songLengthId = 32 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 42 },
{ .songLengthId = 32 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 32 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
{ .songLengthId = 38 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 0 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 32 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x20, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 32 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 42 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 17 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 44 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 14 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 0 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 2 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/greetings.h
+173 -173
View File
@@ -2,340 +2,340 @@
#define GUARD_DATA_BARD_MUSIC_GREETINGS_H
const struct BardSound gBardSounds_Greetings[][6] = {
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 18 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 30 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 44 },
{ .songLengthId = 6 },
{ .songLengthId = 23 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 6 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x28, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 40 },
{ .songLengthId = 13 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 44 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 24 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 35 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/hobbies.h
+224 -224
View File
@@ -2,436 +2,436 @@
#define GUARD_DATA_BARD_MUSIC_HOBBIES_H
const struct BardSound gBardSounds_Hobbies[][6] = {
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 38 },
{ .songLengthId = 4 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 30 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 47 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 50 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2f, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 47 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 5 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 44 },
{ .songLengthId = 11 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 44 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 44 },
{ .songLengthId = 26 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 26 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 14 },
{ .songLengthId = 8 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 17 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 5 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/length_table.h
+13 -13
View File
@@ -2,19 +2,19 @@
#define GUARD_LENGTH_TABLE_H
const int gBardSoundLengthTable[] = {
0x09, 0x16, 0x0f, 0x10,
0x27, 0x15, 0x09, 0x1e,
0x18, 0x0f, 0x19, 0x0c,
0x16, 0x2d, 0x18, 0x0f,
0x28, 0x09, 0x15, 0x2a,
0x12, 0x09, 0x16, 0x0f,
0x1b, 0x30, 0x12, 0x1b,
0x21, 0x18, 0x19, 0x27,
0x13, 0x10, 0x36, 0x12,
0x09, 0x2d, 0x0f, 0x0c,
0x27, 0x17, 0x05, 0x2d,
0x0c, 0x15, 0x30, 0x0c,
0x15, 0x45, 0x12, 0x0f
9, 22, 15, 16,
39, 21, 9, 30,
24, 15, 25, 12,
22, 45, 24, 15,
40, 9, 21, 42,
18, 9, 22, 15,
27, 48, 18, 27,
33, 24, 25, 39,
19, 16, 54, 18,
9, 45, 15, 12,
39, 23, 5, 45,
12, 21, 48, 12,
21, 69, 18, 15
};
src/data/bard_music/lifestyle.h
+190 -190
View File
@@ -2,364 +2,364 @@
#define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H
const struct BardSound gBardSounds_Lifestyle[][6] = {
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 35 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 42 },
{ .songLengthId = 50 },
{ .songLengthId = 3 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 15 },
{ .songLengthId = 48 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 42 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 27 },
{ .songLengthId = 11 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 9 },
{ .songLengthId = 44 },
{ .songLengthId = 17 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 39 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 15 },
{ .songLengthId = 50 },
{ .songLengthId = 23 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 12 },
{ .songLengthId = 24 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/misc.h
+167 -167
View File
@@ -2,340 +2,340 @@
#define GUARD_DATA_BARD_MUSIC_MISC_H
const struct BardSound gBardSounds_Misc[][6] = {
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 48 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 46 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 26 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/moves.h
+1546 -1546
View File
File diff suppressed because it is too large Load Diff
src/data/bard_music/people.h
+302 -302
View File
@@ -2,604 +2,604 @@
#define GUARD_DATA_BARD_MUSIC_PEOPLE_H
const struct BardSound gBardSounds_People[][6] = {
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 26 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x13, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 19 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 45 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, -0x9, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26, .songLengthOffset = -0x9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 45 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 8 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 30 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x7, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 7 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x29, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 41 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x28, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 40 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 38 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/pokemon.h
+1669 -1669
View File
File diff suppressed because it is too large Load Diff
src/data/bard_music/speech.h
+239 -239
View File
@@ -2,484 +2,484 @@
#define GUARD_DATA_BARD_MUSIC_SPEECH_H
const struct BardSound gBardSounds_Speech[][6] = {
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 9 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 44 },
{ .songLengthId = 10 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 9 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 23 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 17 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x2d, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 45 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 20 },
{ .songLengthId = 12 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 11 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 11 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 1 },
{ .songLengthId = 48 },
{ .songLengthId = 6 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 35 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 35 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 44 },
{ .songLengthId = 1 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 10 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 17 },
{ .songLengthId = 14 },
{ .songLengthId = 38 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x7, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 7 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x10, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 16 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 1 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x28, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 40 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 38 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 6 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 8 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/status.h
+464 -464
View File
File diff suppressed because it is too large Load Diff
src/data/bard_music/time.h
+181 -181
View File
@@ -2,364 +2,364 @@
#define GUARD_DATA_BARD_MUSIC_TIME_H
const struct BardSound gBardSounds_Time[][6] = {
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 28 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 2 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 9 },
{ .songLengthId = 44 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 50 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 12 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 44 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 17 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x28, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 40 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x21, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 33 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 48 },
{ .songLengthId = 5 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 15 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 50 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 48 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/trainer.h
+100 -100
View File
@@ -2,220 +2,220 @@
#define GUARD_DATA_BARD_MUSIC_TRAINER_H
const struct BardSound gBardSounds_Trainer[][6] = {
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x2d, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 39 },
{ .songLengthId = 45 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x15, 0x0, 0x0, 0x0, 0x0 },
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 21 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 18 },
{ .songLengthId = 50 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 27 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 }
{ .songLengthId = 9 },
{ .songLengthId = 18 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
{ .songLengthId = 6 },
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x8, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 }
{ .songLengthId = 9 },
{ .songLengthId = 8 },
{ .songLengthId = 6 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
{ .songLengthId = 12 },
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x32, 0x0, 0x0, 0x0, 0x0 },
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 50 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 0 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 27 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 12 },
{ .songLengthId = 9 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 48 },
{ .songLengthId = 6 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/trendysaying.h
+136 -136
View File
@@ -2,268 +2,268 @@
#define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H
const struct BardSound gBardSounds_TrendySaying[][6] = {
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x14, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 2 },
{ .songLengthId = 20 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x1b, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27 },
{ .songLengthId = 27 },
{ .songLengthId = 23 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x26, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 38 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 44 },
{ .songLengthId = 18 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 29 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 17 },
{ .songLengthId = 3 },
{ .songLengthId = 26 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 11 },
{ .songLengthId = 17 },
{ .songLengthId = 14 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x0, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x3, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 3 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 35 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 36 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1d, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 29 },
{ .songLengthId = 44 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2b, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 43 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/voices.h
+261 -261
View File
@@ -2,508 +2,508 @@
#define GUARD_DATA_BARD_MUSIC_VOICES_H
const struct BardSound gBardSounds_Voices[][6] = {
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 12 },
{ .songLengthId = 48 },
{ .songLengthId = 51 },
{ .songLengthId = 12 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1b, 0x5, 0x8, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 27, .songLengthOffset = 0x5, .unused = 0x8 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x28, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 40 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x19, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 25 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x31, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 49 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x23, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 35 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ 0x11, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
{ .songLengthId = 17 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xa, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 10 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x2, 0x0, 0x0, 0x0, 0x0 },
{ 0x24, 0x0, 0x0, 0x0, 0x0 },
NULL_BARD_SOUND
{ .songLengthId = 44 },
{ .songLengthId = 14 },
{ .songLengthId = 12 },
{ .songLengthId = 2 },
{ .songLengthId = 36 },
NULL_BARD_SOUND,
},
{
{ 0x13, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 19 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 14 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x12, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 18 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ 0x1e, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 30 },
{ .songLengthId = 30 },
{ .songLengthId = 30 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x1, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 1 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ 0xb, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 23 },
{ .songLengthId = 11 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x17, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 23 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x5, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 5 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x13, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 19 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0x7, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 7 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 39 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 26 },
{ .songLengthId = 24 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 26 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ 0xc, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
{ .songLengthId = 12 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x9, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 9 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 24 },
{ .songLengthId = 24 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x2a, 0x0, 0x0, 0x0, 0x0 },
{ 0x2c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 42 },
{ .songLengthId = 44 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0xe, 0x0, 0x0, 0x0, 0x0 },
{ 0x30, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 14 },
{ .songLengthId = 48 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x1c, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 28 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ 0x27, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 39 },
{ .songLengthId = 39 },
{ .songLengthId = 39 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0xf, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 15 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x18, 0x0, 0x0, 0x0, 0x0 },
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 24 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x4, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 4 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x7, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 7 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x22, 0x0, 0x0, 0x0, 0x0 },
{ 0xd, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 34 },
{ .songLengthId = 13 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x7, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ 0x33, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 7 },
{ .songLengthId = 51 },
{ .songLengthId = 51 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
},
{
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ 0x6, 0x0, 0x0, 0x0, 0x0 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
{ .songLengthId = 6 },
NULL_BARD_SOUND,
NULL_BARD_SOUND,
NULL_BARD_SOUND
}
};
src/data/bard_music/word_pitch.h
+42 -174
View File
@@ -3,184 +3,52 @@
#define PITCH_END 0x1800
static const s16 sPitch1_0[] = {
-0x300, PITCH_END
};
static const s16 sPitch1_1[] = {
0x0900, PITCH_END
};
static const s16 sPitch1_2[] = {
0x0100, PITCH_END
};
static const s16 sPitch1_3[] = {
0x0400, PITCH_END
};
static const s16 sPitch1_4[] = {
0x0b00, PITCH_END
};
static const s16 sPitch2_0[] = {
-0x300, -0x100, PITCH_END
};
static const s16 sPitch2_1[] = {
-0x300, 0x0200, PITCH_END
};
static const s16 sPitch2_2[] = {
0x0200, 0x0400, PITCH_END
};
static const s16 sPitch2_3[] = {
0x0600, 0x0800, PITCH_END
};
static const s16 sPitch2_4[] = {
0x0900, 0x0800, PITCH_END
};
static const s16 sPitch3_0[] = {
-0x300, -0x100, -0x300, PITCH_END
};
static const s16 sPitch3_1[] = {
0x0400, -0x300, 0x0400, PITCH_END
};
static const s16 sPitch3_2[] = {
0x0900, 0x0800, 0x0600, PITCH_END
};
static const s16 sPitch3_3[] = {
0x0100, 0x0200, 0x0400, PITCH_END
};
static const s16 sPitch3_4[] = {
0x0600, 0x1000, 0x0d00, PITCH_END
};
static const s16 sPitch4_0[] = {
0x0400, 0x0900, 0x0400, 0x0900, PITCH_END
};
static const s16 sPitch4_1[] = {
0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END
};
static const s16 sPitch4_2[] = {
0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
};
static const s16 sPitch4_3[] = {
0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
};
static const s16 sPitch4_4[] = {
0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END
};
static const s16 sPitch5_0[] = {
-0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END
};
static const s16 sPitch5_1[] = {
0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
};
static const s16 sPitch5_2[] = {
0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END
};
static const s16 sPitch5_3[] = {
0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END
};
static const s16 sPitch5_4[] = {
0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END
};
static const s16 sPitch6_0[] = {
-0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
};
static const s16 sPitch6_1[] = {
0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END
};
static const s16 sPitch6_2[] = {
0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END
};
static const s16 sPitch6_3[] = {
0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END
};
static const s16 sPitch6_4[] = {
0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END
};
static const s16 sPitch7_0[] = {
0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END
};
static const s16 sPitch7_1[] = {
0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END
};
static const s16 sPitch7_2[] = {
0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END
};
static const s16 sPitch7_3[] = {
0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END
};
static const s16 sPitch7_4[] = {
0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END
};
static const s16 sPitch1_0[] = { -0x300, PITCH_END };
static const s16 sPitch1_1[] = { 0x0900, PITCH_END };
static const s16 sPitch1_2[] = { 0x0100, PITCH_END };
static const s16 sPitch1_3[] = { 0x0400, PITCH_END };
static const s16 sPitch1_4[] = { 0x0b00, PITCH_END };
static const s16 sPitch2_0[] = { -0x300, -0x100, PITCH_END };
static const s16 sPitch2_1[] = { -0x300, 0x0200, PITCH_END };
static const s16 sPitch2_2[] = { 0x0200, 0x0400, PITCH_END };
static const s16 sPitch2_3[] = { 0x0600, 0x0800, PITCH_END };
static const s16 sPitch2_4[] = { 0x0900, 0x0800, PITCH_END };
static const s16 sPitch3_0[] = { -0x300, -0x100, -0x300, PITCH_END };
static const s16 sPitch3_1[] = { 0x0400, -0x300, 0x0400, PITCH_END };
static const s16 sPitch3_2[] = { 0x0900, 0x0800, 0x0600, PITCH_END };
static const s16 sPitch3_3[] = { 0x0100, 0x0200, 0x0400, PITCH_END };
static const s16 sPitch3_4[] = { 0x0600, 0x1000, 0x0d00, PITCH_END };
static const s16 sPitch4_0[] = { 0x0400, 0x0900, 0x0400, 0x0900, PITCH_END };
static const s16 sPitch4_1[] = { 0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END };
static const s16 sPitch4_2[] = { 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END };
static const s16 sPitch4_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END };
static const s16 sPitch4_4[] = { 0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END };
static const s16 sPitch5_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END };
static const s16 sPitch5_1[] = { 0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END };
static const s16 sPitch5_2[] = { 0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END };
static const s16 sPitch5_3[] = { 0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END };
static const s16 sPitch5_4[] = { 0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END };
static const s16 sPitch6_0[] = { -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END };
static const s16 sPitch6_1[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END };
static const s16 sPitch6_2[] = { 0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END };
static const s16 sPitch6_3[] = { 0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END };
static const s16 sPitch6_4[] = { 0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END };
static const s16 sPitch7_0[] = { 0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END };
static const s16 sPitch7_1[] = { 0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END };
static const s16 sPitch7_2[] = { 0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END };
static const s16 sPitch7_3[] = { 0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END };
static const s16 sPitch7_4[] = { 0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END };
// Only sPitch7_# are used below
// This table is always indexed with (x + 30), where x is some value 0 - 4
static const s16 *const sBardSoundPitchTables[] = {
sPitch1_0,
sPitch1_1,
sPitch1_2,
sPitch1_3,
sPitch1_4,
sPitch2_0,
sPitch2_1,
sPitch2_2,
sPitch2_3,
sPitch2_4,
sPitch3_0,
sPitch3_1,
sPitch3_2,
sPitch3_3,
sPitch3_4,
sPitch4_0,
sPitch4_1,
sPitch4_2,
sPitch4_3,
sPitch4_4,
sPitch5_0,
sPitch5_1,
sPitch5_2,
sPitch5_3,
sPitch5_4,
sPitch6_0,
sPitch6_1,
sPitch6_2,
sPitch6_3,
sPitch6_4,
sPitch7_0,
sPitch7_1,
sPitch7_2,
sPitch7_3,
sPitch7_4
sPitch1_0, sPitch1_1, sPitch1_2, sPitch1_3, sPitch1_4,
sPitch2_0, sPitch2_1, sPitch2_2, sPitch2_3, sPitch2_4,
sPitch3_0, sPitch3_1, sPitch3_2, sPitch3_3, sPitch3_4,
sPitch4_0, sPitch4_1, sPitch4_2, sPitch4_3, sPitch4_4,
sPitch5_0, sPitch5_1, sPitch5_2, sPitch5_3, sPitch5_4,
sPitch6_0, sPitch6_1, sPitch6_2, sPitch6_3, sPitch6_4,
sPitch7_0, sPitch7_1, sPitch7_2, sPitch7_3, sPitch7_4
};
src/data/battle_frontier/battle_frontier_exchange_corner.h
+4 -4
View File
@@ -10,7 +10,7 @@ static const u16 sFrontierExchangeCorner_Decor1[] =
DECOR_CYNDAQUIL_DOLL,
DECOR_CHIKORITA_DOLL,
DECOR_TOTODILE_DOLL,
0xFFFF
ITEM_LIST_END
};
static const u16 sFrontierExchangeCorner_Decor2[] =
@@ -20,7 +20,7 @@ static const u16 sFrontierExchangeCorner_Decor2[] =
DECOR_VENUSAUR_DOLL,
DECOR_CHARIZARD_DOLL,
DECOR_BLASTOISE_DOLL,
0xFFFF
ITEM_LIST_END
};
static const u16 sFrontierExchangeCorner_Vitamins[] =
@@ -31,7 +31,7 @@ static const u16 sFrontierExchangeCorner_Vitamins[] =
ITEM_ZINC,
ITEM_CARBOS,
ITEM_HP_UP,
0xFFFF
ITEM_LIST_END
};
static const u16 sFrontierExchangeCorner_HoldItems[] =
@@ -45,7 +45,7 @@ static const u16 sFrontierExchangeCorner_HoldItems[] =
ITEM_KINGS_ROCK,
ITEM_FOCUS_BAND,
ITEM_SCOPE_LENS,
0xFFFF
ITEM_LIST_END
};
static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
src/data/item_icon_table.h
+2 -2
View File
@@ -1,4 +1,4 @@
const u32 *const gItemIconTable[][2] =
const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
{
[ITEM_NONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
// Pokeballs
@@ -402,5 +402,5 @@ const u32 *const gItemIconTable[][2] =
[ITEM_MAGMA_EMBLEM] = {gItemIcon_MagmaEmblem, gItemIconPalette_MagmaEmblem},
[ITEM_OLD_SEA_MAP] = {gItemIcon_OldSeaMap, gItemIconPalette_OldSeaMap},
// Return to field arrow
[ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
[ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
};
src/data/object_events/object_event_graphics_info.h
+4654 -245
View File
File diff suppressed because it is too large Load Diff
src/data/pokemon/base_stats.h → src/data/pokemon/species_info.h
+27 -27
View File
@@ -2,7 +2,7 @@
// 255 (MON_GENDERLESS) is reserved for genderless Pokémon.
#define PERCENT_FEMALE(percent) min(254, ((percent * 255) / 100))
#define OLD_UNOWN_BASE_STATS \
#define OLD_UNOWN_SPECIES_INFO \
{ \
.baseHP = 50, \
.baseAttack = 150, \
@@ -34,7 +34,7 @@
.noFlip = FALSE, \
}
const struct BaseStats gBaseStats[] =
const struct SpeciesInfo gSpeciesInfo[] =
{
[SPECIES_NONE] = {0},
@@ -8070,55 +8070,55 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE,
},
[SPECIES_OLD_UNOWN_B] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_B] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_C] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_C] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_D] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_D] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_E] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_E] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_F] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_F] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_G] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_G] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_H] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_H] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_I] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_I] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_J] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_J] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_K] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_K] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_L] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_L] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_M] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_M] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_N] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_N] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_O] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_O] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_P] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_P] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Q] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_R] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_R] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_S] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_S] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_T] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_T] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_U] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_U] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_V] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_V] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_W] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_W] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_X] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_X] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Y] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_BASE_STATS,
[SPECIES_OLD_UNOWN_Z] = OLD_UNOWN_SPECIES_INFO,
[SPECIES_TREECKO] =
{
src/data/pokemon_graphics/front_pic_anims.h
+1372 -3070
View File
File diff suppressed because it is too large Load Diff
src/data/pokemon_graphics/unknown_anims.h
-2322
View File
File diff suppressed because it is too large Load Diff
src/data/pokemon_graphics/unused_anims.h
+1827
View File
File diff suppressed because it is too large Load Diff
src/data/region_map/city_map_tilemaps.h
+22 -22
View File
@@ -1,22 +1,22 @@
const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/city_maps/lavaridge_0.bin.lz");
const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/city_maps/fallarbor_0.bin.lz");
const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/city_maps/fortree_0.bin.lz");
const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_0.bin.lz");
const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_1.bin.lz");
const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_0.bin.lz");
const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/city_maps/rustboro_1.bin.lz");
const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/city_maps/pacifidlog_0.bin.lz");
const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_1.bin.lz");
const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/city_maps/mauville_0.bin.lz");
const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/city_maps/oldale_0.bin.lz");
const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_1.bin.lz");
const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/city_maps/lilycove_0.bin.lz");
const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/city_maps/littleroot_0.bin.lz");
const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/city_maps/dewford_0.bin.lz");
const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/city_maps/sootopolis_0.bin.lz");
const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_0.bin.lz");
const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/city_maps/ever_grande_1.bin.lz");
const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/city_maps/verdanturf_0.bin.lz");
const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_1.bin.lz");
const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/city_maps/mossdeep_0.bin.lz");
const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/city_maps/petalburg_0.bin.lz");
const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lavaridge_0.bin.lz");
const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fallarbor_0.bin.lz");
const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/fortree_0.bin.lz");
const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_0.bin.lz");
const u32 gPokenavCityMap_Slateport_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/slateport_1.bin.lz");
const u32 gPokenavCityMap_Rustboro_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_0.bin.lz");
const u32 gPokenavCityMap_Rustboro_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/rustboro_1.bin.lz");
const u32 gPokenavCityMap_Pacifidlog_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/pacifidlog_0.bin.lz");
const u32 gPokenavCityMap_Mauville_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_1.bin.lz");
const u32 gPokenavCityMap_Mauville_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mauville_0.bin.lz");
const u32 gPokenavCityMap_Oldale_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/oldale_0.bin.lz");
const u32 gPokenavCityMap_Lilycove_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_1.bin.lz");
const u32 gPokenavCityMap_Lilycove_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/lilycove_0.bin.lz");
const u32 gPokenavCityMap_Littleroot_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/littleroot_0.bin.lz");
const u32 gPokenavCityMap_Dewford_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/dewford_0.bin.lz");
const u32 gPokenavCityMap_Sootopolis_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/sootopolis_0.bin.lz");
const u32 gPokenavCityMap_EverGrande_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_0.bin.lz");
const u32 gPokenavCityMap_EverGrande_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/ever_grande_1.bin.lz");
const u32 gPokenavCityMap_Verdanturf_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/verdanturf_0.bin.lz");
const u32 gPokenavCityMap_Mossdeep_1[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_1.bin.lz");
const u32 gPokenavCityMap_Mossdeep_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/mossdeep_0.bin.lz");
const u32 gPokenavCityMap_Petalburg_0[] = INCBIN_U32("graphics/pokenav/region_map/city_maps/petalburg_0.bin.lz");
src/data/region_map/region_map_entries.h
-418
View File
@@ -1,418 +0,0 @@
#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT TOWN");
static const u8 sMapName_OldaleTown[] = _("OLDALE TOWN");
static const u8 sMapName_DewfordTown[] = _("DEWFORD TOWN");
static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE TOWN");
static const u8 sMapName_FallarborTown[] = _("FALLARBOR TOWN");
static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF TOWN");
static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN");
static const u8 sMapName_PetalburgCity[] = _("PETALBURG CITY");
static const u8 sMapName_SlateportCity[] = _("SLATEPORT CITY");
static const u8 sMapName_MauvilleCity[] = _("MAUVILLE CITY");
static const u8 sMapName_RustboroCity[] = _("RUSTBORO CITY");
static const u8 sMapName_FortreeCity[] = _("FORTREE CITY");
static const u8 sMapName_LilycoveCity[] = _("LILYCOVE CITY");
static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP CITY");
static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS CITY");
static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE CITY");
static const u8 sMapName_Route101[] = _("ROUTE 101");
static const u8 sMapName_Route102[] = _("ROUTE 102");
static const u8 sMapName_Route103[] = _("ROUTE 103");
static const u8 sMapName_Route104[] = _("ROUTE 104");
static const u8 sMapName_Route105[] = _("ROUTE 105");
static const u8 sMapName_Route106[] = _("ROUTE 106");
static const u8 sMapName_Route107[] = _("ROUTE 107");
static const u8 sMapName_Route108[] = _("ROUTE 108");
static const u8 sMapName_Route109[] = _("ROUTE 109");
static const u8 sMapName_Route110[] = _("ROUTE 110");
static const u8 sMapName_Route111[] = _("ROUTE 111");
static const u8 sMapName_Route112[] = _("ROUTE 112");
static const u8 sMapName_Route113[] = _("ROUTE 113");
static const u8 sMapName_Route114[] = _("ROUTE 114");
static const u8 sMapName_Route115[] = _("ROUTE 115");
static const u8 sMapName_Route116[] = _("ROUTE 116");
static const u8 sMapName_Route117[] = _("ROUTE 117");
static const u8 sMapName_Route118[] = _("ROUTE 118");
static const u8 sMapName_Route119[] = _("ROUTE 119");
static const u8 sMapName_Route120[] = _("ROUTE 120");
static const u8 sMapName_Route121[] = _("ROUTE 121");
static const u8 sMapName_Route122[] = _("ROUTE 122");
static const u8 sMapName_Route123[] = _("ROUTE 123");
static const u8 sMapName_Route124[] = _("ROUTE 124");
static const u8 sMapName_Route125[] = _("ROUTE 125");
static const u8 sMapName_Route126[] = _("ROUTE 126");
static const u8 sMapName_Route127[] = _("ROUTE 127");
static const u8 sMapName_Route128[] = _("ROUTE 128");
static const u8 sMapName_Route129[] = _("ROUTE 129");
static const u8 sMapName_Route130[] = _("ROUTE 130");
static const u8 sMapName_Route131[] = _("ROUTE 131");
static const u8 sMapName_Route132[] = _("ROUTE 132");
static const u8 sMapName_Route133[] = _("ROUTE 133");
static const u8 sMapName_Route134[] = _("ROUTE 134");
static const u8 sMapName_Underwater[] = _("UNDERWATER");
static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE");
static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY");
static const u8 sMapName_SafariZone[] = _("SAFARI ZONE");
static const u8 sMapName_BattleFrontier[] = _("BATTLE FRONTIER");
static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS");
static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP");
static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE");
static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS");
static const u8 sMapName_MtPyre[] = _("MT. PYRE");
static const u8 sMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT");
static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE");
static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD");
static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND");
static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
static const u8 sMapName_FieryPath[] = _("FIERY PATH");
static const u8 sMapName_JaggedPass[] = _("JAGGED PASS");
static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER");
static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB");
static const u8 sMapName_IslandCave[] = _("ISLAND CAVE");
static const u8 sMapName_DesertRuins[] = _("DESERT RUINS");
static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB");
static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
static const u8 sMapName_SkyPillar[] = _("SKY PILLAR");
static const u8 sMapName_SecretBase[] = _("SECRET BASE");
static const u8 sMapName_None[] = _("");
static const u8 sMapName_PalletTown[] = _("PALLET TOWN");
static const u8 sMapName_ViridianCity[] = _("VIRIDIAN CITY");
static const u8 sMapName_PewterCity[] = _("PEWTER CITY");
static const u8 sMapName_CeruleanCity[] = _("CERULEAN CITY");
static const u8 sMapName_LavenderTown[] = _("LAVENDER TOWN");
static const u8 sMapName_VermilionCity[] = _("VERMILION CITY");
static const u8 sMapName_CeladonCity[] = _("CELADON CITY");
static const u8 sMapName_FuchsiaCity[] = _("FUCHSIA CITY");
static const u8 sMapName_CinnabarIsland[] = _("CINNABAR ISLAND");
static const u8 sMapName_IndigoPlateau[] = _("INDIGO PLATEAU");
static const u8 sMapName_SaffronCity[] = _("SAFFRON CITY");
static const u8 sMapName_Route4[] = _("ROUTE 4");
static const u8 sMapName_Route10[] = _("ROUTE 10");
static const u8 sMapName_Route1[] = _("ROUTE 1");
static const u8 sMapName_Route2[] = _("ROUTE 2");
static const u8 sMapName_Route3[] = _("ROUTE 3");
static const u8 sMapName_Route4_2[] = _("ROUTE 4");
static const u8 sMapName_Route5[] = _("ROUTE 5");
static const u8 sMapName_Route6[] = _("ROUTE 6");
static const u8 sMapName_Route7[] = _("ROUTE 7");
static const u8 sMapName_Route8[] = _("ROUTE 8");
static const u8 sMapName_Route9[] = _("ROUTE 9");
static const u8 sMapName_Route10_2[] = _("ROUTE 10");
static const u8 sMapName_Route11[] = _("ROUTE 11");
static const u8 sMapName_Route12[] = _("ROUTE 12");
static const u8 sMapName_Route13[] = _("ROUTE 13");
static const u8 sMapName_Route14[] = _("ROUTE 14");
static const u8 sMapName_Route15[] = _("ROUTE 15");
static const u8 sMapName_Route16[] = _("ROUTE 16");
static const u8 sMapName_Route17[] = _("ROUTE 17");
static const u8 sMapName_Route18[] = _("ROUTE 18");
static const u8 sMapName_Route19[] = _("ROUTE 19");
static const u8 sMapName_Route20[] = _("ROUTE 20");
static const u8 sMapName_Route21[] = _("ROUTE 21");
static const u8 sMapName_Route22[] = _("ROUTE 22");
static const u8 sMapName_Route23[] = _("ROUTE 23");
static const u8 sMapName_Route24[] = _("ROUTE 24");
static const u8 sMapName_Route25[] = _("ROUTE 25");
static const u8 sMapName_ViridianForest[] = _("VIRIDIAN FOREST");
static const u8 sMapName_MtMoon[] = _("MT. MOON");
static const u8 sMapName_SSAnne[] = _("S.S. ANNE");
static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH");
static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH");
static const u8 sMapName_DiglettsCave[] = _("DIGLETT'S CAVE");
static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD");
static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT");
static const u8 sMapName_SilphCo[] = _("SILPH CO.");
static const u8 sMapName_PokemonMansion[] = _("POKéMON MANSION");
static const u8 sMapName_KantoSafariZone[] = _("SAFARI ZONE");
static const u8 sMapName_PokemonLeague[] = _("POKéMON LEAGUE");
static const u8 sMapName_RockTunnel[] = _("ROCK TUNNEL");
static const u8 sMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS");
static const u8 sMapName_PokemonTower[] = _("POKéMON TOWER");
static const u8 sMapName_CeruleanCave[] = _("CERULEAN CAVE");
static const u8 sMapName_PowerPlant[] = _("POWER PLANT");
static const u8 sMapName_OneIsland[] = _("ONE ISLAND");
static const u8 sMapName_TwoIsland[] = _("TWO ISLAND");
static const u8 sMapName_ThreeIsland[] = _("THREE ISLAND");
static const u8 sMapName_FourIsland[] = _("FOUR ISLAND");
static const u8 sMapName_FiveIsland[] = _("FIVE ISLAND");
static const u8 sMapName_SevenIsland[] = _("SEVEN ISLAND");
static const u8 sMapName_SixIsland[] = _("SIX ISLAND");
static const u8 sMapName_KindleRoad[] = _("KINDLE ROAD");
static const u8 sMapName_TreasureBeach[] = _("TREASURE BEACH");
static const u8 sMapName_CapeBrink[] = _("CAPE BRINK");
static const u8 sMapName_BondBridge[] = _("BOND BRIDGE");
static const u8 sMapName_ThreeIslePort[] = _("THREE ISLE PORT");
static const u8 sMapName_SeviiIsle6[] = _("SEVII ISLE 6");
static const u8 sMapName_SeviiIsle7[] = _("SEVII ISLE 7");
static const u8 sMapName_SeviiIsle8[] = _("SEVII ISLE 8");
static const u8 sMapName_SeviiIsle9[] = _("SEVII ISLE 9");
static const u8 sMapName_ResortGorgeous[] = _("RESORT GORGEOUS");
static const u8 sMapName_WaterLabyrinth[] = _("WATER LABYRINTH");
static const u8 sMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW");
static const u8 sMapName_MemorialPillar[] = _("MEMORIAL PILLAR");
static const u8 sMapName_OutcastIsland[] = _("OUTCAST ISLAND");
static const u8 sMapName_GreenPath[] = _("GREEN PATH");
static const u8 sMapName_WaterPath[] = _("WATER PATH");
static const u8 sMapName_RuinValley[] = _("RUIN VALLEY");
static const u8 sMapName_TrainerTower[] = _("TRAINER TOWER");
static const u8 sMapName_CanyonEntrance[] = _("CANYON ENTRANCE");
static const u8 sMapName_SevaultCanyon[] = _("SEVAULT CANYON");
static const u8 sMapName_TanobyRuins[] = _("TANOBY RUINS");
static const u8 sMapName_SeviiIsle22[] = _("SEVII ISLE 22");
static const u8 sMapName_SeviiIsle23[] = _("SEVII ISLE 23");
static const u8 sMapName_SeviiIsle24[] = _("SEVII ISLE 24");
static const u8 sMapName_NavelRock[] = _("NAVEL ROCK");
static const u8 sMapName_MtEmber[] = _("MT. EMBER");
static const u8 sMapName_BerryForest[] = _("BERRY FOREST");
static const u8 sMapName_IcefallCave[] = _("ICEFALL CAVE");
static const u8 sMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE");
static const u8 sMapName_TrainerTower2[] = _("TRAINER TOWER");
static const u8 sMapName_DottedHole[] = _("DOTTED HOLE");
static const u8 sMapName_LostCave[] = _("LOST CAVE");
static const u8 sMapName_PatternBush[] = _("PATTERN BUSH");
static const u8 sMapName_AlteringCave[] = _("ALTERING CAVE");
static const u8 sMapName_TanobyChambers[] = _("TANOBY CHAMBERS");
static const u8 sMapName_ThreeIslePath[] = _("THREE ISLE PATH");
static const u8 sMapName_TanobyKey[] = _("TANOBY KEY");
static const u8 sMapName_BirthIsland[] = _("BIRTH ISLAND");
static const u8 sMapName_MoneanChamber[] = _("MONEAN CHAMBER");
static const u8 sMapName_LiptooChamber[] = _("LIPTOO CHAMBER");
static const u8 sMapName_WeepthChamber[] = _("WEEPTH CHAMBER");
static const u8 sMapName_DilfordChamber[] = _("DILFORD CHAMBER");
static const u8 sMapName_ScufibChamber[] = _("SCUFIB CHAMBER");
static const u8 sMapName_RixyChamber[] = _("RIXY CHAMBER");
static const u8 sMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER");
static const u8 sMapName_EmberSpa[] = _("EMBER SPA");
static const u8 sMapName_SpecialArea[] = _("SPECIAL AREA");
static const u8 sMapName_AquaHideout[] = _("AQUA HIDEOUT");
static const u8 sMapName_MagmaHideout[] = _("MAGMA HIDEOUT");
static const u8 sMapName_MirageTower[] = _("MIRAGE TOWER");
static const u8 sMapName_FarawayIsland[] = _("FARAWAY ISLAND");
static const u8 sMapName_ArtisanCave[] = _("ARTISAN CAVE");
static const u8 sMapName_MarineCave[] = _("MARINE CAVE");
static const u8 sMapName_TerraCave[] = _("TERRA CAVE");
static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS");
static const u8 sMapName_TrainerHill[] = _("TRAINER HILL");
const struct RegionMapLocation gRegionMapEntries[] = {
[MAPSEC_LITTLEROOT_TOWN] = { 4, 11, 1, 1, sMapName_LittlerootTown},
[MAPSEC_OLDALE_TOWN] = { 4, 9, 1, 1, sMapName_OldaleTown},
[MAPSEC_DEWFORD_TOWN] = { 2, 14, 1, 1, sMapName_DewfordTown},
[MAPSEC_LAVARIDGE_TOWN] = { 5, 3, 1, 1, sMapName_LavaridgeTown},
[MAPSEC_FALLARBOR_TOWN] = { 3, 0, 1, 1, sMapName_FallarborTown},
[MAPSEC_VERDANTURF_TOWN] = { 4, 6, 1, 1, sMapName_VerdanturfTown},
[MAPSEC_PACIFIDLOG_TOWN] = {17, 10, 1, 1, sMapName_PacifidlogTown},
[MAPSEC_PETALBURG_CITY] = { 1, 9, 1, 1, sMapName_PetalburgCity},
[MAPSEC_SLATEPORT_CITY] = { 8, 10, 1, 2, sMapName_SlateportCity},
[MAPSEC_MAUVILLE_CITY] = { 8, 6, 2, 1, sMapName_MauvilleCity},
[MAPSEC_RUSTBORO_CITY] = { 0, 5, 1, 2, sMapName_RustboroCity},
[MAPSEC_FORTREE_CITY] = {12, 0, 1, 1, sMapName_FortreeCity},
[MAPSEC_LILYCOVE_CITY] = {18, 3, 2, 1, sMapName_LilycoveCity},
[MAPSEC_MOSSDEEP_CITY] = {24, 5, 2, 1, sMapName_MossdeepCity},
[MAPSEC_SOOTOPOLIS_CITY] = {21, 7, 1, 1, sMapName_SootopolisCity},
[MAPSEC_EVER_GRANDE_CITY] = {27, 8, 1, 2, sMapName_EverGrandeCity},
[MAPSEC_ROUTE_101] = { 4, 10, 1, 1, sMapName_Route101},
[MAPSEC_ROUTE_102] = { 2, 9, 2, 1, sMapName_Route102},
[MAPSEC_ROUTE_103] = { 4, 8, 4, 1, sMapName_Route103},
[MAPSEC_ROUTE_104] = { 0, 7, 1, 3, sMapName_Route104},
[MAPSEC_ROUTE_105] = { 0, 10, 1, 3, sMapName_Route105},
[MAPSEC_ROUTE_106] = { 0, 13, 2, 1, sMapName_Route106},
[MAPSEC_ROUTE_107] = { 3, 14, 3, 1, sMapName_Route107},
[MAPSEC_ROUTE_108] = { 6, 14, 2, 1, sMapName_Route108},
[MAPSEC_ROUTE_109] = { 8, 12, 1, 3, sMapName_Route109},
[MAPSEC_ROUTE_110] = { 8, 7, 1, 3, sMapName_Route110},
[MAPSEC_ROUTE_111] = { 8, 0, 1, 6, sMapName_Route111},
[MAPSEC_ROUTE_112] = { 6, 3, 2, 1, sMapName_Route112},
[MAPSEC_ROUTE_113] = { 4, 0, 4, 1, sMapName_Route113},
[MAPSEC_ROUTE_114] = { 1, 0, 2, 3, sMapName_Route114},
[MAPSEC_ROUTE_115] = { 0, 2, 1, 3, sMapName_Route115},
[MAPSEC_ROUTE_116] = { 1, 5, 4, 1, sMapName_Route116},
[MAPSEC_ROUTE_117] = { 5, 6, 3, 1, sMapName_Route117},
[MAPSEC_ROUTE_118] = {10, 6, 2, 1, sMapName_Route118},
[MAPSEC_ROUTE_119] = {11, 0, 1, 6, sMapName_Route119},
[MAPSEC_ROUTE_120] = {13, 0, 1, 4, sMapName_Route120},
[MAPSEC_ROUTE_121] = {14, 3, 4, 1, sMapName_Route121},
[MAPSEC_ROUTE_122] = {16, 4, 1, 2, sMapName_Route122},
[MAPSEC_ROUTE_123] = {12, 6, 5, 1, sMapName_Route123},
[MAPSEC_ROUTE_124] = {20, 3, 4, 3, sMapName_Route124},
[MAPSEC_ROUTE_125] = {24, 3, 2, 2, sMapName_Route125},
[MAPSEC_ROUTE_126] = {20, 6, 3, 3, sMapName_Route126},
[MAPSEC_ROUTE_127] = {23, 6, 3, 3, sMapName_Route127},
[MAPSEC_ROUTE_128] = {23, 9, 4, 1, sMapName_Route128},
[MAPSEC_ROUTE_129] = {24, 10, 2, 1, sMapName_Route129},
[MAPSEC_ROUTE_130] = {21, 10, 3, 1, sMapName_Route130},
[MAPSEC_ROUTE_131] = {18, 10, 3, 1, sMapName_Route131},
[MAPSEC_ROUTE_132] = {15, 10, 2, 1, sMapName_Route132},
[MAPSEC_ROUTE_133] = {12, 10, 3, 1, sMapName_Route133},
[MAPSEC_ROUTE_134] = { 9, 10, 3, 1, sMapName_Route134},
[MAPSEC_UNDERWATER_124] = {20, 3, 4, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_126] = {20, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_127] = {23, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_128] = {23, 9, 4, 1, sMapName_Underwater},
[MAPSEC_UNDERWATER_SOOTOPOLIS] = {21, 7, 1, 1, sMapName_Underwater},
[MAPSEC_GRANITE_CAVE] = { 1, 13, 1, 1, sMapName_GraniteCave},
[MAPSEC_MT_CHIMNEY] = { 6, 2, 1, 1, sMapName_MtChimney},
[MAPSEC_SAFARI_ZONE] = {16, 2, 1, 1, sMapName_SafariZone},
[MAPSEC_BATTLE_FRONTIER] = {22, 12, 1, 1, sMapName_BattleFrontier},
[MAPSEC_PETALBURG_WOODS] = { 0, 8, 1, 1, sMapName_PetalburgWoods},
[MAPSEC_RUSTURF_TUNNEL] = { 2, 5, 1, 1, sMapName_RusturfTunnel},
[MAPSEC_ABANDONED_SHIP] = { 6, 14, 1, 1, sMapName_AbandonedShip},
[MAPSEC_NEW_MAUVILLE] = { 8, 7, 1, 1, sMapName_NewMauville},
[MAPSEC_METEOR_FALLS] = { 0, 3, 1, 1, sMapName_MeteorFalls},
[MAPSEC_METEOR_FALLS2] = { 1, 2, 1, 1, sMapName_MeteorFalls},
[MAPSEC_MT_PYRE] = {16, 4, 1, 1, sMapName_MtPyre},
[MAPSEC_AQUA_HIDEOUT_OLD] = {19, 3, 1, 1, sMapName_AquaHideoutOld},
[MAPSEC_SHOAL_CAVE] = {24, 4, 1, 1, sMapName_ShoalCave},
[MAPSEC_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_SeafloorCavern},
[MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_Underwater},
[MAPSEC_VICTORY_ROAD] = {27, 9, 1, 1, sMapName_VictoryRoad},
[MAPSEC_MIRAGE_ISLAND] = {17, 10, 1, 1, sMapName_MirageIsland},
[MAPSEC_CAVE_OF_ORIGIN] = {21, 7, 1, 1, sMapName_CaveOfOrigin},
[MAPSEC_SOUTHERN_ISLAND] = {12, 14, 1, 1, sMapName_SouthernIsland},
[MAPSEC_FIERY_PATH] = { 6, 3, 1, 1, sMapName_FieryPath},
[MAPSEC_FIERY_PATH2] = { 7, 3, 1, 1, sMapName_FieryPath},
[MAPSEC_JAGGED_PASS] = { 6, 3, 1, 1, sMapName_JaggedPass},
[MAPSEC_JAGGED_PASS2] = { 7, 2, 1, 1, sMapName_JaggedPass},
[MAPSEC_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_SealedChamber},
[MAPSEC_UNDERWATER_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_Underwater},
[MAPSEC_SCORCHED_SLAB] = {13, 0, 1, 1, sMapName_ScorchedSlab},
[MAPSEC_ISLAND_CAVE] = { 0, 10, 1, 1, sMapName_IslandCave},
[MAPSEC_DESERT_RUINS] = { 8, 3, 1, 1, sMapName_DesertRuins},
[MAPSEC_ANCIENT_TOMB] = {13, 2, 1, 1, sMapName_AncientTomb},
[MAPSEC_INSIDE_OF_TRUCK] = { 0, 0, 1, 1, sMapName_InsideOfTruck},
[MAPSEC_SKY_PILLAR] = {19, 10, 1, 1, sMapName_SkyPillar},
[MAPSEC_SECRET_BASE] = { 0, 0, 1, 1, sMapName_SecretBase},
[MAPSEC_DYNAMIC] = { 0, 0, 1, 1, sMapName_None},
[MAPSEC_PALLET_TOWN] = { 0, 0, 1, 1, sMapName_PalletTown},
[MAPSEC_VIRIDIAN_CITY] = { 0, 0, 1, 1, sMapName_ViridianCity},
[MAPSEC_PEWTER_CITY] = { 0, 0, 1, 1, sMapName_PewterCity},
[MAPSEC_CERULEAN_CITY] = { 0, 0, 1, 1, sMapName_CeruleanCity},
[MAPSEC_LAVENDER_TOWN] = { 0, 0, 1, 1, sMapName_LavenderTown},
[MAPSEC_VERMILION_CITY] = { 0, 0, 1, 1, sMapName_VermilionCity},
[MAPSEC_CELADON_CITY] = { 0, 0, 1, 1, sMapName_CeladonCity},
[MAPSEC_FUCHSIA_CITY] = { 0, 0, 1, 1, sMapName_FuchsiaCity},
[MAPSEC_CINNABAR_ISLAND] = { 0, 0, 1, 1, sMapName_CinnabarIsland},
[MAPSEC_INDIGO_PLATEAU] = { 0, 0, 1, 1, sMapName_IndigoPlateau},
[MAPSEC_SAFFRON_CITY] = { 0, 0, 1, 1, sMapName_SaffronCity},
[MAPSEC_ROUTE_4_POKECENTER] = { 0, 0, 1, 1, sMapName_Route4},
[MAPSEC_ROUTE_10_POKECENTER] = { 0, 0, 1, 1, sMapName_Route10},
[MAPSEC_ROUTE_1] = { 0, 0, 1, 1, sMapName_Route1},
[MAPSEC_ROUTE_2] = { 0, 0, 1, 1, sMapName_Route2},
[MAPSEC_ROUTE_3] = { 0, 0, 1, 1, sMapName_Route3},
[MAPSEC_ROUTE_4] = { 0, 0, 1, 1, sMapName_Route4_2},
[MAPSEC_ROUTE_5] = { 0, 0, 1, 1, sMapName_Route5},
[MAPSEC_ROUTE_6] = { 0, 0, 1, 1, sMapName_Route6},
[MAPSEC_ROUTE_7] = { 0, 0, 1, 1, sMapName_Route7},
[MAPSEC_ROUTE_8] = { 0, 0, 1, 1, sMapName_Route8},
[MAPSEC_ROUTE_9] = { 0, 0, 1, 1, sMapName_Route9},
[MAPSEC_ROUTE_10] = { 0, 0, 1, 1, sMapName_Route10_2},
[MAPSEC_ROUTE_11] = { 0, 0, 1, 1, sMapName_Route11},
[MAPSEC_ROUTE_12] = { 0, 0, 1, 1, sMapName_Route12},
[MAPSEC_ROUTE_13] = { 0, 0, 1, 1, sMapName_Route13},
[MAPSEC_ROUTE_14] = { 0, 0, 1, 1, sMapName_Route14},
[MAPSEC_ROUTE_15] = { 0, 0, 1, 1, sMapName_Route15},
[MAPSEC_ROUTE_16] = { 0, 0, 1, 1, sMapName_Route16},
[MAPSEC_ROUTE_17] = { 0, 0, 1, 1, sMapName_Route17},
[MAPSEC_ROUTE_18] = { 0, 0, 1, 1, sMapName_Route18},
[MAPSEC_ROUTE_19] = { 0, 0, 1, 1, sMapName_Route19},
[MAPSEC_ROUTE_20] = { 0, 0, 1, 1, sMapName_Route20},
[MAPSEC_ROUTE_21] = { 0, 0, 1, 1, sMapName_Route21},
[MAPSEC_ROUTE_22] = { 0, 0, 1, 1, sMapName_Route22},
[MAPSEC_ROUTE_23] = { 0, 0, 1, 1, sMapName_Route23},
[MAPSEC_ROUTE_24] = { 0, 0, 1, 1, sMapName_Route24},
[MAPSEC_ROUTE_25] = { 0, 0, 1, 1, sMapName_Route25},
[MAPSEC_VIRIDIAN_FOREST] = { 0, 0, 1, 1, sMapName_ViridianForest},
[MAPSEC_MT_MOON] = { 0, 0, 1, 1, sMapName_MtMoon},
[MAPSEC_S_S_ANNE] = { 0, 0, 1, 1, sMapName_SSAnne},
[MAPSEC_UNDERGROUND_PATH] = { 0, 0, 1, 1, sMapName_UndergroundPath},
[MAPSEC_UNDERGROUND_PATH_2] = { 0, 0, 1, 1, sMapName_UndergroundPath2},
[MAPSEC_DIGLETTS_CAVE] = { 0, 0, 1, 1, sMapName_DiglettsCave},
[MAPSEC_KANTO_VICTORY_ROAD] = { 0, 0, 1, 1, sMapName_KantoVictoryRoad},
[MAPSEC_ROCKET_HIDEOUT] = { 0, 0, 1, 1, sMapName_RocketHideout},
[MAPSEC_SILPH_CO] = { 0, 0, 1, 1, sMapName_SilphCo},
[MAPSEC_POKEMON_MANSION] = { 0, 0, 1, 1, sMapName_PokemonMansion},
[MAPSEC_KANTO_SAFARI_ZONE] = { 0, 0, 1, 1, sMapName_KantoSafariZone},
[MAPSEC_POKEMON_LEAGUE] = { 0, 0, 1, 1, sMapName_PokemonLeague},
[MAPSEC_ROCK_TUNNEL] = { 0, 0, 1, 1, sMapName_RockTunnel},
[MAPSEC_SEAFOAM_ISLANDS] = { 0, 0, 1, 1, sMapName_SeafoamIslands},
[MAPSEC_POKEMON_TOWER] = { 0, 0, 1, 1, sMapName_PokemonTower},
[MAPSEC_CERULEAN_CAVE] = { 0, 0, 1, 1, sMapName_CeruleanCave},
[MAPSEC_POWER_PLANT] = { 0, 0, 1, 1, sMapName_PowerPlant},
[MAPSEC_ONE_ISLAND] = { 0, 0, 1, 1, sMapName_OneIsland},
[MAPSEC_TWO_ISLAND] = { 0, 0, 1, 1, sMapName_TwoIsland},
[MAPSEC_THREE_ISLAND] = { 0, 0, 1, 1, sMapName_ThreeIsland},
[MAPSEC_FOUR_ISLAND] = { 0, 0, 1, 1, sMapName_FourIsland},
[MAPSEC_FIVE_ISLAND] = { 0, 0, 1, 1, sMapName_FiveIsland},
[MAPSEC_SEVEN_ISLAND] = { 0, 0, 1, 1, sMapName_SevenIsland},
[MAPSEC_SIX_ISLAND] = { 0, 0, 1, 1, sMapName_SixIsland},
[MAPSEC_KINDLE_ROAD] = { 0, 0, 1, 1, sMapName_KindleRoad},
[MAPSEC_TREASURE_BEACH] = { 0, 0, 1, 1, sMapName_TreasureBeach},
[MAPSEC_CAPE_BRINK] = { 0, 0, 1, 1, sMapName_CapeBrink},
[MAPSEC_BOND_BRIDGE] = { 0, 0, 1, 1, sMapName_BondBridge},
[MAPSEC_THREE_ISLE_PORT] = { 0, 0, 1, 1, sMapName_ThreeIslePort},
[MAPSEC_SEVII_ISLE_6] = { 0, 0, 1, 1, sMapName_SeviiIsle6},
[MAPSEC_SEVII_ISLE_7] = { 0, 0, 1, 1, sMapName_SeviiIsle7},
[MAPSEC_SEVII_ISLE_8] = { 0, 0, 1, 1, sMapName_SeviiIsle8},
[MAPSEC_SEVII_ISLE_9] = { 0, 0, 1, 1, sMapName_SeviiIsle9},
[MAPSEC_RESORT_GORGEOUS] = { 0, 0, 1, 1, sMapName_ResortGorgeous},
[MAPSEC_WATER_LABYRINTH] = { 0, 0, 1, 1, sMapName_WaterLabyrinth},
[MAPSEC_FIVE_ISLE_MEADOW] = { 0, 0, 1, 1, sMapName_FiveIsleMeadow},
[MAPSEC_MEMORIAL_PILLAR] = { 0, 0, 1, 1, sMapName_MemorialPillar},
[MAPSEC_OUTCAST_ISLAND] = { 0, 0, 1, 1, sMapName_OutcastIsland},
[MAPSEC_GREEN_PATH] = { 0, 0, 1, 1, sMapName_GreenPath},
[MAPSEC_WATER_PATH] = { 0, 0, 1, 1, sMapName_WaterPath},
[MAPSEC_RUIN_VALLEY] = { 0, 0, 1, 1, sMapName_RuinValley},
[MAPSEC_TRAINER_TOWER] = { 0, 0, 1, 1, sMapName_TrainerTower},
[MAPSEC_CANYON_ENTRANCE] = { 0, 0, 1, 1, sMapName_CanyonEntrance},
[MAPSEC_SEVAULT_CANYON] = { 0, 0, 1, 1, sMapName_SevaultCanyon},
[MAPSEC_TANOBY_RUINS] = { 0, 0, 1, 1, sMapName_TanobyRuins},
[MAPSEC_SEVII_ISLE_22] = { 0, 0, 1, 1, sMapName_SeviiIsle22},
[MAPSEC_SEVII_ISLE_23] = { 0, 0, 1, 1, sMapName_SeviiIsle23},
[MAPSEC_SEVII_ISLE_24] = { 0, 0, 1, 1, sMapName_SeviiIsle24},
[MAPSEC_NAVEL_ROCK_FRLG] = { 0, 0, 1, 1, sMapName_NavelRock},
[MAPSEC_MT_EMBER] = { 0, 0, 1, 1, sMapName_MtEmber},
[MAPSEC_BERRY_FOREST] = { 0, 0, 1, 1, sMapName_BerryForest},
[MAPSEC_ICEFALL_CAVE] = { 0, 0, 1, 1, sMapName_IcefallCave},
[MAPSEC_ROCKET_WAREHOUSE] = { 0, 0, 1, 1, sMapName_RocketWarehouse},
[MAPSEC_TRAINER_TOWER_2] = { 0, 0, 1, 1, sMapName_TrainerTower2},
[MAPSEC_DOTTED_HOLE] = { 0, 0, 1, 1, sMapName_DottedHole},
[MAPSEC_LOST_CAVE] = { 0, 0, 1, 1, sMapName_LostCave},
[MAPSEC_PATTERN_BUSH] = { 0, 0, 1, 1, sMapName_PatternBush},
[MAPSEC_ALTERING_CAVE_FRLG] = { 0, 0, 1, 1, sMapName_AlteringCave},
[MAPSEC_TANOBY_CHAMBERS] = { 0, 0, 1, 1, sMapName_TanobyChambers},
[MAPSEC_THREE_ISLE_PATH] = { 0, 0, 1, 1, sMapName_ThreeIslePath},
[MAPSEC_TANOBY_KEY] = { 0, 0, 1, 1, sMapName_TanobyKey},
[MAPSEC_BIRTH_ISLAND_FRLG] = { 0, 0, 1, 1, sMapName_BirthIsland},
[MAPSEC_MONEAN_CHAMBER] = { 0, 0, 1, 1, sMapName_MoneanChamber},
[MAPSEC_LIPTOO_CHAMBER] = { 0, 0, 1, 1, sMapName_LiptooChamber},
[MAPSEC_WEEPTH_CHAMBER] = { 0, 0, 1, 1, sMapName_WeepthChamber},
[MAPSEC_DILFORD_CHAMBER] = { 0, 0, 1, 1, sMapName_DilfordChamber},
[MAPSEC_SCUFIB_CHAMBER] = { 0, 0, 1, 1, sMapName_ScufibChamber},
[MAPSEC_RIXY_CHAMBER] = { 0, 0, 1, 1, sMapName_RixyChamber},
[MAPSEC_VIAPOIS_CHAMBER] = { 0, 0, 1, 1, sMapName_ViapoisChamber},
[MAPSEC_EMBER_SPA] = { 0, 0, 1, 1, sMapName_EmberSpa},
[MAPSEC_SPECIAL_AREA] = { 0, 0, 1, 1, sMapName_SpecialArea},
[MAPSEC_AQUA_HIDEOUT] = {19, 3, 1, 1, sMapName_AquaHideout},
[MAPSEC_MAGMA_HIDEOUT] = { 6, 3, 1, 1, sMapName_MagmaHideout},
[MAPSEC_MIRAGE_TOWER] = { 8, 2, 1, 1, sMapName_MirageTower},
[MAPSEC_BIRTH_ISLAND] = { 0, 0, 1, 1, sMapName_BirthIsland},
[MAPSEC_FARAWAY_ISLAND] = { 0, 0, 1, 1, sMapName_FarawayIsland},
[MAPSEC_ARTISAN_CAVE] = {22, 12, 1, 1, sMapName_ArtisanCave},
[MAPSEC_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_MarineCave},
[MAPSEC_UNDERWATER_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_Underwater},
[MAPSEC_TERRA_CAVE] = { 0, 0, 1, 1, sMapName_TerraCave},
[MAPSEC_UNDERWATER_105] = { 0, 10, 1, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_125] = {24, 3, 2, 2, sMapName_Underwater},
[MAPSEC_UNDERWATER_129] = {24, 10, 2, 1, sMapName_Underwater},
[MAPSEC_DESERT_UNDERPASS] = { 2, 0, 1, 1, sMapName_DesertUnderpass},
[MAPSEC_ALTERING_CAVE] = { 6, 8, 1, 1, sMapName_AlteringCave},
[MAPSEC_NAVEL_ROCK] = { 0, 0, 1, 1, sMapName_NavelRock},
[MAPSEC_TRAINER_HILL] = { 8, 4, 1, 1, sMapName_TrainerHill}
};
#endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
src/data/region_map/region_map_layout.h
+17
View File
@@ -0,0 +1,17 @@
static const u8 sRegionMap_MapSectionLayout[MAP_HEIGHT][MAP_WIDTH] = {
{MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_ROUTE_114, MAPSEC_FALLARBOR_TOWN, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_113, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_FORTREE_CITY, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_NONE, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_115, MAPSEC_ROUTE_114, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_MT_CHIMNEY, MAPSEC_MT_CHIMNEY, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SAFARI_ZONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LAVARIDGE_TOWN, MAPSEC_ROUTE_112, MAPSEC_ROUTE_112, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_ROUTE_120, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_ROUTE_121, MAPSEC_LILYCOVE_CITY, MAPSEC_LILYCOVE_CITY, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_115, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_125, MAPSEC_ROUTE_125, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_RUSTBORO_CITY, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_ROUTE_116, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_111, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_119, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_122, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_ROUTE_124, MAPSEC_MOSSDEEP_CITY, MAPSEC_MOSSDEEP_CITY, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_RUSTBORO_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_VERDANTURF_TOWN, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_ROUTE_117, MAPSEC_MAUVILLE_CITY, MAPSEC_MAUVILLE_CITY, MAPSEC_ROUTE_118, MAPSEC_ROUTE_118, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_ROUTE_123, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_SOOTOPOLIS_CITY, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_104, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_103, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_126, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_ROUTE_127, MAPSEC_NONE, MAPSEC_EVER_GRANDE_CITY},
{MAPSEC_ROUTE_104, MAPSEC_PETALBURG_CITY, MAPSEC_ROUTE_102, MAPSEC_ROUTE_102, MAPSEC_OLDALE_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_110, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_ROUTE_128, MAPSEC_EVER_GRANDE_CITY},
{MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_101, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_134, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_133, MAPSEC_ROUTE_132, MAPSEC_ROUTE_132, MAPSEC_PACIFIDLOG_TOWN, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_131, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_130, MAPSEC_ROUTE_129, MAPSEC_ROUTE_129, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_LITTLEROOT_TOWN, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SLATEPORT_CITY, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_105, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_BATTLE_FRONTIER, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_ROUTE_106, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
{MAPSEC_NONE, MAPSEC_NONE, MAPSEC_DEWFORD_TOWN, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_107, MAPSEC_ROUTE_108, MAPSEC_ROUTE_108, MAPSEC_ROUTE_109, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_SOUTHERN_ISLAND, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE, MAPSEC_NONE},
};
src/data/region_map/region_map_sections.json
+1715
View File
File diff suppressed because it is too large Load Diff
src/data/region_map/region_map_sections.json.txt
+24
View File
@@ -0,0 +1,24 @@
{{ doNotModifyHeader }}
#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
## for map_section in map_sections
{% if isEmptyString(getVar(map_section.name)) and not existsIn(map_section, "name_clone") %}{{ setVar(map_section.name, map_section.map_section) }}{% endif %}
## endfor
## for map_section in map_sections
{% if getVar(map_section.name) == map_section.map_section %}
static const u8 sMapName_{{ cleanString(map_section.name) }}[] = _("{{ map_section.name }}");
{% endif %}
{% if existsIn(map_section, "name_clone") %}
static const u8 sMapName_{{ cleanString(map_section.name) }}_Clone[] = _("{{ map_section.name }}");
{% endif %}
## endfor
const struct RegionMapLocation gRegionMapEntries[] = {
## for map_section in map_sections
[{{ map_section.map_section }}] = { {{ map_section.x }}, {{ map_section.y }}, {{ map_section.width }}, {{ map_section.height }}, sMapName_{{ cleanString(map_section.name) }}{% if existsIn(map_section, "name_clone") %}_Clone{% endif %} },
## endfor
};
#endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
src/data/tilesets/graphics.h
+1636
View File
File diff suppressed because it is too large Load Diff
src/data/tilesets/headers.h
+827
View File
@@ -0,0 +1,827 @@
const struct Tileset gTileset_General =
{
.isCompressed = TRUE,
.isSecondary = FALSE,
.tiles = gTilesetTiles_General,
.palettes = gTilesetPalettes_General,
.metatiles = gMetatiles_General,
.metatileAttributes = gMetatileAttributes_General,
.callback = InitTilesetAnim_General,
};
const struct Tileset gTileset_Petalburg =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Petalburg,
.palettes = gTilesetPalettes_Petalburg,
.metatiles = gMetatiles_Petalburg,
.metatileAttributes = gMetatileAttributes_Petalburg,
.callback = InitTilesetAnim_Petalburg,
};
const struct Tileset gTileset_Rustboro =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Rustboro,
.palettes = gTilesetPalettes_Rustboro,
.metatiles = gMetatiles_Rustboro,
.metatileAttributes = gMetatileAttributes_Rustboro,
.callback = InitTilesetAnim_Rustboro,
};
const struct Tileset gTileset_Dewford =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Dewford,
.palettes = gTilesetPalettes_Dewford,
.metatiles = gMetatiles_Dewford,
.metatileAttributes = gMetatileAttributes_Dewford,
.callback = InitTilesetAnim_Dewford,
};
const struct Tileset gTileset_Slateport =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Slateport,
.palettes = gTilesetPalettes_Slateport,
.metatiles = gMetatiles_Slateport,
.metatileAttributes = gMetatileAttributes_Slateport,
.callback = InitTilesetAnim_Slateport,
};
const struct Tileset gTileset_Mauville =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Mauville,
.palettes = gTilesetPalettes_Mauville,
.metatiles = gMetatiles_Mauville,
.metatileAttributes = gMetatileAttributes_Mauville,
.callback = InitTilesetAnim_Mauville,
};
const struct Tileset gTileset_Lavaridge =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Lavaridge,
.palettes = gTilesetPalettes_Lavaridge,
.metatiles = gMetatiles_Lavaridge,
.metatileAttributes = gMetatileAttributes_Lavaridge,
.callback = InitTilesetAnim_Lavaridge,
};
const struct Tileset gTileset_Fallarbor =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Fallarbor,
.palettes = gTilesetPalettes_Fallarbor,
.metatiles = gMetatiles_Fallarbor,
.metatileAttributes = gMetatileAttributes_Fallarbor,
.callback = InitTilesetAnim_Fallarbor,
};
const struct Tileset gTileset_Fortree =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Fortree,
.palettes = gTilesetPalettes_Fortree,
.metatiles = gMetatiles_Fortree,
.metatileAttributes = gMetatileAttributes_Fortree,
.callback = InitTilesetAnim_Fortree,
};
const struct Tileset gTileset_Lilycove =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Lilycove,
.palettes = gTilesetPalettes_Lilycove,
.metatiles = gMetatiles_Lilycove,
.metatileAttributes = gMetatileAttributes_Lilycove,
.callback = InitTilesetAnim_Lilycove,
};
const struct Tileset gTileset_Mossdeep =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Mossdeep,
.palettes = gTilesetPalettes_Mossdeep,
.metatiles = gMetatiles_Mossdeep,
.metatileAttributes = gMetatileAttributes_Mossdeep,
.callback = InitTilesetAnim_Mossdeep,
};
const struct Tileset gTileset_EverGrande =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_EverGrande,
.palettes = gTilesetPalettes_EverGrande,
.metatiles = gMetatiles_EverGrande,
.metatileAttributes = gMetatileAttributes_EverGrande,
.callback = InitTilesetAnim_EverGrande,
};
const struct Tileset gTileset_Pacifidlog =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Pacifidlog,
.palettes = gTilesetPalettes_Pacifidlog,
.metatiles = gMetatiles_Pacifidlog,
.metatileAttributes = gMetatileAttributes_Pacifidlog,
.callback = InitTilesetAnim_Pacifidlog,
};
const struct Tileset gTileset_Sootopolis =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Sootopolis,
.palettes = gTilesetPalettes_Sootopolis,
.metatiles = gMetatiles_Sootopolis,
.metatileAttributes = gMetatileAttributes_Sootopolis,
.callback = InitTilesetAnim_Sootopolis,
};
const struct Tileset gTileset_BattleFrontierOutsideWest =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleFrontierOutsideWest,
.palettes = gTilesetPalettes_BattleFrontierOutsideWest,
.metatiles = gMetatiles_BattleFrontierOutsideWest,
.metatileAttributes = gMetatileAttributes_BattleFrontierOutsideWest,
.callback = InitTilesetAnim_BattleFrontierOutsideWest,
};
const struct Tileset gTileset_BattleFrontierOutsideEast =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleFrontierOutsideEast,
.palettes = gTilesetPalettes_BattleFrontierOutsideEast,
.metatiles = gMetatiles_BattleFrontierOutsideEast,
.metatileAttributes = gMetatileAttributes_BattleFrontierOutsideEast,
.callback = InitTilesetAnim_BattleFrontierOutsideEast,
};
const struct Tileset gTileset_Building =
{
.isCompressed = TRUE,
.isSecondary = FALSE,
.tiles = gTilesetTiles_InsideBuilding,
.palettes = gTilesetPalettes_InsideBuilding,
.metatiles = gMetatiles_InsideBuilding,
.metatileAttributes = gMetatileAttributes_InsideBuilding,
.callback = InitTilesetAnim_Building,
};
const struct Tileset gTileset_Shop =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Shop,
.palettes = gTilesetPalettes_Shop,
.metatiles = gMetatiles_Shop,
.metatileAttributes = gMetatileAttributes_Shop,
.callback = NULL,
};
const struct Tileset gTileset_PokemonCenter =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonCenter,
.palettes = gTilesetPalettes_PokemonCenter,
.metatiles = gMetatiles_PokemonCenter,
.metatileAttributes = gMetatileAttributes_PokemonCenter,
.callback = NULL,
};
const struct Tileset gTileset_Cave =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Cave,
.palettes = gTilesetPalettes_Cave,
.metatiles = gMetatiles_Cave,
.metatileAttributes = gMetatileAttributes_Cave,
.callback = InitTilesetAnim_Cave,
};
const struct Tileset gTileset_PokemonSchool =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonSchool,
.palettes = gTilesetPalettes_PokemonSchool,
.metatiles = gMetatiles_PokemonSchool,
.metatileAttributes = gMetatileAttributes_PokemonSchool,
.callback = NULL,
};
const struct Tileset gTileset_PokemonFanClub =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonFanClub,
.palettes = gTilesetPalettes_PokemonFanClub,
.metatiles = gMetatiles_PokemonFanClub,
.metatileAttributes = gMetatileAttributes_PokemonFanClub,
.callback = NULL,
};
const struct Tileset gTileset_Unused1 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Unused1,
.palettes = gTilesetPalettes_Unused1,
.metatiles = gMetatiles_Unused1,
.metatileAttributes = gMetatileAttributes_Unused1,
.callback = NULL,
};
const struct Tileset gTileset_MeteorFalls =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MeteorFalls,
.palettes = gTilesetPalettes_MeteorFalls,
.metatiles = gMetatiles_MeteorFalls,
.metatileAttributes = gMetatileAttributes_MeteorFalls,
.callback = NULL,
};
const struct Tileset gTileset_OceanicMuseum =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_OceanicMuseum,
.palettes = gTilesetPalettes_OceanicMuseum,
.metatiles = gMetatiles_OceanicMuseum,
.metatileAttributes = gMetatileAttributes_OceanicMuseum,
.callback = NULL,
};
const struct Tileset gTileset_CableClub =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_CableClub,
.palettes = gTilesetPalettes_CableClub,
.metatiles = gMetatiles_CableClub,
.metatileAttributes = gMetatileAttributes_CableClub,
.callback = NULL,
};
const struct Tileset gTileset_SeashoreHouse =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SeashoreHouse,
.palettes = gTilesetPalettes_SeashoreHouse,
.metatiles = gMetatiles_SeashoreHouse,
.metatileAttributes = gMetatileAttributes_SeashoreHouse,
.callback = NULL,
};
const struct Tileset gTileset_PrettyPetalFlowerShop =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PrettyPetalFlowerShop,
.palettes = gTilesetPalettes_PrettyPetalFlowerShop,
.metatiles = gMetatiles_PrettyPetalFlowerShop,
.metatileAttributes = gMetatileAttributes_PrettyPetalFlowerShop,
.callback = NULL,
};
const struct Tileset gTileset_PokemonDayCare =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PokemonDayCare,
.palettes = gTilesetPalettes_PokemonDayCare,
.metatiles = gMetatiles_PokemonDayCare,
.metatileAttributes = gMetatileAttributes_PokemonDayCare,
.callback = NULL,
};
const struct Tileset gTileset_Facility =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Facility,
.palettes = gTilesetPalettes_Facility,
.metatiles = gMetatiles_Facility,
.metatileAttributes = gMetatileAttributes_Facility,
.callback = NULL,
};
const struct Tileset gTileset_BikeShop =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BikeShop,
.palettes = gTilesetPalettes_BikeShop,
.metatiles = gMetatiles_BikeShop,
.metatileAttributes = gMetatileAttributes_BikeShop,
.callback = InitTilesetAnim_BikeShop,
};
const struct Tileset gTileset_RusturfTunnel =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_RusturfTunnel,
.palettes = gTilesetPalettes_RusturfTunnel,
.metatiles = gMetatiles_RusturfTunnel,
.metatileAttributes = gMetatileAttributes_RusturfTunnel,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseBrownCave =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseBrownCave,
.palettes = gTilesetPalettes_SecretBaseBrownCave,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseTree =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseTree,
.palettes = gTilesetPalettes_SecretBaseTree,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseShrub =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseShrub,
.palettes = gTilesetPalettes_SecretBaseShrub,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseBlueCave =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseBlueCave,
.palettes = gTilesetPalettes_SecretBaseBlueCave,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseYellowCave =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseYellowCave,
.palettes = gTilesetPalettes_SecretBaseYellowCave,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_SecretBaseRedCave =
{
.isCompressed = FALSE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SecretBaseRedCave,
.palettes = gTilesetPalettes_SecretBaseRedCave,
.metatiles = gMetatiles_SecretBaseSecondary,
.metatileAttributes = gMetatileAttributes_SecretBaseSecondary,
.callback = NULL,
};
const struct Tileset gTileset_InsideOfTruck =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_InsideOfTruck,
.palettes = gTilesetPalettes_InsideOfTruck,
.metatiles = gMetatiles_InsideOfTruck,
.metatileAttributes = gMetatileAttributes_InsideOfTruck,
.callback = NULL,
};
const struct Tileset gTileset_Unused2 =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Unused2,
.palettes = gTilesetPalettes_Unused2,
.metatiles = gMetatiles_Unused2,
.metatileAttributes = gMetatileAttributes_Unused2,
.callback = NULL,
};
const struct Tileset gTileset_Contest =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Contest,
.palettes = gTilesetPalettes_Contest,
.metatiles = gMetatiles_Contest,
.metatileAttributes = gMetatileAttributes_Contest,
.callback = NULL,
};
const struct Tileset gTileset_LilycoveMuseum =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_LilycoveMuseum,
.palettes = gTilesetPalettes_LilycoveMuseum,
.metatiles = gMetatiles_LilycoveMuseum,
.metatileAttributes = gMetatileAttributes_LilycoveMuseum,
.callback = NULL,
};
const struct Tileset gTileset_BrendansMaysHouse =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BrendansMaysHouse,
.palettes = gTilesetPalettes_BrendansMaysHouse,
.metatiles = gMetatiles_BrendansMaysHouse,
.metatileAttributes = gMetatileAttributes_BrendansMaysHouse,
.callback = NULL,
};
const struct Tileset gTileset_Lab =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Lab,
.palettes = gTilesetPalettes_Lab,
.metatiles = gMetatiles_Lab,
.metatileAttributes = gMetatileAttributes_Lab,
.callback = NULL,
};
const struct Tileset gTileset_Underwater =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_Underwater,
.palettes = gTilesetPalettes_Underwater,
.metatiles = gMetatiles_Underwater,
.metatileAttributes = gMetatileAttributes_Underwater,
.callback = InitTilesetAnim_Underwater,
};
const struct Tileset gTileset_PetalburgGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_PetalburgGym,
.palettes = gTilesetPalettes_PetalburgGym,
.metatiles = gMetatiles_PetalburgGym,
.metatileAttributes = gMetatileAttributes_PetalburgGym,
.callback = NULL,
};
const struct Tileset gTileset_SootopolisGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_SootopolisGym,
.palettes = gTilesetPalettes_SootopolisGym,
.metatiles = gMetatiles_SootopolisGym,
.metatileAttributes = gMetatileAttributes_SootopolisGym,
.callback = InitTilesetAnim_SootopolisGym,
};
const struct Tileset gTileset_GenericBuilding =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_GenericBuilding,
.palettes = gTilesetPalettes_GenericBuilding,
.metatiles = gMetatiles_GenericBuilding,
.metatileAttributes = gMetatileAttributes_GenericBuilding,
.callback = NULL,
};
const struct Tileset gTileset_MauvilleGameCorner =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MauvilleGameCorner,
.palettes = gTilesetPalettes_MauvilleGameCorner,
.metatiles = gMetatiles_MauvilleGameCorner,
.metatileAttributes = gMetatileAttributes_MauvilleGameCorner,
.callback = NULL,
};
const struct Tileset gTileset_RustboroGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_RustboroGym,
.palettes = gTilesetPalettes_RustboroGym,
.metatiles = gMetatiles_RustboroGym,
.metatileAttributes = gMetatileAttributes_RustboroGym,
.callback = NULL,
};
const struct Tileset gTileset_DewfordGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_DewfordGym,
.palettes = gTilesetPalettes_DewfordGym,
.metatiles = gMetatiles_DewfordGym,
.metatileAttributes = gMetatileAttributes_DewfordGym,
.callback = NULL,
};
const struct Tileset gTileset_MauvilleGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MauvilleGym,
.palettes = gTilesetPalettes_MauvilleGym,
.metatiles = gMetatiles_MauvilleGym,
.metatileAttributes = gMetatileAttributes_MauvilleGym,
.callback = InitTilesetAnim_MauvilleGym,
};
const struct Tileset gTileset_LavaridgeGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_LavaridgeGym,
.palettes = gTilesetPalettes_LavaridgeGym,
.metatiles = gMetatiles_LavaridgeGym,
.metatileAttributes = gMetatileAttributes_LavaridgeGym,
.callback = NULL,
};
const struct Tileset gTileset_TrickHousePuzzle =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_TrickHousePuzzle,
.palettes = gTilesetPalettes_TrickHousePuzzle,
.metatiles = gMetatiles_TrickHousePuzzle,
.metatileAttributes = gMetatileAttributes_TrickHousePuzzle,
.callback = NULL,
};
const struct Tileset gTileset_FortreeGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_FortreeGym,
.palettes = gTilesetPalettes_FortreeGym,
.metatiles = gMetatiles_FortreeGym,
.metatileAttributes = gMetatileAttributes_FortreeGym,
.callback = NULL,
};
const struct Tileset gTileset_MossdeepGym =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MossdeepGym,
.palettes = gTilesetPalettes_MossdeepGym,
.metatiles = gMetatiles_MossdeepGym,
.metatileAttributes = gMetatileAttributes_MossdeepGym,
.callback = NULL,
};
const struct Tileset gTileset_InsideShip =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_InsideShip,
.palettes = gTilesetPalettes_InsideShip,
.metatiles = gMetatiles_InsideShip,
.metatileAttributes = gMetatileAttributes_InsideShip,
.callback = NULL,
};
const struct Tileset gTileset_SecretBase =
{
.isCompressed = FALSE,
.isSecondary = FALSE,
.tiles = gTilesetTiles_SecretBase,
.palettes = gTilesetPalettes_SecretBase,
.metatiles = gMetatiles_SecretBasePrimary,
.metatileAttributes = gMetatileAttributes_SecretBasePrimary,
.callback = NULL,
};
const struct Tileset * const gTilesetPointer_SecretBase = &gTileset_SecretBase;
const struct Tileset * const gTilesetPointer_SecretBaseRedCave = &gTileset_SecretBaseRedCave;
const struct Tileset gTileset_EliteFour =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_EliteFour,
.palettes = gTilesetPalettes_EliteFour,
.metatiles = gMetatiles_EliteFour,
.metatileAttributes = gMetatileAttributes_EliteFour,
.callback = InitTilesetAnim_EliteFour,
};
const struct Tileset gTileset_BattleFrontier =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleFrontier,
.palettes = gTilesetPalettes_BattleFrontier,
.metatiles = gMetatiles_BattleFrontier,
.metatileAttributes = gMetatileAttributes_BattleFrontier,
.callback = NULL,
};
const struct Tileset gTileset_BattlePalace =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattlePalace,
.palettes = gTilesetPalettes_BattlePalace,
.metatiles = gMetatiles_BattlePalace,
.metatileAttributes = gMetatileAttributes_BattlePalace,
.callback = NULL,
};
const struct Tileset gTileset_BattleDome =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleDome,
.palettes = gTilesetPalettes_BattleDome,
.metatiles = gMetatiles_BattleDome,
.metatileAttributes = gMetatileAttributes_BattleDome,
.callback = InitTilesetAnim_BattleDome,
};
const struct Tileset gTileset_BattleFactory =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleFactory,
.palettes = gTilesetPalettes_BattleFactory,
.metatiles = gMetatiles_BattleFactory,
.metatileAttributes = gMetatileAttributes_BattleFactory,
.callback = NULL,
};
const struct Tileset gTileset_BattlePike =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattlePike,
.palettes = gTilesetPalettes_BattlePike,
.metatiles = gMetatiles_BattlePike,
.metatileAttributes = gMetatileAttributes_BattlePike,
.callback = NULL,
};
const struct Tileset gTileset_BattleArena =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleArena,
.palettes = gTilesetPalettes_BattleArena,
.metatiles = gMetatiles_BattleArena,
.metatileAttributes = gMetatileAttributes_BattleArena,
.callback = NULL,
};
const struct Tileset gTileset_BattlePyramid =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattlePyramid,
.palettes = gTilesetPalettes_BattlePyramid,
.metatiles = gMetatiles_BattlePyramid,
.metatileAttributes = gMetatileAttributes_BattlePyramid,
.callback = InitTilesetAnim_BattlePyramid,
};
const struct Tileset gTileset_MirageTower =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MirageTower,
.palettes = gTilesetPalettes_MirageTower,
.metatiles = gMetatiles_MirageTower,
.metatileAttributes = gMetatileAttributes_MirageTower,
.callback = NULL,
};
const struct Tileset gTileset_MossdeepGameCorner =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MossdeepGameCorner,
.palettes = gTilesetPalettes_MossdeepGameCorner,
.metatiles = gMetatiles_MossdeepGameCorner,
.metatileAttributes = gMetatileAttributes_MossdeepGameCorner,
.callback = NULL,
};
const struct Tileset gTileset_IslandHarbor =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_IslandHarbor,
.palettes = gTilesetPalettes_IslandHarbor,
.metatiles = gMetatiles_IslandHarbor,
.metatileAttributes = gMetatileAttributes_IslandHarbor,
.callback = NULL,
};
const struct Tileset gTileset_TrainerHill =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_TrainerHill,
.palettes = gTilesetPalettes_TrainerHill,
.metatiles = gMetatiles_TrainerHill,
.metatileAttributes = gMetatileAttributes_TrainerHill,
.callback = NULL,
};
const struct Tileset gTileset_NavelRock =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_NavelRock,
.palettes = gTilesetPalettes_NavelRock,
.metatiles = gMetatiles_NavelRock,
.metatileAttributes = gMetatileAttributes_NavelRock,
.callback = NULL,
};
const struct Tileset gTileset_BattleFrontierRankingHall =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleFrontierRankingHall,
.palettes = gTilesetPalettes_BattleFrontierRankingHall,
.metatiles = gMetatiles_BattleFrontierRankingHall,
.metatileAttributes = gMetatileAttributes_BattleFrontierRankingHall,
.callback = NULL,
};
const struct Tileset gTileset_BattleTent =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_BattleTent,
.palettes = gTilesetPalettes_BattleTent,
.metatiles = gMetatiles_BattleTent,
.metatileAttributes = gMetatileAttributes_BattleTent,
.callback = NULL,
};
const struct Tileset gTileset_MysteryEventsHouse =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_MysteryEventsHouse,
.palettes = gTilesetPalettes_MysteryEventsHouse,
.metatiles = gMetatiles_MysteryEventsHouse,
.metatileAttributes = gMetatileAttributes_MysteryEventsHouse,
.callback = NULL,
};
const struct Tileset gTileset_UnionRoom =
{
.isCompressed = TRUE,
.isSecondary = TRUE,
.tiles = gTilesetTiles_UnionRoom,
.palettes = gTilesetPalettes_UnionRoom,
.metatiles = gMetatiles_UnionRoom,
.metatileAttributes = gMetatileAttributes_UnionRoom,
.callback = NULL,
};
src/data/tilesets/metatiles.h
+209
View File
@@ -0,0 +1,209 @@
const u16 gMetatiles_General[] = INCBIN_U16("data/tilesets/primary/general/metatiles.bin");
const u16 gMetatileAttributes_General[] = INCBIN_U16("data/tilesets/primary/general/metatile_attributes.bin");
const u16 gMetatiles_Petalburg[] = INCBIN_U16("data/tilesets/secondary/petalburg/metatiles.bin");
const u16 gMetatileAttributes_Petalburg[] = INCBIN_U16("data/tilesets/secondary/petalburg/metatile_attributes.bin");
const u16 gMetatiles_Rustboro[] = INCBIN_U16("data/tilesets/secondary/rustboro/metatiles.bin");
const u16 gMetatileAttributes_Rustboro[] = INCBIN_U16("data/tilesets/secondary/rustboro/metatile_attributes.bin");
const u16 gMetatiles_Dewford[] = INCBIN_U16("data/tilesets/secondary/dewford/metatiles.bin");
const u16 gMetatileAttributes_Dewford[] = INCBIN_U16("data/tilesets/secondary/dewford/metatile_attributes.bin");
const u16 gMetatiles_Slateport[] = INCBIN_U16("data/tilesets/secondary/slateport/metatiles.bin");
const u16 gMetatileAttributes_Slateport[] = INCBIN_U16("data/tilesets/secondary/slateport/metatile_attributes.bin");
const u16 gMetatiles_Mauville[] = INCBIN_U16("data/tilesets/secondary/mauville/metatiles.bin");
const u16 gMetatileAttributes_Mauville[] = INCBIN_U16("data/tilesets/secondary/mauville/metatile_attributes.bin");
const u16 gMetatiles_Lavaridge[] = INCBIN_U16("data/tilesets/secondary/lavaridge/metatiles.bin");
const u16 gMetatileAttributes_Lavaridge[] = INCBIN_U16("data/tilesets/secondary/lavaridge/metatile_attributes.bin");
const u16 gMetatiles_Fallarbor[] = INCBIN_U16("data/tilesets/secondary/fallarbor/metatiles.bin");
const u16 gMetatileAttributes_Fallarbor[] = INCBIN_U16("data/tilesets/secondary/fallarbor/metatile_attributes.bin");
const u16 gMetatiles_Fortree[] = INCBIN_U16("data/tilesets/secondary/fortree/metatiles.bin");
const u16 gMetatileAttributes_Fortree[] = INCBIN_U16("data/tilesets/secondary/fortree/metatile_attributes.bin");
const u16 gMetatiles_Lilycove[] = INCBIN_U16("data/tilesets/secondary/lilycove/metatiles.bin");
const u16 gMetatileAttributes_Lilycove[] = INCBIN_U16("data/tilesets/secondary/lilycove/metatile_attributes.bin");
const u16 gMetatiles_Mossdeep[] = INCBIN_U16("data/tilesets/secondary/mossdeep/metatiles.bin");
const u16 gMetatileAttributes_Mossdeep[] = INCBIN_U16("data/tilesets/secondary/mossdeep/metatile_attributes.bin");
const u16 gMetatiles_EverGrande[] = INCBIN_U16("data/tilesets/secondary/ever_grande/metatiles.bin");
const u16 gMetatileAttributes_EverGrande[] = INCBIN_U16("data/tilesets/secondary/ever_grande/metatile_attributes.bin");
const u16 gMetatiles_Pacifidlog[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/metatiles.bin");
const u16 gMetatileAttributes_Pacifidlog[] = INCBIN_U16("data/tilesets/secondary/pacifidlog/metatile_attributes.bin");
const u16 gMetatiles_Sootopolis[] = INCBIN_U16("data/tilesets/secondary/sootopolis/metatiles.bin");
const u16 gMetatileAttributes_Sootopolis[] = INCBIN_U16("data/tilesets/secondary/sootopolis/metatile_attributes.bin");
const u16 gMetatiles_BattleFrontierOutsideWest[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/metatiles.bin");
const u16 gMetatileAttributes_BattleFrontierOutsideWest[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_west/metatile_attributes.bin");
const u16 gMetatiles_BattleFrontierOutsideEast[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/metatiles.bin");
const u16 gMetatileAttributes_BattleFrontierOutsideEast[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_outside_east/metatile_attributes.bin");
const u16 gMetatiles_InsideBuilding[] = INCBIN_U16("data/tilesets/primary/building/metatiles.bin");
const u16 gMetatileAttributes_InsideBuilding[] = INCBIN_U16("data/tilesets/primary/building/metatile_attributes.bin");
const u16 gMetatiles_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/metatiles.bin");
const u16 gMetatileAttributes_Shop[] = INCBIN_U16("data/tilesets/secondary/shop/metatile_attributes.bin");
const u16 gMetatiles_PokemonCenter[] = INCBIN_U16("data/tilesets/secondary/pokemon_center/metatiles.bin");
const u16 gMetatileAttributes_PokemonCenter[] = INCBIN_U16("data/tilesets/secondary/pokemon_center/metatile_attributes.bin");
const u16 gMetatiles_Cave[] = INCBIN_U16("data/tilesets/secondary/cave/metatiles.bin");
const u16 gMetatileAttributes_Cave[] = INCBIN_U16("data/tilesets/secondary/cave/metatile_attributes.bin");
const u16 gMetatiles_PokemonSchool[] = INCBIN_U16("data/tilesets/secondary/pokemon_school/metatiles.bin");
const u16 gMetatileAttributes_PokemonSchool[] = INCBIN_U16("data/tilesets/secondary/pokemon_school/metatile_attributes.bin");
const u16 gMetatiles_PokemonFanClub[] = INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/metatiles.bin");
const u16 gMetatileAttributes_PokemonFanClub[] = INCBIN_U16("data/tilesets/secondary/pokemon_fan_club/metatile_attributes.bin");
const u16 gMetatiles_Unused1[] = INCBIN_U16("data/tilesets/secondary/unused_1/metatiles.bin");
const u16 gMetatileAttributes_Unused1[] = INCBIN_U16("data/tilesets/secondary/unused_1/metatile_attributes.bin");
const u16 gMetatiles_MeteorFalls[] = INCBIN_U16("data/tilesets/secondary/meteor_falls/metatiles.bin");
const u16 gMetatileAttributes_MeteorFalls[] = INCBIN_U16("data/tilesets/secondary/meteor_falls/metatile_attributes.bin");
const u16 gMetatiles_OceanicMuseum[] = INCBIN_U16("data/tilesets/secondary/oceanic_museum/metatiles.bin");
const u16 gMetatileAttributes_OceanicMuseum[] = INCBIN_U16("data/tilesets/secondary/oceanic_museum/metatile_attributes.bin");
const u16 gMetatiles_CableClub[] = INCBIN_U16("data/tilesets/secondary/cable_club/metatiles.bin");
const u16 gMetatileAttributes_CableClub[] = INCBIN_U16("data/tilesets/secondary/cable_club/metatile_attributes.bin");
const u16 gMetatiles_SeashoreHouse[] = INCBIN_U16("data/tilesets/secondary/seashore_house/metatiles.bin");
const u16 gMetatileAttributes_SeashoreHouse[] = INCBIN_U16("data/tilesets/secondary/seashore_house/metatile_attributes.bin");
const u16 gMetatiles_PrettyPetalFlowerShop[] = INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/metatiles.bin");
const u16 gMetatileAttributes_PrettyPetalFlowerShop[] = INCBIN_U16("data/tilesets/secondary/pretty_petal_flower_shop/metatile_attributes.bin");
const u16 gMetatiles_PokemonDayCare[] = INCBIN_U16("data/tilesets/secondary/pokemon_day_care/metatiles.bin");
const u16 gMetatileAttributes_PokemonDayCare[] = INCBIN_U16("data/tilesets/secondary/pokemon_day_care/metatile_attributes.bin");
const u16 gMetatiles_Facility[] = INCBIN_U16("data/tilesets/secondary/facility/metatiles.bin");
const u16 gMetatileAttributes_Facility[] = INCBIN_U16("data/tilesets/secondary/facility/metatile_attributes.bin");
const u16 gMetatiles_BikeShop[] = INCBIN_U16("data/tilesets/secondary/bike_shop/metatiles.bin");
const u16 gMetatileAttributes_BikeShop[] = INCBIN_U16("data/tilesets/secondary/bike_shop/metatile_attributes.bin");
const u16 gMetatiles_RusturfTunnel[] = INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/metatiles.bin");
const u16 gMetatileAttributes_RusturfTunnel[] = INCBIN_U16("data/tilesets/secondary/rusturf_tunnel/metatile_attributes.bin");
const u16 gMetatiles_SecretBaseSecondary[] = INCBIN_U16("data/tilesets/secondary/secret_base/metatiles.bin");
const u16 gMetatileAttributes_SecretBaseSecondary[] = INCBIN_U16("data/tilesets/secondary/secret_base/metatile_attributes.bin");
const u16 gMetatiles_InsideOfTruck[] = INCBIN_U16("data/tilesets/secondary/inside_of_truck/metatiles.bin");
const u16 gMetatileAttributes_InsideOfTruck[] = INCBIN_U16("data/tilesets/secondary/inside_of_truck/metatile_attributes.bin");
const u16 gMetatiles_Contest[] = INCBIN_U16("data/tilesets/secondary/contest/metatiles.bin");
const u16 gMetatileAttributes_Contest[] = INCBIN_U16("data/tilesets/secondary/contest/metatile_attributes.bin");
const u16 gMetatiles_LilycoveMuseum[] = INCBIN_U16("data/tilesets/secondary/lilycove_museum/metatiles.bin");
const u16 gMetatileAttributes_LilycoveMuseum[] = INCBIN_U16("data/tilesets/secondary/lilycove_museum/metatile_attributes.bin");
const u16 gMetatiles_BrendansMaysHouse[] = INCBIN_U16("data/tilesets/secondary/brendans_mays_house/metatiles.bin");
const u16 gMetatileAttributes_BrendansMaysHouse[] = INCBIN_U16("data/tilesets/secondary/brendans_mays_house/metatile_attributes.bin");
const u16 gMetatiles_Lab[] = INCBIN_U16("data/tilesets/secondary/lab/metatiles.bin");
const u16 gMetatileAttributes_Lab[] = INCBIN_U16("data/tilesets/secondary/lab/metatile_attributes.bin");
const u16 gMetatiles_Underwater[] = INCBIN_U16("data/tilesets/secondary/underwater/metatiles.bin");
const u16 gMetatileAttributes_Underwater[] = INCBIN_U16("data/tilesets/secondary/underwater/metatile_attributes.bin");
const u16 gMetatiles_GenericBuilding[] = INCBIN_U16("data/tilesets/secondary/generic_building/metatiles.bin");
const u16 gMetatileAttributes_GenericBuilding[] = INCBIN_U16("data/tilesets/secondary/generic_building/metatile_attributes.bin");
const u16 gMetatiles_MauvilleGameCorner[] = INCBIN_U16("data/tilesets/secondary/mauville_game_corner/metatiles.bin");
const u16 gMetatileAttributes_MauvilleGameCorner[] = INCBIN_U16("data/tilesets/secondary/mauville_game_corner/metatile_attributes.bin");
const u16 gMetatiles_Unused2[] = INCBIN_U16("data/tilesets/secondary/unused_2/metatiles.bin");
const u16 gMetatileAttributes_Unused2[] = INCBIN_U16("data/tilesets/secondary/unused_2/metatile_attributes.bin");
const u16 gMetatiles_RustboroGym[] = INCBIN_U16("data/tilesets/secondary/rustboro_gym/metatiles.bin");
const u16 gMetatileAttributes_RustboroGym[] = INCBIN_U16("data/tilesets/secondary/rustboro_gym/metatile_attributes.bin");
const u16 gMetatiles_DewfordGym[] = INCBIN_U16("data/tilesets/secondary/dewford_gym/metatiles.bin");
const u16 gMetatileAttributes_DewfordGym[] = INCBIN_U16("data/tilesets/secondary/dewford_gym/metatile_attributes.bin");
const u16 gMetatiles_MauvilleGym[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/metatiles.bin");
const u16 gMetatileAttributes_MauvilleGym[] = INCBIN_U16("data/tilesets/secondary/mauville_gym/metatile_attributes.bin");
const u16 gMetatiles_LavaridgeGym[] = INCBIN_U16("data/tilesets/secondary/lavaridge_gym/metatiles.bin");
const u16 gMetatileAttributes_LavaridgeGym[] = INCBIN_U16("data/tilesets/secondary/lavaridge_gym/metatile_attributes.bin");
const u16 gMetatiles_PetalburgGym[] = INCBIN_U16("data/tilesets/secondary/petalburg_gym/metatiles.bin");
const u16 gMetatileAttributes_PetalburgGym[] = INCBIN_U16("data/tilesets/secondary/petalburg_gym/metatile_attributes.bin");
const u16 gMetatiles_FortreeGym[] = INCBIN_U16("data/tilesets/secondary/fortree_gym/metatiles.bin");
const u16 gMetatileAttributes_FortreeGym[] = INCBIN_U16("data/tilesets/secondary/fortree_gym/metatile_attributes.bin");
const u16 gMetatiles_MossdeepGym[] = INCBIN_U16("data/tilesets/secondary/mossdeep_gym/metatiles.bin");
const u16 gMetatileAttributes_MossdeepGym[] = INCBIN_U16("data/tilesets/secondary/mossdeep_gym/metatile_attributes.bin");
const u16 gMetatiles_SootopolisGym[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/metatiles.bin");
const u16 gMetatileAttributes_SootopolisGym[] = INCBIN_U16("data/tilesets/secondary/sootopolis_gym/metatile_attributes.bin");
const u16 gMetatiles_TrickHousePuzzle[] = INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/metatiles.bin");
const u16 gMetatileAttributes_TrickHousePuzzle[] = INCBIN_U16("data/tilesets/secondary/trick_house_puzzle/metatile_attributes.bin");
const u16 gMetatiles_InsideShip[] = INCBIN_U16("data/tilesets/secondary/inside_ship/metatiles.bin");
const u16 gMetatileAttributes_InsideShip[] = INCBIN_U16("data/tilesets/secondary/inside_ship/metatile_attributes.bin");
const u16 gMetatiles_SecretBasePrimary[] = INCBIN_U16("data/tilesets/primary/secret_base/metatiles.bin");
const u16 gMetatileAttributes_SecretBasePrimary[] = INCBIN_U16("data/tilesets/primary/secret_base/metatile_attributes.bin");
const u16 gMetatiles_EliteFour[] = INCBIN_U16("data/tilesets/secondary/elite_four/metatiles.bin");
const u16 gMetatileAttributes_EliteFour[] = INCBIN_U16("data/tilesets/secondary/elite_four/metatile_attributes.bin");
const u16 gMetatiles_BattleFrontier[] = INCBIN_U16("data/tilesets/secondary/battle_frontier/metatiles.bin");
const u16 gMetatileAttributes_BattleFrontier[] = INCBIN_U16("data/tilesets/secondary/battle_frontier/metatile_attributes.bin");
const u16 gMetatiles_BattlePalace[] = INCBIN_U16("data/tilesets/secondary/battle_palace/metatiles.bin");
const u16 gMetatileAttributes_BattlePalace[] = INCBIN_U16("data/tilesets/secondary/battle_palace/metatile_attributes.bin");
const u16 gMetatiles_BattleDome[] = INCBIN_U16("data/tilesets/secondary/battle_dome/metatiles.bin");
const u16 gMetatileAttributes_BattleDome[] = INCBIN_U16("data/tilesets/secondary/battle_dome/metatile_attributes.bin");
const u16 gMetatiles_BattleFactory[] = INCBIN_U16("data/tilesets/secondary/battle_factory/metatiles.bin");
const u16 gMetatileAttributes_BattleFactory[] = INCBIN_U16("data/tilesets/secondary/battle_factory/metatile_attributes.bin");
const u16 gMetatiles_BattlePike[] = INCBIN_U16("data/tilesets/secondary/battle_pike/metatiles.bin");
const u16 gMetatileAttributes_BattlePike[] = INCBIN_U16("data/tilesets/secondary/battle_pike/metatile_attributes.bin");
const u16 gMetatiles_BattleArena[] = INCBIN_U16("data/tilesets/secondary/battle_arena/metatiles.bin");
const u16 gMetatileAttributes_BattleArena[] = INCBIN_U16("data/tilesets/secondary/battle_arena/metatile_attributes.bin");
const u16 gMetatiles_BattlePyramid[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/metatiles.bin");
const u16 gMetatileAttributes_BattlePyramid[] = INCBIN_U16("data/tilesets/secondary/battle_pyramid/metatile_attributes.bin");
const u16 gMetatiles_MirageTower[] = INCBIN_U16("data/tilesets/secondary/mirage_tower/metatiles.bin");
const u16 gMetatileAttributes_MirageTower[] = INCBIN_U16("data/tilesets/secondary/mirage_tower/metatile_attributes.bin");
const u16 gMetatiles_MossdeepGameCorner[] = INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/metatiles.bin");
const u16 gMetatileAttributes_MossdeepGameCorner[] = INCBIN_U16("data/tilesets/secondary/mossdeep_game_corner/metatile_attributes.bin");
const u16 gMetatiles_IslandHarbor[] = INCBIN_U16("data/tilesets/secondary/island_harbor/metatiles.bin");
const u16 gMetatileAttributes_IslandHarbor[] = INCBIN_U16("data/tilesets/secondary/island_harbor/metatile_attributes.bin");
const u16 gMetatiles_TrainerHill[] = INCBIN_U16("data/tilesets/secondary/trainer_hill/metatiles.bin");
const u16 gMetatileAttributes_TrainerHill[] = INCBIN_U16("data/tilesets/secondary/trainer_hill/metatile_attributes.bin");
const u16 gMetatiles_NavelRock[] = INCBIN_U16("data/tilesets/secondary/navel_rock/metatiles.bin");
const u16 gMetatileAttributes_NavelRock[] = INCBIN_U16("data/tilesets/secondary/navel_rock/metatile_attributes.bin");
const u16 gMetatiles_BattleFrontierRankingHall[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/metatiles.bin");
const u16 gMetatileAttributes_BattleFrontierRankingHall[] = INCBIN_U16("data/tilesets/secondary/battle_frontier_ranking_hall/metatile_attributes.bin");
const u16 gMetatiles_BattleTent[] = INCBIN_U16("data/tilesets/secondary/battle_tent/metatiles.bin");
const u16 gMetatileAttributes_BattleTent[] = INCBIN_U16("data/tilesets/secondary/battle_tent/metatile_attributes.bin");
const u16 gMetatiles_MysteryEventsHouse[] = INCBIN_U16("data/tilesets/secondary/mystery_events_house/metatiles.bin");
const u16 gMetatileAttributes_MysteryEventsHouse[] = INCBIN_U16("data/tilesets/secondary/mystery_events_house/metatile_attributes.bin");
const u16 gMetatiles_UnionRoom[] = INCBIN_U16("data/tilesets/secondary/union_room/metatiles.bin");
const u16 gMetatileAttributes_UnionRoom[] = INCBIN_U16("data/tilesets/secondary/union_room/metatile_attributes.bin");
src/data/union_room.h
+22 -22
View File
@@ -717,9 +717,9 @@ static const struct ListMenuTemplate sListMenuTemplate_PossibleGroupMembers = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.fontId = 1,
.cursorKind = 1
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_INVISIBLE
};
static const struct WindowTemplate sWindowTemplate_GroupList = {
@@ -777,9 +777,9 @@ static const struct ListMenuTemplate sListMenuTemplate_UnionRoomGroups = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 1,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct WindowTemplate sWindowTemplate_InviteToActivity = {
@@ -815,9 +815,9 @@ static const struct ListMenuTemplate sListMenuTemplate_InviteToActivity = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct WindowTemplate sWindowTemplate_RegisterForTrade = {
@@ -852,9 +852,9 @@ static const struct ListMenuTemplate sListMenuTemplate_RegisterForTrade = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct WindowTemplate sWindowTemplate_TradingBoardRequestType = {
@@ -904,9 +904,9 @@ static const struct ListMenuTemplate sMenuTemplate_TradingBoardRequestType = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct WindowTemplate sWindowTemplate_TradingBoardHeader = {
@@ -930,7 +930,7 @@ static const struct WindowTemplate sWindowTemplate_TradingBoardMain = {
};
static const struct ListMenuItem sTradeBoardListMenuItems[] = {
{ sText_EmptyString, -3 },
{ sText_EmptyString, LIST_HEADER },
{ sText_EmptyString, 0 },
{ sText_EmptyString, 1 },
{ sText_EmptyString, 2 },
@@ -958,9 +958,9 @@ static const struct ListMenuTemplate sTradeBoardListMenuTemplate = {
.cursorShadowPal = 13,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
// Unused
@@ -1010,9 +1010,9 @@ static const struct ListMenuTemplate sEmptyListMenuTemplate = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 1,
.fontId = 1,
.cursorKind = 0
.scrollMultiple = LIST_MULTIPLE_SCROLL_DPAD,
.fontId = FONT_NORMAL,
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct RfuPlayerData sUnionRoomPlayer_DummyRfu = {0};
src/daycare.c
+5 -5
View File
@@ -78,7 +78,7 @@ static const struct ListMenuTemplate sDaycareListMenuLevelTemplate =
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const u8 *const sCompatibilityMessages[] =
@@ -842,7 +842,7 @@ void CreateEgg(struct Pokemon *mon, u16 species, bool8 setHotSpringsLocation)
language = LANGUAGE_JAPANESE;
SetMonData(mon, MON_DATA_POKEBALL, &ball);
SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
SetMonData(mon, MON_DATA_FRIENDSHIP, &gSpeciesInfo[species].eggCycles);
SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
SetMonData(mon, MON_DATA_LANGUAGE, &language);
if (setHotSpringsLocation)
@@ -869,7 +869,7 @@ static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *
language = LANGUAGE_JAPANESE;
SetMonData(mon, MON_DATA_POKEBALL, &ball);
SetMonData(mon, MON_DATA_NICKNAME, sJapaneseEggNickname);
SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
SetMonData(mon, MON_DATA_FRIENDSHIP, &gSpeciesInfo[species].eggCycles);
SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
SetMonData(mon, MON_DATA_LANGUAGE, &language);
}
@@ -1031,8 +1031,8 @@ static u8 GetDaycareCompatibilityScore(struct DayCare *daycare)
trainerIds[i] = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_OT_ID);
personality = GetBoxMonData(&daycare->mons[i].mon, MON_DATA_PERSONALITY);
genders[i] = GetGenderFromSpeciesAndPersonality(species[i], personality);
eggGroups[i][0] = gBaseStats[species[i]].eggGroup1;
eggGroups[i][1] = gBaseStats[species[i]].eggGroup2;
eggGroups[i][0] = gSpeciesInfo[species[i]].eggGroup1;
eggGroups[i][1] = gSpeciesInfo[species[i]].eggGroup2;
}
// check unbreedable egg group
src/decompress.c
+2 -2
View File
@@ -268,7 +268,7 @@ bool8 LoadCompressedSpriteSheetUsingHeap(const struct CompressedSpriteSheet *src
struct SpriteSheet dest;
void *buffer;
buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8);
buffer = AllocZeroed(src->data[0] >> 8);
LZ77UnCompWram(src->data, buffer);
dest.data = buffer;
@@ -285,7 +285,7 @@ bool8 LoadCompressedSpritePaletteUsingHeap(const struct CompressedSpritePalette
struct SpritePalette dest;
void *buffer;
buffer = AllocZeroed(*((u32 *)(&src->data[0])) >> 8);
buffer = AllocZeroed(src->data[0] >> 8);
LZ77UnCompWram(src->data, buffer);
dest.data = buffer;
dest.tag = src->tag;
src/decoration.c
+7 -6
View File
@@ -314,8 +314,9 @@ static const struct ListMenuTemplate sDecorationItemsListMenuTemplate =
.cursorShadowPal = 3,
.lettersSpacing = FALSE,
.itemVerticalPadding = 0,
.scrollMultiple = FALSE,
.fontId = FONT_NARROW
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NARROW,
.cursorKind = CURSOR_BLACK_ARROW,
};
#include "data/decoration/icon.h"
@@ -890,7 +891,7 @@ static void PrintDecorationItemMenuItems(u8 taskId)
StringCopy(sDecorationItemsMenu->names[i], gText_Cancel);
sDecorationItemsMenu->items[i].name = sDecorationItemsMenu->names[i];
sDecorationItemsMenu->items[i].id = -2;
sDecorationItemsMenu->items[i].id = LIST_CANCEL;
gMultiuseListMenuTemplate = sDecorationItemsListMenuTemplate;
gMultiuseListMenuTemplate.windowId = sDecorMenuWindowIds[WINDOW_DECORATION_CATEGORIES];
gMultiuseListMenuTemplate.totalItems = sDecorationItemsMenu->numMenuItems;
@@ -1976,7 +1977,7 @@ static void SetDecorSelectionMetatiles(struct PlaceDecorationGraphicsDataBuffer
shape = data->decoration->shape;
for (i = 0; i < sDecorTilemaps[shape].size; i++)
{
data->tiles[sDecorTilemaps[shape].tiles[i]] = GetMetatile(data->decoration->tiles[sDecorTilemaps[shape].y[i]] * 8 + sDecorTilemaps[shape].x[i]);
data->tiles[sDecorTilemaps[shape].tiles[i]] = GetMetatile(data->decoration->tiles[sDecorTilemaps[shape].y[i]] * NUM_TILES_PER_METATILE + sDecorTilemaps[shape].x[i]);
}
}
@@ -2036,7 +2037,7 @@ static u8 gpu_pal_decompress_alloc_tag_and_upload(struct PlaceDecorationGraphics
SetDecorSelectionMetatiles(data);
SetDecorSelectionBoxOamAttributes(data->decoration->shape);
SetDecorSelectionBoxTiles(data);
CopyPalette(data->palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(data->decoration->tiles[0] * 8) + 7] >> 12);
CopyPalette(data->palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(data->decoration->tiles[0] * NUM_TILES_PER_METATILE) + 7] >> 12);
LoadSpritePalette(&sSpritePal_PlaceDecoration);
return CreateSprite(&sDecorationSelectorSpriteTemplate, 0, 0, 0);
}
@@ -2092,7 +2093,7 @@ static u8 AddDecorationIconObjectFromObjectEvent(u16 tilesTag, u16 paletteTag, u
SetDecorSelectionMetatiles(&sPlaceDecorationGraphicsDataBuffer);
SetDecorSelectionBoxOamAttributes(sPlaceDecorationGraphicsDataBuffer.decoration->shape);
SetDecorSelectionBoxTiles(&sPlaceDecorationGraphicsDataBuffer);
CopyPalette(sPlaceDecorationGraphicsDataBuffer.palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0] * 8) + 7] >> 12);
CopyPalette(sPlaceDecorationGraphicsDataBuffer.palette, ((u16 *)gTilesetPointer_SecretBaseRedCave->metatiles)[(sPlaceDecorationGraphicsDataBuffer.decoration->tiles[0] * NUM_TILES_PER_METATILE) + 7] >> 12);
sheet.data = sPlaceDecorationGraphicsDataBuffer.image;
sheet.size = sDecorShapeSizes[sPlaceDecorationGraphicsDataBuffer.decoration->shape] * TILE_SIZE_4BPP;
sheet.tag = tilesTag;
src/dodrio_berry_picking.c
+7 -7
View File
@@ -4675,7 +4675,7 @@ static void ShowNames(void)
ClearWindowTilemap(sGfx->windowIds[i]);
RemoveWindow(sGfx->windowIds[i]);
}
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
}
@@ -4859,7 +4859,7 @@ static void ShowResults(void)
sGfx->state++;
}
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 5, 30, 15);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 5, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT - 5);
RemoveWindow(sGfx->windowIds[1]);
sGfx->windowIds[1] = AddWindow(&sWindowTemplate_Prize);
ClearWindowTilemap(sGfx->windowIds[1]);
@@ -4917,7 +4917,7 @@ static void ShowResults(void)
ClearWindowTilemap(sGfx->windowIds[1]);
RemoveWindow(sGfx->windowIds[0]);
RemoveWindow(sGfx->windowIds[1]);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
break;
@@ -5012,7 +5012,7 @@ static void Msg_WantToPlayAgain(void)
ClearWindowTilemap(sGfx->windowIds[WIN_YES_NO]);
RemoveWindow(sGfx->windowIds[WIN_PLAY_AGAIN]);
RemoveWindow(sGfx->windowIds[WIN_YES_NO]);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
break;
@@ -5044,7 +5044,7 @@ static void Msg_SavingDontTurnOff(void)
sGfx->state++;
break;
default:
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
break;
@@ -5083,7 +5083,7 @@ static void EraseMessage(void)
{
ClearWindowTilemap(sGfx->windowIds[0]);
RemoveWindow(sGfx->windowIds[0]);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
}
@@ -5121,7 +5121,7 @@ static void Msg_SomeoneDroppedOut(void)
sGfx->playAgainState = PLAY_AGAIN_DROPPED;
ClearWindowTilemap(sGfx->windowIds[0]);
RemoveWindow(sGfx->windowIds[0]);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(BG_INTERFACE, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(BG_INTERFACE);
sGfx->finished = TRUE;
break;
src/ereader_screen.c
+3 -2
View File
@@ -5,6 +5,7 @@
#include "link.h"
#include "main.h"
#include "mystery_gift_menu.h"
#include "mystery_gift_client.h"
#include "save.h"
#include "sound.h"
#include "sprite.h"
@@ -98,7 +99,7 @@ static u8 EReader_Transfer(struct EReaderData *eReader)
static void OpenEReaderLink(void)
{
memset(gDecompressionBuffer, 0, 0x2000);
gLinkType = LINKTYPE_EREADER;
gLinkType = LINKTYPE_EREADER_EM;
OpenLink();
SetSuppressLinkErrorMessage(TRUE);
}
@@ -259,7 +260,7 @@ void CreateEReaderTask(void)
data->unused2 = 0;
data->unused3 = 0;
data->status = 0;
data->unusedBuffer = AllocZeroed(0x40);
data->unusedBuffer = AllocZeroed(CLIENT_MAX_MSG_SIZE);
}
static void ResetTimer(u16 *timer)
src/event_object_movement.c
+70 -57
View File
@@ -168,7 +168,20 @@ static bool8 AreElevationsCompatible(u8, u8);
static const struct SpriteFrameImage sPicTable_PechaBerryTree[];
const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
const u8 gReflectionEffectPaletteMap[16] = {
[PALSLOT_PLAYER] = PALSLOT_PLAYER_REFLECTION,
[PALSLOT_PLAYER_REFLECTION] = PALSLOT_PLAYER_REFLECTION,
[PALSLOT_NPC_1] = PALSLOT_NPC_1_REFLECTION,
[PALSLOT_NPC_2] = PALSLOT_NPC_2_REFLECTION,
[PALSLOT_NPC_3] = PALSLOT_NPC_3_REFLECTION,
[PALSLOT_NPC_4] = PALSLOT_NPC_4_REFLECTION,
[PALSLOT_NPC_1_REFLECTION] = PALSLOT_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = PALSLOT_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = PALSLOT_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = PALSLOT_NPC_4_REFLECTION,
[PALSLOT_NPC_SPECIAL] = PALSLOT_NPC_SPECIAL_REFLECTION,
[PALSLOT_NPC_SPECIAL_REFLECTION] = PALSLOT_NPC_SPECIAL_REFLECTION
};
static const struct SpriteTemplate sCameraSpriteTemplate = {
.tileTag = 0,
@@ -610,55 +623,55 @@ static const struct PairedPalettes sSpecialObjectReflectionPaletteSets[] = {
};
static const u16 sObjectPaletteTags0[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags1[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags2[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 sObjectPaletteTags3[] = {
OBJ_EVENT_PAL_TAG_BRENDAN,
OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_1,
OBJ_EVENT_PAL_TAG_NPC_2,
OBJ_EVENT_PAL_TAG_NPC_3,
OBJ_EVENT_PAL_TAG_NPC_4,
OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
[PALSLOT_PLAYER] = OBJ_EVENT_PAL_TAG_BRENDAN,
[PALSLOT_PLAYER_REFLECTION] = OBJ_EVENT_PAL_TAG_BRENDAN_REFLECTION,
[PALSLOT_NPC_1] = OBJ_EVENT_PAL_TAG_NPC_1,
[PALSLOT_NPC_2] = OBJ_EVENT_PAL_TAG_NPC_2,
[PALSLOT_NPC_3] = OBJ_EVENT_PAL_TAG_NPC_3,
[PALSLOT_NPC_4] = OBJ_EVENT_PAL_TAG_NPC_4,
[PALSLOT_NPC_1_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_1_REFLECTION,
[PALSLOT_NPC_2_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_2_REFLECTION,
[PALSLOT_NPC_3_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_3_REFLECTION,
[PALSLOT_NPC_4_REFLECTION] = OBJ_EVENT_PAL_TAG_NPC_4_REFLECTION,
};
static const u16 *const sObjectPaletteTagSets[] = {
@@ -1396,13 +1409,13 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl
objectEvent = &gObjectEvents[objectEventId];
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, 0);
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, 10);
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteSlot);
}
else if (paletteSlot >= 16)
{
@@ -1590,7 +1603,7 @@ u8 CreateVirtualObject(u8 graphicsId, u8 virtualObjId, s16 x, s16 y, u8 elevatio
sprite->coordOffsetEnabled = TRUE;
sprite->sVirtualObjId = virtualObjId;
sprite->sVirtualObjElev = elevation;
if (graphicsInfo->paletteSlot == 10)
if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL)
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
else if (graphicsInfo->paletteSlot >= 16)
_PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot | 0xf0);
@@ -1716,11 +1729,11 @@ static void SpawnObjectEventOnReturnToField(u8 objectEventId, s16 x, s16 y)
*(u16 *)&spriteTemplate.paletteTag = TAG_NONE;
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
@@ -1791,11 +1804,11 @@ void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId)
graphicsInfo = GetObjectEventGraphicsInfo(graphicsId);
sprite = &gSprites[objectEvent->spriteId];
paletteSlot = graphicsInfo->paletteSlot;
if (paletteSlot == 0)
if (paletteSlot == PALSLOT_PLAYER)
{
PatchObjectPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
else if (paletteSlot == 10)
else if (paletteSlot == PALSLOT_NPC_SPECIAL)
{
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, graphicsInfo->paletteSlot);
}
@@ -1973,7 +1986,7 @@ void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup,
void FreeAndReserveObjectSpritePalettes(void)
{
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 12;
gReservedSpritePaletteCount = OBJ_PALSLOT_COUNT;
}
static void LoadObjectEventPalette(u16 paletteTag)
@@ -2499,19 +2512,19 @@ void OverrideSecretBaseDecorationSpriteScript(u8 localId, u8 mapNum, u8 mapGroup
}
}
void InitObjectEventPalettes(u8 palSlot)
void InitObjectEventPalettes(u8 reflectionType)
{
FreeAndReserveObjectSpritePalettes();
sCurrentSpecialObjectPaletteTag = OBJ_EVENT_PAL_TAG_NONE;
sCurrentReflectionType = palSlot;
if (palSlot == 1)
sCurrentReflectionType = reflectionType;
if (reflectionType == 1)
{
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], 0, 6);
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], PALSLOT_PLAYER, PALSLOT_NPC_4 + 1);
gReservedSpritePaletteCount = 8;
}
else
{
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], 0, 10);
PatchObjectPaletteRange(sObjectPaletteTagSets[sCurrentReflectionType], PALSLOT_PLAYER, PALSLOT_NPC_4_REFLECTION + 1);
}
}
@@ -2519,7 +2532,7 @@ u16 GetObjectPaletteTag(u8 palSlot)
{
u8 i;
if (palSlot < 10)
if (palSlot < PALSLOT_NPC_SPECIAL)
return sObjectPaletteTagSets[sCurrentReflectionType][palSlot];
for (i = 0; sSpecialObjectReflectionPaletteSets[i].tag != OBJ_EVENT_PAL_TAG_NONE; i++)
src/field_camera.c
+4 -4
View File
@@ -30,7 +30,7 @@ static void RedrawMapSliceWest(struct FieldCameraOffset *, const struct MapLayou
static s32 MapPosToBgTilemapOffset(struct FieldCameraOffset *, s32, s32);
static void DrawWholeMapViewInternal(int, int, const struct MapLayout *);
static void DrawMetatileAt(const struct MapLayout *, u16, int, int);
static void DrawMetatile(s32, u16 *, u16);
static void DrawMetatile(s32, const u16 *, u16);
static void CameraPanningCB_PanAhead(void);
static struct FieldCameraOffset sFieldCameraOffset;
@@ -226,7 +226,7 @@ void DrawDoorMetatileAt(int x, int y, u16 *tiles)
static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 offset, int x, int y)
{
u16 metatileId = MapGridGetMetatileIdAt(x, y);
u16 *metatiles;
const u16 *metatiles;
if (metatileId > NUM_METATILES_TOTAL)
metatileId = 0;
@@ -237,10 +237,10 @@ static void DrawMetatileAt(const struct MapLayout *mapLayout, u16 offset, int x,
metatiles = mapLayout->secondaryTileset->metatiles;
metatileId -= NUM_METATILES_IN_PRIMARY;
}
DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * 8, offset);
DrawMetatile(MapGridGetMetatileLayerTypeAt(x, y), metatiles + metatileId * NUM_TILES_PER_METATILE, offset);
}
static void DrawMetatile(s32 metatileLayerType, u16 *tiles, u16 offset)
static void DrawMetatile(s32 metatileLayerType, const u16 *tiles, u16 offset)
{
switch (metatileLayerType)
{
src/field_control_avatar.c
+8 -8
View File
@@ -36,7 +36,7 @@
#include "constants/trainer_hill.h"
static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0;
static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0;
static EWRAM_DATA u16 sPrevMetatileBehavior = 0;
u8 gSelectedObjectEvent;
@@ -671,18 +671,18 @@ static bool8 CheckStandardWildEncounter(u16 metatileBehavior)
if (sWildEncounterImmunitySteps < 4)
{
sWildEncounterImmunitySteps++;
sPreviousPlayerMetatileBehavior = metatileBehavior;
sPrevMetatileBehavior = metatileBehavior;
return FALSE;
}
if (StandardWildEncounter(metatileBehavior, sPreviousPlayerMetatileBehavior) == TRUE)
if (StandardWildEncounter(metatileBehavior, sPrevMetatileBehavior) == TRUE)
{
sWildEncounterImmunitySteps = 0;
sPreviousPlayerMetatileBehavior = metatileBehavior;
sPrevMetatileBehavior = metatileBehavior;
return TRUE;
}
sPreviousPlayerMetatileBehavior = metatileBehavior;
sPrevMetatileBehavior = metatileBehavior;
return FALSE;
}
@@ -815,7 +815,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
warpEvent = &gMapHeader.events->warps[warpEventId];
}
if (warpEvent->mapNum == MAP_NUM(NONE))
if (warpEvent->mapNum == MAP_NUM(DYNAMIC))
{
SetWarpDestinationToDynamicWarp(warpEvent->warpId);
}
@@ -826,7 +826,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId);
UpdateEscapeWarp(position->x, position->y);
mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum);
if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(NONE))
if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(DYNAMIC))
SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId);
}
}
@@ -884,7 +884,7 @@ static u8 *TryRunCoordEventScript(struct CoordEvent *coordEvent)
DoCoordEventWeather(coordEvent->trigger);
return NULL;
}
if (coordEvent->trigger == 0)
if (coordEvent->trigger == TRIGGER_RUN_IMMEDIATELY)
{
RunScriptImmediately(coordEvent->script);
return NULL;
src/field_effect.c
+10
View File
@@ -405,6 +405,11 @@ static const struct SpriteFrameImage sPicTable_HofMonitorSmall[] =
{.data = sHofMonitorSmall_Gfx, .size = 0x200} // the macro breaks down here
};
/*
[0_][] <-1 24x16
[2 ][] <-3
^-- Origin
*/
static const struct Subsprite sSubsprites_PokecenterMonitor[] =
{
{
@@ -443,6 +448,11 @@ static const struct Subsprite sSubsprites_PokecenterMonitor[] =
static const struct SubspriteTable sSubspriteTable_PokecenterMonitor = subsprite_table(sSubsprites_PokecenterMonitor);
/*
[0_____][1_____] 24x16
[2 ][3 ]
^-- Origin
*/
static const struct Subsprite sSubsprites_HofMonitorBig[] =
{
{
src/field_effect_helpers.c
+2 -8
View File
@@ -97,18 +97,12 @@ static void LoadObjectRegularReflectionPalette(struct ObjectEvent *objectEvent,
graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
if (graphicsInfo->reflectionPaletteTag != OBJ_EVENT_PAL_TAG_NONE)
{
if (graphicsInfo->paletteSlot == 0)
{
if (graphicsInfo->paletteSlot == PALSLOT_PLAYER)
LoadPlayerObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
}
else if (graphicsInfo->paletteSlot == 10)
{
else if (graphicsInfo->paletteSlot == PALSLOT_NPC_SPECIAL)
LoadSpecialObjectReflectionPalette(graphicsInfo->paletteTag, paletteIndex);
}
else
{
PatchObjectPalette(GetObjectPaletteTag(paletteIndex), paletteIndex);
}
UpdateSpritePaletteWithWeather(paletteIndex);
}
}
src/field_screen_effect.c
+1 -1
View File
@@ -1136,7 +1136,7 @@ static void Task_OrbEffect(u8 taskId)
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7));
SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR);
SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ);
SetBgTilemapPalette(0, 0, 0, 0x1E, 0x14, 0xF);
SetBgTilemapPalette(0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT, 0xF);
ScheduleBgCopyTilemapToVram(0);
SetOrbFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], tCenterX, tCenterY, 1);
CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480);
src/field_specials.c
+5 -5
View File
@@ -1196,7 +1196,7 @@ void IsGrassTypeInParty(void)
if (GetMonData(pokemon, MON_DATA_SANITY_HAS_SPECIES) && !GetMonData(pokemon, MON_DATA_IS_EGG))
{
species = GetMonData(pokemon, MON_DATA_SPECIES);
if (gBaseStats[species].type1 == TYPE_GRASS || gBaseStats[species].type2 == TYPE_GRASS)
if (gSpeciesInfo[species].type1 == TYPE_GRASS || gSpeciesInfo[species].type2 == TYPE_GRASS)
{
gSpecialVar_Result = TRUE;
return;
@@ -2536,9 +2536,9 @@ static void InitScrollableMultichoice(void)
gScrollableMultichoice_ListMenuTemplate.cursorShadowPal = 3;
gScrollableMultichoice_ListMenuTemplate.lettersSpacing = 0;
gScrollableMultichoice_ListMenuTemplate.itemVerticalPadding = 0;
gScrollableMultichoice_ListMenuTemplate.scrollMultiple = 0;
gScrollableMultichoice_ListMenuTemplate.scrollMultiple = LIST_NO_MULTIPLE_SCROLL;
gScrollableMultichoice_ListMenuTemplate.fontId = FONT_NORMAL;
gScrollableMultichoice_ListMenuTemplate.cursorKind = 0;
gScrollableMultichoice_ListMenuTemplate.cursorKind = CURSOR_BLACK_ARROW;
}
static void ScrollableMultichoice_MoveCursor(s32 itemIndex, bool8 onInit, struct ListMenu *list)
@@ -2919,7 +2919,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
{
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor1Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor1[selection] == 0xFFFF)
if (sFrontierExchangeCorner_Decor1[selection] == ITEM_LIST_END)
{
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor1[selection]);
}
@@ -2932,7 +2932,7 @@ static void FillFrontierExchangeCornerWindowAndItemIcon(u16 menu, u16 selection)
break;
case SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2:
AddTextPrinterParameterized2(0, FONT_NORMAL, sFrontierExchangeCorner_Decor2Descriptions[selection], 0, NULL, TEXT_COLOR_DARK_GRAY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY);
if (sFrontierExchangeCorner_Decor2[selection] == 0xFFFF)
if (sFrontierExchangeCorner_Decor2[selection] == ITEM_LIST_END)
{
ShowFrontierExchangeCornerItemIcon(sFrontierExchangeCorner_Decor2[selection]);
}
src/field_weather.c
+181 -174
View File
@@ -21,9 +21,9 @@
enum
{
GAMMA_NONE,
GAMMA_NORMAL,
GAMMA_ALT,
COLOR_MAP_NONE,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_CONTRAST,
};
struct RGBColor
@@ -33,11 +33,6 @@ struct RGBColor
u16 b:5;
};
struct WeatherPaletteData
{
u16 gammaShiftColors[8][0x1000]; // 0x1000 is the number of bytes that make up all palettes.
};
struct WeatherCallbacks
{
void (*initVars)(void);
@@ -48,11 +43,11 @@ struct WeatherCallbacks
// This file's functions.
static bool8 LightenSpritePaletteInFog(u8);
static void BuildGammaShiftTables(void);
static void UpdateWeatherGammaShift(void);
static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex);
static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor);
static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor);
static void BuildColorMaps(void);
static void UpdateWeatherColorMap(void);
static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex);
static void ApplyColorMapWithBlend(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex, u8 blendCoeff, u16 blendColor);
static void ApplyDroughtColorMapWithBlend(s8 colorMapIndex, u8 blendCoeff, u16 blendColor);
static void ApplyFogBlend(u8 blendCoeff, u16 blendColor);
static bool8 FadeInScreen_RainShowShade(void);
static bool8 FadeInScreen_Drought(void);
@@ -66,9 +61,9 @@ static void None_Main(void);
static u8 None_Finish(void);
EWRAM_DATA struct Weather gWeather = {0};
EWRAM_DATA static u8 sFieldEffectPaletteGammaTypes[32] = {0};
EWRAM_DATA static u8 sFieldEffectPaletteColorMapTypes[32] = {0};
static const u8 *sPaletteGammaTypes;
static const u8 *sPaletteColorMapTypes;
// The drought weather effect uses a precalculated color lookup table. Presumably this
// is because the underlying color shift calculation is slow.
@@ -108,50 +103,50 @@ static const struct WeatherCallbacks sWeatherFuncs[] =
void (*const gWeatherPalStateFuncs[])(void) =
{
[WEATHER_PAL_STATE_CHANGING_WEATHER] = UpdateWeatherGammaShift,
[WEATHER_PAL_STATE_CHANGING_WEATHER] = UpdateWeatherColorMap,
[WEATHER_PAL_STATE_SCREEN_FADING_IN] = FadeInScreenWithWeather,
[WEATHER_PAL_STATE_SCREEN_FADING_OUT] = DoNothing,
[WEATHER_PAL_STATE_IDLE] = DoNothing,
};
// This table specifies which of the gamma shift tables should be
// This table specifies which of the color maps should be
// applied to each of the background and sprite palettes.
static const u8 sBasePaletteGammaTypes[32] =
static const u8 sBasePaletteColorMapTypes[32] =
{
// background palettes
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NONE,
GAMMA_NONE,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_NONE,
COLOR_MAP_NONE,
// sprite palettes
GAMMA_ALT,
GAMMA_NORMAL,
GAMMA_ALT,
GAMMA_ALT,
GAMMA_ALT,
GAMMA_ALT,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_ALT,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
GAMMA_NORMAL,
COLOR_MAP_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_CONTRAST,
COLOR_MAP_CONTRAST,
COLOR_MAP_CONTRAST,
COLOR_MAP_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
COLOR_MAP_DARK_CONTRAST,
};
const u16 gFogPalette[] = INCBIN_U16("graphics/weather/fog.gbapal");
@@ -160,10 +155,10 @@ void StartWeather(void)
{
if (!FuncIsActiveTask(Task_WeatherMain))
{
u8 index = AllocSpritePalette(TAG_WEATHER_START);
u8 index = AllocSpritePalette(PALTAG_WEATHER);
CpuCopy32(gFogPalette, &gPlttBufferUnfaded[0x100 + index * 16], 32);
BuildGammaShiftTables();
gWeatherPtr->altGammaSpritePalIndex = index;
BuildColorMaps();
gWeatherPtr->contrastColorMapSpritePalIndex = index;
gWeatherPtr->weatherPicSpritePalIndex = AllocSpritePalette(PALTAG_WEATHER_2);
gWeatherPtr->rainSpriteCount = 0;
gWeatherPtr->curRainSpriteIndex = 0;
@@ -238,7 +233,7 @@ static void Task_WeatherMain(u8 taskId)
{
// Finished cleaning up previous weather. Now transition to next weather.
sWeatherFuncs[gWeatherPtr->nextWeather].initVars();
gWeatherPtr->gammaStepFrameCounter = 0;
gWeatherPtr->colorMapStepCounter = 0;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
gWeatherPtr->currWeather = gWeatherPtr->nextWeather;
gWeatherPtr->weatherChangeComplete = TRUE;
@@ -254,8 +249,8 @@ static void Task_WeatherMain(u8 taskId)
static void None_Init(void)
{
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 0;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 0;
}
static void None_Main(void)
@@ -267,70 +262,82 @@ static u8 None_Finish(void)
return 0;
}
// Builds two tables that contain gamma shifts for palette colors.
// Builds two tables that contain color maps, used for directly transforming
// palette colors in weather effects. The colors maps are a spectrum of
// brightness + contrast mappings. By transitioning between the maps, weather
// effects like lightning are created.
// It's unclear why the two tables aren't declared as const arrays, since
// this function always builds the same two tables.
static void BuildGammaShiftTables(void)
static void BuildColorMaps(void)
{
u16 v0;
u8 (*gammaTable)[32];
u16 v2;
u16 v4;
u16 v5;
u16 gammaIndex;
u16 v9;
u32 v10;
u16 v11;
s16 dunno;
u16 i;
u8 (*colorMaps)[32];
u16 colorVal;
u16 curBrightness;
u16 brightnessDelta;
u16 colorMapIndex;
u16 baseBrightness;
u32 remainingBrightness;
s16 diff;
sPaletteGammaTypes = sBasePaletteGammaTypes;
for (v0 = 0; v0 <= 1; v0++)
sPaletteColorMapTypes = sBasePaletteColorMapTypes;
for (i = 0; i < 2; i++)
{
if (v0 == 0)
gammaTable = gWeatherPtr->gammaShifts;
if (i == 0)
colorMaps = gWeatherPtr->darkenedContrastColorMaps;
else
gammaTable = gWeatherPtr->altGammaShifts;
colorMaps = gWeatherPtr->contrastColorMaps;
for (v2 = 0; v2 < 32; v2++)
for (colorVal = 0; colorVal < 32; colorVal++)
{
v4 = v2 << 8;
if (v0 == 0)
v5 = (v2 << 8) / 16;
curBrightness = colorVal << 8;
if (i == 0)
brightnessDelta = (colorVal << 8) / 16;
else
v5 = 0;
for (gammaIndex = 0; gammaIndex <= 2; gammaIndex++)
brightnessDelta = 0;
// First three color mappings are simple brightness modifiers which are
// progressively darker, according to brightnessDelta.
for (colorMapIndex = 0; colorMapIndex < 3; colorMapIndex++)
{
v4 = (v4 - v5);
gammaTable[gammaIndex][v2] = v4 >> 8;
curBrightness -= brightnessDelta;
colorMaps[colorMapIndex][colorVal] = curBrightness >> 8;
}
v9 = v4;
v10 = 0x1f00 - v4;
if ((0x1f00 - v4) < 0)
baseBrightness = curBrightness;
remainingBrightness = 0x1f00 - curBrightness;
if ((0x1f00 - curBrightness) < 0)
remainingBrightness += 0xf;
brightnessDelta = remainingBrightness / (NUM_WEATHER_COLOR_MAPS - 3);
if (colorVal < 12)
{
v10 += 0xf;
}
v11 = v10 >> 4;
if (v2 < 12)
{
for (; gammaIndex < 19; gammaIndex++)
// For shadows (color values < 12), the remaining color mappings are
// brightness modifiers, which are increased at a significantly lower rate
// than the midtones and highlights (color values >= 12). This creates a
// high contrast effect, used in the thunderstorm weather.
for (; colorMapIndex < NUM_WEATHER_COLOR_MAPS; colorMapIndex++)
{
v4 += v11;
dunno = v4 - v9;
if (dunno > 0)
v4 -= (dunno + ((u16)dunno >> 15)) >> 1;
gammaTable[gammaIndex][v2] = v4 >> 8;
if (gammaTable[gammaIndex][v2] > 0x1f)
gammaTable[gammaIndex][v2] = 0x1f;
curBrightness += brightnessDelta;
diff = curBrightness - baseBrightness;
if (diff > 0)
curBrightness -= diff / 2;
colorMaps[colorMapIndex][colorVal] = curBrightness >> 8;
if (colorMaps[colorMapIndex][colorVal] > 31)
colorMaps[colorMapIndex][colorVal] = 31;
}
}
else
{
for (; gammaIndex < 19; gammaIndex++)
// For midtones and highlights (color values >= 12), the remaining
// color mappings are simple brightness modifiers which are
// progressively brighter, hitting exactly 31 at the last mapping.
for (; colorMapIndex < NUM_WEATHER_COLOR_MAPS; colorMapIndex++)
{
v4 += v11;
gammaTable[gammaIndex][v2] = v4 >> 8;
if (gammaTable[gammaIndex][v2] > 0x1f)
gammaTable[gammaIndex][v2] = 0x1f;
curBrightness += brightnessDelta;
colorMaps[colorMapIndex][colorVal] = curBrightness >> 8;
if (colorMaps[colorMapIndex][colorVal] > 31)
colorMaps[colorMapIndex][colorVal] = 31;
}
}
}
@@ -338,26 +345,26 @@ static void BuildGammaShiftTables(void)
}
// When the weather is changing, it gradually updates the palettes
// towards the desired gamma shift.
static void UpdateWeatherGammaShift(void)
// towards the desired color map.
static void UpdateWeatherColorMap(void)
{
if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_SCREEN_FADING_OUT)
{
if (gWeatherPtr->gammaIndex == gWeatherPtr->gammaTargetIndex)
if (gWeatherPtr->colorMapIndex == gWeatherPtr->targetColorMapIndex)
{
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
else
{
if (++gWeatherPtr->gammaStepFrameCounter >= gWeatherPtr->gammaStepDelay)
if (++gWeatherPtr->colorMapStepCounter >= gWeatherPtr->colorMapStepDelay)
{
gWeatherPtr->gammaStepFrameCounter = 0;
if (gWeatherPtr->gammaIndex < gWeatherPtr->gammaTargetIndex)
gWeatherPtr->gammaIndex++;
gWeatherPtr->colorMapStepCounter = 0;
if (gWeatherPtr->colorMapIndex < gWeatherPtr->targetColorMapIndex)
gWeatherPtr->colorMapIndex++;
else
gWeatherPtr->gammaIndex--;
gWeatherPtr->colorMapIndex--;
ApplyGammaShift(0, 32, gWeatherPtr->gammaIndex);
ApplyColorMap(0, 32, gWeatherPtr->colorMapIndex);
}
}
}
@@ -377,21 +384,21 @@ static void FadeInScreenWithWeather(void)
case WEATHER_SHADE:
if (FadeInScreen_RainShowShade() == FALSE)
{
gWeatherPtr->gammaIndex = 3;
gWeatherPtr->colorMapIndex = 3;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
case WEATHER_DROUGHT:
if (FadeInScreen_Drought() == FALSE)
{
gWeatherPtr->gammaIndex = -6;
gWeatherPtr->colorMapIndex = -6;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
case WEATHER_FOG_HORIZONTAL:
if (FadeInScreen_FogHorizontal() == FALSE)
{
gWeatherPtr->gammaIndex = 0;
gWeatherPtr->colorMapIndex = 0;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
@@ -402,7 +409,7 @@ static void FadeInScreenWithWeather(void)
default:
if (!gPaletteFade.active)
{
gWeatherPtr->gammaIndex = gWeatherPtr->gammaTargetIndex;
gWeatherPtr->colorMapIndex = gWeatherPtr->targetColorMapIndex;
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
}
break;
@@ -416,12 +423,12 @@ static bool8 FadeInScreen_RainShowShade(void)
if (++gWeatherPtr->fadeScreenCounter >= 16)
{
ApplyGammaShift(0, 32, 3);
ApplyColorMap(0, 32, 3);
gWeatherPtr->fadeScreenCounter = 16;
return FALSE;
}
ApplyGammaShiftWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
ApplyColorMapWithBlend(0, 32, 3, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
return TRUE;
}
@@ -432,12 +439,12 @@ static bool8 FadeInScreen_Drought(void)
if (++gWeatherPtr->fadeScreenCounter >= 16)
{
ApplyGammaShift(0, 32, -6);
ApplyColorMap(0, 32, -6);
gWeatherPtr->fadeScreenCounter = 16;
return FALSE;
}
ApplyDroughtGammaShiftWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
ApplyDroughtColorMapWithBlend(-6, 16 - gWeatherPtr->fadeScreenCounter, gWeatherPtr->fadeDestColor);
return TRUE;
}
@@ -454,24 +461,24 @@ static bool8 FadeInScreen_FogHorizontal(void)
static void DoNothing(void)
{ }
static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
static void ApplyColorMap(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex)
{
u16 curPalIndex;
u16 palOffset;
u8 *gammaTable;
u8 *colorMap;
u16 i;
if (gammaIndex > 0)
if (colorMapIndex > 0)
{
gammaIndex--;
colorMapIndex--;
palOffset = startPalIndex * 16;
numPalettes += startPalIndex;
curPalIndex = startPalIndex;
// Loop through the speficied palette range and apply necessary gamma shifts to the colors.
// Loop through the specified palette range and apply necessary color maps.
while (curPalIndex < numPalettes)
{
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE)
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE)
{
// No palette change.
CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16));
@@ -481,18 +488,18 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
{
u8 r, g, b;
if (sPaletteGammaTypes[curPalIndex] == GAMMA_ALT || curPalIndex - 16 == gWeatherPtr->altGammaSpritePalIndex)
gammaTable = gWeatherPtr->altGammaShifts[gammaIndex];
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_CONTRAST || curPalIndex - 16 == gWeatherPtr->contrastColorMapSpritePalIndex)
colorMap = gWeatherPtr->contrastColorMaps[colorMapIndex];
else
gammaTable = gWeatherPtr->gammaShifts[gammaIndex];
colorMap = gWeatherPtr->darkenedContrastColorMaps[colorMapIndex];
for (i = 0; i < 16; i++)
{
// Apply gamma shift to the original color.
// Apply color map to the original color.
struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset];
r = gammaTable[baseColor.r];
g = gammaTable[baseColor.g];
b = gammaTable[baseColor.b];
r = colorMap[baseColor.r];
g = colorMap[baseColor.g];
b = colorMap[baseColor.b];
gPlttBufferFaded[palOffset++] = RGB2(r, g, b);
}
}
@@ -500,17 +507,17 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
curPalIndex++;
}
}
else if (gammaIndex < 0)
else if (colorMapIndex < 0)
{
// A negative gammIndex value means that the blending will come from the special Drought weather's palette tables.
gammaIndex = -gammaIndex - 1;
colorMapIndex = -colorMapIndex - 1;
palOffset = startPalIndex * 16;
numPalettes += startPalIndex;
curPalIndex = startPalIndex;
while (curPalIndex < numPalettes)
{
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE)
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE)
{
// No palette change.
CpuFastCopy(gPlttBufferUnfaded + palOffset, gPlttBufferFaded + palOffset, 16 * sizeof(u16));
@@ -520,7 +527,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
{
for (i = 0; i < 16; i++)
{
gPlttBufferFaded[palOffset] = sDroughtWeatherColors[gammaIndex][DROUGHT_COLOR_INDEX(gPlttBufferUnfaded[palOffset])];
gPlttBufferFaded[palOffset] = sDroughtWeatherColors[colorMapIndex][DROUGHT_COLOR_INDEX(gPlttBufferUnfaded[palOffset])];
palOffset++;
}
}
@@ -535,7 +542,7 @@ static void ApplyGammaShift(u8 startPalIndex, u8 numPalettes, s8 gammaIndex)
}
}
static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaIndex, u8 blendCoeff, u16 blendColor)
static void ApplyColorMapWithBlend(u8 startPalIndex, u8 numPalettes, s8 colorMapIndex, u8 blendCoeff, u16 blendColor)
{
u16 palOffset;
u16 curPalIndex;
@@ -547,34 +554,34 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI
palOffset = startPalIndex * 16;
numPalettes += startPalIndex;
gammaIndex--;
colorMapIndex--;
curPalIndex = startPalIndex;
while (curPalIndex < numPalettes)
{
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE)
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE)
{
// No gamma shift. Simply blend the colors.
// No color map. Simply blend the colors.
BlendPalette(palOffset, 16, blendCoeff, blendColor);
palOffset += 16;
}
else
{
u8 *gammaTable;
u8 *colorMap;
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NORMAL)
gammaTable = gWeatherPtr->gammaShifts[gammaIndex];
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_DARK_CONTRAST)
colorMap = gWeatherPtr->darkenedContrastColorMaps[colorMapIndex];
else
gammaTable = gWeatherPtr->altGammaShifts[gammaIndex];
colorMap = gWeatherPtr->contrastColorMaps[colorMapIndex];
for (i = 0; i < 16; i++)
{
struct RGBColor baseColor = *(struct RGBColor *)&gPlttBufferUnfaded[palOffset];
u8 r = gammaTable[baseColor.r];
u8 g = gammaTable[baseColor.g];
u8 b = gammaTable[baseColor.b];
u8 r = colorMap[baseColor.r];
u8 g = colorMap[baseColor.g];
u8 b = colorMap[baseColor.b];
// Apply gamma shift and target blend color to the original color.
// Apply color map and target blend color to the original color.
r += ((rBlend - r) * blendCoeff) >> 4;
g += ((gBlend - g) * blendCoeff) >> 4;
b += ((bBlend - b) * blendCoeff) >> 4;
@@ -586,7 +593,7 @@ static void ApplyGammaShiftWithBlend(u8 startPalIndex, u8 numPalettes, s8 gammaI
}
}
static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 blendColor)
static void ApplyDroughtColorMapWithBlend(s8 colorMapIndex, u8 blendCoeff, u16 blendColor)
{
struct RGBColor color;
u8 rBlend;
@@ -596,7 +603,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
u16 palOffset;
u16 i;
gammaIndex = -gammaIndex - 1;
colorMapIndex = -colorMapIndex - 1;
color = *(struct RGBColor *)&blendColor;
rBlend = color.r;
gBlend = color.g;
@@ -604,9 +611,9 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
palOffset = 0;
for (curPalIndex = 0; curPalIndex < 32; curPalIndex++)
{
if (sPaletteGammaTypes[curPalIndex] == GAMMA_NONE)
if (sPaletteColorMapTypes[curPalIndex] == COLOR_MAP_NONE)
{
// No gamma shift. Simply blend the colors.
// No color map. Simply blend the colors.
BlendPalette(palOffset, 16, blendCoeff, blendColor);
palOffset += 16;
}
@@ -626,7 +633,7 @@ static void ApplyDroughtGammaShiftWithBlend(s8 gammaIndex, u8 blendCoeff, u16 bl
b1 = color1.b;
offset = ((b1 & 0x1E) << 7) | ((g1 & 0x1E) << 3) | ((r1 & 0x1E) >> 1);
color2 = *(struct RGBColor *)&sDroughtWeatherColors[gammaIndex][offset];
color2 = *(struct RGBColor *)&sDroughtWeatherColors[colorMapIndex][offset];
r2 = color2.r;
g2 = color2.g;
b2 = color2.b;
@@ -710,25 +717,25 @@ static bool8 LightenSpritePaletteInFog(u8 paletteIndex)
return FALSE;
}
void ApplyWeatherGammaShiftIfIdle(s8 gammaIndex)
void ApplyWeatherColorMapIfIdle(s8 colorMapIndex)
{
if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
{
ApplyGammaShift(0, 32, gammaIndex);
gWeatherPtr->gammaIndex = gammaIndex;
ApplyColorMap(0, 32, colorMapIndex);
gWeatherPtr->colorMapIndex = colorMapIndex;
}
}
void ApplyWeatherGammaShiftIfIdle_Gradual(u8 gammaIndex, u8 gammaTargetIndex, u8 gammaStepDelay)
void ApplyWeatherColorMapIfIdle_Gradual(u8 colorMapIndex, u8 targetColorMapIndex, u8 colorMapStepDelay)
{
if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
{
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_CHANGING_WEATHER;
gWeatherPtr->gammaIndex = gammaIndex;
gWeatherPtr->gammaTargetIndex = gammaTargetIndex;
gWeatherPtr->gammaStepFrameCounter = 0;
gWeatherPtr->gammaStepDelay = gammaStepDelay;
ApplyWeatherGammaShiftIfIdle(gammaIndex);
gWeatherPtr->colorMapIndex = colorMapIndex;
gWeatherPtr->targetColorMapIndex = targetColorMapIndex;
gWeatherPtr->colorMapStepCounter = 0;
gWeatherPtr->colorMapStepDelay = colorMapStepDelay;
ApplyWeatherColorMapIfIdle(colorMapIndex);
}
}
@@ -832,7 +839,7 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
default:
if (gWeatherPtr->currWeather != WEATHER_FOG_HORIZONTAL)
{
ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
ApplyColorMap(paletteIndex, 1, gWeatherPtr->colorMapIndex);
}
else
{
@@ -843,9 +850,9 @@ void UpdateSpritePaletteWithWeather(u8 spritePaletteIndex)
}
}
void ApplyWeatherGammaShiftToPal(u8 paletteIndex)
void ApplyWeatherColorMapToPal(u8 paletteIndex)
{
ApplyGammaShift(paletteIndex, 1, gWeatherPtr->gammaIndex);
ApplyColorMap(paletteIndex, 1, gWeatherPtr->colorMapIndex);
}
// Unused
@@ -886,9 +893,9 @@ bool8 LoadDroughtWeatherPalettes(void)
return FALSE;
}
static void SetDroughtGamma(s8 gammaIndex)
static void SetDroughtColorMap(s8 colorMapIndex)
{
ApplyWeatherGammaShiftIfIdle(-gammaIndex - 1);
ApplyWeatherColorMapIfIdle(-colorMapIndex - 1);
}
void DroughtStateInit(void)
@@ -907,7 +914,7 @@ void DroughtStateRun(void)
if (++gWeatherPtr->droughtTimer > 5)
{
gWeatherPtr->droughtTimer = 0;
SetDroughtGamma(gWeatherPtr->droughtBrightnessStage++);
SetDroughtColorMap(gWeatherPtr->droughtBrightnessStage++);
if (gWeatherPtr->droughtBrightnessStage > 5)
{
gWeatherPtr->droughtLastBrightnessStage = gWeatherPtr->droughtBrightnessStage;
@@ -920,14 +927,14 @@ void DroughtStateRun(void)
gWeatherPtr->droughtTimer = (gWeatherPtr->droughtTimer + 3) & 0x7F;
gWeatherPtr->droughtBrightnessStage = ((gSineTable[gWeatherPtr->droughtTimer] - 1) >> 6) + 2;
if (gWeatherPtr->droughtBrightnessStage != gWeatherPtr->droughtLastBrightnessStage)
SetDroughtGamma(gWeatherPtr->droughtBrightnessStage);
SetDroughtColorMap(gWeatherPtr->droughtBrightnessStage);
gWeatherPtr->droughtLastBrightnessStage = gWeatherPtr->droughtBrightnessStage;
break;
case 2:
if (++gWeatherPtr->droughtTimer > 5)
{
gWeatherPtr->droughtTimer = 0;
SetDroughtGamma(--gWeatherPtr->droughtBrightnessStage);
SetDroughtColorMap(--gWeatherPtr->droughtBrightnessStage);
if (gWeatherPtr->droughtBrightnessStage == 3)
gWeatherPtr->droughtState = 0;
}
@@ -1093,12 +1100,12 @@ void SetWeatherPalStateIdle(void)
void PreservePaletteInWeather(u8 preservedPalIndex)
{
CpuCopy16(sBasePaletteGammaTypes, sFieldEffectPaletteGammaTypes, 32);
sFieldEffectPaletteGammaTypes[preservedPalIndex] = GAMMA_NONE;
sPaletteGammaTypes = sFieldEffectPaletteGammaTypes;
CpuCopy16(sBasePaletteColorMapTypes, sFieldEffectPaletteColorMapTypes, 32);
sFieldEffectPaletteColorMapTypes[preservedPalIndex] = COLOR_MAP_NONE;
sPaletteColorMapTypes = sFieldEffectPaletteColorMapTypes;
}
void ResetPreservedPalettesInWeather(void)
{
sPaletteGammaTypes = sBasePaletteGammaTypes;
sPaletteColorMapTypes = sBasePaletteColorMapTypes;
}
src/field_weather_effect.c
+109 -99
View File
@@ -94,8 +94,8 @@ static const struct SpriteTemplate sCloudSpriteTemplate =
void Clouds_InitVars(void)
{
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->initStep = 0;
if (gWeatherPtr->cloudSpritesCreated == FALSE)
@@ -152,8 +152,8 @@ bool8 Clouds_Finish(void)
void Sunny_InitVars(void)
{
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
}
void Sunny_InitAll(void)
@@ -235,8 +235,8 @@ void Drought_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 0;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 0;
}
void Drought_InitAll(void)
@@ -476,8 +476,8 @@ void Rain_InitVars(void)
gWeatherPtr->rainSpriteVisibleDelay = 8;
gWeatherPtr->isDownpour = FALSE;
gWeatherPtr->targetRainSpriteCount = 10;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 3;
gWeatherPtr->colorMapStepDelay = 20;
SetRainStrengthFromSoundEffect(SE_RAIN);
}
@@ -768,8 +768,8 @@ void Snow_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 3;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->targetSnowflakeSpriteCount = 16;
gWeatherPtr->snowflakeVisibleCounter = 0;
}
@@ -1014,38 +1014,38 @@ static void UpdateSnowflakeSprite(struct Sprite *sprite)
enum {
// This block of states is run only once
// when first setting up the thunderstorm
TSTORM_STATE_LOAD_RAIN,
TSTORM_STATE_CREATE_RAIN,
TSTORM_STATE_INIT_RAIN,
TSTORM_STATE_WAIT_CHANGE,
THUNDER_STATE_LOAD_RAIN,
THUNDER_STATE_CREATE_RAIN,
THUNDER_STATE_INIT_RAIN,
THUNDER_STATE_WAIT_CHANGE,
// The thunderstorm loops through these states,
// not necessarily in order.
TSTORM_STATE_LOOP_START,
TSTORM_STATE_LOOP_WAIT,
TSTORM_STATE_INIT_THUNDER_SHORT_1,
TSTORM_STATE_INIT_THUNDER_SHORT_2,
TSTORM_STATE_TRY_THUNDER_SHORT,
TSTORM_STATE_TRY_NEW_THUNDER,
TSTORM_STATE_WAIT_THUNDER_SHORT,
TSTORM_STATE_INIT_THUNDER_LONG,
TSTORM_STATE_WAIT_THUNDER_LONG,
TSTORM_STATE_FADE_THUNDER_LONG,
TSTORM_STATE_END_THUNDER_LONG,
THUNDER_STATE_NEW_CYCLE,
THUNDER_STATE_NEW_CYCLE_WAIT,
THUNDER_STATE_INIT_CYCLE_1,
THUNDER_STATE_INIT_CYCLE_2,
THUNDER_STATE_SHORT_BOLT,
THUNDER_STATE_TRY_NEW_BOLT,
THUNDER_STATE_WAIT_BOLT_SHORT,
THUNDER_STATE_INIT_BOLT_LONG,
THUNDER_STATE_WAIT_BOLT_LONG,
THUNDER_STATE_FADE_BOLT_LONG,
THUNDER_STATE_END_BOLT_LONG,
};
void Thunderstorm_InitVars(void)
{
gWeatherPtr->initStep = TSTORM_STATE_LOAD_RAIN;
gWeatherPtr->initStep = THUNDER_STATE_LOAD_RAIN;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->rainSpriteVisibleCounter = 0;
gWeatherPtr->rainSpriteVisibleDelay = 4;
gWeatherPtr->isDownpour = FALSE;
gWeatherPtr->targetRainSpriteCount = 16;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 3;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment
gWeatherPtr->thunderTriggered = FALSE;
gWeatherPtr->thunderEnqueued = FALSE;
SetRainStrengthFromSoundEffect(SE_THUNDERSTORM);
}
@@ -1061,18 +1061,18 @@ void Thunderstorm_InitAll(void)
//------------------------------------------------------------------------------
static void UpdateThunderSound(void);
static void SetThunderCounter(u16);
static void EnqueueThunder(u16);
void Downpour_InitVars(void)
{
gWeatherPtr->initStep = TSTORM_STATE_LOAD_RAIN;
gWeatherPtr->initStep = THUNDER_STATE_LOAD_RAIN;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->rainSpriteVisibleCounter = 0;
gWeatherPtr->rainSpriteVisibleDelay = 4;
gWeatherPtr->isDownpour = TRUE;
gWeatherPtr->targetRainSpriteCount = 24;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 3;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->weatherGfxLoaded = FALSE; // duplicate assignment
SetRainStrengthFromSoundEffect(SE_DOWNPOUR);
}
@@ -1084,110 +1084,119 @@ void Downpour_InitAll(void)
Thunderstorm_Main();
}
// In a given cycle, there will be some shorter bolts of lightning, potentially
// followed by a longer bolt. As a "regex", the pattern is:
// (SHORT_BOLT){1,2}(LONG_BOLT)?
//
// Thunder only plays on the final bolt of the cycle.
void Thunderstorm_Main(void)
{
UpdateThunderSound();
switch (gWeatherPtr->initStep)
{
case TSTORM_STATE_LOAD_RAIN:
case THUNDER_STATE_LOAD_RAIN:
LoadRainSpriteSheet();
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_CREATE_RAIN:
case THUNDER_STATE_CREATE_RAIN:
if (!CreateRainSprite())
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_INIT_RAIN:
case THUNDER_STATE_INIT_RAIN:
if (!UpdateVisibleRainSprites())
{
gWeatherPtr->weatherGfxLoaded = TRUE;
gWeatherPtr->initStep++;
}
break;
case TSTORM_STATE_WAIT_CHANGE:
case THUNDER_STATE_WAIT_CHANGE:
if (gWeatherPtr->palProcessingState != WEATHER_PAL_STATE_CHANGING_WEATHER)
gWeatherPtr->initStep = TSTORM_STATE_INIT_THUNDER_SHORT_1;
gWeatherPtr->initStep = THUNDER_STATE_INIT_CYCLE_1;
break;
case TSTORM_STATE_LOOP_START:
case THUNDER_STATE_NEW_CYCLE:
gWeatherPtr->thunderAllowEnd = TRUE;
gWeatherPtr->thunderDelay = (Random() % 360) + 360;
gWeatherPtr->thunderTimer = (Random() % 360) + 360;
gWeatherPtr->initStep++;
// fall through
case TSTORM_STATE_LOOP_WAIT:
// Wait between 360-720 frames before trying thunder again
if (--gWeatherPtr->thunderDelay == 0)
case THUNDER_STATE_NEW_CYCLE_WAIT:
// Wait between 360-720 frames before starting a new cycle.
if (--gWeatherPtr->thunderTimer == 0)
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_INIT_THUNDER_SHORT_1:
case THUNDER_STATE_INIT_CYCLE_1:
gWeatherPtr->thunderAllowEnd = TRUE;
gWeatherPtr->thunderSkipShort = Random() % 2;
gWeatherPtr->thunderLongBolt = Random() % 2;
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_INIT_THUNDER_SHORT_2:
gWeatherPtr->thunderShortRetries = (Random() & 1) + 1;
case THUNDER_STATE_INIT_CYCLE_2:
gWeatherPtr->thunderShortBolts = (Random() & 1) + 1;
gWeatherPtr->initStep++;
// fall through
case TSTORM_STATE_TRY_THUNDER_SHORT:
ApplyWeatherGammaShiftIfIdle(19);
if (!gWeatherPtr->thunderSkipShort && gWeatherPtr->thunderShortRetries == 1)
SetThunderCounter(20); // Do short thunder
case THUNDER_STATE_SHORT_BOLT:
// Short bolt of lightning strikes.
ApplyWeatherColorMapIfIdle(19);
// If final lightning bolt, enqueue thunder.
if (!gWeatherPtr->thunderLongBolt && gWeatherPtr->thunderShortBolts == 1)
EnqueueThunder(20);
gWeatherPtr->thunderDelay = (Random() % 3) + 6;
gWeatherPtr->thunderTimer = (Random() % 3) + 6;
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_TRY_NEW_THUNDER:
if (--gWeatherPtr->thunderDelay == 0)
case THUNDER_STATE_TRY_NEW_BOLT:
if (--gWeatherPtr->thunderTimer == 0)
{
ApplyWeatherGammaShiftIfIdle(3);
// Short bolt of lightning ends.
ApplyWeatherColorMapIfIdle(3);
gWeatherPtr->thunderAllowEnd = TRUE;
if (--gWeatherPtr->thunderShortRetries != 0)
if (--gWeatherPtr->thunderShortBolts != 0)
{
// Try a short thunder again
gWeatherPtr->thunderDelay = (Random() % 16) + 60;
gWeatherPtr->initStep = TSTORM_STATE_WAIT_THUNDER_SHORT;
// Wait a little, then do another short bolt.
gWeatherPtr->thunderTimer = (Random() % 16) + 60;
gWeatherPtr->initStep = THUNDER_STATE_WAIT_BOLT_SHORT;
}
else if (!gWeatherPtr->thunderSkipShort)
else if (!gWeatherPtr->thunderLongBolt)
{
// No more thunder, restart loop
gWeatherPtr->initStep = TSTORM_STATE_LOOP_START;
// No more bolts, restart loop.
gWeatherPtr->initStep = THUNDER_STATE_NEW_CYCLE;
}
else
{
// Set up long thunder
gWeatherPtr->initStep = TSTORM_STATE_INIT_THUNDER_LONG;
// Set up long bolt.
gWeatherPtr->initStep = THUNDER_STATE_INIT_BOLT_LONG;
}
}
break;
case TSTORM_STATE_WAIT_THUNDER_SHORT:
if (--gWeatherPtr->thunderDelay == 0)
gWeatherPtr->initStep = TSTORM_STATE_TRY_THUNDER_SHORT;
case THUNDER_STATE_WAIT_BOLT_SHORT:
if (--gWeatherPtr->thunderTimer == 0)
gWeatherPtr->initStep = THUNDER_STATE_SHORT_BOLT;
break;
case TSTORM_STATE_INIT_THUNDER_LONG:
gWeatherPtr->thunderDelay = (Random() % 16) + 60;
case THUNDER_STATE_INIT_BOLT_LONG:
gWeatherPtr->thunderTimer = (Random() % 16) + 60;
gWeatherPtr->initStep++;
break;
case TSTORM_STATE_WAIT_THUNDER_LONG:
if (--gWeatherPtr->thunderDelay == 0)
case THUNDER_STATE_WAIT_BOLT_LONG:
if (--gWeatherPtr->thunderTimer == 0)
{
// Do long thunder
SetThunderCounter(100);
ApplyWeatherGammaShiftIfIdle(19);
gWeatherPtr->thunderDelay = (Random() & 0xF) + 30;
// Do long bolt. Enqueue thunder with a potentially longer delay.
EnqueueThunder(100);
ApplyWeatherColorMapIfIdle(19);
gWeatherPtr->thunderTimer = (Random() & 0xF) + 30;
gWeatherPtr->initStep++;
}
break;
case TSTORM_STATE_FADE_THUNDER_LONG:
if (--gWeatherPtr->thunderDelay == 0)
case THUNDER_STATE_FADE_BOLT_LONG:
if (--gWeatherPtr->thunderTimer == 0)
{
ApplyWeatherGammaShiftIfIdle_Gradual(19, 3, 5);
// Fade long bolt out over time.
ApplyWeatherColorMapIfIdle_Gradual(19, 3, 5);
gWeatherPtr->initStep++;
}
break;
case TSTORM_STATE_END_THUNDER_LONG:
case THUNDER_STATE_END_BOLT_LONG:
if (gWeatherPtr->palProcessingState == WEATHER_PAL_STATE_IDLE)
{
gWeatherPtr->thunderAllowEnd = TRUE;
gWeatherPtr->initStep = TSTORM_STATE_LOOP_START;
gWeatherPtr->initStep = THUNDER_STATE_NEW_CYCLE;
}
break;
}
@@ -1218,7 +1227,7 @@ bool8 Thunderstorm_Finish(void)
if (!UpdateVisibleRainSprites())
{
DestroyRainSprites();
gWeatherPtr->thunderTriggered = 0;
gWeatherPtr->thunderEnqueued = FALSE;
gWeatherPtr->finishStep++;
return FALSE;
}
@@ -1229,20 +1238,21 @@ bool8 Thunderstorm_Finish(void)
return TRUE;
}
static void SetThunderCounter(u16 max)
// Enqueue a thunder sound effect for at most `waitFrames` frames from now.
static void EnqueueThunder(u16 waitFrames)
{
if (!gWeatherPtr->thunderTriggered)
if (!gWeatherPtr->thunderEnqueued)
{
gWeatherPtr->thunderCounter = Random() % max;
gWeatherPtr->thunderTriggered = TRUE;
gWeatherPtr->thunderSETimer = Random() % waitFrames;
gWeatherPtr->thunderEnqueued = TRUE;
}
}
static void UpdateThunderSound(void)
{
if (gWeatherPtr->thunderTriggered == TRUE)
if (gWeatherPtr->thunderEnqueued == TRUE)
{
if (gWeatherPtr->thunderCounter == 0)
if (gWeatherPtr->thunderSETimer == 0)
{
if (IsSEPlaying())
return;
@@ -1252,11 +1262,11 @@ static void UpdateThunderSound(void)
else
PlaySE(SE_THUNDER2);
gWeatherPtr->thunderTriggered = FALSE;
gWeatherPtr->thunderEnqueued = FALSE;
}
else
{
gWeatherPtr->thunderCounter--;
gWeatherPtr->thunderSETimer--;
}
}
}
@@ -1361,8 +1371,8 @@ void FogHorizontal_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
if (gWeatherPtr->fogHSpritesCreated == 0)
{
gWeatherPtr->fogHScrollCounter = 0;
@@ -1516,8 +1526,8 @@ void Ash_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = FALSE;
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->ashUnused = 20; // Never read
if (!gWeatherPtr->ashSpritesCreated)
{
@@ -1726,8 +1736,8 @@ void FogDiagonal_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = 0;
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
gWeatherPtr->fogHScrollCounter = 0;
gWeatherPtr->fogHScrollOffset = 1;
if (!gWeatherPtr->fogDSpritesCreated)
@@ -1940,8 +1950,8 @@ void Sandstorm_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->weatherGfxLoaded = 0;
gWeatherPtr->gammaTargetIndex = 0;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 0;
gWeatherPtr->colorMapStepDelay = 20;
if (!gWeatherPtr->sandstormSpritesCreated)
{
gWeatherPtr->sandstormXOffset = gWeatherPtr->sandstormYOffset = 0;
@@ -2237,8 +2247,8 @@ static void UpdateSandstormSwirlSprite(struct Sprite *sprite)
void Shade_InitVars(void)
{
gWeatherPtr->initStep = 0;
gWeatherPtr->gammaTargetIndex = 3;
gWeatherPtr->gammaStepDelay = 20;
gWeatherPtr->targetColorMapIndex = 3;
gWeatherPtr->colorMapStepDelay = 20;
}
void Shade_InitAll(void)
src/fieldmap.c
+4 -4
View File
@@ -406,7 +406,7 @@ void MapGridSetMetatileEntryAt(int x, int y, u16 metatile)
u16 GetMetatileAttributesById(u16 metatile)
{
u16 *attributes;
const u16 *attributes;
if (metatile < NUM_METATILES_IN_PRIMARY)
{
attributes = gMapHeader.mapLayout->primaryTileset->metatileAttributes;
@@ -880,17 +880,17 @@ void LoadTilesetPalette(struct Tileset const *tileset, u16 destOffset, u16 size)
if (tileset->isSecondary == FALSE)
{
LoadPalette(&black, destOffset, 2);
LoadPalette(((u16 *)tileset->palettes) + 1, destOffset + 1, size - 2);
LoadPalette(tileset->palettes[0] + 1, destOffset + 1, size - 2);
ApplyGlobalTintToPaletteEntries(destOffset + 1, (size - 2) >> 1);
}
else if (tileset->isSecondary == TRUE)
{
LoadPalette(((u16 *)tileset->palettes) + (NUM_PALS_IN_PRIMARY * 16), destOffset, size);
LoadPalette(tileset->palettes[NUM_PALS_IN_PRIMARY], destOffset, size);
ApplyGlobalTintToPaletteEntries(destOffset, size >> 1);
}
else
{
LoadCompressedPalette((u32 *)tileset->palettes, destOffset, size);
LoadCompressedPalette((const u32 *)tileset->palettes, destOffset, size);
ApplyGlobalTintToPaletteEntries(destOffset, size >> 1);
}
}
src/frontier_pass.c
+6 -6
View File
@@ -760,9 +760,9 @@ static bool32 InitFrontierPass(void)
case 7:
if (FreeTempTileDataBuffersIfPossible())
return FALSE;
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
@@ -1396,9 +1396,9 @@ static bool32 InitFrontierMap(void)
SetBgTilemapBuffer(0, sMapData->tilemapBuff0);
SetBgTilemapBuffer(1, sMapData->tilemapBuff1);
SetBgTilemapBuffer(2, sMapData->tilemapBuff2);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
src/graphics.c
+3 -3
View File
@@ -365,7 +365,7 @@ const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpb
"graphics/battle_interface/hpbar_anim.4bpp",
"graphics/battle_interface/misc_frameend.4bpp",
"graphics/battle_interface/ball_display.4bpp",
"graphics/battle_interface/ball_display_unused_extra.4bpp",
"graphics/battle_interface/ball_caught_indicator.4bpp",
"graphics/battle_interface/status2.4bpp", // these three duplicate sets of graphics are for the opponent pokemon
"graphics/battle_interface/status3.4bpp", // and are also for use in double battles. they use dynamic palettes so
"graphics/battle_interface/status4.4bpp", // coloring them is an extreme headache and wont be done for now
@@ -1323,8 +1323,8 @@ const u16 gPokenavMessageBox_Pal[] = INCBIN_U16("graphics/pokenav/message.gbapal
const u32 gPokenavMessageBox_Gfx[] = INCBIN_U32("graphics/pokenav/message.4bpp.lz");
const u32 gPokenavMessageBox_Tilemap[] = INCBIN_U32("graphics/pokenav/message.bin.lz");
const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/zoom_tiles.gbapal");
const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/city_zoom_text.4bpp.lz");
const u16 gRegionMapCityZoomTiles_Pal[] = INCBIN_U16("graphics/pokenav/region_map/zoom_tiles.gbapal");
const u32 gRegionMapCityZoomText_Gfx[] = INCBIN_U32("graphics/pokenav/region_map/city_zoom_text.4bpp.lz");
const u16 gPokenavConditionCancel_Pal[] = INCBIN_U16("graphics/pokenav/condition/cancel.gbapal");
const u8 gPokenavConditionCancel_Gfx[] = INCBIN_U8("graphics/pokenav/condition/cancel.4bpp");
src/heal_location.c
+3 -3
View File
@@ -13,14 +13,14 @@ u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum)
if (sHealLocations[i].group == mapGroup && sHealLocations[i].map == mapNum)
return i + 1;
}
return 0;
return HEAL_LOCATION_NONE;
}
const struct HealLocation *GetHealLocationByMap(u16 mapGroup, u16 mapNum)
{
u32 index = GetHealLocationIndexByMap(mapGroup, mapNum);
if (index == 0)
if (index == HEAL_LOCATION_NONE)
return NULL;
else
return &sHealLocations[index - 1];
@@ -28,7 +28,7 @@ const struct HealLocation *GetHealLocationByMap(u16 mapGroup, u16 mapNum)
const struct HealLocation *GetHealLocation(u32 index)
{
if (index == 0)
if (index == HEAL_LOCATION_NONE)
return NULL;
else if (index > ARRAY_COUNT(sHealLocations))
return NULL;
src/international_string_util.c
+1 -1
View File
@@ -133,7 +133,7 @@ void PadNameString(u8 *dest, u8 padChar)
while (length < PLAYER_NAME_LENGTH - 1)
{
dest[length] = EXT_CTRL_CODE_BEGIN;
dest[length + 1] = EXT_CTRL_CODE_RESET_SIZE;
dest[length + 1] = EXT_CTRL_CODE_RESET_FONT;
length += 2;
}
}
src/intro.c
+36 -26
View File
@@ -3322,24 +3322,29 @@ static u8 CreateGameFreakLogoSprites(s16 x, s16 y, s16 unused)
#undef sLetterX
#undef COLOR_CHANGES
#define sScale data[1]
#define sRot data[2]
#define sPos data[3]
#define sTimer data[7]
static void SpriteCB_FlygonSilhouette(struct Sprite *sprite)
{
sprite->data[7]++;
sprite->sTimer++;
if (sprite->sState != 0)
{
s16 sin1;
s16 sin2;
s16 sin;
s16 cos;
s16 a, b, c, d;
sin1 = gSineTable[(u8)sprite->data[2]];
sin2 = gSineTable[(u8)(sprite->data[2] + 64)];
d = Q_8_8_TO_INT(sin2 * sprite->data[1]);
c = Q_8_8_TO_INT(-sin1 * sprite->data[1]);
b = Q_8_8_TO_INT(sin1 * sprite->data[1]);
a = Q_8_8_TO_INT(sin2 * sprite->data[1]);
// Determines rotation of the sprite
sin = gSineTable[(u8)sprite->sRot];
cos = gSineTable[(u8)(sprite->sRot + 64)];
// Converts rotation and scale into the OAM matrix
d = Q_8_8_TO_INT( cos * sprite->sScale);
c = Q_8_8_TO_INT(-sin * sprite->sScale);
b = Q_8_8_TO_INT( sin * sprite->sScale);
a = Q_8_8_TO_INT( cos * sprite->sScale);
SetOamMatrix(1, a, b, c, d);
}
@@ -3353,36 +3358,41 @@ static void SpriteCB_FlygonSilhouette(struct Sprite *sprite)
CalcCenterToCornerVec(sprite, SPRITE_SHAPE(64x32), SPRITE_SIZE(64x32), ST_OAM_AFFINE_DOUBLE);
sprite->invisible = FALSE;
sprite->sState = 1;
sprite->data[1] = 0x80;
sprite->data[2] = 0;
sprite->data[3] = 0;
sprite->sScale = 128;
sprite->sRot = 0;
sprite->sPos = 0;
break;
case 1:
sprite->x2 = -Sin((u8)sprite->data[3], 140);
sprite->y2 = -Sin((u8)sprite->data[3], 120);
sprite->data[1] += 7;
sprite->data[3] += 3;
sprite->x2 = -Sin((u8)sprite->sPos, 140);
sprite->y2 = -Sin((u8)sprite->sPos, 120);
sprite->sScale += 7;
sprite->sPos += 3;
if (sprite->x + sprite->x2 <= -16)
{
sprite->oam.priority = 3;
sprite->sState++;
sprite->x = 20;
sprite->y = 40;
sprite->data[1] = 0x200;
sprite->data[2] = 0;
sprite->data[3] = 0x10;
sprite->sScale = 512;
sprite->sRot = 0;
sprite->sPos = 16;
}
break;
case 2:
sprite->x2 = Sin((u8)sprite->data[3], 34);
sprite->y2 = -Cos((u8)sprite->data[3], 60);
sprite->data[1] += 2;
if (sprite->data[7] % 5 == 0)
sprite->data[3]++;
sprite->x2 = Sin((u8)sprite->sPos, 34);
sprite->y2 = -Cos((u8)sprite->sPos, 60);
sprite->sScale += 2;
if (sprite->sTimer % 5 == 0)
sprite->sPos++;
break;
}
}
#undef sScale
#undef sRot
#undef sPos
#undef sTimer
static void SpriteCB_RayquazaOrb(struct Sprite *sprite)
{
u16 foo;
src/item.c
+2 -1
View File
@@ -880,6 +880,7 @@ const u8 *ItemId_GetName(u16 itemId)
return gItems[SanitizeItemId(itemId)].name;
}
// Unused
u16 ItemId_GetId(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].itemId;
@@ -910,7 +911,7 @@ u8 ItemId_GetImportance(u16 itemId)
return gItems[SanitizeItemId(itemId)].importance;
}
// unused
// Unused
u8 ItemId_GetRegistrability(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].registrability;
src/item_icon.c
+2 -2
View File
@@ -159,8 +159,8 @@ u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u1
const void *GetItemIconPicOrPalette(u16 itemId, u8 which)
{
if (itemId == 0xFFFF)
itemId = ITEM_FIELD_ARROW;
if (itemId == ITEM_LIST_END)
itemId = ITEMS_COUNT; // Use last icon, the "return to field" arrow
else if (itemId >= ITEMS_COUNT)
itemId = 0;
src/item_menu.c
+5 -5
View File
@@ -259,9 +259,9 @@ static const struct ListMenuTemplate sItemListMenu =
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NARROW,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct MenuAction sItemMenuActions[] = {
@@ -937,7 +937,7 @@ static void BagMenu_MoveCursorCallback(s32 itemIndex, bool8 onInit, struct ListM
if (itemIndex != LIST_CANCEL)
AddBagItemIconSprite(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex), gBagMenu->itemIconSlot);
else
AddBagItemIconSprite(-1, gBagMenu->itemIconSlot);
AddBagItemIconSprite(ITEM_LIST_END, gBagMenu->itemIconSlot);
gBagMenu->itemIconSlot ^= 1;
if (!gBagMenu->inhibitItemDescriptionPrint)
PrintItemDescription(itemIndex);
@@ -987,7 +987,7 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
else
{
// Print registered icon
if (gSaveBlock1Ptr->registeredItem && gSaveBlock1Ptr->registeredItem == itemId)
if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == itemId)
BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16);
}
}
@@ -1909,7 +1909,7 @@ static void ItemMenu_Register(u8 taskId)
u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
gSaveBlock1Ptr->registeredItem = 0;
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
else
gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
src/link.c
+3 -3
View File
@@ -206,7 +206,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 0,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 5,
.paletteNum = 15,
.baseBlock = 0x002
@@ -215,7 +215,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 6,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 7,
.paletteNum = 15,
.baseBlock = 0x098
@@ -224,7 +224,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 13,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 7,
.paletteNum = 15,
.baseBlock = 0x16A
src/link_rfu_2.c
+6 -7
View File
@@ -2525,9 +2525,8 @@ u8 RfuGetStatus(void)
bool32 RfuHasErrored(void)
{
// RFU_STATUS_OK will underflow here intentionally
u32 var = RfuGetStatus() - 1;
if (var < RFU_STATUS_CONNECTION_ERROR)
u32 status = RfuGetStatus();
if (status == RFU_STATUS_FATAL_ERROR || status == RFU_STATUS_CONNECTION_ERROR)
return TRUE;
else
return FALSE;
@@ -2656,7 +2655,7 @@ static u8 GetPartnerIndexByNameAndTrainerID(const u8 *name, u16 id)
for (i = 0; i < RFU_CHILD_MAX; i++)
{
u16 trainerId = ReadU16(gRfuLinkStatus->partner[i].gname + 2);
u16 trainerId = ReadU16(((struct RfuGameData *)gRfuLinkStatus->partner[i].gname)->compatibility.playerTrainerId);
if (IsRfuSerialNumberValid(gRfuLinkStatus->partner[i].serialNo)
&& !StringCompare(name, gRfuLinkStatus->partner[i].uname)
&& id == trainerId)
@@ -2682,9 +2681,9 @@ static void RfuReqDisconnectSlot(u32 slot)
void RequestDisconnectSlotByTrainerNameAndId(const u8 *name, u16 id)
{
u8 var = GetPartnerIndexByNameAndTrainerID(name, id);
if (var != 0xFF)
RfuReqDisconnectSlot(1 << var);
u8 index = GetPartnerIndexByNameAndTrainerID(name, id);
if (index != 0xFF)
RfuReqDisconnectSlot(1 << index);
}
void Rfu_DisconnectPlayerById(u32 playerIdx)
src/list_menu.c
+47 -41
View File
@@ -13,6 +13,10 @@
#include "sound.h"
#include "constants/songs.h"
// Cursors after this point are created using a sprite with their own task.
// This allows them to have idle animations. Cursors prior to this are simply printed text.
#define CURSOR_OBJECT_START CURSOR_RED_OUTLINE
struct UnkIndicatorsStruct
{
u8 field_0;
@@ -70,7 +74,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn
static void ListMenuPrintEntries(struct ListMenu *list, u16 startIndex, u16 yOffset, u16 count);
static void ListMenuDrawCursor(struct ListMenu *list);
static void ListMenuCallSelectionChangedCallback(struct ListMenu *list, u8 onInit);
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind);
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorObjId);
static void Task_ScrollIndicatorArrowPair(u8 taskId);
static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor);
static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor);
@@ -78,9 +82,9 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y);
static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y);
static void ListMenuRemoveRedOutlineCursorObject(u8 taskId);
static void ListMenuRemoveRedArrowCursorObject(u8 taskId);
static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind);
static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind);
static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind);
static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorObjId);
static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorObjId);
static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorObjId);
static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite);
static void SpriteCallback_RedArrowCursor(struct Sprite *sprite);
@@ -301,10 +305,10 @@ static const struct SpriteTemplate sSpriteTemplate_RedArrowCursor =
.callback = SpriteCallback_RedArrowCursor,
};
static const u16 sRedArrowPal[] = INCBIN_U16("graphics/interface/red_arrow.gbapal");
static const u32 sRedArrowOtherGfx[] = INCBIN_U32("graphics/interface/red_arrow_other.4bpp.lz");
static const u32 sSelectorOutlineGfx[] = INCBIN_U32("graphics/interface/selector_outline.4bpp.lz");
static const u32 sRedArrowGfx[] = INCBIN_U32("graphics/interface/red_arrow.4bpp.lz");
static const u16 sRedInterface_Pal[] = INCBIN_U16("graphics/interface/red.gbapal"); // Shared by all of the below gfx
static const u32 sScrollIndicator_Gfx[] = INCBIN_U32("graphics/interface/scroll_indicator.4bpp.lz");
static const u32 sOutlineCursor_Gfx[] = INCBIN_U32("graphics/interface/outline_cursor.4bpp.lz");
static const u32 sArrowCursor_Gfx[] = INCBIN_U32("graphics/interface/arrow_cursor.4bpp.lz");
// code
static void ListMenuDummyTask(u8 taskId)
@@ -477,7 +481,7 @@ void DestroyListMenuTask(u8 listTaskId, u16 *scrollOffset, u16 *selectedRow)
*selectedRow = list->selectedRow;
if (list->taskId != TASK_NONE)
ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - 2);
ListMenuRemoveCursorObject(list->taskId, list->template.cursorKind - CURSOR_OBJECT_START);
DestroyTask(listTaskId);
}
@@ -650,31 +654,33 @@ static void ListMenuDrawCursor(struct ListMenu *list)
u8 y = list->selectedRow * yMultiplier + list->template.upText_Y;
switch (list->template.cursorKind)
{
case 0:
case CURSOR_BLACK_ARROW:
ListMenuPrint(list, gText_SelectorArrow2, x, y);
break;
case 1:
case CURSOR_INVISIBLE:
break;
case 2:
case CURSOR_RED_OUTLINE:
if (list->taskId == TASK_NONE)
list->taskId = ListMenuAddCursorObject(list, 0);
list->taskId = ListMenuAddCursorObject(list, CURSOR_RED_OUTLINE - CURSOR_OBJECT_START);
ListMenuUpdateCursorObject(list->taskId,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 - 1,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1, 0);
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y - 1,
CURSOR_RED_OUTLINE - CURSOR_OBJECT_START);
break;
case 3:
case CURSOR_RED_ARROW:
if (list->taskId == TASK_NONE)
list->taskId = ListMenuAddCursorObject(list, 1);
list->taskId = ListMenuAddCursorObject(list, CURSOR_RED_ARROW - CURSOR_OBJECT_START);
ListMenuUpdateCursorObject(list->taskId,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_LEFT) * 8 + x,
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y, 1);
GetWindowAttribute(list->template.windowId, WINDOW_TILEMAP_TOP) * 8 + y,
CURSOR_RED_ARROW - CURSOR_OBJECT_START);
break;
}
}
#undef TASK_NONE
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorObjId)
{
struct CursorStruct cursor;
@@ -686,13 +692,13 @@ static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
cursor.palTag = TAG_NONE;
cursor.palNum = 15;
return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
return ListMenuAddCursorObjectInternal(&cursor, cursorObjId);
}
static void ListMenuErasePrintedCursor(struct ListMenu *list, u16 selectedRow)
{
u8 cursorKind = list->template.cursorKind;
if (cursorKind == 0)
if (cursorKind == CURSOR_BLACK_ARROW)
{
u8 yMultiplier = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + list->template.itemVerticalPadding;
u8 width = GetMenuCursorDimensionByFont(list->template.fontId, 0);
@@ -1071,18 +1077,18 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
struct ScrollIndicatorPair *data;
u8 taskId;
spriteSheet.data = sRedArrowOtherGfx;
spriteSheet.data = sScrollIndicator_Gfx;
spriteSheet.size = 0x100;
spriteSheet.tag = arrowInfo->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (arrowInfo->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20);
LoadPalette(sRedInterface_Pal, (16 * arrowInfo->palNum) + 0x100, 0x20);
}
else
{
spritePal.data = sRedArrowPal;
spritePal.data = sRedInterface_Pal;
spritePal.tag = arrowInfo->palTag;
LoadSpritePalette(&spritePal);
}
@@ -1190,39 +1196,39 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
DestroyTask(taskId);
}
static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorKind)
static u8 ListMenuAddCursorObjectInternal(struct CursorStruct *cursor, u32 cursorObjId)
{
switch (cursorKind)
switch (cursorObjId)
{
case 0:
case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
default:
return ListMenuAddRedOutlineCursorObject(cursor);
case 1:
case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
return ListMenuAddRedArrowCursorObject(cursor);
}
}
static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorKind)
static void ListMenuUpdateCursorObject(u8 taskId, u16 x, u16 y, u32 cursorObjId)
{
switch (cursorKind)
switch (cursorObjId)
{
case 0:
case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
ListMenuUpdateRedOutlineCursorObject(taskId, x, y);
break;
case 1:
case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
ListMenuUpdateRedArrowCursorObject(taskId, x, y);
break;
}
}
static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorKind)
static void ListMenuRemoveCursorObject(u8 taskId, u32 cursorObjId)
{
switch (cursorKind)
switch (cursorObjId)
{
case 0:
case CURSOR_RED_OUTLINE - CURSOR_OBJECT_START:
ListMenuRemoveRedOutlineCursorObject(taskId);
break;
case 1:
case CURSOR_RED_ARROW - CURSOR_OBJECT_START:
ListMenuRemoveRedArrowCursorObject(taskId);
break;
}
@@ -1317,18 +1323,18 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
struct SpriteTemplate spriteTemplate;
u8 taskId;
spriteSheet.data = sSelectorOutlineGfx;
spriteSheet.data = sOutlineCursor_Gfx;
spriteSheet.size = 0x100;
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
}
else
{
spritePal.data = sRedArrowPal;
spritePal.data = sRedInterface_Pal;
spritePal.tag = cursor->palTag;
LoadSpritePalette(&spritePal);
}
@@ -1402,18 +1408,18 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
struct SpriteTemplate spriteTemplate;
u8 taskId;
spriteSheet.data = sRedArrowGfx;
spriteSheet.data = sArrowCursor_Gfx;
spriteSheet.size = 0x80;
spriteSheet.tag = cursor->tileTag;
LoadCompressedSpriteSheet(&spriteSheet);
if (cursor->palTag == TAG_NONE)
{
LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
LoadPalette(sRedInterface_Pal, (16 * cursor->palNum) + 0x100, 0x20);
}
else
{
spritePal.data = sRedArrowPal;
spritePal.data = sRedInterface_Pal;
spritePal.tag = cursor->palTag;
LoadSpritePalette(&spritePal);
}
src/mail.c
+2 -2
View File
@@ -556,8 +556,8 @@ static bool8 MailReadBuildGraphics(void)
}
break;
case 10:
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 1, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyToBgTilemapBuffer(1, sMailGraphics[sMailRead->mailType].tileMap, 0, 0);
break;
case 11:
src/main_menu.c
+2 -2
View File
@@ -1121,7 +1121,7 @@ static void Task_DisplayMainMenuInvalidActionError(u8 taskId)
switch (gTasks[taskId].tCurrItem)
{
case 0:
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
switch (gTasks[taskId].tMenuType)
{
case 0:
@@ -1631,7 +1631,7 @@ static void Task_NewGameBirchSpeech_ProcessNameYesNoMenu(u8 taskId)
NewGameBirchSpeech_StartFadePlatformIn(taskId, 1);
gTasks[taskId].func = Task_NewGameBirchSpeech_SlidePlatformAway2;
break;
case -1:
case MENU_B_PRESSED:
case 1:
PlaySE(SE_SELECT);
gTasks[taskId].func = Task_NewGameBirchSpeech_BoyOrGirl;
src/mauville_old_man.c
+5 -5
View File
@@ -479,7 +479,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
song->sound = GetWordSounds(word);
GetWordPhonemes(song, MACRO1(word));
song->currWord++;
if (song->sound->var00 != 0xFF)
if (song->sound->songLengthId != 0xFF)
song->state = 0;
else
{
@@ -497,9 +497,9 @@ static void BardSing(struct Task *task, struct BardSong *song)
{
case 0:
song->phonemeTimer = song->phonemes[song->currPhoneme].length;
if (sound->var00 <= 50)
if (sound->songLengthId <= 50)
{
u8 num = sound->var00 / 3;
u8 num = sound->songLengthId / 3;
m4aSongNumStart(PH_TRAP_HELD + 3 * num);
}
song->state = 2;
@@ -507,7 +507,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
break;
case 2:
song->state = 1;
if (sound->var00 <= 50)
if (sound->songLengthId <= 50)
{
song->volume = 0x100 + sound->volume * 16;
m4aMPlayVolumeControl(&gMPlayInfo_SE2, TRACKS_ALL, song->volume);
@@ -529,7 +529,7 @@ static void BardSing(struct Task *task, struct BardSong *song)
if (song->phonemeTimer == 0)
{
song->currPhoneme++;
if (song->currPhoneme != 6 && song->sound[song->currPhoneme].var00 != 0xFF)
if (song->currPhoneme != 6 && song->sound[song->currPhoneme].songLengthId != 0xFF)
song->state = 0;
else
{
src/menu_specialized.c
+7 -7
View File
@@ -187,7 +187,7 @@ static const struct ListMenuTemplate sMoveRelearnerMovesListTemplate =
.itemVerticalPadding = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
//--------------
@@ -284,7 +284,7 @@ u8 MailboxMenu_CreateList(struct PlayerPCItemPageStruct *page)
gMultiuseListMenuTemplate.moveCursorFunc = MailboxMenu_MoveCursorFunc;
gMultiuseListMenuTemplate.itemPrintFunc = MailboxMenu_ItemPrintFunc;
gMultiuseListMenuTemplate.fontId = FONT_NORMAL;
gMultiuseListMenuTemplate.cursorKind = 0;
gMultiuseListMenuTemplate.cursorKind = CURSOR_BLACK_ARROW;
gMultiuseListMenuTemplate.lettersSpacing = 0;
gMultiuseListMenuTemplate.itemVerticalPadding = 0;
gMultiuseListMenuTemplate.scrollMultiple = LIST_NO_MULTIPLE_SCROLL;
@@ -1539,7 +1539,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
0,
15 * i,
color,
-1,
TEXT_SKIP_DRAW,
sLvlUpStatStrings[i]);
StringCopy(text, (statsDiff[i] >= 0) ? gText_Plus : gText_Dash);
@@ -1548,7 +1548,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
56,
15 * i,
color,
-1,
TEXT_SKIP_DRAW,
text);
if (abs(statsDiff[i]) <= 9)
x = 18;
@@ -1561,7 +1561,7 @@ void DrawLevelUpWindowPg1(u16 windowId, u16 *statsBefore, u16 *statsAfter, u8 bg
56 + x,
15 * i,
color,
-1,
TEXT_SKIP_DRAW,
text);
}
}
@@ -1603,7 +1603,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
0,
15 * i,
color,
-1,
TEXT_SKIP_DRAW,
sLvlUpStatStrings[i]);
AddTextPrinterParameterized3(windowId,
@@ -1611,7 +1611,7 @@ void DrawLevelUpWindowPg2(u16 windowId, u16 *currStats, u8 bgClr, u8 fgClr, u8 s
56 + x,
15 * i,
color,
-1,
TEXT_SKIP_DRAW,
text);
}
}
src/move_relearner.c
+7 -7
View File
@@ -553,7 +553,7 @@ static void DoMoveRelearnerMain(void)
gSpecialVar_0x8004 = FALSE;
sMoveRelearnerStruct->state = MENU_STATE_FADE_AND_RETURN;
}
else if (selection == -1 || selection == 1)
else if (selection == MENU_B_PRESSED || selection == 1)
{
if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
{
@@ -579,14 +579,14 @@ static void DoMoveRelearnerMain(void)
break;
case MENU_STATE_CONFIRM_DELETE_OLD_MOVE:
{
s8 var = Menu_ProcessInputNoWrapClearOnChoose();
s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
if (var == 0)
if (selection == 0)
{
PrintMessageWithPlaceholders(gText_MoveRelearnerWhichMoveToForget);
sMoveRelearnerStruct->state = MENU_STATE_PRINT_WHICH_MOVE_PROMPT;
}
else if (var == -1 || var == 1)
else if (selection == MENU_B_PRESSED || selection == 1)
{
sMoveRelearnerStruct->state = MENU_STATE_PRINT_STOP_TEACHING;
}
@@ -606,13 +606,13 @@ static void DoMoveRelearnerMain(void)
break;
case MENU_STATE_CONFIRM_STOP_TEACHING:
{
s8 var = Menu_ProcessInputNoWrapClearOnChoose();
s8 selection = Menu_ProcessInputNoWrapClearOnChoose();
if (var == 0)
if (selection == 0)
{
sMoveRelearnerStruct->state = MENU_STATE_CHOOSE_SETUP_STATE;
}
else if (var == MENU_B_PRESSED || var == 1)
else if (selection == MENU_B_PRESSED || selection == 1)
{
// What's the point? It gets set to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT, anyway.
if (sMoveRelearnerMenuSate.showContestInfo == FALSE)
src/mystery_event_menu.c
+1 -1
View File
@@ -95,7 +95,7 @@ void CB2_InitMysteryEventMenu(void)
for (i = 0; i < (int)ARRAY_COUNT(sWindowTemplates) - 1; i++)
FillWindowPixelBuffer(i, PIXEL_FILL(0));
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14);
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
LoadUserWindowBorderGfx(0, 1u, 0xD0u);
Menu_LoadStdPalAt(0xE0);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON);
src/mystery_gift.c
+2 -2
View File
@@ -27,7 +27,7 @@ static void IncrementCardStatForNewTrainer(u32, u32, u32 *, int);
void ClearMysteryGift(void)
{
CpuFill32(0, &gSaveBlock1Ptr->mysteryGift, sizeof(gSaveBlock1Ptr->mysteryGift));
ClearSavedWonderNewsMetadata(); // Clear is redundant, InitSavedWonderNews would be sufficient
ClearSavedWonderNewsMetadata(); // Clear is redundant, WonderNews_Reset would be sufficient
InitQuestionnaireWords();
}
@@ -109,7 +109,7 @@ static void ClearSavedWonderNews(void)
static void ClearSavedWonderNewsMetadata(void)
{
CpuFill32(0, GetSavedWonderNewsMetadata(), sizeof(gSaveBlock1Ptr->mysteryGift.newsMetadata));
InitSavedWonderNews();
WonderNews_Reset();
}
bool32 IsWonderNewsSameAsSaved(const u8 *news)
src/mystery_gift_menu.c
+18 -18
View File
@@ -108,7 +108,7 @@ static const struct WindowTemplate sMainWindows[] = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 0,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 2,
.paletteNum = 12,
.baseBlock = 0x0013
@@ -126,7 +126,7 @@ static const struct WindowTemplate sMainWindows[] = {
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 15,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 5,
.paletteNum = 13,
.baseBlock = 0x004f
@@ -242,9 +242,9 @@ static const struct ListMenuTemplate sListMenuTemplate_ThreeOptions = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct ListMenuItem sListMenuItems_ReceiveSendToss[] = {
@@ -287,9 +287,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveSendToss = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct ListMenuTemplate sListMenu_ReceiveToss = {
@@ -308,9 +308,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveToss = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct ListMenuTemplate sListMenu_ReceiveSend = {
@@ -329,9 +329,9 @@ static const struct ListMenuTemplate sListMenu_ReceiveSend = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const struct ListMenuTemplate sListMenu_Receive = {
@@ -350,9 +350,9 @@ static const struct ListMenuTemplate sListMenu_Receive = {
.cursorShadowPal = 3,
.lettersSpacing = 0,
.itemVerticalPadding = 0,
.scrollMultiple = 0,
.scrollMultiple = LIST_NO_MULTIPLE_SCROLL,
.fontId = FONT_NORMAL,
.cursorKind = 0
.cursorKind = CURSOR_BLACK_ARROW
};
static const u8 *const sUnusedMenuTexts[] = {
@@ -649,8 +649,8 @@ static u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whi
width++;
windowTemplate.width = width;
if (width < 30)
windowTemplate.tilemapLeft = (30 - width) / 2;
if (width < DISPLAY_TILE_WIDTH)
windowTemplate.tilemapLeft = (DISPLAY_TILE_WIDTH - width) / 2;
else
windowTemplate.tilemapLeft = 0;
@@ -1267,7 +1267,7 @@ static void Task_MysteryGift(u8 taskId)
data->state = MG_STATE_CLIENT_LINK_END;
break;
case CLI_RET_COPY_MSG:
memcpy(data->clientMsg, MysteryGiftClient_GetMsg(), 0x40);
memcpy(data->clientMsg, MysteryGiftClient_GetMsg(), CLIENT_MAX_MSG_SIZE);
MysteryGiftClient_AdvanceState();
break;
case CLI_RET_PRINT_MSG:
@@ -1380,9 +1380,9 @@ static void Task_MysteryGift(u8 taskId)
if (data->msgId == CLI_MSG_NEWS_RECEIVED)
{
if (data->sourceIsFriend == TRUE)
GenerateRandomWonderNews(WONDER_NEWS_RECV_FRIEND);
WonderNews_SetReward(WONDER_NEWS_RECV_FRIEND);
else
GenerateRandomWonderNews(WONDER_NEWS_RECV_WIRELESS);
WonderNews_SetReward(WONDER_NEWS_RECV_WIRELESS);
}
if (!successMsg)
{
@@ -1589,7 +1589,7 @@ static void Task_MysteryGift(u8 taskId)
{
if (data->sourceIsFriend == TRUE && data->msgId == SVR_MSG_NEWS_SENT)
{
GenerateRandomWonderNews(WONDER_NEWS_SENT);
WonderNews_SetReward(WONDER_NEWS_SENT);
data->state = MG_STATE_SAVE_LOAD_GIFT;
}
else
src/mystery_gift_scripts.c
+1 -1
View File
@@ -172,7 +172,7 @@ static const struct MysteryGiftServerCmd sServerScript_TossPrompt[] = {
{SVR_SEND},
{SVR_RECV, MG_LINKID_RESPONSE},
{SVR_READ_RESPONSE},
{SVR_GOTO_IF_EQ, FALSE, sServerScript_SendCard}, // Tossed old card, send new one
{SVR_GOTO_IF_EQ, FALSE, sServerScript_SendCard}, // Tossed old card, send new one
{SVR_GOTO, .ptr = sServerScript_ClientCanceledCard} // Kept old card, cancel new one
};
src/mystery_gift_view.c
+18 -18
View File
@@ -226,9 +226,9 @@ s32 WonderCard_Enter(void)
return 0;
break;
case 2:
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
@@ -244,7 +244,7 @@ s32 WonderCard_Enter(void)
gPaletteFade.bufferTransferDisabled = TRUE;
LoadPalette(sWonderCardData->gfx->pal, 0x10, 0x20);
LZ77UnCompWram(sWonderCardData->gfx->map, sWonderCardData->bgTilemapBuffer);
CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, 30, 20, 0, 0, 30, 20, 1, 0x008, 0);
CopyRectToBgTilemapBufferRect(2, sWonderCardData->bgTilemapBuffer, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT, 1, 0x008, 0);
CopyBgTilemapBufferToVram(2);
break;
case 4:
@@ -291,9 +291,9 @@ s32 WonderCard_Exit(bool32 useCancel)
return 0;
break;
case 2:
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
@@ -595,7 +595,7 @@ static const struct WindowTemplate sNews_WindowTemplates[] = {
.tilemapLeft = 1,
.tilemapTop = 3,
.width = 28,
.height = 20,
.height = DISPLAY_TILE_HEIGHT,
.paletteNum = 2,
.baseBlock = 0x07C
}
@@ -688,10 +688,10 @@ s32 WonderNews_Enter(void)
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
break;
case 2:
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
@@ -707,8 +707,8 @@ s32 WonderNews_Enter(void)
gPaletteFade.bufferTransferDisabled = TRUE;
LoadPalette(sWonderNewsData->gfx->pal, 0x10, 0x20);
LZ77UnCompWram(sWonderNewsData->gfx->map, sWonderNewsData->bgTilemapBuffer);
CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, 30, 3, 0, 0, 30, 3, 1, 8, 0);
CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, 30, 23, 0, 3, 30, 23, 1, 8, 0);
CopyRectToBgTilemapBufferRect(1, sWonderNewsData->bgTilemapBuffer, 0, 0, DISPLAY_TILE_WIDTH, 3, 0, 0, DISPLAY_TILE_WIDTH, 3, 1, 8, 0);
CopyRectToBgTilemapBufferRect(3, sWonderNewsData->bgTilemapBuffer, 0, 3, DISPLAY_TILE_WIDTH, 3 + DISPLAY_TILE_HEIGHT, 0, 3, DISPLAY_TILE_WIDTH, 3 + DISPLAY_TILE_HEIGHT, 1, 8, 0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(3);
break;
@@ -760,10 +760,10 @@ s32 WonderNews_Exit(bool32 useCancel)
ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON);
break;
case 2:
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, 30, 24);
FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, 30, 24);
FillBgTilemapBufferRect_Palette0(0, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT);
FillBgTilemapBufferRect_Palette0(2, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT + 4);
FillBgTilemapBufferRect_Palette0(3, 0x000, 0, 0, DISPLAY_TILE_WIDTH, DISPLAY_TILE_HEIGHT + 4);
CopyBgTilemapBufferToVram(0);
CopyBgTilemapBufferToVram(1);
CopyBgTilemapBufferToVram(2);
src/naming_screen.c
+21 -1
View File
@@ -267,7 +267,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
.bg = 0,
.tilemapLeft = 0,
.tilemapTop = 0,
.width = 30,
.width = DISPLAY_TILE_WIDTH,
.height = 2,
.paletteNum = 11,
.baseBlock = 0x074
@@ -2179,6 +2179,12 @@ static const struct OamData sOam_32x16 =
.paletteNum = 0,
};
/*
[0_____][] <-1 40x32
[2_____][] <-3
[4___+_][] <-5/Origin
[6 ][] <-7
*/
static const struct Subsprite sSubsprites_PageSwapFrame[] =
{
{
@@ -2247,6 +2253,10 @@ static const struct Subsprite sSubsprites_PageSwapFrame[] =
}
};
/*
[0_][] <-1 24x8
^-- Origin
*/
static const struct Subsprite sSubsprites_PageSwapText[] =
{
{
@@ -2267,6 +2277,11 @@ static const struct Subsprite sSubsprites_PageSwapText[] =
}
};
/*
[0_____][] <-1 40x24
[2_____][] <-3
[4___+_][] <-5/Origin
*/
static const struct Subsprite sSubsprites_Button[] =
{
{
@@ -2319,6 +2334,11 @@ static const struct Subsprite sSubsprites_Button[] =
}
};
/*
[0_] 16x24
[1+] <--Origin
[2_]
*/
static const struct Subsprite sSubsprites_PCIcon[] =
{
{
src/new_game.c
+2 -1
View File
@@ -44,6 +44,7 @@
#include "berry_powder.h"
#include "mystery_gift.h"
#include "union_room_chat.h"
#include "constants/items.h"
extern const u8 EventScript_ResetAllMapFlags[];
@@ -181,7 +182,7 @@ void NewGameInitData(void)
ResetPokemonStorageSystem();
ClearRoamerData();
ClearRoamerLocationData();
gSaveBlock1Ptr->registeredItem = 0;
gSaveBlock1Ptr->registeredItem = ITEM_NONE;
ClearBag();
NewGameInitPCItems();
ClearPokeblocks();

Some files were not shown because too many files have changed in this diff Show More