From 5fc07331775c4f10757d127196cff3d91598c778 Mon Sep 17 00:00:00 2001 From: Chris Maltby Date: Fri, 6 Sep 2024 14:56:10 +0100 Subject: [PATCH 1/4] Fix issue where "Display Dialogue" event would inconsistently pause between each dialogue in a multi dialogue sequence + Fix issue where text scroll would not scroll first character of each line of text when using avatars --- CHANGELOG.md | 2 ++ src/lib/compiler/scriptBuilder.ts | 36 +++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01dc645c0..05b2d6199 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix issue causing crash when trying to preview an FX Hammer effect index that doesn't exist - Fix issue building game when playing FX Hammer sound effect that doesn't exist (overflowed values will clamp to available range) - Fix issue where migrate project confirmation dialog would appear behind project window on Linux +- Fix issue where "Display Dialogue" event would inconsistently pause between each dialogue in a multi dialogue sequence +- Fix issue where text scroll would not scroll first character of each line of text when using avatars ## [4.1.1] - 2024-09-04 diff --git a/src/lib/compiler/scriptBuilder.ts b/src/lib/compiler/scriptBuilder.ts index aca8ff8ad..96cd6b1cc 100644 --- a/src/lib/compiler/scriptBuilder.ts +++ b/src/lib/compiler/scriptBuilder.ts @@ -1995,6 +1995,7 @@ class ScriptBuilder { width: number, height: number, color: ScriptBuilderUIColor, + autoScroll: boolean, drawFrame: boolean ) => { this._addCmd( @@ -2004,7 +2005,10 @@ class ScriptBuilder { width, height, color, - unionFlags([".UI_AUTO_SCROLL"].concat(drawFrame ? ".UI_DRAW_FRAME" : [])) + unionFlags([ + ...(autoScroll ? [".UI_AUTO_SCROLL"] : []), + ...(drawFrame ? [".UI_DRAW_FRAME"] : []), + ]) ); }; @@ -3884,15 +3888,8 @@ extern void __mute_mask_${symbol}; } } - let endDelaySequence = ""; - if (closeWhen === "text") { - endDelaySequence = `\\001\\${decOct(8)}\\001\\${decOct(6)}`; - } else if (textIndex !== input.length - 1) { - endDelaySequence = `\\001\\${decOct(7)}`; - } - this._loadStructuredText( - `${textPosSequence}${text}${endDelaySequence}`, + `${textPosSequence}${text}`, avatarIndex, textHeight ); @@ -3903,6 +3900,7 @@ extern void __mute_mask_${symbol}; 20, textBoxHeight, ".UI_COLOR_WHITE", + false, showFrame ); } @@ -3915,15 +3913,15 @@ extern void __mute_mask_${symbol}; ".OVERLAY_SPEED_INSTANT" ); this._overlayMoveTo(0, textBoxY, overlayInSpeed); - } - this._overlaySetScroll( - textX + (avatarId ? 3 : 0), - textY, - (showFrame ? 19 : 20) - (avatarId ? 3 : 0) - textX, - textHeight, - ".UI_COLOR_WHITE" - ); + this._overlaySetScroll( + textX + (avatarId ? 2 : 0), + textY, + (showFrame ? 19 : 20) - (avatarId ? 3 : 0) - textX, + textHeight, + ".UI_COLOR_WHITE" + ); + } this._displayText(); @@ -4061,7 +4059,7 @@ extern void __mute_mask_${symbol}; } this._loadStructuredText(choiceText); - this._overlayClear(0, 0, 20, numLines + 2, ".UI_COLOR_WHITE", true); + this._overlayClear(0, 0, 20, numLines + 2, ".UI_COLOR_WHITE", true, true); this._overlayMoveTo(0, 18 - numLines - 2, ".OVERLAY_IN_SPEED"); this._displayText(); this._overlayWait(true, [".UI_WAIT_WINDOW", ".UI_WAIT_TEXT"]); @@ -4123,7 +4121,7 @@ extern void __mute_mask_${symbol}; } this._loadStructuredText(menuText); - this._overlayClear(0, 0, 20 - x, height + 2, ".UI_COLOR_WHITE", true); + this._overlayClear(0, 0, 20 - x, height + 2, ".UI_COLOR_WHITE", true, true); if (layout === "menu") { this._overlayMoveTo(10, 18, ".OVERLAY_SPEED_INSTANT"); } From 4c7967f76017af2c6f7538e0cc62f947e50e959b Mon Sep 17 00:00:00 2001 From: Chris Maltby Date: Fri, 6 Sep 2024 15:03:02 +0100 Subject: [PATCH 2/4] Fix tests --- test/data/compiler/compileEntityEvents.test.js | 16 ++++++++-------- test/data/compiler/gbvmBuildHelpers.test.ts | 14 +++++++------- test/data/compiler/scriptBuilder.test.ts | 14 +++++++------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/test/data/compiler/compileEntityEvents.test.js b/test/data/compiler/compileEntityEvents.test.js index 67b47407f..1e5813c00 100644 --- a/test/data/compiler/compileEntityEvents.test.js +++ b/test/data/compiler/compileEntityEvents.test.js @@ -90,7 +90,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "HELLO WORLD" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -147,10 +147,10 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "\\001\\001\\002\\002@A\\nBC\\001\\003\\004\\001\\377\\002\\001HELLO WORLD" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED - VM_OVERLAY_SET_SCROLL 4, 1, 15, 5, .UI_COLOR_WHITE + VM_OVERLAY_SET_SCROLL 3, 1, 15, 5, .UI_COLOR_WHITE VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_OUT_SPEED @@ -217,7 +217,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "FALSE PATH" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -231,7 +231,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "TRUE PATH" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -308,7 +308,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "FALSE PATH" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -322,7 +322,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "TRUE PATH" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -336,7 +336,7 @@ _testname:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "AFTER" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE diff --git a/test/data/compiler/gbvmBuildHelpers.test.ts b/test/data/compiler/gbvmBuildHelpers.test.ts index d95cdc374..1185fdf1b 100644 --- a/test/data/compiler/gbvmBuildHelpers.test.ts +++ b/test/data/compiler/gbvmBuildHelpers.test.ts @@ -31,7 +31,7 @@ _scene_1_init:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -67,7 +67,7 @@ _SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -108,7 +108,7 @@ _scene_1_init:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -152,7 +152,7 @@ describe("gbvmScriptChecksum", () => { ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -188,7 +188,7 @@ describe("gbvmScriptChecksum", () => { ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -233,7 +233,7 @@ describe("gbvmScriptChecksum", () => { ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ @@ -269,7 +269,7 @@ describe("gbvmScriptChecksum", () => { ; Text Dialogue VM_LOAD_TEXT 0 .asciz "hello world!" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ diff --git a/test/data/compiler/scriptBuilder.test.ts b/test/data/compiler/scriptBuilder.test.ts index 96b4b1dcb..9a7ee00aa 100644 --- a/test/data/compiler/scriptBuilder.test.ts +++ b/test/data/compiler/scriptBuilder.test.ts @@ -248,7 +248,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "Hello World" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -407,7 +407,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "Goodbye World" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -421,7 +421,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "Hello World" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -508,7 +508,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "0=FALSE 2=FALSE" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -522,7 +522,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "0=FALSE 2=TRUE" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -540,7 +540,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "0=TRUE 1=FALSE" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE @@ -554,7 +554,7 @@ _MY_SCRIPT:: ; Text Dialogue VM_LOAD_TEXT 0 .asciz "0=TRUE 1=TRUE" - VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, ^/(.UI_AUTO_SCROLL | .UI_DRAW_FRAME)/ + VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED VM_OVERLAY_SET_SCROLL 1, 1, 18, 5, .UI_COLOR_WHITE From 95fa458c580f501688288c34eea93256636435c1 Mon Sep 17 00:00:00 2001 From: Chris Maltby Date: Fri, 6 Sep 2024 15:32:54 +0100 Subject: [PATCH 3/4] Fix text scroll when using avatars + fix "Advanced Dialogue" plugin not showing frame --- src/lib/compiler/scriptBuilder.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/compiler/scriptBuilder.ts b/src/lib/compiler/scriptBuilder.ts index 96cd6b1cc..4ab0dc552 100644 --- a/src/lib/compiler/scriptBuilder.ts +++ b/src/lib/compiler/scriptBuilder.ts @@ -1995,8 +1995,8 @@ class ScriptBuilder { width: number, height: number, color: ScriptBuilderUIColor, - autoScroll: boolean, - drawFrame: boolean + drawFrame: boolean, + autoScroll = true ) => { this._addCmd( "VM_OVERLAY_CLEAR", @@ -3900,8 +3900,8 @@ extern void __mute_mask_${symbol}; 20, textBoxHeight, ".UI_COLOR_WHITE", - false, - showFrame + showFrame, + false ); } @@ -3917,7 +3917,7 @@ extern void __mute_mask_${symbol}; this._overlaySetScroll( textX + (avatarId ? 2 : 0), textY, - (showFrame ? 19 : 20) - (avatarId ? 3 : 0) - textX, + (showFrame ? 19 : 20) - (avatarId ? 2 : 0) - textX, textHeight, ".UI_COLOR_WHITE" ); From 9fdcde6e53fdb0cf150a09485ed1372f57e45a31 Mon Sep 17 00:00:00 2001 From: Chris Maltby Date: Fri, 6 Sep 2024 15:37:06 +0100 Subject: [PATCH 4/4] Fix tests --- test/data/compiler/compileEntityEvents.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/data/compiler/compileEntityEvents.test.js b/test/data/compiler/compileEntityEvents.test.js index 1e5813c00..6c41ba0bd 100644 --- a/test/data/compiler/compileEntityEvents.test.js +++ b/test/data/compiler/compileEntityEvents.test.js @@ -150,7 +150,7 @@ _testname:: VM_OVERLAY_CLEAR 0, 0, 20, 4, .UI_COLOR_WHITE, .UI_DRAW_FRAME VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_SPEED_INSTANT VM_OVERLAY_MOVE_TO 0, 14, .OVERLAY_IN_SPEED - VM_OVERLAY_SET_SCROLL 3, 1, 15, 5, .UI_COLOR_WHITE + VM_OVERLAY_SET_SCROLL 3, 1, 16, 5, .UI_COLOR_WHITE VM_DISPLAY_TEXT VM_OVERLAY_WAIT .UI_MODAL, ^/(.UI_WAIT_WINDOW | .UI_WAIT_TEXT | .UI_WAIT_BTN_A)/ VM_OVERLAY_MOVE_TO 0, 18, .OVERLAY_OUT_SPEED