diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-09-30 16:41:16 -0700 |
| commit | 4c5bfdc153a8484c00aae30ed22badf006d7f8d9 (patch) | |
| tree | 47bfb4286c03f021d48ffadde5da675a9f903f61 /src/party_menu.c | |
| parent | aaa09d735451cced915bc6bacfce45ced8e33fa1 (diff) | |
| parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) | |
Merge remote-tracking branch 'upstream/master' into name_labels
Diffstat (limited to 'src/party_menu.c')
| -rw-r--r-- | src/party_menu.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index 1fcd2cdda..39477e293 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -33,15 +33,6 @@ #include "species.h" #include "party_menu.h" -#define DATA_COUNT (6) - -struct Unk2001000 -{ - u8 unk0; - u8 unk1; - u8 unk2; -}; - struct Unk201C000 { /*0x00*/ struct Pokemon *pokemon; @@ -68,8 +59,6 @@ struct UnknownStruct5 u16 *unk4; }; -extern u8 ewram[]; -#define ewram01000 (*(struct Unk2001000 *)(ewram + 0x01000)) #define ewram1C000 (*(struct Unk201C000 *)(ewram + 0x1C000)) #define ewram1F000 (*(struct Unk201F000 *)(ewram + 0x1F000)) |