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

Clean up pokemon/ball/dex mentions in comments

Browse Source
This commit is contained in:
Bassoonian
2023-12-12 19:02:36 +01:00
parent e4149e83f8
commit e5ac2fe0b1
73 changed files with 228 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/data/bard_music/bard_sounds.h
View File

@@ -25,7 +25,7 @@
#include "trendysaying.h"
const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
[EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokemon
[EC_GROUP_POKEMON] = NULL, // Handled by gBardSounds_Pokémon
[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_Pokemon
[EC_GROUP_POKEMON_NATIONAL] = NULL // Handled by gBardSounds_Pokémon
};
#endif //GUARD_BARD_SOUNDS_TABLE_H

2
src/data/battle_frontier/battle_frontier_trainer_mons.h
View File

@@ -4172,7 +4172,7 @@
FRONTIER_MON_##lastmon##_10,\
-1
// The strong Psychic M/F trainers all use the below pokemon
// The strong Psychic M/F trainers all use the below Pokémon
// Additionally they use 1 of 3 legendary trios, and Latios or Latias depending on gender
#define FRONTIER_MONS_PSYCHIC_2(lati, legend1, legend2, legend3) \
FRONTIER_MON_WOBBUFFET_1, \

6
src/data/party_menu.h
View File

@@ -64,7 +64,7 @@ static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
// Each layout array has an array for each of the 6 party slots
// The array for each slot has the sprite coords of its various sprites in the following order
// Pokemon icon (x, y), held item (x, y), status condition (x, y), menu pokeball (x, y)
// Pokémon icon (x, y), held item (x, y), status condition (x, y), menu Poké Ball (x, y)
static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
{
[PARTY_LAYOUT_SINGLE] =
@@ -902,7 +902,7 @@ static const struct CompressedSpritePalette sSpritePalette_MenuPokeball =
gPartyMenuPokeball_Pal, TAG_POKEBALL
};
// Used for the pokeball sprite on each party slot / Cancel button
// Used for the Poké Ball sprite on each party slot / Cancel button
static const struct SpriteTemplate sSpriteTemplate_MenuPokeball =
{
.tileTag = TAG_POKEBALL,
@@ -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_MenuPokeball is used
// Used for the pokeball sprite next to Cancel and Confirm when both are present, otherwise sSpriteTemplate_MenuPoké Ball is used
static const struct SpriteTemplate sSpriteTemplate_MenuPokeballSmall =
{
.tileTag = TAG_POKEBALL_SMALL,

2
src/data/pokemon/pokedex_orders.h
View File

@@ -25,7 +25,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_OLD_UNOWN_X,
NATIONAL_DEX_OLD_UNOWN_Y,
NATIONAL_DEX_OLD_UNOWN_Z,
// Actual pokemon start here.
// Actual Pokémon start here.
NATIONAL_DEX_ABRA,
NATIONAL_DEX_ABSOL,
NATIONAL_DEX_AERODACTYL,