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
@@ -24,15 +24,15 @@ SCRIPT_START script_08010BEC
StartPlayerScript script_08011074
WaitForSomething2 0x00000400
_0807F078 0x0034, 0x0002
TextboxNoOverlapFollowPos 0x1036, 0x000c
MessageFromTargetPos 0x1036, 0x000c
WaitUntilTextboxCloses
_0807E5F8 0x00000010
WaitForSomething2 0x00000020
TextboxNoOverlapFollowPos 0x1037, 0x0002
MessageFromTargetPos 0x1037, 0x0002
WaitUntilTextboxCloses
_0807E5F8 0x00000010
WaitForSomething2 0x00000020
TextboxNoOverlapFollowPos 0x1038, 0x000c
MessageFromTargetPos 0x1038, 0x000c
WaitUntilTextboxCloses
StopBgm
_0807E778 0x0004
@@ -69,7 +69,7 @@ SCRIPT_START script_08010BEC
_0807E8E4_1
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
TextboxNoOverlapFollowPos 0x1039, 0x000c
MessageFromTargetPos 0x1039, 0x000c
WaitUntilTextboxCloses
PlayBgm BGM_CASTLE_TOURNAMENT
_0807E8E4_2
@@ -82,7 +82,7 @@ SCRIPT_START script_08010BEC
Wait 0x012c
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
TextboxNoOverlapFollowPos 0x103a, 0x000c
MessageFromTargetPos 0x103a, 0x000c
WaitUntilTextboxCloses
SetEntityPositionRelative 0x01f8, 0x01c0
_0807F0B4 0x0004
@@ -100,7 +100,7 @@ SCRIPT_START script_08010BEC
PlaySound SFX_9B
_0807E5F8 0x00000100
WaitForSomething2 0x00000200
TextboxNoOverlapFollowPos 0x1043, 0x0000
MessageFromTargetPos 0x1043, 0x0000
WaitUntilTextboxCloses
PlayBgm BGM_VAATI_THEME
_0807E5F8 0x00000100
@@ -116,7 +116,7 @@ SCRIPT_START script_08010BEC
WaitForSomething2 0x00005000
_0807E5F8 0x00028000
WaitForSomething2 0x00050000
TextboxNoOverlapFollowPos 0x1044, 0x0000
MessageFromTargetPos 0x1044, 0x0000
WaitUntilTextboxCloses
SetEntityPositionRelative 0x01f8, 0x0098
StopBgm