summaryrefslogtreecommitdiff
path: root/src/field/wild_encounter.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-11-26 16:00:01 -0600
committercamthesaxman <cameronghall@cox.net>2017-11-26 16:00:01 -0600
commitb80d40fb6977e58d5b001e063314c4e4faac5a02 (patch)
tree3223d59e2d01822d6c966d6964476c053f143af5 /src/field/wild_encounter.c
parent026e017a16df44806b95435403a8e3b8dbe78084 (diff)
map constants
Diffstat (limited to 'src/field/wild_encounter.c')
-rw-r--r--src/field/wild_encounter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index b19b1d4c2..2376f582c 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -5,7 +5,7 @@
#include "event_data.h"
#include "field_player_avatar.h"
#include "fieldmap.h"
-#include "map_constants.h"
+#include "constants/maps.h"
#include "metatile_behavior.h"
#include "pokeblock.h"
#include "random.h"
@@ -2953,8 +2953,8 @@ static bool8 CheckFeebas(void)
u8 route119section = 0;
u16 waterTileNum;
- if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119
- && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119)
+ if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE119)
+ && gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE119))
{
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
x -= 7;