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

Review changes

Browse source
This commit is contained in:
tustin2121 2020-09-20 13:04:20 -04:00
parent 832be34898
commit be9100fe52
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/data/battle_frontier/trainer_hill.h
View file

@ -2723,7 +2723,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
.spAttackIV = 30, .spAttackIV = 30,
.spDefenseIV = 31, .spDefenseIV = 31,
.abilityNum = 0, .abilityNum = 0,
.personality = 0x0202, .personality = 0x202,
.nickname = _("UNOWN"), .nickname = _("UNOWN"),
.friendship = 255, .friendship = 255,
}, },
@ -2765,7 +2765,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
.spAttackIV = 30, .spAttackIV = 30,
.spDefenseIV = 30, .spDefenseIV = 30,
.abilityNum = 0, .abilityNum = 0,
.personality = 0x0102, .personality = 0x102,
.nickname = _("UNOWN"), .nickname = _("UNOWN"),
.friendship = 255, .friendship = 255,
}, },
@ -2927,7 +2927,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
.spAttackIV = 30, .spAttackIV = 30,
.spDefenseIV = 31, .spDefenseIV = 31,
.abilityNum = 0, .abilityNum = 0,
.personality = 0x0302, .personality = 0x302,
.nickname = _("UNOWN"), .nickname = _("UNOWN"),
.friendship = 255, .friendship = 255,
}, },
@ -2948,7 +2948,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
.spAttackIV = 30, .spAttackIV = 30,
.spDefenseIV = 30, .spDefenseIV = 30,
.abilityNum = 0, .abilityNum = 0,
.personality = 0x0203, .personality = 0x203,
.nickname = _("UNOWN"), .nickname = _("UNOWN"),
.friendship = 255, .friendship = 255,
}, },
@ -2969,7 +2969,7 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
.spAttackIV = 31, .spAttackIV = 31,
.spDefenseIV = 31, .spDefenseIV = 31,
.abilityNum = 0, .abilityNum = 0,
.personality = 0x0301, .personality = 0x301,
.nickname = _("UNOWN"), .nickname = _("UNOWN"),
.friendship = 255, .friendship = 255,
}, },
@ -5575,4 +5575,4 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
#undef COORDS_XY #undef COORDS_XY
#undef TRAINER_DIRS #undef TRAINER_DIRS
#undef TRAINER_RANGE #undef TRAINER_RANGE

6
src/trainer_hill.c
View file

@ -672,7 +672,7 @@ bool32 LoadTrainerHillFloorObjectEventScripts(void)
return TRUE; return TRUE;
} }
static u16 getMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride is always 16 static u16 GetMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride is always 16
{ {
bool8 impassable; bool8 impassable;
u16 metatile; u16 metatile;
@ -682,7 +682,7 @@ static u16 getMetatileForFloor(u8 floorId, u32 x, u32 y, u32 stride) // stride i
metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + 0x200; metatile = sHillData->floors[floorId].display.metatileData[stride * y + x] + 0x200;
elevation = 0x3000; elevation = 0x3000;
return (((impassable << 10) & 0xc00) | elevation) | (metatile & 0x3ff); return (((impassable << 10) & METATILE_COLLISION_MASK) | elevation) | (metatile & METATILE_ID_MASK);
} }
void GenerateTrainerHillFloorLayout(u16 *mapArg) void GenerateTrainerHillFloorLayout(u16 *mapArg)
@ -722,7 +722,7 @@ void GenerateTrainerHillFloorLayout(u16 *mapArg)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
{ {
for (j = 0; j < 16; j++) for (j = 0; j < 16; j++)
dst[j] = getMetatileForFloor(mapId, j, i, 0x10); dst[j] = GetMetatileForFloor(mapId, j, i, 0x10);
dst += 31; dst += 31;
} }