From 3873d9aa1bf7c8b9728f4f5602e4cfb3548540af Mon Sep 17 00:00:00 2001
From: Skeli <sesyl.schweitzer@gmail.com>
Date: Tue, 17 Sep 2019 08:48:52 -0400
Subject: [PATCH] Fix Various Issues

---
 scripts/build.py            | 54 ++++++++-----------------------------
 src/Back_Pic_Coords_Table.c |  2 +-
 src/Base_Stats.c            |  4 +--
 src/Evolution Table.c       |  4 ++-
 src/TM_Tutor_Tables.c       |  2 +-
 5 files changed, 18 insertions(+), 48 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index 580fb5c..3b51284 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -10,43 +10,6 @@ import sys
 from datetime import datetime
 from string import StringFileConverter
 
-PathVar = os.environ.get('Path')
-Paths = PathVar.split(';')
-PATH = ""
-for candidatePath in Paths:
-    if "devkitARM" in candidatePath:
-        PATH = candidatePath
-        break
-if PATH == "":
-	print('DevKit does not exist in your Path variable.\nChecking default location.')
-	PATH = 'C://devkitPro//devkitARM//bin'
-	if os.path.isdir(PATH) == False:
-		print("...\nDevkit not found.")
-		sys.exit(1)
-	else:
-		print("Devkit found.")
-
-PREFIX = '/arm-none-eabi-'
-AS = (PATH + PREFIX + 'as')
-CC = (PATH + PREFIX + 'gcc')
-LD = (PATH + PREFIX + 'ld')
-GR = ("deps/grit.exe")
-WAV2AGB = ("deps/wav2agb.exe")
-ARP = ('armips')
-OBJCOPY = (PATH + PREFIX + 'objcopy')
-SRC = './src'
-GRAPHICS = './graphics'
-ASSEMBLY = './assembly'
-STRINGS = './strings'
-AUDIO = './audio'
-BUILD = './build'
-IMAGES = '\Images'
-ASFLAGS = ['-mthumb', '-I', ASSEMBLY]
-LDFLAGS = ['BPRE.ld', '-T', 'linker.ld']
-CFLAGS = ['-mthumb', '-mno-thumb-interwork', '-mcpu=arm7tdmi', '-mtune=arm7tdmi',
-'-mno-long-calls', '-march=armv4t', '-Wall', '-Wextra','-Os', '-fira-loop-pressure', '-fipa-pta']
-
-
 if sys.platform.startswith('win'):
     PathVar = os.environ.get('Path')
     Paths = PathVar.split(';')
@@ -430,14 +393,19 @@ def main():
     except FileExistsError:
         pass
 
-    ProcessSpriteGraphics()	
+    try:
+        ProcessSpriteGraphics()	
 
-    # Gather source files and process them
-    objects = itertools.starmap(RunGlob, globs.items())
+        # Gather source files and process them
+        objects = itertools.starmap(RunGlob, globs.items())
 
-    # Link and extract raw binary
-    linked = LinkObjects(itertools.chain.from_iterable(objects))
-    Objcopy(linked)
+        # Link and extract raw binary
+        linked = LinkObjects(itertools.chain.from_iterable(objects))
+        Objcopy(linked)
+
+    except Exception as e:
+        print("There was an error compiling the engine: {}".format(e))
+        sys.exit(1)
 
     # Build special_inserts.asm
     if os.path.isfile('special_inserts.asm'):
diff --git a/src/Back_Pic_Coords_Table.c b/src/Back_Pic_Coords_Table.c
index 645a269..e1c2e3f 100644
--- a/src/Back_Pic_Coords_Table.c
+++ b/src/Back_Pic_Coords_Table.c
@@ -4146,7 +4146,7 @@ const struct MonCoords gMonBackPicCoords[NUM_SPECIES] =
 	[SPECIES_HOOPA] =
 	{
 		.size = 0x0,
-		.y_offset = 0x7,
+		.y_offset = 0x8,
 	},
 	[SPECIES_HOOPA_UNBOUND] =
 	{
diff --git a/src/Base_Stats.c b/src/Base_Stats.c
index 417d34c..bf4891c 100644
--- a/src/Base_Stats.c
+++ b/src/Base_Stats.c
@@ -24157,7 +24157,7 @@ const struct BaseStats gBaseStats[] =
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 21,
 		.friendship = 70,
-		.growthRate = GROWTH_MEDIUM_FAST,
+		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_OVERGROW,
@@ -24256,7 +24256,7 @@ const struct BaseStats gBaseStats[] =
 		.genderRatio = PERCENT_FEMALE(12.5),
 		.eggCycles = 21,
 		.friendship = 70,
-		.growthRate = GROWTH_MEDIUM_FAST,
+		.growthRate = GROWTH_MEDIUM_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
 		.ability1 = ABILITY_BLAZE,
diff --git a/src/Evolution Table.c b/src/Evolution Table.c
index 7bd4ee9..3fbb332 100644
--- a/src/Evolution Table.c	
+++ b/src/Evolution Table.c	
@@ -29,7 +29,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_RATTATA] =          {{EVO_LEVEL, 20, SPECIES_RATICATE, 0}},
 	[SPECIES_SPEAROW] =          {{EVO_LEVEL, 20, SPECIES_FEAROW, 0}},
 	[SPECIES_EKANS] =            {{EVO_LEVEL, 22, SPECIES_ARBOK, 0}},
-	[SPECIES_PIKACHU] =          {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0}},
+	[SPECIES_PIKACHU] =          {{EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU, 0},
+								  {EVO_ITEM, ITEM_THUNDER_STONE, SPECIES_RAICHU_A, 0}},
 	[SPECIES_SANDSHREW] =        {{EVO_LEVEL, 22, SPECIES_SANDSLASH, 0}},
 	[SPECIES_NIDORAN_F] =        {{EVO_LEVEL, 16, SPECIES_NIDORINA, 0}},
 	[SPECIES_NIDORINA] =         {{EVO_ITEM, ITEM_MOON_STONE, SPECIES_NIDOQUEEN, 0}},
@@ -441,6 +442,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] =
 	[SPECIES_CLAUNCHER] =        {{EVO_LEVEL, 37, SPECIES_CLAWITZER, 0}},
 	[SPECIES_HELIOPTILE] =       {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_HELIOLISK, 0}},
 	[SPECIES_TYRUNT] =           {{EVO_LEVEL_DAY, 39, SPECIES_TYRANTRUM, 0}},
+	[SPECIES_AMAURA] =           {{EVO_LEVEL_NIGHT, 39, SPECIES_AURORUS, 0}},
 	[SPECIES_GOOMY] =            {{EVO_LEVEL, 40, SPECIES_SLIGGOO, 0}},
 	[SPECIES_SLIGGOO] =          {{EVO_RAINY_OW, 50, SPECIES_GOODRA, 0}},
 	[SPECIES_PHANTUMP] =         {{EVO_TRADE, 0, SPECIES_TREVENANT, 0},
diff --git a/src/TM_Tutor_Tables.c b/src/TM_Tutor_Tables.c
index 208d92b..a27c556 100644
--- a/src/TM_Tutor_Tables.c
+++ b/src/TM_Tutor_Tables.c
@@ -121,7 +121,7 @@ const u16 gTMHMMoves[NUM_TMSHMS] =
 	MOVE_TRICKROOM,		//116
 	MOVE_FLING,			//117
 	MOVE_AURORAVEIL,	//118
-	MOVE_LAVAPLUME,		//119
+	MOVE_SKYDROP,		//119
 	MOVE_NATUREPOWER,	//120
 	MOVE_CUT,			//121
 	MOVE_FLY,			//122