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

data/const/demoScreen.s

@@ -4,7 +4,7 @@
 	.section .rodata
     .align 2
 
-.ifdef DEMO
+.ifdef DEMO_USA
 @ TODO choose demo screen
 demoFunctions::
 	.4byte sub_080A2E40

data/const/enemy/gyorgFemale.s

@@ -24,12 +24,17 @@ gUnk_080D1A94:: @ 080D1A94
 	@ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0D1834, 0x0000018
 .else
+.ifdef DEMO_JP
+	@ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0D1834, 0x0000018
+.else
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0D11C0, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0D1A94, 0x0000018
 .endif
 .endif
+.endif
 
 
 gUnk_080D1AAC:: @ 080D1AAC
@@ -37,36 +42,51 @@ gUnk_080D1AAC:: @ 080D1AAC
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0D184C, 0x0000018
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0D184C, 0x0000018
+.else
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0D11D8, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0D1AAC, 0x0000018
 .endif
 .endif
+.endif
 
 gUnk_080D1AC4:: @ 080D1AC4
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0D1864, 0x0000018
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0D1864, 0x0000018
+.else
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0D11F0, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0D1AC4, 0x0000018
 .endif
 .endif
+.endif
 
 gUnk_080D1ADC:: @ 080D1ADC
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0D187C, 0x0000018
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0D187C, 0x0000018
+.else
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0D1208, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0D1ADC, 0x0000018
 .endif
 .endif
+.endif
 
 gUnk_080D1AF4:: @ 080D1AF4
 	.incbin "baserom.gba", 0x0D1AF4, 0x0000004

data/const/npc/forestMinish.s

@@ -70,12 +70,17 @@ gUnk_08109F6C:: @ 08109F6C
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x109C30, 0x000002B
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x109C30, 0x000002B
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x109C30, 0x000002B
 .else
 	.incbin "baserom.gba", 0x109F6C, 0x000002B
 .endif
 .endif
+.endif
 
 
 gUnk_08109F97:: @ 08109F97
@@ -83,12 +88,17 @@ gUnk_08109F97:: @ 08109F97
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x109C5B, 0x00000B1
 .else
 	.incbin "baserom.gba", 0x109F97, 0x00000B1
 .endif
 .endif
+.endif
 
 gUnk_0810A048:: @ 0810A048
 	.incbin "baserom.gba", 0x10A048, 0x0000024

data/const/npc/kid.s

@@ -55,12 +55,17 @@ gUnk_0810C00F:: @ 0810C00F
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x10BCD3, 0x0000091
 .else
 	.incbin "baserom.gba", 0x10C00F, 0x0000091
 .endif
 .endif
+.endif
 
 gUnk_0810C0A0:: @ 0810C0A0
 	.incbin "baserom.gba", 0x10C0A0, 0x0000024

data/const/npc/townsperson.s

@@ -87,24 +87,34 @@ gUnk_0810B922:: @ 0810B922
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x10B5E6, 0x0000049
 .else
 	.incbin "baserom.gba", 0x10B922, 0x0000049
 .endif
 .endif
+.endif
 
 gUnk_0810B96B:: @ 0810B96B
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x10B62F, 0x0000065
 .else
 	.incbin "baserom.gba", 0x10B96B, 0x0000065
 .endif
 .endif
+.endif
 
 gUnk_0810B9D0:: @ 0810B9D0
 	.incbin "baserom.gba", 0x10B9D0, 0x0000031
@@ -114,12 +124,17 @@ gUnk_0810BA01:: @ 0810BA01
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x10B6C5, 0x0000117
 .else
 	.incbin "baserom.gba", 0x10BA01, 0x0000117
 .endif
 .endif
+.endif
 
 gUnk_0810BB18:: @ 0810BB18
 	.incbin "baserom.gba", 0x10BB18, 0x0000044
@@ -134,12 +149,17 @@ gUnk_0810BBCC:: @ 0810BBCC
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10B890, 0x000009C
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10B890, 0x000009C
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x10B890, 0x000009C
 .else
 	.incbin "baserom.gba", 0x10BBCC, 0x000009C
 .endif
 .endif
+.endif
 
 gUnk_0810BC68:: @ 0810BC68
 	.incbin "baserom.gba", 0x10BC68, 0x0000098

data/const/npc/windTribespeople.s

@@ -50,24 +50,34 @@ gUnk_08113B28:: @ 08113B28
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x1137EC, 0x0000008
 .else
 	.incbin "baserom.gba", 0x113B28, 0x0000008
 .endif
 .endif
+.endif
 
 gUnk_08113B30:: @ 08113B30
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x1137F4, 0x0000008
 .else
 	.incbin "baserom.gba", 0x113B30, 0x0000008
 .endif
 .endif
+.endif
 
 gUnk_08113B38:: @ 08113B38
 	.incbin "baserom.gba", 0x113B38, 0x0000007

data/const/object/object96.s

@@ -23,11 +23,15 @@ gUnk_08123FB0:: @ 08123FB0
 .ifdef JP
 	.4byte 0x000000CD
 .else
-.ifdef EU
+.ifdef DEMO_JP
 	.4byte 0x000000CD
+.else
+.ifdef EU
+	.4byte 0x000000CD  @ TODO deduplicate
 .else
 	.4byte 0x000000d0
 .endif
+.endif
 .endif
 	.4byte sub_0809D91C
 	.4byte 00000000

data/const/object/pinwheel.s

@@ -8,12 +8,16 @@ gUnk_08125050:: @ 08125050
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x124D14, 0x000000C
 .else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x124D14, 0x000000C
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x124D14, 0x000000C
 .else
 	.incbin "baserom.gba", 0x125050, 0x000000C
 .endif
 .endif
+.endif
 
 gUnk_0812505C:: @ 0812505C
 	.4byte sub_080A23DC

data/data_080B2A70.s

@@ -24,9 +24,13 @@ gUnk_080B2A70:: @ 080B2A70
 @ TODO contains some pointers to iwram
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0B21D0, 0x0000230
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_eu.gba", 0x0B21D0, 0x0000230
 .else
 	.incbin "baserom.gba", 0x0B2AA8, 0x0000230
 .endif
+.endif
 
 
 

data/data_080B3740.s

@@ -58,7 +58,11 @@ gUnk_080B3D20:: @ 080B3D20
 .else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0B3AC0, 0x00000B0
+.else
+.ifdef DEMO_JP 
+	.incbin "baserom_jp.gba", 0x0B3AC0, 0x00000B0 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0B3D20, 0x00000B0
 .endif
 .endif
+.endif

data/data_080B4410.s

@@ -11,10 +11,14 @@ gUnk_080B4410:: @ 080B4410
 .else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0B41B0, 0x0000048	
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0B41B0, 0x0000048 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0B4410, 0x0000048
 .endif
 .endif
+.endif
 
 gUnk_080B4458:: @ 080B4458
 	.4byte sub_08019698

data/data_080C93E0.s

@@ -148,10 +148,14 @@ gUnk_080C9870:: @ 080C9870
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C9610, 0x0000078
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C9610, 0x0000078 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9870, 0x0000078
 .endif
 .endif
+.endif
 
 gUnk_080C98E8:: @ 080C98E8
 .ifdef EU
@@ -160,10 +164,14 @@ gUnk_080C98E8:: @ 080C98E8
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C9688, 0x0000040
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C9688, 0x0000040 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C98E8, 0x0000040
 .endif
 .endif
+.endif
 
 gUnk_080C9928:: @ 080C9928
 .ifdef EU
@@ -172,10 +180,14 @@ gUnk_080C9928:: @ 080C9928
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C96C8, 0x0000060
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C96C8, 0x0000060 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9928, 0x0000060
 .endif
 .endif
+.endif
 
 gUnk_080C9988:: @ 080C9988
 .ifdef EU
@@ -184,10 +196,14 @@ gUnk_080C9988:: @ 080C9988
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C9728, 0x0000060
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C9728, 0x0000060 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9988, 0x0000060
 .endif
 .endif
+.endif
 
 gUnk_080C99E8:: @ 080C99E8
 .ifdef EU
@@ -196,10 +212,14 @@ gUnk_080C99E8:: @ 080C99E8
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C9788, 0x0000048
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C9788, 0x0000048 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C99E8, 0x0000048
 .endif
 .endif
+.endif
 
 gUnk_080C9A30:: @ 080C9A30
 	.4byte gUnk_080C9870
@@ -215,10 +235,14 @@ gUnk_080C9A44:: @ 080C9A44
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C97E4, 0x0000038
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C97E4, 0x0000038 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9A44, 0x0000038
 .endif
 .endif
+.endif
 
 gUnk_080C9A7C:: @ 080C9A7C
 .ifdef EU
@@ -227,10 +251,14 @@ gUnk_080C9A7C:: @ 080C9A7C
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C981C, 0x00000B0
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C981C, 0x00000B0 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9A7C, 0x00000B0
 .endif
 .endif
+.endif
 
 gUnk_080C9B2C:: @ 080C9B2C
 .ifdef EU
@@ -239,10 +267,14 @@ gUnk_080C9B2C:: @ 080C9B2C
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C98CC, 0x0000088
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C98CC, 0x0000088 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9B2C, 0x0000088
 .endif
 .endif
+.endif
 
 gUnk_080C9BB4:: @ 080C9BB4
 .ifdef EU
@@ -251,10 +283,14 @@ gUnk_080C9BB4:: @ 080C9BB4
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C9954, 0x0000068
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C9954, 0x0000068 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9BB4, 0x0000068
 .endif
 .endif
+.endif
 
 gUnk_080C9C1C:: @ 080C9C1C
 .ifdef EU
@@ -263,10 +299,14 @@ gUnk_080C9C1C:: @ 080C9C1C
 .else
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0C99BC, 0x0000020
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0C99BC, 0x0000020 @ TODO deduplicate
 .else
 	.incbin "baserom.gba", 0x0C9C1C, 0x0000020
 .endif
 .endif
