From 29d6221935d3e8e01dc11b4023ba977ff433f3c9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 31 Jan 2019 15:51:20 -0600 Subject: Convert map data to JSON --- src/battle_pike.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/battle_pike.c') 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) -- cgit v1.2.3