diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-19 08:47:50 -0500 |
| commit | 9d44bc0bda9294c4d4cb3744efe9c2d96278c3bd (patch) | |
| tree | 6ac0ef8acbace05710da0052b4decaf4146d5d3f /src | |
| parent | 9397d6d23ad460f7019d4a12da035f53a450d237 (diff) | |
| parent | 71fec599bbe144af8d4a16e98ec32454fd10a4a8 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokemon_jump
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; |