+.endif
 
 gUnk_080C9C3C:: @ 080C9C3C
 	.4byte gUnk_080C9A44

data/data_080FC8A4.s

@@ -130,12 +130,17 @@ gUnk_080FCB62:: @ 080FCB62
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FC812, 0x0000032
 .else
 	.incbin "baserom.gba", 0x0FCB62, 0x0000032
 .endif
 .endif
+.endif
 
 gUnk_080FCB94:: @ 080FCB94
 	.incbin "baserom.gba", 0x0FCB94, 0x0000020
@@ -1228,24 +1233,34 @@ gUnk_080FE320:: @ 080FE320
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FDFD0, 0x00002F0
 .else
 	.incbin "baserom.gba", 0x0FE320, 0x00002F0
 .endif
 .endif
+.endif
 
 gUnk_080FE610:: @ 080FE610
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FE2C0, 0x00004B8
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_demo_jp.gba", 0x0FDDF4, 0x00004B8
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FE2C0, 0x00004B8
 .else
 	.incbin "baserom.gba", 0x0FE610, 0x00004B8
 .endif
 .endif
+.endif
 
 gUnk_080FEAC8:: @ 080FEAC8
 	.incbin "baserom.gba", 0x0FEAC8, 0x0000003
@@ -1258,24 +1273,34 @@ gUnk_080FEAEE:: @ 080FEAEE
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FE79E, 0x000002C
 .else
 	.incbin "baserom.gba", 0x0FEAEE, 0x000002C
 .endif
 .endif
+.endif
 
 gUnk_080FEB1A:: @ 080FEB1A
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FE7CA, 0x00000C2
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_demo_jp.gba", 0x0FE2FE, 0x00000C2
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FE7CA, 0x00000C2
 .else
 	.incbin "baserom.gba", 0x0FEB1A, 0x00000C2
 .endif
 .endif
+.endif
 
 gUnk_080FEBDC:: @ 080FEBDC
 	.incbin "baserom.gba", 0x0FEBDC, 0x000000C
@@ -1329,12 +1354,17 @@ gUnk_080FEE58:: @ 080FEE58
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
 .else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FEB08, 0x0000020
 .else
 	.incbin "baserom.gba", 0x0FEE58, 0x0000020
 .endif
 .endif
+.endif
 
 gUnk_080FEE78:: @ 080FEE78
 	.incbin "baserom.gba", 0x0FEE78, 0x0000030

data/data_080FEEB8.s

@@ -39,12 +39,16 @@ gUnk_080FEF48:: @ 080FEF48
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020
 .else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020 @ TODO deduplicate
+.else
 .ifdef EU
 	.incbin "baserom_jp.gba", 0x0FEC08, 0x0000020
 .else
 	.incbin "baserom.gba", 0x0FEF58, 0x0000020
 .endif
 .endif
+.endif
 
 gUnk_080FEF78:: @ 080FEF78
 	.incbin "baserom.gba", 0x0FEF78, 0x000000C
@@ -1912,10 +1916,14 @@ gUnk_080FFBA8:: @ 080FFBA8
 .else
 .ifdef EU
     .incbin "baserom_eu.gba", 0x0FF0DC, 0x0000048
+.else
+.ifdef DEMO_JP
+    .incbin "baserom_jp.gba", 0x0FF858, 0x0000035
 .else
 	.incbin "baserom.gba", 0x0FFBA8, 0x0000035
 .endif
 .endif
+.endif
 
 gUnk_080FFBDD:: @ 080FFBDD
 .ifdef JP
@@ -1923,10 +1931,14 @@ gUnk_080FFBDD:: @ 080FFBDD
 .else
 .ifdef EU
     .incbin "baserom_eu.gba", 0x0FF124, 0x0000054
+.else
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x0FF88D, 0x000001f
 .else
 	.incbin "baserom.gba", 0x0FFBDD, 0x0000013
 .endif
 .endif
+.endif
 
 gUnk_080FFBF0:: @ 080FFBF0
 .ifdef JP
@@ -1935,10 +1947,15 @@ gUnk_080FFBF0:: @ 080FFBF0
 .else
 .ifdef EU
 	.incbin "baserom_eu.gba", 0x0FF178, 0x0000054
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FF8AC, 0x0000024
 .else
 	.incbin "baserom.gba", 0x0FFBF0, 0x0000024
 .endif
 .endif
+.endif
 
 gUnk_080FFC14:: @ 080FFC14
 	.incbin "baserom.gba", 0x0FFC14, 0x0000024
@@ -1950,9 +1967,14 @@ gUnk_080FFC68:: @ 080FFC68
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FF924, 0x0000018
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FF924, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0FFC68, 0x0000018
 .endif
+.endif
 
 gUnk_080FFC80:: @ 080FFC80
 	.incbin "baserom.gba", 0x0FFC80, 0x000000C
@@ -1973,9 +1995,14 @@ gUnk_080FFCD4:: @ 080FFCD4
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FF990, 0x0000018
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FF990, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0FFCD4, 0x0000018
 .endif
+.endif
 
 gUnk_080FFCEC:: @ 080FFCEC
 	.incbin "baserom.gba", 0x0FFCEC, 0x0000001
@@ -1984,21 +2011,36 @@ gUnk_080FFCED:: @ 080FFCED
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FF9A9, 0x0000017
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FF9A9, 0x0000017
 .else
 	.incbin "baserom.gba", 0x0FFCED, 0x0000017
 .endif
+.endif
 
 gUnk_080FFD04:: @ 080FFD04
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x0FF9C0, 0x0000018
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x0FF9C0, 0x0000018
 .else
 	.incbin "baserom.gba", 0x0FFD04, 0x0000018
 .endif
+.endif
 
 .ifdef JP
 gUnk_080FF9D8:: @ 080FF9D8
 	.incbin "baserom_jp.gba", 0x0FF9D8, 0x000000C
+.else
+.ifdef DEMO_JP
+gUnk_080FF9D8:: @ 080FF9D8
+	.incbin "baserom_jp.gba", 0x0FF9D8, 0x000000C @ TODO deduplicate
+.endif
 .endif
 
 gUnk_080FFD1C:: @ 080FFD1C
@@ -2287,9 +2329,14 @@ gUnk_08100388:: @ 08100388
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x100050, 0x0000054
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x100050, 0x0000054
 .else
 	.incbin "baserom.gba", 0x100388, 0x0000054
 .endif
+.endif
 
 gUnk_081003DC:: @ 081003DC
 	.incbin "baserom.gba", 0x1003DC, 0x0000024
@@ -2301,57 +2348,92 @@ gUnk_08100401:: @ 08100401
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1000C9, 0x0000006
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1000C9, 0x0000006
 .else
 	.incbin "baserom.gba", 0x100401, 0x0000006
 .endif
+.endif
 
 gUnk_08100407:: @ 08100407
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1000CF, 0x000001D
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1000CF, 0x000001D
 .else
 	.incbin "baserom.gba", 0x100407, 0x000001D
 .endif
+.endif
 
 gUnk_08100424:: @ 08100424
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1000EC, 0x0000048
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1000EC, 0x0000048
 .else
 	.incbin "baserom.gba", 0x100424, 0x0000048
 .endif
+.endif
 
 gUnk_0810046C:: @ 0810046C
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x100134, 0x0000048
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x100134, 0x0000048
 .else
 	.incbin "baserom.gba", 0x10046C, 0x0000048
 .endif
+.endif
 
 gUnk_081004B4:: @ 081004B4
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x10017C, 0x0000018
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x10017C, 0x0000018
 .else
 	.incbin "baserom.gba", 0x1004B4, 0x0000018
 .endif
+.endif
 
 gUnk_081004CC:: @ 081004CC
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x100194, 0x0000024
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x100194, 0x0000024
 .else
 	.incbin "baserom.gba", 0x1004CC, 0x0000024
 .endif
+.endif
 
 gUnk_081004F0:: @ 081004F0
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1001B8, 0x0000008
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1001B8, 0x0000008
 .else
 	.incbin "baserom.gba", 0x1004F0, 0x0000008
 .endif
+.endif
 
 gUnk_081004F8:: @ 081004F8
 	.incbin "baserom.gba", 0x1004F8, 0x0000002
@@ -2360,17 +2442,27 @@ gUnk_081004FA:: @ 081004FA
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1001C2, 0x0000004
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1001C2, 0x0000004
 .else
 	.incbin "baserom.gba", 0x1004FA, 0x0000004
 .endif
+.endif
 
 gUnk_081004FE:: @ 081004FE
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1001C6, 0x0000012
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1001C6, 0x0000012
 .else
 	.incbin "baserom.gba", 0x1004FE, 0x0000012
 .endif
+.endif
 
 gUnk_08100510:: @ 08100510
 	.incbin "baserom.gba", 0x100510, 0x0000001
@@ -2532,9 +2624,14 @@ gUnk_08100970:: @ 08100970
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x100638, 0x000003C
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x100638, 0x000003C
 .else
 	.incbin "baserom.gba", 0x100970, 0x000003C
 .endif
+.endif
 
 gUnk_081009AC:: @ 081009AC
 	.incbin "baserom.gba", 0x1009AC, 0x000000C
@@ -2579,17 +2676,27 @@ gUnk_08100A11:: @ 08100A11
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1006D9, 0x000001F
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1006D9, 0x000001F
 .else
 	.incbin "baserom.gba", 0x100A11, 0x000001F
 .endif
+.endif
 
 gUnk_08100A30:: @ 08100A30
 .ifdef JP
     @ TODO only small differences
 	.incbin "baserom_jp.gba", 0x1006F8, 0x0000054
+.else
+.ifdef DEMO_JP
+    @ TODO only small differences
+	.incbin "baserom_jp.gba", 0x1006F8, 0x0000054
 .else
 	.incbin "baserom.gba", 0x100A30, 0x0000054
 .endif
