summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--asm/secret_base.s21
-rw-r--r--src/secret_base.c10
2 files changed, 10 insertions, 21 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 3292992ed..233005271 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -6,27 +6,6 @@
.section .text_80BC1D0
- thumb_func_start sub_80BC50C
-sub_80BC50C: @ 80BC50C
- push {r4,r5,lr}
- bl sub_80BC474
- movs r0, 0x14
- bl IncrementGameStat
- ldr r4, _080BC530 @ =gSaveBlock1
- ldr r0, _080BC534 @ =0x00001a16
- adds r4, r0
- ldrh r5, [r4]
- movs r0, 0
- bl ResetSecretBase
- strh r5, [r4]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080BC530: .4byte gSaveBlock1
-_080BC534: .4byte 0x00001a16
- thumb_func_end sub_80BC50C
-
thumb_func_start sub_80BC538
sub_80BC538: @ 80BC538
push {r4,r5,lr}
diff --git a/src/secret_base.c b/src/secret_base.c
index 0488a3bf3..544289885 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1047,3 +1047,13 @@ void sub_80BC474(void)
}
}
}
+
+void sub_80BC50C(void)
+{
+ u16 backup_sbr_field_e;
+ sub_80BC474();
+ IncrementGameStat(GAME_STAT_MOVED_SECRET_BASE);
+ backup_sbr_field_e = gSaveBlock1.secretBases[0].sbr_field_e;
+ ResetSecretBase(0);
+ gSaveBlock1.secretBases[0].sbr_field_e = backup_sbr_field_e;
+}