diff options
| author | Daniel Harding <33dannye@gmail.com> | 2021-01-20 18:45:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-20 18:45:14 -0600 |
| commit | dc57997f0e3268e6c9a621429f01c55a96e21bc8 (patch) | |
| tree | 32040dc6deb308575b0ad9736bab962be311d077 /tools/script_extractor.py | |
| parent | ea07840c6eb327b0caddfcaca8bbbfb8173a4eab (diff) | |
| parent | 8a71ce39643684d73f67c87d650d3f352e55103f (diff) | |
Merge pull request #90 from dannye/master
Scripts and labels
Diffstat (limited to 'tools/script_extractor.py')
| -rwxr-xr-x | tools/script_extractor.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/script_extractor.py b/tools/script_extractor.py index 8869c66..ed8eaf9 100755 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -86,9 +86,9 @@ def decodeLine(scriptList, game_data, loc, ignore_broken, locList): wordLoc = (game_data[loc] + (game_data[loc+1]<<8)) if wordLoc == 0000: if macroMode: - ret += "NO_JUMP, " + ret += "NULL, " else: - ret += "\tdw NO_JUMP\n" + ret += "\tdw NULL\n" else: if macroMode: ret += ".ows_" + format(wordLoc+0x8000,"04x") + ", " @@ -285,7 +285,7 @@ def createList(): # this is a func just so all this can go at the bottom ("Func_d3e0", "", DO_NOT_QUIT,""), ("Func_d3fe", "q", DO_NOT_QUIT,""), ("Func_d408", "b", DO_NOT_QUIT,""), - ("Func_d40f", "q", DO_NOT_QUIT,""), + ("ScriptCommand_PlaySong", "b", DO_NOT_QUIT,"play_song"), ("ScriptCommand_PlaySFX", "b", DO_NOT_QUIT,"play_sfx"), ("ScriptCommand_PauseSong", "", DO_NOT_QUIT,"pause_song"), ("ScriptCommand_ResumeSong", "", DO_NOT_QUIT,"resume_song"), |