summaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/engine')
-rwxr-xr-xsrc/engine/bank3.asm17
-rwxr-xr-xsrc/engine/bank4.asm4
2 files changed, 18 insertions, 3 deletions
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm
index 2879afb..991fc92 100755
--- a/src/engine/bank3.asm
+++ b/src/engine/bank3.asm
@@ -2899,7 +2899,22 @@ asm_d4e6
jp IncreaseOWScriptPointerBy4
; 0xd4ec
-INCBIN "baserom.gbc",$d4ec,$f580 - $d4ec
+INCBIN "baserom.gbc",$d4ec,$d753 - $d4ec
+
+; move to it's own file after we know where scripts start and end
+ start_script
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ run_script OWScript_MovePlayer, $0, $2
+ ; there are more but the scripts haven't been disassembled
+
+INCBIN "baserom.gbc",$d76f,$f580 - $d76f
Func_f580: ; f580 (3:7580)
call Func_ca69
diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm
index a3fee53..c810209 100755
--- a/src/engine/bank4.asm
+++ b/src/engine/bank4.asm
@@ -962,7 +962,7 @@ INCLUDE "data/unknownNPCData.asm"
INCBIN "baserom.gbc",$11f4e,$1217b - $11f4e
-
+owsCons = 0
OverworldScriptTable: ; 1217b (4:617b)
dw Func_ccbe
dw Func_ccc6 ; seems to end conversation with mason and starts bringing aid over
@@ -1017,7 +1017,7 @@ OverworldScriptTable: ; 1217b (4:617b)
dw Func_d195
dw Func_d1ad
dw Func_d1b3
- dw Func_cccc ; Ends dialoge. Seems to do it after player answers the "start fight?" question.
+ dw Func_cccc ; Ends dialogue but seems to be more of a loading thing. it's used to load mason's lab, i bet it's used to load battles + in general
dw Func_d244
dw Func_d24c
dw DeckMachine_d336