summaryrefslogtreecommitdiff
path: root/asm/easy_chat.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/easy_chat.s')
-rw-r--r--asm/easy_chat.s42
1 files changed, 21 insertions, 21 deletions
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index abc2e3429..8b793ab40 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -369,7 +369,7 @@ _0811AF86:
thumb_func_start sub_811AF8C
sub_811AF8C: @ 811AF8C
push {lr}
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -418,7 +418,7 @@ _0811AFE6:
thumb_func_start sub_811AFEC
sub_811AFEC: @ 811AFEC
push {r4,lr}
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -461,7 +461,7 @@ _0811B03A:
thumb_func_start sub_811B040
sub_811B040: @ 811B040
push {lr}
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -566,7 +566,7 @@ sub_811B0E8: @ 811B0E8
thumb_func_start sub_811B0F8
sub_811B0F8: @ 811B0F8
push {r4,lr}
- bl sub_8198C58
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -2425,7 +2425,7 @@ sub_811BDF0: @ 811BDF0
adds r6, r0, 0
ldr r0, =gSaveBlock1Ptr
ldr r4, [r0]
- bl sub_81AFBF0
+ bl DynamicPlaceholderTextUtil_Reset
ldr r0, =0x00003b70
adds r5, r4, r0
adds r0, r5, 0
@@ -2441,17 +2441,17 @@ sub_811BDF0: @ 811BDF0
bl TVShowConvertInternationalString
movs r0, 0
mov r1, sp
- bl sub_81AFC0C
+ bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
b _0811BE3C
.pool
_0811BE34:
ldr r1, =gText_Lady
movs r0, 0
- bl sub_81AFC0C
+ bl DynamicPlaceholderTextUtil_SetPlaceholderPtr
_0811BE3C:
ldr r1, =gText_F700sQuiz
adds r0, r6, 0
- bl sub_81AFC28
+ bl DynamicPlaceholderTextUtil_ExpandPlaceholders
add sp, 0x20
pop {r4-r6}
pop {r0}
@@ -2700,14 +2700,14 @@ _0811BFE0:
b _0811C124
.pool
_0811C044:
- ldr r1, =gUnknown_08DCBDD0
+ ldr r1, =gEasyChatWindow_Gfx
movs r0, 0
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
bl copy_decompressed_tile_data_to_vram_autofree
- ldr r1, =gUnknown_08DCBF10
+ ldr r1, =gEasyChatWindow_Tilemap
movs r0, 0x3
movs r2, 0
movs r3, 0
@@ -4544,7 +4544,7 @@ sub_811CF04: @ 811CF04
sub_811CF64: @ 811CF64
push {r4,lr}
bl ResetPaletteFade
- ldr r0, =gUnknown_08DCBDB0
+ ldr r0, =gEasyChatMode_Pal
movs r1, 0
movs r2, 0x20
bl LoadPalette
@@ -4722,7 +4722,7 @@ sub_811D0BC: @ 811D0BC
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
- bl sub_809882C
+ bl LoadUserWindowBorderGfx
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE
@@ -4809,7 +4809,7 @@ _0811D19C:
b _0811D1BC
.pool
_0811D1A8:
- ldr r0, =gText_CombineTwoWordsOrPhrases
+ ldr r0, =gText_CombineTwoWordsOrPhrases3
str r0, [sp, 0xC]
b _0811D1BC
.pool
@@ -7722,7 +7722,7 @@ _0811E852:
adds r1, r5, 0
movs r2, 0x4C
movs r3, 0x28
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -7753,7 +7753,7 @@ _0811E8A0:
adds r1, r5, 0
movs r2, 0x34
movs r3, 0x28
- bl AddPseudoFieldObject
+ bl AddPseudoEventObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -7977,8 +7977,8 @@ _0811EA68:
bx r1
thumb_func_end sub_811EA28
- thumb_func_start start_menu_is_selected_item_valid
-start_menu_is_selected_item_valid: @ 811EA6C
+ thumb_func_start EasyChat_GetNumWordsInGroup
+EasyChat_GetNumWordsInGroup: @ 811EA6C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -7986,7 +7986,7 @@ start_menu_is_selected_item_valid: @ 811EA6C
cmp r0, 0
bne _0811EA84
movs r0, 0
- bl pokedex_count
+ bl GetNationalPokedexCount
lsls r0, 16
lsrs r0, 16
b _0811EA9A
@@ -8007,7 +8007,7 @@ _0811EA9A:
pop {r1}
bx r1
.pool
- thumb_func_end start_menu_is_selected_item_valid
+ thumb_func_end EasyChat_GetNumWordsInGroup
thumb_func_start sub_811EAA4
sub_811EAA4: @ 811EAA4
@@ -8879,7 +8879,7 @@ sub_811F0F8: @ 811F0F8
sub_811F108: @ 811F108
push {r4-r7,lr}
movs r0, 0
- bl start_menu_is_selected_item_valid
+ bl EasyChat_GetNumWordsInGroup
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -9103,7 +9103,7 @@ sub_811F2D4: @ 811F2D4
movs r5, 0
strh r5, [r0]
movs r0, 0
- bl pokedex_count
+ bl GetNationalPokedexCount
lsls r0, 16
cmp r0, 0
beq _0811F2FC