diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:07:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:07:35 -0400 |
| commit | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (patch) | |
| tree | 48a735f5fc6b6dca208d8f8cdbdacfa6f54a5f88 /src/fldeff_cut.c | |
| parent | 5dfbdca6c7df39c8064a82aa1316d6380ccb0d85 (diff) | |
| parent | eb4bcc89cd149ae1a5e43f2aef0dddf5a69bb23c (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'src/fldeff_cut.c')
| -rw-r--r-- | src/fldeff_cut.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 34868342f..939c15dbf 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -227,9 +227,7 @@ bool8 SetUpFieldMove_Cut(void) y = gPlayerFacingPosition.y + sHyperCutStruct[i].y; tileCuttable = TRUE; - j = 0; - do - { + for (j = 0; j < 2; ++j) { if (sHyperCutStruct[i].unk2[j] == 0) break; if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE) @@ -237,7 +235,7 @@ bool8 SetUpFieldMove_Cut(void) tileCuttable = FALSE; break; } - } while (++j <= 1); + } if (tileCuttable == TRUE) { @@ -253,11 +251,8 @@ bool8 SetUpFieldMove_Cut(void) sHyperCutTiles[tileArrayId] = TRUE; ret = TRUE; } - else - { - if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) - sHyperCutTiles[tileArrayId] = TRUE; - } + else if (MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE) + sHyperCutTiles[tileArrayId] = TRUE; } } } |