From 1f1eebb104dd3f4e90f9dd3405af6ed8de48b443 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 12:53:41 -0300 Subject: [PATCH 01/12] Defined the species for Deoxys' forms --- include/constants/species.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/constants/species.h b/include/constants/species.h index c10f0051f..a97ad904d 100644 --- a/include/constants/species.h +++ b/include/constants/species.h @@ -913,8 +913,11 @@ #define SPECIES_LYCANROC_DUSK 903 #define SPECIES_ZYGARDE_10 904 #define SPECIES_ZYGARDE_COMPLETE 905 +#define SPECIES_DEOXYS_ATTACK 906 +#define SPECIES_DEOXYS_DEFENSE 907 +#define SPECIES_DEOXYS_SPEED 908 -#define SPECIES_EGG 906 +#define SPECIES_EGG 909 #define NUM_SPECIES SPECIES_EGG // Unown forms, not actual species From d119307f02d330992b0a9005de9925cdf6a4a78c Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 12:55:44 -0300 Subject: [PATCH 02/12] Defined the sprites for Deoxys' forms --- include/graphics.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/graphics.h b/include/graphics.h index 60705b856..f9d6c3df1 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3725,6 +3725,18 @@ extern const u32 gMonFrontPic_ZygardeComplete[]; extern const u32 gMonBackPic_ZygardeComplete[]; extern const u32 gMonPalette_ZygardeComplete[]; extern const u32 gMonShinyPalette_ZygardeComplete[]; +extern const u32 gMonFrontPic_DeoxysAttack[]; +extern const u32 gMonBackPic_DeoxysAttack[]; +extern const u32 gMonPalette_DeoxysAttack[]; +extern const u32 gMonShinyPalette_DeoxysAttack[]; +extern const u32 gMonFrontPic_DeoxysDefense[]; +extern const u32 gMonBackPic_DeoxysDefense[]; +extern const u32 gMonPalette_DeoxysDefense[]; +extern const u32 gMonShinyPalette_DeoxysDefense[]; +extern const u32 gMonFrontPic_DeoxysSpeed[]; +extern const u32 gMonBackPic_DeoxysSpeed[]; +extern const u32 gMonPalette_DeoxysSpeed[]; +extern const u32 gMonShinyPalette_DeoxysSpeed[]; extern const u8 gMonIcon_QuestionMark[]; extern const u8 gMonIcon_Bulbasaur[]; @@ -4662,6 +4674,9 @@ extern const u8 gMonIcon_LycanrocMidnight[]; extern const u8 gMonIcon_LycanrocDusk[]; extern const u8 gMonIcon_Zygarde10[]; extern const u8 gMonIcon_ZygardeComplete[]; +extern const u8 gMonIcon_DeoxysAttack[]; +extern const u8 gMonIcon_DeoxysDefense[]; +extern const u8 gMonIcon_DeoxysSpeed[]; extern const u8 gMonFootprint_QuestionMark[]; extern const u8 gMonFootprint_Bulbasaur[]; From 8ce522d6c9d1d20400313f869fe73b62250f0ea7 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:00:42 -0300 Subject: [PATCH 03/12] Added coordinates and entries for the forms of Deoxys in the sprite data tables --- .../pokemon_graphics/back_pic_coordinates.h | 15 ++++++++ src/data/pokemon_graphics/back_pic_table.h | 3 ++ src/data/pokemon_graphics/front_pic_anims.h | 36 +++++++++++++++++++ .../pokemon_graphics/front_pic_coordinates.h | 15 ++++++++ src/data/pokemon_graphics/front_pic_table.h | 3 ++ src/data/pokemon_graphics/palette_table.h | 3 ++ .../pokemon_graphics/shiny_palette_table.h | 3 ++ 7 files changed, 78 insertions(+) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index b1fa314cf..153ddfda2 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4624,4 +4624,19 @@ const struct MonCoords gMonBackPicCoords[] = .size = 0x88, .y_offset = 0x4 }, + [SPECIES_DEOXYS_ATTACK] = + { + .size = 0x87, + .y_offset = 0x6 + }, + [SPECIES_DEOXYS_DEFENSE] = + { + .size = 0x87, + .y_offset = 0x6 + }, + [SPECIES_DEOXYS_SPEED] = + { + .size = 0x87, + .y_offset = 0x6 + }, }; diff --git a/src/data/pokemon_graphics/back_pic_table.h b/src/data/pokemon_graphics/back_pic_table.h index 1cbcffb9f..14c8a29f8 100644 --- a/src/data/pokemon_graphics/back_pic_table.h +++ b/src/data/pokemon_graphics/back_pic_table.h @@ -910,6 +910,9 @@ const struct CompressedSpriteSheet gMonBackPicTable[] = SPECIES_SPRITE(LYCANROC_DUSK, gMonBackPic_LycanrocDusk), SPECIES_SPRITE(ZYGARDE_10, gMonBackPic_Zygarde10), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonBackPic_ZygardeComplete), + SPECIES_SPRITE(DEOXYS_ATTACK, gMonBackPic_DeoxysAttack), + SPECIES_SPRITE(DEOXYS_DEFENSE, gMonBackPic_DeoxysDefense), + SPECIES_SPRITE(DEOXYS_SPEED, gMonBackPic_DeoxysSpeed), SPECIES_SPRITE(UNOWN_A, gMonBackPic_UnownA), SPECIES_SPRITE(UNOWN_B, gMonBackPic_UnownB), diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index 640fb9bf8..8e971c523 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -8416,6 +8416,24 @@ static const union AnimCmd sAnim_ZYGARDE_COMPLETE_1[] = ANIMCMD_END, }; +static const union AnimCmd sAnim_DEOXYS_ATTACK_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_DEFENSE_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + +static const union AnimCmd sAnim_DEOXYS_SPEED_1[] = +{ + ANIMCMD_FRAME(0, 1), + ANIMCMD_END, +}; + static const union AnimCmd *const sAnims_NONE[] ={ sAnim_GeneralFrame0, sAnim_NONE_1, @@ -13126,6 +13144,21 @@ static const union AnimCmd *const sAnims_ZYGARDE_COMPLETE[] ={ sAnim_ZYGARDE_COMPLETE_1, }; +static const union AnimCmd *const sAnims_DEOXYS_ATTACK[] ={ + sAnim_GeneralFrame0, + sAnim_DEOXYS_ATTACK_1, +}; + +static const union AnimCmd *const sAnims_DEOXYS_DEFENSE[] ={ + sAnim_GeneralFrame0, + sAnim_DEOXYS_DEFENSE_1, +}; + +static const union AnimCmd *const sAnims_DEOXYS_SPEED[] ={ + sAnim_GeneralFrame0, + sAnim_DEOXYS_SPEED_1, +}; + #define ANIM_CMD(name) [SPECIES_##name] = sAnims_##name #define ANIM_CMD_FULL(name, anims) [SPECIES_##name] = anims @@ -14038,6 +14071,9 @@ const union AnimCmd *const *const gMonFrontAnimsPtrTable[] = ANIM_CMD(LYCANROC_DUSK), ANIM_CMD(ZYGARDE_10), ANIM_CMD(ZYGARDE_COMPLETE), + ANIM_CMD(DEOXYS_ATTACK), + ANIM_CMD(DEOXYS_DEFENSE), + ANIM_CMD(DEOXYS_SPEED), }; #undef ANIM_CMD diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index f377a2333..5bb28efd6 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4624,4 +4624,19 @@ const struct MonCoords gMonFrontPicCoords[] = .size = 0x55, .y_offset = 0x0, }, + [SPECIES_DEOXYS_ATTACK] = + { + .size = 0x88, + .y_offset = 0x0, + }, + [SPECIES_DEOXYS_DEFENSE] = + { + .size = 0x88, + .y_offset = 0x0, + }, + [SPECIES_DEOXYS_SPEED] = + { + .size = 0x88, + .y_offset = 0x0, + }, }; diff --git a/src/data/pokemon_graphics/front_pic_table.h b/src/data/pokemon_graphics/front_pic_table.h index 480133434..a3466ebe9 100644 --- a/src/data/pokemon_graphics/front_pic_table.h +++ b/src/data/pokemon_graphics/front_pic_table.h @@ -910,6 +910,9 @@ const struct CompressedSpriteSheet gMonFrontPicTable[] = SPECIES_SPRITE(LYCANROC_DUSK, gMonFrontPic_LycanrocDusk), SPECIES_SPRITE(ZYGARDE_10, gMonFrontPic_Zygarde10), SPECIES_SPRITE(ZYGARDE_COMPLETE, gMonFrontPic_ZygardeComplete), + SPECIES_SPRITE(DEOXYS_ATTACK, gMonFrontPic_DeoxysAttack), + SPECIES_SPRITE(DEOXYS_DEFENSE, gMonFrontPic_DeoxysDefense), + SPECIES_SPRITE(DEOXYS_SPEED, gMonFrontPic_DeoxysSpeed), SPECIES_SPRITE(UNOWN_A, gMonFrontPic_UnownA), SPECIES_SPRITE(UNOWN_B, gMonFrontPic_UnownB), diff --git a/src/data/pokemon_graphics/palette_table.h b/src/data/pokemon_graphics/palette_table.h index 0d92de828..bb490ea38 100644 --- a/src/data/pokemon_graphics/palette_table.h +++ b/src/data/pokemon_graphics/palette_table.h @@ -910,6 +910,9 @@ const struct CompressedSpritePalette gMonPaletteTable[] = SPECIES_PAL(LYCANROC_DUSK, gMonPalette_LycanrocDusk), SPECIES_PAL(ZYGARDE_10, gMonPalette_Zygarde10), SPECIES_PAL(ZYGARDE_COMPLETE, gMonPalette_ZygardeComplete), + SPECIES_PAL(DEOXYS_ATTACK, gMonPalette_DeoxysAttack), + SPECIES_PAL(DEOXYS_DEFENSE, gMonPalette_DeoxysDefense), + SPECIES_PAL(DEOXYS_SPEED, gMonPalette_DeoxysSpeed), SPECIES_PAL(UNOWN_A, gMonPalette_Unown), SPECIES_PAL(UNOWN_B, gMonPalette_Unown), diff --git a/src/data/pokemon_graphics/shiny_palette_table.h b/src/data/pokemon_graphics/shiny_palette_table.h index b2915545e..2713581e9 100644 --- a/src/data/pokemon_graphics/shiny_palette_table.h +++ b/src/data/pokemon_graphics/shiny_palette_table.h @@ -910,6 +910,9 @@ const struct CompressedSpritePalette gMonShinyPaletteTable[] = SPECIES_SHINY_PAL(LYCANROC_DUSK, gMonShinyPalette_LycanrocDusk), SPECIES_SHINY_PAL(ZYGARDE_10, gMonShinyPalette_Zygarde10), SPECIES_SHINY_PAL(ZYGARDE_COMPLETE, gMonShinyPalette_ZygardeComplete), + SPECIES_SHINY_PAL(DEOXYS_ATTACK, gMonShinyPalette_DeoxysAttack), + SPECIES_SHINY_PAL(DEOXYS_DEFENSE, gMonShinyPalette_DeoxysDefense), + SPECIES_SHINY_PAL(DEOXYS_SPEED, gMonShinyPalette_DeoxysSpeed), SPECIES_SHINY_PAL(UNOWN_A, gMonShinyPalette_Unown), SPECIES_SHINY_PAL(UNOWN_B, gMonShinyPalette_Unown), From 63a8ba2b0566d30e3999658c424e9a9fab0779b9 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:01:34 -0300 Subject: [PATCH 04/12] Set the InGame names for Deoxys' forms --- src/data/text/species_names.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/data/text/species_names.h b/src/data/text/species_names.h index 206637c85..1fe950bc6 100644 --- a/src/data/text/species_names.h +++ b/src/data/text/species_names.h @@ -908,4 +908,7 @@ const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1] = { [SPECIES_LYCANROC_DUSK] = _("Lycanroc"), [SPECIES_ZYGARDE_10] = _("Zygarde"), [SPECIES_ZYGARDE_COMPLETE] = _("Zygarde"), + [SPECIES_DEOXYS_ATTACK] = _("Deoxys"), + [SPECIES_DEOXYS_DEFENSE] = _("Deoxys"), + [SPECIES_DEOXYS_SPEED] = _("Deoxys"), }; From a3cc1a2edc85482ace79905670c65477aa44b70e Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:04:01 -0300 Subject: [PATCH 05/12] Added the base stats of Deoxys' forms, thanks to UltimaSoul --- src/data/pokemon/base_stats.h | 74 +++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/src/data/pokemon/base_stats.h b/src/data/pokemon/base_stats.h index 2dca94a4a..a7eec5556 100644 --- a/src/data/pokemon/base_stats.h +++ b/src/data/pokemon/base_stats.h @@ -22891,4 +22891,78 @@ const struct BaseStats gBaseStats[] = .bodyColor = BODY_COLOR_GREEN, .noFlip = FALSE, }, + + [SPECIES_DEOXYS_ATTACK] = + { + .baseHP = 50, + .baseAttack = 180, + .baseDefense = 20, + .baseSpeed = 150, + .baseSpAttack = 180, + .baseSpDefense = 20, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 270, + .evYield_Attack = 2, + .evYield_SpAttack = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_DEOXYS_DEFENSE] = + { + .baseHP = 50, + .baseAttack = 70, + .baseDefense = 160, + .baseSpeed = 90, + .baseSpAttack = 70, + .baseSpDefense = 160, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 270, + .evYield_Defense = 2, + .evYield_SpDefense = 1, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, + + [SPECIES_DEOXYS_SPEED] = + { + .baseHP = 50, + .baseAttack = 95, + .baseDefense = 90, + .baseSpeed = 180, + .baseSpAttack = 95, + .baseSpDefense = 90, + .type1 = TYPE_PSYCHIC, + .type2 = TYPE_PSYCHIC, + .catchRate = 3, + .expYield = 270, + .evYield_Speed = 3, + .genderRatio = MON_GENDERLESS, + .eggCycles = 120, + .friendship = 0, + .growthRate = GROWTH_SLOW, + .eggGroup1 = EGG_GROUP_UNDISCOVERED, + .eggGroup2 = EGG_GROUP_UNDISCOVERED, + .abilities = {ABILITY_PRESSURE, ABILITY_NONE}, + .bodyColor = BODY_COLOR_RED, + .noFlip = FALSE, + }, }; From 30cd54088815aa686b3a7186357e9a7174ed03f0 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:05:38 -0300 Subject: [PATCH 06/12] Implemented the level up learnsets of Deoxys' forms, thanks to UltimaSoul --- src/data/pokemon/level_up_learnset_pointers.h | 3 + src/data/pokemon/level_up_learnsets.h | 56 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 6b97b8281..e371d7422 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -909,4 +909,7 @@ const struct LevelUpMove *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_LYCANROC_DUSK] = sLycanrocDuskLevelUpLearnset, [SPECIES_ZYGARDE_10] = sZygardeLevelUpLearnset, [SPECIES_ZYGARDE_COMPLETE] = sZygardeLevelUpLearnset, + [SPECIES_DEOXYS_ATTACK] = sDeoxysAttackLevelUpLearnset, + [SPECIES_DEOXYS_DEFENSE] = sDeoxysDefenseLevelUpLearnset, + [SPECIES_DEOXYS_SPEED] = sDeoxysSpeedLevelUpLearnset, }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 3f5491c62..5bc79d3bf 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -16940,3 +16940,59 @@ static const struct LevelUpMove sLycanrocDuskLevelUpLearnset[] = { //LEVEL_UP_MOVE(48, MOVE_STONE_EDGE), LEVEL_UP_END }; + +static const struct LevelUpMove sDeoxysAttackLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_WRAP), + LEVEL_UP_MOVE( 7, MOVE_NIGHT_SHADE), + LEVEL_UP_MOVE(13, MOVE_TELEPORT), + LEVEL_UP_MOVE(19, MOVE_TAUNT), + LEVEL_UP_MOVE(25, MOVE_PURSUIT), + LEVEL_UP_MOVE(31, MOVE_PSYCHIC), + LEVEL_UP_MOVE(37, MOVE_SUPERPOWER), + //LEVEL_UP_MOVE(43, MOVE_PSYCHO_SHIFT), + //LEVEL_UP_MOVE(49, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(55, MOVE_COSMIC_POWER), + LEVEL_UP_MOVE(61, MOVE_ZAP_CANNON), + LEVEL_UP_MOVE(67, MOVE_PSYCHO_BOOST), + LEVEL_UP_MOVE(73, MOVE_HYPER_BEAM), + LEVEL_UP_END +}; + +static const struct LevelUpMove sDeoxysDefenseLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_WRAP), + LEVEL_UP_MOVE( 7, MOVE_NIGHT_SHADE), + LEVEL_UP_MOVE(13, MOVE_TELEPORT), + LEVEL_UP_MOVE(19, MOVE_KNOCK_OFF), + LEVEL_UP_MOVE(25, MOVE_SPIKES), + LEVEL_UP_MOVE(31, MOVE_PSYCHIC), + LEVEL_UP_MOVE(37, MOVE_SNATCH), + //LEVEL_UP_MOVE(43, MOVE_PSYCHO_SHIFT), + //LEVEL_UP_MOVE(49, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(55, MOVE_IRON_DEFENSE), + LEVEL_UP_MOVE(55, MOVE_AMNESIA), + LEVEL_UP_MOVE(61, MOVE_RECOVER), + LEVEL_UP_MOVE(67, MOVE_PSYCHO_BOOST), + LEVEL_UP_MOVE(73, MOVE_COUNTER), + LEVEL_UP_MOVE(73, MOVE_MIRROR_COAT), + LEVEL_UP_END +}; + +static const struct LevelUpMove sDeoxysSpeedLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_WRAP), + LEVEL_UP_MOVE( 7, MOVE_NIGHT_SHADE), + LEVEL_UP_MOVE(13, MOVE_DOUBLE_TEAM), + LEVEL_UP_MOVE(19, MOVE_KNOCK_OFF), + LEVEL_UP_MOVE(25, MOVE_PURSUIT), + LEVEL_UP_MOVE(31, MOVE_PSYCHIC), + LEVEL_UP_MOVE(37, MOVE_SWIFT), + //LEVEL_UP_MOVE(43, MOVE_PSYCHO_SHIFT), + //LEVEL_UP_MOVE(49, MOVE_ZEN_HEADBUTT), + LEVEL_UP_MOVE(55, MOVE_AGILITY), + LEVEL_UP_MOVE(61, MOVE_RECOVER), + LEVEL_UP_MOVE(67, MOVE_PSYCHO_BOOST), + LEVEL_UP_MOVE(73, MOVE_EXTREME_SPEED), + LEVEL_UP_END +}; From e6f22f29931512b2f733cb68ef5d3d687242d566 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:12:26 -0300 Subject: [PATCH 07/12] Defined the paths for the sprites of Deoxys' forms --- src/data/graphics/pokemon.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index ba619aac7..4d9d88fa3 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -3688,6 +3688,18 @@ const u32 gMonFrontPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/ const u32 gMonBackPic_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/back_complete.4bpp.lz"); const u32 gMonPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/normal_complete.gbapal.lz"); const u32 gMonShinyPalette_ZygardeComplete[] = INCBIN_U32("graphics/pokemon/zygarde/shiny_complete.gbapal.lz"); +const u32 gMonFrontPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/front_attack.4bpp.lz"); +const u32 gMonBackPic_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/back_attack.4bpp.lz"); +const u32 gMonPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/normal_attack.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysAttack[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_attack.gbapal.lz"); +const u32 gMonFrontPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/front_defense.4bpp.lz"); +const u32 gMonBackPic_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/back_defense.4bpp.lz"); +const u32 gMonPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/normal_defense.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysDefense[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_defense.gbapal.lz"); +const u32 gMonFrontPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/front_speed.4bpp.lz"); +const u32 gMonBackPic_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/back_speed.4bpp.lz"); +const u32 gMonPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/normal_speed.gbapal.lz"); +const u32 gMonShinyPalette_DeoxysSpeed[] = INCBIN_U32("graphics/pokemon/deoxys/shiny_speed.gbapal.lz"); const u8 gMonIcon_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/icon.4bpp"); const u8 gMonIcon_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/icon.4bpp"); @@ -4625,6 +4637,9 @@ const u8 gMonIcon_LycanrocMidnight[] = INCBIN_U8("graphics/pokemon/lycanroc/icon const u8 gMonIcon_LycanrocDusk[] = INCBIN_U8("graphics/pokemon/lycanroc/icon_dusk.4bpp"); const u8 gMonIcon_Zygarde10[] = INCBIN_U8("graphics/pokemon/zygarde/icon_10pc.4bpp"); const u8 gMonIcon_ZygardeComplete[] = INCBIN_U8("graphics/pokemon/zygarde/icon_complete.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 gMonFootprint_QuestionMark[] = INCBIN_U8("graphics/pokemon/question_mark/footprint.1bpp"); const u8 gMonFootprint_Bulbasaur[] = INCBIN_U8("graphics/pokemon/bulbasaur/footprint.1bpp"); From d18bb3198360e8f51b18355c9f93cc1e88209309 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:13:36 -0300 Subject: [PATCH 08/12] Linked the icons to the species of Deoxys' forms --- src/pokemon_icon.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c index eefd5c972..6a23971c7 100644 --- a/src/pokemon_icon.c +++ b/src/pokemon_icon.c @@ -932,6 +932,9 @@ const u8 *const gMonIconTable[] = [SPECIES_LYCANROC_DUSK] = gMonIcon_LycanrocDusk, [SPECIES_ZYGARDE_10] = gMonIcon_Zygarde10, [SPECIES_ZYGARDE_COMPLETE] = gMonIcon_ZygardeComplete, + [SPECIES_DEOXYS_ATTACK] = gMonIcon_DeoxysAttack, + [SPECIES_DEOXYS_DEFENSE] = gMonIcon_DeoxysDefense, + [SPECIES_DEOXYS_SPEED] = gMonIcon_DeoxysSpeed, [SPECIES_UNOWN_A] = gMonIcon_UnownA, [SPECIES_UNOWN_B] = gMonIcon_UnownB, [SPECIES_UNOWN_C] = gMonIcon_UnownC, From 179741446f9f295d139a64f0677747a8e68af399 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 13:30:36 -0300 Subject: [PATCH 09/12] Added the icons of Deoxys' forms, coming straight from Pokefirered and vanilla Pokeemerald --- graphics/pokemon/deoxys/icon_attack.png | Bin 0 -> 456 bytes graphics/pokemon/deoxys/icon_defense.png | Bin 0 -> 414 bytes graphics/pokemon/deoxys/icon_speed.png | Bin 0 -> 376 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 graphics/pokemon/deoxys/icon_attack.png create mode 100644 graphics/pokemon/deoxys/icon_defense.png create mode 100644 graphics/pokemon/deoxys/icon_speed.png diff --git a/graphics/pokemon/deoxys/icon_attack.png b/graphics/pokemon/deoxys/icon_attack.png new file mode 100644 index 0000000000000000000000000000000000000000..ae34130ee00e4ee1309d95b33964fd2c547dccdc GIT binary patch literal 456 zcmV;(0XP1MP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00001 zbW%=J06^y0W&i*IMoC0LR5*>*ld*1uFbszC1o89qg>qBLMz-=ISKZ^>Ld$ktTFAsL zB_LHILIT`4B-hZXLxnxW6-KmbFJwyPLn?H~vq%N#j-@DW zZDD}Bvb-o2?!a8ZRDR%FY&%y2n@SWiUU+f`e7s<63YE(Zx+e+^L($5$r4p{4vY?XV zauS(j?41Nqa%rZM7!SiH*kY-%U$M86KT{Kn#;8nWyea0ID%?kOFLG>kr#j!l_2Oy( zp}Bp~ei!a_9k|e}7a47fCgi%kclAbpZJi+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00001 zbW%=J06^y0W&i*I97#k$R5*>zk~?n0FbqI-0`o|{4Ku~wtR=QCk|MXM5Wq#Y6dej} z&63!fBovUX(zfJJffgOjO%J3Cuk*v!PbWA&OA zY6k7`@?TnM=bXz~@@W`_OQ1v<_Z}F79 zAf!VVkKcoibeL?Q8bvyY>wJ9gNe8jCVbEc1L$AZyhX3pE4O`#uFN3BVz5oCK07*qo IM6N<$g47wgegFUf literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/icon_speed.png b/graphics/pokemon/deoxys/icon_speed.png new file mode 100644 index 0000000000000000000000000000000000000000..674b93a9c1dcaaf8caf68dde7ba7e340fe623df6 GIT binary patch literal 376 zcmV-;0f+vHP)i+lfKO3m(bod2|>q{aVgtej$ET0ucUS*eg@00034 zNklb>k6o%gkc*@d|d-OuiR<<(LK1T;1DT=yeL#9i*7>rcOmL=p@NC=Rw zU7BCA44;2J8~FoxydYH@A|QV(&rnKQ-b4n=BBkg~t^m`&imnu3R{d!ar2zP>hPf&L zuIl>^z^aCZTwUoKVe28DXx+|TCU~&Z`$qdNgClHY9m!k8J8XBH^n9y~nzg%03igtK z(c_c-YAu}g6<9EwX2UZ8_|(8g4lIMXVjp>1YWHEk!NcUg=ur89Q`Dgm`OCbDI@m@g zf`={Y;D{3O;TClWC)me1IE3q>Lm=^880b}pc*-<3=}?k%sDQobP!fN<;ktmo`SAm$ Wdc_ue-`=tS0000 Date: Thu, 23 Jul 2020 13:37:47 -0300 Subject: [PATCH 10/12] Added the cries of Deoxys' forms --- sound/cry_tables.inc | 6 ++++++ sound/direct_sound_data.inc | 12 ++++++++++++ 2 files changed, 18 insertions(+) diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc index dabd9ce5b..3140d5c8f 100644 --- a/sound/cry_tables.inc +++ b/sound/cry_tables.inc @@ -910,6 +910,9 @@ gCryTable:: @ 869DCF4 cry_not Cry_Lycanroc_Dusk cry_not Cry_Zygarde_10 cry_not Cry_Zygarde_Complete + cry Cry_DeoxysAttack + cry Cry_DeoxysDefense + cry Cry_DeoxysSpeed .align 2 gCryTable2:: @ 869EF24 @@ -1822,3 +1825,6 @@ gCryTable2:: @ 869EF24 cry2_not Cry_Lycanroc_Dusk cry2_not Cry_Zygarde_10 cry2_not Cry_Zygarde_Complete + cry2 Cry_DeoxysAttack + cry2 Cry_DeoxysDefense + cry2 Cry_DeoxysSpeed diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc index 8b51cb18c..441f589f3 100644 --- a/sound/direct_sound_data.inc +++ b/sound/direct_sound_data.inc @@ -4014,6 +4014,18 @@ Cry_Zygarde_10:: Cry_Zygarde_Complete:: .incbin "sound/direct_sound_samples/cries/cry_not_zygarde_complete.bin" + .align 2 +Deoxys_Attack:: + .incbin "sound/direct_sound_samples/cries/cry_deoxys.bin" + + .align 2 +Deoxys_Defense:: + .incbin "sound/direct_sound_samples/cries/cry_deoxys.bin" + + .align 2 +Deoxys_Speed:: + .incbin "sound/direct_sound_samples/cries/cry_deoxys.bin" + .align 2 DirectSoundWaveData_register_noise:: .incbin "sound/direct_sound_samples/register_noise.bin" From dc67bd37491df71ba7c7b65541c10094107470fd Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 23 Jul 2020 14:34:01 -0300 Subject: [PATCH 11/12] A few things: -Inserted the sprites of Deoxys' form -Fixed mistakes that I made while adding their cries and sprites -Tweaked the Y coord of Deoxys' Defense Form's back sprite --- graphics/pokemon/deoxys/anim_front_attack.png | Bin 0 -> 1727 bytes .../pokemon/deoxys/anim_front_defense.png | Bin 0 -> 1300 bytes graphics/pokemon/deoxys/anim_front_speed.png | Bin 0 -> 1625 bytes graphics/pokemon/deoxys/back_attack.png | Bin 0 -> 774 bytes graphics/pokemon/deoxys/back_defense.png | Bin 0 -> 678 bytes graphics/pokemon/deoxys/back_speed.png | Bin 0 -> 746 bytes graphics/pokemon/deoxys/front_attack.png | Bin 0 -> 967 bytes graphics/pokemon/deoxys/front_defense.png | Bin 0 -> 848 bytes graphics/pokemon/deoxys/front_speed.png | Bin 0 -> 951 bytes graphics/pokemon/deoxys/normal_attack.pal | 19 ++++++++++++++++++ graphics/pokemon/deoxys/normal_defense.pal | 19 ++++++++++++++++++ graphics/pokemon/deoxys/normal_speed.pal | 19 ++++++++++++++++++ graphics/pokemon/deoxys/shiny_attack.pal | 19 ++++++++++++++++++ graphics/pokemon/deoxys/shiny_defense.pal | 19 ++++++++++++++++++ graphics/pokemon/deoxys/shiny_speed.pal | 19 ++++++++++++++++++ sound/cry_tables.inc | 12 +++++------ sound/direct_sound_data.inc | 6 +++--- src/data/graphics/pokemon.h | 6 +++--- .../pokemon_graphics/back_pic_coordinates.h | 2 +- 19 files changed, 127 insertions(+), 13 deletions(-) create mode 100644 graphics/pokemon/deoxys/anim_front_attack.png create mode 100644 graphics/pokemon/deoxys/anim_front_defense.png create mode 100644 graphics/pokemon/deoxys/anim_front_speed.png create mode 100644 graphics/pokemon/deoxys/back_attack.png create mode 100644 graphics/pokemon/deoxys/back_defense.png create mode 100644 graphics/pokemon/deoxys/back_speed.png create mode 100644 graphics/pokemon/deoxys/front_attack.png create mode 100644 graphics/pokemon/deoxys/front_defense.png create mode 100644 graphics/pokemon/deoxys/front_speed.png create mode 100644 graphics/pokemon/deoxys/normal_attack.pal create mode 100644 graphics/pokemon/deoxys/normal_defense.pal create mode 100644 graphics/pokemon/deoxys/normal_speed.pal create mode 100644 graphics/pokemon/deoxys/shiny_attack.pal create mode 100644 graphics/pokemon/deoxys/shiny_defense.pal create mode 100644 graphics/pokemon/deoxys/shiny_speed.pal diff --git a/graphics/pokemon/deoxys/anim_front_attack.png b/graphics/pokemon/deoxys/anim_front_attack.png new file mode 100644 index 0000000000000000000000000000000000000000..f731109ae0f00375c21b8c02d6ce53cf2fd132be GIT binary patch literal 1727 zcmV;w20;0VP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwKqw&Ka6q6?I2afhfWW{=kf4}wkT6hS zU_fyA`1ruU&{$AVczAGNKrpCSIK)Va)&Kwi32;bRa{vGi!vFvd!vV){sAK>D1{g_1 zK~z}7&6mHA<3tq4Jz5toJ)XVQ3M7!n3Dq_BglLNsa*`n|$j#-}CX}l zS)#ok{{Vs-iN9cRnd`RX3L5?n-pu&-Cbumq^277-dvBiKd-ILaeIeWU@XL7sI0+sA z5FI_>fes!5yzs*wsPuvHVG4z4xS$NR0c0uF#*~#lM^~d}s-)s~?FseC8kUfE-FCfy5he(11f3Q^eVG zF*;;`vQy3|fp2FkegJShr~)1+;xsx0`0||xz?o507})N6unjBEw>)q;tnc})+YJfC>8b3+^%a^z0Up zq!7A!DXtmyzWSXr_648~f!vMW+NB`u9az}=|6XI#6!^=!Kyvov?vC>!G`YAYtjvh@ zv^EB5D&F7yEf;`br3ou>nhKDKDvVD`f7(QrkQ%@StQV?7t$Af4+n~xD@(i=sM`7Sf zW0i?@3xK5WqiDh;V1S8Gg%BE*4~N<&0Gz2Nx5UqW2_Rns0d=Q*AKlLG0nFAOs5cz| z;QGqPP9;DBh7LmZu0x|}dJH%Lz^4OFU7t#myDRmPY%2h2o4W8IDf1~)fU31DZ3CWs z76O`tt+;_2l^!fTs{bnc^(fA)L^-oPs8dnb_W4m4KC2o2UR|N_eNfmKu85)f6x%yltbtXOMyka0S{E;r5fJ>yk- zK$3B8UJo{T-dquF0|11^WFXed7SNfn5G&4}?#<2FghaDR*M(`Pk{2X?{8rDMA?Ost^=3T|G&l zhhbQax*lpC`QJ)l_$=&tP$5`h2`s1apld*fpqlvn``7U|({2HR2N^=HrohKvzFz(@ z^X;w&8G~CGyZn7`}144ViRH_udzx8YVAOSG2 zDc2c&yyrXu;Z>D@%;T=~0E+86po6!srt(}WtBgR5;6bI)@j%D0(N90jm@jZy-T++2 zIs`<=*Aw=nc>C(zUz436zPfAX`B~`!41|R3-$M+LOHSCi0@$eZ00vS6@qKakUgdhi z&bA7;&>o=hM2HQk4+?b-pazhe1kw3<3KGPKKw&5ef;lRE)mM0rt2g<)0ycT50IFEf>^KmwG5Mxkyk@chqsq!h8nb+@`kY;zs{)hA~JG z1b+bF^j|dHV^xh303a`$Q>ifSk3$5v=@ADKgeLj+9xwz2p*JQ~OuV`219`Sklfz0T z0r;qTp?>9YsZp{NVTdP5yMP7LNsksO!3gWG!w6YF)3PWDoe;6U1Nq#w0SLhh(YOzw zi%No60sv4LR^9=~raIp%V7KW4jfUAlEf6v91_?gv={Vo82}^tbms$o4b54Ag_Cg%D zMUXiI0CoN?p>b#Ynm(Hl)&}|tWWr{CXIzq=fIzGp<2`}Vzku$Ybi8-Nk^i}d@gKp& VqQXEIhPwa&002ovPDHLkV1mW174rZ9 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/anim_front_defense.png b/graphics/pokemon/deoxys/anim_front_defense.png new file mode 100644 index 0000000000000000000000000000000000000000..ee4259be5bf02c97b5853ddc08b617d8da043c53 GIT binary patch literal 1300 zcmV+v1?&2WP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwKqw%fP&nXlKwv;H@UW18z`#h5pfFHi zm~fC77#R5Y_`tx>U_fvH000000KJy%DgXcg32;bRa{vGi!vFvd!vV){sAK>D1Z_z~ zK~z}7?Uuie+eQ$^$y5TXkn1D|Aq|HvgzdP4#DY3MgOLZY3zANEF0=}R0688&3A)rN zl7=RY(_tUL3E~GalBdZm{~bxKm@28Vg&=5un*C;WcK5T!!*#9M;iGsyH*bIS0%0x& z`vy_KrSNJ;8z~vBj9KAvS_Y$!9;&l`q!4JX{XI1*aI*)fI;FH+ff0VRBo~SDm!1C~pTcyF~*I#J2R=K>!onh3BxujY)*g5_sqWr$md~or=&J5lTd;s1Q6)O@QDbZBwN)U7V@3 zS8*zs@Nh$Y@A1V;Hc`oH0L7Cft>AM~c?QT-lzIg%!2o!d>jpzb<8&XVNUfY$=Md&)o zebxfrdb{Hq5M!Y9TEJe*oi62|5Nr&f%ruZr0lx=U&;q>Al7OS%z5{j;ngQrkvl@s7 zK&1h72H+UbN52K?nS2Ov)d0;E-R!%rb(e-yI0QJ*r%?mLQd&-|tRYZL0gJlTD(3*J z28wyWQPw=r4ZEILsETep^Kexgapo2O7svk=5#hh9UPr!XFukjFN^ssU|$icXyJwX8^ zTSs))RdA}0`Y?no1eX*br)4ruUo|lX08ZBwAeP$%-mZ=hvV@=*YotUefUHB%SxqN^ z@EPg=l0wuODqy20DWu0P*Yi>)mF`N%9XW`H0L3Ay=Vh9qYuT@i^js`*_;CDb^1|EJFy}>X7cki?QT@5n> zkVlWev)@cWob`|1-TUJ?u-HKl?BndbQjXs}-2})BK>P3p&vvF-_a25EOLhV1)9{SD z1>Hk219YYIj4f3@0vDQc>_ChmhW^16V&orYh7JD!bpAmP%laE8qydi9vKDs$0000< KMNUMnLSTaKNI&!d literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/anim_front_speed.png b/graphics/pokemon/deoxys/anim_front_speed.png new file mode 100644 index 0000000000000000000000000000000000000000..c6f490d2f25f960e8349080d294be264f3720b3e GIT binary patch literal 1625 zcmV-f2B!ImP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwFi>Dfkf4CTz(6P<;BY_~7#N^XIKaTr zm~fEz`1oKza9B`KczAFC0000007Sij8UO$Q32;bRa{vGi!vFvd!vV){sAK>D1+qy* zK~z}7&6dA!ayltUtK1}(AXgyPaqDc7S>VPJ%6fN- z3kClI1xR!>P;;U=(VzrP<*h)j?Ei)L#$K;y)(fIziflad@tYrh^S)p5Ut6c!{b!&z z^cZ9KpEGU;TzB|kz}T3aMeS3#(7Yg+u(KQAX=7L*0g*v)b{n#D(n^GYygLadL6Ef0 z!WKbzr-ATk`$G95fJJHKkf#|jX#$o z{@!kYN-0m>-`?2?keQUp>Fcj{1JnoN*Jw9DZlrv*-0FR+3$3Rkq)aZi0(6HSw!t3d zajLjI-syTr`<(N>cc_Xi=l1KJ{!w>NN52}r9~VMI_V_@*<1i+tM?B8%%@Cd5=n8)s zZjYbD>g9LJ0D6N+zb+-eAwtB(7eA+wF^=y$zT{)V##E)*%kP`J=(sw*&oSfACS#$5 zS~jQX>CfgYgAfR35ektCWdzU<{!IYHnD~o0PK{mm2ReWppFuVzV@Jku)|{Yoqz}kX zh#z3Sj?W7dr~?qX(8Pr*#0_f+K*%iu!4lSZ8=RW~h>w?m;<$VYz-$plMgW`vLxhlx z-Vy*gIbI(kDGx#a+)6m@`EjaL4fJ&Ya&}$;(yxHTi^>_wsmg*uLwWI+lt%)Aa->rR za>5EoR=F=-A!?vsRxRgJ&p_piILoA~)J&f03?RK~hAPD?fWyTpfqDs5De&Qxv%3-O zHF5Vd1giVFE^1C*Abjx*%0l0f08Ud!8GKc_8 z`GdR3b_np$xIAOrcut?;30G1_#2hjh#!z+9VAeh^Gr3yM&6_ z5(ONHJM^9|K>MMn%58Di4g}f)fzWF)5G>FZWTEZBvk%%AT4{)>3ajtuZEr`=$1VIao>*!W4xycxJK3lJ$E0@Q7*ZEey zO`uGd7b^sGfKd?{Kv|DgaSr~1g0UZnHsA?5lu<;uJK$MSX+r5zN`OMIzA>DOq85#E zG5Yhyb*4bxq5-iQ_{cRt)hau&0lLbs*ZuWer$L3Mx z%CZOWN~3JiZGXX=ENg$xZ00000NkvXXu0mjf`E>Y$ literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/back_attack.png b/graphics/pokemon/deoxys/back_attack.png new file mode 100644 index 0000000000000000000000000000000000000000..14da9a37fae1ab3b9107dc2d2d9dcb26e88f0f78 GIT binary patch literal 774 zcmV+h1Nr=kP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwa9|Ml=s>8bI2afhaL}kopm1P#z&K!7 zXb712`1ruU&`?lNczAGNKrpCSIM=TPBme*a32;bRa{vGi!vFvd!vV){sAK>D0$)i) zK~zY`m6Wk=+b|G@Wq=P5hC-(+St5KWiV|Xx(K30QhWVeph zyYxs(v0_mY%0bJ0`tLvT?vnpJ{9yvniwQz!^C>`%OB5i-B^XRdFqn{F0_3=arX2He zU_zpR2?=sJE)jsf#EkPBkVPbzlmQ_R0EK+&0YU~uJ7A;c5%-xxQWpm;McgT8kOr`UU72UvZL08BS2fWzt# z0g{wM>k{Hmj^Z6qQGn^D41j@_C|a9p9S2xz0+WH$niz_Qei%&Pfn0zZOu)$GuEN2% zbw$|0@GPyJ102fF9>3JWEBuNB8~ORw6=>_fHWufbxqb7%@4DuZxD>hdcd)bdAF29r z3Hcjv4_Musy_sB)xK>8E92Lm>b@{mP>MQfzmGRnJRBRC%IskOn_q)#Bk5VlFehRzu z?V3QL`_a7j^@kkp1&U*?p>sa$Y>MROn78c~RzSyu8{6&al9pk7b82l)>+-2L3fbaX?AGrq>?? z2-qHPcSROb4=@U0d7+QRl5%9tgAjloNU%A!T6;rHlHwk)6_R74+q)o-=&U7dXI;y? zI63w;%>$4VUu0`$D{B$LR8ZmW%^q5SOs~-a8kWB8OS8X_#JT~lq?b|#2S^Vvvp?%F z!~`T)a=OG_0MZt~8&DEV_eDSj*)jm9Gt(n$pgBqM51pLc33TEBQ2+n{07*qoM6N<$ Eg4Q)u$N&HU literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/back_defense.png b/graphics/pokemon/deoxys/back_defense.png new file mode 100644 index 0000000000000000000000000000000000000000..3dbba1a7a1f2cb6d45635b9e473ae55ca115d248 GIT binary patch literal 678 zcmV;X0$KfuP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwa9|Lqs5toOKwv;H`1sgx(5OhDa5!LC zV0ge77#R5Y_`tx>Xb6}9000000Mni`!TD0sl!v zK~zY`?bNZ3oG=go(4~v07OuF6DjteO?pQZbK8VzJMFvsrr7_|w7B`Fhl^Ku07{slV zI+x*0Z)XW1TfGR{-A zzTd2XG2r~KCKg|Dh0dN~##_(vl2|n9K()szwNB95t zWek&Vq7L9@WIP68>4la7Xl!qzgmuv3o_fIBU_g5@p@6WbR1Zs+G)M-y%pvmy3VQ6( z8khkT8tt9lh?w(yP-Y-_PH2_9ub;ngVDg}5(9s23*yVX%;gn(w=;l+!(t-bOQ?x4> z-PQMlQXF7My71jT{p%vYhh;f2l15tA=NYH~Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwIAB;vpm1=|sBmBq_~<|w7#OIiIKaTr zV0ggz`1oiDm{3qqczAFC000000J`2Kxc~qF32;bRa{vGi!vFvd!vV){sAK>D0z*ke zK~zY`?Ub=@+b|G@Rlwj}yFllHPMal5>H=L|fVN)1lvddgs6_=5L(;uok%1Glc8cGn z|B09zm^fQHJalm*T4YmR!Iw4fV6upk=pAV}q`(~%Nw;&l~fQN@AtC{qAZ zn%wJMT+htb)nQg~*|g4CZxF3uoZ~OQZxT9WixMWPTYlZW8evS--?dgE!Rsl}pE$KI z@&Oj7x2UeR){TIR$TOu2>#XFIe@}nj>%A_iMF<9dU)3-w=x80X2imtu4M7@&*S9=G zo}+ttoB|+n=$*+9XF#qd_aV01Yem~C6Wjt^tdXmU1#b=nW+S9Q8xH^$%kNh;n85LB zzx9R(VXOVLh6hOFfVP(O0fR8Ob(dc*K%b8m0$c72WW>Y6@)BaE!x_|y0n)AGP3`3+ z#HI}AtKYR22dOVC1L6{5rtvrRK;f)KHSG_ISe$`PIRXO~;dmy6e|{KK!l3gd2E%LM zIJ(LvDf5y{6Lc8ZhRzmy8GsE96+aD!*@m<}L;z+bReb#-0BPx#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwKqw&Ka6q6?I2afhfWW{=kf4}wkT6hS zU_fyA`1ruU&{$AVczAGNKrpCSIK)Va)&Kwi32;bRa{vGi!vFvd!vV){sAK>D10YF6 zK~zY`g_XaK+CUJ-y*d{z{f9%R6p1`GsnXbcLKIQt<5uJ%xjBRpDG_Ex9w5baB#M!x z^!Egj@&b8+6Q!@COo}vlj?C`bU^sJZfsOa)Z)Rt|9c%l8nA-EhJ^`GCCjbJMCnA7< z3h<)mBY=ouSN~#>kN-B zgskq8(GTxMEJRL^X|iQoMP(w4WCl*-v4Bj zzC(0J5O<-LcEcU|hzdpUZ)!O^gMZl?B&TmT8^+d=&iK@!WkrnJtr(VR{b%!AOdvr^ z31e*U93Tp{)?SwJlteamwt%JK{92w+V^B$C3sOZRo~EyhI0{`MR!Pij02aN7<0~ov z4J9I(LZnqOY%p~M7?p?I;9r9hAb|oxaQm!?AFiJO)Kn3`>-z|}fsC<|1rUIyk`QOt zhB)pY1I`c#z-QnFAS72Kc^NM&0KE+^ZY0nEs05_fva}9(V#}QXM2yu$);JqgNro^4 z$D-7tc1MV3O9>bg1j-x{F!2Ng&>5mn=aB-E$O#mH4F>H>D27U00jLUQOLaX%K<+&2 zBXEl;lqJqmmBJY$Wf#=3%_Qb(R02j?EusRnKD?gfE8HYGagnOMvhxJC+X~{KC?8lo z;b|1gli}8UHpbu!xrv1Kuu>uw?15WrInW(5waQn)jRIDDzUzO4(sZFd4wh*s;DYnr zd6NJsU%+e?Fx$CX0K7Ud17(KZjMjRG(@h7{a?wn^)1B2Dq|?pyslUkc-4k9HKp@ht zd_JGlfV~bY0OB*Y+-B9CS%*Mb=@QtF@Dy-n`#s$0F86`bqzC{2 literal 0 HcmV?d00001 diff --git a/graphics/pokemon/deoxys/front_defense.png b/graphics/pokemon/deoxys/front_defense.png new file mode 100644 index 0000000000000000000000000000000000000000..7cd7365bcf160981117751500713f3e2354fd14a GIT binary patch literal 848 zcmV-W1F!svP)Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwKqw%fP&nXlKwv;H@UW18z`#h5pfFHi zm~fC77#R5Y_`tx>U_fvH000000KJy%DgXcg32;bRa{vGi!vFvd!vV){sAK>D0;x$v zK~zY`ebq5<)G!nWaEB?nsj&-G5ldb=oV>+PpeS2EL)8xeLvm%K137|_Xe%YCFf+gs z;-M%XfqoDKpN8jL?nrXJcsj*D+5h+KrmueiN3<{DuAjY2zxY9j@u!d01S>!P z+BQKLm)Y6|9%a1xozo8Gsy(p*QAYO$#Mv!cTk$xK;KS8vnA{^`Z3E}X0Zy?SHXsBB zE$0V;qpmS&f6!?p8kMwxJ52ukC9o{4KrD+e`TmVgYnf|1$Th8CPO~ZyYTF7<&^7?z z|IGD1a8y+=Dic7~Zl;wTI0n#ERqTf#Kr^(2nJEjDmWhZ)X;Z1Ym(p2gg%XNmLie6a_obMm6dgcy z?9&c`q?CIgFH~c8FcB<(mw7HEEw6!_W>%8}byS%bLQ*~*gj6P**4cp&n&4Q|H-y?f zt&^(E%|+u<^DP*Kpdtte%C`{IECX-~3dD#*y#;TC1*o8C?Cl~qD4)*f^0000Px#1ZP1_K>z@;j|==^1poj5Fi=cXMfjkwFi>Dfkf4CTz(6P<;BY_~7#N^XIKaTr zm~fEz`1oKza9B`KczAFC0000007Sij8UO$Q32;bRa{vGi!vFvd!vV){sAK>D0}x3> zK~zY`os_?C(?Ar*FUY#7Lz76I=|u_yWoRr~Ar;B0F7Z+(a(Hz^asl;DLXDFf;O~H$ z1$M;7mP$8WHsmS(UwCIbj-5D2aEoKV&wbyIy!X(*o<_6zcc9gADW&$8`%WE0nF2&H)}I7)fNF^VkS9YnWGt%nLgy^FPl4dFK2Sbq5X9?< z&D?qbaR^~Ji*8-Fiw+TUe-^!Kzc>T{0l>GfhXFM9XR6De9tN;d>YDs|d=NlWrK0N} z9}WZ92jXXV7(ipCJ}&mYK5D{gr3!|s#hyU3dhhUs;s_!tQx zllR|ESh3stj<2|fsE4(Q@4l3?XpmIj=eFbfLr-X-7iAZ%^lx((EC9lp2SOO3D+1|@ zKW0F9$e&ATDp|HqQvv1mp&KL5QBuZb2aR4@AU{Grv;FD~k}6OLAUscr8=Z(Ttr0+I zVga^*7$a}uC_e`xH_SX_uCj%J19kITsh+SvW@%(XPLKo9YV9i`L;wH)Jz(`p#<3z= zPt|qW0jQOG$Xh%II1Ek(6d~lRz=tZw_g%;}A}6s0^7-5>HD{ezzzPtVz{hq5IGeH^ z#mQ<)!l|O%NK;IpPS9z`m9*!%d8N5(r6{2;1+N3$fB}xSIstb^_NT zc{neCEQuo-KNPJZv?&4ELnPWQnh`_mo+DiOCld2^3&8xCVo7B#gfX3~q8VX)mRrE~ z8#ZQ1Oi4hK;>C$l0Zz_DNno^HgBHMsFUhvsL10-L9?vFjNNL{mT2vPRTv?uN?RXWN z>W%@QrnFR` Date: Sun, 9 Aug 2020 20:59:22 -0300 Subject: [PATCH 12/12] Updated the Deoxys Forms' battle sprites' Y coords --- src/data/pokemon_graphics/back_pic_coordinates.h | 6 +++--- src/data/pokemon_graphics/front_pic_coordinates.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data/pokemon_graphics/back_pic_coordinates.h b/src/data/pokemon_graphics/back_pic_coordinates.h index cb38bf48b..44fac4b43 100644 --- a/src/data/pokemon_graphics/back_pic_coordinates.h +++ b/src/data/pokemon_graphics/back_pic_coordinates.h @@ -4627,16 +4627,16 @@ const struct MonCoords gMonBackPicCoords[] = [SPECIES_DEOXYS_ATTACK] = { .size = 0x87, - .y_offset = 0x6 + .y_offset = 6, }, [SPECIES_DEOXYS_DEFENSE] = { .size = 0x87, - .y_offset = 0x9 + .y_offset = 9, }, [SPECIES_DEOXYS_SPEED] = { .size = 0x87, - .y_offset = 0x6 + .y_offset = 6, }, }; diff --git a/src/data/pokemon_graphics/front_pic_coordinates.h b/src/data/pokemon_graphics/front_pic_coordinates.h index aab50769d..2c0c798b8 100644 --- a/src/data/pokemon_graphics/front_pic_coordinates.h +++ b/src/data/pokemon_graphics/front_pic_coordinates.h @@ -4627,16 +4627,16 @@ const struct MonCoords gMonFrontPicCoords[] = [SPECIES_DEOXYS_ATTACK] = { .size = 0x88, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_DEOXYS_DEFENSE] = { .size = 0x88, - .y_offset = 0x0, + .y_offset = 0, }, [SPECIES_DEOXYS_SPEED] = { .size = 0x88, - .y_offset = 0x0, + .y_offset = 0, }, };