diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2016-12-20 11:15:14 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 11:15:14 -0800 |
| commit | a5e670f683a795fb783b6303d81fccdff933d3c3 (patch) | |
| tree | 35446913d0b5c08d7457257342e54260d092a278 /src | |
| parent | 1ef1142628279a6a931cade6c8e9a89112d82024 (diff) | |
| parent | 14dd68d14ae9411e0b93fa13950e430c781a530c (diff) | |
Merge pull request #137 from marijnvdwerf/fix-rev1-compilation
Fix compilation of rev1
Diffstat (limited to 'src')
| -rw-r--r-- | src/save_failed_screen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c index 8c724e1c5..fe22abb2b 100644 --- a/src/save_failed_screen.c +++ b/src/save_failed_screen.c @@ -288,13 +288,13 @@ void sub_8147218(void) orrs r0, r1\n\ strh r0, [r2, 0x3E]\n\ mov r1, r12\n\ - adds r1, 0x3C\n\ - @.if REVISION >= 1\n\ - @movs r0, 0x38\n\ - @.else\n\ - movs r0, 0x48\n\ - @.endif\n\ - strb r0, [r1]\n\ + adds r1, 0x3C\n" +#if REVISION >= 1 + "movs r0, 0x38\n" +#else + "movs r0, 0x48\n" +#endif + "strb r0, [r1]\n\ ldr r0, _0814729C @ =gUnknown_0203933E\n\ ldrh r0, [r0]\n\ cmp r0, 0\n\ |