Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	ASM/c/debug.h
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -84,16 +84,17 @@ static uint8_t debugNumberIsInUsage[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static int32_t debugNumbers[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 static float debugNumbersFloat[10] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
 static menu_index_t current_menu_indexes = {0, 0, 0, 0, 0, 0, 0, 0};
-static uint8_t show_warp_menu = 0;
+static bool show_warp_menu = 0;
 
 typedef void(*usebutton_t)(z64_game_t* game, z64_link_t* link, uint8_t item, uint8_t button);
 #define z64_usebutton ((usebutton_t)    0x8038C9A0)
 
 void debug_utilities(z64_disp_buf_t* db);
 void draw_debug_menu(z64_disp_buf_t* db);
 void draw_debug_numbers(z64_disp_buf_t* db);
-int debug_menu_is_drawn();
+bool debug_menu_is_drawn();
 void draw_debug_int(int whichNumber, int numberToShow);
 void draw_debug_float(int whichNumber, float numberToShow);
+void manage_debug_inputs();
 
 #endif

ASM/build/bundle.o

@@ -1,5 +1,4 @@
 #include "message.h"
-#include "z64.h"
 #include "stdbool.h"
 #include "save.h"
 #include "dungeon_info.h"
@@ -26,7 +25,7 @@ char FILENAME_ENCODING[256] = {
 
 extern uint8_t PLAYER_NAMES[256][8];
 extern uint8_t PLAYER_NAME_ID;
-
+uint16_t current_textbox_id;
 // Helper function for adding characters to the decoded message buffer
 void Message_AddCharacter(MessageContext* msgCtx, void* pFont, uint32_t* pDecodedBufPos, uint32_t* pCharTexIdx, uint8_t charToAdd) {
     uint32_t decodedBufPosVal = *pDecodedBufPos;
@@ -219,6 +218,14 @@ bool Message_Decode_Additional_Control_Codes(uint8_t currChar, uint32_t* pDecode
     }
 }
 
+void grab_textbox_id(z64_game_t* play, uint16_t textId)
+{
+    // Displaced code
+    Message_OpenText(play, textId);
+
+    current_textbox_id = textId;
+}
+
 uint8_t shooting_gallery_show_message = 0;
 // Displays a warning message if player did adult shooting gallery without bow.
 void shooting_gallery_message() {

ASM/build/c_symbols.txt

@@ -1,6 +1,10 @@
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
+#include "z64.h"
+
+extern uint16_t current_textbox_id;
+void Message_OpenText(z64_game_t* play, uint16_t textId);
 void display_misc_messages();
 
 #endif

ASM/c/debug.c

@@ -21,6 +21,7 @@ CutsceneFlags_Get = 0x8005991C;
 z64_Gfx_SetupDL_42Opa = 0x8007E868;
 Audio_StopCurrentMusic = 0x800C7684;
 sprintf = 0x800CE7b4;
+Message_OpenText = 0x800DC838;
 Fault_AddHungupAndCrashImpl = 0x800AF564;
 z64_ItemIcons = 0x800F8D2C;
 z64_SfxDefaultPos = 0x80104394;

ASM/c/debug.h

@@ -4234,6 +4234,7 @@ DemoEffect_DrawJewel_AfterHook:
 .include "hacks/z_parameter.asm"
 .include "hacks/ovl_en_po_field.asm"
 .include "hacks/z_title.asm"
+.include "hacks/message.asm"
 .include "hacks/z_file_choose.asm"
 .include "hacks/ovl_en_changer.asm"
 .include "hacks/ovl_en_ssh.asm"

ASM/c/message.c

@@ -0,0 +1,4 @@
+.headersize(0x800D5EF0 - 0x00B4BE50)
+.org 0x800DCE38
+    ; Replaces jal     func_800DC838
+    jal     grab_textbox_id