+.endif
 
 gUnk_08100A84:: @ 08100A84
 	.incbin "baserom.gba", 0x100A84, 0x000000C
@@ -2614,8 +2721,12 @@ gUnk_08100AA8:: @ 08100AA8
 	.4byte gUnk_080FFD04
 .ifdef JP
 	.4byte gUnk_080FF9D8
+.else
+.ifdef DEMO_JP
+	.4byte gUnk_080FF9D8
 .else
 	.4byte gUnk_080FFD1C 
+.endif
 .endif
 	.4byte gUnk_080FFC98
 	.4byte gUnk_080FFCB0

data/data_081320FC.s

@@ -4,6 +4,12 @@
 	.section .rodata
 	.align 2
 
+.ifdef DEMO_JP
+	@ TODO check whether this is the same save as one of the DEMO_USA ones
+	.incbin "baserom_demo_jp.gba", 0x131830, 0x500
+.endif
+
+
 gUnk_0813210C:: @ 0813210C
 	.incbin "baserom.gba", 0x13210C, 0x0000004
 	.4byte gUnk_0813235C

data/data_08132B30.s

@@ -2540,7 +2540,7 @@ gUnk_0813A7F0:: @ 0813A7F0
 	.4byte gUnk_08133FDC
 	.4byte gUnk_08133FDC
 	.4byte gUnk_08133FDC
-	.ifndef DEMO
+	.ifndef DEMO_USA
 	.4byte gUnk_08139108
 	.4byte gUnk_081391D0
 	.4byte gUnk_081391FC
@@ -11041,7 +11041,10 @@ gUnk_08545666:: @ 08545666
 .ifdef JP
 	.incbin "baserom_jp.gba", 0x546192, 0x5C98E
 .else
-
+@ TODO JP differs from here
+.ifdef DEMO_JP
+	.incbin "baserom_jp.gba", 0x546192, 0x5C98E
+.else
 gUnk_08546566:: @ 08546566
 	.incbin "baserom.gba", 0x546566, 0x00019E4
 
@@ -11344,6 +11347,7 @@ gUnk_085A0806:: @ 085A0806
 
 .endif
 .endif
+.endif
 
 @ TODO JP and EU differ to here
 

data/metatile_headers.s

@@ -561,6 +561,10 @@ gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
 	metatiles_top 0x223680, 0x108, 1
 	metatile_types_top 0x2236C8, 0x42, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_top 0x223680, 0x108, 1
+	metatile_types_top 0x2236C8, 0x42, 1, 1
+.else
 .ifdef EU
 	metatiles_top 0x22360C+0x48, 0x108, 1
 	metatile_types_top 0x223654+0x48, 0x42, 1, 1
@@ -569,6 +573,7 @@ gAreaMetatiles_PalaceOfWindsBoss:: @ 08102ED4
 	metatile_types_top 0x223654, 0x42, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_Sanctuary:: @ 08102EEC
 .ifdef JP
@@ -577,6 +582,12 @@ gAreaMetatiles_Sanctuary:: @ 08102EEC
 	metatile_types_bottom 0x236424, 0xD88, 1
 	metatile_types_top 0x236788, 0xD88, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x233418, 0x3620, 1
+	metatiles_top 0x235320, 0x3620, 1
+	metatile_types_bottom 0x236424, 0xD88, 1
+	metatile_types_top 0x236788, 0xD88, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x2333A4+0x48, 0x3620, 1
 	metatiles_top 0x2352AC+0x48, 0x3620, 1
@@ -589,6 +600,7 @@ gAreaMetatiles_Sanctuary:: @ 08102EEC
 	metatile_types_top 0x236714, 0xD88, 1, 1
 .endif
 .endif
+.endif
 
 
 gAreaMetatiles_HyruleCastle:: @ 08102F1C
@@ -598,6 +610,12 @@ gAreaMetatiles_HyruleCastle:: @ 08102F1C
 	metatile_types_bottom 0x240440, 0xDF0, 1
 	metatile_types_top 0x24086C, 0xD84, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x23D224, 0x37C0, 1
+	metatiles_top 0x23EF98, 0x3610, 1
+	metatile_types_bottom 0x240440, 0xDF0, 1
+	metatile_types_top 0x24086C, 0xD84, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x23D1B0+0x48, 0x37C0, 1
 	metatiles_top 0x23EF24+0x48, 0x3610, 1
@@ -610,6 +628,7 @@ gAreaMetatiles_HyruleCastle:: @ 08102F1C
 	metatile_types_top 0x2407F8, 0xD84, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
 .ifdef JP
@@ -618,6 +637,12 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
 	metatile_types_bottom 0x24702C, 0x51E, 1
 	metatile_types_top 0x24719C, 0x3FC, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x246158, 0x1478, 1
+	metatiles_top 0x246CAC, 0xFF0, 1
+	metatile_types_bottom 0x24702C, 0x51E, 1
+	metatile_types_top 0x24719C, 0x3FC, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x2460E4+0x48, 0x1478, 1
 	metatiles_top 0x246C38+0x48, 0xFF0, 1
@@ -630,6 +655,7 @@ gAreaMetatiles_SanctuaryEntrance:: @ 08102F4C
 	metatile_types_top 0x247128, 0x3FC, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
 .ifdef JP
@@ -638,6 +664,12 @@ gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
 	metatile_types_bottom 0x2524F4, 0xFF6, 1
 	metatile_types_top 0x252A7C, 0xDF0, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x24D940, 0x3FD8, 1
+	metatiles_top 0x250680, 0x37C0, 1
+	metatile_types_bottom 0x2524F4, 0xFF6, 1
+	metatile_types_top 0x252A7C, 0xDF0, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x24D8CC+0x48, 0x3FD8, 1
 	metatiles_top 0x25060C+0x48, 0x37C0, 1
@@ -650,6 +682,7 @@ gAreaMetatiles_DarkHyruleCastle:: @ 08102F7C
 	metatile_types_top 0x252A08, 0xDF0, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
 .ifdef JP
@@ -658,6 +691,12 @@ gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
 	metatile_types_bottom 0x276048, 0xCD0, 1
 	metatile_types_top 0x276324, 0x7BC, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x273EE8, 0x3340, 1
+	metatiles_top 0x27540C, 0x1EF0, 1
+	metatile_types_bottom 0x276048, 0xCD0, 1
+	metatile_types_top 0x276324, 0x7BC, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x273E74+0x48, 0x3340, 1
 	metatiles_top 0x275398+0x48, 0x1EF0, 1
@@ -670,6 +709,7 @@ gAreaMetatiles_DarkHyruleCastleOutside:: @ 08102FAC
 	metatile_types_top 0x2762B0, 0x7BC, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
 .ifdef JP
@@ -678,6 +718,12 @@ gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
 	metatile_types_bottom 0x257D78, 0xD84, 1
 	metatile_types_top 0x257FEC, 0xD84, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x256688, 0x3610, 1
+	metatiles_top 0x257468, 0x3610, 1
+	metatile_types_bottom 0x257D78, 0xD84, 1
+	metatile_types_top 0x257FEC, 0xD84, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x256614+0x48, 0x3610, 1
 	metatiles_top 0x2573F4+0x48, 0x3610, 1
@@ -690,6 +736,7 @@ gAreaMetatiles_DarkHyruleCastleBridge:: @ 08102FDC
 	metatile_types_top 0x257F78, 0xD84, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_VaatisArms:: @ 0810300C
 .ifdef JP
@@ -698,6 +745,12 @@ gAreaMetatiles_VaatisArms:: @ 0810300C
 	metatile_types_bottom 0x264DBC, 0x5F2, 1
 	metatile_types_top 0x264EC0, 0x2F0, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x263D70, 0x17C8, 1
+	metatiles_top 0x264A38, 0xBC0, 1
+	metatile_types_bottom 0x264DBC, 0x5F2, 1
+	metatile_types_top 0x264EC0, 0x2F0, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x263CFC+0x48, 0x17C8, 1
 	metatiles_top 0x2649C4+0x48, 0xBC0, 1
@@ -710,6 +763,7 @@ gAreaMetatiles_VaatisArms:: @ 0810300C
 	metatile_types_top 0x264E4C, 0x2F0, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_Vaati3:: @ 0810303C
 .ifdef JP
@@ -718,6 +772,12 @@ gAreaMetatiles_Vaati3:: @ 0810303C
 	metatile_types_bottom 0x25CFC4, 0x3A0, 1
 	metatile_types_top 0x25D098, 0x26E, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x25C730, 0xE80, 1
+	metatiles_top 0x25CDE8, 0x9B8, 1
+	metatile_types_bottom 0x25CFC4, 0x3A0, 1
+	metatile_types_top 0x25D098, 0x26E, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x25C6BC+0x48, 0xE80, 1
 	metatiles_top 0x25CD74+0x48, 0x9B8, 1
@@ -730,6 +790,7 @@ gAreaMetatiles_Vaati3:: @ 0810303C
 	metatile_types_top 0x25D024, 0x26E, 1, 1
 .endif
 .endif
+.endif
 
 gAreaMetatiles_Vaati2:: @ 0810306C
 .ifdef JP
@@ -738,6 +799,12 @@ gAreaMetatiles_Vaati2:: @ 0810306C
 	metatile_types_bottom 0x260D30, 0x214, 1
 	metatile_types_top 0x260DAC, 0xA6, 1, 1
 .else
+.ifdef DEMO_JP
+	metatiles_bottom 0x260864, 0x850, 1
+	metatiles_top 0x260C90, 0x298, 1
+	metatile_types_bottom 0x260D30, 0x214, 1
+	metatile_types_top 0x260DAC, 0xA6, 1, 1
+.else
 .ifdef EU
 	metatiles_bottom 0x2607F0+0x48, 0x850, 1
 	metatiles_top 0x260C1C+0x48, 0x298, 1
