diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-09 08:51:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-09 08:51:16 -0400 |
| commit | e011ca7ac919efe05d5c965c84e14abd19dfaacd (patch) | |
| tree | 9c9f3920cf3070d9d16d4c9b9374c2e8ffa56c9f /src/party_menu.c | |
| parent | 113659ca87d944f2949d0cdb9e863101d040edc1 (diff) | |
| parent | 99dc97f6aa48646c90def102ce2632be8c45eab9 (diff) | |
Merge branch 'master' into trade
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)) |