diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-03 13:36:42 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-11-03 13:36:42 -0400 |
| commit | 8dcea40e585c6aa37a42aa570de9b37d78538756 (patch) | |
| tree | 37cbab86d602380fb5358edb39b6890c03727d97 | |
| parent | 812f735c03d90b92c10e8c2ee460654317fc1822 (diff) | |
sub_81136D4
| -rw-r--r-- | asm/quest_log.s | 61 | ||||
| -rw-r--r-- | src/quest_log.c | 17 |
2 files changed, 17 insertions, 61 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index 72cd3da6a..a256be271 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -5,67 +5,6 @@ .text - thumb_func_start sub_81136D4 -sub_81136D4: @ 81136D4 - push {lr} - ldr r0, _08113728 @ =gSaveBlock1Ptr - ldr r2, [r0] - movs r1, 0x4 - ldrsb r1, [r2, r1] - adds r3, r0, 0 - cmp r1, 0x2 - bne _081136F0 - ldrb r0, [r2, 0x5] - subs r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0xA - bls _08113724 -_081136F0: - ldr r2, [r3] - ldrh r1, [r2, 0x4] - ldr r0, _0811372C @ =0x0000090e - cmp r1, r0 - beq _08113724 - movs r0, 0x4 - ldrsb r0, [r2, r0] - cmp r0, 0x1F - bne _08113708 - ldrb r0, [r2, 0x5] - cmp r0, 0x1 - bls _08113724 -_08113708: - ldr r0, [r3] - ldrh r1, [r0, 0x4] - ldr r0, _08113730 @ =0x00002e01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113734 @ =0x00003a01 - cmp r1, r0 - beq _08113724 - ldr r0, _08113738 @ =0x00000b02 - cmp r1, r0 - beq _08113724 - ldr r0, _0811373C @ =0x0000060a - cmp r1, r0 - bne _08113740 -_08113724: - movs r0, 0x1 - b _08113742 - .align 2, 0 -_08113728: .4byte gSaveBlock1Ptr -_0811372C: .4byte 0x0000090e -_08113730: .4byte 0x00002e01 -_08113734: .4byte 0x00003a01 -_08113738: .4byte 0x00000b02 -_0811373C: .4byte 0x0000060a -_08113740: - movs r0, 0 -_08113742: - pop {r1} - bx r1 - thumb_func_end sub_81136D4 - thumb_func_start sub_8113748 sub_8113748: @ 8113748 push {lr} diff --git a/src/quest_log.c b/src/quest_log.c index cfa353caa..50998b0eb 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -2909,3 +2909,20 @@ void sub_8113550(u16 a0, void * a1) "_081136D0: .4byte gUnknown_203B048"); } #endif // NONMATCHING + +bool8 sub_81136D4(void) +{ + if (gSaveBlock1Ptr->location.mapGroup == 2 && (gSaveBlock1Ptr->location.mapNum == 1 || gSaveBlock1Ptr->location.mapNum == 2 || gSaveBlock1Ptr->location.mapNum == 3 || gSaveBlock1Ptr->location.mapNum == 4 || gSaveBlock1Ptr->location.mapNum == 5 || gSaveBlock1Ptr->location.mapNum == 6 || gSaveBlock1Ptr->location.mapNum == 7 || gSaveBlock1Ptr->location.mapNum == 8 || gSaveBlock1Ptr->location.mapNum == 9 || gSaveBlock1Ptr->location.mapNum == 10 || gSaveBlock1Ptr->location.mapNum == 11)) + return TRUE; + + if (gSaveBlock1Ptr->location.mapGroup == 14 && gSaveBlock1Ptr->location.mapNum == 9) + return TRUE; + + if (gSaveBlock1Ptr->location.mapGroup == 31 && (gSaveBlock1Ptr->location.mapNum == 0 || gSaveBlock1Ptr->location.mapNum == 1)) + return TRUE; + + if ((gSaveBlock1Ptr->location.mapGroup == 1 && gSaveBlock1Ptr->location.mapNum == 46) || (gSaveBlock1Ptr->location.mapGroup == 1 && gSaveBlock1Ptr->location.mapNum == 58) || (gSaveBlock1Ptr->location.mapGroup == 2 && gSaveBlock1Ptr->location.mapNum == 11) || (gSaveBlock1Ptr->location.mapGroup == 10 && gSaveBlock1Ptr->location.mapNum == 6)) + return TRUE; + + return FALSE; +} |