From e73ce5317dfc243474faa9187181ed323faf4ed5 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:05:30 -0400 Subject: Parametrized to Parameterized --- asm/script_menu.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index d917b5d5b..3445a36ff 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -578,7 +578,7 @@ _0809CD82: movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized3 b _0809CDE0 .align 2, 0 _0809CDAC: .4byte gUnknown_83E0738 @@ -603,7 +603,7 @@ _0809CDB0: movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized3 _0809CDE0: add sp, 0x10 pop {r4} @@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254 movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized3 add sp, 0x10 pop {r0} bx r0 -- cgit v1.2.3 From b249154009efceb5710848a2567fb821d3e7217a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:44:48 -0400 Subject: synchronize text printer function names with pokeemerald --- asm/script_menu.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 3445a36ff..bb4b0e062 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -578,7 +578,7 @@ _0809CD82: movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterized2 b _0809CDE0 .align 2, 0 _0809CDAC: .4byte gUnknown_83E0738 @@ -603,7 +603,7 @@ _0809CDB0: movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterized2 _0809CDE0: add sp, 0x10 pop {r4} @@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254 movs r0, 0 movs r1, 0x2 movs r3, 0 - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterized2 add sp, 0x10 pop {r0} bx r0 -- cgit v1.2.3 From 2b750cf44491aee3b2fe8265afb4ac6620500afa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Jun 2019 10:21:32 -0400 Subject: Rename Item PC symbols --- asm/script_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index bb4b0e062..69e487bcc 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -1721,7 +1721,7 @@ sub_809D6B0: @ 809D6B0 bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0x1 - bl sub_810F4D8 + bl ClearMenuWindow adds r0, r4, 0 bl RemoveWindow pop {r4} -- cgit v1.2.3 From efad45497dfb69cf2879d0bf2e318eaf8fc2252f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 24 Jun 2019 14:37:45 +0800 Subject: through AddTextPrinterParameterized2() --- asm/script_menu.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 69e487bcc..54c3d6691 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -308,7 +308,7 @@ _0809CB7A: mov r3, r10 bl sub_809CC18 movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram _0809CBA2: add sp, 0x20 pop {r3-r5} @@ -845,7 +845,7 @@ _0809CF08: movs r3, 0x1 bl sub_811030C movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram _0809CFB8: movs r0, 0x1 _0809CFBA: @@ -1145,7 +1145,7 @@ _0809D1FA: movs r3, 0xFF bl sub_809CC18 movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram add sp, 0xC pop {r3,r4} mov r8, r3 @@ -1328,7 +1328,7 @@ _0809D31C: movs r1, 0x1 bl sub_80F7750 movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram movs r0, 0x1 b _0809D3C2 .align 2, 0 @@ -1615,7 +1615,7 @@ _0809D572: movs r1, 0x1 bl sub_80F7750 movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram _0809D5F2: movs r0, 0x1 _0809D5F4: @@ -1953,7 +1953,7 @@ _0809D844: movs r3, 0xFF bl sub_809CC18 movs r0, 0 - bl schedule_bg_copy_tilemap_to_vram + bl ScheduleBgCopyTilemapToVram _0809D8A8: add sp, 0xC pop {r3,r4} -- cgit v1.2.3 From 0d46c60b383d5feca05950e57bb05dc392f815cc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 05:47:01 +0800 Subject: thru DisplayYesNoMenuDefaultNo() --- asm/script_menu.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 54c3d6691..e6a1cc48f 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -249,7 +249,7 @@ _0809CB02: lsrs r5, r0, 24 adds r0, r5, 0 movs r1, 0 - bl sub_80F7750 + bl SetStdWindowBorderStyle mov r2, r10 cmp r2, 0x1E beq _0809CB32 @@ -636,7 +636,7 @@ _0809CE08: lsls r0, 24 cmp r0, 0 bne _0809CE26 - bl sub_80F7858 + bl DisplayYesNoMenuDefaultYes adds r0, r4, 0 movs r1, 0x50 bl CreateTask @@ -822,7 +822,7 @@ _0809CF08: lsrs r0, 24 strh r0, [r4, 0x14] movs r1, 0 - bl sub_80F7750 + bl SetStdWindowBorderStyle ldrb r0, [r4, 0x14] lsls r5, 27 lsrs r5, 24 @@ -989,7 +989,7 @@ _0809D0B0: lsrs r6, r0, 24 adds r0, r6, 0 movs r1, 0 - bl sub_80F7750 + bl SetStdWindowBorderStyle ldr r2, _0809D128 @ =gUnknown_8417BD3 movs r0, 0x22 str r0, [sp] @@ -1050,7 +1050,7 @@ _0809D14C: lsrs r6, r0, 24 adds r0, r6, 0 movs r1, 0 - bl sub_80F7750 + bl SetStdWindowBorderStyle mov r0, r8 bl FlagGet lsls r0, 24 @@ -1326,7 +1326,7 @@ _0809D31C: strb r0, [r1, 0x5] ldrb r0, [r3, 0x12] movs r1, 0x1 - bl sub_80F7750 + bl SetStdWindowBorderStyle movs r0, 0 bl ScheduleBgCopyTilemapToVram movs r0, 0x1 @@ -1613,7 +1613,7 @@ _0809D572: strh r2, [r1, 0x8] strh r5, [r1, 0xC] movs r1, 0x1 - bl sub_80F7750 + bl SetStdWindowBorderStyle movs r0, 0 bl ScheduleBgCopyTilemapToVram _0809D5F2: @@ -1859,7 +1859,7 @@ _0809D7B8: lsrs r7, r0, 24 adds r0, r7, 0 movs r1, 0 - bl sub_80F7750 + bl SetStdWindowBorderStyle movs r6, 0 mov r5, r9 subs r5, 0x2 -- cgit v1.2.3 From f7aaf6234311435ca7bb2e5b094df6dfa8ab1827 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 26 Jun 2019 07:31:39 +0800 Subject: finished hof_pc --- asm/script_menu.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 69e487bcc..f99f541fe 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -914,8 +914,8 @@ _0809D034: _0809D03C: .4byte gSpecialVar_Result thumb_func_end sub_809CFDC - thumb_func_start sp109_CreatePCMenu -sp109_CreatePCMenu: @ 809D040 + thumb_func_start ScrSpecial_CreatePCMenu +ScrSpecial_CreatePCMenu: @ 809D040 push {lr} ldr r0, _0809D060 @ =sub_809CC98 bl FuncIsActiveTask @@ -937,7 +937,7 @@ _0809D068: _0809D06A: pop {r1} bx r1 - thumb_func_end sp109_CreatePCMenu + thumb_func_end ScrSpecial_CreatePCMenu thumb_func_start sub_809D070 sub_809D070: @ 809D070 @@ -1159,8 +1159,8 @@ _0809D24C: .4byte gStringVar4 _0809D250: .4byte gUnknown_8417BB6 thumb_func_end sub_809D070 - thumb_func_start sub_809D254 -sub_809D254: @ 809D254 + thumb_func_start ScriptMenu_DisplayPCStartupPrompt +ScriptMenu_DisplayPCStartupPrompt: @ 809D254 push {lr} sub sp, 0x10 movs r0, 0 @@ -1184,7 +1184,7 @@ sub_809D254: @ 809D254 bx r0 .align 2, 0 _0809D284: .4byte gUnknown_81A508A - thumb_func_end sub_809D254 + thumb_func_end ScriptMenu_DisplayPCStartupPrompt thumb_func_start sub_809D288 sub_809D288: @ 809D288 -- cgit v1.2.3 From e0e81c5fbe6a0c0bdcbb5a1de5e16dfb1ffdc091 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 9 Jul 2019 14:07:19 +0800 Subject: finished menu (1 failed attempt) --- asm/script_menu.s | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 0d5cabbcf..4a5f2e858 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -271,7 +271,7 @@ _0809CB32: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl sub_810FBE8 + bl PrintMultichoiceListItems b _0809CB7A .align 2, 0 _0809CB54: .4byte sub_809D6D4 @@ -290,7 +290,7 @@ _0809CB5C: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl sub_810FBE8 + bl PrintMultichoiceListItems _0809CB7A: movs r0, 0xE str r0, [sp] @@ -301,7 +301,7 @@ _0809CB7A: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor ldr r0, [sp, 0x18] adds r1, r7, 0 adds r2, r5, 0 @@ -475,10 +475,10 @@ _0809CCD0: ldrsh r0, [r5, r1] cmp r0, 0 bne _0809CCDE - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround b _0809CCE2 _0809CCDE: - bl ProcessMenuInput + bl Menu_ProcessInput _0809CCE2: lsls r0, 24 lsrs r4, r0, 24 @@ -562,7 +562,7 @@ _0809CD78: bl FillWindowPixelBuffer ldr r4, _0809CDAC @ =gUnknown_83E0738 _0809CD82: - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -587,7 +587,7 @@ _0809CDB0: movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, _0809CDE8 @ =gUnknown_83E0748 - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -833,7 +833,7 @@ _0809CF08: movs r1, 0x1 adds r2, r5, 0 movs r3, 0x10 - bl sub_8110104 + bl MultichoiceGridPrintItems ldrb r0, [r4, 0x14] str r5, [sp] str r7, [sp, 0x4] @@ -843,7 +843,7 @@ _0809CF08: movs r1, 0x1 movs r2, 0 movs r3, 0x1 - bl sub_811030C + bl MultichoiceGridInitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram _0809CFB8: @@ -874,7 +874,7 @@ sub_809CFDC: @ 809CFDC lsls r0, 3 ldr r1, _0809D018 @ =gTasks+0x8 adds r5, r0, r1 - bl sub_8110650 + bl Menu_ProcessInputGridLayout lsls r0, 24 asrs r1, r0, 24 movs r0, 0x2 @@ -1138,7 +1138,7 @@ _0809D1FA: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 mov r1, r9 adds r2, r6, 0 @@ -1721,7 +1721,7 @@ sub_809D6B0: @ 809D6B0 bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent adds r0, r4, 0 bl RemoveWindow pop {r4} @@ -1946,7 +1946,7 @@ _0809D844: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 mov r1, r9 adds r2, r7, 0 -- cgit v1.2.3 From 9d539994652736c50a054c8d3c6beb8f221f3428 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 10 Jul 2019 03:21:34 +0800 Subject: polish and bug fix --- asm/script_menu.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'asm/script_menu.s') diff --git a/asm/script_menu.s b/asm/script_menu.s index 4a5f2e858..59af843f1 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -271,7 +271,7 @@ _0809CB32: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl PrintMultichoiceListItems + bl MultichoiceList_PrintItems b _0809CB7A .align 2, 0 _0809CB54: .4byte sub_809D6D4 @@ -290,7 +290,7 @@ _0809CB5C: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl PrintMultichoiceListItems + bl MultichoiceList_PrintItems _0809CB7A: movs r0, 0xE str r0, [sp] @@ -833,7 +833,7 @@ _0809CF08: movs r1, 0x1 adds r2, r5, 0 movs r3, 0x10 - bl MultichoiceGridPrintItems + bl MultichoiceGrid_PrintItems ldrb r0, [r4, 0x14] str r5, [sp] str r7, [sp, 0x4] @@ -843,7 +843,7 @@ _0809CF08: movs r1, 0x1 movs r2, 0 movs r3, 0x1 - bl MultichoiceGridInitCursor + bl MultichoiceGrid_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram _0809CFB8: -- cgit v1.2.3