From 418da6158b2cd3069841fd4570e563bc83518351 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Wed, 3 Feb 2021 12:57:56 -0500 Subject: [PATCH] last of the cries --- sound/cry_tables.inc | 26 +++++++++++++------------- src/data/graphics/pokemon.h | 8 ++++---- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index 842094e3fb..d105846046 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -474,7 +474,7 @@ gCryTable:: @ 869DCF4 cry Cry_Glaceon cry Cry_Gliscor cry Cry_Mamoswine - cry Cry_PorygonZ + cry Cry_Porygon_Z cry Cry_Gallade cry Cry_Probopass cry Cry_Dusknoir @@ -866,7 +866,7 @@ gCryTable:: @ 869DCF4 cry_uncomp Cry_Perrserker cry_uncomp Cry_Cursola cry_uncomp Cry_Sirfetchd - cry_uncomp Cry_MrRime + cry_uncomp Cry_Mr_Rime cry_uncomp Cry_Runerigus cry_uncomp Cry_Milcery cry_uncomp Cry_Alcremie @@ -978,7 +978,7 @@ gCryTable:: @ 869DCF4 cry Cry_Slowbro cry Cry_Farfetchd cry Cry_Weezing - cry Cry_MrMime + cry Cry_Mr_Mime cry Cry_Articuno cry Cry_Zapdos cry Cry_Moltres @@ -1303,10 +1303,10 @@ gCryTable2:: @ 869EF24 cry2 Cry_Raichu @ 869F050 cry2 Cry_Sandshrew @ 869F05C cry2 Cry_Sandslash @ 869F068 - cry2 Cry_NidoranF @ 869F074 + cry2 Cry_Nidoran_F @ 869F074 cry2 Cry_Nidorina @ 869F080 cry2 Cry_Nidoqueen @ 869F08C - cry2 Cry_NidoranM @ 869F098 + cry2 Cry_Nidoran_M @ 869F098 cry2 Cry_Nidorino @ 869F0A4 cry2 Cry_Nidoking @ 869F0B0 cry2 Cry_Clefairy @ 869F0BC @@ -1396,7 +1396,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Seaking @ 869F4AC cry2 Cry_Staryu @ 869F4B8 cry2 Cry_Starmie @ 869F4C4 - cry2 Cry_MrMime @ 869F4D0 + cry2 Cry_Mr_Mime @ 869F4D0 cry2 Cry_Scyther @ 869F4DC cry2 Cry_Jynx @ 869F4E8 cry2 Cry_Electabuzz @ 869F4F4 @@ -1713,7 +1713,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Bronzor cry2 Cry_Bronzong cry2 Cry_Bonsly - cry2 Cry_Mimejr + cry2 Cry_Mime_Jr cry2 Cry_Happiny cry2 Cry_Chatot cry2 Cry_Spiritomb @@ -2059,10 +2059,10 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Jangmo_o cry2_uncomp Cry_Hakamo_o cry2_uncomp Cry_Kommo_o - cry2_uncomp Cry_Tapu_koko - cry2_uncomp Cry_Tapu_lele - cry2_uncomp Cry_Tapu_bulu - cry2_uncomp Cry_Tapu_fini + cry2_uncomp Cry_Tapu_Koko + cry2_uncomp Cry_Tapu_Lele + cry2_uncomp Cry_Tapu_Bulu + cry2_uncomp Cry_Tapu_Fini cry2_uncomp Cry_Cosmog cry2_uncomp Cry_Cosmoem cry2_uncomp Cry_Solgaleo @@ -2252,7 +2252,7 @@ gCryTable2:: @ 869EF24 cry2 Cry_Slowbro cry2 Cry_Farfetchd cry2 Cry_Weezing - cry2 Cry_MrMime + cry2 Cry_Mr_Mime cry2 Cry_Articuno cry2 Cry_Zapdos cry2 Cry_Moltres @@ -2460,7 +2460,7 @@ gCryTable2:: @ 869EF24 cry2_uncomp Cry_Hoopa_Unbound @ Oricorio cry2_uncomp Cry_Oricorio_Pom_Pom - cry2_uncomp Cry_Oricorio_Pa_u + cry2_uncomp Cry_Oricorio_Pau cry2_uncomp Cry_Oricorio_Sensu @ Rockruff cry2_uncomp Cry_Rockruff diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 9ede202856..b93000cfe0 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -866,7 +866,7 @@ const u32 gMonFrontPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/fron const u32 gMonFrontPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/front.4bpp.lz"); const u32 gMonFrontPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/front.4bpp.lz"); const u32 gMonFrontPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/front.4bpp.lz"); -const u32 gMonFrontPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); +const u32 gMonFrontPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/front.4bpp.lz"); const u32 gMonFrontPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/front.4bpp.lz"); const u32 gMonFrontPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/front.4bpp.lz"); const u32 gMonFrontPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/front.4bpp.lz"); @@ -2006,7 +2006,7 @@ const u32 gMonBackPic_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/back. const u32 gMonBackPic_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/back.4bpp.lz"); const u32 gMonBackPic_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/back.4bpp.lz"); const u32 gMonBackPic_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/back.4bpp.lz"); -const u32 gMonBackPic_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); +const u32 gMonBackPic_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/back.4bpp.lz"); const u32 gMonBackPic_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/back.4bpp.lz"); const u32 gMonBackPic_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/back.4bpp.lz"); const u32 gMonBackPic_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/back.4bpp.lz"); @@ -3144,7 +3144,7 @@ const u32 gMonPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/norma const u32 gMonPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/normal.gbapal.lz"); const u32 gMonPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/normal.gbapal.lz"); const u32 gMonPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/normal.gbapal.lz"); -const u32 gMonPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); +const u32 gMonPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/normal.gbapal.lz"); const u32 gMonPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/normal.gbapal.lz"); const u32 gMonPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/normal.gbapal.lz"); const u32 gMonPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/normal.gbapal.lz"); @@ -4309,7 +4309,7 @@ const u32 gMonShinyPalette_Obstagoon[] = INCBIN_U32("graphics/pokemon/obstagoon/ const u32 gMonShinyPalette_Perrserker[] = INCBIN_U32("graphics/pokemon/perrserker/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cursola[] = INCBIN_U32("graphics/pokemon/cursola/shiny.gbapal.lz"); const u32 gMonShinyPalette_Sirfetchd[] = INCBIN_U32("graphics/pokemon/sirfetchd/shiny.gbapal.lz"); -const u32 gMonShinyPalette_MrRime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Mr_Rime[] = INCBIN_U32("graphics/pokemon/mr_rime/shiny.gbapal.lz"); const u32 gMonShinyPalette_Runerigus[] = INCBIN_U32("graphics/pokemon/runerigus/shiny.gbapal.lz"); const u32 gMonShinyPalette_Milcery[] = INCBIN_U32("graphics/pokemon/milcery/shiny.gbapal.lz"); const u32 gMonShinyPalette_Alcremie[] = INCBIN_U32("graphics/pokemon/alcremie/shiny.gbapal.lz");