diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 17:31:00 -0500 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-12-20 17:31:00 -0500 |
| commit | e8ec8efa902ea56cf17bdcd908067247d13ee28d (patch) | |
| tree | ba708ba6b0e0125148de6de2c48713d0b64d70de /tools/script_extractor.py | |
| parent | 5930b53dd28705197ebfc1a905ea3175552ba39a (diff) | |
| parent | 9fab715759ddf919b0c4bb9a01095c4c225fcac0 (diff) | |
Merge in master (and update some macros)
Diffstat (limited to 'tools/script_extractor.py')
| -rwxr-xr-x[-rw-r--r--] | tools/script_extractor.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/script_extractor.py b/tools/script_extractor.py index 776d45f..8869c66 100644..100755 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -268,9 +268,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,"quit_script_fully"), ("Func_d244", "q", DO_NOT_QUIT,""), - ("Func_d24c", "q", DO_NOT_QUIT,""), + ("ScriptCommand_ChooseDeckToDuelAgainstMultichoice", "", DO_NOT_QUIT,"choose_deck_to_duel_against_multichoice"), ("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT,"open_deck_machine"), - ("Func_d271", "q", DO_NOT_QUIT,""), + ("ScriptCommand_ChooseStarterDeckMultichoice", "", DO_NOT_QUIT,""), ("ScriptCommand_EnterMap", "bbood", DO_NOT_QUIT,"enter_map"), ("ScriptCommand_MoveArbitraryNPC", "bm", DO_NOT_QUIT,"move_arbitrary_npc"), ("Func_d209", "", DO_NOT_QUIT,""), @@ -293,8 +293,8 @@ def createList(): # this is a func just so all this can go at the bottom ("ScriptCommand_WaitForSongToFinish", "", DO_NOT_QUIT,"wait_for_song_to_finish"), ("Func_d435", "b", DO_NOT_QUIT,""), ("ScriptCommand_AskQuestionJumpDefaultYes", "tj", DO_NOT_QUIT,"ask_question_jump_default_yes"), - ("Func_d2f6", "q", DO_NOT_QUIT,""), - ("Func_d317", "", DO_NOT_QUIT,""), + ("ScriptCommand_ShowSamNormalMultichoice", "", DO_NOT_QUIT,"show_sam_normal_multichoice"), + ("ScriptCommand_ShowSamTutorialMultichoice", "", DO_NOT_QUIT,"show_sam_tutorial_multichoice"), ("Func_d43d", "", DO_NOT_QUIT,""), ("ScriptCommand_EndScriptLoop2", "", QUIT_CONTINUE_CODE,"end_script_loop_2"), ("ScriptCommand_EndScriptLoop3", "", QUIT_CONTINUE_CODE,"end_script_loop_3"), |