summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-23 10:55:30 -0500
committerEvan <eroelke@gmail.com>2019-12-04 14:54:50 -0700
commit98be2d1805920105f31baf633453ce39e968e018 (patch)
tree5094add4c317bacf9bf9b3fa0eee708810c95a9e
parent9d71775293cedadf4c38f8d2f3a53032c2de07af (diff)
fldeff_sweetscent ewram
-rw-r--r--include/fldeff.h1
-rw-r--r--src/fldeff_sweetscent.c2
-rw-r--r--sym_ewram.txt7
3 files changed, 5 insertions, 5 deletions
diff --git a/include/fldeff.h b/include/fldeff.h
index d44ce75a2..51287f400 100644
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -7,7 +7,6 @@
gTasks[taskId].data[8] = (u32)func >> 16; \
gTasks[taskId].data[9] = (u32)func;
-extern u8 *gUnknown_203AAB0;
extern struct MapPosition gPlayerFacingPosition;
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 66529cd55..943d8504c 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -13,6 +13,8 @@
#include "wild_encounter.h"
#include "constants/songs.h"
+static EWRAM_DATA u8 *gUnknown_203AAB0 = NULL;
+
static void FieldCallback_SweetScent(void);
static void StartSweetScentFieldEffect(void);
static void TrySweetScentEncounter(u8 taskId);
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 1fc0deab1..f2ebbb771 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -427,6 +427,7 @@ gPlayerFacingPosition: @ 2039A04
.align 2
.include "src/battle_transition.o"
+ .align 2
gUnknown_2039A30: @ 2039A30
.space 0x4
@@ -437,10 +438,8 @@ gUnknown_2039A34: @ 2039A34
.include "src/save.o"
.align 2
.include "src/mystery_event_script.o"
-
-gUnknown_203AAB0: @ 203AAB0
- .space 0x4
-
+ .align 2
+ .include "src/fldeff_sweetscent.o"
.align 2
.include "src/learn_move.o"
.align 2