diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-24 22:10:35 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-10-24 22:10:35 -0400 |
| commit | e094e3db9b8e4ab2b97085ac7048c9b6c327ed1f (patch) | |
| tree | 8413102842f09c5649941ce52d594335c46701e7 | |
| parent | 82ac40e6197d96f59215c0544f73b8e795ed5c64 (diff) | |
CurrentMapIsSecretBase
| -rw-r--r-- | asm/secret_base.s | 36 | ||||
| -rw-r--r-- | src/secret_base.c | 15 |
2 files changed, 15 insertions, 36 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index ba44d6052..879e6445a 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -5,42 +5,6 @@ .text - thumb_func_start sub_80E91F8 -sub_80E91F8: @ 80E91F8 - push {lr} - ldr r0, =sub_80E916C - movs r1, 0 - bl CreateTask - movs r0, 0x1 - movs r1, 0 - bl fade_screen - pop {r0} - bx r0 - .pool - thumb_func_end sub_80E91F8 - - thumb_func_start CurrentMapIsSecretBase -CurrentMapIsSecretBase: @ 80E9214 - push {lr} - ldr r0, =gSaveBlock1Ptr - ldr r1, [r0] - movs r0, 0x4 - ldrsb r0, [r1, r0] - cmp r0, 0x19 - bne _080E9230 - ldrb r0, [r1, 0x5] - cmp r0, 0x17 - bhi _080E9230 - movs r0, 0x1 - b _080E9232 - .pool -_080E9230: - movs r0, 0 -_080E9232: - pop {r1} - bx r1 - thumb_func_end CurrentMapIsSecretBase - thumb_func_start sub_80E9238 sub_80E9238: @ 80E9238 push {r4-r7,lr} diff --git a/src/secret_base.c b/src/secret_base.c index 7f868720b..6f888eb4b 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -347,3 +347,18 @@ void sub_80E916C(u8 taskId) DestroyTask(taskId); } } + +void sub_80E91F8(void) +{ + CreateTask(sub_80E916C, 0); + fade_screen(1, 0); +} + +bool8 CurrentMapIsSecretBase(void) +{ + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_SECRET_BASE_RED_CAVE1 && (u8)gSaveBlock1Ptr->location.mapNum <= MAP_ID_SECRET_BASE_SHRUB4) + { + return TRUE; + } + return FALSE; +} |