diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-02-14 21:17:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-14 21:17:44 -0500 |
| commit | 759f373d3153afb0e9dcf5050a700aeca036a919 (patch) | |
| tree | b43e8d72d1886eb1c38dadd67113bec77ef41a26 /src/overworld.c | |
| parent | 8d85ff1683437897cb0c06dd84fa2d927f560090 (diff) | |
| parent | 59695b82210cb2c95c10b52efc1a88e18c67dea9 (diff) | |
Merge pull request #488 from GriffinRichards/map-constants
Sync roamer.c, add missing map constant usage
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index cb5507b4c..fc54745a9 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -520,9 +520,9 @@ static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId static bool32 IsDummyWarp(struct WarpData *warp) { - if (warp->mapGroup != -1) + if (warp->mapGroup != (s8)MAP_GROUP(UNDEFINED)) return FALSE; - else if (warp->mapNum != -1) + else if (warp->mapNum != (s8)MAP_NUM(UNDEFINED)) return FALSE; else if (warp->warpId != -1) return FALSE; @@ -895,7 +895,10 @@ bool8 sub_8055B38(u16 metatileBehavior) { if (MetatileBehavior_IsSurfable(metatileBehavior) != TRUE) return FALSE; - if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B3F) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B3F)) || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B4F) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B4F))) + if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B3F) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B3F)) + || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(SEAFOAM_ISLANDS_B4F) + && gSaveBlock1Ptr->location.mapNum == MAP_NUM(SEAFOAM_ISLANDS_B4F))) return TRUE; return FALSE; } |