diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-24 08:15:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-24 08:15:08 -0400 |
| commit | 6b64fbc5224293394cff282bb2aedcecfa56eceb (patch) | |
| tree | 648a5bf848957321a13d5a489692d3d33492359e /src/quest_log_events.c | |
| parent | a925d2b7b0c1d6d4386d3f647a18f4f797dbeab7 (diff) | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into misc_doc
Diffstat (limited to 'src/quest_log_events.c')
| -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 e7418649e..8fe66e183 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; |