diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2020-12-13 16:48:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 16:48:05 -0600 |
| commit | 4b7009286856fea6a6727dc09169e8ba7b3eefc0 (patch) | |
| tree | 77f8dbd111b582ddcc327dcda0bfb178197f14fd /src/code_80118A4_1.c | |
| parent | c1606fc87ed78f04708bbb6ea8c61496a7764149 (diff) | |
| parent | b02a392e94e05d98a6c8fa2b20bdca99861c7df8 (diff) | |
Merge pull request #9 from mateon1/nonmatchings
Fix a lot of nonmatchings
Diffstat (limited to 'src/code_80118A4_1.c')
| -rw-r--r-- | src/code_80118A4_1.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/src/code_80118A4_1.c b/src/code_80118A4_1.c index 9d57d7d..89f4db5 100644 --- a/src/code_80118A4_1.c +++ b/src/code_80118A4_1.c @@ -23,40 +23,10 @@ void sub_8011B14(void) gUnknown_203B150 = 0; } -#ifndef NONMATCHING -NAKED -#endif u8 sub_8011B20(void) { -#ifdef NONMATCHING - // TODO figure out why I mix up my mv/ldr for these kinds of comparisons - u8 temp; - if(gUnknown_203B150 == 0) - { - temp = 1; - } - else - { - temp = 0; - } - gUnknown_203B150 = temp; + gUnknown_203B150 = !gUnknown_203B150; return gUnknown_203B150; -#else - asm_unified("\tpush {lr}\n" - "\tldr r1, _08011B38\n" - "\tmovs r2, 0\n" - "\tldrb r0, [r1]\n" - "\tcmp r0, 0\n" - "\tbne _08011B2E\n" - "\tmovs r2, 0x1\n" -"_08011B2E:\n" - "\tstrb r2, [r1]\n" - "\tldrb r0, [r1]\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.align 2, 0\n" -"_08011B38: .4byte gUnknown_203B150"); -#endif } // unused |