diff --git a/ASM/README.md b/ASM/README.md index ea271a8a1..c300555d2 100644 --- a/ASM/README.md +++ b/ASM/README.md @@ -17,7 +17,7 @@ How to use the Debug mode: - You will then have access to a hidden menu with the following options: - Instant warps to Dungeons, Bosses or Overworld locations - Item inventory edits - - Instant age switch + - Instant age switch with the current location kept - Bunny Hood applied on The menu will appear if you press either L+R or Dpad-Up according to what you set for the menu_not_on_dup variable in debug.c. Use Dpad-Left/Dpad-Right and A/B to navigate it. @@ -26,4 +26,3 @@ The warps and items are easily customizable with the code at the top of debug.c. - Additionally, you can call functions to print numbers on screen, to help you debug new features. Call either draw_debug_int or draw_debug_float in your code, with the first argument being the number wanted to be displayed, and the second argument its place on the screen (up to 10 values). -- An input display is also available, but the icons are currently bugged on Dolphin. \ No newline at end of file diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt index 9b470fc00..d3c55cab6 100644 --- a/ASM/build/asm_symbols.txt +++ b/ASM/build/asm_symbols.txt @@ -1518,8 +1518,6 @@ 80420AD0 texture_table 80420CC0 .byt:0001 80420CC0 float_precision -80420CC1 .byt:0001 -80420CC1 show_input_viewer 80420CC4 .byt:0003 80420CC4 debug_text_color 80420CC7 .byt:0001 diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o index 0cff6b6c2..1ac63100d 100644 Binary files a/ASM/build/bundle.o and b/ASM/build/bundle.o differ diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt index 13ea2a4b8..2e8bdb577 100644 --- a/ASM/build/c_symbols.txt +++ b/ASM/build/c_symbols.txt @@ -431,7 +431,6 @@ SYMBOL TABLE: 00000000 *UND* 00000000 CFG_RAINBOW_BOMBCHU_TRAIL_INNER_ENABLED 000146f4 g F .text 0000003c SaveFile_UnsetTradeItemAsOwned 0000c0dc g F .text 0000015c draw_gi_bullet_bags -00000001 g O .sdata 00000001 show_input_viewer 0000a484 g F .text 000001a0 sprite_load 0000b40c g F .text 000000a4 draw_gi_sold_out 000099f4 g F .text 00000054 Item_DropCollectible_Actor_Spawn_Override diff --git a/ASM/c/debug.c b/ASM/c/debug.c index 1637dbf25..2749ddab0 100644 --- a/ASM/c/debug.c +++ b/ASM/c/debug.c @@ -3,7 +3,6 @@ const int8_t debug_text_width = 16; const int8_t debug_text_height = 16; colorRGB8_t debug_text_color = { 0xE0, 0xE0, 0x10 }; // Yellow -int8_t show_input_viewer = 1; int8_t float_precision = 5; int8_t menu_not_on_dup = 0; diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt index 80b4ebd71..dd82352f2 100644 --- a/data/generated/rom_patch.txt +++ b/data/generated/rom_patch.txt @@ -31225,7 +31225,7 @@ fec1fc,9000000 34a0c90,1c 34a0ca0,1d 34a0cb0,1e -34a0cc0,5010000 +34a0cc0,5000000 34a0cc4,e0e01010 34a0cc8,10000000 34a0ccc,d diff --git a/data/generated/symbols.json b/data/generated/symbols.json index 619bd9c85..6e5554092 100644 --- a/data/generated/symbols.json +++ b/data/generated/symbols.json @@ -269,7 +269,6 @@ "satisified_pending_frames": "034A0DA6", "scene_fog_distance": "034A0CD4", "setup_db": "0349D2F8", - "show_input_viewer": "034A0CC1", "silver_rupee_vars": "0349E7F0", "song_note_sprite": "0349D278", "stones_sprite": "0349D2E8",