From 618240c62639bc4da73d400965b6df67b2c3619e Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sun, 5 Nov 2017 23:07:39 -0500
Subject: move src/engine/ direct ewram calls to ewram.h.

---
 src/engine/main_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/engine/main_menu.c')

diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index e0af86f3d..3a343a0de 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -54,7 +54,7 @@ extern const u8 gUnknown_081E796C[];
 
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
-extern u8 unk_2000000[];
+extern u8 ewram[];
 
 //Menu layouts
 enum
@@ -1419,14 +1419,14 @@ void AddBirchSpeechObjects(u8 taskId)
     gTasks[taskId].tAzurillSpriteId = spriteId;
 
     //Create Brendan sprite
-    spriteId = CreateTrainerSprite(0, 120, 60, 0, unk_2000000);
+    spriteId = CreateTrainerSprite(0, 120, 60, 0, ewram);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
     gTasks[taskId].tBrendanSpriteId = spriteId;
 
     //Create May sprite
-    spriteId = CreateTrainerSprite(1, 120, 60, 0, unk_2000000 + 0x800);
+    spriteId = CreateTrainerSprite(1, 120, 60, 0, ewram + 0x800);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-- 
cgit v1.2.3


From 5711615c6067e49c3254f9568be55dc6ed3d5c2f Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Mon, 6 Nov 2017 03:46:09 -0500
Subject: finish refactoring ewram defines into ewram.h.

---
 src/engine/main_menu.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/engine/main_menu.c')

diff --git a/src/engine/main_menu.c b/src/engine/main_menu.c
index 3a343a0de..bfbf0dcd6 100644
--- a/src/engine/main_menu.c
+++ b/src/engine/main_menu.c
@@ -22,6 +22,7 @@
 #include "text.h"
 #include "title_screen.h"
 #include "unknown_task.h"
+#include "ewram.h"
 
 #define BirchSpeechUpdateWindowText() ((u8)MenuUpdateWindowText_OverrideLineLength(24))
 
@@ -54,8 +55,6 @@ extern const u8 gUnknown_081E796C[];
 
 extern const union AffineAnimCmd *const gSpriteAffineAnimTable_81E79AC[];
 
-extern u8 ewram[];
-
 //Menu layouts
 enum
 {
@@ -1419,14 +1418,14 @@ void AddBirchSpeechObjects(u8 taskId)
     gTasks[taskId].tAzurillSpriteId = spriteId;
 
     //Create Brendan sprite
-    spriteId = CreateTrainerSprite(0, 120, 60, 0, ewram);
+    spriteId = CreateTrainerSprite(0, 120, 60, 0, eBrendanSprite);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
     gTasks[taskId].tBrendanSpriteId = spriteId;
 
     //Create May sprite
-    spriteId = CreateTrainerSprite(1, 120, 60, 0, ewram + 0x800);
+    spriteId = CreateTrainerSprite(1, 120, 60, 0, eMaySprite);
     gSprites[spriteId].callback = nullsub_34;
     gSprites[spriteId].invisible = 1;
     gSprites[spriteId].oam.priority = 0;
-- 
cgit v1.2.3