summaryrefslogtreecommitdiff
path: root/src/engine/main_menu.c
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-06 03:46:09 -0500
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-11-06 03:46:09 -0500
commit5711615c6067e49c3254f9568be55dc6ed3d5c2f (patch)
treeac0e55b1797d8b2a913bb500cb31e2fff67c8211 /src/engine/main_menu.c
parent618240c62639bc4da73d400965b6df67b2c3619e (diff)
finish refactoring ewram defines into ewram.h.
Diffstat (limited to 'src/engine/main_menu.c')
-rw-r--r--src/engine/main_menu.c7
1 files changed, 3 insertions, 4 deletions
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;