From 2c64b5692f3df0c46cfa1610a51cd7de7a0017fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Na=C5=9Bciszewski?= Date: Sun, 13 Dec 2020 19:50:37 +0100 Subject: Fix a lot of nonmatchings, some were plain wrong code --- src/code_80118A4_1.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'src/code_80118A4_1.c') 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 -- cgit v1.2.3