Merge pull request #519 from cbt6/field-message

2026-10-01 21:40:15 -05:00 · 2022-07-03 17:29:08 +00:00
parent 02e2256170
commit c11a96da9d
4 changed files with 36 additions and 36 deletions
--- a/pokefirered.sym
+++ b/pokefirered.sym
@@ -4425,19 +4425,19 @@
 0806930c l 0000003c DoRippleFieldEffect
 08069348 g 00000028 InitFieldMessageBox
 08069348 l 00000000 .gcc2_compiled.
-08069370 l 0000009c Task_RunFieldMessageBoxPrinter
-0806940c l 00000014 task_add_textbox
-08069420 l 0000001c task_del_textbox
+08069370 l 0000009c Task_DrawFieldMessageBox
+0806940c l 00000014 CreateTask_DrawFieldMessageBox
+08069420 l 0000001c DestroyTask_DrawFieldMessageBox
 0806943c g 00000028 ShowFieldMessage
 08069464 g 00000026 ShowFieldAutoScrollMessage
-0806948c g 00000018 sub_806948C
-080694a4 g 00000022 sub_80694A4
-080694c8 l 0000001c textbox_fdecode_auto_and_task_add
-080694e4 l 00000010 textbox_auto_and_task_add
+0806948c l 00000018 ForceShowFieldAutoScrollMessage
+080694a4 l 00000022 ShowFieldMessageFromBuffer
+080694c8 l 0000001c ExpandStringAndStartDrawFieldMessageBox
+080694e4 l 00000010 StartDrawFieldMessageBox
 080694f4 g 0000001c HideFieldMessageBox
-08069510 g 0000000c textbox_any_visible
+08069510 g 0000000c GetFieldMessageBoxType
 0806951c g 0000001a IsFieldMessageBoxHidden
-08069538 g 0000001c sub_8069538
+08069538 l 0000001c ReplaceFieldMessageWithFrame
 08069554 g 0000001a walkrun_is_standing_still
 08069554 l 00000000 .gcc2_compiled.
 08069570 g 00000020 Task_WaitPlayerStopMoving
--- a/pokefirered_rev1.sym
+++ b/pokefirered_rev1.sym
@@ -4425,19 +4425,19 @@
 08069320 l 0000003c DoRippleFieldEffect
 0806935c g 00000028 InitFieldMessageBox
 0806935c l 00000000 .gcc2_compiled.
-08069384 l 0000009c Task_RunFieldMessageBoxPrinter
-08069420 l 00000014 task_add_textbox
-08069434 l 0000001c task_del_textbox
+08069384 l 0000009c Task_DrawFieldMessageBox
+08069420 l 00000014 CreateTask_DrawFieldMessageBox
+08069434 l 0000001c DestroyTask_DrawFieldMessageBox
 08069450 g 00000028 ShowFieldMessage
 08069478 g 00000026 ShowFieldAutoScrollMessage
-080694a0 g 00000018 sub_806948C
-080694b8 g 00000022 sub_80694A4
-080694dc l 0000001c textbox_fdecode_auto_and_task_add
-080694f8 l 00000010 textbox_auto_and_task_add
+080694a0 l 00000018 ForceShowFieldAutoScrollMessage
+080694b8 l 00000022 ShowFieldMessageFromBuffer
+080694dc l 0000001c ExpandStringAndStartDrawFieldMessageBox
+080694f8 l 00000010 StartDrawFieldMessageBox
 08069508 g 0000001c HideFieldMessageBox
-08069524 g 0000000c textbox_any_visible
+08069524 g 0000000c GetFieldMessageBoxType
 08069530 g 0000001a IsFieldMessageBoxHidden
-0806954c g 0000001c sub_8069538
+0806954c l 0000001c ReplaceFieldMessageWithFrame
 08069568 g 0000001a walkrun_is_standing_still
 08069568 l 00000000 .gcc2_compiled.
 08069584 g 00000020 Task_WaitPlayerStopMoving
--- a/pokeleafgreen.sym
+++ b/pokeleafgreen.sym
@@ -4425,19 +4425,19 @@
 0806930c l 0000003c DoRippleFieldEffect
 08069348 g 00000028 InitFieldMessageBox
 08069348 l 00000000 .gcc2_compiled.
-08069370 l 0000009c Task_RunFieldMessageBoxPrinter
-0806940c l 00000014 task_add_textbox
-08069420 l 0000001c task_del_textbox
+08069370 l 0000009c Task_DrawFieldMessageBox
+0806940c l 00000014 CreateTask_DrawFieldMessageBox
+08069420 l 0000001c DestroyTask_DrawFieldMessageBox
 0806943c g 00000028 ShowFieldMessage
 08069464 g 00000026 ShowFieldAutoScrollMessage
-0806948c g 00000018 sub_806948C
-080694a4 g 00000022 sub_80694A4
-080694c8 l 0000001c textbox_fdecode_auto_and_task_add
-080694e4 l 00000010 textbox_auto_and_task_add
+0806948c l 00000018 ForceShowFieldAutoScrollMessage
+080694a4 l 00000022 ShowFieldMessageFromBuffer
+080694c8 l 0000001c ExpandStringAndStartDrawFieldMessageBox
+080694e4 l 00000010 StartDrawFieldMessageBox
 080694f4 g 0000001c HideFieldMessageBox
-08069510 g 0000000c textbox_any_visible
+08069510 g 0000000c GetFieldMessageBoxType
 0806951c g 0000001a IsFieldMessageBoxHidden
-08069538 g 0000001c sub_8069538
+08069538 l 0000001c ReplaceFieldMessageWithFrame
 08069554 g 0000001a walkrun_is_standing_still
 08069554 l 00000000 .gcc2_compiled.
 08069570 g 00000020 Task_WaitPlayerStopMoving
--- a/pokeleafgreen_rev1.sym
+++ b/pokeleafgreen_rev1.sym
@@ -4425,19 +4425,19 @@
 08069320 l 0000003c DoRippleFieldEffect
 0806935c g 00000028 InitFieldMessageBox
 0806935c l 00000000 .gcc2_compiled.
-08069384 l 0000009c Task_RunFieldMessageBoxPrinter
-08069420 l 00000014 task_add_textbox
-08069434 l 0000001c task_del_textbox
+08069384 l 0000009c Task_DrawFieldMessageBox
+08069420 l 00000014 CreateTask_DrawFieldMessageBox
+08069434 l 0000001c DestroyTask_DrawFieldMessageBox
 08069450 g 00000028 ShowFieldMessage
 08069478 g 00000026 ShowFieldAutoScrollMessage
-080694a0 g 00000018 sub_806948C
-080694b8 g 00000022 sub_80694A4
-080694dc l 0000001c textbox_fdecode_auto_and_task_add
-080694f8 l 00000010 textbox_auto_and_task_add
+080694a0 l 00000018 ForceShowFieldAutoScrollMessage
+080694b8 l 00000022 ShowFieldMessageFromBuffer
+080694dc l 0000001c ExpandStringAndStartDrawFieldMessageBox
+080694f8 l 00000010 StartDrawFieldMessageBox
 08069508 g 0000001c HideFieldMessageBox
-08069524 g 0000000c textbox_any_visible
+08069524 g 0000000c GetFieldMessageBoxType
 08069530 g 0000001a IsFieldMessageBoxHidden
-0806954c g 0000001c sub_8069538
+0806954c l 0000001c ReplaceFieldMessageWithFrame
 08069568 g 0000001a walkrun_is_standing_still
 08069568 l 00000000 .gcc2_compiled.
 08069584 g 00000020 Task_WaitPlayerStopMoving