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_pyramid.c | |
| parent | 5c1667b41a7d31df6d405d272833895bf8472cf6 (diff) | |
Convert map data to JSON
Diffstat (limited to 'src/battle_pyramid.c')
| -rw-r--r-- | src/battle_pyramid.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index c0ff1ecf5..ed911d8d9 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -30,6 +30,7 @@ #include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" +#include "constants/layouts.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/species.h" @@ -1380,9 +1381,9 @@ u8 GetPyramidRunMultiplier(void) u8 InBattlePyramid(void) { - if (gMapHeader.mapLayoutId == 361) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) return 1; - else if (gMapHeader.mapLayoutId == 378) + else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP) return 2; else return FALSE; @@ -1390,7 +1391,8 @@ u8 InBattlePyramid(void) bool8 InBattlePyramid_(void) { - return (gMapHeader.mapLayoutId == 361 || gMapHeader.mapLayoutId == 378); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP; } void sub_81A9E90(void) |