dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1424 from GriffinRichards/constants-trhill

Browse Source 
Use some missing fieldmap constants in trainer hill
This commit is contained in:
GriffinR
2021-04-30 15:50:26 -04:00
committed by GitHub
parent f7a699c686 2608018862
commit 24e02085d7
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_hill.c
+7 -4
View File
@@ -678,10 +678,10 @@ static u16 GetMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride i
u16 elevation; u16 elevation;
impassable = (sHillData->floors[floorId].display.collisionData[y] >> (15 - x) & 1); impassable = (sHillData->floors[floorId].display.collisionData[y] >> (15 - x) & 1);
metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + 0x200; metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + NUM_METATILES_IN_PRIMARY;
elevation = 0x3000; elevation = 3 << METATILE_ELEVATION_SHIFT;
return (((impassable << 10) & METATILE_COLLISION_MASK) | elevation) | (metatile & METATILE_ID_MASK); return ((impassable << METATILE_COLLISION_SHIFT) & METATILE_COLLISION_MASK) | elevation | (metatile & METATILE_ID_MASK);
} }
void GenerateTrainerHillFloorLayout(u16 *mapArg) void GenerateTrainerHillFloorLayout(u16 *mapArg)
@@ -710,6 +710,8 @@ void GenerateTrainerHillFloorLayout(u16 *mapArg)
gBackupMapLayout.width = 31; gBackupMapLayout.width = 31;
gBackupMapLayout.height = 35; gBackupMapLayout.height = 35;
dst = mapArg + 224; dst = mapArg + 224;
// First 5 rows of the map (Entrance / Exit) are always the same
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
{ {
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
@@ -718,10 +720,11 @@ void GenerateTrainerHillFloorLayout(u16 *mapArg)
src += 16; src += 16;
} }
// Load the 16x16 floor-specific layout
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
dst[j] = GetMetatileForFloor(mapId, j, i, 0x10); dst[j] = GetMetatileForFloor(mapId, j, i, 16);
dst += 31; dst += 31;
} }