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
+13
View File
@@ -4,9 +4,13 @@ SCRIPT_START script_0800939A
.else
.ifdef EU
CheckLocalFlag 0x00ac
.else
.ifdef DEMO_JP @ TODO deduplicate
CheckLocalFlag 0x00ac
.else
CheckLocalFlag 0x00ae
.endif
.endif
.endif
JumpIf script_0800943E
CheckInventory1 0x000d
@@ -31,9 +35,13 @@ script_080093DA:
.else
.ifdef EU
CheckLocalFlag 0x00ab
.else
.ifdef DEMO_JP
CheckLocalFlag 0x00ab @ TODO deduplicate
.else
CheckLocalFlag 0x00ad
.endif
.endif
.endif
JumpIf script_080093EE
SetIntVariable 0x00001d04
@@ -58,10 +66,15 @@ script_080093EE:
.ifdef EU
SetLocalFlag 0x00ac
SetLocalFlag 0x00ab
.else
.ifdef DEMO_JP
SetLocalFlag 0x00ac @ TODO deduplicate
SetLocalFlag 0x00ab
.else
SetLocalFlag 0x00ae
SetLocalFlag 0x00ad
.endif
.endif
.endif
Call sub_0806D5D4
_0807EB8C