ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

oricorio pau constants

Browse Source
This commit is contained in:
amiosi 2021-02-02 14:49:01 -05:00
parent 032f8ac834
commit a021204389
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32414,7 +32414,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE,
},
[SPECIES_ORICORIO_PA_U] =
[SPECIES_ORICORIO_PAU] =
{
.baseHP = 75,
.baseAttack = 70,

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

@ -430,7 +430,7 @@ const u16 *const gFormSpeciesIdTables[NUM_SPECIES] =
[SPECIES_HOOPA_UNBOUND] = sHoopaFormSpeciesIdTable,
// Oricorio
[SPECIES_ORICORIO_POM_POM] = sOricorioFormSpeciesIdTable,
[SPECIES_ORICORIO_PA_U] = sOricorioFormSpeciesIdTable,
[SPECIES_ORICORIO_PAU] = sOricorioFormSpeciesIdTable,
[SPECIES_ORICORIO_SENSU] = sOricorioFormSpeciesIdTable,
// Rockruff
[SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffFormSpeciesIdTable,

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

@ -846,7 +846,7 @@ static const u16 sHoopaFormSpeciesIdTable[] = {
static const u16 sOricorioFormSpeciesIdTable[] = {
SPECIES_ORICORIO,
SPECIES_ORICORIO_POM_POM,
SPECIES_ORICORIO_PA_U,
SPECIES_ORICORIO_PAU,
SPECIES_ORICORIO_SENSU,
FORM_SPECIES_END,
};

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

@ -1186,7 +1186,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_HOOPA_UNBOUND] = sHoopaUnboundLevelUpLearnset,
// Oricorio
[SPECIES_ORICORIO_POM_POM] = sOricorioLevelUpLearnset,
[SPECIES_ORICORIO_PA_U] = sOricorioLevelUpLearnset,
[SPECIES_ORICORIO_PAU] = sOricorioLevelUpLearnset,
[SPECIES_ORICORIO_SENSU] = sOricorioLevelUpLearnset,
// Rockruff
[SPECIES_ROCKRUFF_OWN_TEMPO] = sRockruffLevelUpLearnset,

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

@ -23878,7 +23878,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM12_TAUNT)
| TMHM(TM06_TOXIC)),
[SPECIES_ORICORIO_PA_U] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE)
[SPECIES_ORICORIO_PAU] = TMHM_LEARNSET(TMHM(TM40_AERIAL_ACE)
| TMHM(TM45_ATTRACT)
| TMHM(TM04_CALM_MIND)
| TMHM(TM32_DOUBLE_TEAM)

2
src/data/pokemon_graphics/back_pic_table.h
View File

@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(HOOPA_UNBOUND, gMonBackPic_HoopaUnbound),
SPECIES_SPRITE(ORICORIO_POM_POM, gMonBackPic_OricorioPomPom),
SPECIES_SPRITE(ORICORIO_PA_U, gMonBackPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_PAU, gMonBackPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_SENSU, gMonBackPic_OricorioSensu),
SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonBackPic_Rockruff),

2
src/data/pokemon_graphics/front_pic_table.h
View File

@ -1185,7 +1185,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(HOOPA_UNBOUND, gMonFrontPic_HoopaUnbound),
SPECIES_SPRITE(ORICORIO_POM_POM, gMonFrontPic_OricorioPomPom),
SPECIES_SPRITE(ORICORIO_PA_U, gMonFrontPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_PAU, gMonFrontPic_OricorioPau),
SPECIES_SPRITE(ORICORIO_SENSU, gMonFrontPic_OricorioSensu),
SPECIES_SPRITE(ROCKRUFF_OWN_TEMPO, gMonFrontPic_Rockruff),

2
src/data/pokemon_graphics/palette_table.h
View File

@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(HOOPA_UNBOUND, gMonPalette_HoopaUnbound),
SPECIES_PAL(ORICORIO_POM_POM, gMonPalette_OricorioPomPom),
SPECIES_PAL(ORICORIO_PA_U, gMonPalette_OricorioPau),
SPECIES_PAL(ORICORIO_PAU, gMonPalette_OricorioPau),
SPECIES_PAL(ORICORIO_SENSU, gMonPalette_OricorioSensu),
SPECIES_PAL(ROCKRUFF_OWN_TEMPO, gMonPalette_Rockruff),

2
src/data/pokemon_graphics/shiny_palette_table.h
View File

@ -1185,7 +1185,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(HOOPA_UNBOUND, gMonShinyPalette_HoopaUnbound),
SPECIES_SHINY_PAL(ORICORIO_POM_POM, gMonShinyPalette_OricorioPomPom),
SPECIES_SHINY_PAL(ORICORIO_PA_U, gMonShinyPalette_OricorioPau),
SPECIES_SHINY_PAL(ORICORIO_PAU, gMonShinyPalette_OricorioPau),
SPECIES_SHINY_PAL(ORICORIO_SENSU, gMonShinyPalette_OricorioSensu),
SPECIES_SHINY_PAL(ROCKRUFF_OWN_TEMPO, gMonShinyPalette_Rockruff),

2
src/data/text/species_names.h
View File

@ -1188,7 +1188,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_HOOPA_UNBOUND] = _("Hoopa"),
// Oricorio
[SPECIES_ORICORIO_POM_POM] = _("Oricorio"),
[SPECIES_ORICORIO_PA_U] = _("Oricorio"),
[SPECIES_ORICORIO_PAU] = _("Oricorio"),
[SPECIES_ORICORIO_SENSU] = _("Oricorio"),
// Rockruff
[SPECIES_ROCKRUFF_OWN_TEMPO] = _("Rockruff"),

2
src/pokemon.c
View File

@ -1496,7 +1496,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
[SPECIES_HOOPA_UNBOUND - 1] = NATIONAL_DEX_HOOPA,
// Oricorio
[SPECIES_ORICORIO_POM_POM - 1] = NATIONAL_DEX_ORICORIO,
[SPECIES_ORICORIO_PA_U - 1] = NATIONAL_DEX_ORICORIO,
[SPECIES_ORICORIO_PAU - 1] = NATIONAL_DEX_ORICORIO,
[SPECIES_ORICORIO_SENSU - 1] = NATIONAL_DEX_ORICORIO,
// Rockruff
[SPECIES_ROCKRUFF_OWN_TEMPO - 1] = NATIONAL_DEX_ROCKRUFF,

4
src/pokemon_icon.c
View File

@ -1168,7 +1168,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete,
[SPECIES_HOOPA_UNBOUND] = gMonIcon_HoopaUnbound,
[SPECIES_ORICORIO_POM_POM] = gMonIcon_OricorioPomPom,
[SPECIES_ORICORIO_PA_U] = gMonIcon_OricorioPau,
[SPECIES_ORICORIO_PAU] = gMonIcon_OricorioPau,
[SPECIES_ORICORIO_SENSU] = gMonIcon_OricorioSensu,
[SPECIES_ROCKRUFF_OWN_TEMPO] = gMonIcon_Rockruff,
[SPECIES_LYCANROC_MIDNIGHT] = gMonIcon_LycanrocMidnight,
@ -2355,7 +2355,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_ZYGARDE_COMPLETE] = 1,
[SPECIES_HOOPA_UNBOUND] = 0,
[SPECIES_ORICORIO_POM_POM] = 1,
[SPECIES_ORICORIO_PA_U] = 1,
[SPECIES_ORICORIO_PAU] = 1,
[SPECIES_ORICORIO_SENSU] = 0,
[SPECIES_ROCKRUFF_OWN_TEMPO] = 2,
[SPECIES_LYCANROC_MIDNIGHT] = 0,