From 4cf701c5871a17f0bc580019e8d294bc1c84ebf3 Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sun, 5 Nov 2017 01:34:52 -0400
Subject: move ewram defines to ewram.h.

---
 src/battle/battle_transition.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/battle/battle_transition.c')

diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index 53d32d03a..5562da462 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -12,11 +12,11 @@
 #include "songs.h"
 #include "trainer.h"
 #include "field_camera.h"
+#include "ewram.h"
 
 void sub_807DE10(void);
 void dp12_8087EA4(void);
 
-extern u8 ewram[];
 extern u16 gUnknown_03005560[];
 extern u16 gUnknown_03004DE0[][0x3C0];
 
@@ -45,7 +45,6 @@ struct TransitionData
     s16 data[11];
 };
 
-#define TRANSITION_STRUCT   (*(struct TransitionData *)   (ewram + 0xC000))
 typedef bool8 (*TransitionState)(struct Task* task);
 typedef bool8 (*TransitionSpriteCallback)(struct Sprite* sprite);
 
-- 
cgit v1.2.3


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/battle/battle_transition.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/battle/battle_transition.c')

diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index 5562da462..d0a9bfb92 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -1733,8 +1733,8 @@ static void Mugshots_CreateOpponentPlayerSprites(struct Task* task)
     task->tMugshotOpponentID = CreateTrainerSprite(sMugshotsTrainerPicIDsTable[mugshotID],
                                                      sMugshotsOpponentCoords[mugshotID][0] - 32,
                                                      sMugshotsOpponentCoords[mugshotID][1] + 42,
-                                                     0, &ewram[0xC03C]);
-    task->tMugshotPlayerID = CreateTrainerSprite(gSaveBlock2.playerGender, 272, 106, 0, &ewram[0xC03C]);
+                                                     0, ewramC03C);
+    task->tMugshotPlayerID = CreateTrainerSprite(gSaveBlock2.playerGender, 272, 106, 0, ewramC03C);
 
     opponentSprite = &gSprites[task->tMugshotOpponentID];
     playerSprite = &gSprites[task->tMugshotPlayerID];
-- 
cgit v1.2.3