diff options
| -rw-r--r-- | asm/secret_base.s | 31 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/secret_base.c | 28 |
3 files changed, 29 insertions, 31 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index 69cfff512..e1aded8e3 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -5,37 +5,6 @@ .text - thumb_func_start sub_80E8AF0 -sub_80E8AF0: @ 80E8AF0 - push {r4,lr} - sub sp, 0x4 - adds r4, r0, 0 - movs r0, 0 - str r0, [sp] - ldr r2, =0x01000028 - mov r0, sp - adds r1, r4, 0 - bl CpuFastSet - movs r2, 0 - adds r4, 0x2 - movs r3, 0xFF -_080E8B0A: - adds r0, r4, r2 - ldrb r1, [r0] - orrs r1, r3 - strb r1, [r0] - adds r0, r2, 0x1 - lsls r0, 16 - lsrs r2, r0, 16 - cmp r2, 0x6 - bls _080E8B0A - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end sub_80E8AF0 - thumb_func_start ResetSecretBases ResetSecretBases: @ 80E8B28 push {r4,r5,lr} diff --git a/ld_script.txt b/ld_script.txt index f655711dd..26ccbd884 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -147,6 +147,7 @@ SECTIONS { src/money.o(.text); asm/contest_effect.o(.text); asm/record_mixing.o(.text); + src/secret_base.o(.text); asm/secret_base.o(.text); src/tv.o(.text); asm/contest_link_80F57C4.o(.text); diff --git a/src/secret_base.c b/src/secret_base.c new file mode 100644 index 000000000..53d204946 --- /dev/null +++ b/src/secret_base.c @@ -0,0 +1,28 @@ + +// Includes +#include "global.h" +#include "decoration.h" +#include "decoration_inventory.h" +#include "text.h" +#include "secret_base.h" + +// Static type declarations + +// Static RAM declarations + +// Static ROM declarations + +void sub_80E8AF0(struct SecretBaseRecord *sbr) +{ + u16 i; + + CpuFastFill16(0, sbr, sizeof(struct SecretBaseRecord)); + for (i = 0; i < 7; i ++) + { + sbr->trainerName[i] = EOS; + } +} + +// .rodata + +// .text |