diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-25 00:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-06-25 00:26:50 -0400 |
| commit | 2cae14cf5ae83831d5c387b3823de34d8d476908 (patch) | |
| tree | b776589bf88596d7280011c3ea1d9befd32b287f /include/battle_party_menu.h | |
| parent | 3300def3b39752f9f290f10dbf0cf7748f0dec5b (diff) | |
| parent | e72babd734ab7fd4e5c6d29f456b82d5e76e1bde (diff) | |
Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
asm/battle_anim_8137220.s
asm-de/battle_message.s
Diffstat (limited to 'include/battle_party_menu.h')
| -rw-r--r-- | include/battle_party_menu.h | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index 5112c7b3c..71bd2cf51 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -1,26 +1,9 @@ #ifndef GUARD_BATTLE_PARTY_MENU_H #define GUARD_BATTLE_PARTY_MENU_H -#include "task.h" - -// TODO: Unify all of the 0x0201B000 structs -struct Struct201B000 -{ - u8 filler0[0x259]; - u8 unk259; - u8 filler25A[6]; - u8 unk260; - u8 filler261[1]; - u8 unk262; - s16 unk264; - s16 unk266; -}; - extern u8 unk_2000000[]; +#define EWRAM_1609D unk_2000000[0x1609D] void SetUpBattlePokemonMenu(u8); -#define EWRAM_1609D unk_2000000[0x1609D] -#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000)) - #endif |