diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-10 07:59:47 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-10 07:59:47 -0400 |
| commit | b78aef06258d5bc6f44cdcc43987a5dd11f1d975 (patch) | |
| tree | 958b7cc70526517e36d1c290e493ec18b428c8df | |
| parent | f5964c58bd51718381c5492c063662354a86309e (diff) | |
sub_8110944
| -rw-r--r-- | asm/quest_log.s | 39 | ||||
| -rw-r--r-- | include/global.h | 4 | ||||
| -rw-r--r-- | src/quest_log.c | 10 |
3 files changed, 13 insertions, 40 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index bad86c36d..d1beeb0c4 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,45 +5,6 @@ .text - thumb_func_start sub_8110944 -sub_8110944: @ 8110944 - push {r4,r5,lr} - adds r5, r0, 0 - ldr r4, _08110978 @ =gSaveBlock1Ptr - ldr r0, _0811097C @ =gUnknown_203ADF8 - ldrb r0, [r0] - movs r3, 0xCD - lsls r3, 3 - adds r2, r0, 0 - muls r2, r3 - movs r0, 0x98 - lsls r0, 5 - adds r2, r0 - ldr r0, [r4] - adds r0, r2 - movs r4, 0xAD - lsls r4, 3 - adds r2, r0, r4 - adds r0, r3 - subs r0, r1 - cmp r5, r2 - bcc _08110972 - cmp r5, r0 - bls _08110980 -_08110972: - movs r0, 0 - b _08110982 - .align 2, 0 -_08110978: .4byte gSaveBlock1Ptr -_0811097C: .4byte gUnknown_203ADF8 -_08110980: - movs r0, 0x1 -_08110982: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_8110944 - thumb_func_start sub_8110988 sub_8110988: @ 8110988 push {r4,r5,lr} diff --git a/include/global.h b/include/global.h index e1b6ff579..907dc7eaa 100644 --- a/include/global.h +++ b/include/global.h @@ -476,7 +476,9 @@ struct MysteryEventStruct struct QuestLog { - /*0x0000*/ u8 filler_000[0x668]; + /*0x0000*/ u8 filler_000[0x568]; + /*0x0568*/ u8 filler_568[0x100]; + /*0x0668*/ u8 end[0]; }; #define MAP_OBJECTS_COUNT 16 diff --git a/src/quest_log.c b/src/quest_log.c index c59de93db..4dc0a5719 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -58,3 +58,13 @@ void sub_811092C(void) if (gUnknown_203AE8C) gUnknown_203AE8C(); } + +bool8 sub_8110944(u8 * a0, s32 a1) +{ + u8 * r2 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].filler_568; + u8 * r0 = gSaveBlock1Ptr->questLog[gUnknown_203ADF8].end; + r0 -= a1; + if (a0 < r2 || a0 > r0) + return FALSE; + return TRUE; +} |