diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-09-20 15:20:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-20 15:20:24 -0400 |
| commit | 47b5b75a1d940cc8aaf1f8f90457f5183624f1ad (patch) | |
| tree | 8089d1859ed97eb1d2839d0d464fd4a82685cb43 /src/trainer_hill.c | |
| parent | 1d1035a01f1c7ab0aaca6d69b4ee2caed6ccccad (diff) | |
| parent | be9100fe52875e15aa3424c3751148ddd9bf127b (diff) | |
Merge pull request #1201 from tustin2121/tustin2121-patch-8
Documenting the trainer hill floor data
Diffstat (limited to 'src/trainer_hill.c')
| -rw-r--r-- | src/trainer_hill.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 14af7372f..fcaeb060b 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -672,17 +672,17 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void) return TRUE; } -static u16 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3) +static u16 GetMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride is always 16 { - u8 var0; - u16 var1; - u16 var2; + bool8 impassable; + u16 metatile; + u16 elevation; - var0 = (sHillData->floors[floorId].display.unk3A0[arg2] >> (15 - bit) & 1); - var1 = sHillData->floors[floorId].display.data[arg3 * arg2 + bit] + 0x200; - var2 = 0x3000; + impassable = (sHillData->floors[floorId].display.collisionData[y] >> (15 - x) & 1); + metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + 0x200; + elevation = 0x3000; - return (((var0 << 10) & 0xc00) | var2) | (var1 & 0x3ff); + return (((impassable << 10) & METATILE_COLLISION_MASK) | elevation) | (metatile & METATILE_ID_MASK); } void GenerateTrainerHillFloorLayout(u16 *mapArg) @@ -722,7 +722,7 @@ void GenerateTrainerHillFloorLayout(u16 *mapArg) for (i = 0; i < 16; i++) { for (j = 0; j < 16; j++) - dst[j] = sub_81D5F58(mapId, j, i, 0x10); + dst[j] = GetMetatileForFloor(mapId, j, i, 0x10); dst += 31; } |