diff --git a/graphics/backspr/gBackShinySprite009Blastoise.png b/graphics/backspr/gBackShinySprite009Blastoise.png index 2830d4a..7826602 100644 Binary files a/graphics/backspr/gBackShinySprite009Blastoise.png and b/graphics/backspr/gBackShinySprite009Blastoise.png differ diff --git a/graphics/backspr/gBackShinySprite1084Melmetal.png b/graphics/backspr/gBackShinySprite1084Melmetal.png index 7a429ef..a3f6ec5 100644 Binary files a/graphics/backspr/gBackShinySprite1084Melmetal.png and b/graphics/backspr/gBackShinySprite1084Melmetal.png differ diff --git a/graphics/backspr/gBackShinySprite279Sceptile.png b/graphics/backspr/gBackShinySprite279Sceptile.png index 60ad585..772f1c2 100644 Binary files a/graphics/backspr/gBackShinySprite279Sceptile.png and b/graphics/backspr/gBackShinySprite279Sceptile.png differ diff --git a/graphics/backspr/gBackShinySprite766Greninja.png b/graphics/backspr/gBackShinySprite766Greninja.png index c2878c0..a8ece01 100644 Binary files a/graphics/backspr/gBackShinySprite766Greninja.png and b/graphics/backspr/gBackShinySprite766Greninja.png differ diff --git a/graphics/backspr/gBackShinySprite808Sylveon.png b/graphics/backspr/gBackShinySprite808Sylveon.png index 181386b..409615f 100644 Binary files a/graphics/backspr/gBackShinySprite808Sylveon.png and b/graphics/backspr/gBackShinySprite808Sylveon.png differ diff --git a/graphics/backspr/gBackShinySprite816Phantump.png b/graphics/backspr/gBackShinySprite816Phantump.png index 4a67df4..6bce8d0 100644 Binary files a/graphics/backspr/gBackShinySprite816Phantump.png and b/graphics/backspr/gBackShinySprite816Phantump.png differ diff --git a/graphics/backspr/gBackShinySprite817Trevenant.png b/graphics/backspr/gBackShinySprite817Trevenant.png index a16598d..a07ce16 100644 Binary files a/graphics/backspr/gBackShinySprite817Trevenant.png and b/graphics/backspr/gBackShinySprite817Trevenant.png differ diff --git a/graphics/backspr/gBackShinySprite839Ashgreninja.png b/graphics/backspr/gBackShinySprite839Ashgreninja.png index 37dd068..9ff3102 100644 Binary files a/graphics/backspr/gBackShinySprite839Ashgreninja.png and b/graphics/backspr/gBackShinySprite839Ashgreninja.png differ diff --git a/graphics/backspr/gBackShinySprite872BlastoiseMega.png b/graphics/backspr/gBackShinySprite872BlastoiseMega.png index 3118743..e88fc6c 100644 Binary files a/graphics/backspr/gBackShinySprite872BlastoiseMega.png and b/graphics/backspr/gBackShinySprite872BlastoiseMega.png differ diff --git a/graphics/frontspr/gFrontSprite009Blastoise.png b/graphics/frontspr/gFrontSprite009Blastoise.png index 305b425..9ab1856 100644 Binary files a/graphics/frontspr/gFrontSprite009Blastoise.png and b/graphics/frontspr/gFrontSprite009Blastoise.png differ diff --git a/graphics/frontspr/gFrontSprite1184UrshifuSingle.png b/graphics/frontspr/gFrontSprite1184UrshifuSingle.png index e62a37f..56e1113 100644 Binary files a/graphics/frontspr/gFrontSprite1184UrshifuSingle.png and b/graphics/frontspr/gFrontSprite1184UrshifuSingle.png differ diff --git a/graphics/frontspr/gFrontSprite1208UrshifuRapid.png b/graphics/frontspr/gFrontSprite1208UrshifuRapid.png index dbefa4f..3456e77 100644 Binary files a/graphics/frontspr/gFrontSprite1208UrshifuRapid.png and b/graphics/frontspr/gFrontSprite1208UrshifuRapid.png differ diff --git a/graphics/frontspr/gFrontSprite279Sceptile.png b/graphics/frontspr/gFrontSprite279Sceptile.png index 3ffc8ec..e510c74 100644 Binary files a/graphics/frontspr/gFrontSprite279Sceptile.png and b/graphics/frontspr/gFrontSprite279Sceptile.png differ diff --git a/graphics/frontspr/gFrontSprite766Greninja.png b/graphics/frontspr/gFrontSprite766Greninja.png index bc74f55..ce5a565 100644 Binary files a/graphics/frontspr/gFrontSprite766Greninja.png and b/graphics/frontspr/gFrontSprite766Greninja.png differ diff --git a/graphics/frontspr/gFrontSprite808Sylveon.png b/graphics/frontspr/gFrontSprite808Sylveon.png index 570d67e..f9a92bf 100644 Binary files a/graphics/frontspr/gFrontSprite808Sylveon.png and b/graphics/frontspr/gFrontSprite808Sylveon.png differ diff --git a/graphics/frontspr/gFrontSprite816Phantump.png b/graphics/frontspr/gFrontSprite816Phantump.png index d669531..83d70bd 100644 Binary files a/graphics/frontspr/gFrontSprite816Phantump.png and b/graphics/frontspr/gFrontSprite816Phantump.png differ diff --git a/graphics/frontspr/gFrontSprite817Trevenant.png b/graphics/frontspr/gFrontSprite817Trevenant.png index 77bcfc3..657080a 100644 Binary files a/graphics/frontspr/gFrontSprite817Trevenant.png and b/graphics/frontspr/gFrontSprite817Trevenant.png differ diff --git a/graphics/frontspr/gFrontSprite839Ashgreninja.png b/graphics/frontspr/gFrontSprite839Ashgreninja.png index 6d07fd8..2b0c9fc 100644 Binary files a/graphics/frontspr/gFrontSprite839Ashgreninja.png and b/graphics/frontspr/gFrontSprite839Ashgreninja.png differ diff --git a/graphics/frontspr/gFrontSprite872BlastoiseMega.png b/graphics/frontspr/gFrontSprite872BlastoiseMega.png index 6b6186b..3954c6c 100644 Binary files a/graphics/frontspr/gFrontSprite872BlastoiseMega.png and b/graphics/frontspr/gFrontSprite872BlastoiseMega.png differ diff --git a/graphics/frontspr/gFrontSprite890SceptileMega.png b/graphics/frontspr/gFrontSprite890SceptileMega.png index 682fc7a..d73aa17 100644 Binary files a/graphics/frontspr/gFrontSprite890SceptileMega.png and b/graphics/frontspr/gFrontSprite890SceptileMega.png differ diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c index 69bfd2f..47e9a60 100644 --- a/src/Back_Pic_Coords_Table.c +++ b/src/Back_Pic_Coords_Table.c @@ -5426,7 +5426,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] = [SPECIES_MELMETAL] = { .size = 0x0, - .y_offset = 0xd, + .y_offset = 0x10, }, [SPECIES_PIKACHU_SURFING] = { diff --git a/src/Cry_Table.c b/src/Cry_Table.c index f075f48..430b6fd 100644 --- a/src/Cry_Table.c +++ b/src/Cry_Table.c @@ -14310,6 +14310,18 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, + [SPECIES_KOFFING_G] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = (u8*) 0x8583f4c, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_WEEZING_G] = { .type = 0x20, @@ -14418,6 +14430,18 @@ const struct ToneData gCryTable[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, + [SPECIES_MIME_JR_G] = + { + .type = 0x20, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryMimeJr, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_DARUMAKA_G] = { .type = 0x20, diff --git a/src/Cry_Table_2.c b/src/Cry_Table_2.c index f6f47a9..4d4f5f5 100644 --- a/src/Cry_Table_2.c +++ b/src/Cry_Table_2.c @@ -14310,6 +14310,18 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, + [SPECIES_KOFFING_G] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = (u8*) 0x8583f4c, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_WEEZING_G] = { .type = 0x30, @@ -14418,6 +14430,18 @@ const struct ToneData gCryTable2[NUM_SPECIES] = .sustain = 0xff, .release = 0x0, }, + [SPECIES_MIME_JR_G] = + { + .type = 0x30, + .key = 0x3c, + .length = 0x0, + .pan_sweep = 0x0, + .wav = gCryMimeJr, + .attack = 0xff, + .decay = 0x0, + .sustain = 0xff, + .release = 0x0, + }, [SPECIES_DARUMAKA_G] = { .type = 0x30, diff --git a/src/Front_Pic_Coords_Table.c b/src/Front_Pic_Coords_Table.c index 8561339..522b255 100644 --- a/src/Front_Pic_Coords_Table.c +++ b/src/Front_Pic_Coords_Table.c @@ -1401,7 +1401,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_SCEPTILE] = { .size = 0x88, - .y_offset = 0x1, + .y_offset = 0x0, }, [SPECIES_TORCHIC] = { @@ -4201,7 +4201,7 @@ const struct MonCoords gMonFrontPicCoords[NUM_SPECIES] = [SPECIES_ASHGRENINJA] = { .size = 0x0, - .y_offset = 0x5, + .y_offset = 0x0, }, [SPECIES_FLABEBE_BLUE] = { diff --git a/src/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c index 8882ebc..ec421d2 100644 --- a/src/Pokedex_Data_Table.c +++ b/src/Pokedex_Data_Table.c @@ -9631,7 +9631,7 @@ const struct PokedexEntry gPokedexEntries[/*NATIONAL_DEX_COUNT*/] = [NATIONAL_DEX_MARSHADOW] = { .categoryName = {_G, _l, _o, _o, _m, _d, _w, _e, _l, _l, _END, _SPACE}, - .height = 70, + .height = 7, .weight = 222, .description = DEX_ENTRY_MARSHADOW, .unusedDescription = (const u8*) 0x8444cb1, diff --git a/src/tm_compatibility/19 - Giga Drain.txt b/src/tm_compatibility/19 - Giga Drain.txt index 95c528d..134ea2d 100644 --- a/src/tm_compatibility/19 - Giga Drain.txt +++ b/src/tm_compatibility/19 - Giga Drain.txt @@ -79,6 +79,8 @@ SHEDINJA VOLBEAT ILLUMISE ROSELIA +GULPIN +SWALOT TRAPINCH VIBRAVA FLYGON @@ -164,7 +166,6 @@ JOLTIK GALVANTULA FERROSEED FERROTHORN -TYNAMO EELEKTRIK EELEKTROSS SHELMET diff --git a/src/tm_compatibility/22 - Solarbeam.txt b/src/tm_compatibility/22 - Solarbeam.txt index a0eb8ad..ce6546a 100644 --- a/src/tm_compatibility/22 - Solarbeam.txt +++ b/src/tm_compatibility/22 - Solarbeam.txt @@ -144,6 +144,8 @@ INFERNAPE BUDEW ROSERADE WORMADAM +WORMADAM_SANDY +WORMADAM_TRASH MOTHIM CHERUBI CHERRIM diff --git a/src/tm_compatibility/48 - Skill Swap.txt b/src/tm_compatibility/48 - Skill Swap.txt index 47f0061..a8b8524 100644 --- a/src/tm_compatibility/48 - Skill Swap.txt +++ b/src/tm_compatibility/48 - Skill Swap.txt @@ -42,6 +42,7 @@ KIRLIA GARDEVOIR SPOINK GRUMPIG +PLUSLE SPINDA LUNATONE SOLROCK diff --git a/src/tm_compatibility/49 - Leech Fang.txt b/src/tm_compatibility/49 - Leech Fang.txt index 71e9d3a..b983df6 100644 --- a/src/tm_compatibility/49 - Leech Fang.txt +++ b/src/tm_compatibility/49 - Leech Fang.txt @@ -16,6 +16,8 @@ MEW SPINARAK ARIADOS CROBAT +BEAUTIFLY +DUSTOX NINCADA NINJASK SHEDINJA diff --git a/src/tm_compatibility/71 - Stone Edge.txt b/src/tm_compatibility/71 - Stone Edge.txt index c1de5ae..3a579a6 100644 --- a/src/tm_compatibility/71 - Stone Edge.txt +++ b/src/tm_compatibility/71 - Stone Edge.txt @@ -25,6 +25,7 @@ PINSIR TAUROS GYARADOS OMASTAR +KABUTO KABUTOPS AERODACTYL DRAGONITE diff --git a/src/tutor_compatibility/105 - Blaze Kick.txt b/src/tutor_compatibility/105 - Blaze Kick.txt index 3061e14..c383c84 100644 --- a/src/tutor_compatibility/105 - Blaze Kick.txt +++ b/src/tutor_compatibility/105 - Blaze Kick.txt @@ -3,6 +3,7 @@ CHARIZARD HITMONLEE ZAPDOS_G MEW +COMBUSKEN BLAZIKEN MEDICHAM CHIMCHAR diff --git a/src/tutor_compatibility/123 - Hurricane.txt b/src/tutor_compatibility/123 - Hurricane.txt index d76fc90..c867da5 100644 --- a/src/tutor_compatibility/123 - Hurricane.txt +++ b/src/tutor_compatibility/123 - Hurricane.txt @@ -28,6 +28,7 @@ SWELLOW WINGULL PELIPPER MASQUERAIN +ALTARIA TROPIUS CASTFORM SALAMENCE diff --git a/src/tutor_compatibility/34 - Laser Focus.txt b/src/tutor_compatibility/34 - Laser Focus.txt index 2db269b..6985c8b 100644 --- a/src/tutor_compatibility/34 - Laser Focus.txt +++ b/src/tutor_compatibility/34 - Laser Focus.txt @@ -1,6 +1,10 @@ Tutour 34: Laser Focus BEEDRILL PIDGEOT +RATTATA +RATTATA_A +RATICATE +RATICATE_A FEAROW PIKACHU PIKACHU_SURFING diff --git a/src/tutor_compatibility/54 - Knock Off.txt b/src/tutor_compatibility/54 - Knock Off.txt index fd97a25..19d36c3 100644 --- a/src/tutor_compatibility/54 - Knock Off.txt +++ b/src/tutor_compatibility/54 - Knock Off.txt @@ -97,6 +97,9 @@ LUDICOLO SHIFTRY WINGULL PELIPPER +RALTS +KIRLIA +GALLADE MAKUHITA HARIYAMA AZURILL diff --git a/src/tutor_compatibility/74 - Toxic Spikes.txt b/src/tutor_compatibility/74 - Toxic Spikes.txt index a3d789e..3616c10 100644 --- a/src/tutor_compatibility/74 - Toxic Spikes.txt +++ b/src/tutor_compatibility/74 - Toxic Spikes.txt @@ -29,6 +29,10 @@ ROSELIA ROSERADE VESPIQUEN SKORUPI +DEOXYS +DEOXYS_ATTACK +DEOXYS_DEFENSE +DEOXYS_SPEED DRAPION VENIPEDE WHIRLIPEDE