diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2019-02-05 14:35:42 -0600 |
| commit | bc4cc9f78a705636228c39311bb6e3c393f090d3 (patch) | |
| tree | d2b59408df53676ffb65e217cc1a62cbcba05f97 /src/battle_pyramid.c | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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) |