@@ -750,6 +817,7 @@ gAreaMetatiles_Vaati2:: @ 0810306C
 	metatile_types_top 0x260D38, 0xA6, 1, 1
 .endif
 .endif
+.endif
 
 
 gAreaMetatiles:: @ 0810309C

data/scripts/script_08008B5C.inc

@@ -1,60 +1,60 @@
 SCRIPT_START script_08008B5C
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	_0807EB44 0x0004
 	_0807E930 0x0000
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 script_08008B6E:
-	_0807E944 
-	_0807E864 
+	_0807E944
+	_0807E864
 	_0807E930 0x0004
 	Call sub_0807F2D4
 	Call sub_0806BBB0
-	_0807EA94 
+	_0807EA94
 	_0807E930 0x0008
-	_0807E878 
+	_0807E878
 	Jump script_08008B6E
 	.2byte 0x0000
 SCRIPT_START script_08008B90
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 script_08008BA2:
-	_0807E944 
-	_0807E864 
+	_0807E944
+	_0807E864
 	_0807E930 0x0004
 	Call sub_0807F2D4
 	MessageFromTarget 0x4912
 	_0807EA94 
 	_0807E930 0x0008
-	_0807E878 
+	_0807E878
 	Jump script_08008BA2
 SCRIPT_START script_08008BC0
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	_0807EB44 0x0004
 	DoPostScriptAction 0x000a
 	_0807E930 0x0000
 .ifdef EU
 	SetGlobalFlag 0x0061
 .endif
-	EndBlock 
+	EndBlock
 script_08008BD2:
-	_0807E944 
-	_0807E864 
+	_0807E944
+	_0807E864
 .ifndef EU
 	SetGlobalFlag 0x0061
 .endif
 	_0807E930 0x0004
 	Call sub_0807F2D4
-	_0807EA94 
+	_0807EA94
 	Call sub_0806BA34
 	JumpIfNot script_08008C54
-	_0807EA94 
+	_0807EA94
 	CallWithArg sub_0806BB1C, 0x00000000
 	Call sub_0807F2D4
 	CallWithArg sub_0806BB1C, 0x00000001
@@ -78,18 +78,18 @@ script_08008C54:
 	_0807E930 0x0008
 	Wait 0x000f
 script_08008C5C:
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	Jump script_08008BD2
 SCRIPT_START script_08008C64
-	BeginBlock 
+	BeginBlock
 	SetEntityPositionRelative 0x0068, 0x0018
 	DoPostScriptAction 0x000f
 	_0807EB44 0x0004
 	_0807E930 0x0004
 	SetEntitySpeed 0x0300
 	PlaySound SFX_STAIRS
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000002
 	MessageNoOverlap 0x490d
 	_0807EA94 

data/scripts/script_08008D50.inc

@@ -1,15 +1,15 @@
 SCRIPT_START script_08008D50
-	BeginBlock 
+	BeginBlock
 	SetEntityPositionRelative 0x0068, 0x0068
 	_0807F0B4 0x0004
-	CameraTargetEntity 
-	EndBlock 
+	CameraTargetEntity
+	EndBlock
 	Wait 0x001e
 	_0807E5F8 0x00000002
 	WaitForSomething 0x00000001
 	Wait 0x000f
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	Wait 0x001e
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0006

data/scripts/script_08008D8C.inc

@@ -1,52 +1,52 @@
 SCRIPT_START script_08008D8C
-	BeginBlock 
+	BeginBlock
 	Call sub_08061FD8
 	Call sub_08061E70
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 script_08008DA0:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08008DA0
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	Call sub_08061FD8
 	Call sub_08062048
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	Jump script_08008DA0
 	.2byte 0x0000
 SCRIPT_START script_08008DC0
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	EndBlock 
+	EndBlock
 script_08008DD8:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08008DD8
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	CallWithArg sub_0807F3D8, 0x00000000
 	Call sub_080643D8
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
 	Jump script_08008DD8
 SCRIPT_START script_08008E08
-	BeginBlock 
+	BeginBlock
 	SetEntityPositionRelative 0x0088, 0x0078
-	EndBlock 
+	EndBlock
 script_08008E12:
 	CheckPlayerInRegion 0x00d8, 0x0098, 0x4020
 	JumpIfNot script_08008E12
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	_0807F0B4 0x0001
-	CameraTargetEntity 
-	WaitForPlayerAction0x17 
+	CameraTargetEntity
+	WaitForPlayerAction0x17
 	Wait 0x003c
 	StartPlayerScript script_08008F74
 	WaitForSomething2 0x00000020
@@ -81,32 +81,32 @@ script_08008E12:
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
 	_0807F034 0x0035
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	StartPlayerScript script_08008FC0
 	WaitForSomething2 0x00000020
-	_0807E8E4_0 
+	_0807E8E4_0
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000100
 	_0807E5F8 0x00000010
 	Wait 0x0078
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000100
-	_0807E8E4_1 
+	_0807E8E4_1
 	_0807E5F8 0x00000001
 	WaitForSomething2 0x00000002
 	_0807F034 0x0047
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	SetIntVariable 0x00000003
 	Call sub_0807F420
-	_0807E8E4_0 
+	_0807E8E4_0
 	_0807E5F8 0x00000080
 	WaitForSomething2 0x00000100
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	SetGlobalFlag 0x0015
 	Call sub_0806DCC0
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08008F74.inc

@@ -1,7 +1,7 @@
 SCRIPT_START script_08008F74
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0100
-	EndBlock 
+	EndBlock
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x00b8, 0x0090
 	_0807EB44 0x0006

data/scripts/script_08008FFC.inc

@@ -1,8 +1,8 @@
 SCRIPT_START script_08008FFC
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0000
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000010
 	PlaySound SFX_11C
 	_0807E930 0x0001

data/scripts/script_0800903C.inc

@@ -1,8 +1,8 @@
 SCRIPT_START script_0800903C
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	PlaySound SFX_PLY_JUMP
 	_0807EF3C 0x0180, 0x0030
@@ -11,20 +11,20 @@ SCRIPT_START script_0800903C
 	WaitForSomething2 0x00000004
 	_0807EB44 0x0004
 	_0807E5F8 0x00000008
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	DoPostScriptAction 0x000a
 	Jump script_0800927E
 	.2byte 0x0000
 SCRIPT_START script_08009080
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F348
 	SetEntitySpeed 0x0100
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	_0807E9D4 
+	_0807E9D4
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000080
 	_0807EB44 0x0004
 	_0807ECC4 0x0008
@@ -74,23 +74,23 @@ SCRIPT_START script_08009080
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000100
 script_0800917C:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800917C
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	Call sub_0806673C
-	_0807EA94 
+	_0807EA94
 	Wait 0x000f
-	_0807E878 
+	_0807E878
 	Jump script_0800917C
 SCRIPT_START script_08009198
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F348
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000001
-	_0807EB74 
+	_0807EB74
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x105b, 0x0000
 	_0807EA94 
@@ -111,86 +111,86 @@ SCRIPT_START script_08009198
 	WaitForSomething2 0x00000001
 	DoPostScriptAction 0x0004
 	Wait 0x003c
-	_0807EB74 
-	_0807EB8C 
+	_0807EB74
+	_0807EB8C
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x1055, 0x0000
 	_0807EA94 
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
-	_0807EB74 
+	_0807EB74
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0001
 	_0807EDD4 0x0098, 0x0078
-	_0807EB74 
+	_0807EB74
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x1059, 0x0000
 	_0807EA94 
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000002
-	BeginBlock 
-	_0807E9D4 
+	BeginBlock
+	_0807E9D4
 	DoPostScriptAction 0x000a
 	Jump script_080092B2
 	.2byte 0x0000
 SCRIPT_START script_08009274
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 script_0800927E:
 	Call sub_080668F0
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 script_0800928A:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800928A
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	Call sub_08066904
-	_0807EA94 
+	_0807EA94
 	Wait 0x000f
-	_0807E878 
+	_0807E878
 	Jump script_0800928A
 	.2byte 0x0000
 SCRIPT_START script_080092A8
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0000
 script_080092B2:
-	_0807E9D4 
+	_0807E9D4
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 script_080092BA:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_080092BA
 	_0807E864 
 	_0807EB74 
 	MessageNoOverlap 0x105e
 	_0807EA94 
 	Wait 0x000f
-	_0807E878 
+	_0807E878
 	Jump script_080092BA
 SCRIPT_START script_080092D4
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Call sub_0806672C
 	DoPostScriptAction 0x000a
-	EndBlock 
+	EndBlock
 	Jump script_0800917C
 	.2byte 0x0000
 SCRIPT_START script_080092F0
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000a
 	Call sub_08066E38
-	_0807E9D4 
-	EndBlock 
+	_0807E9D4
+	EndBlock
 script_08009300:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009300
 	_0807E864 
 	_0807EB74 
@@ -200,7 +200,7 @@ script_08009300:
 	Jump script_08009300
 	.2byte 0x0000
 SCRIPT_START script_08009318
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009320.inc

@@ -1,8 +1,8 @@
 SCRIPT_START script_08009320
-	BeginBlock 
+	BeginBlock
 	Call sub_0806D650
 	SetEntitySpeed 0x0010
-	EndBlock 
+	EndBlock
 script_0800932E:
 	_0807EEF4 0xfff8, 0x0000
 	_0807EEF4 0x0008, 0x0000

data/scripts/script_08009340.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_08009340
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009348.inc

@@ -1,27 +1,27 @@
 SCRIPT_START script_08009348
-	BeginBlock 
-	_0807E9D4 
-	EndBlock 
+	BeginBlock
+	_0807E9D4
+	EndBlock
 script_0800934E:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800934E
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	Call sub_0806D638
 	_0807F0B4 0x0001
-	CameraTargetEntity 
+	CameraTargetEntity
 	CheckGlobalFlag 0x0055
 	JumpIf script_0800939A
 	MessageNoOverlap 0x1d01
 	_0807EA94 
 script_08009376:
