This commit is contained in:
Marcus Huderle 2019-02-07 11:54:51 -06:00
parent 3a88ab831d
commit b52871433a

View File

@ -68,8 +68,8 @@ enum
OBJ_POSITIONS_UNIFORM, OBJ_POSITIONS_UNIFORM,
OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE, OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE,
OBJ_POSITIONS_IN_AND_NEAR_EXIT, OBJ_POSITIONS_IN_AND_NEAR_EXIT,
OBJ_POSITIONS_NEAR_NEAR_ENTRANCE, OBJ_POSITIONS_NEAR_ENTRANCE,
OBJ_POSITIONS_NEAR_NEAR_EXIT, OBJ_POSITIONS_NEAR_EXIT,
}; };
struct PyramidWildMon struct PyramidWildMon
@ -210,7 +210,7 @@ static const struct PyramidFloorTemplate sPyramidFloorTemplates[] =
.numItems = 3, .numItems = 3,
.numTrainers = 6, .numTrainers = 6,
.itemPositions = OBJ_POSITIONS_UNIFORM, .itemPositions = OBJ_POSITIONS_UNIFORM,
.trainerPositions = OBJ_POSITIONS_NEAR_NEAR_EXIT, .trainerPositions = OBJ_POSITIONS_NEAR_EXIT,
.runMultiplier = 96, .runMultiplier = 96,
.layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15}, .layoutOffsets = {8, 9, 10, 11, 12, 13, 14, 15},
}, },
@ -1628,11 +1628,11 @@ void LoadBattlePyramidEventObjectTemplates(void)
if (SetPyramidObjectPositionsInAndNearSquare(i, exitSquareId)) if (SetPyramidObjectPositionsInAndNearSquare(i, exitSquareId))
SetPyramidObjectPositionsUniformly(i); SetPyramidObjectPositionsUniformly(i);
break; break;
case OBJ_POSITIONS_NEAR_NEAR_ENTRANCE: case OBJ_POSITIONS_NEAR_ENTRANCE:
if (SetPyramidObjectPositionsNearSquare(i, entranceSquareId)) if (SetPyramidObjectPositionsNearSquare(i, entranceSquareId))
SetPyramidObjectPositionsUniformly(i); SetPyramidObjectPositionsUniformly(i);
break; break;
case OBJ_POSITIONS_NEAR_NEAR_EXIT: case OBJ_POSITIONS_NEAR_EXIT:
if (SetPyramidObjectPositionsNearSquare(i, exitSquareId)) if (SetPyramidObjectPositionsNearSquare(i, exitSquareId))
SetPyramidObjectPositionsUniformly(i); SetPyramidObjectPositionsUniformly(i);
break; break;