diff options
| author | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-05-03 12:06:02 -0400 |
|---|---|---|
| committer | Andrew Martinek <andrewrmartinek@gmail.com> | 2020-05-03 12:06:41 -0400 |
| commit | b7f47ca621716938cfc6df7d4eea90b2be909eaf (patch) | |
| tree | 752719ac974a6fe4a0e450054eaa43510eee77bc | |
| parent | 0b1318f49d0f17847f52c3fd35ea2574d9b7af78 (diff) | |
add challenge machine
| -rw-r--r-- | src/engine/bank03.asm | 14 | ||||
| -rw-r--r-- | tools/script_extractor.py | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 4ee4626..31d8846 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3196,13 +3196,19 @@ MasonLabPressedA: ; d565 (3:5565) ChallengeMachineObjectTable: ; d572 (3:5572) db 10, 4, NORTH - dw OWSequence_d57d + dw OWSequence_ChallengeMachine db 12, 4, NORTH - dw OWSequence_d57d + dw OWSequence_ChallengeMachine db $00 -OWSequence_d57d: ; d57d (3:557d) - INCROM $d57d, $d753 +OWSequence_ChallengeMachine: ; d57d (3:557d) + start_script + run_script Func_ccdc + tx Text05bd + run_script Func_d43d + run_script OWScript_QuitScriptFully + + INCROM $d583, $d753 OWSequence_EnterLabFirstTime: ; d753 (3:5753) start_script diff --git a/tools/script_extractor.py b/tools/script_extractor.py index 2f68ee7..5fcfbac 100644 --- a/tools/script_extractor.py +++ b/tools/script_extractor.py @@ -257,7 +257,7 @@ def createList(): # this is a func just so all this can go at the bottom ("OWScript_AskQuestionJumpDefaultYes", "tj", DO_NOT_QUIT), ("Func_d2f6", "q", DO_NOT_QUIT), ("Func_d317", "", DO_NOT_QUIT), - ("Func_d43d", "q", DO_NOT_QUIT), + ("Func_d43d", "", DO_NOT_QUIT), ("OWScript_EndScriptLoop2", "q", QUIT_CONTINUE_CODE), ("OWScript_EndScriptLoop3", "q", QUIT_CONTINUE_CODE), ("OWScript_EndScriptLoop4", "q", QUIT_CONTINUE_CODE), |