diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-11-26 16:00:01 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-11-26 16:00:01 -0600 |
| commit | b80d40fb6977e58d5b001e063314c4e4faac5a02 (patch) | |
| tree | 3223d59e2d01822d6c966d6964476c053f143af5 /src/field/rotating_gate.c | |
| parent | 026e017a16df44806b95435403a8e3b8dbe78084 (diff) | |
map constants
Diffstat (limited to 'src/field/rotating_gate.c')
| -rw-r--r-- | src/field/rotating_gate.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c index c3b6a8a71..c17b604c2 100644 --- a/src/field/rotating_gate.c +++ b/src/field/rotating_gate.c @@ -3,7 +3,7 @@ #include "event_data.h" #include "field_map_obj.h" #include "fieldmap.h" -#include "map_constants.h" +#include "constants/maps.h" #include "constants/songs.h" #include "sound.h" #include "sprite.h" @@ -622,14 +622,14 @@ static EWRAM_DATA u8 gRotatingGate_PuzzleCount = 0; static int GetCurrentMapRotatingGatePuzzleType(void) { - if (gSaveBlock1.location.mapGroup == MAP_GROUP_FORTREE_CITY_GYM && - gSaveBlock1.location.mapNum == MAP_ID_FORTREE_CITY_GYM) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_FORTREE_CITY_GYM) && + gSaveBlock1.location.mapNum == MAP_NUM(MAP_FORTREE_CITY_GYM)) { return PUZZLE_FORTREE_CITY_GYM; } - if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE110_TRICK_HOUSE_PUZZLE6 && - gSaveBlock1.location.mapNum == MAP_ID_ROUTE110_TRICK_HOUSE_PUZZLE6) + if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6) && + gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6)) { return PUZZLE_ROUTE110_TRICK_HOUSE_PUZZLE6; } |