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
+34 -30
View File
@@ -1,9 +1,9 @@
SCRIPT_START script_080145E8
BeginBlock
BeginBlock
DoPostScriptAction 0x0008
_0807EB44 0x0004
DoPostScriptAction 0x0000
EndBlock
EndBlock
script_080145F8:
.ifdef EU
CheckPlayerInRegion 0x00a8, 0x0054, 0x080c
@@ -12,19 +12,19 @@ script_080145F8:
JumpIfNot script_080145F8
CheckRoomFlag 0x0009
JumpIf script_08014632
_0807E864
_0807E864
Wait 0x0018
_0807E8E4_3
_0807E8E4_3
_0807EB44 0x0002
MessageFromTargetPos 0x432b, 0x000c
_0807EA94
Wait 0x0018
_0807E878
_0807E878
Jump script_080145F8
script_08014632:
CheckRoomFlag 0x0000
JumpIfNot script_08014632
_0807E864
_0807E864
Call sub_0807DF28
script_08014642:
CheckRoomFlag 0x0009
@@ -32,12 +32,12 @@ script_08014642:
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
Call sub_0807DF50
_0807E878
_0807E878
Jump script_080145F8
.else
CheckRoomFlag 0x0000
JumpIfNot script_080145F8
_0807E864
_0807E864
Call sub_0807DF28
script_08014608:
CheckRoomFlag 0x0004
@@ -45,20 +45,20 @@ script_08014608:
_0807E5F8 0x00000004
WaitForSomething2 0x00000008
Call sub_0807DF50
_0807E878
_0807E878
Jump script_080145F8
.endif
.align 2, 0
SCRIPT_START script_08014628
BeginBlock
_0807E9D4
BeginBlock
_0807E9D4
_0807EB44 0x0004
SetEntityDirection 0x0000
DoPostScriptAction 0x000a
EndBlock
EndBlock
script_0801463A:
_0807E30C
_0807E30C
.ifdef EU
JumpIf script_080146E2
.else
@@ -71,18 +71,18 @@ script_0801463A:
JumpIfNot script_0801463A
CheckRoomFlag 0x0009
JumpIfNot script_0801463A
_0807E864
_0807E864
_0807EB28 0x431f
_0807EA94
_0807EA94
script_0801469A:
StartPlayerScript script_080147DC
Wait 0x0010
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
_0807E878
_0807E878
Jump script_0801463A
script_080146E2:
_0807E864
_0807E864
_0807E930 0x0008
Wait 0x0020
_0807E930 0x0002
@@ -116,26 +116,30 @@ script_0801472E_2:
MessageFromTargetPos 0x432b, 0x000c
Jump script_080147CE
script_08014672:
.ifdef DEMO_JP
Call sub_08088658
.else
.ifdef JP
CheckPlayerInRegion 0x0078, 0x0078, 0x0810
.else
Call sub_08088658
.endif
.endif
JumpIfNot script_0801463A
_0807E864
_0807E864
_0807EB28 0x431f
_0807EA94
_0807EA94
StartPlayerScript script_080147DC
Wait 0x0010
_0807E5F8 0x00000002
WaitForSomething2 0x00000001
_0807E878
_0807E878
Jump script_0801463A
script_080146A0:
_0807E864
_0807E864
_0807E930 0x0008
Wait 0x0010
_0807EB8C
_0807EB8C
Wait 0x0010
_0807E930 0x0002
CheckGlobalFlag 0x0059
@@ -193,9 +197,9 @@ script_0801472E:
ClearRoomFlag 0x0006
Call sub_08088544
script_0801473C:
_0807E3E8
_0807E3E8
JumpIfNot script_08014770
_0807EA94
_0807EA94
_0807E3BC 0x0001
JumpIfNot script_080147C4
SetRoomFlag 0x0001
@@ -204,7 +208,7 @@ script_08014754:
CheckRoomFlag 0x0003
JumpIfNot script_08014754
ClearRoomFlag 0x0003
_0807EA94
_0807EA94
.ifdef EU
SetRoomFlag 0x0009
.else
@@ -218,7 +222,7 @@ script_08014770:
.else
SetRoomFlag 0x0009
.endif
_0807EA94
_0807EA94
Jump script_080147CE
script_0801477A:
CheckRoomFlag 0x0008
@@ -227,9 +231,9 @@ script_0801477A:
JumpIf script_080147A4
script_0801478A:
Call sub_08088478
_0807EA94
_0807EA94
Call sub_080885B0
WaitPlayerAction8
WaitPlayerAction8
_0807E5F8 0x00000008
Jump script_080147CE
script_080147A4:
@@ -250,12 +254,12 @@ script_080147C4:
.endif
MessageFromTargetPos 0x4307, 0x000c
script_080147CE:
_0807EA94
_0807EA94
.ifdef EU
Wait 0x000F
.else
Wait 0x0004
.endif
_0807E878
_0807E878
Jump script_0801463A
.align 2, 0