-	_0807EA94 
+	_0807EA94
 	Call sub_0806D640
 	_0807F0B4 0x0001
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	Wait 0x002d
 	_0807F0B4 0x0004
-	_0807E878 
+	_0807E878
 	Call sub_0807DF50
 	Jump script_0800934E
 SCRIPT_END

data/scripts/script_0800939A.inc

@@ -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 

data/scripts/script_08009464.inc

@@ -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

data/scripts/script_080094CC.inc

@@ -1,13 +1,13 @@
 SCRIPT_START script_080094CC
-	BeginBlock 
+	BeginBlock
 	Call sub_0806D804
 	SetEntitySpeed 0x0180
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	SetEntity0x20 0x00018000
 	Call sub_0806D858
 script_080094EA:
-	_0807EE30 
+	_0807EE30
 	JumpIfNot script_080094EA
 	Wait 0x001e
 	DoPostScriptAction 0x0006

data/scripts/script_080094FC.inc

@@ -1,73 +1,73 @@
 SCRIPT_START script_080094FC
-	BeginBlock 
+	BeginBlock
 	Call sub_08067100
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 script_08009512:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009512
-	_0807E864 
+	_0807E864
 	DoPostScriptAction 0x0001
-	_0807EB74 
+	_0807EB74
 	Call sub_080670B4
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Jump script_08009512
 	.2byte 0x0000
 SCRIPT_START script_08009538
-	BeginBlock 
+	BeginBlock
 	Call sub_08067100
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 script_0800954E:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800954E
-	_0807E864 
+	_0807E864
 	DoPostScriptAction 0x0001
-	_0807EB74 
+	_0807EB74
 	Call sub_080670E4
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	Jump script_0800954E
 	.2byte 0x0000
 SCRIPT_START script_08009574
-	BeginBlock 
+	BeginBlock
 	Call sub_08067314
 	DoPostScriptAction 0x000a
 	_0807EB44 0x0004
 	SetIntVariable 0x00000000
 	Call sub_080672B0
-	EndBlock 
+	EndBlock
 script_08009592:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009592
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	SetIntVariable 0x00000004
 	Call sub_080672B0
 	Call sub_080672C8
-	_0807EA94 
+	_0807EA94
 	Wait 0x000f
-	_0807E878 
+	_0807E878
 	_0807EB44 0x0004
 	SetIntVariable 0x00000000
 	Call sub_080672B0
 	Jump script_08009592
 	.2byte 0x0000
 SCRIPT_START script_080095CC
-	BeginBlock 
+	BeginBlock
 	Call sub_0806BE3C
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
-	EndBlock 
+	EndBlock
 script_080095DE:
 	Call sub_0806BF44
 	JumpIf script_080095F2

data/scripts/script_080095F2.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_080095F2
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_080095DE
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	DoPostScriptAction 0x0001
 	Call sub_0806BE84
-	_0807EA94 
+	_0807EA94
 	JumpIfNot script_08009622
 	PlaySound SFX_109
 	_0807F088 0x003c
@@ -14,55 +14,55 @@ SCRIPT_START script_080095F2
 	_0807EA94 
 	_0807F078 0x003c, 0x0001
 script_08009622:
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0000
 	Jump script_080095DE
 SCRIPT_START script_0800962C
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x000b
 	DoPostScriptAction 0x0008
-	EndBlock 
+	EndBlock
 script_08009638:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_08009638
-	EndBlock 
+	EndBlock
 script_08009646:
 	Call sub_0806BF44
 	JumpIf script_08009646
-	EndBlock 
+	EndBlock
 	Call sub_0806BE3C
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
 script_08009660:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009660
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	DoPostScriptAction 0x0001
 	Call sub_0806BEC8
-	_0807EA94 
+	_0807EA94
 	JumpIfNot script_0800968E
 	PlaySound SFX_111
 	PlaySound SFX_SECRET
 	_0807F078 0x003c, 0x0002
 	Call sub_0806BEFC
 script_0800968E:
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0000
 	Jump script_08009660
 SCRIPT_START script_08009698
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	Jump script_080096FC
 	CheckGlobalFlag 0x0020
 	JumpIf script_080096FC
-	EndBlock 
+	EndBlock
 script_080096AC:
 	CheckPlayerInRegion 0x0188, 0x01c0, 0x1020
 	JumpIfNot script_080096AC
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	StartPlayerScript script_08009704
@@ -77,7 +77,7 @@ script_080096EC:
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_080096EC
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_080096FC:
 	Call sub_0808692C
 SCRIPT_END

data/scripts/script_08009740.inc

@@ -1,31 +1,31 @@
 SCRIPT_START script_08009740
-	BeginBlock 
+	BeginBlock
 	Call sub_08065D00
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
-	EndBlock 
+	EndBlock
 script_0800975A:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800975A
-	_0807E864 
-	_0807EB74 
+	_0807E864
+	_0807EB74
 	DoPostScriptAction 0x0000
 	Call sub_08065F64
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	Jump script_0800975A
 	.2byte 0x0000
 SCRIPT_START script_08009778
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	PlaySound SFX_1F3
 	Call sub_0807F40C
-	_0807E8E4_1 
+	_0807E8E4_1
 	Wait 0x000a
-	_0807E8E4_3 
+	_0807E8E4_3
 	Wait 0x0032
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
@@ -37,11 +37,11 @@ SCRIPT_START script_08009778
 	WaitForSomething2 0x00000040
 	_0807F078 0x003c, 0x0000
 	SetGlobalFlag 0x0020
-	_0807E8E4_3 
+	_0807E8E4_3
 	Wait 0x001e
 	_0807EB28 0x2809
-	_0807EA94 
+	_0807EA94
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_080097F0.inc

@@ -1,19 +1,19 @@
 SCRIPT_START script_080097F0
-	BeginBlock 
+	BeginBlock
 	_0807E930 0x0003
 	DoPostScriptAction 0x0007
 	SetEntitySpeed 0x0300
 	Call sub_0807F348
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	PlaySound SFX_123
 	Call sub_0807F1A0
 script_08009816:
-	EndBlock 
-	BeginBlock 
-	_0807EE30 
+	EndBlock
+	BeginBlock
+	_0807EE30
 	JumpIfNot script_08009816
-	EndBlock 
+	EndBlock
 	_0807E5F8 0x00000004
 	Call sub_0807FBD4
 	PlaySound SFX_1F3

data/scripts/script_08009838.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_08009838
-	BeginBlock 
+	BeginBlock
 	_0807E930 0x0003
 	DoPostScriptAction 0x0007
 	SetEntitySpeed 0x0300
 	Call sub_0807F348
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000008
 	Call sub_0809E0A0
 	Call sub_0809E0D4

data/scripts/script_080098D4.inc

@@ -1,6 +1,6 @@
 SCRIPT_START script_080098D4
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 script_080098D8:
 	CheckGlobalFlag 0x0020
 	JumpIfNot script_080098D8
@@ -12,9 +12,13 @@ script_080098E0:
 .else
 .ifdef EU
 	CheckLocalFlag 0x5b
+.else
+.ifdef DEMO_JP
+	CheckLocalFlag 0x5b @ TODO deduplicate
 .else
 	CheckLocalFlag 0x5d
 .endif
+.endif
 .endif
 	JumpIf script_08009910
 .ifdef JP
@@ -22,17 +26,21 @@ script_080098E0:
 .else
 .ifdef EU
 	SetLocalFlag 0x005b
+.else
+.ifdef DEMO_JP
+	SetLocalFlag 0x005b @ TODO deduplicate
 .else
 	SetLocalFlag 0x005d
 .endif
 .endif
-	_0807E864 
+.endif
+	_0807E864
 	Call sub_0807F9A4
 	Call sub_0807DF28
 	_0807EB28 0x280a
-	_0807EA94 
+	_0807EA94
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_08009910:
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_08009918.inc

@@ -1,15 +1,15 @@
 SCRIPT_START script_08009918
-	BeginBlock 
+	BeginBlock
 	Call sub_0807DF28
-	_0807E864 
+	_0807E864
 	_0807E5F8 0x00000000
-	EndBlock 
-	WaitFor_2 
+	EndBlock
+	WaitFor_2
 	Wait 0x0078
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000001
 	SetGlobalFlag 0x001c
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	Call sub_0807921C
 SCRIPT_END

data/scripts/script_08009950.inc

@@ -1,16 +1,16 @@
 SCRIPT_START script_08009950
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F348
 	SetEntitySpeed 0x0040
 	_0807EB44 0x0004
 	_0807E930 0x000c
 	_0807E908 0x0003
-	EndBlock 
+	EndBlock
 	Wait 0x001e
-	CameraTargetEntity 
+	CameraTargetEntity
 	_0807E778 0x0004
 	_0807E800 0x00000000
-	WaitFor_2 
+	WaitFor_2
 	WaitForSomething2 0x00000008
 	DoPostScriptAction 0x0004
 	Wait 0x001e
@@ -31,7 +31,7 @@ SCRIPT_START script_08009950
 	DoPostScriptAction 0x0000
 	Wait 0x001e
 	_0807E778 0x0002
-	DoFade5 
-	WaitFor_2 
+	DoFade5
+	WaitFor_2
 	Call sub_08053634
 SCRIPT_END

data/scripts/script_080099DC.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_080099DC
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F348
 	SetEntitySpeed 0x00c0
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0008
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0007
 	_0807EDD4 0x0068, 0x0060

data/scripts/script_08009A34.inc

@@ -8,13 +8,13 @@ script_08009A38:
 	Jump script_08009A38
 SCRIPT_START script_08009A50
 	SetEntityPositionRelative 0x0240, 0x0178
-	CameraTargetEntity 
+	CameraTargetEntity
 	SetEntitySpeed 0x0080
 	Wait 0x0078
 	PlayBgm BGM_MINISH_CAP
 	_0807E778 0x0002
