ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

sub_8018404

Browse Source
This commit is contained in:
PikalaxALT 2019-03-30 09:23:47 -04:00
parent 2f57d6bc0f
commit 3b9275b133
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm/union_room.s
View File

@ -5,23 +5,6 @@
.text .text
thumb_func_start sub_8018404
sub_8018404: @ 8018404
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
adds r1, 0x10
bl StringCopy7
ldrb r1, [r4]
lsls r1, 28
lsrs r1, 28
adds r0, r5, 0
bl ConvertInternationalString
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_8018404
@ file boundary? @ file boundary?
thumb_func_start sub_8018424 thumb_func_start sub_8018424

6
src/union_room.c
View File

@ -5383,3 +5383,9 @@ void sub_8018220(u8 *unused, struct UnkStruct_URoom *arg1, bool8 arg2)
StringAppend(gStringVar4, arg1->field_1A4); StringAppend(gStringVar4, arg1->field_1A4);
} }
} }
void sub_8018404(u8 *dest, struct UnkStruct_x20 *arg1)
{
StringCopy7(dest, arg1->unk.playerName);
ConvertInternationalString(dest, arg1->unk.field_0.unk_00.unk_00_0);
}