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

Merge branch 'master' into reverts

Browse Source
This commit is contained in:
aaaaaa123456789
2020-10-26 12:16:36 -03:00
parent fe40c0c466 585f313c64
commit 1c3d75f673
382 changed files with 22866 additions and 22447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trainer_hill.c
+9 -10
View File
@@ -29,7 +29,6 @@
#include "constants/layouts.h"
#include "constants/moves.h"
#include "constants/maps.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/easy_chat.h"
#include "constants/trainer_hill.h"
@@ -672,17 +671,17 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void)
return TRUE;
}
static u32 sub_81D5F58(u8 floorId, u32 bit, u32 arg2, u32 arg3)
static u32 GetMetatileForFloor(u8 floorId, u32 bit, u32 arg2, u32 arg3)
{
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[arg2 * arg3 + bit] + 0x200;
var2 = 0x3000;
impassable = (sHillData->floors[floorId].display.collisionData[arg2] >> (15 - bit)) & 1;
metatile = sHillData->floors[floorId].display.metatileData[arg2 * arg3 + bit] + 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 +721,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;
}