diff options
| -rw-r--r-- | asm/link_rfu_4.s | 66 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/link_rfu_4.c | 18 | ||||
| -rw-r--r-- | sym_ewram.txt | 1 |
4 files changed, 18 insertions, 68 deletions
diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s deleted file mode 100644 index d4a41d2b3..000000000 --- a/asm/link_rfu_4.s +++ /dev/null @@ -1,66 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80FD338 -sub_80FD338: @ 80FD338 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - mov r9, r1 - lsls r0, 16 - lsrs r0, 16 - mov r8, r0 - movs r7, 0 - ldr r6, _080FD374 @ =gSaveBlock1Ptr - ldr r4, _080FD378 @ =0x00003ba8 - movs r5, 0 -_080FD350: - ldr r0, [r6] - adds r0, r4 - adds r0, 0x4 - mov r1, r9 - movs r2, 0x7 - bl StringCompareN - cmp r0, 0 - bne _080FD37C - ldr r0, [r6] - ldr r1, _080FD378 @ =0x00003ba8 - adds r0, r1 - adds r0, r5 - ldr r0, [r0] - cmp r0, r8 - bne _080FD37C - movs r0, 0x1 - b _080FD396 - .align 2, 0 -_080FD374: .4byte gSaveBlock1Ptr -_080FD378: .4byte 0x00003ba8 -_080FD37C: - ldr r0, [r6] - adds r0, r4 - adds r0, 0x4 - bl NameIsEmpty - cmp r0, 0 - bne _080FD394 - adds r4, 0xC - adds r5, 0xC - adds r7, 0x1 - cmp r7, 0x13 - ble _080FD350 -_080FD394: - movs r0, 0 -_080FD396: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80FD338 - - .align 2, 0 @ Don't pad with nop diff --git a/ld_script.txt b/ld_script.txt index a4b99d525..1a4749d0f 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -227,7 +227,6 @@ SECTIONS { src/map_preview_screen.o(.text); src/link_rfu_2.o(.text); src/link_rfu_4.o(.text); - asm/link_rfu_4.o(.text); src/link_rfu.o(.text); asm/easy_chat_2.o(.text); src/pokedex_screen.o(.text); diff --git a/src/link_rfu_4.c b/src/link_rfu_4.c index 80973e30d..368431281 100644 --- a/src/link_rfu_4.c +++ b/src/link_rfu_4.c @@ -928,3 +928,21 @@ void RecordMixTrainerNames(void) Free(newRecords); } } + +bool32 sub_80FD338(u16 id, u8 *name) +{ + s32 i; + + for (i = 0; i < 20; i++) + { + if (StringCompareN(gSaveBlock1Ptr->trainerNameRecords[i].trainerName, name, 7) == 0 && gSaveBlock1Ptr->trainerNameRecords[i].trainerId == id) + { + return TRUE; + } + if (NameIsEmpty(gSaveBlock1Ptr->trainerNameRecords[i].trainerName)) + { + return FALSE; + } + } + return FALSE; +} diff --git a/sym_ewram.txt b/sym_ewram.txt index 210932fe9..1171ba918 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -17,7 +17,6 @@ .include "src/link.o" .space 8 - @ .include "src/link_rfu.o" .align 2 .include "src/battle_controllers.o" .align 2 |