ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-09-28 16:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forgot about Jangmo-o

Browse Source
This commit is contained in:
Eduardo Quezada 2023-02-24 21:58:09 -03:00
parent bbefee6bd4
commit ca81d7a0f9
15 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/graphics.h
View File

@ -867,7 +867,7 @@ 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_JangmoO[];
extern const u32 gMonFrontPic_HakamoO[];
extern const u32 gMonFrontPic_KommoO[];
extern const u32 gMonFrontPic_TapuKoko[];
@ -2081,7 +2081,7 @@ 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_JangmoO[];
extern const u32 gMonBackPic_HakamoO[];
extern const u32 gMonBackPic_KommoO[];
extern const u32 gMonBackPic_TapuKoko[];
@ -3287,7 +3287,7 @@ 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_JangmoO[];
extern const u32 gMonPalette_HakamoO[];
extern const u32 gMonPalette_KommoO[];
extern const u32 gMonPalette_TapuKoko[];
@ -4520,7 +4520,7 @@ 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_JangmoO[];
extern const u32 gMonShinyPalette_HakamoO[];
extern const u32 gMonShinyPalette_KommoO[];
extern const u32 gMonShinyPalette_TapuKoko[];
@ -5747,7 +5747,7 @@ 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_JangmoO[];
extern const u8 gMonIcon_HakamoO[];
extern const u8 gMonIcon_KommoO[];
extern const u8 gMonIcon_TapuKoko[];

4
sound/cry_tables.inc
View File

@ -1126,7 +1126,7 @@ gCryTable::
cry Cry_Bruxish
cry Cry_Drampa
cry Cry_Dhelmise
cry Cry_Jangmoo
cry Cry_JangmoO
cry Cry_HakamoO
cry Cry_KommoO
cry Cry_TapuKoko
@ -3248,7 +3248,7 @@ gCryTable_Reverse::
cry_reverse Cry_Bruxish
cry_reverse Cry_Drampa
cry_reverse Cry_Dhelmise
cry_reverse Cry_Jangmoo
cry_reverse Cry_JangmoO
cry_reverse Cry_HakamoO
cry_reverse Cry_KommoO
cry_reverse Cry_TapuKoko

2
sound/direct_sound_data.inc
View File

@ -3518,7 +3518,7 @@ 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

10
src/data/graphics/pokemon.h
View File

@ -800,7 +800,7 @@ 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_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");
@ -2012,7 +2012,7 @@ 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_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");
@ -3218,7 +3218,7 @@ 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_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");
@ -4451,7 +4451,7 @@ 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_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");
@ -5678,7 +5678,7 @@ 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_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");

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

@ -789,7 +789,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] =
[SPECIES_BRUXISH] = sBruxishLevelUpLearnset,
[SPECIES_DRAMPA] = sDrampaLevelUpLearnset,
[SPECIES_DHELMISE] = sDhelmiseLevelUpLearnset,
[SPECIES_JANGMO_O] = sJangmooLevelUpLearnset,
[SPECIES_JANGMO_O] = sJangmoOLevelUpLearnset,
[SPECIES_HAKAMO_O] = sHakamoOLevelUpLearnset,
[SPECIES_KOMMO_O] = sKommoOLevelUpLearnset,
[SPECIES_TAPU_KOKO] = sTapuKokoLevelUpLearnset,

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

@ -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),

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

@ -9396,7 +9396,7 @@ const struct PokedexEntry gPokedexEntries[] =
.categoryName = _("Scaly"),
.height = 6,
.weight = 297,
.description = gJangmooPokedexText,
.description = gJangmoOPokedexText,
.pokemonScale = 356,
.pokemonOffset = 17,
.trainerScale = 256,

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

@ -4697,7 +4697,7 @@ 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"

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

@ -789,7 +789,7 @@ const u16 *const gTeachableLearnsets[NUM_SPECIES] =
[SPECIES_BRUXISH] = sBruxishTeachableLearnset,
[SPECIES_DRAMPA] = sDrampaTeachableLearnset,
[SPECIES_DHELMISE] = sDhelmiseTeachableLearnset,
[SPECIES_JANGMO_O] = sJangmooTeachableLearnset,
[SPECIES_JANGMO_O] = sJangmoOTeachableLearnset,
[SPECIES_HAKAMO_O] = sHakamoOTeachableLearnset,
[SPECIES_KOMMO_O] = sKommoOTeachableLearnset,
[SPECIES_TAPU_KOKO] = sTapuKokoTeachableLearnset,

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

@ -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,

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

@ -789,7 +789,7 @@ 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(JANGMO_O, gMonBackPic_JangmoO),
SPECIES_SPRITE(HAKAMO_O, gMonBackPic_HakamoO),
SPECIES_SPRITE(KOMMO_O, gMonBackPic_KommoO),
SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko),

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

@ -789,7 +789,7 @@ 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(JANGMO_O, gMonFrontPic_JangmoO),
SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_HakamoO),
SPECIES_SPRITE(KOMMO_O, gMonFrontPic_KommoO),
SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko),

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

@ -789,7 +789,7 @@ 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(JANGMO_O, gMonPalette_JangmoO),
SPECIES_PAL(HAKAMO_O, gMonPalette_HakamoO),
SPECIES_PAL(KOMMO_O, gMonPalette_KommoO),
SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko),

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

@ -789,7 +789,7 @@ 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(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),

2
src/pokemon_icon.c
View File

@ -815,7 +815,7 @@ const u8 *const gMonIconTable[] =
[SPECIES_BRUXISH] = gMonIcon_Bruxish,
[SPECIES_DRAMPA] = gMonIcon_Drampa,
[SPECIES_DHELMISE] = gMonIcon_Dhelmise,
[SPECIES_JANGMO_O] = gMonIcon_Jangmoo,
[SPECIES_JANGMO_O] = gMonIcon_JangmoO,
[SPECIES_HAKAMO_O] = gMonIcon_HakamoO,
[SPECIES_KOMMO_O] = gMonIcon_KommoO,
[SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko,