From cdfc053a56326a13dc5311b24488445e17536b7e Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Mon, 17 Jan 2022 21:23:10 +0200
Subject: [PATCH] Fix Minor Issues

-Missing Koffing-G and Mime Jr. G cries
-Incorrect Marshadow Pokedex height
---
 src/Cry_Table.c          | 24 ++++++++++++++++++++++++
 src/Cry_Table_2.c        | 24 ++++++++++++++++++++++++
 src/Pokedex_Data_Table.c |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

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/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c
index 3530066..e4e7f45 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,