diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
| commit | 82f55f238125ff42845881189eb9237692c48ba4 (patch) | |
| tree | 7b496125c6e0b644ce535548ec09755fd4f489bb /src/frontier_pass.c | |
| parent | 6556b556dd624964f53d76ff546589e6688412eb (diff) | |
| parent | 6967caefb246f9709032049b0ae2baee71f71eb6 (diff) | |
Merge master into ObjEvent rename
Diffstat (limited to 'src/frontier_pass.c')
| -rw-r--r-- | src/frontier_pass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/frontier_pass.c b/src/frontier_pass.c index 6832c4f66..79c1ce6f4 100644 --- a/src/frontier_pass.c +++ b/src/frontier_pass.c @@ -1558,7 +1558,7 @@ static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a fro || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS)) return FRONTIER_FACILITY_PIKE + 1; else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY) - || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) + || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR) || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)) return FRONTIER_FACILITY_PYRAMID + 1; else |