summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-02-18 16:42:47 -0500
committerGitHub <noreply@github.com>2020-02-18 16:42:47 -0500
commitf9c1b6101495f09cf797cf0cb466ec4cc5838e72 (patch)
treea9928af64ee6a0ee6c9409ca40d43ddefe14c27d /src
parente4d15a2338500e91e1f2a9723c48ecf25ae8111e (diff)
parent753e894b6a9aa9f51789d4e1945d310749fd6c54 (diff)
Merge pull request #258 from GriffinRichards/doc-headers
Document some header properties
Diffstat (limited to 'src')
-rw-r--r--src/battle_script_commands.c2
-rw-r--r--src/battle_setup.c2
-rw-r--r--src/fldeff_rocksmash.c2
-rw-r--r--src/item_use.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 527e32bcc..4875a63f2 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -48,7 +48,7 @@
#include "constants/abilities.h"
#include "constants/pokemon.h"
#include "constants/trainers.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
diff --git a/src/battle_setup.c b/src/battle_setup.c
index ae6aaf8be..73e7acc1a 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -37,7 +37,7 @@
#include "constants/pokemon.h"
#include "constants/trainers.h"
#include "constants/trainer_classes.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
enum
{
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 2cca37f7a..00f17a16d 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -16,7 +16,7 @@
#include "event_object_movement.h"
#include "constants/songs.h"
#include "constants/object_events.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
static void task08_080C9820(u8 taskId);
static void sub_80C98FC(u8 taskId);
diff --git a/src/item_use.c b/src/item_use.c
index 57771754a..022be5b2b 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -42,7 +42,7 @@
#include "constants/maps.h"
#include "constants/moves.h"
#include "constants/songs.h"
-#include "constants/map_types.h"
+#include "constants/maps.h"
static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL;