From d70ce81dcd7503b7b849ccfa2a08af4979b7d4e3 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 13 Dec 2020 00:14:24 -0600 Subject: Adding Multichoice Textbox configuration data --- tools/script_extractor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/script_extractor.py b/tools/script_extractor.py index 812678c..ba7427d 100644 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -230,9 +230,9 @@ def createList(): # this is a func just so all this can go at the bottom ("Func_d1b3", "", DO_NOT_QUIT), ("ScriptCommand_QuitScriptFully", "", QUIT_SPECIAL), ("Func_d244", "q", DO_NOT_QUIT), - ("Func_d24c", "q", DO_NOT_QUIT), + ("Show_ChooseDeckToDuelAgainst_MultichoiceTextbox", "q", DO_NOT_QUIT), ("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT), - ("Func_d271", "q", DO_NOT_QUIT), + ("Show_ChooseStarterDeck_MultichoiceTextbox", "q", DO_NOT_QUIT), ("ScriptCommand_EnterMap", "bbood", DO_NOT_QUIT), ("ScriptCommand_MoveArbitraryNPC", "bm", DO_NOT_QUIT), ("Func_d209", "", DO_NOT_QUIT), @@ -255,8 +255,8 @@ def createList(): # this is a func just so all this can go at the bottom ("ScriptCommand_WaitForSongToFinish", "q", DO_NOT_QUIT), ("Func_d435", "b", DO_NOT_QUIT), ("ScriptCommand_AskQuestionJumpDefaultYes", "tj", DO_NOT_QUIT), - ("Func_d2f6", "q", DO_NOT_QUIT), - ("Func_d317", "", DO_NOT_QUIT), + ("ScriptCommand_ShowSamNormalMultichoice", "q", DO_NOT_QUIT), + ("ScriptCommand_ShowSamTutorialMultichoice", "", DO_NOT_QUIT), ("Func_d43d", "", DO_NOT_QUIT), ("ScriptCommand_EndScriptLoop2", "q", QUIT_CONTINUE_CODE), ("ScriptCommand_EndScriptLoop3", "q", QUIT_CONTINUE_CODE), -- cgit v1.2.3 From 45de771f8298595664346b95c812293b1f258ab8 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 13 Dec 2020 00:21:46 -0600 Subject: Normalizing function names --- tools/script_extractor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/script_extractor.py b/tools/script_extractor.py index ba7427d..d8ebc06 100644 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -230,9 +230,9 @@ def createList(): # this is a func just so all this can go at the bottom ("Func_d1b3", "", DO_NOT_QUIT), ("ScriptCommand_QuitScriptFully", "", QUIT_SPECIAL), ("Func_d244", "q", DO_NOT_QUIT), - ("Show_ChooseDeckToDuelAgainst_MultichoiceTextbox", "q", DO_NOT_QUIT), + ("ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst", "q", DO_NOT_QUIT), ("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT), - ("Show_ChooseStarterDeck_MultichoiceTextbox", "q", DO_NOT_QUIT), + ("ScriptCommand_ShowMultichoiceTextbox_ChooseStarterDeck", "q", DO_NOT_QUIT), ("ScriptCommand_EnterMap", "bbood", DO_NOT_QUIT), ("ScriptCommand_MoveArbitraryNPC", "bm", DO_NOT_QUIT), ("Func_d209", "", DO_NOT_QUIT), -- cgit v1.2.3 From 117efe39b6b297dc52c1b5ad4d3012e7b00c8bd7 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Tue, 15 Dec 2020 20:47:13 +0100 Subject: Misc progress related to duel effect functions --- tools/tcgdisasm.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'tools') diff --git a/tools/tcgdisasm.py b/tools/tcgdisasm.py index 579d577..a887b1e 100644 --- a/tools/tcgdisasm.py +++ b/tools/tcgdisasm.py @@ -763,16 +763,17 @@ class Disassembler(object): # handle the special flag macros found_flag_macro = False - for flag_macro in flag_macros: - if flag_macro[0] == target_offset: - found_flag_macro = True - current_flag_macro = flag_macro - event_flag = "EVENT_FLAG_" + format(opcode_arg_3, "02X") - opcode_output_str = flag_macro[1].format(event_flag) - - # we need to skip a byte since this macro takes one extra - opcode_nargs+=1 - break + if opcode_byte == 0xcd: + for flag_macro in flag_macros: + if flag_macro[0] == target_offset: + found_flag_macro = True + current_flag_macro = flag_macro + event_flag = "EVENT_FLAG_" + format(opcode_arg_3, "02X") + opcode_output_str = flag_macro[1].format(event_flag) + + # we need to skip a byte since this macro takes one extra + opcode_nargs+=1 + break if not found_flag_macro and opcode_byte in call_commands + absolute_jumps: -- cgit v1.2.3