diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-15 01:31:19 -0500 |
| commit | 8c5d8a550780ec370f340ad2537c5ec418740839 (patch) | |
| tree | b2763c4d325426183f9f7d9aefc27d0e2d9c9d9a /include/battle_party_menu.h | |
| parent | 86a26c9282f03c751fc67e7da6e0d4014f69a688 (diff) | |
| parent | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (diff) | |
fix merge conflicts
Diffstat (limited to 'include/battle_party_menu.h')
| -rw-r--r-- | include/battle_party_menu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index b9c3ad707..11752296b 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -3,7 +3,8 @@ #include "task.h" -struct UnknownStruct1 +// TODO: Unify all of the 0x0201B000 structs +struct Struct201B000 { u8 filler0[0x259]; u8 unk259; @@ -33,6 +34,6 @@ extern u8 unk_2000000[]; void SetUpBattlePokemonMenu(u8); #define EWRAM_1609D unk_2000000[0x1609D] -#define EWRAM_1B000 (*(struct UnknownStruct1 *)(unk_2000000 + 0x1B000)) +#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000)) #endif |