-	DoFade4 
-	WaitFor_2 
+	DoFade4
+	WaitFor_2
 	Wait 0x0078
 	_0807E5F8 0x00000004
 	Call sub_08053648

data/scripts/script_08009A84.inc

@@ -1,16 +1,16 @@
 SCRIPT_START script_08009A84
-	BeginBlock 
+	BeginBlock
 	SetEntityPositionRelative 0x01e8, 0x0110
 	SetEntitySpeed 0x00c0
 	DoPostScriptAction 0x0008
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0007
 	_0807EDD4 0x01e8, 0x0200
 	_0807EDD4 0x01f8, 0x0218
 	_0807EDD4 0x0220, 0x0228
 	_0807EDD4 0x0240, 0x0228
-	CameraTargetEntity 
+	CameraTargetEntity
 	_0807EDD4 0x0290, 0x0228
 	_0807EDD4 0x0290, 0x01f8
 	SetEntitySpeed 0x0080

data/scripts/script_08009AF8.inc

@@ -1,6 +1,6 @@
 SCRIPT_START script_08009AF8
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 	WaitForSomething2 0x00000010
 	PlaySound SFX_F0
 	DoPostScriptAction 0x0008
@@ -10,7 +10,7 @@ SCRIPT_START script_08009AF8
 	Wait 0x005a
 	_0807E778 0x0004
 	_0807E80C 0x00000000
-	WaitFor_2 
+	WaitFor_2
 	Call sub_0805367C
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009B30.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_08009B30
-	BeginBlock 
+	BeginBlock
 	Call sub_0807DF28
-	_0807E864 
+	_0807E864
 	SetLocalFlag 0x0046
-	EndBlock 
-	WaitFor_2 
+	EndBlock
+	WaitFor_2
 	Wait 0x001e
 	MessageFromTarget 0x1005
 	_0807EA94 
@@ -14,7 +14,7 @@ SCRIPT_START script_08009B30
 	DoPostScriptAction 0x0014
 	Wait 0x001e
 	Call sub_08053250
-	_0807E878 
+	_0807E878
 	Call sub_0807DF50
 	Call sub_080791D0
 SCRIPT_END

data/scripts/script_08009B78.inc

@@ -1,15 +1,15 @@
 SCRIPT_START script_08009B78
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0006
 	SetEntitySpeed 0x0080
-	_0807E9D4 
+	_0807E9D4
 	Call sub_0807F348
-	EndBlock 
+	EndBlock
 	CheckGlobalFlag 0x0013
 	JumpIf script_08009C4C
-	_0807E888 
+	_0807E888
 	Wait 0x000a
-	_0807E864 
+	_0807E864
 	StartPlayerScript script_08009CFC
 	Call sub_0807DF28
 	WaitForSomething2 0x00000008
@@ -24,7 +24,7 @@ SCRIPT_START script_08009B78
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000008
-	_0807EB8C 
+	_0807EB8C
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x100b, 0x0000
 	_0807EA94 
@@ -42,8 +42,8 @@ SCRIPT_START script_08009B78
 	WaitForSomething2 0x00000008
 	Call sub_08053250
 	_0807F034 0x0034
-	WaitPlayerAction8 
-	_0807E8E4_1 
+	WaitPlayerAction8
+	_0807E8E4_1
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x100c, 0x0000
 	_0807EA94 
@@ -52,7 +52,7 @@ SCRIPT_START script_08009B78
 script_08009C4C:
 	DoPostScriptAction 0x000a
 script_08009C50:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009C50
 	_0807E864 
 	_0807EB74 

data/scripts/script_08009C68.inc

@@ -1,26 +1,26 @@
 SCRIPT_START script_08009C68
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0002
 	SetEntitySpeed 0x0100
 	Call sub_0807F348
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	DoPostScriptAction 0x0004
-	_0807EB74 
+	_0807EB74
 	WaitForSomething2 0x00000004
-	_0807EB74 
+	_0807EB74
 	WaitForSomething2 0x00000004
-	_0807EB74 
-	_0807EB8C 
+	_0807EB74
+	_0807EB8C
 	DoPostScriptAction 0x0001
 	MessageFromTargetPos 0x100a, 0x0000
 	_0807EA94 
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000004
-	_0807EB8C 
+	_0807EB8C
 	DoPostScriptAction 0x0001
-	_0807EB8C 
+	_0807EB8C
 	_0807EB44 0x0002
 	MessageFromTargetPos 0x100d, 0x0000
 	_0807EA94 
@@ -29,11 +29,11 @@ SCRIPT_START script_08009C68
 	_0807EDD4 0x0000, 0x0060
 	Call sub_080536A8
 	Wait 0x001e
-	BeginBlock 
+	BeginBlock
 	SetGlobalFlag 0x0013
 	Call sub_0807DF50
 	Call sub_080791D0
-	_0807E878 
-	EndBlock 
+	_0807E878
+	EndBlock
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009CFC.inc

@@ -1,8 +1,8 @@
 SCRIPT_START script_08009CFC
-	BeginBlock 
-	_0807E8E4_1 
+	BeginBlock
+	_0807E8E4_1
 	SetEntitySpeed 0x00c0
-	EndBlock 
+	EndBlock
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0004
 	Wait 0x003c
@@ -10,7 +10,7 @@ SCRIPT_START script_08009CFC
 	_0807EDD4 0x0060, 0x0068
 	_0807E5F8 0x00000004
 	DoPostScriptAction 0x0000
-	_0807E8E4_0 
+	_0807E8E4_0
 	Wait 0x000f
 	PlaySound SFX_VO_ZELDA1
 	DoPostScriptAction 0x0000
@@ -18,7 +18,7 @@ SCRIPT_START script_08009CFC
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000002
 	_0807EDD4 0x0070, 0x005c
-	_0807E8E4_1 
+	_0807E8E4_1
 	DoPostScriptAction 0x0000
 	Wait 0x000f
 	_0807E5F8 0x00000008

data/scripts/script_08009D6C.inc

@@ -1,8 +1,8 @@
 SCRIPT_START script_08009D6C
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0100
 	_0807EB44 0x0006
-	EndBlock 
+	EndBlock
 	_0807EDD4 0x0078, 0x0060
 	_0807EDD4 0x0078, 0x007c
 	Wait 0x001e
@@ -11,8 +11,8 @@ SCRIPT_START script_08009D6C
 	_0807EDD4 0x0078, 0x0098
 	DoPostScriptAction 0x0008
 	_0807E778 0x0010
-	DoFade5 
-	WaitFor_2 
+	DoFade5
+	WaitFor_2
 	Call sub_08053634
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_08009DB0.inc

@@ -1,44 +1,44 @@
 SCRIPT_START script_08009DB0
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F348
 	Call sub_08066288
 	Call sub_08066274
 	DoPostScriptAction 0x000a
 	_0807E930 0x000c
 	_0807E908 0x0003
-	EndBlock 
+	EndBlock
 script_08009DD2:
-	_0807E944 
+	_0807E944
 	_0807E908 0x0002
 	Call sub_0806622C
-	_0807EA94 
+	_0807EA94
 	_0807E908 0x0003
 	_0807E930 0x000c
 	Jump script_08009DD2
 SCRIPT_START script_08009DEC
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 script_08009DF0:
 	CheckPlayerInRegion 0x00a0, 0x0038, 0x1830
 	JumpIfNot script_08009DF0
-	_0807E864 
+	_0807E864
 	Call sub_0807F9A4
 	Wait 0x0008
 	_0807EB28 0x3207
-	_0807E3E8 
+	_0807E3E8
 	JumpIfNot script_08009E4E
 	Call sub_0807DF28
 	_0807E778 0x0002
-	DoFade5 
-	WaitFor_2 
+	DoFade5
+	WaitFor_2
 	Call sub_0804E864
 	Wait 0x001e
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000001
 	_0807EB28 0x3209
 	Wait 0x000f
-	_0807EA94 
-	_0807E878 
+	_0807EA94
+	_0807E878
 	Call sub_0807DF50
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_08009E4E.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_08009E4E
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009E58.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_08009E58
-	BeginBlock 
+	BeginBlock
 	Call sub_0807DF28
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	_0807E778 0x0002
-	DoFade4 
-	WaitFor_2 
+	DoFade4
+	WaitFor_2
 	DoPostScriptAction 0x0014
 	Wait 0x001e
 	_0807E5F8 0x00000001

data/scripts/script_08009E80.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_08009E80
-	BeginBlock 
-	EndBlock 
+	BeginBlock
+	EndBlock
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_08009E88.inc

@@ -1,28 +1,32 @@
 SCRIPT_START script_08009E88
-	BeginBlock 
+	BeginBlock
 	Call sub_0807DF28
-	_0807E864 
+	_0807E864
 .ifdef JP
 	SetLocalFlag 0x009e
 .else
 .ifdef EU
 	SetLocalFlag 0x009e
+.else
+.ifdef DEMO_JP
+	SetLocalFlag 0x009e @ TODO deduplicate
 .else
 	SetLocalFlag 0x009f
 .endif
 .endif
-	EndBlock 
+.endif
+	EndBlock
 	Wait 0x003c
 	_0807E778 0x0004
-	DoFade4 
-	WaitFor_2 
+	DoFade4
+	WaitFor_2
 script_08009EA4:
 	Call sub_0807F0D8
 	JumpIfNot script_08009EA4
 	DoPostScriptAction 0x0014
 	Wait 0x000a
 	Call sub_08053250
-	_0807E878 
+	_0807E878
 	Call sub_0807DF50
 	Call sub_080791D0
 SCRIPT_END

data/scripts/script_08009ECC.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_08009ECC
-	BeginBlock 
+	BeginBlock
 	SetIntVariable 0x00000002
 	DoPostScriptAction 0x0001
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
-	BeginBlock 
+	BeginBlock
 	SetIntVariable 0x00000003
 	DoPostScriptAction 0x0001
