Merge branch 'master' into Unbound

2026-09-07 01:25:32 -05:00 · 2022-01-17 21:27:20 +02:00
parent f8e65d6515 cdfc053a56
commit 4c35d74f86
35 changed files with 73 additions and 5 deletions
--- a/graphics/backspr/gBackShinySprite009Blastoise.png
+++ b/graphics/backspr/gBackShinySprite009Blastoise.png
--- a/graphics/backspr/gBackShinySprite1084Melmetal.png
+++ b/graphics/backspr/gBackShinySprite1084Melmetal.png
--- a/graphics/backspr/gBackShinySprite279Sceptile.png
+++ b/graphics/backspr/gBackShinySprite279Sceptile.png
--- a/graphics/backspr/gBackShinySprite766Greninja.png
+++ b/graphics/backspr/gBackShinySprite766Greninja.png
--- a/graphics/backspr/gBackShinySprite808Sylveon.png
+++ b/graphics/backspr/gBackShinySprite808Sylveon.png
--- a/graphics/backspr/gBackShinySprite816Phantump.png
+++ b/graphics/backspr/gBackShinySprite816Phantump.png
--- a/graphics/backspr/gBackShinySprite817Trevenant.png
+++ b/graphics/backspr/gBackShinySprite817Trevenant.png
--- a/graphics/backspr/gBackShinySprite839Ashgreninja.png
+++ b/graphics/backspr/gBackShinySprite839Ashgreninja.png
--- a/graphics/backspr/gBackShinySprite872BlastoiseMega.png
+++ b/graphics/backspr/gBackShinySprite872BlastoiseMega.png
--- a/graphics/frontspr/gFrontSprite009Blastoise.png
+++ b/graphics/frontspr/gFrontSprite009Blastoise.png
--- a/graphics/frontspr/gFrontSprite1184UrshifuSingle.png
+++ b/graphics/frontspr/gFrontSprite1184UrshifuSingle.png
--- a/graphics/frontspr/gFrontSprite1208UrshifuRapid.png
+++ b/graphics/frontspr/gFrontSprite1208UrshifuRapid.png
--- a/graphics/frontspr/gFrontSprite279Sceptile.png
+++ b/graphics/frontspr/gFrontSprite279Sceptile.png
--- a/graphics/frontspr/gFrontSprite766Greninja.png
+++ b/graphics/frontspr/gFrontSprite766Greninja.png
--- a/graphics/frontspr/gFrontSprite808Sylveon.png
+++ b/graphics/frontspr/gFrontSprite808Sylveon.png
--- a/graphics/frontspr/gFrontSprite816Phantump.png
+++ b/graphics/frontspr/gFrontSprite816Phantump.png
--- a/graphics/frontspr/gFrontSprite817Trevenant.png
+++ b/graphics/frontspr/gFrontSprite817Trevenant.png
--- a/graphics/frontspr/gFrontSprite839Ashgreninja.png
+++ b/graphics/frontspr/gFrontSprite839Ashgreninja.png
--- a/graphics/frontspr/gFrontSprite872BlastoiseMega.png
+++ b/graphics/frontspr/gFrontSprite872BlastoiseMega.png
--- a/graphics/frontspr/gFrontSprite890SceptileMega.png
+++ b/graphics/frontspr/gFrontSprite890SceptileMega.png
--- 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] =
 	{
--- 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,
--- 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,
--- 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] =
 	{
--- 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,
--- a/src/tm_compatibility/19
+++ b/src/tm_compatibility/19
@@ -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
--- a/src/tm_compatibility/22
+++ b/src/tm_compatibility/22
@@ -144,6 +144,8 @@ INFERNAPE
 BUDEW
 ROSERADE
 WORMADAM
+WORMADAM_SANDY
+WORMADAM_TRASH
 MOTHIM
 CHERUBI
 CHERRIM
--- a/src/tm_compatibility/48
+++ b/src/tm_compatibility/48
@@ -42,6 +42,7 @@ KIRLIA
 GARDEVOIR
 SPOINK
 GRUMPIG
+PLUSLE
 SPINDA
 LUNATONE
 SOLROCK
--- a/src/tm_compatibility/49
+++ b/src/tm_compatibility/49
@@ -16,6 +16,8 @@ MEW
 SPINARAK
 ARIADOS
 CROBAT
+BEAUTIFLY
+DUSTOX
 NINCADA
 NINJASK
 SHEDINJA
--- a/src/tm_compatibility/71
+++ b/src/tm_compatibility/71
@@ -25,6 +25,7 @@ PINSIR
 TAUROS
 GYARADOS
 OMASTAR
+KABUTO
 KABUTOPS
 AERODACTYL
 DRAGONITE
--- a/src/tutor_compatibility/105
+++ b/src/tutor_compatibility/105
@@ -3,6 +3,7 @@ CHARIZARD
 HITMONLEE
 ZAPDOS_G
 MEW
+COMBUSKEN
 BLAZIKEN
 MEDICHAM
 CHIMCHAR
--- a/src/tutor_compatibility/123
+++ b/src/tutor_compatibility/123
@@ -28,6 +28,7 @@ SWELLOW
 WINGULL
 PELIPPER
 MASQUERAIN
+ALTARIA
 TROPIUS
 CASTFORM
 SALAMENCE
--- a/src/tutor_compatibility/34
+++ b/src/tutor_compatibility/34
@@ -1,6 +1,10 @@
 Tutour 34: Laser Focus
 BEEDRILL
 PIDGEOT
+RATTATA
+RATTATA_A
+RATICATE
+RATICATE_A
 FEAROW
 PIKACHU
 PIKACHU_SURFING
--- a/src/tutor_compatibility/54
+++ b/src/tutor_compatibility/54
@@ -97,6 +97,9 @@ LUDICOLO
 SHIFTRY
 WINGULL
 PELIPPER
+RALTS
+KIRLIA
+GALLADE
 MAKUHITA
 HARIYAMA
 AZURILL
--- a/src/tutor_compatibility/74
+++ b/src/tutor_compatibility/74
@@ -29,6 +29,10 @@ ROSELIA
 ROSERADE
 VESPIQUEN
 SKORUPI
+DEOXYS
+DEOXYS_ATTACK
+DEOXYS_DEFENSE
+DEOXYS_SPEED
 DRAPION
 VENIPEDE
 WHIRLIPEDE