diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-23 02:53:00 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-23 02:53:00 -0400 |
| commit | b280105f527f9cbb1bed2fde5ae006a87b697e23 (patch) | |
| tree | 12deeb8f5f21707819f36fa1e86aa73c255b8f65 /src | |
| parent | 0f1acd595e4844253930a442f8e444373989f401 (diff) | |
[LEAK-INFORMED] fix sub_8113AE8 fakematching
Diffstat (limited to 'src')
| -rw-r--r-- | src/quest_log_events.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/quest_log_events.c b/src/quest_log_events.c index 72b8ddfd7..84a14f5e8 100644 --- a/src/quest_log_events.c +++ b/src/quest_log_events.c @@ -582,18 +582,16 @@ void sub_8113ABC(const u16 *a0) bool8 sub_8113AE8(const u16 *a0) { -#ifndef NONMATCHING - register const u16 *r0 asm("r0") = a0; -#else const u16 *r0 = a0; -#endif - if (r0 == NULL || r0[1] > sQuestLogCursor) + if (a0 == NULL) // checks must be separate to match + return FALSE; + if (r0[1] > sQuestLogCursor) return FALSE; - sQuestLogEventTextBufferCBs[a0[0] & 0xFFF](a0); - gUnknown_203B044.id = a0[0]; - gUnknown_203B044.unk_1 = (a0[0] & 0xF000) >> 12; + sQuestLogEventTextBufferCBs[(r0[0] & 0xFFF)](a0); + gUnknown_203B044.id = r0[0]; + gUnknown_203B044.unk_1 = (r0[0] & 0xF000) >> 12; if (gUnknown_203B044.unk_1 != 0) gUnknown_203B044.unk_2 = 1; return TRUE; |