ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-28 06:13:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

MIMEJR -> MIME_JR

Browse Source
This commit is contained in:
amiosi 2021-02-02 12:36:05 -05:00
parent 76851eb672
commit 47e1d6b790
20 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/constants/species.h
View File

@ -440,7 +440,7 @@
#define SPECIES_BRONZOR 436 #define SPECIES_BRONZOR 436
#define SPECIES_BRONZONG 437 #define SPECIES_BRONZONG 437
#define SPECIES_BONSLY 438 #define SPECIES_BONSLY 438
#define SPECIES_MIMEJR 439 #define SPECIES_MIME_JR 439
#define SPECIES_HAPPINY 440 #define SPECIES_HAPPINY 440
#define SPECIES_CHATOT 441 #define SPECIES_CHATOT 441
#define SPECIES_SPIRITOMB 442 #define SPECIES_SPIRITOMB 442
@ -1791,7 +1791,7 @@
#define NATIONAL_DEX_BRONZOR 436 #define NATIONAL_DEX_BRONZOR 436
#define NATIONAL_DEX_BRONZONG 437 #define NATIONAL_DEX_BRONZONG 437
#define NATIONAL_DEX_BONSLY 438 #define NATIONAL_DEX_BONSLY 438
#define NATIONAL_DEX_MIMEJR 439 #define NATIONAL_DEX_MIME_JR 439
#define NATIONAL_DEX_HAPPINY 440 #define NATIONAL_DEX_HAPPINY 440
#define NATIONAL_DEX_CHATOT 441 #define NATIONAL_DEX_CHATOT 441
#define NATIONAL_DEX_SPIRITOMB 442 #define NATIONAL_DEX_SPIRITOMB 442

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

@ -12408,7 +12408,7 @@ const struct BaseStats gBaseStats[] =
.noFlip = FALSE, .noFlip = FALSE,
}, },
[SPECIES_MIMEJR] = [SPECIES_MIME_JR] =
{ {
.baseHP = 20, .baseHP = 20,
.baseAttack = 25, .baseAttack = 25,

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

@ -2678,7 +2678,7 @@ const u16 gEggMoves[] = {
MOVE_CURSE, MOVE_CURSE,
MOVE_ENDURE), MOVE_ENDURE),
egg_moves(MIMEJR, egg_moves(MIME_JR,
MOVE_FUTURE_SIGHT, MOVE_FUTURE_SIGHT,
MOVE_HYPNOSIS, MOVE_HYPNOSIS,
MOVE_MIMIC, MOVE_MIMIC,

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

@ -286,7 +286,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
[SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}}, [SPECIES_STUNKY] = {{EVO_LEVEL, 34, SPECIES_SKUNTANK}},
[SPECIES_BRONZOR] = {{EVO_LEVEL, 35, SPECIES_BRONZONG}}, [SPECIES_BRONZOR] = {{EVO_LEVEL, 35, SPECIES_BRONZONG}},
[SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}}, [SPECIES_BONSLY] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_SUDOWOODO}},
[SPECIES_MIMEJR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}}, [SPECIES_MIME_JR] = {{EVO_MOVE, MOVE_MIMIC, SPECIES_MR_MIME}},
[SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}}, [SPECIES_HAPPINY] = {{EVO_ITEM_HOLD_DAY, ITEM_OVAL_STONE, SPECIES_CHANSEY}},
[SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE}}, [SPECIES_GIBLE] = {{EVO_LEVEL, 24, SPECIES_GABITE}},
[SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP}}, [SPECIES_GABITE] = {{EVO_LEVEL, 48, SPECIES_GARCHOMP}},

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

