diff --git a/graphics/pokemon/mimejr/anim_front.png b/graphics/pokemon/mime_jr/anim_front.png similarity index 100% rename from graphics/pokemon/mimejr/anim_front.png rename to graphics/pokemon/mime_jr/anim_front.png diff --git a/graphics/pokemon/mimejr/back.png b/graphics/pokemon/mime_jr/back.png similarity index 100% rename from graphics/pokemon/mimejr/back.png rename to graphics/pokemon/mime_jr/back.png diff --git a/graphics/pokemon/mimejr/footprint.png b/graphics/pokemon/mime_jr/footprint.png similarity index 100% rename from graphics/pokemon/mimejr/footprint.png rename to graphics/pokemon/mime_jr/footprint.png diff --git a/graphics/pokemon/mimejr/front.png b/graphics/pokemon/mime_jr/front.png similarity index 100% rename from graphics/pokemon/mimejr/front.png rename to graphics/pokemon/mime_jr/front.png diff --git a/graphics/pokemon/mimejr/icon.png b/graphics/pokemon/mime_jr/icon.png similarity index 100% rename from graphics/pokemon/mimejr/icon.png rename to graphics/pokemon/mime_jr/icon.png diff --git a/graphics/pokemon/mimejr/normal.pal b/graphics/pokemon/mime_jr/normal.pal similarity index 100% rename from graphics/pokemon/mimejr/normal.pal rename to graphics/pokemon/mime_jr/normal.pal diff --git a/graphics/pokemon/mimejr/shiny.pal b/graphics/pokemon/mime_jr/shiny.pal similarity index 100% rename from graphics/pokemon/mimejr/shiny.pal rename to graphics/pokemon/mime_jr/shiny.pal diff --git a/graphics/pokemon/oricorio/pa_u/back.png b/graphics/pokemon/oricorio/pau/back.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/back.png rename to graphics/pokemon/oricorio/pau/back.png diff --git a/graphics/pokemon/oricorio/pa_u/front.png b/graphics/pokemon/oricorio/pau/front.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/front.png rename to graphics/pokemon/oricorio/pau/front.png diff --git a/graphics/pokemon/oricorio/pa_u/icon.png b/graphics/pokemon/oricorio/pau/icon.png similarity index 100% rename from graphics/pokemon/oricorio/pa_u/icon.png rename to graphics/pokemon/oricorio/pau/icon.png diff --git a/graphics/pokemon/oricorio/pa_u/normal.pal b/graphics/pokemon/oricorio/pau/normal.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/normal.pal rename to graphics/pokemon/oricorio/pau/normal.pal diff --git a/graphics/pokemon/oricorio/pa_u/shiny.pal b/graphics/pokemon/oricorio/pau/shiny.pal similarity index 100% rename from graphics/pokemon/oricorio/pa_u/shiny.pal rename to graphics/pokemon/oricorio/pau/shiny.pal diff --git a/include/graphics.h b/include/graphics.h index 6e4223be9..85ee8e200 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -158,7 +158,7 @@ extern const u32 gMonFrontPic_Goldeen[]; extern const u32 gMonFrontPic_Seaking[]; extern const u32 gMonFrontPic_Staryu[]; extern const u32 gMonFrontPic_Starmie[]; -extern const u32 gMonFrontPic_Mrmime[]; +extern const u32 gMonFrontPic_MrMime[]; extern const u32 gMonFrontPic_Scyther[]; extern const u32 gMonFrontPic_Jynx[]; extern const u32 gMonFrontPic_Electabuzz[]; @@ -476,7 +476,7 @@ extern const u32 gMonFrontPic_Skuntank[]; extern const u32 gMonFrontPic_Bronzor[]; extern const u32 gMonFrontPic_Bronzong[]; extern const u32 gMonFrontPic_Bonsly[]; -extern const u32 gMonFrontPic_Mimejr[]; +extern const u32 gMonFrontPic_MimeJr[]; extern const u32 gMonFrontPic_Happiny[]; extern const u32 gMonFrontPic_Chatot[]; extern const u32 gMonFrontPic_Spiritomb[]; @@ -819,9 +819,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_Jangmo_o[]; -extern const u32 gMonFrontPic_Hakamo_o[]; -extern const u32 gMonFrontPic_Kommo_o[]; +extern const u32 gMonFrontPic_Jangmoo[]; +extern const u32 gMonFrontPic_Hakamoo[]; +extern const u32 gMonFrontPic_Kommoo[]; extern const u32 gMonFrontPic_Tapu_koko[]; extern const u32 gMonFrontPic_Tapu_lele[]; extern const u32 gMonFrontPic_Tapu_bulu[]; @@ -1298,7 +1298,7 @@ extern const u32 gMonBackPic_Goldeen[]; extern const u32 gMonBackPic_Seaking[]; extern const u32 gMonBackPic_Staryu[]; extern const u32 gMonBackPic_Starmie[]; -extern const u32 gMonBackPic_Mrmime[]; +extern const u32 gMonBackPic_MrMime[]; extern const u32 gMonBackPic_Scyther[]; extern const u32 gMonBackPic_Jynx[]; extern const u32 gMonBackPic_Electabuzz[]; @@ -1616,7 +1616,7 @@ extern const u32 gMonBackPic_Skuntank[]; extern const u32 gMonBackPic_Bronzor[]; extern const u32 gMonBackPic_Bronzong[]; extern const u32 gMonBackPic_Bonsly[]; -extern const u32 gMonBackPic_Mimejr[]; +extern const u32 gMonBackPic_MimeJr[]; extern const u32 gMonBackPic_Happiny[]; extern const u32 gMonBackPic_Chatot[]; extern const u32 gMonBackPic_Spiritomb[]; @@ -1959,9 +1959,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_Jangmo_o[]; -extern const u32 gMonBackPic_Hakamo_o[]; -extern const u32 gMonBackPic_Kommo_o[]; +extern const u32 gMonBackPic_Jangmoo[]; +extern const u32 gMonBackPic_Hakamoo[]; +extern const u32 gMonBackPic_Kommoo[]; extern const u32 gMonBackPic_Tapu_koko[]; extern const u32 gMonBackPic_Tapu_lele[]; extern const u32 gMonBackPic_Tapu_bulu[]; @@ -2437,7 +2437,7 @@ extern const u32 gMonPalette_Goldeen[]; extern const u32 gMonPalette_Seaking[]; extern const u32 gMonPalette_Staryu[]; extern const u32 gMonPalette_Starmie[]; -extern const u32 gMonPalette_Mrmime[]; +extern const u32 gMonPalette_MrMime[]; extern const u32 gMonPalette_Scyther[]; extern const u32 gMonPalette_Jynx[]; extern const u32 gMonPalette_Electabuzz[]; @@ -2754,7 +2754,7 @@ extern const u32 gMonPalette_Skuntank[]; extern const u32 gMonPalette_Bronzor[]; extern const u32 gMonPalette_Bronzong[]; extern const u32 gMonPalette_Bonsly[]; -extern const u32 gMonPalette_Mimejr[]; +extern const u32 gMonPalette_MimeJr[]; extern const u32 gMonPalette_Happiny[]; extern const u32 gMonPalette_Chatot[]; extern const u32 gMonPalette_Spiritomb[]; @@ -3097,9 +3097,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_Jangmo_o[]; -extern const u32 gMonPalette_Hakamo_o[]; -extern const u32 gMonPalette_Kommo_o[]; +extern const u32 gMonPalette_Jangmoo[]; +extern const u32 gMonPalette_Hakamoo[]; +extern const u32 gMonPalette_Kommoo[]; extern const u32 gMonPalette_Tapu_koko[]; extern const u32 gMonPalette_Tapu_lele[]; extern const u32 gMonPalette_Tapu_bulu[]; @@ -3602,7 +3602,7 @@ extern const u32 gMonShinyPalette_Goldeen[]; extern const u32 gMonShinyPalette_Seaking[]; extern const u32 gMonShinyPalette_Staryu[]; extern const u32 gMonShinyPalette_Starmie[]; -extern const u32 gMonShinyPalette_Mrmime[]; +extern const u32 gMonShinyPalette_MrMime[]; extern const u32 gMonShinyPalette_Scyther[]; extern const u32 gMonShinyPalette_Jynx[]; extern const u32 gMonShinyPalette_Electabuzz[]; @@ -3919,7 +3919,7 @@ extern const u32 gMonShinyPalette_Skuntank[]; extern const u32 gMonShinyPalette_Bronzor[]; extern const u32 gMonShinyPalette_Bronzong[]; extern const u32 gMonShinyPalette_Bonsly[]; -extern const u32 gMonShinyPalette_Mimejr[]; +extern const u32 gMonShinyPalette_MimeJr[]; extern const u32 gMonShinyPalette_Happiny[]; extern const u32 gMonShinyPalette_Chatot[]; extern const u32 gMonShinyPalette_Spiritomb[]; @@ -4262,9 +4262,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_Jangmo_o[]; -extern const u32 gMonShinyPalette_Hakamo_o[]; -extern const u32 gMonShinyPalette_Kommo_o[]; +extern const u32 gMonShinyPalette_Jangmoo[]; +extern const u32 gMonShinyPalette_Hakamoo[]; +extern const u32 gMonShinyPalette_Kommoo[]; extern const u32 gMonShinyPalette_Tapu_koko[]; extern const u32 gMonShinyPalette_Tapu_lele[]; extern const u32 gMonShinyPalette_Tapu_bulu[]; @@ -4759,7 +4759,7 @@ extern const u8 gMonIcon_Goldeen[]; extern const u8 gMonIcon_Seaking[]; extern const u8 gMonIcon_Staryu[]; extern const u8 gMonIcon_Starmie[]; -extern const u8 gMonIcon_Mrmime[]; +extern const u8 gMonIcon_MrMime[]; extern const u8 gMonIcon_Scyther[]; extern const u8 gMonIcon_Jynx[]; extern const u8 gMonIcon_Electabuzz[]; @@ -5076,7 +5076,7 @@ extern const u8 gMonIcon_Skuntank[]; extern const u8 gMonIcon_Bronzor[]; extern const u8 gMonIcon_Bronzong[]; extern const u8 gMonIcon_Bonsly[]; -extern const u8 gMonIcon_Mimejr[]; +extern const u8 gMonIcon_MimeJr[]; extern const u8 gMonIcon_Happiny[]; extern const u8 gMonIcon_Chatot[]; extern const u8 gMonIcon_Spiritomb[]; @@ -5419,9 +5419,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_Jangmo_o[]; -extern const u8 gMonIcon_Hakamo_o[]; -extern const u8 gMonIcon_Kommo_o[]; +extern const u8 gMonIcon_Jangmoo[]; +extern const u8 gMonIcon_Hakamoo[]; +extern const u8 gMonIcon_Kommoo[]; extern const u8 gMonIcon_Tapu_koko[]; extern const u8 gMonIcon_Tapu_lele[]; extern const u8 gMonIcon_Tapu_bulu[]; @@ -5781,7 +5781,7 @@ extern const u8 gMonFootprint_Goldeen[]; extern const u8 gMonFootprint_Seaking[]; extern const u8 gMonFootprint_Staryu[]; extern const u8 gMonFootprint_Starmie[]; -extern const u8 gMonFootprint_Mrmime[]; +extern const u8 gMonFootprint_MrMime[]; extern const u8 gMonFootprint_Scyther[]; extern const u8 gMonFootprint_Jynx[]; extern const u8 gMonFootprint_Electabuzz[]; diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 651f368df..5ab18ed61 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -121,7 +121,7 @@ const u32 gMonFrontPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/anim_fro const u32 gMonFrontPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/anim_front.4bpp.lz"); const u32 gMonFrontPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/anim_front.4bpp.lz"); const u32 gMonFrontPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/anim_front.4bpp.lz"); const u32 gMonFrontPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/anim_front.4bpp.lz"); const u32 gMonFrontPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/anim_front.4bpp.lz"); const u32 gMonFrontPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/anim_front.4bpp.lz"); @@ -439,7 +439,7 @@ const u32 gMonFrontPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/anim_f const u32 gMonFrontPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/anim_front.4bpp.lz"); const u32 gMonFrontPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/anim_front.4bpp.lz"); -const u32 gMonFrontPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/anim_front.4bpp.lz"); +const u32 gMonFrontPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/anim_front.4bpp.lz"); const u32 gMonFrontPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/anim_front.4bpp.lz"); const u32 gMonFrontPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/anim_front.4bpp.lz"); const u32 gMonFrontPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/anim_front.4bpp.lz"); @@ -782,9 +782,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_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/front.4bpp.lz"); -const u32 gMonFrontPic_Kommo_o[] = 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_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); const u32 gMonFrontPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); const u32 gMonFrontPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); @@ -1104,7 +1104,7 @@ const u32 gMonFrontPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_per const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/front.4bpp.lz"); const u32 gMonFrontPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/front.4bpp.lz"); const u32 gMonFrontPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/front.4bpp.lz"); -const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/front.4bpp.lz"); +const u32 gMonFrontPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/front.4bpp.lz"); const u32 gMonFrontPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/front.4bpp.lz"); const u32 gMonFrontPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/front.4bpp.lz"); @@ -1261,7 +1261,7 @@ const u32 gMonBackPic_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/back.4bpp const u32 gMonBackPic_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/back.4bpp.lz"); const u32 gMonBackPic_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/back.4bpp.lz"); const u32 gMonBackPic_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/back.4bpp.lz"); -const u32 gMonBackPic_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); +const u32 gMonBackPic_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/back.4bpp.lz"); const u32 gMonBackPic_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/back.4bpp.lz"); const u32 gMonBackPic_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/back.4bpp.lz"); const u32 gMonBackPic_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/back.4bpp.lz"); @@ -1579,7 +1579,7 @@ const u32 gMonBackPic_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/back.4b const u32 gMonBackPic_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/back.4bpp.lz"); const u32 gMonBackPic_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/back.4bpp.lz"); const u32 gMonBackPic_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/back.4bpp.lz"); -const u32 gMonBackPic_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/back.4bpp.lz"); +const u32 gMonBackPic_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/back.4bpp.lz"); const u32 gMonBackPic_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/back.4bpp.lz"); const u32 gMonBackPic_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/back.4bpp.lz"); const u32 gMonBackPic_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/back.4bpp.lz"); @@ -1922,9 +1922,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_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/back.4bpp.lz"); -const u32 gMonBackPic_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/back.4bpp.lz"); -const u32 gMonBackPic_Kommo_o[] = 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_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); const u32 gMonBackPic_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); const u32 gMonBackPic_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); @@ -2244,7 +2244,7 @@ const u32 gMonBackPic_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/back.4bpp.lz"); const u32 gMonBackPic_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/back.4bpp.lz"); const u32 gMonBackPic_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/back.4bpp.lz"); -const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/back.4bpp.lz"); +const u32 gMonBackPic_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/back.4bpp.lz"); const u32 gMonBackPic_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/back.4bpp.lz"); const u32 gMonBackPic_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/back.4bpp.lz"); const u32 gMonBackPic_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/back.4bpp.lz"); @@ -2400,7 +2400,7 @@ const u32 gMonPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/normal.gb const u32 gMonPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/normal.gbapal.lz"); const u32 gMonPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/normal.gbapal.lz"); const u32 gMonPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/normal.gbapal.lz"); -const u32 gMonPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); +const u32 gMonPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/normal.gbapal.lz"); const u32 gMonPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/normal.gbapal.lz"); const u32 gMonPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/normal.gbapal.lz"); const u32 gMonPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/normal.gbapal.lz"); @@ -2717,7 +2717,7 @@ const u32 gMonPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/normal. const u32 gMonPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/normal.gbapal.lz"); const u32 gMonPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/normal.gbapal.lz"); const u32 gMonPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/normal.gbapal.lz"); -const u32 gMonPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/normal.gbapal.lz"); +const u32 gMonPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/normal.gbapal.lz"); const u32 gMonPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/normal.gbapal.lz"); const u32 gMonPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/normal.gbapal.lz"); const u32 gMonPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/normal.gbapal.lz"); @@ -3060,9 +3060,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_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/normal.gbapal.lz"); -const u32 gMonPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/normal.gbapal.lz"); -const u32 gMonPalette_Kommo_o[] = 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_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); const u32 gMonPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); const u32 gMonPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); @@ -3385,7 +3385,7 @@ const u32 gMonPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10_perc const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/normal.gbapal.lz"); const u32 gMonPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/normal.gbapal.lz"); const u32 gMonPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/normal.gbapal.lz"); -const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/normal.gbapal.lz"); +const u32 gMonPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/normal.gbapal.lz"); const u32 gMonPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/normal.gbapal.lz"); const u32 gMonPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/normal.gbapal.lz"); const u32 gMonPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/normal.gbapal.lz"); @@ -3565,7 +3565,7 @@ const u32 gMonShinyPalette_Goldeen[] = INCBIN_U32("graphics/pokemon/goldeen/shin const u32 gMonShinyPalette_Seaking[] = INCBIN_U32("graphics/pokemon/seaking/shiny.gbapal.lz"); const u32 gMonShinyPalette_Staryu[] = INCBIN_U32("graphics/pokemon/staryu/shiny.gbapal.lz"); const u32 gMonShinyPalette_Starmie[] = INCBIN_U32("graphics/pokemon/starmie/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mrmime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MrMime[] = INCBIN_U32("graphics/pokemon/mr_mime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Scyther[] = INCBIN_U32("graphics/pokemon/scyther/shiny.gbapal.lz"); const u32 gMonShinyPalette_Jynx[] = INCBIN_U32("graphics/pokemon/jynx/shiny.gbapal.lz"); const u32 gMonShinyPalette_Electabuzz[] = INCBIN_U32("graphics/pokemon/electabuzz/shiny.gbapal.lz"); @@ -3882,7 +3882,7 @@ const u32 gMonShinyPalette_Skuntank[] = INCBIN_U32("graphics/pokemon/skuntank/sh const u32 gMonShinyPalette_Bronzor[] = INCBIN_U32("graphics/pokemon/bronzor/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bronzong[] = INCBIN_U32("graphics/pokemon/bronzong/shiny.gbapal.lz"); const u32 gMonShinyPalette_Bonsly[] = INCBIN_U32("graphics/pokemon/bonsly/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Mimejr[] = INCBIN_U32("graphics/pokemon/mimejr/shiny.gbapal.lz"); +const u32 gMonShinyPalette_MimeJr[] = INCBIN_U32("graphics/pokemon/mime_jr/shiny.gbapal.lz"); const u32 gMonShinyPalette_Happiny[] = INCBIN_U32("graphics/pokemon/happiny/shiny.gbapal.lz"); const u32 gMonShinyPalette_Chatot[] = INCBIN_U32("graphics/pokemon/chatot/shiny.gbapal.lz"); const u32 gMonShinyPalette_Spiritomb[] = INCBIN_U32("graphics/pokemon/spiritomb/shiny.gbapal.lz"); @@ -4225,9 +4225,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_Jangmo_o[] = INCBIN_U32("graphics/pokemon/jangmo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Hakamo_o[] = INCBIN_U32("graphics/pokemon/hakamo_o/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Kommo_o[] = 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_Tapu_koko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tapu_lele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); const u32 gMonShinyPalette_Tapu_bulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); @@ -4550,7 +4550,7 @@ const u32 gMonShinyPalette_Zygarde10[] = INCBIN_U32("graphics/pokemon/zygarde/10 const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/complete/shiny.gbapal.lz"); const u32 gMonShinyPalette_HoopaUnbound[] = INCBIN_U32("graphics/pokemon/hoopa/unbound/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioPomPom[] = INCBIN_U32("graphics/pokemon/oricorio/pom_pom/shiny.gbapal.lz"); -const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pa_u/shiny.gbapal.lz"); +const u32 gMonShinyPalette_OricorioPau[] = INCBIN_U32("graphics/pokemon/oricorio/pau/shiny.gbapal.lz"); const u32 gMonShinyPalette_OricorioSensu[] = INCBIN_U32("graphics/pokemon/oricorio/sensu/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocMidnight[] = INCBIN_U32("graphics/pokemon/lycanroc/midnight/shiny.gbapal.lz"); const u32 gMonShinyPalette_LycanrocDusk[] = INCBIN_U32("graphics/pokemon/lycanroc/dusk/shiny.gbapal.lz"); @@ -4722,7 +4722,7 @@ const u8 gMonIcon_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/icon.4bpp"); const u8 gMonIcon_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/icon.4bpp"); const u8 gMonIcon_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/icon.4bpp"); const u8 gMonIcon_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/icon.4bpp"); -const u8 gMonIcon_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); +const u8 gMonIcon_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/icon.4bpp"); const u8 gMonIcon_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/icon.4bpp"); const u8 gMonIcon_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/icon.4bpp"); const u8 gMonIcon_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/icon.4bpp"); @@ -5039,7 +5039,7 @@ const u8 gMonIcon_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/icon.4bpp"); const u8 gMonIcon_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/icon.4bpp"); const u8 gMonIcon_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/icon.4bpp"); const u8 gMonIcon_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/icon.4bpp"); -const u8 gMonIcon_Mimejr[] = INCBIN_U8("graphics/pokemon/mimejr/icon.4bpp"); +const u8 gMonIcon_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/icon.4bpp"); const u8 gMonIcon_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/icon.4bpp"); const u8 gMonIcon_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/icon.4bpp"); const u8 gMonIcon_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/icon.4bpp"); @@ -5382,9 +5382,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_Jangmo_o[] = INCBIN_U8("graphics/pokemon/jangmo_o/icon.4bpp"); -const u8 gMonIcon_Hakamo_o[] = INCBIN_U8("graphics/pokemon/hakamo_o/icon.4bpp"); -const u8 gMonIcon_Kommo_o[] = 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_Tapu_koko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); const u8 gMonIcon_Tapu_lele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); const u8 gMonIcon_Tapu_bulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); @@ -5603,7 +5603,7 @@ const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/10_percent/i const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/complete/icon.4bpp"); const u8 gMonIcon_HoopaUnbound[] = INCBIN_U8("graphics/pokemon/hoopa/unbound/icon.4bpp"); const u8 gMonIcon_OricorioPomPom[] = INCBIN_U8("graphics/pokemon/oricorio/pom_pom/icon.4bpp"); -const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pa_u/icon.4bpp"); +const u8 gMonIcon_OricorioPau[] = INCBIN_U8("graphics/pokemon/oricorio/pau/icon.4bpp"); const u8 gMonIcon_OricorioSensu[] = INCBIN_U8("graphics/pokemon/oricorio/sensu/icon.4bpp"); const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/midnight/icon.4bpp"); const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/dusk/icon.4bpp"); @@ -5744,7 +5744,7 @@ const u8 gMonFootprint_Goldeen[] = INCBIN_U8("graphics/pokemon/goldeen/footprint const u8 gMonFootprint_Seaking[] = INCBIN_U8("graphics/pokemon/seaking/footprint.1bpp"); const u8 gMonFootprint_Staryu[] = INCBIN_U8("graphics/pokemon/staryu/footprint.1bpp"); const u8 gMonFootprint_Starmie[] = INCBIN_U8("graphics/pokemon/starmie/footprint.1bpp"); -const u8 gMonFootprint_Mrmime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); +const u8 gMonFootprint_MrMime[] = INCBIN_U8("graphics/pokemon/mr_mime/footprint.1bpp"); const u8 gMonFootprint_Scyther[] = INCBIN_U8("graphics/pokemon/scyther/footprint.1bpp"); const u8 gMonFootprint_Jynx[] = INCBIN_U8("graphics/pokemon/jynx/footprint.1bpp"); const u8 gMonFootprint_Electabuzz[] = INCBIN_U8("graphics/pokemon/electabuzz/footprint.1bpp"); @@ -6061,7 +6061,7 @@ const u8 gMonFootprint_Skuntank[] = INCBIN_U8("graphics/pokemon/skuntank/footpri const u8 gMonFootprint_Bronzor[] = INCBIN_U8("graphics/pokemon/bronzor/footprint.1bpp"); const u8 gMonFootprint_Bronzong[] = INCBIN_U8("graphics/pokemon/bronzong/footprint.1bpp"); const u8 gMonFootprint_Bonsly[] = INCBIN_U8("graphics/pokemon/bonsly/footprint.1bpp"); -const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mimejr/footprint.1bpp"); +const u8 gMonFootprint_MimeJr[] = INCBIN_U8("graphics/pokemon/mime_jr/footprint.1bpp"); const u8 gMonFootprint_Happiny[] = INCBIN_U8("graphics/pokemon/happiny/footprint.1bpp"); const u8 gMonFootprint_Chatot[] = INCBIN_U8("graphics/pokemon/chatot/footprint.1bpp"); const u8 gMonFootprint_Spiritomb[] = INCBIN_U8("graphics/pokemon/spiritomb/footprint.1bpp"); diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 8c9f8a194..b6186f2d8 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -122,7 +122,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SEAKING] = sSeakingLevelUpLearnset, [SPECIES_STARYU] = sStaryuLevelUpLearnset, [SPECIES_STARMIE] = sStarmieLevelUpLearnset, - [SPECIES_MR_MIME] = sMrmimeLevelUpLearnset, + [SPECIES_MR_MIME] = sMrMimeLevelUpLearnset, [SPECIES_SCYTHER] = sScytherLevelUpLearnset, [SPECIES_JYNX] = sJynxLevelUpLearnset, [SPECIES_ELECTABUZZ] = sElectabuzzLevelUpLearnset, @@ -439,7 +439,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_BRONZOR] = sBronzorLevelUpLearnset, [SPECIES_BRONZONG] = sBronzongLevelUpLearnset, [SPECIES_BONSLY] = sBonslyLevelUpLearnset, - [SPECIES_MIME_JR] = sMimejrLevelUpLearnset, + [SPECIES_MIME_JR] = sMimeJrLevelUpLearnset, [SPECIES_HAPPINY] = sHappinyLevelUpLearnset, [SPECIES_CHATOT] = sChatotLevelUpLearnset, [SPECIES_SPIRITOMB] = sSpiritombLevelUpLearnset, @@ -782,9 +782,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, diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 2cd3c98f9..c774cc312 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -2388,7 +2388,7 @@ static const struct LevelUpMove sStarmieLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMrmimeLevelUpLearnset[] = { +static const struct LevelUpMove sMrMimeLevelUpLearnset[] = { //LEVEL_UP_MOVE( 1, MOVE_MISTY_TERRAIN), LEVEL_UP_MOVE( 1, MOVE_MAGICAL_LEAF), //LEVEL_UP_MOVE( 1, MOVE_QUICK_GUARD), @@ -8862,7 +8862,7 @@ static const struct LevelUpMove sBonslyLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sMimejrLevelUpLearnset[] = { +static const struct LevelUpMove sMimeJrLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TICKLE), LEVEL_UP_MOVE( 1, MOVE_BARRIER), LEVEL_UP_MOVE( 1, MOVE_POUND), @@ -15954,7 +15954,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), @@ -15972,7 +15972,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), @@ -15997,7 +15997,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), diff --git a/src/data/pokemon/pokedex_entries.h b/src/data/pokemon/pokedex_entries.h index d873f1401..7cf2b9d43 100644 --- a/src/data/pokemon/pokedex_entries.h +++ b/src/data/pokemon/pokedex_entries.h @@ -1469,7 +1469,7 @@ const struct PokedexEntry gPokedexEntries[] = .categoryName = _("BARRIER"), .height = 13, .weight = 545, - .description = gMrmimePokedexText, + .description = gMrMimePokedexText, .pokemonScale = 258, .pokemonOffset = 6, .trainerScale = 256, diff --git a/src/data/pokemon/pokedex_text.h b/src/data/pokemon/pokedex_text.h index 120c5abca..44aa56d0c 100644 --- a/src/data/pokemon/pokedex_text.h +++ b/src/data/pokemon/pokedex_text.h @@ -730,7 +730,7 @@ const u8 gStarmiePokedexText[] = _( "reflections of stars that twinkled on\n" "gentle waves at night."); -const u8 gMrmimePokedexText[] = _( +const u8 gMrMimePokedexText[] = _( "A Mr. Mime is a master of pantomime. It can\n" "convince others that something unseeable\n" "actually exists. Once believed, the\n" diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 5f79ce149..12de66f37 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(SEAKING, gMonBackPic_Seaking), SPECIES_SPRITE(STARYU, gMonBackPic_Staryu), SPECIES_SPRITE(STARMIE, gMonBackPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonBackPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonBackPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonBackPic_Scyther), SPECIES_SPRITE(JYNX, gMonBackPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonBackPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(BRONZOR, gMonBackPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonBackPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonBackPic_Bonsly), - SPECIES_SPRITE(MIME_JR, gMonBackPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonBackPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonBackPic_Happiny), SPECIES_SPRITE(CHATOT, gMonBackPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonBackPic_Spiritomb), @@ -782,9 +782,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_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommo_o), + SPECIES_SPRITE(JANGMO_O, gMonBackPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonBackPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonBackPic_Kommoo), SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_Tapu_koko), SPECIES_SPRITE(TAPU_LELE, gMonBackPic_Tapu_lele), SPECIES_SPRITE(TAPU_BULU, gMonBackPic_Tapu_bulu), diff --git a/src/data/pokemon_graphics/footprint_table.h b/src/data/pokemon_graphics/footprint_table.h index aec82a15b..f54602855 100644 --- a/src/data/pokemon_graphics/footprint_table.h +++ b/src/data/pokemon_graphics/footprint_table.h @@ -122,7 +122,7 @@ const u8 *const gMonFootprintTable[] = [SPECIES_SEAKING] = gMonFootprint_Seaking, [SPECIES_STARYU] = gMonFootprint_Staryu, [SPECIES_STARMIE] = gMonFootprint_Starmie, - [SPECIES_MR_MIME] = gMonFootprint_Mrmime, + [SPECIES_MR_MIME] = gMonFootprint_MrMime, [SPECIES_SCYTHER] = gMonFootprint_Scyther, [SPECIES_JYNX] = gMonFootprint_Jynx, [SPECIES_ELECTABUZZ] = gMonFootprint_Electabuzz, diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 8ae5fc9ec..f34a27d31 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -122,7 +122,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(SEAKING, gMonFrontPic_Seaking), SPECIES_SPRITE(STARYU, gMonFrontPic_Staryu), SPECIES_SPRITE(STARMIE, gMonFrontPic_Starmie), - SPECIES_SPRITE(MR_MIME, gMonFrontPic_Mrmime), + SPECIES_SPRITE(MR_MIME, gMonFrontPic_MrMime), SPECIES_SPRITE(SCYTHER, gMonFrontPic_Scyther), SPECIES_SPRITE(JYNX, gMonFrontPic_Jynx), SPECIES_SPRITE(ELECTABUZZ, gMonFrontPic_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(BRONZOR, gMonFrontPic_Bronzor), SPECIES_SPRITE(BRONZONG, gMonFrontPic_Bronzong), SPECIES_SPRITE(BONSLY, gMonFrontPic_Bonsly), - SPECIES_SPRITE(MIME_JR, gMonFrontPic_Mimejr), + SPECIES_SPRITE(MIME_JR, gMonFrontPic_MimeJr), SPECIES_SPRITE(HAPPINY, gMonFrontPic_Happiny), SPECIES_SPRITE(CHATOT, gMonFrontPic_Chatot), SPECIES_SPRITE(SPIRITOMB, gMonFrontPic_Spiritomb), @@ -782,9 +782,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_Jangmo_o), - SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamo_o), - SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommo_o), + SPECIES_SPRITE(JANGMO_O, gMonFrontPic_Jangmoo), + SPECIES_SPRITE(HAKAMO_O, gMonFrontPic_Hakamoo), + SPECIES_SPRITE(KOMMO_O, gMonFrontPic_Kommoo), SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_Tapu_koko), SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_Tapu_lele), SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_Tapu_bulu), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 3ccb072ca..5905e1369 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(SEAKING, gMonPalette_Seaking), SPECIES_PAL(STARYU, gMonPalette_Staryu), SPECIES_PAL(STARMIE, gMonPalette_Starmie), - SPECIES_PAL(MR_MIME, gMonPalette_Mrmime), + SPECIES_PAL(MR_MIME, gMonPalette_MrMime), SPECIES_PAL(SCYTHER, gMonPalette_Scyther), SPECIES_PAL(JYNX, gMonPalette_Jynx), SPECIES_PAL(ELECTABUZZ, gMonPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(BRONZOR, gMonPalette_Bronzor), SPECIES_PAL(BRONZONG, gMonPalette_Bronzong), SPECIES_PAL(BONSLY, gMonPalette_Bonsly), - SPECIES_PAL(MIME_JR, gMonPalette_Mimejr), + SPECIES_PAL(MIME_JR, gMonPalette_MimeJr), SPECIES_PAL(HAPPINY, gMonPalette_Happiny), SPECIES_PAL(CHATOT, gMonPalette_Chatot), SPECIES_PAL(SPIRITOMB, gMonPalette_Spiritomb), @@ -782,9 +782,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_Jangmo_o), - SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamo_o), - SPECIES_PAL(KOMMO_O, gMonPalette_Kommo_o), + SPECIES_PAL(JANGMO_O, gMonPalette_Jangmoo), + SPECIES_PAL(HAKAMO_O, gMonPalette_Hakamoo), + SPECIES_PAL(KOMMO_O, gMonPalette_Kommoo), SPECIES_PAL(TAPU_KOKO, gMonPalette_Tapu_koko), SPECIES_PAL(TAPU_LELE, gMonPalette_Tapu_lele), SPECIES_PAL(TAPU_BULU, gMonPalette_Tapu_bulu), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 93bfe33b7..e2ce6126b 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -122,7 +122,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(SEAKING, gMonShinyPalette_Seaking), SPECIES_SHINY_PAL(STARYU, gMonShinyPalette_Staryu), SPECIES_SHINY_PAL(STARMIE, gMonShinyPalette_Starmie), - SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_Mrmime), + SPECIES_SHINY_PAL(MR_MIME, gMonShinyPalette_MrMime), SPECIES_SHINY_PAL(SCYTHER, gMonShinyPalette_Scyther), SPECIES_SHINY_PAL(JYNX, gMonShinyPalette_Jynx), SPECIES_SHINY_PAL(ELECTABUZZ, gMonShinyPalette_Electabuzz), @@ -439,7 +439,7 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(BRONZOR, gMonShinyPalette_Bronzor), SPECIES_SHINY_PAL(BRONZONG, gMonShinyPalette_Bronzong), SPECIES_SHINY_PAL(BONSLY, gMonShinyPalette_Bonsly), - SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_Mimejr), + SPECIES_SHINY_PAL(MIME_JR, gMonShinyPalette_MimeJr), SPECIES_SHINY_PAL(HAPPINY, gMonShinyPalette_Happiny), SPECIES_SHINY_PAL(CHATOT, gMonShinyPalette_Chatot), SPECIES_SHINY_PAL(SPIRITOMB, gMonShinyPalette_Spiritomb), @@ -782,9 +782,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_Jangmo_o), - SPECIES_SHINY_PAL(HAKAMO_O, gMonShinyPalette_Hakamo_o), - SPECIES_SHINY_PAL(KOMMO_O, gMonShinyPalette_Kommo_o), + 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_Tapu_koko), SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_Tapu_lele), SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_Tapu_bulu), diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 26677bcca..c13b1361c 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -438,7 +438,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_BRONZOR] = _("Bronzor"), [SPECIES_BRONZONG] = _("Bronzong"), [SPECIES_BONSLY] = _("Bonsly"), - [SPECIES_MIME_JR] = _("Mime jr."), + [SPECIES_MIME_JR] = _("Mime Jr."), [SPECIES_HAPPINY] = _("Happiny"), [SPECIES_CHATOT] = _("Chatot"), [SPECIES_SPIRITOMB] = _("Spiritomb"), @@ -473,7 +473,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_GLACEON] = _("Glaceon"), [SPECIES_GLISCOR] = _("Gliscor"), [SPECIES_MAMOSWINE] = _("Mamoswine"), - [SPECIES_PORYGON_Z] = _("Porygon-z"), + [SPECIES_PORYGON_Z] = _("Porygon-Z"), [SPECIES_GALLADE] = _("Gallade"), [SPECIES_PROBOPASS] = _("Probopass"), [SPECIES_DUSKNOIR] = _("Dusknoir"), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 9265871f1..1795df232 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -147,7 +147,7 @@ const u8 *const gMonIconTable[] = [SPECIES_SEAKING] = gMonIcon_Seaking, [SPECIES_STARYU] = gMonIcon_Staryu, [SPECIES_STARMIE] = gMonIcon_Starmie, - [SPECIES_MR_MIME] = gMonIcon_Mrmime, + [SPECIES_MR_MIME] = gMonIcon_MrMime, [SPECIES_SCYTHER] = gMonIcon_Scyther, [SPECIES_JYNX] = gMonIcon_Jynx, [SPECIES_ELECTABUZZ] = gMonIcon_Electabuzz, @@ -464,7 +464,7 @@ const u8 *const gMonIconTable[] = [SPECIES_BRONZOR] = gMonIcon_Bronzor, [SPECIES_BRONZONG] = gMonIcon_Bronzong, [SPECIES_BONSLY] = gMonIcon_Bonsly, - [SPECIES_MIME_JR] = gMonIcon_Mimejr, + [SPECIES_MIME_JR] = gMonIcon_MimeJr, [SPECIES_HAPPINY] = gMonIcon_Happiny, [SPECIES_CHATOT] = gMonIcon_Chatot, [SPECIES_SPIRITOMB] = gMonIcon_Spiritomb, @@ -807,9 +807,9 @@ const u8 *const gMonIconTable[] = [SPECIES_BRUXISH] = gMonIcon_Bruxish, [SPECIES_DRAMPA] = gMonIcon_Drampa, [SPECIES_DHELMISE] = gMonIcon_Dhelmise, - [SPECIES_JANGMO_O] = gMonIcon_Jangmo_o, - [SPECIES_HAKAMO_O] = gMonIcon_Hakamo_o, - [SPECIES_KOMMO_O] = gMonIcon_Kommo_o, + [SPECIES_JANGMO_O] = gMonIcon_Jangmoo, + [SPECIES_HAKAMO_O] = gMonIcon_Hakamoo, + [SPECIES_KOMMO_O] = gMonIcon_Kommoo, [SPECIES_TAPU_KOKO] = gMonIcon_Tapu_koko, [SPECIES_TAPU_LELE] = gMonIcon_Tapu_lele, [SPECIES_TAPU_BULU] = gMonIcon_Tapu_bulu,