diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-17 18:19:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-17 18:19:06 -0400 |
| commit | 1cf2470aac038fce48a5777e36b00554af90d910 (patch) | |
| tree | 31a0afce3cc927221ef5229a8d2fb0f5754e1a54 /berry_fix/asm/loader.s | |
| parent | 96fd719a1906346db062daf13e1107b3c4b220ed (diff) | |
| parent | 98441b119996ff1dc9575d925479213864d293f7 (diff) | |
Merge pull request #1097 from PokeCodec/asm
Allow assembly on Clang
Diffstat (limited to 'berry_fix/asm/loader.s')
| -rw-r--r-- | berry_fix/asm/loader.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s index 39e0b768a..a78014078 100644 --- a/berry_fix/asm/loader.s +++ b/berry_fix/asm/loader.s @@ -75,21 +75,21 @@ _send: @ 14c _150: bl _recv bne _150 - mov r2, 0 + mov r2, #0 strh r2, [r0, 0xa] @ SIOMLT_SEND - cmp r1, 0 + cmp r1, #0 bne _150 mov r2, 0x8000 _16c: - mov r1, 0 + mov r1, #0 _170: strh r1, [r0, 0xa] @ SIOMLT_SEND bl _recv bne _150 cmp r1, r2 bne _16c - lsr r2, 5 - cmp r1, 0 + lsr r2, #5 + cmp r1, #0 bne _170 ldr r3, =BerryFixMBHeaderGameCode ldrh r2, [r3] @@ -105,7 +105,7 @@ _1a0: bne _1a0 cmp r1, r2 bne _1a0 - mov r1, 0 + mov r1, #0 strh r1, [r0, 0xa] @ SIOMLT_SEND ldr r0, =_data_2f0 ldr r1, =gCode |