rename field message box functions

2 files changed, 42 insertions, 42 deletions

diff --git a/asm/rom4.s b/asm/rom4.s
index 0580d04bd..4f310a3ba 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -4212,7 +4212,7 @@ sub_8054D4C: @ 8054D4C
 	movs r0, 0
 	bl sub_805C7C4
 	bl FieldEffectActiveListClear
-	bl sub_8064A74
+	bl InitFieldMessageBox
 	bl sub_807C828
 	bl sub_8080750
 	cmp r4, 0
diff --git a/asm/rom5.s b/asm/rom5.s
index f4dda2c3f..5315327db 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -15607,7 +15607,7 @@ _080826D4: .4byte do_choose_name_or_words_screen
 sub_80826D8: @ 80826D8
 	push {lr}
 	bl sub_808281C
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	thumb_func_end sub_80826D8
@@ -15648,7 +15648,7 @@ _08082714: .4byte gUnknown_081C6C02
 sub_8082718: @ 8082718
 	push {lr}
 	bl sub_8082880
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8082718
@@ -16861,7 +16861,7 @@ sub_8082F68: @ 8082F68
 	movs r0, 0x15
 	bl audio_play
 	ldr r0, _08082FC4
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r0, _08082FC8
 	b _08082FDA
 	.align 2, 0
@@ -16872,7 +16872,7 @@ _08082FCC:
 	movs r0, 0x16
 	bl audio_play
 	ldr r0, _08082FE4
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r0, _08082FE8
 _08082FDA:
 	str r0, [r4]
@@ -16902,7 +16902,7 @@ sub_8082FEC: @ 8082FEC
 	bl sub_8082DF4
 	cmp r0, 0x1
 	beq _0808302C
-	bl textbox_any_visible
+	bl GetFieldMessageBoxMode
 	lsls r0, 24
 	lsrs r2, r0, 24
 	cmp r2, 0
@@ -16978,7 +16978,7 @@ sub_808303C: @ 808303C
 	movs r3, 0x1
 	bl ConvertIntToDecimalStringN
 	ldr r0, _080830DC
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	mov r0, r9
 	subs r0, 0x8
 	add r0, r8
@@ -17017,7 +17017,7 @@ sub_80830E4: @ 80830E4
 	bl sub_8082DF4
 	cmp r0, 0x1
 	beq _08083178
-	bl textbox_any_visible
+	bl GetFieldMessageBoxMode
 	lsls r0, 24
 	cmp r0, 0
 	bne _08083178
@@ -17036,7 +17036,7 @@ sub_80830E4: @ 80830E4
 	beq _08083158
 _08083132:
 	ldr r0, _0808314C
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 	ldr r1, _08083150
 	lsls r0, r5, 2
 	adds r0, r5
@@ -17161,7 +17161,7 @@ sub_80831F8: @ 80831F8
 	cmp r0, 0x3
 	bne _08083250
 	bl sub_800832C
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, _0808324C
 	b _0808326E
 	.align 2, 0
@@ -17208,7 +17208,7 @@ sub_8083288: @ 8083288
 	cmp r0, 0x3
 	bne _080832C8
 	bl sub_800832C
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, _080832C0
 	lsls r1, r4, 2
 	adds r1, r4
@@ -17296,7 +17296,7 @@ _0808335A:
 	movs r0, 0
 	bl SetSuppressLinkErrorMessage
 	bl ResetBlockReceivedFlags
-	bl textbox_close
+	bl HideFieldMessageBox
 	ldr r0, _08083398
 	ldrh r0, [r0]
 	cmp r0, 0x1
@@ -17363,7 +17363,7 @@ sub_80833EC: @ 80833EC
 	movs r0, 0x5
 	strh r0, [r1]
 	bl sub_8082D4C
-	bl textbox_close
+	bl HideFieldMessageBox
 	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
@@ -17384,7 +17384,7 @@ sub_8083418: @ 8083418
 	movs r0, 0x6
 	strh r0, [r1]
 	bl sub_8082D4C
-	bl textbox_close
+	bl HideFieldMessageBox
 	bl EnableBothScriptContexts
 	adds r0, r4, 0
 	bl DestroyTask
@@ -18151,14 +18151,14 @@ _08083A04:
 	b _08083A7E
 _08083A0E:
 	ldr r0, _08083A1C
-	bl box_related_two__2
+	bl ShowFieldMessage
 	movs r0, 0x1
 	strh r0, [r5, 0x8]
 	b _08083A7E
 	.align 2, 0
 _08083A1C: .4byte gUnknown_081A490C
 _08083A20:
-	bl sub_8064C84
+	bl IsFieldMessageBoxHidden
 	lsls r0, 24
 	cmp r0, 0
 	beq _08083A7E
