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
+7 -7
View File
@@ -36,11 +36,11 @@ SCRIPT_START script_08010120
script_08010132:
CheckEntityInteractType
JumpIfNot script_08010132
_0807E864
_0807EB74
TextboxNoOverlapFollow 0x4f22
_0807E864
_0807EB74
MessageFromTarget 0x4f22
WaitUntilTextboxCloses
_0807E878
_0807E878
Jump script_08010132
SCRIPT_START script_08010148
BeginBlock
@@ -55,9 +55,9 @@ script_0801015A:
_0807EB74
CheckRoomFlag 0x0001
JumpIf script_0801019E
TextboxNoOverlapFollowPos 0x3001, 0x0000
MessageFromTargetPos 0x3001, 0x0000
WaitUntilTextboxCloses
_0807E3E8
_0807E3E8
JumpIfNot script_080101A6
Call sub_080A1608
WaitUntilTextboxCloses
@@ -81,7 +81,7 @@ script_080101AC:
Call sub_080A1270
_0807E864
Call sub_0807DF28
TextboxNoOverlapFollowPos 0x3004, 0x0007
MessageFromTargetPos 0x3004, 0x0007
WaitUntilTextboxCloses
StopBgm
_0807E778 0x0004