diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-01-31 15:51:20 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-01-31 15:51:20 -0600 |
| commit | 29d6221935d3e8e01dc11b4023ba977ff433f3c9 (patch) | |
| tree | 0b7af297b60ce14bf03d6613952269ef0fa66676 /src/battle_pike.c | |
| parent | 5c1667b41a7d31df6d405d272833895bf8472cf6 (diff) | |
Convert map data to JSON
Diffstat (limited to 'src/battle_pike.c')
| -rw-r--r-- | src/battle_pike.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/battle_pike.c b/src/battle_pike.c index c12038efb..bdf6e8027 100644 --- a/src/battle_pike.c +++ b/src/battle_pike.c @@ -16,6 +16,7 @@ #include "constants/event_objects.h" #include "constants/battle_frontier.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/rgb.h" #include "constants/trainers.h" #include "constants/species.h" @@ -1314,8 +1315,10 @@ static void sub_81A8090(void) bool8 InBattlePike(void) { - return (gMapHeader.mapLayoutId == 351 || gMapHeader.mapLayoutId == 352 - || gMapHeader.mapLayoutId == 358 || gMapHeader.mapLayoutId == 359); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 + || gMapHeader.mapLayoutId == LAYOUT_UNKNOWN_MAP_084693AC; } static void sub_81A80DC(void) |