diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-08 21:55:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 21:55:29 -0400 |
| commit | 8f6d6b933e081d6e7a35b52bd36da9d11952145b (patch) | |
| tree | 591ae4ff89812fbd41576c3bcfdba322c032e0d6 /src/trainer_hill.c | |
| parent | fb29a464e63d544f63b8981fdac44981a79eb4a9 (diff) | |
| parent | f980188b82f3a00348a5a78caf33cc0eb8812aa2 (diff) | |
Merge pull request #1181 from PokeCodec/trainer-hill
Remove fakematch in trainer_hill.c
Diffstat (limited to 'src/trainer_hill.c')
| -rw-r--r-- | src/trainer_hill.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c index bed8df2e0..14af7372f 100644 --- a/src/trainer_hill.c +++ b/src/trainer_hill.c @@ -672,22 +672,17 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void) return TRUE; } -static u32 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3) +static u16 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3) { - u16 var0, var1; - #ifndef NONMATCHING - register u16 var2 asm("r3"); //compiler keeps wanting to "mov r3, 0x80" instead of "mov r2 0x80" and then later "add r3, r2, 0" - #else + u8 var0; + u16 var1; u16 var2; - #endif - u16 var3; var0 = (sHillData->floors[floorId].display.unk3A0[arg2] >> (15 - bit) & 1); - var1 = sHillData->floors[floorId].display.data[arg3 * arg2 + bit]; - var2 = 0x200; - var3 = 0x3000; + var1 = sHillData->floors[floorId].display.data[arg3 * arg2 + bit] + 0x200; + var2 = 0x3000; - return ((var0 << 10) | var3) | (var1 | var2); + return (((var0 << 10) & 0xc00) | var2) | (var1 & 0x3ff); } void GenerateTrainerHillFloorLayout(u16 *mapArg) |