diff options
| -rw-r--r-- | asm/quest_log.s | 24 | ||||
| -rw-r--r-- | src/quest_log.c | 20 |
2 files changed, 14 insertions, 30 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index 22d19fab9..5f7b6b627 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,30 +5,6 @@ .text - thumb_func_start sub_8110E3C -sub_8110E3C: @ 8110E3C - push {lr} - ldr r0, _08110E60 @ =gUnknown_203AE08 - ldr r0, [r0] - bl sub_8113BF4 - ldr r1, _08110E64 @ =gUnknown_203ADF8 - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x3 - bls _08110E5A - movs r0, 0 - strb r0, [r1] -_08110E5A: - pop {r0} - bx r0 - .align 2, 0 -_08110E60: .4byte gUnknown_203AE08 -_08110E64: .4byte gUnknown_203ADF8 - thumb_func_end sub_8110E3C - thumb_func_start sub_8110E68 sub_8110E68: @ 8110E68 push {r4-r7,lr} diff --git a/src/quest_log.c b/src/quest_log.c index 08b504057..97313674e 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -27,19 +27,20 @@ void sub_8110A00(void); void sub_8110A3C(void); void sub_8110BB0(u8); void sub_8110BE8(u8); -void sub_815A008(struct QuestLog *); void sub_8110E3C(void); +void sub_8110D94(void); +void sub_8110E20(void); +void sub_8110D48(u8); +void sub_81115E8(void); u8 sub_8110E68(void *); void sub_81118F4(s8); void sub_8111AD8(void); void sub_8113B88(void); void sub_8113BD8(void); -void sub_81138F8(void); -void sub_81115E8(void); -void sub_8110D94(void); -void sub_8110E20(void); -void sub_8110D48(u8); +void sub_8113BF4(void *); void sub_8112940(u8, u8 *, u16); +void sub_81138F8(void); +void sub_815A008(struct QuestLog *); void sub_8110840(void * a0) @@ -424,3 +425,10 @@ void sub_8110E20(void) { VarSet(VAR_0x40AE, gSaveBlock1Ptr->mapDataId); } + +void sub_8110E3C(void) +{ + sub_8113BF4(gUnknown_203AE08); + if (++gUnknown_203ADF8 > 3) + gUnknown_203ADF8 = 0; +} |