diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-04-01 20:30:41 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-04-01 19:30:41 -0500 |
| commit | c429e6d69c3df23687e2336039b676b8927c238e (patch) | |
| tree | 886c78662205b3ff6b2fa863087e81298b545b73 | |
| parent | fe1c14db76472101383f9f06d88d6d512faf367a (diff) | |
Move gPlayerFacingPosition out of sym_ewram.txt (#617)
* Move gPlayerFacingPosition out of sym_ewram.txt
* Fix tabs in sym_ewram.txt
* Remove redundant faraway island extern
| -rw-r--r-- | include/fldeff.h | 1 | ||||
| -rw-r--r-- | src/fldeff_misc.c | 2 | ||||
| -rw-r--r-- | src/fldeff_rocksmash.c | 3 | ||||
| -rw-r--r-- | sym_ewram.txt | 6 |
4 files changed, 3 insertions, 9 deletions
diff --git a/include/fldeff.h b/include/fldeff.h index e095396a4..ff6c9823f 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -10,6 +10,7 @@ void FixLongGrassMetatilesWindowTop(s16 x, s16 y); void FixLongGrassMetatilesWindowBottom(s16 x, s16 y); extern const struct SpritePalette gFieldEffectObjectPaletteInfo6; +extern struct MapPosition gPlayerFacingPosition; // groundshake bool8 sub_81BE66C(void); diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c index 5d1920aac..efde43b76 100644 --- a/src/fldeff_misc.c +++ b/src/fldeff_misc.c @@ -23,7 +23,7 @@ #include "constants/songs.h" #include "constants/vars.h" -extern struct MapPosition gPlayerFacingPosition; +EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0}; static void sub_80F9C90(u8); static void sub_80F9DFC(u8); diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 86df8e943..a9077f2ff 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -27,9 +27,6 @@ static void sub_813561C(u8 taskId); static void sub_81356C4(void); static void sub_8135714(void); -// extern RAM loc -extern struct MapPosition gPlayerFacingPosition; - // text bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) { diff --git a/sym_ewram.txt b/sym_ewram.txt index 98ba03cfe..8cb156837 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -135,11 +135,7 @@ gUnknown_02022D00: @ 2022D00 .include "src/decoration.o" .include "src/slot_machine.o" .include "src/battle_ai_script_commands.o" - -.align 2 -gPlayerFacingPosition: @ 203AB40 - .space 0x8 - + .include "src/fldeff_misc.o" .include "src/pokeblock.o" .include "src/field_specials.o" .include "src/battle_records.o" |