@ -439,7 +439,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_BRONZOR] = sBronzorLevelUpLearnset, [SPECIES_BRONZOR] = sBronzorLevelUpLearnset,
[SPECIES_BRONZONG] = sBronzongLevelUpLearnset, [SPECIES_BRONZONG] = sBronzongLevelUpLearnset,
[SPECIES_BONSLY] = sBonslyLevelUpLearnset, [SPECIES_BONSLY] = sBonslyLevelUpLearnset,
[SPECIES_MIMEJR] = sMimejrLevelUpLearnset, [SPECIES_MIME_JR] = sMimejrLevelUpLearnset,
[SPECIES_HAPPINY] = sHappinyLevelUpLearnset, [SPECIES_HAPPINY] = sHappinyLevelUpLearnset,
[SPECIES_CHATOT] = sChatotLevelUpLearnset, [SPECIES_CHATOT] = sChatotLevelUpLearnset,
[SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset, [SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset,

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

@ -5268,7 +5268,7 @@ const struct PokedexEntry gPokedexEntries[] =
.trainerOffset = 0, .trainerOffset = 0,
}, },
[NATIONAL_DEX_MIMEJR] = [NATIONAL_DEX_MIME_JR] =
{ {
.categoryName = _("Mime"), .categoryName = _("Mime"),
.height = 6, .height = 6,

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

@ -507,7 +507,7 @@ const u16 gPokedexOrder_Alphabetical[] =
NATIONAL_DEX_MILCERY, NATIONAL_DEX_MILCERY,
NATIONAL_DEX_MILOTIC, NATIONAL_DEX_MILOTIC,
NATIONAL_DEX_MILTANK, NATIONAL_DEX_MILTANK,
NATIONAL_DEX_MIMEJR, NATIONAL_DEX_MIME_JR,
NATIONAL_DEX_MIMIKYU, NATIONAL_DEX_MIMIKYU,
NATIONAL_DEX_MINCCINO, NATIONAL_DEX_MINCCINO,
NATIONAL_DEX_MINIOR, NATIONAL_DEX_MINIOR,
@ -1248,7 +1248,7 @@ const u16 gPokedexOrder_Weight[] =
NATIONAL_DEX_MORGREM, NATIONAL_DEX_MORGREM,
NATIONAL_DEX_IVYSAUR, NATIONAL_DEX_IVYSAUR,
//NATIONAL_DEX_BANETTE, // Mega //NATIONAL_DEX_BANETTE, // Mega
NATIONAL_DEX_MIMEJR, NATIONAL_DEX_MIME_JR,
NATIONAL_DEX_LAMPENT, NATIONAL_DEX_LAMPENT,
//NATIONAL_DEX_TOGEDEMARU, // Totem-sized //NATIONAL_DEX_TOGEDEMARU, // Totem-sized
NATIONAL_DEX_BLACEPHALON, NATIONAL_DEX_BLACEPHALON,
@ -2260,7 +2260,7 @@ const u16 gPokedexOrder_Height[] =
NATIONAL_DEX_BAGON, NATIONAL_DEX_BAGON,
NATIONAL_DEX_BELDUM, NATIONAL_DEX_BELDUM,
NATIONAL_DEX_STARAVIA, NATIONAL_DEX_STARAVIA,
NATIONAL_DEX_MIMEJR, NATIONAL_DEX_MIME_JR,
NATIONAL_DEX_HAPPINY, NATIONAL_DEX_HAPPINY,
NATIONAL_DEX_MUNCHLAX, NATIONAL_DEX_MUNCHLAX,
NATIONAL_DEX_SNIVY, NATIONAL_DEX_SNIVY,

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

@ -10829,7 +10829,7 @@ const u32 gTMHMLearnsets[][2] =
| TMHM(TM46_THIEF) | TMHM(TM46_THIEF)
| TMHM(TM06_TOXIC)), | TMHM(TM06_TOXIC)),
[SPECIES_MIMEJR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT) [SPECIES_MIME_JR] = TMHM_LEARNSET(TMHM(TM45_ATTRACT)
| TMHM(TM31_BRICK_BREAK) | TMHM(TM31_BRICK_BREAK)
| TMHM(TM04_CALM_MIND) | TMHM(TM04_CALM_MIND)
| TMHM(TM32_DOUBLE_TEAM) | TMHM(TM32_DOUBLE_TEAM)

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

@ -6438,7 +6438,7 @@ static const u32 sTutorLearnsets[] =
| TUTOR(MOVE_SUBSTITUTE) | TUTOR(MOVE_SUBSTITUTE)
| TUTOR(MOVE_SWAGGER)), | TUTOR(MOVE_SWAGGER)),
[SPECIES_MIMEJR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER) [SPECIES_MIME_JR] = TUTOR_LEARNSET(TUTOR(MOVE_DREAM_EATER)
| TUTOR(MOVE_ENDURE) | TUTOR(MOVE_ENDURE)
| TUTOR(MOVE_ICY_WIND) | TUTOR(MOVE_ICY_WIND)
| TUTOR(MOVE_MIMIC) | TUTOR(MOVE_MIMIC)

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

@ -2195,7 +2195,7 @@ const struct MonCoords gMonBackPicCoords[] =
.size = 0x58, .size = 0x58,
.y_offset = 6, .y_offset = 6,
}, },
[SPECIES_MIMEJR] = [SPECIES_MIME_JR] =
{ {
.size = 0x88, .size = 0x88,
.y_offset = 1, .y_offset = 1,

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

@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] =
SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor), SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor),
SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong), SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong),
SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly), SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly),
SPECIES_SPRITE(MIMEJR, gMonBackPic_Mimejr), SPECIES_SPRITE(MIME_JR, gMonBackPic_Mimejr),
SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny), SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny),
SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot), SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot),
SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb), SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb),

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

