diff options
| author | sphericalice <sphericalice@outlook.com> | 2021-10-25 18:07:46 +0100 |
|---|---|---|
| committer | sphericalice <sphericalice@outlook.com> | 2021-10-25 18:07:46 +0100 |
| commit | 0637910f5856ea0ee0e877f81c57150f7101d419 (patch) | |
| tree | fb2da27c40f3ff2db049899c96d0f9b5f1e40573 /src | |
| parent | 120e75d275988c5d723ac827e141d4ea5195e461 (diff) | |
Use the TILESET_WIDTH constant in rotating_tile_puzzle.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/rotating_tile_puzzle.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c index 56be9736f..b8dd03f9e 100644 --- a/src/rotating_tile_puzzle.c +++ b/src/rotating_tile_puzzle.c @@ -134,14 +134,14 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber) continue; // Object is on a metatile after the puzzle tile section (never occurs, in both cases the puzzle tiles are last) - if ((u8)((metatile - puzzleTileStart) / 8) >= 5) + if ((u8)((metatile - puzzleTileStart) / TILESET_WIDTH) >= 5) continue; // Object is on a metatile in puzzle tile section, but not one of the currently rotating color - if ((u8)((metatile - puzzleTileStart) / 8) != puzzleNumber) + if ((u8)((metatile - puzzleTileStart) / TILESET_WIDTH) != puzzleNumber) continue; - puzzleTileNum = (u8)((metatile - puzzleTileStart) % 8); + puzzleTileNum = (u8)((metatile - puzzleTileStart) % TILESET_WIDTH); // First 4 puzzle tiles are the colored arrows if (puzzleTileNum < 4) @@ -221,7 +221,7 @@ void TurnRotatingTileObjects(void) // prevPuzzleTileNum will similarly be a number [0-3] representing the arrow tile the object just moved from // All the puzzles are oriented counter-clockwise and can only move 1 step at a time, so the difference between the current tile and the previous tile will always either be -1 or 3 (0-1, 1-2, 2-3, 3-0) // Which means tileDifference will always either be -1 or 3 after the below subtraction, and rotation will always be ROTATE_COUNTERCLOCKWISE after the following conditionals - tileDifference = (u8)((metatile - puzzleTileStart) % 8); + tileDifference = (u8)((metatile - puzzleTileStart) % TILESET_WIDTH); tileDifference -= (sRotatingTilePuzzle->objects[i].prevPuzzleTileNum); // Always true, see above @@ -331,7 +331,7 @@ static void TurnUnsavedRotatingTileObject(u8 eventTemplateId, u8 puzzleTileNum) else puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right; - tileDifference = (u8)((metatile - puzzleTileStart) % 8); + tileDifference = (u8)((metatile - puzzleTileStart) % TILESET_WIDTH); tileDifference -= puzzleTileNum; if (tileDifference < 0 || tileDifference == 3) |