diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-16 21:27:55 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-10-16 21:28:16 +0200 |
| commit | 47154cb556214b5c0b0e1fd373baa616fce61b18 (patch) | |
| tree | 84a013362159dd252f7751c5aa4b0f0aef74124d | |
| parent | bcbfcc0ee4e80f2728699a1b330c8011c3946c74 (diff) | |
Add DEMO_JP variant
440 files changed, 8007 insertions, 3692 deletions
@@ -4,12 +4,14 @@ First, you must put a The Legend of Zelda: The Minish Cap (U) ROM (with SHA1: `b ## Building other variants To build other variants, you currently need a combination of different baseroms, depending on the variant. -| | USA | DEMO | JP | EU | -| - | :-: | :-: | :-: | :-: | -| baserom.gba | X | X | X | X | -| baserom_demo.gba | | X | | | -| baserom_jp.gba | | | X | X | -| baserom_eu.gba | | | | X | +| | USA | JP | EU | DEMO_USA | DEMO_JP | +| - | :-: | :-: | :-: | :-: | :-: | +| baserom.gba | X | X | X | X | X | +| baserom_jp.gba | | X | X | | X | +| baserom_eu.gba | | | X | | | +| baserom_demo.gba | | | | X | | +| baserom_demo_jp.gba | | | | | X | + ## Prerequisites diff --git a/Jenkinsfile b/Jenkinsfile index bd7b99ea..5f5169af 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { } stage('Build') { steps { - sh 'make usa demo jp eu -j' + sh 'make usa demo_usa jp demo_jp eu -j' } } stage('Report Progress') { @@ -16,15 +16,20 @@ ifeq ($(GAME_VERSION), USA) GAME_CODE := BZME BUILD_NAME := tmc else -ifeq ($(GAME_VERSION), DEMO) +ifeq ($(GAME_VERSION), DEMO_USA) GAME_CODE := BZHE -BUILD_NAME := tmc_demo +BUILD_NAME := tmc_demo_usa else ifeq ($(GAME_VERSION), JP) GAME_CODE := BZMJ BUILD_NAME := tmc_jp GAME_LANGUAGE := JAPANESE else +ifeq ($(GAME_VERSION), DEMO_JP) +GAME_CODE := BZMJ +BUILD_NAME := tmc_demo_jp +GAME_LANGUAGE := JAPANESE +else ifeq ($(GAME_VERSION), EU) GAME_CODE := BZMP BUILD_NAME := tmc_eu @@ -34,6 +39,7 @@ endif endif endif endif +endif SHELL := /bin/bash -o pipefail @@ -166,8 +172,9 @@ clean: mostlyclean clean-tools tidy: rm -f tmc.gba tmc.elf tmc.map - rm -f tmc_demo.gba tmc_demo.elf tmc_demo.map + rm -f tmc_demo_usa.gba tmc_demo_usa.elf tmc_demo_usa.map rm -f tmc_jp.gba tmc_jp.elf tmc_jp.map + rm -f tmc_demo_jp.gba tmc_demo_jp.elf tmc_demo_jp.map rm -f tmc_eu.gba tmc_eu.elf tmc_eu.map rm -r build/* @@ -240,32 +247,47 @@ $(ROM): $(ELF) $(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@ usa: ; @$(MAKE) GAME_VERSION=USA -demo: ; @$(MAKE) GAME_VERSION=DEMO +demo_usa: ; @$(MAKE) GAME_VERSION=DEMO_USA jp: ; @$(MAKE) GAME_VERSION=JP +demo_jp: ; @$(MAKE) GAME_VERSION=DEMO_JP eu: ; @$(MAKE) GAME_VERSION=EU ifeq ($(GAME_VERSION), USA) baserom.gba: $(error "You need to provide a USA ROM as baserom.gba") -.PHONY: baserom_demo.gba baserom_jp.gba baserom_eu.gba +.PHONY: baserom_demo.gba baserom_jp.gba baserom_eu.gba baserom_demo_jp.gba baserom_demo.gba: baserom_jp.gba: baserom_eu.gba: +baserom_demo_jp.gba: endif -ifeq ($(GAME_VERSION), DEMO) +ifeq ($(GAME_VERSION), DEMO_USA) baserom.gba: $(error "You need to provide a USA ROM as baserom.gba") baserom_demo.gba: $(error "You need to provide a DEMO ROM as baserom_demo.gba") -.PHONY: baserom_jp.gba baserom_eu.gba +.PHONY: baserom_jp.gba baserom_eu.gba baserom_demo_jp.gba baserom_jp.gba: baserom_eu.gba: +baserom_demo_jp.gba: endif ifeq ($(GAME_VERSION), JP) baserom.gba: $(error "You need to provide a USA ROM as baserom.gba") baserom_jp.gba: $(error "You need to provide a JP ROM as baserom_jp.gba") +.PHONY: baserom_demo.gba baserom_eu.gba baserom_demo_jp.gba +baserom_demo.gba: +baserom_eu.gba: +baserom_demo_jp.gba: +endif +ifeq ($(GAME_VERSION), DEMO_JP) +baserom.gba: + $(error "You need to provide a USA ROM as baserom.gba") +baserom_jp.gba: + $(error "You need to provide a JP ROM as baserom_jp.gba") +baserom_demo_jp.gba: + $(error "You need to provide a DEMO JP ROM as baserom_demo_jp.gba") .PHONY: baserom_demo.gba baserom_eu.gba baserom_demo.gba: baserom_eu.gba: @@ -277,6 +299,7 @@ baserom_jp.gba: $(error "You need to provide a JP ROM as baserom_jp.gba") baserom_eu.gba: $(error "You need to provide a EU ROM as baserom_eu.gba") -.PHONY: baserom_demo.gba +.PHONY: baserom_demo.gba baserom_demo_jp.gba baserom_demo.gba: +baserom_demo_jp.gba: endif @@ -12,12 +12,14 @@ traditionally as a source code base for general changes. This is a WIP decompilation of The Legend of Zelda: The Minish Cap. The purpose of the project is to recreate a source code base for the game from scratch, using information found inside the game along with static and/or dynamic analysis. -The only build currently supported is `The Legend of Zelda: The Minish Cap (USA)`, but other versions are planned to be supported. - -It builds the following ROM: +It builds the following ROMs: * [**tmc.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1841) `sha1: b4bd50e4131b027c334547b4524e2dbbd4227130` +* [**tmc_eu.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1734) `sha1: cff199b36ff173fb6faf152653d1bccf87c26fb7` +* [**tmc_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1719) `sha1: 6c5404a1effb17f481f352181d0f1c61a2765c5d` +* [**tmc_demo_usa.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x051) `sha1: 63fcad218f9047b6a9edbb68c98bd0dec322d7a1` +* [**tmc_demo_jp.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=x430) `sha1: 9cdb56fa79bba13158b81925c1f3641251326412` **Note:** This repository does not include any of the assets necessary to build the ROM. A prior copy of the game is required to extract the needed assets. diff --git a/asm/code_08000108.s b/asm/code_08000108.s index c3f2ab5f..6034ba4e 100644 --- a/asm/code_08000108.s +++ b/asm/code_08000108.s @@ -40,7 +40,43 @@ _08000144EU: .byte 0x33, 0x5A, 0x43, 0x4D .4byte gUnk_03007FA0 .4byte gUnk_03006C14 +.else +.ifdef DEMO_JP @ TODO deduplicate + thumb_func_start sub_08000118 +sub_08000118: @ 0x08000118 + add r0, pc, #0x28 + ldm r0!, {r1, r2, r3} +_0800011C: + subs r2, #4 + str r1, [r2] + cmp r2, r3 + bgt _0800011C + bx lr + non_word_aligned_thumb_func_start sub_08000126 +sub_08000126: @ 0x08000126 + add r0, pc, #0x1C + ldm r0!, {r1, r2, r3} +_0800012A: + ldr r0, [r3] + adds r3, #4 + cmp r0, r1 + beq _0800012A + subs r2, #0xa0 +_08000134: + ldr r0, [r2] + adds r2, #4 + cmp r0, r1 + beq _08000134 + subs r1, r2, #4 + subs r0, r3, #4 + bx lr + .align 2, 0 +_08000144EU: + .byte 0x33, 0x5A, 0x43, 0x4D + .4byte gUnk_03007FA0 + .4byte gUnk_03006C14 +.endif .endif thumb_func_start sub_08000108 diff --git a/asm/code_080043E8.s b/asm/code_080043E8.s index 70bf95de..cb4fe1c9 100644 --- a/asm/code_080043E8.s +++ b/asm/code_080043E8.s @@ -2254,7 +2254,11 @@ gUnk_08007CAC:: @ 08007CAC .incbin "baserom.gba", 0x007CAC, 0x000005B gUnk_08007D07:: @ 08007D07 -.ifdef DEMO +.ifdef DEMO_JP +@ TODO only one byte differs + .incbin "baserom_demo_jp.gba", 0x007D4F, 0x00000CF +.else +.ifdef DEMO_USA @ TODO only one byte differs .incbin "baserom_demo.gba", 0x007D07, 0x00000CF .else @@ -2270,6 +2274,7 @@ gUnk_08007D07:: @ 08007D07 .endif .endif .endif +.endif non_word_aligned_thumb_func_start sub_08007DD6 sub_08007DD6: @ 0x08007DD6 diff --git a/asm/code_08018500.s b/asm/code_08018500.s index 262f4700..c937ee09 100644 --- a/asm/code_08018500.s +++ b/asm/code_08018500.s @@ -641,9 +641,13 @@ _080189D0: .ifdef EU movs r1, #0x77 .else +.ifdef DEMO_JP + movs r1, #0x77 @ TODO deduplicate +.else movs r1, #0x79 .endif .endif +.endif bl SetLocalFlagByOffset ldr r0, _080189E8 @ =gUnk_080FEE38 bl LoadRoomEntityList diff --git a/asm/code_0801967C.s b/asm/code_0801967C.s index a43b54fa..aec89e65 100644 --- a/asm/code_0801967C.s +++ b/asm/code_0801967C.s @@ -991,11 +991,18 @@ _08019DEE: beq _08019DF6 b _0801A2A4 .else -.ifdef DEMO +.ifdef DEMO_USA ldrb r0, [r4, #0xa] cmp r0, #0 beq _08019DF6 b _0801A2A4 +.else +.ifdef DEMO_JP @ TODO deduplicate + ldrb r0, [r4, #0xa] + cmp r0, #0 + beq _08019DF6 + b _0801A2A4 +.endif .endif .endif _08019DF6: diff --git a/asm/code_0801D79C.s b/asm/code_0801D79C.s index a4614d00..01aa32ee 100644 --- a/asm/code_0801D79C.s +++ b/asm/code_0801D79C.s @@ -2190,6 +2190,103 @@ _0801E8D2: thumb_func_start sub_0801E8D4 sub_0801E8D4: @ 0x0801E8D4 +.ifdef DEMO_JP + push {r4, r5, lr} + movs r5, #0xa +_0801E914: + adds r0, r5, #0 + bl CheckKinstoneFused + cmp r0, #0 + beq _0801E9C4 + adds r0, r5, #0 + bl sub_0801E810 + cmp r0, #0 + bne _0801E9C4 + ldr r1, _0801E94C @ =0x080C9500 + lsls r0, r5, #3 + adds r0, r0, r1 + ldrb r1, [r0, #4] + lsls r0, r1, #2 + adds r0, r0, r1 + lsls r0, r0, #2 + ldr r1, _0801E950 @ =0x080FDB04 + adds r2, r0, r1 + ldrh r3, [r2, #0x12] + ldrb r0, [r2, #0x10] + cmp r0, #9 + bhi _0801E9B0 + lsls r0, r0, #2 + ldr r1, _0801E954 @ =_0801E958 + adds r0, r0, r1 + ldr r0, [r0] + mov pc, r0 + .align 2, 0 +_0801E94C: .4byte 0x080C9500 +_0801E950: .4byte 0x080FDB04 +_0801E954: .4byte _0801E958 +_0801E958: @ jump table + .4byte _0801E980 @ case 0 + .4byte _0801E984 @ case 1 + .4byte _0801E988 @ case 2 + .4byte _0801E98C @ case 3 + .4byte _0801E990 @ case 4 + .4byte _0801E994 @ case 5 + .4byte _0801E99A @ case 6 + .4byte _0801E9A0 @ case 7 + .4byte _0801E9A6 @ case 8 + .4byte _0801E9AC @ case 9 +_0801E980: + movs r4, #0 + b _0801E9B0 +_0801E984: + ldrb r4, [r2, #0x11] + b _0801E9B0 +_0801E988: + movs r4, #0xf + b _0801E9B0 +_0801E98C: + movs r4, #0x10 + b _0801E9B0 +_0801E990: + movs r4, #0x11 + b _0801E9B0 +_0801E994: + movs r4, #4 + movs r3, #0x83 + b _0801E9B0 +_0801E99A: + movs r4, #4 + movs r3, #0x84 + b _0801E9B0 +_0801E9A0: + movs r4, #4 + movs r3, #0x87 + b _0801E9B0 +_0801E9A6: + movs r4, #4 + movs r3, #0x88 + b _0801E9B0 +_0801E9AC: + movs r4, #4 + movs r3, #0x8b +_0801E9B0: + adds r0, r4, #0 + adds r1, r3, #0 + bl sub_0807CB24 + cmp r0, #0 + beq _0801E9C4 + ldr r0, _0801E9CC @ =gUnk_02002C8E + adds r1, r5, #0 + bl WriteBit +_0801E9C4: + adds r5, #1 + cmp r5, #0x64 + bls _0801E914 + pop {r4, r5, pc} + .align 2, 0 +_0801E9CC: .4byte gUnk_02002C8E + +.else .ifdef JP push {r4, r5, lr} movs r4, #0xa @@ -2432,6 +2529,7 @@ _0801E990: _0801E998: .4byte gUnk_02002C8E .endif .endif +.endif thumb_func_start sub_0801E99C sub_0801E99C: @ 0x0801E99C diff --git a/asm/code_080526F8.s b/asm/code_080526F8.s index 52e84d20..b29a3351 100644 --- a/asm/code_080526F8.s +++ b/asm/code_080526F8.s @@ -696,7 +696,7 @@ _08052C30: _08052C34: .4byte gScreenTransition _08052C38: .4byte gArea .else -.ifdef DEMO @TODO deduplicate +.ifdef DEMO_USA @TODO deduplicate thumb_func_start sub_08052BF8 sub_08052BF8: @ 0x08052BF8 push {lr} @@ -733,6 +733,37 @@ _08052C38: .4byte gArea .endif .endif + +.ifdef DEMO_JP + thumb_func_start sub_08052BF8 +sub_08052BF8: @ 0x08052BF8 + push {lr} + ldr r0, _08052B38 @ =gScreenTransition + adds r1, r0, #0 + adds r1, #0x31 + ldrb r0, [r1] + cmp r0, #0 + bne _08052B36 + movs r0, #1 + strb r0, [r1] + bl GetEmptyManager + adds r1, r0, #0 + cmp r1, #0 + beq _08052B36 + movs r0, #9 + strb r0, [r1, #8] + movs r0, #0xf + strb r0, [r1, #9] + strb r0, [r1, #0xa] + adds r0, r1, #0 + movs r1, #0 + bl AppendEntityToList +_08052B36: + pop {pc} + .align 2, 0 +_08052B38: .4byte gScreenTransition +.endif + thumb_func_start sub_08052C3C sub_08052C3C: @ 0x08052C3C push {lr} @@ -1359,15 +1390,19 @@ _0805310C: _0805311A: movs r0, #0x80 lsls r0, r0, #1 -.ifdef JP +.ifdef JP @ TODO deduplicate movs r1, #0x9b .else .ifdef EU movs r1, #0x9b .else +.ifdef DEMO_JP + movs r1, #0x9b +.else movs r1, #0x9c .endif .endif +.endif bl CheckLocalFlagByOffset cmp r0, #0 beq _0805312C diff --git a/asm/code_08054C04.s b/asm/code_08054C04.s index e18c98ee..b629f27c 100644 --- a/asm/code_08054C04.s +++ b/asm/code_08054C04.s @@ -389,9 +389,13 @@ sub_08054EB8: @ 0x08054EB8 .ifdef EU movs r0, #0x77 .else +.ifdef DEMO_JP + movs r0, #0x77 @ TODO deduplicate +.else movs r0, #0x79 .endif .endif +.endif strh r0, [r3, #0x3e] adds r0, r3, #0 movs r1, #6 diff --git a/asm/code_0807F0D8.s b/asm/code_0807F0D8.s index 74d902aa..98e48acc 100644 --- a/asm/code_0807F0D8.s +++ b/asm/code_0807F0D8.s @@ -1601,7 +1601,7 @@ _0807FC32: .align 2, 0 _0807FC3C: .4byte gRoomControls .else -.ifdef DEMO @ TODO deduplicate +.ifdef DEMO_USA @ TODO deduplicate thumb_func_start sub_0807FC24 sub_0807FC24: @ 0x0807FC24 push {lr} @@ -1617,6 +1617,24 @@ _0807FC32: pop {pc} .align 2, 0 _0807FC3C: .4byte gRoomControls +.else +.ifdef DEMO_JP @ TODO deduplicate, one byte different + thumb_func_start sub_0807FC24 +sub_0807FC24: @ 0x0807FC24 + push {lr} + ldr r0, _0807FC3C @ =gRoomControls + ldrb r0, [r0, #5] + movs r1, #0xd0 + cmp r0, #1 + bne _0807FC32 + movs r1, #0xcf +_0807FC32: + adds r0, r1, #0 + bl SetLocalFlag + pop {pc} + .align 2, 0 +_0807FC3C: .4byte gRoomControls +.endif .endif .endif diff --git a/asm/code_080A3BD0.s b/asm/code_080A3BD0.s index e32620f3..34f85259 100644 --- a/asm/code_080A3BD0.s +++ b/asm/code_080A3BD0.s @@ -1302,7 +1302,11 @@ _080A45A2: thumb_func_start sub_080A45A4 sub_080A45A4: @ 0x080A45A4 -.ifdef DEMO +.ifdef DEMO_USA + bx lr + .align 2, 0 +.else +.ifdef DEMO_JP bx lr .align 2, 0 .else @@ -1345,6 +1349,7 @@ _080A45E0: _080A4600: .4byte gUnk_0812814C _080A4604: .4byte gMenu .endif +.endif thumb_func_start sub_080A4608 sub_080A4608: @ 0x080A4608 @@ -3219,7 +3224,12 @@ _080A52DC: .4byte gInput _080A52E0: cmp r4, #0x10 bne _080A52EC -.ifdef DEMO +.ifdef DEMO_USA + movs r0, #0x6d + bl SoundReq + b _080A5336 +.else +.ifdef DEMO_JP @ TODO same as DEMO_USA movs r0, #0x6d bl SoundReq b _080A5336 @@ -3228,6 +3238,7 @@ _080A52E0: bl sub_080A4E84 b _080A530A .endif +.endif _080A52EC: ldr r0, _080A5314 @ =gMenu adds r0, #0x10 diff --git a/asm/code_080A5574.s b/asm/code_080A5574.s index e7582e86..32def5e5 100644 --- a/asm/code_080A5574.s +++ b/asm/code_080A5574.s @@ -202,11 +202,15 @@ _080A570C: cmp r0, #1 bne _080A575E ldrb r3, [r2, #3] - .ifdef DEMO + .ifdef DEMO_USA + movs r4, #0 + .else + .ifdef DEMO_JP movs r4, #0 .else movs r1, #0 .endif + .endif cmp r3, #2 beq _080A572E cmp r3, #2 @@ -227,23 +231,39 @@ _080A572E: ldrb r0, [r0] cmp r0, #0 beq _080A574E - .ifdef DEMO + .ifdef DEMO_USA + movs r4, #8 + .else + .ifdef DEMO_JP movs r4, #8 .else movs r1, #8 .endif + .endif cmp r3, #0 bne _080A574E - .ifdef DEMO + .ifdef DEMO_USA + movs r4, #7 + .else + .ifdef DEMO_JP movs r4, #7 .else movs r1, #7 .endif + .endif b _080A5752 .align 2, 0 _080A5744: .4byte gMenu _080A5748: -.ifdef DEMO +.ifdef DEMO_USA + movs r0, #0x6d + bl SoundReq + b _080A574E +_080A574C: + movs r0, #0x6d + bl SoundReq +.else +.ifdef DEMO_JP movs r0, #0x6d bl SoundReq b _080A574E @@ -256,19 +276,28 @@ _080A574C: _080A574C: movs r1, #0xa .endif +.endif _080A574E: - .ifdef DEMO + .ifdef DEMO_USA + cmp r4, #0 + .else + .ifdef DEMO_JP cmp r4, #0 .else cmp r1, #0 .endif + .endif beq _080A575E _080A5752: - .ifdef DEMO + .ifdef DEMO_USA + adds r0, r4, #0 + .else + .ifdef DEMO_JP adds r0, r4, #0 .else adds r0, r1, #0 .endif + .endif bl sub_080A4E84 movs r0, #0x6a bl SoundReq @@ -24,6 +24,12 @@ start_vector: ldr r1, unk_function mov lr, pc bx r1 +.else +.ifdef DEMO_JP + ldr r1, unk_function + mov lr, pc + bx r1 +.endif .endif ldr r1, =AgbMain mov lr, pc @@ -36,4 +42,8 @@ INTR_VECTOR_BUF: .4byte 0x03007FFC intr_main: .4byte IntrMain .ifdef EU unk_function: .4byte sub_08000118 +.else +.ifdef DEMO_JP +unk_function: .4byte sub_08000118 +.endif .endif diff --git a/asm/figurineDevice.s b/asm/figurineDevice.s index 5a4e395b..d076fd5b 100644 --- a/asm/figurineDevice.s +++ b/asm/figurineDevice.s @@ -988,9 +988,13 @@ _080880B2: .ifdef EU movs r1, #0x9b .else +.ifdef DEMO_JP + movs r1, #0x9b @ TODO deduplicate +.else movs r1, #0x9c .endif .endif +.endif bl CheckLocalFlagByOffset cmp r0, #0 beq _080880C4 @@ -2192,5 +2196,36 @@ _08088678: .align 2, 0 _08088684: .4byte gPlayerEntity _08088688: .4byte gActiveScriptInfo +.else +.ifdef DEMO_JP @ TODO deduplicate + thumb_func_start sub_08088658 +sub_08088658: @ 0x08088658 + push {r4, lr} + adds r4, r1, #0 + movs r0, #0x78 + movs r1, #0x78 + movs r2, #0x10 + movs r3, #8 + bl CheckPlayerInRegion + str r0, [r4, #0x14] + ldr r0, _08088684 @ =gPlayerEntity + movs r1, #0x36 + ldrsh r0, [r0, r1] + cmp r0, #0 + beq _08088678 + movs r0, #0 + str r0, [r4, #0x14] +_08088678: + ldr r2, _08088688 @ =gActiveScriptInfo + ldrb r1, [r2, #7] + movs r0, #1 + orrs r0, r1 + strb r0, [r2, #7] + pop {r4, pc} + .align 2, 0 +_08088684: .4byte gPlayerEntity +_08088688: .4byte gActiveScriptInfo + +.endif .endif .endif diff --git a/asm/fileScreen.s b/asm/fileScreen.s index 49177655..67b9f73d 100755 --- a/asm/fileScreen.s +++ b/asm/fileScreen.s @@ -5,7 +5,7 @@ .text -.ifdef DEMO +.ifdef DEMO_USA thumb_func_start HandleGameplayScreen HandleGameplayScreen: @ 08051A28 push {r4, lr} @@ -340,9 +340,30 @@ _08051B5A: bl sub_08078A90 ldr r0, _08051BC8 @ =gUnk_02034490 strb r4, [r0] +.ifdef DEMO_JP + ldr r0, _08051C30 @ =gUnk_030010A0 + adds r0,#0x31 + ldrb r0,[r0,#0x0] + cmp r0,#0x0 + beq _08051bee + + bl sub_08053178 +_08051bee: + adds r0,r5,#0x0 + adds r0,#0x28 + ldrb r0,[r0,#0x0] + cmp r0,#0xff + beq _08051bfc + bl sub_0801855C +_08051bfc: + bl sub_08052BF8 + +.else + .ifdef JP bl sub_08053178 .endif + .ifndef EU adds r0, r5, #0 adds r0, #0x28 @@ -356,11 +377,17 @@ _08051B96: bl sub_08053178 @ TODO fix addresses bl sub_08053178 .else +.ifdef DEMO_JP + bl sub_08053178 @ TODO fix addresses + bl sub_08053178 +.else .ifndef JP bl sub_08052BF8 bl sub_08053178 .endif .endif +.endif +.endif ldr r0, _08051BCC @ =gRoomVars ldrb r0, [r0] cmp r0, #0 @@ -380,6 +407,9 @@ _08051BBC: .4byte 0x00000864 _08051BC0: .4byte 0x800B0000 _08051BC4: .4byte gMain _08051BC8: .4byte gUnk_02034490 +.ifdef DEMO_JP +_08051C30: .4byte gUnk_030010A0 +.endif _08051BCC: .4byte gRoomVars .endif @@ -523,7 +553,7 @@ _08051D28: .4byte gScreenTransition thumb_func_start sub_08051D2C sub_08051D2C: @ 0x08051D2C -.ifdef DEMO +.ifdef DEMO_USA push {lr} ldr r0, _08051E04 @ =0x03000FD0 ldrb r0, [r0] @@ -864,6 +864,56 @@ sub_080B19C8: @ 0x080B19C8 ldm sp!, {lr} b _080B1C40EU .else +.ifdef DEMO_JP @ TODO deduplicate same as EU + push {r4, r5, r6, r7, r8, sb, sl, fp, lr} + ldr fp, _080B2A30 @ =gUnk_03000000 + ldrb r2, [fp, #3] + cmp r2, #0x80 + bhs _080B19C0EU + add r0, pc, #0x54 @ =_080B19C0 + str r0, [fp, #0x18] + str sp, [fp, #0x14] + ldrb r0, [fp, #0xf] + cmp r0, #0xff + bne _080B1984 + bl _080B1FBC +_080B1980: + mov r0, #0x0 +_080B1984: + ldr r1, _080B2154 @ =0x03006958 + ldr r1, [r1, r0, lsl #2] + str r1, [fp, #0x1c] + ldr r0, _080B2A34 @ =gUnk_081326EC + ldr r0, [r0] + bl sub_080B19C8 + ldr r0, _080B2A38 @ =gUnk_081326EC + ldr r0, [r0, #4] + bl sub_080B19C8 + ldr r0, _080B2A3C @ =gUnk_081326EC + ldr r0, [r0, #8] + bl sub_080B19C8 + ldr r0, _080B2A40 @ =gUnk_081326EC + ldr r0, [r0, #0xc] + bl sub_080B19C8 +_080B19C0EU: + pop {r4, r5, r6, r7, r8, sb, sl, fp, lr} + bx lr + + arm_func_start sub_080B19C8 +sub_080B19C8: @ 0x080B19C8 + ldrb r2, [r0] + cmp r2, #0 + bxeq lr + ldr r1, _080B2A44 @ =0x08131D3C + ldr r1, [r1, #0x10] + mov r2, #0 + strb r2, [r1] + stmdb sp!, {lr} + bl sub_080B2478 + bl sub_080B2534 + ldm sp!, {lr} + b _080B1C40EU +.else push {r4, r5, r6, r7, r8, sb, sl, fp, lr} ldr fp, _080B2A30 @ =gUnk_03000000 ldrb r2, [fp, #3] @@ -903,6 +953,7 @@ sub_080B2448: @ 0x080B2448 ldm sp!, {lr} b _080B26B4 .endif +.endif arm_func_start sub_080B2478 sub_080B2478: @ 0x080B2478 @@ -984,7 +1035,142 @@ sub_080B255C: @ 0x080B255C bl sub_080B299C ldr r3, [fp, #0x1c] mov lr, pc +.ifdef DEMO_JP + bx r3 +.else bxne r3 +.endif + mov r5, #0 + strb r5, [fp, #0x12] + ldrsb r2, [r4, #0x29] + ands r2, r2, #8 + beq _080B1BB8 + ldrsh r3, [r4, #0x36] + cmp r3, #0 + bmi _080B1BA4 + mov r1, #0 + mov r2, #0 + bl sub_080B1BCC + ldrb r1, [r4, #0x18] + and r1, r1, #0x30 + mov r1, r1 + cmp r0, #0x19 + beq _080B1B98 + cmp r0, #0x2f + beq _080B1B64 + cmp r0, #0xf + bne _080B1BA4 + mov r5, #2 + strb r5, [fp, #0x12] + add r7, r7, r5 + ldrb r2, [fp, #1] + and r2, r2, #0x18 + add r2, r2, #0x80 + lsr r2, r2, #2 + b _080B1B74 +_080B1B64: + ldrb r2, [r4, #0x2e] + ldrb r3, [r4, #0x32] + eor r2, r2, r3 + and r2, r2, #6 +_080B1B74: + ldr r3, _080B2A48 @ =gUnk_030068CC + add r2, r1, r2, lsl #1 + ldr sl, [r3, r2] + push {r4, r8, sb} + mov r8, #0 + and sb, sb, #0xc00 + bl _080B2874 + pop {r4, r8, sb, lr} + b _080B2718 +_080B1B98: + mov r5, #2 + strb r5, [fp, #0x12] + add r7, r7, r5 +_080B1BA4: + stmdb sp!, {r4} + mov r0, r4 + bl _080B2718 + pop {r4, lr} + b _080B1BC0 +_080B1BB8: + ldm sp!, {lr} + b _080B2718 +_080B1BC0: + ldrsh r1, [r4, #0x36] + ldrb r0, [r4, #0x29] + tst r0, #0x10 + beq _080B1BD8 + cmp r1, #0 + bxpl lr +_080B1BD8: + tst r0, #0x20 + beq _080B1BEC + ldrb r0, [fp, #1] + tst r0, #1 + bxne lr +_080B1BEC: + mov r2, r7 + cmp r1, #0 + submi r2, r2, r1 + ldr r3, _080B2A4C @ =gUnk_081326EC + ldr r3, [r3, #0x10] + ldrb r0, [r3] + cmp r0, #0x40 + bxhs lr + add r0, r0, #1 + strb r0, [r3] + add r3, r3, r0, lsl #2 + lsr r0, sb, #0xa + and r0, r0, #3 + orr r0, r0, r2, lsl #6 + strh r0, [r3, #2] + ldrb r0, [r4, #0x18] + and r0, r0, #0x30 + lsr r0, r0, #4 + orr r0, r0, r6, lsl #6 + strh r0, [r3] + bx lr +_080B1C40EU: + ldr r4, _080B2A50 @ =gUnk_081326EC + ldr r4, [r4, #0x10] + ldrb r5, [r4] + cmp r5, #0 + bxeq lr + stmdb sp!, {lr} + add r4, r4, #4 +_080B1C5C: + ldrsh r0, [r4] + asr r6, r0, #6 + and r1, r0, #7 + ldr sl, _080B2A54 @ =gUnk_0300694C + ldr sl, [sl, r1, lsl #2] + ldrsh r0, [r4, #2] + asr r7, r0, #6 + and r1, r0, #3 + lsl sb, r1, #0xa + mov r8, #0 + push {r4, r5} + bl _080B2874 + pop {r4, r5} + add r4, r4, #4 + subs r5, r5, #1 + bgt _080B1C5C + ldm sp!, {lr} + bx lr + +.else +.ifdef DEMO_JP @ TODO deduplicate nearly same as EU + stmdb sp!, {lr} + mov r4, r0 + bl sub_080B299C + ldr r3, [fp, #0x1c] + mov lr, pc +.ifdef DEMO_JP + bx r3 +.else + bxne r3 +.endif mov r5, #0 strb r5, [fp, #0x12] ldrsb r2, [r4, #0x29] @@ -1228,6 +1414,7 @@ _080B26D0: bx lr .endif +.endif _080B2718: @@ -1569,11 +1756,129 @@ _080B2144: .4byte gUnk_030068F0 .4byte gUnk_0300689C .endif +.ifdef DEMO_JP @ TODO deduplicate same as EU +_080B1FBC: + mov sl, lr + ldrsh r0, [fp, #0x1c] + ldrsh r1, [fp, #0x1e] + ldrsh r2, [fp, #4] + sub r0, r0, r2 + ldrsh r3, [fp, #6] + sub r1, r1, r3 + mov r2, #0 + mov r3, #0 + bl sub_080B20ECEU + mov r5, #0 + ldr r4, _080B2194 @ =0x03003DF8 +_080B1FECEU: + ldr r0, [r4, #8] + cmp r0, #0 + beq _080B2074EU + ldrsh r6, [r0, #0x2e] + ldrsh r7, [r0, #0x32] + ldr r3, [r4, #4] + cmp r3, #0 + beq _080B2024 + ldrsb r0, [r3] + add r6, r6, r0 + ldrsb r0, [r3, #1] + add r7, r7, r0 + add r3, r3, #2 + b _080B202C +_080B2024: + ldr r3, [r0, #0x48] + add r3, r3, #6 +_080B202C: + ldrsh r0, [fp, #4] + sub r6, r6, r0 + ldrsh r0, [fp, #6] + sub r7, r7, r0 + ldrb r0, [r3] + ldrb r1, [r3, #1] + ldr r2, [fp, #1] + and r2, r2, #3 + lsl r3, r2, #0x1c + lsrs r2, r2, #1 + rsblo r0, r0, #0 + subhs r0, r0, #8 + rsbeq r1, r1, #0 + subne r1, r1, #8 + add r0, r0, r6 + add r1, r1, r7 + mov r2, #0 + bl sub_080B20ECEU +_080B2074EU: + add r4, r4, #0xc + add r5, r5, #1 + cmp r5, #0x1f + bls _080B1FECEU + bx sl + arm_func_start sub_080B2088 +sub_080B2088: @ 0x080B2088 + ldr r5, [r4, #0x48] + cmp r5, #0 + bxeq lr + ldrb r0, [r5, #6] + ldrb r1, [r5, #7] + ldr r2, [fp, #1] + and r2, r2, #3 + lsl r3, r2, #0x1c + lsrs r2, r2, #1 + rsblo r0, r0, #0 + subhs r0, r0, #8 + rsbeq r1, r1, #0 + subne r1, r1, #8 + ldrsb r2, [r5] + add r0, r6, r0 + add r0, r0, r2 + ldrsb r2, [r5, #1] + add r1, r7, r1 + add r1, r1, r2 + mov r2, sb + b sub_080B20ECEU +_080B20DC: + mov r0, r6 + mov r1, r7 + mov r2, r9 + mov r3, #0x0 + + arm_func_start sub_080B20ECEU +sub_080B20ECEU: @ 0x080B20EC + add ip, r1, #7 + cmp ip, #0xa8 + bxhs lr + add ip, r0, #7 + cmp ip, #0xf8 + bxhs lr + and r1, r1, #0xff + lsl r0, r0, #0x17 + orr r0, r1, r0, lsr #7 + eor r0, r0, r3 + and r1, r2, #0xc00 + add r1, r1, #0xff + ldrb r3, [fp, #3] + add ip, fp, #0x20 + add ip, ip, r3, lsl #3 + str r0, [ip] + strh r1, [ip, #4] + add r3, r3, #1 + cmp r3, #0x80 + bhs _080B298C + strb r3, [fp, #3] + bx lr +_080B2144: + .4byte gUnk_03006954 + .4byte gUnk_030068F0 + .4byte gUnk_0300689C +.endif _080B2A30: .4byte gUnk_03000000 .ifdef EU _080B2154: .4byte 0x03006958 @TODO make pointer? .endif +.ifdef DEMO_JP @ TODO deduplicate same as EU +_080B2154: .4byte 0x03006958 @TODO make pointer? +.endif _080B2A34: .4byte gUnk_081326EC _080B2A38: .4byte gUnk_081326EC _080B2A3C: .4byte gUnk_081326EC @@ -1592,3 +1897,6 @@ _080B2A6C: .4byte 0x3E003F00 .ifdef EU _080B2194: .4byte 0x03003DF8 @TODO pointer? .endif +.ifdef DEMO_JP @ TODO deduplicate same as EU +_080B2194: .4byte 0x03003DF8 @TODO pointer? +.endif diff --git a/asm/non_matching/playerItemSwordSpin/sub_0801BB2C.inc b/asm/non_matching/playerItemSwordSpin/sub_0801BB2C.inc index b00782d1..144acfcd 100644 --- a/asm/non_matching/playerItemSwordSpin/sub_0801BB2C.inc +++ b/asm/non_matching/playerItemSwordSpin/sub_0801BB2C.inc @@ -27,9 +27,13 @@ .ifdef EU bl CreateItemEntity .else +.ifdef DEMO_JP + bl CreateItemEntity @ TODO deduplicate +.else bl sub_080A7C18 .endif .endif +.endif ldr r0, _0801BB8C @ =0x00000109 bl SoundReq _0801BB64: diff --git a/asm/non_matching/sittingPerson/sub_0806387C.inc b/asm/non_matching/sittingPerson/sub_0806387C.inc index 063e6ae0..46a94fb0 100644 --- a/asm/non_matching/sittingPerson/sub_0806387C.inc +++ b/asm/non_matching/sittingPerson/sub_0806387C.inc @@ -8,9 +8,13 @@ .ifdef EU movs r0, #0xd7 .else +.ifdef DEMO_JP + movs r0, #0xd7 @ TODO deduplicate +.else movs r0, #0xda .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _08063896 @@ -21,9 +25,13 @@ .ifdef EU movs r0, #0xd7 .else +.ifdef DEMO_JP + movs r0, #0xd7 @ TODO deduplicate +.else movs r0, #0xda .endif .endif +.endif bl SetLocalFlag b _080638D6 _08063896: @@ -33,9 +41,13 @@ _08063896: .ifdef EU movs r0, #0xce .else +.ifdef DEMO_JP + movs r0, #0xce @ TODO deduplicate +.else movs r0, #0xd1 .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _080638D6 @@ -62,9 +74,13 @@ _080638B2: .ifdef EU movs r0, #0xce .else +.ifdef DEMO_JP + movs r0, #0xce @ TODO deduplicate +.else movs r0, #0xd1 .endif .endif +.endif bl SetLocalFlag ldr r0, _080638FC @ =0x00000A17 movs r1, #1 diff --git a/asm/non_matching/sittingPerson/sub_0806390C.inc b/asm/non_matching/sittingPerson/sub_0806390C.inc index 1576a801..20ebf13e 100644 --- a/asm/non_matching/sittingPerson/sub_0806390C.inc +++ b/asm/non_matching/sittingPerson/sub_0806390C.inc @@ -8,9 +8,13 @@ .ifdef EU movs r0, #0xd6 .else +.ifdef DEMO_JP + movs r0, #0xd6 @ TODO deduplicate +.else movs r0, #0xd9 .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _0806392E @@ -21,9 +25,13 @@ .ifdef EU movs r0, #0xd6 .else +.ifdef DEMO_JP + movs r0, #0xd6 @ TODO deduplicate +.else movs r0, #0xd9 .endif .endif +.endif bl SetLocalFlag adds r0, r4, #0 adds r0, #0x84 diff --git a/asm/non_matching/sub_0804C128.inc b/asm/non_matching/sub_0804C128.inc index 9a853e42..5b4ec167 100644 --- a/asm/non_matching/sub_0804C128.inc +++ b/asm/non_matching/sub_0804C128.inc @@ -122,9 +122,13 @@ _0804C206: .ifdef EU movs r0, #0x5a .else +.ifdef DEMO_JP + movs r0, #0x5a @ TODO deduplicate +.else movs r0, #0x5c .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _0804C228 diff --git a/asm/non_matching/sub_0804DE00.inc b/asm/non_matching/sub_0804DE00.inc index 4ec67d83..9908da61 100644 --- a/asm/non_matching/sub_0804DE00.inc +++ b/asm/non_matching/sub_0804DE00.inc @@ -73,9 +73,13 @@ _0804DE5C: .ifdef EU movs r0, #0xca .else +.ifdef DEMO_JP + movs r0, #0xca @ TODO deduplicate +.else movs r0, #0xcd .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _0804DEC4 diff --git a/asm/non_matching/sub_0804E150.inc b/asm/non_matching/sub_0804E150.inc index b782f7f8..f5b994bc 100644 --- a/asm/non_matching/sub_0804E150.inc +++ b/asm/non_matching/sub_0804E150.inc @@ -30,9 +30,13 @@ _0804E17C: .ifdef EU movs r0, #0xce .else +.ifdef DEMO_JP + movs r0, #0xce @ TODO deduplicate +.else movs r0, #0xd1 .endif .endif +.endif bl CheckLocalFlag cmp r0, #0 bne _0804E1BA diff --git a/asm/octorokBoss.s b/asm/octorokBoss.s index 59ca7773..88f8bf4a 100644 --- a/asm/octorokBoss.s +++ b/asm/octorokBoss.s @@ -424,6 +424,254 @@ _0803548C: _08035498: .4byte 0x00000109 .else +.ifdef DEMO_JP @ TODO same as JP + push {r4, r5, r6, r7, lr} + mov r7, sl + mov r6, sb + mov r5, r8 + push {r5, r6, r7} + adds r5, r0, #0 + adds r0, #0x7c + ldrb r0, [r0] + movs r6, #1 + adds r4, r6, #0 + ands r4, r0 + cmp r4, #0 + bne _08035390 + adds r0, r5, #0 + adds r0, #0x84 + ldr r1, [r0] + ldr r1, [r1, #0xc] + adds r1, #0x7d + ldrb r2, [r1] + mov sb, r0 + cmp r2, #0 + beq _080352D0 + subs r0, r2, #1 + strb r0, [r1] +_080352D0: + ldr r3, _08035334 @ =gRoomControls + movs r0, #0x84 + lsls r0, r0, #1 + adds r1, r0, #0 + ldrh r0, [r3, #6] + adds r1, r1, r0 + ldrh r0, [r5, #0x2e] + subs r1, r1, r0 + adds r1, #4 + lsls r1, r1, #0x10 + lsrs r1, r1, #0x10 + ldrh r0, [r3, #8] + ldrh r2, [r5, #0x32] + subs r0, r0, r2 + adds r0, #0x8c + lsls r0, r0, #0x10 + lsrs r0, r0, #0x10 + cmp r1, #8 + bhi _080352FAJP + cmp r0, #8 + bls _08035338 +_080352FAJP: + mov r1, sb + ldr r0, [r1] + strb r6, [r0, #2] + ldrh r0, [r3, #6] + movs r1, #0x84 + lsls r1, r1, #1 + adds r0, r0, r1 + lsls r0, r0, #0x10 + ldr r1, [r5, #0x2c] + subs r0, r0, r1 + ldrh r1, [r3, #8] + adds r1, #0x88 + lsls r1, r1, #0x10 + ldr r2, [r5, #0x30] + subs r1, r1, r2 + bl sub_080045DA + asrs r0, r0, #3 + strb r0, [r5, #0x15] + movs r0, #0x80 + lsls r0, r0, #1 + strh r0, [r5, #0x24] + adds r0, r5, #0 + bl ProcessMovement + adds r7, r5, #0 + adds r7, #0x79 + b _080353FA + .align 2, 0 +_08035334: .4byte gRoomControls +_08035338: + ldrb r0, [r5, #0xb] + cmp r0, #0 + bne _0803537C + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #5 + movs r3, #0 + bl CreateObjectWithParent + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #5 + movs r3, #1 + bl CreateObjectWithParent + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #5 + movs r3, #2 + bl CreateObjectWithParent + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #5 + movs r3, #3 + bl CreateObjectWithParent + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #5 + movs r3, #4 + bl CreateObjectWithParent + strb r6, [r5, #0xb] +_0803537C: + mov r1, sb + ldr r0, [r1] + strb r4, [r0, #2] + adds r1, r5, #0 + adds r1, #0x79 + ldrb r0, [r1] + subs r0, #1 + strb r0, [r1] + adds r7, r1, #0 + b _080353FA +_08035390: + adds r0, r5, #0 + adds r0, #0x84 + ldr r1, [r0] + ldrb r1, [r1, #1] + subs r4, r1, #1 + mov sb, r0 + adds r7, r5, #0 + adds r7, #0x79 + cmp r4, #0 + beq _080353DC + mov ip, sb + movs r0, #1 + mov sl, r0 + lsls r0, r4, #2 + subs r6, r0, #4 + movs r1, #3 + mov r8, r1 +_080353B2: + mov r1, ip + ldr r0, [r1] + adds r0, #0xc + adds r0, r0, r6 + ldr r3, [r0] + ldrb r2, [r3, #0x18] + lsls r1, r2, #0x1e + lsrs r1, r1, #0x1e + mov r0, sl + orrs r1, r0 + mov r0, r8 + ands r1, r0 + movs r0, #4 + rsbs r0, r0, #0 + ands r0, r2 + orrs r0, r1 + strb r0, [r3, #0x18] + subs r6, #4 + subs r4, #1 + cmp r4, #0 + bne _080353B2 +_080353DC: + ldr r1, _08035450 @ =gScreenTransition + ldr r0, [r1] + movs r1, #2 + ands r0, r1 + cmp r0, #0 + beq _080353F4 + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #6 + movs r3, #0 + bl CreateObjectWithParent +_080353F4: + ldrb r0, [r7] + subs r0, #1 + strb r0, [r7] +_080353FA: + ldrb r0, [r7] + cmp r0, #0 + bne _0803548C + movs r0, #2 + strb r0, [r5, #0xd] + adds r4, r5, #0 + adds r4, #0x7c + ldrb r0, [r4] + adds r0, #1 + strb r0, [r4] + adds r0, r5, #0 + bl sub_080AE068 + ldrb r1, [r4] + movs r0, #1 + ands r0, r1 + cmp r0, #0 + bne _08035454 + adds r1, r5, #0 + adds r1, #0x3f + movs r0, #0x5f + strb r0, [r1] + movs r1, #0x84 + lsls r1, r1, #1 + adds r0, r5, #0 + bl LoadFixedGFX + adds r0, r5, #0 + movs r1, #0xef + bl sub_0801D2B4 + adds r0, r5, #0 + movs r1, #0xef + bl sub_08036F14 + mov r1, sb + ldr r0, [r1] + ldr r0, [r0, #0xc] + movs r1, #1 + bl InitAnimationForceUpdate + b _08035480 + .align 2, 0 +_08035450: .4byte gScreenTransition +_08035454: + adds r1, r5, #0 + adds r1, #0x3f + movs r0, #0x61 + strb r0, [r1] + ldr r1, _08035498 @ =0x00000109 + adds r0, r5, #0 + bl LoadFixedGFX + adds r0, r5, #0 + movs r1, #0xf0 + bl sub_0801D2B4 + adds r0, r5, #0 + movs r1, #0xf3 + bl sub_08036F14 + mov r1, sb + ldr r0, [r1] + ldr r0, [r0, #0xc] + movs r1, #2 + bl InitAnimationForceUpdate +_08035480: + adds r0, r5, #0 + movs r1, #0x87 + movs r2, #8 + movs r3, #0 + bl CreateObjectWithParent +_0803548C: + pop {r3, r4, r5} + mov r8, r3 + mov sb, r4 + mov sl, r5 + pop {r4, r5, r6, r7, pc} + .align 2, 0 +_08035498: .4byte 0x00000109 + +.else .ifdef EU push {r4, r5, r6, r7, lr} mov r7, sl @@ -919,6 +1167,7 @@ _080354E8: _080354F4: .4byte 0x00000109 .endif .endif +.endif thumb_func_start sub_080354F8 sub_080354F8: @ 0x080354F8 diff --git a/asm/sub_0807CA18.s b/asm/sub_0807CA18.s index 8db5f175..84b0b866 100644 --- a/asm/sub_0807CA18.s +++ b/asm/sub_0807CA18.s @@ -5,7 +5,7 @@ .text -.ifdef DEMO +.ifdef DEMO_USA thumb_func_start sub_0807CA18 sub_0807CA18: push {r4, r5, r6, lr} diff --git a/asm/vaatiArm.s b/asm/vaatiArm.s index e0bb1f35..6315de9b 100644 --- a/asm/vaatiArm.s +++ b/asm/vaatiArm.s @@ -1010,9 +1010,13 @@ _08042C9E: .ifdef EU subs r0, #0x20 .else +.ifdef DEMO_JP + subs r0, #0x20 @ TODO deduplicate +.else subs r0, #0x40 .endif .endif +.endif cmp r0, r5 bge _08042CAA adds r5, r0, #0 diff --git a/asm/vaatiWrath.s b/asm/vaatiWrath.s index 5fb19bab..6ef91bf2 100644 --- a/asm/vaatiWrath.s +++ b/asm/vaatiWrath.s @@ -64,6 +64,21 @@ _0804139C: .4byte gUnk_080D0E1C thumb_func_start sub_080413A0 sub_080413A0: @ 0x080413A0 +.ifdef DEMO_JP @ TODO deduplicate + push {r4, lr} + adds r4, r0, #0 + bl sub_080423A4 + ldr r1, _080413BC @ =gUnk_080D0E2C + ldrb r0, [r4, #0xc] + lsls r0, r0, #2 + adds r0, r0, r1 + ldr r1, [r0] + adds r0, r4, #0 + bl _call_via_r1 + pop {r4, pc} + .align 2, 0 +_080413BC: .4byte gUnk_080D0E2C +.else .ifdef JP push {lr} ldr r2, _08041358 @ =gUnk_080D0E2C @@ -103,6 +118,7 @@ _08041288: .4byte gUnk_080D0E2C _080413BC: .4byte gUnk_080D0E2C .endif .endif +.endif thumb_func_start sub_080413C0 sub_080413C0: @ 0x080413C0 @@ -2317,7 +2333,76 @@ _0804241C: _08042420: .4byte gPlayerState _08042424: .4byte gPlayerEntity .else -.ifdef DEMO +.ifdef DEMO_USA +@ TODO is there a way to not duplicate this? + thumb_func_start sub_080423A4 +sub_080423A4: @ 0x080423A4 + push {r4, lr} + ldr r0, _080423CC @ =gScreenTransition + adds r4, r0, #0 + adds r4, #0x38 + ldrb r1, [r4] + movs r0, #2 + ands r0, r1 + cmp r0, #0 + bne _0804241C + ldr r0, _080423D0 @ =gSave + movs r2, #0x93 + lsls r2, r2, #3 + adds r1, r0, r2 + ldr r0, [r1] + cmp r0, #0 + beq _080423D4 + subs r0, #1 + str r0, [r1] + b _0804241C + .align 2, 0 +_080423CC: .4byte gScreenTransition +_080423D0: .4byte gSave +_080423D4: + ldr r2, _08042420 @ =gPlayerState + adds r0, r2, #0 + adds r0, #0xa9 + ldrb r0, [r0] + cmp r0, #1 + bgt _0804241C + cmp r0, #0 + blt _0804241C + ldr r0, [r2, #0x2c] + cmp r0, #0 + bne _0804241C + ldr r1, _08042424 @ =gPlayerEntity + adds r0, r1, #0 + adds r0, #0x7a + ldrh r0, [r0] + cmp r0, #0 + bne _0804241C + movs r3, #0x36 + ldrsh r0, [r1, r3] + movs r1, #0x80 + lsls r1, r1, #8 + ands r0, r1 + cmp r0, #0 + beq _0804240A + ldrb r0, [r2, #0xa] + cmp r0, #0 + beq _0804241C +_0804240A: + movs r0, #0xb7 + lsls r0, r0, #4 + movs r1, #0 + bl sub_08078AA8 + ldrb r0, [r4] + movs r1, #2 + orrs r0, r1 + strb r0, [r4] +_0804241C: + pop {r4, pc} + .align 2, 0 +_08042420: .4byte gPlayerState +_08042424: .4byte gPlayerEntity +.else +.ifdef DEMO_JP @ TODO is there a way to not duplicate this? thumb_func_start sub_080423A4 sub_080423A4: @ 0x080423A4 @@ -2387,6 +2472,7 @@ _08042420: .4byte gPlayerState _08042424: .4byte gPlayerEntity .endif .endif +.endif thumb_func_start sub_08042428 sub_08042428: @ 0x08042428 diff --git a/asm/windTribeTeleporter.s b/asm/windTribeTeleporter.s index 6a9d2e91..6167672f 100644 --- a/asm/windTribeTeleporter.s +++ b/asm/windTribeTeleporter.s @@ -115,6 +115,121 @@ _080A0FFE: thumb_func_start sub_080A1000 sub_080A1000: @ 0x080A1000 +.ifdef DEMO_JP + push {r4, lr} + adds r4, r0, #0 + ldrb r1, [r4, #0xd] + cmp r1, #1 + beq _080A0B52 + cmp r1, #1 + bgt _080A0B3C + cmp r1, #0 + beq _080A0B46 + b _080A0BB0 +_080A0B3C: + cmp r1, #2 + beq _080A0B60 + cmp r1, #3 + beq _080A0B8C + b _080A0BB0 +_080A0B46: + movs r0, #0x1e + strb r0, [r4, #0xe] + ldrb r0, [r4, #0xd] + adds r0, #1 + strb r0, [r4, #0xd] + b _080A0BF0 +_080A0B52: + ldrb r0, [r4, #0xe] + subs r0, #1 + strb r0, [r4, #0xe] + lsls r0, r0, #0x18 + cmp r0, #0 + bne _080A0BF0 + b _080A0B98 +_080A0B60: + ldrb r0, [r4, #0xe] + subs r0, #1 + strb r0, [r4, #0xe] + lsls r0, r0, #0x18 + cmp r0, #0 + bne _080A0B7E + ldrb r0, [r4, #0xd] + adds r0, #1 + strb r0, [r4, #0xd] + movs r0, #0x1e + strb r0, [r4, #0xe] + adds r0, #0xf5 + bl SoundReq + b _080A0BF0 +_080A0B7E: + ldr r0, _080A0B88 @ =gScreenTransition + ldr r0, [r0] + movs r1, #7 + b _080A0BDE + .align 2, 0 +_080A0B88: .4byte gScreenTransition +_080A0B8C: + ldrb r0, [r4, #0xe] + subs r0, #1 + strb r0, [r4, #0xe] + lsls r0, r0, #0x18 + cmp r0, #0 + bne _080A0BA4 +_080A0B98: + ldrb r0, [r4, #0xd] + adds r0, #1 + strb r0, [r4, #0xd] + movs r0, #0x1e + strb r0, [r4, #0xe] + b _080A0BF0 +_080A0BA4: + ldr r0, _080A0BAC @ =gScreenTransition + ldr r0, [r0] + b _080A0BDE + .align 2, 0 +_080A0BAC: .4byte gScreenTransition +_080A0BB0: + ldrb r0, [r4, #0xe] + subs r0, #1 + strb r0, [r4, #0xe] + lsls r0, r0, #0x18 + cmp r0, #0 + bne _080A0BD8 + movs r0, #0xfc + bl SetLocalFlag + ldrb r1, [r4, #0xb] + lsls r0, r1, #2 + adds r0, r0, r1 + lsls r0, r0, #2 + ldr r1, _080A0BD4 @ =0x0813AA10 + adds r0, r0, r1 + bl DoExitTransition + b _080A0BF0 + .align 2, 0 +_080A0BD4: .4byte 0x0813AA10 +_080A0BD8: + ldr r0, _080A0BF4 @ =gScreenTransition + ldr r0, [r0] + movs r1, #1 +_080A0BDE: + ands r0, r1 + cmp r0, #0 + bne _080A0BF0 + ldr r0, _080A0BF8 @ =gPlayerEntity + ldrb r1, [r0, #0x14] + adds r1, #2 + movs r2, #6 + ands r1, r2 + strb r1, [r0, #0x14] +_080A0BF0: + pop {r4, pc} + .align 2, 0 +_080A0BF4: .4byte gScreenTransition +_080A0BF8: .4byte gPlayerEntity + + +.else .ifdef JP push {lr} adds r1, r0, #0 @@ -461,6 +576,7 @@ _080A10D8: .4byte gScreenTransition _080A10DC: .4byte gPlayerEntity .endif .endif +.endif thumb_func_start sub_080A10E0 sub_080A10E0: @ 0x080A10E0 diff --git a/data/const/demoScreen.s b/data/const/demoScreen.s index 568bf8a3..d9a787fc 100644 --- a/data/const/demoScreen.s +++ b/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 diff --git a/data/const/enemy/gyorgFemale.s b/data/const/enemy/gyorgFemale.s index f77ba4cb..b2a5a6e4 100644 --- a/data/const/enemy/gyorgFemale.s +++ b/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 diff --git a/data/const/npc/forestMinish.s b/data/const/npc/forestMinish.s index f5b18042..351045f6 100644 --- a/data/const/npc/forestMinish.s +++ b/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 diff --git a/data/const/npc/kid.s b/data/const/npc/kid.s index c7d074a3..b55ba626 100644 --- a/data/const/npc/kid.s +++ b/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 diff --git a/data/const/npc/townsperson.s b/data/const/npc/townsperson.s index 0e9ecd25..e2378b8e 100644 --- a/data/const/npc/townsperson.s +++ b/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 diff --git a/data/const/npc/windTribespeople.s b/data/const/npc/windTribespeople.s index 97202d52..9474557b 100644 --- a/data/const/npc/windTribespeople.s +++ b/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 diff --git a/data/const/object/object96.s b/data/const/object/object96.s index a510537d..4f704f69 100644 --- a/data/const/object/object96.s +++ b/data/const/object/object96.s @@ -23,12 +23,16 @@ 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 .4byte 00000000 diff --git a/data/const/object/pinwheel.s b/data/const/object/pinwheel.s index a142cf19..efba063c 100644 --- a/data/const/object/pinwheel.s +++ b/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 diff --git a/data/data_080B2A70.s b/data/data_080B2A70.s index 70618027..80681df3 100644 --- a/data/data_080B2A70.s +++ b/data/data_080B2A70.s @@ -25,8 +25,12 @@ gUnk_080B2A70:: @ 080B2A70 .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 diff --git a/data/data_080B3740.s b/data/data_080B3740.s index 14dca41f..393f1e17 100644 --- a/data/data_080B3740.s +++ b/data/data_080B3740.s @@ -59,6 +59,10 @@ gUnk_080B3D20:: @ 080B3D20 .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 diff --git a/data/data_080B4410.s b/data/data_080B4410.s index 724ca6e2..8d454965 100644 --- a/data/data_080B4410.s +++ b/data/data_080B4410.s @@ -12,9 +12,13 @@ gUnk_080B4410:: @ 080B4410 .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 diff --git a/data/data_080C93E0.s b/data/data_080C93E0.s index 1e84ada0..4ea5c7b8 100644 --- a/data/data_080C93E0.s +++ b/data/data_080C93E0.s @@ -149,9 +149,13 @@ gUnk_080C9870:: @ 080C9870 .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 @@ -161,9 +165,13 @@ gUnk_080C98E8:: @ 080C98E8 .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 @@ -173,9 +181,13 @@ gUnk_080C9928:: @ 080C9928 .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 @@ -185,9 +197,13 @@ gUnk_080C9988:: @ 080C9988 .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 @@ -197,9 +213,13 @@ gUnk_080C99E8:: @ 080C99E8 .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 @@ -216,9 +236,13 @@ gUnk_080C9A44:: @ 080C9A44 .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 @@ -228,9 +252,13 @@ gUnk_080C9A7C:: @ 080C9A7C .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 @@ -240,9 +268,13 @@ gUnk_080C9B2C:: @ 080C9B2C .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 @@ -252,9 +284,13 @@ gUnk_080C9BB4:: @ 080C9BB4 .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 @@ -264,9 +300,13 @@ gUnk_080C9C1C:: @ 080C9C1C .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 diff --git a/data/data_080D5360.s b/data/data_080D5360.s index 6705401a..b02d7ac6 100644 --- a/data/data_080D5360.s +++ b/data/data_080D5360.s @@ -1897,12 +1897,17 @@ gUnk_080D8FB8:: @ 080D8FB8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D8D58, 0x000005C .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D8D58, 0x000005C +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D8D58, 0x000005C .else .incbin "baserom.gba", 0x0D8FB8, 0x000005C .endif .endif +.endif .4byte script_08009698 .incbin "baserom.gba", 0x0D9018, 0x000000C .4byte script_08009740 @@ -1910,12 +1915,17 @@ gUnk_080D8FB8:: @ 080D8FB8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D8DC8, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D8DC8, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D8DC8, 0x0000020 .else .incbin "baserom.gba", 0x0D9028, 0x0000020 .endif .endif +.endif gUnk_080D9048:: @ 080D9048 .incbin "baserom.gba", 0x0D9048, 0x0000050 @@ -1944,12 +1954,17 @@ gUnk_080D9128:: @ 080D9128 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D8EC8, 0x00000C0 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D8EC8, 0x00000C0 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D8EC8, 0x00000C0 .else .incbin "baserom.gba", 0x0D9128, 0x00000C0 .endif .endif +.endif gUnk_080D91E8:: @ 080D91E8 .incbin "baserom.gba", 0x0D91E8, 0x0000090 @@ -1959,12 +1974,17 @@ gUnk_080D9278:: @ 080D9278 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D9018, 0x0000018 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D9018, 0x0000018 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D9018, 0x0000018 .else .incbin "baserom.gba", 0x0D9278, 0x0000018 .endif .endif +.endif Room_RoyalValley_Main:: @ 080D9290 .4byte gUnk_080D8FB8 @@ -1990,12 +2010,17 @@ gUnk_080D9328:: @ 080D9328 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D90C8, 0x0000010 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D90C8, 0x0000010 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D90C8, 0x0000010 .else .incbin "baserom.gba", 0x0D9328, 0x0000010 .endif .endif +.endif gUnk_080D9338:: @ 080D9338 .incbin "baserom.gba", 0x0D9338, 0x0000008 @@ -2172,6 +2197,10 @@ gUnk_080D9AD8:: @ 080D9AD8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D9878, 0x000004C .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D9878, 0x000004C +.else .ifdef EU @ TODO only small differences @ TODO remove the 0x10 bytes at the correct place (not here) @@ -2180,6 +2209,7 @@ gUnk_080D9AD8:: @ 080D9AD8 .incbin "baserom.gba", 0x0D9AD8, 0x000004C .endif .endif +.endif .4byte script_0800B200 .incbin "baserom.gba", 0x0D9B28, 0x000000C .4byte script_0800B308 @@ -2193,12 +2223,17 @@ gUnk_080D9AD8:: @ 080D9AD8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D9908, 0x00000D0 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D9908, 0x00000D0 +.else .ifdef EU .incbin "baserom_eu.gba", 0x0D92C4, 0x00000C0 .else .incbin "baserom.gba", 0x0D9B68, 0x00000D0 .endif .endif +.endif gUnk_080D9C38:: @ 080D9C38 .incbin "baserom.gba", 0x0D9C38, 0x0000070 @@ -2207,12 +2242,17 @@ gUnk_080D9CA8:: @ 080D9CA8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D9A48, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D9A48, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D9A48, 0x0000020 .else .incbin "baserom.gba", 0x0D9CA8, 0x0000020 .endif .endif +.endif gUnk_080D9CC8:: @ 080D9CC8 .incbin "baserom.gba", 0x0D9CC8, 0x0000020 @@ -2236,12 +2276,17 @@ gUnk_080D9E58:: @ 080D9E58 @ TODO only small differences .incbin "baserom_jp.gba", 0x0D9BF8, 0x0000010 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0D9BF8, 0x0000010 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0D9BF8, 0x0000010 .else .incbin "baserom.gba", 0x0D9E58, 0x0000010 .endif .endif +.endif gUnk_080D9E68:: @ 080D9E68 .incbin "baserom.gba", 0x0D9E68, 0x0000040 @@ -2547,9 +2592,13 @@ gUnk_080DA534:: @ 080DA534 .ifdef EU .incbin "baserom_jp.gba", 0x0DA2D4, 0x40 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0DA2D4, 0x40 +.else .incbin "baserom.gba", 0x0DA534, 0x0000050 .endif .endif +.endif gUnk_080DA584:: @ 080DA584 .incbin "baserom.gba", 0x0DA584, 0x0000010 @@ -4176,12 +4225,17 @@ gUnk_080DD344:: @ 080DD344 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD0D4, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD0D4, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD0D4, 0x0000020 .else .incbin "baserom.gba", 0x0DD344, 0x0000020 .endif .endif +.endif gUnk_080DD364:: @ 080DD364 .incbin "baserom.gba", 0x0DD364, 0x000000C @@ -4212,12 +4266,17 @@ gUnk_080DD40C:: @ 080DD40C @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD19C, 0x0000090 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD19C, 0x0000090 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD19C, 0x0000090 .else .incbin "baserom.gba", 0x0DD40C, 0x0000090 .endif .endif +.endif gUnk_080DD49C:: @ 080DD49C .incbin "baserom.gba", 0x0DD49C, 0x0000130 @@ -4233,12 +4292,17 @@ gUnk_080DD6CC:: @ 080DD6CC @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD45C, 0x0000040 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD45C, 0x0000040 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD45C, 0x0000040 .else .incbin "baserom.gba", 0x0DD6CC, 0x0000040 .endif .endif +.endif Room_CloudTops_Middle:: @ 080DD70C .4byte gUnk_080DD40C @@ -4268,24 +4332,34 @@ gUnk_080DD790:: @ 080DD790 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD520, 0x0000050 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD520, 0x0000050 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD520, 0x0000050 .else .incbin "baserom.gba", 0x0DD790, 0x0000050 .endif .endif +.endif gUnk_080DD7E0:: @ 080DD7E0 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD570, 0x0000040 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD570, 0x0000040 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD570, 0x0000040 .else .incbin "baserom.gba", 0x0DD7E0, 0x0000040 .endif .endif +.endif gUnk_080DD820:: @ 080DD820 .incbin "baserom.gba", 0x0DD820, 0x0000020 @@ -4295,12 +4369,17 @@ gUnk_080DD840:: @ 080DD840 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD5D0, 0x0000040 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD5D0, 0x0000040 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD5D0, 0x0000040 .else .incbin "baserom.gba", 0x0DD840, 0x0000040 .endif .endif +.endif gUnk_080DD880:: @ 080DD880 .incbin "baserom.gba", 0x0DD880, 0x0000020 @@ -4396,12 +4475,17 @@ gUnk_080DDC00:: @ 080DDC00 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DD990, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DD990, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DD990, 0x0000020 .else .incbin "baserom.gba", 0x0DDC00, 0x0000020 .endif .endif +.endif gUnk_080DDC20:: @ 080DDC20 .incbin "baserom.gba", 0x0DDC20, 0x0000030 @@ -4414,12 +4498,17 @@ gUnk_080DDCD0:: @ 080DDCD0 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDA60, 0x0000010 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDA60, 0x0000010 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDA60, 0x0000010 .else .incbin "baserom.gba", 0x0DDCD0, 0x0000010 .endif .endif +.endif gUnk_080DDCE0:: @ 080DDCE0 .incbin "baserom.gba", 0x0DDCE0, 0x0000010 @@ -4459,12 +4548,17 @@ gUnk_080DDD84:: @ 080DDD84 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDB14, 0x0000030 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDB14, 0x0000030 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDB14, 0x0000030 .else .incbin "baserom.gba", 0x0DDD84, 0x0000030 .endif .endif +.endif gUnk_080DDDB4:: @ 080DDDB4 .incbin "baserom.gba", 0x0DDDB4, 0x0000040 @@ -4495,12 +4589,17 @@ gUnk_080DDE48:: @ 080DDE48 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDBD8, 0x0000040 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDBD8, 0x0000040 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDBD8, 0x0000040 .else .incbin "baserom.gba", 0x0DDE48, 0x0000040 .endif .endif +.endif gUnk_080DDE88:: @ 080DDE88 .incbin "baserom.gba", 0x0DDE88, 0x0000020 @@ -4563,12 +4662,17 @@ gUnk_080DDFE8:: @ 080DDFE8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDD78, 0x0000018 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDD78, 0x0000018 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDD78, 0x0000018 .else .incbin "baserom.gba", 0x0DDFE8, 0x0000018 .endif .endif +.endif gUnk_080DE000:: @ 080DE000 .incbin "baserom.gba", 0x0DE000, 0x0000008 @@ -4589,12 +4693,17 @@ gUnk_080DE0E8:: @ 080DE0E8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDE78, 0x0000030 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDE78, 0x0000030 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDE78, 0x0000030 .else .incbin "baserom.gba", 0x0DE0E8, 0x0000030 .endif .endif +.endif gUnk_080DE118:: @ 080DE118 .incbin "baserom.gba", 0x0DE118, 0x0000014 @@ -4615,12 +4724,17 @@ gUnk_080DE150:: @ 080DE150 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DDEE0, 0x0000090 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DDEE0, 0x0000090 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0DDEE0, 0x0000090 .else .incbin "baserom.gba", 0x0DE150, 0x0000090 .endif .endif +.endif gUnk_080DE1E0:: @ 080DE1E0 .incbin "baserom.gba", 0x0DE1E0, 0x0000020 @@ -4645,6 +4759,10 @@ gUnk_080DE320:: @ 080DE320 @ TODO only small differences .incbin "baserom_jp.gba", 0x0DE0B0, 0x0000018 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0DE0B0, 0x0000018 +.else .ifdef EU @ TODO only small differences .incbin "baserom_eu.gba", 0x0DDA5C, 0x0000018 @@ -4652,6 +4770,7 @@ gUnk_080DE320:: @ 080DE320 .incbin "baserom.gba", 0x0DE320, 0x0000018 .endif .endif +.endif gUnk_080DE338:: @ 080DE338 .incbin "baserom.gba", 0x0DE338, 0x0000014 @@ -5083,9 +5202,13 @@ gUnk_080DF7FE:: @ 080DF7FE .ifdef EU .incbin "baserom_jp.gba", 0x0DF57E, 0x000002E .else +.ifdef DEMO_JP + .incbin "baserom_demo_jp.gba", 0x0DF032, 0x000003E +.else .incbin "baserom.gba", 0x0DF7FE, 0x000003E .endif .endif +.endif gUnk_080DF83C:: @ 080DF83C .incbin "baserom.gba", 0x0DF83C, 0x0000020 @@ -10785,9 +10908,13 @@ gUnk_080EE80C:: @ 080EE80C .ifdef EU .incbin "baserom_jp.gba", 0x0EE53C, 0x000006C .else +.ifdef DEMO_JP + .incbin "baserom_demo_jp.gba", 0x0EE040, 0x000006C +.else .incbin "baserom.gba", 0x0EE80C, 0x000006C .endif .endif +.endif .4byte script_08010AE4 .incbin "baserom.gba", 0x0EE87C, 0x0000010 @@ -10871,12 +10998,17 @@ gUnk_080EEADC:: @ 080EEADC @ TODO only small differences .incbin "baserom_jp.gba", 0x0EE80C, 0x0000090 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0EE80C, 0x0000090 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0EE80C, 0x0000090 .else .incbin "baserom.gba", 0x0EEADC, 0x0000090 .endif .endif +.endif gUnk_080EEB6C:: @ 080EEB6C .incbin "baserom.gba", 0x0EEB6C, 0x0000020 @@ -10905,12 +11037,17 @@ gUnk_080EEC4C:: @ 080EEC4C @ TODO only small differences .incbin "baserom_jp.gba", 0x0EE97C, 0x0000070 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0EE97C, 0x0000070 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0EE97C, 0x0000070 .else .incbin "baserom.gba", 0x0EEC4C, 0x0000070 .endif .endif +.endif gUnk_080EECBC:: @ 080EECBC .incbin "baserom.gba", 0x0EECBC, 0x0000020 @@ -10919,12 +11056,16 @@ gUnk_080EECDC:: @ 080EECDC .ifdef JP .incbin "baserom_jp.gba", 0x0EEA0C, 0x0000048 .else +.ifdef DEMO_JP + .incbin "baserom_demo_jp.gba", 0x0EE510, 0x0000050 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0EEA0C, 0x0000048 .else .incbin "baserom.gba", 0x0EECDC, 0x0000050 .endif .endif +.endif gUnk_080EED2C:: @ 080EED2C .incbin "baserom.gba", 0x0EED2C, 0x000004E @@ -11845,12 +11986,17 @@ gUnk_080F0630:: @ 080F0630 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F0358, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F0358, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F0358, 0x0000020 .else .incbin "baserom.gba", 0x0F0630, 0x0000020 .endif .endif +.endif gUnk_080F0650:: @ 080F0650 .incbin "baserom.gba", 0x0F0650, 0x000000C @@ -11962,24 +12108,35 @@ gUnk_080F0940:: @ 080F0940 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F0668, 0x0000060 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F0668, 0x0000060 +.else + .ifdef EU .incbin "baserom_jp.gba", 0x0F0668, 0x0000060 .else .incbin "baserom.gba", 0x0F0940, 0x0000060 .endif .endif +.endif gUnk_080F09A0:: @ 080F09A0 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0F06C8, 0x0000060 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F06C8, 0x0000060 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F06C8, 0x0000060 .else .incbin "baserom.gba", 0x0F09A0, 0x0000060 .endif .endif +.endif gUnk_080F0A00:: @ 080F0A00 .incbin "baserom.gba", 0x0F0A00, 0x0000002 @@ -11998,12 +12155,17 @@ gUnk_080F0A11:: @ 080F0A11 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F0739, 0x000001F .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F0739, 0x000001F +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F0739, 0x000001F .else .incbin "baserom.gba", 0x0F0A11, 0x000001F .endif .endif +.endif gUnk_080F0A30:: @ 080F0A30 .incbin "baserom.gba", 0x0F0A30, 0x0000020 @@ -13002,9 +13164,13 @@ gUnk_080F2B9C:: @ 080F2B9C .ifdef EU .incbin "baserom_jp.gba", 0x0F28C4, 0x00000BC .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F28C4, 0x00000BC +.else .incbin "baserom.gba", 0x0F2B9C, 0x00000CC .endif .endif +.endif .4byte script_08010120 .incbin "baserom.gba", 0x0F2C6C, 0x0000010 @@ -13483,12 +13649,17 @@ gUnk_080F40BC:: @ 080F40BC @ TODO only small differences .incbin "baserom_jp.gba", 0x0F3DD4, 0x0000030 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F3DD4, 0x0000030 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F3DD4, 0x0000030 .else .incbin "baserom.gba", 0x0F40BC, 0x0000030 .endif .endif +.endif gUnk_080F40EC:: @ 080F40EC .incbin "baserom.gba", 0x0F40EC, 0x00000A0 @@ -13808,10 +13979,17 @@ gEntities_MinishWoods_0:: @ 080F4D00 object_item x=0xC8, y=0x134, item=0x63, flag=0x3B, collision=1 object_item x=0x198, y=0x2B4, item=0x63, flag=0x3C, collision=1 .else +.ifdef DEMO_JP + object_item x=0xC8, y=0x134, item=0x63, flag=0x3B, collision=1 + object_item x=0x198, y=0x2B4, item=0x63, flag=0x3C, collision=1 + @TODO convert to correct entities + .byte 0x06, 0x0F, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x98, 0x01, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0F, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68, 0x03, 0xB8, 0x03, 0x00, 0x00, 0x00, 0x00 +.else object_item x=0xC8, y=0x134, item=0x63, flag=0x3C, collision=1 object_item x=0x198, y=0x2B4, item=0x63, flag=0x3D, collision=1 .endif .endif +.endif entity_list_end gUnk_080F4D50:: @ 080F4D50 @@ -13944,6 +14122,13 @@ gRoomTiles_MinishWoods_0:: @ 080F5220 .byte 0x0A, 0x01, 0x38, 0x00, 0x84, 0x0D, 0x1D, 0x00 .byte 0x0A, 0x01, 0x39, 0x00, 0x85, 0x0D, 0x1D, 0x00 .else +.ifdef DEMO_JP @ TODO deduplicate + .byte 0x0A, 0x01, 0x35, 0x00, 0x0A, 0x08, 0x1D, 0x00 + .byte 0x0A, 0x01, 0x36, 0x00, 0x0B, 0x08, 0x1D, 0x00 + .byte 0x0A, 0x01, 0x37, 0x00, 0x83, 0x0D, 0x1D, 0x00 + .byte 0x0A, 0x01, 0x38, 0x00, 0x84, 0x0D, 0x1D, 0x00 + .byte 0x0A, 0x01, 0x39, 0x00, 0x85, 0x0D, 0x1D, 0x00 +.else .ifdef EU .byte 0x0A, 0x01, 0x35, 0x00, 0x0A, 0x08, 0x1D, 0x00 .byte 0x0A, 0x01, 0x36, 0x00, 0x0B, 0x08, 0x1D, 0x00 @@ -13958,6 +14143,7 @@ gRoomTiles_MinishWoods_0:: @ 080F5220 .byte 0x0A, 0x01, 0x3A, 0x00, 0x85, 0x0D, 0x1D, 0x00 .endif .endif +.endif .byte 0x05, 0x00, 0x00, 0x05, 0x6A, 0x01, 0x05, 0x06 .ifdef JP .byte 0x05, 0x00, 0x00, 0x17, 0xDB, 0x03, 0x17, 0x06 @@ -14907,12 +15093,17 @@ gUnk_080F6F2C:: @ 080F6F2C @ TODO only small differences .incbin "baserom_jp.gba", 0x0F6C44, 0x0000050 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F6C44, 0x0000050 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F6C44, 0x0000050 .else .incbin "baserom.gba", 0x0F6F2C, 0x0000050 .endif .endif +.endif gUnk_080F6F7C:: @ 080F6F7C .ifdef EU @@ -14968,12 +15159,17 @@ gUnk_080F70F8:: @ 080F70F8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F6E10, 0x0000060 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F6E10, 0x0000060 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F6E10, 0x0000060 .else .incbin "baserom.gba", 0x0F70F8, 0x0000060 .endif .endif +.endif gUnk_080F7158:: @ 080F7158 .incbin "baserom.gba", 0x0F7158, 0x00000C0 @@ -14983,12 +15179,17 @@ gUnk_080F7218:: @ 080F7218 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F6F30, 0x0000088 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F6F30, 0x0000088 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F6F30, 0x0000088 .else .incbin "baserom.gba", 0x0F7218, 0x0000088 .endif .endif +.endif gUnk_080F72A0:: @ 080F72A0 .incbin "baserom.gba", 0x0F72A0, 0x0000010 @@ -15022,12 +15223,17 @@ gUnk_080F738C:: @ 080F738C @ TODO only small differences .incbin "baserom_jp.gba", 0x0F70A4, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F70A4, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F70A4, 0x0000020 .else .incbin "baserom.gba", 0x0F738C, 0x0000020 .endif .endif +.endif Room_HyruleField_FromMinishWoods:: @ 080F73AC .4byte gUnk_080F72EC @@ -15047,12 +15253,17 @@ gUnk_080F73DC:: @ 080F73DC @ TODO only small differences .incbin "baserom_jp.gba", 0x0F70F4, 0x0000040 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F70F4, 0x0000040 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F70F4, 0x0000040 .else .incbin "baserom.gba", 0x0F73DC, 0x0000040 .endif .endif +.endif gUnk_080F741C:: @ 080F741C .incbin "baserom.gba", 0x0F741C, 0x0000070 @@ -15062,12 +15273,17 @@ gUnk_080F748C:: @ 080F748C @ TODO only small differences .incbin "baserom_jp.gba", 0x0F71A4, 0x0000018 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F71A4, 0x0000018 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F71A4, 0x0000018 .else .incbin "baserom.gba", 0x0F748C, 0x0000018 .endif .endif +.endif gUnk_080F74A4:: @ 080F74A4 .incbin "baserom.gba", 0x0F74A4, 0x0000010 @@ -15130,12 +15346,17 @@ gUnk_080F76C0:: @ 080F76C0 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F73D8, 0x0000038 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F73D8, 0x0000038 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F73D8, 0x0000038 .else .incbin "baserom.gba", 0x0F76C0, 0x0000038 .endif .endif +.endif Room_HyruleField_Farmers:: @ 080F76F8 .4byte gUnk_080F74F0 @@ -15154,12 +15375,17 @@ gUnk_080F7720:: @ 080F7720 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F7438, 0x0000050 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F7438, 0x0000050 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F7438, 0x0000050 .else .incbin "baserom.gba", 0x0F7720, 0x0000050 .endif .endif +.endif gUnk_080F7770:: @ 080F7770 .incbin "baserom.gba", 0x0F7770, 0x0000050 @@ -15212,12 +15438,17 @@ gUnk_080F78E0:: @ 080F78E0 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F75F8, 0x00000F0 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F75F8, 0x00000F0 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F75F8, 0x00000F0 .else .incbin "baserom.gba", 0x0F78E0, 0x00000F0 .endif .endif +.endif gUnk_080F79D0:: @ 080F79D0 .ifdef EU @@ -15240,12 +15471,17 @@ gUnk_080F7AF4:: @ 080F7AF4 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F780C, 0x0000048 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F780C, 0x0000048 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F780C, 0x0000048 .else .incbin "baserom.gba", 0x0F7AF4, 0x0000048 .endif .endif +.endif gUnk_080F7B3C:: @ 080F7B3C .incbin "baserom.gba", 0x0F7B3C, 0x0000018 @@ -15291,12 +15527,17 @@ ManagerData_HyruleField_OutsideCastle:: @ 080F7C00 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F7918, 0x0000080 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F7918, 0x0000080 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F7918, 0x0000080 .else .incbin "baserom.gba", 0x0F7C00, 0x0000080 .endif .endif +.endif gUnk_080F7C80:: @ 080F7C80 .incbin "baserom.gba", 0x0F7C80, 0x000000C @@ -15355,12 +15596,17 @@ TileData_HyruleField_OutsideCastle:: @ 080F7F10 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F7C28, 0x0000070 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F7C28, 0x0000070 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F7C28, 0x0000070 .else .incbin "baserom.gba", 0x0F7F10, 0x0000070 .endif .endif +.endif gUnk_080F7F80:: @ 080F7F80 .incbin "baserom.gba", 0x0F7F80, 0x0000018 @@ -15407,12 +15653,17 @@ ManagerData_HyruleField_OutsideCastleWest:: @ 080F808C @ TODO only small differences .incbin "baserom_jp.gba", 0x0F7DA4, 0x0000060 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F7DA4, 0x0000060 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F7DA4, 0x0000060 .else .incbin "baserom.gba", 0x0F808C, 0x0000060 .endif .endif +.endif EnemyData_HyruleField_OutsideCastleWest:: @ 080F80EC .incbin "baserom.gba", 0x0F80EC, 0x00000B0 @@ -15422,12 +15673,17 @@ TileData_HyruleField_OutsideCastleWest:: @ 080F819C @ TODO only small differences .incbin "baserom_jp.gba", 0x0F7EB4, 0x0000028 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F7EB4, 0x0000028 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F7EB4, 0x0000028 .else .incbin "baserom.gba", 0x0F819C, 0x0000028 .endif .endif +.endif gUnk_080F81C4:: @ 080F81C4 .incbin "baserom.gba", 0x0F81C4, 0x0000010 @@ -15454,9 +15710,13 @@ EntityData_HyruleField_TrilbyHighlands:: @ 080F8210 .ifdef EU .incbin "baserom_jp.gba", 0x0F7F28, 0x00000B0 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F7F28, 0x00000B0 +.else .incbin "baserom.gba", 0x0F8210, 0x00000D0 .endif .endif +.endif gUnk_080F82E0:: @ 080F82E0 .incbin "baserom.gba", 0x0F82E0, 0x000000C @@ -15474,12 +15734,17 @@ TileData_HyruleField_TrilbyHighlands:: @ 080F83E0 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F80D8, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F80D8, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F80D8, 0x0000020 .else .incbin "baserom.gba", 0x0F83E0, 0x0000020 .endif .endif +.endif Room_HyruleField_TrilbyHighlands:: @ 080F8400 .4byte EntityData_HyruleField_TrilbyHighlands @@ -15844,9 +16109,13 @@ gUnk_080F8CF4:: @ 080F8CF4 .ifdef EU .incbin "baserom_jp.gba", 0x0F89EC, 0x0000100 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F89EC, 0x0000100 @ TODO deduplicate +.else .incbin "baserom.gba", 0x0F8CF4, 0x0000110 .endif .endif +.endif gUnk_080F8E04:: @ 080F8E04 .incbin "baserom.gba", 0x0F8E04, 0x0000010 @@ -15871,9 +16140,13 @@ gUnk_080F8E3C:: @ 080F8E3C .ifdef EU .incbin "baserom_jp.gba", 0x0F8B24, 0x0000100 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F8B24, 0x0000100 @ TODO deduplicate +.else .incbin "baserom.gba", 0x0F8E3C, 0x0000110 .endif .endif +.endif gUnk_080F8F4C:: @ 080F8F4C .incbin "baserom.gba", 0x0F8F4C, 0x0000010 @@ -15898,9 +16171,13 @@ gUnk_080F8F84:: @ 080F8F84 .ifdef EU .incbin "baserom_jp.gba", 0x0F8C5C, 0x0000050 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F8C5C, 0x0000050 @ TODO deduplicate +.else .incbin "baserom.gba", 0x0F8F84, 0x0000060 .endif .endif +.endif gUnk_080F8FE4:: @ 080F8FE4 .incbin "baserom.gba", 0x0F8FE4, 0x0000010 @@ -15982,9 +16259,13 @@ gUnk_080F9174:: @ 080F9174 .ifdef EU .incbin "baserom_jp.gba", 0x0F8E3C, 0x0000040 .else +.ifdef DEMO_JP + .incbin "baserom_jp.gba", 0x0F8E3C, 0x0000040 @ TODO deduplicate +.else .incbin "baserom.gba", 0x0F9174, 0x0000050 .endif .endif +.endif gUnk_080F91C4:: @ 080F91C4 .incbin "baserom.gba", 0x0F91C4, 0x0000010 @@ -16026,12 +16307,17 @@ gUnk_080F9264:: @ 080F9264 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F8F1C, 0x00000A0 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F8F1C, 0x00000A0 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F8F1C, 0x00000A0 .else .incbin "baserom.gba", 0x0F9264, 0x00000A0 .endif .endif +.endif gUnk_080F9304:: @ 080F9304 .incbin "baserom.gba", 0x0F9304, 0x000000C @@ -16060,12 +16346,17 @@ gUnk_080F9474:: @ 080F9474 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F912C, 0x0000010 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F912C, 0x0000010 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F912C, 0x0000010 .else .incbin "baserom.gba", 0x0F9474, 0x0000010 .endif .endif +.endif gUnk_080F9484:: @ 080F9484 .incbin "baserom.gba", 0x0F9484, 0x0000010 @@ -16291,12 +16582,17 @@ gUnk_080F9BF8:: @ 080F9BF8 @ TODO only small differences .incbin "baserom_jp.gba", 0x0F98B0, 0x000002C .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0F98B0, 0x000002C +.else .ifdef EU .incbin "baserom_jp.gba", 0x0F98B0, 0x000002C .else .incbin "baserom.gba", 0x0F9BF8, 0x000002C .endif .endif +.endif .4byte script_08009320 .incbin "baserom.gba", 0x0F9C28, 0x0000010 @@ -17063,24 +17359,34 @@ gUnk_080FAC28:: @ 080FAC28 @ TODO only small differences .incbin "baserom_jp.gba", 0x0FA8E0, 0x0000060 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FA8E0, 0x0000060 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FA8E0, 0x0000060 .else .incbin "baserom.gba", 0x0FAC28, 0x0000060 .endif .endif +.endif gUnk_080FAC88:: @ 080FAC88 .ifdef JP @ TODO only small differences .incbin "baserom_jp.gba", 0x0FA940, 0x0000030 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FA940, 0x0000030 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FA940, 0x0000030 .else .incbin "baserom.gba", 0x0FAC88, 0x0000030 .endif .endif +.endif gUnk_080FACB8:: @ 080FACB8 .incbin "baserom.gba", 0x0FACB8, 0x0000090 @@ -17141,12 +17447,17 @@ gUnk_080FAF9C:: @ 080FAF9C @ TODO only small differences .incbin "baserom_jp.gba", 0x0FAC54, 0x0000018 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FAC54, 0x0000018 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FAC54, 0x0000018 .else .incbin "baserom.gba", 0x0FAF9C, 0x0000018 .endif .endif +.endif Room_MtCrenel_WallClimb:: @ 080FAFB4 .4byte gUnk_080FAE9C @@ -17182,12 +17493,17 @@ gUnk_080FB1F4:: @ 080FB1F4 @ TODO only small differences .incbin "baserom_jp.gba", 0x0FAEAC, 0x0000020 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FAEAC, 0x0000020 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FAEAC, 0x0000020 .else .incbin "baserom.gba", 0x0FB1F4, 0x0000020 .endif .endif +.endif gUnk_080FB214:: @ 080FB214 .incbin "baserom.gba", 0x0FB214, 0x0000020 @@ -17226,12 +17542,17 @@ gUnk_080FB410:: @ 080FB410 @ TODO only small differences .incbin "baserom_jp.gba", 0x0FB0C8, 0x0000050 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FB0C8, 0x0000050 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FB0C8, 0x0000050 .else .incbin "baserom.gba", 0x0FB410, 0x0000050 .endif .endif +.endif Room_MtCrenel_GustJarShortcut:: @ 080FB460 .4byte gUnk_080FB2A0 @@ -17248,12 +17569,17 @@ gUnk_080FB480:: @ 080FB480 @ TODO only small differences .incbin "baserom_jp.gba", 0x0FB138, 0x0000150 .else +.ifdef DEMO_JP + @ TODO only small differences + .incbin "baserom_jp.gba", 0x0FB138, 0x0000150 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FB138, 0x0000150 .else .incbin "baserom.gba", 0x0FB480, 0x0000150 .endif .endif +.endif gUnk_080FB5D0:: @ 080FB5D0 .incbin "baserom.gba", 0x0FB5D0, 0x0000030 @@ -17265,12 +17591,17 @@ gUnk_080FB700:: @ 080FB700 .ifdef JP .incbin "baserom_jp.gba", 0x0FB3B8, 0x0000040 .else +.ifdef DEMO_JP + @ TODO small changes compared to USA + .incbin "baserom_demo_jp.gba", 0x0FAEE4, 0x0000048 +.else .ifdef EU .incbin "baserom_jp.gba", 0x0FB3B8, 0x0000040 .else .incbin "baserom.gba", 0x0FB700, 0x0000048 .endif .endif +.endif gUnk_080FB748:: @ 080FB748 .incbin "baserom.gba", 0x0FB748, 0x0000020 diff --git a/data/data_080FC8A4.s b/data/data_080FC8A4.s index dd037a92..66e8e332 100644 --- a/data/data_080FC8A4.s +++ b/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 diff --git a/data/data_080FEEB8.s b/data/data_080FEEB8.s index 90c8e8b4..a5d96be3 100644 --- a/data/data_080FEEB8.s +++ b/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 @@ -1913,9 +1917,13 @@ gUnk_080FFBA8:: @ 080FFBA8 .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 @@ -1924,9 +1932,13 @@ gUnk_080FFBDD:: @ 080FFBDD .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 @@ -1936,9 +1948,14 @@ gUnk_080FFBF0:: @ 080FFBF0 .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 @@ -1951,8 +1968,13 @@ gUnk_080FFC68:: @ 080FFC68 @ 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 @@ -1974,8 +1996,13 @@ gUnk_080FFCD4:: @ 080FFCD4 @ 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 @@ -1985,20 +2012,35 @@ gUnk_080FFCED:: @ 080FFCED @ 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 @@ -2288,8 +2330,13 @@ gUnk_08100388:: @ 08100388 @ 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 @@ -2302,56 +2349,91 @@ gUnk_08100401:: @ 08100401 @ 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 @@ -2361,16 +2443,26 @@ gUnk_081004FA:: @ 081004FA @ 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 @@ -2533,8 +2625,13 @@ gUnk_08100970:: @ 08100970 @ 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 @@ -2580,16 +2677,26 @@ gUnk_08100A11:: @ 08100A11 @ 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 @@ -2615,8 +2722,12 @@ gUnk_08100AA8:: @ 08100AA8 .ifdef JP .4byte gUnk_080FF9D8 .else +.ifdef DEMO_JP + .4byte gUnk_080FF9D8 +.else .4byte gUnk_080FFD1C .endif +.endif .4byte gUnk_080FFC98 .4byte gUnk_080FFCB0 .4byte gUnk_080FFCC8 diff --git a/data/data_0812AA88.s b/data/data_0812AA88.s index 88fb300c..28183a09 100644 --- a/data/data_0812AA88.s +++ b/data/data_0812AA88.s @@ -714,6 +714,7 @@ ENUM_12AED0: .4byte ENUM_12AED0_LOST_05_03 .4byte ENUM_12AED0_KAKERA_TAKARA_J .4byte gUnk_0812AC84 + ENUM_12AED0_KAKERA_TAKARA_J: .ascii "KAKERA_TAKARA_J\0" ENUM_12AED0_LOST_05_03: @@ -1979,6 +1980,773 @@ ENUM_12AED0_LV1_CLEAR_MES: .ascii "LV1_CLEAR_MES\0\0\0" .else +.ifdef DEMO_JP +@ TODO nearly same as JP, deduplicate +ENUM_12AED0: + .4byte gUnk_0812B204 + .4byte ENUM_12AED0_LV1_CLEAR_MES + .4byte ENUM_12AED0_LV2_CLEAR_MES + .4byte ENUM_12AED0_LV3_CLEAR_MES + .4byte ENUM_12AED0_LV4_CLEAR_MES + .4byte ENUM_12AED0_LV5_CLEAR_MES + .4byte ENUM_12AED0_MIZUUMI_00_BENT + .4byte ENUM_12AED0_MIZUUMI_00_00 + .4byte ENUM_12AED0_MIZUUMI_00_H00 + .4byte ENUM_12AED0_MIZUUMI_00_H01 + .4byte ENUM_12AED0_MIZUUMI_00_H02 + .4byte ENUM_12AED0_HIKYOU_00_T0 + .4byte ENUM_12AED0_HIKYOU_00_T1 + .4byte ENUM_12AED0_MAENIWA_00_00 + .4byte ENUM_12AED0_MAENIWA_00_01 + .4byte ENUM_12AED0_MAENIWA_00_02 + .4byte ENUM_12AED0_MAENIWA_00_BENT + .4byte ENUM_12AED0_MAENIWA_00_WARP + .4byte ENUM_12AED0_MAENIWA_00_T0 + .4byte ENUM_12AED0_MAENIWA_00_T1 + .4byte ENUM_12AED0_MAENIWA_00_CAP_0 + .4byte ENUM_12AED0_NAKANIWA_00_EZERO + .4byte ENUM_12AED0_HIKYOU_00_00 + .4byte ENUM_12AED0_HIKYOU_00_01 + .4byte ENUM_12AED0_HIKYOU_00_02 + .4byte ENUM_12AED0_HIKYOU_00_03 + .4byte ENUM_12AED0_HIKYOU_00_04 + .4byte ENUM_12AED0_HIKYOU_00_CAP_0 + .4byte ENUM_12AED0_HIKYOU_00_CAP_1 + .4byte ENUM_12AED0_HIKYOU_00_CAP_2 + .4byte ENUM_12AED0_HIKYOU_00_SEKIZOU + .4byte ENUM_12AED0_HIKYOU_00_14 + .4byte ENUM_12AED0_HIKYOU_00_BOSEKI + .4byte ENUM_12AED0_HIKYOU_00_H00 + .4byte ENUM_12AED0_HIKYOU_00_M0 + .4byte ENUM_12AED0_HIKYOU_00_M1 + .4byte ENUM_12AED0_HIKYOU_00_M2 + .4byte ENUM_12AED0_LOST_00_ENTER + .4byte ENUM_12AED0_LOST_00_00 + .4byte ENUM_12AED0_LOST_00_01 + .4byte ENUM_12AED0_LOST_02_00 + .4byte ENUM_12AED0_LOST_03_00 + .4byte ENUM_12AED0_LOST_03_T0 + .4byte ENUM_12AED0_LOST_04_00 + .4byte ENUM_12AED0_LOST_04_SIBA0 + .4byte ENUM_12AED0_LOST_04_SIBA1 + .4byte ENUM_12AED0_LOST_04_SIBA2 + .4byte ENUM_12AED0_LOST_04_SIBA3 + .4byte ENUM_12AED0_LOST_04_SIBA4 + .4byte ENUM_12AED0_LOST_05_00 + .4byte ENUM_12AED0_LOST_05_01 + .4byte ENUM_12AED0_LOST_05_T0 + .4byte ENUM_12AED0_LOST_05_T1 + .4byte ENUM_12AED0_MORI_00_HIBI_0 + .4byte ENUM_12AED0_MORI_00_HIBI_1 + .4byte ENUM_12AED0_MORI_00_HIBI_2 + .4byte ENUM_12AED0_MORI_00_HIBI_3 + .4byte ENUM_12AED0_MORI_00_HIBI_4 + .4byte ENUM_12AED0_MORI_00_KOBITO + .4byte ENUM_12AED0_MORI_00_H0 + .4byte ENUM_12AED0_MORI_00_H1 + .4byte ENUM_12AED0_MORI_ENTRANCE_1ST + .4byte ENUM_12AED0_YAMA_00_00 + .4byte ENUM_12AED0_YAMA_00_01 + .4byte ENUM_12AED0_YAMA_01_BW00 + .4byte ENUM_12AED0_YAMA_02_00 + .4byte ENUM_12AED0_YAMA_03_00 + .4byte ENUM_12AED0_YAMA_03_01 + .4byte ENUM_12AED0_YAMA_03_02 + .4byte ENUM_12AED0_YAMA_03_DOKU_0 + .4byte ENUM_12AED0_YAMA_03_DOKU_1 + .4byte ENUM_12AED0_YAMA_03_DOKU_2 + .4byte ENUM_12AED0_YAMA_04_CAP_0 + .4byte ENUM_12AED0_YAMA_04_R00 + .4byte ENUM_12AED0_YAMA_04_HIBI_0 + .4byte ENUM_12AED0_YAMA_04_HIBI_1 + .4byte ENUM_12AED0_YAMA_04_00 + .4byte ENUM_12AED0_YAMA_04_01 + .4byte ENUM_12AED0_YAMA_04_04 + .4byte ENUM_12AED0_YAMA_04_05 + .4byte ENUM_12AED0_YAMA_04_06 + .4byte ENUM_12AED0_YAMA_04_ENTHOUSHI + .4byte ENUM_12AED0_YAMA_04_ANAHOUSHI + .4byte ENUM_12AED0_YAMA_04_BOMBWALL0 + .4byte ENUM_12AED0_HAKA_BUNSHIN_00 + .4byte ENUM_12AED0_HAKA_BOSEKI_00 + .4byte ENUM_12AED0_HAKA_BOSEKI_01 + .4byte ENUM_12AED0_HAKA_BOSEKI_02 + .4byte ENUM_12AED0_HAKA_00_CAP_0 + .4byte ENUM_12AED0_HAKA_00_BW00 + .4byte ENUM_12AED0_HAKA_01_T0 + .4byte ENUM_12AED0_HAKA_KEY_GET + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_0 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_1 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_2 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_3 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_4 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_5 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_6 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_7 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_8 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_9 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_10 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_11 + .4byte ENUM_12AED0_SOUGEN_01_WAKAGI_12 + .4byte ENUM_12AED0_SOUGEN_01_00 + .4byte ENUM_12AED0_SOUGEN_01_BENT + .4byte ENUM_12AED0_SOUGEN_01_ZELDA + .4byte ENUM_12AED0_SOUGEN_02_HIBI_0 + .4byte ENUM_12AED0_SOUGEN_02_HIBI_1 + .4byte ENUM_12AED0_SOUGEN_03_BOMBWALL + .4byte ENUM_12AED0_SOUGEN_04_HIBI_0 + .4byte ENUM_12AED0_SOUGEN_04_HIBI_1 + .4byte ENUM_12AED0_SOUGEN_04_HIBI_2 + .4byte ENUM_12AED0_SOUGEN_04_HIBI_3 + .4byte ENUM_12AED0_SOUGEN_05_HIBI_0 + .4byte ENUM_12AED0_SOUGEN_05_HIBI_1 + .4byte ENUM_12AED0_SOUGEN_05_HIBI_2 + .4byte ENUM_12AED0_SOUGEN_05_HIBI_3 + .4byte ENUM_12AED0_SOUGEN_05_BOMB_00 + .4byte ENUM_12AED0_SOUGEN_05_00 + .4byte ENUM_12AED0_SOUGEN_05_01 + .4byte ENUM_12AED0_SOUGEN_05_IWA02 + .4byte ENUM_12AED0_SOUGEN_05_BENT + .4byte ENUM_12AED0_SOUGEN_05_H00 + .4byte ENUM_12AED0_SOUGEN_05_R0 + .4byte ENUM_12AED0_SOUGEN_05_CAP_0 + .4byte ENUM_12AED0_SOUGEN_06_WAKAGI_0 + .4byte ENUM_12AED0_SOUGEN_06_WAKAGI_1 + .4byte ENUM_12AED0_SOUGEN_06_WAKAGI_2 + .4byte ENUM_12AED0_SOUGEN_06_WAKAGI_3 + .4byte ENUM_12AED0_SOUGEN_06_HIBI_0 + .4byte ENUM_12AED0_SOUGEN_06_HIBI_1 + .4byte ENUM_12AED0_SOUGEN_06_HIBI_2 + .4byte ENUM_12AED0_SOUGEN_06_HIBI_3 + .4byte ENUM_12AED0_SOUGEN_06_HIBI_4 + .4byte ENUM_12AED0_SOUGEN_06_IWA_0 + .4byte ENUM_12AED0_SOUGEN_06_AKINDO + .4byte ENUM_12AED0_SOUGEN_06_SAIKAI + .4byte ENUM_12AED0_SOUGEN_06_BENT + .4byte ENUM_12AED0_SOUGEN_06_SLIDE + .4byte ENUM_12AED0_SOUGEN_06_R1 + .4byte ENUM_12AED0_SOUGEN_07_00 + .4byte ENUM_12AED0_SOUGEN_07_01 + .4byte ENUM_12AED0_SOUGEN_07_02 + .4byte ENUM_12AED0_SOUGEN_07_H00 + .4byte ENUM_12AED0_SOUGEN_08_00 + .4byte ENUM_12AED0_SOUGEN_08_01 + .4byte ENUM_12AED0_SOUGEN_08_02 + .4byte ENUM_12AED0_SOUGEN_08_03 + .4byte ENUM_12AED0_SOUGEN_08_04 + .4byte ENUM_12AED0_SOUGEN_08_05 + .4byte ENUM_12AED0_SOUGEN_08_06 + .4byte ENUM_12AED0_SOUGEN_08_07 + .4byte ENUM_12AED0_SOUGEN_08_08 + .4byte ENUM_12AED0_SOUGEN_08_TORITSUKI + .4byte ENUM_12AED0_SOUGEN_08_T00 + .4byte ENUM_12AED0_CASTLE_00_00 + .4byte ENUM_12AED0_CASTLE_04_MEZAME + .4byte ENUM_12AED0_CASTLE_04_MAID_TALK + .4byte ENUM_12AED0_SUIGEN_00_h0 + .4byte ENUM_12AED0_SUIGEN_00_T0 + .4byte ENUM_12AED0_SUIGEN_00_r0 + .4byte ENUM_12AED0_SUIGEN_00_r1 + .4byte ENUM_12AED0_SUIGEN_00_r2 + .4byte ENUM_12AED0_SUIGEN_00_CAP_0 + .4byte ENUM_12AED0_SUIGEN_00_CAP_1 + .4byte ENUM_12AED0_SUIGEN_00_R0 + .4byte ENUM_12AED0_SUIGEN_00_R1 + .4byte ENUM_12AED0_SUIGEN_00_h1 + .4byte ENUM_12AED0_SUIGENGORON_00_CAP_0 + .4byte ENUM_12AED0_DAIGORON_SHIELD + .4byte ENUM_12AED0_DAIGORON_EXCHG + .4byte ENUM_12AED0_BEANDEMO_00 + .4byte ENUM_12AED0_BEANDEMO_01 + .4byte ENUM_12AED0_BEANDEMO_02 + .4byte ENUM_12AED0_BEANDEMO_03 + .4byte ENUM_12AED0_BEANDEMO_04 + .4byte ENUM_12AED0_KAKERA_TAKARA_A + .4byte ENUM_12AED0_KAKERA_TAKARA_E + .4byte ENUM_12AED0_KAKERA_TAKARA_K + .4byte ENUM_12AED0_KAKERA_TAKARA_L + .4byte ENUM_12AED0_KAKERA_TAKARA_M + .4byte ENUM_12AED0_KAKERA_TAKARA_N + .4byte ENUM_12AED0_KAKERA_TAKARA_O + .4byte ENUM_12AED0_KAKERA_TAKARA_P + .4byte ENUM_12AED0_KAKERA_TAKARA_Q + .4byte ENUM_12AED0_KAKERA_TAKARA_R + .4byte ENUM_12AED0_KAKERA_TAKARA_S + .4byte ENUM_12AED0_KAKERA_TAKARA_T + .4byte ENUM_12AED0_KAKERA_TAKARA_U + .4byte ENUM_12AED0_KAKERA_TAKARA_V + .4byte ENUM_12AED0_KAKERA_TAKARA_W + .4byte ENUM_12AED0_KAKERA_TAKARA_X + .4byte ENUM_12AED0_KAKERA_TAKARA_Y + .4byte ENUM_12AED0_KAKERA_TAKARA_Z + .4byte ENUM_12AED0_MACHI_02_HEISHI_TALK + .4byte ENUM_12AED0_MACHI00_00 + .4byte ENUM_12AED0_MACHI00_02 + .4byte ENUM_12AED0_MACHI00_03 + .4byte ENUM_12AED0_MACHI_00_T00 + .4byte ENUM_12AED0_MACHI_00_T01 + .4byte ENUM_12AED0_MACHI_01_DEMO + .4byte ENUM_12AED0_MACHI_02_HEISHI + .4byte ENUM_12AED0_MACHI_02_DOG + .4byte ENUM_12AED0_MACHI_07_BELL + .4byte ENUM_12AED0_SHOP05_OPEN + .4byte ENUM_12AED0_MACHI_MES_20 + .4byte ENUM_12AED0_MACHI_MES_21 + .4byte ENUM_12AED0_MACHI_MES_22 + .4byte ENUM_12AED0_MACHI_MES_23 + .4byte ENUM_12AED0_MACHI_MES_24 + .4byte ENUM_12AED0_MACHI_MES_30 + .4byte ENUM_12AED0_MACHI_MES_40 + .4byte ENUM_12AED0_MACHI_MES_60 + .4byte ENUM_12AED0_MACHI_MES_50 + .4byte ENUM_12AED0_MACHI_DOG_C + .4byte ENUM_12AED0_KUMOUE_00_CAP_0 + .4byte ENUM_12AED0_KUMOUE_01_CAP_0 + .4byte ENUM_12AED0_KUMOUE_01_T0 + .4byte ENUM_12AED0_KUMOUE_01_T1 + .4byte ENUM_12AED0_KUMOUE_01_T2 + .4byte ENUM_12AED0_KUMOUE_01_T3 + .4byte ENUM_12AED0_KUMOUE_01_T4 + .4byte ENUM_12AED0_KUMOUE_01_T5 + .4byte ENUM_12AED0_KUMOUE_01_T6 + .4byte ENUM_12AED0_KUMOUR_01_K0 + .4byte ENUM_12AED0_KUMOUR_01_K1 + .4byte ENUM_12AED0_KUMOUR_01_K2 + .4byte ENUM_12AED0_KUMOUR_01_K3 + .4byte ENUM_12AED0_KUMOUR_01_K4 + .4byte ENUM_12AED0_KUMOUR_01_K5 + .4byte ENUM_12AED0_KUMOUR_01_K6 + .4byte ENUM_12AED0_KUMONOUE_01_KAKERA + .4byte ENUM_12AED0_KUMOUE_02_CAP_0 + .4byte ENUM_12AED0_KUMOUE_02_AWASE_01 + .4byte ENUM_12AED0_KUMOUE_02_AWASE_02 + .4byte ENUM_12AED0_KUMOUE_02_AWASE_03 + .4byte ENUM_12AED0_KUMOUE_02_AWASE_04 + .4byte ENUM_12AED0_KUMOUE_02_AWASE_05 + .4byte ENUM_12AED0_KUMOUE_02_00 + .4byte ENUM_12AED0_KUMOUE_02_01 + .4byte ENUM_12AED0_KUMOUE_02_02 + .4byte ENUM_12AED0_KUMOUE_02_03 + .4byte ENUM_12AED0_KUMOUE_UNCLE_TALK + .4byte ENUM_12AED0_KUMOUE_GIRL_TALK + .4byte ENUM_12AED0_MIZUUMI_00_CAP_0 + .4byte ENUM_12AED0_SUIGEN_00_R2 + .4byte ENUM_12AED0_YAMA_04_CAP_1 + .4byte ENUM_12AED0_LOST_05_02 + .4byte ENUM_12AED0_LOST_05_03 + .4byte ENUM_12AED0_KAKERA_TAKARA_J +.ifdef DEMO_JP + .4byte ENUM_12AED0_KS_WARPUSE +.endif + .4byte gUnk_0812AC84 + +.ifdef DEMO_JP +ENUM_12AED0_KS_WARPUSE: + .ascii "KS_WARPUSE\0\0" +.endif +ENUM_12AED0_KAKERA_TAKARA_J: + .ascii "KAKERA_TAKARA_J\0" +ENUM_12AED0_LOST_05_03: + .ascii "LOST_05_03\0\0" +ENUM_12AED0_LOST_05_02: + .ascii "LOST_05_02\0\0" +ENUM_12AED0_YAMA_04_CAP_1: + .ascii "YAMA_04_CAP_1\0\0\0" +ENUM_12AED0_SUIGEN_00_R2: + .ascii "SUIGEN_00_R2\0\0\0\0" +ENUM_12AED0_MIZUUMI_00_CAP_0: + .ascii "MIZUUMI_00_CAP_0\0\0\0\0" +ENUM_12AED0_KUMOUE_GIRL_TALK: + .ascii "KUMOUE_GIRL_TALK\0\0\0\0" +ENUM_12AED0_KUMOUE_UNCLE_TALK: + .ascii "KUMOUE_UNCLE_TALK\0\0\0" +ENUM_12AED0_KUMOUE_02_03: + .ascii "KUMOUE_02_03\0\0\0\0" +ENUM_12AED0_KUMOUE_02_02: + .ascii "KUMOUE_02_02\0\0\0\0" +ENUM_12AED0_KUMOUE_02_01: + .ascii "KUMOUE_02_01\0\0\0\0" +ENUM_12AED0_KUMOUE_02_00: + .ascii "KUMOUE_02_00\0\0\0\0" +ENUM_12AED0_KUMOUE_02_AWASE_05: + .ascii "KUMOUE_02_AWASE_05\0\0" +ENUM_12AED0_KUMOUE_02_AWASE_04: + .ascii "KUMOUE_02_AWASE_04\0\0" +ENUM_12AED0_KUMOUE_02_AWASE_03: + .ascii "KUMOUE_02_AWASE_03\0\0" +ENUM_12AED0_KUMOUE_02_AWASE_02: + .ascii "KUMOUE_02_AWASE_02\0\0" +ENUM_12AED0_KUMOUE_02_AWASE_01: + .ascii "KUMOUE_02_AWASE_01\0\0" +ENUM_12AED0_KUMOUE_02_CAP_0: + .ascii "KUMOUE_02_CAP_0\0" +ENUM_12AED0_KUMONOUE_01_KAKERA: + .ascii "KUMONOUE_01_KAKERA\0\0" +ENUM_12AED0_KUMOUR_01_K6: + .ascii "KUMOUR_01_K6\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K5: + .ascii "KUMOUR_01_K5\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K4: + .ascii "KUMOUR_01_K4\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K3: + .ascii "KUMOUR_01_K3\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K2: + .ascii "KUMOUR_01_K2\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K1: + .ascii "KUMOUR_01_K1\0\0\0\0" +ENUM_12AED0_KUMOUR_01_K0: + .ascii "KUMOUR_01_K0\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T6: + .ascii "KUMOUE_01_T6\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T5: + .ascii "KUMOUE_01_T5\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T4: + .ascii "KUMOUE_01_T4\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T3: + .ascii "KUMOUE_01_T3\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T2: + .ascii "KUMOUE_01_T2\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T1: + .ascii "KUMOUE_01_T1\0\0\0\0" +ENUM_12AED0_KUMOUE_01_T0: + .ascii "KUMOUE_01_T0\0\0\0\0" +ENUM_12AED0_KUMOUE_01_CAP_0: + .ascii "KUMOUE_01_CAP_0\0" +ENUM_12AED0_KUMOUE_00_CAP_0: + .ascii "KUMOUE_00_CAP_0\0" +ENUM_12AED0_MACHI_DOG_C: + .ascii "MACHI_DOG_C\0" +ENUM_12AED0_MACHI_MES_50: + .ascii "MACHI_MES_50\0\0\0\0" +ENUM_12AED0_MACHI_MES_60: + .ascii "MACHI_MES_60\0\0\0\0" +ENUM_12AED0_MACHI_MES_40: + .ascii "MACHI_MES_40\0\0\0\0" +ENUM_12AED0_MACHI_MES_30: + .ascii "MACHI_MES_30\0\0\0\0" +ENUM_12AED0_MACHI_MES_24: + .ascii "MACHI_MES_24\0\0\0\0" +ENUM_12AED0_MACHI_MES_23: + .ascii "MACHI_MES_23\0\0\0\0" +ENUM_12AED0_MACHI_MES_22: + .ascii "MACHI_MES_22\0\0\0\0" +ENUM_12AED0_MACHI_MES_21: + .ascii "MACHI_MES_21\0\0\0\0" +ENUM_12AED0_MACHI_MES_20: + .ascii "MACHI_MES_20\0\0\0\0" +ENUM_12AED0_SHOP05_OPEN: + .ascii "SHOP05_OPEN\0" +ENUM_12AED0_MACHI_07_BELL: + .ascii "MACHI_07_BELL\0\0\0" +ENUM_12AED0_MACHI_02_DOG: + .ascii "MACHI_02_DOG\0\0\0\0" +ENUM_12AED0_MACHI_02_HEISHI: + .ascii "MACHI_02_HEISHI\0" +ENUM_12AED0_MACHI_01_DEMO: + .ascii "MACHI_01_DEMO\0\0\0" +ENUM_12AED0_MACHI_00_T01: + .ascii "MACHI_00_T01\0\0\0\0" +ENUM_12AED0_MACHI_00_T00: + .ascii "MACHI_00_T00\0\0\0\0" +ENUM_12AED0_MACHI00_03: + .ascii "MACHI00_03\0\0" +ENUM_12AED0_MACHI00_02: + .ascii "MACHI00_02\0\0" +ENUM_12AED0_MACHI00_00: + .ascii "MACHI00_00\0\0" +ENUM_12AED0_MACHI_02_HEISHI_TALK: + .ascii "MACHI_02_HEISHI_TALK\0\0\0\0" +ENUM_12AED0_KAKERA_TAKARA_Z: + .ascii "KAKERA_TAKARA_Z\0" +ENUM_12AED0_KAKERA_TAKARA_Y: + .ascii "KAKERA_TAKARA_Y\0" +ENUM_12AED0_KAKERA_TAKARA_X: + .ascii "KAKERA_TAKARA_X\0" +ENUM_12AED0_KAKERA_TAKARA_W: + .ascii "KAKERA_TAKARA_W\0" +ENUM_12AED0_KAKERA_TAKARA_V: + .ascii "KAKERA_TAKARA_V\0" +ENUM_12AED0_KAKERA_TAKARA_U: + .ascii "KAKERA_TAKARA_U\0" +ENUM_12AED0_KAKERA_TAKARA_T: + .ascii "KAKERA_TAKARA_T\0" +ENUM_12AED0_KAKERA_TAKARA_S: + .ascii "KAKERA_TAKARA_S\0" +ENUM_12AED0_KAKERA_TAKARA_R: + .ascii "KAKERA_TAKARA_R\0" +ENUM_12AED0_KAKERA_TAKARA_Q: + .ascii "KAKERA_TAKARA_Q\0" +ENUM_12AED0_KAKERA_TAKARA_P: + .ascii "KAKERA_TAKARA_P\0" +ENUM_12AED0_KAKERA_TAKARA_O: + .ascii "KAKERA_TAKARA_O\0" +ENUM_12AED0_KAKERA_TAKARA_N: + .ascii "KAKERA_TAKARA_N\0" +ENUM_12AED0_KAKERA_TAKARA_M: + .ascii "KAKERA_TAKARA_M\0" +ENUM_12AED0_KAKERA_TAKARA_L: + .ascii "KAKERA_TAKARA_L\0" +ENUM_12AED0_KAKERA_TAKARA_K: + .ascii "KAKERA_TAKARA_K\0" +ENUM_12AED0_KAKERA_TAKARA_E: + .ascii "KAKERA_TAKARA_E\0" +ENUM_12AED0_KAKERA_TAKARA_A: + .ascii "KAKERA_TAKARA_A\0" +ENUM_12AED0_BEANDEMO_04: + .ascii "BEANDEMO_04\0" +ENUM_12AED0_BEANDEMO_03: + .ascii "BEANDEMO_03\0" +ENUM_12AED0_BEANDEMO_02: + .ascii "BEANDEMO_02\0" +ENUM_12AED0_BEANDEMO_01: + .ascii "BEANDEMO_01\0" +ENUM_12AED0_BEANDEMO_00: + .ascii "BEANDEMO_00\0" +ENUM_12AED0_DAIGORON_EXCHG: + .ascii "DAIGORON_EXCHG\0\0" +ENUM_12AED0_DAIGORON_SHIELD: + .ascii "DAIGORON_SHIELD\0" +ENUM_12AED0_SUIGENGORON_00_CAP_0: + .ascii "SUIGENGORON_00_CAP_0\0\0\0\0" +ENUM_12AED0_SUIGEN_00_h1: + .ascii "SUIGEN_00_h1\0\0\0\0" +ENUM_12AED0_SUIGEN_00_R1: + .ascii "SUIGEN_00_R1\0\0\0\0" +ENUM_12AED0_SUIGEN_00_R0: + .ascii "SUIGEN_00_R0\0\0\0\0" +ENUM_12AED0_SUIGEN_00_CAP_1: + .ascii "SUIGEN_00_CAP_1\0" +ENUM_12AED0_SUIGEN_00_CAP_0: + .ascii "SUIGEN_00_CAP_0\0" +ENUM_12AED0_SUIGEN_00_r2: + .ascii "SUIGEN_00_r2\0\0\0\0" +ENUM_12AED0_SUIGEN_00_r1: + .ascii "SUIGEN_00_r1\0\0\0\0" +ENUM_12AED0_SUIGEN_00_r0: + .ascii "SUIGEN_00_r0\0\0\0\0" +ENUM_12AED0_SUIGEN_00_T0: + .ascii "SUIGEN_00_T0\0\0\0\0" +ENUM_12AED0_SUIGEN_00_h0: + .ascii "SUIGEN_00_h0\0\0\0\0" +ENUM_12AED0_CASTLE_04_MAID_TALK: + .ascii "CASTLE_04_MAID_TALK\0" +ENUM_12AED0_CASTLE_04_MEZAME: + .ascii "CASTLE_04_MEZAME\0\0\0\0" +ENUM_12AED0_CASTLE_00_00: + .ascii "CASTLE_00_00\0\0\0\0" +ENUM_12AED0_SOUGEN_08_T00: + .ascii "SOUGEN_08_T00\0\0\0" +ENUM_12AED0_SOUGEN_08_TORITSUKI: + .ascii "SOUGEN_08_TORITSUKI\0" +ENUM_12AED0_SOUGEN_08_08: + .ascii "SOUGEN_08_08\0\0\0\0" +ENUM_12AED0_SOUGEN_08_07: + .ascii "SOUGEN_08_07\0\0\0\0" +ENUM_12AED0_SOUGEN_08_06: + .ascii "SOUGEN_08_06\0\0\0\0" +ENUM_12AED0_SOUGEN_08_05: + .ascii "SOUGEN_08_05\0\0\0\0" +ENUM_12AED0_SOUGEN_08_04: + .ascii "SOUGEN_08_04\0\0\0\0" +ENUM_12AED0_SOUGEN_08_03: + .ascii "SOUGEN_08_03\0\0\0\0" +ENUM_12AED0_SOUGEN_08_02: + .ascii "SOUGEN_08_02\0\0\0\0" +ENUM_12AED0_SOUGEN_08_01: + .ascii "SOUGEN_08_01\0\0\0\0" +ENUM_12AED0_SOUGEN_08_00: + .ascii "SOUGEN_08_00\0\0\0\0" +ENUM_12AED0_SOUGEN_07_H00: + .ascii "SOUGEN_07_H00\0\0\0" +ENUM_12AED0_SOUGEN_07_02: + .ascii "SOUGEN_07_02\0\0\0\0" +ENUM_12AED0_SOUGEN_07_01: + .ascii "SOUGEN_07_01\0\0\0\0" +ENUM_12AED0_SOUGEN_07_00: + .ascii "SOUGEN_07_00\0\0\0\0" +ENUM_12AED0_SOUGEN_06_R1: + .ascii "SOUGEN_06_R1\0\0\0\0" +ENUM_12AED0_SOUGEN_06_SLIDE: + .ascii "SOUGEN_06_SLIDE\0" +ENUM_12AED0_SOUGEN_06_BENT: + .ascii "SOUGEN_06_BENT\0\0" +ENUM_12AED0_SOUGEN_06_SAIKAI: + .ascii "SOUGEN_06_SAIKAI\0\0\0\0" +ENUM_12AED0_SOUGEN_06_AKINDO: + .ascii "SOUGEN_06_AKINDO\0\0\0\0" +ENUM_12AED0_SOUGEN_06_IWA_0: + .ascii "SOUGEN_06_IWA_0\0" +ENUM_12AED0_SOUGEN_06_HIBI_4: + .ascii "SOUGEN_06_HIBI_4\0\0\0\0" +ENUM_12AED0_SOUGEN_06_HIBI_3: + .ascii "SOUGEN_06_HIBI_3\0\0\0\0" +ENUM_12AED0_SOUGEN_06_HIBI_2: + .ascii "SOUGEN_06_HIBI_2\0\0\0\0" +ENUM_12AED0_SOUGEN_06_HIBI_1: + .ascii "SOUGEN_06_HIBI_1\0\0\0\0" +ENUM_12AED0_SOUGEN_06_HIBI_0: + .ascii "SOUGEN_06_HIBI_0\0\0\0\0" +ENUM_12AED0_SOUGEN_06_WAKAGI_3: + .ascii "SOUGEN_06_WAKAGI_3\0\0" +ENUM_12AED0_SOUGEN_06_WAKAGI_2: + .ascii "SOUGEN_06_WAKAGI_2\0\0" +ENUM_12AED0_SOUGEN_06_WAKAGI_1: + .ascii "SOUGEN_06_WAKAGI_1\0\0" +ENUM_12AED0_SOUGEN_06_WAKAGI_0: + .ascii "SOUGEN_06_WAKAGI_0\0\0" +ENUM_12AED0_SOUGEN_05_CAP_0: + .ascii "SOUGEN_05_CAP_0\0" +ENUM_12AED0_SOUGEN_05_R0: + .ascii "SOUGEN_05_R0\0\0\0\0" +ENUM_12AED0_SOUGEN_05_H00: + .ascii "SOUGEN_05_H00\0\0\0" +ENUM_12AED0_SOUGEN_05_BENT: + .ascii "SOUGEN_05_BENT\0\0" +ENUM_12AED0_SOUGEN_05_IWA02: + .ascii "SOUGEN_05_IWA02\0" +ENUM_12AED0_SOUGEN_05_01: + .ascii "SOUGEN_05_01\0\0\0\0" +ENUM_12AED0_SOUGEN_05_00: + .ascii "SOUGEN_05_00\0\0\0\0" +ENUM_12AED0_SOUGEN_05_BOMB_00: + .ascii "SOUGEN_05_BOMB_00\0\0\0" +ENUM_12AED0_SOUGEN_05_HIBI_3: + .ascii "SOUGEN_05_HIBI_3\0\0\0\0" +ENUM_12AED0_SOUGEN_05_HIBI_2: + .ascii "SOUGEN_05_HIBI_2\0\0\0\0" +ENUM_12AED0_SOUGEN_05_HIBI_1: + .ascii "SOUGEN_05_HIBI_1\0\0\0\0" +ENUM_12AED0_SOUGEN_05_HIBI_0: + .ascii "SOUGEN_05_HIBI_0\0\0\0\0" +ENUM_12AED0_SOUGEN_04_HIBI_3: + .ascii "SOUGEN_04_HIBI_3\0\0\0\0" +ENUM_12AED0_SOUGEN_04_HIBI_2: + .ascii "SOUGEN_04_HIBI_2\0\0\0\0" +ENUM_12AED0_SOUGEN_04_HIBI_1: + .ascii "SOUGEN_04_HIBI_1\0\0\0\0" +ENUM_12AED0_SOUGEN_04_HIBI_0: + .ascii "SOUGEN_04_HIBI_0\0\0\0\0" +ENUM_12AED0_SOUGEN_03_BOMBWALL: + .ascii "SOUGEN_03_BOMBWALL\0\0" +ENUM_12AED0_SOUGEN_02_HIBI_1: + .ascii "SOUGEN_02_HIBI_1\0\0\0\0" +ENUM_12AED0_SOUGEN_02_HIBI_0: + .ascii "SOUGEN_02_HIBI_0\0\0\0\0" +ENUM_12AED0_SOUGEN_01_ZELDA: + .ascii "SOUGEN_01_ZELDA\0" +ENUM_12AED0_SOUGEN_01_BENT: + .ascii "SOUGEN_01_BENT\0\0" +ENUM_12AED0_SOUGEN_01_00: + .ascii "SOUGEN_01_00\0\0\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_12: + .ascii "SOUGEN_01_WAKAGI_12\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_11: + .ascii "SOUGEN_01_WAKAGI_11\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_10: + .ascii "SOUGEN_01_WAKAGI_10\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_9: + .ascii "SOUGEN_01_WAKAGI_9\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_8: + .ascii "SOUGEN_01_WAKAGI_8\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_7: + .ascii "SOUGEN_01_WAKAGI_7\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_6: + .ascii "SOUGEN_01_WAKAGI_6\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_5: + .ascii "SOUGEN_01_WAKAGI_5\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_4: + .ascii "SOUGEN_01_WAKAGI_4\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_3: + .ascii "SOUGEN_01_WAKAGI_3\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_2: + .ascii "SOUGEN_01_WAKAGI_2\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_1: + .ascii "SOUGEN_01_WAKAGI_1\0\0" +ENUM_12AED0_SOUGEN_01_WAKAGI_0: + .ascii "SOUGEN_01_WAKAGI_0\0\0" +ENUM_12AED0_HAKA_KEY_GET: + .ascii "HAKA_KEY_GET\0\0\0\0" +ENUM_12AED0_HAKA_01_T0: + .ascii "HAKA_01_T0\0\0" +ENUM_12AED0_HAKA_00_BW00: + .ascii "HAKA_00_BW00\0\0\0\0" +ENUM_12AED0_HAKA_00_CAP_0: + .ascii "HAKA_00_CAP_0\0\0\0" +ENUM_12AED0_HAKA_BOSEKI_02: + .ascii "HAKA_BOSEKI_02\0\0" +ENUM_12AED0_HAKA_BOSEKI_01: + .ascii "HAKA_BOSEKI_01\0\0" +ENUM_12AED0_HAKA_BOSEKI_00: + .ascii "HAKA_BOSEKI_00\0\0" +ENUM_12AED0_HAKA_BUNSHIN_00: + .ascii "HAKA_BUNSHIN_00\0" +ENUM_12AED0_YAMA_04_BOMBWALL0: + .ascii "YAMA_04_BOMBWALL0\0\0\0" +ENUM_12AED0_YAMA_04_ANAHOUSHI: + .ascii "YAMA_04_ANAHOUSHI\0\0\0" +ENUM_12AED0_YAMA_04_ENTHOUSHI: + .ascii "YAMA_04_ENTHOUSHI\0\0\0" +ENUM_12AED0_YAMA_04_06: + .ascii "YAMA_04_06\0\0" +ENUM_12AED0_YAMA_04_05: + .ascii "YAMA_04_05\0\0" +ENUM_12AED0_YAMA_04_04: + .ascii "YAMA_04_04\0\0" +ENUM_12AED0_YAMA_04_01: + .ascii "YAMA_04_01\0\0" +ENUM_12AED0_YAMA_04_00: + .ascii "YAMA_04_00\0\0" +ENUM_12AED0_YAMA_04_HIBI_1: + .ascii "YAMA_04_HIBI_1\0\0" +ENUM_12AED0_YAMA_04_HIBI_0: + .ascii "YAMA_04_HIBI_0\0\0" +ENUM_12AED0_YAMA_04_R00: + .ascii "YAMA_04_R00\0" +ENUM_12AED0_YAMA_04_CAP_0: + .ascii "YAMA_04_CAP_0\0\0\0" +ENUM_12AED0_YAMA_03_DOKU_2: + .ascii "YAMA_03_DOKU_2\0\0" +ENUM_12AED0_YAMA_03_DOKU_1: + .ascii "YAMA_03_DOKU_1\0\0" +ENUM_12AED0_YAMA_03_DOKU_0: + .ascii "YAMA_03_DOKU_0\0\0" +ENUM_12AED0_YAMA_03_02: + .ascii "YAMA_03_02\0\0" +ENUM_12AED0_YAMA_03_01: + .ascii "YAMA_03_01\0\0" +ENUM_12AED0_YAMA_03_00: + .ascii "YAMA_03_00\0\0" +ENUM_12AED0_YAMA_02_00: + .ascii "YAMA_02_00\0\0" +ENUM_12AED0_YAMA_01_BW00: + .ascii "YAMA_01_BW00\0\0\0\0" +ENUM_12AED0_YAMA_00_01: + .ascii "YAMA_00_01\0\0" +ENUM_12AED0_YAMA_00_00: + .ascii "YAMA_00_00\0\0" +ENUM_12AED0_MORI_ENTRANCE_1ST: + .ascii "MORI_ENTRANCE_1ST\0\0\0" +ENUM_12AED0_MORI_00_H1: + .ascii "MORI_00_H1\0\0" +ENUM_12AED0_MORI_00_H0: + .ascii "MORI_00_H0\0\0" +ENUM_12AED0_MORI_00_KOBITO: + .ascii "MORI_00_KOBITO\0\0" +ENUM_12AED0_MORI_00_HIBI_4: + .ascii "MORI_00_HIBI_4\0\0" +ENUM_12AED0_MORI_00_HIBI_3: + .ascii "MORI_00_HIBI_3\0\0" +ENUM_12AED0_MORI_00_HIBI_2: + .ascii "MORI_00_HIBI_2\0\0" +ENUM_12AED0_MORI_00_HIBI_1: + .ascii "MORI_00_HIBI_1\0\0" +ENUM_12AED0_MORI_00_HIBI_0: + .ascii "MORI_00_HIBI_0\0\0" +ENUM_12AED0_LOST_05_T1: + .ascii "LOST_05_T1\0\0" +ENUM_12AED0_LOST_05_T0: + .ascii "LOST_05_T0\0\0" +ENUM_12AED0_LOST_05_01: + .ascii "LOST_05_01\0\0" +ENUM_12AED0_LOST_05_00: + .ascii "LOST_05_00\0\0" +ENUM_12AED0_LOST_04_SIBA4: + .ascii "LOST_04_SIBA4\0\0\0" +ENUM_12AED0_LOST_04_SIBA3: + .ascii "LOST_04_SIBA3\0\0\0" +ENUM_12AED0_LOST_04_SIBA2: + .ascii "LOST_04_SIBA2\0\0\0" +ENUM_12AED0_LOST_04_SIBA1: + .ascii "LOST_04_SIBA1\0\0\0" +ENUM_12AED0_LOST_04_SIBA0: + .ascii "LOST_04_SIBA0\0\0\0" +ENUM_12AED0_LOST_04_00: + .ascii "LOST_04_00\0\0" +ENUM_12AED0_LOST_03_T0: + .ascii "LOST_03_T0\0\0" +ENUM_12AED0_LOST_03_00: + .ascii "LOST_03_00\0\0" +ENUM_12AED0_LOST_02_00: + .ascii "LOST_02_00\0\0" +ENUM_12AED0_LOST_00_01: + .ascii "LOST_00_01\0\0" +ENUM_12AED0_LOST_00_00: + .ascii "LOST_00_00\0\0" +ENUM_12AED0_LOST_00_ENTER: + .ascii "LOST_00_ENTER\0\0\0" +ENUM_12AED0_HIKYOU_00_M2: + .ascii "HIKYOU_00_M2\0\0\0\0" +ENUM_12AED0_HIKYOU_00_M1: + .ascii "HIKYOU_00_M1\0\0\0\0" +ENUM_12AED0_HIKYOU_00_M0: + .ascii "HIKYOU_00_M0\0\0\0\0" +ENUM_12AED0_HIKYOU_00_H00: + .ascii "HIKYOU_00_H00\0\0\0" +ENUM_12AED0_HIKYOU_00_BOSEKI: + .ascii "HIKYOU_00_BOSEKI\0\0\0\0" +ENUM_12AED0_HIKYOU_00_14: + .ascii "HIKYOU_00_14\0\0\0\0" +ENUM_12AED0_HIKYOU_00_SEKIZOU: + .ascii "HIKYOU_00_SEKIZOU\0\0\0" +ENUM_12AED0_HIKYOU_00_CAP_2: + .ascii "HIKYOU_00_CAP_2\0" +ENUM_12AED0_HIKYOU_00_CAP_1: + .ascii "HIKYOU_00_CAP_1\0" +ENUM_12AED0_HIKYOU_00_CAP_0: + .ascii "HIKYOU_00_CAP_0\0" +ENUM_12AED0_HIKYOU_00_04: + .ascii "HIKYOU_00_04\0\0\0\0" +ENUM_12AED0_HIKYOU_00_03: + .ascii "HIKYOU_00_03\0\0\0\0" +ENUM_12AED0_HIKYOU_00_02: + .ascii "HIKYOU_00_02\0\0\0\0" +ENUM_12AED0_HIKYOU_00_01: + .ascii "HIKYOU_00_01\0\0\0\0" +ENUM_12AED0_HIKYOU_00_00: + .ascii "HIKYOU_00_00\0\0\0\0" +ENUM_12AED0_NAKANIWA_00_EZERO: + .ascii "NAKANIWA_00_EZERO\0\0\0" +ENUM_12AED0_MAENIWA_00_CAP_0: + .ascii "MAENIWA_00_CAP_0\0\0\0\0" +ENUM_12AED0_MAENIWA_00_T1: + .ascii "MAENIWA_00_T1\0\0\0" +ENUM_12AED0_MAENIWA_00_T0: + .ascii "MAENIWA_00_T0\0\0\0" +ENUM_12AED0_MAENIWA_00_WARP: + .ascii "MAENIWA_00_WARP\0" +ENUM_12AED0_MAENIWA_00_BENT: + .ascii "MAENIWA_00_BENT\0" +ENUM_12AED0_MAENIWA_00_02: + .ascii "MAENIWA_00_02\0\0\0" +ENUM_12AED0_MAENIWA_00_01: + .ascii "MAENIWA_00_01\0\0\0" +ENUM_12AED0_MAENIWA_00_00: + .ascii "MAENIWA_00_00\0\0\0" +ENUM_12AED0_HIKYOU_00_T1: + .ascii "HIKYOU_00_T1\0\0\0\0" +ENUM_12AED0_HIKYOU_00_T0: + .ascii "HIKYOU_00_T0\0\0\0\0" +ENUM_12AED0_MIZUUMI_00_H02: + .ascii "MIZUUMI_00_H02\0\0" +ENUM_12AED0_MIZUUMI_00_H01: + .ascii "MIZUUMI_00_H01\0\0" +ENUM_12AED0_MIZUUMI_00_H00: + .ascii "MIZUUMI_00_H00\0\0" +ENUM_12AED0_MIZUUMI_00_00: + .ascii "MIZUUMI_00_00\0\0\0" +ENUM_12AED0_MIZUUMI_00_BENT: + .ascii "MIZUUMI_00_BENT\0" +ENUM_12AED0_LV5_CLEAR_MES: + .ascii "LV5_CLEAR_MES\0\0\0" +ENUM_12AED0_LV4_CLEAR_MES: + .ascii "LV4_CLEAR_MES\0\0\0" +ENUM_12AED0_LV3_CLEAR_MES: + .ascii "LV3_CLEAR_MES\0\0\0" +ENUM_12AED0_LV2_CLEAR_MES: + .ascii "LV2_CLEAR_MES\0\0\0" +ENUM_12AED0_LV1_CLEAR_MES: + .ascii "LV1_CLEAR_MES\0\0\0" +.else .4byte gUnk_0812B204 .4byte gUnk_0812C5F0 .4byte gUnk_0812C5E0 @@ -1990,7 +2758,6 @@ ENUM_12AED0_LV1_CLEAR_MES: .4byte gUnk_0812C580 .4byte gUnk_0812C570 .4byte gUnk_0812C560 - @.4byte 0000 .4byte gUnk_0812C54C .4byte gUnk_0812C53C .4byte gUnk_0812C52C @@ -2230,12 +2997,10 @@ ENUM_12AED0_LV1_CLEAR_MES: .4byte gUnk_0812B638 .4byte gUnk_0812B624 .4byte gUnk_0812B61C -.ifndef JP .4byte gUnk_0812B614 .4byte gUnk_0812B60C .4byte gUnk_0812B604 .4byte gUnk_0812AC84 -.endif gUnk_0812B604:: @ 0812B604 .incbin "baserom.gba", 0x12B604, 0x0000008 @@ -3004,7 +3769,638 @@ gUnk_0812C5F0:: @ 0812C5F0 .incbin "baserom.gba", 0x12C5F0, 0x0000010 .endif .endif +.endif + +.ifdef DEMO_JP +ENUM_12BD8C: + .4byte gUnk_0812B204 + .4byte ENUM_12BD8C_BILL05_YADO1F_MATSU_T0 + .4byte ENUM_12BD8C_BILL06_YADO1F_TAKE_T0 + .4byte ENUM_12BD8C_BILL07_YADO1F_UME_T0 + .4byte ENUM_12BD8C_BILL0A_YADO_TAKARA_T0 + .4byte ENUM_12BD8C_SHOUSE_00_T0 + .4byte ENUM_12BD8C_SHOUSE_00_T1 + .4byte ENUM_12BD8C_SHOUSE_01_T0 + .4byte ENUM_12BD8C_SHOUSE_02_T0 + .4byte ENUM_12BD8C_SHOUSE_02_T1 + .4byte ENUM_12BD8C_SHOUSE_02_T2 + .4byte ENUM_12BD8C_SHOUSE_02_XXXX0 + .4byte ENUM_12BD8C_SHOUSE_02_XXXX1 + .4byte ENUM_12BD8C_SHOUSE_02_XXXX2 + .4byte ENUM_12BD8C_SHOUSE_03_T0 + .4byte ENUM_12BD8C_SHOUSE_03_T1 + .4byte ENUM_12BD8C_KOBITOANA_06_T0 + .4byte ENUM_12BD8C_KOBITOANA_03_T0 + .4byte ENUM_12BD8C_KOBITOANA_07_T0 + .4byte ENUM_12BD8C_KOBITOANA_09_T0 + .4byte ENUM_12BD8C_KOBITOANA_0A_T0 + .4byte ENUM_12BD8C_KOBITOANA_0B_T0 + .4byte ENUM_12BD8C_MHOUSE11_T0 + .4byte ENUM_12BD8C_URO_08_T0 + .4byte ENUM_12BD8C_URO_0A_T0 + .4byte ENUM_12BD8C_URO_0B_T0 + .4byte ENUM_12BD8C_BILL00_SHICHOU_00 + .4byte ENUM_12BD8C_BILL00_SHICHOU_01 + .4byte ENUM_12BD8C_BILL00_SHICHOU_02 + .4byte ENUM_12BD8C_BILL00_SHICHOU_03 + .4byte ENUM_12BD8C_BILL00_SHICHOU_04 + .4byte ENUM_12BD8C_BILL01_TESSIN_1 + .4byte ENUM_12BD8C_BILL01_TESSIN_2 + .4byte ENUM_12BD8C_BILL01_TESSIN_3 + .4byte ENUM_12BD8C_BILL01_TESSIN_4 + .4byte ENUM_12BD8C_BILL01_TESSIN_5 + .4byte ENUM_12BD8C_BILL01_TESSIN_6 + .4byte ENUM_12BD8C_BILL01_TESSIN_7 + .4byte ENUM_12BD8C_BILL01_TESSIN_8 + .4byte ENUM_12BD8C_BILL09_YADO2F_POEMN + .4byte ENUM_12BD8C_BILL0A_YADO_TAKARA_00 + .4byte ENUM_12BD8C_BILL0B_SCHOOLL_00 + .4byte ENUM_12BD8C_BILL0C_SCHOOLR_00 + .4byte ENUM_12BD8C_MHOUSE00_00 + .4byte ENUM_12BD8C_MHOUSE00_01 + .4byte ENUM_12BD8C_MHOUSE00_02 + .4byte ENUM_12BD8C_MHOUSE00_03 + .4byte ENUM_12BD8C_MHOUSE00_04 + .4byte ENUM_12BD8C_MHOUSE00_05 + .4byte ENUM_12BD8C_MHOUSE01_00 + .4byte ENUM_12BD8C_MHOUSE01_01 + .4byte ENUM_12BD8C_MHOUSE01_02 + .4byte ENUM_12BD8C_MHOUSE01_03 + .4byte ENUM_12BD8C_MHOUSE03_00 + .4byte ENUM_12BD8C_MHOUSE03_01 + .4byte ENUM_12BD8C_MHOUSE04_00 + .4byte ENUM_12BD8C_MHOUSE04_01 + .4byte ENUM_12BD8C_MHOUSE04_02 + .4byte ENUM_12BD8C_MHOUSE04_03 + .4byte ENUM_12BD8C_MHOUSE04_04 + .4byte ENUM_12BD8C_MHOUSE06_00 + .4byte ENUM_12BD8C_MHOUSE07_00 + .4byte ENUM_12BD8C_MHOUSE07_01 + .4byte ENUM_12BD8C_MHOUSE08_00 + .4byte ENUM_12BD8C_MHOUSE08_01 + .4byte ENUM_12BD8C_MHOUSE08_02 + .4byte ENUM_12BD8C_MHOUSE08_03 + .4byte ENUM_12BD8C_MHOUSE08_04 + .4byte ENUM_12BD8C_MHOUSE0C_00 + .4byte ENUM_12BD8C_MHOUSE14_00 + .4byte ENUM_12BD8C_MHOUSE15_OP1ST + .4byte ENUM_12BD8C_MHOUSE2_00_00 + .4byte ENUM_12BD8C_MHOUSE2_00_01 + .4byte ENUM_12BD8C_MHOUSE2_00_02 + .4byte ENUM_12BD8C_MHOUSE2_00_03 + .4byte ENUM_12BD8C_MHOUSE2_01_T0 + .4byte ENUM_12BD8C_MHOUSE2_02_KAME + .4byte ENUM_12BD8C_MHOUSE2_02_KEY + .4byte ENUM_12BD8C_MHOUSE2_03_00 + .4byte ENUM_12BD8C_MHOUSE2_05_00 + .4byte ENUM_12BD8C_SHOP00_ITEM_00 + .4byte ENUM_12BD8C_SHOP00_ITEM_01 + .4byte ENUM_12BD8C_SHOP00_ITEM_02 + .4byte ENUM_12BD8C_SHOP00_ITEM_03 + .4byte ENUM_12BD8C_SHOP00_ITEM_04 + .4byte ENUM_12BD8C_SHOP00_SAIFU + .4byte ENUM_12BD8C_SHOP00_YAZUTSU + .4byte ENUM_12BD8C_SHOP01_CAFE_00 + .4byte ENUM_12BD8C_SHOP01_CAFE_01 + .4byte ENUM_12BD8C_SHOP01_TALK + .4byte ENUM_12BD8C_HOUSE_XXXXX + .4byte ENUM_12BD8C_SHOP03_PAN_1ST + .4byte ENUM_12BD8C_SHOP07_TALK1ST + .4byte ENUM_12BD8C_SHOP07_GACHAPON + .4byte ENUM_12BD8C_SHOP07_TANA + .4byte ENUM_12BD8C_SHOP07_COMPLETE + .4byte ENUM_12BD8C_SHOP02_KUTSU_00 + .4byte ENUM_12BD8C_NPC37_REM_TALK1ST + .4byte ENUM_12BD8C_NPC37_REM_SLEEP + .4byte ENUM_12BD8C_SORA_ELDER_RECOVER + .4byte ENUM_12BD8C_SORA_CHIEF_TALK + .4byte ENUM_12BD8C_SORA_ELDER_TALK1ST + .4byte ENUM_12BD8C_SORA_ELDER_TALK2ND + .4byte ENUM_12BD8C_NPC06_19GUY_QUESTION + .4byte ENUM_12BD8C_NPC06_19GUY_ANSWER + .4byte ENUM_12BD8C_DANPEI_TALK1ST + .4byte ENUM_12BD8C_MIZUKAKI_KOBITO + .4byte ENUM_12BD8C_MIZUKAKI_HINT1 + .4byte ENUM_12BD8C_MIZUKAKI_BOOK1_FALL + .4byte ENUM_12BD8C_MIZUKAKI_HINT2 + .4byte ENUM_12BD8C_MIZUKAKI_HINT2_2ND + .4byte ENUM_12BD8C_MIZUKAKI_BOOK2_FALL + .4byte ENUM_12BD8C_MIZUKAKI_HINT3 + .4byte ENUM_12BD8C_MIZUKAKI_HINT3_MAYOR + .4byte ENUM_12BD8C_MIZUKAKI_BOOK3_FALL + .4byte ENUM_12BD8C_MIZUKAKI_BOOK_ALLBACK + .4byte ENUM_12BD8C_MIZUKAKI_STAIR + .4byte ENUM_12BD8C_MIZUKAKI_STAIR_WARP_OK + .4byte ENUM_12BD8C_KHOUSE27_00 + .4byte ENUM_12BD8C_NO_USE_00 + .4byte ENUM_12BD8C_KHOUSE51_00 + .4byte ENUM_12BD8C_NO_USE_01 + .4byte ENUM_12BD8C_KHOUSE51_02 + .4byte ENUM_12BD8C_KHOUSE42_00 + .4byte ENUM_12BD8C_NO_USE_02 + .4byte ENUM_12BD8C_NO_USE_03 + .4byte ENUM_12BD8C_OYAKATA_DEMO + .4byte ENUM_12BD8C_YAMAKOBITO_OPEN + .4byte ENUM_12BD8C_M_PRIEST_TALK + .4byte ENUM_12BD8C_M_ELDER_TALK1ST + .4byte ENUM_12BD8C_M_PRIEST_MOVE + .4byte ENUM_12BD8C_M_ELDER_TALK2ND + .4byte ENUM_12BD8C_MHOUSE04_DANRO + .4byte ENUM_12BD8C_MHOUSE06_DANRO + .4byte ENUM_12BD8C_URO_POEMN_TALK + .4byte ENUM_12BD8C_MHOUSE06_MES_20 + .4byte ENUM_12BD8C_MHOUSE07_MES_20 + .4byte ENUM_12BD8C_MAYOR_2_TALK1ST + .4byte ENUM_12BD8C_MAYOR_4_TALK1ST + .4byte ENUM_12BD8C_BILL01_TESSIN_RESERVED + .4byte ENUM_12BD8C_BILL01_TESSIN_BRANDNEW + .4byte ENUM_12BD8C_KOBITO_MORI_1ST + .4byte ENUM_12BD8C_KOBITO_YAMA_ENTER + .4byte ENUM_12BD8C_KHOUSE52_KINOKO + .4byte ENUM_12BD8C_SORA_YAKATA_ENTER + .4byte ENUM_12BD8C_YADO_CHECKIN + .4byte ENUM_12BD8C_MINIGAME_GAMEEND + .4byte ENUM_12BD8C_MINIGAME_LEVEL2 + .4byte ENUM_12BD8C_MHOUSE_DIN_TALK + .4byte ENUM_12BD8C_MHOUSE_NAYRU_TALK + .4byte ENUM_12BD8C_MHOUSE_FARORE_TALK + .4byte ENUM_12BD8C_URO_12_H0 + .4byte ENUM_12BD8C_URO_19_H0 + .4byte ENUM_12BD8C_URO_1F_H0 + .4byte ENUM_12BD8C_BILL09_TSW0 + .4byte ENUM_12BD8C_BILL09_TSW1 + .4byte ENUM_12BD8C_KHOUSE41_TALK1ST + .4byte ENUM_12BD8C_TAIMA_SAIBAI_1ST + .4byte ENUM_12BD8C_IZUMI_00_FAIRY + .4byte ENUM_12BD8C_IZUMI_01_FAIRY + .4byte ENUM_12BD8C_IZUMI_02_FAIRY + .4byte ENUM_12BD8C_BILL0B_DOUZOU_L + .4byte ENUM_12BD8C_BILL0B_DOUZOU_R + .4byte ENUM_12BD8C_KOBITOANA_08_T0 + .4byte ENUM_12BD8C_KOBITOANA_0C_T0 + .4byte ENUM_12BD8C_KOBITOANA_0D_T0 + .4byte ENUM_12BD8C_KOBITOHOUSE_23_H0 + .4byte ENUM_12BD8C_MHOUSE08_DANRO + .4byte ENUM_12BD8C_MHOUSE09_DANRO + .4byte ENUM_12BD8C_MHOUSE0A_DANRO + .4byte ENUM_12BD8C_MHOUSE0B_DANRO + .4byte ENUM_12BD8C_MHOUSE0C_DANRO + .4byte ENUM_12BD8C_MHOUSE12_DANRO + .4byte ENUM_12BD8C_SORA_DANRO + .4byte ENUM_12BD8C_MIZUKAKI_HINT3_MAP + .4byte ENUM_12BD8C_LEFT_TALK + .4byte ENUM_12BD8C_KHOUSE26_REMOCON + .4byte ENUM_12BD8C_SORA_KIDS_MOVE + .4byte ENUM_12BD8C_KOBITOANA_00_T0 + .4byte ENUM_12BD8C_KHOUSE23_TALK1ST + .4byte ENUM_12BD8C_SHOP05_ELEMENT_H00 + .4byte ENUM_12BD8C_SHOP05_ELEMENT_T00 + .4byte ENUM_12BD8C_SHOP05_ELEMENT_T01 + .4byte ENUM_12BD8C_SHOP05_ELEMENT_T02 + .4byte ENUM_12BD8C_BILL0a_YADO_TAKARA_H00 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R00 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R01 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R02 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R03 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R04 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R05 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R06 + .4byte ENUM_12BD8C_KOBITOYAMA_00_R07 + .4byte ENUM_12BD8C_KOBITO_MORI_00_H00 + .4byte ENUM_12BD8C_KOBITO_MORI_00_H0 + .4byte ENUM_12BD8C_CAFE_01_CAP_0 + .4byte ENUM_12BD8C_BILL_00_CAP_0 + .4byte ENUM_12BD8C_BILL_02_CAP_0 + .4byte ENUM_12BD8C_MHOUSE_07_CAP_0 + .4byte ENUM_12BD8C_MHOUSE_07_CAP_1 + .4byte ENUM_12BD8C_MHOUSE_10_CAP_0 + .4byte ENUM_12BD8C_MHOUSE_15_CAP_0 + .4byte ENUM_12BD8C_MHOUSE_15_CAP_1 + .4byte ENUM_12BD8C_SHOP_03_CAP_0 + .4byte ENUM_12BD8C_MHOUSE_07_CAP_2 + .4byte ENUM_12BD8C_SHOP00_BOMBBAG + .4byte ENUM_12BD8C_CAFE_01_CAP_1 + .4byte ENUM_12BD8C_MH01_KS_KUSURI + .4byte ENUM_12BD8C_MH09_KS_KUSURI + .4byte gUnk_0812AC84 +ENUM_12BD8C_MH09_KS_KUSURI: + .ascii "MH09_KS_KUSURI\0\0" +ENUM_12BD8C_MH01_KS_KUSURI: + .ascii "MH01_KS_KUSURI\0\0" +ENUM_12BD8C_CAFE_01_CAP_1: + .ascii "CAFE_01_CAP_1\0\0\0" +ENUM_12BD8C_SHOP00_BOMBBAG: + .ascii "SHOP00_BOMBBAG\0\0" +ENUM_12BD8C_MHOUSE_07_CAP_2: + .ascii "MHOUSE_07_CAP_2\0" +ENUM_12BD8C_SHOP_03_CAP_0: + .ascii "SHOP_03_CAP_0\0\0\0" +ENUM_12BD8C_MHOUSE_15_CAP_1: + .ascii "MHOUSE_15_CAP_1\0" +ENUM_12BD8C_MHOUSE_15_CAP_0: + .ascii "MHOUSE_15_CAP_0\0" +ENUM_12BD8C_MHOUSE_10_CAP_0: + .ascii "MHOUSE_10_CAP_0\0" +ENUM_12BD8C_MHOUSE_07_CAP_1: + .ascii "MHOUSE_07_CAP_1\0" +ENUM_12BD8C_MHOUSE_07_CAP_0: + .ascii "MHOUSE_07_CAP_0\0" +ENUM_12BD8C_BILL_02_CAP_0: + .ascii "BILL_02_CAP_0\0\0\0" +ENUM_12BD8C_BILL_00_CAP_0: + .ascii "BILL_00_CAP_0\0\0\0" +ENUM_12BD8C_CAFE_01_CAP_0: + .ascii "CAFE_01_CAP_0\0\0\0" +ENUM_12BD8C_KOBITO_MORI_00_H0: + .ascii "KOBITO_MORI_00_H0\0\0\0" +ENUM_12BD8C_KOBITO_MORI_00_H00: + .ascii "KOBITO_MORI_00_H00\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R07: + .ascii "KOBITOYAMA_00_R07\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R06: + .ascii "KOBITOYAMA_00_R06\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R05: + .ascii "KOBITOYAMA_00_R05\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R04: + .ascii "KOBITOYAMA_00_R04\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R03: + .ascii "KOBITOYAMA_00_R03\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R02: + .ascii "KOBITOYAMA_00_R02\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R01: + .ascii "KOBITOYAMA_00_R01\0\0\0" +ENUM_12BD8C_KOBITOYAMA_00_R00: + .ascii "KOBITOYAMA_00_R00\0\0\0" +ENUM_12BD8C_BILL0a_YADO_TAKARA_H00: + .ascii "BILL0a_YADO_TAKARA_H00\0\0" +ENUM_12BD8C_SHOP05_ELEMENT_T02: + .ascii "SHOP05_ELEMENT_T02\0\0" +ENUM_12BD8C_SHOP05_ELEMENT_T01: + .ascii "SHOP05_ELEMENT_T01\0\0" +ENUM_12BD8C_SHOP05_ELEMENT_T00: + .ascii "SHOP05_ELEMENT_T00\0\0" +ENUM_12BD8C_SHOP05_ELEMENT_H00: + .ascii "SHOP05_ELEMENT_H00\0\0" +ENUM_12BD8C_KHOUSE23_TALK1ST: + .ascii "KHOUSE23_TALK1ST\0\0\0\0" +ENUM_12BD8C_KOBITOANA_00_T0: + .ascii "KOBITOANA_00_T0\0" +ENUM_12BD8C_SORA_KIDS_MOVE: + .ascii "SORA_KIDS_MOVE\0\0" +ENUM_12BD8C_KHOUSE26_REMOCON: + .ascii "KHOUSE26_REMOCON\0\0\0\0" +ENUM_12BD8C_LEFT_TALK: + .ascii "LEFT_TALK\0\0\0" +ENUM_12BD8C_MIZUKAKI_HINT3_MAP: + .ascii "MIZUKAKI_HINT3_MAP\0\0" +ENUM_12BD8C_SORA_DANRO: + .ascii "SORA_DANRO\0\0" +ENUM_12BD8C_MHOUSE12_DANRO: + .ascii "MHOUSE12_DANRO\0\0" +ENUM_12BD8C_MHOUSE0C_DANRO: + .ascii "MHOUSE0C_DANRO\0\0" +ENUM_12BD8C_MHOUSE0B_DANRO: + .ascii "MHOUSE0B_DANRO\0\0" +ENUM_12BD8C_MHOUSE0A_DANRO: + .ascii "MHOUSE0A_DANRO\0\0" +ENUM_12BD8C_MHOUSE09_DANRO: + .ascii "MHOUSE09_DANRO\0\0" +ENUM_12BD8C_MHOUSE08_DANRO: + .ascii "MHOUSE08_DANRO\0\0" +ENUM_12BD8C_KOBITOHOUSE_23_H0: + .ascii "KOBITOHOUSE_23_H0\0\0\0" +ENUM_12BD8C_KOBITOANA_0D_T0: + .ascii "KOBITOANA_0D_T0\0" +ENUM_12BD8C_KOBITOANA_0C_T0: + .ascii "KOBITOANA_0C_T0\0" +ENUM_12BD8C_KOBITOANA_08_T0: + .ascii "KOBITOANA_08_T0\0" +ENUM_12BD8C_BILL0B_DOUZOU_R: + .ascii "BILL0B_DOUZOU_R\0" +ENUM_12BD8C_BILL0B_DOUZOU_L: + .ascii "BILL0B_DOUZOU_L\0" +ENUM_12BD8C_IZUMI_02_FAIRY: + .ascii "IZUMI_02_FAIRY\0\0" +ENUM_12BD8C_IZUMI_01_FAIRY: + .ascii "IZUMI_01_FAIRY\0\0" +ENUM_12BD8C_IZUMI_00_FAIRY: + .ascii "IZUMI_00_FAIRY\0\0" +ENUM_12BD8C_TAIMA_SAIBAI_1ST: + .ascii "TAIMA_SAIBAI_1ST\0\0\0\0" +ENUM_12BD8C_KHOUSE41_TALK1ST: + .ascii "KHOUSE41_TALK1ST\0\0\0\0" +ENUM_12BD8C_BILL09_TSW1: + .ascii "BILL09_TSW1\0" +ENUM_12BD8C_BILL09_TSW0: + .ascii "BILL09_TSW0\0" +ENUM_12BD8C_URO_1F_H0: + .ascii "URO_1F_H0\0\0\0" +ENUM_12BD8C_URO_19_H0: + .ascii "URO_19_H0\0\0\0" +ENUM_12BD8C_URO_12_H0: + .ascii "URO_12_H0\0\0\0" +ENUM_12BD8C_MHOUSE_FARORE_TALK: + .ascii "MHOUSE_FARORE_TALK\0\0" +ENUM_12BD8C_MHOUSE_NAYRU_TALK: + .ascii "MHOUSE_NAYRU_TALK\0\0\0" +ENUM_12BD8C_MHOUSE_DIN_TALK: + .ascii "MHOUSE_DIN_TALK\0" +ENUM_12BD8C_MINIGAME_LEVEL2: + .ascii "MINIGAME_LEVEL2\0" +ENUM_12BD8C_MINIGAME_GAMEEND: + .ascii "MINIGAME_GAMEEND\0\0\0\0" +ENUM_12BD8C_YADO_CHECKIN: + .ascii "YADO_CHECKIN\0\0\0\0" +ENUM_12BD8C_SORA_YAKATA_ENTER: + .ascii "SORA_YAKATA_ENTER\0\0\0" +ENUM_12BD8C_KHOUSE52_KINOKO: + .ascii "KHOUSE52_KINOKO\0" +ENUM_12BD8C_KOBITO_YAMA_ENTER: + .ascii "KOBITO_YAMA_ENTER\0\0\0" +ENUM_12BD8C_KOBITO_MORI_1ST: + .ascii "KOBITO_MORI_1ST\0" +ENUM_12BD8C_BILL01_TESSIN_BRANDNEW: + .ascii "BILL01_TESSIN_BRANDNEW\0\0" +ENUM_12BD8C_BILL01_TESSIN_RESERVED: + .ascii "BILL01_TESSIN_RESERVED\0\0" +ENUM_12BD8C_MAYOR_4_TALK1ST: + .ascii "MAYOR_4_TALK1ST\0" +ENUM_12BD8C_MAYOR_2_TALK1ST: + .ascii "MAYOR_2_TALK1ST\0" +ENUM_12BD8C_MHOUSE07_MES_20: + .ascii "MHOUSE07_MES_20\0" +ENUM_12BD8C_MHOUSE06_MES_20: + .ascii "MHOUSE06_MES_20\0" +ENUM_12BD8C_URO_POEMN_TALK: + .ascii "URO_POEMN_TALK\0\0" +ENUM_12BD8C_MHOUSE06_DANRO: + .ascii "MHOUSE06_DANRO\0\0" +ENUM_12BD8C_MHOUSE04_DANRO: + .ascii "MHOUSE04_DANRO\0\0" +ENUM_12BD8C_M_ELDER_TALK2ND: + .ascii "M_ELDER_TALK2ND\0" +ENUM_12BD8C_M_PRIEST_MOVE: + .ascii "M_PRIEST_MOVE\0\0\0" +ENUM_12BD8C_M_ELDER_TALK1ST: + .ascii "M_ELDER_TALK1ST\0" +ENUM_12BD8C_M_PRIEST_TALK: + .ascii "M_PRIEST_TALK\0\0\0" +ENUM_12BD8C_YAMAKOBITO_OPEN: + .ascii "YAMAKOBITO_OPEN\0" +ENUM_12BD8C_OYAKATA_DEMO: + .ascii "OYAKATA_DEMO\0\0\0\0" +ENUM_12BD8C_NO_USE_03: + .ascii "NO_USE_03\0\0\0" +ENUM_12BD8C_NO_USE_02: + .ascii "NO_USE_02\0\0\0" +ENUM_12BD8C_KHOUSE42_00: + .ascii "KHOUSE42_00\0" +ENUM_12BD8C_KHOUSE51_02: + .ascii "KHOUSE51_02\0" +ENUM_12BD8C_NO_USE_01: + .ascii "NO_USE_01\0\0\0" +ENUM_12BD8C_KHOUSE51_00: + .ascii "KHOUSE51_00\0" +ENUM_12BD8C_NO_USE_00: + .ascii "NO_USE_00\0\0\0" +ENUM_12BD8C_KHOUSE27_00: + .ascii "KHOUSE27_00\0" +ENUM_12BD8C_MIZUKAKI_STAIR_WARP_OK: + .ascii "MIZUKAKI_STAIR_WARP_OK\0\0" +ENUM_12BD8C_MIZUKAKI_STAIR: + .ascii "MIZUKAKI_STAIR\0\0" +ENUM_12BD8C_MIZUKAKI_BOOK_ALLBACK: + .ascii "MIZUKAKI_BOOK_ALLBACK\0\0\0" +ENUM_12BD8C_MIZUKAKI_BOOK3_FALL: + .ascii "MIZUKAKI_BOOK3_FALL\0" +ENUM_12BD8C_MIZUKAKI_HINT3_MAYOR: + .ascii "MIZUKAKI_HINT3_MAYOR\0\0\0\0" +ENUM_12BD8C_MIZUKAKI_HINT3: + .ascii "MIZUKAKI_HINT3\0\0" +ENUM_12BD8C_MIZUKAKI_BOOK2_FALL: + .ascii "MIZUKAKI_BOOK2_FALL\0" +ENUM_12BD8C_MIZUKAKI_HINT2_2ND: + .ascii "MIZUKAKI_HINT2_2ND\0\0" +ENUM_12BD8C_MIZUKAKI_HINT2: + .ascii "MIZUKAKI_HINT2\0\0" +ENUM_12BD8C_MIZUKAKI_BOOK1_FALL: + .ascii "MIZUKAKI_BOOK1_FALL\0" +ENUM_12BD8C_MIZUKAKI_HINT1: + .ascii "MIZUKAKI_HINT1\0\0" +ENUM_12BD8C_MIZUKAKI_KOBITO: + .ascii "MIZUKAKI_KOBITO\0" +ENUM_12BD8C_DANPEI_TALK1ST: + .ascii "DANPEI_TALK1ST\0\0" +ENUM_12BD8C_NPC06_19GUY_ANSWER: + .ascii "NPC06_19GUY_ANSWER\0\0" +ENUM_12BD8C_NPC06_19GUY_QUESTION: + .ascii "NPC06_19GUY_QUESTION\0\0\0\0" +ENUM_12BD8C_SORA_ELDER_TALK2ND: + .ascii "SORA_ELDER_TALK2ND\0\0" +ENUM_12BD8C_SORA_ELDER_TALK1ST: + .ascii "SORA_ELDER_TALK1ST\0\0" +ENUM_12BD8C_SORA_CHIEF_TALK: + .ascii "SORA_CHIEF_TALK\0" +ENUM_12BD8C_SORA_ELDER_RECOVER: + .ascii "SORA_ELDER_RECOVER\0\0" +ENUM_12BD8C_NPC37_REM_SLEEP: + .ascii "NPC37_REM_SLEEP\0" +ENUM_12BD8C_NPC37_REM_TALK1ST: + .ascii "NPC37_REM_TALK1ST\0\0\0" +ENUM_12BD8C_SHOP02_KUTSU_00: + .ascii "SHOP02_KUTSU_00\0" +ENUM_12BD8C_SHOP07_COMPLETE: + .ascii "SHOP07_COMPLETE\0" +ENUM_12BD8C_SHOP07_TANA: + .ascii "SHOP07_TANA\0" +ENUM_12BD8C_SHOP07_GACHAPON: + .ascii "SHOP07_GACHAPON\0" +ENUM_12BD8C_SHOP07_TALK1ST: + .ascii "SHOP07_TALK1ST\0\0" +ENUM_12BD8C_SHOP03_PAN_1ST: + .ascii "SHOP03_PAN_1ST\0\0" +ENUM_12BD8C_HOUSE_XXXXX: + .ascii "HOUSE_XXXXX\0" +ENUM_12BD8C_SHOP01_TALK: + .ascii "SHOP01_TALK\0" +ENUM_12BD8C_SHOP01_CAFE_01: + .ascii "SHOP01_CAFE_01\0\0" +ENUM_12BD8C_SHOP01_CAFE_00: + .ascii "SHOP01_CAFE_00\0\0" +ENUM_12BD8C_SHOP00_YAZUTSU: + .ascii "SHOP00_YAZUTSU\0\0" +ENUM_12BD8C_SHOP00_SAIFU: + .ascii "SHOP00_SAIFU\0\0\0\0" +ENUM_12BD8C_SHOP00_ITEM_04: + .ascii "SHOP00_ITEM_04\0\0" +ENUM_12BD8C_SHOP00_ITEM_03: + .ascii "SHOP00_ITEM_03\0\0" +ENUM_12BD8C_SHOP00_ITEM_02: + .ascii "SHOP00_ITEM_02\0\0" +ENUM_12BD8C_SHOP00_ITEM_01: + .ascii "SHOP00_ITEM_01\0\0" +ENUM_12BD8C_SHOP00_ITEM_00: + .ascii "SHOP00_ITEM_00\0\0" +ENUM_12BD8C_MHOUSE2_05_00: + .ascii "MHOUSE2_05_00\0\0\0" +ENUM_12BD8C_MHOUSE2_03_00: + .ascii "MHOUSE2_03_00\0\0\0" +ENUM_12BD8C_MHOUSE2_02_KEY: + .ascii "MHOUSE2_02_KEY\0\0" +ENUM_12BD8C_MHOUSE2_02_KAME: + .ascii "MHOUSE2_02_KAME\0" +ENUM_12BD8C_MHOUSE2_01_T0: + .ascii "MHOUSE2_01_T0\0\0\0" +ENUM_12BD8C_MHOUSE2_00_03: + .ascii "MHOUSE2_00_03\0\0\0" +ENUM_12BD8C_MHOUSE2_00_02: + .ascii "MHOUSE2_00_02\0\0\0" +ENUM_12BD8C_MHOUSE2_00_01: + .ascii "MHOUSE2_00_01\0\0\0" +ENUM_12BD8C_MHOUSE2_00_00: + .ascii "MHOUSE2_00_00\0\0\0" +ENUM_12BD8C_MHOUSE15_OP1ST: + .ascii "MHOUSE15_OP1ST\0\0" +ENUM_12BD8C_MHOUSE14_00: + .ascii "MHOUSE14_00\0" +ENUM_12BD8C_MHOUSE0C_00: + .ascii "MHOUSE0C_00\0" +ENUM_12BD8C_MHOUSE08_04: + .ascii "MHOUSE08_04\0" +ENUM_12BD8C_MHOUSE08_03: + .ascii "MHOUSE08_03\0" +ENUM_12BD8C_MHOUSE08_02: + .ascii "MHOUSE08_02\0" +ENUM_12BD8C_MHOUSE08_01: + .ascii "MHOUSE08_01\0" +ENUM_12BD8C_MHOUSE08_00: + .ascii "MHOUSE08_00\0" +ENUM_12BD8C_MHOUSE07_01: + .ascii "MHOUSE07_01\0" +ENUM_12BD8C_MHOUSE07_00: + .ascii "MHOUSE07_00\0" +ENUM_12BD8C_MHOUSE06_00: + .ascii "MHOUSE06_00\0" +ENUM_12BD8C_MHOUSE04_04: + .ascii "MHOUSE04_04\0" +ENUM_12BD8C_MHOUSE04_03: + .ascii "MHOUSE04_03\0" +ENUM_12BD8C_MHOUSE04_02: + .ascii "MHOUSE04_02\0" +ENUM_12BD8C_MHOUSE04_01: + .ascii "MHOUSE04_01\0" +ENUM_12BD8C_MHOUSE04_00: + .ascii "MHOUSE04_00\0" +ENUM_12BD8C_MHOUSE03_01: + .ascii "MHOUSE03_01\0" +ENUM_12BD8C_MHOUSE03_00: + .ascii "MHOUSE03_00\0" +ENUM_12BD8C_MHOUSE01_03: + .ascii "MHOUSE01_03\0" +ENUM_12BD8C_MHOUSE01_02: + .ascii "MHOUSE01_02\0" +ENUM_12BD8C_MHOUSE01_01: + .ascii "MHOUSE01_01\0" +ENUM_12BD8C_MHOUSE01_00: + .ascii "MHOUSE01_00\0" +ENUM_12BD8C_MHOUSE00_05: + .ascii "MHOUSE00_05\0" +ENUM_12BD8C_MHOUSE00_04: + .ascii "MHOUSE00_04\0" +ENUM_12BD8C_MHOUSE00_03: + .ascii "MHOUSE00_03\0" +ENUM_12BD8C_MHOUSE00_02: + .ascii "MHOUSE00_02\0" +ENUM_12BD8C_MHOUSE00_01: + .ascii "MHOUSE00_01\0" +ENUM_12BD8C_MHOUSE00_00: + .ascii "MHOUSE00_00\0" +ENUM_12BD8C_BILL0C_SCHOOLR_00: + .ascii "BILL0C_SCHOOLR_00\0\0\0" +ENUM_12BD8C_BILL0B_SCHOOLL_00: + .ascii "BILL0B_SCHOOLL_00\0\0\0" +ENUM_12BD8C_BILL0A_YADO_TAKARA_00: + .ascii "BILL0A_YADO_TAKARA_00\0\0\0" +ENUM_12BD8C_BILL09_YADO2F_POEMN: + .ascii "BILL09_YADO2F_POEMN\0" +ENUM_12BD8C_BILL01_TESSIN_8: + .ascii "BILL01_TESSIN_8\0" +ENUM_12BD8C_BILL01_TESSIN_7: + .ascii "BILL01_TESSIN_7\0" +ENUM_12BD8C_BILL01_TESSIN_6: + .ascii "BILL01_TESSIN_6\0" +ENUM_12BD8C_BILL01_TESSIN_5: + .ascii "BILL01_TESSIN_5\0" +ENUM_12BD8C_BILL01_TESSIN_4: + .ascii "BILL01_TESSIN_4\0" +ENUM_12BD8C_BILL01_TESSIN_3: + .ascii "BILL01_TESSIN_3\0" +ENUM_12BD8C_BILL01_TESSIN_2: + .ascii "BILL01_TESSIN_2\0" +ENUM_12BD8C_BILL01_TESSIN_1: + .ascii "BILL01_TESSIN_1\0" +ENUM_12BD8C_BILL00_SHICHOU_04: + .ascii "BILL00_SHICHOU_04\0\0\0" +ENUM_12BD8C_BILL00_SHICHOU_03: + .ascii "BILL00_SHICHOU_03\0\0\0" +ENUM_12BD8C_BILL00_SHICHOU_02: + .ascii "BILL00_SHICHOU_02\0\0\0" +ENUM_12BD8C_BILL00_SHICHOU_01: + .ascii "BILL00_SHICHOU_01\0\0\0" +ENUM_12BD8C_BILL00_SHICHOU_00: + .ascii "BILL00_SHICHOU_00\0\0\0" +ENUM_12BD8C_URO_0B_T0: + .ascii "URO_0B_T0\0\0\0" +ENUM_12BD8C_URO_0A_T0: + .ascii "URO_0A_T0\0\0\0" +ENUM_12BD8C_URO_08_T0: + .ascii "URO_08_T0\0\0\0" +ENUM_12BD8C_MHOUSE11_T0: + .ascii "MHOUSE11_T0\0" +ENUM_12BD8C_KOBITOANA_0B_T0: + .ascii "KOBITOANA_0B_T0\0" +ENUM_12BD8C_KOBITOANA_0A_T0: + .ascii "KOBITOANA_0A_T0\0" +ENUM_12BD8C_KOBITOANA_09_T0: + .ascii "KOBITOANA_09_T0\0" +ENUM_12BD8C_KOBITOANA_07_T0: + .ascii "KOBITOANA_07_T0\0" +ENUM_12BD8C_KOBITOANA_03_T0: + .ascii "KOBITOANA_03_T0\0" +ENUM_12BD8C_KOBITOANA_06_T0: + .ascii "KOBITOANA_06_T0\0" +ENUM_12BD8C_SHOUSE_03_T1: + .ascii "SHOUSE_03_T1\0\0\0\0" +ENUM_12BD8C_SHOUSE_03_T0: + .ascii "SHOUSE_03_T0\0\0\0\0" +ENUM_12BD8C_SHOUSE_02_XXXX2: + .ascii "SHOUSE_02_XXXX2\0" +ENUM_12BD8C_SHOUSE_02_XXXX1: + .ascii "SHOUSE_02_XXXX1\0" +ENUM_12BD8C_SHOUSE_02_XXXX0: + .ascii "SHOUSE_02_XXXX0\0" +ENUM_12BD8C_SHOUSE_02_T2: + .ascii "SHOUSE_02_T2\0\0\0\0" +ENUM_12BD8C_SHOUSE_02_T1: + .ascii "SHOUSE_02_T1\0\0\0\0" +ENUM_12BD8C_SHOUSE_02_T0: + .ascii "SHOUSE_02_T0\0\0\0\0" +ENUM_12BD8C_SHOUSE_01_T0: + .ascii "SHOUSE_01_T0\0\0\0\0" +ENUM_12BD8C_SHOUSE_00_T1: + .ascii "SHOUSE_00_T1\0\0\0\0" +ENUM_12BD8C_SHOUSE_00_T0: + .ascii "SHOUSE_00_T0\0\0\0\0" +ENUM_12BD8C_BILL0A_YADO_TAKARA_T0: + .ascii "BILL0A_YADO_TAKARA_T0\0\0\0" +ENUM_12BD8C_BILL07_YADO1F_UME_T0: + .ascii "BILL07_YADO1F_UME_T0\0\0\0\0" +ENUM_12BD8C_BILL06_YADO1F_TAKE_T0: + .ascii "BILL06_YADO1F_TAKE_T0\0\0\0" +ENUM_12BD8C_BILL05_YADO1F_MATSU_T0: + .ascii "BILL05_YADO1F_MATSU_T0\0\0" +.else .4byte gUnk_0812B204 .4byte gUnk_0812D688 .4byte gUnk_0812D670 @@ -3859,6 +5255,8 @@ gUnk_0812D670:: @ 0812D670 gUnk_0812D688:: @ 0812D688 .incbin "baserom.gba", 0x12D688, 0x0000018 +.endif + .4byte gUnk_0812B204 .4byte gUnk_0812E5FC .4byte gUnk_0812E5E8 @@ -4063,17 +5461,23 @@ gUnk_0812D688:: @ 0812D688 .ifdef JP .4byte gUnk_0812D9D0 .else +.ifdef DEMO_JP + .4byte gUnk_0812D9D0 +.else .4byte gUnk_0812D9D0 .4byte gUnk_0812D9C8 .endif .endif +.endif .4byte gUnk_0812AC84 .ifndef EU .ifndef JP +.ifndef DEMO_JP gUnk_0812D9C8:: @ 0812D9C8 .incbin "baserom.gba", 0x12D9C8, 0x0000008 .endif +.endif gUnk_0812D9D0:: @ 0812D9D0 .incbin "baserom.gba", 0x12D9D0, 0x0000018 @@ -4813,6 +6217,7 @@ gUnk_0812E5FC:: @ 0812E5FC .4byte gUnk_0812E874 .ifndef EU .ifndef JP +.ifndef DEMO_JP .4byte gUnk_0812E86C .4byte gUnk_0812E864 .4byte gUnk_0812E85C @@ -4821,10 +6226,12 @@ gUnk_0812E5FC:: @ 0812E5FC .4byte gUnk_0812E844 .endif .endif +.endif .4byte gUnk_0812AC84 .ifndef EU .ifndef JP +.ifndef DEMO_JP gUnk_0812E844:: @ 0812E844 .incbin "baserom.gba", 0x12E844, 0x0000008 @@ -4843,6 +6250,7 @@ gUnk_0812E86C:: @ 0812E86C .incbin "baserom.gba", 0x12E86C, 0x0000008 .endif .endif +.endif gUnk_0812E874:: @ 0812E874 .incbin "baserom.gba", 0x12E874, 0x0000018 diff --git a/data/data_081320FC.s b/data/data_081320FC.s index 01560713..a6eea0dd 100755 --- a/data/data_081320FC.s +++ b/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 diff --git a/data/data_08132B30.s b/data/data_08132B30.s index 76586690..d16600ed 100644 --- a/data/data_08132B30.s +++ b/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 diff --git a/data/map_headers.s b/data/map_headers.s index 914e306f..d9690807 100755 --- a/data/map_headers.s +++ b/data/map_headers.s @@ -4336,6 +4336,10 @@ gAreaRoomMap_PalaceOfWinds_0:: @ 0810630C map_bottom 0x2246C0+0x74, 0xA8C, 1 map_top 0x224A00+0x74, 0xA8C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2246C0+0x74, 0xA8C, 1 + map_top 0x224A00+0x74, 0xA8C, 1, 1 +.else .ifdef EU map_bottom 0x2246C0+0x48, 0xA8C, 1 map_top 0x224A00+0x48, 0xA8C, 1, 1 @@ -4344,12 +4348,17 @@ gAreaRoomMap_PalaceOfWinds_0:: @ 0810630C map_top 0x224A00, 0xA8C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_1:: @ 08106324 .ifdef JP map_bottom 0x224D14+0x74, 0x12C, 1 map_top 0x224E04+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x224D14+0x74, 0x12C, 1 + map_top 0x224E04+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x224D14+0x48, 0x12C, 1 map_top 0x224E04+0x48, 0x12C, 1, 1 @@ -4358,12 +4367,17 @@ gAreaRoomMap_PalaceOfWinds_1:: @ 08106324 map_top 0x224E04, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_2:: @ 0810633C .ifdef JP map_bottom 0x224E64+0x74, 0x1A4, 1 map_top 0x224FBC+0x74, 0x1A4, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x224E64+0x74, 0x1A4, 1 + map_top 0x224FBC+0x74, 0x1A4, 1, 1 +.else .ifdef EU map_bottom 0x224E64+0x48, 0x1A4, 1 map_top 0x224FBC+0x48, 0x1A4, 1, 1 @@ -4372,12 +4386,17 @@ gAreaRoomMap_PalaceOfWinds_2:: @ 0810633C map_top 0x224FBC, 0x1A4, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_3:: @ 08106354 .ifdef JP map_bottom 0x22505C+0x74, 0x384, 1 map_top 0x2252A4+0x74, 0x384, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22505C+0x74, 0x384, 1 + map_top 0x2252A4+0x74, 0x384, 1, 1 +.else .ifdef EU map_bottom 0x22505C+0x48, 0x384, 1 map_top 0x2252A4+0x48, 0x384, 1, 1 @@ -4386,12 +4405,17 @@ gAreaRoomMap_PalaceOfWinds_3:: @ 08106354 map_top 0x2252A4, 0x384, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_4:: @ 0810636C .ifdef JP map_bottom 0x2253FC+0x74, 0x12C, 1 map_top 0x2254C8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2253FC+0x74, 0x12C, 1 + map_top 0x2254C8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x2253FC+0x48, 0x12C, 1 map_top 0x2254C8+0x48, 0x12C, 1, 1 @@ -4400,12 +4424,17 @@ gAreaRoomMap_PalaceOfWinds_4:: @ 0810636C map_top 0x2254C8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_5:: @ 08106384 .ifdef JP map_bottom 0x225524+0x74, 0x384, 1 map_top 0x22572C+0x74, 0x384, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x225524+0x74, 0x384, 1 + map_top 0x22572C+0x74, 0x384, 1, 1 +.else .ifdef EU map_bottom 0x225524+0x48, 0x384, 1 map_top 0x22572C+0x48, 0x384, 1, 1 @@ -4414,12 +4443,17 @@ gAreaRoomMap_PalaceOfWinds_5:: @ 08106384 map_top 0x22572C, 0x384, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_6:: @ 0810639C .ifdef JP map_bottom 0x225850+0x74, 0x384, 1 map_top 0x225A40+0x74, 0x384, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x225850+0x74, 0x384, 1 + map_top 0x225A40+0x74, 0x384, 1, 1 +.else .ifdef EU map_bottom 0x225850+0x48, 0x384, 1 map_top 0x225A40+0x48, 0x384, 1, 1 @@ -4428,12 +4462,17 @@ gAreaRoomMap_PalaceOfWinds_6:: @ 0810639C map_top 0x225A40, 0x384, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_7:: @ 081063B4 .ifdef JP map_bottom 0x225B60+0x74, 0x384, 1 map_top 0x225D68+0x74, 0x384, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x225B60+0x74, 0x384, 1 + map_top 0x225D68+0x74, 0x384, 1, 1 +.else .ifdef EU map_bottom 0x225B60+0x48, 0x384, 1 map_top 0x225D68+0x48, 0x384, 1, 1 @@ -4442,12 +4481,17 @@ gAreaRoomMap_PalaceOfWinds_7:: @ 081063B4 map_top 0x225D68, 0x384, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_8:: @ 081063CC .ifdef JP map_bottom 0x225E98+0x74, 0x258, 1 map_top 0x22601C+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x225E98+0x74, 0x258, 1 + map_top 0x22601C+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x225E98+0x48, 0x258, 1 map_top 0x22601C+0x48, 0x258, 1, 1 @@ -4456,12 +4500,17 @@ gAreaRoomMap_PalaceOfWinds_8:: @ 081063CC map_top 0x22601C, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_9:: @ 081063E4 .ifdef JP map_bottom 0x226128+0x74, 0x12C, 1 map_top 0x226200+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226128+0x74, 0x12C, 1 + map_top 0x226200+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x226128+0x48, 0x12C, 1 map_top 0x226200+0x48, 0x12C, 1, 1 @@ -4470,12 +4519,17 @@ gAreaRoomMap_PalaceOfWinds_9:: @ 081063E4 map_top 0x226200, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_10:: @ 081063FC .ifdef JP map_bottom 0x226264+0x74, 0x186, 1 map_top 0x226364+0x74, 0x186, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226264+0x74, 0x186, 1 + map_top 0x226364+0x74, 0x186, 1, 1 +.else .ifdef EU map_bottom 0x226264+0x48, 0x186, 1 map_top 0x226364+0x48, 0x186, 1, 1 @@ -4484,12 +4538,17 @@ gAreaRoomMap_PalaceOfWinds_10:: @ 081063FC map_top 0x226364, 0x186, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_11:: @ 08106414 .ifdef JP map_bottom 0x226418+0x74, 0x12C, 1 map_top 0x2264FC+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226418+0x74, 0x12C, 1 + map_top 0x2264FC+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x226418+0x48, 0x12C, 1 map_top 0x2264FC+0x48, 0x12C, 1, 1 @@ -4498,12 +4557,17 @@ gAreaRoomMap_PalaceOfWinds_11:: @ 08106414 map_top 0x2264FC, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_12:: @ 0810642C .ifdef JP map_bottom 0x226578+0x74, 0x1E0, 1 map_top 0x22663C+0x74, 0x1E0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226578+0x74, 0x1E0, 1 + map_top 0x22663C+0x74, 0x1E0, 1, 1 +.else .ifdef EU map_bottom 0x226578+0x48, 0x1E0, 1 map_top 0x22663C+0x48, 0x1E0, 1, 1 @@ -4512,12 +4576,17 @@ gAreaRoomMap_PalaceOfWinds_12:: @ 0810642C map_top 0x22663C, 0x1E0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_13:: @ 08106444 .ifdef JP map_bottom 0x2266BC+0x74, 0x12C, 1 map_top 0x22679C+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2266BC+0x74, 0x12C, 1 + map_top 0x22679C+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x2266BC+0x48, 0x12C, 1 map_top 0x22679C+0x48, 0x12C, 1, 1 @@ -4526,12 +4595,17 @@ gAreaRoomMap_PalaceOfWinds_13:: @ 08106444 map_top 0x22679C, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_14:: @ 0810645C .ifdef JP map_bottom 0x226818+0x74, 0x258, 1 map_top 0x226948+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226818+0x74, 0x258, 1 + map_top 0x226948+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x226818+0x48, 0x258, 1 map_top 0x226948+0x48, 0x258, 1, 1 @@ -4540,12 +4614,17 @@ gAreaRoomMap_PalaceOfWinds_14:: @ 0810645C map_top 0x226948, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_15:: @ 08106474 .ifdef JP map_bottom 0x2269F4+0x74, 0x708, 1 map_top 0x226C3C+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2269F4+0x74, 0x708, 1 + map_top 0x226C3C+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x2269F4+0x48, 0x708, 1 map_top 0x226C3C+0x48, 0x708, 1, 1 @@ -4554,12 +4633,17 @@ gAreaRoomMap_PalaceOfWinds_15:: @ 08106474 map_top 0x226C3C, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_16:: @ 0810648C .ifdef JP map_bottom 0x226E70+0x74, 0xA8C, 1 map_top 0x2271A4+0x74, 0xA8C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x226E70+0x74, 0xA8C, 1 + map_top 0x2271A4+0x74, 0xA8C, 1, 1 +.else .ifdef EU map_bottom 0x226E70+0x48, 0xA8C, 1 map_top 0x2271A4+0x48, 0xA8C, 1, 1 @@ -4568,12 +4652,17 @@ gAreaRoomMap_PalaceOfWinds_16:: @ 0810648C map_top 0x2271A4, 0xA8C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_17:: @ 081064A4 .ifdef JP map_bottom 0x22745C+0x74, 0x384, 1 map_top 0x227668+0x74, 0x384, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22745C+0x74, 0x384, 1 + map_top 0x227668+0x74, 0x384, 1, 1 +.else .ifdef EU map_bottom 0x22745C+0x48, 0x384, 1 map_top 0x227668+0x48, 0x384, 1, 1 @@ -4582,12 +4671,17 @@ gAreaRoomMap_PalaceOfWinds_17:: @ 081064A4 map_top 0x227668, 0x384, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_18:: @ 081064BC .ifdef JP map_bottom 0x227774+0x74, 0x258, 1 map_top 0x227860+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x227774+0x74, 0x258, 1 + map_top 0x227860+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x227774+0x48, 0x258, 1 map_top 0x227860+0x48, 0x258, 1, 1 @@ -4596,12 +4690,17 @@ gAreaRoomMap_PalaceOfWinds_18:: @ 081064BC map_top 0x227860, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_19:: @ 081064D4 .ifdef JP map_bottom 0x227924+0x74, 0x4B0, 1 map_top 0x227B6C+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x227924+0x74, 0x4B0, 1 + map_top 0x227B6C+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x227924+0x48, 0x4B0, 1 map_top 0x227B6C+0x48, 0x4B0, 1, 1 @@ -4610,12 +4709,17 @@ gAreaRoomMap_PalaceOfWinds_19:: @ 081064D4 map_top 0x227B6C, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_20:: @ 081064EC .ifdef JP map_bottom 0x227D34+0x74, 0x258, 1 map_top 0x227EA8+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x227D34+0x74, 0x258, 1 + map_top 0x227EA8+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x227D34+0x48, 0x258, 1 map_top 0x227EA8+0x48, 0x258, 1, 1 @@ -4624,12 +4728,17 @@ gAreaRoomMap_PalaceOfWinds_20:: @ 081064EC map_top 0x227EA8, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_21:: @ 08106504 .ifdef JP map_bottom 0x227F48+0x74, 0x708, 1 map_top 0x228330+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x227F48+0x74, 0x708, 1 + map_top 0x228330+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x227F48+0x48, 0x708, 1 map_top 0x228330+0x48, 0x708, 1, 1 @@ -4638,12 +4747,17 @@ gAreaRoomMap_PalaceOfWinds_21:: @ 08106504 map_top 0x228330, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_22:: @ 0810651C .ifdef JP map_bottom 0x22856C+0x74, 0x4B0, 1 map_top 0x2287B8+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22856C+0x74, 0x4B0, 1 + map_top 0x2287B8+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x22856C+0x48, 0x4B0, 1 map_top 0x2287B8+0x48, 0x4B0, 1, 1 @@ -4652,12 +4766,17 @@ gAreaRoomMap_PalaceOfWinds_22:: @ 0810651C map_top 0x2287B8, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_23:: @ 08106534 .ifdef JP map_bottom 0x228988+0x74, 0x258, 1 map_top 0x228A58+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x228988+0x74, 0x258, 1 + map_top 0x228A58+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x228988+0x48, 0x258, 1 map_top 0x228A58+0x48, 0x258, 1, 1 @@ -4666,12 +4785,17 @@ gAreaRoomMap_PalaceOfWinds_23:: @ 08106534 map_top 0x228A58, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_24:: @ 0810654C .ifdef JP map_bottom 0x228AFC+0x74, 0x4B0, 1 map_top 0x228C7C+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x228AFC+0x74, 0x4B0, 1 + map_top 0x228C7C+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x228AFC+0x48, 0x4B0, 1 map_top 0x228C7C+0x48, 0x4B0, 1, 1 @@ -4680,12 +4804,17 @@ gAreaRoomMap_PalaceOfWinds_24:: @ 0810654C map_top 0x228C7C, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_25:: @ 08106564 .ifdef JP map_bottom 0x228DE4+0x74, 0x4B0, 1 map_top 0x228F90+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x228DE4+0x74, 0x4B0, 1 + map_top 0x228F90+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x228DE4+0x48, 0x4B0, 1 map_top 0x228F90+0x48, 0x4B0, 1, 1 @@ -4694,12 +4823,17 @@ gAreaRoomMap_PalaceOfWinds_25:: @ 08106564 map_top 0x228F90, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_26:: @ 0810657C .ifdef JP map_bottom 0x229138+0x74, 0x4B0, 1 map_top 0x2293A4+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229138+0x74, 0x4B0, 1 + map_top 0x2293A4+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x229138+0x48, 0x4B0, 1 map_top 0x2293A4+0x48, 0x4B0, 1, 1 @@ -4708,12 +4842,17 @@ gAreaRoomMap_PalaceOfWinds_26:: @ 0810657C map_top 0x2293A4, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_27:: @ 08106594 .ifdef JP map_bottom 0x229574+0x74, 0x12C, 1 map_top 0x22964C+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229574+0x74, 0x12C, 1 + map_top 0x22964C+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x229574+0x48, 0x12C, 1 map_top 0x22964C+0x48, 0x12C, 1, 1 @@ -4722,12 +4861,17 @@ gAreaRoomMap_PalaceOfWinds_27:: @ 08106594 map_top 0x22964C, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_28:: @ 081065AC .ifdef JP map_bottom 0x2296D8+0x74, 0x12C, 1 map_top 0x2297C0+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2296D8+0x74, 0x12C, 1 + map_top 0x2297C0+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x2296D8+0x48, 0x12C, 1 map_top 0x2297C0+0x48, 0x12C, 1, 1 @@ -4736,12 +4880,17 @@ gAreaRoomMap_PalaceOfWinds_28:: @ 081065AC map_top 0x2297C0, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_29:: @ 081065C4 .ifdef JP map_bottom 0x229820+0x74, 0x12C, 1 map_top 0x2298F8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229820+0x74, 0x12C, 1 + map_top 0x2298F8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x229820+0x48, 0x12C, 1 map_top 0x2298F8+0x48, 0x12C, 1, 1 @@ -4750,12 +4899,17 @@ gAreaRoomMap_PalaceOfWinds_29:: @ 081065C4 map_top 0x2298F8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_30:: @ 081065DC .ifdef JP map_bottom 0x229978+0x74, 0x12C, 1 map_top 0x229A58+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229978+0x74, 0x12C, 1 + map_top 0x229A58+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x229978+0x48, 0x12C, 1 map_top 0x229A58+0x48, 0x12C, 1, 1 @@ -4764,12 +4918,17 @@ gAreaRoomMap_PalaceOfWinds_30:: @ 081065DC map_top 0x229A58, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_31:: @ 081065F4 .ifdef JP map_bottom 0x229AD4+0x74, 0x12C, 1 map_top 0x229BA4+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229AD4+0x74, 0x12C, 1 + map_top 0x229BA4+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x229AD4+0x48, 0x12C, 1 map_top 0x229BA4+0x48, 0x12C, 1, 1 @@ -4778,12 +4937,17 @@ gAreaRoomMap_PalaceOfWinds_31:: @ 081065F4 map_top 0x229BA4, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_32:: @ 0810660C .ifdef JP map_bottom 0x229C14+0x74, 0x12C, 1 map_top 0x229CE8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229C14+0x74, 0x12C, 1 + map_top 0x229CE8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x229C14+0x48, 0x12C, 1 map_top 0x229CE8+0x48, 0x12C, 1, 1 @@ -4792,12 +4956,17 @@ gAreaRoomMap_PalaceOfWinds_32:: @ 0810660C map_top 0x229CE8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_33:: @ 08106624 .ifdef JP map_bottom 0x229D5C+0x74, 0xA8C, 1 map_top 0x22A0F0+0x74, 0xA8C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x229D5C+0x74, 0xA8C, 1 + map_top 0x22A0F0+0x74, 0xA8C, 1, 1 +.else .ifdef EU map_bottom 0x229D5C+0x48, 0xA8C, 1 map_top 0x22A0F0+0x48, 0xA8C, 1, 1 @@ -4806,12 +4975,17 @@ gAreaRoomMap_PalaceOfWinds_33:: @ 08106624 map_top 0x22A0F0, 0xA8C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_34:: @ 0810663C .ifdef JP map_bottom 0x22A454+0x74, 0x708, 1 map_top 0x22A760+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22A454+0x74, 0x708, 1 + map_top 0x22A760+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x22A454+0x48, 0x708, 1 map_top 0x22A760+0x48, 0x708, 1, 1 @@ -4820,12 +4994,17 @@ gAreaRoomMap_PalaceOfWinds_34:: @ 0810663C map_top 0x22A760, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_35:: @ 08106654 .ifdef JP map_bottom 0x22A99C+0x74, 0x258, 1 map_top 0x22AB10+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22A99C+0x74, 0x258, 1 + map_top 0x22AB10+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x22A99C+0x48, 0x258, 1 map_top 0x22AB10+0x48, 0x258, 1, 1 @@ -4834,12 +5013,17 @@ gAreaRoomMap_PalaceOfWinds_35:: @ 08106654 map_top 0x22AB10, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_36:: @ 0810666C .ifdef JP map_bottom 0x22ABF0+0x74, 0x4B0, 1 map_top 0x22AD78+0x74, 0x4B0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22ABF0+0x74, 0x4B0, 1 + map_top 0x22AD78+0x74, 0x4B0, 1, 1 +.else .ifdef EU map_bottom 0x22ABF0+0x48, 0x4B0, 1 map_top 0x22AD78+0x48, 0x4B0, 1, 1 @@ -4848,12 +5032,17 @@ gAreaRoomMap_PalaceOfWinds_36:: @ 0810666C map_top 0x22AD78, 0x4B0, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_37:: @ 08106684 .ifdef JP map_bottom 0x22AEC4+0x74, 0x12C, 1 map_top 0x22AFC4+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22AEC4+0x74, 0x12C, 1 + map_top 0x22AFC4+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22AEC4+0x48, 0x12C, 1 map_top 0x22AFC4+0x48, 0x12C, 1, 1 @@ -4862,12 +5051,17 @@ gAreaRoomMap_PalaceOfWinds_37:: @ 08106684 map_top 0x22AFC4, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_38:: @ 0810669C .ifdef JP map_bottom 0x22B03C+0x74, 0x12C, 1 map_top 0x22B150+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B03C+0x74, 0x12C, 1 + map_top 0x22B150+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22B03C+0x48, 0x12C, 1 map_top 0x22B150+0x48, 0x12C, 1, 1 @@ -4876,12 +5070,17 @@ gAreaRoomMap_PalaceOfWinds_38:: @ 0810669C map_top 0x22B150, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_39:: @ 081066B4 .ifdef JP map_bottom 0x22B1B0+0x74, 0x12C, 1 map_top 0x22B2A8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B1B0+0x74, 0x12C, 1 + map_top 0x22B2A8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22B1B0+0x48, 0x12C, 1 map_top 0x22B2A8+0x48, 0x12C, 1, 1 @@ -4890,12 +5089,17 @@ gAreaRoomMap_PalaceOfWinds_39:: @ 081066B4 map_top 0x22B2A8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_40:: @ 081066CC .ifdef JP map_bottom 0x22B324+0x74, 0x12C, 1 map_top 0x22B414+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B324+0x74, 0x12C, 1 + map_top 0x22B414+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22B324+0x48, 0x12C, 1 map_top 0x22B414+0x48, 0x12C, 1, 1 @@ -4904,12 +5108,17 @@ gAreaRoomMap_PalaceOfWinds_40:: @ 081066CC map_top 0x22B414, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_41:: @ 081066E4 .ifdef JP map_bottom 0x22B498+0x74, 0x12C, 1 map_top 0x22B56C+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B498+0x74, 0x12C, 1 + map_top 0x22B56C+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22B498+0x48, 0x12C, 1 map_top 0x22B56C+0x48, 0x12C, 1, 1 @@ -4918,12 +5127,17 @@ gAreaRoomMap_PalaceOfWinds_41:: @ 081066E4 map_top 0x22B56C, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_42:: @ 081066FC .ifdef JP map_bottom 0x22B5EC+0x74, 0x12C, 1 map_top 0x22B6D8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B5EC+0x74, 0x12C, 1 + map_top 0x22B6D8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22B5EC+0x48, 0x12C, 1 map_top 0x22B6D8+0x48, 0x12C, 1, 1 @@ -4932,12 +5146,17 @@ gAreaRoomMap_PalaceOfWinds_42:: @ 081066FC map_top 0x22B6D8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_43:: @ 08106714 .ifdef JP map_bottom 0x22B758+0x74, 0x258, 1 map_top 0x22B8B4+0x74, 0x258, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B758+0x74, 0x258, 1 + map_top 0x22B8B4+0x74, 0x258, 1, 1 +.else .ifdef EU map_bottom 0x22B758+0x48, 0x258, 1 map_top 0x22B8B4+0x48, 0x258, 1, 1 @@ -4946,12 +5165,17 @@ gAreaRoomMap_PalaceOfWinds_43:: @ 08106714 map_top 0x22B8B4, 0x258, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_44:: @ 0810672C .ifdef JP map_bottom 0x22B994+0x74, 0x708, 1 map_top 0x22BC78+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22B994+0x74, 0x708, 1 + map_top 0x22BC78+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x22B994+0x48, 0x708, 1 map_top 0x22BC78+0x48, 0x708, 1, 1 @@ -4960,12 +5184,17 @@ gAreaRoomMap_PalaceOfWinds_44:: @ 0810672C map_top 0x22BC78, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_45:: @ 08106744 .ifdef JP map_bottom 0x22BE68+0x74, 0x708, 1 map_top 0x22C07C+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22BE68+0x74, 0x708, 1 + map_top 0x22C07C+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x22BE68+0x48, 0x708, 1 map_top 0x22C07C+0x48, 0x708, 1, 1 @@ -4974,12 +5203,17 @@ gAreaRoomMap_PalaceOfWinds_45:: @ 08106744 map_top 0x22C07C, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_46:: @ 0810675C .ifdef JP map_bottom 0x22C304+0x74, 0x550, 1 map_top 0x22C4B0+0x74, 0x550, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22C304+0x74, 0x550, 1 + map_top 0x22C4B0+0x74, 0x550, 1, 1 +.else .ifdef EU map_bottom 0x22C304+0x48, 0x550, 1 map_top 0x22C4B0+0x48, 0x550, 1, 1 @@ -4988,12 +5222,17 @@ gAreaRoomMap_PalaceOfWinds_46:: @ 0810675C map_top 0x22C4B0, 0x550, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_47:: @ 08106774 .ifdef JP map_bottom 0x22C648+0x74, 0x12C, 1 map_top 0x22C6C8+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22C648+0x74, 0x12C, 1 + map_top 0x22C6C8+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x22C648+0x48, 0x12C, 1 map_top 0x22C6C8+0x48, 0x12C, 1, 1 @@ -5002,12 +5241,17 @@ gAreaRoomMap_PalaceOfWinds_47:: @ 08106774 map_top 0x22C6C8, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_48:: @ 0810678C .ifdef JP map_bottom 0x22C71C+0x74, 0x500, 1 map_top 0x22C9C0+0x74, 0x500, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22C71C+0x74, 0x500, 1 + map_top 0x22C9C0+0x74, 0x500, 1, 1 +.else .ifdef EU map_bottom 0x22C71C+0x48, 0x500, 1 map_top 0x22C9C0+0x48, 0x500, 1, 1 @@ -5016,12 +5260,17 @@ gAreaRoomMap_PalaceOfWinds_48:: @ 0810678C map_top 0x22C9C0, 0x500, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_49:: @ 081067A4 .ifdef JP map_bottom 0x22CB00+0x74, 0x3DE, 1 map_top 0x22CC68+0x74, 0x3DE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22CB00+0x74, 0x3DE, 1 + map_top 0x22CC68+0x74, 0x3DE, 1, 1 +.else .ifdef EU map_bottom 0x22CB00+0x48, 0x3DE, 1 map_top 0x22CC68+0x48, 0x3DE, 1, 1 @@ -5030,12 +5279,17 @@ gAreaRoomMap_PalaceOfWinds_49:: @ 081067A4 map_top 0x22CC68, 0x3DE, 1, 1 .endif .endif +.endif gAreaRoomMap_PalaceOfWinds_50:: @ 081067BC .ifdef JP map_bottom 0x22CD70+0x74, 0x708, 1 map_top 0x22D070+0x74, 0x708, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x22CD70+0x74, 0x708, 1 + map_top 0x22D070+0x74, 0x708, 1, 1 +.else .ifdef EU map_bottom 0x22CD70+0x48, 0x708, 1 map_top 0x22D070+0x48, 0x708, 1, 1 @@ -5044,6 +5298,7 @@ gAreaRoomMap_PalaceOfWinds_50:: @ 081067BC map_top 0x22D070, 0x708, 1, 1 .endif .endif +.endif gAreaRoomMaps_PalaceOfWinds:: @ 081067D4 .4byte gAreaRoomMap_PalaceOfWinds_0 @@ -5102,12 +5357,16 @@ gAreaRoomMap_PalaceOfWindsBoss_0:: @ 081068A0 .ifdef JP map_top 0x22D2B8+0x74, 0x1F80, 1, 1 .else +.ifdef DEMO_JP + map_top 0x22D2B8+0x74, 0x1F80, 1, 1 +.else .ifdef EU map_top 0x22D2B8+0x48, 0x1F80, 1, 1 .else map_top 0x22D2B8, 0x1F80, 1, 1 .endif .endif +.endif gAreaRoomMaps_PalaceOfWindsBoss:: @ 081068AC .4byte gAreaRoomMap_PalaceOfWindsBoss_0 @@ -5117,6 +5376,10 @@ gAreaRoomMap_Sanctuary_0:: @ 081068B0 map_bottom 0x236A08+0x74, 0x6D6, 1 map_top 0x236D1C+0x74, 0x6D6, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x236A08+0x74, 0x6D6, 1 + map_top 0x236D1C+0x74, 0x6D6, 1, 1 +.else .ifdef EU map_bottom 0x236A08+0x48, 0x6D6, 1 map_top 0x236D1C+0x48, 0x6D6, 1, 1 @@ -5125,12 +5388,17 @@ gAreaRoomMap_Sanctuary_0:: @ 081068B0 map_top 0x236D1C, 0x6D6, 1, 1 .endif .endif +.endif gAreaRoomMap_Sanctuary_1:: @ 081068C8 .ifdef JP map_bottom 0x236E14+0x74, 0x910, 1 map_top 0x237320+0x74, 0x910, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x236E14+0x74, 0x910, 1 + map_top 0x237320+0x74, 0x910, 1, 1 +.else .ifdef EU map_bottom 0x236E14+0x48, 0x910, 1 map_top 0x237320+0x48, 0x910, 1, 1 @@ -5139,12 +5407,17 @@ gAreaRoomMap_Sanctuary_1:: @ 081068C8 map_top 0x237320, 0x910, 1, 1 .endif .endif +.endif gAreaRoomMap_Sanctuary_2:: @ 081068E0 .ifdef JP map_bottom 0x2375D8+0x74, 0x344, 1 map_top 0x23788C+0x74, 0x344, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2375D8+0x74, 0x344, 1 + map_top 0x23788C+0x74, 0x344, 1, 1 +.else .ifdef EU map_bottom 0x2375D8+0x48, 0x344, 1 map_top 0x23788C+0x48, 0x344, 1, 1 @@ -5153,6 +5426,7 @@ gAreaRoomMap_Sanctuary_2:: @ 081068E0 map_top 0x23788C, 0x344, 1, 1 .endif .endif +.endif gAreaRoomMaps_Sanctuary:: @ 081068F8 .4byte gAreaRoomMap_Sanctuary_0 @@ -5169,6 +5443,10 @@ gAreaRoomMap_HyruleCastle_0:: @ 08106918 map_bottom 0x240B44+0x74, 0x7CE, 1 map_top 0x240F30+0x74, 0x7CE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x240B44+0x74, 0x7CE, 1 + map_top 0x240F30+0x74, 0x7CE, 1, 1 +.else .ifdef EU map_bottom 0x240B44+0x48, 0x7CE, 1 map_top 0x240F30+0x48, 0x7CE, 1, 1 @@ -5177,12 +5455,17 @@ gAreaRoomMap_HyruleCastle_0:: @ 08106918 map_top 0x240F30, 0x7CE, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_1:: @ 08106930 .ifdef JP map_bottom 0x241118+0x74, 0x7FE, 1 map_top 0x241424+0x74, 0x7FE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x241118+0x74, 0x7FE, 1 + map_top 0x241424+0x74, 0x7FE, 1, 1 +.else .ifdef EU map_bottom 0x241118+0x48, 0x7FE, 1 map_top 0x241424+0x48, 0x7FE, 1, 1 @@ -5191,12 +5474,17 @@ gAreaRoomMap_HyruleCastle_1:: @ 08106930 map_top 0x241424, 0x7FE, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_2:: @ 08106948 .ifdef JP map_bottom 0x2415B0+0x74, 0x2EC, 1 map_top 0x2417B8+0x74, 0x2EC, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2415B0+0x74, 0x2EC, 1 + map_top 0x2417B8+0x74, 0x2EC, 1, 1 +.else .ifdef EU map_bottom 0x2415B0+0x48, 0x2EC, 1 map_top 0x2417B8+0x48, 0x2EC, 1, 1 @@ -5205,12 +5493,17 @@ gAreaRoomMap_HyruleCastle_2:: @ 08106948 map_top 0x2417B8, 0x2EC, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_3:: @ 08106960 .ifdef JP map_bottom 0x24186C+0x74, 0xC94, 1 map_top 0x241D18+0x74, 0xC94, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x24186C+0x74, 0xC94, 1 + map_top 0x241D18+0x74, 0xC94, 1, 1 +.else .ifdef EU map_bottom 0x24186C+0x48, 0xC94, 1 map_top 0x241D18+0x48, 0xC94, 1, 1 @@ -5219,12 +5512,17 @@ gAreaRoomMap_HyruleCastle_3:: @ 08106960 map_top 0x241D18, 0xC94, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_4:: @ 08106978 .ifdef JP map_bottom 0x241EF0+0x74, 0x1FE, 1 map_top 0x242044+0x74, 0x1FE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x241EF0+0x74, 0x1FE, 1 + map_top 0x242044+0x74, 0x1FE, 1, 1 +.else .ifdef EU map_bottom 0x241EF0+0x48, 0x1FE, 1 map_top 0x242044+0x48, 0x1FE, 1, 1 @@ -5233,12 +5531,17 @@ gAreaRoomMap_HyruleCastle_4:: @ 08106978 map_top 0x242044, 0x1FE, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_5:: @ 08106990 .ifdef JP map_bottom 0x2420A4+0x74, 0x12C, 1 map_top 0x24217C+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2420A4+0x74, 0x12C, 1 + map_top 0x24217C+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x2420A4+0x48, 0x12C, 1 map_top 0x24217C+0x48, 0x12C, 1, 1 @@ -5247,12 +5550,17 @@ gAreaRoomMap_HyruleCastle_5:: @ 08106990 map_top 0x24217C, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMap_HyruleCastle_6:: @ 081069A8 .ifdef JP map_bottom 0x2421A8+0x74, 0x12C, 1 map_top 0x242274+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2421A8+0x74, 0x12C, 1 + map_top 0x242274+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x2421A8+0x48, 0x12C, 1 map_top 0x242274+0x48, 0x12C, 1, 1 @@ -5261,6 +5569,7 @@ gAreaRoomMap_HyruleCastle_6:: @ 081069A8 map_top 0x242274, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMaps_HyruleCastle:: @ 081069C0 .4byte gAreaRoomMap_HyruleCastle_0 @@ -5285,6 +5594,10 @@ gAreaRoomMap_SanctuaryEntrance_0:: @ 08106A00 map_bottom 0x247218+0x74, 0x396, 1 map_top 0x24745C+0x74, 0x396, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x247218+0x74, 0x396, 1 + map_top 0x24745C+0x74, 0x396, 1, 1 +.else .ifdef EU map_bottom 0x247218+0x48, 0x396, 1 map_top 0x24745C+0x48, 0x396, 1, 1 @@ -5293,6 +5606,7 @@ gAreaRoomMap_SanctuaryEntrance_0:: @ 08106A00 map_top 0x24745C, 0x396, 1, 1 .endif .endif +.endif gAreaRoomMaps_SanctuaryEntrance:: @ 08106A18 .4byte gAreaRoomMap_SanctuaryEntrance_0 @@ -5302,6 +5616,10 @@ gAreaRoomMap_DarkHyruleCastle_0:: @ 08106A1C map_bottom 0x264EF4+0x74, 0xE58, 1 map_top 0x265378+0x74, 0xE58, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x264EF4+0x74, 0xE58, 1 + map_top 0x265378+0x74, 0xE58, 1, 1 +.else .ifdef EU map_bottom 0x264EF4+0x48, 0xE58, 1 map_top 0x265378+0x48, 0xE58, 1, 1 @@ -5310,12 +5628,17 @@ gAreaRoomMap_DarkHyruleCastle_0:: @ 08106A1C map_top 0x265378, 0xE58, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_1:: @ 08106A34 .ifdef JP map_bottom 0x2657C8+0x74, 0x1BA, 1 map_top 0x2658A4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2657C8+0x74, 0x1BA, 1 + map_top 0x2658A4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2657C8+0x48, 0x1BA, 1 map_top 0x2658A4+0x48, 0x1BA, 1, 1 @@ -5324,12 +5647,17 @@ gAreaRoomMap_DarkHyruleCastle_1:: @ 08106A34 map_top 0x2658A4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_2:: @ 08106A4C .ifdef JP map_bottom 0x265964+0x74, 0x1BA, 1 map_top 0x265A44+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x265964+0x74, 0x1BA, 1 + map_top 0x265A44+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x265964+0x48, 0x1BA, 1 map_top 0x265A44+0x48, 0x1BA, 1, 1 @@ -5338,12 +5666,17 @@ gAreaRoomMap_DarkHyruleCastle_2:: @ 08106A4C map_top 0x265A44, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_3:: @ 08106A64 .ifdef JP map_bottom 0x265B18+0x74, 0x1BA, 1 map_top 0x265C08+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x265B18+0x74, 0x1BA, 1 + map_top 0x265C08+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x265B18+0x48, 0x1BA, 1 map_top 0x265C08+0x48, 0x1BA, 1, 1 @@ -5352,12 +5685,17 @@ gAreaRoomMap_DarkHyruleCastle_3:: @ 08106A64 map_top 0x265C08, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_4:: @ 08106A7C .ifdef JP map_bottom 0x265CD4+0x74, 0x1BA, 1 map_top 0x265DC8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x265CD4+0x74, 0x1BA, 1 + map_top 0x265DC8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x265CD4+0x48, 0x1BA, 1 map_top 0x265DC8+0x48, 0x1BA, 1, 1 @@ -5366,12 +5704,17 @@ gAreaRoomMap_DarkHyruleCastle_4:: @ 08106A7C map_top 0x265DC8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_5:: @ 08106A94 .ifdef JP map_bottom 0x265E98+0x74, 0x444, 1 map_top 0x2660BC+0x74, 0x444, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x265E98+0x74, 0x444, 1 + map_top 0x2660BC+0x74, 0x444, 1, 1 +.else .ifdef EU map_bottom 0x265E98+0x48, 0x444, 1 map_top 0x2660BC+0x48, 0x444, 1, 1 @@ -5380,12 +5723,17 @@ gAreaRoomMap_DarkHyruleCastle_5:: @ 08106A94 map_top 0x2660BC, 0x444, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_6:: @ 08106AAC .ifdef JP map_bottom 0x26620C+0x74, 0x2A0, 1 map_top 0x2663A0+0x74, 0x2A0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26620C+0x74, 0x2A0, 1 + map_top 0x2663A0+0x74, 0x2A0, 1, 1 +.else .ifdef EU map_bottom 0x26620C+0x48, 0x2A0, 1 map_top 0x2663A0+0x48, 0x2A0, 1, 1 @@ -5394,12 +5742,17 @@ gAreaRoomMap_DarkHyruleCastle_6:: @ 08106AAC map_top 0x2663A0, 0x2A0, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_7:: @ 08106AC4 .ifdef JP map_bottom 0x2664A0+0x74, 0x374, 1 map_top 0x2665EC+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2664A0+0x74, 0x374, 1 + map_top 0x2665EC+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x2664A0+0x48, 0x374, 1 map_top 0x2665EC+0x48, 0x374, 1, 1 @@ -5408,12 +5761,17 @@ gAreaRoomMap_DarkHyruleCastle_7:: @ 08106AC4 map_top 0x2665EC, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_8:: @ 08106ADC .ifdef JP map_bottom 0x266730+0x74, 0x374, 1 map_top 0x266910+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x266730+0x74, 0x374, 1 + map_top 0x266910+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x266730+0x48, 0x374, 1 map_top 0x266910+0x48, 0x374, 1, 1 @@ -5422,12 +5780,17 @@ gAreaRoomMap_DarkHyruleCastle_8:: @ 08106ADC map_top 0x266910, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_9:: @ 08106AF4 .ifdef JP map_bottom 0x266A44+0x74, 0x1FE, 1 map_top 0x266B98+0x74, 0x1FE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x266A44+0x74, 0x1FE, 1 + map_top 0x266B98+0x74, 0x1FE, 1, 1 +.else .ifdef EU map_bottom 0x266A44+0x48, 0x1FE, 1 map_top 0x266B98+0x48, 0x1FE, 1, 1 @@ -5436,12 +5799,17 @@ gAreaRoomMap_DarkHyruleCastle_9:: @ 08106AF4 map_top 0x266B98, 0x1FE, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_10:: @ 08106B0C .ifdef JP map_bottom 0x266C78+0x74, 0x1BA, 1 map_top 0x266DA4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x266C78+0x74, 0x1BA, 1 + map_top 0x266DA4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x266C78+0x48, 0x1BA, 1 map_top 0x266DA4+0x48, 0x1BA, 1, 1 @@ -5450,12 +5818,17 @@ gAreaRoomMap_DarkHyruleCastle_10:: @ 08106B0C map_top 0x266DA4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_11:: @ 08106B24 .ifdef JP map_bottom 0x266E70+0x74, 0x1BA, 1 map_top 0x266F7C+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x266E70+0x74, 0x1BA, 1 + map_top 0x266F7C+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x266E70+0x48, 0x1BA, 1 map_top 0x266F7C+0x48, 0x1BA, 1, 1 @@ -5464,12 +5837,17 @@ gAreaRoomMap_DarkHyruleCastle_11:: @ 08106B24 map_top 0x266F7C, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_12:: @ 08106B3C .ifdef JP map_bottom 0x26701C+0x74, 0x1BA, 1 map_top 0x26712C+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26701C+0x74, 0x1BA, 1 + map_top 0x26712C+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26701C+0x48, 0x1BA, 1 map_top 0x26712C+0x48, 0x1BA, 1, 1 @@ -5478,12 +5856,17 @@ gAreaRoomMap_DarkHyruleCastle_12:: @ 08106B3C map_top 0x26712C, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_13:: @ 08106B54 .ifdef JP map_bottom 0x2671DC+0x74, 0x1BA, 1 map_top 0x2672E8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2671DC+0x74, 0x1BA, 1 + map_top 0x2672E8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2671DC+0x48, 0x1BA, 1 map_top 0x2672E8+0x48, 0x1BA, 1, 1 @@ -5492,12 +5875,17 @@ gAreaRoomMap_DarkHyruleCastle_13:: @ 08106B54 map_top 0x2672E8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_14:: @ 08106B6C .ifdef JP map_bottom 0x2673B4+0x74, 0x1BA, 1 map_top 0x2674F0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2673B4+0x74, 0x1BA, 1 + map_top 0x2674F0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2673B4+0x48, 0x1BA, 1 map_top 0x2674F0+0x48, 0x1BA, 1, 1 @@ -5506,12 +5894,17 @@ gAreaRoomMap_DarkHyruleCastle_14:: @ 08106B6C map_top 0x2674F0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_15:: @ 08106B84 .ifdef JP map_bottom 0x2675D4+0x74, 0x1BA, 1 map_top 0x2676F8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2675D4+0x74, 0x1BA, 1 + map_top 0x2676F8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2675D4+0x48, 0x1BA, 1 map_top 0x2676F8+0x48, 0x1BA, 1, 1 @@ -5520,12 +5913,17 @@ gAreaRoomMap_DarkHyruleCastle_15:: @ 08106B84 map_top 0x2676F8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_16:: @ 08106B9C .ifdef JP map_bottom 0x2677BC+0x74, 0x1BA, 1 map_top 0x2678F0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2677BC+0x74, 0x1BA, 1 + map_top 0x2678F0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2677BC+0x48, 0x1BA, 1 map_top 0x2678F0+0x48, 0x1BA, 1, 1 @@ -5534,12 +5932,17 @@ gAreaRoomMap_DarkHyruleCastle_16:: @ 08106B9C map_top 0x2678F0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_17:: @ 08106BB4 .ifdef JP map_bottom 0x2679D0+0x74, 0x2A8, 1 map_top 0x267B70+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2679D0+0x74, 0x2A8, 1 + map_top 0x267B70+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x2679D0+0x48, 0x2A8, 1 map_top 0x267B70+0x48, 0x2A8, 1, 1 @@ -5548,12 +5951,17 @@ gAreaRoomMap_DarkHyruleCastle_17:: @ 08106BB4 map_top 0x267B70, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_18:: @ 08106BCC .ifdef JP map_bottom 0x267C98+0x74, 0x2A8, 1 map_top 0x267E00+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x267C98+0x74, 0x2A8, 1 + map_top 0x267E00+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x267C98+0x48, 0x2A8, 1 map_top 0x267E00+0x48, 0x2A8, 1, 1 @@ -5562,12 +5970,17 @@ gAreaRoomMap_DarkHyruleCastle_18:: @ 08106BCC map_top 0x267E00, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_19:: @ 08106BE4 .ifdef JP map_bottom 0x267F48+0x74, 0x1BA, 1 map_top 0x268080+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x267F48+0x74, 0x1BA, 1 + map_top 0x268080+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x267F48+0x48, 0x1BA, 1 map_top 0x268080+0x48, 0x1BA, 1, 1 @@ -5576,12 +5989,17 @@ gAreaRoomMap_DarkHyruleCastle_19:: @ 08106BE4 map_top 0x268080, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_20:: @ 08106BFC .ifdef JP map_bottom 0x268168+0x74, 0x1BA, 1 map_top 0x2682C8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x268168+0x74, 0x1BA, 1 + map_top 0x2682C8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x268168+0x48, 0x1BA, 1 map_top 0x2682C8+0x48, 0x1BA, 1, 1 @@ -5590,12 +6008,17 @@ gAreaRoomMap_DarkHyruleCastle_20:: @ 08106BFC map_top 0x2682C8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_21:: @ 08106C14 .ifdef JP map_bottom 0x2683A4+0x74, 0x1BA, 1 map_top 0x2684CC+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2683A4+0x74, 0x1BA, 1 + map_top 0x2684CC+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2683A4+0x48, 0x1BA, 1 map_top 0x2684CC+0x48, 0x1BA, 1, 1 @@ -5604,12 +6027,17 @@ gAreaRoomMap_DarkHyruleCastle_21:: @ 08106C14 map_top 0x2684CC, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_22:: @ 08106C2C .ifdef JP map_bottom 0x2685A8+0x74, 0x1BA, 1 map_top 0x2686B0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2685A8+0x74, 0x1BA, 1 + map_top 0x2686B0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2685A8+0x48, 0x1BA, 1 map_top 0x2686B0+0x48, 0x1BA, 1, 1 @@ -5618,12 +6046,17 @@ gAreaRoomMap_DarkHyruleCastle_22:: @ 08106C2C map_top 0x2686B0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_23:: @ 08106C44 .ifdef JP map_bottom 0x26876C+0x74, 0x374, 1 map_top 0x268930+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26876C+0x74, 0x374, 1 + map_top 0x268930+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x26876C+0x48, 0x374, 1 map_top 0x268930+0x48, 0x374, 1, 1 @@ -5632,12 +6065,17 @@ gAreaRoomMap_DarkHyruleCastle_23:: @ 08106C44 map_top 0x268930, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_24:: @ 08106C5C .ifdef JP map_bottom 0x268A98+0x74, 0x374, 1 map_top 0x268C2C+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x268A98+0x74, 0x374, 1 + map_top 0x268C2C+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x268A98+0x48, 0x374, 1 map_top 0x268C2C+0x48, 0x374, 1, 1 @@ -5646,12 +6084,17 @@ gAreaRoomMap_DarkHyruleCastle_24:: @ 08106C5C map_top 0x268C2C, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_25:: @ 08106C74 .ifdef JP map_bottom 0x268D54+0x74, 0x1BA, 1 map_top 0x268E3C+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x268D54+0x74, 0x1BA, 1 + map_top 0x268E3C+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x268D54+0x48, 0x1BA, 1 map_top 0x268E3C+0x48, 0x1BA, 1, 1 @@ -5660,12 +6103,17 @@ gAreaRoomMap_DarkHyruleCastle_25:: @ 08106C74 map_top 0x268E3C, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_26:: @ 08106C8C .ifdef JP map_bottom 0x268F0C+0x74, 0x1BA, 1 map_top 0x269010+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x268F0C+0x74, 0x1BA, 1 + map_top 0x269010+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x268F0C+0x48, 0x1BA, 1 map_top 0x269010+0x48, 0x1BA, 1, 1 @@ -5674,12 +6122,17 @@ gAreaRoomMap_DarkHyruleCastle_26:: @ 08106C8C map_top 0x269010, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_27:: @ 08106CA4 .ifdef JP map_bottom 0x2690AC+0x74, 0x1BA, 1 map_top 0x2690E8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2690AC+0x74, 0x1BA, 1 + map_top 0x2690E8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2690AC+0x48, 0x1BA, 1 map_top 0x2690E8+0x48, 0x1BA, 1, 1 @@ -5688,12 +6141,17 @@ gAreaRoomMap_DarkHyruleCastle_27:: @ 08106CA4 map_top 0x2690E8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_28:: @ 08106CBC .ifdef JP map_bottom 0x269168+0x74, 0x1BA, 1 map_top 0x269290+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x269168+0x74, 0x1BA, 1 + map_top 0x269290+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x269168+0x48, 0x1BA, 1 map_top 0x269290+0x48, 0x1BA, 1, 1 @@ -5702,12 +6160,17 @@ gAreaRoomMap_DarkHyruleCastle_28:: @ 08106CBC map_top 0x269290, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_29:: @ 08106CD4 .ifdef JP map_bottom 0x26936C+0x74, 0x374, 1 map_top 0x2694B0+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26936C+0x74, 0x374, 1 + map_top 0x2694B0+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x26936C+0x48, 0x374, 1 map_top 0x2694B0+0x48, 0x374, 1, 1 @@ -5716,12 +6179,17 @@ gAreaRoomMap_DarkHyruleCastle_29:: @ 08106CD4 map_top 0x2694B0, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_30:: @ 08106CEC .ifdef JP map_bottom 0x2695F0+0x74, 0x1BA, 1 map_top 0x2696D4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2695F0+0x74, 0x1BA, 1 + map_top 0x2696D4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2695F0+0x48, 0x1BA, 1 map_top 0x2696D4+0x48, 0x1BA, 1, 1 @@ -5730,12 +6198,17 @@ gAreaRoomMap_DarkHyruleCastle_30:: @ 08106CEC map_top 0x2696D4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_31:: @ 08106D04 .ifdef JP map_bottom 0x269794+0x74, 0x1BA, 1 map_top 0x2698E4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x269794+0x74, 0x1BA, 1 + map_top 0x2698E4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x269794+0x48, 0x1BA, 1 map_top 0x2698E4+0x48, 0x1BA, 1, 1 @@ -5744,12 +6217,17 @@ gAreaRoomMap_DarkHyruleCastle_31:: @ 08106D04 map_top 0x2698E4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_32:: @ 08106D1C .ifdef JP map_bottom 0x2699BC+0x74, 0x1BA, 1 map_top 0x269AF0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2699BC+0x74, 0x1BA, 1 + map_top 0x269AF0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x2699BC+0x48, 0x1BA, 1 map_top 0x269AF0+0x48, 0x1BA, 1, 1 @@ -5758,12 +6236,17 @@ gAreaRoomMap_DarkHyruleCastle_32:: @ 08106D1C map_top 0x269AF0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_33:: @ 08106D34 .ifdef JP map_bottom 0x269BD8+0x74, 0x1BA, 1 map_top 0x269CE0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x269BD8+0x74, 0x1BA, 1 + map_top 0x269CE0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x269BD8+0x48, 0x1BA, 1 map_top 0x269CE0+0x48, 0x1BA, 1, 1 @@ -5772,12 +6255,17 @@ gAreaRoomMap_DarkHyruleCastle_33:: @ 08106D34 map_top 0x269CE0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_34:: @ 08106D4C .ifdef JP map_bottom 0x269DB4+0x74, 0x1BA, 1 map_top 0x269ED0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x269DB4+0x74, 0x1BA, 1 + map_top 0x269ED0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x269DB4+0x48, 0x1BA, 1 map_top 0x269ED0+0x48, 0x1BA, 1, 1 @@ -5786,12 +6274,17 @@ gAreaRoomMap_DarkHyruleCastle_34:: @ 08106D4C map_top 0x269ED0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_35:: @ 08106D64 .ifdef JP map_bottom 0x269FAC+0x74, 0x1BA, 1 map_top 0x269FE8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x269FAC+0x74, 0x1BA, 1 + map_top 0x269FE8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x269FAC+0x48, 0x1BA, 1 map_top 0x269FE8+0x48, 0x1BA, 1, 1 @@ -5800,12 +6293,17 @@ gAreaRoomMap_DarkHyruleCastle_35:: @ 08106D64 map_top 0x269FE8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_36:: @ 08106D7C .ifdef JP map_bottom 0x26A168+0x74, 0x1BA, 1 map_top 0x26A1A4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26A168+0x74, 0x1BA, 1 + map_top 0x26A1A4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26A168+0x48, 0x1BA, 1 map_top 0x26A1A4+0x48, 0x1BA, 1, 1 @@ -5814,12 +6312,17 @@ gAreaRoomMap_DarkHyruleCastle_36:: @ 08106D7C map_top 0x26A1A4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_37:: @ 08106D94 .ifdef JP map_bottom 0x26A2F8+0x74, 0x1BA, 1 map_top 0x26A334+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26A2F8+0x74, 0x1BA, 1 + map_top 0x26A334+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26A2F8+0x48, 0x1BA, 1 map_top 0x26A334+0x48, 0x1BA, 1, 1 @@ -5828,12 +6331,17 @@ gAreaRoomMap_DarkHyruleCastle_37:: @ 08106D94 map_top 0x26A334, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_38:: @ 08106DAC .ifdef JP map_bottom 0x26A4A0+0x74, 0x2A8, 1 map_top 0x26A5CC+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26A4A0+0x74, 0x2A8, 1 + map_top 0x26A5CC+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x26A4A0+0x48, 0x2A8, 1 map_top 0x26A5CC+0x48, 0x2A8, 1, 1 @@ -5842,12 +6350,17 @@ gAreaRoomMap_DarkHyruleCastle_38:: @ 08106DAC map_top 0x26A5CC, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_39:: @ 08106DC4 .ifdef JP map_bottom 0x26A70C+0x74, 0x2A8, 1 map_top 0x26A7BC+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26A70C+0x74, 0x2A8, 1 + map_top 0x26A7BC+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x26A70C+0x48, 0x2A8, 1 map_top 0x26A7BC+0x48, 0x2A8, 1, 1 @@ -5856,12 +6369,17 @@ gAreaRoomMap_DarkHyruleCastle_39:: @ 08106DC4 map_top 0x26A7BC, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_40:: @ 08106DDC .ifdef JP map_bottom 0x26A940+0x74, 0x1BA, 1 map_top 0x26AA24+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26A940+0x74, 0x1BA, 1 + map_top 0x26AA24+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26A940+0x48, 0x1BA, 1 map_top 0x26AA24+0x48, 0x1BA, 1, 1 @@ -5870,12 +6388,17 @@ gAreaRoomMap_DarkHyruleCastle_40:: @ 08106DDC map_top 0x26AA24, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_41:: @ 08106DF4 .ifdef JP map_bottom 0x26AAF8+0x74, 0x1BA, 1 map_top 0x26ABB4+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26AAF8+0x74, 0x1BA, 1 + map_top 0x26ABB4+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26AAF8+0x48, 0x1BA, 1 map_top 0x26ABB4+0x48, 0x1BA, 1, 1 @@ -5884,12 +6407,17 @@ gAreaRoomMap_DarkHyruleCastle_41:: @ 08106DF4 map_top 0x26ABB4, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_42:: @ 08106E0C .ifdef JP map_bottom 0x26AC78+0x74, 0x1BA, 1 map_top 0x26AD44+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26AC78+0x74, 0x1BA, 1 + map_top 0x26AD44+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26AC78+0x48, 0x1BA, 1 map_top 0x26AD44+0x48, 0x1BA, 1, 1 @@ -5898,12 +6426,17 @@ gAreaRoomMap_DarkHyruleCastle_42:: @ 08106E0C map_top 0x26AD44, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_43:: @ 08106E24 .ifdef JP map_bottom 0x26AE18+0x74, 0x1BA, 1 map_top 0x26AEF8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26AE18+0x74, 0x1BA, 1 + map_top 0x26AEF8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26AE18+0x48, 0x1BA, 1 map_top 0x26AEF8+0x48, 0x1BA, 1, 1 @@ -5912,12 +6445,17 @@ gAreaRoomMap_DarkHyruleCastle_43:: @ 08106E24 map_top 0x26AEF8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_44:: @ 08106E3C .ifdef JP map_bottom 0x26AFBC+0x74, 0x1BA, 1 map_top 0x26B094+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26AFBC+0x74, 0x1BA, 1 + map_top 0x26B094+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26AFBC+0x48, 0x1BA, 1 map_top 0x26B094+0x48, 0x1BA, 1, 1 @@ -5926,12 +6464,17 @@ gAreaRoomMap_DarkHyruleCastle_44:: @ 08106E3C map_top 0x26B094, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_45:: @ 08106E54 .ifdef JP map_bottom 0x26B15C+0x74, 0x1BA, 1 map_top 0x26B250+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B15C+0x74, 0x1BA, 1 + map_top 0x26B250+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B15C+0x48, 0x1BA, 1 map_top 0x26B250+0x48, 0x1BA, 1, 1 @@ -5940,12 +6483,17 @@ gAreaRoomMap_DarkHyruleCastle_45:: @ 08106E54 map_top 0x26B250, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_46:: @ 08106E6C .ifdef JP map_bottom 0x26B2F4+0x74, 0x1BA, 1 map_top 0x26B408+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B2F4+0x74, 0x1BA, 1 + map_top 0x26B408+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B2F4+0x48, 0x1BA, 1 map_top 0x26B408+0x48, 0x1BA, 1, 1 @@ -5954,12 +6502,17 @@ gAreaRoomMap_DarkHyruleCastle_46:: @ 08106E6C map_top 0x26B408, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_47:: @ 08106E84 .ifdef JP map_bottom 0x26B4BC+0x74, 0x1BA, 1 map_top 0x26B4F8+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B4BC+0x74, 0x1BA, 1 + map_top 0x26B4F8+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B4BC+0x48, 0x1BA, 1 map_top 0x26B4F8+0x48, 0x1BA, 1, 1 @@ -5968,12 +6521,17 @@ gAreaRoomMap_DarkHyruleCastle_47:: @ 08106E84 map_top 0x26B4F8, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_48:: @ 08106E9C .ifdef JP map_bottom 0x26B658+0x74, 0x1BA, 1 map_top 0x26B694+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B658+0x74, 0x1BA, 1 + map_top 0x26B694+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B658+0x48, 0x1BA, 1 map_top 0x26B694+0x48, 0x1BA, 1, 1 @@ -5982,12 +6540,17 @@ gAreaRoomMap_DarkHyruleCastle_48:: @ 08106E9C map_top 0x26B694, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_49:: @ 08106EB4 .ifdef JP map_bottom 0x26B7EC+0x74, 0x1BA, 1 map_top 0x26B828+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B7EC+0x74, 0x1BA, 1 + map_top 0x26B828+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B7EC+0x48, 0x1BA, 1 map_top 0x26B828+0x48, 0x1BA, 1, 1 @@ -5996,12 +6559,17 @@ gAreaRoomMap_DarkHyruleCastle_49:: @ 08106EB4 map_top 0x26B828, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_50:: @ 08106ECC .ifdef JP map_bottom 0x26B984+0x74, 0x1BA, 1 map_top 0x26B9C0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26B984+0x74, 0x1BA, 1 + map_top 0x26B9C0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26B984+0x48, 0x1BA, 1 map_top 0x26B9C0+0x48, 0x1BA, 1, 1 @@ -6010,12 +6578,17 @@ gAreaRoomMap_DarkHyruleCastle_50:: @ 08106ECC map_top 0x26B9C0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_51:: @ 08106EE4 .ifdef JP map_bottom 0x26BB34+0x74, 0x2A8, 1 map_top 0x26BB8C+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26BB34+0x74, 0x2A8, 1 + map_top 0x26BB8C+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x26BB34+0x48, 0x2A8, 1 map_top 0x26BB8C+0x48, 0x2A8, 1, 1 @@ -6024,12 +6597,17 @@ gAreaRoomMap_DarkHyruleCastle_51:: @ 08106EE4 map_top 0x26BB8C, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_52:: @ 08106EFC .ifdef JP map_bottom 0x26BD88+0x74, 0x2A8, 1 map_top 0x26BDE0+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26BD88+0x74, 0x2A8, 1 + map_top 0x26BDE0+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x26BD88+0x48, 0x2A8, 1 map_top 0x26BDE0+0x48, 0x2A8, 1, 1 @@ -6038,12 +6616,17 @@ gAreaRoomMap_DarkHyruleCastle_52:: @ 08106EFC map_top 0x26BDE0, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_53:: @ 08106F14 .ifdef JP map_bottom 0x26BFB4+0x74, 0x1BA, 1 map_top 0x26C060+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26BFB4+0x74, 0x1BA, 1 + map_top 0x26C060+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26BFB4+0x48, 0x1BA, 1 map_top 0x26C060+0x48, 0x1BA, 1, 1 @@ -6052,12 +6635,17 @@ gAreaRoomMap_DarkHyruleCastle_53:: @ 08106F14 map_top 0x26C060, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_54:: @ 08106F2C .ifdef JP map_bottom 0x26C190+0x74, 0x1BA, 1 map_top 0x26C23C+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26C190+0x74, 0x1BA, 1 + map_top 0x26C23C+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26C190+0x48, 0x1BA, 1 map_top 0x26C23C+0x48, 0x1BA, 1, 1 @@ -6066,12 +6654,17 @@ gAreaRoomMap_DarkHyruleCastle_54:: @ 08106F2C map_top 0x26C23C, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_55:: @ 08106F44 .ifdef JP map_bottom 0x26C36C+0x74, 0xA5C, 1 map_top 0x26C578+0x74, 0xA5C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26C36C+0x74, 0xA5C, 1 + map_top 0x26C578+0x74, 0xA5C, 1, 1 +.else .ifdef EU map_bottom 0x26C36C+0x48, 0xA5C, 1 map_top 0x26C578+0x48, 0xA5C, 1, 1 @@ -6080,12 +6673,17 @@ gAreaRoomMap_DarkHyruleCastle_55:: @ 08106F44 map_top 0x26C578, 0xA5C, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_56:: @ 08106F5C .ifdef JP map_bottom 0x26CB1C+0x74, 0x1FE, 1 map_top 0x26CC54+0x74, 0x1FE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26CB1C+0x74, 0x1FE, 1 + map_top 0x26CC54+0x74, 0x1FE, 1, 1 +.else .ifdef EU map_bottom 0x26CB1C+0x48, 0x1FE, 1 map_top 0x26CC54+0x48, 0x1FE, 1, 1 @@ -6094,12 +6692,17 @@ gAreaRoomMap_DarkHyruleCastle_56:: @ 08106F5C map_top 0x26CC54, 0x1FE, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_57:: @ 08106F74 .ifdef JP map_bottom 0x26CD14+0x74, 0x3FC, 1 map_top 0x26CE94+0x74, 0x3FC, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26CD14+0x74, 0x3FC, 1 + map_top 0x26CE94+0x74, 0x3FC, 1, 1 +.else .ifdef EU map_bottom 0x26CD14+0x48, 0x3FC, 1 map_top 0x26CE94+0x48, 0x3FC, 1, 1 @@ -6108,12 +6711,17 @@ gAreaRoomMap_DarkHyruleCastle_57:: @ 08106F74 map_top 0x26CE94, 0x3FC, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_58:: @ 08106F8C .ifdef JP map_bottom 0x26CFD0+0x74, 0x264, 1 map_top 0x26D0C4+0x74, 0x264, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26CFD0+0x74, 0x264, 1 + map_top 0x26D0C4+0x74, 0x264, 1, 1 +.else .ifdef EU map_bottom 0x26CFD0+0x48, 0x264, 1 map_top 0x26D0C4+0x48, 0x264, 1, 1 @@ -6122,12 +6730,17 @@ gAreaRoomMap_DarkHyruleCastle_58:: @ 08106F8C map_top 0x26D0C4, 0x264, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastle_59:: @ 08106FA4 .ifdef JP map_bottom 0x26D194+0x74, 0x1BA, 1 map_top 0x26D1D0+0x74, 0x1BA, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26D194+0x74, 0x1BA, 1 + map_top 0x26D1D0+0x74, 0x1BA, 1, 1 +.else .ifdef EU map_bottom 0x26D194+0x48, 0x1BA, 1 map_top 0x26D1D0+0x48, 0x1BA, 1, 1 @@ -6136,6 +6749,7 @@ gAreaRoomMap_DarkHyruleCastle_59:: @ 08106FA4 map_top 0x26D1D0, 0x1BA, 1, 1 .endif .endif +.endif gAreaRoomMaps_DarkHyruleCastle:: @ 08106FBC .4byte gAreaRoomMap_DarkHyruleCastle_0 @@ -6204,6 +6818,10 @@ gAreaRoomMap_DarkHyruleCastleOutside_0:: @ 081070AC map_bottom 0x27647C+0x74, 0x2EE, 1 map_top 0x276694+0x74, 0x2EE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27647C+0x74, 0x2EE, 1 + map_top 0x276694+0x74, 0x2EE, 1, 1 +.else .ifdef EU map_bottom 0x27647C+0x48, 0x2EE, 1 map_top 0x276694+0x48, 0x2EE, 1, 1 @@ -6212,12 +6830,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_0:: @ 081070AC map_top 0x276694, 0x2EE, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_1:: @ 081070C4 .ifdef JP map_bottom 0x276704+0x74, 0x396, 1 map_top 0x276924+0x74, 0x396, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x276704+0x74, 0x396, 1 + map_top 0x276924+0x74, 0x396, 1, 1 +.else .ifdef EU map_bottom 0x276704+0x48, 0x396, 1 map_top 0x276924+0x48, 0x396, 1, 1 @@ -6226,12 +6849,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_1:: @ 081070C4 map_top 0x276924, 0x396, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_2:: @ 081070DC .ifdef JP map_bottom 0x2769A0+0x74, 0x374, 1 map_top 0x276A8C+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2769A0+0x74, 0x374, 1 + map_top 0x276A8C+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x2769A0+0x48, 0x374, 1 map_top 0x276A8C+0x48, 0x374, 1, 1 @@ -6240,12 +6868,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_2:: @ 081070DC map_top 0x276A8C, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_3:: @ 081070F4 .ifdef JP map_bottom 0x276BE8+0x74, 0x52E, 1 map_top 0x276D2C+0x74, 0x52E, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x276BE8+0x74, 0x52E, 1 + map_top 0x276D2C+0x74, 0x52E, 1, 1 +.else .ifdef EU map_bottom 0x276BE8+0x48, 0x52E, 1 map_top 0x276D2C+0x48, 0x52E, 1, 1 @@ -6254,12 +6887,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_3:: @ 081070F4 map_top 0x276D2C, 0x52E, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_4:: @ 0810710C .ifdef JP map_bottom 0x276EEC+0x74, 0x2A8, 1 map_top 0x276F78+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x276EEC+0x74, 0x2A8, 1 + map_top 0x276F78+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x276EEC+0x48, 0x2A8, 1 map_top 0x276F78+0x48, 0x2A8, 1, 1 @@ -6268,12 +6906,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_4:: @ 0810710C map_top 0x276F78, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_5:: @ 08107124 .ifdef JP map_bottom 0x27705C+0x74, 0x374, 1 map_top 0x277164+0x74, 0x374, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27705C+0x74, 0x374, 1 + map_top 0x277164+0x74, 0x374, 1, 1 +.else .ifdef EU map_bottom 0x27705C+0x48, 0x374, 1 map_top 0x277164+0x48, 0x374, 1, 1 @@ -6282,12 +6925,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_5:: @ 08107124 map_top 0x277164, 0x374, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_6:: @ 0810713C .ifdef JP map_bottom 0x2772D0+0x74, 0xA5C, 1 map_top 0x277480+0x74, 0xA5C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2772D0+0x74, 0xA5C, 1 + map_top 0x277480+0x74, 0xA5C, 1, 1 +.else .ifdef EU map_bottom 0x2772D0+0x48, 0xA5C, 1 map_top 0x277480+0x48, 0xA5C, 1, 1 @@ -6296,12 +6944,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_6:: @ 0810713C map_top 0x277480, 0xA5C, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_7:: @ 08107154 .ifdef JP map_bottom 0x2776C8+0x74, 0x6E8, 1 map_top 0x277848+0x74, 0x6E8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2776C8+0x74, 0x6E8, 1 + map_top 0x277848+0x74, 0x6E8, 1, 1 +.else .ifdef EU map_bottom 0x2776C8+0x48, 0x6E8, 1 map_top 0x277848+0x48, 0x6E8, 1, 1 @@ -6310,12 +6963,17 @@ gAreaRoomMap_DarkHyruleCastleOutside_7:: @ 08107154 map_top 0x277848, 0x6E8, 1, 1 .endif .endif +.endif gAreaRoomMap_DarkHyruleCastleOutside_8:: @ 0810716C .ifdef JP map_bottom 0x277A28+0x74, 0x630, 1 map_top 0x277AEC+0x74, 0x630, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x277A28+0x74, 0x630, 1 + map_top 0x277AEC+0x74, 0x630, 1, 1 +.else .ifdef EU map_bottom 0x277A28+0x48, 0x630, 1 map_top 0x277AEC+0x48, 0x630, 1, 1 @@ -6324,6 +6982,7 @@ gAreaRoomMap_DarkHyruleCastleOutside_8:: @ 0810716C map_top 0x277AEC, 0x630, 1, 1 .endif .endif +.endif gAreaRoomMaps_DarkHyruleCastleOutside:: @ 08107184 .4byte gAreaRoomMap_DarkHyruleCastleOutside_0 @@ -6341,6 +7000,10 @@ gAreaRoomMap_DarkHyruleCastleBridge_0:: @ 081071A8 map_bottom 0x26D27C+0x74, 0x2A8, 1 map_top 0x26D470+0x74, 0x2A8, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26D27C+0x74, 0x2A8, 1 + map_top 0x26D470+0x74, 0x2A8, 1, 1 +.else .ifdef EU map_bottom 0x26D27C+0x48, 0x2A8, 1 map_top 0x26D470+0x48, 0x2A8, 1, 1 @@ -6349,6 +7012,7 @@ gAreaRoomMap_DarkHyruleCastleBridge_0:: @ 081071A8 map_top 0x26D470, 0x2A8, 1, 1 .endif .endif +.endif gAreaRoomMaps_DarkHyruleCastleBridge:: @ 081071C0 .4byte gAreaRoomMap_DarkHyruleCastleBridge_0 @@ -6358,6 +7022,10 @@ gAreaRoomMap_VaatisArms_0:: @ 081071C4 map_bottom 0x26DA80+0x74, 0x214, 1 map_top 0x26DC40+0x74, 0x214, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26DA80+0x74, 0x214, 1 + map_top 0x26DC40+0x74, 0x214, 1, 1 +.else .ifdef EU map_bottom 0x26DA80+0x48, 0x214, 1 map_top 0x26DC40+0x48, 0x214, 1, 1 @@ -6366,12 +7034,17 @@ gAreaRoomMap_VaatisArms_0:: @ 081071C4 map_top 0x26DC40, 0x214, 1, 1 .endif .endif +.endif gAreaRoomMap_VaatisArms_1:: @ 081071DC .ifdef JP map_bottom 0x26DC98+0x74, 0x214, 1 map_top 0x26DE58+0x74, 0x214, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26DC98+0x74, 0x214, 1 + map_top 0x26DE58+0x74, 0x214, 1, 1 +.else .ifdef EU map_bottom 0x26DC98+0x48, 0x214, 1 map_top 0x26DE58+0x48, 0x214, 1, 1 @@ -6380,12 +7053,17 @@ gAreaRoomMap_VaatisArms_1:: @ 081071DC map_top 0x26DE58, 0x214, 1, 1 .endif .endif +.endif gAreaRoomMap_VaatisArms_2:: @ 081071F4 .ifdef JP map_bottom 0x26DEB0+0x74, 0x214, 1 map_top 0x26E070+0x74, 0x214, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26DEB0+0x74, 0x214, 1 + map_top 0x26E070+0x74, 0x214, 1, 1 +.else .ifdef EU map_bottom 0x26DEB0+0x48, 0x214, 1 map_top 0x26E070+0x48, 0x214, 1, 1 @@ -6394,6 +7072,7 @@ gAreaRoomMap_VaatisArms_2:: @ 081071F4 map_top 0x26E070, 0x214, 1, 1 .endif .endif +.endif gAreaRoomMaps_VaatisArms:: @ 0810720C .4byte gAreaRoomMap_VaatisArms_0 @@ -6405,6 +7084,10 @@ gAreaRoomMap_Vaati3_0:: @ 08107218 map_bottom 0x26D564+0x74, 0x294, 1 map_top 0x26D704+0x74, 0x294, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26D564+0x74, 0x294, 1 + map_top 0x26D704+0x74, 0x294, 1, 1 +.else .ifdef EU map_bottom 0x26D564+0x48, 0x294, 1 map_top 0x26D704+0x48, 0x294, 1, 1 @@ -6413,12 +7096,17 @@ gAreaRoomMap_Vaati3_0:: @ 08107218 map_top 0x26D704, 0x294, 1, 1 .endif .endif +.endif gAreaRoomMap_Vaati3_1:: @ 08107230 .ifdef JP map_bottom 0x26D75C+0x74, 0x210, 1 map_top 0x26D89C+0x74, 0x210, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26D75C+0x74, 0x210, 1 + map_top 0x26D89C+0x74, 0x210, 1, 1 +.else .ifdef EU map_bottom 0x26D75C+0x48, 0x210, 1 map_top 0x26D89C+0x48, 0x210, 1, 1 @@ -6427,6 +7115,7 @@ gAreaRoomMap_Vaati3_1:: @ 08107230 map_top 0x26D89C, 0x210, 1, 1 .endif .endif +.endif gAreaRoomMaps_Vaati3:: @ 08107248 .4byte gAreaRoomMap_Vaati3_0 @@ -6437,6 +7126,10 @@ gAreaRoomMap_Vaati2_0:: @ 08107250 map_bottom 0x26D8E4+0x74, 0x294, 1 map_top 0x26DA24+0x74, 0x294, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x26D8E4+0x74, 0x294, 1 + map_top 0x26DA24+0x74, 0x294, 1, 1 +.else .ifdef EU map_bottom 0x26D8E4+0x48, 0x294, 1 map_top 0x26DA24+0x48, 0x294, 1, 1 @@ -6445,6 +7138,7 @@ gAreaRoomMap_Vaati2_0:: @ 08107250 map_top 0x26DA24, 0x294, 1, 1 .endif .endif +.endif gAreaRoomMaps_Vaati2:: @ 08107268 .4byte gAreaRoomMap_Vaati2_0 @@ -6454,6 +7148,10 @@ gAreaRoomMap_47_0:: @ 0810726C map_bottom 0x277BB0+0x74, 0x256, 1 map_top 0x277CD8+0x74, 0x256, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x277BB0+0x74, 0x256, 1 + map_top 0x277CD8+0x74, 0x256, 1, 1 +.else .ifdef EU map_bottom 0x277BB0+0x48, 0x256, 1 map_top 0x277CD8+0x48, 0x256, 1, 1 @@ -6462,12 +7160,17 @@ gAreaRoomMap_47_0:: @ 0810726C map_top 0x277CD8, 0x256, 1, 1 .endif .endif +.endif gAreaRoomMap_47_1:: @ 08107284 .ifdef JP map_bottom 0x277D38+0x74, 0x2B2, 1 map_top 0x277E5C+0x74, 0x2B2, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x277D38+0x74, 0x2B2, 1 + map_top 0x277E5C+0x74, 0x2B2, 1, 1 +.else .ifdef EU map_bottom 0x277D38+0x48, 0x2B2, 1 map_top 0x277E5C+0x48, 0x2B2, 1, 1 @@ -6476,12 +7179,17 @@ gAreaRoomMap_47_1:: @ 08107284 map_top 0x277E5C, 0x2B2, 1, 1 .endif .endif +.endif gAreaRoomMap_47_2:: @ 0810729C .ifdef JP map_bottom 0x277ECC+0x74, 0x47E, 1 map_top 0x2780BC+0x74, 0x47E, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x277ECC+0x74, 0x47E, 1 + map_top 0x2780BC+0x74, 0x47E, 1, 1 +.else .ifdef EU map_bottom 0x277ECC+0x48, 0x47E, 1 map_top 0x2780BC+0x48, 0x47E, 1, 1 @@ -6490,6 +7198,7 @@ gAreaRoomMap_47_2:: @ 0810729C map_top 0x2780BC, 0x47E, 1, 1 .endif .endif +.endif gAreaRoomMaps_47:: @ 081072B4 .4byte gAreaRoomMap_47_0 @@ -6941,6 +7650,10 @@ gAreaRoomMap_45_0:: @ 08107774 map_bottom 0x278158+0x74, 0x1FE, 1 map_top 0x27828C+0x74, 0x1FE, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x278158+0x74, 0x1FE, 1 + map_top 0x27828C+0x74, 0x1FE, 1, 1 +.else .ifdef EU map_bottom 0x278158+0x48, 0x1FE, 1 map_top 0x27828C+0x48, 0x1FE, 1, 1 @@ -6949,6 +7662,7 @@ gAreaRoomMap_45_0:: @ 08107774 map_top 0x27828C, 0x1FE, 1, 1 .endif .endif +.endif gAreaRoomMaps_45:: @ 0810778C .4byte gAreaRoomMap_45_0 @@ -6958,6 +7672,10 @@ gAreaRoomMap_46_0:: @ 08107790 map_bottom 0x2782D0+0x74, 0x286, 1 map_top 0x278454+0x74, 0x286, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2782D0+0x74, 0x286, 1 + map_top 0x278454+0x74, 0x286, 1, 1 +.else .ifdef EU map_bottom 0x2782D0+0x48, 0x286, 1 map_top 0x278454+0x48, 0x286, 1, 1 @@ -6966,12 +7684,17 @@ gAreaRoomMap_46_0:: @ 08107790 map_top 0x278454, 0x286, 1, 1 .endif .endif +.endif gAreaRoomMap_46_1:: @ 081077A8 .ifdef JP map_bottom 0x2784C4+0x74, 0x30E, 1 map_top 0x2786E0+0x74, 0x30E, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2784C4+0x74, 0x30E, 1 + map_top 0x2786E0+0x74, 0x30E, 1, 1 +.else .ifdef EU map_bottom 0x2784C4+0x48, 0x30E, 1 map_top 0x2786E0+0x48, 0x30E, 1, 1 @@ -6980,12 +7703,17 @@ gAreaRoomMap_46_1:: @ 081077A8 map_top 0x2786E0, 0x30E, 1, 1 .endif .endif +.endif gAreaRoomMap_46_2:: @ 081077C0 .ifdef JP map_bottom 0x278790+0x74, 0x286, 1 map_top 0x278908+0x74, 0x286, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x278790+0x74, 0x286, 1 + map_top 0x278908+0x74, 0x286, 1, 1 +.else .ifdef EU map_bottom 0x278790+0x48, 0x286, 1 map_top 0x278908+0x48, 0x286, 1, 1 @@ -6994,12 +7722,17 @@ gAreaRoomMap_46_2:: @ 081077C0 map_top 0x278908, 0x286, 1, 1 .endif .endif +.endif gAreaRoomMap_46_3:: @ 081077D8 .ifdef JP map_bottom 0x2789A0+0x74, 0x286, 1 map_top 0x278AEC+0x74, 0x286, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x2789A0+0x74, 0x286, 1 + map_top 0x278AEC+0x74, 0x286, 1, 1 +.else .ifdef EU map_bottom 0x2789A0+0x48, 0x286, 1 map_top 0x278AEC+0x48, 0x286, 1, 1 @@ -7008,12 +7741,17 @@ gAreaRoomMap_46_3:: @ 081077D8 map_top 0x278AEC, 0x286, 1, 1 .endif .endif +.endif gAreaRoomMap_46_4:: @ 081077F0 .ifdef JP map_bottom 0x278B88+0x74, 0x30E, 1 map_top 0x278D38+0x74, 0x30E, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x278B88+0x74, 0x30E, 1 + map_top 0x278D38+0x74, 0x30E, 1, 1 +.else .ifdef EU map_bottom 0x278B88+0x48, 0x30E, 1 map_top 0x278D38+0x48, 0x30E, 1, 1 @@ -7022,12 +7760,17 @@ gAreaRoomMap_46_4:: @ 081077F0 map_top 0x278D38, 0x30E, 1, 1 .endif .endif +.endif gAreaRoomMap_46_5:: @ 08107808 .ifdef JP map_bottom 0x278DDC+0x74, 0x286, 1 map_top 0x278F2C+0x74, 0x286, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x278DDC+0x74, 0x286, 1 + map_top 0x278F2C+0x74, 0x286, 1, 1 +.else .ifdef EU map_bottom 0x278DDC+0x48, 0x286, 1 map_top 0x278F2C+0x48, 0x286, 1, 1 @@ -7036,12 +7779,17 @@ gAreaRoomMap_46_5:: @ 08107808 map_top 0x278F2C, 0x286, 1, 1 .endif .endif +.endif gAreaRoomMap_46_6:: @ 08107820 .ifdef JP map_bottom 0x278FA8+0x74, 0x720, 1 map_top 0x27921C+0x74, 0x720, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x278FA8+0x74, 0x720, 1 + map_top 0x27921C+0x74, 0x720, 1, 1 +.else .ifdef EU map_bottom 0x278FA8+0x48, 0x720, 1 map_top 0x27921C+0x48, 0x720, 1, 1 @@ -7050,12 +7798,17 @@ gAreaRoomMap_46_6:: @ 08107820 map_top 0x27921C, 0x720, 1, 1 .endif .endif +.endif gAreaRoomMap_46_7:: @ 08107838 .ifdef JP map_bottom 0x27932C+0x74, 0x2F2, 1 map_top 0x2794A4+0x74, 0x2F2, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27932C+0x74, 0x2F2, 1 + map_top 0x2794A4+0x74, 0x2F2, 1, 1 +.else .ifdef EU map_bottom 0x27932C+0x48, 0x2F2, 1 map_top 0x2794A4+0x48, 0x2F2, 1, 1 @@ -7064,6 +7817,7 @@ gAreaRoomMap_46_7:: @ 08107838 map_top 0x2794A4, 0x2F2, 1, 1 .endif .endif +.endif gAreaRoomMaps_46:: @ 08107850 .4byte gAreaRoomMap_46_0 @@ -7080,6 +7834,10 @@ gAreaRoomMap_08107870:: @ 08107870 map_bottom 0x279520+0x74, 0xC80, 1 map_top 0x2799B0+0x74, 0xC80, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x279520+0x74, 0xC80, 1 + map_top 0x2799B0+0x74, 0xC80, 1, 1 +.else .ifdef EU map_bottom 0x279520+0x48, 0xC80, 1 map_top 0x2799B0+0x48, 0xC80, 1, 1 @@ -7088,6 +7846,7 @@ gAreaRoomMap_08107870:: @ 08107870 map_top 0x2799B0, 0xC80, 1, 1 .endif .endif +.endif @ Unused gAreaRoomMaps_08107888:: @ 08107888 @@ -7098,6 +7857,10 @@ gAreaRoomMap_4D_0:: @ 0810788C map_bottom 0x279D28+0x74, 0xCD0, 1 map_top 0x27A2F4+0x74, 0xCD0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x279D28+0x74, 0xCD0, 1 + map_top 0x27A2F4+0x74, 0xCD0, 1, 1 +.else .ifdef EU map_bottom 0x279D28+0x48, 0xCD0, 1 map_top 0x27A2F4+0x48, 0xCD0, 1, 1 @@ -7106,6 +7869,7 @@ gAreaRoomMap_4D_0:: @ 0810788C map_top 0x27A2F4, 0xCD0, 1, 1 .endif .endif +.endif gAreaRoomMaps_4D:: @ 081078A4 .4byte gAreaRoomMap_4D_0 @@ -7115,6 +7879,10 @@ gAreaRoomMap_57_0:: @ 081078A8 map_bottom 0x27A574+0x74, 0xC80, 1 map_top 0x27AAE4+0x74, 0xC80, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27A574+0x74, 0xC80, 1 + map_top 0x27AAE4+0x74, 0xC80, 1, 1 +.else .ifdef EU map_bottom 0x27A574+0x48, 0xC80, 1 map_top 0x27AAE4+0x48, 0xC80, 1, 1 @@ -7123,6 +7891,7 @@ gAreaRoomMap_57_0:: @ 081078A8 map_top 0x27AAE4, 0xC80, 1, 1 .endif .endif +.endif gAreaRoomMaps_57:: @ 081078C0 .4byte gAreaRoomMap_57_0 @@ -7132,6 +7901,10 @@ gAreaRoomMap_5F_0:: @ 081078C4 map_bottom 0x27AD50+0x74, 0xC80, 1 map_top 0x27B118+0x74, 0xC80, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27AD50+0x74, 0xC80, 1 + map_top 0x27B118+0x74, 0xC80, 1, 1 +.else .ifdef EU map_bottom 0x27AD50+0x48, 0xC80, 1 map_top 0x27B118+0x48, 0xC80, 1, 1 @@ -7140,6 +7913,7 @@ gAreaRoomMap_5F_0:: @ 081078C4 map_top 0x27B118, 0xC80, 1, 1 .endif .endif +.endif gAreaRoomMaps_5F:: @ 081078DC .4byte gAreaRoomMap_5F_0 @@ -7149,6 +7923,10 @@ gAreaRoomMap_67_0:: @ 081078E0 map_bottom 0x27B3A0+0x74, 0x12C, 1 map_top 0x27B470+0x74, 0x12C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27B3A0+0x74, 0x12C, 1 + map_top 0x27B470+0x74, 0x12C, 1, 1 +.else .ifdef EU map_bottom 0x27B3A0+0x48, 0x12C, 1 map_top 0x27B470+0x48, 0x12C, 1, 1 @@ -7157,6 +7935,7 @@ gAreaRoomMap_67_0:: @ 081078E0 map_top 0x27B470, 0x12C, 1, 1 .endif .endif +.endif gAreaRoomMaps_67:: @ 081078F8 .4byte gAreaRoomMap_67_0 @@ -7166,6 +7945,10 @@ gAreaRoomMap_6F_0:: @ 081078FC map_bottom 0x27B4AC+0x74, 0xC80, 1 map_top 0x27B974+0x74, 0xC80, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27B4AC+0x74, 0xC80, 1 + map_top 0x27B974+0x74, 0xC80, 1, 1 +.else .ifdef EU map_bottom 0x27B4AC+0x48, 0xC80, 1 map_top 0x27B974+0x48, 0xC80, 1, 1 @@ -7174,6 +7957,7 @@ gAreaRoomMap_6F_0:: @ 081078FC map_top 0x27B974, 0xC80, 1, 1 .endif .endif +.endif gAreaRoomMaps_6F:: @ 08107914 .4byte gAreaRoomMap_6F_0 @@ -7183,6 +7967,10 @@ gAreaRoomMap_77_0:: @ 08107918 map_bottom 0x27BCCC+0x74, 0x1040, 1 map_top 0x27C2C8+0x74, 0x1040, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27BCCC+0x74, 0x1040, 1 + map_top 0x27C2C8+0x74, 0x1040, 1, 1 +.else .ifdef EU map_bottom 0x27BCCC+0x48, 0x1040, 1 map_top 0x27C2C8+0x48, 0x1040, 1, 1 @@ -7191,6 +7979,7 @@ gAreaRoomMap_77_0:: @ 08107918 map_top 0x27C2C8, 0x1040, 1, 1 .endif .endif +.endif gAreaRoomMaps_77:: @ 08107930 .4byte gAreaRoomMap_77_0 @@ -7200,6 +7989,10 @@ gAreaRoomMap_7F_0:: @ 08107934 map_bottom 0x27C720+0x74, 0xC80, 1 map_top 0x27CC28+0x74, 0xC80, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27C720+0x74, 0xC80, 1 + map_top 0x27CC28+0x74, 0xC80, 1, 1 +.else .ifdef EU map_bottom 0x27C720+0x48, 0xC80, 1 map_top 0x27CC28+0x48, 0xC80, 1, 1 @@ -7208,6 +8001,7 @@ gAreaRoomMap_7F_0:: @ 08107934 map_top 0x27CC28, 0xC80, 1, 1 .endif .endif +.endif gAreaRoomMaps_7F:: @ 0810794C .4byte gAreaRoomMap_7F_0 @@ -7217,6 +8011,10 @@ gAreaRoomMap_87_0:: @ 08107950 map_bottom 0x27CF58+0x74, 0xF3C, 1 map_top 0x27D71C+0x74, 0xF3C, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27CF58+0x74, 0xF3C, 1 + map_top 0x27D71C+0x74, 0xF3C, 1, 1 +.else .ifdef EU map_bottom 0x27CF58+0x48, 0xF3C, 1 map_top 0x27D71C+0x48, 0xF3C, 1, 1 @@ -7225,6 +8023,7 @@ gAreaRoomMap_87_0:: @ 08107950 map_top 0x27D71C, 0xF3C, 1, 1 .endif .endif +.endif gAreaRoomMaps_87:: @ 08107968 .4byte gAreaRoomMap_87_0 @@ -7234,6 +8033,10 @@ gAreaRoomMap_8F_0:: @ 0810796C map_bottom 0x27DA00+0x74, 0xFA0, 1 map_top 0x27DFF4+0x74, 0xFA0, 1, 1 .else +.ifdef DEMO_JP + map_bottom 0x27DA00+0x74, 0xFA0, 1 + map_top 0x27DFF4+0x74, 0xFA0, 1, 1 +.else .ifdef EU map_bottom 0x27DA00+0x48, 0xFA0, 1 map_top 0x27DFF4+0x48, 0xFA0, 1, 1 @@ -7242,6 +8045,7 @@ gAreaRoomMap_8F_0:: @ 0810796C map_top 0x27DFF4, 0xFA0, 1, 1 .endif .endif +.endif gAreaRoomMaps_8F:: @ 08107984 .4byte gAreaRoomMap_8F_0 diff --git a/data/metatile_headers.s b/data/metatile_headers.s index e3b2c66c..cd96a797 100755 --- a/data/metatile_headers.s +++ b/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 diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 7bce1e1b..2009cc62 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -1,67 +1,67 @@ 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 TextboxNoOverlapFollow 0x4912 - _0807EA94 + _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 Call sub_0806BB7C JumpIfNot script_08008C5C TextboxNoOverlap 0x490c - _0807EA94 + _0807EA94 LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 WaitForSomething 0x00000004 @@ -70,7 +70,7 @@ script_08008BD2: _0807E930 0x0004 Call sub_0807F2D4 TextboxNoOverlap 0x4913 - _0807EA94 + _0807EA94 _0807E930 0x0008 Call sub_0807F2D4 Jump script_08008C5C @@ -78,21 +78,21 @@ 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 TextboxNoOverlap 0x490d - _0807EA94 + _0807EA94 DoPostScriptAction 0x0007 Call sub_08064D08 _0807EDD4 0x0068, 0x0078 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 1b90b9f7..76375a89 100644 --- a/data/scripts/script_08008D50.inc +++ b/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 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index e92f7fbb..777a0a63 100644 --- a/data/scripts/script_08008D8C.inc +++ b/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 @@ -65,7 +65,7 @@ script_08008E12: _0807E5F8 0x00000004 WaitForSomething2 0x00000008 TextboxNoOverlapFollowPos 0x1053, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000080 WaitForSomething2 0x00000100 _0807E5F8 0x00000080 @@ -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 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index 959a01c1..8db32075 100644 --- a/data/scripts/script_08008F74.inc +++ b/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 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 664aabe5..85717dac 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08008FC0 CallWithArg sub_0807F238, 0x0000045f Call sub_0807F304 TextboxNoOverlapFollowPos 0x0501, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000020 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index 34d38b3d..0a8bb0c9 100644 --- a/data/scripts/script_08008FFC.inc +++ b/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 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index e78894a2..06a5ef94 100644 --- a/data/scripts/script_0800903C.inc +++ b/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,39 +11,39 @@ 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 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1050, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1052, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807EB44 0x0006 _0807E930 0x0005 TextboxNoOverlapFollowPos 0x1054, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 @@ -52,48 +52,48 @@ SCRIPT_START script_08009080 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1056, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1057, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x1058, 0x000e - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000100 WaitForSomething2 0x00000080 _0807E930 0x0004 TextboxNoOverlapFollowPos 0x105c, 0x000e - _0807EA94 + _0807EA94 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 TextboxNoOverlapFollowPos 0x105b, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 @@ -105,102 +105,102 @@ SCRIPT_START script_08009198 Wait 0x003c DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1051, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1055, 0x0000 - _0807EA94 + _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 TextboxNoOverlapFollowPos 0x1059, 0x0000 - _0807EA94 + _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 + _0807E864 + _0807EB74 TextboxNoOverlap 0x105e - _0807EA94 + _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 + _0807E864 + _0807EB74 TextboxNoOverlap 0x1071 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08009300 .2byte 0x0000 SCRIPT_START script_08009318 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc index 6b99a817..ccea2c7d 100644 --- a/data/scripts/script_08009320.inc +++ b/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 diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc index 9f5907f4..d5ecf24e 100644 --- a/data/scripts/script_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009340 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index 9cddae5f..0ac133ef 100644 --- a/data/scripts/script_08009348.inc +++ b/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 TextboxNoOverlap 0x1d01 - _0807EA94 + _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 diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index 31f82777..2b5a9bbc 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -5,23 +5,27 @@ SCRIPT_START script_0800939A .ifdef EU CheckLocalFlag 0x00ac .else +.ifdef DEMO_JP @ TODO deduplicate + CheckLocalFlag 0x00ac +.else CheckLocalFlag 0x00ae .endif .endif +.endif JumpIf script_0800943E CheckInventory1 0x000d JumpIf script_080093BC CheckInventory1 0x000e JumpIf script_080093BC TextboxNoOverlap 0x1d02 - _0807EA94 + _0807EA94 Jump script_08009376 script_080093BC: CheckInventory1 0x000e JumpIfNot script_080093DA Call sub_0806D788 TextboxNoOverlap 0x1d03 - _0807EA94 + _0807EA94 Call sub_0806D70C Jump script_08009376 script_080093DA: @@ -32,19 +36,23 @@ script_080093DA: .ifdef EU CheckLocalFlag 0x00ab .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ab @ TODO deduplicate +.else CheckLocalFlag 0x00ad .endif .endif +.endif JumpIf script_080093EE SetIntVariable 0x00001d04 script_080093EE: - TextboxNoOverlapVar - _0807EA94 - _0807E3E8 + TextboxNoOverlapVar + _0807EA94 + _0807E3E8 JumpIfNot script_08009376 Wait 0x001e TextboxNoOverlap 0x1d08 - _0807EA94 + _0807EA94 LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 Call sub_0806D6D0 @@ -59,24 +67,29 @@ script_080093EE: 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 + _0807EB8C TextboxNoOverlap 0x1d09 - _0807EA94 + _0807EA94 Wait 0x000a Jump script_08009376 script_0800943E: Call sub_0806D600 JumpIf script_08009452 TextboxNoOverlap 0x1d0a - _0807EA94 + _0807EA94 JumpIfNot script_08009376 script_08009452: TextboxNoOverlap 0x1d0b - _0807EA94 + _0807EA94 Call sub_0806D74C _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 5f134afa..83fbcbbb 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -11,27 +11,31 @@ SCRIPT_START script_08009464 .ifdef EU ClearLocalFlag 0x00ac .else +.ifdef DEMO_JP + ClearLocalFlag 0x00ac @ TODO deduplicate +.else ClearLocalFlag 0x00ae .endif .endif +.endif Call sub_0806D620 Wait 0x003c - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C TextboxNoOverlap 0x1d0c - _0807EA94 + _0807EA94 Wait 0x000a 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 diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index 8d269a34..9b4323f2 100644 --- a/data/scripts/script_080094CC.inc +++ b/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 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index fb908878..04ad9fd0 100644 --- a/data/scripts/script_080094FC.inc +++ b/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 diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index bee0fd26..ee702274 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -1,68 +1,68 @@ 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 TextboxNoOverlapFollow 0x053c - WaitPlayerAction8 - _0807EA94 + WaitPlayerAction8 + _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 diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index c2cb5886..fe187ffb 100644 --- a/data/scripts/script_08009740.inc +++ b/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 diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 6732d029..dd31d91e 100644 --- a/data/scripts/script_080097F0.inc +++ b/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 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 00776ede..dab8ef69 100644 --- a/data/scripts/script_08009838.inc +++ b/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 diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 1b17c7aa..26d3915e 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -1,6 +1,6 @@ SCRIPT_START script_080098D4 - BeginBlock - EndBlock + BeginBlock + EndBlock script_080098D8: CheckGlobalFlag 0x0020 JumpIfNot script_080098D8 @@ -13,9 +13,13 @@ script_080098E0: .ifdef EU CheckLocalFlag 0x5b .else +.ifdef DEMO_JP + CheckLocalFlag 0x5b @ TODO deduplicate +.else CheckLocalFlag 0x5d .endif .endif +.endif JumpIf script_08009910 .ifdef JP SetLocalFlag 0x005b @@ -23,16 +27,20 @@ script_080098E0: .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 diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc index 79d4cbd7..77f4fe2a 100644 --- a/data/scripts/script_08009918.inc +++ b/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 diff --git a/data/scripts/script_08009950.inc b/data/scripts/script_08009950.inc index 9a01e6c3..bffaaa59 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,23 +1,23 @@ 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 _0807E930 0x000b Wait 0x001e TextboxNoOverlapFollow 0x1002 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 @@ -27,11 +27,11 @@ SCRIPT_START script_08009950 _0807EB44 0x0006 DoPostScriptAction 0x0001 TextboxNoOverlapFollow 0x1004 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 Wait 0x001e _0807E778 0x0002 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_08053634 SCRIPT_END diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 5d6dcffb..e55f9999 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,22 +1,22 @@ SCRIPT_START script_080099DC - BeginBlock + BeginBlock Call sub_0807F348 SetEntitySpeed 0x00c0 _0807EB44 0x0002 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f TextboxNoOverlapFollow 0x1001 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x0001 TextboxNoOverlapFollow 0x1003 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 SCRIPT_END diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index e86e879e..03504b53 100644 --- a/data/scripts/script_08009A34.inc +++ b/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 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index b6d926af..6b3e05a7 100644 --- a/data/scripts/script_08009A84.inc +++ b/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 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 0e66a292..48ef802b 100644 --- a/data/scripts/script_08009AF8.inc +++ b/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 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index bacab8e4..cfca6b8a 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08009B30 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 SetLocalFlag 0x0046 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x001e TextboxNoOverlapFollow 0x1005 - _0807EA94 + _0807EA94 Wait 0x003c Call sub_0807529C Wait 0x003c DoPostScriptAction 0x0014 Wait 0x001e Call sub_08053250 - _0807E878 + _0807E878 Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index 8fd0b8b8..718c99d0 100644 --- a/data/scripts/script_08009B78.inc +++ b/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 @@ -19,15 +19,15 @@ SCRIPT_START script_08009B78 Wait 0x000f DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x1009, 0x0000 - _0807E8E4_1 - _0807EA94 + _0807E8E4_1 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 - _0807EB8C + _0807EB8C DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x100b, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000002 WaitForSomething2 0x00000008 @@ -42,22 +42,22 @@ SCRIPT_START script_08009B78 WaitForSomething2 0x00000008 Call sub_08053250 _0807F034 0x0034 - WaitPlayerAction8 - _0807E8E4_1 + WaitPlayerAction8 + _0807E8E4_1 DoPostScriptAction 0x0001 TextboxNoOverlapFollowPos 0x100c, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 script_08009C4C: DoPostScriptAction 0x000a script_08009C50: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08009C50 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x100e - _0807E878 + _0807E878 Jump script_08009C50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index c9162bc6..0737d769 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,39 +1,39 @@ 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 TextboxNoOverlapFollowPos 0x100a, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 - _0807EB8C + _0807EB8C DoPostScriptAction 0x0001 - _0807EB8C + _0807EB8C _0807EB44 0x0002 TextboxNoOverlapFollowPos 0x100d, 0x0000 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 _0807EDD4 0x0028, 0x0060 _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 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index d51e200f..613aaba8 100644 --- a/data/scripts/script_08009CFC.inc +++ b/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 diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index 4b1a4832..ea71cbc3 100644 --- a/data/scripts/script_08009D6C.inc +++ b/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 diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index 869b107a..f675dccf 100644 --- a/data/scripts/script_08009DB0.inc +++ b/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 diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 8174277e..62c60d42 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E4E - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc index fb9c9b00..9603cf05 100644 --- a/data/scripts/script_08009E58.inc +++ b/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 diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc index bb82f0fd..97dd114a 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E80 - BeginBlock - EndBlock + BeginBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc index 4368b582..4fc207f9 100644 --- a/data/scripts/script_08009E88.inc +++ b/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 diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc index 8ef940d1..afac33a8 100644 --- a/data/scripts/script_08009ECC.inc +++ b/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 diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc index 632f0d1e..d07f072c 100644 --- a/data/scripts/script_08009EF0.inc +++ b/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 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index ac5dfd38..84295d14 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009F14 - BeginBlock + BeginBlock _0807EB44 0x0004 Call sub_08060090 DoPostScriptAction 0x000a @@ -7,112 +7,112 @@ 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 WaitForSomething2 0x00000002 Call sub_0806014C TextboxNoOverlapFollowPos 0x1f01, 0x0000 - _0807EA94 + _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 + EndBlock + _0807E864 TextboxNoOverlap 0x1f0e - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_0800A002 - _0807E878 + _0807E878 Jump script_08009FDC script_0800A002: Wait 0x0008 _0807F034 0x0008 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x0008 - _0807EB8C + _0807EB8C TextboxNoOverlapFollow 0x1f13 - _0807EA94 + _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 TextboxNoOverlap 0x1f14 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_0800A002 - _0807E878 + _0807E878 Jump script_0800A024 script_0800A052: TextboxNoOverlap 0x1f11 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_0800A064 - _0807E878 + _0807E878 Jump script_0800A024 script_0800A064: Wait 0x0008 _0807F034 0x0007 Call sub_08060318 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x0008 - _0807EB8C + _0807EB8C TextboxNoOverlapFollow 0x1f10 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800A024 .2byte 0x0000 diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index d24fdd74..4103d535 100644 --- a/data/scripts/script_0800A088.inc +++ b/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 diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index 3645cdfc..25fbd63c 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/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 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index baedeedc..eadf25ba 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/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 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index d6a90fe0..ecc539d6 100644 --- a/data/scripts/script_0800A160.inc +++ b/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 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index 9ea82fa3..51ac4526 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/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 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 2aaed6d4..27f9114e 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -1,24 +1,24 @@ 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 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 TextboxNoOverlapFollowPos 0x1659, 0x0000 - _0807EA94 + _0807EA94 Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000200 _0807E5F8 0x00000004 - _0807E8E4_0 + _0807E8E4_0 WaitForSomething2 0x00000080 _0807E5F8 0x00000010 WaitForSomething2 0x00000200 @@ -28,16 +28,16 @@ SCRIPT_START script_0800A1D8 Call sub_0807F3F8 WaitForSomething2 0x00000080 TextboxNoOverlapFollowPos 0x165a, 0x000e - _0807EA94 + _0807EA94 Wait 0x003c TextboxNoOverlapFollowPos 0x165b, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 _0807E5F8 0x00000008 WaitForSomething2 0x00000100 Wait 0x003c - _0807E8E4_3 + _0807E8E4_3 _0807E5F8 0x00000004 WaitForSomething2 0x00000080 Wait 0x003c @@ -46,10 +46,10 @@ SCRIPT_START script_0800A1D8 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 TextboxNoOverlapFollowPos 0x165c, 0x000e - _0807EA94 + _0807EA94 StopBgm TextboxNoOverlapFollowPos 0x165d, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x000000c0 _0807E5F8 0x00000006 diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 77e8e6b0..b8d89502 100644 --- a/data/scripts/script_0800A310.inc +++ b/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 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index 17bc1479..fbb04752 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/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 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index be0160a5..55f56c7e 100644 --- a/data/scripts/script_0800A500.inc +++ b/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 diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index 9df69772..6bec907c 100644 --- a/data/scripts/script_0800A590.inc +++ b/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 diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index 1f099721..cce609e8 100644 --- a/data/scripts/script_0800A638.inc +++ b/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 diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index 78eb79bf..759fef06 100644 --- a/data/scripts/script_0800A65C.inc +++ b/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 diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index 7112b6da..5ed4c24a 100644 --- a/data/scripts/script_0800A680.inc +++ b/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 diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index 906bdf0b..89faff49 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/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 diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index c655fe02..80e01e1d 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/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 diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index cf586372..64262eab 100644 --- a/data/scripts/script_0800A704.inc +++ b/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 diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index c9767016..3a60f672 100644 --- a/data/scripts/script_0800A734.inc +++ b/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 diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index 098abea1..ce2dd0f7 100644 --- a/data/scripts/script_0800A764.inc +++ b/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 diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index f6662e0e..719c802a 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/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 diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index d00269a5..258b3451 100644 --- a/data/scripts/script_0800A964.inc +++ b/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 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index f0b9135c..0323f7b4 100644 --- a/data/scripts/script_0800A988.inc +++ b/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 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index 9a235bcf..3bafd5c1 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/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 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index 2f385317..7f7495c8 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/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 diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc index e9a1788a..7c33419b 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/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 diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index e992d04f..a96c6c4f 100644 --- a/data/scripts/script_0800AA48.inc +++ b/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 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index e9bbd201..448bf96b 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/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 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index 0a55246e..96901853 100644 --- a/data/scripts/script_0800AA90.inc +++ b/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 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index bc7bf8ad..8c494dd7 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/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 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index 277ab505..50cb8c6d 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/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 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index 3e39cd33..284bd514 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -1,21 +1,21 @@ 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 Call sub_0807F5C0 TextboxNoOverlapFollowPos 0x1664, 0x0000 - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x165e, 0x000e - _0807EA94 + _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index 93ddef40..a0623913 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/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 @@ -14,15 +14,15 @@ SCRIPT_START script_0800AB6E _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x165f, 0x000e - _0807EA94 + _0807EA94 StartPlayerScript script_0800ACBC WaitForSomething2 0x00000001 TextboxNoOverlapFollowPos 0x1660, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x1661, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 @@ -33,9 +33,9 @@ SCRIPT_START script_0800AB6E WaitForSomething2 0x00000001 Wait 0x003c TextboxNoOverlapFollowPos 0x1662, 0x000e - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x1663, 0x000e - _0807EA94 + _0807EA94 SetEntityPosition 0x0000, 0xffe0 Call sub_0807F5C0 _0807E5F8 0x00000002 @@ -46,24 +46,24 @@ SCRIPT_START script_0800AB6E WaitForSomething2 0x00000001 Wait 0x003c TextboxNoOverlapFollowPos 0x1665, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Wait 0x0078 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 diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 8b08a0c0..a8e89bb6 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/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 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index 2f8a0e05..ad53174a 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/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 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 1e49d980..0b2c4414 100644 --- a/data/scripts/script_0800AD54.inc +++ b/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 diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 07fc508d..b206732e 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/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 diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index 15b0a526..6c4e6b61 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/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 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index 53eb509f..6c6c70ed 100644 --- a/data/scripts/script_0800AF18.inc +++ b/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 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc index 9a6fe0ff..aa361372 100644 --- a/data/scripts/script_0800AF44.inc +++ b/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 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc index 17d3b4c5..5bcbf9c6 100644 --- a/data/scripts/script_0800AF68.inc +++ b/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 diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc index 2966dc38..811902f2 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/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 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index 21e9510d..f456e1ff 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/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 diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc index 7cf12c3d..625e93e6 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/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 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 0d1b013e..1f0482f5 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -1,48 +1,48 @@ 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 CheckGlobalFlag 0x0053 JumpIf script_0800B064 TextboxNoOverlap 0x3f32 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5c - _0807EA94 + _0807EA94 SetGlobalFlag 0x0053 Jump script_0800B09C script_0800B064: TextboxNoOverlap 0x3f32 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5d - _0807EA94 + _0807EA94 Jump script_0800B09C script_0800B082: TextboxNoOverlap 0x3f32 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0008 Call Windcrest_Unlock Wait 0x003c _0807EB28 0x0b5e - _0807EA94 + _0807EA94 script_0800B09C: Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc index d89cc551..83897bff 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B0AC - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807FA40 Call sub_0807DF28 _0807EB28 0x0b5f - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index fa5ccadf..597ed7bf 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,50 +1,50 @@ SCRIPT_START script_0800B0D0 - BeginBlock + BeginBlock Call sub_0806BCD4 DoPostScriptAction 0x000a CallWithArg sub_0806BC94, 0x00000000 - EndBlock + EndBlock script_0800B0E8: Call sub_0807F434 JumpTable script_0800B0E8, script_0800B0F6, script_0800B134 script_0800B0F6: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807F2D4 - _0807EB74 + _0807EB74 CallWithArg sub_0806BC94, 0x00000004 Call sub_0806BCE8 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 script_0800B134: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807F2D4 - _0807EB74 + _0807EB74 CallWithArg sub_0806BC94, 0x00000004 Call sub_0807F650 - _0807E9F0 + _0807E9F0 .ifndef EU JumpIfNot script_0800B160 .endif Call sub_0806BCC0 script_0800B160: Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 SCRIPT_START script_0800B17C - BeginBlock + BeginBlock Call sub_0807DF28 SetLocalFlag 0x0039 - _0807E864 - EndBlock - WaitForPlayerAction0x17 + _0807E864 + EndBlock + WaitForPlayerAction0x17 StartPlayerScript script_0800B1C0 Wait 0x0018 _0807E5F8 0x00000002 @@ -53,7 +53,7 @@ SCRIPT_START script_0800B17C Wait 0x0010 PlayBgm BGM_FIGHT_THEME _0807EB28 0x2701 - _0807E878 + _0807E878 Call sub_0807DF50 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 429afa66..64277512 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B1C0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0088, 0x0090 diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc index ebd489df..5bc8481a 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800B200 - BeginBlock + BeginBlock _0807E5F8 0x00000000 .ifdef JP CheckLocalFlag 0x001e @@ -7,34 +7,42 @@ SCRIPT_START script_0800B200 .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIf script_0800B252 SetEntitySpeed 0x00c0 - EndBlock + EndBlock script_0800B216: WaitForSomething2 0x00000001 Call sub_0807DF28 - MoveEntityToPlayer - CameraTargetEntity + MoveEntityToPlayer + CameraTargetEntity _0807EDD4 0x0068, 0x0380 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 Call sub_0807DF50 Wait 0x000c - CameraTargetPlayer + CameraTargetPlayer Wait 0x0008 - _0807E878 + _0807E878 .ifdef JP CheckLocalFlag 0x001e .else .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIfNot script_0800B216 script_0800B252: SCRIPT_END diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index cfe10656..3e51c2ce 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -1,62 +1,62 @@ SCRIPT_START script_0800B254 - BeginBlock + BeginBlock CheckKinstoneFused 0x0006 JumpIf script_0800B302 _0807EA88 0x0006 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B268: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0006 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B268 .2byte 0x0000 SCRIPT_START script_0800B284 - BeginBlock + BeginBlock CheckKinstoneFused 0x0007 JumpIf script_0800B302 _0807EA88 0x0007 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B298: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0007 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B298 .2byte 0x0000 SCRIPT_START script_0800B2B4 - BeginBlock + BeginBlock CheckKinstoneFused 0x0008 JumpIf script_0800B302 _0807EA88 0x0008 _0807EB44 0x0002 - EndBlock + EndBlock script_0800B2C8: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0008 JumpIf script_0800B2E2 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B2C8 script_0800B2E2: DoPostScriptAction 0x0013 _0807EB44 0x0004 - _0807E9DC + _0807E9DC Call sub_080676E0 Call sub_08067534 DoPostScriptAction 0x0012 _0807E5F8 0x00000001 script_0800B302: - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index a283ba91..51dd64ea 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -1,14 +1,18 @@ SCRIPT_START script_0800B308 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x001e .else .ifdef EU CheckLocalFlag 0x001e .else +.ifdef DEMO_JP + CheckLocalFlag 0x001e @ TODO deduplicate +.else CheckLocalFlag 0x001d .endif .endif +.endif JumpIf script_0800B39C DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 @@ -25,17 +29,17 @@ script_0800B33A: JumpIfNot script_0800B348 Call sub_080676D8 script_0800B348: - EndBlock + EndBlock Call sub_0806757C script_0800B350: - EndBlock + EndBlock WaitForSomething2 0x00000002 PlaySound SFX_ITEM_BOMB_EXPLODE Call sub_080676D8 Call sub_0806757C Call sub_080675D4 Wait 0x0014 - BeginBlock + BeginBlock _0807E5F8 0x00000001 CheckKinstoneFused 0x0006 JumpIfNot script_0800B350 @@ -43,16 +47,20 @@ script_0800B350: JumpIfNot script_0800B350 CheckKinstoneFused 0x0008 JumpIfNot script_0800B350 - EndBlock + EndBlock .ifdef JP SetLocalFlag 0x001e .else .ifdef EU SetLocalFlag 0x001e .else +.ifdef DEMO_JP + SetLocalFlag 0x001e @ TODO deduplicate +.else SetLocalFlag 0x001d .endif .endif +.endif PlaySound SFX_SECRET script_0800B39C: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index 29a0db43..4347fbfc 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800B3A4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_0807F158 SetEntitySpeed 0x0120 _0807EB44 0x0004 _0807E908 0x0002 SetIntVariable 0x0000200a - EndBlock + EndBlock script_0800B3C4: _0807EDD4 0x0158, 0x0290 Call sub_08065780 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index f5e2d2ba..abcdb975 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0800B41C - BeginBlock + BeginBlock SetEntitySpeed 0x00c0 _0807E908 0x0001 DoPostScriptAction 0x000b - _0807E864 + _0807E864 Call sub_0807FBC4 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0004 _0807E5F8 0x00000008 StartPlayerScript script_0800B54C _0807EDD4 0x0140, 0x0298 - _0807EB74 + _0807EB74 WaitForSomething2 0x00000004 - _0807EB74 + _0807EB74 Wait 0x003c PlaySound SFX_TASK_COMPLETE _0807F088 0x0037 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C TextboxNoOverlapFollow 0x200c - _0807EA94 + _0807EA94 Wait 0x0014 _0807EDD4 0x0158, 0x0290 Wait 0x000a diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 26fc3d9a..d4eca1cb 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,35 +1,35 @@ SCRIPT_START script_0800B4AC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 SetEntitySpeed 0x00c0 - _0807E9D4 + _0807E9D4 script_0800B4BC: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800B4D4 TestBit 0x00000008 JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlapFollow 0x200b - EndBlock - _0807E878 + EndBlock + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0800B4BC script_0800B4F0: - EndBlock + EndBlock _0807E610 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 WaitForSomething2 0x00000008 TextboxNoOverlapFollow 0x2016 - _0807EA94 + _0807EA94 _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 _0807EB44 0x0000 @@ -40,7 +40,7 @@ script_0800B4F0: _0807E5F8 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C - _0807E878 + _0807E878 Call sub_0807FBCC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index cb550b60..2b50271b 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800B54C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0128, 0x0298 Wait 0x000a _0807EB44 0x0002 diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index f5acdf53..1170c517 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800B574 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001d JumpIf script_0800B5BC - EndBlock + EndBlock WaitForSomething2 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index 7365b9aa..30532b5e 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800B5C4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 - EndBlock + EndBlock Wait 0x001e PlaySound SFX_VO_DOG _0807EDD4 0x008a, 0x005a diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index d4e33835..9bc039db 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,27 +1,27 @@ SCRIPT_START script_0800B5EC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800B5FA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x2009 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_0800B5FA SCRIPT_START script_0800B614 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B618: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B618 Call sub_08079184 - _0807E864 + _0807E864 Call sub_0807F9A4 StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 @@ -30,8 +30,8 @@ script_0800B618: CheckLocalFlag 0x009e JumpIf script_0800B7A2 TextboxNoOverlap 0x0583 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800B684 Wait 0x000f TextboxNoOverlap 0x0584 @@ -42,27 +42,27 @@ script_0800B618: Jump script_0800B6A6 script_0800B684: TextboxNoOverlap 0x057d - _0807EA94 + _0807EA94 Jump script_0800B6A6 script_0800B68E: - _0807EA94 + _0807EA94 SetLocalFlag 0x009e _0807F034 0x0066 script_0800B698: - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C Wait 0x001e TextboxNoOverlap 0x057f - _0807EA94 + _0807EA94 script_0800B6A6: _0807E778 0x0004 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 Call sub_080873FC - DoFade6 - WaitFor_2 - CameraTargetPlayer + DoFade6 + WaitFor_2 + CameraTargetPlayer Wait 0x001e Call sub_0807DF50 - _0807E878 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 4ff26db2..aa5ffd6e 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800B6C8 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B6CC: HasRupees 0x0001 JumpIfNot script_0800B6CC @@ -8,7 +8,7 @@ script_0800B6D4: CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 JumpIfNot script_0800B6D4 Call sub_08079184 - _0807E864 + _0807E864 Call sub_0807F9A4 StartPlayerScript script_0800B7C4 WaitForSomething2 0x00000004 @@ -17,22 +17,22 @@ script_0800B6D4: CheckLocalFlag 0x009f JumpIf script_0800B7A2 TextboxNoOverlap 0x057b - _0807EA94 + _0807EA94 CallWithArg sub_0807F970, 0x0000057d JumpIf script_0800B6A6 - _0807EA94 + _0807EA94 SetLocalFlag 0x009f _0807F034 0x0064 Jump script_0800B698 .2byte 0x0000 SCRIPT_START script_0800B730 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800B734: Call sub_0808747C JumpIfNot script_0800B734 Call sub_08079184 - _0807E864 + _0807E864 Wait 0x000a Call sub_0807F9A4 StartPlayerScript script_0800B7C4 @@ -42,27 +42,27 @@ script_0800B734: CheckLocalFlag 0x00a0 JumpIf script_0800B7A2 TextboxNoOverlap 0x0580 - _0807EA94 + _0807EA94 CallWithArg sub_0807F970, 0x00000582 JumpIf script_0800B794 CallWithArg sub_08087424, 0x00000001 Wait 0x00b4 Jump script_0800B6A6 script_0800B794: - _0807EA94 + _0807EA94 SetLocalFlag 0x00a0 _0807F034 0x0065 Jump script_0800B698 script_0800B7A2: TextboxNoOverlap 0x0590 - _0807EA94 + _0807EA94 _0807E778 0x0010 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 ModHealth 0x00a0 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 TextboxNoOverlap 0x057f - _0807EA94 + _0807EA94 Jump script_0800B6A6 .2byte 0x0000 diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index b9f32d34..32b4d19b 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800B7C4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock CallWithArg sub_0807F6B4, 0x00000090 JumpIfNot script_0800B7FC CallWithArg sub_0807F464, 0x00000078 CallWithArg sub_0807F4F8, 0x00000090 script_0800B7EE: - _0807E8E4_0 + _0807E8E4_0 DoPostScriptAction 0x0000 _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index e2a45b4a..75771a0a 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -2,10 +2,10 @@ SCRIPT_START script_0800B7FC CallWithArg sub_0807F4F8, 0x00000090 CallWithArg sub_0807F464, 0x00000078 Jump script_0800B7EE - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index db081eea..37f795e2 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -1,132 +1,132 @@ SCRIPT_START script_0800B828 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B836: - _0807E944 - _0807E864 + _0807E944 + _0807E864 TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800B836 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B85E: Wait 0x003c Call sub_080646A4 Jump script_0800B85E - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 _0807E930 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B87E: Wait 0x003c Call sub_0806407C Jump script_0800B87E - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800B89E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B89E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800B89E SCRIPT_START script_0800B8B8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a CallWithArg sub_08064644, sub_0806464C - EndBlock + EndBlock script_0800B8D4: Wait 0x003c Call sub_080646A4 Jump script_0800B8D4 .2byte 0x0000 SCRIPT_START script_0800B8E4 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800B8FC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B8FC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800B8FC .2byte 0x0000 SCRIPT_START script_0800B91C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock CheckLocalFlag 0x005f JumpIf script_0800B94E script_0800B934: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B934 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlapFollow 0x3f19 - _0807EA94 + _0807EA94 SetLocalFlag 0x005f - _0807E878 + _0807E878 Jump script_0800B934 script_0800B94E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800B94E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlapFollow 0x3f1a - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800B94E SCRIPT_START script_0800B964 - BeginBlock + BeginBlock DoPostScriptAction 0x000b DoPostScriptAction 0x0008 Call sub_0806DAAC JumpIf script_0800B9AC Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000005 - EndBlock + EndBlock script_0800B98A: - _0807EA4C - _0807E9F0 + _0807EA4C + _0807E9F0 JumpIf script_0800B99E Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B98A script_0800B99E: Call sub_0806F188 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800B9AC: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 91f99499..36547a00 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -1,71 +1,71 @@ SCRIPT_START script_0800B9B4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 Call sub_080694EC DoPostScriptAction 0x000a Call sub_080694B0 - EndBlock + EndBlock script_0800B9CA: Call sub_0807F434 JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 script_0800B9D8: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_080694D8 - _0807EA94 + _0807EA94 Call sub_080694EC - _0807E878 + _0807E878 Jump script_0800B9CA script_0800B9F4: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_0807F650 - _0807E9F0 - _0807E864 + _0807E9F0 + _0807E864 Call sub_0806948C JumpIf script_0800BA24 - _0807EA94 + _0807EA94 Call sub_080694EC Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B9CA script_0800BA24: - _0807EA94 - _0807E9DC - _0807E9D4 + _0807EA94 + _0807E9DC + _0807E9D4 Call sub_080694EC Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800B9CA SCRIPT_START script_0800BA3C - BeginBlock + BeginBlock Call sub_0807F934 - EndBlock + EndBlock script_0800BA46: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800BA46 - _0807E864 + _0807E864 Call sub_0807DF28 TextboxNoOverlapFollow 0x3301 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800BA6C StopBgm Call sub_0806E964 PlayBGM script_0800BA6C: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800BA46 SCRIPT_START script_0800BA78 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 Call sub_0807F348 - EndBlock + EndBlock script_0800BA8E: CheckRoomFlag 0x00ff JumpIfNot script_0800BA8E @@ -78,7 +78,7 @@ script_0800BA8E: _0807EDD4 0x02f0, 0x0350 Wait 0x001e TextboxNoOverlap 0x0e00 - _0807EA94 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index df7c4e03..a7536962 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800BACC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BADE: CheckRoomFlag 0x00ff JumpIfNot script_0800BADE DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e01 - _0807EA94 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 3f992005..57f1ebc3 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800BB00 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800BB04: CheckRoomFlag 0x00ff JumpIfNot script_0800BB04 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e02 - _0807EA94 + _0807EA94 Wait 0x003c DoPostScriptAction 0x000f Wait 0x00b4 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 072d935e..f45cc966 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800BB30 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BB42: CheckRoomFlag 0x00ff JumpIfNot script_0800BB42 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e05 - _0807EA94 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 8bc8cba9..e0e57a4a 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800BB64 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 SetEntitySpeed 0x0040 Call sub_0807F348 - EndBlock + EndBlock script_0800BB7A: CheckRoomFlag 0x00ff JumpIfNot script_0800BB7A _0807EDD4 0x03a0, 0x00f8 Wait 0x001e TextboxNoOverlap 0x0e06 - _0807EA94 + _0807EA94 Wait 0x000f _0807EDD4 0x0380, 0x00f8 Call sub_08054968 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 58a0884d..2a6f3f19 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800BBA4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F348 - EndBlock + EndBlock script_0800BBBA: CheckRoomFlag 0x00ff JumpIfNot script_0800BBBA DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e04 - _0807EA94 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index a9b2b676..40e3f7a9 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800BBDC - BeginBlock + BeginBlock _0807E930 0x0000 - EndBlock + EndBlock script_0800BBE4: CheckRoomFlag 0x00ff JumpIfNot script_0800BBE4 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e03 - _0807EA94 + _0807EA94 Wait 0x0078 Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 52f34b61..165bc66e 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800BC08 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_0800BC18: CheckRoomFlag 0x00ff JumpIfNot script_0800BC18 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e07 - _0807EA94 - BeginBlock + _0807EA94 + BeginBlock _0807EB44 0x0000 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x003c Call sub_08065CCC Wait 0x0078 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 9e7d93e1..1d947843 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800BC50 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_08054EB8 - EndBlock + EndBlock script_0800BC62: CheckRoomFlag 0x00ff JumpIfNot script_0800BC62 @@ -12,7 +12,7 @@ script_0800BC62: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e08 - _0807EA94 + _0807EA94 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 @@ -26,7 +26,7 @@ script_0800BC62: DoPostScriptAction 0x000c Wait 0x003c TextboxNoOverlap 0x0e09 - _0807EA94 + _0807EA94 Call sub_0807F158 CallWithArg sub_0807F4F8, 0x0000035c Wait 0x001e diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index 1d4a66b4..363c0f86 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800BCE8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 Wait 0x003c TextboxNoOverlap 0x0e0a - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -22,7 +22,7 @@ script_0800BD1C: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e0c - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 3b4f628f..95cf6780 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800BD78 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e TextboxNoOverlap 0x0e0b - _0807EA94 + _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 5fed6585..db96e9f7 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800BE1C - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c TextboxNoOverlap 0x0e0d - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800BE88 .2byte 0x0000 SCRIPT_START script_0800BE54 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -41,7 +41,7 @@ script_0800BE8C: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e0f - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index a57fbd89..a43f732a 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800BECC - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e0e - _0807EA94 + _0807EA94 _0807E5F8 0x0000000c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index be10cfed..3bae9d7c 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800BF38 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c TextboxNoOverlap 0x0e10 - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800BFA4 .2byte 0x0000 SCRIPT_START script_0800BF70 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -41,7 +41,7 @@ script_0800BFA8: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e12 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index da82fbf0..80cf2923 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800C004 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e TextboxNoOverlap 0x0e11 - _0807EA94 + _0807EA94 _0807E5F8 0x0000001c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 784fa358..162aff86 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800C0B0 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c TextboxNoOverlap 0x0e13 - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800C11C .2byte 0x0000 SCRIPT_START script_0800C0E8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -41,7 +41,7 @@ script_0800C120: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e15 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 3df5f2f1..686aed8f 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800C160 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e14 - _0807EA94 + _0807EA94 _0807E5F8 0x0000003c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index be502e1f..59e04df4 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800C1D8 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0002 Wait 0x003c TextboxNoOverlap 0x0e16 - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c Jump script_0800C244 .2byte 0x0000 SCRIPT_START script_0800C210 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 Wait 0x003c - _0807EA94 + _0807EA94 _0807E930 0x0008 Wait 0x003c _0807E5F8 0x00000001 @@ -41,7 +41,7 @@ script_0800C248: DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x0e18 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 02d68b9c..3816afe8 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800C2A4 - BeginBlock + BeginBlock _0807EB44 0x0000 _0807E930 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 Call sub_0807F348 - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e TextboxNoOverlap 0x0e17 - _0807EA94 + _0807EA94 _0807E5F8 0x0000007c WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc index fd0d06d5..06f641d6 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C350 - BeginBlock + BeginBlock CallWithArg sub_0806D658, 0x00000003 SetEntitySpeed 0x0200 - EndBlock + EndBlock script_0800C362: CheckRoomFlag 0x00ff JumpIfNot script_0800C362 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index a19ec82a..6bd48e6e 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -7,7 +7,7 @@ SCRIPT_START script_0800C370 _0807F0C8 0x0000, 0x0000 Wait 0x001e TextboxNoOverlap 0x1d00 - _0807EA94 + _0807EA94 _0807E5F8 0x00000006 WaitForSomething2 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index e50a0f31..3e0cd6d7 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C3CC - BeginBlock + BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 2d796192..a0cd7597 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C410 - BeginBlock + BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index a3882952..c98b696d 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800C45C - BeginBlock + BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 Call sub_080A0B28 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 script_0800C47A: - _0807EE30 + _0807EE30 JumpIfNot script_0800C47A Wait 0x003c SetRoomFlag 0x00ff diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index ec34449e..6e278038 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C494 - BeginBlock + BeginBlock SetEntitySpeed 0x0120 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 6a096484..bdd65634 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800C4D0 - BeginBlock + BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 - EndBlock + EndBlock Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 031cc83f..fbb7b440 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800C50C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807E930 0x0004 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000001 Wait 0x000a DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 4c598340..05e0d753 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,37 +1,37 @@ SCRIPT_START script_0800C550 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C55E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C572 Call sub_08060158 - EndBlock + EndBlock Jump script_0800C55E script_0800C572: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08060208 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C55E SCRIPT_START script_0800C584 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C592: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C5A6 Call sub_08060158 - EndBlock + EndBlock Jump script_0800C592 script_0800C5A6: - EndBlock - _0807E864 + EndBlock + _0807E864 CheckInventory1 0x0067 JumpIfNot script_0800C5BC Call sub_08060208 @@ -39,51 +39,51 @@ script_0800C5A6: script_0800C5BC: TextboxNoOverlap 0x4710 script_0800C5C0: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C592 SCRIPT_START script_0800C5C8 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C5D6: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C5EA Call sub_08060158 - EndBlock + EndBlock Jump script_0800C5D6 script_0800C5EA: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08060270 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800C5D6 SCRIPT_START script_0800C5FC - BeginBlock + BeginBlock script_0800C5FE: Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800C60A: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800C61E Call sub_08060158 - EndBlock + EndBlock Jump script_0800C60A script_0800C61E: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806021C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800C60A SCRIPT_START script_0800C634 - BeginBlock + BeginBlock DoPostScriptAction 0x000a SetEntitySpeed 0x0080 _0807EB44 0x0004 @@ -91,10 +91,10 @@ SCRIPT_START script_0800C634 JumpIfNot script_0800C650 SetEntityPosition 0x0010, 0x0000 script_0800C650: - EndBlock + EndBlock script_0800C652: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x0082 JumpIf script_0800C684 @@ -112,30 +112,30 @@ script_0800C684: JumpIf script_0800C6B6 DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f16 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a SetLocalFlag 0x0080 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C6B6: CheckLocalFlag 0x0081 JumpIf script_0800C6DC DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f1b - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C6DC: CheckLocalFlag 0x0082 JumpIf script_0800C712 DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f17 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a _0807EB44 0x0002 @@ -148,40 +148,40 @@ script_0800C6DC: script_0800C712: DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f18 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C730: CheckLocalFlag 0x0083 JumpIf script_0800C756 DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f19 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 script_0800C756: DoPostScriptAction 0x0002 TextboxNoOverlapFollow 0x1f1a - _0807EA94 + _0807EA94 DoPostScriptAction 0x0015 Wait 0x000a Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C652 SCRIPT_START script_0800C774 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 - EndBlock + EndBlock script_0800C780: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800C8F0 WaitForSomething2 0x00000001 @@ -191,46 +191,46 @@ script_0800C780: JumpIf script_0800C7C0 _0807E930 0x0008 TextboxNoOverlapFollow 0x2122 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C7C0: _0807E930 0x0008 CheckLocalFlag 0x0081 JumpIf script_0800C80A TextboxNoOverlapFollow 0x1130 - _0807EA94 + _0807EA94 _0807EB28 0x1131 - _0807EA94 - _0807EB8C + _0807EA94 + _0807EB8C TextboxNoOverlapFollow 0x1132 - _0807EA94 + _0807EA94 SetIntVariable 0x00000103 Call sub_0807F420 TextboxNoOverlapFollow 0x1133 - _0807EA94 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 SetLocalFlag 0x0081 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C80A: TextboxNoOverlapFollow 0x1133 - _0807EA94 + _0807EA94 Wait 0x000a _0807E930 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 script_0800C824: _0807E930 0x0008 CheckLocalFlag 0x0083 JumpIf script_0800C8AE TextboxNoOverlapFollow 0x1135 - _0807EA94 + _0807EA94 SetEntitySpeed 0x0040 _0807EDD4 0x0038, 0x0044 DoPostScriptAction 0x0000 @@ -239,36 +239,36 @@ script_0800C824: Wait 0x003c PlaySound SFX_SECRET Wait 0x003c - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C TextboxNoOverlapFollow 0x1136 - _0807EA94 + _0807EA94 _0807EB28 0x1137 - _0807EA94 + _0807EA94 Wait 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800C87C: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 SetIntVariable 0x00000008 Call sub_0807F3D8 TextboxNoOverlapFollow 0x1136 - _0807EA94 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C87C script_0800C8AE: TextboxNoOverlapFollow 0x1136 - _0807EA94 + _0807EA94 Wait 0x000a DoPostScriptAction 0x0000 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800C780 diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index b5a97320..ed1e9998 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8C8 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00e8, 0x0068 _0807EB44 0x0000 Wait 0x000f diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 4cfdb12b..c39b1353 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C8F0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807ECC4 0x0010 _0807EDD4 0x0078, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index 3c5d833e..54ab0f85 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,47 +1,47 @@ SCRIPT_START script_0800C91C - BeginBlock + BeginBlock _0807EB44 0x0004 SetEntitySpeed 0x0300 - EndBlock + EndBlock script_0800C928: CheckPlayerInRegion 0x0208, 0x0360, 0x2040 JumpIfNot script_0800C928 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800CA8C WaitForSomething2 0x00000002 Wait 0x003c _0807EB28 0x1125 - _0807EA94 + _0807EA94 _0807E5F8 0x00000800 - _0807E8E4_3 + _0807E8E4_3 Wait 0x003c _0807E5F8 0x00000200 - _0807E8E4_0 + _0807E8E4_0 Wait 0x001e _0807E5F8 0x00002000 - _0807E8E4_1 + _0807E8E4_1 Wait 0x0014 _0807E5F8 0x00020000 - _0807E8E4_1 + _0807E8E4_1 Wait 0x000a _0807E5F8 0x00008000 - _0807E8E4_3 + _0807E8E4_3 Wait 0x001e WaitForSomething2 0x00000400 WaitForSomething2 0x00001000 WaitForSomething2 0x00004000 WaitForSomething2 0x00010000 WaitForSomething2 0x00040000 - _0807E8E4_0 + _0807E8E4_0 Wait 0x003c _0807E5F8 0x00000200 WaitForSomething2 0x00000400 - _0807E8E4_0 + _0807E8E4_0 TextboxNoOverlapFollow 0x1126 Call sub_0807F40C - _0807EA94 + _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 _0807E5F8 0x00002000 @@ -54,14 +54,14 @@ script_0800C928: WaitForSomething2 0x00040000 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 - _0807E8E4_3 + _0807E8E4_3 TextboxNoOverlapFollow 0x1127 - _0807EA94 + _0807EA94 _0807E5F8 0x00002000 WaitForSomething2 0x00004000 - _0807E8E4_1 + _0807E8E4_1 TextboxNoOverlapFollow 0x1128 - _0807EA94 + _0807EA94 _0807E5F8 0x00000200 _0807E5F8 0x00000800 _0807E5F8 0x00002000 @@ -72,11 +72,11 @@ script_0800C928: WaitForSomething2 0x00004000 WaitForSomething2 0x00010000 WaitForSomething2 0x00040000 - _0807E8E4_0 + _0807E8E4_0 _0807EB28 0x1129 - _0807EA94 + _0807EA94 SetLocalFlag 0x008d Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index bccf4699..b77826a4 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800CA8C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0208, 0x0358 SetEntitySpeed 0x0080 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 8c741a64..33cb62c3 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CABC - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index b94d1c74..33d6ea64 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CB54 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000800 DoPostScriptAction 0x0007 _0807EB44 0x0002 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 9293653e..20423e5c 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CBD4 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index facb5c9a..ea083bc7 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CC6C - BeginBlock + BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index 78b981d4..9519af22 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800CD04 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 DoPostScriptAction 0x000f Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 7fb12f17..b5e9bc5c 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800CD7C - BeginBlock + BeginBlock CheckInventory1 0x005b JumpIfNot script_0800C5FE Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CD92: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800CDA6 Call sub_08060158 Jump script_0800CD92 script_0800CDA6: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x009d JumpIf script_0800CDC4 @@ -34,29 +34,29 @@ script_0800CDC4: Jump script_0800CF40 script_0800CDEC: TextboxNoOverlap 0x213e - _0807EA94 + _0807EA94 _0807E48C 0x0023 JumpIfNot script_0800CE14 TextboxNoOverlap 0x214b - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0023 - WaitPlayerAction8 + WaitPlayerAction8 Jump script_0800CE32 script_0800CE14: _0807E48C 0x0022 JumpIfNot script_0800CF40 TextboxNoOverlap 0x214b - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0022 - WaitPlayerAction8 + WaitPlayerAction8 script_0800CE32: - _0807EB8C + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 TextboxNoOverlap 0x213f @@ -74,17 +74,17 @@ script_0800CE46: Jump script_0800CF40 script_0800CE6E: TextboxNoOverlap 0x2142 - _0807EA94 + _0807EA94 _0807E48C 0x0027 JumpIfNot script_0800CF40 TextboxNoOverlap 0x214c - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0027 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 TextboxNoOverlap 0x2143 @@ -102,89 +102,89 @@ script_0800CEA6: Jump script_0800CF40 script_0800CECE: TextboxNoOverlap 0x2146 - _0807EA94 + _0807EA94 _0807E48C 0x0024 JumpIfNot script_0800CF40 TextboxNoOverlap 0x214d - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0800CF40 PlaySound SFX_TASK_COMPLETE _0807F088 0x0024 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C SetGlobalFlag 0x0054 Call sub_08060340 TextboxNoOverlap 0x2147 script_0800CF02: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800CF0C: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800CF20 Call sub_08060158 Jump script_0800CF0C script_0800CF20: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 script_0800CF2A: TextboxNoOverlap 0x2140 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800CF0C script_0800CF3C: TextboxNoOverlap 0x214a script_0800CF40: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800CD92 .2byte 0x0000 SCRIPT_START script_0800CF50 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CF5E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800CF72 Call sub_0806811C - EndBlock + EndBlock Jump script_0800CF5E script_0800CF72: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800CF5E SCRIPT_START script_0800CF88 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800CF96: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800CF96 SCRIPT_START script_0800CFAC - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock CheckInventory1 0x0041 JumpIf script_0800CFD2 CheckLocalFlag 0x007e @@ -202,17 +202,17 @@ script_0800CFEC: JumpIfNot script_0800CFFA _0807E5F8 0x00000010 script_0800CFFA: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068910 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800CFFA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckInventory1 0x0002 JumpIfNot script_0800D032 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 TextboxNoOverlap 0x1219 @@ -222,11 +222,11 @@ script_0800D032: JumpIfNot script_0800D098 StartPlayerScript script_0800D190 WaitForSomething2 0x00000008 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 TextboxNoOverlapFollowPos 0x125c, 0x0002 - _0807EA94 + _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 @@ -250,11 +250,11 @@ script_0800D0A8: WaitForSomething2 0x00000004 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 - _0807EB74 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 TextboxNoOverlapFollowPos 0x123d, 0x0002 - _0807EA94 + _0807EA94 StartPlayerScript script_0800D1B4 WaitForSomething2 0x00000008 _0807EB44 0x0002 @@ -269,7 +269,7 @@ script_0800D108: _0807E5F8 0x00000010 SetLocalFlag 0x007e TextboxNoOverlapFollowPos 0x123e, 0x0002 - _0807EA94 + _0807EA94 Wait 0x000f _0807E930 0x0009 _0807E5F8 0x00000002 @@ -278,7 +278,7 @@ script_0800D108: WaitForSomething2 0x00000004 Wait 0x001e TextboxNoOverlapFollowPos 0x123f, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000004 _0807E5F8 0x00000001 @@ -288,9 +288,9 @@ script_0800D108: Call sub_08095164 _0807EB28 0x1240 script_0800D17C: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Call sub_0807DF50 Jump script_0800CFFA .2byte 0x0000 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index e280400d..1cec26bd 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D190 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 4a7bb3c8..cf4aa40f 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D1B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0170, 0x0120 _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 6a4350fa..f923cce1 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -5,7 +5,7 @@ SCRIPT_START script_0800D1E0 CallWithArg sub_0807F238, 0x000001e2 Call sub_0807F304 TextboxNoOverlap 0x0502 - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc index 50f35779..741fe977 100644 --- a/data/scripts/script_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D218 - BeginBlock + BeginBlock CheckInventory1 0x0041 JumpIf script_0800D24C CheckLocalFlag 0x007e JumpIf script_0800D242 DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000010 DoPostScriptAction 0x0007 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index 27de55ab..f601fb80 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D254 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000020 DoPostScriptAction 0x0007 WaitForSomething2 0x00000020 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index e9a10577..35f525df 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,32 +1,32 @@ SCRIPT_START script_0800D278 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D282: CheckInventory1 0x0041 JumpIf script_0800D292 CheckLocalFlag 0x007e JumpIf script_0800D2EA script_0800D292: - BeginBlock + BeginBlock TestBit 0x00000001 JumpIf script_0800D2C6 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800D2B0 Call sub_0806811C - EndBlock + EndBlock Jump script_0800D282 script_0800D2B0: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D282 script_0800D2C6: - EndBlock + EndBlock _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807E5F8 0x00000004 @@ -36,54 +36,54 @@ script_0800D2C6: script_0800D2EA: _0807E930 0x000b script_0800D2EE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D2EE - _0807E864 + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D2EE SCRIPT_START script_0800D308 - BeginBlock + BeginBlock Call sub_08068884 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800D31E: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068910 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D31E - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 SetIntVariable 0x00000000 Call sub_0806C028 TextboxNoOverlapFollow 0x1219 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D31E SCRIPT_START script_0800D350 - BeginBlock + BeginBlock Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D35E: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800D372 Call sub_0806811C - EndBlock + EndBlock Jump script_0800D35E script_0800D372: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068190 - _0807EA94 + _0807EA94 Wait 0x000f CheckLocalFlag 0x007f JumpIf script_0800D3E4 @@ -108,6 +108,6 @@ script_0800D3B2: DoPostScriptAction 0x000a SetLocalFlag 0x007f script_0800D3E4: - _0807E878 + _0807E878 Jump script_0800D35E .2byte 0x0000 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index ed99e4a7..4a39c3f8 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D3EC - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000d diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index fa00f3c6..a779dd97 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D414 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 Call sub_08068104 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800D426: _0807EB44 0x0002 SetIntVariable 0x00000000 @@ -39,13 +39,13 @@ script_0800D426: _0807EDD4 0x0228, 0x01e8 Jump script_0800D426 .2byte 0x0000 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 _0807EB44 0x0004 DoPostScriptAction 0x0000 script_0800D4E4: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -77,31 +77,31 @@ script_0800D556: script_0800D560: _0807EE04 0x00b8, 0x00b8 script_0800D566: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D4E4 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800D584 - _0807EE30 + _0807EE30 JumpIfNot script_0800D566 Jump script_0800D4E4 script_0800D584: - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800D4E4 SCRIPT_START script_0800D59C - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 DoPostScriptAction 0x0000 script_0800D5AC: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000004 @@ -118,16 +118,16 @@ script_0800D5E2: script_0800D5EC: _0807EE04 0x0058, 0x00c8 script_0800D5F2: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_0800D5AC - _0807EE30 + _0807EE30 JumpIfNot script_0800D5F2 Jump script_0800D5AC .2byte 0x0000 SCRIPT_START script_0800D60C - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000b DoPostScriptAction 0x0008 @@ -135,23 +135,23 @@ SCRIPT_START script_0800D60C JumpIf script_0800D6AE Call sub_0806DAD0 CallWithArg sub_0806DA04, 0x00000002 - EndBlock + EndBlock script_0800D636: - _0807EA4C - _0807E9F0 + _0807EA4C + _0807E9F0 Call sub_0806DAAC JumpIf script_0800D650 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800D636 script_0800D650: - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_0807FBC4 Call sub_0807FBA0 SetEntitySpeed 0x0700 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity _0807EDD4 0x01e8, 0x01b8 Wait 0x003c Call sub_0806DAE8 diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc index 297e34b2..a9418e17 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D698 - _0807EEB4 + _0807EEB4 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807FBCC - _0807E878 + _0807E878 Call sub_0807DF50 script_0800D6AE: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index 5ecafb12..ea0deeed 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6B4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 Call sub_0807F158 Call sub_0807F738 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 8150664a..ab61e061 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -1,17 +1,21 @@ SCRIPT_START script_0800D6D0 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x00f0 .else .ifdef EU CheckLocalFlag 0x00f0 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f0 @ TODO deduplicate +.else CheckLocalFlag 0x00f3 .endif .endif +.endif JumpIf script_0800D6E8 DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800D6E0: .ifdef JP CheckLocalFlag 0x00f0 @@ -19,9 +23,13 @@ script_0800D6E0: .ifdef EU CheckLocalFlag 0x00f0 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f0 @ TODO deduplicate +.else CheckLocalFlag 0x00f3 .endif .endif +.endif JumpIfNot script_0800D6E0 script_0800D6E8: DoPostScriptAction 0x0007 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index 63cfa930..4cbdf8b2 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -1,17 +1,21 @@ SCRIPT_START script_0800D6F0 - BeginBlock + BeginBlock .ifdef JP CheckLocalFlag 0x00f2 .else .ifdef EU CheckLocalFlag 0x00f2 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f2 @ TODO deduplicate +.else CheckLocalFlag 0x00f5 .endif .endif +.endif JumpIf script_0800D6E8 DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800D700: .ifdef JP CheckLocalFlag 0x00f2 @@ -19,9 +23,13 @@ script_0800D700: .ifdef EU CheckLocalFlag 0x00f2 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00f2 @ TODO deduplicate +.else CheckLocalFlag 0x00f5 .endif .endif +.endif JumpIfNot script_0800D700 DoPostScriptAction 0x0007 SCRIPT_END diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index b2ce1c33..84de7598 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,22 +1,22 @@ SCRIPT_START script_0800D710 - BeginBlock + BeginBlock Call sub_0807F360 SetEntitySpeed 0x0700 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity Call sub_0807FBC4 - EndBlock + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000010 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807E5F8 0x0000000a WaitForSomething2 0x00000004 - _0807EEB4 + _0807EEB4 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807FBCC - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index 53cf6c21..01e60a1f 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D76C - BeginBlock + BeginBlock Call sub_0807F360 DoPostScriptAction 0x000b SetEntitySpeed 0x0200 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 DoPostScriptAction 0x0004 Wait 0x003c @@ -24,12 +24,12 @@ SCRIPT_START script_0800D76C WaitForSomething2 0x00000008 Jump script_0800D80C SCRIPT_START script_0800D7DC - BeginBlock + BeginBlock Call sub_0807F360 DoPostScriptAction 0x000b SetEntityPositionRelative 0x0268, 0x01d8 SetEntitySpeed 0x0100 - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807EDD4 0x01f0, 0x01d8 _0807E5F8 0x00000004 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index 8b2968e9..cfde64fd 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800D84C - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800D850: CheckRoomFlag 0x0000 JumpIfNot script_0800D850 - _0807E864 + _0807E864 Call sub_0807DF28 Wait 0x003c Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index d1d1d3ed..7f0ee12a 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,23 +1,23 @@ SCRIPT_START script_0800D874 - BeginBlock + BeginBlock Call sub_0807F934 DoPostScriptAction 0x0008 SetIntVariable 0x00000001 Call sub_0806DA04 - EndBlock + EndBlock script_0800D88E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800D88E - _0807E864 + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 StartPlayerScript script_0800D92C WaitForSomething2 0x00000001 script_0800D8B0: - _0807E8E4_0 + _0807E8E4_0 TextboxNoOverlap 0x1324 - _0807EA94 + _0807EA94 CheckInventory1 0x0017 JumpIf script_0800D8D6 CheckLocalFlag 0x0045 @@ -28,27 +28,27 @@ script_0800D8CE: JumpIfNot script_0800D8CE script_0800D8D6: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800D88E .2byte 0x0000 SCRIPT_START script_0800D8E4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 CheckInventory1 0x0017 JumpIf script_0800D924 - EndBlock + EndBlock script_0800D8F4: CheckInventory1 0x0017 JumpIfNot script_0800D8F4 Call sub_0807DF28 - _0807E864 - WaitPlayerAction8 + _0807E864 + WaitPlayerAction8 _0807EB28 0x1325 - _0807EA94 + _0807EA94 PlaySound SFX_113 SetIntVariable 0x00000000 Call sub_0806DA1C - _0807E878 + _0807E878 Call sub_0807DF50 script_0800D924: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index 2ad1c0b1..43b2abb5 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800D92C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index a86c3da9..0fa534e2 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800D954 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 Call sub_0807F180 - EndBlock + EndBlock script_0800D962: CheckPlayerInRegion 0x0118, 0x0038, 0x3050 JumpIfNot script_0800D962 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800DA00 @@ -18,25 +18,25 @@ script_0800D962: PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 TextboxNoOverlap 0x1701 - _0807EA94 + _0807EA94 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 TextboxNoOverlap 0x1702 - _0807EA94 + _0807EA94 SetEntity0x20 0x00010000 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807F050 0x006d - WaitPlayerAction8 + WaitPlayerAction8 _0807EB28 0x1703 - _0807EA94 + _0807EA94 Wait 0x003c SetLocalFlag 0x0032 PlaySound SFX_113 SetIntVariable 0x00000001 Call sub_0806DA1C Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index 9f15202c..3c9463ec 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DA00 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index 042eae3c..bfed0909 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DA28 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 Wait 0x003c diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 7b451f6c..60e36513 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -1,46 +1,46 @@ SCRIPT_START script_0800DA60 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800DA64: CheckPlayerInRegion 0x0078, 0x0148, 0x4040 JumpIfNot script_0800DA64 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807E8E4_0 + _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0080 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 TextboxNoOverlapFollowPos 0x162d, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 Wait 0x001e TextboxNoOverlapFollowPos 0x162e, 0x0002 - _0807EA94 - _0807E8E4_0 + _0807EA94 + _0807E8E4_0 CallWithArg sub_0807F75C, 0x00780138 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 SetRoomFlag 0x0000 Call sub_0807F40C Wait 0x001e - _0807E8E4_1 + _0807E8E4_1 Wait 0x000a - _0807E8E4_3 + _0807E8E4_3 Wait 0x000a - _0807E8E4_2 + _0807E8E4_2 Call sub_0807F3F8 Wait 0x003c SetRoomFlag 0x0001 SetLocalFlag 0x0077 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc index 3cf5e35c..6af5c26a 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB18 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index 5dd5e987..dc596557 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800DB28 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 DoPostScriptAction 0x0014 - EndBlock + EndBlock WaitForSomething2 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 03052307..ed07cc92 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -1,27 +1,27 @@ SCRIPT_START script_0800DB78 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0800DB7C: CallWithArg sub_0807F6B4, 0x000000a0 JumpIf script_0800DB7C - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807F0B4 0x0001 SetEntityPositionRelative 0x0078, 0x0078 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 _0807EB28 0x1648 - _0807EA94 + _0807EA94 Call sub_0804D7EC _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_0800DBCA: CheckRoomFlag 0x0000 JumpIfNot script_0800DBCA - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0804D810 @@ -35,9 +35,9 @@ script_0800DBCA: StartPlayerScript script_0800DE00 WaitForSomething2 0x00000006 TextboxNoOverlapFollowPos 0x1643, 0x0002 - _0807EA94 + _0807EA94 _0807EB28 0x1645 - _0807EA94 + _0807EA94 Call sub_0807F3F8 _0807E5F8 0x00000001 StopBgm diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc index c08bc36d..c9899815 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -4,18 +4,18 @@ SCRIPT_START script_0800DC4C StartPlayerScript script_0800DE50 WaitForSomething2 0x00000006 _0807EB28 0x1646 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 StartPlayerScript script_0800DE2C - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 CallWithArg sub_0806DA1C, 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index 7ac06b7e..f0d48c29 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800DCAC - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock WaitForSomething2 0x00000001 CallWithArg sub_0807F8E8, 0x00000000 _0807E5F8 0x00000002 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index c8ca954c..b2c5c367 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DDD0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock CallWithArg sub_0807F4F8, 0x000000a0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index e8c74e5f..00579691 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE00 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index 125cf382..12867776 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DE2C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc index afed1ce2..012e71d1 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,5 +1,5 @@ SCRIPT_START script_0800DE50 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc index eda4b452..7c0b11f3 100644 --- a/data/scripts/script_0800DE78.inc +++ b/data/scripts/script_0800DE78.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DE78 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_0800DEB0 WaitForSomething2 0x00000001 WaitForSomething2 0x00000002 _0807EB28 0x1647 - _0807EA94 + _0807EA94 SetLocalFlag 0x007a Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index 5ae10991..2c43999a 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800DEB0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index 8a4dc2fd..3c5f2e5e 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800DED4 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 SetEntitySpeed 0x0100 DoPostScriptAction 0x000b Call sub_08066D04 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08066D14 SetEntityPositionRelative 0x0198, 0x0148 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index 5711733f..ab64048a 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0800DF24 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm - _0807E8E4_2 + _0807E8E4_2 Wait 0x005a Call sub_0807F3F8 Wait 0x003c - _0807E8E4_0 + _0807E8E4_0 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 TextboxNoOverlapFollowPos 0x162f, 0x0002 - _0807EA94 + _0807EA94 PlayBgm BGM_VAATI_REBORN DoPostScriptAction 0x0019 PlaySound SFX_198 @@ -29,10 +29,10 @@ SCRIPT_START script_0800DF24 DoPostScriptAction 0x0008 Wait 0x0080 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 SetLocalFlag 0x0078 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index e3de08af..99f9742c 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DFB4 - EndBlock + EndBlock script_0800DFB6: CheckRoomFlag 0x0001 JumpIfNot script_0800DFB6 StopBgm - _0807E864 + _0807E864 Call sub_0807DF28 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 46080434..9ab37ed5 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -1,31 +1,31 @@ SCRIPT_START script_0800DFE4 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 - EndBlock + _0807E864 + EndBlock StopBgm TextboxNoOverlapFollowPos 0x1632, 0x0002 - _0807EA94 + _0807EA94 SetRoomFlag 0x0003 script_0800DFFE: CheckRoomFlag 0x0000 JumpIfNot script_0800DFFE PlayBgm BGM_VAATI_TRANSFIGURED Call sub_0807DF50 - _0807E878 + _0807E878 script_0800E012: CheckRoomFlag 0x0002 JumpIfNot script_0800E012 - _0807E864 + _0807E864 Call sub_0807DF28 SetLocalFlag 0x007b TextboxNoOverlapFollowPos 0x1639, 0x000c - _0807EA94 + _0807EA94 Wait 0x0096 PlaySound SFX_EVAPORATE CallWithArg sub_0806DA1C, 0x00000005 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index 7bafd454..b1091a3d 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800E050 - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 - EndBlock + _0807E864 + EndBlock StopBgm StopBgm Wait 0x0078 _0807EB28 0x1638 - _0807EA94 + _0807EA94 SetRoomFlag 0x0000 Wait 0x001e _0807E5F8 0x00000001 StartPlayerScript script_0800E094 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index a3891eab..269c0dcd 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E094 - BeginBlock + BeginBlock SetEntitySpeed 0x00c0 - EndBlock + EndBlock WaitForSomething2 0x00000001 DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index b00339ee..c1432caf 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800E0BC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0093 JumpIf script_0800E12E _0807E930 0x0008 CallWithArg sub_0807F8E8, 0x00000000 - EndBlock + EndBlock script_0800E0DE: CheckRoomFlag 0x0000 JumpIfNot script_0800E0DE - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -24,40 +24,40 @@ script_0800E0DE: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 Wait 0x000a TextboxNoOverlap 0x2402 - _0807EA94 + _0807EA94 SetLocalFlag 0x0093 script_0800E12E: Call sub_080668F0 - _0807E878 - EndBlock + _0807E878 + EndBlock script_0800E138: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E138 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x2402 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E138 .2byte 0x0000 SCRIPT_START script_0800E154 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0094 JumpIf script_0800E1D0 _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000001 - EndBlock + EndBlock script_0800E176: CheckRoomFlag 0x0001 JumpIfNot script_0800E176 - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -71,51 +71,51 @@ script_0800E176: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x000a TextboxNoOverlap 0x2401 - _0807EA94 + _0807EA94 SetLocalFlag 0x0094 script_0800E1D0: CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E1E0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2401 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E1E0 SCRIPT_START script_0800E200 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0073 JumpIfNot script_0800E232 - _0807E9D4 + _0807E9D4 SetEntityPositionRelative 0x0070, 0x0168 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock Jump script_0800E32E script_0800E232: CheckLocalFlag 0x0095 JumpIf script_0800E29A _0807E930 0x0010 CallWithArg sub_0807F8E8, 0x00000002 - EndBlock + EndBlock script_0800E24A: CheckRoomFlag 0x0002 JumpIfNot script_0800E24A - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -129,20 +129,20 @@ script_0800E24A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 + _0807EB8C + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 SetLocalFlag 0x0095 script_0800E29A: DoPostScriptAction 0x0000 CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E2AE: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800E312 CheckLocalFlag 0x0093 JumpIfNot script_0800E2AE @@ -150,41 +150,41 @@ script_0800E2AE: JumpIfNot script_0800E2AE CheckLocalFlag 0x0095 JumpIfNot script_0800E2AE - _0807E9DC + _0807E9DC SetLocalFlag 0x0073 - EndBlock + EndBlock _0807EB44 0x0000 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0088, 0x0168 _0807EB44 0x0006 CallWithArg sub_0807F3D8, 0x00000004 _0807EDD4 0x0070, 0x0168 - _0807EB74 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 + _0807E9D4 Jump script_0800E32E script_0800E312: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock TextboxNoOverlap 0x2404 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E2AE script_0800E32E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E32E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2403 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E32E .2byte 0x0000 SCRIPT_START script_0800E350 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a CheckLocalFlag 0x0071 @@ -193,11 +193,11 @@ SCRIPT_START script_0800E350 JumpIf script_0800E3BE _0807E930 0x000c CallWithArg sub_0807F8E8, 0x00000000 - EndBlock + EndBlock script_0800E37A: CheckRoomFlag 0x0000 JumpIfNot script_0800E37A - _0807E864 + _0807E864 Wait 0x001e DoPostScriptAction 0x0010 PlaySound SFX_1C9 @@ -211,95 +211,95 @@ script_0800E37A: DoPostScriptAction 0x0004 Wait 0x001e DoPostScriptAction 0x0000 - _0807EB74 + _0807EB74 SetLocalFlag 0x0096 script_0800E3BE: DoPostScriptAction 0x0000 - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E3C8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x240c - _0807EA94 + _0807EA94 Wait 0x000f _0807F034 0x0053 - WaitPlayerAction8 + WaitPlayerAction8 SetLocalFlag 0x0071 - _0807E878 + _0807E878 script_0800E3E8: - _0807E9D4 - _0807E878 - EndBlock + _0807E9D4 + _0807E878 + EndBlock script_0800E3EE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x240d - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E3EE SCRIPT_START script_0800E408 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x000a Call sub_080668F0 - EndBlock + EndBlock script_0800E41A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E41A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x2406 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E41A SCRIPT_START script_0800E434 - BeginBlock + BeginBlock _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800E44C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E44C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2405 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E44C SCRIPT_START script_0800E46C - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800E484: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E484 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlap 0x2407 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E484 SCRIPT_START script_0800E4A4 - BeginBlock + BeginBlock Call sub_0807F354 - EndBlock + EndBlock CheckLocalFlag 0x007c JumpIf script_0800E4FA script_0800E4B6: @@ -313,39 +313,43 @@ script_0800E4B6: .endif .endif JumpIfNot script_0800E4B6 - BeginBlock + BeginBlock _0807E864 .ifdef JP +.ifndef DEMO_JP Call sub_0805E544 +.endif .else .ifdef EU Call sub_0805E544 .endif .endif - EndBlock + EndBlock Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollow 0x160c - _0807EA94 + _0807EA94 Wait 0x001e TextboxNoOverlapFollow 0x160d - _0807EA94 + _0807EA94 Wait 0x001e _0807EB28 0x160e Wait 0x003c - _0807EA94 - BeginBlock + _0807EA94 + BeginBlock PlayBgm BGM_FIGHT_THEME2 SetLocalFlag 0x007c .ifdef JP +.ifndef DEMO_JP Call UnfreezeTime +.endif .else .ifdef EU Call UnfreezeTime .endif .endif script_0800E4FA: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index 3beea212..52e85d09 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800E504 - BeginBlock - EndBlock + BeginBlock + EndBlock CheckLocalFlag 0x007d JumpIf script_0800E53C script_0800E510: CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 JumpIfNot script_0800E510 - _0807E864 + _0807E864 Wait 0x001e Call sub_0807F3F8 Wait 0x003c @@ -15,6 +15,6 @@ script_0800E510: _0807EB28 0x1617 SetLocalFlag 0x007d script_0800E53C: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index d56ce3ff..1b7a7f95 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800E544 - BeginBlock - EndBlock + BeginBlock + EndBlock CheckLocalFlag 0x007e JumpIf script_0800E582 script_0800E550: CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 JumpIfNot script_0800E550 - _0807E864 + _0807E864 Wait 0x001e Call sub_0807F3F8 Wait 0x003c @@ -16,7 +16,7 @@ script_0800E550: Call sub_08053494 SetLocalFlag 0x007e script_0800E582: - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index f32c3d6e..f01aa39a 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800E58C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 DoPostScriptAction 0x0014 - EndBlock + EndBlock Wait 0x003c PlaySound SFX_105 Wait 0x003c PlaySound SFX_9B Wait 0x001e TextboxNoOverlap 0x1625 - _0807EA94 + _0807EA94 Wait 0x003c Call sub_08053C84 SCRIPT_END diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc index 04160a36..49daf384 100644 --- a/data/scripts/script_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E5C4 - BeginBlock + BeginBlock CheckLocalFlag 0x0086 JumpIfNot script_0800E5D6 DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index c1219cee..b2e3dd76 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E5D6 - EndBlock + EndBlock script_0800E5D8: CheckLocalFlag 0x0086 JumpIfNot script_0800E5D8 - _0807E864 + _0807E864 Wait 0x003c SetIntVariable 0x00000905 Call sub_0807F420 SetRoomFlag 0x0001 Wait 0x001e - _0807E878 + _0807E878 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 282b2a6d..f5bf0e9e 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E600 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_0 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_0 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 1e325aeb..d19fe97c 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E62C - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_1 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_1 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index 3368222f..ca0d71bf 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E658 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_2 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_2 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index 1f12e319..428f2ece 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E684 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0018 - _0807E864 + _0807E864 Call sub_0807F354 - EndBlock - WaitForPlayerAction0x17 - _0807E8E4_3 + EndBlock + WaitForPlayerAction0x17 + _0807E8E4_3 DoPostScriptAction 0x0001 Call sub_080752AC - _0807E878 + _0807E878 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index c345a277..83cdc0f8 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,69 +1,69 @@ SCRIPT_START script_0800E6B0 - BeginBlock + BeginBlock Call sub_08060090 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800E6BE: - BeginBlock - CheckEntityInteractType + BeginBlock + CheckEntityInteractType JumpIf script_0800E6D2 Call sub_08060158 - EndBlock + EndBlock Jump script_0800E6BE script_0800E6D2: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806025C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E6BE SCRIPT_START script_0800E6E8 - BeginBlock + BeginBlock Call sub_0806ADFC DoPostScriptAction 0x000a script_0800E6F4: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800E708 Call sub_0806AEE4 Jump script_0800E6F4 script_0800E708: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806AFE8 JumpIf script_0800E722 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E6F4 script_0800E722: - _0807EA94 + _0807EA94 _0807F034 0x0057 - WaitPlayerAction8 - _0807EA94 - _0807E878 + WaitPlayerAction8 + _0807EA94 + _0807E878 Jump script_0800E6F4 .2byte 0x0000 SCRIPT_START script_0800E734 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800E73E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E73E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0806AF60, 0x00000000 Call sub_0806AFE8 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800E73E SCRIPT_START script_0800E760 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a SetEntitySpeed 0x0200 CheckGlobalFlag 0x0029 @@ -74,23 +74,23 @@ script_0800E77C: SetEntityPositionRelative 0x0188, 0x0098 Jump script_0800E6F4 script_0800E786: - EndBlock + EndBlock script_0800E788: - BeginBlock + BeginBlock CheckGlobalFlag 0x002a JumpIf script_0800E7BA - CheckEntityInteractType + CheckEntityInteractType JumpIf script_0800E7A4 Call sub_0806AEE4 - EndBlock + EndBlock Jump script_0800E788 script_0800E7A4: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806AFE8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800E788 script_0800E7BA: DoPostScriptAction 0x000f @@ -99,63 +99,63 @@ script_0800E7BA: Call sub_0806AF70 _0807EE04 0x0188, 0x0058 script_0800E7D8: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806AF78 - _0807EE30 + _0807EE30 JumpIfNot script_0800E7D8 - EntityHasHeight + EntityHasHeight JumpIf script_0800E7D8 - EndBlock + EndBlock Jump script_0800E6F4 SCRIPT_START script_0800E7F4 - BeginBlock + BeginBlock Call sub_0806C674 DoPostScriptAction 0x000a _0807EB44 0x0004 - EndBlock + EndBlock script_0800E806: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E806 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C70C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_0800E806 .2byte 0x0000 SCRIPT_START script_0800E824 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0000 - EndBlock + EndBlock script_0800E832: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E832 - _0807E864 + _0807E864 _0807EB44 0x0004 - BeginBlock + BeginBlock TextboxNoOverlapFollow 0x4501 CallWithArg sub_0807F854, 0x00010032 CallWithArg sub_0807F854, 0x000200c8 CallWithArg sub_0807F854, 0x00030190 - EndBlock - _0807EA94 - _0807EB38 + EndBlock + _0807EA94 + _0807EB38 JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 script_0800E872: - BeginBlock + BeginBlock TextboxNoOverlapFollow 0x4505 CallWithArg sub_0807F854, 0x00010190 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x0190 JumpIfNot script_0800E908 ModRupees 0xfe70 SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 - _0807EA94 + _0807EA94 Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index c357c472..5cffcef6 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E8A4 - BeginBlock + BeginBlock TextboxNoOverlapFollow 0x4504 CallWithArg sub_0807F854, 0x000100c8 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x00c8 JumpIfNot script_0800E908 ModRupees 0xff38 SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 - _0807EA94 + _0807EA94 Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index a288f654..cfa1d8ff 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E8D6 - BeginBlock + BeginBlock TextboxNoOverlapFollow 0x4503 CallWithArg sub_0807F854, 0x00010032 - EndBlock - _0807EA94 + EndBlock + _0807EA94 HasRupees 0x0032 JumpIfNot script_0800E908 ModRupees 0xffce SetLocalFlag 0x0091 TextboxNoOverlapFollow 0x4508 - _0807EA94 + _0807EA94 Call sub_0806C598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 90180d0e..d0f8d043 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -4,58 +4,58 @@ SCRIPT_START script_0800E908 script_0800E910: TextboxNoOverlapFollow 0x4509 script_0800E914: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0000 Jump script_0800E832 SCRIPT_START script_0800E920 - BeginBlock + BeginBlock Call sub_0806C4F8 DoPostScriptAction 0x000a _0807EB44 0x0000 - EndBlock + EndBlock script_0800E932: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E932 - _0807E864 + _0807E864 _0807EB44 0x0004 _0807E930 0x0004 script_0800E942: Call sub_0806C4A8 JumpIfNot script_0800E942 Call sub_0806C4DC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0000 _0807E930 0x0000 Jump script_0800E932 .2byte 0x0000 SCRIPT_START script_0800E964 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800E974: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800E974 - _0807E864 + _0807E864 _0807E930 0x0008 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806B260 JumpIfNot script_0800E9E4 - _0807EA94 + _0807EA94 DoPostScriptAction 0x000b StartPlayerScript script_0800E9F4 WaitForSomething2 0x00000001 DoPostScriptAction 0x000a TextboxNoOverlapFollow 0x4a24 - _0807EA94 + _0807EA94 _0807E930 0x000a Wait 0x0014 TextboxNoOverlapFollow 0x4a25 - _0807EA94 + _0807EA94 _0807E930 0x0000 StartPlayerScript script_0800EA1C WaitForSomething2 0x00000001 @@ -63,11 +63,11 @@ script_0800E974: PlaySound SFX_SECRET Wait 0x00f0 TextboxNoOverlapFollow 0x4a26 - _0807EA94 + _0807EA94 SetLocalFlag 0x0075 script_0800E9E4: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807E930 0x0000 Jump script_0800E974 diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index 1c1b1d22..c801e9d9 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0800E9F4 - BeginBlock + BeginBlock _0807EB44 0x0004 SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index e114b2e9..74afaf9f 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,185 +1,185 @@ SCRIPT_START script_0800EA54 - BeginBlock + BeginBlock Call sub_0806CE5C DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 - EndBlock + EndBlock script_0800EA6A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EA6A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_0807F2D4 _0807E930 0x0009 Call sub_0806CE80 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E930 0x000a Call sub_0807F2D4 _0807E930 0x0008 Jump script_0800EA6A SCRIPT_START script_0800EAA4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 Call sub_0806C09C DoPostScriptAction 0x000a _0807E930 0x0000 _0807EB44 0x0004 - EndBlock + EndBlock script_0800EABC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EABC - BeginBlock - _0807E864 - _0807EB74 + BeginBlock + _0807E864 + _0807EB74 CallWithArg sub_0806C028, 0x00000004 - EndBlock + EndBlock script_0800EAD4: Call sub_0806C00C JumpIfNot script_0800EAD4 _0807E930 0x0008 Call sub_0806C038 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807E930 0x0000 Jump script_0800EABC SCRIPT_START script_0800EAF8 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0000 - EndBlock + EndBlock script_0800EB0E: - _0807E30C + _0807E30C JumpIfNot script_0800EB0E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800EB0E .2byte 0x0000 SCRIPT_START script_0800EB2C - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800EB44: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EB44 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EB44 .2byte 0x0000 SCRIPT_START script_0800EB64 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 - EndBlock + EndBlock script_0800EB7C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EB7C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0006 Call sub_08061FD8 Jump script_0800EB7C - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 - EndBlock + EndBlock Jump script_0800EBF4 SCRIPT_START script_0800EBC0 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock Jump script_0800EBF4 SCRIPT_START script_0800EBDC - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0006 Call sub_08061FD8 - EndBlock + EndBlock script_0800EBF4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EBF4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EBF4 .2byte 0x0000 SCRIPT_START script_0800EC14 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0002 Call sub_08061FD8 - EndBlock + EndBlock script_0800EC2C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EC2C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0002 Call sub_08061FD8 Jump script_0800EC2C SCRIPT_START script_0800EC54 - BeginBlock + BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a _0807EB44 0x0004 Call sub_08061FD8 - EndBlock + EndBlock script_0800EC6C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800EC6C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FD8 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800EC6C .2byte 0x0000 SCRIPT_START script_0800EC8C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 SetEntitySpeed 0x0040 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0002 - EndBlock + EndBlock script_0800ECAC: _0807EB44 0x0006 _0807E930 0x0007 @@ -203,85 +203,85 @@ script_0800ECAC: Wait 0x001e Jump script_0800ECAC SCRIPT_START script_0800ED04 - BeginBlock + BeginBlock Call sub_080639D0 DoPostScriptAction 0x000a - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_08063850, 0x00000000 - EndBlock + EndBlock script_0800ED20: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800ED20 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_08063850, 0x00000000 Call sub_08063944 - _0807EA94 + _0807EA94 JumpIfNot script_0800ED46 _0807F050 0x0070 - WaitPlayerAction8 + WaitPlayerAction8 script_0800ED46: - _0807E878 + _0807E878 Call sub_08063874 CallWithArg sub_08063850, 0x00000000 Jump script_0800ED20 SCRIPT_START script_0800ED5C - BeginBlock + BeginBlock Call sub_08064CC0 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0002 _0807E930 0x0000 - EndBlock + EndBlock script_0800ED76: - _0807E944 - _0807E864 - _0807EB74 + _0807E944 + _0807E864 + _0807EB74 Call sub_08064CD8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800ED76 .2byte 0x0000 SCRIPT_START script_0800ED90 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a script_0800ED98: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800EDB6 TestBit 0x00000001 JumpIf script_0800EE12 Call sub_0806AEE4 Jump script_0800ED98 script_0800EDB6: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EE3E Wait 0x000a _0807E5F8 0x00000001 TextboxNoOverlapFollow 0x4c07 - _0807EA94 + _0807EA94 _0807E5F8 0x00000010 TextboxNoOverlapFollow 0x4c08 - _0807EA94 + _0807EA94 _0807E5F8 0x00000020 TextboxNoOverlapFollow 0x4c09 - _0807EA94 + _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 _0807E5F8 0x00000040 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x00ae Jump script_0800ED98 script_0800EE12: - EndBlock + EndBlock WaitForSomething2 0x00000002 _0807EB44 0x0002 CallWithArg sub_0806AF60, 0x00000008 @@ -291,48 +291,48 @@ script_0800EE12: Jump script_0800ED98 script_0800EE3E: TextboxNoOverlapFollow 0x4c16 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800ED98 SCRIPT_START script_0800EE50 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a script_0800EE58: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0800EE76 TestBit 0x00000001 JumpIf script_0800EED2 Call sub_0806AEE4 Jump script_0800EE58 script_0800EE76: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 CheckLocalFlag 0x00ae JumpIf script_0800EEFE Wait 0x000a _0807E5F8 0x00000001 TextboxNoOverlapFollow 0x4c07 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 TextboxNoOverlapFollow 0x4c08 - _0807EA94 + _0807EA94 _0807E5F8 0x00000004 TextboxNoOverlapFollow 0x4c09 - _0807EA94 + _0807EA94 SetIntVariable 0x00000503 Call sub_0807F420 _0807E5F8 0x00000008 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x00ae Jump script_0800EE58 script_0800EED2: - EndBlock + EndBlock WaitForSomething2 0x00000010 _0807EB44 0x0006 CallWithArg sub_0806AF60, 0x00000008 @@ -342,19 +342,19 @@ script_0800EED2: Jump script_0800EE58 script_0800EEFE: TextboxNoOverlapFollow 0x4c15 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0800EE58 TextboxNoOverlapFollow 0x4c07 - _0807EA94 + _0807EA94 _0807E5F8 0x00000012 Wait 0x000a TextboxNoOverlapFollow 0x4c08 - _0807EA94 + _0807EA94 _0807E5F8 0x00000024 TextboxNoOverlapFollow 0x4c09 - _0807EA94 + _0807EA94 _0807E5F8 0x00000048 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 74e61575..e897f7e2 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,28 +1,28 @@ SCRIPT_START script_0800EF40 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001f JumpIf script_0800EF92 - EndBlock + EndBlock script_0800EF50: Call sub_080869A4 JumpIfNot script_0800EF50 - _0807E864 + _0807E864 CheckLocalFlagByOffset 0x0200, 0x006d JumpIf script_0800EF82 TextboxNoOverlapFollow 0x4d01 - _0807EA94 + _0807EA94 StartPlayerScript script_0800EF9C WaitForSomething2 0x00000001 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800EF50 script_0800EF82: SetGlobalFlag 0x001f TextboxNoOverlapFollow 0x4d02 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 script_0800EF92: Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index 6e1be5e2..d3e025d2 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800EF9C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0001 _0807ECC4 0x0008 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index cf88816f..76060064 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800EFC0 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CheckLocalFlag 0x007b JumpIf script_0800F082 - EndBlock + EndBlock Jump script_0800EFFE script_0800EFDA: _0807EB44 0x0006 @@ -39,19 +39,19 @@ script_0800EFFE: JumpIf script_0800F082 Jump script_0800EFDA script_0800F082: - EndBlock + EndBlock Call sub_0806AEE4 Jump script_0800F082 .2byte 0x0000 SCRIPT_START script_0800F090 - BeginBlock + BeginBlock _0807F0B4 0x0001 - CameraTargetPlayer - EndBlock + CameraTargetPlayer + EndBlock script_0800F09A: CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 JumpIfNot script_0800F09A - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 LoadRoomEntityList gUnk_080EE8AC @@ -60,33 +60,33 @@ script_0800F09A: _0807E5F8 0x0000001e WaitForSomething2 0x00000040 TextboxNoOverlapFollowPos 0x1201, 0x000c - _0807EA94 + _0807EA94 WaitForSomething2 0x000003c0 - _0807E8E4_0 + _0807E8E4_0 TextboxNoOverlapFollowPos 0x1202, 0x000c - _0807EA94 + _0807EA94 _0807F034 0x0067 - WaitPlayerAction8 - _0807E8E4_0 + WaitPlayerAction8 + _0807E8E4_0 _0807E5F8 0x00000002 WaitForSomething2 0x00000040 TextboxNoOverlapFollowPos 0x1203, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000040 script_0800F11A: CheckKinstoneFused 0x0032 JumpIfNot script_0800F11A - _0807E864 + _0807E864 Call sub_0807DF28 _0807E5F8 0x0000001e Wait 0x003c - _0807E8E4_1 + _0807E8E4_1 WaitForSomething2 0x000003c0 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index 30be825a..debc95ba 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F14C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0000 _0807EB44 0x0006 DoPostScriptAction 0x0004 diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index b9ef9e66..fc4cbc3f 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800F184 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0008 DoPostScriptAction 0x000a - EndBlock + EndBlock Call sub_0807F348 _0807EB44 0x0002 WaitForSomething2 0x00000002 @@ -13,7 +13,7 @@ SCRIPT_START script_0800F184 _0807EDD4 0x01f8, 0x0328 _0807EB44 0x0004 _0807E930 0x0008 - _0807E8E4_0 + _0807E8E4_0 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 Call sub_0806E440 @@ -21,88 +21,88 @@ SCRIPT_START script_0800F184 _0807E5F8 0x00000040 WaitForSomething2 0x00000002 script_0800F1E6: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_0807F680, 0x000001c0 JumpIf script_0800F22A - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + _0807EA94 StartPlayerScript script_0800F33C WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F22A: CallWithArg sub_0807F680, 0x00000230 JumpIfNot script_0800F26A - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + _0807EA94 StartPlayerScript script_0800F354 WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F26A: CallWithArg sub_0807F6B4, 0x00000310 JumpIf script_0800F2AA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + _0807EA94 StartPlayerScript script_0800F36C WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F2AA: CallWithArg sub_0807F6B4, 0x00000340 JumpIfNot script_0800F2EA - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 - _0807EB74 + _0807EB74 _0807E930 0x0008 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlapFollowPos 0x1206, 0x000c - _0807EA94 + _0807EA94 StartPlayerScript script_0800F384 WaitForSomething2 0x00000400 - _0807E878 + _0807E878 Jump script_0800F1E6 script_0800F2EA: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckKinstoneFused 0x0032 JumpIf script_0800F314 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F2EA - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 _0807E930 0x0008 TextboxNoOverlapFollowPos 0x1208, 0x000c - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F1E6 script_0800F314: - EndBlock + EndBlock _0807E5F8 0x00000040 WaitForSomething2 0x00000002 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index d492c9ee..e5f3f939 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F39C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000004 DoPostScriptAction 0x0007 @@ -18,20 +18,20 @@ SCRIPT_START script_0800F39C DoPostScriptAction 0x000a _0807E5F8 0x00000080 script_0800F3EA: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F402 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 TextboxNoOverlap 0x1237 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 script_0800F402: TestBit 0x00000004 JumpIfNot script_0800F3EA - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0010 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 3f822589..d66d02c1 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F430 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000008 DoPostScriptAction 0x0007 @@ -17,20 +17,20 @@ SCRIPT_START script_0800F430 DoPostScriptAction 0x000a _0807E5F8 0x00000100 script_0800F478: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F490 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 TextboxNoOverlap 0x1238 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 script_0800F490: TestBit 0x00000008 JumpIfNot script_0800F478 - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0018 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 958ffa77..edbecc19 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800F4C4 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0002 DoPostScriptAction 0x0001 DoPostScriptAction 0x0008 SetEntitySpeed 0x0080 DoPostScriptAction 0x000b - EndBlock + EndBlock Call sub_0807F348 WaitForSomething2 0x00000010 DoPostScriptAction 0x0007 @@ -17,20 +17,20 @@ SCRIPT_START script_0800F4C4 DoPostScriptAction 0x000a _0807E5F8 0x00000200 script_0800F50C: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_0800F524 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 TextboxNoOverlap 0x1239 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 script_0800F524: TestBit 0x00000010 JumpIfNot script_0800F50C - EndBlock + EndBlock DoPostScriptAction 0x000b Wait 0x0028 SetEntitySpeed 0x0100 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index bf828afc..521ca3b4 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -1,125 +1,125 @@ SCRIPT_START script_0800F554 - BeginBlock + BeginBlock Call sub_08061FE4 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800F564: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F564 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FE4 Call sub_08061FF4 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F564 .2byte 0x0000 SCRIPT_START script_0800F584 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0800F592: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F592 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_0800F592 .2byte 0x0000 SCRIPT_START script_0800F5B0 - BeginBlock + BeginBlock _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800F5C8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F5C8 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F5C8 .2byte 0x0000 SCRIPT_START script_0800F5EC - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_0800F604: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F604 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 TextboxNoOverlap 0x2511 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800F604 SCRIPT_START script_0800F628 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0001 - EndBlock + EndBlock script_0800F636: - _0807E30C + _0807E30C JumpIfNot script_0800F636 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800F636 .2byte 0x0000 SCRIPT_START script_0800F650 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800F662: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F662 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806B4F0 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 DoPostScriptAction 0x0000 Jump script_0800F662 .2byte 0x0000 SCRIPT_START script_0800F688 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_0800F6A0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F6A0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 .ifdef JP CheckLocalFlag 0x00ca @@ -127,28 +127,32 @@ script_0800F6A0: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800F6C4 TextboxNoOverlap 0x2512 Jump script_0800F6C8 script_0800F6C4: TextboxNoOverlap 0x251f script_0800F6C8: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 .2byte 0x0000 SCRIPT_START script_0800F6E0 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a Call sub_08062788 - EndBlock + EndBlock script_0800F6F4: .ifdef JP CheckLocalFlag 0x00ca @@ -156,17 +160,21 @@ script_0800F6F4: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800F718 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800F6F4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_0800F6F4 script_0800F718: diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index bd45a2ff..501b6814 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F724 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0800F72C: .ifdef JP CheckLocalFlag 0x00ca @@ -9,9 +9,13 @@ script_0800F72C: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIfNot script_0800F72C DoPostScriptAction 0x0007 Jump script_0800F584 @@ -24,17 +28,21 @@ SCRIPT_START script_0800F73C .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FA4C - _0807E864 + _0807E864 Call sub_0807DF28 SetEntityPositionRelative 0x00c8, 0x0148 Call sub_0807F844 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 StartPlayerScript script_0800FA54 _0807E5F8 0x00000002 _0807F0B4 0x0001 @@ -47,110 +55,110 @@ SCRIPT_START script_0800F73C WaitForSomething2 0x00000001 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x2501, 0x0000 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000010 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FA78 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x2503, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FA9C WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x2504, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_0800FAC0 WaitForSomething2 0x00000001 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 TextboxNoOverlapFollowPos 0x2505, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 WaitForSomething2 0x00000004 - _0807E864 + _0807E864 Call sub_0807DF28 Call sub_08063C5C PlaySound SFX_CUCCO_MINIGAME_BELL Wait 0x001e - _0807E8E4_0 + _0807E8E4_0 Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollowPos 0x1021, 0x000e - _0807EA94 + _0807EA94 StartPlayerScript script_0800FAE4 SetEntityPositionRelative 0x00f0, 0x0258 _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity Wait 0x001e Call sub_08063C2C WaitForSomething2 0x00000001 TextboxNoOverlapFollowPos 0x1022, 0x000e - _0807EA94 - _0807E8E4_0 + _0807EA94 + _0807E8E4_0 Call sub_08063C14 Call sub_08094CDC Wait 0x001e TextboxNoOverlapFollowPos 0x1023, 0x000e - _0807EA94 + _0807EA94 Call sub_08063C14 Call sub_08094DD8 Wait 0x001e TextboxNoOverlapFollowPos 0x1024, 0x000e - _0807EA94 + _0807EA94 Call sub_08063C14 Call sub_08094D34 Wait 0x001e TextboxNoOverlapFollowPos 0x1025, 0x000e - _0807EA94 + _0807EA94 Call sub_08063C5C TextboxNoOverlapFollowPos 0x1026, 0x000e - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 - _0807E8E4_1 + _0807E8E4_1 Call sub_08063C2C TextboxNoOverlapFollowPos 0x1027, 0x0000 - _0807EA94 + _0807EA94 Call sub_08063C74 Wait 0x003c Call sub_08063C14 - _0807E8E4_0 + _0807E8E4_0 TextboxNoOverlapFollowPos 0x1028, 0x000e - _0807EA94 - _0807E8E4_1 + _0807EA94 + _0807E8E4_1 TextboxNoOverlapFollowPos 0x1029, 0x0000 - _0807EA94 - _0807E8E4_0 + _0807EA94 + _0807E8E4_0 TextboxNoOverlapFollowPos 0x102a, 0x000e - _0807EA94 + _0807EA94 Call sub_08063C14 Call sub_08094D70 PlaySound SFX_103 @@ -161,13 +169,13 @@ SCRIPT_START script_0800F73C Wait 0x001e Call sub_08094E0C Wait 0x001e - _0807E8E4_1 + _0807E8E4_1 Call sub_0807F3F8 Wait 0x003c TextboxNoOverlapFollowPos 0x102b, 0x0000 - _0807EA94 + _0807EA94 _0807F034 0x000d - WaitPlayerAction8 + WaitPlayerAction8 Call sub_0806DC3C Call sub_080791BC CallWithArg sub_0807F244, 0x0000000d @@ -178,11 +186,11 @@ SCRIPT_START script_0800F73C SetIntVariable 0x00000000 Call sub_0807F5B0 TextboxNoOverlapFollowPos 0x102c, 0x0000 - _0807EA94 + _0807EA94 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Wait 0x000a _0807E5F8 0x00000002 Call sub_08063C44 @@ -192,11 +200,15 @@ SCRIPT_START script_0800F73C .ifdef EU SetLocalFlag 0x00ca .else +.ifdef DEMO_JP + SetLocalFlag 0x00ca @ TODO deduplicate +.else SetLocalFlag 0x00cd .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 script_0800FA4C: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index bb03b3ad..f860b75f 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA54 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index 6da1cdb1..1586c6f1 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA78 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index 32d80aea..cf738fff 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FA9C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index 9ca12a8a..c9240cf5 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAC0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index 0db32cf2..957eb40f 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FAE4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F584 JumpTable script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC script_0800FAFC: diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index cfc3e949..687e719e 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800FB44 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x000b SetEntitySpeed 0x0080 Call sub_08066D04 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call sub_08066D14 JumpIf script_0800FB6C - MoveEntityToPlayer + MoveEntityToPlayer script_0800FB6C: DoPostScriptAction 0x0007 SetEntityPositionRelative 0x00b8, 0x0398 @@ -23,9 +23,9 @@ script_0800FB6C: DoPostScriptAction 0x0001 _0807E5F8 0x00000004 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 script_0800FBAE: - _0807E30C + _0807E30C JumpIfNot script_0800FBAE DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -44,7 +44,7 @@ script_0800FBAE: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC06: - _0807E30C + _0807E30C JumpIfNot script_0800FC06 DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -61,7 +61,7 @@ script_0800FC06: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC52: - _0807E30C + _0807E30C JumpIfNot script_0800FC52 DoPostScriptAction 0x000b _0807E5F8 0x00000004 @@ -78,7 +78,7 @@ script_0800FC52: _0807E5F8 0x00000004 DoPostScriptAction 0x000a script_0800FC9E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FC9E DoPostScriptAction 0x000b _0807EB44 0x0000 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 7b8bb425..3ecbe8f3 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -5,9 +5,13 @@ SCRIPT_START script_0800FD0C .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FD50 WaitForSomething2 0x00000010 script_0800FD1A: @@ -19,28 +23,32 @@ script_0800FD1A: .ifdef EU CheckLocalFlag 0x00ca .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else CheckLocalFlag 0x00cd .endif .endif +.endif JumpIf script_0800FD5C - _0807E864 + _0807E864 Call sub_0807F9A4 TextboxNoOverlapFollowPos 0x2506, 0x0000 - _0807EA94 + _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 - _0807E878 + _0807E878 Jump script_0800FD1A script_0800FD50: CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD50 script_0800FD5C: - _0807E864 + _0807E864 Call sub_0807F9A4 TextboxNoOverlapFollowPos 0x106c, 0x0000 - _0807EA94 + _0807EA94 StartPlayerScript script_0800FD80 WaitForSomething2 0x00000008 - _0807E878 + _0807E878 Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index 024ecd82..806f3a31 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,42 +1,42 @@ SCRIPT_START script_0800FDA0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_0800FDB2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FDB2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08069888 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0800FDB2 .2byte 0x0000 SCRIPT_START script_0800FDCC - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 SetEntitySpeed 0x0040 - EndBlock + EndBlock script_0800FDE2: Call sub_08069A60 script_0800FDE8: Call sub_0806991C script_0800FDEE: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE06 - _0807EE30 + _0807EE30 JumpIfNot script_0800FDEE Jump script_0800FDE2 script_0800FE06: - EndBlock + EndBlock _0807EB44 0x0002 DoPostScriptAction 0x0000 Wait 0x001e @@ -53,27 +53,27 @@ script_0800FE06: Jump script_0800FDE8 .2byte 0x0000 SCRIPT_START script_0800FE44 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 SetEntitySpeed 0x0040 - EndBlock + EndBlock script_0800FE5A: Call sub_08069AA8 script_0800FE60: Call sub_080699AC script_0800FE66: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08069ACC JumpIf script_0800FE7E - _0807EE30 + _0807EE30 JumpIfNot script_0800FE66 Jump script_0800FE5A script_0800FE7E: - EndBlock + EndBlock _0807EB44 0x0002 DoPostScriptAction 0x0000 Wait 0x001e @@ -90,28 +90,28 @@ script_0800FE7E: Jump script_0800FE60 .2byte 0x0000 SCRIPT_START script_0800FEBC - BeginBlock + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800FED8: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000b Call sub_080642B8 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FED8 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800FED8 script_0800FF0E: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc index 33b87618..981413e6 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0800FF18 - BeginBlock + BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A _0807EB44 0x0006 - _0807E9D4 + _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 - EndBlock + EndBlock script_0800FF34: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000b Call sub_08064198 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FF34 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 Call sub_08064428 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0800FF34 script_0800FF6A: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 5f45e217..4d54243d 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -1,20 +1,24 @@ SCRIPT_START script_0800FF74 - BeginBlock + BeginBlock _0807EB44 0x0002 - _0807E9D4 + _0807E9D4 CallWithArg sub_0807F3D8, 0x00000008 Call sub_080644A4 .ifdef JP ClearLocalFlag 0x00c4 .else +.ifdef DEMO_JP + ClearLocalFlag 0x00c4 @ TODO deduplicate +.else .ifndef EU ClearLocalFlag 0x00c7 .endif .endif - EndBlock +.endif + EndBlock script_0800FF92: - EndBlock - BeginBlock + EndBlock + BeginBlock DoPostScriptAction 0x000a .ifdef JP CheckLocalFlag 0x00cb @@ -22,9 +26,13 @@ script_0800FF92: .ifdef EU CheckLocalFlag 0x00cb .else +.ifdef DEMO_JP + CheckLocalFlag 0x00cb @ TODO deduplicate +.else CheckLocalFlag 0x00ce .endif .endif +.endif JumpIf script_0800FFCC DoPostScriptAction 0x000b Call sub_08064198 @@ -34,9 +42,13 @@ script_0800FF92: .ifdef EU CheckLocalFlag 0x00c4 .else +.ifdef DEMO_JP + CheckLocalFlag 0x00c4 @ TODO deduplicate +.else CheckLocalFlag 0x00c7 .endif .endif +.endif JumpIfNot script_0800FFCC Call sub_08064488 CheckPlayerInRegion2 0x4040 @@ -44,25 +56,29 @@ script_0800FF92: Call sub_08064470 JumpIf script_08010014 script_0800FFCC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0800FF92 - EndBlock + EndBlock .ifdef JP SetLocalFlag 0x00c4 .else .ifdef EU SetLocalFlag 0x00c4 .else +.ifdef DEMO_JP + SetLocalFlag 0x00c4 @ TODO deduplicate +.else SetLocalFlag 0x00c7 .endif .endif - _0807E864 - _0807EB74 +.endif + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 CheckInventory1 0x0048 JumpIf script_0800FFF8 TextboxNoOverlap 0x3401 - _0807EA94 + _0807EA94 Jump script_08010060 script_0800FFF8: .ifdef JP @@ -71,27 +87,31 @@ script_0800FFF8: .ifdef EU CheckLocalFlag 0x00cb .else +.ifdef DEMO_JP + CheckLocalFlag 0x00cb @ TODO deduplicate +.else CheckLocalFlag 0x00ce .endif .endif +.endif JumpIfNot script_0801000A TextboxNoOverlap 0x340b - _0807EA94 + _0807EA94 Jump script_08010060 script_0801000A: TextboxNoOverlap 0x3402 - _0807EA94 + _0807EA94 Jump script_08010060 script_08010014: - EndBlock - _0807E888 + EndBlock + _0807E888 Call sub_0807F594 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 PlaySound SFX_TASK_COMPLETE TextboxNoOverlap 0x340a - _0807EA94 + _0807EA94 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x0000000c SetEntitySpeed 0x0100 @@ -104,31 +124,35 @@ script_08010014: .ifdef EU SetLocalFlag 0x00cb .else +.ifdef DEMO_JP + SetLocalFlag 0x00cb @ TODO deduplicate +.else SetLocalFlag 0x00ce .endif .endif +.endif script_08010060: Call sub_080644A4 CallWithArg sub_0807F5B0, 0x0000000a - _0807E878 + _0807E878 Jump script_0800FF92 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 - EndBlock + EndBlock script_08010090: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010090 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_080672B0, 0x00000004 TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010090 diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index 562efdf5..eae8c627 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -1,67 +1,67 @@ SCRIPT_START script_080100C8 - BeginBlock + BeginBlock Call sub_08061FE4 Call sub_08061E70 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080100DC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080100DC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08061FE4 Call sub_08062048 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080100DC .2byte 0x0000 SCRIPT_START script_080100FC - BeginBlock + BeginBlock Call sub_08061FE4 Call sub_08061E70 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010110: Wait 0x003c Call sub_08061E90 Jump script_08010110 .2byte 0x0000 SCRIPT_START script_08010120 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010132: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010132 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlapFollow 0x4f22 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08010132 SCRIPT_START script_08010148 - BeginBlock + BeginBlock DoPostScriptAction 0x0001 Call sub_0806C354 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801015A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801015A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CheckRoomFlag 0x0001 JumpIf script_0801019E TextboxNoOverlapFollowPos 0x3001, 0x0000 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080101A6 Call sub_080A1608 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 CallWithArg sub_080A1550, script_080101AC JumpIfNot script_0801015A PlayBgm BGM_CUCCO_MINIGAME @@ -69,51 +69,51 @@ script_0801015A: Jump script_0801015A script_0801019E: Call sub_080A1608 - _0807EA94 + _0807EA94 script_080101A6: - _0807E878 + _0807E878 Jump script_0801015A script_080101AC: - BeginBlock + BeginBlock DoPostScriptAction 0x0008 Call sub_080A1648 - EndBlock + EndBlock Call sub_080A1270 - _0807E864 + _0807E864 Call sub_0807DF28 TextboxNoOverlapFollowPos 0x3004, 0x0007 - _0807EA94 + _0807EA94 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 CallWithArg sub_0807F75C, 0x03400378 Call sub_080791BC Call sub_0807FB74 - _0807E8E4_1 + _0807E8E4_1 Call sub_0807F168 Call sub_080A1388 Call sub_0806EC38 - BeginBlock - MoveEntityToPlayer + BeginBlock + MoveEntityToPlayer Call sub_0807F844 - CameraTargetPlayer - EndBlock + CameraTargetPlayer + EndBlock _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 PlayBGM Call sub_080A13B4 - _0807EA94 + _0807EA94 JumpIfNot script_08010240 Call sub_080A13E8 - WaitPlayerAction8 + WaitPlayerAction8 Call sub_080A1460 - _0807EA94 + _0807EA94 Call sub_080A14A8 script_08010240: Call sub_0807DF50 - _0807E878 + _0807E878 CallWithArg sub_0807F5B0, 0x00000000 ClearRoomFlag 0x0001 Call sub_080A169C diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index d0d023f8..a86eb227 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,69 +1,69 @@ SCRIPT_START script_08010264 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0006 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_0801027A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801027A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08065F64 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0801027A - .2byte 0x0000 + .align 2 SCRIPT_START script_08010294 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080102A6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080102A6 CheckRoomFlag 0x0009 JumpIfNot script_080102CC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Call sub_08062500 Jump script_080102A6 script_080102CC: - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080102A6 .2byte 0x0000 SCRIPT_START script_080102E0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080102F2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080102F2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080102F2 .2byte 0x0000 SCRIPT_START script_0801030C - BeginBlock + BeginBlock DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010314: - EndBlock + EndBlock Call sub_08062698 Call sub_080626AC CallWithArg sub_0807F0EC, 0x00000009 @@ -95,124 +95,124 @@ script_08010386: script_08010390: _0807EE04 0x03c8, 0x00b8 script_08010396: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_080626C0 JumpIf script_08010314 - _0807EE30 + _0807EE30 JumpIfNot script_08010396 Jump script_08010314 .2byte 0x0000 SCRIPT_START script_080103B0 - BeginBlock + BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080103C2: Wait 0x001e Call sub_08062948 Jump script_080103C2 SCRIPT_START script_080103D0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000004 - EndBlock + EndBlock script_080103E8: Wait 0x003c Call sub_0806407C Jump script_080103E8 .2byte 0x0000 SCRIPT_START script_080103F8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08010410: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010410 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08010410 SCRIPT_START script_08010428 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a SetIntVariable sub_08064688 Call sub_08064644 - EndBlock + EndBlock script_08010446: Wait 0x003c Call sub_080646A4 Jump script_08010446 SCRIPT_START script_08010454 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_080636F4 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_08010470: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010470 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_080636D8 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_08010470 SCRIPT_START script_080104A0 - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 Call sub_08063CAC DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_080104BC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080104BC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000004 Call sub_08063C90 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_080104BC SCRIPT_START script_080104EC - BeginBlock + BeginBlock _0807EB44 0x0004 _0807E930 0x0000 DoPostScriptAction 0x000a Call sub_0807F348 - EndBlock + EndBlock script_08010502: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010502 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000008 CheckRoomFlag 0x000e JumpIf script_0801052E SetRoomFlag 0x000e TextboxNoOverlap 0x2b10 - _0807EA94 + _0807EA94 script_0801052E: Call sub_080634E4 JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 @@ -234,8 +234,8 @@ script_08010564: script_08010570: Call sub_080634EC CallWithArg sub_0807F78C, 0x00000000 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080105E0 CallWithArg sub_0807F7C4, 0x00000000 JumpIfNot script_080105C4 @@ -244,10 +244,10 @@ script_08010570: Call sub_08063504 JumpIf script_080105D4 TextboxNoOverlap 0x2b07 - _0807EA94 + _0807EA94 CallWithArg sub_0807F800, 0x00000000 - WaitPlayerAction8 - _0807EA94 + WaitPlayerAction8 + _0807EA94 TextboxNoOverlap 0x2b0c Jump script_080105E0 script_080105C4: @@ -262,142 +262,142 @@ script_080105D4: script_080105DC: TextboxNoOverlap 0x2b0e script_080105E0: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08010502 .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010602: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010602 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlapFollow 0x0a01 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_08010602 SCRIPT_START script_0801061C - BeginBlock + BeginBlock _0807E930 0x0008 script_08010622: Call sub_08062A48 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801062E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801062E - _0807E864 + _0807E864 Call sub_0806265C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_0801062E SCRIPT_START script_08010644 - BeginBlock + BeginBlock _0807E930 0x0009 Jump script_08010622 .2byte 0x0000 SCRIPT_START script_08010650 - BeginBlock + BeginBlock _0807E930 0x000b Jump script_08010622 .2byte 0x0000 - BeginBlock + BeginBlock _0807E930 0x000c Jump script_08010622 .2byte 0x0000 - BeginBlock + BeginBlock _0807E930 0x000d Jump script_08010622 .2byte 0x0000 SCRIPT_START script_08010674 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08010686: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010686 - _0807E864 - _0807EB74 - HasRoomItemForSale + _0807E864 + _0807EB74 + HasRoomItemForSale Call sub_0807F77C TextboxNoOverlapFollowTable 0x3c08, 0x3c09 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 Jump script_08010686 .2byte 0x0000 SCRIPT_START script_080106AC - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080106BE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080106BE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0807F2D4 DoPostScriptAction 0x0000 - HasRoomItemForSale + HasRoomItemForSale JumpIf script_080106E0 TextboxNoOverlap 0x3c07 Jump script_08010726 script_080106E0: Call sub_08062EB8 CallWithArg sub_0807F78C, 0x00000000 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08010726 - _0807EA94 + _0807EA94 BuyItem 0x0000, 0x0000 JumpIf script_0801070C TextboxNoOverlap 0x3c04 Jump script_08010726 script_0801070C: - WaitPlayerAction8 + WaitPlayerAction8 ModHealth 0x0008 Call sub_08062EDC JumpIf script_08010724 TextboxNoOverlap 0x3c06 Jump script_08010726 script_08010724: - WaitPlayerAction8 + WaitPlayerAction8 script_08010726: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0001 Jump script_080106BE .2byte 0x0000 SCRIPT_START script_08010734 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock script_08010746: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010746 - _0807E864 + _0807E864 _0807E930 0x0004 - BeginBlock + BeginBlock Call sub_08062D18 JumpIfNot script_08010786 - EndBlock - _0807EA94 - _0807E3E8 + EndBlock + _0807EA94 + _0807E3E8 JumpIfNot script_08010786 HasRupees 0x00c8 JumpIf script_08010778 @@ -408,60 +408,60 @@ script_08010778: Call sub_08062E14 TextboxNoOverlap 0x4007 script_08010786: - EndBlock - _0807EA94 - _0807E878 + EndBlock + _0807EA94 + _0807E878 _0807E930 0x0008 Jump script_08010746 SCRIPT_START script_08010794 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080107AA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080107AA - _0807E864 + _0807E864 Call sub_0807F2D4 DoPostScriptAction 0x0001 Call sub_08062CBC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0000 Jump script_080107AA .2byte 0x0000 SCRIPT_START script_080107D0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a DoPostScriptAction 0x0007 - _0807E9D4 + _0807E9D4 Call sub_0807F348 Call sub_08069684 - EndBlock + EndBlock script_080107F2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 Call sub_080696B0 script_08010804: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion2 0x3030 JumpIfNot script_080107F2 - HasRoomItemForSale + HasRoomItemForSale JumpIf script_08010860 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010804 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CheckGlobalFlag 0x0042 JumpIfNot script_08010858 CheckGlobalFlag 0x0043 @@ -479,19 +479,19 @@ script_08010858: TextboxNoOverlap 0x2c1a Jump script_080108BA script_08010860: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF38 - _0807EB74 + _0807EB74 Call sub_08069660 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080108B2 Call GoronMerchant_TryToBuyKinstone JumpIfNot script_080108B2 - WaitPlayerAction8 - _0807EA94 - _0807EB8C + WaitPlayerAction8 + _0807EA94 + _0807EB8C CheckGlobalFlag 0x0042 JumpIfNot script_080108AA CheckGlobalFlag 0x0043 @@ -504,25 +504,25 @@ script_080108AA: .ifdef USA SetLocalFlag 0x00fa .else -.ifdef DEMO +.ifdef DEMO_USA SetLocalFlag 0x00fa .endif .endif TextboxNoOverlap 0x2c20 script_080108B2: - _0807EA94 + _0807EA94 Call sub_0807F83C script_080108BA: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_08010804 SCRIPT_START script_080108D0 CheckPlayerInRegion2 0x0808 JumpIfNot script_080108D0 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_080109F0 @@ -530,32 +530,32 @@ SCRIPT_START script_080108D0 CheckRoomFlag 0x0001 JumpIf script_08010900 _0807EB28 0x0b63 - _0807EA94 + _0807EA94 script_08010900: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080108D0 SCRIPT_START script_0801090C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 CheckKinstoneFused 0x001b JumpIf script_0800EF92 - EndBlock + EndBlock script_0801091C: Call sub_080869A4 JumpIfNot script_0801091C - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 CheckRoomFlag 0x0001 JumpIf script_08010942 _0807EB28 0x0b62 - _0807EA94 + _0807EA94 script_08010942: StartPlayerScript script_080109F0 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_0801091C Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index 908a6a23..666fab8c 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010964 CheckPlayerInRegion2 0x0808 JumpIfNot script_08010964 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08010A38 @@ -9,30 +9,34 @@ SCRIPT_START script_08010964 CheckRoomFlag 0x0001 JumpIf script_08010994 _0807EB28 0x0b63 - _0807EA94 + _0807EA94 script_08010994: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08010964 SCRIPT_START script_080109A0 - BeginBlock - EndBlock + BeginBlock + EndBlock .ifdef JP CheckLocalFlag 0x00ce .else .ifdef EU CheckLocalFlag 0x00ce .else +.ifdef DEMO_JP + CheckLocalFlag 0x00ce @ TODO deduplicate +.else CheckLocalFlag 0x00d1 .endif .endif +.endif JumpIf script_080109EA CheckPlayerInRegion2 0x0808 JumpIfNot script_080109A0 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08010A38 @@ -40,10 +44,10 @@ SCRIPT_START script_080109A0 CheckRoomFlag 0x0001 JumpIf script_080109DE _0807EB28 0x0b64 - _0807EA94 + _0807EA94 script_080109DE: Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_080109A0 script_080109EA: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index dd5e7093..d8d9abbb 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080109F0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index 6d0a7712..8e7c7ca4 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A14 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 36c00b7c..e3dae7ae 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08010A38 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 2cdf5764..b08284b9 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08010A5C - BeginBlock + BeginBlock Call sub_0807DF28 - _0807E864 + _0807E864 ModHealth 0x00a0 - EndBlock + EndBlock Wait 0x003c _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 script_08010A78: Call sub_0807F0D8 JumpIfNot script_08010A78 DoPostScriptAction 0x0014 - _0807E878 + _0807E878 Call sub_0807DF50 Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index 96232387..83937eb5 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -1,24 +1,24 @@ SCRIPT_START script_08010A98 - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 DoPostScriptAction 0x000a Call sub_08067314 - EndBlock + EndBlock script_08010AB4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010AB4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_080672B0, 0x00000004 Call sub_08067304 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 CallWithArg sub_080672B0, 0x00000000 Jump script_08010AB4 SCRIPT_START script_08010AE4 - BeginBlock + BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 _0807EB44 0x0004 @@ -26,35 +26,35 @@ SCRIPT_START script_08010AE4 SetEntitySpeed 0x0180 CallWithArg sub_0807F348 Call sub_0806075C - EndBlock - _0807EA94 + EndBlock + _0807EA94 Call sub_080606C0 script_08010B10: - EndBlock + EndBlock Call sub_0806076C DoPostScriptAction 0x0007 script_08010B1C: Call sub_08060700 script_08010B22: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIf script_08010B3A CallWithArg sub_080608E4, 0x00000000 JumpIf script_08010B44 script_08010B3A: - _0807EE30 + _0807EE30 JumpIfNot script_08010B22 Jump script_08010B10 script_08010B44: - EndBlock + EndBlock DoPostScriptAction 0x0000 script_08010B4A: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_080608E4, 0x00000001 JumpIf script_08010B4A - EndBlock + EndBlock Jump script_08010B1C script_08010B62: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 44727354..cce9f2f3 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08010B68 - BeginBlock - _0807E564 + BeginBlock + _0807E564 JumpIfNot script_08010BAC Call sub_0807F924 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08010B88: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_08010BAC - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010B88 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806E2DC - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08010B88 script_08010BAC: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 6e912cff..8535ddbb 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,43 +1,43 @@ SCRIPT_START script_08010BB4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0008 Call sub_0806E440 - EndBlock + EndBlock script_08010BCA: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08010BCA - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 Call sub_0806E418 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E930 0x0008 Jump script_08010BCA .2byte 0x0000 SCRIPT_START script_08010BEC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08011074 WaitForSomething2 0x00000400 _0807F078 0x0034, 0x0002 TextboxNoOverlapFollowPos 0x1036, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 TextboxNoOverlapFollowPos 0x1037, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 TextboxNoOverlapFollowPos 0x1038, 0x000c - _0807EA94 + _0807EA94 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 Call sub_08064180 Call sub_08064180 Call sub_08064180 @@ -53,11 +53,11 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x00000400 SetEntityPositionRelative 0x01f8, 0x0050 _0807F0B4 0x0007 - CameraTargetEntity + CameraTargetEntity Wait 0x000a _0807F0B4 0x0001 _0807E778 0x0001 - DoFade4 + DoFade4 _0807E5F8 0x0002a800 WaitForSomething2 0x00055000 SetEntityPositionRelative 0x01f8, 0x0078 @@ -66,13 +66,13 @@ SCRIPT_START script_08010BEC WaitForSomething2 0x01000000 _0807E5F8 0x0002a800 WaitForSomething2 0x00055000 - _0807E8E4_1 + _0807E8E4_1 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 TextboxNoOverlapFollowPos 0x1039, 0x000c - _0807EA94 + _0807EA94 PlayBgm BGM_CASTLE_TOURNAMENT - _0807E8E4_2 + _0807E8E4_2 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E5F8 0x00000010 @@ -83,7 +83,7 @@ SCRIPT_START script_08010BEC _0807E5F8 0x00000004 WaitForSomething2 0x00000008 TextboxNoOverlapFollowPos 0x103a, 0x000c - _0807EA94 + _0807EA94 SetEntityPositionRelative 0x01f8, 0x01c0 _0807F0B4 0x0004 Wait 0x0078 @@ -101,7 +101,7 @@ SCRIPT_START script_08010BEC _0807E5F8 0x00000100 WaitForSomething2 0x00000200 TextboxNoOverlapFollowPos 0x1043, 0x0000 - _0807EA94 + _0807EA94 PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000100 WaitForSomething2 0x00000200 @@ -117,7 +117,7 @@ SCRIPT_START script_08010BEC _0807E5F8 0x00028000 WaitForSomething2 0x00050000 TextboxNoOverlapFollowPos 0x1044, 0x0000 - _0807EA94 + _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 StopBgm Wait 0x003c diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 2ebf3a9e..20cde3ce 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -13,8 +13,8 @@ SCRIPT_START script_08010E5A _0807E5F8 0x00800000 WaitForSomething2 0x01000000 _0807E778 0x0004 - DoFade7 - WaitFor_2 + DoFade7 + WaitFor_2 Wait 0x003c PlaySound SFX_SPIRITS_RELEASE PlaySound SFX_1C2 @@ -22,8 +22,8 @@ SCRIPT_START script_08010E5A _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C @@ -48,8 +48,8 @@ SCRIPT_START script_08010E5A WaitForSomething2 0x00000020 WaitForSomething2 0x00000200 TextboxNoOverlapFollowPos 0x1045, 0x000c - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x1046, 0x0000 - _0807EA94 + _0807EA94 CallWithArg CreateManager36, 0x00000002 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 54feb621..e9d967cd 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -5,7 +5,7 @@ SCRIPT_START script_08010F84 StartPlayerScript script_080110BC WaitForSomething2 0x00000400 TextboxNoOverlapFollowPos 0x1047, 0x0000 - _0807EA94 + _0807EA94 Call sub_0806DC3C Call sub_080791BC CallWithArg sub_0807F244, 0x0000000d @@ -29,11 +29,11 @@ SCRIPT_START script_08010F84 StopBgm Wait 0x003c TextboxNoOverlapFollowPos 0x104a, 0x0000 - _0807EA94 + _0807EA94 _0807E5F8 0x00000100 WaitForSomething2 0x00000200 TextboxNoOverlapFollowPos 0x1049, 0x0000 - _0807EA94 + _0807EA94 SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 _0807E5F8 0x00000100 diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index 43df8c6b..4f3ea168 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08011074 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc index ae79a2e7..5a5b24bb 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -4,6 +4,6 @@ SCRIPT_START script_08011098 DoPostScriptAction 0x0000 _0807E5F8 0x00000400 _0807E610 0x00000002 - EndBlock + EndBlock Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index 7ca7f0c1..9827dbfb 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080110BC - BeginBlock + BeginBlock SetEntitySpeed 0x0040 - EndBlock + EndBlock SetEntitySpeed 0x0200 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0068 diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index e65fa936..95ed5ca6 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -6,10 +6,10 @@ SCRIPT_START script_080110E8 Call sub_0807F36C SetEntitySpeed 0x0400 _0807ECF4 0x0008 - BeginBlock + BeginBlock Call sub_0807F1E8 DoPostScriptAction 0x0011 - EndBlock + EndBlock Call sub_0807F2D4 WaitForSomething 0x80000000 Call sub_080791BC diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index 7e9e0db4..a2789561 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,17 +1,19 @@ SCRIPT_START script_08011128 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 .ifdef JP - _0807E9D4 +.ifndef DEMO_JP + _0807E9D4 DoPostScriptAction 0x000a +.endif .else .ifdef EU - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a .endif .endif - EndBlock + EndBlock script_08011134: CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 JumpIfNot script_08011134 @@ -45,7 +47,9 @@ script_08011134: DoPostScriptAction 0x0006 SCRIPT_END .ifdef JP +.ifndef DEMO_JP .2byte 0x0000 +.endif .else .ifdef EU .2byte 0x0000 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index 4d5a8961..6c63ae50 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080111CC - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08066D04 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000010 Call sub_08066D14 JumpIf script_080111F6 - MoveEntityToPlayer + MoveEntityToPlayer script_080111F6: Call sub_0807F8BC JumpIf script_08011206 @@ -17,7 +17,7 @@ script_08011206: DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0050 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index 6f11ef20..ef5f171c 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080112C4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08095244 Call sub_0807F338 - EndBlock + EndBlock WaitForSomething 0x0002a800 DoPostScriptAction 0x0007 _0807E930 0x0006 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index 782fe44e..bc84211f 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080115D0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807E930 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00080000 _0807E930 0x0005 PlaySound SFX_11C diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index 115fd3d0..f540d792 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011608 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0006 _0807E930 0x0003 - EndBlock + EndBlock WaitForSomething2 0x00200000 _0807E930 0x0007 PlaySound SFX_11C diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index 13deb024..aecf84a6 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011640 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000040 DoPostScriptAction 0x0007 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index 72f45453..57538123 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080116A8 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F338 WaitForSomething2 0x00000100 DoPostScriptAction 0x0001 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 8b854d03..f1c733d5 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801183C - BeginBlock + BeginBlock Call sub_08095330 - EndBlock + EndBlock WaitForSomething2 0x00800000 _0807EF3C 0x0000, 0x0020 _0807E5F8 0x01000000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 4c9f0bc0..f820b99f 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011890 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock Wait 0x00f0 Call sub_08094B6C _0807EDD4 0x01f8, 0x0088 diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index d0633936..f27d95f1 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080118D4 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock WaitForSomething2 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 50b0e0d3..295f3d62 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0801194C - BeginBlock + BeginBlock _0807EB44 0x0002 Jump script_0801196A .2byte 0x0000 SCRIPT_START script_08011958 - BeginBlock + BeginBlock _0807EB44 0x0006 Jump script_0801196A .2byte 0x0000 SCRIPT_START script_08011964 - BeginBlock + BeginBlock _0807EB44 0x0004 script_0801196A: - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_0801197C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801197C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 CheckGlobalFlag 0x0015 JumpIf script_080119A0 @@ -29,125 +29,129 @@ script_0801197C: script_080119A0: TextboxNoOverlapFollow 0x103f script_080119A4: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801197C SCRIPT_START script_080119B0 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0004 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x0000000c - EndBlock + EndBlock script_080119C8: Wait 0x003c Call sub_0806407C Jump script_080119C8 .2byte 0x0000 -SCRIPT_START script_080119D8 - BeginBlock +SCRIPT_START script_080119D8 + BeginBlock _0807EB44 0x0002 Jump script_080119F6 .2byte 0x0000 SCRIPT_START script_080119E4 - BeginBlock + BeginBlock _0807EB44 0x0004 Jump script_080119F6 .2byte 0x0000 SCRIPT_START script_080119F0 - BeginBlock + BeginBlock _0807EB44 0x0006 script_080119F6: - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A08: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A08 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08011A08 .2byte 0x0000 SCRIPT_START script_08011A2C - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A44: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A44 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlapFollow 0x1320 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08011A44 SCRIPT_START script_08011A64 - BeginBlock + BeginBlock _0807EB44 0x0002 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011A7C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011A7C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 CallWithArg sub_080644B4, 0x00000006 JumpIf script_08011AFA TextboxNoOverlapFollow 0x1320 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08011A7C .2byte 0x0000 - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08011AC4: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011AC4 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 TextboxNoOverlapFollow 0x1322 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08011AC4 SCRIPT_START script_08011AE4 CheckRoomFlag 0x000f JumpIfNot script_08011AE4 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 script_08011AFA: TextboxNoOverlapFollowPos 0x1321, 0x0007 - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x0011 .else .ifdef EU SetLocalFlag 0x0011 .else +.ifdef DEMO_JP + SetLocalFlag 0x0011 @ TODO deduplicate +.else SetLocalFlag 0x0010 .endif .endif +.endif CallWithArg sub_0806DA1C, 0x00000003 - _0807E878 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 0e870c50..e81b6e16 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011B20 - _0807E864 + _0807E864 Call sub_0807DF28 TextboxNoOverlapFollowPos 0x1320, 0x000c - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index 4d7d15d8..fecdf231 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,34 +1,34 @@ SCRIPT_START script_08011B40 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 WaitForSomething2 0x00000004 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c - _0807EB8C + _0807EB8C TextboxNoOverlap 0x3d07 - _0807EA94 + _0807EA94 _0807EB44 0x0004 ClearGlobalFlag 0x0050 Call sub_0807DF50 - _0807E878 + _0807E878 script_08011B84: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011B84 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x3d01 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011BA4 script_08011B9A: - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_08011B84 script_08011BA4: @@ -42,42 +42,42 @@ script_08011BBC: ModRupees 0xfff6 Wait 0x001e TextboxNoOverlap 0x3d06 - _0807EA94 + _0807EA94 CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitFor_2 Wait 0x003c Call sub_0806C224 Jump script_08011B9A SCRIPT_START script_08011BE4 - BeginBlock - _0807E888 - EndBlock + BeginBlock + _0807E888 + EndBlock CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitFor_2 Wait 0x003c - _0807E878 + _0807E878 SetRoomFlag 0x0000 PlayBgm BGM_FIGHT_THEME2 script_08011C04: CheckRoomFlag 0x0064 JumpIfNot script_08011C04 StopBgm - _0807E864 + _0807E864 Wait 0x003c - CameraTargetEntity + CameraTargetEntity Wait 0x003c Call Simon_CreateChest Wait 0x003c - CameraTargetPlayer - _0807E878 + CameraTargetPlayer + _0807E878 script_08011C28: CheckLocalFlag 0x0001 JumpIfNot script_08011C28 - _0807E888 - WaitPlayerAction8 + _0807E888 + WaitPlayerAction8 Wait 0x001e CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitFor_2 Wait 0x003c Call sub_0806C280 SCRIPT_END diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index c74be3e5..154bc0ab 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011C50 - BeginBlock - _0807E864 - EndBlock + BeginBlock + _0807E864 + EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitFor_2 Wait 0x003c DoPostScriptAction 0x0014 Wait 0x001e diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index cbe9a609..2a833792 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -1,599 +1,611 @@ SCRIPT_START script_08011C7C - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011CC2 - EndBlock + EndBlock script_08011C9A: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011C9A - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4515 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011C9A script_08011CC2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002c JumpIf script_08011C9A CheckGlobalFlag 0x002d JumpIf script_08011C9A - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011CC2 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x3105 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011D0E - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011CC2 script_08011D00: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011D00 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011D0E: TextboxNoOverlap 0x3108 - _0807EA94 + _0807EA94 SetGlobalFlag 0x002b - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D00 .2byte 0x0000 SCRIPT_START script_08011D28 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011D6E - EndBlock + EndBlock script_08011D46: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011D46 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4513 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D46 script_08011D6E: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011D46 CheckGlobalFlag 0x002d JumpIf script_08011D46 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011D6E - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x3103 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011DBA - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D6E script_08011DAC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011DAC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011DBA: TextboxNoOverlap 0x3106 - _0807EA94 + _0807EA94 SetGlobalFlag 0x002c - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DAC .2byte 0x0000 SCRIPT_START script_08011DD4 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a CheckGlobalFlag 0x0047 JumpIf script_08011E1A - EndBlock + EndBlock script_08011DF2: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIfNot script_08011DF2 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4514 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DF2 script_08011E1A: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002b JumpIf script_08011DF2 CheckGlobalFlag 0x002c JumpIf script_08011DF2 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E1A - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x3104 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011E66 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E1A script_08011E58: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E58 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011E66: TextboxNoOverlap 0x3107 - _0807EA94 + _0807EA94 SetGlobalFlag 0x002d - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E58 .2byte 0x0000 SCRIPT_START script_08011E80 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011E96: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002f JumpIf script_08011C9A CheckGlobalFlag 0x0030 JumpIf script_08011C9A - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011E96 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011ECC TextboxNoOverlap 0x4524 - _0807EA94 + _0807EA94 Jump script_08011ED8 script_08011ECC: TextboxNoOverlap 0x3111 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011EF4 script_08011ED8: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E96 script_08011EE6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011EE6 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011EF4: TextboxNoOverlap 0x3114 - _0807EA94 + _0807EA94 SetGlobalFlag 0x002e - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011EE6 SCRIPT_START script_08011F0C - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011F22: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011D46 CheckGlobalFlag 0x0030 JumpIf script_08011D46 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011F22 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011F58 TextboxNoOverlap 0x4522 - _0807EA94 + _0807EA94 Jump script_08011F64 script_08011F58: TextboxNoOverlap 0x310f - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_08011F80 script_08011F64: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011F22 script_08011F72: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011F72 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_08011F80: TextboxNoOverlap 0x3112 - _0807EA94 + _0807EA94 SetGlobalFlag 0x002f - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011F72 SCRIPT_START script_08011F98 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08011FAE: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x002e JumpIf script_08011DF2 CheckGlobalFlag 0x002f JumpIf script_08011DF2 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011FAE - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckGlobalFlag 0x0048 JumpIf script_08011FE4 TextboxNoOverlap 0x4523 - _0807EA94 + _0807EA94 Jump script_08011FF0 script_08011FE4: TextboxNoOverlap 0x3110 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_0801200C script_08011FF0: - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011FAE script_08011FFE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08011FFE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 script_0801200C: TextboxNoOverlap 0x3113 - _0807EA94 + _0807EA94 SetGlobalFlag 0x0030 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011FFE SCRIPT_START script_08012024 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801203A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801203A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0094 JumpIf script_0801205E TextboxNoOverlap 0x3122 - _0807EA94 + _0807EA94 SetLocalFlag 0x0094 Jump script_0801209E script_0801205E: _0807E48C 0x0031 JumpIfNot script_08012070 TextboxNoOverlap 0x3123 - _0807EA94 + _0807EA94 Jump script_0801209E script_08012070: TextboxNoOverlap 0x3124 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0801209E _0807E48C 0x0020 JumpIfNot script_0801209A TextboxNoOverlap 0x3125 - _0807EA94 + _0807EA94 _0807F034 0x0031 WaitPlayerAction8 .ifdef USA Call sub_0807FC24 .else -.ifdef DEMO +.ifdef DEMO_USA Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif .endif .endif Jump script_0801209E script_0801209A: TextboxNoOverlap 0x3127 script_0801209E: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801203A .align 2, 0 SCRIPT_START script_080120B0 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080120C6: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080120C6 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0095 JumpIf script_080120EA TextboxNoOverlap 0x3116 - _0807EA94 + _0807EA94 SetLocalFlag 0x0095 Jump script_0801212A script_080120EA: _0807E48C 0x002f JumpIfNot script_080120FC TextboxNoOverlap 0x3117 - _0807EA94 + _0807EA94 Jump script_0801212A script_080120FC: TextboxNoOverlap 0x3118 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_0801212A _0807E48C 0x0020 JumpIfNot script_08012126 TextboxNoOverlap 0x3119 - _0807EA94 + _0807EA94 _0807F034 0x002f WaitPlayerAction8 .ifdef USA Call sub_0807FC24 -.else -.ifdef DEMO +.else +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP Call sub_0807FC24 .endif .endif +.endif Jump script_0801212A script_08012126: TextboxNoOverlap 0x311b script_0801212A: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080120C6 .align 2, 0 SCRIPT_START script_0801213C - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012152: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012152 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 CheckLocalFlag 0x0096 JumpIf script_08012176 TextboxNoOverlap 0x311c - _0807EA94 + _0807EA94 SetLocalFlag 0x0096 Jump script_080121B6 script_08012176: _0807E48C 0x0030 JumpIfNot script_08012188 TextboxNoOverlap 0x311d - _0807EA94 + _0807EA94 Jump script_080121B6 script_08012188: TextboxNoOverlap 0x311e - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080121B6 _0807E48C 0x0020 JumpIfNot script_080121B2 TextboxNoOverlap 0x311f - _0807EA94 + _0807EA94 _0807F034 0x0030 - WaitPlayerAction8 + WaitPlayerAction8 .ifdef USA Call sub_0807FC24 .else -.ifdef DEMO +.ifdef DEMO_USA Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif .endif .endif Jump script_080121B6 script_080121B2: TextboxNoOverlap 0x3121 script_080121B6: - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012152 .align 2, 0 SCRIPT_START script_080121C8 - BeginBlock + BeginBlock Call sub_08064828 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080121DE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080121DE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4527 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080121DE SCRIPT_START script_08012200 - BeginBlock + BeginBlock Call sub_08064928 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012216: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012216 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4525 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012216 SCRIPT_START script_08012238 - BeginBlock + BeginBlock Call sub_08064A28 _0807EB44 0x0004 DoPostScriptAction 0x0001 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801224E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801224E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x4526 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801224E SCRIPT_START script_08012270 - BeginBlock + BeginBlock _0807EB44 0x0004 Call sub_08061FD8 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012284: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x001e JumpIfNot script_08012298 CheckInventory1 0x0015 JumpIf script_080122BA script_08012298: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012284 - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 TextboxNoOverlapFollow 0x2302 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 SetGlobalFlag 0x001e Jump script_08012284 script_080122BA: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIfNot script_080122CE CheckRoomFlag 0x0001 JumpIf script_080122EC script_080122CE: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080122BA - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 TextboxNoOverlapFollow 0x2303 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080122BA script_080122EC: - EndBlock - _0807EB74 - _0807E864 + EndBlock + _0807EB74 + _0807E864 Call sub_08061FD8 DoPostScriptAction 0x000b Call sub_08061FB0 @@ -604,7 +616,7 @@ script_080122EC: PlaySound SFX_SECRET SetLocalFlag 0x0043 Wait 0x001e - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .align 2, 0 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index cca78f35..8c01c8db 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -1,72 +1,72 @@ SCRIPT_START script_0801232C - BeginBlock - _0807EB74 - _0807E9D4 + BeginBlock + _0807EB74 + _0807E9D4 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08012338: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012338 - _0807EB74 - _0807E864 + _0807EB74 + _0807E864 TextboxNoOverlapFollow 0x2304 - _0807EA94 + _0807EA94 CheckLocalFlag 0x0042 JumpIf script_0801235A SetLocalFlag 0x0042 _0807F034 0x0057 - WaitPlayerAction8 + WaitPlayerAction8 script_0801235A: - _0807E878 + _0807E878 Jump script_08012338 SCRIPT_START script_08012360 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_08012368: CheckLocalFlag 0x0004 JumpIfNot script_08012368 Call sub_0807DF28 - _0807E864 + _0807E864 StopBgm - BeginBlock + BeginBlock _0807E778 0x0004 _0807E788 0x00007fff - DoFade5 + DoFade5 _0807E858 0x0080 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 PlayBgm BGM_ELEMENTAL_SANCTUARY _0807EB28 0x1401 - _0807EA94 + _0807EA94 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x0007 PlaySound SFX_ELEMENT_FLOAT SetEntity0x20 0xffff8000 Wait 0x003c - _0807E8E4_0 + _0807E8E4_0 StartPlayerScript script_08012410 WaitForSomething2 0x00000001 TextboxNoOverlap 0x1402 - _0807EA94 + _0807EA94 StopBgm SetEntity0x20 0x00010000 Wait 0x003c - BeginBlock + BeginBlock _0807E778 0x0004 _0807E788 0xffffffff - DoFade4 + DoFade4 _0807E858 0x0080 - EndBlock - WaitFor_2 + EndBlock + WaitFor_2 PlayBGM _0807EB28 0x1403 - _0807EA94 + _0807EA94 SetIntVariable 0x00000203 Call sub_0807F420 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index 089683a3..82f5c189 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012410 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0004 Wait 0x003c _0807E5F8 0x00000001 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index c18f6787..6070d716 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,55 +1,55 @@ 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 TextboxNoOverlapFollowPos 0x1101, 0x0007 - _0807EA94 - CameraTargetPlayer + _0807EA94 + 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 _0807E788 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 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 123e7ed8..2fa50394 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,21 +1,21 @@ SCRIPT_START script_080126FC - BeginBlock + BeginBlock SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807E930 0x0020 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 TextboxNoOverlapFollowPos 0x1102, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 TextboxNoOverlapFollowPos 0x1103, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 @@ -26,55 +26,55 @@ SCRIPT_START script_080126FC DoPostScriptAction 0x0011 _0807E930 0x001c TextboxNoOverlapFollowPos 0x1105, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 TextboxNoOverlapFollowPos 0x1106, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001c Call sub_0806D96C TextboxNoOverlapFollowPos 0x1107, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 TextboxNoOverlapFollowPos 0x1108, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001c Call sub_0806D96C TextboxNoOverlapFollowPos 0x1109, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000008 script_080127F2: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08012824 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080127F2 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0806D944 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1114, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0020 - _0807E878 + _0807E878 Jump script_080127F2 script_08012824: - _0807E864 - _0807E9DC + _0807E864 + _0807E9DC CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 - EndBlock + EndBlock _0807E5F8 0x00000008 WaitForSomething2 0x00000004 DoPostScriptAction 0x000b @@ -83,13 +83,13 @@ script_08012824: Call sub_0806D944 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110a, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110b, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 @@ -97,51 +97,51 @@ script_08012824: Wait 0x003c _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110c, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110d, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x001f _0807E5F8 0x00000008 WaitForSomething2 0x00000004 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110e, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0018 SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0010 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012904: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_08012920 CheckPlayerInRegion2 0x3030 JumpIfNot script_0801293A Jump script_08012904 script_08012920: - _0807E864 + _0807E864 _0807E930 0x0010 - EndBlock + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012904 script_0801293A: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x110f, 0x000c @@ -149,35 +149,35 @@ script_0801293A: SetEntitySpeed 0x0080 Call sub_0806D908 _0807EC1C 0x0050 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012984: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_080129A0 CheckPlayerInRegion2 0x3030 JumpIfNot script_080129BA Jump script_08012984 script_080129A0: - _0807E864 + _0807E864 _0807E930 0x0010 - EndBlock + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012984 script_080129BA: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1110, 0x000c @@ -186,37 +186,37 @@ script_080129BA: Call sub_0806D908 _0807EC1C 0x0050 _0807E930 0x0018 - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 script_08012A08: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0806D944 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_08012A24 CheckPlayerInRegion2 0x3030 JumpIfNot script_08012A3E Jump script_08012A08 script_08012A24: - _0807E864 + _0807E864 _0807E930 0x0010 - EndBlock + EndBlock TextboxNoOverlapFollowPos 0x1115, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0018 - _0807E878 + _0807E878 Jump script_08012A08 script_08012A3E: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm DoPostScriptAction 0x000b - _0807EB8C + _0807EB8C Call sub_0806D944 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1111, 0x000c @@ -224,20 +224,20 @@ script_08012A3E: SetEntitySpeed 0x0080 Call sub_0806D8A0 script_08012A74: - _0807EE30 + _0807EE30 JumpIfNot script_08012A74 _0807E930 0x001f - _0807EA94 + _0807EA94 StartPlayerScript script_08012B18 Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 PlayBgm BGM_EZLO_THEME - BeginBlock - _0807E8E4_2 + BeginBlock + _0807E8E4_2 _0807EB28 0x1112 - EndBlock - _0807EA94 + EndBlock + _0807EA94 _0807E5F8 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc index d88f3c06..8c0a07dd 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012AB0 - EndBlock + EndBlock script_08012AB2: _0807EB44 0x0002 Wait 0x000a diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index 9600c570..549da3a5 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AC8 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index 3e4b36e6..3250384f 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012AF0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index 4790ca98..7fa4617a 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B24 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index 13cd72a9..8fb19805 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B50 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0000 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index 015962e2..9b90a21b 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012B7C - BeginBlock + BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0002 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC94 0x0008 _0807E5F8 0x00000002 diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc index 071ced29..b23bee96 100644 --- a/data/scripts/script_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BA8 - BeginBlock + BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0001 - EndBlock + EndBlock WaitForSomething2 0x00000040 _0807E930 0x0005 Wait 0x001e diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc index 97cea951..2d3bc84f 100644 --- a/data/scripts/script_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012BF8 - BeginBlock + BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0003 - EndBlock + EndBlock WaitForSomething2 0x00000010 _0807E930 0x0007 Wait 0x001e diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index 7d27437b..63b3e809 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012C48 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 - EndBlock + EndBlock _0807EDD4 0x0388, 0x0168 _0807E5F8 0x00000100 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index b8aa1e2a..6f60275d 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,47 +1,51 @@ SCRIPT_START script_08012C68 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x0008 SetIntVariable 0x00000000 Call sub_0806DA04 - EndBlock + EndBlock script_08012C7E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012C7E - _0807E864 - _0807E8E4_0 + _0807E864 + _0807E8E4_0 TextboxNoOverlapFollow 0x111d - _0807EA94 + _0807EA94 SetGlobalFlag 0x0022 - _0807E878 + _0807E878 Jump script_08012C7E SCRIPT_START script_08012C98 CheckGlobalFlag 0x0014 JumpIfNot script_08012C98 script_08012CA0: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 JumpIfNot script_08012CA0 - _0807E564 + _0807E564 JumpIf script_08012CD2 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 _0807EB28 0x2202 - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x003a .else .ifdef EU SetLocalFlag 0x003a .else +.ifdef DEMO_JP + SetLocalFlag 0x003a @ TODO deduplicate +.else SetLocalFlag 0x003b .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 script_08012CD2: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index 900f0de5..7890ec34 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,27 +1,31 @@ SCRIPT_START script_08012CD8 - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_08012CD8 CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 JumpIfNot script_08012CD8 ComparePlayerAction 0x0015 JumpIf script_08012CD8 - _0807E864 + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807EB28 0x2203 - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x003d .else .ifdef EU SetLocalFlag 0x003d .else +.ifdef DEMO_JP + SetLocalFlag 0x003d @ TODO deduplicate +.else SetLocalFlag 0x003e .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index 73cb0ac9..f66473fa 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08012D18 - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x0014 JumpIfNot script_08012D18 CheckLocalFlagByOffset 0x0200, 0x008d JumpIf script_08012D68 CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 JumpIfNot script_08012D18 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x111a - _0807EA94 + _0807EA94 StartPlayerScript script_08010A38 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08012D18 script_08012D68: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index 8b936911..f5b97d27 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -1,24 +1,28 @@ SCRIPT_START script_08012D70 CheckPlayerInRegion 0x0088, 0x0048, 0x3030 JumpIfNot script_08012D70 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_08012DB0 WaitForSomething2 0x00000001 _0807EB28 0x132d - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x0015 .else .ifdef EU SetLocalFlag 0x0015 .else +.ifdef DEMO_JP + SetLocalFlag 0x0015 @ TODO deduplicate +.else SetLocalFlag 0x0014 .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index 09eef4e2..5e9b2640 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012DB0 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0088, 0x0068 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc index d7874822..21a77241 100644 --- a/data/scripts/script_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08012DD8 - BeginBlock - EndBlock - _0807E888 + BeginBlock + EndBlock + _0807E888 Wait 0x0018 - _0807E864 + _0807E864 StartPlayerScript script_08012DF8 WaitForSomething2 0x00000001 _0807E908 0x0002 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 21ed79e5..3e47a89b 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08012DF8 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0140 - EndBlock + EndBlock _0807EDD4 0x00b8, 0x0094 Wait 0x0008 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc index 3bae5d40..2a6bee16 100644 --- a/data/scripts/script_08012E20.inc +++ b/data/scripts/script_08012E20.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E20 - BeginBlock - _0807E864 - EndBlock + BeginBlock + _0807E864 + EndBlock Wait 0x0078 _0807E908 0x0004 StartPlayerScript script_08012E44 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index 4d929371..bc828aa9 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08012E44 - BeginBlock + BeginBlock SetEntitySpeed 0x0140 - EndBlock + EndBlock Wait 0x003c _0807EB44 0x0004 Wait 0x000f diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index 257e134c..5a36cc9d 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,38 +1,38 @@ SCRIPT_START script_08012E88 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a Call sub_0806B60C - EndBlock + EndBlock script_08012E9E: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012E9E - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0001 Call sub_0806B4F0 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 DoPostScriptAction 0x0000 Jump script_08012E9E .2byte 0x0000 SCRIPT_START script_08012EC0 - BeginBlock + BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 DoPostScriptAction 0x000a Call sub_0806B60C - EndBlock + EndBlock script_08012EDC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08012EDC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x0000000c Call sub_0806B4F0 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 CallWithArg sub_0807F3D8, 0x00000008 Jump script_08012EDC diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index 1b76edf7..8174dc07 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08012F0C - BeginBlock + BeginBlock CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 _0807E930 0x0002 @@ -9,7 +9,7 @@ SCRIPT_START script_08012F0C JumpIf script_08012FD2 CheckGlobalFlag 0x001e JumpIf script_08012F86 - EndBlock + EndBlock CheckLocalFlag 0x0062 JumpIfNot script_08012F48 Call sub_0806A9B0 @@ -19,17 +19,17 @@ script_08012F48: script_08012F50: Call sub_0806A96C JumpIfNot script_08012F50 - _0807E864 + _0807E864 TextboxNoOverlap 0x4401 - _0807EA94 + _0807EA94 SetLocalFlag 0x0061 - _0807E878 + _0807E878 _0807E908 0x0001 script_08012F6C: Call sub_0806A96C JumpIfNot script_08012F6C TextboxNoOverlap 0x4402 - _0807EA94 + _0807EA94 _0807E908 0x0001 Jump script_08012F6C SCRIPT_END diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 69c5f405..24041dde 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,85 +1,85 @@ SCRIPT_START script_08012F86 - BeginBlock + BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080130E4 SetLocalFlag 0x0060 ClearLocalFlag 0x0061 - EndBlock + EndBlock WaitForSomething2 0x00000004 _0807E908 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0807DF50 - _0807E878 + _0807E878 SetLocalFlag 0x0062 Jump script_08012FFA script_08012FD2: - BeginBlock + BeginBlock _0807E930 0x000d _0807E908 0x0005 SetLocalFlag 0x0062 CallWithArg sub_0807F93C, 0x0000f2f4 Call sub_0806AA10 - EndBlock + EndBlock CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 + _0807E944 TextboxNoOverlap 0x4403 - _0807EA94 + _0807EA94 Jump script_08012FFA script_08013006: - _0807E944 - BeginBlock - _0807E864 + _0807E944 + BeginBlock + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock PlaySound SFX_TASK_COMPLETE _0807F088 0x0038 - WaitPlayerAction8 + WaitPlayerAction8 Wait 0x001e - _0807E8E4_0 + _0807E8E4_0 Call sub_0806AB9C _0807E930 0x000b Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x4404 - _0807EA94 + _0807EA94 Wait 0x001e DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x440e - _0807EA94 + _0807EA94 Wait 0x001e Call sub_0806A9E8 _0807E930 0x000f Wait 0x00f0 TextboxNoOverlap 0x4405 - _0807EA94 + _0807EA94 _0807E5F8 0x00000200 _0807F034 0x0015 - WaitPlayerAction8 - _0807EB8C + WaitPlayerAction8 + _0807EB8C TextboxNoOverlap 0x4406 - _0807EA94 + _0807EA94 _0807E908 0x0001 Call sub_0807DF50 - _0807E878 + _0807E878 script_0801308A: Call sub_0806A96C JumpIfNot script_0801308A TextboxNoOverlap 0x4407 - _0807EA94 + _0807EA94 _0807E908 0x0001 script_0801309E: Call sub_0806A96C JumpIfNot script_0801309E TextboxNoOverlap 0x440d - _0807EA94 + _0807EA94 _0807E908 0x0001 Jump script_0801308A script_080130B6: @@ -87,13 +87,13 @@ script_080130B6: JumpIfNot script_080130C4 Call sub_0806A9B0 script_080130C4: - EndBlock + EndBlock script_080130C6: Call sub_0806A96C JumpIfNot script_080130C6 - _0807E864 + _0807E864 Call sub_0806AA18 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807E908 0x0001 Jump script_080130C6 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 154a90ed..38df27bf 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080130E4 - BeginBlock + BeginBlock _0807EB44 0x0006 SetEntitySpeed 0x0140 - EndBlock + EndBlock _0807EDD4 0x00a8, 0x0060 Wait 0x0008 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index 762ffc4e..2f3d1cbc 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,40 +1,40 @@ SCRIPT_START script_08013114 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 DoPostScriptAction 0x000a DoPostScriptAction 0x0012 Call sub_0807F348 - EndBlock + EndBlock script_08013128: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_0801313C Call sub_0806AEE4 Jump script_08013128 script_0801313C: - _0807E864 - EndBlock - _0807EB74 + _0807E864 + EndBlock + _0807EB74 Call sub_0806AED8 CallWithArg sub_0806AA50, 0x00000000 - _0807EA94 + _0807EA94 CallWithArg sub_0806AA50, 0x00000001 - _0807EA94 + _0807EA94 CallWithArg sub_0806AA50, 0x00000002 - _0807EA94 + _0807EA94 JumpIf script_08013176 - _0807E878 + _0807E878 Jump script_08013128 script_08013176: SetIntVariable 0x00000403 Call sub_0807F420 - _0807E878 + _0807E878 Jump script_08013128 SCRIPT_START script_08013188 - BeginBlock + BeginBlock CheckLocalFlag 0x0062 JumpIfNot script_0801319A DoPostScriptAction 0x0006 - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 4e7727b2..3a6734da 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,38 +1,38 @@ SCRIPT_START script_0801319A - EndBlock - BeginBlock - CameraTargetEntity - MoveEntityToPlayer + EndBlock + BeginBlock + CameraTargetEntity + MoveEntityToPlayer Call sub_0806AB74 Jump script_0801319A SCRIPT_START script_080131AC CheckPlayerInRegion 0x0098, 0x0038, 0x2060 JumpIfNot script_080131AC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StartPlayerScript script_080132E4 WaitForSomething2 0x00000002 _0807EB28 0x1601 - _0807EA94 + _0807EA94 StartPlayerScript script_0801330C WaitForSomething2 0x00000002 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 LoadRoomEntityList gUnk_080F5680 StartPlayerScript script_08013330 WaitForSomething2 0x00000002 - MoveEntityToPlayer + MoveEntityToPlayer SetEntityPosition 0x0000, 0xfff0 Call sub_0807F844 - CameraTargetEntity + CameraTargetEntity Call sub_080536B8 - _0807E864 + _0807E864 Call sub_0807DF28 - WaitFor_2 + WaitFor_2 TextboxNoOverlapFollowPos 0x1602, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 _0807E5F8 0x00000020 @@ -46,33 +46,33 @@ SCRIPT_START script_080131AC _0807E5F8 0x00000020 WaitForSomething2 0x00000042 TextboxNoOverlapFollowPos 0x1603, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000040 _0807E788 0xffff7fff _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 StopBgm _0807E858 0x0000 Wait 0x003c - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 TextboxNoOverlapFollowPos 0x1604, 0x0007 - _0807EA94 + _0807EA94 _0807E788 0xffffffff _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 _0807E5F8 0x00000004 WaitForSomething2 0x00000002 _0807EB28 0x1605 - _0807EA94 + _0807EA94 SetLocalFlag 0x0078 PlayBgm BGM_CASTLE_COLLAPSE SetGlobalFlag 0x005d Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index 61f3f5ea..78146e83 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080132E4 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 7963871e..fd756c78 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0801330C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc index 082f3afb..e1622710 100644 --- a/data/scripts/script_08013330.inc +++ b/data/scripts/script_08013330.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013330 - BeginBlock + BeginBlock _0807EB44 0x0000 SetEntityPositionRelative 0x0098, 0x0070 - EndBlock + EndBlock _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index d210e38e..f353b8f8 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801334C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x000d - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0020 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index 52231159..7b1a62fd 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080133C4 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000008 Call sub_08061F94 Wait 0x000a diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index 042cb44d..d489dda4 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080133F8 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_0807F338 - EndBlock + EndBlock WaitForSomething2 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index 37b49953..077f4297 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08013494 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 - EndBlock + EndBlock Wait 0x005a Call sub_08094B6C _0807EDD4 0x0098, 0x0080 - BeginBlock + BeginBlock Call sub_08094B80 PlaySound SFX_1CC Call sub_0807F36C _0807E5F8 0x00000080 - EndBlock + EndBlock DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index bdf9d90e..63bf844d 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,38 +1,38 @@ SCRIPT_START script_080134DC - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_080134F8: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080134F8 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F04 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E04 CallWithArg sub_08095D54, script_08013E28 - EndBlock + EndBlock WaitForSomething2 0x18000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -57,17 +57,17 @@ script_080134F8: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0503, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00040000 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc index be9e61d7..f42ba66d 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -3,7 +3,7 @@ SCRIPT_START script_08013650 Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 Wait 0x0078 @@ -12,12 +12,12 @@ SCRIPT_START script_08013650 StartPlayerScript script_080136B4 WaitForSomething2 0x00000002 _0807EB28 0x1501 - _0807EA94 + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer SetLocalFlag 0x007a Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index da761630..3cd43738 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index 989c33ee..bd7e8f9c 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080136D8 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock Call sub_0807F584 JumpTable script_080136F0, script_080136FA, script_08013704, script_080136FA script_080136F0: diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index d669a6ce..e8018f05 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,39 +1,39 @@ SCRIPT_START script_08013720 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_0801373C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801373C - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F34 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E4C - EndBlock + EndBlock WaitForSomething2 0x20000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -60,22 +60,22 @@ script_0801373C: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0504, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00040000 SetLocalFlag 0x007b Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index c2401d1d..93b64077 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,41 +1,41 @@ SCRIPT_START script_080138B4 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_0807F92C CallWithArg sub_0806DA04, 0x00000003 - EndBlock + EndBlock script_080138D0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_080138D0 - _0807E864 + _0807E864 Call sub_0807DF28 StartPlayerScript script_080136D8 WaitForSomething2 0x00000001 CallWithArg sub_08095A1C, script_08013F64 PlaySound SFX_ELEMENT_PLACE Wait 0x005a - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_FLOAT CallWithArg sub_08095D54, script_08013E70 - EndBlock + EndBlock WaitForSomething2 0x40000000 - BeginBlock + BeginBlock PlaySound SFX_ELEMENT_CHARGE CallWithArg sub_08095D8C, script_08014054 CallWithArg sub_08095D8C, script_08014074 CallWithArg sub_08095D8C, script_08014094 CallWithArg sub_08095D8C, script_080140B8 - EndBlock + EndBlock Wait 0x001e - BeginBlock + BeginBlock PlaySound SFX_1D0 CallWithArg sub_08095D8C, script_080140DC CallWithArg sub_08095D8C, script_08014118 CallWithArg sub_08095D8C, script_08014154 CallWithArg sub_08095D8C, script_08014198 - EndBlock + EndBlock Wait 0x003c CallWithArg CreateManager36, 0x00000000 _0807E5F8 0x00000200 @@ -65,22 +65,22 @@ script_080138D0: Call sub_0807F304 Wait 0x003c _0807E778 0x0004 - DoFade7 + DoFade7 PlaySound SFX_EVAPORATE - WaitFor_2 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000010 _0807E778 0x0002 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 PlaySound SFX_109 TextboxNoOverlapFollowPos 0x0505, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00040000 .ifndef EU _0807F0B4 0x0002 SetEntityPositionRelative 0x00e8, 0x00d8 - CameraTargetEntity + CameraTargetEntity .endif Call sub_0806DC3C CallWithArg sub_0807F244, 0x00010001 diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc index 704a94ee..9aaa52eb 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -4,7 +4,7 @@ SCRIPT_START script_08013AA6 .ifdef EU _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 - CameraTargetEntity + CameraTargetEntity Wait 0x003c .endif _0807E5F8 0x00000008 @@ -14,21 +14,21 @@ SCRIPT_START script_08013AA6 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x00e8, 0x0050 - CameraTargetEntity + CameraTargetEntity Wait 0x003c LoadRoomEntityList gUnk_080F55D8 Wait 0x0078 _0807F0B4 0x0007 - MoveEntityToPlayer - CameraTargetEntity + MoveEntityToPlayer + CameraTargetEntity Wait 0x003c _0807EB28 0x1502 - _0807EA94 + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer SetLocalFlag 0x007c Call sub_08053250 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index e1b11b09..093dd881 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,24 +1,24 @@ SCRIPT_START script_08013B18 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 script_08013B1E: - EndBlock - BeginBlock + EndBlock + BeginBlock CallWithArg sub_0807F6B4, 0x000001c8 JumpIfNot script_08013B1E CheckInventory1 0x0006 JumpIfNot script_08013B1E CheckLocalFlag 0x0078 JumpIf script_08013B1E - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807EB28 0x1507 - _0807EA94 + _0807EA94 StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08013B1E .2byte 0x0000 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index b6c87eec..6e6988d0 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08013BE8 - BeginBlock + BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A CheckInventory1 0x0003 @@ -10,7 +10,7 @@ SCRIPT_START script_08013BE8 JumpIfNot script_08013C98 CheckInventory1 0x0041 JumpIfNot script_08013C98 - EndBlock + EndBlock DoPostScriptAction 0x0008 WaitForSomething2 0x00000004 _0807E908 0x0002 @@ -20,7 +20,7 @@ script_08013C2A: CheckLocalFlag 0x007c JumpIf script_08013C98 script_08013C32: - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F934 DoPostScriptAction 0x000a @@ -28,17 +28,17 @@ script_08013C32: .ifndef EU CallWithArg sub_0807F8E8, 0x00000004 .endif - EndBlock + EndBlock script_08013C58: - EndBlock - BeginBlock + EndBlock + BeginBlock TestBit 0x00000008 JumpIf script_08013C92 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013C58 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 CheckLocalFlag 0x007d JumpIf script_08013C82 _0807EB28 0x1501 @@ -46,12 +46,12 @@ script_08013C58: script_08013C82: _0807EB28 0x1506 script_08013C86: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08013C58 script_08013C92: - EndBlock + EndBlock _0807E908 0x0004 script_08013C98: DoPostScriptAction 0x0008 diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc index 923f7045..d83c3e2e 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -1,25 +1,25 @@ SCRIPT_START script_08013CA4 - EndBlock + EndBlock script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 JumpIfNot script_08013CA6 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0001 SetEntityPositionRelative 0x00e8, 0x0138 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 Wait 0x0078 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807F5C0 _0807EB28 0x1504 - _0807EA94 + _0807EA94 SetLocalFlag 0x0079 Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 94e4b155..c18da600 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D04 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D1C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D1C CallWithArg sub_08095D54, 0x00000000 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index fb8e239b..b2035e0e 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D44 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D5C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D5C CallWithArg sub_08095D54, 0x00000001 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index 30973797..99a81862 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013D84 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013D9C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013D9C CallWithArg sub_08095D54, 0x00000002 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index 620febcf..dbac7069 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013DC4 - BeginBlock + BeginBlock Call sub_0807F92C DoPostScriptAction 0x0008 CallWithArg sub_0806DA04, 0x00000004 - EndBlock + EndBlock script_08013DDC: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08013DDC CallWithArg sub_08095D54, 0x00000003 PlaySound SFX_ELEMENT_PLACE diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index bc6bb9c4..47abff69 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E04 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index ebdbe6ce..e996cf56 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E28 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 4cf5047d..7180dae7 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E4C - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index f74c3644..fb6a48c8 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013E70 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 - EndBlock + EndBlock SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index a01fcca2..6da73541 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013E94 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x00f8 _0807E930 0x0001 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index 777ce0e7..f02fef23 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EB0 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x00f8 _0807E930 0x0003 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index daeb7eb8..4ea11b20 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013ECC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x0120, 0x0168 _0807E930 0x0005 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index 081cdfbb..924a762e 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EE8 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 SetEntityPositionRelative 0x00b0, 0x0168 _0807E930 0x0007 - EndBlock + EndBlock SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 8e99a3ff..7b5162e1 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F04 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0008 - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index 18a770a5..9646a835 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F34 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0009 - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000c Call sub_0807F2D4 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index 5dbd9cdb..3bdd29ac 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013F64 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x000a - EndBlock + EndBlock WaitForSomething2 0x00000080 _0807E930 0x000d Call sub_0807F2D4 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index b34394a6..4ca6f3f1 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08013F94 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock CheckLocalFlag 0x007d JumpIf script_08013FE0 script_08013FA4: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckInventory1 0x0003 JumpIfNot script_08013FA4 CheckPlayerFlags 0x00400000 JumpIfNot script_08013FA4 - EndBlock + EndBlock Call sub_0807FA40 - _0807E888 + _0807E888 Call sub_0807DF38 Wait 0x0078 _0807EB28 0x1505 - _0807EA94 + _0807EA94 SetLocalFlag 0x007d Call sub_0807DF50 - _0807E878 + _0807E878 script_08013FE0: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index 605788ba..6c30a598 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08013FE8 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_08013FF0: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckLocalFlag 0x007d JumpIf script_0801404C CheckLocalFlag 0x007a @@ -13,18 +13,18 @@ script_08013FF0: JumpIfNot script_08013FF0 CallWithArg sub_0807F6B4, 0x000000d0 JumpIfNot script_08013FF0 - EndBlock + EndBlock Call sub_0807F9A4 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807EB28 0x1508 - _0807EA94 + _0807EA94 StartPlayerScript script_08010A14 WaitForSomething2 0x00000001 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08013FF0 script_0801404C: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index b00a8e67..52fc4e4f 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014054 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 Call sub_0807F738 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index 33a943f1..94ac4516 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014074 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0001 Call sub_0807F738 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index 6160fb05..804c7748 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014094 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index 8fb4d8e0..94996896 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080140B8 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0003 Call sub_0807F738 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc index 2cce09f5..14d92521 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080140DC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 - EndBlock + EndBlock WaitForSomething2 0x00000200 _0807E930 0x0008 Call sub_0807F2D4 diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc index 350984a1..3576334e 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08014118 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0005 - EndBlock + EndBlock WaitForSomething2 0x00000400 _0807E930 0x0009 Call sub_0807F2D4 diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index 898e3180..5f7ddbf6 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014154 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething2 0x00000800 _0807E930 0x000a Call sub_0807F2D4 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index a7e84754..c3506e6f 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08014198 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0007 SetEntityPosition 0x0000, 0xfff0 - EndBlock + EndBlock WaitForSomething2 0x00001000 _0807E930 0x000b Call sub_0807F2D4 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index e80ffd66..cdb648e7 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080141DC - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0014 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - EndBlock + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc index 73c8e186..4119ab95 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08014210 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0015 Call sub_0807F714 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc - EndBlock + EndBlock WaitForSomething 0x00000020 Wait 0x0078 Call sub_0807F2D4 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 569bc7d0..1108937b 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -11,23 +11,23 @@ script_08014264: .ifndef EU SCRIPT_START script_08014274 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 - EndBlock + EndBlock script_0801427C: CheckLocalFlag 0x0078 JumpIfNot script_0801427C - BeginBlock + BeginBlock Call sub_0807F934 CallWithArg sub_0806DA04, 0x00000008 - EndBlock + EndBlock script_08014298: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014298 - _0807E864 + _0807E864 TextboxNoOverlapFollowPos 0x0647, 0x000c - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014298 .2byte 0x0000 .endif diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index 44a7709f..1a69e91f 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -1,19 +1,19 @@ SCRIPT_START script_080142B0 - BeginBlock + BeginBlock CheckLocalFlag 0x0054 JumpIf script_08014382 CheckLocalFlag 0x0053 JumpIf script_08014330 - EndBlock + EndBlock script_080142C4: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIfNot script_080142C4 CheckPlayerInRegion 0x0098, 0x0058, 0x1818 JumpIfNot script_080142C4 - EndBlock - _0807E864 + EndBlock + _0807E864 SetLocalFlag 0x0053 Wait 0x0014 _0807E908 0x0004 @@ -30,22 +30,22 @@ script_080142C4: _0807E930 0x0002 Wait 0x001e TextboxNoOverlap 0x2c12 - _0807EA94 + _0807EA94 Wait 0x0014 _0807E930 0x0004 - _0807E878 + _0807E878 _0807E908 0x0001 script_08014330: - EndBlock - BeginBlock - _0807E564 + EndBlock + BeginBlock + _0807E564 JumpIf script_08014330 - EntityHasHeight + EntityHasHeight JumpIf script_08014330 CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 JumpIfNot script_08014330 - EndBlock - _0807E864 + EndBlock + _0807E864 SetLocalFlag 0x0054 Wait 0x005a _0807E908 0x0004 @@ -54,10 +54,10 @@ script_08014330: _0807E930 0x0001 Wait 0x001e TextboxNoOverlap 0x2c13 - _0807EA94 + _0807EA94 Wait 0x0014 _0807E930 0x0004 _0807E908 0x0001 - _0807E878 + _0807E878 script_08014382: SCRIPT_END diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 7689da1c..ea9f4c78 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08014384 - EndBlock - _0807E864 - _0807EA94 - _0807E3E8 + EndBlock + _0807E864 + _0807EA94 + _0807E3E8 JumpIfNot script_080143AC Wait 0x001e Call sub_08065370 JumpIfNot script_080143AC Wait 0x003c - _0807EA94 - _0807EB8C + _0807EA94 + _0807EB8C Wait 0x001e - TextboxNoOverlapVar + TextboxNoOverlapVar script_080143AC: - _0807EA94 + _0807EA94 Wait 0x001e _0807E930 0x0004 _0807E908 0x0001 - _0807E878 + _0807E878 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 652ee0ff..b95fc900 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080143C0 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 Call sub_080654FC _0807E930 0x0001 Call sub_080654EC Wait 0x003c TextboxNoOverlap 0x2c16 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -17,25 +17,25 @@ script_080143FA: Call sub_080654EC Wait 0x001e TextboxNoOverlap 0x2c18 - _0807EA94 + _0807EA94 Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 _0807F034 0x0036 - WaitPlayerAction8 + WaitPlayerAction8 TextboxNoOverlap 0x2c19 - _0807EA94 + _0807EA94 SetIntVariable 0x00000303 Call sub_0807F420 .ifndef EU Wait 0x001e - _0807EB8C + _0807EB8C TextboxNoOverlap 0x2c22 - _0807EA94 + _0807EA94 .endif script_0801443E: _0807E930 0x0004 _0807E908 0x0001 Call sub_0807DF50 - _0807E878 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index 10fbfc52..d9c80760 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -1,21 +1,21 @@ SCRIPT_START script_08014450 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014462: - _0807E30C + _0807E30C JumpIfNot script_08014462 - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 TextboxNoOverlapFollow 0x4202 TextboxNoOverlapFollow 0x4203 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c @@ -28,7 +28,7 @@ script_080144A2: Call sub_0806E250 JumpIfNot script_080144B8 TextboxNoOverlapFollow 0x420b - _0807EB38 + _0807EB38 JumpTable script_080144B8, script_080144C0 script_080144B8: ClearLocalFlag 0x0093 @@ -38,7 +38,7 @@ script_080144C0: .ifdef USA SetLocalFlag 0x00d3 .else -.ifdef DEMO +.ifdef DEMO_USA SetLocalFlag 0x00d3 .endif .endif @@ -57,14 +57,18 @@ script_080144F0: Wait 0x003c _0807E930 0x0002 script_080144FC: - _0807E878 + _0807E878 CheckRoomFlag 0x0000 JumpIfNot script_08014462 .ifdef USA - _0807E9DC + _0807E9DC .else -.ifdef DEMO - _0807E9DC +.ifdef DEMO_USA + _0807E9DC +.else +.ifdef DEMO_JP + _0807E9DC +.endif .endif .endif SCRIPT_END diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 1cd3510e..5046c8c9 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0801450C - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 SetEntitySpeed 0x01c0 DoPostScriptAction 0x000a - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 Call sub_0806E20C - _0807EA94 + _0807EA94 Call sub_0806E23C ClearLocalFlag 0x0093 ClearLocalFlag 0x0092 @@ -16,21 +16,21 @@ SCRIPT_START script_0801450C Jump script_080144FC .2byte 0x0000 SCRIPT_START script_08014548 - BeginBlock - EndBlock + BeginBlock + EndBlock script_0801454C: CheckPlayerInRegion 0x0078, 0x0088, 0x0810 JumpIfNot script_0801454C CheckRoomFlag 0x0000 JumpIfNot script_0801454C - _0807E864 + _0807E864 _0807EB28 0x4217 - _0807EA94 + _0807EA94 StartPlayerScript script_08014588 Wait 0x0010 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 - _0807E878 + _0807E878 Jump script_0801454C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index 35e475e0..b9971cca 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014588 - EndBlock + EndBlock WaitForSomething2 0x00000001 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0078 diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index 1aa48d71..e5890fd0 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -1,29 +1,29 @@ SCRIPT_START script_080145B0 - BeginBlock + BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 CheckLocalFlag 0x005e JumpIf script_080145E4 - EndBlock + EndBlock script_080145C2: CheckRoomFlag 0x0005 JumpIfNot script_080145C2 - _0807E864 + _0807E864 ClearRoomFlag 0x0005 .ifdef EU Wait 0x0018 - _0807E8E4_1 + _0807E8E4_1 _0807EB44 0x0006 .else Wait 0x000c - _0807EB8C + _0807EB8C .endif TextboxNoOverlapFollowPos 0x432e, 0x000c - _0807EA94 + _0807EA94 .ifdef EU Wait 0x0018 .endif - _0807E878 + _0807E878 Jump script_080145C2 script_080145E4: - EndBlock + EndBlock SCRIPT_END diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 0f68e289..5a62b9cc 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -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 TextboxNoOverlapFollowPos 0x432b, 0x000c - _0807EA94 + _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 @@ -111,31 +111,35 @@ script_0801472E_2: JumpIfNot script_0801463A CheckLocalFlag 0x005e JumpIf script_080146A0 - _0807E864 - _0807EB8C + _0807E864 + _0807EB8C TextboxNoOverlapFollowPos 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 @@ -171,7 +175,7 @@ script_0801474A: SetRoomFlag 0x000a .endif TextboxNoOverlapFollowPos 0x4305, 0x000c - _0807EA94 + _0807EA94 _0807E3BC 0x0001 JumpIfNot script_080147C4 TextboxNoOverlapFollowPos 0x4306, 0x000c @@ -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 TextboxNoOverlapFollowPos 0x4307, 0x000c script_080147CE: - _0807EA94 + _0807EA94 .ifdef EU Wait 0x000F .else Wait 0x0004 .endif - _0807E878 + _0807E878 Jump script_0801463A .align 2, 0 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index c6e83402..d5b0ad59 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_080147DC - EndBlock + EndBlock WaitForSomething2 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0068 diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index b5f500dd..82f48f9d 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -1,29 +1,29 @@ SCRIPT_START script_08014804 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF38 Wait 0x0010 CheckLocalFlag 0x0093 JumpIf script_080148B6 TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + _0807E878 script_0801482E: TestBit 0x00000001 JumpIf script_08014862 TestBit 0x00000004 JumpIf script_08014878 - _0807E30C + _0807E30C JumpIfNot script_0801482E - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 TextboxNoOverlapFollowPos 0x4215, 0x000c - _0807E878 + _0807E878 Jump script_0801482E script_08014862: _0807E930 0x0008 @@ -42,15 +42,15 @@ script_0801488E: JumpIf script_080148C2 TestBit 0x00000004 JumpIf script_080148D8 - _0807E30C + _0807E30C JumpIfNot script_0801488E - _0807E864 + _0807E864 _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 script_080148B6: TextboxNoOverlapFollowPos 0x4216, 0x000c - _0807E878 + _0807E878 Jump script_0801488E script_080148C2: _0807E930 0x0008 @@ -66,27 +66,27 @@ script_080148D8: Jump script_0801488E .2byte 0x0000 SCRIPT_START script_080148F0 - BeginBlock - EndBlock + BeginBlock + EndBlock script_080148F4: CheckRoomFlag 0x0000 JumpIfNot script_080148F4 ClearRoomFlag 0x0000 Call sub_0806E140 JumpIfNot script_08014932 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08014938 - _0807E864 + _0807E864 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0806E1E0 - _0807EA94 + _0807EA94 Wait 0x0018 - _0807E878 + _0807E878 Jump script_080148F4 script_08014932: - _0807EA94 + _0807EA94 Jump script_08014938 script_08014938: _0807E5F8 0x00000004 diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index 9cbae7ab..5d851262 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014958 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 @@ -7,33 +7,33 @@ SCRIPT_START script_08014958 _0807EB44 0x0004 SetEntityPositionRelative 0x0078, 0x0128 script_08014976: - EndBlock + EndBlock script_08014978: - _0807E30C + _0807E30C JumpIfNot script_08014978 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014978 SCRIPT_START script_08014994 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a CheckGlobalFlag 0x0058 JumpIfNot script_080149C6 - EndBlock + EndBlock script_080149AA: - _0807E30C + _0807E30C JumpIfNot script_080149AA - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_080149AA script_080149C6: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 18150975..4f6024af 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,16 +1,16 @@ SCRIPT_START script_080149CC - BeginBlock + BeginBlock SetEntitySpeed 0x0080 Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_080149DE: - _0807E30C + _0807E30C JumpIfNot script_080149DE - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 CheckLocalFlag 0x0064 JumpIfNot script_08014A20 CheckLocalFlag 0x00b1 @@ -20,42 +20,42 @@ script_080149DE: DoPostScriptAction 0x0001 _0807EDD4 0x0068, 0x00f8 PlaySound SFX_SECRET - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a script_08014A20: - _0807E878 + _0807E878 Jump script_080149DE .2byte 0x0000 SCRIPT_START script_08014A28 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014A36: - _0807E30C + _0807E30C JumpIfNot script_08014A36 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014A36 .2byte 0x0000 SCRIPT_START script_08014A54 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014A62: - _0807E30C + _0807E30C JumpIfNot script_08014A62 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014A62 .2byte 0x0000 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 753bfa0b..dd674139 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,38 +1,38 @@ SCRIPT_START script_08014A80 - BeginBlock + BeginBlock DoPostScriptAction 0x000a - EndBlock + EndBlock WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0004 _0807E5F8 0x00000002 WaitForSomething2 0x00000001 TextboxNoOverlap 0x2f0a - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 script_08014AAC: - _0807E30C + _0807E30C JumpIfNot script_08014AAC - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x2f0a - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014AAC .2byte 0x0000 SCRIPT_START script_08014AC4 - BeginBlock + BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08014AD2: - _0807E30C + _0807E30C JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 StartPlayerScript script_08014B10 WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 CheckLocalFlag 0x0064 JumpIf script_08014AFE SetLocalFlag 0x0064 @@ -41,8 +41,8 @@ script_08014AD2: script_08014AFE: TextboxNoOverlap 0x2f0c script_08014B02: - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014AD2 .2byte 0x0000 diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index 45c292eb..42a6c2b1 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08014B10 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 31ec68fd..0d97b17f 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,28 +1,28 @@ SCRIPT_START script_08014B34 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock CheckLocalFlag 0x0063 JumpIf script_08014BE8 script_08014B48: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckRoomFlag 0x0000 JumpIf script_08014B70 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014B48 - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 TextboxNoOverlap 0x2f01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08014B48 script_08014B70: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807DF28 _0807E5F8 0x00000001 DoPostScriptAction 0x0004 @@ -45,42 +45,42 @@ script_08014B70: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014BE8: _0807E930 0x0010 Call sub_0806CD4C script_08014BF2: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014BF2 - _0807E864 + _0807E864 CheckLocalFlag 0x0065 JumpIf script_08014C1C SetLocalFlag 0x0065 TextboxNoOverlap 0x2f07 - _0807EA94 + _0807EA94 SetIntVariable 0x00000064 _0807F034 0x003f - WaitPlayerAction8 + WaitPlayerAction8 Jump script_08014C22 script_08014C1C: TextboxNoOverlap 0x2f08 - _0807EA94 + _0807EA94 script_08014C22: Wait 0x000f - _0807E878 + _0807E878 Jump script_08014BF2 SCRIPT_START script_08014C2C - BeginBlock + BeginBlock Call sub_0806CD58 DoPostScriptAction 0x000a _0807EB44 0x0004 _0807E930 0x0006 - EndBlock + EndBlock script_08014C42: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014C42 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 script_08014C4C: Call sub_0806CCD0 JumpIfNot script_08014C4C @@ -91,40 +91,40 @@ script_08014C56: JumpIf script_08014C7C SetLocalFlag 0x0066 TextboxNoOverlap 0x2f0d - _0807EA94 + _0807EA94 _0807F034 0x000a - WaitPlayerAction8 + WaitPlayerAction8 Jump script_08014C82 script_08014C7C: TextboxNoOverlap 0x2f09 - _0807EA94 + _0807EA94 script_08014C82: Wait 0x000f - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x0006 Jump script_08014C42 SCRIPT_START script_08014C94 - BeginBlock + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 Call sub_0806C870 DoPostScriptAction 0x000a DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014CAE: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckGlobalFlag 0x0024 JumpIf script_08014CD4 - _0807E30C + _0807E30C JumpIfNot script_08014CAE - EndBlock - _0807E864 - _0807EB74 + EndBlock + _0807E864 + _0807EB74 Call sub_0806C90C - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014CAE script_08014CD4: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index 4b0d2f45..7eea160e 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08014CDC - BeginBlock + BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x000a Call sub_08066D04 @@ -7,51 +7,51 @@ SCRIPT_START script_08014CDC SetEntityPositionRelative 0x01e8, 0x0180 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 Call sub_08066E08 - _0807E864 + _0807E864 TextboxNoOverlapFollowPos 0x1010, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 script_08014D1E: - EndBlock - BeginBlock + EndBlock + BeginBlock CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 TextboxNoOverlap 0x1012 - _0807EA94 + _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 Call sub_08066E08 SetEntityPositionRelative 0x01f8, 0x00c8 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014D60: CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 - _0807E864 + _0807E864 Call sub_0807DF28 TextboxNoOverlap 0x1013 - _0807EA94 + _0807EA94 _0807EC64 0x0040 _0807EB44 0x0004 DoPostScriptAction 0x0000 SetEntityPositionRelative 0x01e8, 0x0028 Call sub_0807DF50 - _0807E878 + _0807E878 script_08014D96: CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot script_08014D96 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 TextboxNoOverlap 0x1014 - _0807EA94 + _0807EA94 _0807EC64 0x0018 .ifdef JP SetLocalFlag 0x006b @@ -59,10 +59,14 @@ script_08014D96: .ifdef EU SetLocalFlag 0x006b .else +.ifdef DEMO_JP + SetLocalFlag 0x006b @ TODO deduplicate +.else SetLocalFlag 0x006d .endif .endif +.endif Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index f8df2393..f8d36d7f 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08014DCC - BeginBlock + BeginBlock SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 Call sub_0807F348 - _0807E864 + _0807E864 Call sub_0807DF28 - EndBlock + EndBlock _0807E778 0x0010 - DoFade6 - WaitFor_2 + DoFade6 + WaitFor_2 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 1b70d789..6db6e5f8 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -1,44 +1,44 @@ SCRIPT_START script_08014E14 - BeginBlock + BeginBlock _0807EB44 0x0004 - _0807E9D4 + _0807E9D4 DoPostScriptAction 0x000a CallWithArg sub_0807F3D8, 0x00000000 - EndBlock + EndBlock script_08014E2C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014E2C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 CallWithArg sub_0807F3D8, 0x00000000 Call sub_08064428 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014E2C .2byte 0x0000 SCRIPT_START script_08014E50 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014E64: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014E64 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 CallWithArg sub_0807F78C, 0x00000022 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08014EBC CallWithArg sub_0807F7C4, 0x00000022 JumpIfNot script_08014EB0 _0807E48C 0x0020 JumpIfNot script_08014EB8 CallWithArg sub_0807F800, 0x00000022 - WaitPlayerAction8 + WaitPlayerAction8 TextboxNoOverlap 0x0a04 Jump script_08014EBC script_08014EB0: @@ -47,69 +47,69 @@ script_08014EB0: script_08014EB8: TextboxNoOverlap 0x0a02 script_08014EBC: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08014E64 .2byte 0x0000 SCRIPT_START script_08014ECC - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_08014EE0: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 TextboxNoOverlap 0x200d - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_08014EE0 .2byte 0x0000 SCRIPT_START script_08014EF8 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000a - EndBlock + EndBlock script_08014F0C: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014F0C - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 DoPostScriptAction 0x0000 TextboxNoOverlap 0x200e - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 _0807EB44 0x0004 _0807E930 0x000a Jump script_08014F0C .2byte 0x0000 SCRIPT_START script_08014F30 - BeginBlock + BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 _0807EB44 0x0004 _0807E930 0x000e - EndBlock + EndBlock Call sub_08065914 script_08014F4A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08014F4A - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 DoPostScriptAction 0x0000 - BeginBlock + BeginBlock TextboxNoOverlap 0x3b0b CallWithArg sub_0807F854, 0x00010064 - EndBlock - _0807EA94 - _0807E3E8 + EndBlock + _0807EA94 + _0807E3E8 JumpIfNot script_08014FA6 HasRupees 0x0064 JumpIfNot script_08014F9A @@ -117,7 +117,7 @@ script_08014F4A: JumpIfNot script_08014FA2 ModRupees 0xff9c _0807F034 0x0022 - WaitPlayerAction8 + WaitPlayerAction8 TextboxNoOverlap 0x3b11 Jump script_08014FA6 script_08014F9A: @@ -126,30 +126,30 @@ script_08014F9A: script_08014FA2: TextboxNoOverlap 0x3b0f script_08014FA6: - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 _0807E930 0x000e Jump script_08014F4A SCRIPT_START script_08014FBC - BeginBlock + BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 Call sub_08054564 - EndBlock + EndBlock script_08014FCC: CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 JumpIfNot script_08014FCC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm _0807F0B4 0x0001 - CameraTargetEntity + CameraTargetEntity StartPlayerScript script_080152B4 WaitForSomething2 0x00000001 TextboxNoOverlapFollowPos 0x1301, 0x0002 - _0807EA94 + _0807EA94 Call sub_0807F3F8 Wait 0x003c _0807E5F8 0x00000002 @@ -158,20 +158,20 @@ script_08014FCC: WaitForSomething2 0x00000004 PlayBgm BGM_VAATI_THEME _0807EB28 0x1302 - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x1303, 0x0002 - _0807EA94 + _0807EA94 _0807EB28 0x1304 - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x1305, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething2 0x00000004 _0807EB28 0x1306 - _0807EA94 + _0807EA94 StopBgm StartPlayerScript script_080152DC - CameraTargetEntity + CameraTargetEntity _0807F0B4 0x0003 SetEntityPositionRelative 0x01f8, 0x0148 WaitForSomething2 0x00000001 @@ -204,11 +204,11 @@ script_08014FCC: LoadRoomEntityList gUnk_080F7FC0 PlayBgm BGM_FIGHT_THEME Call sub_0807DF50 - _0807E878 + _0807E878 script_08015104: CheckRoomFlag 0x0000 JumpIfNot script_08015104 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 StopBgm @@ -238,51 +238,55 @@ script_08015104: Wait 0x003c PlaySound SFX_SECRET _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer .ifdef JP SetLocalFlag 0x008a .else .ifdef EU SetLocalFlag 0x008a .else +.ifdef DEMO_JP + SetLocalFlag 0x008a @ TODO deduplicate +.else SetLocalFlag 0x008c .endif .endif +.endif _0807EB28 0x130c - _0807EA94 - CameraTargetPlayer + _0807EA94 + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 Call sub_08053B3C - BeginBlock - _0807E864 + BeginBlock + _0807E864 CallWithArg sub_0807F6E8, 0x00000008 - MoveEntityToPlayer + MoveEntityToPlayer _0807F0B4 0x0004 - CameraTargetEntity + CameraTargetEntity _0807E778 0x0100 - DoFade4 + DoFade4 _0807E80C 0x00000000 - EndBlock + EndBlock StartPlayerScript script_08015360 WaitForSomething2 0x00000001 LoadRoomEntityList gUnk_080F7CB0 _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 _0807E5F8 0x00000008 WaitForSomething2 0x00000010 - BeginBlock - _0807E8E4_2 + BeginBlock + _0807E8E4_2 _0807EB28 0x1315 - EndBlock - _0807EA94 + EndBlock + _0807EA94 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer Call sub_08054570 PlayBGM Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index fa102af2..c7060e78 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015234 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F354 - EndBlock + EndBlock WaitForSomething2 0x00000002 Call sub_08066C94 Wait 0x00e9 diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index e29fae3e..61ae2f32 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152B4 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index c16d1795..5e55ee16 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,7 +1,7 @@ SCRIPT_START script_080152DC - BeginBlock + BeginBlock SetEntitySpeed 0x0200 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index 786e3cf2..5dd2c48f 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015338 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index 73b67bde..98b78e13 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015360 - BeginBlock + BeginBlock SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 - EndBlock + EndBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 _0807E5F8 0x00000001 diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index 6f8a7d4f..bfa9a257 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08015390 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 - EndBlock + EndBlock _0807E930 0x001f Call sub_0806D944 WaitForSomething2 0x00000008 _0807E930 0x0010 TextboxNoOverlapFollowPos 0x1314, 0x000c - _0807EA94 + _0807EA94 _0807E930 0x0018 Call sub_0806D8A0 script_080153C2: - _0807EE30 + _0807EE30 JumpIfNot script_080153C2 _0807E930 0x001f StartPlayerScript script_08015384 diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index e44e0e7a..5d469635 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_080153EC - BeginBlock + BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0078, 0x0068 - CameraTargetEntity - EndBlock + CameraTargetEntity + EndBlock PlayBgm BGM_EZLO_STORY _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Wait 0x003c _0807E5F8 0x00000080 WaitForSomething2 0x00000100 @@ -18,19 +18,19 @@ SCRIPT_START script_080153EC _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0090 TextboxNoOverlapFollowPos 0x1330, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00000880 WaitForSomething2 0x00001000 Wait 0x003c TextboxNoOverlapFollowPos 0x130d, 0x0002 - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x130e, 0x000c - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x130f, 0x0002 - _0807EA94 + _0807EA94 TextboxNoOverlapFollowPos 0x1310, 0x000c - _0807EA94 + _0807EA94 CallWithArg CreateManager36, 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 28d145b7..70537368 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -6,7 +6,7 @@ SCRIPT_START script_0801548E _0807E5F8 0x00048000 WaitForSomething2 0x00090000 TextboxNoOverlapFollowPos 0x1311, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00008000 WaitForSomething2 0x00010000 _0807E5F8 0x00048000 @@ -14,13 +14,13 @@ SCRIPT_START script_0801548E CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 TextboxNoOverlapFollowPos 0x1312, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000800 WaitForSomething2 0x00001000 StopBgm _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 SetRoomFlag 0x0001 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index 31767026..267b9dd6 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0801550C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 _0807EB44 0x0000 Call sub_0807F338 - EndBlock + EndBlock CallWithArg sub_0806AF60, 0x00000000 WaitForSomething2 0x00008000 CallWithArg sub_0806AF60, 0x00000004 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index 58bf24d6..cc21ef92 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015618 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0040 Call sub_08094B80 - EndBlock + EndBlock WaitForSomething2 0x00000080 CallWithArg CreateManager36, 0x00000003 Call sub_08094B0C diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index 9d917502..4bcb6dc9 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015684 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0017 Call sub_0807F180 - EndBlock + EndBlock WaitForSomething2 0x00000800 _0807EB44 0x0002 DoPostScriptAction 0x0017 diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index e7543e12..8495df7f 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015754 - BeginBlock + BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call sub_08094B80 - EndBlock + EndBlock Wait 0x0078 PlaySound SFX_1C5 Call sub_08094B6C diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 57f353dc..209a89aa 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -1,17 +1,17 @@ SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 script_080157DA: CheckPlayerInRegion 0x0250, 0x0230, 0x3040 JumpIfNot script_080157DA - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807F3F8 @@ -21,7 +21,7 @@ script_080157DA: StartPlayerScript script_080158F8 _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 - CameraTargetEntity + CameraTargetEntity Call sub_0807F5C0 WaitForSomething2 0x00000010 _0807E5F8 0x00000008 @@ -33,34 +33,34 @@ script_080157DA: _0807E5F8 0x00000001 WaitForSomething2 0x00000002 TextboxNoOverlapFollowPos 0x1066, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 Call sub_0807DF50 - _0807E878 + _0807E878 Call sub_08066F94 _0807E5F8 0x00000008 script_08015880: CheckRoomFlag 0x0000 JumpIfNot script_08015880 script_08015888: - _0807EA94 + _0807EA94 ComparePlayerAction 0x001c JumpIf script_08015888 - _0807E864 + _0807E864 Call sub_0807DF28 _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 - CameraTargetEntity + CameraTargetEntity StartPlayerScript script_08015938 WaitForSomething2 0x00000010 TextboxNoOverlapFollowPos 0x106a, 0x000c - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 Wait 0x0078 - _0807E8E4_2 + _0807E8E4_2 TextboxNoOverlapFollowPos 0x1068, 0x0002 - _0807EA94 + _0807EA94 _0807E5F8 0x00000001 WaitForSomething2 0x00000002 .ifdef JP @@ -69,13 +69,17 @@ script_08015888: .ifdef EU SetLocalFlag 0x0089 .else +.ifdef DEMO_JP + SetLocalFlag 0x0089 @ TODO deduplicate +.else SetLocalFlag 0x008b .endif .endif +.endif Call sub_08066FB8 Call sub_0807DF50 - _0807E878 + _0807E878 _0807F0B4 0x0004 - CameraTargetPlayer + CameraTargetPlayer DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 4af73e8a..9b2ce9e8 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08015958 - BeginBlock + BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_08066D04 - EndBlock + EndBlock WaitForSomething2 0x00000001 - BeginBlock + BeginBlock Call sub_08066D14 - MoveEntityToPlayer - EndBlock + MoveEntityToPlayer + EndBlock DoPostScriptAction 0x0007 - _0807EB74 + _0807EB74 _0807EDD4 0x01f8, 0x02f8 _0807EB44 0x0004 DoPostScriptAction 0x0000 TextboxNoOverlapFollowPos 0x1011, 0x0002 - _0807EA94 + _0807EA94 _0807EDD4 0x01f8, 0x0268 SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 @@ -46,22 +46,22 @@ SCRIPT_START script_08015958 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E9D4 + _0807E9D4 _0807E5F8 0x00000002 script_08015A32: - EndBlock - BeginBlock - _0807EB74 + EndBlock + BeginBlock + _0807EB74 CheckRoomFlag 0x0000 JumpIf script_08015A54 - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08015A32 - EndBlock + EndBlock TextboxNoOverlapFollowPos 0x1067, 0x0002 - _0807EA94 + _0807EA94 Jump script_08015A32 script_08015A54: - EndBlock + EndBlock DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index fd4dfb84..b0b245f7 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015AC4 - BeginBlock + BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000008 _0807E908 0x0007 WaitForSomething2 0x00000008 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index fced2034..f0f3c82a 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015B14 - BeginBlock + BeginBlock _0807E930 0x0018 SetEntitySpeed 0x0300 - EndBlock + EndBlock _0807EDD4 0x0248, 0x0218 _0807E5F8 0x00000020 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 9df5e5af..a6e0cc20 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,28 +1,32 @@ SCRIPT_START script_08015B34 - EndBlock - BeginBlock + EndBlock + BeginBlock .ifdef JP CheckLocalFlag 0x0089 .else .ifdef EU CheckLocalFlag 0x0089 .else +.ifdef DEMO_JP + CheckLocalFlag 0x0089 @ TODO deduplicate +.else CheckLocalFlag 0x008b .endif .endif +.endif JumpIf script_08015B7E CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 TextboxNoOverlapFollowPos 0x2506, 0x0002 - _0807EA94 + _0807EA94 StartPlayerScript script_08015B84 WaitForSomething2 0x00000004 Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08015B34 script_08015B7E: DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index 433c22e4..70876df6 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -1,29 +1,33 @@ SCRIPT_START script_08015BA8 - BeginBlock + BeginBlock .ifdef JP SetLocalFlag 0x008c .else .ifdef EU SetLocalFlag 0x008c .else +.ifdef DEMO_JP + SetLocalFlag 0x008c @ TODO deduplicate +.else SetLocalFlag 0x008e .endif .endif - _0807E864 - MoveEntityToPlayer - CameraTargetEntity +.endif + _0807E864 + MoveEntityToPlayer + CameraTargetEntity SetEntitySpeed 0x0200 - EndBlock + EndBlock Wait 0x000f - _0807E8E4_2 + _0807E8E4_2 Call sub_0807F3F8 Wait 0x001e _0807EDD4 0x00b8, 0x0258 Wait 0x001e SetRoomFlag 0x0065 Wait 0x0078 - _0807EEB4 - CameraTargetPlayer - _0807E878 + _0807EEB4 + CameraTargetPlayer + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index d066f2e8..8a8040fa 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,48 +1,52 @@ SCRIPT_START script_08015BE8 - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock script_08015BF0: CheckPlayerInRegion 0x0160, 0x0020, 0x3040 JumpIfNot script_08015BF0 - _0807E864 + _0807E864 Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807FBC4 StartPlayerScript script_08015C7C WaitForSomething2 0x00000100 - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitFor_2 StopBgm Call sub_08053BE8 - BeginBlock - _0807E864 + BeginBlock + _0807E864 Call sub_0807FBC4 - CameraTargetPlayer + CameraTargetPlayer _0807E778 0x0100 - DoFade4 + DoFade4 _0807E80C 0x00000000 - EndBlock + EndBlock _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitFor_2 PlayBGM _0807EB28 0x131f - _0807EA94 + _0807EA94 .ifdef JP SetLocalFlag 0x009b .else .ifdef EU SetLocalFlag 0x009b .else +.ifdef DEMO_JP + SetLocalFlag 0x009b @ TODO deduplicate +.else SetLocalFlag 0x009c .endif .endif +.endif Call sub_0807FBCC Call sub_0807DF50 - _0807E878 + _0807E878 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index 966109fa..b977512b 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_08015C7C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 - EndBlock + EndBlock DoPostScriptAction 0x0001 _0807EDD4 0x0168, 0x0058 _0807EB44 0x0004 @@ -9,7 +9,7 @@ SCRIPT_START script_08015C7C CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 TextboxNoOverlapFollowPos 0x1318, 0x000c - _0807EA94 + _0807EA94 CallWithArg sub_0807F238, 0x000003c9 Call sub_0807F304 _0807EB44 0x0004 diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index c565c3e9..71dd90ee 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -1,35 +1,35 @@ SCRIPT_START script_08015CD4 - BeginBlock + BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0088, 0x0068 - CameraTargetEntity - EndBlock + CameraTargetEntity + EndBlock _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 Wait 0x003c _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity + CameraTargetEntity Wait 0x003c PlayBgm BGM_VAATI_THEME _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807F0B4 0x0004 SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity + CameraTargetEntity Wait 0x003c _0807E5F8 0x00000010 WaitForSomething2 0x00000020 @@ -38,15 +38,15 @@ SCRIPT_START script_08015CD4 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 _0807E5F8 0x00000010 LoadRoomEntityList gUnk_080FCE30 StopBgm Wait 0x0078 _0807E778 0x0004 - DoFade4 - WaitFor_2 + DoFade4 + WaitFor_2 PlayBgm BGM_DIGGING_CAVE _0807E5F8 0x00000040 WaitForSomething2 0x00000080 @@ -59,8 +59,8 @@ SCRIPT_START script_08015CD4 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 _0807E778 0x0004 - DoFade5 - WaitFor_2 + DoFade5 + WaitFor_2 StopBgm SetRoomFlag 0x0000 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 660f818c..6ab45a4f 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,25 +1,25 @@ SCRIPT_START script_08015DF0 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c TextboxNoOverlap 0x1319 - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 TextboxNoOverlap 0x131a - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 TextboxNoOverlap 0x131d - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething2 0x00000004 TextboxNoOverlap 0x131e - _0807EA94 + _0807EA94 _0807E5F8 0x00000008 WaitForSomething 0x00000400 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index 1f4a3001..bd9fd02f 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015E58 - BeginBlock + BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x001d - EndBlock + EndBlock WaitForSomething2 0x00000010 Call sub_08066C94 Wait 0x00e9 @@ -33,7 +33,7 @@ SCRIPT_START script_08015E58 DoPostScriptAction 0x0014 Wait 0x001e TextboxNoOverlap 0x131b - _0807EA94 + _0807EA94 _0807E5F8 0x00000020 WaitForSomething2 0x00000010 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 29fc1626..1ecc9b4d 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015F08 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething2 0x00000001 TextboxNoOverlap 0x131c - _0807EA94 + _0807EA94 _0807E5F8 0x00000002 WaitForSomething 0x00000200 DoPostScriptAction 0x0005 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 6cb4e64b..b90cb216 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015F3C - BeginBlock + BeginBlock SetEntitySpeed 0x0080 _0807EB44 0x0000 _0807E930 0x0000 - EndBlock + EndBlock WaitForSomething 0x00000040 _0807E930 0x0004 _0807EC64 0x00c0 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index 754f1236..685cd467 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015F80 - BeginBlock + BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock WaitForSomething 0x00000200 DoPostScriptAction 0x0005 WaitForSomething 0x00000400 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index b33a121f..3f743ae6 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015FA4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 - EndBlock + EndBlock WaitForSomething 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc index 0182664e..a4af16db 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08015FC0 - BeginBlock + BeginBlock Call sub_0806DB84 CheckKinstoneFused 0x0009 JumpIf script_08016028 _0807EA88 0x0009 CallWithArg sub_0806DA04, 0x00000007 DoPostScriptAction 0x000a - EndBlock + EndBlock script_08015FE4: - _0807EA4C - _0807E9F0 - _0807E864 + _0807EA4C + _0807E9F0 + _0807E864 CheckKinstoneFused 0x0009 JumpIf script_08015FFE Call sub_0807DF50 - _0807E878 + _0807E878 Jump script_08015FE4 script_08015FFE: _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index 9a93f3b9..af9de637 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -4,9 +4,9 @@ SCRIPT_START script_08016004 _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET _0807EB28 0x0b1f - _0807EA94 + _0807EA94 Call sub_0807DF50 - _0807E878 + _0807E878 script_08016028: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index 91553bd0..89472d82 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08016030 - BeginBlock + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_08016062 - EndBlock + EndBlock WaitForSomething2 0x00000001 DoPostScriptAction 0x0010 Wait 0x003c diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index b700d7ba..34937e0f 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801606C - BeginBlock + BeginBlock CheckKinstoneFused 0x0009 JumpIf script_0801609E - EndBlock + EndBlock WaitForSomething2 0x00000002 DoPostScriptAction 0x0010 Wait 0x003c diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 9239fd38..0d780e49 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080160A8 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807E930 0x0008 script_080160B0: - EndBlock - BeginBlock - CheckEntityInteractType + EndBlock + BeginBlock + CheckEntityInteractType JumpIf script_080160E0 TestBit 0x00000008 JumpIf script_080160D2 @@ -13,61 +13,61 @@ script_080160B0: JumpIf script_080160D2 Jump script_080160B0 script_080160D2: - EndBlock - _0807EB74 + EndBlock + _0807EB74 WaitForSomething2 0x00000004 Jump script_080160B0 script_080160E0: - _0807E864 - _0807EB74 - EndBlock - HasRoomItemForSale + _0807E864 + _0807EB74 + EndBlock + HasRoomItemForSale JumpIfNot script_0801611A TextboxNoOverlapFollow 0x2d07 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08016132 BuyItem 0x0000, 0x0000 JumpIf script_0801610C TextboxNoOverlapFollow 0x2d0b - _0807EA94 + _0807EA94 Jump script_08016132 script_0801610C: - WaitPlayerAction8 + WaitPlayerAction8 .ifndef EU - _0807EB8C + _0807EB8C TextboxNoOverlapFollow 0x2d0d .else TextboxNoOverlapFollow 0x2d08 .endif - _0807EA94 + _0807EA94 Jump script_08016132 script_0801611A: CheckKinstoneFused 0x0014 JumpIfNot script_0801612C TextboxNoOverlapFollow 0x2d09 - _0807EA94 + _0807EA94 Jump script_08016132 script_0801612C: TextboxNoOverlapFollow 0x2d01 - _0807EA94 + _0807EA94 script_08016132: - _0807E878 + _0807E878 _0807EB44 0x0004 Jump script_080160B0 .align 2, 0 SCRIPT_START script_0801613C - BeginBlock + BeginBlock Call sub_080787B4 - EndBlock + EndBlock script_08016146: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08016146 - _0807E864 + _0807E864 GetInventoryValue 0x0025 TextboxNoOverlapFollowTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 - _0807E3E8 + _0807E3E8 JumpIfNot script_0801618A _0807E48C 0x0020 JumpIf script_08016172 @@ -79,24 +79,24 @@ script_08016172: TextboxNoOverlapFollow 0x2d0b Jump script_0801618A script_08016184: - WaitPlayerAction8 + WaitPlayerAction8 TextboxNoOverlapFollow 0x2d06 script_0801618A: - _0807E878 + _0807E878 Jump script_08016146 .align 2, 0 SCRIPT_START script_08016190 - BeginBlock + BeginBlock Call sub_080787B4 - EndBlock + EndBlock script_0801619A: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_0801619A - _0807E864 + _0807E864 GetInventoryValue 0x0024 TextboxNoOverlapFollowTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 - _0807E3E8 + _0807E3E8 JumpIfNot script_080161E2 _0807E48C 0x0020 JumpIf script_080161C6 @@ -109,54 +109,54 @@ script_080161C6: Jump script_080161E2 script_080161D8: .ifndef EU - WaitPlayerAction8 - _0807EA94 - _0807EB8C + WaitPlayerAction8 + _0807EA94 + _0807EB8C TextboxNoOverlap 0x2d06 .else TextboxNoOverlapFollow 0x2d06 .endif script_080161E2: - _0807E878 + _0807E878 Jump script_0801619A .align 2, 0 SCRIPT_START script_080161E8 - BeginBlock + BeginBlock Call sub_0807F348 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - EndBlock + EndBlock script_080161FE: Call sub_08068C28 script_08016204: - CheckEntityInteractType + CheckEntityInteractType JumpIfNot script_08016204 - _0807E864 + _0807E864 Call sub_0807DF28 - _0807EB74 + _0807EB74 Call sub_08068CA0 JumpIf script_0801633E Call sub_08068CFC JumpIfNot script_08016332 Call sub_08068DB8 - _0807EA94 + _0807EA94 Call sub_08068DD0 - _0807EA94 - _0807E3E8 + _0807EA94 + _0807E3E8 JumpIfNot script_08016346 StartPlayerScript script_0801635C WaitForSomething2 0x00000001 - _0807EB74 + _0807EB74 Call sub_08068C8C JumpIf script_08016262 Call sub_08068DE8 - _0807EA94 + _0807EA94 Wait 0x001e script_08016262: Call sub_08068E00 - _0807EA94 + _0807EA94 DoPostScriptAction 0x0001 Call sub_0807F2D4 Call sub_08068E90 @@ -171,31 +171,31 @@ script_08016262: Call sub_08068BD0 Wait 0x001e Call sub_08068E18 - _0807EA94 + _0807EA94 Call sub_08068EB4 Call sub_0807DF50 - _0807E878 + _0807E878 script_080162CC: - EndBlock - BeginBlock + EndBlock + BeginBlock Call sub_08068EC4 JumpIf script_080162F6 - CheckEntityInteractType + CheckEntityInteractType JumpIf script_080162E4 Jump script_080162CC script_080162E4: - EndBlock - _0807E864 + EndBlock + _0807E864 Call sub_08068E78 - _0807EA94 - _0807E878 + _0807EA94 + _0807E878 Jump script_080162CC script_080162F6: - EndBlock - _0807E888 + EndBlock + _0807E888 Call sub_0807F594 Call sub_0807DF28 - _0807E864 + _0807E864 StopBgm PlaySound SFX_TASK_COMPLETE Wait 0x003c @@ -203,21 +203,21 @@ script_080162F6: Call sub_08068F3C script_0801631C: Call sub_08068E30 - _0807EA94 + _0807EA94 Call sub_08068C6C - WaitPlayerAction8 - _0807EA94 + WaitPlayerAction8 + _0807EA94 Jump script_08016346 script_08016332: Call sub_08068E60 - _0807EA94 + _0807EA94 Jump script_08016346 script_0801633E: Call sub_08068E48 - _0807EA94 + _0807EA94 script_08016346: Call sub_0807DF50 - _0807E878 + _0807E878 _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_080161FE diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 7887a419..6b85d8b8 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,6 +1,6 @@ SCRIPT_START script_08016384 - BeginBlock - EndBlock + BeginBlock + EndBlock Jump script_08016384 JumpIf script_08016384 JumpIfNot script_08016384 @@ -15,7 +15,7 @@ SCRIPT_START script_08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 - HasRoomItemForSale + HasRoomItemForSale CheckLocalFlag 0x0067 .ifdef JP CheckLocalFlagByOffset 0x0100, 0x0069 @@ -23,17 +23,21 @@ SCRIPT_START script_08016384 .ifdef EU CheckLocalFlagByOffset 0x0100, 0x0069 .else +.ifdef DEMO_JP + CheckLocalFlagByOffset 0x0100, 0x0069 @ TODO deduplicate +.else CheckLocalFlagByOffset 0x0100, 0x006b .endif .endif +.endif CheckGlobalFlag 0x0013 CheckRoomFlag 0x0000 CheckPlayerInRegion 0x0000, 0x0000, 0x0000 CheckPlayerInRegion2 0x0000 - CheckEntityInteractType - _0807E30C + CheckEntityInteractType + _0807E30C HasRupees 0x00c8 - _0807E3E8 + _0807E3E8 CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 _0807E48C 0x0020 @@ -41,8 +45,8 @@ SCRIPT_START script_08016384 _0807E4EC 0x00000000 _0807E514 0x00000000 CheckPlayerFlags 0x00000080 - _0807E564 - EntityHasHeight + _0807E564 + EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 _0807E5F8 0x00000001 @@ -57,9 +61,9 @@ SCRIPT_START script_08016384 Wait 0x001e WaitForSomething 0x00000001 WaitForSomething2 0x00000002 - WaitPlayerAction8 - WaitForPlayerAction0x17 - WaitFor_1 - WaitFor_2 + WaitPlayerAction8 + WaitForPlayerAction0x17 + WaitFor_1 + WaitFor_2 _0807E778 0x0004 _0807E788 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 9ca8e7f6..a62ea33f 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -1,51 +1,51 @@ SCRIPT_START script_08016482 - _0807E79C + _0807E79C Nop2 0x0080 - DoFade4 - DoFade5 - DoFade6 - DoFade7 + DoFade4 + DoFade5 + DoFade6 + DoFade7 _0807E800 0x00000000 _0807E80C 0x00000000 - _0807E858_0 - _0807E864 - _0807E878 - _0807E888 + _0807E858_0 + _0807E864 + _0807E878 + _0807E888 SetPlayerAction 0x00005408 StartPlayerScript script_08016384 _0807E8D4 0x03a0 - _0807E8E4_0 - _0807E8E4_1 - _0807E8E4_2 - _0807E8E4_3 + _0807E8E4_0 + _0807E8E4_1 + _0807E8E4_2 + _0807E8E4_3 _0807E908 0x0004 SetIntVariable 0x00000000 - _0807E924 + _0807E924 _0807E930 0x0000 - _0807E944 + _0807E944 _0807E974 0x0600 - _0807E9D4 - _0807E9DC + _0807E9D4 + _0807E9DC _0807E9E4 0x0000 _0807EA88 0x0001 - _0807EA94 + _0807EA94 TextboxNoOverlapFollow 0x0601 TextboxNoOverlap 0x0601 TextboxNoOverlapFollowPos_1 0x0601 TextboxNoOverlapFollowTable 0x0601, 0x0602, 0x0603 - TextboxNoOverlapVar + TextboxNoOverlapVar _0807EB28 0x0602 - _0807EB38 + _0807EB38 _0807EB44 0x0000 _0807EB4C 0x0000, 0x0000 - _0807EB74 - _0807EB8C + _0807EB74 + _0807EB8C SetEntityDirection 0x0000 SetEntityDirectionWithAnimationState 0x0000 SetEntitySpeed 0x0100 SetEntity0x20 0x00018000 SetEntityPositionRelative 0x0000, 0x0000 - MoveEntityToPlayer + MoveEntityToPlayer Nop3 _0807EC1C 0x0010 _0807EC64 0x0020 @@ -55,8 +55,8 @@ SCRIPT_START script_08016482 _0807ED24 0x0000, 0x0000, 0x0000 _0807EDD4 0x0000, 0x0000 _0807EE04 0x0000, 0x0000 - _0807EE30 - _0807EEB4 + _0807EE30 + _0807EEB4 _0807EEF4 0xfff0, 0x0014 DoPostScriptAction 0x0000 DoPostScriptAction2 0x0001 @@ -72,8 +72,8 @@ SCRIPT_START script_08016482 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 _0807F088 0x0001 - CameraTargetEntity - CameraTargetPlayer + CameraTargetEntity + CameraTargetPlayer _0807F0B4 0x0007 _0807F0C8 0x003c, 0x0003 SCRIPT_END diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index c8af0ba1..288a6781 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_080165A4 - BeginBlock + BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 - _0807E9D4 - EndBlock + _0807E9D4 + EndBlock script_080165B2: _0807E974 0x0601 Jump script_080165B2 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index ac2b01c1..d0e3de77 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -7,38 +7,38 @@ SCRIPT_START script_080165D8 JumpAbsolute script_080165D8 .2byte 0x0000 SCRIPT_START script_080165F8 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_080165FE: - _0807E30C + _0807E30C JumpIfNot script_080165FE TextboxNoOverlapFollow 0x0601 Jump script_080165FE SCRIPT_START script_0801660C - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_08016612: - _0807E944 - _0807E864 + _0807E944 + _0807E864 TextboxNoOverlapFollow 0x0602 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_08016612 .2byte 0x0000 SCRIPT_START script_08016628 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_0801662E: - _0807E944 - _0807E864 + _0807E944 + _0807E864 _0807EB28 0x0603 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801662E .2byte 0x0000 SCRIPT_START script_08016644 @@ -121,7 +121,7 @@ script_08016700: _0807EB44 0x0004 Wait 0x003c Jump script_08016700 -SCRIPT_START script_08016798 +SCRIPT_START script_08016798 SetEntitySpeed 0x0100 script_0801679C: WaitForSomething 0x00000002 @@ -200,64 +200,64 @@ script_08016848: _0807EB44 0x0004 Jump script_08016848 SCRIPT_START script_080168E0 - BeginBlock - _0807E9D4 - EndBlock + BeginBlock + _0807E9D4 + EndBlock script_080168E6: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x000f - _0807E878 + _0807E878 Jump script_080168E6 SCRIPT_START script_080168F4 - BeginBlock + BeginBlock Call sub_08064EA4 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801690A: - _0807E30C + _0807E30C JumpIfNot script_0801690A - _0807E864 - _0807EB74 + _0807E864 + _0807EB74 Call sub_08064F28 - _0807EA94 + _0807EA94 JumpIfNot script_08016926 _0807F034 0x003d - WaitPlayerAction8 + WaitPlayerAction8 script_08016926: - _0807E878 + _0807E878 SetGlobalFlag 0x005c Jump script_0801690A - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a - EndBlock + EndBlock script_0801693E: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x0018 TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801693E .2byte 0x0000 - BeginBlock - _0807E9D4 + BeginBlock + _0807E9D4 _0807EB44 0x0000 DoPostScriptAction 0x000a _0807E930 0x0000 - EndBlock + EndBlock script_0801696A: - _0807E944 - _0807E864 + _0807E944 + _0807E864 Wait 0x0018 TextboxNoOverlapFollow 0x0a01 - _0807EA94 + _0807EA94 Wait 0x000f - _0807E878 + _0807E878 Jump script_0801696A .2byte 0x0000 diff --git a/data/sprite_table.s b/data/sprite_table.s index 0b04dede..178484d4 100644 --- a/data/sprite_table.s +++ b/data/sprite_table.s @@ -14,7 +14,7 @@ gUnk_089FB780:: @ 089FB780 .incbin "baserom.gba", 0x9FB780, 0x0000F44 .endif @ More sprites in demo -.ifdef DEMO +.ifdef DEMO_USA .incbin "baserom_demo.gba", 0x9FD0F4, 0xC0 gUnk_089FD1B4:: .incbin "baserom_demo.gba", 0x9FD1B4, 0x140 diff --git a/data/strings.s b/data/strings.s index 3f4df9ab..9f501e06 100644 --- a/data/strings.s +++ b/data/strings.s @@ -7,6 +7,10 @@ @ TODO use tmc_strings to extract strings for other variants translation:: @ 089B1D90 +.ifdef DEMO_JP + @ some strings seem to be added compared to JP + .incbin "baserom_demo_jp.gba", 0x9B1A28, 0x002BD90 +.else .ifdef JP .incbin "baserom_jp.gba", 0x9B1A30, 0x2BCC0 .else @@ -29,3 +33,4 @@ translationItalian:: .incbin "translations/USA.bin" .endif .endif +.endif diff --git a/data/tileset_headers.s b/data/tileset_headers.s index 0ad27038..36ab18a5 100755 --- a/data/tileset_headers.s +++ b/data/tileset_headers.s @@ -1461,9 +1461,13 @@ gAreaTileset_PalaceOfWindsBoss_0:: @ 08102154 .ifdef JP tileset_tiles 0x224510, 0x600F000, 0x800, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x224510, 0x600F000, 0x800, 1 +.else tileset_tiles 0x22449C, 0x600F000, 0x800, 1 .endif .endif +.endif tileset_palette_set 162, 1 gAreaTilesets_PalaceOfWindsBoss:: @ 08102184 @@ -1475,6 +1479,11 @@ gAreaTileset_Sanctuary_0:: @ 08102188 tileset_tiles 0x22FFA4, 0x6004000, 0x4000, 1 tileset_tiles 0x232028, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x22E250, 0x6000000, 0x4000, 1 + tileset_tiles 0x22FFA4, 0x6004000, 0x4000, 1 + tileset_tiles 0x232028, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x22E1DC+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x22FF30+0x48, 0x6004000, 0x4000, 1 @@ -1485,6 +1494,7 @@ gAreaTileset_Sanctuary_0:: @ 08102188 tileset_tiles 0x231FB4, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 57, 1 gAreaTilesets_Sanctuary:: @ 081021B8 @@ -1496,6 +1506,11 @@ gAreaTileset_HyruleCastle_0:: @ 081021BC tileset_tiles 0x239B50, 0x6004000, 0x4000, 1 tileset_tiles 0x23B8C8, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x2379C0, 0x6000000, 0x4000, 1 + tileset_tiles 0x239B50, 0x6004000, 0x4000, 1 + tileset_tiles 0x23B8C8, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x23794C+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x239ADC+0x48, 0x6004000, 0x4000, 1 @@ -1506,6 +1521,7 @@ gAreaTileset_HyruleCastle_0:: @ 081021BC tileset_tiles 0x23B854, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 58, 1 gAreaTilesets_HyruleCastle:: @ 081021EC @@ -1517,6 +1533,11 @@ gAreaTileset_SanctuaryEntrance_0:: @ 081021F0 tileset_tiles 0x243F6C, 0x6004000, 0x4000, 1 tileset_tiles 0x245558, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x242430, 0x6000000, 0x4000, 1 + tileset_tiles 0x243F6C, 0x6004000, 0x4000, 1 + tileset_tiles 0x245558, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x2423BC+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x243EF8+0x48, 0x6004000, 0x4000, 1 @@ -1527,6 +1548,7 @@ gAreaTileset_SanctuaryEntrance_0:: @ 081021F0 tileset_tiles 0x2454E4, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 145, 1 @@ -1539,6 +1561,11 @@ gAreaTileset_DarkHyruleCastle_0:: @ 08102224 tileset_tiles 0x249734, 0x6004000, 0x4000, 1 tileset_tiles 0x24B99C, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x247560, 0x6000000, 0x4000, 1 + tileset_tiles 0x249734, 0x6004000, 0x4000, 1 + tileset_tiles 0x24B99C, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x2474EC+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x2496C0+0x48, 0x6004000, 0x4000, 1 @@ -1549,6 +1576,7 @@ gAreaTileset_DarkHyruleCastle_0:: @ 08102224 tileset_tiles 0x24B928, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 59, 1 gAreaTilesets_DarkHyruleCastle:: @ 08102254 @@ -1560,6 +1588,11 @@ gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258 tileset_tiles 0x270420, 0x6004000, 0x4000, 1 tileset_tiles 0x2720A4, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x26E430, 0x6000000, 0x4000, 1 + tileset_tiles 0x270420, 0x6004000, 0x4000, 1 + tileset_tiles 0x2720A4, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x26E3BC+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x2703AC+0x48, 0x6004000, 0x4000, 1 @@ -1570,6 +1603,7 @@ gAreaTileset_DarkHyruleCastleOutside_0:: @ 08102258 tileset_tiles 0x272030, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 144, 1 @@ -1582,6 +1616,11 @@ gAreaTileset_DarkHyruleCastleBridge_0:: @ 0810228C tileset_tiles 0x254090, 0x6004000, 0x4000, 1 tileset_tiles 0x2557CC, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x252F6C, 0x6000000, 0x4000, 1 + tileset_tiles 0x254090, 0x6004000, 0x4000, 1 + tileset_tiles 0x2557CC, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x252EF8+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x25401C+0x48, 0x6004000, 0x4000, 1 @@ -1592,6 +1631,7 @@ gAreaTileset_DarkHyruleCastleBridge_0:: @ 0810228C tileset_tiles 0x255758, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 180, 1 gAreaTilesets_DarkHyruleCastleBridge:: @ 081022BC @@ -1603,6 +1643,11 @@ gAreaTileset_VaatisArms_0:: @ 081022C0 tileset_tiles 0x2625A4, 0x6004000, 0x4000, 1 tileset_tiles 0x262F78, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x260DFC, 0x6000000, 0x4000, 1 + tileset_tiles 0x2625A4, 0x6004000, 0x4000, 1 + tileset_tiles 0x262F78, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x260D88+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x262530+0x48, 0x6004000, 0x4000, 1 @@ -1613,6 +1658,7 @@ gAreaTileset_VaatisArms_0:: @ 081022C0 tileset_tiles 0x262F04, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 155, 1 gAreaTilesets_VaatisArms:: @ 081022F0 @@ -1624,6 +1670,11 @@ gAreaTileset_Vaati3_0:: @ 081022F4 tileset_tiles 0x259310, 0x6004000, 0x4000, 1 tileset_tiles 0x25A52C, 0x6008000, 0x4000, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x258204, 0x6000000, 0x4000, 1 + tileset_tiles 0x259310, 0x6004000, 0x4000, 1 + tileset_tiles 0x25A52C, 0x6008000, 0x4000, 1 +.else .ifdef EU tileset_tiles 0x258190+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x25929C+0x48, 0x6004000, 0x4000, 1 @@ -1634,6 +1685,7 @@ gAreaTileset_Vaati3_0:: @ 081022F4 tileset_tiles 0x25A4B8, 0x6008000, 0x4000, 1 .endif .endif +.endif tileset_palette_set 156, 1 gAreaTilesets_Vaati3:: @ 08102324 @@ -1646,6 +1698,12 @@ gAreaTileset_Vaati2_0:: @ 08102328 tileset_tiles 0x25EE50, 0x6008000, 0x4000, 1 tileset_tiles 0x26E13C, 0x600F000, 0x800, 1 .else +.ifdef DEMO_JP + tileset_tiles 0x25D128, 0x6000000, 0x4000, 1 + tileset_tiles 0x25DC08, 0x6004000, 0x4000, 1 + tileset_tiles 0x25EE50, 0x6008000, 0x4000, 1 + tileset_tiles 0x26E13C, 0x600F000, 0x800, 1 +.else .ifdef EU tileset_tiles 0x25D0B4+0x48, 0x6000000, 0x4000, 1 tileset_tiles 0x25DB94+0x48, 0x6004000, 0x4000, 1 @@ -1658,6 +1716,7 @@ gAreaTileset_Vaati2_0:: @ 08102328 tileset_tiles 0x26E0C8, 0x600F000, 0x800, 1 .endif .endif +.endif tileset_palette_set 169, 1 gAreaTilesets_Vaati2:: @ 08102364 @@ -153,7 +153,7 @@ SECTIONS { . = 0x000369F0; gUnk_020369F0 = .; . = 0x00036A38; gCurrentWindow = .; . = 0x00036A40; gNewWindow = .; -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) . = 0x00036A50; gUnk_02036A58 = .; . = 0x00036AD0; gUnk_02036AD8 = .; . = 0x00036BB0; gUnk_02036BB8 = .; @@ -283,7 +283,7 @@ SECTIONS { . = 0x00005FF0; gUnk_03005FF0 = .; . = 0x000060F0; gUnk_030060F0 = .; . = 0x00006164; gUnk_03006164 = .; -#ifdef EU +#if defined(EU) || defined(DEMO_JP) . = 0x000065AC; gUnk_03006580 = .; . = 0x000065C8; gUnk_0300659C = .; . = 0x0000689C; gUnk_0300689C = .; @@ -913,7 +913,7 @@ SECTIONS { asm/code_080A29BC.o(.text); src/playerItem/playerItemShield.o(.text); src/playerItem/playerItem15.o(.text); -#ifdef DEMO +#ifdef DEMO_USA src/demoScreen.o(.text); #endif src/audio.o(.text); @@ -1649,7 +1649,7 @@ data/const/object/object1D.o(.rodata); data/data_08125104.o(.rodata); data/const/playerItem/playerItemShield.o(.rodata); data/const/playerItem/playerItem15.o(.rodata); -#ifdef DEMO +#ifdef DEMO_USA data/const/demoScreen.o(.rodata); #endif data/data_08127280.o(.rodata); diff --git a/src/code_0805436C.c b/src/code_0805436C.c index 2273aab3..c2625d5b 100644 --- a/src/code_0805436C.c +++ b/src/code_0805436C.c @@ -275,7 +275,7 @@ u32 CreateItemDrop(Entity* arg0, u32 itemID, u32 itemParameter) { */ void sub_08054870(void) { -#ifndef DEMO +#if !(defined(DEMO_USA) || defined(DEMO_JP)) gUnk_080FE2A0[gMenu.menuType](); #endif } diff --git a/src/eeprom.c b/src/eeprom.c index b7763a47..ef2c0e8f 100644 --- a/src/eeprom.c +++ b/src/eeprom.c @@ -1,7 +1,7 @@ #include "global.h" #include "gba/eeprom.h" -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) const u8 unk[] = { 0xff, 0xff, 0xff, 0xff }; const u8 padding[0x18] = {}; #else diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c index 2fd6ac8f..d15eb877 100644 --- a/src/enemy/businessScrub.c +++ b/src/enemy/businessScrub.c @@ -266,7 +266,7 @@ void sub_08028CE8(Entity* this) { this->actionDelay = 4; this->field_0x80.HALF.HI = 0; sub_080290E0(this, 3); -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) SetLocalFlag(0x87); #endif return; @@ -61,7 +61,7 @@ void sub_0805212C(void) { gMenu.transitionTimer--; if (gMenu.transitionTimer == 0) { sub_080520C4(2); -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) SoundReq(0x80080000); DoFade(7, 4); #else @@ -77,7 +77,7 @@ void sub_0805212C(void) { } } -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) void sub_080521A0(void) { if (gFadeControl.active == 0) { DoSoftReset(); diff --git a/src/intro.c b/src/intro.c index a181800e..61d63686 100644 --- a/src/intro.c +++ b/src/intro.c @@ -104,7 +104,7 @@ static void HandleNintendoCapcomLogos(void) { gScreen.bg.bg1Updated = 1; DoFade(6, 8); advance = ADVANCE_NONE; -#ifdef DEMO +#if defined(DEMO_USA) if (gUnk_02000010.listenForKeyPresses == 0) { if ((gInput.heldKeys & 0x204) == 0x204) { // TODO gUnk_02000010.field_0x7 = 1; @@ -190,7 +190,7 @@ static void HandleTitlescreen(void) { } break; case 2: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(DEMO_JP) || defined(EU) if (GetAdvanceState()) { #else if (--gIntroState.timer == 0) { @@ -198,7 +198,7 @@ static void HandleTitlescreen(void) { gIntroState.timer = 3600; gIntroState.state++; } -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) UpdatePressStartIcon(); #endif break; @@ -213,7 +213,7 @@ static void HandleTitlescreen(void) { AdvanceIntroSequence(advance); SoundReq(SONG_VOL_FADE_OUT); } -#ifdef JP +#if defined(JP) || defined(DEMO_JP) || defined(DEMO_JP) gOamCmd._4 = 0; gOamCmd._6 = 0; gOamCmd._8 = 0xE020; @@ -249,7 +249,7 @@ static void HandleTitlescreen(void) { sub_080AD9B0(); } -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) static void UpdatePressStartIcon(void) { gOamCmd._4 = 0; gOamCmd._6 = 0; @@ -295,7 +295,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { if (!gFadeControl.active) { gFadeControl.field_0x4 = -1; gIntroState.subState++; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) gIntroState.timer = 120; #else gIntroState.timer = 90; @@ -310,7 +310,7 @@ static void HandleJapaneseTitlescreenAnimationIntro(void) { case 2: if (GetAdvanceState() != ADVANCE_NONE) { gIntroState.state++; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) gIntroState.timer = 30; #else gIntroState.timer = 60; @@ -340,7 +340,7 @@ static void HandleTitlescreenAnimationIntro(void) { break; case 2: if (--gIntroState.timer == 0) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) gIntroState.timer = 360; #else gIntroState.timer = 300; @@ -354,7 +354,7 @@ static void HandleTitlescreenAnimationIntro(void) { default: if (!gFadeControl.active && GetAdvanceState() != ADVANCE_NONE) { gIntroState.state++; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) gIntroState.timer = 30; #else gIntroState.timer = 60; @@ -364,9 +364,18 @@ static void HandleTitlescreenAnimationIntro(void) { } } +#ifdef DEMO_JP +extern u8 gUnk_02002A40; +#endif + static void ExitTitlescreen(void) { if (!gFadeControl.active) { +#ifdef DEMO_JP + MemCopy(&sLightRaysAlphaBlends[8], &gUnk_02002A40, 0x4B4); + InitScreen(SCREEN_GAMEPLAY); +#else InitScreen(SCREEN_CHOOSE_FILE); +#endif } } @@ -20,7 +20,7 @@ extern void HandleDebugTextScreen(void); static void (*const sScreenHandlers[])(void) = { [SCREEN_INTRO] = HandleIntroScreen, -#ifdef DEMO +#ifdef DEMO_USA [SCREEN_CHOOSE_FILE] = HandleChooseDemoScreen, #else [SCREEN_CHOOSE_FILE] = HandleChooseFileScreen, diff --git a/src/manager/manager37.c b/src/manager/manager37.c index f7b56dfa..35003011 100644 --- a/src/manager/manager37.c +++ b/src/manager/manager37.c @@ -38,7 +38,7 @@ void sub_0805DE68(Manager* this) { gScreenTransition.field_0x39 = 0x0f; *(u8*)&gScreenTransition.field_0x3a = 0x20; *((u8*)&gScreenTransition.field_0x3a + 1) = 0x20; -#if !defined(EU) && !defined(JP) && !defined(DEMO_JP) +#if !defined(EU) && !defined(JP) gSave.unk498 = 0x1194; #endif } diff --git a/src/manager/managerF.c b/src/manager/managerF.c index d7e1d7bb..97d732f7 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -28,7 +28,7 @@ void sub_0805947C(ManagerF*); #ifndef EU void sub_080594DC(ManagerF*); #endif -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) void sub_08059548(ManagerF*); #endif @@ -51,7 +51,7 @@ void (*const gUnk_08108314[])(ManagerF*) = { #ifndef EU sub_080594DC, #endif -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) sub_08059548, #endif }; @@ -424,7 +424,7 @@ void sub_080594DC(ManagerF* this) { } #endif -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) void sub_08059548(ManagerF* this) { sub_0805E3A0(this, 6); if (gPlayerEntity.action == 0x16) { diff --git a/src/npc/castleMaid.c b/src/npc/castleMaid.c index dc513e2e..425dd203 100644 --- a/src/npc/castleMaid.c +++ b/src/npc/castleMaid.c @@ -97,13 +97,13 @@ void sub_0806464C(Entity* this) { s32 tmp; if (CheckGlobalFlag(0x15) != 0) { tmp = 2; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) } else if (CheckLocalFlag(0x9f) == 0) { #else } else if (CheckLocalFlag(0xa0) == 0) { #endif tmp = 0; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0x9f); #else SetLocalFlag(0xa0); diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c index b508d100..5e1861e7 100644 --- a/src/npc/castorWildsStatue.c +++ b/src/npc/castorWildsStatue.c @@ -58,7 +58,7 @@ void sub_08067418(Entity* this) { this->spriteOrientation.flipY = 1; this->spriteRendering.b3 = 1; this->spritePriority.b0 = 2; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0x1e) == 0) { #else if (CheckLocalFlag(0x1d) == 0) { diff --git a/src/npc/dog.c b/src/npc/dog.c index 97486431..6f9ed898 100644 --- a/src/npc/dog.c +++ b/src/npc/dog.c @@ -45,7 +45,7 @@ void sub_08069B44(Entity* this) { u32 sVar3; u32 uVar4; u32 uVar5; - if (sub_08069EF0() != 0) { + if (sub_08069EF0(this) != 0) { uVar5 = sub_0805ACC0(this); if (uVar5 == 0) { sVar3 = this->x.HALF.HI; @@ -74,7 +74,7 @@ void sub_08069B44(Entity* this) { if (((this->type == 0) && ((gPlayerState.flags.all & 0x80) == 0)) && (GetInventoryValue(0x36) != 2)) { this->action = 4; } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) { #else if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) { @@ -270,7 +270,7 @@ void sub_08069F6C(Entity* this) { } u32 sub_08069F90(Entity* this) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if ((this->type == 2) && (CheckLocalFlag(0xcc) == 0)) { #else if ((this->type == 2) && (CheckLocalFlag(0xcf) == 0)) { @@ -328,13 +328,13 @@ void sub_0806A0A4(Entity* this) { if ((gPlayerState.flags.all & 0x80) != 0) { dialog = 4; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xcc) == 0) { #else if (CheckLocalFlag(0xcf) == 0) { #endif dialog = 3; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xcc); #else SetLocalFlag(0xcf); @@ -344,19 +344,19 @@ void sub_0806A0A4(Entity* this) { } else { dialog = 2; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xcc) == 0) { #else if (CheckLocalFlag(0xcf) == 0) { #endif dialog = 1; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xd8) == 0) { #else if (CheckLocalFlag(0xdb) == 0) { #endif dialog = 0; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xd8); #else SetLocalFlag(0xdb); diff --git a/src/npc/gina.c b/src/npc/gina.c index 95886173..b7470173 100644 --- a/src/npc/gina.c +++ b/src/npc/gina.c @@ -29,7 +29,7 @@ void Gina(Entity* this) { case 2: if (UpdateFuseInteraction(this) != 0) { this->action = 1; -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) SetLocalFlag(0x88); #endif } diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index b82dfa45..804c013a 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -105,35 +105,35 @@ void sub_0806DAD0(Entity* this) { void sub_0806DAE8(Entity* this) { switch (this->type - 1) { case 0: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xeb); #else SetLocalFlag(0xee); #endif break; case 1: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xec); #else SetLocalFlag(0xef); #endif break; case 2: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xed); #else SetLocalFlag(0xf0); #endif break; case 3: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xee); #else SetLocalFlag(0xf1); #endif break; case 4: -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0xef); #else SetLocalFlag(0xf2); @@ -147,7 +147,7 @@ void sub_0806DAE8(Entity* this) { void sub_0806DB44(Entity* this, ScriptExecutionContext* context) { context->condition = 0; -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xeb) != 0 && CheckLocalFlag(0xec) != 0 && CheckLocalFlag(0xed) != 0 && CheckLocalFlag(0xee) != 0 && CheckLocalFlag(0xef) != 0) { #else @@ -566,7 +566,7 @@ void sub_0804BAC0(void) { if (!CheckGlobalFlag(LV2_CLEAR)) { LoadRoomEntityList(&gUnk_080D7328); } -#ifdef JP +#if defined(JP) || defined(DEMO_JP) if (CheckGlobalFlag(CASTLE_BGM) || CheckGlobalFlag(ENDING)) { #else #ifdef EU @@ -660,7 +660,7 @@ u32 sub_0804BC34() { extern EntityData gUnk_080D7690; void sub_0804bc38(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0x9b)) { #else if (CheckLocalFlag(0x9c)) { @@ -670,7 +670,7 @@ void sub_0804bc38(void) { } u32 sub_0804BC50(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x9e)) { #else if (!CheckLocalFlag(0x9f)) { @@ -684,7 +684,7 @@ u32 sub_0804BC50(void) { extern u32 script_08009E88; void sub_0804BC70(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(DEMO_JP) || defined(EU) if (!CheckLocalFlag(0x9e)) { #else if (!CheckLocalFlag(0x9f)) { @@ -702,19 +702,19 @@ void sub_0804BC70(void) { if (!CheckGlobalFlag(TABIDACHI)) { sub_08052878(); -#ifndef JP +#if !(defined(JP) || defined(DEMO_JP)) } else { #else } #endif if (CheckGlobalFlag(CASTLE_BGM)) { -#ifdef JP +#if defined(JP) || defined(DEMO_JP) gArea.pMusicIndex = gArea.musicIndex; #else gArea.pMusicIndex = 0x1b; #endif } -#ifndef JP +#if !(defined(JP) || defined(DEMO_JP)) } #endif #endif @@ -2005,7 +2005,7 @@ void sub_0804CAA0(void) { if (CheckGlobalFlag(KUMOTATSUMAKI)) { sub_0809F814(0x6de); } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xf0)) { #else if (CheckLocalFlag(0xf3)) { @@ -2014,7 +2014,7 @@ void sub_0804CAA0(void) { } else { LoadRoomEntityList(&gUnk_080DD7E0); } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlag(0xf2)) { #else if (CheckLocalFlag(0xf5)) { @@ -2031,7 +2031,7 @@ u32 sub_0804CAF4() { void sub_0804CAF8() { sub_080300E8(); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) SetLocalFlag(0x25); #else SetLocalFlag(0x24); @@ -2059,7 +2059,7 @@ void sub_0804CB14(void) { } void sub_0804CB2C(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlagByOffset(0x100, 0x28)) { #else if (CheckLocalFlagByOffset(0x100, 0x27)) { @@ -2099,14 +2099,14 @@ extern EntityData gUnk_080DE200; void sub_0804CB7C(void) { sub_080300E8(); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x31)) { #else if (!CheckLocalFlag(0x30)) { #endif LoadRoomEntityList(&gUnk_080DE1E0); } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x32)) { #else if (!CheckLocalFlag(0x31)) { @@ -2237,9 +2237,15 @@ u32 sub_0804CD0C() { return 1; } -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) void nullsub_251() { +#ifdef DEMO_USA if (gUnk_02000000->saveFileId != 0 && GetInventoryValue(0x40) == 0) { +#else +#ifdef DEMO_JP + if (GetInventoryValue(0x40) == 0) { +#endif +#endif SetTileType(0x365, 0x349, 1); SetTileType(0x365, 0x34a, 1); SetTileType(0x365, 0x34b, 1); @@ -2374,7 +2380,7 @@ u32 sub_0804CE38() { return 1; } -#ifdef DEMO +#ifdef DEMO_USA void nullsub_262() { if (GetInventoryValue(0x41) == 0) { SetTileType(0x365, 0x287, 2); @@ -4314,7 +4320,7 @@ void LoadHyruleTown(void) { sub_08054570(); TryLoadPrologueHyruleTown(); -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) SetTileType(0x176, 0x66b, 1); #endif if (gSave.unk8 == 1) { @@ -4374,7 +4380,7 @@ void LoadHyruleTown(void) { LoadRoomEntityList(&gUnk_080EEA5C); } // rocs cape -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0xcd) && GetInventoryValue(0x14)) { #else if (!CheckLocalFlag(0xd0) && GetInventoryValue(0x14)) { @@ -4523,7 +4529,7 @@ void sub_0804E27C(void) { SetGlobalFlag(CASTLE_BGM); } else { if (CheckGlobalFlag(CASTLE_BGM)) { -#ifdef JP +#if defined(JP) || defined(DEMO_JP) gArea.pMusicIndex = gArea.musicIndex; #else gArea.pMusicIndex = 0x1b; @@ -4531,7 +4537,7 @@ void sub_0804E27C(void) { } #endif } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(DEMO_JP) || defined(EU) if (!CheckLocalFlag(0x9b)) { #else if (!CheckLocalFlag(0x9c)) { @@ -4558,13 +4564,13 @@ void sub_0804E27C(void) { } SetTileType(0x4072, 600, 1); SetTileType(0x4072, 0x298, 1); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(DEMO_JP) || defined(EU) if (CheckLocalFlag(0x11)) { #else if (CheckLocalFlag(0x10)) { #endif LoadRoomEntityList(&gUnk_080F0920); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(DEMO_JP) || defined(EU) ClearLocalFlag(0x11); #else ClearLocalFlag(0x10); @@ -5157,7 +5163,7 @@ void sub_0804EC00(void) { if (!CheckGlobalFlag(EZERO_1ST)) { LoadRoomEntityList(&gUnk_080F4D50); } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x3d)) { if (!CheckLocalFlag(0x3a)) { #else @@ -5176,7 +5182,7 @@ void sub_0804EC00(void) { if ((s32)gSave.windcrests > -1) { LoadRoomEntityList(&gUnk_080F4E10); } -#ifdef DEMO +#ifdef DEMO_USA SetTileType(0x177, 0x5b4, 1); SetTileType(0x177, 0x5f4, 1); #endif @@ -5213,7 +5219,7 @@ void sub_0804ECEC(void) { // white sword if (GetInventoryValue(0x2)) { LoadRoomEntityList(&gUnk_080F5328); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x15)) { #else if (!CheckLocalFlag(0x14)) { @@ -5406,7 +5412,7 @@ u32 sub_0804F02C() { extern EntityData gUnk_080F5E68; void sub_0804F030(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlagByOffset(0x100, 0xce)) { #else if (!CheckLocalFlagByOffset(0x100, 0xd1)) { @@ -5450,7 +5456,7 @@ void nullsub_400() { } u32 sub_0804F09C(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByOffset(0x100, 0xd9)) { #else if (CheckGlobalFlag(KUMOTATSUMAKI) && CheckLocalFlagByOffset(0x100, 0xdc)) { @@ -5463,7 +5469,7 @@ u32 sub_0804F09C(void) { extern EntityData gUnk_080F61BC; void sub_0804F0C0(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckLocalFlagByOffset(0x100, 0xd9)) { #else if (CheckLocalFlagByOffset(0x100, 0xdc)) { @@ -5616,7 +5622,7 @@ void sub_0804F230() { } u32 sub_0804F23C(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x6b)) { #else if (!CheckLocalFlag(0x6d)) { @@ -5633,7 +5639,7 @@ extern EntityData gUnk_080F7088; void sub_0804F25C(void) { Manager18_Main(0); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x6b)) { #else if (!CheckLocalFlag(0x6d)) { @@ -5743,7 +5749,7 @@ u32 Vars_HyruleField_OutsideCastle(void) { gRoomVars.field_0x6c = &gUnk_080F7CD0; gRoomVars.field_0x88 = sub_0804F5E8; } -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x8a)) { #else if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x8c)) { @@ -5769,7 +5775,7 @@ extern EntityData gUnk_080F7D70; void Load_HyruleField_OutsideCastle(void) { sub_0804F4E4(); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x89)) { #else if (!CheckLocalFlag(0x8b)) { @@ -5793,7 +5799,7 @@ void Load_HyruleField_OutsideCastle(void) { extern EntityData gUnk_080F7DC0; void sub_0804F578(void) { -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (!CheckLocalFlag(0x8c)) { #else if (!CheckLocalFlag(0x8e)) { @@ -5964,7 +5970,7 @@ extern EntityData gUnk_080F82E0; void Load_HyruleField_TrilbyHighlands(void) { Manager18_Main(0); -#if defined(JP) || defined(EU) +#if defined(JP) || defined(EU) || defined(DEMO_JP) if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9b)) { #else if (CheckGlobalFlag(LV2_CLEAR) && GetInventoryValue(0x3) && !CheckLocalFlag(0x9c)) { @@ -6620,7 +6626,7 @@ u32 sub_0804FED4() { } void sub_0804FED8(void) { -#if defined(USA) || defined(DEMO) +#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP) SetTileType(0x176, 0x66f, 1); #endif } @@ -43,16 +43,22 @@ const u16 gUnk_0811E454[] = { 0x0, 0x0, 0x100, 0x200, 0x300, 0x400, 0x500, const char gUnk_0811E470[4] = "LINK"; -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) const u8 demoUnknown0 = 0x0; +#ifdef DEMO_USA const u8 demoUnknown1[] = { 0x0f, 0x0a, 0x0a, 0x0f, 0x0f, 0x0f, 0x08, 0x05, 0x05, 0x00, 0x00 }; #else +const u8 demoUnknown1[] = { 0 }; +#endif +#else const u8 padding[2] = { 0, 0 }; #endif static SaveResult (*const sSaveHandlers[])(u32) = { HandleSaveInit, HandleSaveInProgress, HandleSaveDone }; -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) + +#ifdef DEMO_USA asm("demoPointer1: .incbin \"baserom_demo.gba\", 0x11e010, 0x500"); asm("demoPointer2: .incbin \"baserom_demo.gba\", 0x11e510, 0x500"); asm("demoPointer3: .incbin \"baserom_demo.gba\", 0x11ea10, 0x500"); @@ -62,6 +68,7 @@ extern const u32 demoPointer2; extern const u32 demoPointer3; const u32 demoPointers[] = { (u32)&demoPointer1, (u32)&demoPointer2, (u32)&demoPointer3 }; +#endif #else @@ -147,7 +154,7 @@ SaveResult HandleSaveDone(u32 arg0) { } u32 InitSaveData(void) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) CpuSet(NULL, &gSave, 0x4b4); return 1; #else @@ -179,7 +186,7 @@ u32 InitSaveData(void) { } u32 WriteSaveFile(u32 index, SaveFile* saveFile) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 1; #else return DataDoubleWriteWithStatus(index, saveFile); @@ -187,7 +194,7 @@ u32 WriteSaveFile(u32 index, SaveFile* saveFile) { } u32 Write_02000000(struct_02000000* arg0) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 1; #else return DataDoubleWriteWithStatus(3, arg0); @@ -195,7 +202,7 @@ u32 Write_02000000(struct_02000000* arg0) { } u32 sub_0807CF1C(u8* arg0) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 1; #else return DataDoubleWriteWithStatus(5, arg0); @@ -203,7 +210,7 @@ u32 sub_0807CF1C(u8* arg0) { } s32 ReadSaveFile(u32 index, SaveFile* saveFile) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 1; #else return DataDoubleReadWithStatus(index, saveFile); @@ -211,7 +218,7 @@ s32 ReadSaveFile(u32 index, SaveFile* saveFile) { } u32 Read_02000000(struct_02000000* arg0) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 0; #else return DataDoubleReadWithStatus(3, arg0); @@ -219,7 +226,7 @@ u32 Read_02000000(struct_02000000* arg0) { } u32 sub_0807CF3C(u8* arg0) { -#ifdef DEMO +#if defined(DEMO_USA) || defined(DEMO_JP) return 0; #else return DataDoubleReadWithStatus(5, arg0); @@ -227,7 +234,7 @@ u32 sub_0807CF3C(u8* arg0) { } void SetFileStatusDeleted(u32 index) { -#ifndef DEMO +#if !(defined(DEMO_USA) || defined(DEMO_JP)) const SaveFileEEPROMAddresses* eepromAddresses; eepromAddresses = GetSaveFileEEPROMAddresses(index); @@ -236,7 +243,7 @@ void SetFileStatusDeleted(u32 index) { #endif } -#ifndef DEMO +#if !(defined(DEMO_USA) || defined(DEMO_JP)) void SetFileStatusInit(u32 index) { const SaveFileEEPROMAddresses* eepromAddresses; const SaveFileStatus* fileStatus; diff --git a/src/sub_080A3B84.c b/src/sub_080A3B84.c index c20cc780..2012ae1d 100644 --- a/src/sub_080A3B84.c +++ b/src/sub_080A3B84.c @@ -7,7 +7,7 @@ extern void (*const gUnk_081280C4[])(); void DrawKinstoneMenu(void) { -#ifndef DEMO +#if !(defined(DEMO_USA) || defined(DEMO_JP)) gScreenTransition.field_0x24[8] = 2; FlushSprites(); gUnk_081280C4[gMenu.menuType](); diff --git a/tmc_demo.sha1 b/tmc_demo.sha1 deleted file mode 100644 index c96b5d47..00000000 --- a/tmc_demo.sha1 +++ /dev/null @@ -1 +0,0 @@ -63fcad218f9047b6a9edbb68c98bd0dec322d7a1 tmc_demo.gba diff --git a/tmc_demo_jp.sha1 b/tmc_demo_jp.sha1 new file mode 100644 index 00000000..db83ea2c --- /dev/null +++ b/tmc_demo_jp.sha1 @@ -0,0 +1 @@ +9cdb56fa79bba13158b81925c1f3641251326412 tmc_demo_jp.gba diff --git a/tmc_demo_usa.sha1 b/tmc_demo_usa.sha1 new file mode 100644 index 00000000..e5e387f5 --- /dev/null +++ b/tmc_demo_usa.sha1 @@ -0,0 +1 @@ +63fcad218f9047b6a9edbb68c98bd0dec322d7a1 tmc_demo_usa.gba |