summaryrefslogtreecommitdiff
path: root/src/fldeff_cut.c
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 14:51:21 -0500
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-12-16 14:51:21 -0500
commit34fc9789c9d11464161aabf022eb270597c6778a (patch)
treed7f97e29db99b3983d2d50678dcc250da179d32d /src/fldeff_cut.c
parentcc5db41f30708c1cc2d33a46879c96a9404764a3 (diff)
parent49bdaeb940afc98e3f98b24c9a5afe1bb8d5d86b (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into rebase-install-md
Diffstat (limited to 'src/fldeff_cut.c')
-rw-r--r--src/fldeff_cut.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 785f7b426..0458f7621 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -227,17 +227,15 @@ 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 (sHyperCutStruct[i].unk2[j] == 0) break; // one line required to match -g
if (cutTiles[(u8)(sHyperCutStruct[i].unk2[j] - 1)] == FALSE)
{
tileCuttable = FALSE;
break;
}
- } while (++j <= 1);
+ }
if (tileCuttable == TRUE)
{