diff options
| -rw-r--r-- | asm/secret_base.s | 12 | ||||
| -rwxr-xr-x | src/secret_base_80bb4ac.c | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index cd82ff213..eb578f85e 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,18 +6,6 @@ .text - thumb_func_start sub_80BB5D0 -sub_80BB5D0: @ 80BB5D0 - ldr r0, _080BB5DC @ =gUnknown_020387DC - ldr r1, _080BB5E0 @ =gSpecialVar_0x8004 - ldrh r1, [r1] - strb r1, [r0] - bx lr - .align 2, 0 -_080BB5DC: .4byte gUnknown_020387DC -_080BB5E0: .4byte gSpecialVar_0x8004 - thumb_func_end sub_80BB5D0 - thumb_func_start sub_80BB5E4 sub_80BB5E4: @ 80BB5E4 push {r4,lr} diff --git a/src/secret_base_80bb4ac.c b/src/secret_base_80bb4ac.c index cc629d05a..406bef40a 100755 --- a/src/secret_base_80bb4ac.c +++ b/src/secret_base_80bb4ac.c @@ -1,7 +1,7 @@ #include "global.h" -extern int gUnknown_020387DC; -extern int gSpecialVar_0x8004; +extern u8 gUnknown_020387DC; +extern u16 gSpecialVar_0x8004; void sub_80BB4AC(struct SecretBaseRecord *record) { // 080bb4ac u16 i; @@ -44,6 +44,6 @@ void ResetSecretBases(void) { // 080bb5b4 ResetSecretBase(i); } -// void sub_80BB5D0(void) { // 080bb5d0 - // gUnknown_020387DC = gSpecialVar_0x8004; -// } +void sub_80BB5D0(void) { // 080bb5d0 + gUnknown_020387DC = gSpecialVar_0x8004; +} |