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
+6 -6
View File
@@ -7,9 +7,9 @@ SCRIPT_START script_0801232C
script_08012338:
CheckEntityInteractType
JumpIfNot script_08012338
_0807EB74
_0807E864
TextboxNoOverlapFollow 0x2304
_0807EB74
_0807E864
MessageFromTarget 0x2304
WaitUntilTextboxCloses
CheckLocalFlag 0x0042
JumpIf script_0801235A
@@ -31,7 +31,7 @@ script_08012368:
StopBgm
BeginBlock
_0807E778 0x0004
_0807E788 0x00007fff
SetFadeMask 0x00007fff
DoFade5
_0807E858 0x0080
EndBlock
@@ -48,14 +48,14 @@ script_08012368:
_0807E8E4_0
StartPlayerScript script_08012410
WaitForSomething2 0x00000001
TextboxNoOverlap 0x1402
MessageNoOverlap 0x1402
WaitUntilTextboxCloses
StopBgm
SetEntity0x20 0x00010000
Wait 0x003c
BeginBlock
_0807E778 0x0004
_0807E788 0xffffffff
SetFadeMask 0xffffffff
DoFade4
_0807E858 0x0080
EndBlock