diff options
| author | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:31:07 -0300 |
|---|---|---|
| committer | aaaaaa123456789 <aaaaaa123456789@acidch.at> | 2020-10-26 12:31:07 -0300 |
| commit | 00db69a302355626ffd0d3379e7ea0743a010e15 (patch) | |
| tree | a666c5450db00627915ee2e1e7665a742380e375 /src/trainer_hill.c | |
| parent | 1c3d75f6736445324fdcba31d5dbd858997e22c4 (diff) | |
Port back improvements from later commits
Diffstat (limited to 'src/trainer_hill.c')
| -rw-r--r-- | src/trainer_hill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c index 75271cab0..18d56723c 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -671,14 +671,14 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void) return TRUE; } -static u32 GetMetatileForFloor(u8 floorId, u32 bit, u32 arg2, u32 arg3) +static u16 GetMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride is always 16 { bool8 impassable; u16 metatile; u16 elevation; - impassable = (sHillData->floors[floorId].display.collisionData[arg2] >> (15 - bit)) & 1; - metatile = sHillData->floors[floorId].display.metatileData[arg2 * arg3 + bit] + 0x200; + impassable = (sHillData->floors[floorId].display.collisionData[y] >> (15 - x) & 1); + metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + 0x200; elevation = 0x3000; return (((impassable << 10) & METATILE_COLLISION_MASK) | elevation) | (metatile & METATILE_ID_MASK); |