From 96e1b19dc1ea9dbf686fd26743d79c68d12e0f24 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 6 Jan 2019 13:06:56 -0500 Subject: through ScrCmd_release; propose names for remaining funcs --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 1d81d0392..4a58b11ad 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -11,7 +11,7 @@ sub_806ED54: @ 806ED54 ldr r0, _0806ED6C @ =gUnknown_20370F5 movs r1, 0 strb r1, [r0] - bl sub_805642C + bl is_c1_link_related_active cmp r0, 0x1 bne _0806ED70 bl sub_806EE34 @@ -634,7 +634,7 @@ _0806F254: .4byte gUnknown_20370F0 thumb_func_start ShowStartMenu ShowStartMenu: @ 806F258 push {lr} - bl sub_805642C + bl is_c1_link_related_active cmp r0, 0 bne _0806F26E bl player_bitmagic -- cgit v1.2.3 From e1bd043bf3049b8a91b718ca1e4416711f0b8646 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 7 Jan 2019 15:32:11 -0500 Subject: through sub_8059250 --- asm/start_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 4a58b11ad..cfd970001 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1109,7 +1109,7 @@ _0806F61E: thumb_func_start sub_806F624 sub_806F624: @ 806F624 push {lr} - bl sub_80590D8 + bl save_serialize_map ldr r1, _0806F63C @ =gUnknown_3000FA4 ldr r0, _0806F640 @ =sub_806F7A8 str r0, [r1] -- cgit v1.2.3 From fb423f957dc8944edf0b822a7aaa1949434ac65e Mon Sep 17 00:00:00 2001 From: scnorton Date: Tue, 9 Apr 2019 14:30:54 -0400 Subject: sub_812EB58; port scanline_effect --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index cfd970001..1cc3a7919 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1713,7 +1713,7 @@ _0806FA88: bl SetGpuReg movs r0, 0 bl SetVBlankCallback - bl remove_some_task + bl ScanlineEffect_Stop movs r2, 0xA0 lsls r2, 19 mov r1, sp @@ -1767,7 +1767,7 @@ _0806FB00: bl ResetSpriteData bl ResetTasks bl ResetPaletteFade - bl dp12_8087EA4 + bl ScanlineEffect_Clear b _0806FB64 _0806FB12: movs r0, 0 -- cgit v1.2.3 From 915694e8a7a5967d76bcbe544d671bb2f962f608 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 11 Apr 2019 18:26:02 -0400 Subject: Documentation of oak_speech --- asm/start_menu.s | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 1cc3a7919..65a1e4402 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -158,7 +158,7 @@ sub_806EE7C: @ 806EE7C bl PutWindowTilemap ldrb r0, [r4] movs r1, 0 - bl sub_80F6F1C + bl DrawStdWindowFrame ldr r0, _0806EEFC @ =gStringVar1 ldr r1, _0806EF00 @ =gUnknown_2039996 ldrh r1, [r1] @@ -390,7 +390,7 @@ _0806F06C: lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_80F6F1C + bl DrawStdWindowFrame ldr r1, _0806F08C @ =gUnknown_20370FF b _0806F0B8 .align 2, 0 @@ -438,7 +438,7 @@ _0806F0C4: movs r1, 0x2 movs r2, 0 movs r3, 0 - bl sub_810F7D8 + bl ProgramAndPlaceMenuCursorOnWindow strb r0, [r4] bl sub_80BF708 lsls r0, 24 @@ -1049,7 +1049,7 @@ sub_806F5A4: @ 806F5A4 push {lr} bl sub_812B234 movs r0, 0xC - bl sub_812B1F0 + bl HelpSystem_SetSomeVariable2 bl sub_806F624 ldr r1, _0806F5C0 @ =gUnknown_20370F0 ldr r0, _0806F5C4 @ =sub_806F5C8 @@ -1156,7 +1156,7 @@ sub_806F67C: @ 806F67C push {lr} bl sub_812B234 movs r0, 0xC - bl sub_812B1F0 + bl HelpSystem_SetSomeVariable2 bl sub_806F624 ldr r0, _0806F698 @ =task50_save_game movs r1, 0x50 @@ -1239,7 +1239,7 @@ sub_806F71C: @ 806F71C push {lr} movs r0, 0 movs r1, 0x1 - bl sub_80F6F54 + bl ClearDialogWindowAndFrame pop {r0} bx r0 thumb_func_end sub_806F71C @@ -1328,7 +1328,7 @@ sub_806F7A8: @ 806F7A8 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_80F6F9C + bl ClearStdWindowAndFrame bl remove_start_menu_window_maybe movs r0, 0 bl sub_8112EDC @@ -2178,7 +2178,7 @@ sub_806FE84: @ 806FE84 ldr r4, _0806FE9C @ =gUnknown_2037104 ldrb r0, [r4] movs r1, 0 - bl sub_80F6F9C + bl ClearStdWindowAndFrame ldrb r0, [r4] bl RemoveWindow pop {r4} @@ -2197,7 +2197,7 @@ sub_806FEA0: @ 806FEA0 lsls r0, 24 lsrs r0, 24 movs r1, 0x1 - bl sub_80F6F9C + bl ClearStdWindowAndFrame bl remove_start_menu_window_maybe bl sub_80696C0 bl ScriptContext2_Disable -- cgit v1.2.3 From d74dda011ad0fc50d3ffb1a98213308e114933cf Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 17 Apr 2019 14:09:54 -0700 Subject: Port fldeff_teleport --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 65a1e4402..124f64792 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -568,13 +568,13 @@ sub_806F1D4: @ 806F1D4 movs r0, 0 strb r0, [r1] strb r0, [r1, 0x1] - ldr r1, _0806F1E8 @ =gUnknown_3005024 + ldr r1, _0806F1E8 @ =gFieldCallback2 ldr r0, _0806F1EC @ =sub_806F1B8 str r0, [r1] bx lr .align 2, 0 _0806F1E4: .4byte gUnknown_20370FF -_0806F1E8: .4byte gUnknown_3005024 +_0806F1E8: .4byte gFieldCallback2 _0806F1EC: .4byte sub_806F1B8 thumb_func_end sub_806F1D4 -- cgit v1.2.3 From 6cebd1f85311b1aa7321eb141521686d21bd091c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 25 Apr 2019 16:52:29 -0400 Subject: through MysteryGift_HandleThreeOptionMenu --- asm/start_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 65a1e4402..e73315789 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1912,7 +1912,7 @@ _0806FC14: movs r0, 0 movs r1, 0x8 movs r2, 0xF - bl sub_8150048 + bl DrawTextBorderOuter movs r0, 0 bl PutWindowTilemap movs r0, 0 -- cgit v1.2.3 From 7f07bd6607df54aa26590d62c561f15daaaf9671 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 May 2019 12:24:15 -0400 Subject: blend_palette --- asm/start_menu.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index d8178a37a..d165dbc36 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -854,7 +854,7 @@ _0806F424: .4byte gPaletteFade _0806F428: movs r0, 0x29 bl IncrementGameStat - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_806EF18 bl sub_80563F0 ldr r0, _0806F448 @ =sub_810275C @@ -881,7 +881,7 @@ sub_806F44C: @ 806F44C .align 2, 0 _0806F460: .4byte gPaletteFade _0806F464: - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_806EF18 bl sub_80563F0 ldr r0, _0806F47C @ =CB2_PartyMenuFromStartMenu @@ -908,7 +908,7 @@ sub_806F480: @ 806F480 .align 2, 0 _0806F494: .4byte gPaletteFade _0806F498: - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_806EF18 bl sub_80563F0 ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu @@ -935,7 +935,7 @@ sub_806F4B4: @ 806F4B4 .align 2, 0 _0806F4C8: .4byte gPaletteFade _0806F4CC: - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_806EF18 bl sub_80563F0 ldr r0, _0806F4E4 @ =sub_80568A8 @@ -974,7 +974,7 @@ sub_806F4FC: @ 806F4FC .align 2, 0 _0806F510: .4byte gPaletteFade _0806F514: - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_806EF18 bl sub_80563F0 ldr r0, _0806F534 @ =sub_8088388 @@ -1029,7 +1029,7 @@ sub_806F56C: @ 806F56C .align 2, 0 _0806F580: .4byte gPaletteFade _0806F584: - bl play_some_sound + bl PlayRainStoppingSoundEffect bl sub_80563F0 ldr r0, _0806F59C @ =gUnknown_300502C ldrb r0, [r0] -- cgit v1.2.3 From e9e87a0fe47406b5d2881b9360886842b8731c97 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 6 May 2019 10:49:10 -0400 Subject: egg_hatch as part of daycare --- asm/start_menu.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index d165dbc36..3fc08e41a 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -856,7 +856,7 @@ _0806F428: bl IncrementGameStat bl PlayRainStoppingSoundEffect bl sub_806EF18 - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F448 @ =sub_810275C bl SetMainCallback2 movs r0, 0x1 @@ -883,7 +883,7 @@ _0806F460: .4byte gPaletteFade _0806F464: bl PlayRainStoppingSoundEffect bl sub_806EF18 - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F47C @ =CB2_PartyMenuFromStartMenu bl SetMainCallback2 movs r0, 0x1 @@ -910,7 +910,7 @@ _0806F494: .4byte gPaletteFade _0806F498: bl PlayRainStoppingSoundEffect bl sub_806EF18 - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu bl SetMainCallback2 movs r0, 0x1 @@ -937,7 +937,7 @@ _0806F4C8: .4byte gPaletteFade _0806F4CC: bl PlayRainStoppingSoundEffect bl sub_806EF18 - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F4E4 @ =sub_80568A8 bl sub_808B698 movs r0, 0x1 @@ -976,7 +976,7 @@ _0806F510: .4byte gPaletteFade _0806F514: bl PlayRainStoppingSoundEffect bl sub_806EF18 - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F534 @ =sub_8088388 bl SetMainCallback2 ldr r1, _0806F538 @ =gMain @@ -1030,7 +1030,7 @@ sub_806F56C: @ 806F56C _0806F580: .4byte gPaletteFade _0806F584: bl PlayRainStoppingSoundEffect - bl sub_80563F0 + bl CleanupOverworldWindowsAndTilemaps ldr r0, _0806F59C @ =gUnknown_300502C ldrb r0, [r0] ldr r1, _0806F5A0 @ =sub_80568A8 @@ -1362,7 +1362,7 @@ _0806F7F4: .4byte sub_806F7F8 thumb_func_start sub_806F7F8 sub_806F7F8: @ 806F7F8 push {lr} - bl ProcessMenuInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 @@ -1481,7 +1481,7 @@ _0806F8D8: .4byte sub_806F8DC thumb_func_start sub_806F8DC sub_806F8DC: @ 806F8DC push {lr} - bl ProcessMenuInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 -- cgit v1.2.3 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/start_menu.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 3fc08e41a..b24cf4ac3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1908,7 +1908,7 @@ _0806FC14: movs r0, 0 movs r1, 0x2 movs r3, 0xFF - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized3 movs r0, 0 movs r1, 0x8 movs r2, 0xF -- 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/start_menu.s | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index b24cf4ac3..d6707732e 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -1908,7 +1908,7 @@ _0806FC14: movs r0, 0 movs r1, 0x2 movs r3, 0xFF - bl AddTextPrinterParameterized3 + bl AddTextPrinterParameterized2 movs r0, 0 movs r1, 0x8 movs r2, 0xF @@ -2043,7 +2043,7 @@ sub_806FCF4: @ 806FCF4 str r4, [sp, 0x8] movs r1, 0x2 movs r3, 0 - bl box_print + bl AddTextPrinterParameterized3 movs r0, 0x2 adds r1, r4, 0 adds r2, r6, 0 @@ -2058,7 +2058,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0xE - bl box_print + bl AddTextPrinterParameterized3 movs r0, 0 adds r1, r4, 0 movs r2, 0x2 @@ -2077,7 +2077,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0x1C - bl box_print + bl AddTextPrinterParameterized3 movs r0, 0x4 adds r1, r4, 0 movs r2, 0x2 @@ -2091,7 +2091,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x3C movs r3, 0x1C - bl box_print + bl AddTextPrinterParameterized3 movs r7, 0x2A ldr r0, _0806FE78 @ =0x00000829 bl FlagGet @@ -2108,7 +2108,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x2 movs r3, 0x2A - bl box_print + bl AddTextPrinterParameterized3 movs r0, 0x1 adds r1, r4, 0 movs r2, 0x2 @@ -2121,7 +2121,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 movs r2, 0x3C movs r3, 0x2A - bl box_print + bl AddTextPrinterParameterized3 movs r7, 0x38 _0806FE0A: ldrb r0, [r5] @@ -2133,7 +2133,7 @@ _0806FE0A: movs r1, 0 movs r2, 0x2 adds r3, r7, 0 - bl box_print + bl AddTextPrinterParameterized3 movs r0, 0x2 adds r1, r4, 0 movs r2, 0x2 @@ -2146,7 +2146,7 @@ _0806FE0A: movs r1, 0 movs r2, 0x3C adds r3, r7, 0 - bl box_print + bl AddTextPrinterParameterized3 ldrb r0, [r5] movs r1, 0x2 bl CopyWindowToVram -- 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/start_menu.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index d6707732e..358eb7283 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -220,7 +220,7 @@ sub_806EF18: @ 806EF18 ldr r4, _0806EF40 @ =gUnknown_2037101 ldrb r0, [r4] movs r1, 0 - bl sub_810F4D8 + bl ClearMenuWindow ldrb r0, [r4] movs r1, 0x2 bl CopyWindowToVram @@ -440,7 +440,7 @@ _0806F0C4: movs r3, 0 bl ProgramAndPlaceMenuCursorOnWindow strb r0, [r4] - bl sub_80BF708 + bl MenuHelpers_LinkSomething lsls r0, 24 cmp r0, 0 bne _0806F118 @@ -666,7 +666,7 @@ sub_806F280: @ 806F280 bl MoveMenuCursor ldr r4, _0806F360 @ =gUnknown_20370F4 strb r0, [r4] - bl sub_80BF708 + bl MenuHelpers_LinkSomething lsls r0, 24 cmp r0, 0 bne _0806F2D2 @@ -701,7 +701,7 @@ _0806F2D2: bl MoveMenuCursor ldr r4, _0806F360 @ =gUnknown_20370F4 strb r0, [r4] - bl sub_80BF708 + bl MenuHelpers_LinkSomething lsls r0, 24 cmp r0, 0 bne _0806F320 @@ -1080,7 +1080,7 @@ sub_806F5C8: @ 806F5C8 _0806F5E4: movs r0, 0 movs r1, 0 - bl sub_810F260 + bl ClearMenuWindow_BorderThickness2 bl sub_806F14C bl sub_812B248 ldr r1, _0806F5FC @ =gUnknown_20370F0 @@ -1093,7 +1093,7 @@ _0806F600: .4byte sub_806F280 _0806F604: movs r0, 0 movs r1, 0x1 - bl sub_810F260 + bl ClearMenuWindow_BorderThickness2 bl sub_80696C0 bl ScriptContext2_Disable bl sub_812B248 @@ -1781,7 +1781,7 @@ _0806FB12: movs r0, 0 movs r1, 0x8 movs r2, 0xF0 - bl sub_814FF2C + bl TextWindow_SetStdFrame0_WithPal b _0806FB64 .align 2, 0 _0806FB34: .4byte gUnknown_83A73B8 @@ -2014,7 +2014,7 @@ sub_806FCF4: @ 806FCF4 ldr r4, _0806FE5C @ =0x0000021d adds r1, r4, 0 movs r2, 0xD0 - bl sub_814FF2C + bl TextWindow_SetStdFrame0_WithPal ldrb r0, [r5] movs r1, 0 adds r2, r4, 0 -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- asm/start_menu.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'asm/start_menu.s') diff --git a/asm/start_menu.s b/asm/start_menu.s index 358eb7283..9dc9fbab6 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -911,14 +911,14 @@ _0806F498: bl PlayRainStoppingSoundEffect bl sub_806EF18 bl CleanupOverworldWindowsAndTilemaps - ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu + ldr r0, _0806F4B0 @ =ReturnToBagFromKeyItem bl SetMainCallback2 movs r0, 0x1 _0806F4AC: pop {r1} bx r1 .align 2, 0 -_0806F4B0: .4byte UseFameCheckerFromMenu +_0806F4B0: .4byte ReturnToBagFromKeyItem thumb_func_end sub_806F480 thumb_func_start sub_806F4B4 -- cgit v1.2.3