diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:46:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 06:46:02 -0400 |
| commit | 1f569f0136952135a0e17fe22cf180c0e87dd007 (patch) | |
| tree | f842f63b64a10ebe663e7daac2ea0bba8e5cd302 /src/quest_log.c | |
| parent | eafb77fbb912d22294f168c1e6e89575b35f0d6c (diff) | |
| parent | bc61968e1b7e1cbe3a63f8d2a6a93489fbdfa8bb (diff) | |
Merge pull request #134 from jiangzhengwenjz/sub_8115748
real match sub_8115748
Diffstat (limited to 'src/quest_log.c')
| -rw-r--r-- | src/quest_log.c | 67 |
1 files changed, 14 insertions, 53 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index e3ff53417..e1226c0b3 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -4913,7 +4913,6 @@ static const u16 gUnknown_8456C50[] = { 0x08a1 }; -#ifdef NONMATCHING void sub_8115748(u16 a0) { s32 i; @@ -4921,60 +4920,22 @@ void sub_8115748(u16 a0) return; for (i = 0; i < 17; i++) { - if (a0 != gUnknown_8456C50[i]) - continue; - if (!FlagGet(a0)) - gUnknown_203B049 = TRUE; - else - gUnknown_203B049 = FALSE; - break; + if (a0 == gUnknown_8456C50[i]) + { + if (!FlagGet(a0)) + { + gUnknown_203B049 = TRUE; + break; + } + else + { + gUnknown_203B049 += 0; + gUnknown_203B049 = FALSE; + break; + } + } } } -#else -NAKED -void sub_8115748(u16 a0) -{ - asm_unified("\tpush {r4,lr}\n" - "\tlsls r0, 16\n" - "\tlsrs r2, r0, 16\n" - "\tldr r0, =gUnknown_203ADFA\n" - "\tldrb r0, [r0]\n" - "\tsubs r0, 0x2\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tcmp r0, 0x1\n" - "\tbls _08115792\n" - "\tmovs r1, 0\n" - "\tldr r4, =gUnknown_203B049\n" - "\tldr r0, =gUnknown_8456C50\n" - "\tb _08115778\n" - "\t.pool\n" - "_08115770:\n" - "\tmovs r0, 0\n" - "\tb _08115790\n" - "_08115774:\n" - "\tadds r0, 0x2\n" - "\tadds r1, 0x1\n" - "_08115778:\n" - "\tcmp r1, 0x10\n" - "\tbgt _08115792\n" - "\tldrh r3, [r0]\n" - "\tcmp r2, r3\n" - "\tbne _08115774\n" - "\tadds r0, r2, 0\n" - "\tbl FlagGet\n" - "\tlsls r0, 24\n" - "\tcmp r0, 0\n" - "\tbne _08115770\n" - "\tmovs r0, 0x1\n" - "_08115790:\n" - "\tstrb r0, [r4]\n" - "_08115792:\n" - "\tpop {r4}\n" - "\tpop {r0}\n" - "\tbx r0"); -} -#endif // NONMATCHING void sub_8115798(void) { |