diff options
| author | dannye <33dannye@gmail.com> | 2020-12-20 13:19:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-20 13:19:33 -0600 |
| commit | b276b23d4e9ea34d64766ddb92c768b4bc4f1b8f (patch) | |
| tree | 9ba304cf8d635d6f6c81c85ce864b0311108b414 /tools | |
| parent | a134c1f9a9c197ee9662c8177fa487ec938f5294 (diff) | |
| parent | 68f371effcfc31927dc093a68505af85f523d243 (diff) | |
Merge branch 'master' of https://github.com/pret/poketcg
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/script_extractor.py | 8 | ||||
| -rw-r--r-- | tools/tcgdisasm.py | 21 |
2 files changed, 15 insertions, 14 deletions
diff --git a/tools/script_extractor.py b/tools/script_extractor.py index 812678c..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), - ("Func_d24c", "q", DO_NOT_QUIT), + ("ScriptCommand_ShowMultichoiceTextbox_ChooseDeckToDuelAgainst", "q", DO_NOT_QUIT), ("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT), - ("Func_d271", "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), @@ -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), 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: |