diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:07:33 -0500 |
| commit | 1ac177723de817a85533adc3e984425d3ab86e00 (patch) | |
| tree | 3f5ce54362ad9a8c75e21c52f78ce3b4bcd460f2 /asm/pokemon_storage_system.s | |
| parent | eff1ad330031633b2a28f2b9e8bc8f5e5258826a (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into field_poison
Diffstat (limited to 'asm/pokemon_storage_system.s')
| -rwxr-xr-x | asm/pokemon_storage_system.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 94245f93b..c30cd7c28 100755 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -6737,7 +6737,7 @@ sub_80CAC58: @ 80CAC58 sub sp, 0xC lsls r0, 24 lsrs r6, r0, 24 - bl sub_81AFBF0 + bl UnkTextUtil_Reset ldr r1, =gUnknown_0857276C lsls r0, r6, 3 adds r0, r1 @@ -6774,7 +6774,7 @@ _080CACB8: adds r1, r2 _080CACC0: movs r0, 0 - bl sub_81AFC0C + bl UnkTextUtil_SetPtrI b _080CAD30 .pool _080CACD0: @@ -6817,7 +6817,7 @@ _080CAD16: ldr r0, =0x000021eb adds r1, r0 movs r0, 0 - bl sub_81AFC0C + bl UnkTextUtil_SetPtrI _080CAD30: ldr r5, =gUnknown_02039D08 ldr r0, [r5] @@ -6827,7 +6827,7 @@ _080CAD30: lsls r1, r6, 3 adds r1, r2 ldr r1, [r1] - bl sub_81AFC28 + bl UnkTextUtil_StringExpandPlaceholders movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer |