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 6655863ed..1a0d69e0e 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -5,27 +5,6 @@
.text
- thumb_func_start sub_80E9A90
-sub_80E9A90: @ 80E9A90
- push {r4-r6,lr}
- ldr r5, =gSaveBlock1Ptr
- ldr r0, [r5]
- ldr r4, =0x00001aaa
- adds r1, r0, r4
- ldrh r6, [r1]
- ldr r1, =0x00001a9c
- adds r0, r1
- bl sub_80E8AF0
- ldr r0, [r5]
- adds r0, r4
- strh r6, [r0]
- bl sub_80E9728
- pop {r4-r6}
- pop {r0}
- bx r0
- .pool
- thumb_func_end sub_80E9A90
-
thumb_func_start sub_80E9AC0
sub_80E9AC0: @ 80E9AC0
push {lr}
diff --git a/src/secret_base.c b/src/secret_base.c
index 4e9dc2090..210149ee9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -850,3 +850,13 @@ __attribute__((naked)) void sub_80E9914(void)
"\t.pool");
}
#endif
+
+void sub_80E9A90(void)
+{
+ u16 sbr_e;
+
+ sbr_e = gSaveBlock1Ptr->secretBases[0].sbr_field_e;
+ sub_80E8AF0(&gSaveBlock1Ptr->secretBases[0]);
+ gSaveBlock1Ptr->secretBases[0].sbr_field_e = sbr_e;
+ sub_80E9728();
+}