diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-10 12:21:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 12:21:05 -0800 |
| commit | 9ed1584bab5d2c0676261d6419834cd9d4f7dc3c (patch) | |
| tree | b451de240205ca20b9ce52bccb33d0d67adef3d8 /src/field/party_menu.c | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
| parent | 0343a1bcd728d813a38fc3486535e962e681c094 (diff) | |
Merge pull request #454 from ProjectRevoTPP/ewram
ewram refactor
Diffstat (limited to 'src/field/party_menu.c')
| -rw-r--r-- | src/field/party_menu.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7a519d737..25fd63463 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -25,7 +25,6 @@ #include "pokemon_summary_screen.h" #include "rom_8077ABC.h" #include "rom_8094928.h" -#include "script_pokemon_80F9.h" #include "songs.h" #include "sound.h" #include "species.h" @@ -35,6 +34,8 @@ #include "task.h" #include "unknown_task.h" #include "util.h" +#include "script_pokemon_80F9.h" +#include "ewram.h" struct Coords8 { @@ -483,9 +484,6 @@ struct Unk201FE00 u8 unkE02; }; -#define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) -#define ewram1FE00 (*(struct Unk201FE00 *)(ewram + 0x1FE00)) - extern u16 gBattleTypeFlags; extern u8 gTileBuffer[]; extern u8 gUnknown_0202E8F4; |