@ -439,7 +439,7 @@ const u8 *const gMonFootprintTable[] =
[SPECIES_BRONZOR] = gMonFootprint_Bronzor, [SPECIES_BRONZOR] = gMonFootprint_Bronzor,
[SPECIES_BRONZONG] = gMonFootprint_Bronzong, [SPECIES_BRONZONG] = gMonFootprint_Bronzong,
[SPECIES_BONSLY] = gMonFootprint_Bonsly, [SPECIES_BONSLY] = gMonFootprint_Bonsly,
[SPECIES_MIMEJR] = gMonFootprint_MimeJr, [SPECIES_MIME_JR] = gMonFootprint_MimeJr,
[SPECIES_HAPPINY] = gMonFootprint_Happiny, [SPECIES_HAPPINY] = gMonFootprint_Happiny,
[SPECIES_CHATOT] = gMonFootprint_Chatot, [SPECIES_CHATOT] = gMonFootprint_Chatot,
[SPECIES_SPIRITOMB] = gMonFootprint_Spiritomb, [SPECIES_SPIRITOMB] = gMonFootprint_Spiritomb,

8
src/data/pokemon_graphics/front_pic_anims.h
View File

@ -5256,7 +5256,7 @@ static const union AnimCmd sAnim_BONSLY_1[] =
ANIMCMD_END, ANIMCMD_END,
}; };
static const union AnimCmd sAnim_MIMEJR_1[] = static const union AnimCmd sAnim_MIME_JR_1[] =
{ {
ANIMCMD_FRAME(0, 10), ANIMCMD_FRAME(0, 10),
ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(1, 10),
@ -11526,9 +11526,9 @@ static const union AnimCmd *const sAnims_BONSLY[] ={
sAnim_BONSLY_1, sAnim_BONSLY_1,
}; };
static const union AnimCmd *const sAnims_MIMEJR[] ={ static const union AnimCmd *const sAnims_MIME_JR[] ={
sAnim_GeneralFrame0, sAnim_GeneralFrame0,
sAnim_MIMEJR_1, sAnim_MIME_JR_1,
}; };
static const union AnimCmd *const sAnims_HAPPINY[] ={ static const union AnimCmd *const sAnims_HAPPINY[] ={
@ -14843,7 +14843,7 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] =
ANIM_CMD(BRONZOR), ANIM_CMD(BRONZOR),
ANIM_CMD(BRONZONG), ANIM_CMD(BRONZONG),
ANIM_CMD(BONSLY), ANIM_CMD(BONSLY),
ANIM_CMD(MIMEJR), ANIM_CMD(MIME_JR),
ANIM_CMD(HAPPINY), ANIM_CMD(HAPPINY),
ANIM_CMD(CHATOT), ANIM_CMD(CHATOT),
ANIM_CMD(SPIRITOMB), ANIM_CMD(SPIRITOMB),

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

@ -2195,7 +2195,7 @@ const struct MonCoords gMonFrontPicCoords[] =
.size = 0x55, .size = 0x55,
.y_offset = 9, .y_offset = 9,
}, },
[SPECIES_MIMEJR] = [SPECIES_MIME_JR] =
{ {
.size = 0x77, .size = 0x77,
.y_offset = 9, .y_offset = 9,

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

@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] =
SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor), SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor),
SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong), SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong),
SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly), SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly),
SPECIES_SPRITE(MIMEJR, gMonFrontPic_Mimejr), SPECIES_SPRITE(MIME_JR, gMonFrontPic_Mimejr),
SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny), SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny),
SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot), SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot),
SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb), SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb),

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

@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] =
SPECIES_PAL(BRONZOR, gMonPalette_Bronzor), SPECIES_PAL(BRONZOR, gMonPalette_Bronzor),
SPECIES_PAL(BRONZONG, gMonPalette_Bronzong), SPECIES_PAL(BRONZONG, gMonPalette_Bronzong),
SPECIES_PAL(BONSLY, gMonPalette_Bonsly), SPECIES_PAL(BONSLY, gMonPalette_Bonsly),
SPECIES_PAL(MIMEJR, gMonPalette_Mimejr), SPECIES_PAL(MIME_JR, gMonPalette_Mimejr),
SPECIES_PAL(HAPPINY, gMonPalette_Happiny), SPECIES_PAL(HAPPINY, gMonPalette_Happiny),
SPECIES_PAL(CHATOT, gMonPalette_Chatot), SPECIES_PAL(CHATOT, gMonPalette_Chatot),
SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb), SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb),

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

