Merge remote-tracking branch 'upstream/master' into m

This commit is contained in:
theo3
2021-11-05 01:58:55 -07:00
440 changed files with 7319 additions and 11526 deletions
+26 -26
View File
@@ -1,46 +1,46 @@
SCRIPT_START script_08012430
BeginBlock
BeginBlock
DoPostScriptAction 0x000a
_0807EB44 0x0004
_0807E930 0x0000
EndBlock
EndBlock
script_08012440:
CheckEntityInteractType
CheckEntityInteractType
JumpIfNot script_08012440
_0807E864
_0807E864
_0807E930 0x0008
Call sub_0807F2D4
_0807E930 0x0009
Call sub_0806B2B4
_0807EA94
_0807EA94
CheckLocalFlag 0x00b3
JumpIf script_08012474
SetLocalFlag 0x00b3
_0807F034 0x0062
WaitPlayerAction8
WaitPlayerAction8
.ifdef USA
SetLocalFlag 0x00d0
.else
.ifdef DEMO
.ifdef DEMO_USA
SetLocalFlag 0x00d0
.endif
.endif
script_08012474:
_0807E878
_0807E878
_0807E930 0x0000
Jump script_08012440
.align 2, 0
SCRIPT_START script_08012480
BeginBlock
BeginBlock
Call sub_08054564
EndBlock
EndBlock
script_0801248A:
CheckPlayerInRegion 0x0208, 0x02c8, 0x4020
JumpIfNot script_0801248A
StopBgm
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
StartPlayerScript script_08012AB0
@@ -49,7 +49,7 @@ script_0801248A:
CameraTargetPlayer
_0807E778 0x0004
_0807E80C 0x00000000
WaitFor_2
WaitFor_2
_0807E858 0x0000
Call sub_080791BC
LoadRoomEntityList gUnk_080F4D70
@@ -58,7 +58,7 @@ script_0801248A:
Call sub_0807F844
_0807E778 0x0004
_0807E800 0x00000000
WaitFor_2
WaitFor_2
PlayBgm BGM_EZLO_THEME
_0807E5F8 0x00000010
WaitForSomething2 0x00000020
@@ -73,21 +73,21 @@ script_0801248A:
StopBgm
_0807E778 0x0004
_0807E80C 0x00000000
WaitFor_2
MoveEntityToPlayer
WaitFor_2
MoveEntityToPlayer
Call sub_0807F844
CameraTargetPlayer
CameraTargetPlayer
SetFadeMask 0xffffffff
_0807E778 0x0004
_0807E800 0x00000000
WaitFor_2
WaitFor_2
Call sub_0807DF50
_0807E878
_0807E878
PlayBGM
script_08012566:
CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020
JumpIfNot script_08012566
_0807E864
_0807E864
Call sub_0807F9A4
Call sub_0807DF28
Call sub_0806DC7C
@@ -96,7 +96,7 @@ script_08012566:
WaitForSomething2 0x00000001
SetEntityPositionRelative 0x0388, 0x0168
_0807F0B4 0x0001
CameraTargetEntity
CameraTargetEntity
Wait 0x005a
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
@@ -116,11 +116,11 @@ script_08012566:
StopBgm
PlayBgm BGM_FIGHT_THEME2
Call sub_0807DF50
_0807E878
_0807E878
_0807E5F8 0x00000050
LoadRoomEntityList gUnk_080F51D0
WaitForSomething2 0x00000008
_0807E864
_0807E864
Call sub_0807FA40
Call sub_0807DF28
PlaySound SFX_SECRET
@@ -129,7 +129,7 @@ script_08012566:
WaitForSomething2 0x00000008
StartPlayerScript script_08012AF0
WaitForSomething2 0x00000001
_0807E8E4_0
_0807E8E4_0
PlayBgm BGM_EZLO_THEME
Wait 0x001e
_0807E5F8 0x00000004
@@ -147,9 +147,9 @@ script_08012566:
PlayBGM
Call sub_0806DCA0
_0807F0B4 0x0004
CameraTargetPlayer
CameraTargetPlayer
Call sub_0807DF50
_0807E878
_0807E878
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
_0807E5F8 0x00000004
@@ -163,6 +163,6 @@ script_08012566:
SetGlobalFlag 0x0014
CallWithArg sub_0807F6F8, 0x00000008
Call sub_0807DF50
_0807E878
_0807E878
DoPostScriptAction 0x0006
SCRIPT_END