Merge branch 'master' into asset-extraction

This commit is contained in:
octorock
2021-11-06 00:33:07 +01:00
413 changed files with 6686 additions and 12843 deletions
+2 -2
View File
@@ -4,7 +4,7 @@ SCRIPT_START script_0800DFE4
_0807E864
EndBlock
StopBgm
TextboxNoOverlapFollowPos 0x1632, 0x0002
MessageFromTargetPos 0x1632, 0x0002
WaitUntilTextboxCloses
SetRoomFlag 0x0003
script_0800DFFE:
@@ -19,7 +19,7 @@ script_0800E012:
_0807E864
Call sub_0807DF28
SetLocalFlag 0x007b
TextboxNoOverlapFollowPos 0x1639, 0x000c
MessageFromTargetPos 0x1639, 0x000c
WaitUntilTextboxCloses
Wait 0x0096
PlaySound SFX_EVAPORATE