summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2019-04-05 00:05:51 +0200
committerhuderlem <huderlem@gmail.com>2019-04-05 07:53:23 -0500
commit8751fafad148d1c2a6790b6b4fcba9be39f3c1e3 (patch)
treee33c5ee024f73372eb92d3036dfa18724bd5f8de /src
parentb0223f691fcc83c18b6ba8df5140d907939b04cf (diff)
Make it compile
Diffstat (limited to 'src')
-rw-r--r--src/battle_bg.c1
-rw-r--r--src/battle_script_commands.c1
-rw-r--r--src/battle_setup.c1
-rw-r--r--src/battle_util2.c4
4 files changed, 5 insertions, 2 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c
index 814e8dad9..81e8acdf9 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -5,6 +5,7 @@
#include "battle_message.h"
#include "battle_setup.h"
#include "bg.h"
+#include "data.h"
#include "decompress.h"
#include "gpu_regs.h"
#include "graphics.h"
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index fc396b5e3..c002eefbc 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -50,6 +50,7 @@
#include "pokemon_summary_screen.h"
#include "pokenav.h"
#include "menu_specialized.h"
+#include "data.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 7395c175b..712098773 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -45,6 +45,7 @@
#include "constants/map_types.h"
#include "constants/battle_frontier.h"
#include "field_screen_effect.h"
+#include "data.h"
enum
{
diff --git a/src/battle_util2.c b/src/battle_util2.c
index 5ef969fd5..f840cd58b 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -25,7 +25,7 @@ void AllocateBattleResources(void)
gBattleResources->flags = AllocZeroed(sizeof(*gBattleResources->flags));
gBattleResources->battleScriptsStack = AllocZeroed(sizeof(*gBattleResources->battleScriptsStack));
gBattleResources->battleCallbackStack = AllocZeroed(sizeof(*gBattleResources->battleCallbackStack));
- gBattleResources->statsBeforeLvlUp = AllocZeroed(sizeof(*gBattleResources->statsBeforeLvlUp));
+ gBattleResources->beforeLvlUp = AllocZeroed(sizeof(*gBattleResources->beforeLvlUp));
gBattleResources->ai = AllocZeroed(sizeof(*gBattleResources->ai));
gBattleResources->battleHistory = AllocZeroed(sizeof(*gBattleResources->battleHistory));
gBattleResources->AI_ScriptsStack = AllocZeroed(sizeof(*gBattleResources->AI_ScriptsStack));
@@ -56,7 +56,7 @@ void FreeBattleResources(void)
FREE_AND_SET_NULL(gBattleResources->flags);
FREE_AND_SET_NULL(gBattleResources->battleScriptsStack);
FREE_AND_SET_NULL(gBattleResources->battleCallbackStack);
- FREE_AND_SET_NULL(gBattleResources->statsBeforeLvlUp);
+ FREE_AND_SET_NULL(gBattleResources->beforeLvlUp);
FREE_AND_SET_NULL(gBattleResources->ai);
FREE_AND_SET_NULL(gBattleResources->battleHistory);
FREE_AND_SET_NULL(gBattleResources->AI_ScriptsStack);