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/item_menu.c | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
| parent | 0343a1bcd728d813a38fc3486535e962e681c094 (diff) | |
Merge pull request #454 from ProjectRevoTPP/ewram
ewram refactor
Diffstat (limited to 'src/field/item_menu.c')
| -rw-r--r-- | src/field/item_menu.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/field/item_menu.c b/src/field/item_menu.c index c508bcacf..09542cc6d 100644 --- a/src/field/item_menu.c +++ b/src/field/item_menu.c @@ -34,9 +34,9 @@ #include "task.h" #include "text.h" #include "unknown_task.h" +#include "ewram.h" // External stuff -extern u8 ewram[]; extern void gpu_pal_allocator_reset__manage_upper_four(void); extern void sub_80F9020(void); extern void sub_80F9988(); @@ -158,12 +158,6 @@ extern struct PocketScrollState gBagPocketScrollStates[]; extern struct ItemSlot *gCurrentBagPocketItemSlots; // selected pocket item slots extern const u8 Event_NoRegisteredItem[]; -#define ewramBerryPic (ewram + 0) -#define ewramBerryPicTemp (ewram + 0x1000) -#define ewramSavedItemsPocket ((struct ItemSlot *)(ewram + 0x1E000)) // saved items pocket (for Wally battle) -#define ewramSavedPokeballsPocket ((struct ItemSlot *)(ewram + 0x1F000)) // saved Pokeballs pocket (for Wally battle) -#define ewramBagSetupStep (ewram[0x1FFFF]) - extern const struct CompressedSpriteSheet sMaleBagSpriteSheet; extern const struct CompressedSpriteSheet sFemaleBagSpriteSheet; extern const struct CompressedSpritePalette sBagSpritePalette; |