ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move gPlayerFacingPosition out of sym_ewram.txt (#617)

Browse Source 
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
This commit is contained in:
Phlosioneer 2019-04-01 20:30:41 -04:00 committed by huderlem
parent fe1c14db76
commit c429e6d69c
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/fldeff.h
View File

@ -10,6 +10,7 @@ void FixLongGrassMetatilesWindowTop(s16 x, s16 y);
void FixLongGrassMetatilesWindowBottom(s16 x, s16 y); void FixLongGrassMetatilesWindowBottom(s16 x, s16 y);
extern const struct SpritePalette gFieldEffectObjectPaletteInfo6; extern const struct SpritePalette gFieldEffectObjectPaletteInfo6;
extern struct MapPosition gPlayerFacingPosition;
// groundshake // groundshake
bool8 sub_81BE66C(void); bool8 sub_81BE66C(void);

2
src/fldeff_misc.c
View File

@ -23,7 +23,7 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/vars.h" #include "constants/vars.h"
extern struct MapPosition gPlayerFacingPosition; EWRAM_DATA struct MapPosition gPlayerFacingPosition = {0};
static void sub_80F9C90(u8); static void sub_80F9C90(u8);
static void sub_80F9DFC(u8); static void sub_80F9DFC(u8);

3
src/fldeff_rocksmash.c
View File

@ -27,9 +27,6 @@ static void sub_813561C(u8 taskId);
static void sub_81356C4(void); static void sub_81356C4(void);
static void sub_8135714(void); static void sub_8135714(void);
// extern RAM loc
extern struct MapPosition gPlayerFacingPosition;
// text // text
bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId) bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
{ {

6
sym_ewram.txt
View File

@ -135,11 +135,7 @@ gUnknown_02022D00: @ 2022D00
.include "src/decoration.o" .include "src/decoration.o"
.include "src/slot_machine.o" .include "src/slot_machine.o"
.include "src/battle_ai_script_commands.o" .include "src/battle_ai_script_commands.o"
.include "src/fldeff_misc.o"
.align 2
gPlayerFacingPosition: @ 203AB40
.space 0x8
.include "src/pokeblock.o" .include "src/pokeblock.o"
.include "src/field_specials.o" .include "src/field_specials.o"
.include "src/battle_records.o" .include "src/battle_records.o"