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_factory.c | |
| parent | 37e86d75788f4ed364db19aabce11e6e054a1084 (diff) | |
| parent | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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) |