diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-23 19:47:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-23 19:47:08 -0400 |
commit | d7e31f5a8558a5ae87f5da43469771ca32ca00d0 (patch) | |
tree | 5e8d37ff77dd627348e8376092cbd9e485708b78 /src/fldeff_cut.c | |
parent | d2c7a862c7535bc9f44254fa0230e09e8598324a (diff) | |
parent | cc018fe6c90ea84422af94cd5e613d0d9e52da95 (diff) |
Merge pull request #1148 from PokeCodec/savedIme
Remove unused var from ruby and other minor refactors.
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; } } } |