Fix accidental symbol replacements
This commit is contained in:
parent
e5ac2fe0b1
commit
bc2a745171
7 changed files with 9 additions and 9 deletions
|
@ -1315,7 +1315,7 @@ static void HBlankCB_Shuffle(void)
|
|||
#undef tAmplitude
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// B_TRANSITION_BIG_Poké Ball, B_TRANSITION_AQUA, B_TRANSITION_MAGMA,
|
||||
// B_TRANSITION_BIG_POKEBALL, B_TRANSITION_AQUA, B_TRANSITION_MAGMA,
|
||||
// B_TRANSITION_REGICE, B_TRANSITION_REGISTEEL, B_TRANSITION_REGIROCK
|
||||
// and B_TRANSITION_KYOGRE.
|
||||
//
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include "trendysaying.h"
|
||||
|
||||
const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
|
||||
[EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokémon
|
||||
[EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon
|
||||
[EC_GROUP_TRAINER] = gBardSounds_Trainer,
|
||||
[EC_GROUP_STATUS] = gBardSounds_Status,
|
||||
[EC_GROUP_BATTLE] = gBardSounds_Battle,
|
||||
|
@ -46,7 +46,7 @@ const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
|
|||
[EC_GROUP_MOVE_1] = NULL, // Handled by gBardSounds_Moves
|
||||
[EC_GROUP_MOVE_2] = NULL, // Handled by gBardSounds_Moves
|
||||
[EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying,
|
||||
[EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokémon
|
||||
[EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokemon
|
||||
};
|
||||
|
||||
#endif //GUARD_BARD_SOUNDS_TABLE_H
|
||||
|
|
|
@ -983,7 +983,7 @@ static const struct CompressedSpriteSheet sSpriteSheet_MenuPokeballSmall =
|
|||
gPartyMenuPokeballSmall_Gfx, 0x0300, TAG_POKEBALL_SMALL
|
||||
};
|
||||
|
||||
// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPoké Ball is used
|
||||
// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPokeball is used
|
||||
static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall =
|
||||
{
|
||||
.tileTag = TAG_POKEBALL_SMALL,
|
||||
|
|
|
@ -3512,7 +3512,7 @@ static void CursorCb_SendMon(u8 taskId)
|
|||
}
|
||||
else
|
||||
{
|
||||
// gStringVar4 below is the error message buffered by TrySwitchInPokémon
|
||||
// gStringVar4 below is the error message buffered by TrySwitchInPokemon
|
||||
PartyMenuRemoveWindow(&sPartyMenuInternal->windowId[1]);
|
||||
DisplayPartyMenuMessage(gStringVar4, TRUE);
|
||||
gTasks[taskId].func = Task_ReturnToChooseMonAfterText;
|
||||
|
|
|
@ -98,7 +98,7 @@ static const struct CombinedMove sCombinedMoves[2] =
|
|||
};
|
||||
|
||||
// NOTE: The order of the elements in the 3 arrays below is irrelevant.
|
||||
// To reorder the pokedex, see the values in include/constants/Pokédex.h.
|
||||
// To reorder the pokedex, see the values in include/constants/pokedex.h.
|
||||
|
||||
#define SPECIES_TO_HOENN(name) [SPECIES_##name - 1] = HOENN_DEX_##name
|
||||
#define SPECIES_TO_NATIONAL(name) [SPECIES_##name - 1] = NATIONAL_DEX_##name
|
||||
|
|
|
@ -6687,8 +6687,8 @@ static void LoadSavedMovingMon(void)
|
|||
{
|
||||
if (sIsMonBeingMoved)
|
||||
{
|
||||
// If it came from the party load a struct Pokémon,
|
||||
// otherwise load a BoxPokémon
|
||||
// If it came from the party load a struct Pokemon,
|
||||
// otherwise load a BoxPokemon
|
||||
if (sMovingMonOrigBoxId == TOTAL_BOXES_COUNT)
|
||||
sStorage->movingMon = sSavedMovingMon;
|
||||
else
|
||||
|
|
|
@ -367,7 +367,7 @@ static void VblankCB_StarterChoose(void)
|
|||
#define tPkmnSpriteId data[1]
|
||||
#define tCircleSpriteId data[2]
|
||||
|
||||
// Data for sSpriteTemplate_Poké Ball
|
||||
// Data for sSpriteTemplate_Pokeball
|
||||
#define sTaskId data[0]
|
||||
#define sBallId data[1]
|
||||
|
||||
|
|
Loading…
Reference in a new issue