atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tapu case

Browse source
This commit is contained in:
amiosi 2021-02-02 14:24:15 -05:00
parent f700004188
commit 9c2c337e6f
7 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
include/graphics.h
View file

@ -822,10 +822,10 @@ extern const u32 gMonFrontPic_Dhelmise[];
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[];
extern const u32 gMonFrontPic_Tapu_fini[];
extern const u32 gMonFrontPic_Tapu_Koko[];
extern const u32 gMonFrontPic_Tapu_Lele[];
extern const u32 gMonFrontPic_Tapu_Bulu[];
extern const u32 gMonFrontPic_Tapu_Fini[];
extern const u32 gMonFrontPic_Cosmog[];
extern const u32 gMonFrontPic_Cosmoem[];
extern const u32 gMonFrontPic_Solgaleo[];
@ -1962,10 +1962,10 @@ extern const u32 gMonBackPic_Dhelmise[];
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[];
extern const u32 gMonBackPic_Tapu_fini[];
extern const u32 gMonBackPic_Tapu_Koko[];
extern const u32 gMonBackPic_Tapu_Lele[];
extern const u32 gMonBackPic_Tapu_Bulu[];
extern const u32 gMonBackPic_Tapu_Fini[];
extern const u32 gMonBackPic_Cosmog[];
extern const u32 gMonBackPic_Cosmoem[];
extern const u32 gMonBackPic_Solgaleo[];
@ -3100,10 +3100,10 @@ extern const u32 gMonPalette_Dhelmise[];
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[];
extern const u32 gMonPalette_Tapu_fini[];
extern const u32 gMonPalette_Tapu_Koko[];
extern const u32 gMonPalette_Tapu_Lele[];
extern const u32 gMonPalette_Tapu_Bulu[];
extern const u32 gMonPalette_Tapu_Fini[];
extern const u32 gMonPalette_Cosmog[];
extern const u32 gMonPalette_Cosmoem[];
extern const u32 gMonPalette_Solgaleo[];
@ -4265,10 +4265,10 @@ extern const u32 gMonShinyPalette_Dhelmise[];
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[];
extern const u32 gMonShinyPalette_Tapu_fini[];
extern const u32 gMonShinyPalette_Tapu_Koko[];
extern const u32 gMonShinyPalette_Tapu_Lele[];
extern const u32 gMonShinyPalette_Tapu_Bulu[];
extern const u32 gMonShinyPalette_Tapu_Fini[];
extern const u32 gMonShinyPalette_Cosmog[];
extern const u32 gMonShinyPalette_Cosmoem[];
extern const u32 gMonShinyPalette_Solgaleo[];
@ -5422,10 +5422,10 @@ extern const u8 gMonIcon_Dhelmise[];
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[];
extern const u8 gMonIcon_Tapu_fini[];
extern const u8 gMonIcon_Tapu_Koko[];
extern const u8 gMonIcon_Tapu_Lele[];
extern const u8 gMonIcon_Tapu_Bulu[];
extern const u8 gMonIcon_Tapu_Fini[];
extern const u8 gMonIcon_Cosmog[];
extern const u8 gMonIcon_Cosmoem[];
extern const u8 gMonIcon_Solgaleo[];

40
src/data/graphics/pokemon.h
View file

@ -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_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_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_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_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_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_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_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_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_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_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");

8
src/data/pokemon_graphics/back_pic_table.h
View file

@ -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_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(COSMOG, gMonBackPic_Cosmog),
SPECIES_SPRITE(COSMOEM, gMonBackPic_Cosmoem),
SPECIES_SPRITE(SOLGALEO, gMonBackPic_Solgaleo),

8
src/data/pokemon_graphics/front_pic_table.h
View file

@ -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_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(COSMOG, gMonFrontPic_Cosmog),
SPECIES_SPRITE(COSMOEM, gMonFrontPic_Cosmoem),
SPECIES_SPRITE(SOLGALEO, gMonFrontPic_Solgaleo),

8
src/data/pokemon_graphics/palette_table.h
View file

@ -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_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(COSMOG, gMonPalette_Cosmog),
SPECIES_PAL(COSMOEM, gMonPalette_Cosmoem),
SPECIES_PAL(SOLGALEO, gMonPalette_Solgaleo),

8
src/data/pokemon_graphics/shiny_palette_table.h
View file

@ -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_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(COSMOG, gMonShinyPalette_Cosmog),
SPECIES_SHINY_PAL(COSMOEM, gMonShinyPalette_Cosmoem),
SPECIES_SHINY_PAL(SOLGALEO, gMonShinyPalette_Solgaleo),

8
src/pokemon_icon.c
View file

@ -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_Tapu_Koko,
[SPECIES_TAPU_LELE] = gMonIcon_Tapu_Lele,
[SPECIES_TAPU_BULU] = gMonIcon_Tapu_Bulu,
[SPECIES_TAPU_FINI] = gMonIcon_Tapu_Fini,
[SPECIES_COSMOG] = gMonIcon_Cosmog,
[SPECIES_COSMOEM] = gMonIcon_Cosmoem,
[SPECIES_SOLGALEO] = gMonIcon_Solgaleo,