From a22495d7cb87cbf697c8da8a024c8b07f93876ca Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 5 May 2019 10:09:52 +0200 Subject: [PATCH] Gen4 mon animations --- src/data/pokemon_graphics/front_pic_anims.h | 127 ++++++++++++-------- src/pokemon.c | 112 ++++++++++++++++- src/pokemon_storage_system.c | 19 --- 3 files changed, 187 insertions(+), 71 deletions(-) diff --git a/src/data/pokemon_graphics/front_pic_anims.h b/src/data/pokemon_graphics/front_pic_anims.h index d8cca479c..e7e130bc3 100644 --- a/src/data/pokemon_graphics/front_pic_anims.h +++ b/src/data/pokemon_graphics/front_pic_anims.h @@ -4807,48 +4807,54 @@ static const union AnimCmd sAnim_UNOWN_QMARK_1[] = static const union AnimCmd sAnim_TURTWIG_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), ANIMCMD_END, }; static const union AnimCmd sAnim_GROTLE_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 27), + ANIMCMD_FRAME(1, 27), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_TORTERRA_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 26), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; static const union AnimCmd sAnim_CHIMCHAR_1[] = { ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 7), ANIMCMD_END, }; static const union AnimCmd sAnim_MONFERNO_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 12), + ANIMCMD_FRAME(1, 12), + ANIMCMD_FRAME(0, 7), ANIMCMD_END, }; static const union AnimCmd sAnim_INFERNAPE_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 25), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -4919,17 +4925,17 @@ static const union AnimCmd sAnim_BIBAREL_1[] = static const union AnimCmd sAnim_KRICKETOT_1[] = { - ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 30), ANIMCMD_END, }; static const union AnimCmd sAnim_KRICKETUNE_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), ANIMCMD_END, }; @@ -4953,21 +4959,25 @@ static const union AnimCmd sAnim_LUXRAY_1[] = { ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_BUDEW_1[] = { - ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_ROSERADE_1[] = { - ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -5041,8 +5051,12 @@ static const union AnimCmd sAnim_MOTHIM_1[] = static const union AnimCmd sAnim_COMBEE_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5129,8 +5143,10 @@ static const union AnimCmd sAnim_DRIFLOON_1[] = static const union AnimCmd sAnim_DRIFBLIM_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5145,16 +5161,20 @@ static const union AnimCmd sAnim_BUNEARY_1[] = static const union AnimCmd sAnim_LOPUNNY_1[] = { + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(1, 20), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_MISMAGIUS_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5185,8 +5205,9 @@ static const union AnimCmd sAnim_PURUGLY_1[] = static const union AnimCmd sAnim_CHINGLING_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 20), + ANIMCMD_FRAME(1, 40), + ANIMCMD_FRAME(1, 40), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5233,8 +5254,10 @@ static const union AnimCmd sAnim_BONSLY_1[] = static const union AnimCmd sAnim_MIMEJR_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5257,8 +5280,9 @@ static const union AnimCmd sAnim_CHATOT_1[] = static const union AnimCmd sAnim_SPIRITOMB_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 5), + ANIMCMD_FRAME(1, 60), + ANIMCMD_FRAME(1, 50), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5313,16 +5337,16 @@ static const union AnimCmd sAnim_LUCARIO_1[] = static const union AnimCmd sAnim_HIPPOPOTAS_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 50), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_HIPPOWDON_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 45), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5377,15 +5401,19 @@ static const union AnimCmd sAnim_FINNEON_1[] = static const union AnimCmd sAnim_LUMINEON_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), + ANIMCMD_FRAME(0, 10), + ANIMCMD_FRAME(1, 10), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_MANTYKE_1[] = { - ANIMCMD_FRAME(0, 30), + ANIMCMD_FRAME(1, 50), ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, @@ -5457,8 +5485,7 @@ static const union AnimCmd sAnim_ELECTIVIRE_1[] = static const union AnimCmd sAnim_MAGMORTAR_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(1, 40), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; @@ -5473,23 +5500,23 @@ static const union AnimCmd sAnim_TOGEKISS_1[] = static const union AnimCmd sAnim_YANMEGA_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), - ANIMCMD_FRAME(0, 1), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 15), + ANIMCMD_FRAME(1, 15), + ANIMCMD_FRAME(0, 5), ANIMCMD_END, }; static const union AnimCmd sAnim_LEAFEON_1[] = { - ANIMCMD_FRAME(0, 30), - ANIMCMD_FRAME(1, 30), + ANIMCMD_FRAME(1, 35), ANIMCMD_FRAME(0, 1), ANIMCMD_END, }; static const union AnimCmd sAnim_GLACEON_1[] = { - ANIMCMD_FRAME(0, 30), ANIMCMD_FRAME(1, 30), ANIMCMD_FRAME(0, 1), ANIMCMD_END, diff --git a/src/pokemon.c b/src/pokemon.c index 36b77cc57..22c350386 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1772,9 +1772,117 @@ static const u8 sMonFrontAnimIdsTable[NUM_SPECIES - 1] = [SPECIES_JIRACHI - 1] = 0x0d, [SPECIES_DEOXYS - 1] = 0x1b, [SPECIES_CHIMECHO - 1] = 0x1d, - [SPECIES_MOTHIM - 1] = 0x1d, - //Gen 6 animations + // Gen 4 + [SPECIES_TURTWIG - 1] = 0x04, + [SPECIES_GROTLE - 1] = 0x03, + [SPECIES_TORTERRA - 1] = 0x10, + [SPECIES_CHIMCHAR - 1] = 0x1E, + [SPECIES_MONFERNO - 1] = 0x4c, + [SPECIES_INFERNAPE - 1] = 0x25, + [SPECIES_PIPLUP - 1] = 0x45, + [SPECIES_PRINPLUP - 1] = 0x45, + [SPECIES_EMPOLEON - 1] = 0x19, + [SPECIES_STARLY - 1] = 0x17, + [SPECIES_STARAVIA - 1] = 0x17, + [SPECIES_STARAPTOR - 1] = 0x16, + [SPECIES_BIDOOF - 1] = 0x45, + [SPECIES_BIBAREL - 1] = 0x6B, + [SPECIES_KRICKETOT - 1] = 0x10, + [SPECIES_KRICKETUNE - 1] = 0x10, + [SPECIES_SHINX - 1] = 0x17, + [SPECIES_LUXIO - 1] = 0x17, + [SPECIES_LUXRAY - 1] = 0x23, + [SPECIES_BUDEW - 1] = 0x13, + [SPECIES_ROSERADE - 1] = 0x24, + [SPECIES_CRANIDOS - 1] = 0x19, + [SPECIES_RAMPARDOS - 1] = 0x19, + [SPECIES_SHIELDON - 1] = 0x10, + [SPECIES_BASTIODON - 1] = 0x0F, + [SPECIES_BURMY - 1] = 0x1E, + [SPECIES_WORMADAM - 1] = 0x1E, + [SPECIES_MOTHIM - 1] = 0x1D, + [SPECIES_COMBEE - 1] = 0x1C, + [SPECIES_VESPIQUEN - 1] = 0x20, + [SPECIES_PACHIRISU - 1] = 0x00, + [SPECIES_BUIZEL - 1] = 0x11, + [SPECIES_FLOATZEL - 1] = 0x13, + [SPECIES_CHERUBI - 1] = 0x30, + [SPECIES_CHERRIM - 1] = 0x30, + [SPECIES_SHELLOS - 1] = 0x45, + [SPECIES_GASTRODON - 1] = 0x45, + [SPECIES_AMBIPOM - 1] = 0x25, + [SPECIES_DRIFLOON - 1] = 0x1C, + [SPECIES_DRIFBLIM - 1] = 0x1C, + [SPECIES_BUNEARY - 1] = 0x1E, + [SPECIES_LOPUNNY - 1] = 0x13, + [SPECIES_MISMAGIUS - 1] = 0x0E, + [SPECIES_HONCHKROW - 1] = 0x15, + [SPECIES_GLAMEOW - 1] = 0x09, + [SPECIES_PURUGLY - 1] = 0x10, + [SPECIES_CHINGLING - 1] = 0x1D, + [SPECIES_STUNKY - 1] = 0x1A, + [SPECIES_SKUNTANK - 1] = 0x45, + [SPECIES_BRONZOR - 1] = 0x4E, + [SPECIES_BRONZONG - 1] = 0x51, + [SPECIES_BONSLY - 1] = 0x52, + [SPECIES_MIMEJR - 1] = 0x40, + [SPECIES_HAPPINY - 1] = 0x45, + [SPECIES_CHATOT - 1] = 0x19, + [SPECIES_SPIRITOMB - 1] = 0x3A, + [SPECIES_GIBLE - 1] = 0x1E, + [SPECIES_GABITE - 1] = 0x17, + [SPECIES_GARCHOMP - 1] = 0x19, + [SPECIES_MUNCHLAX - 1] = 0x13, + [SPECIES_RIOLU - 1] = 0x16, + [SPECIES_LUCARIO - 1] = 0x0F, + [SPECIES_HIPPOPOTAS - 1] = 0x17, + [SPECIES_HIPPOWDON - 1] = 0x00, + [SPECIES_SKORUPI - 1] = 0x10, + [SPECIES_DRAPION - 1] = 0x1e, + [SPECIES_CROAGUNK - 1] = 0x24, + [SPECIES_TOXICROAK - 1] = 0x4, + [SPECIES_CARNIVINE - 1] = 0x1D, + [SPECIES_FINNEON - 1] = 0x2D, + [SPECIES_LUMINEON - 1] = 0x22, + [SPECIES_MANTYKE - 1] = 0x4E, + [SPECIES_SNOVER - 1] = 0x52, + [SPECIES_ABOMASNOW - 1] = 0xF, + [SPECIES_WEAVILE - 1] = 0xF, + [SPECIES_MAGNEZONE - 1] = 0x23, + [SPECIES_LICKILICKY - 1] = 0x2F, + [SPECIES_RHYPERIOR - 1] = 0x41, + [SPECIES_TANGROWTH - 1] = 0x3A, + [SPECIES_ELECTIVIRE - 1] = 0x23, + [SPECIES_MAGMORTAR - 1] = 0x21, + [SPECIES_TOGEKISS - 1] = 0x1A, + [SPECIES_YANMEGA - 1] = 0xA, + [SPECIES_LEAFEON - 1] = 0x52, + [SPECIES_GLACEON - 1] = 0x17, + [SPECIES_GLISCOR - 1] = 0x12, + [SPECIES_MAMOSWINE - 1] = 0x1E, + [SPECIES_PORYGON_Z - 1] = 0x1C, + [SPECIES_GALLADE - 1] = 0x13, + [SPECIES_PROBOPASS - 1] = 0xE, + [SPECIES_DUSKNOIR - 1] = 0x15, + [SPECIES_FROSLASS - 1] = 0x1C, + [SPECIES_ROTOM - 1] = 0x23, + [SPECIES_UXIE - 1] = 0x1D, + [SPECIES_MESPRIT - 1] = 0x1D, + [SPECIES_AZELF - 1] = 0x1D, + [SPECIES_DIALGA - 1] = 0x30, + [SPECIES_PALKIA - 1] = 0xF, + [SPECIES_HEATRAN - 1] = 0x21, + [SPECIES_REGIGIGAS - 1] = 0x3A, + [SPECIES_GIRATINA - 1] = 0x19, + [SPECIES_CRESSELIA - 1] = 0x1D, + [SPECIES_PHIONE - 1] = 0x1D, + [SPECIES_MANAPHY - 1] = 0x17, + [SPECIES_DARKRAI - 1] = 0x15, + [SPECIES_SHAYMIN - 1] = 0x13, + [SPECIES_ARCEUS - 1] = 0x11, + + //Gen 6 [SPECIES_CHESPIN - 1] = 0x31, [SPECIES_QUILLADIN - 1] = 0x00, [SPECIES_CHESNAUGHT - 1] = 0x19, diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 85ec7cc23..148be7c5c 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1875,25 +1875,6 @@ static void Cb2_ExitPSS(void) sPreviousBoxOption = GetCurrentBoxOption(); gFieldCallback = FieldCb_ReturnToPcMenu; SetMainCallback2(CB2_ReturnToField); - { - int i, j, id = SPECIES_MEGA_GENGAR; - - #include "constants/items.h" - - ClearBag(); - - for (i = 0; i < 14; i++) - { - for (j = 0; j < 30; j++) - { - gPokemonStoragePtr->boxes[i][j] = gPlayerParty[0].box; - SetBoxMonData(&gPokemonStoragePtr->boxes[i][j], MON_DATA_SPECIES, &id); - if (++id > NUM_SPECIES) - return; - } - } - - } } static s16 StorageSystemGetNextMonIndex(struct BoxPokemon *box, s8 startIdx, u8 stopIdx, u8 mode)