@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] =
SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor), SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor),
SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong), SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong),
SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly), SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly),
SPECIES_SHINY_PAL(MIMEJR, gMonShinyPalette_Mimejr), SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_Mimejr),
SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny), SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny),
SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot), SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot),
SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb), SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb),

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

@ -438,7 +438,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = {
[SPECIES_BRONZOR] = _("Bronzor"), [SPECIES_BRONZOR] = _("Bronzor"),
[SPECIES_BRONZONG] = _("Bronzong"), [SPECIES_BRONZONG] = _("Bronzong"),
[SPECIES_BONSLY] = _("Bonsly"), [SPECIES_BONSLY] = _("Bonsly"),
[SPECIES_MIMEJR] = _("Mime jr."), [SPECIES_MIME_JR] = _("Mime jr."),
[SPECIES_HAPPINY] = _("Happiny"), [SPECIES_HAPPINY] = _("Happiny"),
[SPECIES_CHATOT] = _("Chatot"), [SPECIES_CHATOT] = _("Chatot"),
[SPECIES_SPIRITOMB] = _("Spiritomb"), [SPECIES_SPIRITOMB] = _("Spiritomb"),

4
src/pokemon.c
View File

@ -751,7 +751,7 @@ const u16 gSpeciesToNationalPokedexNum[NUM_SPECIES] = // Assigns all species to
SPECIES_TO_NATIONAL(BRONZOR), SPECIES_TO_NATIONAL(BRONZOR),
SPECIES_TO_NATIONAL(BRONZONG), SPECIES_TO_NATIONAL(BRONZONG),
SPECIES_TO_NATIONAL(BONSLY), SPECIES_TO_NATIONAL(BONSLY),
SPECIES_TO_NATIONAL(MIMEJR), SPECIES_TO_NATIONAL(MIME_JR),
SPECIES_TO_NATIONAL(HAPPINY), SPECIES_TO_NATIONAL(HAPPINY),
SPECIES_TO_NATIONAL(CHATOT), SPECIES_TO_NATIONAL(CHATOT),
SPECIES_TO_NATIONAL(SPIRITOMB), SPECIES_TO_NATIONAL(SPIRITOMB),
@ -2293,7 +2293,7 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] =
[SPECIES_BRONZOR - 1] = 0x4E, [SPECIES_BRONZOR - 1] = 0x4E,
[SPECIES_BRONZONG - 1] = 0x51, [SPECIES_BRONZONG - 1] = 0x51,
[SPECIES_BONSLY - 1] = 0x52, [SPECIES_BONSLY - 1] = 0x52,
[SPECIES_MIMEJR - 1] = 0x40, [SPECIES_MIME_JR - 1] = 0x40,
[SPECIES_HAPPINY - 1] = 0x45, [SPECIES_HAPPINY - 1] = 0x45,
[SPECIES_CHATOT - 1] = 0x19, [SPECIES_CHATOT - 1] = 0x19,
[SPECIES_SPIRITOMB - 1] = 0x3A, [SPECIES_SPIRITOMB - 1] = 0x3A,

4
src/pokemon_icon.c
View File

@ -464,7 +464,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_BRONZOR] = gMonIcon_Bronzor, [SPECIES_BRONZOR] = gMonIcon_Bronzor,
[SPECIES_BRONZONG] = gMonIcon_Bronzong, [SPECIES_BRONZONG] = gMonIcon_Bronzong,
[SPECIES_BONSLY] = gMonIcon_Bonsly, [SPECIES_BONSLY] = gMonIcon_Bonsly,
[SPECIES_MIMEJR] = gMonIcon_Mimejr, [SPECIES_MIME_JR] = gMonIcon_Mimejr,
[SPECIES_HAPPINY] = gMonIcon_Happiny, [SPECIES_HAPPINY] = gMonIcon_Happiny,
[SPECIES_CHATOT] = gMonIcon_Chatot, [SPECIES_CHATOT] = gMonIcon_Chatot,
[SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb,
@ -1680,7 +1680,7 @@ const u8 gMonIconPaletteIndices[] =
[SPECIES_BRONZOR] = 0, [SPECIES_BRONZOR] = 0,
[SPECIES_BRONZONG] = 0, [SPECIES_BRONZONG] = 0,
[SPECIES_BONSLY] = 1, [SPECIES_BONSLY] = 1,
[SPECIES_MIMEJR] = 0, [SPECIES_MIME_JR] = 0,
[SPECIES_HAPPINY] = 0, [SPECIES_HAPPINY] = 0,
[SPECIES_CHATOT] = 0, [SPECIES_CHATOT] = 0,
[SPECIES_SPIRITOMB] = 5, [SPECIES_SPIRITOMB] = 5,