diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-25 03:20:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 03:20:53 -0400 |
| commit | c5839905a1259fd7e843c0ffa1ce2470d40b76ae (patch) | |
| tree | 145189a2e8e563318172ea72707b6391114fa0b4 /src/fldeff_cut.c | |
| parent | 2455913e392c79a311f361ca755762aa736fd04f (diff) | |
| parent | d8f858d04e1204d3a1997b0e22b02d460b098874 (diff) | |
Merge pull request #354 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/fldeff_cut.c')
| -rw-r--r-- | src/fldeff_cut.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c index 6a2d1659f..35ba3821f 100644 --- a/src/fldeff_cut.c +++ b/src/fldeff_cut.c @@ -136,7 +136,11 @@ bool8 SetUpFieldMove_Cut(void) else { // FIXME: this fakematch - register s32 neg1 asm("r8"); + #ifndef NONMATCHING + register s32 neg1 asm("r8"); + #else + s32 neg1; + #endif struct MapPosition *pos; PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); @@ -204,7 +208,11 @@ bool8 FldEff_CutGrass(void) u8 i, j; s16 x, y; // FIXME: this fakematch - register s32 neg1 asm("r9"); + #ifndef NONMATCHING + register s32 neg1 asm("r9"); + #else + s32 neg1; + #endif struct MapPosition *pos; i = 0; |