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
+7 -3
View File
@@ -10,9 +10,13 @@ SCRIPT_START script_08009464
.else
.ifdef EU
ClearLocalFlag 0x00ac
.else
.ifdef DEMO_JP
ClearLocalFlag 0x00ac @ TODO deduplicate
.else
ClearLocalFlag 0x00ae
.endif
.endif
.endif
Call sub_0806D620
Wait 0x003c
@@ -24,14 +28,14 @@ SCRIPT_START script_08009464
Jump script_08009376
.2byte 0x0000
SCRIPT_START script_080094A4
BeginBlock
BeginBlock
Call sub_0806D7C4
SetEntitySpeed 0x0080
EndBlock
EndBlock
Wait 0x003c
SetEntity0x20 0x00018000
script_080094BC:
_0807EE30
_0807EE30
JumpIfNot script_080094BC
Wait 0x003c
DoPostScriptAction 0x0006