diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-06 05:53:42 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-07 01:46:06 +0800 |
commit | cc4d2f524cbac1610e6ff517d55d7de48ebcafc7 (patch) | |
tree | bcf43cfb13e38d0e42649ec4622db8787a20db32 /asm | |
parent | 60300866962c072aaf949c0addf75514b973bfec (diff) |
finished dynamic_placeholder_text_util
Diffstat (limited to 'asm')
-rw-r--r-- | asm/berry_crush_3.s | 6 | ||||
-rw-r--r-- | asm/diploma.s | 12 | ||||
-rw-r--r-- | asm/dodrio_berry_picking.s | 14 | ||||
-rw-r--r-- | asm/field_specials.s | 2 | ||||
-rw-r--r-- | asm/link_rfu_3.s | 34 | ||||
-rw-r--r-- | asm/pokemon_jump_2.s | 20 | ||||
-rw-r--r-- | asm/pokemon_special_anim.s | 14 | ||||
-rw-r--r-- | asm/pokemon_storage_system.s | 8 | ||||
-rw-r--r-- | asm/pokemon_summary_screen.s | 28 | ||||
-rw-r--r-- | asm/union_room_chat.s | 20 | ||||
-rw-r--r-- | asm/unk_text_util.s | 130 |
11 files changed, 79 insertions, 209 deletions
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s index 716967e65..581b84793 100644 --- a/asm/berry_crush_3.s +++ b/asm/berry_crush_3.s @@ -1265,7 +1265,7 @@ _0814DFE0: adds r4, r2, r4 str r4, [sp, 0x2C] _0814DFF0: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r0, [sp, 0x10] cmp r0, 0x1 beq _0814E0E4 @@ -1610,10 +1610,10 @@ _0814E2B8: ldr r0, [sp, 0xC] adds r1, r0, r1 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, _0814E324 @ =gStringVar4 adds r1, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r1, [sp, 0x2C] ldrb r0, [r1] mov r2, r9 diff --git a/asm/diploma.s b/asm/diploma.s index f3fc0871a..9e3d1b3ee 100644 --- a/asm/diploma.s +++ b/asm/diploma.s @@ -513,18 +513,18 @@ _080F5014: .4byte gUnknown_203AB48 sub_80F5018: @ 80F5018 push {r4-r6,lr} sub sp, 0xAC - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r0, _080F5040 @ =gSaveBlock2Ptr ldr r1, [r0] movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr bl sub_8088F84 lsls r0, 16 cmp r0, 0 beq _080F5048 ldr r1, _080F5044 @ =gUnknown_841B68F movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr b _080F5050 .align 2, 0 _080F5040: .4byte gSaveBlock2Ptr @@ -532,14 +532,14 @@ _080F5044: .4byte gUnknown_841B68F _080F5048: ldr r1, _080F50E0 @ =gUnknown_841B698 movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr _080F5050: movs r0, 0 movs r1, 0 bl FillWindowPixelBuffer ldr r1, _080F50E4 @ =gUnknown_841B60E add r0, sp, 0xC - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r5, 0x1 negs r5, r5 movs r0, 0x2 @@ -562,7 +562,7 @@ _080F5050: bl AddTextPrinterParameterized3 ldr r1, _080F50EC @ =gUnknown_841B619 add r0, sp, 0xC - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x2 add r1, sp, 0xC adds r2, r5, 0 diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s index 35fefbe29..13a4d95b5 100644 --- a/asm/dodrio_berry_picking.s +++ b/asm/dodrio_berry_picking.s @@ -9983,7 +9983,7 @@ _08155480: movs r1, 0 adds r2, r5, 0 bl AddTextPrinterParameterized - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset bl sub_8153390 lsls r0, 16 lsrs r0, 16 @@ -9992,10 +9992,10 @@ _08155480: bl CopyItemName movs r0, 0 adds r1, r5, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r1, _0815556C @ =gUnknown_841CD7A add r0, sp, 0xC - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, [r4] add r0, r10 ldrb r0, [r0] @@ -10016,7 +10016,7 @@ _08155480: beq _0815559E cmp r4, 0x3 beq _0815559E - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset bl sub_8153390 lsls r0, 16 lsrs r0, 16 @@ -10024,12 +10024,12 @@ _08155480: bl CopyItemName movs r0, 0 adds r1, r5, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr cmp r4, 0x2 bne _08155574 ldr r1, _08155570 @ =gUnknown_841CD9F add r0, sp, 0xC - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _08155580 .align 2, 0 _08155558: .4byte 0x00000101 @@ -10044,7 +10044,7 @@ _08155574: bne _08155580 ldr r1, _081555C4 @ =gUnknown_841CDBA add r0, sp, 0xC - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders _08155580: ldr r0, _081555C8 @ =gUnknown_203F440 ldr r0, [r0] diff --git a/asm/field_specials.s b/asm/field_specials.s index 40645fb85..d81dc424e 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -3183,7 +3183,7 @@ _080CBE20: lsls r0, 24 lsrs r0, 24 _080CBE40: - bl sub_813CD24 + bl GetColorFromTextColorTable _080CBE44: lsls r0, 24 lsrs r0, 24 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 4bffa31c5..f46ac9953 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10537,14 +10537,14 @@ _0811B056: lsls r0, r4, 24 lsrs r0, 24 adds r1, r5, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr adds r5, 0xB adds r4, 0x1 cmp r4, 0x3 ble _0811B056 ldr r1, _0811B074 @ =gUnknown_8457D44 adds r0, r7, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _0811B080 .align 2, 0 _0811B074: .4byte gUnknown_8457D44 @@ -10952,7 +10952,7 @@ sub_811B31C: @ 811B31C ldr r0, _0811B4B0 @ =gUnknown_2039624 adds r1, r0 mov r8, r1 - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset mov r6, r9 adds r6, 0xAC bl sub_80447F0 @@ -10966,11 +10966,11 @@ sub_811B31C: @ 811B31C bl StringCopy movs r0, 0 adds r1, r6, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr mov r1, r8 adds r1, 0x30 movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r4, 0xB0 lsls r4, 1 add r4, r9 @@ -10984,7 +10984,7 @@ sub_811B31C: @ 811B31C bl StringCopy movs r0, 0x2 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr mov r5, r9 adds r5, 0xCA mov r0, r8 @@ -10995,7 +10995,7 @@ sub_811B31C: @ 811B31C bl ConvertIntToDecimalStringN movs r0, 0x3 adds r1, r5, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r2, 0xD9 add r2, r9 mov r10, r2 @@ -11015,16 +11015,16 @@ sub_811B31C: @ 811B31C bl ConvertIntToDecimalStringN movs r0, 0x4 mov r1, r10 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r0, 0x5 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r4, 0xC8 lsls r4, 1 add r4, r9 ldr r1, _0811B4BC @ =gUnknown_84594C4 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, _0811B4C0 @ =gStringVar4 adds r1, r4, 0 bl StringCopy @@ -11041,7 +11041,7 @@ _0811B40A: bl ConvertIntToDecimalStringN movs r0, 0 adds r1, r6, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr mov r2, r8 ldrh r1, [r2, 0x16] cmp r1, r4 @@ -11056,7 +11056,7 @@ _0811B426: bl ConvertIntToDecimalStringN movs r0, 0x2 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr mov r0, r8 ldrh r1, [r0, 0x20] adds r0, r5, 0 @@ -11065,7 +11065,7 @@ _0811B426: bl ConvertIntToDecimalStringN movs r0, 0x3 adds r1, r5, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r7, 0 movs r6, 0x80 lsls r6, 19 @@ -11078,7 +11078,7 @@ _0811B45E: bl CopyEasyChatWord lsrs r0, r6, 24 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r2, 0x80 lsls r2, 17 adds r6, r2 @@ -11092,7 +11092,7 @@ _0811B45E: add r4, r9 ldr r1, _0811B4C8 @ =gUnknown_8459504 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r5, _0811B4C0 @ =gStringVar4 adds r0, r5, 0 adds r1, r4, 0 @@ -11102,7 +11102,7 @@ _0811B45E: bne _0811B4D0 ldr r1, _0811B4CC @ =gUnknown_8459588 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders adds r0, r5, 0 adds r1, r4, 0 bl StringAppend @@ -11127,7 +11127,7 @@ _0811B4D0: adds r1, r0 ldr r1, [r1] adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders adds r0, r5, 0 adds r1, r4, 0 bl StringAppend diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index af4b28a27..7ef149fec 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -5644,20 +5644,20 @@ sub_814A468: @ 814A468 ldr r1, _0814A530 @ =gUnknown_846D94C bl StringAppend _0814A4C2: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r4, _0814A52C @ =gUnknown_203F3D8 ldr r1, [r4] adds r1, 0x26 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r1, [r4] adds r1, 0x66 movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r4] adds r0, 0xA6 ldr r1, _0814A534 @ =gUnknown_841CBA9 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x4 movs r1, 0x8 movs r2, 0x16 @@ -5706,15 +5706,15 @@ sub_814A53C: @ 814A53C ldr r1, [r4] adds r1, 0x26 bl CopyItemName - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r1, [r4] adds r1, 0x26 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r4] adds r0, 0xA6 ldr r1, _0814A5B0 @ =gUnknown_841CBCA - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x4 movs r1, 0x8 movs r2, 0x16 @@ -5761,15 +5761,15 @@ sub_814A5B4: @ 814A5B4 ldr r1, [r4] adds r1, 0x26 bl CopyItemName - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r1, [r4] adds r1, 0x26 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r4] adds r0, 0xA6 ldr r1, _0814A628 @ =gUnknown_841CBE4 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x4 movs r1, 0x9 movs r2, 0x16 diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 31e3752d3..5c91419df 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -1815,15 +1815,15 @@ _0811D3C0: _0811D3D4: .4byte gUnknown_841B295 _0811D3D8: .4byte gUnknown_841B2A7 _0811D3DC: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset bl sub_811D0F4 adds r1, r0, 0 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr bl sub_811D0D0 adds r1, r0, 0 movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr adds r4, 0x14 ldr r1, _0811D400 @ =gUnknown_841B32E b _0811D470 @@ -1866,20 +1866,20 @@ _0811D444: .4byte gUnknown_841B2F1 _0811D448: .4byte gUnknown_841B2ED _0811D44C: .4byte gUnknown_8459998 _0811D450: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset bl sub_811D0F4 adds r1, r0, 0 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr bl sub_811D0C4 adds r1, r0, 0 movs r0, 0x1 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr adds r4, 0x14 ldr r1, _0811D478 @ =gUnknown_841B306 _0811D470: adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _0811D4A2 .align 2, 0 _0811D478: .4byte gUnknown_841B306 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 0c9536a8e..a5e91a4a6 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -8190,7 +8190,7 @@ sub_808FBA4: @ 808FBA4 sub sp, 0xC lsls r0, 24 lsrs r6, r0, 24 - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r1, _0808FBC8 @ =gUnknown_83CEA88 lsls r0, r6, 3 adds r0, r1 @@ -8231,7 +8231,7 @@ _0808FC04: adds r1, r2 _0808FC0C: movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr b _0808FC7C .align 2, 0 _0808FC14: .4byte gUnknown_20397B0 @@ -8281,7 +8281,7 @@ _0808FC62: ldr r0, _0808FCE0 @ =0x000021db adds r1, r0 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr _0808FC7C: ldr r5, _0808FCDC @ =gUnknown_20397B0 ldr r0, [r5] @@ -8292,7 +8292,7 @@ _0808FC7C: lsls r1, r6, 3 adds r1, r2 ldr r1, [r1] - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index f561ad660..62afb042c 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -5747,7 +5747,7 @@ _08137574: sub_8137578: @ 8137578 push {r4-r7,lr} sub sp, 0xD4 - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r7, _081375E8 @ =gUnknown_203B140 ldr r0, [r7] ldr r4, _081375EC @ =0x00003290 @@ -5760,7 +5760,7 @@ sub_8137578: @ 8137578 adds r0, r1 ldr r1, [r0] movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r7] adds r0, r4 movs r1, 0x24 @@ -5777,7 +5777,7 @@ _081375B2: bl ConvertIntToDecimalStringN movs r0, 0x1 add r1, sp, 0x14 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r7] adds r0, r4 movs r1, 0x23 @@ -5824,7 +5824,7 @@ _0813761C: _08137626: adds r1, r4, 0 movs r0, 0x2 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r4, _08137664 @ =gUnknown_203B140 ldr r0, [r4] ldr r1, _08137668 @ =0x00003290 @@ -5901,7 +5901,7 @@ _081376C0: ldr r1, _081376D8 @ =gUnknown_8419841 _081376CE: adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _081376E6 .align 2, 0 _081376D8: .4byte gUnknown_8419841 @@ -5909,7 +5909,7 @@ _081376DC: add r4, sp, 0x3C ldr r1, _08137714 @ =gUnknown_8419822 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders _081376E6: ldr r0, _08137718 @ =gUnknown_203B140 ldr r0, [r0] @@ -5944,7 +5944,7 @@ _08137720: .4byte gUnknown_8463FA4 sub_8137724: @ 8137724 push {r4-r6,lr} sub sp, 0xD4 - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r5, _081377A0 @ =gUnknown_203B140 ldr r0, [r5] ldr r4, _081377A4 @ =0x00003290 @@ -5957,7 +5957,7 @@ sub_8137724: @ 8137724 adds r0, r1 ldr r1, [r0] movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r5] adds r0, r4 movs r1, 0x24 @@ -5974,7 +5974,7 @@ _0813775E: bl ConvertIntToDecimalStringN movs r0, 0x1 add r1, sp, 0x14 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r0, [r5] adds r0, r4 movs r1, 0x23 @@ -6025,7 +6025,7 @@ _081377D0: ldr r1, _081377E8 @ =gUnknown_841979D _081377DE: adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _081377F6 .align 2, 0 _081377E8: .4byte gUnknown_841979D @@ -6033,7 +6033,7 @@ _081377EC: add r4, sp, 0x3C ldr r1, _08137820 @ =gUnknown_8419782 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders _081377F6: ldr r0, _08137824 @ =gUnknown_203B140 ldr r0, [r0] @@ -6077,7 +6077,7 @@ _08137846: _08137850: adds r1, r4, 0 movs r0, 0x2 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r4, _08137890 @ =gUnknown_203B140 ldr r0, [r4] ldr r1, _08137894 @ =0x00003290 @@ -6149,7 +6149,7 @@ _081378EA: ldr r1, _081378F8 @ =gUnknown_841988A _081378EE: adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders b _08137906 .align 2, 0 _081378F8: .4byte gUnknown_841988A @@ -6157,7 +6157,7 @@ _081378FC: add r4, sp, 0x3C ldr r1, _08137934 @ =gUnknown_8419860 adds r0, r4, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders _08137906: ldr r0, _08137938 @ =gUnknown_203B140 ldr r0, [r0] diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 137ee69c1..609cf8366 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -2362,10 +2362,10 @@ _08129664: ldrb r1, [r4, 0x8] cmp r0, r1 beq _081296EC - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset movs r0, 0 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r1, _08129684 @ =gUnknown_841B3AA b _081296D8 .align 2, 0 @@ -2404,14 +2404,14 @@ _081296BE: ldrb r5, [r5] cmp r0, r5 beq _081296EC - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset movs r0, 0 adds r1, r4, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr ldr r1, _081296E8 @ =gUnknown_841B3BE _081296D8: adds r0, r6, 0 - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders movs r0, 0x1 b _081296EE .align 2, 0 @@ -3957,11 +3957,11 @@ sub_812A240: @ 812A240 beq _0812A280 b _0812A28A _0812A250: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset bl sub_8129814 adds r1, r0, 0 movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r0, 0x5 movs r1, 0 bl sub_812A578 @@ -4122,11 +4122,11 @@ sub_812A378: @ 812A378 beq _0812A3BC b _0812A3C6 _0812A388: - bl UnkTextUtil_Reset + bl DynamicPlaceholderTextUtil_Reset ldr r0, _0812A3B4 @ =gSaveBlock2Ptr ldr r1, [r0] movs r0, 0 - bl UnkTextUtil_SetPtrI + bl DynamicPlaceholderTextUtil_SetPlaceholderPtr movs r0, 0x9 movs r1, 0 bl sub_812A578 @@ -4455,7 +4455,7 @@ _0812A5F8: adds r0, r1, 0 adds r0, 0x22 ldr r1, [r4] - bl UnkTextUtil_StringExpandPlaceholders + bl DynamicPlaceholderTextUtil_ExpandPlaceholders ldr r0, [r5] adds r6, r0, 0 adds r6, 0x22 diff --git a/asm/unk_text_util.s b/asm/unk_text_util.s deleted file mode 100644 index 15d21c95a..000000000 --- a/asm/unk_text_util.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start UnkTextUtil_Reset -UnkTextUtil_Reset: @ 813CC90 - push {lr} - ldr r1, _0813CCA8 @ =gUnknown_203F34C - movs r2, 0 - adds r0, r1, 0 - adds r0, 0x1C -_0813CC9A: - str r2, [r0] - subs r0, 0x4 - cmp r0, r1 - bge _0813CC9A - pop {r0} - bx r0 - .align 2, 0 -_0813CCA8: .4byte gUnknown_203F34C - thumb_func_end UnkTextUtil_Reset - - thumb_func_start UnkTextUtil_SetPtrI -UnkTextUtil_SetPtrI: @ 813CCAC - push {lr} - adds r2, r1, 0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x7 - bhi _0813CCC0 - ldr r1, _0813CCC4 @ =gUnknown_203F34C - lsls r0, 2 - adds r0, r1 - str r2, [r0] -_0813CCC0: - pop {r0} - bx r0 - .align 2, 0 -_0813CCC4: .4byte gUnknown_203F34C - thumb_func_end UnkTextUtil_SetPtrI - - thumb_func_start UnkTextUtil_StringExpandPlaceholders -UnkTextUtil_StringExpandPlaceholders: @ 813CCC8 - push {r4,r5,lr} - adds r2, r0, 0 - adds r4, r1, 0 - ldrb r1, [r4] - adds r0, r1, 0 - cmp r0, 0xFF - beq _0813CD08 - ldr r5, _0813CCE4 @ =gUnknown_203F34C -_0813CCD8: - cmp r1, 0xF7 - beq _0813CCE8 - strb r1, [r2] - adds r4, 0x1 - adds r2, 0x1 - b _0813CD00 - .align 2, 0 -_0813CCE4: .4byte gUnknown_203F34C -_0813CCE8: - adds r4, 0x1 - ldrb r0, [r4] - lsls r0, 2 - adds r0, r5 - ldr r1, [r0] - cmp r1, 0 - beq _0813CCFE - adds r0, r2, 0 - bl StringCopy - adds r2, r0, 0 -_0813CCFE: - adds r4, 0x1 -_0813CD00: - ldrb r1, [r4] - adds r0, r1, 0 - cmp r0, 0xFF - bne _0813CCD8 -_0813CD08: - movs r0, 0xFF - strb r0, [r2] - adds r0, r2, 0 - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end UnkTextUtil_StringExpandPlaceholders - - thumb_func_start UnkTextUtil_GetPtrI -UnkTextUtil_GetPtrI: @ 813CD14 - lsls r0, 24 - ldr r1, _0813CD20 @ =gUnknown_203F34C - lsrs r0, 22 - adds r0, r1 - ldr r0, [r0] - bx lr - .align 2, 0 -_0813CD20: .4byte gUnknown_203F34C - thumb_func_end UnkTextUtil_GetPtrI - - thumb_func_start sub_813CD24 -sub_813CD24: @ 813CD24 - push {lr} - lsls r0, 16 - lsrs r1, r0, 16 - lsrs r2, r0, 17 - movs r0, 0x1 - ands r1, r0 - lsls r1, 2 - cmp r2, 0x4B - bhi _0813CD48 - ldr r0, _0813CD44 @ =gUnknown_8464300 - adds r0, r2, r0 - ldrb r0, [r0] - asrs r0, r1 - movs r1, 0xF - ands r0, r1 - b _0813CD4A - .align 2, 0 -_0813CD44: .4byte gUnknown_8464300 -_0813CD48: - movs r0, 0x3 -_0813CD4A: - pop {r1} - bx r1 - thumb_func_end sub_813CD24 - - .align 2, 0 @ Don't pad with nop. |