diff options
Diffstat (limited to 'src/engine')
| -rwxr-xr-x | src/engine/bank3.asm | 15 | ||||
| -rwxr-xr-x | src/engine/bank4.asm | 20 |
2 files changed, 22 insertions, 13 deletions
diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index 82d8080..27f4400 100755 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -1677,7 +1677,16 @@ Func_ccb9: ; ccb9 (3:4cb9) ld [$d415], a ret -OWScript_EndScriptLoop: ; ccbe (3:4cbe) +OWScript_EndScriptLoop1: ; ccbe (3:4cbe) +OWScript_EndScriptLoop2: ; ccbe (3:4cbe) +OWScript_EndScriptLoop3: ; ccbe (3:4cbe) +OWScript_EndScriptLoop4: ; ccbe (3:4cbe) +OWScript_EndScriptLoop5: ; ccbe (3:4cbe) +OWScript_EndScriptLoop6: ; ccbe (3:4cbe) +OWScript_EndScriptLoop7: ; ccbe (3:4cbe) +OWScript_EndScriptLoop8: ; ccbe (3:4cbe) +OWScript_EndScriptLoop9: ; ccbe (3:4cbe) +OWScript_EndScriptLoop10: ; ccbe (3:4cbe) ld a, $01 ld [wBreakOWScriptLoop], a jp IncreaseOWScriptPointerBy1 @@ -1688,7 +1697,7 @@ OWScript_CloseTextBox: ; ccc6 (3:4cc6) OWScript_EndScriptCloseText: ; cccc (3:4ccc) call OWScript_CloseTextBox - call OWScript_EndScriptLoop + call OWScript_EndScriptLoop1 pop hl ret @@ -2945,7 +2954,7 @@ OWSequence_d753: ; d753 (3:5753) db $07 db $79 db $57 - run_scriptx OWScript_EndScriptLoop_0 + run_script OWScript_EndScriptLoop1 ret start_script diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm index 362a8bb..394804f 100755 --- a/src/engine/bank4.asm +++ b/src/engine/bank4.asm @@ -963,7 +963,7 @@ INCLUDE "data/unknownNPCData.asm" INCBIN "baserom.gbc",$11f4e,$1217b - $11f4e OverworldScriptTable: ; 1217b (4:617b) - dw OWScript_EndScriptLoop + dw OWScript_EndScriptLoop1 dw OWScript_CloseTextBox dw OWScript_PrintTextString dw Func_ccdc @@ -1046,11 +1046,11 @@ OverworldScriptTable: ; 1217b (4:617b) dw Func_d2f6 dw Func_d317 dw Func_d43d - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop + dw OWScript_EndScriptLoop2 + dw OWScript_EndScriptLoop3 + dw OWScript_EndScriptLoop4 + dw OWScript_EndScriptLoop5 + dw OWScript_EndScriptLoop6 dw OWScript_CustomModifyEventFlags dw Func_d460 dw OWScript_JumpIfFlagSet @@ -1063,10 +1063,10 @@ OverworldScriptTable: ; 1217b (4:617b) dw Func_d4ca dw OWScript_JumpIfFlagNotSet dw Func_d452 - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop - dw OWScript_EndScriptLoop + dw OWScript_EndScriptLoop7 + dw OWScript_EndScriptLoop8 + dw OWScript_EndScriptLoop9 + dw OWScript_EndScriptLoop10 INCBIN "baserom.gbc",$1224b,$1229f - $1224b |