@@ -18181,7 +18181,7 @@ _08083A40:
 	beq _08083A62
 	b _08083A7E
 _08083A52:
-	bl textbox_close
+	bl HideFieldMessageBox
 	movs r0, 0
 	strh r0, [r5, 0x8]
 	adds r0, r4, 0
@@ -18193,7 +18193,7 @@ _08083A62:
 	b _08083A7E
 _08083A68:
 	bl sub_8055588
-	bl textbox_close
+	bl HideFieldMessageBox
 	bl MenuZeroFillScreen
 	adds r0, r4, 0
 	bl DestroyTask
@@ -139431,7 +139431,7 @@ _080BED44:
 	lsls r0, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	b _080BED82
 	.align 2, 0
 _080BED54: .4byte gUnknown_083D1454
@@ -139453,7 +139453,7 @@ _080BED5C:
 	lsls r0, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 _080BED82:
 	ldr r1, _080BEDA0
 	movs r0, 0x1
@@ -143343,7 +143343,7 @@ _080C0B7A:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -143616,7 +143616,7 @@ _080C0DDE:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -143871,7 +143871,7 @@ _080C1014:
 	lsls r1, r6, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -144255,7 +144255,7 @@ _080C138A:
 	lsls r1, r7, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	add sp, 0x8
 	pop {r4-r7}
 	pop {r0}
@@ -144511,7 +144511,7 @@ _080C15DC:
 	lsls r1, r6, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -144668,7 +144668,7 @@ _080C173C:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -144851,7 +144851,7 @@ _080C1916:
 	movs r3, 0x2
 	bl ConvertEasyChatWordsToString
 	adds r0, r4, 0
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldr r1, _080C1938
 	movs r0, 0x1
 	strb r0, [r1]
@@ -144867,7 +144867,7 @@ _080C193C:
 	movs r3, 0x2
 	bl ConvertEasyChatWordsToString
 	adds r0, r4, 0
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldr r1, _080C195C
 	movs r0, 0x3
 	strb r0, [r1]
@@ -144880,7 +144880,7 @@ _080C1960:
 	lsls r1, r7, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 _080C196C:
 	pop {r4-r7}
 	pop {r0}
@@ -145014,7 +145014,7 @@ _080C1ACC:
 	movs r3, 0x2
 	bl ConvertEasyChatWordsToString
 	adds r0, r4, 0
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldr r1, _080C1AEC
 	movs r0, 0x1
 	strb r0, [r1]
@@ -145027,7 +145027,7 @@ _080C1AF0:
 	lsls r1, r6, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 _080C1AFC:
 	pop {r4-r7}
 	pop {r0}
@@ -145131,7 +145131,7 @@ _080C1BD6:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -145175,7 +145175,7 @@ DoTVShowPokemonNewsMassOutbreak: @ 80C1BF8
 	lsls r0, 2
 	adds r0, r1
 	ldr r0, [r0]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -145380,7 +145380,7 @@ _080C1DF8:
 	lsls r1, r7, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r7}
 	pop {r0}
 	bx r0
@@ -145481,7 +145481,7 @@ _080C1EE4:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -145577,7 +145577,7 @@ _080C1FB6:
 	lsls r1, r5, 2
 	adds r1, r0
 	ldr r0, [r1]
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -152766,7 +152766,7 @@ _080C57C4:
 	strh r0, [r4]
 	b _080C581A
 _080C57CA:
-	bl sub_8064C84
+	bl IsFieldMessageBoxHidden
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C581A
@@ -152789,7 +152789,7 @@ _080C57F4:
 	ldrb r0, [r4, 0x2]
 	bl sub_80C56DC
 	ldr r0, _080C5808
-	bl box_related_two__2
+	bl ShowFieldMessage
 	ldrh r0, [r4]
 	adds r0, 0x1
 	strh r0, [r4]
@@ -231563,7 +231563,7 @@ _080EB81E:
 	adds r1, r5, 0
 	bl ConvertEasyChatWordsToString
 	adds r0, r4, 0
-	bl box_related_two__3
+	bl ShowFieldAutoScrollMessage
 _080EB82E:
 	pop {r4,r5}
 	pop {r0}
@@ -257775,7 +257775,7 @@ sub_80F8700: @ 80F8700
 	bl sub_80F8534
 	adds r0, r6, 0
 	bl sub_80F8484
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -301676,7 +301676,7 @@ sub_810D600: @ 810D600
 	ldr r0, _0810D614
 	ldrh r0, [r0]
 	bl sub_810D488
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -303218,7 +303218,7 @@ _0810E248: .4byte gUnknown_083F8376
 sub_810E24C: @ 810E24C
 	push {lr}
 	ldr r0, _0810E258
-	bl box_related_two__2
+	bl ShowFieldMessage
 	pop {r0}
 	bx r0
 	.align 2, 0