summaryrefslogtreecommitdiff
path: root/src/field/rotating_gate.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-11-26 17:06:07 -0600
committercamthesaxman <cameronghall@cox.net>2017-11-26 17:06:07 -0600
commit6f0feb7ca09511df0a1d13c99a1ec5c9a46ed06b (patch)
treef2d0d052e517765fa3002da50d187b1fd48278c1 /src/field/rotating_gate.c
parent611984671904aa19cf678c59ff2a8682cba09224 (diff)
don't require MAP_ prefix on MAP_GROUP and MAP_NUM macros
Diffstat (limited to 'src/field/rotating_gate.c')
-rw-r--r--src/field/rotating_gate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index c17b604c2..00008c69c 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -622,14 +622,14 @@ static EWRAM_DATA u8 gRotatingGate_PuzzleCount = 0;
static int GetCurrentMapRotatingGatePuzzleType(void)
{
- if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_FORTREE_CITY_GYM) &&
- gSaveBlock1.location.mapNum == MAP_NUM(MAP_FORTREE_CITY_GYM))
+ if (gSaveBlock1.location.mapGroup == MAP_GROUP(FORTREE_CITY_GYM) &&
+ gSaveBlock1.location.mapNum == MAP_NUM(FORTREE_CITY_GYM))
{
return PUZZLE_FORTREE_CITY_GYM;
}
- if (gSaveBlock1.location.mapGroup == MAP_GROUP(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6) &&
- gSaveBlock1.location.mapNum == MAP_NUM(MAP_ROUTE110_TRICK_HOUSE_PUZZLE6))
+ if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE110_TRICK_HOUSE_PUZZLE6) &&
+ gSaveBlock1.location.mapNum == MAP_NUM(ROUTE110_TRICK_HOUSE_PUZZLE6))
{
return PUZZLE_ROUTE110_TRICK_HOUSE_PUZZLE6;
}