-	EndBlock 
+	EndBlock
 SCRIPT_END

data/scripts/script_08009EF0.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_08009EF0
-	BeginBlock 
+	BeginBlock
 	SetIntVariable 0x00000000
 	DoPostScriptAction 0x0001
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
-	BeginBlock 
+	BeginBlock
 	SetIntVariable 0x00000001
 	DoPostScriptAction 0x0001
-	EndBlock 
+	EndBlock
 SCRIPT_END

data/scripts/script_08009F14.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_08009F14
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	Call sub_08060090
 	DoPostScriptAction 0x000a
@@ -7,15 +7,15 @@ SCRIPT_START script_08009F14
 	JumpIf script_08009FD2
 	CheckInventory1 0x0007
 	JumpIf script_08009F84
-	EndBlock 
+	EndBlock
 script_08009F36:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_08060158
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009F36
-	EndBlock 
-	_0807E864 
+	EndBlock
+	_0807E864
 	Call sub_0807DF28
 	DoPostScriptAction 0x000b
 	StartPlayerScript script_0800A088
@@ -25,42 +25,42 @@ script_08009F36:
 	_0807EA94 
 	Wait 0x001e
 	_0807F034 0x0065
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	DoPostScriptAction 0x000a
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 script_08009F84:
-	EndBlock 
+	EndBlock
 script_08009F86:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_08060158
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009F86
-	EndBlock 
-	_0807E864 
+	EndBlock
+	_0807E864
 	Call sub_080602BC
-	_0807EA94 
+	_0807EA94
 	CallWithArg sub_0807F970, 0x00001f03
 	JumpIf script_08009FB6
-	_0807E878 
+	_0807E878
 	Jump script_08009F86
 script_08009FB6:
 	Wait 0x0008
 	PlaySound SFX_103
 	CallWithArg sub_0806030C, 0x00000063
 	Wait 0x0008
-	_0807E878 
+	_0807E878
 	Jump script_08009F86
 script_08009FD2:
-	EndBlock 
+	EndBlock
 	CheckLocalFlag 0x00b0
 	JumpIf script_0800A024
 script_08009FDC:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_08060158
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_08009FDC
 	EndBlock 
 	_0807E864 
@@ -68,47 +68,47 @@ script_08009FDC:
 	_0807EA94 
 	_0807E3E8 
 	JumpIf script_0800A002
-	_0807E878 
+	_0807E878
 	Jump script_08009FDC
 script_0800A002:
 	Wait 0x0008
 	_0807F034 0x0008
 	Call sub_08060318
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	Wait 0x0008
 	_0807EB8C 
 	MessageFromTarget 0x1f13
 	_0807EA94 
 	SetLocalFlag 0x00b0
-	_0807E878 
+	_0807E878
 script_0800A024:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_08060158
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800A024
-	EndBlock 
-	_0807E864 
+	EndBlock
+	_0807E864
 	CheckInventory1 0x0008
 	JumpIf script_0800A052
 	MessageNoOverlap 0x1f14
 	_0807EA94 
 	_0807E3E8 
 	JumpIf script_0800A002
-	_0807E878 
+	_0807E878
 	Jump script_0800A024
 script_0800A052:
 	MessageNoOverlap 0x1f11
 	_0807EA94 
 	_0807E3E8 
 	JumpIf script_0800A064
-	_0807E878 
+	_0807E878
 	Jump script_0800A024
 script_0800A064:
 	Wait 0x0008
 	_0807F034 0x0007
 	Call sub_08060318
-	WaitPlayerAction8 
+	WaitPlayerAction8
 	Wait 0x0008
 	_0807EB8C 
 	MessageFromTarget 0x1f10

data/scripts/script_0800A088.inc

@@ -1,7 +1,7 @@
 SCRIPT_START script_0800A088
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0100
-	EndBlock 
+	EndBlock
 	_0807ECC4 0x0010
 	_0807EDD4 0x0078, 0x0060
 	_0807EB44 0x0000

data/scripts/script_0800A0B4.inc

@@ -1,16 +1,16 @@
 SCRIPT_START script_0800A0B4
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0140
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
-	EndBlock 
+	EndBlock
 	Wait 0x0078
 	PlayBgm BGM_ELEMENT_THEME
 	Call sub_080A0464
 script_0800A0D2:
-	_0807EE30 
+	_0807EE30
 	JumpIfNot script_0800A0D2
-	_0807E8E4_0 
+	_0807E8E4_0
 	Wait 0x0008
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000004

data/scripts/script_0800A0FC.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A0FC
-	EndBlock 
+	EndBlock
 script_0800A0FE:
 	CheckGlobalFlag 0x0051
 	JumpIfNot script_0800A0FE
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	StopBgm
 .ifndef EU
@@ -12,14 +12,14 @@ script_0800A0FE:
 .endif
 	SetEntityPositionRelative 0x00b0, 0x0058
 	Call sub_0807F844
-	_0807E8E4_3 
+	_0807E8E4_3
 	CallWithArg sub_0807F75C, 0x00d00060
 	CallWithArg sub_08094AE8, script_0800A160
 	PlaySound SFX_APPARATE
 	_0807E778 0x0002
-	DoFade6 
-	EndBlock 
-	WaitFor_2 
+	DoFade6
+	EndBlock
+	WaitFor_2
 	WaitForSomething2 0x00000004
 	CallWithArg sub_0806DA1C, 0x00000006
 	DoPostScriptAction 0x0006

data/scripts/script_0800A160.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_0800A160
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
@@ -7,7 +7,7 @@ SCRIPT_START script_0800A160
 	SetEntityPositionRelative 0x00b0, 0x0080
 	CallWithArg sub_0807F98C, 0xff800000
 	CallWithArg sub_080960C4, script_0800A1B4
-	EndBlock 
+	EndBlock
 	PlaySound SFX_SPARKLES
 	_0807EF3C 0xff80, 0x0000
 	PlaySound SFX_143

data/scripts/script_0800A1B4.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A1B4
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000002
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_0800A1D8.inc

@@ -1,12 +1,12 @@
 SCRIPT_START script_0800A1D8
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0080
 	Call sub_0807F844
-	_0807E8E4_3 
+	_0807E8E4_3
 	CallWithArg sub_0807F75C, 0x00a80088
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	StartPlayerScript script_0800A310
 	WaitForSomething2 0x00000001
@@ -18,7 +18,7 @@ SCRIPT_START script_0800A1D8
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000200
 	_0807E5F8 0x00000004
-	_0807E8E4_0 
+	_0807E8E4_0
 	WaitForSomething2 0x00000080
 	_0807E5F8 0x00000010
 	WaitForSomething2 0x00000200
@@ -37,7 +37,7 @@ SCRIPT_START script_0800A1D8
 	_0807E5F8 0x00000008
 	WaitForSomething2 0x00000100
 	Wait 0x003c
-	_0807E8E4_3 
+	_0807E8E4_3
 	_0807E5F8 0x00000004
 	WaitForSomething2 0x00000080
 	Wait 0x003c

data/scripts/script_0800A310.inc

@@ -1,5 +1,5 @@
 SCRIPT_START script_0800A310
-	EndBlock 
+	EndBlock
 	_0807EB44 0x0002
 	Wait 0x000a
 	_0807EB44 0x0006
@@ -12,13 +12,13 @@ SCRIPT_START script_0800A310
 	Call sub_080791BC
 	.2byte 0x0000
 SCRIPT_START script_0800A340
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0008
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	_0807E930 0x000e
 	DoPostScriptAction 0x0007

data/scripts/script_0800A3D8.inc

@@ -1,16 +1,16 @@
 SCRIPT_START script_0800A3D8
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0100
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0004
 	Call sub_0807F3F8
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	_0807EC94 0x0010
 	_0807EB44 0x0002

data/scripts/script_0800A500.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A500
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807E930 0x0005
 	Call sub_0807F348
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000008
 	PlaySound SFX_SPARKLES
 	_0807E610 0x00000800

data/scripts/script_0800A590.inc

@@ -1,13 +1,13 @@
 SCRIPT_START script_0800A590
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	SetEntity0x20 0x00000000
 	DoPostScriptAction 0x0008
 	_0807EB44 0x0000
 	Call sub_0807F714
-	MoveEntityToPlayer 
+	MoveEntityToPlayer
 	CallWithArg sub_0807F98C, 0xfff00000
-	EndBlock 
+	EndBlock
 	_0807E930 0x0023
 	WaitForSomething2 0x00000010
 	CallWithArg sub_0807F6E8, 0x00000008

data/scripts/script_0800A638.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A638
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00001000
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_0800A65C.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A65C
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000800
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_0800A680.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A680
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000020
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_0800A6A4.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A6A4
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0068
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	CallWithArg sub_0806DA1C, 0x00000008

data/scripts/script_0800A6D4.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A6D4
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0070
 	Call sub_0807F844
 	PlaySound SFX_APPARATE
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x00000009
 	DoPostScriptAction 0x0006

data/scripts/script_0800A704.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A704
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0198, 0x01c8
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	CallWithArg sub_0806DA1C, 0x0000000a

data/scripts/script_0800A734.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800A734
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x00d8, 0x01c8
 	Call sub_0807F844
 	PlaySound SFX_APPARATE
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	CallWithArg sub_0806DA1C, 0x0000000b
 	DoPostScriptAction 0x0006

data/scripts/script_0800A764.inc

@@ -1,20 +1,20 @@
 SCRIPT_START script_0800A764
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x00f8, 0x01b8
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	_0807E778 0x0004
-	DoFade7 
-	WaitFor_2 
+	DoFade7
+	WaitFor_2
 	_0807E5F8 0x00000001
 	PlaySound SFX_APPARATE
 	_0807E778 0x0002
-	DoFade6 
-	WaitFor_2 
+	DoFade6
+	WaitFor_2
 	Wait 0x001e
 	_0807E5F8 0x00000002
 	Wait 0x0014

