diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-28 13:05:05 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-28 13:05:05 -0600 |
commit | 0cd9ba36ce985a6bba1d47d0c57cd82b80543602 (patch) | |
tree | d3e77e5656a9c41fd6b47eb8d93ba8cc04bb038e /src/lilycove_lady.c | |
parent | 19b467e49f2a1dcf3845747dbc2f53586cc02fce (diff) | |
parent | 305a4fa744938fbe508acb3cb5f71cb4169a7199 (diff) |
Merge pull request #224 from DizzyEggg/another_try
Fix two nonmatching functions
Diffstat (limited to 'src/lilycove_lady.c')
-rw-r--r-- | src/lilycove_lady.c | 84 |
1 files changed, 3 insertions, 81 deletions
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c index 81a10f8a4..812f1f975 100644 --- a/src/lilycove_lady.c +++ b/src/lilycove_lady.c @@ -606,7 +606,6 @@ u8 sub_818E06C(void) } } -#ifdef NONMATCHING static u8 sub_818E13C(void) { u8 retval; @@ -627,9 +626,11 @@ static u8 sub_818E13C(void) len = sub_818E258(gUnknown_0203CD68->playerName); if (len == sub_818E258(gSaveBlock2Ptr->playerName)) { + u8 *name = gUnknown_0203CD68->playerName; for (i = 0; i < len; i ++) { - if (gUnknown_0203CD68->playerName[i] != gSaveBlock2Ptr->playerName[i]) + name = gUnknown_0203CD68->playerName; + if (name[i] != gSaveBlock2Ptr->playerName[i]) { retval = 2; break; @@ -640,85 +641,6 @@ static u8 sub_818E13C(void) } return retval; } -#else -ASM_DIRECT static u8 sub_818E13C(void) -{ - asm_unified("\tpush {r4-r7,lr}\n" - "\tmovs r7, 0x1\n" - "\tldr r5, =gUnknown_0203CD68\n" - "\tldr r0, =gSaveBlock1Ptr\n" - "\tldr r1, [r0]\n" - "\tldr r2, =0x00003b58\n" - "\tadds r0, r1, r2\n" - "\tstr r0, [r5]\n" - "\tldrb r0, [r0, 0x18]\n" - "\tcmp r0, 0xFF\n" - "\tbne _0818E174\n" - "\tldr r0, =gStringVar1\n" - "\tldr r1, =gText_Lady2\n" - "\tbl StringCopy7\n" - "\tmovs r7, 0\n" - "\tb _0818E1DC\n" - "\t.pool\n" - "_0818E174:\n" - "\tldr r4, =gStringVar1\n" - "\tldr r0, =0x00003b70\n" - "\tadds r1, r0\n" - "\tadds r0, r4, 0\n" - "\tbl StringCopy7\n" - "\tldr r0, [r5]\n" - "\tadds r0, 0x2D\n" - "\tldrb r1, [r0]\n" - "\tadds r0, r4, 0\n" - "\tbl ConvertInternationalString\n" - "\tldr r0, [r5]\n" - "\tadds r0, 0x18\n" - "\tbl sub_818E258\n" - "\tlsls r0, 24\n" - "\tlsrs r4, r0, 24\n" - "\tldr r6, =gSaveBlock2Ptr\n" - "\tldr r0, [r6]\n" - "\tbl sub_818E258\n" - "\tlsls r0, 24\n" - "\tlsrs r0, 24\n" - "\tcmp r4, r0\n" - "\tbne _0818E1DC\n" - "\tldr r0, [r5]\n" - "\tmovs r2, 0\n" - "\tcmp r2, r4\n" - "\tbcs _0818E1DC\n" - "\tldr r1, [r6]\n" - "\tldrb r0, [r0, 0x18]\n" - "\tldrb r1, [r1]\n" - "\tcmp r0, r1\n" - "\tbne _0818E1DA\n" - "_0818E1BA:\n" - "\tadds r0, r2, 0x1\n" - "\tlsls r0, 24\n" - "\tlsrs r2, r0, 24\n" - "\tcmp r2, r4\n" - "\tbcs _0818E1DC\n" - "\tldr r0, =gUnknown_0203CD68\n" - "\tldr r1, [r0]\n" - "\tadds r1, 0x18\n" - "\tadds r1, r2\n" - "\tldr r0, =gSaveBlock2Ptr\n" - "\tldr r0, [r0]\n" - "\tadds r0, r2\n" - "\tldrb r1, [r1]\n" - "\tldrb r0, [r0]\n" - "\tcmp r1, r0\n" - "\tbeq _0818E1BA\n" - "_0818E1DA:\n" - "\tmovs r7, 0x2\n" - "_0818E1DC:\n" - "\tadds r0, r7, 0\n" - "\tpop {r4-r7}\n" - "\tpop {r1}\n" - "\tbx r1\n" - "\t.pool"); -} -#endif static u8 sub_818E1F4(void) { |