mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-13 17:22:25 +01:00
Use proper symbol name styles for Jangmo-o family (#2739)
This commit is contained in:
commit
deb3109c81
@ -867,9 +867,9 @@ extern const u32 gMonFrontPic_Mimikyu[];
|
||||
extern const u32 gMonFrontPic_Bruxish[];
|
||||
extern const u32 gMonFrontPic_Drampa[];
|
||||
extern const u32 gMonFrontPic_Dhelmise[];
|
||||
extern const u32 gMonFrontPic_Jangmoo[];
|
||||
extern const u32 gMonFrontPic_Hakamoo[];
|
||||
extern const u32 gMonFrontPic_Kommoo[];
|
||||
extern const u32 gMonFrontPic_JangmoO[];
|
||||
extern const u32 gMonFrontPic_HakamoO[];
|
||||
extern const u32 gMonFrontPic_KommoO[];
|
||||
extern const u32 gMonFrontPic_TapuKoko[];
|
||||
extern const u32 gMonFrontPic_TapuLele[];
|
||||
extern const u32 gMonFrontPic_TapuBulu[];
|
||||
@ -2081,9 +2081,9 @@ extern const u32 gMonBackPic_Mimikyu[];
|
||||
extern const u32 gMonBackPic_Bruxish[];
|
||||
extern const u32 gMonBackPic_Drampa[];
|
||||
extern const u32 gMonBackPic_Dhelmise[];
|
||||
extern const u32 gMonBackPic_Jangmoo[];
|
||||
extern const u32 gMonBackPic_Hakamoo[];
|
||||
extern const u32 gMonBackPic_Kommoo[];
|
||||
extern const u32 gMonBackPic_JangmoO[];
|
||||
extern const u32 gMonBackPic_HakamoO[];
|
||||
extern const u32 gMonBackPic_KommoO[];
|
||||
extern const u32 gMonBackPic_TapuKoko[];
|
||||
extern const u32 gMonBackPic_TapuLele[];
|
||||
extern const u32 gMonBackPic_TapuBulu[];
|
||||
@ -3287,9 +3287,9 @@ extern const u32 gMonPalette_Mimikyu[];
|
||||
extern const u32 gMonPalette_Bruxish[];
|
||||
extern const u32 gMonPalette_Drampa[];
|
||||
extern const u32 gMonPalette_Dhelmise[];
|
||||
extern const u32 gMonPalette_Jangmoo[];
|
||||
extern const u32 gMonPalette_Hakamoo[];
|
||||
extern const u32 gMonPalette_Kommoo[];
|
||||
extern const u32 gMonPalette_JangmoO[];
|
||||
extern const u32 gMonPalette_HakamoO[];
|
||||
extern const u32 gMonPalette_KommoO[];
|
||||
extern const u32 gMonPalette_TapuKoko[];
|
||||
extern const u32 gMonPalette_TapuLele[];
|
||||
extern const u32 gMonPalette_TapuBulu[];
|
||||
@ -4520,9 +4520,9 @@ extern const u32 gMonShinyPalette_Mimikyu[];
|
||||
extern const u32 gMonShinyPalette_Bruxish[];
|
||||
extern const u32 gMonShinyPalette_Drampa[];
|
||||
extern const u32 gMonShinyPalette_Dhelmise[];
|
||||
extern const u32 gMonShinyPalette_Jangmoo[];
|
||||
extern const u32 gMonShinyPalette_Hakamoo[];
|
||||
extern const u32 gMonShinyPalette_Kommoo[];
|
||||
extern const u32 gMonShinyPalette_JangmoO[];
|
||||
extern const u32 gMonShinyPalette_HakamoO[];
|
||||
extern const u32 gMonShinyPalette_KommoO[];
|
||||
extern const u32 gMonShinyPalette_TapuKoko[];
|
||||
extern const u32 gMonShinyPalette_TapuLele[];
|
||||
extern const u32 gMonShinyPalette_TapuBulu[];
|
||||
@ -5747,9 +5747,9 @@ extern const u8 gMonIcon_Mimikyu[];
|
||||
extern const u8 gMonIcon_Bruxish[];
|
||||
extern const u8 gMonIcon_Drampa[];
|
||||
extern const u8 gMonIcon_Dhelmise[];
|
||||
extern const u8 gMonIcon_Jangmoo[];
|
||||
extern const u8 gMonIcon_Hakamoo[];
|
||||
extern const u8 gMonIcon_Kommoo[];
|
||||
extern const u8 gMonIcon_JangmoO[];
|
||||
extern const u8 gMonIcon_HakamoO[];
|
||||
extern const u8 gMonIcon_KommoO[];
|
||||
extern const u8 gMonIcon_TapuKoko[];
|
||||
extern const u8 gMonIcon_TapuLele[];
|
||||
extern const u8 gMonIcon_TapuBulu[];
|
||||
@ -6960,9 +6960,9 @@ extern const u8 gMonFootprint_Mimikyu[];
|
||||
extern const u8 gMonFootprint_Bruxish[];
|
||||
extern const u8 gMonFootprint_Drampa[];
|
||||
extern const u8 gMonFootprint_Dhelmise[];
|
||||
extern const u8 gMonFootprint_Jangmo_o[];
|
||||
extern const u8 gMonFootprint_Hakamo_o[];
|
||||
extern const u8 gMonFootprint_Kommo_o[];
|
||||
extern const u8 gMonFootprint_JangmoO[];
|
||||
extern const u8 gMonFootprint_HakamoO[];
|
||||
extern const u8 gMonFootprint_KommoO[];
|
||||
extern const u8 gMonFootprint_Tapu_Koko[];
|
||||
extern const u8 gMonFootprint_Tapu_Lele[];
|
||||
extern const u8 gMonFootprint_Tapu_Bulu[];
|
||||
|
@ -1126,9 +1126,9 @@ gCryTable::
|
||||
cry Cry_Bruxish
|
||||
cry Cry_Drampa
|
||||
cry Cry_Dhelmise
|
||||
cry Cry_Jangmoo
|
||||
cry Cry_Hakamoo
|
||||
cry Cry_Kommoo
|
||||
cry Cry_JangmoO
|
||||
cry Cry_HakamoO
|
||||
cry Cry_KommoO
|
||||
cry Cry_TapuKoko
|
||||
cry Cry_TapuLele
|
||||
cry Cry_TapuBulu
|
||||
@ -3248,9 +3248,9 @@ gCryTable_Reverse::
|
||||
cry_reverse Cry_Bruxish
|
||||
cry_reverse Cry_Drampa
|
||||
cry_reverse Cry_Dhelmise
|
||||
cry_reverse Cry_Jangmoo
|
||||
cry_reverse Cry_Hakamoo
|
||||
cry_reverse Cry_Kommoo
|
||||
cry_reverse Cry_JangmoO
|
||||
cry_reverse Cry_HakamoO
|
||||
cry_reverse Cry_KommoO
|
||||
cry_reverse Cry_TapuKoko
|
||||
cry_reverse Cry_TapuLele
|
||||
cry_reverse Cry_TapuBulu
|
||||
|
@ -3518,15 +3518,15 @@ Cry_Dhelmise::
|
||||
.incbin "sound/direct_sound_samples/cries/dhelmise.bin"
|
||||
|
||||
.align 2
|
||||
Cry_Jangmoo::
|
||||
Cry_JangmoO::
|
||||
.incbin "sound/direct_sound_samples/cries/jangmo_o.bin"
|
||||
|
||||
.align 2
|
||||
Cry_Hakamoo::
|
||||
Cry_HakamoO::
|
||||
.incbin "sound/direct_sound_samples/cries/hakamo_o.bin"
|
||||
|
||||
.align 2
|
||||
Cry_Kommoo::
|
||||
Cry_KommoO::
|
||||
.incbin "sound/direct_sound_samples/cries/kommo_o.bin"
|
||||
|
||||
.align 2
|
||||
|
@ -800,9 +800,9 @@ const u32 gMonFrontPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/front.4b
|
||||
const u32 gMonFrontPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/front.4bpp.lz");
|
||||
const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/anim_front.4bpp.lz");
|
||||
const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/anim_front.4bpp.lz");
|
||||
@ -2012,9 +2012,9 @@ const u32 gMonBackPic_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/back.4bpp
|
||||
const u32 gMonBackPic_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/back.4bpp.lz");
|
||||
const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz");
|
||||
const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz");
|
||||
const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz");
|
||||
@ -3218,9 +3218,9 @@ const u32 gMonPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/normal.gb
|
||||
const u32 gMonPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/normal.gbapal.lz");
|
||||
const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz");
|
||||
const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz");
|
||||
const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz");
|
||||
@ -4451,9 +4451,9 @@ const u32 gMonShinyPalette_Mimikyu[] = INCBIN_U32("graphics/pokemon/mimikyu/shin
|
||||
const u32 gMonShinyPalette_Bruxish[] = INCBIN_U32("graphics/pokemon/bruxish/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Drampa[] = INCBIN_U32("graphics/pokemon/drampa/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Jangmoo[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Hakamoo[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_Kommoo[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_JangmoO[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_HakamoO[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_KommoO[] = INCBIN_U32("graphics/pokemon/kommo_o/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz");
|
||||
const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz");
|
||||
@ -5678,9 +5678,9 @@ const u8 gMonIcon_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/icon.4bpp");
|
||||
const u8 gMonIcon_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/icon.4bpp");
|
||||
const u8 gMonIcon_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/icon.4bpp");
|
||||
const u8 gMonIcon_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/icon.4bpp");
|
||||
const u8 gMonIcon_Jangmoo[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp");
|
||||
const u8 gMonIcon_Hakamoo[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp");
|
||||
const u8 gMonIcon_Kommoo[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp");
|
||||
const u8 gMonIcon_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp");
|
||||
const u8 gMonIcon_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp");
|
||||
const u8 gMonIcon_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/icon.4bpp");
|
||||
const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp");
|
||||
const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp");
|
||||
const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp");
|
||||
@ -6891,9 +6891,9 @@ const u8 gMonFootprint_Mimikyu[] = INCBIN_U8("graphics/pokemon/mimikyu/footprint
|
||||
const u8 gMonFootprint_Bruxish[] = INCBIN_U8("graphics/pokemon/bruxish/footprint.1bpp");
|
||||
const u8 gMonFootprint_Drampa[] = INCBIN_U8("graphics/pokemon/drampa/footprint.1bpp");
|
||||
const u8 gMonFootprint_Dhelmise[] = INCBIN_U8("graphics/pokemon/dhelmise/footprint.1bpp");
|
||||
const u8 gMonFootprint_Jangmo_o[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_Hakamo_o[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_Kommo_o[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_JangmoO[] = INCBIN_U8("graphics/pokemon/jangmo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_HakamoO[] = INCBIN_U8("graphics/pokemon/hakamo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_KommoO[] = INCBIN_U8("graphics/pokemon/kommo_o/footprint.1bpp");
|
||||
const u8 gMonFootprint_Tapu_Koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/footprint.1bpp");
|
||||
const u8 gMonFootprint_Tapu_Lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/footprint.1bpp");
|
||||
const u8 gMonFootprint_Tapu_Bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/footprint.1bpp");
|
||||
|
@ -789,9 +789,9 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
|
||||
[SPECIES_BRUXISH] = sBruxishLevelUpLearnset,
|
||||
[SPECIES_DRAMPA] = sDrampaLevelUpLearnset,
|
||||
[SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset,
|
||||
[SPECIES_JANGMO_O] = sJangmooLevelUpLearnset,
|
||||
[SPECIES_HAKAMO_O] = sHakamooLevelUpLearnset,
|
||||
[SPECIES_KOMMO_O] = sKommooLevelUpLearnset,
|
||||
[SPECIES_JANGMO_O] = sJangmoOLevelUpLearnset,
|
||||
[SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset,
|
||||
[SPECIES_KOMMO_O] = sKommoOLevelUpLearnset,
|
||||
[SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset,
|
||||
[SPECIES_TAPU_LELE] = sTapuLeleLevelUpLearnset,
|
||||
[SPECIES_TAPU_BULU] = sTapuBuluLevelUpLearnset,
|
||||
|
@ -15960,7 +15960,7 @@ static const struct LevelUpMove sDhelmiseLevelUpLearnset[] = {
|
||||
LEVEL_UP_END
|
||||
};
|
||||
|
||||
static const struct LevelUpMove sJangmooLevelUpLearnset[] = {
|
||||
static const struct LevelUpMove sJangmoOLevelUpLearnset[] = {
|
||||
LEVEL_UP_MOVE( 1, MOVE_TACKLE),
|
||||
LEVEL_UP_MOVE( 5, MOVE_LEER),
|
||||
LEVEL_UP_MOVE( 9, MOVE_BIDE),
|
||||
@ -15978,7 +15978,7 @@ static const struct LevelUpMove sJangmooLevelUpLearnset[] = {
|
||||
LEVEL_UP_END
|
||||
};
|
||||
|
||||
static const struct LevelUpMove sHakamooLevelUpLearnset[] = {
|
||||
static const struct LevelUpMove sHakamoOLevelUpLearnset[] = {
|
||||
LEVEL_UP_MOVE( 0, MOVE_SKY_UPPERCUT),
|
||||
LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT),
|
||||
LEVEL_UP_MOVE( 1, MOVE_AUTOTOMIZE),
|
||||
@ -16003,7 +16003,7 @@ static const struct LevelUpMove sHakamooLevelUpLearnset[] = {
|
||||
LEVEL_UP_END
|
||||
};
|
||||
|
||||
static const struct LevelUpMove sKommooLevelUpLearnset[] = {
|
||||
static const struct LevelUpMove sKommoOLevelUpLearnset[] = {
|
||||
LEVEL_UP_MOVE( 0, MOVE_CLANGING_SCALES),
|
||||
LEVEL_UP_MOVE( 1, MOVE_CLANGING_SCALES),
|
||||
LEVEL_UP_MOVE( 1, MOVE_SKY_UPPERCUT),
|
||||
|
@ -9396,7 +9396,7 @@ const struct PokedexEntry gPokedexEntries[] =
|
||||
.categoryName = _("Scaly"),
|
||||
.height = 6,
|
||||
.weight = 297,
|
||||
.description = gJangmooPokedexText,
|
||||
.description = gJangmoOPokedexText,
|
||||
.pokemonScale = 356,
|
||||
.pokemonOffset = 17,
|
||||
.trainerScale = 256,
|
||||
@ -9408,7 +9408,7 @@ const struct PokedexEntry gPokedexEntries[] =
|
||||
.categoryName = _("Scaly"),
|
||||
.height = 12,
|
||||
.weight = 470,
|
||||
.description = gHakamooPokedexText,
|
||||
.description = gHakamoOPokedexText,
|
||||
.pokemonScale = 356,
|
||||
.pokemonOffset = 17,
|
||||
.trainerScale = 256,
|
||||
@ -9420,7 +9420,7 @@ const struct PokedexEntry gPokedexEntries[] =
|
||||
.categoryName = _("Scaly"),
|
||||
.height = 16,
|
||||
.weight = 782,
|
||||
.description = gKommooPokedexText,
|
||||
.description = gKommoOPokedexText,
|
||||
.pokemonScale = 356,
|
||||
.pokemonOffset = 17,
|
||||
.trainerScale = 256,
|
||||
|
@ -4697,19 +4697,19 @@ const u8 gDhelmisePokedexText[] = _(
|
||||
"It maintains itself with new infusions of\n"
|
||||
"seabed detritus and seaweed.");
|
||||
|
||||
const u8 gJangmooPokedexText[] = _(
|
||||
const u8 gJangmoOPokedexText[] = _(
|
||||
"It expresses its feelings by smacking its\n"
|
||||
"scales. Metallic sounds echo through the\n"
|
||||
"tall mountains where Jangmo-o live. They\n"
|
||||
"grow little by little battling one another.");
|
||||
|
||||
const u8 gHakamooPokedexText[] = _(
|
||||
const u8 gHakamoOPokedexText[] = _(
|
||||
"It sheds and regrows its scales on a\n"
|
||||
"continuous basis. The scales become\n"
|
||||
"harder each time they're regrown. Its\n"
|
||||
"scaly punches tear its foes to shreds.");
|
||||
|
||||
const u8 gKommooPokedexText[] = _(
|
||||
const u8 gKommoOPokedexText[] = _(
|
||||
"Its rigid scales function as offense and\n"
|
||||
"defense. In the past, its scales were\n"
|
||||
"processed and used to make weapons\n"
|
||||
|
@ -789,9 +789,9 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
|
||||
[SPECIES_BRUXISH] = sBruxishTeachableLearnset,
|
||||
[SPECIES_DRAMPA] = sDrampaTeachableLearnset,
|
||||
[SPECIES_DHELMISE] = sDhelmiseTeachableLearnset,
|
||||
[SPECIES_JANGMO_O] = sJangmooTeachableLearnset,
|
||||
[SPECIES_HAKAMO_O] = sHakamooTeachableLearnset,
|
||||
[SPECIES_KOMMO_O] = sKommooTeachableLearnset,
|
||||
[SPECIES_JANGMO_O] = sJangmoOTeachableLearnset,
|
||||
[SPECIES_HAKAMO_O] = sHakamoOTeachableLearnset,
|
||||
[SPECIES_KOMMO_O] = sKommoOTeachableLearnset,
|
||||
[SPECIES_TAPU_KOKO] = sTapuKokoTeachableLearnset,
|
||||
[SPECIES_TAPU_LELE] = sTapuLeleTeachableLearnset,
|
||||
[SPECIES_TAPU_BULU] = sTapuBuluTeachableLearnset,
|
||||
|
@ -29414,7 +29414,7 @@ static const u16 sDhelmiseTeachableLearnset[] = {
|
||||
MOVE_UNAVAILABLE,
|
||||
};
|
||||
|
||||
static const u16 sJangmooTeachableLearnset[] = {
|
||||
static const u16 sJangmoOTeachableLearnset[] = {
|
||||
MOVE_AERIAL_ACE,
|
||||
MOVE_ATTRACT,
|
||||
MOVE_BRICK_BREAK,
|
||||
@ -29445,7 +29445,7 @@ static const u16 sJangmooTeachableLearnset[] = {
|
||||
MOVE_UNAVAILABLE,
|
||||
};
|
||||
|
||||
static const u16 sHakamooTeachableLearnset[] = {
|
||||
static const u16 sHakamoOTeachableLearnset[] = {
|
||||
MOVE_AERIAL_ACE,
|
||||
MOVE_ATTRACT,
|
||||
MOVE_BRICK_BREAK,
|
||||
@ -29475,7 +29475,7 @@ static const u16 sHakamooTeachableLearnset[] = {
|
||||
MOVE_UNAVAILABLE,
|
||||
};
|
||||
|
||||
static const u16 sKommooTeachableLearnset[] = {
|
||||
static const u16 sKommoOTeachableLearnset[] = {
|
||||
MOVE_AERIAL_ACE,
|
||||
MOVE_ATTRACT,
|
||||
MOVE_BRICK_BREAK,
|
||||
|
@ -789,9 +789,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
|
||||
SPECIES_SPRITE(BRUXISH, gMonBackPic_Bruxish),
|
||||
SPECIES_SPRITE(DRAMPA, gMonBackPic_Drampa),
|
||||
SPECIES_SPRITE(DHELMISE, gMonBackPic_Dhelmise),
|
||||
SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo),
|
||||
SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo),
|
||||
SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo),
|
||||
SPECIES_SPRITE(JANGMO_O, gMonBackPic_JangmoO),
|
||||
SPECIES_SPRITE(HAKAMO_O, gMonBackPic_HakamoO),
|
||||
SPECIES_SPRITE(KOMMO_O, gMonBackPic_KommoO),
|
||||
SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko),
|
||||
SPECIES_SPRITE(TAPU_LELE, gMonBackPic_TapuLele),
|
||||
SPECIES_SPRITE(TAPU_BULU, gMonBackPic_TapuBulu),
|
||||
|
@ -789,9 +789,9 @@ const u8 *const gMonFootprintTable[] =
|
||||
[SPECIES_BRUXISH] = gMonFootprint_Bruxish,
|
||||
[SPECIES_DRAMPA] = gMonFootprint_Drampa,
|
||||
[SPECIES_DHELMISE] = gMonFootprint_Dhelmise,
|
||||
[SPECIES_JANGMO_O] = gMonFootprint_Jangmo_o,
|
||||
[SPECIES_HAKAMO_O] = gMonFootprint_Hakamo_o,
|
||||
[SPECIES_KOMMO_O] = gMonFootprint_Kommo_o,
|
||||
[SPECIES_JANGMO_O] = gMonFootprint_JangmoO,
|
||||
[SPECIES_HAKAMO_O] = gMonFootprint_HakamoO,
|
||||
[SPECIES_KOMMO_O] = gMonFootprint_KommoO,
|
||||
[SPECIES_TAPU_KOKO] = gMonFootprint_Tapu_Koko,
|
||||
[SPECIES_TAPU_LELE] = gMonFootprint_Tapu_Lele,
|
||||
[SPECIES_TAPU_BULU] = gMonFootprint_Tapu_Bulu,
|
||||
|
@ -789,9 +789,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
|
||||
SPECIES_SPRITE(BRUXISH, gMonFrontPic_Bruxish),
|
||||
SPECIES_SPRITE(DRAMPA, gMonFrontPic_Drampa),
|
||||
SPECIES_SPRITE(DHELMISE, gMonFrontPic_Dhelmise),
|
||||
SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo),
|
||||
SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo),
|
||||
SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo),
|
||||
SPECIES_SPRITE(JANGMO_O, gMonFrontPic_JangmoO),
|
||||
SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_HakamoO),
|
||||
SPECIES_SPRITE(KOMMO_O, gMonFrontPic_KommoO),
|
||||
SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko),
|
||||
SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_TapuLele),
|
||||
SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_TapuBulu),
|
||||
|
@ -789,9 +789,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
|
||||
SPECIES_PAL(BRUXISH, gMonPalette_Bruxish),
|
||||
SPECIES_PAL(DRAMPA, gMonPalette_Drampa),
|
||||
SPECIES_PAL(DHELMISE, gMonPalette_Dhelmise),
|
||||
SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo),
|
||||
SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo),
|
||||
SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo),
|
||||
SPECIES_PAL(JANGMO_O, gMonPalette_JangmoO),
|
||||
SPECIES_PAL(HAKAMO_O, gMonPalette_HakamoO),
|
||||
SPECIES_PAL(KOMMO_O, gMonPalette_KommoO),
|
||||
SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko),
|
||||
SPECIES_PAL(TAPU_LELE, gMonPalette_TapuLele),
|
||||
SPECIES_PAL(TAPU_BULU, gMonPalette_TapuBulu),
|
||||
|
@ -789,9 +789,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
|
||||
SPECIES_SHINY_PAL(BRUXISH, gMonShinyPalette_Bruxish),
|
||||
SPECIES_SHINY_PAL(DRAMPA, gMonShinyPalette_Drampa),
|
||||
SPECIES_SHINY_PAL(DHELMISE, gMonShinyPalette_Dhelmise),
|
||||
SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_Jangmoo),
|
||||
SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamoo),
|
||||
SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommoo),
|
||||
SPECIES_SHINY_PAL(JANGMO_O, gMonShinyPalette_JangmoO),
|
||||
SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_HakamoO),
|
||||
SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_KommoO),
|
||||
SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko),
|
||||
SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_TapuLele),
|
||||
SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_TapuBulu),
|
||||
|
@ -815,9 +815,9 @@ const u8 *const gMonIconTable[] =
|
||||
[SPECIES_BRUXISH] = gMonIcon_Bruxish,
|
||||
[SPECIES_DRAMPA] = gMonIcon_Drampa,
|
||||
[SPECIES_DHELMISE] = gMonIcon_Dhelmise,
|
||||
[SPECIES_JANGMO_O] = gMonIcon_Jangmoo,
|
||||
[SPECIES_HAKAMO_O] = gMonIcon_Hakamoo,
|
||||
[SPECIES_KOMMO_O] = gMonIcon_Kommoo,
|
||||
[SPECIES_JANGMO_O] = gMonIcon_JangmoO,
|
||||
[SPECIES_HAKAMO_O] = gMonIcon_HakamoO,
|
||||
[SPECIES_KOMMO_O] = gMonIcon_KommoO,
|
||||
[SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko,
|
||||
[SPECIES_TAPU_LELE] = gMonIcon_TapuLele,
|
||||
[SPECIES_TAPU_BULU] = gMonIcon_TapuBulu,
|
||||
|
Loading…
x
Reference in New Issue
Block a user