diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-16 22:12:38 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-05-16 22:12:38 -0400 |
| commit | 1114be138b080dee4e3bc9a9827b1abf2031b34f (patch) | |
| tree | 9cec345cd3f38fe9c09d76bbe099985920876129 | |
| parent | 651630d5dc8e2b79e522e07863f0c35965752e9b (diff) | |
SecretBasePC_PackUp
| -rw-r--r-- | asm/secret_base.s | 29 | ||||
| -rw-r--r-- | src/secret_base.c | 14 |
2 files changed, 14 insertions, 29 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index 17b5cb665..8f2df8396 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,35 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BC440 -sub_80BC440: @ 80BC440 - push {r4,r5,lr} - ldr r4, _080BC45C @ =gSaveBlock1 - ldr r0, _080BC460 @ =0x00001a16 - adds r4, r0 - ldrh r5, [r4] - movs r0, 0 - bl ResetSecretBase - strh r5, [r4] - bl sub_80BC0F8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080BC45C: .4byte gSaveBlock1 -_080BC460: .4byte 0x00001a16 - thumb_func_end sub_80BC440 - - thumb_func_start SecretBasePC_PackUp -SecretBasePC_PackUp: @ 80BC464 - push {lr} - movs r0, 0x14 - bl IncrementGameStat - bl sub_80BC440 - pop {r0} - bx r0 - thumb_func_end SecretBasePC_PackUp - thumb_func_start sub_80BC474 sub_80BC474: @ 80BC474 push {r4-r7,lr} diff --git a/src/secret_base.c b/src/secret_base.c index a405ec337..04f14018c 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1054,3 +1054,17 @@ _080BC43C: .4byte gSaveBlock1 + 0x1AA2\n\ .syntax divided\n"); } #endif + +void sub_80BC440(void) +{ + u16 backupValue = gSaveBlock1.secretBases[0].sbr_field_e; + ResetSecretBase(0); + gSaveBlock1.secretBases[0].sbr_field_e = backupValue; + sub_80BC0F8(); +} + +void SecretBasePC_PackUp(void) +{ + IncrementGameStat(20); + sub_80BC440(); +} |