From dded980cde81b1b71a636d8c2b7c15668e0a7b35 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Wed, 17 Oct 2018 23:36:18 -0400 Subject: [PATCH] fix building --- include/party_menu.h | 1 + src/battle_main.c | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/party_menu.h b/include/party_menu.h index 0103099e4..bf0db514b 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,6 +1,7 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H +#include "main.h" #include "task.h" enum diff --git a/src/battle_main.c b/src/battle_main.c index 80ee5c425..44cd65976 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -52,20 +52,7 @@ #include "international_string_util.h" #include "pokeball.h" #include "party_menu.h" - -struct UnknownPokemonStruct4 -{ - /*0x00*/ u16 species; - /*0x02*/ u16 heldItem; - /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1]; - /*0x0F*/ u8 level; - /*0x10*/ u16 hp; - /*0x12*/ u16 maxhp; - /*0x14*/ u32 status; - /*0x18*/ u32 personality; - /*0x1C*/ u8 gender; - /*0x1D*/ u8 language; -}; +#include "battle_main.h" extern u16 gBattle_BG0_X; extern u16 gBattle_BG0_Y;