From 2aae7e99d52fc488e75309909d279b459f5e1d80 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 15:35:40 +0200 Subject: Make rom build again --- include/battle_party_menu.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'include/battle_party_menu.h') diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h index b9c3ad707..afd616331 100644 --- a/include/battle_party_menu.h +++ b/include/battle_party_menu.h @@ -15,19 +15,6 @@ struct UnknownStruct1 s16 unk266; }; -struct PartyMenuItem -{ - const u8 *text; - TaskFunc func; -}; - -struct PartyPopupMenu -{ - u8 unk0; - u8 unk1; - const u8 *unk4; -}; - extern u8 unk_2000000[]; void SetUpBattlePokemonMenu(u8); -- cgit v1.2.3 From 4c91ef5f49f5f8fb5aff42257807e5480e64dd65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 10 Jun 2017 23:37:25 -0500 Subject: move rom_8094928.c into battle_party_menu.c --- include/battle_party_menu.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/battle_party_menu.h') 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 -- cgit v1.2.3