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 /include/constants/map_groups.h | |
parent | 6556b556dd624964f53d76ff546589e6688412eb (diff) | |
parent | 6967caefb246f9709032049b0ae2baee71f71eb6 (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'include/constants/map_groups.h')
-rwxr-xr-x | include/constants/map_groups.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index 14b3f1d56..75cb71da0 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -487,7 +487,7 @@ #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR (23 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM (24 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY (25 | (26 << 8)) -#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE (26 | (26 << 8)) +#define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR (26 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP (27 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY (28 | (26 << 8)) #define MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR (29 | (26 << 8)) |