diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-04 21:36:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 21:36:18 -0600 |
| commit | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (patch) | |
| tree | ceee3e124b987b8dd24cb3a7bba85d4effe1ef5d /src/battle_factory.c | |
| parent | 646533cfa3c8c42aee3efedaadfe49e495b64892 (diff) | |
| parent | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (diff) | |
Merge pull request #543 from pret/mapdata
Convert map data to JSON
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 5793c78e9..c025dc139 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -11,6 +11,7 @@ #include "constants/species.h" #include "constants/battle_ai.h" #include "constants/battle_frontier.h" +#include "constants/layouts.h" #include "constants/trainers.h" #include "constants/moves.h" @@ -662,7 +663,8 @@ static u8 GetStyleForMove(u16 move) bool8 sub_81A6BF4(void) { - return (gMapHeader.mapLayoutId == 347 || gMapHeader.mapLayoutId == 348); + return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM + || gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM; } static void sub_81A6C1C(void) |