From d3a59211228c0b37605575cd8972236d6f26c19a Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Fri, 13 Nov 2020 16:34:53 -0300 Subject: [PATCH] Review changes 3 --- .../anim_front.png} | Bin .../{back_attack.png => attack/back.png} | Bin .../{front_attack.png => attack/front.png} | Bin .../{icon_attack.png => attack/icon.png} | Bin .../{normal_attack.pal => attack/normal.pal} | 0 .../{shiny_attack.pal => attack/shiny.pal} | 0 .../anim_front.png} | Bin .../{back_defense.png => defense/back.png} | Bin .../{front_defense.png => defense/front.png} | Bin .../{icon_defense.png => defense/icon.png} | Bin .../normal.pal} | 0 .../{shiny_defense.pal => defense/shiny.pal} | 0 .../anim_front.png} | Bin .../deoxys/{back_speed.png => speed/back.png} | Bin .../{front_speed.png => speed/front.png} | Bin .../deoxys/{icon_speed.png => speed/icon.png} | Bin .../{normal_speed.pal => speed/normal.pal} | 0 .../{shiny_speed.pal => speed/shiny.pal} | 0 src/data/graphics/pokemon.h | 33 +++++++++--------- src/data/pokemon_graphics/front_pic_anims.h | 6 ++-- 20 files changed, 20 insertions(+), 19 deletions(-) rename graphics/pokemon/deoxys/{anim_front_attack.png => attack/anim_front.png} (100%) rename graphics/pokemon/deoxys/{back_attack.png => attack/back.png} (100%) rename graphics/pokemon/deoxys/{front_attack.png => attack/front.png} (100%) rename graphics/pokemon/deoxys/{icon_attack.png => attack/icon.png} (100%) rename graphics/pokemon/deoxys/{normal_attack.pal => attack/normal.pal} (100%) rename graphics/pokemon/deoxys/{shiny_attack.pal => attack/shiny.pal} (100%) rename graphics/pokemon/deoxys/{anim_front_defense.png => defense/anim_front.png} (100%) rename graphics/pokemon/deoxys/{back_defense.png => defense/back.png} (100%) rename graphics/pokemon/deoxys/{front_defense.png => defense/front.png} (100%) rename graphics/pokemon/deoxys/{icon_defense.png => defense/icon.png} (100%) rename graphics/pokemon/deoxys/{normal_defense.pal => defense/normal.pal} (100%) rename graphics/pokemon/deoxys/{shiny_defense.pal => defense/shiny.pal} (100%) rename graphics/pokemon/deoxys/{anim_front_speed.png => speed/anim_front.png} (100%) rename graphics/pokemon/deoxys/{back_speed.png => speed/back.png} (100%) rename graphics/pokemon/deoxys/{front_speed.png => speed/front.png} (100%) rename graphics/pokemon/deoxys/{icon_speed.png => speed/icon.png} (100%) rename graphics/pokemon/deoxys/{normal_speed.pal => speed/normal.pal} (100%) rename graphics/pokemon/deoxys/{shiny_speed.pal => speed/shiny.pal} (100%) diff --git a/graphics/pokemon/deoxys/anim_front_attack.png b/graphics/pokemon/deoxys/attack/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/anim_front_attack.png rename to graphics/pokemon/deoxys/attack/anim_front.png diff --git a/graphics/pokemon/deoxys/back_attack.png b/graphics/pokemon/deoxys/attack/back.png similarity index 100% rename from graphics/pokemon/deoxys/back_attack.png rename to graphics/pokemon/deoxys/attack/back.png diff --git a/graphics/pokemon/deoxys/front_attack.png b/graphics/pokemon/deoxys/attack/front.png similarity index 100% rename from graphics/pokemon/deoxys/front_attack.png rename to graphics/pokemon/deoxys/attack/front.png diff --git a/graphics/pokemon/deoxys/icon_attack.png b/graphics/pokemon/deoxys/attack/icon.png similarity index 100% rename from graphics/pokemon/deoxys/icon_attack.png rename to graphics/pokemon/deoxys/attack/icon.png diff --git a/graphics/pokemon/deoxys/normal_attack.pal b/graphics/pokemon/deoxys/attack/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/normal_attack.pal rename to graphics/pokemon/deoxys/attack/normal.pal diff --git a/graphics/pokemon/deoxys/shiny_attack.pal b/graphics/pokemon/deoxys/attack/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/shiny_attack.pal rename to graphics/pokemon/deoxys/attack/shiny.pal diff --git a/graphics/pokemon/deoxys/anim_front_defense.png b/graphics/pokemon/deoxys/defense/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/anim_front_defense.png rename to graphics/pokemon/deoxys/defense/anim_front.png diff --git a/graphics/pokemon/deoxys/back_defense.png b/graphics/pokemon/deoxys/defense/back.png similarity index 100% rename from graphics/pokemon/deoxys/back_defense.png rename to graphics/pokemon/deoxys/defense/back.png diff --git a/graphics/pokemon/deoxys/front_defense.png b/graphics/pokemon/deoxys/defense/front.png similarity index 100% rename from graphics/pokemon/deoxys/front_defense.png rename to graphics/pokemon/deoxys/defense/front.png diff --git a/graphics/pokemon/deoxys/icon_defense.png b/graphics/pokemon/deoxys/defense/icon.png similarity index 100% rename from graphics/pokemon/deoxys/icon_defense.png rename to graphics/pokemon/deoxys/defense/icon.png diff --git a/graphics/pokemon/deoxys/normal_defense.pal b/graphics/pokemon/deoxys/defense/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/normal_defense.pal rename to graphics/pokemon/deoxys/defense/normal.pal diff --git a/graphics/pokemon/deoxys/shiny_defense.pal b/graphics/pokemon/deoxys/defense/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/shiny_defense.pal rename to graphics/pokemon/deoxys/defense/shiny.pal diff --git a/graphics/pokemon/deoxys/anim_front_speed.png b/graphics/pokemon/deoxys/speed/anim_front.png similarity index 100% rename from graphics/pokemon/deoxys/anim_front_speed.png rename to graphics/pokemon/deoxys/speed/anim_front.png diff --git a/graphics/pokemon/deoxys/back_speed.png b/graphics/pokemon/deoxys/speed/back.png similarity index 100% rename from graphics/pokemon/deoxys/back_speed.png rename to graphics/pokemon/deoxys/speed/back.png diff --git a/graphics/pokemon/deoxys/front_speed.png b/graphics/pokemon/deoxys/speed/front.png similarity index 100% rename from graphics/pokemon/deoxys/front_speed.png rename to graphics/pokemon/deoxys/speed/front.png diff --git a/graphics/pokemon/deoxys/icon_speed.png b/graphics/pokemon/deoxys/speed/icon.png similarity index 100% rename from graphics/pokemon/deoxys/icon_speed.png rename to graphics/pokemon/deoxys/speed/icon.png diff --git a/graphics/pokemon/deoxys/normal_speed.pal b/graphics/pokemon/deoxys/speed/normal.pal similarity index 100% rename from graphics/pokemon/deoxys/normal_speed.pal rename to graphics/pokemon/deoxys/speed/normal.pal diff --git a/graphics/pokemon/deoxys/shiny_speed.pal b/graphics/pokemon/deoxys/speed/shiny.pal similarity index 100% rename from graphics/pokemon/deoxys/shiny_speed.pal rename to graphics/pokemon/deoxys/speed/shiny.pal diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index eea8d24663..1aaaa1efd9 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -922,9 +922,9 @@ const u32 gMonFrontPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/ const u32 gMonFrontPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/anim_front.4bpp.lz"); const u32 gMonFrontPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/anim_front.4bpp.lz"); const u32 gMonFrontPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/anim_front.4bpp.lz"); -const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front_attack.4bpp.lz"); -const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front_defense.4bpp.lz"); -const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/anim_front_speed.4bpp.lz"); +const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/anim_front.4bpp.lz"); +const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/anim_front.4bpp.lz"); const u32 gMonFrontPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/anim_front.4bpp.lz"); const u32 gMonFrontPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/anim_front.4bpp.lz"); @@ -1931,9 +1931,9 @@ const u32 gMonBackPic_UnownQuestionMark[] = INCBIN_U32("graphics/pokemon/unown/q const u32 gMonBackPic_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/back.4bpp.lz"); const u32 gMonBackPic_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/back.4bpp.lz"); const u32 gMonBackPic_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/back.4bpp.lz"); -const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/back_attack.4bpp.lz"); -const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/back_defense.4bpp.lz"); -const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/back_speed.4bpp.lz"); +const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/back.4bpp.lz"); +const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/back.4bpp.lz"); +const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/back.4bpp.lz"); const u32 gMonBackPic_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/back.4bpp.lz"); const u32 gMonBackPic_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/back.4bpp.lz"); const u32 gMonBackPic_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/back.4bpp.lz"); @@ -2911,9 +2911,9 @@ const u32 gMonPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pichu/spi const u32 gMonPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/normal.gbapal.lz"); const u32 gMonPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/normal.gbapal.lz"); const u32 gMonPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/normal.gbapal.lz"); -const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/normal_attack.gbapal.lz"); -const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/normal_defense.gbapal.lz"); -const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/normal_speed.gbapal.lz"); +const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/normal.gbapal.lz"); +const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/normal.gbapal.lz"); +const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/normal.gbapal.lz"); const u32 gMonPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/normal.gbapal.lz"); const u32 gMonPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/normal.gbapal.lz"); const u32 gMonPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/normal.gbapal.lz"); @@ -3859,7 +3859,8 @@ const u32 gMonShinyPalette_Stakataka[] = INCBIN_U32("graphics/pokemon/stakataka/ const u32 gMonShinyPalette_Blacephalon[] = INCBIN_U32("graphics/pokemon/blacephalon/shiny.gbapal.lz"); const u32 gMonShinyPalette_Zeraora[] = INCBIN_U32("graphics/pokemon/zeraora/shiny.gbapal.lz"); const u32 gMonShinyPalette_Meltan[] = INCBIN_U32("graphics/pokemon/meltan/shiny.gbapal.lz"); -const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz");const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/shiny.gbapal.lz"); +const u32 gMonShinyPalette_Melmetal[] = INCBIN_U32("graphics/pokemon/melmetal/shiny.gbapal.lz"); +const u32 gMonShinyPalette_VenusaurMega[] = INCBIN_U32("graphics/pokemon/mega_venusaur/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaX[] = INCBIN_U32("graphics/pokemon/mega_charizard_x/shiny.gbapal.lz"); const u32 gMonShinyPalette_CharizardMegaY[] = INCBIN_U32("graphics/pokemon/mega_charizard_y/shiny.gbapal.lz"); const u32 gMonShinyPalette_BlastoiseMega[] = INCBIN_U32("graphics/pokemon/mega_blastoise/shiny.gbapal.lz"); @@ -3944,9 +3945,9 @@ const u32 gMonShinyPalette_PichuSpikyEared[] = INCBIN_U32("graphics/pokemon/pich const u32 gMonShinyPalette_CastformSunny[] = INCBIN_U32("graphics/pokemon/castform/sunny/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformRainy[] = INCBIN_U32("graphics/pokemon/castform/rainy/shiny.gbapal.lz"); const u32 gMonShinyPalette_CastformSnowy[] = INCBIN_U32("graphics/pokemon/castform/snowy/shiny.gbapal.lz"); -const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_attack.gbapal.lz"); -const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_defense.gbapal.lz"); -const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_speed.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/attack/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/defense/shiny.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/speed/shiny.gbapal.lz"); const u32 gMonShinyPalette_BurmySandyCloak[] = INCBIN_U32("graphics/pokemon/burmy/sandy_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_BurmyTrashCloak[] = INCBIN_U32("graphics/pokemon/burmy/trash_cloak/shiny.gbapal.lz"); const u32 gMonShinyPalette_WormadamSandyCloak[] = INCBIN_U32("graphics/pokemon/wormadam/sandy_cloak/shiny.gbapal.lz"); @@ -4997,9 +4998,9 @@ const u8 gMonIcon_UnownQuestionMark[] = INCBIN_U8("graphics/pokemon/unown/questi const u8 gMonIcon_CastformSunny[] = INCBIN_U8("graphics/pokemon/castform/sunny/icon.4bpp"); const u8 gMonIcon_CastformRainy[] = INCBIN_U8("graphics/pokemon/castform/rainy/icon.4bpp"); const u8 gMonIcon_CastformSnowy[] = INCBIN_U8("graphics/pokemon/castform/snowy/icon.4bpp"); -const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/icon_attack.4bpp"); -const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/icon_defense.4bpp"); -const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/icon_speed.4bpp"); +const u8 gMonIcon_DeoxysAttack[] = INCBIN_U8("graphics/pokemon/deoxys/attack/icon.4bpp"); +const u8 gMonIcon_DeoxysDefense[] = INCBIN_U8("graphics/pokemon/deoxys/defense/icon.4bpp"); +const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/speed/icon.4bpp"); const u8 gMonIcon_BurmySandyCloak[] = INCBIN_U8("graphics/pokemon/burmy/sandy_cloak/icon.4bpp"); const u8 gMonIcon_BurmyTrashCloak[] = INCBIN_U8("graphics/pokemon/burmy/trash_cloak/icon.4bpp"); const u8 gMonIcon_WormadamSandyCloak[] = INCBIN_U8("graphics/pokemon/wormadam/sandy_cloak/icon.4bpp"); diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index b88ce50c51..4463a7a525 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -14127,9 +14127,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD_FULL(CASTFORM_SUNNY, sAnims_CASTFORM), ANIM_CMD_FULL(CASTFORM_RAINY, sAnims_CASTFORM), ANIM_CMD_FULL(CASTFORM_SNOWY, sAnims_CASTFORM), - ANIM_CMD(DEOXYS_ATTACK, sAnims_DEOXYS), - ANIM_CMD(DEOXYS_DEFENSE, sAnims_DEOXYS), - ANIM_CMD(DEOXYS_SPEED, sAnims_DEOXYS), + ANIM_CMD(DEOXYS_ATTACK), + ANIM_CMD(DEOXYS_DEFENSE), + ANIM_CMD(DEOXYS_SPEED), ANIM_CMD_FULL(BURMY_SANDY_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(BURMY_TRASH_CLOAK, sAnims_BURMY), ANIM_CMD_FULL(WORMADAM_SANDY_CLOAK, sAnims_WORMADAM),