diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2022-01-26 17:51:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-26 17:51:56 -0500 |
| commit | 2efbd5f549bd03cfdaea2c84d48d5fb706034464 (patch) | |
| tree | 2454365b3478382c4246dc850f700f661377ed46 /src/battle_pyramid.c | |
| parent | 4188dd405c07943da9fb6d5c048d5845a94e0669 (diff) | |
| parent | 3d0326106ed683911da66eee1bf94becadc7a2db (diff) | |
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
Diffstat (limited to 'src/battle_pyramid.c')
| -rw-r--r-- | src/battle_pyramid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index b10690ce4..154760396 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -1239,7 +1239,7 @@ static u8 GetPostBattleDirectionHintTextIndex(int *hintType, u8 minDistanceForEx { for (x = 0; x < 32; x++) { - if ((map[x] & METATILE_ID_MASK) == METATILE_BattlePyramid_Exit) + if ((map[x] & MAPGRID_METATILE_ID_MASK) == METATILE_BattlePyramid_Exit) { x += MAP_OFFSET - gObjectEvents[gSelectedObjectEvent].initialCoords.x; y += MAP_OFFSET - gObjectEvents[gSelectedObjectEvent].initialCoords.y; @@ -1545,7 +1545,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio { for (x = 0; x < mapLayout->width; x++) { - if ((layoutMap[x] & METATILE_ID_MASK) != METATILE_BattlePyramid_Exit) + if ((layoutMap[x] & MAPGRID_METATILE_ID_MASK) != METATILE_BattlePyramid_Exit) { map[x] = layoutMap[x]; } @@ -1556,7 +1556,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio gSaveBlock1Ptr->pos.x = (mapLayout->width * (i % 4)) + x; gSaveBlock1Ptr->pos.y = (mapLayout->height * (i / 4)) + y; } - map[x] = (layoutMap[x] & (METATILE_ELEVATION_MASK | METATILE_COLLISION_MASK)) | METATILE_BattlePyramid_Floor; + map[x] = (layoutMap[x] & (MAPGRID_ELEVATION_MASK | MAPGRID_COLLISION_MASK)) | METATILE_BattlePyramid_Floor; } else { |