Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-25 19:37:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration

Browse Source
This commit is contained in:
Eduardo Quezada D'Ottone
2023-11-02 21:24:35 -04:00
committed by leo60228
parent 392a65dec0 1467ffa3d8
commit eccd2c4a65
248 changed files with 6386 additions and 2820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/data/text/move_names.h
View File

@@ -1968,4 +1968,3 @@ const u8 *const gMaxMoveNames[] =
[MOVE_G_MAX_ONE_BLOW - FIRST_MAX_MOVE] = sText_G_Max_One_Blow,
[MOVE_G_MAX_RAPID_FLOW - FIRST_MAX_MOVE] = sText_G_Max_Rapid_Flow,
};

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

@@ -882,6 +882,68 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_RUNERIGUS] = _("Runerigus"),
[SPECIES_MILCERY] = _("Milcery"),
[SPECIES_ALCREMIE_STRAWBERRY_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_BERRY_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_LOVE_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STAR_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_CLOVER_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_FLOWER_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_VANILLA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_RIBBON_RAINBOW_SWIRL] = _("Alcremie"),
[SPECIES_FALINKS] = _("Falinks"),
[SPECIES_PINCURCHIN] = _("Pincurchin"),
[SPECIES_SNOM] = _("Snom"),
@@ -1446,15 +1508,6 @@ const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_SINISTEA_ANTIQUE] = _("Sinistea"),
// Polteageist
[SPECIES_POLTEAGEIST_ANTIQUE] = _("Polteageis"),
// Alcremie
[SPECIES_ALCREMIE_STRAWBERRY_RUBY_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_MATCHA_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_MINT_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_LEMON_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_SALTED_CREAM] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_RUBY_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_CARAMEL_SWIRL] = _("Alcremie"),
[SPECIES_ALCREMIE_STRAWBERRY_RAINBOW_SWIRL] = _("Alcremie"),
// Eiscue
[SPECIES_EISCUE_NOICE_FACE] = _("Eiscue"),
// Indeedee