From 032f8ac834c571b7c01b58f122d6a90a4c28c343 Mon Sep 17 00:00:00 2001 From: amiosi <44352097+amiosi@users.noreply.github.com> Date: Tue, 2 Feb 2021 14:43:12 -0500 Subject: [PATCH] tapus pls --- src/data/graphics/pokemon.h | 40 +++++++++---------- src/data/pokemon_graphics/back_pic_table.h | 8 ++-- src/data/pokemon_graphics/front_pic_table.h | 8 ++-- src/data/pokemon_graphics/palette_table.h | 8 ++-- .../pokemon_graphics/shiny_palette_table.h | 8 ++-- src/pokemon_icon.c | 8 ++-- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index 534d912792..9ede202856 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -785,10 +785,10 @@ const u32 gMonFrontPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/front. 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"); -const u32 gMonFrontPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); +const u32 gMonFrontPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/front.4bpp.lz"); +const u32 gMonFrontPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/front.4bpp.lz"); +const u32 gMonFrontPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/front.4bpp.lz"); +const u32 gMonFrontPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/front.4bpp.lz"); const u32 gMonFrontPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/front.4bpp.lz"); const u32 gMonFrontPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/front.4bpp.lz"); const u32 gMonFrontPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/front.4bpp.lz"); @@ -1925,10 +1925,10 @@ const u32 gMonBackPic_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/back.4b 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"); -const u32 gMonBackPic_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); +const u32 gMonBackPic_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/back.4bpp.lz"); +const u32 gMonBackPic_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/back.4bpp.lz"); +const u32 gMonBackPic_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/back.4bpp.lz"); +const u32 gMonBackPic_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/back.4bpp.lz"); const u32 gMonBackPic_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/back.4bpp.lz"); const u32 gMonBackPic_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/back.4bpp.lz"); const u32 gMonBackPic_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/back.4bpp.lz"); @@ -3063,10 +3063,10 @@ const u32 gMonPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/normal. 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"); -const u32 gMonPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); +const u32 gMonPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/normal.gbapal.lz"); +const u32 gMonPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/normal.gbapal.lz"); +const u32 gMonPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/normal.gbapal.lz"); +const u32 gMonPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/normal.gbapal.lz"); const u32 gMonPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/normal.gbapal.lz"); const u32 gMonPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/normal.gbapal.lz"); const u32 gMonPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/normal.gbapal.lz"); @@ -4228,10 +4228,10 @@ const u32 gMonShinyPalette_Dhelmise[] = INCBIN_U32("graphics/pokemon/dhelmise/sh 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"); -const u32 gMonShinyPalette_Tapu_Fini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuKoko[] = INCBIN_U32("graphics/pokemon/tapu_koko/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuLele[] = INCBIN_U32("graphics/pokemon/tapu_lele/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuBulu[] = INCBIN_U32("graphics/pokemon/tapu_bulu/shiny.gbapal.lz"); +const u32 gMonShinyPalette_TapuFini[] = INCBIN_U32("graphics/pokemon/tapu_fini/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmog[] = INCBIN_U32("graphics/pokemon/cosmog/shiny.gbapal.lz"); const u32 gMonShinyPalette_Cosmoem[] = INCBIN_U32("graphics/pokemon/cosmoem/shiny.gbapal.lz"); const u32 gMonShinyPalette_Solgaleo[] = INCBIN_U32("graphics/pokemon/solgaleo/shiny.gbapal.lz"); @@ -5385,10 +5385,10 @@ 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_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"); -const u8 gMonIcon_Tapu_Fini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); +const u8 gMonIcon_TapuKoko[] = INCBIN_U8("graphics/pokemon/tapu_koko/icon.4bpp"); +const u8 gMonIcon_TapuLele[] = INCBIN_U8("graphics/pokemon/tapu_lele/icon.4bpp"); +const u8 gMonIcon_TapuBulu[] = INCBIN_U8("graphics/pokemon/tapu_bulu/icon.4bpp"); +const u8 gMonIcon_TapuFini[] = INCBIN_U8("graphics/pokemon/tapu_fini/icon.4bpp"); const u8 gMonIcon_Cosmog[] = INCBIN_U8("graphics/pokemon/cosmog/icon.4bpp"); const u8 gMonIcon_Cosmoem[] = INCBIN_U8("graphics/pokemon/cosmoem/icon.4bpp"); const u8 gMonIcon_Solgaleo[] = INCBIN_U8("graphics/pokemon/solgaleo/icon.4bpp"); diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index e71f450d83..720a3dbb99 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = 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), - SPECIES_SPRITE(TAPU_FINI, gMonBackPic_Tapu_Fini), + SPECIES_SPRITE(TAPU_KOKO, gMonBackPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonBackPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonBackPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonBackPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonBackPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonBackPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonBackPic_Solgaleo), diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 2a8f113e68..938dd0dca5 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -785,10 +785,10 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = 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), - SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_Tapu_Fini), + SPECIES_SPRITE(TAPU_KOKO, gMonFrontPic_TapuKoko), + SPECIES_SPRITE(TAPU_LELE, gMonFrontPic_TapuLele), + SPECIES_SPRITE(TAPU_BULU, gMonFrontPic_TapuBulu), + SPECIES_SPRITE(TAPU_FINI, gMonFrontPic_TapuFini), SPECIES_SPRITE(COSMOG, gMonFrontPic_Cosmog), SPECIES_SPRITE(COSMOEM, gMonFrontPic_Cosmoem), SPECIES_SPRITE(SOLGALEO, gMonFrontPic_Solgaleo), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 082f48da84..7149baea57 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonPaletteTable[] = 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), - SPECIES_PAL(TAPU_FINI, gMonPalette_Tapu_Fini), + SPECIES_PAL(TAPU_KOKO, gMonPalette_TapuKoko), + SPECIES_PAL(TAPU_LELE, gMonPalette_TapuLele), + SPECIES_PAL(TAPU_BULU, gMonPalette_TapuBulu), + SPECIES_PAL(TAPU_FINI, gMonPalette_TapuFini), SPECIES_PAL(COSMOG, gMonPalette_Cosmog), SPECIES_PAL(COSMOEM, gMonPalette_Cosmoem), SPECIES_PAL(SOLGALEO, gMonPalette_Solgaleo), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index 64c8f6f750..6a149dd87a 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -785,10 +785,10 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = 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), - SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_Tapu_Fini), + SPECIES_SHINY_PAL(TAPU_KOKO, gMonShinyPalette_TapuKoko), + SPECIES_SHINY_PAL(TAPU_LELE, gMonShinyPalette_TapuLele), + SPECIES_SHINY_PAL(TAPU_BULU, gMonShinyPalette_TapuBulu), + SPECIES_SHINY_PAL(TAPU_FINI, gMonShinyPalette_TapuFini), SPECIES_SHINY_PAL(COSMOG, gMonShinyPalette_Cosmog), SPECIES_SHINY_PAL(COSMOEM, gMonShinyPalette_Cosmoem), SPECIES_SHINY_PAL(SOLGALEO, gMonShinyPalette_Solgaleo), diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index 7311cf6fa9..33534206e7 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -810,10 +810,10 @@ const u8 *const gMonIconTable[] = [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, - [SPECIES_TAPU_FINI] = gMonIcon_Tapu_Fini, + [SPECIES_TAPU_KOKO] = gMonIcon_TapuKoko, + [SPECIES_TAPU_LELE] = gMonIcon_TapuLele, + [SPECIES_TAPU_BULU] = gMonIcon_TapuBulu, + [SPECIES_TAPU_FINI] = gMonIcon_TapuFini, [SPECIES_COSMOG] = gMonIcon_Cosmog, [SPECIES_COSMOEM] = gMonIcon_Cosmoem, [SPECIES_SOLGALEO] = gMonIcon_Solgaleo,