diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-09-12 16:53:04 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-09-12 16:53:04 -0500 |
| commit | a185f8a26dc5e5a04908c272ab54bede7af8a10c (patch) | |
| tree | 9e427bbb6c06e6e6693bd5dfeed04140acb5554e /src/wild_encounter.c | |
| parent | 3b3d1596526ad0b19f7042d5176d92eac4738451 (diff) | |
lots more relabeling
Diffstat (limited to 'src/wild_encounter.c')
| -rw-r--r-- | src/wild_encounter.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 23e74561c..f7f005737 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -5,6 +5,7 @@ #include "event_data.h" #include "field_player_avatar.h" #include "fieldmap.h" +#include "map_constants.h" #include "metatile_behavior.h" #include "pokeblock.h" #include "rng.h" @@ -2952,7 +2953,8 @@ static bool8 CheckFeebas(void) u8 route119section = 0; u16 waterTileNum; - if (gSaveBlock1.location.mapGroup == 0 && gSaveBlock1.location.mapNum == 0x22) + if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE119 + && gSaveBlock1.location.mapNum == MAP_ID_ROUTE119) { GetXYCoordsOneStepInFrontOfPlayer(&x, &y); x -= 7; @@ -3497,7 +3499,7 @@ u16 GetLocalWildMon(bool8 *isWaterMon) } } -u16 GetMirageIslandMon(void) +u16 GetLocalWaterMon(void) { u16 headerNum = GetCurrentMapWildMonHeader(); |