atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove fakematch in trainer hell

Browse source
This commit is contained in:
PokeCodec 2020-09-08 20:25:07 -04:00
parent 6fb1d55c33
commit 6e3f5a462a
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/trainer_hill.c
View file

@ -672,22 +672,17 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void)
return TRUE; 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; u8 var0;
#ifndef NONMATCHING u16 var1;
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
u16 var2; u16 var2;
#endif
u16 var3;
var0 = (sHillData->floors[floorId].display.unk3A0[arg2] >> (15 - bit) & 1); var0 = (sHillData->floors[floorId].display.unk3A0[arg2] >> (15 - bit) & 1);
var1 = sHillData->floors[floorId].display.data[arg3 * arg2 + bit]; var1 = sHillData->floors[floorId].display.data[arg3 * arg2 + bit] + 0x200;
var2 = 0x200; var2 = 0x3000;
var3 = 0x3000;
return ((var0 << 10) | var3) | (var1 | var2); return (((var0 << 10) & 0xc00) | var2) | (var1 & 0x3ff);
} }
void GenerateTrainerHillFloorLayout(u16 *mapArg) void GenerateTrainerHillFloorLayout(u16 *mapArg)