diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 16:16:03 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-18 16:16:03 -0500 |
commit | 729c224bf2421c30e64f2082f19907b5e66b8138 (patch) | |
tree | 79b85113649e7ba33f37962ecbcaae4a6d85956a /src | |
parent | e94f9c148358f2e25e6ebbd58d39eb9ddd27f7c3 (diff) |
Name battle scene and map type constants
Diffstat (limited to 'src')
-rw-r--r-- | src/battle_script_commands.c | 2 | ||||
-rw-r--r-- | src/battle_setup.c | 2 | ||||
-rw-r--r-- | src/fldeff_rocksmash.c | 2 | ||||
-rw-r--r-- | src/item_use.c | 2 |
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; |