data/scripts/script_0800A7E4.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A7E4
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000002
@@ -16,11 +16,11 @@ script_0800A80C:
 	Wait 0x001e
 	Jump script_0800A80C
 SCRIPT_START script_0800A820
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000004
@@ -33,11 +33,11 @@ script_0800A848:
 	Wait 0x0014
 	Jump script_0800A848
 SCRIPT_START script_0800A85C
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0010
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000001
 	_0807E930 0x0002
 	WaitForSomething2 0x00000008
@@ -50,11 +50,11 @@ script_0800A884:
 	Wait 0x000a
 	Jump script_0800A884
 SCRIPT_START script_0800A898
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0008
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000001
 	DoPostScriptAction 0x0000
 	WaitForSomething2 0x00000010
@@ -67,11 +67,11 @@ script_0800A8C0:
 	Wait 0x0019
 	Jump script_0800A8C0
 SCRIPT_START script_0800A8D4
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	_0807EB44 0x0004
 	_0807E930 0x0008
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000001
 	DoPostScriptAction 0x0000
 	WaitForSomething2 0x00000020
@@ -84,12 +84,12 @@ script_0800A8FC:
 	Wait 0x000f
 	Jump script_0800A8FC
 SCRIPT_START script_0800A910
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0378, 0x0178
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	_0807E5F8 0x00000001
 	Wait 0x001e

data/scripts/script_0800A964.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A964
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0007
 	_0807E930 0x0001
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000001
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800A988.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A988
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0007
 	_0807E930 0x0002
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800A9AC.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A9AC
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800A9D0.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800A9D0
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0007
 	_0807E930 0x0003
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000008
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800A9F4.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800A9F4
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0128, 0x0058
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	_0807E5F8 0x00000001
 	Wait 0x000a

data/scripts/script_0800AA48.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA48
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000001
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800AA6C.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA6C
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800AA90.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AA90
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000004
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800AAB4.inc

@@ -1,9 +1,9 @@
 SCRIPT_START script_0800AAB4
-	BeginBlock 
+	BeginBlock
 	_0807EB44 0x0006
 	DoPostScriptAction 0x0007
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000008
 	Call CreateDust
 	DoPostScriptAction 0x0006

data/scripts/script_0800AAD8.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AAD8
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0148
 	Call sub_0807F844
-	EndBlock 
+	EndBlock
 	Wait 0x003c
 	PlaySound SFX_EVAPORATE
 	CallWithArg sub_0806DA1C, 0x0000000f

data/scripts/script_0800AB08.inc

@@ -1,14 +1,14 @@
 SCRIPT_START script_0800AB08
-	BeginBlock 
-	_0807E864 
+	BeginBlock
+	_0807E864
 	Call sub_0807DF28
 	SetEntityPositionRelative 0x0088, 0x0148
 	Call sub_0807F844
-	_0807E8E4_3 
+	_0807E8E4_3
 	CallWithArg sub_0807F6E8, 0x00000008
 	CallWithArg sub_0807F75C, 0x00a80088
 	PlaySound SFX_APPARATE
-	EndBlock 
+	EndBlock
 	Wait 0x0078
 	_0807F0B4 0x0001
 	SetEntityPositionRelative 0x0088, 0x0078

data/scripts/script_0800AB6E.inc

@@ -2,7 +2,7 @@ SCRIPT_START script_0800AB6E
 	Call sub_0808D2CC
 	_0807E5F8 0x00000002
 	WaitForSomething2 0x00000004
-	_0807E8E4_0 
+	_0807E8E4_0
 	_0807E5F8 0x00000040
 	WaitForSomething2 0x00000080
 	SetEntityPosition 0x0000, 0xffe0
@@ -53,17 +53,17 @@ SCRIPT_START script_0800AB6E
 	Call sub_0808D280
 	Wait 0x0078
 	_0807E778 0x0004
-	DoFade5 
-	WaitFor_2 
+	DoFade5
+	WaitFor_2
 	Call sub_0807FB94
-	MoveEntityToPlayer 
+	MoveEntityToPlayer
 	Call sub_0807F844
 	_0807F0B4 0x0004
-	CameraTargetPlayer 
+	CameraTargetPlayer
 	_0807E5F8 0x80000000
-	DoFade4 
-	WaitFor_2 
+	DoFade4
+	WaitFor_2
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END

data/scripts/script_0800ACBC.inc

@@ -1,7 +1,7 @@
 SCRIPT_START script_0800ACBC
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0100
-	EndBlock 
+	EndBlock
 	_0807EDD4 0x0088, 0x0080
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000

data/scripts/script_0800ACE0.inc

@@ -1,16 +1,16 @@
 SCRIPT_START script_0800ACE0
-	BeginBlock 
+	BeginBlock
 	Call sub_08094BE0
 	CallWithArg sub_0807F238, 0x0000045b
 	PlaySound SFX_109
-	EndBlock 
+	EndBlock
 	Call sub_0807F304
 	Wait 0x005a
 	_0807E5F8 0x00000008
-	BeginBlock 
+	BeginBlock
 	CallWithArg sub_0807F6F8, 0x00000008
 	CallWithArg sub_0807F238, 0x000008e4
-	EndBlock 
+	EndBlock
 	Call sub_0807F304
 	_0807EB44 0x0004
 	DoPostScriptAction 0x0000

data/scripts/script_0800AD54.inc

@@ -1,20 +1,20 @@
 SCRIPT_START script_0800AD54
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
-	EndBlock 
+	EndBlock
 	_0807EC64 0x0020
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000
 	_0807E5F8 0x00000001
 	Call sub_080791BC
 SCRIPT_START script_0800AD74
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0004
 	CallWithArg sub_0807F3D8, 0x00000000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000002
 	DoPostScriptAction 0x0004
 	Wait 0x001e

data/scripts/script_0800AEA4.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AEA4
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807EB44 0x0002
 	DoPostScriptAction 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000040
 	_0807EB44 0x0000
 	DoPostScriptAction 0x0000

data/scripts/script_0800AEDC.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AEDC
-	BeginBlock 
+	BeginBlock
 	SetEntitySpeed 0x0080
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	_0807E930 0x0000
-	EndBlock 
+	EndBlock
 	WaitForSomething2 0x00000008
 	Call sub_08094B80
 	_0807EF3C 0x0000, 0x0001

data/scripts/script_0800AF18.inc

@@ -1,10 +1,10 @@
 SCRIPT_START script_0800AF18
-	BeginBlock 
+	BeginBlock
 	DoPostScriptAction 0x0007
 	DoPostScriptAction 0x000b
 	CallWithArg sub_0807F994, 0x0000fff8
 	PlaySound SFX_SPARKLES
-	EndBlock 
+	EndBlock
 	WaitForSomething 0x00000020
 	PlaySound SFX_143
 	DoPostScriptAction 0x0006

data/scripts/script_0800AF44.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF44
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	_0807EB28 0x1c01
-	_0807EA94 
+	_0807EA94
 	SetLocalFlagByOffset 0x0100, 0x0001
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_0800AF68.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF68
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	_0807EB28 0x1c02
-	_0807EA94 
+	_0807EA94
 	SetLocalFlagByOffset 0x0100, 0x0002
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_0800AF8C.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AF8C
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	_0807EB28 0x1c03
-	_0807EA94 
+	_0807EA94
 	SetLocalFlagByOffset 0x0100, 0x0003
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_0800AFB0.inc

@@ -1,18 +1,18 @@
 SCRIPT_START script_0800AFB0
-	_0807E864 
+	_0807E864
 script_0800AFB2:
-	EndBlock 
-	BeginBlock 
+	EndBlock
+	BeginBlock
 	Call sub_0807FBB4
 	ComparePlayerAction 0x0001
 	JumpIfNot script_0800AFB2
-	EndBlock 
+	EndBlock
 	Call sub_0807DF28
 	_0807EB28 0x1c04
-	_0807EA94 
+	_0807EA94
 	SetLocalFlagByOffset 0x0100, 0x0004
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_0800AFE8.inc

@@ -1,11 +1,11 @@
 SCRIPT_START script_0800AFE8
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	_0807EB28 0x1c05
-	_0807EA94 
+	_0807EA94
 	SetLocalFlagByOffset 0x0100, 0x0005
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000

data/scripts/script_0800B00C.inc

@@ -1,14 +1,14 @@
 SCRIPT_START script_0800B00C
-	BeginBlock 
+	BeginBlock
 	Call sub_0807F934
 	Call sub_080A2124
 	DoPostScriptAction 0x000a
 	DoPostScriptAction 0x0007
-	EndBlock 
+	EndBlock
 script_0800B024:
-	CheckEntityInteractType 
+	CheckEntityInteractType
 	JumpIfNot script_0800B024
-	_0807E864 
+	_0807E864
 	Call sub_0807DF28
 	CheckGlobalFlag 0x0052
 	JumpIf script_0800B082
@@ -20,7 +20,7 @@ script_0800B024:
 	Call Windcrest_Unlock
 	Wait 0x003c
 	_0807EB28 0x0b5c
-	_0807EA94 
+	_0807EA94
 	SetGlobalFlag 0x0053
 	Jump script_0800B09C
 script_0800B064:
@@ -30,7 +30,7 @@ script_0800B064:
 	Call Windcrest_Unlock
 	Wait 0x003c
 	_0807EB28 0x0b5d
-	_0807EA94 
+	_0807EA94
 	Jump script_0800B09C
 script_0800B082:
 	MessageNoOverlap 0x3f32
@@ -39,10 +39,10 @@ script_0800B082:
 	Call Windcrest_Unlock
 	Wait 0x003c
 	_0807EB28 0x0b5e
-	_0807EA94 
+	_0807EA94
 script_0800B09C:
 	Call sub_0807DF50
-	_0807E878 
+	_0807E878
 	DoPostScriptAction 0x0006
 SCRIPT_END
 	.2byte 0x0000