diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/script_extractor.py | 52 | 
1 files changed, 26 insertions, 26 deletions
| diff --git a/tools/script_extractor.py b/tools/script_extractor.py index bfc2eb8..fd1028c 100644 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -251,62 +251,62 @@ def createList(): # this is a func just so all this can go at the bottom  	("Func_d0be", "bb", DO_NOT_QUIT,""),  	("ScriptCommand_DoFrames", "i", DO_NOT_QUIT,"do_frames"),  	("Func_d0d9", "bbw", DO_NOT_QUIT,""), # jumps but still needs args -	("ScriptCommand_JumpIfPlayerCoordMatches", "iij", DO_NOT_QUIT,""), # jumps but still needs args -	("ScriptCommand_MoveActiveNPC", "m", DO_NOT_QUIT,""), -	("ScriptCommand_GiveOneOfEachTrainerBooster", "", DO_NOT_QUIT,""), +	("ScriptCommand_JumpIfPlayerCoordsMatch", "iij", DO_NOT_QUIT,"jump_if_player_coords_match"), # jumps but still needs args +	("ScriptCommand_MoveActiveNPC", "m", DO_NOT_QUIT,"move_active_npc"), +	("ScriptCommand_GiveOneOfEachTrainerBooster", "", DO_NOT_QUIT,"give_one_of_each_trainer_booster"),  	("Func_d103", "q", DO_NOT_QUIT,""),  	("Func_d125", "b", DO_NOT_QUIT,""),  	("Func_d135", "b", DO_NOT_QUIT,""),  	("Func_d16b", "b", DO_NOT_QUIT,""),  	("Func_cd4f", "bbb", DO_NOT_QUIT,""),  	("Func_cd94", "q", DO_NOT_QUIT,""), -	("ScriptCommand_MoveWramNPC", "m", DO_NOT_QUIT,""), +	("ScriptCommand_MoveWramNPC", "m", DO_NOT_QUIT,"move_wram_npc"),  	("Func_cdd8", "", DO_NOT_QUIT,""),  	("Func_cdf5", "bb", DO_NOT_QUIT,""),  	("Func_d195", "", DO_NOT_QUIT,""),  	("Func_d1ad", "", DO_NOT_QUIT,""),  	("Func_d1b3", "", DO_NOT_QUIT,""), -	("ScriptCommand_QuitScriptFully", "", QUIT_SPECIAL,""), +	("ScriptCommand_QuitScriptFully", "", QUIT_SPECIAL,"quit_script_fully"),  	("Func_d244", "q", DO_NOT_QUIT,""),  	("Func_d24c", "q", DO_NOT_QUIT,""), -	("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT,""), +	("ScriptCommand_OpenDeckMachine", "b", DO_NOT_QUIT,"open_deck_machine"),  	("Func_d271", "q", DO_NOT_QUIT,""), -	("ScriptCommand_EnterMap", "bbood", DO_NOT_QUIT,""), -	("ScriptCommand_MoveArbitraryNPC", "bm", 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,""),  	("Func_d38f", "b", DO_NOT_QUIT,""),  	("Func_d396", "b", DO_NOT_QUIT,""),  	("Func_cd76", "", DO_NOT_QUIT,""),  	("Func_d39d", "b", DO_NOT_QUIT,""),  	("Func_d3b9", "", DO_NOT_QUIT,""), -	("ScriptCommand_TryGivePCPack", "b", DO_NOT_QUIT,""), -	("ScriptCommand_nop", "", DO_NOT_QUIT,""), +	("ScriptCommand_TryGivePCPack", "b", DO_NOT_QUIT,"try_give_pc_pack"), +	("ScriptCommand_nop", "", DO_NOT_QUIT,"script_nop"),  	("Func_d3d4", "q", DO_NOT_QUIT,""),  	("Func_d3e0", "", DO_NOT_QUIT,""),  	("Func_d3fe", "q", DO_NOT_QUIT,""),  	("Func_d408", "b", DO_NOT_QUIT,""),  	("Func_d40f", "q", DO_NOT_QUIT,""), -	("ScriptCommand_PlaySFX", "b", DO_NOT_QUIT,""), -	("ScriptCommand_PauseSong", "q", DO_NOT_QUIT,""), -	("ScriptCommand_ResumeSong", "q", DO_NOT_QUIT,""), +	("ScriptCommand_PlaySFX", "b", DO_NOT_QUIT,"play_sfx"), +	("ScriptCommand_PauseSong", "", DO_NOT_QUIT,"pause_song"), +	("ScriptCommand_ResumeSong", "", DO_NOT_QUIT,"resume_song"),  	("Func_d41d", "", DO_NOT_QUIT,""), -	("ScriptCommand_WaitForSongToFinish", "q", DO_NOT_QUIT,""), +	("ScriptCommand_WaitForSongToFinish", "", DO_NOT_QUIT,"wait_for_song_to_finish"),  	("Func_d435", "b", DO_NOT_QUIT,""), -	("ScriptCommand_AskQuestionJumpDefaultYes", "tj", 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,""),  	("Func_d43d", "", DO_NOT_QUIT,""), -	("ScriptCommand_EndScriptLoop2", "q", QUIT_CONTINUE_CODE,"end_script_loop_2"), -	("ScriptCommand_EndScriptLoop3", "q", QUIT_CONTINUE_CODE,"end_script_loop_3"), -	("ScriptCommand_EndScriptLoop4", "q", QUIT_CONTINUE_CODE,"end_script_loop_4"), -	("ScriptCommand_EndScriptLoop5", "q", QUIT_CONTINUE_CODE,"end_script_loop_5"), -	("ScriptCommand_EndScriptLoop6", "q", QUIT_CONTINUE_CODE,"end_script_loop_6"), -	("ScriptCommand_SetFlagValue", "fb", DO_NOT_QUIT,""), -	("ScriptCommand_JumpIfFlagZero1", "fj", DO_NOT_QUIT,""), -	("ScriptCommand_JumpIfFlagNonzero1", "q", DO_NOT_QUIT,""), -	("ScriptCommand_JumpIfFlagEqual", "fbj", DO_NOT_QUIT,""), # also capable of jumping -	("ScriptCommand_JumpIfFlagNotEqual", "fbj", DO_NOT_QUIT,""), # jumps -	("ScriptCommand_JumpIfFlagNotLessThan", "fbj", DO_NOT_QUIT,""), +	("ScriptCommand_EndScriptLoop2", "", QUIT_CONTINUE_CODE,"end_script_loop_2"), +	("ScriptCommand_EndScriptLoop3", "", QUIT_CONTINUE_CODE,"end_script_loop_3"), +	("ScriptCommand_EndScriptLoop4", "", QUIT_CONTINUE_CODE,"end_script_loop_4"), +	("ScriptCommand_EndScriptLoop5", "", QUIT_CONTINUE_CODE,"end_script_loop_5"), +	("ScriptCommand_EndScriptLoop6", "", QUIT_CONTINUE_CODE,"end_script_loop_6"), +	("ScriptCommand_SetFlagValue", "fb", DO_NOT_QUIT,"script_set_flag_value"), +	("ScriptCommand_JumpIfFlagZero1", "fj", DO_NOT_QUIT,"jump_if_flag_zero_1"), +	("ScriptCommand_JumpIfFlagNonzero1", "fj", DO_NOT_QUIT,"jump_if_flag_nonzero_1"), +	("ScriptCommand_JumpIfFlagEqual", "fbj", DO_NOT_QUIT,"jump_if_flag_equal"), +	("ScriptCommand_JumpIfFlagNotEqual", "fbj", DO_NOT_QUIT,"jump_if_flag_not_equal"), +	("ScriptCommand_JumpIfFlagNotLessThan", "fbj", DO_NOT_QUIT,"jump_if_flag_not_less_than"),  	("ScriptCommand_JumpIfFlagLessThan", "fbj", DO_NOT_QUIT,""),  	("ScriptCommand_MaxOutFlagValue", "f", DO_NOT_QUIT,""),  	("ScriptCommand_ZeroOutFlagValue", "f", DO_NOT_QUIT,""), | 
