Game-Decompilation/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2025-01-31 18:02:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

name_string_util.s

Browse Source
This commit is contained in:
YamaArashi 2017-01-02 04:48:04 -08:00
parent 8b98e7a24b
commit e7054aed14
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/choose_party.s
View File

@ -1743,7 +1743,7 @@ _08122B96:
mov r0, r9
bl StringGetEnd10
mov r0, r9
bl sub_814A568
bl SanitizeNameString
adds r0, r4, 0
movs r1, 0x3
mov r2, r9

2
asm/daycare.s
View File

@ -194,7 +194,7 @@ sub_80413C8: @ 80413C8
bl StringCopy
adds r0, r6, 0
movs r1, 0xFC
bl sub_814A518
bl PadNameString
adds r6, 0x8
adds r0, r7, 0
adds r1, r6, 0

2
asm/egg_hatch.s
View File

@ -304,7 +304,7 @@ _08042B08:
adds r1, r6, 0
bl StringCopy
adds r0, r4, 0
bl sub_814A568
bl SanitizeNameString
movs r0, 0x1
b _08042B42
.align 2, 0

2
asm/mail_data.s
View File

@ -203,7 +203,7 @@ _080A2C3A:
ldr r3, _080A2D14 @ =gSaveBlock1 + 0x2B5E
adds r0, r3
movs r1, 0
bl sub_814A518
bl PadNameString
movs r3, 0
mov r2, r10
ldr r5, _080A2D18 @ =gSaveBlock1 + 0x2B66

12
asm/rom_814A518.s → asm/name_string_util.s
View File

@ -6,8 +6,8 @@
.text
thumb_func_start sub_814A518
sub_814A518: @ 814A518
thumb_func_start PadNameString
PadNameString: @ 814A518
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 24
@ -49,10 +49,10 @@ _0814A55A:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_814A518
thumb_func_end PadNameString
thumb_func_start sub_814A568
sub_814A568: @ 814A568
thumb_func_start SanitizeNameString
SanitizeNameString: @ 814A568
push {r4,lr}
adds r4, r0, 0
bl StringLength
@ -71,6 +71,6 @@ _0814A588:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_814A568
thumb_func_end SanitizeNameString
.align 2, 0 @ Don't pad with nop.

4
asm/player_pc.s
View File

@ -1395,7 +1395,7 @@ _0813B036:
mov r0, r8
bl StringCopy
mov r0, r8
bl sub_814A568
bl SanitizeNameString
mov r0, r8
movs r1, 0x15
adds r2, r5, 0
@ -1683,7 +1683,7 @@ sub_813B294: @ 813B294
adds r0, r4, 0
bl StringCopy
adds r0, r4, 0
bl sub_814A568
bl SanitizeNameString
ldr r4, _0813B2F4 @ =gStringVar4
ldr r1, _0813B2F8 @ =gOtherText_WhatWillYouDoMail
adds r0, r4, 0

2
asm/rom_800D42C.s
View File

@ -3438,7 +3438,7 @@ _0800F03E:
beq _0800F0D4
adds r0, r7, 0
movs r1, 0
bl sub_814A518
bl PadNameString
_0800F0D4:
adds r7, 0x20
movs r0, 0x1

2
include/asm.inc.h
View File

@ -455,7 +455,7 @@ u8 intro_create_brendan_sprite(/*TODO: arg types*/);
u8 intro_create_may_sprite(/*TODO: arg types*/);
u8 intro_create_latios_sprite(/*TODO: arg types*/);
u8 intro_create_latias_sprite(/*TODO: arg types*/);
void sub_814A568(u8*);
void SanitizeNameString(u8*);
// src/agb_flash.o
u16 ReadFlashId(void);

2
ld_script.txt
View File

@ -218,7 +218,7 @@ SECTIONS {
asm/bard_music.o(.text);
asm/fldeff_teleport.o(.text);
asm/unknown_debug_menu.o(.text);
asm/rom_814A518.o(.text);
asm/name_string_util.o(.text);
src/menu_cursor.o(.text);
} =0

2
src/mail.c
View File

@ -448,7 +448,7 @@ u8 *sub_80F8D7C(u8 *dest, u8 *src) {
u16 length;
StringCopy(dest, src);
sub_814A568(dest);
SanitizeNameString(dest);
length = StringLength(dest);