From 3619aade49777599bea816cf2be1c90bea0622b3 Mon Sep 17 00:00:00 2001 From: Masaru2 Date: Fri, 27 Aug 2021 12:10:11 -0400 Subject: [PATCH] A bunch of improvements and fixes --- engine/debug/color_picker.asm | 4 ++-- engine/debug/debug_room.asm | 4 +--- home/menu.asm | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/engine/debug/color_picker.asm b/engine/debug/color_picker.asm index 80abd70a6..f9a03c30e 100644 --- a/engine/debug/color_picker.asm +++ b/engine/debug/color_picker.asm @@ -1059,8 +1059,8 @@ DebugColor_PlaceCursor: DebugColor_AreYouFinishedString: db "Done?" - next "YES", DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_A - next "NO", DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_BLACK, DEBUGTEST_B + next "YES", DEBUGTEST_A + next "NO", DEBUGTEST_BLACK, "", DEBUGTEST_B db "@" DebugColor_UpArrowGFX: diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 6381f2605..5104b7219 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -1770,12 +1770,10 @@ PrintHexNumber: .HexDigits: db "0123456789ABCDEF" - -DebugRoomMenu_ColorMenu: - farcall DebugColorPicker DebugRoomMenu_TrainerMenu: ld a, 1 ld [wDebugColorIsTrainer], a +DebugRoomMenu_ColorMenu: farcall DebugColorPicker ret diff --git a/home/menu.asm b/home/menu.asm index 5a3257150..83e9b3597 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -844,4 +844,4 @@ InterpretMobileMenu:: ; unreferenced ld [wMenuData_2DMenuItemStringsBank], a farcall _InterpretMobileMenu ld a, [wMenuCursorPosition] - ret + ret \ No newline at end of file