From 1d70c1e4ca11ecdf21beaebcfbc3eedc2b6dea95 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Jun 2018 11:06:39 -0400 Subject: Some label changes and suggestions --- home/window.asm | 6 +++--- shim.sym | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/home/window.asm b/home/window.asm index 902b427..da1c838 100644 --- a/home/window.asm +++ b/home/window.asm @@ -91,7 +91,7 @@ GetMenuIndexSet:: ; 00:1ec3 ret Function1ee9:: ; 1ee9 - call Function1d2d + call MenuBoxCoord2Tile call Function1c86 ld a, [wMenuDataItems] add a @@ -110,7 +110,7 @@ Function1ee9:: ; 1ee9 ret RunMenuItemPrintingFunction:: ; 00:1f02 - call Function1d2d + call MenuBoxCoord2Tile ld bc, 2 * SCREEN_WIDTH + 2 add hl, bc .asm_1f09: ; 00:1f09 @@ -140,7 +140,7 @@ RunMenuItemPrintingFunction:: ; 00:1f02 Function1f27:: ; 00:1f27 ; Combines Crystal functions "InitMenuCursorAndButtonPermissions" and "GetStaticMenuJoypad" push de - call Function1c44 + call InitVerticalMenuCursor ld hl, wMenuJoypadFilter ld a, [wMenuData2] bit 3, a diff --git a/shim.sym b/shim.sym index 0347f2b..995cbd7 100644 --- a/shim.sym +++ b/shim.sym @@ -5,14 +5,14 @@ 00:17BF GetObjectStruct 00:1A7C Function1a7c 00:1BF4 Function1bf4 -00:1C44 Function1c44 -00:1C60 Function1c60 -00:1C7A Function1c7a +00:1C44 InitVerticalMenuCursor +00:1C60 Function1c60 ; PopWindow? +00:1C7A Function1c7a ; HandleWindow? 00:1C86 Function1c86 -00:1C96 Function1c96 -00:1CAE Function1cae +00:1C96 Function1c96 ; CopyMenuData? +00:1CAE Function1cae ; PushWindow? 00:1CEB Function1ceb -00:1D2D Function1d2d +00:1D2D MenuBoxCoord2Tile 00:1D49 LoadMenuHeader 00:202C Function202c -- cgit v1.2.3