diff --git a/asm/bird.s b/asm/bird.s index a0db6e49..e61da353 100644 --- a/asm/bird.s +++ b/asm/bird.s @@ -515,7 +515,7 @@ _0809D5E6: adds r4, r0, #0 cmp r4, #0 beq _0809D62E - ldr r1, _0809D668 @ =script_0800B0AC + ldr r1, _0809D668 @ =script_EzloTalkOcarina bl StartCutscene adds r1, r4, #0 adds r1, #0x84 @@ -545,7 +545,7 @@ _0809D658: .4byte gPlayerEntity _0809D65C: .4byte 0xFFF80000 _0809D660: .4byte gRoomControls _0809D664: .4byte gUnk_02034490 -_0809D668: .4byte script_0800B0AC +_0809D668: .4byte script_EzloTalkOcarina thumb_func_start sub_0809D66C sub_0809D66C: @ 0x0809D66C diff --git a/asm/businessScrubPrologue.s b/asm/businessScrubPrologue.s index f8bf3fe4..87fa6ddc 100644 --- a/asm/businessScrubPrologue.s +++ b/asm/businessScrubPrologue.s @@ -142,14 +142,14 @@ sub_08045C3C: @ 0x08045C3C bl sub_08046030 adds r0, r4, #0 bl sub_08095C48 - ldr r1, _08045CA0 @ =script_08015AC4 + ldr r1, _08045CA0 @ =script_BusinessScrubIntro adds r0, r4, #0 bl StartCutscene adds r0, r4, #0 bl sub_0807DD50 pop {r4, pc} .align 2, 0 -_08045CA0: .4byte script_08015AC4 +_08045CA0: .4byte script_BusinessScrubIntro thumb_func_start sub_08045CA4 sub_08045CA4: @ 0x08045CA4 diff --git a/asm/fourElements.s b/asm/fourElements.s index 781da69f..f59c48cc 100644 --- a/asm/fourElements.s +++ b/asm/fourElements.s @@ -78,7 +78,7 @@ sub_080A01E0: @ 0x080A01E0 adds r0, #0x38 strb r3, [r0] _080A0246: - ldr r0, _080A028C @ =script_0800A0B4 + ldr r0, _080A028C @ =script_PlayerGetElement bl StartPlayerScript ldr r1, _080A0284 @ =gScreen adds r2, r1, #0 @@ -108,7 +108,7 @@ _080A027C: .4byte gHitbox_6 _080A0280: .4byte 0x0000FF40 _080A0284: .4byte gScreen _080A0288: .4byte 0x0000FDFF -_080A028C: .4byte script_0800A0B4 +_080A028C: .4byte script_PlayerGetElement thumb_func_start sub_080A0290 sub_080A0290: @ 0x080A0290 diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index df85a3a2..1c6bc83d 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -115,7 +115,7 @@ .4byte \entityDataList .endm -.macro TestBit bitmask:req +.macro CheckSyncFlagAndClear bitmask:req .2byte 0x0c0e .4byte \bitmask .endm @@ -185,7 +185,7 @@ .2byte \s .endm -.macro _0807E3E8 +.macro CheckTextboxResult .2byte 0x041c .endm @@ -204,7 +204,7 @@ .endif .endm -.macro _0807E48C s:req +.macro CheckBottleContaining s:req .2byte 0x081f .2byte \s .endm @@ -247,12 +247,12 @@ .2byte \s .endm -.macro _0807E5F8 w:req +.macro SetSyncFlag w:req .2byte 0x0c28 .4byte \w .endm -.macro _0807E610 w:req +.macro ClearSyncFlag w:req .2byte 0x0c29 .4byte \w .endm @@ -298,12 +298,12 @@ .2byte \frames .endm -.macro WaitForSomething w:req +.macro WaitForSyncFlag w:req .2byte 0x0c32 .4byte \w .endm -.macro WaitForSomething2 w:req +.macro WaitForSyncFlagAndClear w:req .2byte 0x0c33 .4byte \w .endm @@ -320,7 +320,7 @@ .2byte 0x0436 .endm -.macro WaitFor_2 +.macro WaitForFadeFinish .2byte 0x0437 .endm @@ -690,7 +690,7 @@ .2byte 8 .endm -.macro _0807F034 s:req +.macro GivePlayerItem s:req .2byte 0x0882 .2byte \s .endm diff --git a/asm/mazaalBossObject.s b/asm/mazaalBossObject.s index 22ea10b6..1a02086b 100644 --- a/asm/mazaalBossObject.s +++ b/asm/mazaalBossObject.s @@ -85,7 +85,7 @@ _0809AB70: adds r1, #0x63 movs r0, #0x20 strb r0, [r1] - ldr r1, _0809ABA0 @ =script_08012DD8 + ldr r1, _0809ABA0 @ =script_Object89Mazaal adds r0, r5, #0 bl StartCutscene adds r1, r5, #0 @@ -94,7 +94,7 @@ _0809AB70: _0809AB9C: pop {r4, r5, pc} .align 2, 0 -_0809ABA0: .4byte script_08012DD8 +_0809ABA0: .4byte script_Object89Mazaal thumb_func_start sub_0809ABA4 sub_0809ABA4: @ 0x0809ABA4 diff --git a/asm/non_matching/player/sub_080751E8.inc b/asm/non_matching/player/sub_080751E8.inc index 6140893a..b90fbe8c 100644 --- a/asm/non_matching/player/sub_080751E8.inc +++ b/asm/non_matching/player/sub_080751E8.inc @@ -31,16 +31,16 @@ cmp r7, #0 bne _08075240 strb r7, [r3] - ldr r6, _0807523C @ =script_08009ECC + ldr r6, _0807523C @ =script_BedInLinksRoom b _08075244 .align 2, 0 _08075230: .4byte gPlayerScriptExecutionContext _08075234: .4byte gPlayerEntity _08075238: .4byte gPlayerState -_0807523C: .4byte script_08009ECC +_0807523C: .4byte script_BedInLinksRoom _08075240: strb r4, [r3] - ldr r6, _08075290 @ =script_08009EF0 + ldr r6, _08075290 @ =script_BedAtSimons _08075244: ldr r0, _08075294 @ =gPlayerState adds r0, #0x39 @@ -78,7 +78,7 @@ _08075270: _0807528C: pop {r4, r5, r6, r7, pc} .align 2, 0 -_08075290: .4byte script_08009EF0 +_08075290: .4byte script_BedAtSimons _08075294: .4byte gPlayerState _08075298: .4byte gPlayerEntity .syntax divided diff --git a/asm/non_matching/stockwell/sub_080650CC.inc b/asm/non_matching/stockwell/sub_080650CC.inc index 961a8ac3..21f19267 100644 --- a/asm/non_matching/stockwell/sub_080650CC.inc +++ b/asm/non_matching/stockwell/sub_080650CC.inc @@ -16,12 +16,12 @@ adds r0, r5, #0 adds r0, #0x84 ldr r0, [r0] - ldr r1, _080650FC @ =script_080143C0 + ldr r1, _080650FC @ =script_StockwellDogFood bl InitScriptExecutionContext b _080651A6 .align 2, 0 _080650F8: .4byte gRoomVars -_080650FC: .4byte script_080143C0 +_080650FC: .4byte script_StockwellDogFood _08065100: adds r2, r5, #0 adds r2, #0x5a @@ -65,7 +65,7 @@ _0806513C: adds r0, r5, #0 adds r0, #0x84 ldr r0, [r0] - ldr r1, _08065174 @ =script_08014384 + ldr r1, _08065174 @ =script_StockwellBuy bl InitScriptExecutionContext _0806515E: adds r0, r7, #0 @@ -78,7 +78,7 @@ _0806515E: str r0, [r1, #0x10] b _080651A6 .align 2, 0 -_08065174: .4byte script_08014384 +_08065174: .4byte script_StockwellBuy _08065178: .4byte gMessage _0806517C: ldrb r1, [r2] diff --git a/data/const/npc/forestMinish.s b/data/const/npc/forestMinish.s index cd2fa1aa..97cf8805 100644 --- a/data/const/npc/forestMinish.s +++ b/data/const/npc/forestMinish.s @@ -8,50 +8,50 @@ gUnk_08109C98:: @ 08109C98 .incbin "forestMinish/gUnk_08109C98.bin" gUnk_08109D18:: @ 08109D18 - .4byte script_08009F14 - .4byte script_0800BB30 - .4byte script_080165F8 - .4byte script_0801660C - .4byte script_08016628 - .4byte script_08016644 - .4byte script_0801666C - .4byte script_080166B8 - .4byte script_080166FC - .4byte script_08016798 - .4byte script_08016844 - .4byte script_080168E0 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800C584 - .4byte script_0800C5C8 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800C550 - .4byte script_0800CD7C - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800C5FC - .4byte script_0800E6B0 - .4byte script_0800E6B0 - .4byte script_0800E6B0 - .4byte script_0800CABC - .4byte script_0800CB54 - .4byte script_0800CBD4 - .4byte script_0800CC6C - .4byte script_0800CD04 + .4byte script_BombMinish + .4byte script_BombMinishKinstone + .4byte script_ForestMinish12 + .4byte script_ForestMinish13 + .4byte script_ForestMinish14 + .4byte script_ForestMinish15 + .4byte script_ForestMinish16 + .4byte script_ForestMinish17 + .4byte script_ForestMinish18 + .4byte script_ForestMinish19 + .4byte script_ForestMinish20 + .4byte script_ForestMinish21 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish2 + .4byte script_ForestMinish3 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish1 + .4byte script_ForestMinish10 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish4 + .4byte script_ForestMinish11 + .4byte script_ForestMinish11 + .4byte script_ForestMinish11 + .4byte script_ForestMinish5 + .4byte script_ForestMinish6 + .4byte script_ForestMinish7 + .4byte script_ForestMinish8 + .4byte script_ForestMinish9 gUnk_08109DC8:: @ 08109DC8 .incbin "forestMinish/gUnk_08109DC8.bin" diff --git a/data/data_080FCAC8.s b/data/data_080FCAC8.s index 888bf0ca..bbed9369 100644 --- a/data/data_080FCAC8.s +++ b/data/data_080FCAC8.s @@ -15,27 +15,27 @@ gUnk_080FCBB4:: @ 080FCBB4 gUnk_080FCBC4:: @ 080FCBC4 .incbin "data_080FC8A4/gUnk_080FCBC4.bin" - .4byte script_08009A50 + .4byte script_IntroCameraTarget .incbin "data_080FC8A4/gUnk_080FCBC4_1.bin" - .4byte script_08009A84 + .4byte script_ZeldaMoveToLinksHouse .incbin "data_080FC8A4/gUnk_080FCBC4_2.bin" - .4byte script_08009AF8 + .4byte script_HouseDoorIntro .incbin "data_080FC8A4/gUnk_080FCBC4_3.bin" - .4byte script_08009A34 + .4byte script_Object69Intro2 .incbin "data_080FC8A4/gUnk_080FCBC4_4.bin" gUnk_080FCC14:: @ 080FCC14 .incbin "data_080FC8A4/gUnk_080FCC14.bin" - .4byte script_08009918 + .4byte script_Object69Intro .incbin "data_080FC8A4/gUnk_080FCC14_1.bin" - .4byte script_08009950 + .4byte script_SmithIntro .incbin "data_080FC8A4/gUnk_080FCC14_2.bin" - .4byte script_080099DC + .4byte script_ZeldaIntro .incbin "data_080FC8A4/gUnk_080FCC14_3.bin" gUnk_080FCC54:: @ 080FCC54 .incbin "data_080FC8A4/gUnk_080FCC54.bin" - .4byte script_08009D6C + .4byte script_ZeldaLeaveLinksHouse .incbin "data_080FC8A4/gUnk_080FCC54_1.bin" gUnk_080FCC84:: @ 080FCC84 @@ -100,13 +100,13 @@ gUnk_080FCD40:: @ 080FCD40 gUnk_080FCD84:: @ 080FCD84 .incbin "data_080FC8A4/gUnk_080FCD84.bin" - .4byte script_080153EC + .4byte script_Object69MinishVaati .incbin "data_080FC8A4/gUnk_080FCD84_1.bin" - .4byte script_0801550C + .4byte script_MinishEzlo .incbin "data_080FC8A4/gUnk_080FCD84_2.bin" - .4byte script_08015618 + .4byte script_Object6AMinishCap .incbin "data_080FC8A4/gUnk_080FCD84_3.bin" - .4byte script_08015684 + .4byte script_Vaati .incbin "data_080FC8A4/gUnk_080FCD84_4.bin" gUnk_080FCDD4:: @ 080FCDD4 @@ -116,30 +116,30 @@ gUnk_080FCDD4:: @ 080FCDD4 gUnk_080FCDE0:: @ 080FCDE0 .incbin "data_080FC8A4/gUnk_080FCDE0.bin" - .4byte script_08015CD4 + .4byte script_Object69TakeoverCutscene .incbin "data_080FC8A4/gUnk_080FCDE0_1.bin" - .4byte script_08015DF0 + .4byte script_KingDaltusTakeover .incbin "data_080FC8A4/gUnk_080FCDE0_2.bin" - .4byte script_08015E58 + .4byte script_VaatiTakeover .incbin "data_080FC8A4/gUnk_080FCDE0_3.bin" - .4byte script_08015FA4 + .4byte script_ZeldaStoneTakeover .incbin "data_080FC8A4/gUnk_080FCDE0_4.bin" gUnk_080FCE30:: @ 080FCE30 .incbin "data_080FC8A4/gUnk_080FCE30.bin" - .4byte script_08015F08 + .4byte script_MinisterPothoTakeover .incbin "data_080FC8A4/gUnk_080FCE30_1.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_2.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_3.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_4.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_5.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_6.bin" - .4byte script_08015F3C + .4byte script_GuardTakeover .incbin "data_080FC8A4/gUnk_080FCE30_7.bin" gUnk_080FCEB0:: @ 080FCEB0 @@ -149,9 +149,9 @@ gUnk_080FCEB0:: @ 080FCEB0 gUnk_080FCEBC:: @ 080FCEBC .incbin "data_080FC8A4/gUnk_080FCEBC.bin" - .4byte script_0800DB18 + .4byte script_ZeldaStoneInDHC .incbin "data_080FC8A4/gUnk_080FCEBC_1.bin" - .4byte script_0800E58C + .4byte script_ZeldaStoneDHC .incbin "data_080FC8A4/gUnk_080FCEBC_2.bin" gUnk_080FCEEC:: @ 080FCEEC diff --git a/data/data_080FEEB8.s b/data/data_080FEEB8.s index 7ed1d927..87e60885 100644 --- a/data/data_080FEEB8.s +++ b/data/data_080FEEB8.s @@ -17,11 +17,11 @@ gUnk_080FEEC8:: @ 080FEEC8 gUnk_080FEED4:: @ 080FEED4 .incbin "data_080FEEB8/gUnk_080FEED4.bin" - .4byte script_0800C350 + .4byte script_BigGoronKinstone1 .incbin "data_080FEEB8/gUnk_080FEED4_1.bin" - .4byte script_0800C3CC + .4byte script_BigGoronKinstone2 .incbin "data_080FEEB8/gUnk_080FEED4_2.bin" - .4byte script_0800C410 + .4byte script_BigGoronKinstone3 .incbin "data_080FEEB8/gUnk_080FEED4_3.bin" gUnk_080FEF34:: @ 080FEF34 @@ -35,7 +35,7 @@ gUnk_080FEF3C:: @ 080FEF3C gUnk_080FEF48:: @ 080FEF48 .incbin "data_080FEEB8/gUnk_080FEF48.bin" - .4byte script_0800BC50 + .4byte script_GoronKinstone .ifdef JP .incbin "data_080FEEB8/gUnk_080FEF48_1_JP.bin" .else @@ -52,57 +52,57 @@ gUnk_080FEF48:: @ 080FEF48 gUnk_080FEF78:: @ 080FEF78 .incbin "data_080FEEB8/gUnk_080FEF78.bin" - .4byte script_0800BCE8 + .4byte script_Goron1Kinstone2 .incbin "data_080FEEB8/gUnk_080FEF78_1.bin" - .4byte script_0800BD78 + .4byte script_Goron2Kinstone2 .incbin "data_080FEEB8/gUnk_080FEF78_2.bin" gUnk_080FEFA8:: @ 080FEFA8 .incbin "data_080FEEB8/gUnk_080FEFA8.bin" - .4byte script_0800BE1C + .4byte script_Goron1Kinstone3 .incbin "data_080FEEB8/gUnk_080FEFA8_1.bin" - .4byte script_0800BE54 + .4byte script_Goron2Kinstone3 .incbin "data_080FEEB8/gUnk_080FEFA8_2.bin" - .4byte script_0800BECC + .4byte script_Goron3Kinstone3 .incbin "data_080FEEB8/gUnk_080FEFA8_3.bin" gUnk_080FEFE8:: @ 080FEFE8 .incbin "data_080FEEB8/gUnk_080FEFE8.bin" - .4byte script_0800BF38 + .4byte script_Goron1Kinstone4 .incbin "data_080FEEB8/gUnk_080FEFE8_1.bin" - .4byte script_0800BF70 + .4byte script_Goron2Kinstone4 .incbin "data_080FEEB8/gUnk_080FEFE8_2.bin" - .4byte script_0800BF70 + .4byte script_Goron2Kinstone4 .incbin "data_080FEEB8/gUnk_080FEFE8_3.bin" - .4byte script_0800C004 + .4byte script_Goron4Kinstone4 .incbin "data_080FEEB8/gUnk_080FEFE8_4.bin" gUnk_080FF038:: @ 080FF038 .incbin "data_080FEEB8/gUnk_080FF038.bin" - .4byte script_0800C0B0 + .4byte script_Goron1Kinstone5 .incbin "data_080FEEB8/gUnk_080FF038_1.bin" - .4byte script_0800C0E8 + .4byte script_Goron2Kinstone5 .incbin "data_080FEEB8/gUnk_080FF038_2.bin" - .4byte script_0800C0E8 + .4byte script_Goron2Kinstone5 .incbin "data_080FEEB8/gUnk_080FF038_3.bin" - .4byte script_0800C0E8 + .4byte script_Goron2Kinstone5 .incbin "data_080FEEB8/gUnk_080FF038_4.bin" - .4byte script_0800C160 + .4byte script_Goron5Kinstone5 .incbin "data_080FEEB8/gUnk_080FF038_5.bin" gUnk_080FF098:: @ 080FF098 .incbin "data_080FEEB8/gUnk_080FF098.bin" - .4byte script_0800C1D8 + .4byte script_Goron1Kinstone6 .incbin "data_080FEEB8/gUnk_080FF098_1.bin" - .4byte script_0800C210 + .4byte script_Goron2Kinstone6 .incbin "data_080FEEB8/gUnk_080FF098_2.bin" - .4byte script_0800C210 + .4byte script_Goron2Kinstone6 .incbin "data_080FEEB8/gUnk_080FF098_3.bin" - .4byte script_0800C210 + .4byte script_Goron2Kinstone6 .incbin "data_080FEEB8/gUnk_080FF098_4.bin" - .4byte script_0800C210 + .4byte script_Goron2Kinstone6 .incbin "data_080FEEB8/gUnk_080FF098_5.bin" - .4byte script_0800C2A4 + .4byte script_Goron6Kindstone6 .incbin "data_080FEEB8/gUnk_080FF098_6.bin" gUnk_080FF108:: @ 080FF108 @@ -119,7 +119,7 @@ gUnk_080FF120:: @ 080FF120 gUnk_080FF128:: @ 080FF128 .incbin "data_080FEEB8/gUnk_080FF128.bin" - .4byte script_0800BB64 + .4byte script_GoronMerchantArriving .incbin "data_080FEEB8/gUnk_080FF128_1.bin" gUnk_080FF148:: @ 080FF148 @@ -129,7 +129,7 @@ gUnk_080FF148:: @ 080FF148 gUnk_080FF154:: @ 080FF154 .incbin "data_080FEEB8/gUnk_080FF154.bin" - .4byte script_0800BACC + .4byte script_MutohKinstone .incbin "data_080FEEB8/gUnk_080FF154_1.bin" gUnk_080FF174:: @ 080FF174 @@ -138,7 +138,7 @@ gUnk_080FF174:: @ 080FF174 gUnk_080FF17C:: @ 080FF17C .incbin "data_080FEEB8/gUnk_080FF17C.bin" - .4byte script_0800BC08 + .4byte script_GhostBrotherKinstone .incbin "data_080FEEB8/gUnk_080FF17C_1.bin" gUnk_080FF1CC:: @ 080FF1CC @@ -182,7 +182,7 @@ gUnk_080FF254:: @ 080FF254 gUnk_080FF264:: @ 080FF264 .incbin "data_080FEEB8/gUnk_080FF264.bin" - .4byte script_0800BBDC + .4byte script_CarlovKinstone .incbin "data_080FEEB8/gUnk_080FF264_1.bin" gUnk_080FF284:: @ 080FF284 @@ -203,7 +203,7 @@ gUnk_080FF2B8:: @ 080FF2B8 gUnk_080FF2C0:: @ 080FF2C0 .incbin "data_080FEEB8/gUnk_080FF2C0.bin" - .4byte script_0800BA78 + .4byte script_GormanFirstAppearance .incbin "data_080FEEB8/gUnk_080FF2C0_1.bin" gUnk_080FF300:: @ 080FF300 @@ -212,7 +212,7 @@ gUnk_080FF300:: @ 080FF300 gUnk_080FF308:: @ 080FF308 .incbin "data_080FEEB8/gUnk_080FF308.bin" - .4byte script_0800BB00 + .4byte script_SyrupKinstone .incbin "data_080FEEB8/gUnk_080FF308_1.bin" gUnk_080FF328:: @ 080FF328 @@ -240,13 +240,13 @@ gUnk_080FF36C:: @ 080FF36C gUnk_080FF378:: @ 080FF378 .incbin "data_080FEEB8/gUnk_080FF378.bin" - .4byte script_0800C45C + .4byte script_ObjectB3KinstoneSpark .incbin "data_080FEEB8/gUnk_080FF378_1.bin" - .4byte script_0800C494 + .4byte script_ObjectB3KinstoneSparkFromBottom .incbin "data_080FEEB8/gUnk_080FF378_2.bin" - .4byte script_0800C4D0 + .4byte script_ObjectB3KinstoneSparkGoronMerchang .incbin "data_080FEEB8/gUnk_080FF378_3.bin" - .4byte script_0800C50C + .4byte script_ObjectB3KinstoneSparkGoron .incbin "data_080FEEB8/gUnk_080FF378_4.bin" gUnk_080FF3C8:: @ 080FF3C8 @@ -271,7 +271,7 @@ gUnk_080FF3F4:: @ 080FF3F4 gUnk_080FF400:: @ 080FF400 .incbin "data_080FEEB8/gUnk_080FF400.bin" - .4byte script_0800BBA4 + .4byte script_StampKinstone .incbin "data_080FEEB8/gUnk_080FF400_1.bin" gUnk_080FF420:: @ 080FF420 diff --git a/data/map/entity_headers.s b/data/map/entity_headers.s index ed4e3308..450c0c9b 100644 --- a/data/map/entity_headers.s +++ b/data/map/entity_headers.s @@ -1911,7 +1911,7 @@ Room_MinishPaths1_MayorsCabin:: @ 080D61A0 .4byte sub_StateChange_MinishPaths1_MayorsCabin Entities_HouseInteriors1_Mayor_0:: @ 080D61C0 - npc_raw subtype=0x4b, x=0x88, y=0x60, script=script_0800EA54 + npc_raw subtype=0x4b, x=0x88, y=0x60, script=script_Mayor object_raw subtype=0x4c, x=0x7c, y=0x48, collision=1 object_raw subtype=0x4c, x=0x94, y=0x48, collision=1 ezlo_hint x=0xa, y=0x12, rx=0x3, ry=0x1, msg=0xb55, flag=0xc4 @@ -1954,11 +1954,11 @@ Room_HouseInteriors1_Mayor:: @ 080D62FC .4byte gUnk_additional_8_HouseInteriors1_Mayor Entities_HouseInteriors1_PostOffice_0:: @ 080D6320 - npc_raw subtype=0xa, x=0x48, y=0x38, script=script_08010794 + npc_raw subtype=0xa, x=0x48, y=0x38, script=script_Stamp entity_list_end gUnk_080D6340:: @ 080D6340 - npc_raw subtype=0xc, x=0x68, y=0x38, script=script_08010734 + npc_raw subtype=0xc, x=0x68, y=0x38, script=script_Marcy entity_list_end gUnk_080D6360:: @ 080D6360 @@ -2034,7 +2034,7 @@ gUnk_080D6558:: @ 080D6558 entity_list_end gUnk_080D6578:: @ 080D6578 - npc_raw subtype=0x1a, x=0x38, y=0x40, paramA=0x2, script=script_0800ED5C + npc_raw subtype=0x1a, x=0x38, y=0x40, paramA=0x2, script=script_Sturgeon entity_list_end Entities_HouseInteriors1_Library2F_1:: @ 080D6598 @@ -2085,27 +2085,27 @@ Room_HouseInteriors1_Library2F:: @ 080D66A8 .4byte gUnk_additional_a_HouseInteriors1_Library2F Entities_HouseInteriors1_Library1F_0:: @ 080D66D4 - npc_raw subtype=0x3d, x=0x128, y=0xa8, script=script_08008B5C + npc_raw subtype=0x3d, x=0x128, y=0xa8, script=script_LibrarianRight entity_list_end gUnk_additional_8_HouseInteriors1_Library1F:: @ 080D66F4 - npc_raw subtype=0x3d, x=0xa8, y=0xa8, paramA=0x1, script=script_08008B90 + npc_raw subtype=0x3d, x=0xa8, y=0xa8, paramA=0x1, script=script_LibrarianLeft entity_list_end gUnk_080D6714:: @ 080D6714 - npc_raw subtype=0x6, x=0x38, y=0x40, paramB=0x400, script=script_08008D8C + npc_raw subtype=0x6, x=0x38, y=0x40, paramB=0x400, script=script_LibraryVisitor entity_list_end gUnk_additional_9_HouseInteriors1_Library1F:: @ 080D6734 - npc_raw subtype=0x3d, x=0xa8, y=0xa8, paramA=0x1, script=script_08008BC0 + npc_raw subtype=0x3d, x=0xa8, y=0xa8, paramA=0x1, script=script_LibrarianLeftWithQuest object_raw subtype=0x8c, x=0x98, y=0x90, collision=1, paramB=0x3 object_raw subtype=0x8c, x=0xac, y=0x90, collision=1, paramA=0x1, paramB=0x3 object_raw subtype=0x8c, x=0xc0, y=0x90, collision=1, paramA=0x2, paramB=0x3 entity_list_end gUnk_080D6784:: @ 080D6784 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08008D50 - npc_raw subtype=0x1a, x=0x68, y=0x18, paramA=0x1, script=script_08008C64 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69AllBooksCollected + npc_raw subtype=0x1a, x=0x68, y=0x18, paramA=0x1, script=script_SturgeonAllBooksCollected entity_list_end Entities_HouseInteriors1_Library1F_1:: @ 080D67B4 @@ -2146,13 +2146,13 @@ Room_HouseInteriors1_Library1F:: @ 080D68CC .4byte gUnk_additional_9_HouseInteriors1_Library1F Entities_HouseInteriors1_Inn1F_0:: @ 080D68F4 - npc_raw subtype=0x47, x=0x40, y=0x38, script=script_0800E824 - npc_raw subtype=0x6, x=0xb8, y=0x48, paramA=0x9, paramB=0x400, script=script_080100FC + npc_raw subtype=0x47, x=0x40, y=0x38, script=script_Emma + npc_raw subtype=0x6, x=0xb8, y=0x48, paramA=0x9, paramB=0x400, script=script_Townsperson2 entity_list_end gUnk_080D6924:: @ 080D6924 - npc_raw subtype=0x7, x=0xe8, y=0x38, paramA=0x7, paramB=0x400, script=script_080103B0 - npc_raw subtype=0x7, x=0xe8, y=0x68, paramA=0x8, paramB=0x400, script=script_080103B0 + npc_raw subtype=0x7, x=0xe8, y=0x38, paramA=0x7, paramB=0x400, script=script_Kid4 + npc_raw subtype=0x7, x=0xe8, y=0x68, paramA=0x8, paramB=0x400, script=script_Kid4 entity_list_end Entities_HouseInteriors1_Inn1F_1:: @ 080D6954 @@ -2292,36 +2292,36 @@ Entities_HouseInteriors1_InnWest2F_0:: @ 080D6BE4 entity_list_end UpperInn_Oracles:: @ 080D6BF4 - npc_raw subtype=0x17, x=0x70, y=0x48, script=script_08011C7C - npc_raw subtype=0x18, x=0x88, y=0x48, script=script_08011D28 - npc_raw subtype=0x19, x=0xa0, y=0x48, script=script_08011DD4 + npc_raw subtype=0x17, x=0x70, y=0x48, script=script_Din + npc_raw subtype=0x18, x=0x88, y=0x48, script=script_Nayru + npc_raw subtype=0x19, x=0xa0, y=0x48, script=script_Farore entity_list_end UpperInn_NoFarore:: @ 080D6C34 - npc_raw subtype=0x17, x=0x7c, y=0x48, script=script_08011E80 - npc_raw subtype=0x18, x=0x94, y=0x48, script=script_08011F0C + npc_raw subtype=0x17, x=0x7c, y=0x48, script=script_Din2 + npc_raw subtype=0x18, x=0x94, y=0x48, script=script_Nayru2 entity_list_end UpperInn_NoDin:: @ 080D6C64 - npc_raw subtype=0x18, x=0x7c, y=0x48, script=script_08011F0C - npc_raw subtype=0x19, x=0x94, y=0x48, script=script_08011F98 + npc_raw subtype=0x18, x=0x7c, y=0x48, script=script_Nayru2 + npc_raw subtype=0x19, x=0x94, y=0x48, script=script_Farore2 entity_list_end UpperInn_NoNayru:: @ 080D6C94 - npc_raw subtype=0x17, x=0x7c, y=0x48, script=script_08011E80 - npc_raw subtype=0x19, x=0x94, y=0x48, script=script_08011F98 + npc_raw subtype=0x17, x=0x7c, y=0x48, script=script_Din2 + npc_raw subtype=0x19, x=0x94, y=0x48, script=script_Farore2 entity_list_end UpperInn_Din:: @ 080D6CC4 - npc_raw subtype=0x17, x=0x88, y=0x48, script=script_080121C8 + npc_raw subtype=0x17, x=0x88, y=0x48, script=script_DinAlone entity_list_end UpperInn_Nayru:: @ 080D6CE4 - npc_raw subtype=0x18, x=0x88, y=0x48, script=script_08012200 + npc_raw subtype=0x18, x=0x88, y=0x48, script=script_NayruAlone entity_list_end UpperInn_Farore:: @ 080D6D04 - npc_raw subtype=0x19, x=0x88, y=0x48, script=script_08012238 + npc_raw subtype=0x19, x=0x88, y=0x48, script=script_FaroreAlone entity_list_end Entities_HouseInteriors1_InnWest2F_1:: @ 080D6D24 @@ -2353,14 +2353,14 @@ Entities_HouseInteriors1_InnEast2F_0:: @ 080D6DBC entity_list_end gUnk_additional_8_HouseInteriors1_InnEast2F:: @ 080D6DDC - delayed_entity_raw subtype=0x13, x=0x76, y=0xc0, layer=1, paramA=0x1, paramB=0x2, paramC=script_0800ED04, conditions=0x3f8 - delayed_entity_raw subtype=0x7, x=0x68, y=0x98, layer=1, paramC=script_080103B0, paramD=0x4, conditions=0x300 - delayed_entity_raw subtype=0x7, x=0x48, y=0x98, layer=1, paramA=0x6, paramC=script_080103B0, paramD=0x4, conditions=0x300 - delayed_entity_raw subtype=0x7, x=0x48, y=0x98, layer=1, paramA=0x6, paramC=script_0800D59C, paramD=0x4, conditions=0x10 - delayed_entity_raw subtype=0x7, x=0x38, y=0xc8, layer=1, paramA=0x7, paramC=script_0800D59C, paramD=0x4, conditions=0x10 - delayed_entity_raw subtype=0x7, x=0x58, y=0xd8, layer=1, paramA=0x8, paramC=script_0800D59C, paramD=0x4, conditions=0x10 - delayed_entity_raw subtype=0x6, x=0x58, y=0xa8, layer=1, paramA=0x14, paramC=script_080100FC, paramD=0x4, conditions=0x3c0 - delayed_entity_raw subtype=0x6, x=0x48, y=0x168, layer=1, paramA=0x10, paramC=script_080100FC, paramD=0x4, conditions=0x300 + delayed_entity_raw subtype=0x13, x=0x76, y=0xc0, layer=1, paramA=0x1, paramB=0x2, paramC=script_SittingPerson, conditions=0x3f8 + delayed_entity_raw subtype=0x7, x=0x68, y=0x98, layer=1, paramC=script_Kid4, paramD=0x4, conditions=0x300 + delayed_entity_raw subtype=0x7, x=0x48, y=0x98, layer=1, paramA=0x6, paramC=script_Kid4, paramD=0x4, conditions=0x300 + delayed_entity_raw subtype=0x7, x=0x48, y=0x98, layer=1, paramA=0x6, paramC=script_KidInn, paramD=0x4, conditions=0x10 + delayed_entity_raw subtype=0x7, x=0x38, y=0xc8, layer=1, paramA=0x7, paramC=script_KidInn, paramD=0x4, conditions=0x10 + delayed_entity_raw subtype=0x7, x=0x58, y=0xd8, layer=1, paramA=0x8, paramC=script_KidInn, paramD=0x4, conditions=0x10 + delayed_entity_raw subtype=0x6, x=0x58, y=0xa8, layer=1, paramA=0x14, paramC=script_Townsperson2, paramD=0x4, conditions=0x3c0 + delayed_entity_raw subtype=0x6, x=0x48, y=0x168, layer=1, paramA=0x10, paramC=script_Townsperson2, paramD=0x4, conditions=0x300 entity_list_end Entities_HouseInteriors1_InnEast2F_1:: @ 080D6E6C @@ -2429,7 +2429,7 @@ Entities_HouseInteriors1_SchoolWest_0:: @ 080D7018 entity_list_end gUnk_080D7038:: @ 080D7038 - npc_raw subtype=0x48, x=0x78, y=0x78, paramA=0x1, script=script_0800E7F4 + npc_raw subtype=0x48, x=0x78, y=0x78, paramA=0x1, script=script_Teachers entity_list_end Entities_HouseInteriors1_SchoolWest_1:: @ 080D7058 @@ -2464,27 +2464,27 @@ Entities_HouseInteriors1_SchoolEast_0:: @ 080D7120 entity_list_end gUnk_080D7140:: @ 080D7140 - npc_raw subtype=0x7, x=0x48, y=0x40, paramA=0x1, paramB=0x200, script=script_08010644 - npc_raw subtype=0x7, x=0x48, y=0x70, paramA=0x2, paramB=0x200, script=script_08010644 + npc_raw subtype=0x7, x=0x48, y=0x40, paramA=0x1, paramB=0x200, script=script_Kid6 + npc_raw subtype=0x7, x=0x48, y=0x70, paramA=0x2, paramB=0x200, script=script_Kid6 entity_list_end gUnk_080D7170:: @ 080D7170 - npc_raw subtype=0x7, x=0xa8, y=0x40, paramB=0x200, script=script_0801061C - npc_raw subtype=0x7, x=0x78, y=0x40, paramA=0x3, paramB=0x200, script=script_08010650 + npc_raw subtype=0x7, x=0xa8, y=0x40, paramB=0x200, script=script_Kid5 + npc_raw subtype=0x7, x=0x78, y=0x40, paramA=0x3, paramB=0x200, script=script_Kid7 entity_list_end gUnk_080D71A0:: @ 080D71A0 - npc_raw subtype=0x7, x=0x68, y=0x68, paramA=0x1, paramB=0x400, script=script_080103B0 - npc_raw subtype=0x7, x=0x98, y=0x48, paramA=0x2, paramB=0x400, script=script_080103B0 + npc_raw subtype=0x7, x=0x68, y=0x68, paramA=0x1, paramB=0x400, script=script_Kid4 + npc_raw subtype=0x7, x=0x98, y=0x48, paramA=0x2, paramB=0x400, script=script_Kid4 entity_list_end gUnk_080D71D0:: @ 080D71D0 - npc_raw subtype=0x48, x=0x110, y=0x48, script=script_0800E7F4 + npc_raw subtype=0x48, x=0x110, y=0x48, script=script_Teachers entity_list_end gUnk_080D71F0:: @ 080D71F0 - npc_raw subtype=0x48, x=0xe8, y=0x58, script=script_0800E7F4 - npc_raw subtype=0x48, x=0x28, y=0x48, paramA=0x1, script=script_0800E7F4 + npc_raw subtype=0x48, x=0xe8, y=0x58, script=script_Teachers + npc_raw subtype=0x48, x=0x28, y=0x48, paramA=0x1, script=script_Teachers entity_list_end Entities_HouseInteriors1_SchoolEast_1:: @ 080D7220 @@ -2519,8 +2519,8 @@ Room_HouseInteriors1_SchoolEast:: @ 080D72B0 .4byte gUnk_additional_9_HouseInteriors1_SchoolEast Entities_HyruleCastle_0_0:: @ 080D72D8 - npc_raw subtype=0x15, x=0xb8, y=0x38, script=script_08008DC0 - npc_raw subtype=0x15, x=0xf8, y=0x38, paramB=0x1, script=script_08008DC0 + npc_raw subtype=0x15, x=0xb8, y=0x38, script=script_GuardAtEntry + npc_raw subtype=0x15, x=0xf8, y=0x38, paramB=0x1, script=script_GuardAtEntry entity_list_end Entities_HyruleCastle_0_1:: @ 080D7308 @@ -2532,7 +2532,7 @@ gUnk_080D7328:: @ 080D7328 entity_list_end gUnk_080D7348:: @ 080D7348 - npc_raw subtype=0x4e, script=script_0800A734 + npc_raw subtype=0x4e, script=script_Npc4EHyruleCastleEntrance entity_list_end Enemies_HyruleCastle_0:: @ 080D7368 @@ -2565,12 +2565,12 @@ gUnk_080D73E0:: @ 080D73E0 entity_list_end gUnk_080D7410:: @ 080D7410 - npc_raw subtype=0x4e, script=script_0800A764 - npc_raw subtype=0x15, x=0xb8, y=0x1a8, paramB=0x28, script=script_0800A7E4 - npc_raw subtype=0x15, x=0xf8, y=0x1b8, paramB=0x29, script=script_0800A820 - npc_raw subtype=0x15, x=0x138, y=0x1d8, paramB=0x2a, script=script_0800A85C - npc_raw subtype=0x16, x=0xd8, y=0x1c8, script=script_0800A898 - npc_raw subtype=0x16, x=0x118, y=0x1b8, script=script_0800A8D4 + npc_raw subtype=0x4e, script=script_Npc4EUnfreezeCastleStaff + npc_raw subtype=0x15, x=0xb8, y=0x1a8, paramB=0x28, script=script_GuardStoneOutro1 + npc_raw subtype=0x15, x=0xf8, y=0x1b8, paramB=0x29, script=script_GuardStoneOutro2 + npc_raw subtype=0x15, x=0x138, y=0x1d8, paramB=0x2a, script=script_GuardStoneOutro3 + npc_raw subtype=0x16, x=0xd8, y=0x1c8, script=script_MaidStoneOutro1 + npc_raw subtype=0x16, x=0x118, y=0x1b8, script=script_MaidStoneOutro2 entity_list_end Enemies_HyruleCastle_1:: @ 080D7480 @@ -2593,34 +2593,34 @@ Entities_HyruleCastle_2_0:: @ 080D74B8 entity_list_end gUnk_080D74C8:: @ 080D74C8 - npc_raw subtype=0x4e, script=script_08008E08 - npc_raw subtype=0x15, x=0x78, y=0x98, paramB=0x2, script=script_08008FFC - npc_raw subtype=0x15, x=0x78, y=0xb8, paramB=0x3, script=script_08008FFC - npc_raw subtype=0x15, x=0x78, y=0xd8, paramB=0x4, script=script_08008FFC - npc_raw subtype=0x15, x=0x98, y=0x98, paramB=0x5, script=script_08008FFC - npc_raw subtype=0x15, x=0x98, y=0xb8, paramB=0x6, script=script_08008FFC - npc_raw subtype=0x15, x=0x98, y=0xd8, paramB=0x7, script=script_08008FFC - npc_raw subtype=0x24, x=0x88, y=0x58, script=script_08009080 - npc_raw subtype=0x25, x=0x68, y=0x58, script=script_0800903C - npc_raw subtype=0x22, x=0xb8, y=0x78, script=script_08009198 - npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_080092F0 + npc_raw subtype=0x4e, script=script_Npc4EIntroAssembly + npc_raw subtype=0x15, x=0x78, y=0x98, paramB=0x2, script=script_GuardAtAssembly + npc_raw subtype=0x15, x=0x78, y=0xb8, paramB=0x3, script=script_GuardAtAssembly + npc_raw subtype=0x15, x=0x78, y=0xd8, paramB=0x4, script=script_GuardAtAssembly + npc_raw subtype=0x15, x=0x98, y=0x98, paramB=0x5, script=script_GuardAtAssembly + npc_raw subtype=0x15, x=0x98, y=0xb8, paramB=0x6, script=script_GuardAtAssembly + npc_raw subtype=0x15, x=0x98, y=0xd8, paramB=0x7, script=script_GuardAtAssembly + npc_raw subtype=0x24, x=0x88, y=0x58, script=script_KingDaltusAtAssembly + npc_raw subtype=0x25, x=0x68, y=0x58, script=script_MinisterPothoAtAssembly + npc_raw subtype=0x22, x=0xb8, y=0x78, script=script_SmithAtAssembly + npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_StoneZelda entity_list_end gUnk_080D7588:: @ 080D7588 - npc_raw subtype=0x25, x=0x68, y=0x58, script=script_08009274 - npc_raw subtype=0x24, x=0x88, y=0x58, script=script_080092D4 - npc_raw subtype=0x22, x=0xa8, y=0x78, script=script_080092A8 - npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_080092F0 + npc_raw subtype=0x25, x=0x68, y=0x58, script=script_MinisterPotho + npc_raw subtype=0x24, x=0x88, y=0x58, script=script_KingDaltus + npc_raw subtype=0x22, x=0xa8, y=0x78, script=script_SmithAtCastle + npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_StoneZelda entity_list_end gUnk_080D75D8:: @ 080D75D8 - npc_raw subtype=0x25, x=0x68, y=0x58, script=script_08009274 - npc_raw subtype=0x24, x=0x88, y=0x58, script=script_080092D4 - npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_080092F0 + npc_raw subtype=0x25, x=0x68, y=0x58, script=script_MinisterPotho + npc_raw subtype=0x24, x=0x88, y=0x58, script=script_KingDaltus + npc_raw subtype=0x28, x=0xb8, y=0x58, script=script_StoneZelda entity_list_end gUnk_080D7618:: @ 080D7618 - npc_raw subtype=0x4e, script=script_0800A6D4 + npc_raw subtype=0x4e, script=script_Npc4EHyruleCastleThrone entity_list_end Enemies_HyruleCastle_2:: @ 080D7638 @@ -2667,7 +2667,7 @@ Room_HyruleCastle_3:: @ 080D76E8 .4byte gUnk_additional_8_HyruleCastle_3 Entities_HyruleCastle_4_0:: @ 080D770C - npc_raw subtype=0x16, x=0x58, y=0x50, script=script_0800B8B8 + npc_raw subtype=0x16, x=0x58, y=0x50, script=script_CastleMaid entity_list_end Enemies_HyruleCastle_4:: @ 080D772C @@ -2979,7 +2979,7 @@ Room_GreatFairies_Exit:: @ 080D7D9C .4byte sub_StateChange_GreatFairies_Exit Entities_Dojos_Grayblade_0:: @ 080D7DBC - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x2, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x2, script=script_BladeBrothers object_raw subtype=0x0, x=0x28, y=0x84, collision=1, paramA=0x63, paramB=0x400, paramC=0x800000 entity_list_end @@ -3013,7 +3013,7 @@ Room_Dojos_Grayblade:: @ 080D7E9C .4byte sub_StateChange_Dojos_Grayblade Entities_Dojos_Splitblade_0:: @ 080D7EBC - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x6, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x6, script=script_BladeBrothers entity_list_end Entities_Dojos_Splitblade_1:: @ 080D7EDC @@ -3044,7 +3044,7 @@ Room_Dojos_Splitblade:: @ 080D7F7C .4byte sub_StateChange_Dojos_Splitblade Entities_Dojos_Greatblade_0:: @ 080D7F9C - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x7, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x7, script=script_BladeBrothers entity_list_end Entities_Dojos_Greatblade_1:: @ 080D7FBC @@ -3075,7 +3075,7 @@ Room_Dojos_Greatblade:: @ 080D805C .4byte sub_StateChange_Dojos_Greatblade Entities_Dojos_Scarblade_0:: @ 080D807C - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x5, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x5, script=script_BladeBrothers entity_list_end Entities_Dojos_Scarblade_1:: @ 080D809C @@ -3106,7 +3106,7 @@ Room_Dojos_Scarblade:: @ 080D813C .4byte sub_StateChange_Dojos_Scarblade Entities_Dojos_Swiftblade_0:: @ 080D815C - npc_raw subtype=0x30, x=0x78, y=0x28, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, script=script_BladeBrothers object_raw subtype=0x0, x=0x28, y=0x84, collision=1, paramA=0x63, paramB=0x400, paramC=0x7f0000 entity_list_end @@ -3138,7 +3138,7 @@ Room_Dojos_Swiftblade:: @ 080D822C .4byte sub_StateChange_Dojos_Swiftblade Entities_Dojos_Grimblade_0:: @ 080D824C - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x4, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x4, script=script_BladeBrothers object_raw subtype=0x0, x=0x28, y=0x84, collision=1, paramA=0x63, paramB=0x400, paramC=0x830000 entity_list_end @@ -3178,7 +3178,7 @@ Room_Dojos_Grimblade:: @ 080D8374 .4byte sub_StateChange_Dojos_Grimblade Entities_Dojos_Waveblade_0:: @ 080D8394 - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x3, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x3, script=script_BladeBrothers object_raw subtype=0x0, x=0x28, y=0x84, collision=1, paramA=0x63, paramB=0x400, paramC=0x820000 entity_list_end @@ -3428,42 +3428,42 @@ Entities_GoronCave_Main_0:: @ 080D89C4 entity_list_end gUnk_080D89E4:: @ 080D89E4 - npc_raw subtype=0x32, x=0x68, y=0x228, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x68, y=0x228, script=script_GoronPunching entity_list_end gUnk_080D8A04:: @ 080D8A04 - npc_raw subtype=0x32, x=0x48, y=0x178, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x68, y=0x178, paramA=0x1, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x48, y=0x178, script=script_GoronPunching + npc_raw subtype=0x32, x=0x68, y=0x178, paramA=0x1, script=script_GoronPunching entity_list_end gUnk_080D8A34:: @ 080D8A34 - npc_raw subtype=0x32, x=0x48, y=0x178, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x68, y=0x178, paramA=0x1, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x88, y=0x178, paramA=0x2, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x48, y=0x178, script=script_GoronPunching + npc_raw subtype=0x32, x=0x68, y=0x178, paramA=0x1, script=script_GoronPunching + npc_raw subtype=0x32, x=0x88, y=0x178, paramA=0x2, script=script_GoronPunching entity_list_end gUnk_080D8A74:: @ 080D8A74 - npc_raw subtype=0x32, x=0x28, y=0xd8, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x48, y=0xd8, paramA=0x1, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x68, y=0xd8, paramA=0x2, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x88, y=0xd8, paramA=0x3, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x28, y=0xd8, script=script_GoronPunching + npc_raw subtype=0x32, x=0x48, y=0xd8, paramA=0x1, script=script_GoronPunching + npc_raw subtype=0x32, x=0x68, y=0xd8, paramA=0x2, script=script_GoronPunching + npc_raw subtype=0x32, x=0x88, y=0xd8, paramA=0x3, script=script_GoronPunching entity_list_end gUnk_080D8AC4:: @ 080D8AC4 - npc_raw subtype=0x32, x=0x28, y=0xd8, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x48, y=0xd8, paramA=0x1, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x68, y=0xd8, paramA=0x2, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x88, y=0xd8, paramA=0x3, script=script_0800B9B4 - npc_raw subtype=0x32, x=0xa8, y=0xd8, paramA=0x4, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x28, y=0xd8, script=script_GoronPunching + npc_raw subtype=0x32, x=0x48, y=0xd8, paramA=0x1, script=script_GoronPunching + npc_raw subtype=0x32, x=0x68, y=0xd8, paramA=0x2, script=script_GoronPunching + npc_raw subtype=0x32, x=0x88, y=0xd8, paramA=0x3, script=script_GoronPunching + npc_raw subtype=0x32, x=0xa8, y=0xd8, paramA=0x4, script=script_GoronPunching entity_list_end gUnk_080D8B24:: @ 080D8B24 - npc_raw subtype=0x32, x=0x28, y=0x98, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x48, y=0x98, paramA=0x1, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x68, y=0x98, paramA=0x2, script=script_0800B9B4 - npc_raw subtype=0x32, x=0x88, y=0x98, paramA=0x3, script=script_0800B9B4 - npc_raw subtype=0x32, x=0xa8, y=0x98, paramA=0x4, script=script_0800B9B4 - npc_raw subtype=0x32, x=0xc8, y=0x98, paramA=0x5, script=script_0800B9B4 + npc_raw subtype=0x32, x=0x28, y=0x98, script=script_GoronPunching + npc_raw subtype=0x32, x=0x48, y=0x98, paramA=0x1, script=script_GoronPunching + npc_raw subtype=0x32, x=0x68, y=0x98, paramA=0x2, script=script_GoronPunching + npc_raw subtype=0x32, x=0x88, y=0x98, paramA=0x3, script=script_GoronPunching + npc_raw subtype=0x32, x=0xa8, y=0x98, paramA=0x4, script=script_GoronPunching + npc_raw subtype=0x32, x=0xc8, y=0x98, paramA=0x5, script=script_GoronPunching entity_list_end Enemies_GoronCave_Main:: @ 080D8B94 @@ -3557,8 +3557,8 @@ Entities_RoyalValley_Main_0:: @ 080D8FB8 .else manager subtype=0x11, paramC=0x88000056 .endif - object_raw subtype=0x19, x=0x1a0, y=0x1a2, unknown=0x4f, collision=1, paramA=0x1, paramB=0x3, paramC=script_08009698 - npc_raw subtype=0x21, x=0x88, y=0x118, script=script_08009740 + object_raw subtype=0x19, x=0x1a0, y=0x1a2, unknown=0x4f, collision=1, paramA=0x1, paramB=0x3, paramC=script_GraveyardHouseDoor + npc_raw subtype=0x21, x=0x88, y=0x118, script=script_GhostBrothers .ifdef EU_JP ezlo_hint x=0x38, y=0x4a, rx=0x1, ry=0x4, msg=0xb1d, flag=0x58 .else @@ -3571,14 +3571,14 @@ gUnk_080D9048:: @ 080D9048 .incbin "data_080D5360/gUnk_080D9048.bin" gUnk_080D9098:: @ 080D9098 - npc_raw subtype=0x40, x=0xd8, y=0x188, paramA=0x1, script=script_0800962C - object_raw subtype=0x69, unknown=0x4f, paramC=script_080098D4 + npc_raw subtype=0x40, x=0xd8, y=0x188, paramA=0x1, script=script_DampeOuside + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69GetKeyBack entity_list_end gUnk_080D90C8:: @ 080D90C8 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08009778 - object_raw subtype=0x97, x=0x1f0, y=0x1a0, unknown=0x4f, paramA=0x4, paramC=script_080097F0 - object_raw subtype=0x97, x=0x1f0, y=0x1b0, unknown=0x4f, paramA=0x4, paramC=script_08009838 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69CrowStealingKey + object_raw subtype=0x97, x=0x1f0, y=0x1a0, unknown=0x4f, paramA=0x4, paramC=script_Object97FirstCrow + object_raw subtype=0x97, x=0x1f0, y=0x1b0, unknown=0x4f, paramA=0x4, paramC=script_Object97SecondCrow entity_list_end gUnk_080D9108:: @ 080D9108 @@ -3706,7 +3706,7 @@ Room_RoyalValleyGraves_HeartPiece:: @ 080D93C0 .4byte sub_StateChange_RoyalValleyGraves_HeartPiece Entities_RoyalValleyGraves_Gina_0:: @ 080D93E0 - npc_raw subtype=0x43, x=0x78, y=0x58, script=script_0800B91C + npc_raw subtype=0x43, x=0x78, y=0x58, script=script_Gina entity_list_end Enemies_RoyalValleyGraves_Gina:: @ 080D9400 @@ -3727,9 +3727,9 @@ Room_RoyalValleyGraves_Gina:: @ 080D9420 .4byte sub_StateChange_RoyalValleyGraves_Gina Entities_MinishRafters_Cafe_0:: @ 080D9440 - npc_raw subtype=0x38, x=0xd8, y=0x30, paramA=0x1, paramB=0x202, script=script_0800E734 - npc_raw subtype=0x38, x=0x38, y=0xa8, paramB=0x103, script=script_0800E6E8 - npc_raw subtype=0x38, x=0x5c, y=0xdc, paramB=0x104, script=script_0800E6E8 + npc_raw subtype=0x38, x=0xd8, y=0x30, paramA=0x1, paramB=0x202, script=script_TownMinish2 + npc_raw subtype=0x38, x=0x38, y=0xa8, paramB=0x103, script=script_TownMinish1 + npc_raw subtype=0x38, x=0x5c, y=0xdc, paramB=0x104, script=script_TownMinish1 npc_raw subtype=0x3, x=0x78, y=0xd6, unknown=0xf, paramB=0x324, script=0x0 npc_raw subtype=0x3, x=0x128, y=0xa8, unknown=0xf, paramB=0x125, script=0x0 npc_raw subtype=0x3, x=0x158, y=0xb4, unknown=0xf, paramB=0x226, script=0x0 @@ -3818,9 +3818,9 @@ Room_MinishRafters_Stockwell:: @ 080D97A0 .4byte sub_StateChange_MinishRafters_Stockwell Entities_MinishRafters_DrLeft_0:: @ 080D97C0 - npc_raw subtype=0x38, x=0x98, y=0x90, paramB=0x7, script=script_0800E6E8 - npc_raw subtype=0x38, x=0x158, y=0x68, paramB=0x208, script=script_0800E760 - npc_raw subtype=0x38, x=0x38, y=0x58, paramA=0x5, paramB=0x109, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x98, y=0x90, paramB=0x7, script=script_TownMinish1 + npc_raw subtype=0x38, x=0x158, y=0x68, paramB=0x208, script=script_TownMinish3 + npc_raw subtype=0x38, x=0x38, y=0x58, paramA=0x5, paramB=0x109, script=script_TownMinish1 entity_list_end gUnk_080D9800:: @ 080D9800 @@ -3863,10 +3863,10 @@ Room_MinishRafters_DrLeft:: @ 080D9948 .4byte sub_StateChange_MinishRafters_DrLeft Entities_MinishRafters_Bakery_0:: @ 080D9968 - npc_raw subtype=0x38, x=0x48, y=0x78, paramA=0x5, paramB=0x20e, script=script_0800E6E8 - npc_raw subtype=0x38, x=0x78, y=0xc8, paramA=0x4, paramB=0x20f, script=script_0800E6E8 - npc_raw subtype=0x38, x=0xe8, y=0xc8, paramA=0x3, paramB=0x210, script=script_0800E6E8 - npc_raw subtype=0x38, x=0x158, y=0x98, paramB=0x211, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x48, y=0x78, paramA=0x5, paramB=0x20e, script=script_TownMinish1 + npc_raw subtype=0x38, x=0x78, y=0xc8, paramA=0x4, paramB=0x20f, script=script_TownMinish1 + npc_raw subtype=0x38, x=0xe8, y=0xc8, paramA=0x3, paramB=0x210, script=script_TownMinish1 + npc_raw subtype=0x38, x=0x158, y=0x98, paramB=0x211, script=script_TownMinish1 entity_list_end Entities_MinishRafters_Bakery_1:: @ 080D99B8 @@ -3908,11 +3908,11 @@ Entities_CastorWilds_Main_0:: @ 080D9AD8 .ifdef EU_JP manager subtype=0x20, x=0x218, y=0x328, paramB=0x12182e00, paramC=0x161318 manager subtype=0x20, x=0x2b8, y=0x398, paramB=0x12a82e00, paramC=0x171398 - object_raw subtype=0x69, x=0x68, y=0x380, unknown=0x4f, paramC=script_0800B200 - npc_raw subtype=0x2b, x=0x28, y=0x3a8, paramA=0x1, script=script_0800B308 - npc_raw subtype=0x2b, x=0x40, y=0x354, script=script_0800B254 - npc_raw subtype=0x2b, x=0x70, y=0x354, script=script_0800B284 - npc_raw subtype=0x2b, x=0xa0, y=0x354, script=script_0800B2B4 + object_raw subtype=0x69, x=0x68, y=0x380, unknown=0x4f, paramC=script_Object69 + npc_raw subtype=0x2b, x=0x28, y=0x3a8, paramA=0x1, script=script_CastorWildsStatueRock + npc_raw subtype=0x2b, x=0x40, y=0x354, script=script_CastorWildsStatueLeft + npc_raw subtype=0x2b, x=0x70, y=0x354, script=script_CastorWildsStatueMiddle + npc_raw subtype=0x2b, x=0xa0, y=0x354, script=script_CastorWildsStatueRight object_raw subtype=0x71, x=0x38, y=0x2d8, paramA=0x1, paramB=0x1, paramC=0x200000 manager subtype=0x4 manager subtype=0x20, x=0x2b8, y=0x148, paramB=0x12b82e00, paramC=0x1f1158 @@ -3930,11 +3930,11 @@ Entities_CastorWilds_Main_0:: @ 080D9AD8 .else manager subtype=0x20, x=0x218, y=0x328, paramB=0x12182e00, paramC=0x151318 manager subtype=0x20, x=0x2b8, y=0x398, paramB=0x12a82e00, paramC=0x161398 - object_raw subtype=0x69, x=0x68, y=0x380, unknown=0x4f, paramC=script_0800B200 - npc_raw subtype=0x2b, x=0x28, y=0x3a8, paramA=0x1, script=script_0800B308 - npc_raw subtype=0x2b, x=0x40, y=0x354, script=script_0800B254 - npc_raw subtype=0x2b, x=0x70, y=0x354, script=script_0800B284 - npc_raw subtype=0x2b, x=0xa0, y=0x354, script=script_0800B2B4 + object_raw subtype=0x69, x=0x68, y=0x380, unknown=0x4f, paramC=script_Object69 + npc_raw subtype=0x2b, x=0x28, y=0x3a8, paramA=0x1, script=script_CastorWildsStatueRock + npc_raw subtype=0x2b, x=0x40, y=0x354, script=script_CastorWildsStatueLeft + npc_raw subtype=0x2b, x=0x70, y=0x354, script=script_CastorWildsStatueMiddle + npc_raw subtype=0x2b, x=0xa0, y=0x354, script=script_CastorWildsStatueRight object_raw subtype=0x71, x=0x38, y=0x2d8, paramA=0x1, paramB=0x1, paramC=0x1f0000 manager subtype=0x4 manager subtype=0x20, x=0x2b8, y=0x148, paramB=0x12b82e00, paramC=0x1e1158 @@ -3972,7 +3972,7 @@ gUnk_080D9CC8:: @ 080D9CC8 entity_list_end gUnk_080D9CE8:: @ 080D9CE8 - object_raw subtype=0xbb, x=0x228, y=0x398, unknown=0x4f, paramB=0x5, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x228, y=0x398, unknown=0x4f, paramB=0x5, paramC=script_Windcrest entity_list_end Entities_CastorWilds_Main_1:: @ 080D9D08 @@ -4196,7 +4196,7 @@ Entities_CastorDarknut_Main_0:: @ 080DA210 entity_list_end gUnk_080DA230:: @ 080DA230 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800B17C + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69DarknutFight object_raw subtype=0xc, x=0x88, y=0x68, paramA=0x1, paramC=0x390000 entity_list_end @@ -4258,7 +4258,7 @@ Room_CastorDarknut_Hall:: @ 080DA384 .4byte sub_StateChange_CastorDarknut_Hall Entities_GreatFairies_Graveyard_0:: @ 080DA3A4 - object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_0800B614 + object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_GreatFairyArrows object_raw subtype=0x1b, x=0x78, y=0x48, collision=2, paramA=0x16 entity_list_end @@ -4279,7 +4279,7 @@ Room_GreatFairies_Graveyard:: @ 080DA3EC .4byte sub_StateChange_GreatFairies_Graveyard Entities_GreatFairies_MinishWoods_0:: @ 080DA40C - object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_0800B6C8 + object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_GreatFairyRupees object_raw subtype=0x1b, x=0x78, y=0x48, collision=2, paramA=0xb entity_list_end @@ -4300,7 +4300,7 @@ Room_GreatFairies_MinishWoods:: @ 080DA454 .4byte sub_StateChange_GreatFairies_MinishWoods Entities_GreatFairies_MtCrenel_0:: @ 080DA474 - object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_0800B730 + object_raw subtype=0x69, x=0x78, y=0x48, unknown=0x4f, paramC=script_GreatFairyBombs object_raw subtype=0x1b, x=0x78, y=0x48, collision=2 entity_list_end @@ -4367,7 +4367,7 @@ Room_GardenFountains_West:: @ 080DA5A4 .4byte sub_StateChange_GardenFountains_West Entities_MinishHouseInteriors_GentariMain_0:: @ 080DA5C4 - npc_raw subtype=0x1, x=0x78, y=0x30, script=script_0800C774 + npc_raw subtype=0x1, x=0x78, y=0x30, script=script_Gentari object_raw subtype=0x58, x=0x18, y=0x50, paramC=0x830000 entity_list_end @@ -4427,7 +4427,7 @@ Room_MinishHouseInteriors_GentariExit:: @ 080DA6E8 .4byte gUnk_additional_9_MinishHouseInteriors_GentariExit Entities_MinishHouseInteriors_Festari_0:: @ 080DA710 - npc_raw subtype=0x2, x=0xe8, y=0x48, script=script_0800C634 + npc_raw subtype=0x2, x=0xe8, y=0x48, script=script_Festari entity_list_end Entities_MinishHouseInteriors_Festari_1:: @ 080DA730 @@ -4719,7 +4719,7 @@ Entities_MinishHouseInteriors_MelariMinesSouthwest_0:: @ 080DAED8 entity_list_end gUnk_080DAEE8:: @ 080DAEE8 - npc_raw subtype=0x2f, x=0x58, y=0x58, paramB=0x100, script=script_0800D308 + npc_raw subtype=0x2f, x=0x58, y=0x58, paramB=0x100, script=script_MelariInRoom entity_list_end Entities_MinishHouseInteriors_MelariMinesSouthwest_1:: @ 080DAF08 @@ -4747,7 +4747,7 @@ Entities_MinishHouseInteriors_MelariMinesSoutheast_0:: @ 080DAF70 entity_list_end gUnk_080DAF80:: @ 080DAF80 - npc_raw subtype=0x2d, x=0xa8, y=0x48, paramA=0x4, paramB=0x7, script=script_0800CF50 + npc_raw subtype=0x2d, x=0xa8, y=0x48, paramA=0x4, paramB=0x7, script=script_MountainMinish1 entity_list_end Entities_MinishHouseInteriors_MelariMinesSoutheast_1:: @ 080DAFA0 @@ -4775,7 +4775,7 @@ Entities_MinishHouseInteriors_MelariMinesEast_0:: @ 080DB008 entity_list_end gUnk_080DB018:: @ 080DB018 - npc_raw subtype=0x2d, x=0x130, y=0x58, paramA=0x4, paramB=0x8, script=script_0800CF50 + npc_raw subtype=0x2d, x=0x130, y=0x58, paramA=0x4, paramB=0x8, script=script_MountainMinish1 entity_list_end Entities_MinishHouseInteriors_MelariMinesEast_1:: @ 080DB038 @@ -4877,7 +4877,7 @@ Entities_MinishHouseInteriors_Librari_0:: @ 080DB228 entity_list_end gUnk_080DB238:: @ 080DB238 - npc_raw subtype=0x39, x=0x78, y=0x48, script=script_08012430 + npc_raw subtype=0x39, x=0x78, y=0x48, script=script_LibrariLater entity_list_end Entities_MinishHouseInteriors_Librari_1:: @ 080DB258 @@ -4925,7 +4925,7 @@ Room_MinishHouseInteriors_HyruleFieldExit:: @ 080DB308 .4byte sub_StateChange_MinishHouseInteriors_HyruleFieldExit Entities_MinishHouseInteriors_HyruleTown_0:: @ 080DB328 - npc_raw subtype=0x38, x=0x78, y=0x48, paramA=0x2, paramB=0x212, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x78, y=0x48, paramA=0x2, paramB=0x212, script=script_TownMinish1 entity_list_end Entities_MinishHouseInteriors_HyruleTown_1:: @ 080DB348 @@ -5000,13 +5000,13 @@ Entities_TownMinishHoles_MayorsHouse_0:: @ 080DB490 entity_list_end gUnk_080DB4A0:: @ 080DB4A0 - npc_raw subtype=0x38, x=0x68, y=0x48, paramB=0x205, script=script_0800E6E8 - npc_raw subtype=0x38, x=0x88, y=0x48, paramA=0x3, paramB=0x206, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x68, y=0x48, paramB=0x205, script=script_TownMinish1 + npc_raw subtype=0x38, x=0x88, y=0x48, paramA=0x3, paramB=0x206, script=script_TownMinish1 entity_list_end gUnk_080DB4D0:: @ 080DB4D0 - npc_raw subtype=0x38, x=0x68, y=0x48, paramB=0x205, script=script_0800ED90 - npc_raw subtype=0x38, x=0x88, y=0x48, paramA=0x3, paramB=0x206, script=script_0800EE50 + npc_raw subtype=0x38, x=0x68, y=0x48, paramB=0x205, script=script_TownMinish4 + npc_raw subtype=0x38, x=0x88, y=0x48, paramA=0x3, paramB=0x206, script=script_TownMinish5 entity_list_end Entities_TownMinishHoles_MayorsHouse_1:: @ 080DB500 @@ -5031,7 +5031,7 @@ Room_TownMinishHoles_MayorsHouse:: @ 080DB548 .4byte sub_StateChange_TownMinishHoles_MayorsHouse Entities_TownMinishHoles_WestOracle_0:: @ 080DB568 - npc_raw subtype=0x38, x=0x78, y=0x48, paramA=0x2, paramB=0x213, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x78, y=0x48, paramA=0x2, paramB=0x213, script=script_TownMinish1 entity_list_end Entities_TownMinishHoles_WestOracle_1:: @ 080DB588 @@ -5055,7 +5055,7 @@ Room_TownMinishHoles_WestOracle:: @ 080DB5C0 .4byte sub_StateChange_TownMinishHoles_WestOracle Entities_TownMinishHoles_DrLeft_0:: @ 080DB5E0 - npc_raw subtype=0x38, x=0x58, y=0x40, paramB=0x20a, script=script_0800EFC0 + npc_raw subtype=0x38, x=0x58, y=0x40, paramB=0x20a, script=script_TownMinish6 entity_list_end Entities_TownMinishHoles_DrLeft_1:: @ 080DB600 @@ -5080,7 +5080,7 @@ Room_TownMinishHoles_DrLeft:: @ 080DB648 .4byte sub_StateChange_TownMinishHoles_DrLeft Entities_TownMinishHoles_Carpenter_0:: @ 080DB668 - npc_raw subtype=0x38, x=0x78, y=0x58, paramB=0x10b, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x78, y=0x58, paramB=0x10b, script=script_TownMinish1 entity_list_end Entities_TownMinishHoles_Carpenter_1:: @ 080DB688 @@ -5105,8 +5105,8 @@ Room_TownMinishHoles_Carpenter:: @ 080DB6D0 .4byte sub_StateChange_TownMinishHoles_Carpenter Entities_TownMinishHoles_Cafe_0:: @ 080DB6F0 - npc_raw subtype=0x38, x=0x88, y=0x68, paramA=0x5, paramB=0x20c, script=script_0800E6E8 - npc_raw subtype=0x38, x=0xa8, y=0x48, paramA=0x4, paramB=0x20d, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x88, y=0x68, paramA=0x5, paramB=0x20c, script=script_TownMinish1 + npc_raw subtype=0x38, x=0xa8, y=0x48, paramA=0x4, paramB=0x20d, script=script_TownMinish1 entity_list_end Entities_TownMinishHoles_Cafe_1:: @ 080DB720 @@ -5155,11 +5155,11 @@ Room_TownMinishHoles_5:: @ 080DB7E0 .4byte sub_StateChange_TownMinishHoles_5 Entities_TownMinishHoles_LibraryBookshelf_0:: @ 080DB800 - npc_raw subtype=0x38, x=0xc0, y=0xd0, paramB=0x201, script=script_0800E6E8 + npc_raw subtype=0x38, x=0xc0, y=0xd0, paramB=0x201, script=script_TownMinish1 entity_list_end gUnk_additional_a_TownMinishHoles_LibraryBookshelf:: @ 080DB820 - npc_raw subtype=0x38, x=0x80, y=0x158, paramA=0x2, paramB=0x200, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x80, y=0x158, paramA=0x2, paramB=0x200, script=script_TownMinish1 entity_list_end Entities_TownMinishHoles_LibraryBookshelf_1:: @ 080DB840 @@ -5209,11 +5209,11 @@ Room_TownMinishHoles_LibraryBookshelf:: @ 080DB9BC .4byte gUnk_additional_a_TownMinishHoles_LibraryBookshelf Entities_TownMinishHoles_LibrariBookHouse_0:: @ 080DB9E8 - npc_raw subtype=0x39, x=0x78, y=0x58, script=script_0800E964 + npc_raw subtype=0x39, x=0x78, y=0x58, script=script_Librari entity_list_end gUnk_080DBA08:: @ 080DBA08 - npc_raw subtype=0x38, x=0x90, y=0x80, paramA=0x2, paramB=0x200, script=script_0800E6E8 + npc_raw subtype=0x38, x=0x90, y=0x80, paramA=0x2, paramB=0x200, script=script_TownMinish1 entity_list_end Entities_TownMinishHoles_LibrariBookHouse_1:: @ 080DBA28 @@ -5244,15 +5244,15 @@ Entities_TownMinishHoles_RemShoeShop_0:: @ 080DBAA0 entity_list_end gUnk_080DBAD0:: @ 080DBAD0 - npc_raw subtype=0x38, x=0x68, y=0x88, paramB=0x200, script=script_08013114 - npc_raw subtype=0x38, x=0x98, y=0xa8, paramB=0x200, script=script_08013114 - npc_raw subtype=0x38, x=0xd8, y=0x78, paramB=0x200, script=script_08013114 + npc_raw subtype=0x38, x=0x68, y=0x88, paramB=0x200, script=script_RemTownMinish + npc_raw subtype=0x38, x=0x98, y=0xa8, paramB=0x200, script=script_RemTownMinish + npc_raw subtype=0x38, x=0xd8, y=0x78, paramB=0x200, script=script_RemTownMinish entity_list_end gUnk_080DBB10:: @ 080DBB10 - npc_raw subtype=0x38, x=0x92, y=0xe8, paramB=0x200, script=script_08013114 - npc_raw subtype=0x38, x=0xb8, y=0xb8, paramB=0x200, script=script_08013114 - npc_raw subtype=0x38, x=0xee, y=0xd0, paramB=0x200, script=script_08013114 + npc_raw subtype=0x38, x=0x92, y=0xe8, paramB=0x200, script=script_RemTownMinish + npc_raw subtype=0x38, x=0xb8, y=0xb8, paramB=0x200, script=script_RemTownMinish + npc_raw subtype=0x38, x=0xee, y=0xd0, paramB=0x200, script=script_RemTownMinish entity_list_end gUnk_080DBB50:: @ 080DBB50 @@ -5264,7 +5264,7 @@ gUnk_080DBB70:: @ 080DBB70 entity_list_end gUnk_080DBB90:: @ 080DBB90 - object_raw subtype=0x69, unknown=0x48, paramC=script_08013188 + object_raw subtype=0x69, unknown=0x48, paramC=script_Object69Rem entity_list_end Enemies_TownMinishHoles_RemShoeShop:: @ 080DBBB0 @@ -5587,7 +5587,7 @@ gUnk_080DC470:: @ 080DC470 entity_list_end gUnk_080DC4C0:: @ 080DC4C0 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800C91C + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69VillageIntro npc_raw subtype=0x3, x=0x208, y=0x2f0, unknown=0xf, collision=1, paramB=0x227, script=0x0 npc_raw subtype=0x3, x=0x198, y=0x330, unknown=0xf, collision=1, paramB=0x128, script=0x0 npc_raw subtype=0x3, x=0x278, y=0x330, unknown=0xf, collision=1, paramB=0x329, script=0x0 @@ -6186,10 +6186,10 @@ Room_MinishCracks_11:: @ 080DD124 .4byte sub_StateChange_MinishCracks_11 Entities_MelarisMine_Main_0:: @ 080DD144 - npc_raw subtype=0x2d, x=0x168, y=0x48, script=script_0800CF88 - npc_raw subtype=0x2d, x=0x238, y=0x48, paramB=0x1, script=script_0800CF88 - npc_raw subtype=0x2d, x=0x268, y=0x138, paramA=0x6, paramB=0x2, script=script_0800CF50 - npc_raw subtype=0x2d, x=0x128, y=0x1e8, paramA=0x2, paramB=0x3, script=script_0800D414 + npc_raw subtype=0x2d, x=0x168, y=0x48, script=script_MountainMinish2 + npc_raw subtype=0x2d, x=0x238, y=0x48, paramB=0x1, script=script_MountainMinish2 + npc_raw subtype=0x2d, x=0x268, y=0x138, paramA=0x6, paramB=0x2, script=script_MountainMinish1 + npc_raw subtype=0x2d, x=0x128, y=0x1e8, paramA=0x2, paramB=0x3, script=script_MountainMinish5 object_raw subtype=0x0, x=0xe8, y=0xe8, collision=1, paramA=0x5c, paramB=0x771, paramC=0xb90000 object_raw subtype=0x0, x=0x1f8, y=0x48, collision=1, paramA=0x56, paramB=0x700, paramC=0xba0000 object_raw subtype=0x0, x=0xd8, y=0x48, collision=1, paramA=0x5c, paramB=0x772, paramC=0xbb0000 @@ -6201,19 +6201,19 @@ Entities_MelarisMine_Main_0:: @ 080DD144 entity_list_end gUnk_additional_8_MelarisMine_Main:: @ 080DD214 - npc_raw subtype=0x2d, x=0x1ba, y=0x138, paramA=0x6, paramB=0x5, script=script_0800D278 - npc_raw subtype=0x2d, x=0x1ba, y=0x148, paramA=0x6, paramB=0x6, script=script_0800D278 - npc_raw subtype=0x2f, x=0x190, y=0x140, script=script_0800CFAC - object_raw subtype=0x6a, x=0x1a8, y=0x138, unknown=0x4f, paramA=0x8, paramC=script_0800D218 - object_raw subtype=0x6a, x=0x1a8, y=0x138, unknown=0x4f, paramA=0x9, paramC=script_0800D254 + npc_raw subtype=0x2d, x=0x1ba, y=0x138, paramA=0x6, paramB=0x5, script=script_MountainMinish3 + npc_raw subtype=0x2d, x=0x1ba, y=0x148, paramA=0x6, paramB=0x6, script=script_MountainMinish3 + npc_raw subtype=0x2f, x=0x190, y=0x140, script=script_Melari + object_raw subtype=0x6a, x=0x1a8, y=0x138, unknown=0x4f, paramA=0x8, paramC=script_Object6ABrokenSword + object_raw subtype=0x6a, x=0x1a8, y=0x138, unknown=0x4f, paramA=0x9, paramC=script_Object6ARepairedSword entity_list_end gUnk_additional_9_MelarisMine_Main:: @ 080DD274 - npc_raw subtype=0x2d, x=0x80, y=0x130, paramA=0x2, paramB=0x4, script=script_0800D350 + npc_raw subtype=0x2d, x=0x80, y=0x130, paramA=0x2, paramB=0x4, script=script_MountainMinish4 entity_list_end gUnk_080DD294:: @ 080DD294 - npc_raw subtype=0x2d, x=0xa0, y=0x130, paramA=0x4, paramB=0x4, script=script_0800CF50 + npc_raw subtype=0x2d, x=0xa0, y=0x130, paramA=0x4, paramB=0x4, script=script_MountainMinish1 entity_list_end Entities_MelarisMine_Main_1:: @ 080DD2B4 @@ -6250,7 +6250,7 @@ Entities_CloudTops_House_0:: @ 080DD344 entity_list_end gUnk_080DD364:: @ 080DD364 - object_raw subtype=0xbb, x=0x1e8, y=0x1a8, unknown=0x4f, paramB=0x2, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x1e8, y=0x1a8, unknown=0x4f, paramB=0x2, paramC=script_Windcrest entity_list_end Entities_CloudTops_House_1:: @ 080DD384 @@ -6375,9 +6375,9 @@ gUnk_080DD730:: @ 080DD730 entity_list_end gUnk_080DD750:: @ 080DD750 - object_raw subtype=0x69, x=0x1e8, y=0x1b8, unknown=0x4f, paramC=script_0800D710 - npc_raw subtype=0x49, x=0x268, y=0x1d8, paramA=0x1, paramB=0x60b, script=script_0800D7DC - npc_raw subtype=0x49, x=0x1a8, y=0x1f8, paramA=0x3, paramB=0x40a, script=script_0800D76C + object_raw subtype=0x69, x=0x1e8, y=0x1b8, unknown=0x4f, paramC=script_Object69GreatWhirlwindRevealed + npc_raw subtype=0x49, x=0x268, y=0x1d8, paramA=0x1, paramB=0x60b, script=script_WindTribespeopleGreatWhirlwindRevealed2 + npc_raw subtype=0x49, x=0x1a8, y=0x1f8, paramA=0x3, paramB=0x40a, script=script_WindTribespeopleGreatWhirlwindRevealed1 entity_list_end Entities_CloudTops_Bottom_0:: @ 080DD790 @@ -6445,13 +6445,13 @@ gUnk_additional_8_CloudTops_Bottom:: @ 080DD8F0 delayed_entity_raw subtype=0x5e, x=0x338, y=0x2e8, layer=1, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0x5e, x=0x378, y=0x398, layer=1, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0x5e, x=0x398, y=0x1a8, layer=1, paramB=0x1, conditions=0xffff - delayed_entity_raw subtype=0x5e, x=0x248, y=0x48, layer=1, paramB=0x1, paramC=script_0800D6D0, conditions=0xffff - delayed_entity_raw subtype=0x5e, x=0x268, y=0x2d8, layer=1, paramB=0x1, paramC=script_0800D6F0, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x40, layer=1, paramA=0x12, paramB=0x1, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x138, y=0x2c0, layer=1, paramA=0x12, paramB=0x2, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x48, y=0x30, layer=1, paramA=0x12, paramB=0x3, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x2f8, y=0x1d0, layer=1, paramA=0x12, paramB=0x4, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x2d0, layer=1, paramA=0x12, paramB=0x5, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x5e, x=0x248, y=0x48, layer=1, paramB=0x1, paramC=script_HiddenWhirlwind1, conditions=0xffff + delayed_entity_raw subtype=0x5e, x=0x268, y=0x2d8, layer=1, paramB=0x1, paramC=script_HiddenWhirlwind2, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x40, layer=1, paramA=0x12, paramB=0x1, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x138, y=0x2c0, layer=1, paramA=0x12, paramB=0x2, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x48, y=0x30, layer=1, paramA=0x12, paramB=0x3, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x2f8, y=0x1d0, layer=1, paramA=0x12, paramB=0x4, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x2d0, layer=1, paramA=0x12, paramB=0x5, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x228, y=0x1a0, layer=2, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x1c8, y=0x1e0, layer=2, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x1b8, y=0x1a0, layer=2, paramB=0x2, conditions=0xffff @@ -6469,14 +6469,14 @@ gUnk_additional_8_CloudTops_Bottom:: @ 080DD8F0 delayed_entity_raw subtype=0x5e, x=0x338, y=0x2e8, layer=1, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0x5e, x=0x378, y=0x398, layer=1, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0x5e, x=0x398, y=0x1a8, layer=1, paramB=0x1, conditions=0xffff - delayed_entity_raw subtype=0x5e, x=0x248, y=0x48, layer=1, paramB=0x1, paramC=script_0800D6D0, conditions=0xffff - delayed_entity_raw subtype=0x5e, x=0x268, y=0x2d8, layer=1, paramB=0x1, paramC=script_0800D6F0, conditions=0xffff - delayed_entity_raw subtype=0x5e, x=0x1e8, y=0x398, layer=1, paramB=0x1, paramC=script_0800D6F0, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x40, layer=1, paramA=0x12, paramB=0x1, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x138, y=0x2c0, layer=1, paramA=0x12, paramB=0x2, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x48, y=0x30, layer=1, paramA=0x12, paramB=0x3, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x2f8, y=0x1d0, layer=1, paramA=0x12, paramB=0x4, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x2d0, layer=1, paramA=0x12, paramB=0x5, paramC=script_0800D6B4, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x5e, x=0x248, y=0x48, layer=1, paramB=0x1, paramC=script_HiddenWhirlwind1, conditions=0xffff + delayed_entity_raw subtype=0x5e, x=0x268, y=0x2d8, layer=1, paramB=0x1, paramC=script_HiddenWhirlwind2, conditions=0xffff + delayed_entity_raw subtype=0x5e, x=0x1e8, y=0x398, layer=1, paramB=0x1, paramC=script_HiddenWhirlwind2, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x40, layer=1, paramA=0x12, paramB=0x1, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x138, y=0x2c0, layer=1, paramA=0x12, paramB=0x2, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x48, y=0x30, layer=1, paramA=0x12, paramB=0x3, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x2f8, y=0x1d0, layer=1, paramA=0x12, paramB=0x4, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x6a, x=0x3a8, y=0x2d0, layer=1, paramA=0x12, paramB=0x5, paramC=script_Object6AMysteriousCloud, paramD=0x1, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x228, y=0x1a0, layer=2, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x1c8, y=0x1e0, layer=2, paramB=0x1, conditions=0xffff delayed_entity_raw subtype=0xbe, x=0x1b8, y=0x1a0, layer=2, paramB=0x2, conditions=0xffff @@ -6486,13 +6486,13 @@ gUnk_additional_8_CloudTops_Bottom:: @ 080DD8F0 .endif gUnk_additional_9_CloudTops_Bottom:: @ 080DDA70 - delayed_entity_raw subtype=0x4e, x=0x3a8, y=0x48, layer=1, paramA=0x1, paramC=script_0800D60C, conditions=0xffff - delayed_entity_raw subtype=0x4e, x=0x138, y=0x2c8, layer=1, paramA=0x2, paramC=script_0800D60C, conditions=0xffff - delayed_entity_raw subtype=0x4e, x=0x48, y=0x38, layer=1, paramA=0x3, paramC=script_0800D60C, conditions=0xffff - delayed_entity_raw subtype=0x4e, x=0x2f8, y=0x1d8, layer=1, paramA=0x4, paramC=script_0800D60C, conditions=0xffff - delayed_entity_raw subtype=0x4e, x=0x3a8, y=0x2d8, layer=1, paramA=0x5, paramC=script_0800D60C, conditions=0xffff - delayed_entity_raw subtype=0x49, x=0x2d8, y=0x1d8, layer=1, paramA=0x1, paramB=0xb, paramC=script_08014C94, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x49, x=0x1a8, y=0x1f8, layer=1, paramA=0x3, paramB=0xa, paramC=script_08014C94, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x4e, x=0x3a8, y=0x48, layer=1, paramA=0x1, paramC=script_Npc4EFirstCloud, conditions=0xffff + delayed_entity_raw subtype=0x4e, x=0x138, y=0x2c8, layer=1, paramA=0x2, paramC=script_Npc4EFirstCloud, conditions=0xffff + delayed_entity_raw subtype=0x4e, x=0x48, y=0x38, layer=1, paramA=0x3, paramC=script_Npc4EFirstCloud, conditions=0xffff + delayed_entity_raw subtype=0x4e, x=0x2f8, y=0x1d8, layer=1, paramA=0x4, paramC=script_Npc4EFirstCloud, conditions=0xffff + delayed_entity_raw subtype=0x4e, x=0x3a8, y=0x2d8, layer=1, paramA=0x5, paramC=script_Npc4EFirstCloud, conditions=0xffff + delayed_entity_raw subtype=0x49, x=0x2d8, y=0x1d8, layer=1, paramA=0x1, paramB=0xb, paramC=script_WindTribespeople7, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x49, x=0x1a8, y=0x1f8, layer=1, paramA=0x3, paramB=0xa, paramC=script_WindTribespeople7, paramD=0x4, conditions=0xffff entity_list_end Enemies_CloudTops_Bottom:: @ 080DDAF0 @@ -6720,7 +6720,7 @@ Entities_Ruins_FortressEntrance_0:: @ 080DDFE8 entity_list_end gUnk_080DE008:: @ 080DE008 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800AF8C + object_raw subtype=0x69, unknown=0x4f, paramC=script_EzloTalkFoW entity_list_end Entities_Ruins_FortressEntrance_1:: @ 080DE028 @@ -7645,7 +7645,7 @@ Entities_DeepwoodShrineEntry_Main_0:: @ 080DFB68 entity_list_end gUnk_080DFB78:: @ 080DFB78 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800AF44 + object_raw subtype=0x69, unknown=0x4f, paramC=script_EzloTalkDWS entity_list_end Enemies_DeepwoodShrineEntry_Main:: @ 080DFB98 @@ -9457,8 +9457,8 @@ Room_InnerMazaal_Main:: @ 080E3790 .4byte sub_StateChange_Dojos_71 Entities_FortressOfWindsTop_Main_0:: @ 080E37B0 - npc_raw subtype=0x4e, x=0xa0, y=0x58, script=script_0800D874 - npc_raw subtype=0x4e, x=0xa0, y=0x58, script=script_0800D8E4 + npc_raw subtype=0x4e, x=0xa0, y=0x58, script=script_Npc4EWindRuinsTextBoard + npc_raw subtype=0x4e, x=0xa0, y=0x58, script=script_Npc4EReceiveOcarina object_raw subtype=0x95, x=0xe8, y=0x108, collision=2, paramA=0x3 object_raw subtype=0x95, x=0x38, y=0xd8, collision=2, paramA=0x4 object_raw subtype=0x95, x=0x108, y=0xd8, collision=2, paramA=0x5 @@ -11023,8 +11023,8 @@ Entities_RoyalCrypt_KingGustaf_0:: @ 080E67AC entity_list_end gUnk_080E693C:: @ 080E693C - npc_raw subtype=0x42, x=0x118, y=0x48, script=script_0800D954 - object_raw subtype=0x6a, x=0x118, y=0x28, unknown=0x4f, paramA=0x12, paramB=0x9, paramC=script_0800DA28 + npc_raw subtype=0x42, x=0x118, y=0x48, script=script_KingGustav + object_raw subtype=0x6a, x=0x118, y=0x28, unknown=0x4f, paramA=0x12, paramB=0x9, paramC=script_Object6AKingsGravestone entity_list_end Enemies_RoyalCrypt_KingGustaf:: @ 080E696C @@ -13079,7 +13079,7 @@ Room_PalaceOfWindsBoss_Main:: @ 080EAA58 .4byte sub_StateChange_PalaceOfWindsBoss_Main Entities_Vaati2_Main_0:: @ 080EAA78 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800DFE4 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69V2Intro npc_raw subtype=0x3b, x=0xb0, y=0x88, unknown=0xf, script=0x0 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0c, flag=0x7b entity_list_end @@ -13108,7 +13108,7 @@ Room_Vaati2_Main:: @ 080EAB00 Entities_Vaati3_Main_0:: @ 080EAB20 manager subtype=0x2f, unknown=0x8 manager subtype=0x37, paramA=0x1 - npc_raw subtype=0x4e, script=script_0800A0FC + npc_raw subtype=0x4e, script=script_Npc4EV3Defeated object_raw subtype=0x74, x=0xb0, y=0x28, collision=1, paramC=0xffff0000 manager subtype=0x3, x=0xb0, y=0x28, unknown=0x0, paramA=0x3, paramB=0x102 ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0d, flag=0x4051 @@ -13131,7 +13131,7 @@ Room_Vaati3_Main:: @ 080EABA8 .4byte sub_StateChange_Vaati3_Main Entities_DarkHyruleCastleBridge_Main_0:: @ 080EABC8 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800E4A4 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69BallAndChainSoldierRoom object_raw subtype=0x39, x=0x88, y=0x118, paramA=0x6, paramC=0xffff entity_list_end @@ -13211,15 +13211,15 @@ Entities_DarkHyruleCastleOutside_ZeldaStatuePlatform_1:: @ 080EAD48 entity_list_end gUnk_080EAD68:: @ 080EAD68 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800DA60 - npc_raw subtype=0x28, x=0x78, y=0x68, script=script_0800DB18 - npc_raw subtype=0x27, x=0x78, y=0x96, paramA=0x1, script=script_0800DB28 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69VaatiWithZelda + npc_raw subtype=0x28, x=0x78, y=0x68, script=script_ZeldaStoneInDHC + npc_raw subtype=0x27, x=0x78, y=0x96, paramA=0x1, script=script_VaatiWithZelda object_raw subtype=0xab, x=0x78, y=0x138 entity_list_end gUnk_080EADB8:: @ 080EADB8 - npc_raw subtype=0x4e, script=script_0800DB78 - npc_raw subtype=0x28, x=0x78, y=0x68, script=script_0800DCAC + npc_raw subtype=0x4e, script=script_Npc4EAfterDefeatingV2 + npc_raw subtype=0x28, x=0x78, y=0x68, script=script_ZeldaAfterDefeatingV2 entity_list_end Enemies_DarkHyruleCastleOutside_ZeldaStatuePlatform:: @ 080EADE8 @@ -13246,9 +13246,9 @@ Entities_DarkHyruleCastleOutside_Garden_0:: @ 080EAE40 entity_list_end gUnk_080EAE60:: @ 080EAE60 - npc_raw subtype=0x25, x=0xb8, y=0x138, script=script_0800E0BC - npc_raw subtype=0x15, x=0x68, y=0x118, paramB=0x24, script=script_0800E154 - npc_raw subtype=0x15, x=0x88, y=0x180, paramB=0x25, script=script_0800E200 + npc_raw subtype=0x25, x=0xb8, y=0x138, script=script_MinishterPothoStone + npc_raw subtype=0x15, x=0x68, y=0x118, paramB=0x24, script=script_GuardStone1 + npc_raw subtype=0x15, x=0x88, y=0x180, paramB=0x25, script=script_GuardStone2 ezlo_hint x=0x4, y=0x1e, rx=0xd, ry=0x9, msg=0xb25, flag=0x85 .ifndef EU manager subtype=0xf, paramA=0xe @@ -13256,15 +13256,15 @@ gUnk_080EAE60:: @ 080EAE60 entity_list_end gUnk_080EAEC0:: @ 080EAEC0 - npc_raw subtype=0x4e, script=script_0800A1D8 - npc_raw subtype=0xf, x=0x88, y=0x68, script=script_0800A340 - npc_raw subtype=0x28, x=0x58, y=0x88, script=script_0800A3D8 - npc_raw subtype=0x4d, x=0x88, y=0x88, script=script_0800A590 - object_raw subtype=0x6a, x=0x88, y=0xa8, unknown=0x4f, paramA=0x1, paramC=script_0800A500 + npc_raw subtype=0x4e, script=script_Npc4EOutro + npc_raw subtype=0xf, x=0x88, y=0x68, script=script_MinishEzloOutro + npc_raw subtype=0x28, x=0x58, y=0x88, script=script_ZeldaOutro + npc_raw subtype=0x4d, x=0x88, y=0x88, script=script_EzloCapOutro + object_raw subtype=0x6a, x=0x88, y=0xa8, unknown=0x4f, paramA=0x1, paramC=script_Object6AMinishCapOutro entity_list_end gUnk_080EAF20:: @ 080EAF20 - npc_raw subtype=0x4e, script=script_0800AAD8 + npc_raw subtype=0x4e, script=script_Npc4ESanctuaryEntrance entity_list_end Entities_DarkHyruleCastleOutside_Garden_1:: @ 080EAF40 @@ -13503,12 +13503,12 @@ Entities_DarkHyruleCastle_0_0:: @ 080EB594 entity_list_end gUnk_080EB5D4:: @ 080EB5D4 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800DE78 - npc_raw subtype=0x28, x=0xd8, y=0x178, script=script_0800DED4 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69CastleEscape + npc_raw subtype=0x28, x=0xd8, y=0x178, script=script_ZeldaCastleEscape entity_list_end gUnk_080EB604:: @ 080EB604 - npc_raw subtype=0x4e, script=script_0800A704 + npc_raw subtype=0x4e, script=script_Npc4EDHCEntrance object_raw subtype=0x6a, x=0x1e8, y=0x1d8, collision=1, paramA=0x5, paramB=0x2 object_raw subtype=0x6a, x=0x198, y=0x198, collision=1, paramA=0x5, paramB=0x102 object_raw subtype=0x6a, x=0x150, y=0x1c0, collision=1, paramA=0x5, paramB=0x202 @@ -13627,7 +13627,7 @@ Room_DarkHyruleCastle_4:: @ 080EB864 .4byte sub_StateChange_Dojos_ToSplitblade0 Entities_DarkHyruleCastle_5_0:: @ 080EB884 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800E504 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69KeatonsRoom object_raw subtype=0x3, x=0x78, y=0x48, paramA=0x1, paramC=0x80000001 object_raw subtype=0x3, x=0x98, y=0x48, paramA=0x1, paramC=0x80010001 object_raw subtype=0x3, x=0xb8, y=0x48, paramA=0x1, paramC=0x80020001 @@ -13667,7 +13667,7 @@ Entities_DarkHyruleCastle_6_0:: @ 080EB9E4 entity_list_end gUnk_080EB9F4:: @ 080EB9F4 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800E544 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69DarkNutsRoom manager subtype=0x1e, x=0x30, y=0xa0, paramB=0x2000f0, paramC=0x80000000 manager subtype=0x35, x=0xa8, y=0x58, paramB=0x3c1e00, paramC=0x80008001 manager subtype=0xb, unknown=0x0, paramB=0x8, paramC=0x80028001 @@ -13682,14 +13682,14 @@ gUnk_080EB9F4:: @ 080EB9F4 entity_list_end gUnk_080EBAA4:: @ 080EBAA4 - npc_raw subtype=0x27, x=0xa8, y=0x58, paramA=0x1, script=script_0800DF24 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800DFB4 + npc_raw subtype=0x27, x=0xa8, y=0x58, paramA=0x1, script=script_Vaati1Intro + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69V1Defeated object_raw subtype=0x8, x=0xa8, y=0x28, paramC=0xffff object_raw subtype=0x39, x=0xa8, y=0xd8, paramA=0x6, paramC=0xffff entity_list_end gUnk_080EBAF4:: @ 080EBAF4 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800E050 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69V2Defeated object_raw subtype=0x8, x=0xa8, y=0x28, paramC=0x80000000 object_raw subtype=0x39, x=0xa8, y=0xd8, paramA=0x6, paramC=0x80000000 entity_list_end @@ -13845,7 +13845,7 @@ gUnk_additional_8_DarkHyruleCastle_10:: @ 080EBFD8 enemy_raw subtype=0x5, x=0x88, y=0x38, unknown=0x2f, paramA=0x3, paramB=0xe160000, paramC=0x300030 object_raw subtype=0x8, x=0x88, y=0xa8, paramA=0x12, paramC=0x86ffff object_raw subtype=0x39, x=0x88, y=0x28, paramA=0x4, paramC=0x86ffff - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800E5C4 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69DHC ezlo_hint type=0x3, x=0x0, y=0x0, rx=0x3f, ry=0x3f, msg=0xb0a, flag=0x86 entity_list_end @@ -14497,7 +14497,7 @@ Entities_DarkHyruleCastle_31_0:: @ 080ED194 entity_list_end gUnk_080ED1E4:: @ 080ED1E4 - npc_raw subtype=0x4e, script=script_0800A6A4 + npc_raw subtype=0x4e, script=script_Npc4EDHCThrone object_raw subtype=0x6a, x=0xc0, y=0x40, collision=1, paramA=0x5, paramB=0x102 object_raw subtype=0x6a, x=0xa0, y=0x80, collision=1, paramA=0x5, paramB=0x202 object_raw subtype=0x6a, x=0x50, y=0x60, collision=1, paramA=0x5, paramB=0x302 @@ -15253,13 +15253,13 @@ Entities_DarkHyruleCastle_57_0:: @ 080EE68C manager subtype=0x35, x=0xe0, y=0x68, paramB=0x3c1e00, paramC=0x8f0081 object_raw subtype=0xb1, x=0x80, y=0x78, paramC=0x810000 object_raw subtype=0xb1, x=0x140, y=0x78, paramC=0x810000 - npc_raw subtype=0x24, x=0x120, y=0x58, script=script_0800E350 + npc_raw subtype=0x24, x=0x120, y=0x58, script=script_KingDaltusStone entity_list_end gUnk_080EE71C:: @ 080EE71C - npc_raw subtype=0x25, x=0x138, y=0x38, script=script_0800E408 - npc_raw subtype=0x15, x=0x128, y=0x88, paramB=0x24, script=script_0800E434 - npc_raw subtype=0x15, x=0x168, y=0x88, paramB=0x25, script=script_0800E46C + npc_raw subtype=0x25, x=0x138, y=0x38, script=script_MinisterPothoCell + npc_raw subtype=0x15, x=0x128, y=0x88, paramB=0x24, script=script_GuardCellLeft + npc_raw subtype=0x15, x=0x168, y=0x88, paramB=0x25, script=script_GuardCellRight entity_list_end Enemies_DarkHyruleCastle_57:: @ 080EE75C @@ -15328,18 +15328,18 @@ Entities_HyruleTown_0_0:: @ 080EE80C object_raw subtype=0xb7, x=0x2f8, y=0x278 manager subtype=0x1a, unknown=0x8, paramA=0x3c manager subtype=0x16, paramA=0xf - npc_raw subtype=0x4, x=0x1f8, y=0x1d8, script=script_08010AE4 + npc_raw subtype=0x4, x=0x1f8, y=0x1d8, script=script_Postman entity_list_end gUnk_080EE88C:: @ 080EE88C - npc_raw subtype=0x4e, script=script_0800F090 + npc_raw subtype=0x4e, script=script_Npc4EFirstKinstone entity_list_end gUnk_080EE8AC:: @ 080EE8AC - npc_raw subtype=0x53, x=0x158, y=0x328, script=script_0800F184 - npc_raw subtype=0x7, x=0x148, y=0x328, paramA=0x6, script=script_0800F39C - npc_raw subtype=0x7, x=0x134, y=0x328, paramA=0x7, script=script_0800F430 - npc_raw subtype=0x7, x=0x120, y=0x328, paramA=0x8, script=script_0800F4C4 + npc_raw subtype=0x53, x=0x158, y=0x328, script=script_HurdyGurdyManFirstKinstone + npc_raw subtype=0x7, x=0x148, y=0x328, paramA=0x6, script=script_KidKinstone1 + npc_raw subtype=0x7, x=0x134, y=0x328, paramA=0x7, script=script_KidKinstone2 + npc_raw subtype=0x7, x=0x120, y=0x328, paramA=0x8, script=script_KidKinstone3 entity_list_end gUnk_080EE8FC:: @ 080EE8FC @@ -15427,17 +15427,17 @@ gUnk_080EEB8C:: @ 080EEB8C entity_list_end gUnk_080EEBAC:: @ 080EEBAC - object_raw subtype=0xbb, x=0x278, y=0x58, unknown=0x4f, paramB=0x3, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x278, y=0x58, unknown=0x4f, paramB=0x3, paramC=script_Windcrest entity_list_end Entities_HyruleTown_1_0:: @ 080EEBCC manager subtype=0x16, paramA=0x9 - npc_raw subtype=0x4e, script=script_0800F73C - npc_raw subtype=0x28, x=0xc8, y=0x3c8, script=script_0800FB44 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800FD0C + npc_raw subtype=0x4e, script=script_Npc4EIntroTown + npc_raw subtype=0x28, x=0xc8, y=0x3c8, script=script_ZeldaIntroTown + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69IntroTown object_raw subtype=0x95, x=0x144, y=0x4c, collision=2, paramA=0x4 object_raw subtype=0x95, x=0x178, y=0xa8, collision=2, paramA=0x7 - object_raw subtype=0xbb, x=0x148, y=0x58, unknown=0x4f, paramB=0x3, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x148, y=0x58, unknown=0x4f, paramB=0x3, paramC=script_Windcrest entity_list_end Entities_HyruleTown_1_1:: @ 080EEC4C @@ -15605,83 +15605,83 @@ gUnk_additional_2c_HyruleTown_0:: @ 080EF09C .incbin "data_080D5360/gUnk_additional_2c_HyruleTown_0.bin" gUnk_additional_f_HyruleTown_0:: @ 080EF0B0 - delayed_entity_raw subtype=0x6, x=0x298, y=0x268, layer=1, paramA=0x8, paramC=script_080100C8, paramD=0x4, conditions=0x1c - delayed_entity_raw subtype=0x6, x=0x238, y=0x118, layer=1, paramA=0xa, paramC=script_080100FC, paramD=0x4, conditions=0x1fc - delayed_entity_raw subtype=0x6, x=0x1a8, y=0x308, layer=1, paramA=0xb, paramC=script_080100FC, paramD=0x4, conditions=0x1fc - delayed_entity_raw subtype=0x6, x=0x2ec, y=0x2a8, layer=1, paramA=0x6, paramC=script_080100C8, paramD=0x2, conditions=0x3c - delayed_entity_raw subtype=0x6, x=0x1d8, y=0x228, layer=1, paramA=0x6, paramC=script_080100FC, paramD=0x4, conditions=0xc0 - delayed_entity_raw subtype=0x6, x=0x328, y=0x168, layer=1, paramA=0x1, paramC=script_080100FC, paramD=0x4, conditions=0xfc - delayed_entity_raw subtype=0x6, x=0x1c8, y=0x278, layer=1, paramA=0x2, paramC=script_080100FC, paramD=0x4, conditions=0xfc - delayed_entity_raw subtype=0x6, x=0x58, y=0x328, layer=1, paramA=0x11, paramC=script_080100FC, paramD=0x4, conditions=0x1fc - delayed_entity_raw subtype=0x6, x=0x88, y=0x1a8, layer=1, paramA=0x12, paramC=script_080100C8, paramD=0x6, conditions=0xfc - delayed_entity_raw subtype=0x6, x=0x1e8, y=0x1a8, layer=1, paramA=0x13, paramC=script_080100FC, paramD=0x4, conditions=0x1e0 - delayed_entity_raw subtype=0x6, x=0x238, y=0x308, layer=1, paramA=0x10, paramC=script_080100FC, paramD=0x2, conditions=0xfc - delayed_entity_raw subtype=0x48, x=0x2c8, y=0xac, layer=1, paramA=0x1, paramC=script_0800E7F4, paramD=0x4, conditions=0x3c - delayed_entity_raw subtype=0x45, x=0x358, y=0x378, layer=1, paramC=script_08010148, paramD=0x6, conditions=0x3fc + delayed_entity_raw subtype=0x6, x=0x298, y=0x268, layer=1, paramA=0x8, paramC=script_Townsperson1, paramD=0x4, conditions=0x1c + delayed_entity_raw subtype=0x6, x=0x238, y=0x118, layer=1, paramA=0xa, paramC=script_Townsperson2, paramD=0x4, conditions=0x1fc + delayed_entity_raw subtype=0x6, x=0x1a8, y=0x308, layer=1, paramA=0xb, paramC=script_Townsperson2, paramD=0x4, conditions=0x1fc + delayed_entity_raw subtype=0x6, x=0x2ec, y=0x2a8, layer=1, paramA=0x6, paramC=script_Townsperson1, paramD=0x2, conditions=0x3c + delayed_entity_raw subtype=0x6, x=0x1d8, y=0x228, layer=1, paramA=0x6, paramC=script_Townsperson2, paramD=0x4, conditions=0xc0 + delayed_entity_raw subtype=0x6, x=0x328, y=0x168, layer=1, paramA=0x1, paramC=script_Townsperson2, paramD=0x4, conditions=0xfc + delayed_entity_raw subtype=0x6, x=0x1c8, y=0x278, layer=1, paramA=0x2, paramC=script_Townsperson2, paramD=0x4, conditions=0xfc + delayed_entity_raw subtype=0x6, x=0x58, y=0x328, layer=1, paramA=0x11, paramC=script_Townsperson2, paramD=0x4, conditions=0x1fc + delayed_entity_raw subtype=0x6, x=0x88, y=0x1a8, layer=1, paramA=0x12, paramC=script_Townsperson1, paramD=0x6, conditions=0xfc + delayed_entity_raw subtype=0x6, x=0x1e8, y=0x1a8, layer=1, paramA=0x13, paramC=script_Townsperson2, paramD=0x4, conditions=0x1e0 + delayed_entity_raw subtype=0x6, x=0x238, y=0x308, layer=1, paramA=0x10, paramC=script_Townsperson2, paramD=0x2, conditions=0xfc + delayed_entity_raw subtype=0x48, x=0x2c8, y=0xac, layer=1, paramA=0x1, paramC=script_Teachers, paramD=0x4, conditions=0x3c + delayed_entity_raw subtype=0x45, x=0x358, y=0x378, layer=1, paramC=script_Anju, paramD=0x6, conditions=0x3fc delayed_entity_raw subtype=0x2c, x=0x168, y=0x13c, layer=1, paramA=0x1, paramD=0x20, conditions=0x1fc delayed_entity_raw subtype=0x2c, x=0x13c, y=0x158, layer=1, paramA=0x2, paramD=0x20, conditions=0x1fc delayed_entity_raw subtype=0x2c, x=0x1c8, y=0x34e, layer=2, paramA=0x5, paramD=0x60, conditions=0x1fc - delayed_entity_raw subtype=0x7, x=0x368, y=0xd8, layer=1, paramA=0x6, paramC=script_08010294, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x188, y=0x268, layer=1, paramA=0x6, paramC=script_080102E0, paramD=0x6, conditions=0x20 - delayed_entity_raw subtype=0x7, x=0x328, y=0x268, layer=1, paramA=0x6, paramC=script_080103B0, paramD=0x4, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x158, y=0x78, layer=2, paramA=0x6, paramC=script_080102E0, paramD=0x4, conditions=0x80 - delayed_entity_raw subtype=0x7, x=0x158, y=0x1b8, layer=1, paramA=0x7, paramC=script_080102E0, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x280, y=0x268, layer=1, paramA=0x7, paramC=script_080102E0, conditions=0x20 - delayed_entity_raw subtype=0x7, x=0x308, y=0x238, layer=1, paramA=0x7, paramC=script_080103B0, paramD=0x4, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x168, y=0x78, layer=2, paramA=0x7, paramC=script_080102E0, paramD=0x4, conditions=0x80 - delayed_entity_raw subtype=0x7, x=0x168, y=0x1b8, layer=1, paramA=0x8, paramC=script_080102E0, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x2b0, y=0x268, layer=1, paramA=0x8, paramC=script_080102E0, conditions=0x20 - delayed_entity_raw subtype=0x7, x=0x2d8, y=0x248, layer=1, paramA=0x8, paramC=script_080103B0, paramD=0x4, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x178, y=0x78, layer=2, paramA=0x8, paramC=script_080102E0, paramD=0x4, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x368, y=0xd8, layer=1, paramA=0x6, paramC=script_Kid1, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x188, y=0x268, layer=1, paramA=0x6, paramC=script_Kid2, paramD=0x6, conditions=0x20 + delayed_entity_raw subtype=0x7, x=0x328, y=0x268, layer=1, paramA=0x6, paramC=script_Kid4, paramD=0x4, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x158, y=0x78, layer=2, paramA=0x6, paramC=script_Kid2, paramD=0x4, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x158, y=0x1b8, layer=1, paramA=0x7, paramC=script_Kid2, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x280, y=0x268, layer=1, paramA=0x7, paramC=script_Kid2, conditions=0x20 + delayed_entity_raw subtype=0x7, x=0x308, y=0x238, layer=1, paramA=0x7, paramC=script_Kid4, paramD=0x4, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x168, y=0x78, layer=2, paramA=0x7, paramC=script_Kid2, paramD=0x4, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x168, y=0x1b8, layer=1, paramA=0x8, paramC=script_Kid2, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x2b0, y=0x268, layer=1, paramA=0x8, paramC=script_Kid2, conditions=0x20 + delayed_entity_raw subtype=0x7, x=0x2d8, y=0x248, layer=1, paramA=0x8, paramC=script_Kid4, paramD=0x4, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x178, y=0x78, layer=2, paramA=0x8, paramC=script_Kid2, paramD=0x4, conditions=0x80 delayed_entity_raw subtype=0x35, x=0x398, y=0x2c8, layer=1, paramA=0x1, paramB=0x1, conditions=0x1fc delayed_entity_raw subtype=0x35, x=0x78, y=0x220, layer=1, paramA=0x2, paramB=0x2, conditions=0x1fc - delayed_entity_raw subtype=0xb, x=0x218, y=0x1c8, layer=1, paramC=script_08010428, conditions=0xfc - delayed_entity_raw subtype=0x6, x=0x304, y=0x2a8, layer=1, paramA=0x7, paramC=script_080100C8, paramD=0x6, conditions=0x3c - delayed_entity_raw subtype=0x12, x=0x1d0, y=0x1f8, layer=1, paramC=script_08010454, conditions=0x1fc - delayed_entity_raw subtype=0x14, x=0x1d0, y=0x248, layer=1, paramC=script_080104A0, conditions=0x1fc - delayed_entity_raw subtype=0x7, x=0x318, y=0xa8, layer=1, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x338, y=0x98, layer=1, paramA=0x1, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x358, y=0xa8, layer=1, paramA=0x2, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x378, y=0x88, layer=1, paramA=0x3, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x398, y=0x98, layer=1, paramA=0x4, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x3b8, y=0x88, layer=1, paramA=0x5, paramC=script_0801030C, paramD=0x4, conditions=0xc - delayed_entity_raw subtype=0x7, x=0x378, y=0x98, layer=1, paramC=script_080103B0, paramD=0x4, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x3a8, y=0x98, layer=1, paramA=0x3, paramC=script_080103B0, paramD=0x4, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x308, y=0x98, layer=1, paramA=0x4, paramC=script_080102E0, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x318, y=0x98, layer=1, paramA=0x5, paramC=script_080102E0, conditions=0x40 - delayed_entity_raw subtype=0x7, x=0x348, y=0x98, layer=1, paramA=0x1, paramC=script_080103B0, paramD=0x4, conditions=0x80 - delayed_entity_raw subtype=0x7, x=0x3a8, y=0x98, layer=1, paramA=0x2, paramC=script_080103B0, paramD=0x4, conditions=0x80 - delayed_entity_raw subtype=0x7, x=0x368, y=0x58, layer=1, paramA=0x4, paramC=script_080102E0, conditions=0x80 - delayed_entity_raw subtype=0x7, x=0x378, y=0x58, layer=1, paramA=0x5, paramC=script_080102E0, conditions=0x80 - delayed_entity_raw subtype=0x8, x=0x3e0, y=0xd8, layer=1, paramB=0x80, paramC=script_0800FF18, paramD=0x1, conditions=0xc - delayed_entity_raw subtype=0x8, x=0x18, y=0x108, layer=1, paramB=0x81, paramC=script_0800FF74, paramD=0x1, conditions=0xc - delayed_entity_raw subtype=0x8, x=0x68, y=0xf8, layer=1, paramB=0x82, paramC=script_080103D0, conditions=0x30 - delayed_entity_raw subtype=0x8, x=0x1f8, y=0x98, layer=1, paramB=0x83, paramC=script_080103D0, conditions=0x1f0 - delayed_entity_raw subtype=0x8, x=0x48, y=0x158, layer=1, paramB=0x84, paramC=script_080103D0, conditions=0x300 - delayed_entity_raw subtype=0x8, x=0x398, y=0xe8, layer=1, paramB=0x85, paramC=script_080103D0, conditions=0x30 - delayed_entity_raw subtype=0x8, x=0x398, y=0x128, layer=1, paramB=0x86, paramC=script_080103D0, conditions=0x300 - delayed_entity_raw subtype=0x8, x=0x48, y=0x2b8, layer=1, paramB=0x87, paramC=script_080103D0, conditions=0x210 - delayed_entity_raw subtype=0x8, x=0x118, y=0x248, layer=1, paramB=0x88, paramC=script_080103D0, conditions=0x1f0 - delayed_entity_raw subtype=0x8, x=0x208, y=0x318, layer=1, paramB=0x89, paramC=script_080103D0, conditions=0x3f0 - delayed_entity_raw subtype=0x8, x=0x388, y=0x2f8, layer=1, paramB=0x8a, paramC=script_080103D0, conditions=0x230 - delayed_entity_raw subtype=0x8, x=0x1c8, y=0x288, layer=1, paramB=0x8b, paramC=script_080103D0, conditions=0x300 - delayed_entity_raw subtype=0x8, x=0x1f8, y=0x1b8, layer=1, paramB=0x8c, paramC=script_080103D0, conditions=0x200 - delayed_entity_raw subtype=0x8, x=0x188, y=0x338, layer=1, paramB=0x8d, paramC=script_080103D0, conditions=0x200 - delayed_entity_raw subtype=0x8, x=0x238, y=0x118, layer=1, paramB=0x8e, paramC=script_080103D0, conditions=0x200 - delayed_entity_raw subtype=0x8, x=0x168, y=0xb8, layer=1, paramB=0x8f, paramC=script_080103F8, conditions=0x200 - delayed_entity_raw subtype=0x8, x=0x1f8, y=0x50, layer=1, paramB=0x90, paramC=script_0800FEBC, paramD=0x1, conditions=0xc - delayed_entity_raw subtype=0x8, x=0x48, y=0x2c8, layer=1, paramB=0x91, paramC=script_080103D0, conditions=0x20 - delayed_entity_raw subtype=0x13, x=0x13b, y=0x2c8, layer=1, paramB=0x3, paramC=script_0800ED04, paramD=0x1, conditions=0x3c0 - delayed_entity_raw subtype=0x13, x=0x167, y=0x2e2, layer=1, paramA=0x3, paramB=0x4, paramC=script_0800ED04, conditions=0x80 - delayed_entity_raw subtype=0x4e, x=0x368, y=0x1b6, layer=1, paramC=script_080108D0, conditions=0x6 - delayed_entity_raw subtype=0x4e, x=0x388, y=0x256, layer=1, paramC=script_080108D0, conditions=0x6 - delayed_entity_raw subtype=0x4e, x=0x178, y=0x252, layer=1, paramC=script_08010964, conditions=0x1e - delayed_entity_raw subtype=0x4e, x=0x178, y=0x292, layer=1, paramC=script_080109A0, conditions=0x3fe - delayed_entity_raw subtype=0x52, x=0x50, y=0x398, layer=1, paramC=script_08010B68, conditions=0x1f0 - delayed_entity_raw subtype=0x52, x=0x188, y=0x1aa, layer=1, paramA=0x1, paramB=0x1, paramC=script_08010B68, conditions=0x1f0 - delayed_entity_raw subtype=0x52, x=0x3c8, y=0x2f8, layer=1, paramA=0x2, paramB=0x2, paramC=script_08010B68, conditions=0x1f0 - delayed_entity_raw subtype=0x52, x=0x138, y=0x10a, layer=1, paramA=0x3, paramB=0x3, paramC=script_08010B68, conditions=0x1e0 - delayed_entity_raw subtype=0x52, x=0x338, y=0x3a, layer=2, paramA=0x4, paramB=0x4, paramC=script_08010B68, conditions=0x1c0 + delayed_entity_raw subtype=0xb, x=0x218, y=0x1c8, layer=1, paramC=script_MaidTown, conditions=0xfc + delayed_entity_raw subtype=0x6, x=0x304, y=0x2a8, layer=1, paramA=0x7, paramC=script_Townsperson1, paramD=0x6, conditions=0x3c + delayed_entity_raw subtype=0x12, x=0x1d0, y=0x1f8, layer=1, paramC=script_Brocco, conditions=0x1fc + delayed_entity_raw subtype=0x14, x=0x1d0, y=0x248, layer=1, paramC=script_Pina, conditions=0x1fc + delayed_entity_raw subtype=0x7, x=0x318, y=0xa8, layer=1, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x338, y=0x98, layer=1, paramA=0x1, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x358, y=0xa8, layer=1, paramA=0x2, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x378, y=0x88, layer=1, paramA=0x3, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x398, y=0x98, layer=1, paramA=0x4, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x3b8, y=0x88, layer=1, paramA=0x5, paramC=script_Kid3, paramD=0x4, conditions=0xc + delayed_entity_raw subtype=0x7, x=0x378, y=0x98, layer=1, paramC=script_Kid4, paramD=0x4, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x3a8, y=0x98, layer=1, paramA=0x3, paramC=script_Kid4, paramD=0x4, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x308, y=0x98, layer=1, paramA=0x4, paramC=script_Kid2, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x318, y=0x98, layer=1, paramA=0x5, paramC=script_Kid2, conditions=0x40 + delayed_entity_raw subtype=0x7, x=0x348, y=0x98, layer=1, paramA=0x1, paramC=script_Kid4, paramD=0x4, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x3a8, y=0x98, layer=1, paramA=0x2, paramC=script_Kid4, paramD=0x4, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x368, y=0x58, layer=1, paramA=0x4, paramC=script_Kid2, conditions=0x80 + delayed_entity_raw subtype=0x7, x=0x378, y=0x58, layer=1, paramA=0x5, paramC=script_Kid2, conditions=0x80 + delayed_entity_raw subtype=0x8, x=0x3e0, y=0xd8, layer=1, paramB=0x80, paramC=script_GuardEast, paramD=0x1, conditions=0xc + delayed_entity_raw subtype=0x8, x=0x18, y=0x108, layer=1, paramB=0x81, paramC=script_GuardWest, paramD=0x1, conditions=0xc + delayed_entity_raw subtype=0x8, x=0x68, y=0xf8, layer=1, paramB=0x82, paramC=script_GuardPatrolling, conditions=0x30 + delayed_entity_raw subtype=0x8, x=0x1f8, y=0x98, layer=1, paramB=0x83, paramC=script_GuardPatrolling, conditions=0x1f0 + delayed_entity_raw subtype=0x8, x=0x48, y=0x158, layer=1, paramB=0x84, paramC=script_GuardPatrolling, conditions=0x300 + delayed_entity_raw subtype=0x8, x=0x398, y=0xe8, layer=1, paramB=0x85, paramC=script_GuardPatrolling, conditions=0x30 + delayed_entity_raw subtype=0x8, x=0x398, y=0x128, layer=1, paramB=0x86, paramC=script_GuardPatrolling, conditions=0x300 + delayed_entity_raw subtype=0x8, x=0x48, y=0x2b8, layer=1, paramB=0x87, paramC=script_GuardPatrolling, conditions=0x210 + delayed_entity_raw subtype=0x8, x=0x118, y=0x248, layer=1, paramB=0x88, paramC=script_GuardPatrolling, conditions=0x1f0 + delayed_entity_raw subtype=0x8, x=0x208, y=0x318, layer=1, paramB=0x89, paramC=script_GuardPatrolling, conditions=0x3f0 + delayed_entity_raw subtype=0x8, x=0x388, y=0x2f8, layer=1, paramB=0x8a, paramC=script_GuardPatrolling, conditions=0x230 + delayed_entity_raw subtype=0x8, x=0x1c8, y=0x288, layer=1, paramB=0x8b, paramC=script_GuardPatrolling, conditions=0x300 + delayed_entity_raw subtype=0x8, x=0x1f8, y=0x1b8, layer=1, paramB=0x8c, paramC=script_GuardPatrolling, conditions=0x200 + delayed_entity_raw subtype=0x8, x=0x188, y=0x338, layer=1, paramB=0x8d, paramC=script_GuardPatrolling, conditions=0x200 + delayed_entity_raw subtype=0x8, x=0x238, y=0x118, layer=1, paramB=0x8e, paramC=script_GuardPatrolling, conditions=0x200 + delayed_entity_raw subtype=0x8, x=0x168, y=0xb8, layer=1, paramB=0x8f, paramC=script_GuardLibrary, conditions=0x200 + delayed_entity_raw subtype=0x8, x=0x1f8, y=0x50, layer=1, paramB=0x90, paramC=script_GuardNorth, paramD=0x1, conditions=0xc + delayed_entity_raw subtype=0x8, x=0x48, y=0x2c8, layer=1, paramB=0x91, paramC=script_GuardPatrolling, conditions=0x20 + delayed_entity_raw subtype=0x13, x=0x13b, y=0x2c8, layer=1, paramB=0x3, paramC=script_SittingPerson, paramD=0x1, conditions=0x3c0 + delayed_entity_raw subtype=0x13, x=0x167, y=0x2e2, layer=1, paramA=0x3, paramB=0x4, paramC=script_SittingPerson, conditions=0x80 + delayed_entity_raw subtype=0x4e, x=0x368, y=0x1b6, layer=1, paramC=script_InnDoor, conditions=0x6 + delayed_entity_raw subtype=0x4e, x=0x388, y=0x256, layer=1, paramC=script_InnDoor, conditions=0x6 + delayed_entity_raw subtype=0x4e, x=0x178, y=0x252, layer=1, paramC=script_SimonsDoor, conditions=0x1e + delayed_entity_raw subtype=0x4e, x=0x178, y=0x292, layer=1, paramC=script_PhonographDoor, conditions=0x3fe + delayed_entity_raw subtype=0x52, x=0x50, y=0x398, layer=1, paramC=script_SmallTownMinish, conditions=0x1f0 + delayed_entity_raw subtype=0x52, x=0x188, y=0x1aa, layer=1, paramA=0x1, paramB=0x1, paramC=script_SmallTownMinish, conditions=0x1f0 + delayed_entity_raw subtype=0x52, x=0x3c8, y=0x2f8, layer=1, paramA=0x2, paramB=0x2, paramC=script_SmallTownMinish, conditions=0x1f0 + delayed_entity_raw subtype=0x52, x=0x138, y=0x10a, layer=1, paramA=0x3, paramB=0x3, paramC=script_SmallTownMinish, conditions=0x1e0 + delayed_entity_raw subtype=0x52, x=0x338, y=0x3a, layer=2, paramA=0x4, paramB=0x4, paramC=script_SmallTownMinish, conditions=0x1c0 delayed_entity_raw subtype=0x54, x=0x3c0, y=0x31c, layer=2, conditions=0x1fc delayed_entity_raw subtype=0x55, x=0x11c, y=0x364, layer=1, conditions=0x1fc delayed_entity_raw subtype=0x10, x=0x48, y=0x80, layer=2, conditions=0x3fe @@ -15689,32 +15689,32 @@ gUnk_additional_f_HyruleTown_0:: @ 080EF0B0 delayed_entity_raw subtype=0x0 gUnk_additional_8_HyruleTown_0:: @ 080EF5D0 - delayed_entity_raw subtype=0x21, x=0x388, y=0x338, layer=1, paramA=0x1, paramC=script_08010264, conditions=0x3fc + delayed_entity_raw subtype=0x21, x=0x388, y=0x338, layer=1, paramA=0x1, paramC=script_Ghost, conditions=0x3fc entity_list_end gUnk_additional_2d_HyruleTown_0:: @ 080EF5F0 - delayed_entity_raw subtype=0x33, x=0x220, y=0x1f8, layer=1, paramC=script_080107D0, conditions=0x3f0 + delayed_entity_raw subtype=0x33, x=0x220, y=0x1f8, layer=1, paramC=script_GoronMerchant, conditions=0x3f0 entity_list_end gUnk_additional_2e_HyruleTown_0:: @ 080EF610 - delayed_entity_raw subtype=0x11, x=0x220, y=0x248, layer=1, paramA=0x1, paramC=script_080104EC, conditions=0x3f0 + delayed_entity_raw subtype=0x11, x=0x220, y=0x248, layer=1, paramA=0x1, paramC=script_Beedle, conditions=0x3f0 delayed_entity_raw subtype=0x50, x=0x220, y=0x250, layer=1, conditions=0x3f0 entity_list_end gUnk_additional_2f_HyruleTown_0:: @ 080EF640 - delayed_entity_raw subtype=0x34, x=0x2b8, y=0x378, layer=1, paramC=script_0800FDA0, conditions=0x3f0 + delayed_entity_raw subtype=0x34, x=0x2b8, y=0x378, layer=1, paramC=script_GormanFirstHouse, conditions=0x3f0 entity_list_end gUnk_additional_30_HyruleTown_0:: @ 080EF660 - delayed_entity_raw subtype=0x34, x=0x68, y=0x1c8, layer=1, paramC=script_0800FDCC, conditions=0x3f0 + delayed_entity_raw subtype=0x34, x=0x68, y=0x1c8, layer=1, paramC=script_GormanSecondHouse, conditions=0x3f0 entity_list_end gUnk_additional_31_HyruleTown_0:: @ 080EF680 - delayed_entity_raw subtype=0x34, x=0x138, y=0x108, layer=1, paramC=script_0800FE44, conditions=0x1f0 + delayed_entity_raw subtype=0x34, x=0x138, y=0x108, layer=1, paramC=script_GormanCats, conditions=0x1f0 entity_list_end gUnk_additional_32_HyruleTown_0:: @ 080EF6A0 - delayed_entity_raw subtype=0x34, x=0x40, y=0x1d0, layer=1, paramC=script_0800FDA0, conditions=0x3f0 + delayed_entity_raw subtype=0x34, x=0x40, y=0x1d0, layer=1, paramC=script_GormanFirstHouse, conditions=0x3f0 entity_list_end gUnk_additional_34_HyruleTown_0:: @ 080EF6C0 @@ -15734,46 +15734,46 @@ gUnk_additional_37_HyruleTown_0:: @ 080EF720 entity_list_end gUnk_additional_38_HyruleTown_0:: @ 080EF740 - delayed_entity_raw subtype=0x2a, x=0x80, y=0x88, layer=1, paramA=0x2, paramC=script_08010A98, conditions=0x3e0 + delayed_entity_raw subtype=0x2a, x=0x80, y=0x88, layer=1, paramA=0x2, paramC=script_Carpenter, conditions=0x3e0 entity_list_end gUnk_additional_39_HyruleTown_0:: @ 080EF760 - delayed_entity_raw subtype=0x1e, x=0x1a8, y=0xf8, layer=1, paramA=0x1, paramC=script_08014F30, conditions=0x3f0 + delayed_entity_raw subtype=0x1e, x=0x1a8, y=0xf8, layer=1, paramA=0x1, paramC=script_MalonHyruleTown, conditions=0x3f0 delayed_entity_raw subtype=0x1f, x=0x1c0, y=0xf8, layer=1, conditions=0x3f0 delayed_entity_raw subtype=0x20, x=0x1d0, y=0xf8, layer=1, conditions=0x3f0 entity_list_end gUnk_additional_3a_HyruleTown_0:: @ 080EF7A0 - delayed_entity_raw subtype=0x6, x=0x168, y=0xb8, layer=1, paramC=script_080100C8, paramD=0x4, conditions=0x3c + delayed_entity_raw subtype=0x6, x=0x168, y=0xb8, layer=1, paramC=script_Townsperson1, paramD=0x4, conditions=0x3c entity_list_end gUnk_additional_9_HyruleTown_1:: @ 080EF7C0 - delayed_entity_raw subtype=0x6, x=0xe8, y=0x2f8, layer=1, paramA=0x8, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0xa0, y=0x248, layer=1, paramA=0x1, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0x90, y=0x258, layer=1, paramA=0x4, paramC=script_0800F584, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0xb0, y=0x258, layer=1, paramC=script_0800F584, conditions=0xffff - delayed_entity_raw subtype=0x12, x=0xa0, y=0x1f8, layer=1, paramC=script_08010454, conditions=0xffff - delayed_entity_raw subtype=0x11, x=0xf0, y=0x1f8, layer=1, paramC=script_0800F5EC, conditions=0xffff - delayed_entity_raw subtype=0x14, x=0xf0, y=0x248, layer=1, paramC=script_0800F688, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0xbe, y=0x198, layer=1, paramA=0x7, paramC=script_0800F6E0, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0xd2, y=0x198, layer=1, paramA=0x8, paramC=script_0800F6E0, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x78, y=0x198, layer=1, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x60, y=0x210, layer=1, paramA=0x2, paramC=script_0800F554, paramD=0x2, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x60, y=0x250, layer=1, paramA=0xa, paramC=script_0800F554, paramD=0x2, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x60, y=0x290, layer=1, paramA=0xb, paramC=script_0800F554, paramD=0x2, conditions=0xffff - delayed_entity_raw subtype=0x3a, x=0x118, y=0x19a, layer=1, paramB=0x3, paramC=script_0800F650, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x128, y=0x1f0, layer=1, paramA=0x6, paramC=script_0800F554, paramD=0x6, conditions=0xffff - delayed_entity_raw subtype=0x49, x=0x104, y=0xd0, layer=1, paramA=0x3, paramB=0x8, paramC=script_0800F628, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x49, x=0xf0, y=0xd0, layer=1, paramA=0x1, paramB=0x9, paramC=script_0800F628, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x128, y=0x1c8, layer=1, paramA=0x4, paramC=script_0800F554, paramD=0x6, conditions=0xffff - delayed_entity_raw subtype=0x8, x=0xe8, y=0xa8, layer=1, paramB=0x23, paramC=script_0800F5B0, paramD=0x1, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0x98, y=0xc8, layer=1, paramA=0x6, paramC=script_0800F584, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0xb0, y=0x220, layer=1, paramA=0x5, paramC=script_0800F554, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0xf0, y=0x298, layer=1, paramA=0x7, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x88, y=0x1e0, layer=1, paramA=0xd, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x6, x=0x98, y=0x1e0, layer=1, paramA=0xe, paramC=script_0800F554, paramD=0x4, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0x98, y=0xe8, layer=1, paramA=0x7, paramC=script_0800F724, conditions=0xffff - delayed_entity_raw subtype=0x7, x=0xa8, y=0xe8, layer=1, paramA=0x8, paramC=script_0800F724, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0xe8, y=0x2f8, layer=1, paramA=0x8, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0xa0, y=0x248, layer=1, paramA=0x1, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0x90, y=0x258, layer=1, paramA=0x4, paramC=script_KidIntro1, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0xb0, y=0x258, layer=1, paramC=script_KidIntro1, conditions=0xffff + delayed_entity_raw subtype=0x12, x=0xa0, y=0x1f8, layer=1, paramC=script_Brocco, conditions=0xffff + delayed_entity_raw subtype=0x11, x=0xf0, y=0x1f8, layer=1, paramC=script_BeedleIntro, conditions=0xffff + delayed_entity_raw subtype=0x14, x=0xf0, y=0x248, layer=1, paramC=script_PinaIntro, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0xbe, y=0x198, layer=1, paramA=0x7, paramC=script_KidIntro2, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0xd2, y=0x198, layer=1, paramA=0x8, paramC=script_KidIntro2, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x78, y=0x198, layer=1, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x60, y=0x210, layer=1, paramA=0x2, paramC=script_TownsperonIntro, paramD=0x2, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x60, y=0x250, layer=1, paramA=0xa, paramC=script_TownsperonIntro, paramD=0x2, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x60, y=0x290, layer=1, paramA=0xb, paramC=script_TownsperonIntro, paramD=0x2, conditions=0xffff + delayed_entity_raw subtype=0x3a, x=0x118, y=0x19a, layer=1, paramB=0x3, paramC=script_PercyIntro, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x128, y=0x1f0, layer=1, paramA=0x6, paramC=script_TownsperonIntro, paramD=0x6, conditions=0xffff + delayed_entity_raw subtype=0x49, x=0x104, y=0xd0, layer=1, paramA=0x3, paramB=0x8, paramC=script_WindtribespeopleIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x49, x=0xf0, y=0xd0, layer=1, paramA=0x1, paramB=0x9, paramC=script_WindtribespeopleIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x128, y=0x1c8, layer=1, paramA=0x4, paramC=script_TownsperonIntro, paramD=0x6, conditions=0xffff + delayed_entity_raw subtype=0x8, x=0xe8, y=0xa8, layer=1, paramB=0x23, paramC=script_GuardIntro, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0x98, y=0xc8, layer=1, paramA=0x6, paramC=script_KidIntro1, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0xb0, y=0x220, layer=1, paramA=0x5, paramC=script_TownsperonIntro, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0xf0, y=0x298, layer=1, paramA=0x7, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x88, y=0x1e0, layer=1, paramA=0xd, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x6, x=0x98, y=0x1e0, layer=1, paramA=0xe, paramC=script_TownsperonIntro, paramD=0x4, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0x98, y=0xe8, layer=1, paramA=0x7, paramC=script_KidIntro3, conditions=0xffff + delayed_entity_raw subtype=0x7, x=0xa8, y=0xe8, layer=1, paramA=0x8, paramC=script_KidIntro3, conditions=0xffff entity_list_end gUnk_additional_9_HyruleTown_0:: @ 080EF970 @@ -15787,9 +15787,9 @@ gUnk_additional_b_HyruleTown_0:: @ 080EF9C0 gUnk_additional_c_HyruleTown_0:: @ 080EF9E4 .incbin "data_080D5360/gUnk_additional_c_HyruleTown_0.bin" - .4byte script_0800EF40 + .4byte script_DrLeftDoor .incbin "data_080D5360/gUnk_additional_c_HyruleTown_0_1.bin" - .4byte script_0801090C + .4byte script_FirstHouseDoor .incbin "data_080D5360/gUnk_additional_c_HyruleTown_0_2.bin" gUnk_additional_8_HyruleTown_1:: @ 080EFAA4 @@ -16307,53 +16307,53 @@ Entities_CastleGarden_Main_0:: @ 080F0630 entity_list_end gUnk_080F0650:: @ 080F0650 - npc_raw subtype=0x25, x=0x1e8, y=0x40, script=script_08011128 - npc_raw subtype=0x15, x=0x228, y=0x88, paramB=0x10c, script=script_080119B0 - npc_raw subtype=0x15, x=0x1c8, y=0xc8, paramB=0x10d, script=script_080119B0 - npc_raw subtype=0x15, x=0x1d8, y=0x1e8, paramB=0xe, script=script_080119D8 - npc_raw subtype=0x15, x=0x218, y=0x1e8, paramB=0xf, script=script_080119F0 + npc_raw subtype=0x25, x=0x1e8, y=0x40, script=script_MinisterPothoIntroCastle + npc_raw subtype=0x15, x=0x228, y=0x88, paramB=0x10c, script=script_GuardGarden4 + npc_raw subtype=0x15, x=0x1c8, y=0xc8, paramB=0x10d, script=script_GuardGarden4 + npc_raw subtype=0x15, x=0x1d8, y=0x1e8, paramB=0xe, script=script_GardGarden5 + npc_raw subtype=0x15, x=0x218, y=0x1e8, paramB=0xf, script=script_GuardEntry1 entity_list_end gUnk_080F06B0:: @ 080F06B0 - npc_raw subtype=0x4e, script=script_08010BEC - npc_raw subtype=0x28, x=0x1c8, y=0x88, script=script_080111CC + npc_raw subtype=0x4e, script=script_Npc4EIntroCastle + npc_raw subtype=0x28, x=0x1c8, y=0x88, script=script_ZeldaIntroCastle entity_list_end gUnk_080F06E0:: @ 080F06E0 - npc_raw subtype=0x24, x=0x1f8, y=0x28, script=script_08011640 - npc_raw subtype=0x15, x=0x1e8, y=0x68, paramB=0x10, script=script_080112C4 - npc_raw subtype=0x15, x=0x208, y=0x68, paramA=0x1, paramB=0x11, script=script_080112C4 - npc_raw subtype=0x15, x=0x1e8, y=0x48, paramA=0x2, paramB=0x12, script=script_080112C4 - npc_raw subtype=0x15, x=0x208, y=0x48, paramA=0x3, paramB=0x13, script=script_080112C4 - npc_raw subtype=0x15, x=0x1e8, y=0x1e8, paramA=0x4, paramB=0x14, script=script_080115D0 - npc_raw subtype=0x15, x=0x208, y=0x1e8, paramA=0x5, paramB=0x15, script=script_08011608 - npc_raw subtype=0x27, x=0x1f8, y=0x230, paramA=0x1, script=script_080116A8 + npc_raw subtype=0x24, x=0x1f8, y=0x28, script=script_KingDaltusIntroCeremony + npc_raw subtype=0x15, x=0x1e8, y=0x68, paramB=0x10, script=script_GuardCarryingChest + npc_raw subtype=0x15, x=0x208, y=0x68, paramA=0x1, paramB=0x11, script=script_GuardCarryingChest + npc_raw subtype=0x15, x=0x1e8, y=0x48, paramA=0x2, paramB=0x12, script=script_GuardCarryingChest + npc_raw subtype=0x15, x=0x208, y=0x48, paramA=0x3, paramB=0x13, script=script_GuardCarryingChest + npc_raw subtype=0x15, x=0x1e8, y=0x1e8, paramA=0x4, paramB=0x14, script=script_GuardEntryLeft + npc_raw subtype=0x15, x=0x208, y=0x1e8, paramA=0x5, paramB=0x15, script=script_GuardEntryRight + npc_raw subtype=0x27, x=0x1f8, y=0x230, paramA=0x1, script=script_VaatiIntroCeremony entity_list_end gUnk_080F0770:: @ 080F0770 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x1001, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x2002, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x3003, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x4004, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x5005, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x6006, paramC=script_08011930 - object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x7007, paramC=script_08011930 + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x1001, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x2002, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x3003, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x4004, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x5005, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x6006, paramC=script_Object6AMonsterFromChest + object_raw subtype=0x6a, x=0x1f8, y=0x78, unknown=0x4f, paramA=0xe, paramB=0x7007, paramC=script_Object6AMonsterFromChest entity_list_end gUnk_080F0800:: @ 080F0800 - npc_raw subtype=0x15, x=0x188, y=0xa0, paramB=0x16, script=script_0801194C - npc_raw subtype=0x15, x=0x128, y=0x19b, paramB=0x17, script=script_08011964 - npc_raw subtype=0x15, x=0x268, y=0xa0, paramB=0x18, script=script_08011958 - npc_raw subtype=0x15, x=0x2c8, y=0x19b, paramB=0x19, script=script_08011964 + npc_raw subtype=0x15, x=0x188, y=0xa0, paramB=0x16, script=script_GuardGarden1 + npc_raw subtype=0x15, x=0x128, y=0x19b, paramB=0x17, script=script_GuardGarden3 + npc_raw subtype=0x15, x=0x268, y=0xa0, paramB=0x18, script=script_GuardGarden2 + npc_raw subtype=0x15, x=0x2c8, y=0x19b, paramB=0x19, script=script_GuardGarden3 entity_list_end gUnk_080F0850:: @ 080F0850 - npc_raw subtype=0x15, x=0x188, y=0xa0, paramB=0x1c, script=script_08011A64 + npc_raw subtype=0x15, x=0x188, y=0xa0, paramB=0x1c, script=script_GuardEntry3 entity_list_end gUnk_080F0870:: @ 080F0870 - npc_raw subtype=0x15, x=0x128, y=0x19b, paramB=0x22, script=script_080119E4 + npc_raw subtype=0x15, x=0x128, y=0x19b, paramB=0x22, script=script_GuardGarden6 entity_list_end gUnk_080F0890:: @ 080F0890 @@ -16361,16 +16361,16 @@ gUnk_080F0890:: @ 080F0890 npc_raw subtype=0x15, x=0x98, y=0xc8, unknown=0xf, collision=1, paramA=0x1, paramB=0x1f, script=0x0 npc_raw subtype=0x15, x=0x68, y=0x168, unknown=0xf, collision=1, paramA=0x2, paramB=0x20, script=0x0 npc_raw subtype=0x15, x=0x48, y=0x168, unknown=0xf, collision=1, paramA=0x3, paramB=0x21, script=0x0 - npc_raw subtype=0x4e, script=script_08011AE4 + npc_raw subtype=0x4e, script=script_GuardGarden7 entity_list_end gUnk_080F08F0:: @ 080F08F0 - npc_raw subtype=0x15, x=0x1ec, y=0x38, paramB=0x1a, script=script_08011A2C - npc_raw subtype=0x15, x=0x204, y=0x38, paramB=0x1b, script=script_08011A2C + npc_raw subtype=0x15, x=0x1ec, y=0x38, paramB=0x1a, script=script_GuardEntry2 + npc_raw subtype=0x15, x=0x204, y=0x38, paramB=0x1b, script=script_GuardEntry2 entity_list_end gUnk_080F0920:: @ 080F0920 - npc_raw subtype=0x4e, script=script_08011B20 + npc_raw subtype=0x4e, script=script_GuardGarden8 entity_list_end Entities_CastleGarden_Main_1:: @ 080F0940 @@ -16465,7 +16465,7 @@ Room_CastleGarden_Main:: @ 080F0AE8 .4byte gUnk_additional_f_CastleGarden_Main Entities_SimonsSimulation_Main_0:: @ 080F0B28 - object_raw subtype=0x69, x=0x98, y=0x88, unknown=0x4f, paramC=script_08011BE4 + object_raw subtype=0x69, x=0x98, y=0x88, unknown=0x4f, paramC=script_Object69SimonsSimulation entity_list_end gUnk_080F0B48:: @ 080F0B48 @@ -16616,15 +16616,15 @@ Area_SimonsSimulation_Main:: @ 080F1BEC .4byte gUnk_additional_16_SimonsSimulation_Main Entities_HouseInteriors2_Stranger_0:: @ 080F1C48 - npc_raw subtype=0x49, x=0x88, y=0x48, script=script_0800EAF8 + npc_raw subtype=0x49, x=0x88, y=0x48, script=script_WindTribespeopleVisitor entity_list_end gUnk_080F1C68:: @ 080F1C68 - npc_raw subtype=0x52, x=0x7a, y=0x22, paramB=0x5, script=script_08010B68 + npc_raw subtype=0x52, x=0x7a, y=0x22, paramB=0x5, script=script_SmallTownMinish entity_list_end gUnk_080F1C88:: @ 080F1C88 - npc_raw subtype=0x52, x=0x72, y=0x22, paramB=0x6, script=script_08010B68 + npc_raw subtype=0x52, x=0x72, y=0x22, paramB=0x6, script=script_SmallTownMinish entity_list_end Entities_HouseInteriors2_Stranger_1:: @ 080F1CA8 @@ -16664,15 +16664,15 @@ Entities_HouseInteriors2_WestOracle_0:: @ 080F1D70 entity_list_end gUnk_080F1D90:: @ 080F1D90 - npc_raw subtype=0x17, x=0x78, y=0x68, script=script_08012024 + npc_raw subtype=0x17, x=0x78, y=0x68, script=script_DinMovedIn entity_list_end gUnk_080F1DB0:: @ 080F1DB0 - npc_raw subtype=0x18, x=0x78, y=0x68, script=script_080120B0 + npc_raw subtype=0x18, x=0x78, y=0x68, script=script_NayruMovedIn entity_list_end gUnk_080F1DD0:: @ 080F1DD0 - npc_raw subtype=0x19, x=0x78, y=0x68, script=script_0801213C + npc_raw subtype=0x19, x=0x78, y=0x68, script=script_FaroreMovedIn entity_list_end Entities_HouseInteriors2_WestOracle_1:: @ 080F1DF0 @@ -16798,7 +16798,7 @@ Room_HouseInteriors2_3:: @ 080F2108 .4byte gUnk_additional_a_HouseInteriors2_3 Entities_HouseInteriors2_DrLeft_0:: @ 080F2134 - npc_raw subtype=0x41, x=0x78, y=0x68, script=script_0800EAA4 + npc_raw subtype=0x41, x=0x78, y=0x68, script=script_DrLeft manager subtype=0x26, paramA=0xd, paramB=0x28ff object_raw subtype=0x8d, x=0x48, y=0x48, paramC=0x840000 entity_list_end @@ -16874,16 +16874,16 @@ Entities_HouseInteriors2_Romio_0:: @ 080F232C entity_list_end gUnk_additional_c_HouseInteriors2_Romio:: @ 080F236C - npc_raw subtype=0x6, x=0x78, y=0x48, paramA=0xd, paramB=0x400, script=script_0800EB2C + npc_raw subtype=0x6, x=0x78, y=0x48, paramA=0xd, paramB=0x400, script=script_TownspersonInDogHouse entity_list_end gUnk_080F238C:: @ 080F238C - npc_raw subtype=0x6, x=0xb8, y=0x74, paramA=0xd, paramB=0x400, script=script_0800EB64 - npc_raw subtype=0x6, x=0xa4, y=0x74, paramA=0xe, paramB=0x400, script=script_0800EC14 + npc_raw subtype=0x6, x=0xb8, y=0x74, paramA=0xd, paramB=0x400, script=script_DogPersonInCatHouse + npc_raw subtype=0x6, x=0xa4, y=0x74, paramA=0xe, paramB=0x400, script=script_CatPersonTalkingToDogPerson entity_list_end gUnk_080F23BC:: @ 080F23BC - npc_raw subtype=0x7, x=0x88, y=0x48, paramA=0x4, paramB=0x400, script=script_080103B0 + npc_raw subtype=0x7, x=0x88, y=0x48, paramA=0x4, paramB=0x400, script=script_Kid4 entity_list_end Entities_HouseInteriors2_Romio_1:: @ 080F23DC @@ -16944,12 +16944,12 @@ Entities_HouseInteriors2_Julietta_0:: @ 080F2510 entity_list_end gUnk_080F2570:: @ 080F2570 - npc_raw subtype=0x6, x=0xb0, y=0x6d, paramA=0xe, paramB=0x400, script=script_0800EC54 + npc_raw subtype=0x6, x=0xb0, y=0x6d, paramA=0xe, paramB=0x400, script=script_CatPerson entity_list_end gUnk_080F2590:: @ 080F2590 - npc_raw subtype=0x6, x=0x78, y=0x68, paramA=0x7, paramB=0x400, script=script_0800EBC0 - npc_raw subtype=0x6, x=0x48, y=0x78, paramA=0xe, paramB=0x400, script=script_0800EC54 + npc_raw subtype=0x6, x=0x78, y=0x68, paramA=0x7, paramB=0x400, script=script_OldLadyCatHouse1 + npc_raw subtype=0x6, x=0x48, y=0x78, paramA=0xe, paramB=0x400, script=script_CatPerson entity_list_end gUnk_080F25C0:: @ 080F25C0 @@ -16959,7 +16959,7 @@ gUnk_080F25C0:: @ 080F25C0 entity_list_end gUnk_080F2600:: @ 080F2600 - npc_raw subtype=0x7, x=0x28, y=0x98, paramA=0x3, paramB=0x400, script=script_080103B0 + npc_raw subtype=0x7, x=0x28, y=0x98, paramA=0x3, paramB=0x400, script=script_Kid4 entity_list_end Entities_HouseInteriors2_Julietta_1:: @ 080F2620 @@ -17005,25 +17005,25 @@ Entities_HouseInteriors2_Percy_0:: @ 080F26F8 entity_list_end gUnk_additional_9_HouseInteriors2_Percy:: @ 080F2718 - npc_raw subtype=0x6, x=0x78, y=0x58, paramA=0xc, paramB=0x400, script=script_08012270 + npc_raw subtype=0x6, x=0x78, y=0x58, paramA=0xc, paramB=0x400, script=script_MoblinLadyDisguised manager subtype=0x23, x=0x68, y=0x48, paramA=0x2, paramB=0x4002, paramC=0x80000000 manager subtype=0x23, x=0x88, y=0x48, paramA=0x2, paramB=0x4002, paramC=0x80010000 entity_list_end gUnk_additional_a_HouseInteriors2_Percy:: @ 080F2758 - npc_raw subtype=0x3c, x=0x78, y=0x58, script=script_0801232C + npc_raw subtype=0x3c, x=0x78, y=0x58, script=script_MoblinLady manager subtype=0x23, x=0x68, y=0x48, paramB=0x2, paramC=0x430000 manager subtype=0x23, x=0x88, y=0x48, paramB=0x2, paramC=0x430000 entity_list_end gUnk_080F2798:: @ 080F2798 - npc_raw subtype=0x3a, x=0x78, y=0x58, paramB=0x1, script=script_08012E88 + npc_raw subtype=0x3a, x=0x78, y=0x58, paramB=0x1, script=script_PercyInside manager subtype=0x23, x=0x68, y=0x48, paramB=0x2, paramC=0x430000 manager subtype=0x23, x=0x88, y=0x48, paramB=0x2, paramC=0x430000 entity_list_end gUnk_080F27D8:: @ 080F27D8 - npc_raw subtype=0x3a, x=0x78, y=0x58, paramB=0x4, script=script_08012E88 + npc_raw subtype=0x3a, x=0x78, y=0x58, paramB=0x4, script=script_PercyInside manager subtype=0x23, x=0x68, y=0x48, paramB=0x2, paramC=0x430000 manager subtype=0x23, x=0x88, y=0x48, paramB=0x2, paramC=0x430000 entity_list_end @@ -17064,15 +17064,15 @@ Entities_HouseInteriors2_EastOracle_0:: @ 080F28B4 entity_list_end gUnk_080F28D4:: @ 080F28D4 - npc_raw subtype=0x17, x=0x78, y=0x48, script=script_08012024 + npc_raw subtype=0x17, x=0x78, y=0x48, script=script_DinMovedIn entity_list_end gUnk_080F28F4:: @ 080F28F4 - npc_raw subtype=0x18, x=0x78, y=0x48, script=script_080120B0 + npc_raw subtype=0x18, x=0x78, y=0x48, script=script_NayruMovedIn entity_list_end gUnk_080F2914:: @ 080F2914 - npc_raw subtype=0x19, x=0x78, y=0x48, script=script_0801213C + npc_raw subtype=0x19, x=0x78, y=0x48, script=script_FaroreMovedIn entity_list_end Entities_HouseInteriors2_EastOracle_1:: @ 080F2934 @@ -17181,7 +17181,7 @@ Entities_HouseInteriors2_Cucco_0:: @ 080F2B9C .endif entity_list_end - npc_raw subtype=0x45, x=0x98, y=0x38, script=script_08010120 + npc_raw subtype=0x45, x=0x98, y=0x38, script=script_AnjuInside entity_list_end Entities_HouseInteriors2_Cucco_1:: @ 080F2C7C @@ -17265,12 +17265,12 @@ Entities_HouseInteriors2_LinksHouseSmith_0:: @ 080F2E84 entity_list_end gUnk_080F2E94:: @ 080F2E94 - npc_raw subtype=0x22, x=0x80, y=0x50, script=script_08009B78 - npc_raw subtype=0x28, x=0x60, y=0x50, script=script_08009C68 + npc_raw subtype=0x22, x=0x80, y=0x50, script=script_SmithIntro2 + npc_raw subtype=0x28, x=0x60, y=0x50, script=script_ZeldaTalkToSmith entity_list_end gUnk_080F2EC4:: @ 080F2EC4 - npc_raw subtype=0x22, x=0xb8, y=0x60, script=script_08009DB0 + npc_raw subtype=0x22, x=0xb8, y=0x60, script=script_SmithAtLinksHouse entity_list_end Entities_HouseInteriors2_LinksHouseSmith_1:: @ 080F2EE4 @@ -17306,7 +17306,7 @@ Entities_HouseInteriors2_Dampe_0:: @ 080F2FB4 entity_list_end gUnk_080F2FD4:: @ 080F2FD4 - npc_raw subtype=0x40, x=0x78, y=0x58, script=script_080095CC + npc_raw subtype=0x40, x=0x78, y=0x58, script=script_DampeInside2 entity_list_end Entities_HouseInteriors2_Dampe_1:: @ 080F2FF4 @@ -17336,7 +17336,7 @@ Room_HouseInteriors2_Dampe:: @ 080F307C Entities_HouseInteriors2_Stockwell_0:: @ 080F309C manager subtype=0x26, paramA=0x8, paramB=0xff - npc_raw subtype=0x35, x=0x68, y=0x48, script=script_0800B5C4 + npc_raw subtype=0x35, x=0x68, y=0x48, script=script_ShopwellsDog entity_list_end gUnk_080F30CC:: @ 080F30CC @@ -17378,7 +17378,7 @@ Entities_HouseInteriors2_LinksHouseBedroom_0:: @ 080F3198 entity_list_end gUnk_080F31D8:: @ 080F31D8 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08009DEC + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69LinksHouseBed entity_list_end Entities_HouseInteriors2_LinksHouseBedroom_1:: @ 080F31F8 @@ -17405,12 +17405,12 @@ Entities_HouseInteriors4_Carpenter_0:: @ 080F3250 entity_list_end gUnk_080F3260:: @ 080F3260 - npc_raw subtype=0x29, x=0x78, y=0x70, script=script_08009538 - npc_raw subtype=0x2a, x=0x38, y=0x88, script=script_08009574 - npc_raw subtype=0x2a, x=0x58, y=0x88, paramA=0x1, script=script_08009574 - npc_raw subtype=0x2a, x=0x98, y=0x88, paramA=0x3, script=script_08009574 + npc_raw subtype=0x29, x=0x78, y=0x70, script=script_MutohInMill + npc_raw subtype=0x2a, x=0x38, y=0x88, script=script_CarpenterOutsideTown + npc_raw subtype=0x2a, x=0x58, y=0x88, paramA=0x1, script=script_CarpenterOutsideTown + npc_raw subtype=0x2a, x=0x98, y=0x88, paramA=0x3, script=script_CarpenterOutsideTown entity_list_end - npc_raw subtype=0x2a, x=0x60, y=0x58, paramA=0x2, script=script_08009574 + npc_raw subtype=0x2a, x=0x60, y=0x58, paramA=0x2, script=script_CarpenterOutsideTown entity_list_end Entities_HouseInteriors4_Carpenter_1:: @ 080F32D0 @@ -17453,7 +17453,7 @@ Room_HouseInteriors4_Carpenter:: @ 080F33C8 .4byte gUnk_additional_a_HouseInteriors4_Carpenter Entities_HouseInteriors4_Swiftblade_0:: @ 080F33F4 - npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x1, script=script_080161E8 + npc_raw subtype=0x30, x=0x78, y=0x28, paramA=0x1, script=script_BladeBrothers entity_list_end Entities_HouseInteriors4_Swiftblade_1:: @ 080F3414 @@ -17491,7 +17491,7 @@ Entities_HouseInteriors4_RanchHouseWest_0:: @ 080F35E4 entity_list_end gUnk_080F3604:: @ 080F3604 - npc_raw subtype=0x1e, x=0x68, y=0x58, script=script_08014EF8 + npc_raw subtype=0x1e, x=0x68, y=0x58, script=scriptMalonInside entity_list_end Entities_HouseInteriors4_RanchHouseWest_1:: @ 080F3624 @@ -17541,11 +17541,11 @@ Entities_HouseInteriors4_RanchHouseEast_0:: @ 080F3780 npc_raw subtype=0x31, x=0xb0, y=0x48, unknown=0xf, paramB=0x101, script=0x0 manager subtype=0x26, paramA=0x9, paramB=0xff entity_list_end - npc_raw subtype=0x1d, x=0x48, y=0x38, script=script_08014E50 + npc_raw subtype=0x1d, x=0x48, y=0x38, script=script_TalonInside entity_list_end gUnk_080F37D0:: @ 080F37D0 - npc_raw subtype=0x1d, x=0x48, y=0x38, script=script_08014ECC + npc_raw subtype=0x1d, x=0x48, y=0x38, script=script_TalonInside2 entity_list_end Entities_HouseInteriors4_RanchHouseEast_1:: @ 080F37F0 @@ -17687,12 +17687,12 @@ Entities_LakeHylia_Main_0:: @ 080F3BF4 entity_list_end gUnk_080F3C44:: @ 080F3C44 - npc_raw subtype=0x1b, x=0x148, y=0x108, paramA=0x3, script=script_080168F4 + npc_raw subtype=0x1b, x=0x148, y=0x108, paramA=0x3, script=script_TingleSiblings entity_list_end gUnk_080F3C64:: @ 080F3C64 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800AFB0 - npc_raw subtype=0x42, x=0x128, y=0x180, script=script_08012360 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69AfterToD + npc_raw subtype=0x42, x=0x128, y=0x180, script=script_KingGustafHologram entity_list_end gUnk_080F3C94:: @ 080F3C94 @@ -17826,7 +17826,7 @@ Room_LakeHylia_Beanstalk:: @ 080F41B8 .4byte gUnk_additional_9_LakeHylia_Beanstalk Entities_LakeWoodsCave_Main_0:: @ 080F41E0 - npc_raw subtype=0x4e, x=0x308, y=0x178, paramA=0x9, script=script_0800B964 + npc_raw subtype=0x4e, x=0x308, y=0x178, paramA=0x9, script=script_MysteriousWall manager subtype=0x4 object_raw subtype=0x41, x=0x248, y=0x198, paramA=0x1 entity_list_end @@ -17877,7 +17877,7 @@ Room_HyliaDigCaves_Middle:: @ 080F4300 .4byte sub_StateChange_Ruins_LadderToTektites3 Entities_HyliaDigCaves_North_0:: @ 080F4320 - npc_raw subtype=0x4e, x=0x1c8, y=0xc8, paramA=0xa, script=script_0800B964 + npc_raw subtype=0x4e, x=0x1c8, y=0xc8, paramA=0xa, script=script_MysteriousWall manager subtype=0x4 object_raw subtype=0x41, x=0x248, y=0x78, paramA=0x1 object_raw subtype=0x41, x=0x308, y=0x78, paramA=0x1 @@ -17963,7 +17963,7 @@ Room_HyruleDigCaves_Main:: @ 080F4540 .4byte sub_StateChange_Ruins_LadderToTektites6 Entities_CrenelDigCave_Main_0:: @ 080F4560 - npc_raw subtype=0x4e, x=0x148, y=0x28, paramA=0x8, script=script_0800B964 + npc_raw subtype=0x4e, x=0x148, y=0x28, paramA=0x8, script=script_MysteriousWall manager subtype=0x4 object_raw subtype=0x0, x=0x78, y=0xa4, collision=1, paramA=0x63, paramB=0x400, paramC=0x450000 entity_list_end @@ -17993,7 +17993,7 @@ Room_CrenelDigCave_Main:: @ 080F4638 .4byte sub_StateChange_Ruins_LadderToTektites7 Entities_DigCaves1_HyruleFieldFarm_0:: @ 080F4658 - npc_raw subtype=0x4e, x=0xf8, y=0x38, paramA=0x7, script=script_0800B964 + npc_raw subtype=0x4e, x=0xf8, y=0x38, paramA=0x7, script=script_MysteriousWall manager subtype=0x4 object_raw subtype=0x0, x=0xd8, y=0x78, collision=1, paramA=0x56, paramB=0x400, paramC=0x460000 entity_list_end @@ -18017,7 +18017,7 @@ Room_DigCaves1_HyruleFieldFarm:: @ 080F46D0 .4byte sub_StateChange_Ruins_LadderToTektites8 Entities_DigCaves1_TrilbyHighlands_0:: @ 080F46F0 - npc_raw subtype=0x4e, x=0xe8, y=0x28, paramA=0x6, script=script_0800B964 + npc_raw subtype=0x4e, x=0xe8, y=0x28, paramA=0x6, script=script_MysteriousWall manager subtype=0x4 object_raw subtype=0x41, x=0x88, y=0x58, paramA=0x1 entity_list_end @@ -18251,13 +18251,13 @@ Entities_MinishWoods_Main_0:: @ 080F4D00 entity_list_end gUnk_080F4D50:: @ 080F4D50 - npc_raw subtype=0x4e, script=script_08012480 + npc_raw subtype=0x4e, script=script_Npc4EEzloCutscene entity_list_end gUnk_080F4D70:: @080F4D70 - npc_raw subtype=0x4d, x=0x388, y=0x168, script=script_080126FC - object_raw subtype=0x6a, x=0x358, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_08012BA8 - object_raw subtype=0x6a, x=0x3b8, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_08012BF8 + npc_raw subtype=0x4d, x=0x388, y=0x168, script=script_EzloCap + object_raw subtype=0x6a, x=0x358, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_Object6ALeftBullyingOctorok + object_raw subtype=0x6a, x=0x3b8, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_Object6ARightBullyingOctorok entity_list_end gUnk_080F4DB0:: @ 080F4DB0 @@ -18265,7 +18265,7 @@ gUnk_080F4DB0:: @ 080F4DB0 entity_list_end gUnk_080F4DD0:: @ 080F4DD0 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08012CD8 + object_raw subtype=0x69, unknown=0x4f, paramC=script_EzloTalkMinishPortal entity_list_end gUnk_080F4DF0:: @ 080F4DF0 @@ -18273,7 +18273,7 @@ gUnk_080F4DF0:: @ 080F4DF0 entity_list_end gUnk_080F4E10:: @ 080F4E10 - object_raw subtype=0xbb, x=0x128, y=0x2a8, unknown=0x4f, paramB=0x7, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x128, y=0x2a8, unknown=0x4f, paramB=0x7, paramC=script_Windcrest entity_list_end Entities_MinishWoods_Main_1:: @ 080F4E30 @@ -18287,11 +18287,11 @@ Entities_MinishWoods_Main_1:: @ 080F4E30 entity_list_end gUnk_080F4EB0:: @ 080F4EB0 - npc_raw subtype=0x4e, script=script_0800A910 - object_raw subtype=0x6a, x=0x398, y=0x148, unknown=0x4f, paramA=0x13, paramC=script_0800A964 - object_raw subtype=0x6a, x=0x378, y=0x158, unknown=0x4f, paramA=0x13, paramC=script_0800A988 - object_raw subtype=0x6a, x=0x3a8, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_0800A9AC - object_raw subtype=0x6a, x=0x388, y=0x188, unknown=0x4f, paramA=0x13, paramC=script_0800A9D0 + npc_raw subtype=0x4e, script=script_Npc4EMinishWoods + object_raw subtype=0x6a, x=0x398, y=0x148, unknown=0x4f, paramA=0x13, paramC=script_Object6AOctorok1 + object_raw subtype=0x6a, x=0x378, y=0x158, unknown=0x4f, paramA=0x13, paramC=script_Object6AOctorok2 + object_raw subtype=0x6a, x=0x3a8, y=0x168, unknown=0x4f, paramA=0x13, paramC=script_Object6AOctorok3 + object_raw subtype=0x6a, x=0x388, y=0x188, unknown=0x4f, paramA=0x13, paramC=script_Object6AOctorok4 entity_list_end gUnk_080F4F10:: @ 080F4F10 @@ -18434,7 +18434,7 @@ Entities_SanctuaryEntrance_Main_0:: @ 080F52F8 entity_list_end gUnk_080F5308:: @ 080F5308 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08012D70 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69SanctuaryEntrance entity_list_end gUnk_080F5328:: @ 080F5328 @@ -18442,9 +18442,9 @@ gUnk_080F5328:: @ 080F5328 entity_list_end gUnk_080F5348:: @ 080F5348 - npc_raw subtype=0x4e, script=script_0800AB08 - npc_raw subtype=0xf, x=0x88, y=0x68, script=script_0800AD74 - npc_raw subtype=0x28, x=0x68, y=0x88, script=script_0800AEA4 + npc_raw subtype=0x4e, script=script_Npc4EFixedEverything + npc_raw subtype=0xf, x=0x88, y=0x68, script=script_MinishEzloGoodbye + npc_raw subtype=0x28, x=0x68, y=0x88, script=script_ZeldaGoodbye object_raw subtype=0x3e, x=0x88, y=0x40, collision=1, paramA=0x1 entity_list_end @@ -18491,10 +18491,10 @@ Room_Sanctuary_Hall:: @ 080F5428 .4byte sub_StateChange_Sanctuary_Hall Entities_Sanctuary_Main_0:: @ 080F5448 - object_raw subtype=0x6a, x=0xe8, y=0x90, unknown=0x4f, paramA=0x17, paramC=script_08013BE8 + object_raw subtype=0x6a, x=0xe8, y=0x90, unknown=0x4f, paramA=0x17, paramC=script_Object6ATextBoard npc_raw subtype=0x4e, script=script_08013F94 - npc_raw subtype=0x4e, script=script_08013FE8 - npc_raw subtype=0x4e, script=script_08013B18 + npc_raw subtype=0x4e, script=script_NPC4EPreventPlayerLeave + npc_raw subtype=0x4e, script=script_Npc4EPreventPlayerLeaving object_raw subtype=0xb0, x=0xe8, y=0x248, paramC=0x80008000 object_raw subtype=0x3, x=0xc8, y=0x228, paramA=0x1, paramC=0x80010000 object_raw subtype=0x3, x=0x108, y=0x228, paramA=0x1, paramC=0x80020000 @@ -18505,32 +18505,32 @@ Entities_Sanctuary_Main_0:: @ 080F5448 entity_list_end gUnk_080F54E8:: @ 080F54E8 - npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_08013CA4 + npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_Npc4ESanctuaryIntro entity_list_end gUnk_080F5508:: @ 080F5508 - npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_080134DC + npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_Npc4EPedestal entity_list_end gUnk_080F5528:: @ 080F5528 - object_raw subtype=0x6a, x=0xb0, y=0xf8, unknown=0x4f, paramA=0x1c, paramC=script_08013E94 - object_raw subtype=0x6a, x=0x120, y=0xf8, unknown=0x4f, paramA=0x1c, paramC=script_08013EB0 + object_raw subtype=0x6a, x=0xb0, y=0xf8, unknown=0x4f, paramA=0x1c, paramC=script_Object6AEarthElement + object_raw subtype=0x6a, x=0x120, y=0xf8, unknown=0x4f, paramA=0x1c, paramC=script_Object6AFireElement entity_list_end gUnk_080F5558:: @ 080F5558 - npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_08013720 + npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_Npc4ESecondSanctuary entity_list_end gUnk_080F5578:: @ 080F5578 - object_raw subtype=0x6a, x=0x120, y=0x168, unknown=0x4f, paramA=0x1c, paramC=script_08013ECC + object_raw subtype=0x6a, x=0x120, y=0x168, unknown=0x4f, paramA=0x1c, paramC=script_Object6AWaterElement entity_list_end gUnk_080F5598:: @ 080F5598 - npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_080138B4 + npc_raw subtype=0x4e, x=0xe8, y=0x138, script=script_Npc4EThirdSanctuary entity_list_end gUnk_080F55B8:: @ 080F55B8 - object_raw subtype=0x6a, x=0xb0, y=0x168, unknown=0x4f, paramA=0x1c, paramC=script_08013EE8 + object_raw subtype=0x6a, x=0xb0, y=0x168, unknown=0x4f, paramA=0x1c, paramC=script_Object6AWindElement entity_list_end gUnk_080F55D8:: @ 080F55D8 @@ -18555,18 +18555,18 @@ Room_Sanctuary_Main:: @ 080F5610 Entities_Sanctuary_StainedGlass_0:: @ 080F5630 .ifndef EU - npc_raw subtype=0x4e, x=0x98, y=0x38, script=script_08014274 + npc_raw subtype=0x4e, x=0x98, y=0x38, script=script_Npc4ELookAtPictureAgain manager subtype=0xf, paramA=0xe .endif entity_list_end gUnk_080F5660:: @ 080F5660 - object_raw subtype=0x69, unknown=0x4f, paramC=script_080131AC + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object3EPictureBackRoom entity_list_end gUnk_080F5680:: @ 080F5680 - npc_raw subtype=0x24, x=0x98, y=0x48, script=script_080133C4 - npc_raw subtype=0x27, x=0x98, y=0xc8, paramA=0x1, script=script_080133F8 + npc_raw subtype=0x24, x=0x98, y=0x48, script=script_FakeKingDaltus + npc_raw subtype=0x27, x=0x98, y=0xc8, paramA=0x1, script=script_VaatiSanctuary entity_list_end Entities_Sanctuary_StainedGlass_1:: @ 080F56B0 @@ -18668,12 +18668,12 @@ Room_HouseInteriors3_StockwellShop:: @ 080F5934 .4byte gUnk_additional_8_HouseInteriors3_StockwellShop Entities_HouseInteriors3_Cafe_0:: @ 080F5958 - npc_raw subtype=0x46, x=0x64, y=0x78, script=script_0800E920 - npc_raw subtype=0x13, x=0x55, y=0xa8, paramA=0x2, script=script_0800ED04 - npc_raw subtype=0x13, x=0xc6, y=0x6a, paramA=0x4, paramB=0x1, script=script_0800ED04 - npc_raw subtype=0x6, x=0x98, y=0x98, paramA=0x3, paramB=0x400, script=script_080100FC - npc_raw subtype=0x6, x=0x40, y=0x50, paramA=0x5, paramB=0x400, script=script_0800EC8C - npc_raw subtype=0x53, x=0x28, y=0x78, script=script_08010BB4 + npc_raw subtype=0x46, x=0x64, y=0x78, script=script_Mama + npc_raw subtype=0x13, x=0x55, y=0xa8, paramA=0x2, script=script_SittingPerson + npc_raw subtype=0x13, x=0xc6, y=0x6a, paramA=0x4, paramB=0x1, script=script_SittingPerson + npc_raw subtype=0x6, x=0x98, y=0x98, paramA=0x3, paramB=0x400, script=script_Townsperson2 + npc_raw subtype=0x6, x=0x40, y=0x50, paramA=0x5, paramB=0x400, script=script_CafeGuy + npc_raw subtype=0x53, x=0x28, y=0x78, script=script_HurdyGurdyMan manager subtype=0x26, paramA=0xb, paramB=0x28ff ezlo_hint type=0x2, x=0x16, y=0x14, rx=0x2, ry=0x2, msg=0xb24, flag=0xc3 entity_list_end @@ -18773,11 +18773,11 @@ Room_HouseInteriors3_RemShoeShop:: @ 080F5BE8 .endif Entities_HouseInteriors3_Bakery_0:: @ 080F5C10 - npc_raw subtype=0xd, x=0xa8, y=0x5c, script=script_08010674 - npc_raw subtype=0xe, x=0x30, y=0x56, script=script_080106AC + npc_raw subtype=0xd, x=0xa8, y=0x5c, script=script_Wheaton + npc_raw subtype=0xe, x=0x30, y=0x56, script=script_Pita ezlo_hint x=0x4, y=0xe, rx=0x7, ry=0x1, msg=0xb56, flag=0xcb entity_list_end - npc_raw subtype=0x6, x=0x68, y=0x90, paramA=0x7, paramB=0x400, script=script_0800EBDC + npc_raw subtype=0x6, x=0x68, y=0x90, paramA=0x7, paramB=0x400, script=script_OldLadyCatHouse2 entity_list_end Entities_HouseInteriors3_Bakery_1:: @ 080F5C70 @@ -18823,11 +18823,11 @@ Room_HouseInteriors3_Bakery:: @ 080F5D84 .4byte gUnk_additional_a_HouseInteriors3_Bakery Entities_HouseInteriors3_Simon_0:: @ 080F5DB0 - npc_raw subtype=0x44, x=0xb0, y=0x40, script=script_08011B40 + npc_raw subtype=0x44, x=0xb0, y=0x40, script=script_Simon entity_list_end gUnk_080F5DD0:: @ 080F5DD0 - npc_raw subtype=0x7, x=0x88, y=0x48, paramA=0x5, paramB=0x400, script=script_080103B0 + npc_raw subtype=0x7, x=0x88, y=0x48, paramA=0x5, paramB=0x400, script=script_Kid4 entity_list_end Entities_HouseInteriors3_Simon_1:: @ 080F5DF0 @@ -18861,7 +18861,7 @@ gUnk_080F5E68:: @ 080F5E68 Entities_HouseInteriors3_FigurineHouse_1:: @ 080F5E88 object_raw subtype=0x4f, x=0x8, y=0x58, paramA=0x2, paramB=0x3 object_raw subtype=0x4f, x=0xe8, y=0x58, paramA=0x2, paramB=0x1 - npc_raw subtype=0x57, x=0x78, y=0x20, script=script_0800BA3C + npc_raw subtype=0x57, x=0x78, y=0x20, script=script_Phonograph entity_list_end Enemies_HouseInteriors3_FigurineHouse:: @ 080F5EC8 @@ -18884,19 +18884,19 @@ Room_HouseInteriors3_FigurineHouse:: @ 080F5EF8 .4byte sub_StateChange_HouseInteriors3_FigurineHouse Entities_HouseInteriors3_BorlovEntrance_0:: @ 080F5F18 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08014548 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object6APreventPlayerLeaveCarlov entity_list_end gUnk_additional_8_HouseInteriors3_BorlovEntrance:: @ 080F5F38 - npc_raw subtype=0x6, x=0x38, y=0x78, paramA=0x8, paramB=0x400, script=script_080100C8 + npc_raw subtype=0x6, x=0x38, y=0x78, paramA=0x8, paramB=0x400, script=script_Townsperson1 entity_list_end gUnk_additional_9_HouseInteriors3_BorlovEntrance:: @ 080F5F58 - npc_raw subtype=0x3f, x=0x78, y=0x48, paramA=0x1, script=script_08014450 + npc_raw subtype=0x3f, x=0x78, y=0x48, paramA=0x1, script=script_Carlov entity_list_end gUnk_additional_a_HouseInteriors3_BorlovEntrance:: @ 080F5F78 - npc_raw subtype=0x3f, x=0x78, y=0x48, paramA=0x1, script=script_0801450C + npc_raw subtype=0x3f, x=0x78, y=0x48, paramA=0x1, script=script_CarlovWon entity_list_end Entities_HouseInteriors3_BorlovEntrance_1:: @ 080F5F98 @@ -18925,9 +18925,9 @@ Room_HouseInteriors3_BorlovEntrance:: @ 080F5FF0 .4byte gUnk_additional_a_HouseInteriors3_BorlovEntrance Entities_HouseInteriors3_Carlov_0:: @ 080F601C - npc_raw subtype=0x3f, x=0x78, y=0x39, script=script_08014628 - object_raw subtype=0x69, unknown=0x4f, paramC=script_080145B0 - object_raw subtype=0x69, unknown=0x4f, paramC=script_080145E8 + npc_raw subtype=0x3f, x=0x78, y=0x39, script=script_Carlov2 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object6ACarlov + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object6ACarlov2 object_raw subtype=0x54, x=0xa8, y=0x3e, paramA=0x1, paramB=0x80000, paramC=0x80000000 entity_list_end @@ -18954,8 +18954,8 @@ Room_HouseInteriors3_Carlov:: @ 080F60C4 .4byte sub_StateChange_HouseInteriors3_Carlov Entities_HouseInteriors3_Borlov_0:: @ 080F60E4 - npc_raw subtype=0x3f, x=0xb8, y=0x38, paramA=0x1, script=script_08014804 - npc_raw subtype=0x51, script=script_080148F0 + npc_raw subtype=0x3f, x=0xb8, y=0x38, paramA=0x1, script=script_CarlovGame + npc_raw subtype=0x51, script=script_CarlovChest entity_list_end Entities_HouseInteriors3_Borlov_1:: @ 080F6114 @@ -18980,8 +18980,8 @@ Room_HouseInteriors3_Borlov:: @ 080F615C .4byte sub_StateChange_HouseInteriors3_Borlov Entities_WindTribeTower_Entrance_0:: @ 080F617C - npc_raw subtype=0x49, x=0xa8, y=0x58, paramB=0x401, script=script_08014958 - npc_raw subtype=0x49, x=0x48, y=0x48, paramA=0x1, paramB=0x402, script=script_08014994 + npc_raw subtype=0x49, x=0xa8, y=0x58, paramB=0x401, script=script_WindTribespeople1 + npc_raw subtype=0x49, x=0x48, y=0x48, paramA=0x1, paramB=0x402, script=script_WindTribespeople2 object_raw subtype=0x8d, x=0xb8, y=0x28, paramC=0xad0000 entity_list_end @@ -19018,19 +19018,19 @@ Room_WindTribeTower_Entrance:: @ 080F6284 .4byte sub_StateChange_WindTribeTower_Entrance Entities_WindTribeTower_Floor2_0:: @ 080F62A4 - npc_raw subtype=0x49, x=0x68, y=0x58, paramA=0x2, paramB=0x403, script=script_08014A54 + npc_raw subtype=0x49, x=0x68, y=0x58, paramA=0x2, paramB=0x403, script=script_WindTribespeople5 object_raw subtype=0x5, x=0x98, y=0x128 object_raw subtype=0x5, x=0x88, y=0x128 entity_list_end gUnk_080F62E4:: @ 080F62E4 object_raw subtype=0x18, x=0xa0, y=0x28 - npc_raw subtype=0x4a, x=0xa0, y=0x38, script=script_08014B34 - npc_raw subtype=0x49, x=0x88, y=0xfc, paramA=0x5, paramB=0x406, script=script_08014A28 + npc_raw subtype=0x4a, x=0xa0, y=0x38, script=script_GregalSick + npc_raw subtype=0x49, x=0x88, y=0xfc, paramA=0x5, paramB=0x406, script=script_WindTribespeople4 entity_list_end gUnk_080F6324:: @ 080F6324 - npc_raw subtype=0x4a, x=0xa0, y=0x58, paramA=0x3, script=script_08014C2C + npc_raw subtype=0x4a, x=0xa0, y=0x58, paramA=0x3, script=script_GregalHealthy entity_list_end Entities_WindTribeTower_Floor2_1:: @ 080F6344 @@ -19059,7 +19059,7 @@ Room_WindTribeTower_Floor2:: @ 080F63C4 .4byte sub_StateChange_WindTribeTower_Floor2 Entities_WindTribeTower_Floor3_0:: @ 080F63E4 - npc_raw subtype=0x49, x=0x68, y=0xf8, paramA=0x5, paramB=0x406, script=script_08014A28 + npc_raw subtype=0x49, x=0x68, y=0xf8, paramA=0x5, paramB=0x406, script=script_WindTribespeople4 object_raw subtype=0x5, x=0x68, y=0x128 object_raw subtype=0x5, x=0x78, y=0x128 object_raw subtype=0x5, x=0x88, y=0x128 @@ -19095,7 +19095,7 @@ Room_WindTribeTower_Floor3:: @ 080F64E4 .4byte sub_StateChange_WindTribeTower_Floor3 Entities_WindTribeTower_Floor4_0:: @ 080F6504 - npc_raw subtype=0x49, x=0x78, y=0x28, paramA=0x4, paramB=0x405, script=script_08014AC4 + npc_raw subtype=0x49, x=0x78, y=0x28, paramA=0x4, paramB=0x405, script=script_Siroc object_raw subtype=0x5, x=0x28, y=0x118 object_raw subtype=0x5, x=0x28, y=0x128 object_raw subtype=0x5, x=0xc8, y=0x118 @@ -19103,11 +19103,11 @@ Entities_WindTribeTower_Floor4_0:: @ 080F6504 entity_list_end gUnk_080F6564:: @ 080F6564 - npc_raw subtype=0x49, x=0x88, y=0xf8, paramA=0x3, paramB=0x404, script=script_080149CC + npc_raw subtype=0x49, x=0x88, y=0xf8, paramA=0x3, paramB=0x404, script=script_WindTribespeople3 entity_list_end gUnk_080F6584:: @ 080F6584 - npc_raw subtype=0x49, x=0x68, y=0xf8, paramA=0x3, paramB=0x404, script=script_080149CC + npc_raw subtype=0x49, x=0x68, y=0xf8, paramA=0x3, paramB=0x404, script=script_WindTribespeople3 entity_list_end Entities_WindTribeTower_Floor4_1:: @ 080F65A4 @@ -19145,7 +19145,7 @@ Entities_WindTribeTowerRoof_Main_0:: @ 080F664C entity_list_end gUnk_080F66AC:: @ 080F66AC - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800AFE8 + object_raw subtype=0x69, unknown=0x4f, paramC=script_EzloTalkPoW entity_list_end Entities_WindTribeTowerRoof_Main_1:: @ 080F66CC @@ -19536,16 +19536,16 @@ Entities_HyruleField_LinksHouseExterior_0:: @ 080F7018 entity_list_end gUnk_080F7088:: @ 080F7088 - npc_raw subtype=0x1b, x=0x3b8, y=0x118, script=script_080168F4 + npc_raw subtype=0x1b, x=0x3b8, y=0x118, script=script_TingleSiblings entity_list_end gUnk_080F70A8:: @ 080F70A8 - npc_raw subtype=0x28, x=0x1e8, y=0x180, script=script_08014CDC - npc_raw subtype=0x4e, x=0x238, y=0x1a8, script=script_08014DCC + npc_raw subtype=0x28, x=0x1e8, y=0x180, script=script_ZeldaOutsideLinksHouse + npc_raw subtype=0x4e, x=0x238, y=0x1a8, script=script_Npc4EOutsideLinksHouse entity_list_end gUnk_080F70D8:: @ 080F70D8 - object_raw subtype=0xbb, x=0x2c8, y=0x128, unknown=0x4f, paramB=0x6, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x2c8, y=0x128, unknown=0x4f, paramB=0x6, paramC=script_Windcrest entity_list_end Entities_HyruleField_LinksHouseExterior_1:: @ 080F70F8 @@ -19723,8 +19723,8 @@ gUnk_080F7500:: @ 080F7500 entity_list_end gUnk_additional_8_HyruleField_Farmers:: @ 080F7520 - delayed_entity_raw subtype=0x3e, x=0xb8, y=0xe8, layer=1, paramC=script_0800B0D0, conditions=0xffff - delayed_entity_raw subtype=0x3e, x=0x68, y=0x128, layer=1, paramA=0x1, paramC=script_0800B0D0, paramD=0x1, conditions=0xffff + delayed_entity_raw subtype=0x3e, x=0xb8, y=0xe8, layer=1, paramC=script_Farmer, conditions=0xffff + delayed_entity_raw subtype=0x3e, x=0x68, y=0x128, layer=1, paramA=0x1, paramC=script_Farmer, paramD=0x1, conditions=0xffff entity_list_end gUnk_080F7550:: @ 080F7550 @@ -19732,11 +19732,11 @@ gUnk_080F7550:: @ 080F7550 entity_list_end gUnk_additional_9_HyruleField_Farmers:: @ 080F7570 - delayed_entity_raw subtype=0x29, x=0x148, y=0xf0, layer=1, paramC=script_080094FC, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x128, y=0xd0, layer=1, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x1a8, y=0x100, layer=1, paramA=0x1, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x138, y=0x98, layer=1, paramA=0x2, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x148, y=0x88, layer=1, paramA=0x3, paramC=script_08009574, conditions=0xffff + delayed_entity_raw subtype=0x29, x=0x148, y=0xf0, layer=1, paramC=script_MutohOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x128, y=0xd0, layer=1, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x1a8, y=0x100, layer=1, paramA=0x1, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x138, y=0x98, layer=1, paramA=0x2, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x148, y=0x88, layer=1, paramA=0x3, paramC=script_CarpenterOutsideTown, conditions=0xffff entity_list_end Entities_HyruleField_Farmers_1:: @ 080F75D0 @@ -19806,12 +19806,12 @@ gUnk_additional_b_HyruleField_LonLonRanch:: @ 080F7770 entity_list_end gUnk_080F77C0:: @ 080F77C0 - npc_raw subtype=0x1d, x=0x130, y=0x290, script=script_0800B3A4 - npc_raw subtype=0x1e, x=0x120, y=0x270, script=script_0800B4AC + npc_raw subtype=0x1d, x=0x130, y=0x290, script=script_TalonLostKey + npc_raw subtype=0x1e, x=0x120, y=0x270, script=script_MalonLostKey entity_list_end gUnk_080F77F0:: @ 080F77F0 - npc_raw subtype=0x1e, x=0x13e, y=0x280, script=script_0800B5EC + npc_raw subtype=0x1e, x=0x13e, y=0x280, script=script_MalonAtRanch entity_list_end gUnk_080F7810:: @ 080F7810 @@ -19819,8 +19819,8 @@ gUnk_080F7810:: @ 080F7810 entity_list_end gUnk_additional_c_HyruleField_LonLonRanch:: @ 080F7830 - delayed_entity_raw subtype=0x8, x=0xc8, y=0x228, layer=1, paramB=0x8, paramC=script_08014E14, conditions=0xffff - delayed_entity_raw subtype=0x8, x=0x38, y=0x218, layer=1, paramB=0x9, paramC=script_08014E14, conditions=0xffff + delayed_entity_raw subtype=0x8, x=0xc8, y=0x228, layer=1, paramB=0x8, paramC=script_GuardNorthHyruleField, conditions=0xffff + delayed_entity_raw subtype=0x8, x=0x38, y=0x218, layer=1, paramB=0x9, paramC=script_GuardNorthHyruleField, conditions=0xffff entity_list_end gUnk_080F7860:: @ 080F7860 @@ -19828,7 +19828,7 @@ gUnk_080F7860:: @ 080F7860 entity_list_end gUnk_additional_d_HyruleField_LonLonRanch:: @ 080F7880 - delayed_entity_raw subtype=0x32, x=0x88, y=0x368, layer=1, paramC=script_0800B9B4, conditions=0xffff + delayed_entity_raw subtype=0x32, x=0x88, y=0x368, layer=1, paramC=script_GoronPunching, conditions=0xffff entity_list_end gUnk_080F78A0:: @ 080F78A0 @@ -19840,7 +19840,7 @@ gUnk_080F78A0:: @ 080F78A0 entity_list_end gUnk_additional_12_HyruleField_LonLonRanch:: @ 080F78C0 - delayed_entity_raw subtype=0x1b, x=0xb8, y=0x108, layer=1, paramA=0x1, paramC=script_080168F4, conditions=0xfff0 + delayed_entity_raw subtype=0x1b, x=0xb8, y=0x108, layer=1, paramA=0x1, paramC=script_TingleSiblings, conditions=0xfff0 entity_list_end Entities_HyruleField_LonLonRanch_1:: @ 080F78E0 @@ -19883,7 +19883,7 @@ gUnk_additional_e_HyruleField_LonLonRanch:: @ 080F79D0 gUnk_additional_11_HyruleField_LonLonRanch:: @ 080F7A20 .incbin "data_080D5360/gUnk_additional_11_HyruleField_LonLonRanch.bin" - .4byte script_0800B574 + .4byte script_LonLonRanchDoor .incbin "data_080D5360/gUnk_additional_11_HyruleField_LonLonRanch_1.bin" Enemies_HyruleField_LonLonRanch:: @ 080F7A44 @@ -19978,12 +19978,12 @@ Entities_HyruleField_OutsideCastle_1:: @ 080F7C00 entity_list_end gUnk_080F7C80:: @ 080F7C80 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08014FBC - npc_raw subtype=0x27, x=0x1f8, y=0x108, paramA=0x1, script=script_08015234 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69VaatiAppears + npc_raw subtype=0x27, x=0x1f8, y=0x108, paramA=0x1, script=script_VaatiAppearsAgain entity_list_end gUnk_080F7CB0:: @ 080F7CB0 - npc_raw subtype=0x4d, x=0x1e8, y=0x148, script=script_08015390 + npc_raw subtype=0x4d, x=0x1e8, y=0x148, script=script_EzloCapExplainingOriginStory entity_list_end gUnk_080F7CD0:: @ 080F7CD0 @@ -19991,19 +19991,19 @@ gUnk_080F7CD0:: @ 080F7CD0 entity_list_end gUnk_additional_e_HyruleField_OutsideCastle:: @ 080F7CF0 - delayed_entity_raw subtype=0x29, x=0x208, y=0x2c8, layer=1, paramC=script_080094FC, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x1c8, y=0x2f0, layer=1, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x258, y=0x2b0, layer=1, paramA=0x1, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x228, y=0x2b8, layer=1, paramA=0x2, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x2a, x=0x208, y=0x2f8, layer=1, paramA=0x3, paramC=script_08009574, conditions=0xffff - delayed_entity_raw subtype=0x8, x=0x278, y=0x2c8, layer=1, paramB=0xa, paramC=script_08014E14, conditions=0xffff - delayed_entity_raw subtype=0x8, x=0x198, y=0x2b8, layer=1, paramB=0xb, paramC=script_08014E14, conditions=0xffff + delayed_entity_raw subtype=0x29, x=0x208, y=0x2c8, layer=1, paramC=script_MutohOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x1c8, y=0x2f0, layer=1, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x258, y=0x2b0, layer=1, paramA=0x1, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x228, y=0x2b8, layer=1, paramA=0x2, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x2a, x=0x208, y=0x2f8, layer=1, paramA=0x3, paramC=script_CarpenterOutsideTown, conditions=0xffff + delayed_entity_raw subtype=0x8, x=0x278, y=0x2c8, layer=1, paramB=0xa, paramC=script_GuardNorthHyruleField, conditions=0xffff + delayed_entity_raw subtype=0x8, x=0x198, y=0x2b8, layer=1, paramB=0xb, paramC=script_GuardNorthHyruleField, conditions=0xffff entity_list_end gUnk_080F7D70:: @ 080F7D70 object_raw subtype=0x69, unknown=0x4f, paramC=script_080157AC object_raw subtype=0x69, unknown=0x4f, paramC=script_08015B34 - npc_raw subtype=0x28, x=0x1e8, y=0x168, script=script_08015958 + npc_raw subtype=0x28, x=0x1e8, y=0x168, script=script_ZeldaIntroBusinessScrub enemy_raw subtype=0x5b, x=0x248, y=0x1eb entity_list_end @@ -20012,7 +20012,7 @@ gUnk_080F7DC0:: @ 080F7DC0 entity_list_end gUnk_additional_d_HyruleField_OutsideCastle:: @ 080F7DE0 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08015BA8 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69FixBridge manager subtype=0x5, x=0x9, y=0x25, paramB=0x89, paramC=0x80650001 manager subtype=0x5, x=0x9, y=0x26, paramB=0x89, paramC=0x80650001 entity_list_end @@ -20105,7 +20105,7 @@ Entities_HyruleField_OutsideCastle_0West:: @ 080F805C entity_list_end gUnk_080F806C:: @ 080F806C - npc_raw subtype=0x1b, x=0xb8, y=0x78, paramA=0x2, script=script_080168F4 + npc_raw subtype=0x1b, x=0xb8, y=0x78, paramA=0x2, script=script_TingleSiblings entity_list_end Entities_HyruleField_OutsideCastle_1West:: @ 080F808C @@ -20202,7 +20202,7 @@ Entities_HyruleField_TrilbyHighlands_0:: @ 080F8210 .endif gUnk_080F82E0:: @ 080F82E0 - object_raw subtype=0x69, unknown=0x4f, paramC=script_08015BE8 + object_raw subtype=0x69, unknown=0x4f, paramC=script_Object69Takeover entity_list_end Entities_HyruleField_TrilbyHighlands_1:: @ 080F8300 @@ -20250,7 +20250,7 @@ Entities_HyruleField_PercysHouse_0:: @ 080F8420 entity_list_end gUnk_080F8430:: @ 080F8430 - npc_raw subtype=0x3a, x=0x68, y=0x58, paramB=0x2, script=script_08012EC0 + npc_raw subtype=0x3a, x=0x68, y=0x58, paramB=0x2, script=script_PercyOutside entity_list_end Entities_HyruleField_PercysHouse_1:: @ 080F8450 @@ -20943,11 +20943,11 @@ Entities_VeilFalls_Main_0:: @ 080F9264 .endif gUnk_080F9304:: @ 080F9304 - object_raw subtype=0xbb, x=0xf8, y=0xf8, unknown=0x4f, paramB=0x1, paramC=script_0800B00C + object_raw subtype=0xbb, x=0xf8, y=0xf8, unknown=0x4f, paramB=0x1, paramC=script_Windcrest entity_list_end Entities_VeilFalls_Main_1:: @ 080F9324 - npc_raw subtype=0x4e, x=0x38, y=0x1fd, paramA=0xb, script=script_08015FC0 + npc_raw subtype=0x4e, x=0x38, y=0x1fd, paramA=0xb, script=script_NPC4ESourceOfTheFlow manager subtype=0x6, paramA=0x8 entity_list_end @@ -21256,10 +21256,10 @@ Room_VeilFallsCaves_HeartPiece:: @ 080F9B58 Entities_VeilFallsTop_Main_0:: @ 080F9B78 object_raw subtype=0x82, x=0x58, y=0x38, paramB=0x1 - npc_raw subtype=0x4c, x=0x140, y=0x68, script=script_08009318 - npc_raw subtype=0x4c, x=0xd0, y=0x68, paramA=0x5, script=script_08009340 - npc_raw subtype=0x4c, x=0x1b0, y=0x68, paramA=0xa, script=script_08009340 - npc_raw subtype=0x4c, y=0x78, paramA=0x4, script=script_08009348 + npc_raw subtype=0x4c, x=0x140, y=0x68, script=script_BigGoron1 + npc_raw subtype=0x4c, x=0xd0, y=0x68, paramA=0x5, script=script_BigGoron2 + npc_raw subtype=0x4c, x=0x1b0, y=0x68, paramA=0xa, script=script_BigGoron2 + npc_raw subtype=0x4c, y=0x78, paramA=0x4, script=script_BigGoron3 npc_raw subtype=0x4c, x=0x108, y=0x88, unknown=0xf, paramA=0x1, script=0x0 npc_raw subtype=0x4c, x=0x108, y=0x88, unknown=0xf, paramA=0x2, script=0x0 entity_list_end @@ -21268,21 +21268,21 @@ gUnk_080F9BF8:: @ 080F9BF8 .ifdef EU_JP ezlo_hint x=0xe, y=0x6, rx=0x2, ry=0x2, msg=0xb20, flag=0xaa object_raw subtype=0x82, x=0x58, y=0x38, paramB=0x1 - npc_raw subtype=0x4c, x=0x140, y=0xf8, script=script_08009320 + npc_raw subtype=0x4c, x=0x140, y=0xf8, script=script_BigGoronHiding entity_list_end .else ezlo_hint x=0xe, y=0x6, rx=0x2, ry=0x2, msg=0xb20, flag=0xac object_raw subtype=0x82, x=0x58, y=0x38, paramB=0x1 - npc_raw subtype=0x4c, x=0x140, y=0xf8, script=script_08009320 + npc_raw subtype=0x4c, x=0x140, y=0xf8, script=script_BigGoronHiding entity_list_end .endif gUnk_080F9C38:: @ 080F9C38 - object_raw subtype=0x6a, x=0x108, y=0x88, unknown=0x4f, paramA=0x29, paramC=script_080094A4 + object_raw subtype=0x6a, x=0x108, y=0x88, unknown=0x4f, paramA=0x29, paramC=script_Object6AVeilFallsTop entity_list_end gUnk_080F9C58:: @ 080F9C58 - object_raw subtype=0x6a, x=0x118, y=0x88, unknown=0x4f, paramA=0x2a, paramC=script_080094CC + object_raw subtype=0x6a, x=0x118, y=0x88, unknown=0x4f, paramA=0x2a, paramC=script_Object6AMirrorShield entity_list_end Entities_VeilFallsTop_Main_1:: @ 080F9C78 @@ -21416,8 +21416,8 @@ Room_47_4:: @ 080F9F08 .4byte sub_StateChange_47_4 Entities_TreeInteriors_WitchHut_0:: @ 080F9F28 - npc_raw subtype=0x36, x=0x78, y=0x30, script=script_080160A8 - object_raw subtype=0x69, x=0x58, y=0x48, unknown=0x4f, paramC=script_0801613C + npc_raw subtype=0x36, x=0x78, y=0x30, script=script_Syrup + object_raw subtype=0x69, x=0x58, y=0x48, unknown=0x4f, paramC=script_Object69PotionBlue entity_list_end Entities_TreeInteriors_WitchHut_1:: @ 080F9F58 @@ -21431,7 +21431,7 @@ gUnk_080F9F88:: @ 080F9F88 gUnk_080F9FA8:: @ 080F9FA8 object_raw subtype=0x4d, x=0x98, y=0x48, collision=1, paramA=0x8 - object_raw subtype=0x69, x=0x98, y=0x48, unknown=0x4f, paramC=script_08016190 + object_raw subtype=0x69, x=0x98, y=0x48, unknown=0x4f, paramC=script_Object69PotionRed entity_list_end Enemies_TreeInteriors_WitchHut:: @ 080F9FD8 @@ -21767,7 +21767,7 @@ Entities_TreeInteriors_PercysTreehouse_0:: @ 080FA5B0 entity_list_end gUnk_080FA5D0:: @ 080FA5D0 - npc_raw subtype=0x3a, x=0x78, y=0x58, script=script_08012E88 + npc_raw subtype=0x3a, x=0x78, y=0x58, script=script_PercyInside entity_list_end Entities_TreeInteriors_PercysTreehouse_1:: @ 080FA5F0 @@ -22133,11 +22133,11 @@ gUnk_080FACB8:: @ 080FACB8 entity_list_end gUnk_080FAD48:: @ 080FAD48 - npc_raw subtype=0x4e, script=script_0800A9F4 - object_raw subtype=0x6a, x=0xf8, y=0x38, unknown=0x4f, paramA=0x20, paramC=script_0800AA48 - object_raw subtype=0x6a, x=0x168, y=0x48, unknown=0x4f, paramA=0x20, paramC=script_0800AA6C - object_raw subtype=0x6a, x=0x138, y=0x68, unknown=0x4f, paramA=0x21, paramC=script_0800AA90 - object_raw subtype=0x6a, x=0xe8, y=0x88, unknown=0x4f, paramA=0x21, paramC=script_0800AAB4 + npc_raw subtype=0x4e, script=script_Npc4EMtCrenel + object_raw subtype=0x6a, x=0xf8, y=0x38, unknown=0x4f, paramA=0x20, paramC=script_Object6ATektite1 + object_raw subtype=0x6a, x=0x168, y=0x48, unknown=0x4f, paramA=0x20, paramC=script_Object6ATektite2 + object_raw subtype=0x6a, x=0x138, y=0x68, unknown=0x4f, paramA=0x21, paramC=script_Object6ATektite3 + object_raw subtype=0x6a, x=0xe8, y=0x88, unknown=0x4f, paramA=0x21, paramC=script_Object6ATektite4 entity_list_end Enemies_MtCrenel_MountainTop:: @ 080FADA8 @@ -22225,11 +22225,11 @@ Entities_MtCrenel_CaveOfFlamesEntrance_0:: @ 080FAFD4 entity_list_end gUnk_080FAFE4:: @ 080FAFE4 - object_raw subtype=0x69, unknown=0x4f, paramC=script_0800AF68 + object_raw subtype=0x69, unknown=0x4f, paramC=script_EzloTalkCoF entity_list_end gUnk_080FB004:: @ 080FB004 - object_raw subtype=0xbb, x=0x98, y=0xf8, unknown=0x4f, paramC=script_0800B00C + object_raw subtype=0xbb, x=0x98, y=0xf8, unknown=0x4f, paramC=script_Windcrest entity_list_end Entities_MtCrenel_CaveOfFlamesEntrance_1:: @ 080FB024 @@ -22897,7 +22897,7 @@ Room_CrenelCaves_BombBusinessScrub:: @ 080FC234 .4byte sub_StateChange_CrenelCaves_BombBusinessScrub Entities_CrenelCaves_Hermit_0:: @ 080FC254 - npc_raw subtype=0x6, x=0x78, y=0x38, paramA=0xf, paramB=0x400, script=script_0800B8E4 + npc_raw subtype=0x6, x=0x78, y=0x38, paramA=0xf, paramB=0x400, script=script_CrenelHermit entity_list_end Entities_CrenelCaves_Hermit_1:: @ 080FC274 diff --git a/data/scripts.s b/data/scripts.s index 5e02e94b..b23bc221 100644 --- a/data/scripts.s +++ b/data/scripts.s @@ -4,408 +4,583 @@ .include "asm/macros/scripts.inc" .syntax unified - .text - .include "data/scripts/script_08008B5C.inc" - .include "data/scripts/script_08008D50.inc" - .include "data/scripts/script_08008D8C.inc" - .include "data/scripts/script_08008F74.inc" - .include "data/scripts/script_08008FC0.inc" - .include "data/scripts/script_08008FFC.inc" - .include "data/scripts/script_0800903C.inc" - .include "data/scripts/script_08009320.inc" - .include "data/scripts/script_08009340.inc" - .include "data/scripts/script_08009348.inc" - .include "data/scripts/script_0800939A.inc" - .include "data/scripts/script_08009464.inc" - .include "data/scripts/script_080094CC.inc" - .include "data/scripts/script_080094FC.inc" - .include "data/scripts/script_080095F2.inc" - .include "data/scripts/script_08009704.inc" - .include "data/scripts/script_08009740.inc" - .include "data/scripts/script_080097F0.inc" - .include "data/scripts/script_08009838.inc" - .include "data/scripts/script_0800987C.inc" - .include "data/scripts/script_080098D4.inc" - .include "data/scripts/script_08009918.inc" - .include "data/scripts/script_08009950.inc" - .include "data/scripts/script_080099DC.inc" - .include "data/scripts/script_08009A34.inc" - .include "data/scripts/script_08009A84.inc" - .include "data/scripts/script_08009AF8.inc" - .include "data/scripts/script_08009B30.inc" - .include "data/scripts/script_08009B78.inc" - .include "data/scripts/script_08009C68.inc" - .include "data/scripts/script_08009CFC.inc" - .include "data/scripts/script_08009D6C.inc" - .include "data/scripts/script_08009DB0.inc" - .include "data/scripts/script_08009E4E.inc" - .include "data/scripts/script_08009E58.inc" - .include "data/scripts/script_08009E80.inc" - .include "data/scripts/script_08009E88.inc" - .include "data/scripts/script_08009ECC.inc" - .include "data/scripts/script_08009EF0.inc" - .include "data/scripts/script_08009F14.inc" - .include "data/scripts/script_0800A088.inc" - .include "data/scripts/script_0800A0B4.inc" - .include "data/scripts/script_0800A0FC.inc" - .include "data/scripts/script_0800A160.inc" - .include "data/scripts/script_0800A1B4.inc" - .include "data/scripts/script_0800A1D8.inc" - .include "data/scripts/script_0800A310.inc" - .include "data/scripts/script_0800A3D8.inc" - .include "data/scripts/script_0800A500.inc" - .include "data/scripts/script_0800A590.inc" - .include "data/scripts/script_0800A638.inc" - .include "data/scripts/script_0800A65C.inc" - .include "data/scripts/script_0800A680.inc" - .include "data/scripts/script_0800A6A4.inc" - .include "data/scripts/script_0800A6D4.inc" - .include "data/scripts/script_0800A704.inc" - .include "data/scripts/script_0800A734.inc" - .include "data/scripts/script_0800A764.inc" - .include "data/scripts/script_0800A7E4.inc" - .include "data/scripts/script_0800A964.inc" - .include "data/scripts/script_0800A988.inc" - .include "data/scripts/script_0800A9AC.inc" - .include "data/scripts/script_0800A9D0.inc" - .include "data/scripts/script_0800A9F4.inc" - .include "data/scripts/script_0800AA48.inc" - .include "data/scripts/script_0800AA6C.inc" - .include "data/scripts/script_0800AA90.inc" - .include "data/scripts/script_0800AAB4.inc" - .include "data/scripts/script_0800AAD8.inc" - .include "data/scripts/script_0800AB08.inc" - .include "data/scripts/script_0800AB6E.inc" - .include "data/scripts/script_0800ACBC.inc" - .include "data/scripts/script_0800ACE0.inc" - .include "data/scripts/script_0800AD54.inc" - .include "data/scripts/script_0800AEA4.inc" - .include "data/scripts/script_0800AEDC.inc" - .include "data/scripts/script_0800AF18.inc" - .include "data/scripts/script_0800AF44.inc" - .include "data/scripts/script_0800AF68.inc" - .include "data/scripts/script_0800AF8C.inc" - .include "data/scripts/script_0800AFB0.inc" - .include "data/scripts/script_0800AFE8.inc" - .include "data/scripts/script_0800B00C.inc" - .include "data/scripts/script_0800B0AC.inc" - .include "data/scripts/script_0800B0D0.inc" - .include "data/scripts/script_0800B1C0.inc" - .include "data/scripts/script_0800B200.inc" - .include "data/scripts/script_0800B254.inc" - .include "data/scripts/script_0800B308.inc" - .include "data/scripts/script_0800B3A4.inc" - .include "data/scripts/script_0800B41C.inc" - .include "data/scripts/script_0800B4AC.inc" - .include "data/scripts/script_0800B54C.inc" - .include "data/scripts/script_0800B574.inc" - .include "data/scripts/script_0800B5C4.inc" - .include "data/scripts/script_0800B5EC.inc" - .include "data/scripts/script_0800B6C8.inc" - .include "data/scripts/script_0800B7C4.inc" - .include "data/scripts/script_0800B7FC.inc" - .include "data/scripts/script_0800B828.inc" - .include "data/scripts/script_0800B9B4.inc" - .include "data/scripts/script_0800BACC.inc" - .include "data/scripts/script_0800BB00.inc" - .include "data/scripts/script_0800BB30.inc" - .include "data/scripts/script_0800BB64.inc" - .include "data/scripts/script_0800BBA4.inc" - .include "data/scripts/script_0800BBDC.inc" - .include "data/scripts/script_0800BC08.inc" - .include "data/scripts/script_0800BC50.inc" - .include "data/scripts/script_0800BCE8.inc" - .include "data/scripts/script_0800BD78.inc" - .include "data/scripts/script_0800BE1C.inc" - .include "data/scripts/script_0800BECC.inc" - .include "data/scripts/script_0800BF38.inc" - .include "data/scripts/script_0800C004.inc" - .include "data/scripts/script_0800C0B0.inc" - .include "data/scripts/script_0800C160.inc" - .include "data/scripts/script_0800C1D8.inc" - .include "data/scripts/script_0800C2A4.inc" - .include "data/scripts/script_0800C350.inc" - .include "data/scripts/script_0800C370.inc" - .include "data/scripts/script_0800C3B0.inc" - .include "data/scripts/script_0800C3CC.inc" - .include "data/scripts/script_0800C410.inc" - .include "data/scripts/script_0800C45C.inc" - .include "data/scripts/script_0800C494.inc" - .include "data/scripts/script_0800C4D0.inc" - .include "data/scripts/script_0800C50C.inc" - .include "data/scripts/script_0800C550.inc" - .include "data/scripts/script_0800C8C8.inc" - .include "data/scripts/script_0800C8F0.inc" - .include "data/scripts/script_0800C91C.inc" - .include "data/scripts/script_0800CA8C.inc" - .include "data/scripts/script_0800CABC.inc" - .include "data/scripts/script_0800CB54.inc" - .include "data/scripts/script_0800CBD4.inc" - .include "data/scripts/script_0800CC6C.inc" - .include "data/scripts/script_0800CD04.inc" - .include "data/scripts/script_0800CD7C.inc" - .include "data/scripts/script_0800D190.inc" - .include "data/scripts/script_0800D1B4.inc" - .include "data/scripts/script_0800D1E0.inc" - .include "data/scripts/script_0800D218.inc" - .include "data/scripts/script_0800D242.inc" - .include "data/scripts/script_0800D24C.inc" - .include "data/scripts/script_0800D254.inc" - .include "data/scripts/script_0800D278.inc" - .include "data/scripts/script_0800D3EC.inc" - .include "data/scripts/script_0800D414.inc" - .include "data/scripts/script_0800D698.inc" - .include "data/scripts/script_0800D6B4.inc" - .include "data/scripts/script_0800D6D0.inc" - .include "data/scripts/script_0800D6F0.inc" - .include "data/scripts/script_0800D710.inc" - .include "data/scripts/script_0800D76C.inc" - .include "data/scripts/script_0800D84C.inc" - .include "data/scripts/script_0800D874.inc" - .include "data/scripts/script_0800D92C.inc" - .include "data/scripts/script_0800D954.inc" - .include "data/scripts/script_0800DA00.inc" - .include "data/scripts/script_0800DA28.inc" - .include "data/scripts/script_0800DA60.inc" - .include "data/scripts/script_0800DB18.inc" - .include "data/scripts/script_0800DB28.inc" - .include "data/scripts/script_0800DB78.inc" - .include "data/scripts/script_0800DC4C.inc" - .include "data/scripts/script_0800DCAC.inc" - .include "data/scripts/script_0800DDD0.inc" - .include "data/scripts/script_0800DE00.inc" - .include "data/scripts/script_0800DE2C.inc" - .include "data/scripts/script_0800DE50.inc" - .include "data/scripts/script_0800DE78.inc" - .include "data/scripts/script_0800DEB0.inc" - .include "data/scripts/script_0800DED4.inc" - .include "data/scripts/script_0800DF24.inc" - .include "data/scripts/script_0800DFB4.inc" - .include "data/scripts/script_0800DFE4.inc" - .include "data/scripts/script_0800E050.inc" - .include "data/scripts/script_0800E094.inc" - .include "data/scripts/script_0800E0BC.inc" - .include "data/scripts/script_0800E504.inc" - .include "data/scripts/script_0800E544.inc" - .include "data/scripts/script_0800E58C.inc" - .include "data/scripts/script_0800E5C4.inc" - .include "data/scripts/script_0800E5D6.inc" - .include "data/scripts/script_0800E600.inc" - .include "data/scripts/script_0800E62C.inc" - .include "data/scripts/script_0800E658.inc" - .include "data/scripts/script_0800E684.inc" - .include "data/scripts/script_0800E6B0.inc" - .include "data/scripts/script_0800E8A4.inc" - .include "data/scripts/script_0800E8D6.inc" - .include "data/scripts/script_0800E908.inc" - .include "data/scripts/script_0800E9F4.inc" - .include "data/scripts/script_0800EA1C.inc" - .include "data/scripts/script_0800EA54.inc" - .include "data/scripts/script_0800EF40.inc" - .include "data/scripts/script_0800EF9C.inc" - .include "data/scripts/script_0800EFC0.inc" - .include "data/scripts/script_0800F14C.inc" - .include "data/scripts/script_0800F184.inc" - .include "data/scripts/script_0800F33C.inc" - .include "data/scripts/script_0800F354.inc" - .include "data/scripts/script_0800F36C.inc" - .include "data/scripts/script_0800F384.inc" - .include "data/scripts/script_0800F39C.inc" - .include "data/scripts/script_0800F430.inc" - .include "data/scripts/script_0800F4C4.inc" - .include "data/scripts/script_0800F554.inc" - .include "data/scripts/script_0800F724.inc" - .include "data/scripts/script_0800FA54.inc" - .include "data/scripts/script_0800FA78.inc" - .include "data/scripts/script_0800FA9C.inc" - .include "data/scripts/script_0800FAC0.inc" - .include "data/scripts/script_0800FAE4.inc" - .include "data/scripts/script_0800FB2C.inc" - .include "data/scripts/script_0800FB44.inc" - .include "data/scripts/script_0800FD0C.inc" - .include "data/scripts/script_0800FD80.inc" - .include "data/scripts/script_0800FDA0.inc" - .include "data/scripts/script_0800FF18.inc" - .include "data/scripts/script_0800FF74.inc" - .include "data/scripts/script_080100C8.inc" - .include "data/scripts/script_08010264.inc" - .include "data/scripts/script_08010964.inc" - .include "data/scripts/script_080109F0.inc" - .include "data/scripts/script_08010A14.inc" - .include "data/scripts/script_08010A38.inc" - .include "data/scripts/script_08010A5C.inc" - .include "data/scripts/script_08010A98.inc" - .include "data/scripts/script_08010B68.inc" - .include "data/scripts/script_08010BB4.inc" - .include "data/scripts/script_08010E5A.inc" - .include "data/scripts/script_08010F84.inc" - .include "data/scripts/script_08011074.inc" - .include "data/scripts/script_08011098.inc" - .include "data/scripts/script_080110BC.inc" - .include "data/scripts/script_080110E8.inc" - .include "data/scripts/script_08011128.inc" - .include "data/scripts/script_080111CC.inc" - .include "data/scripts/script_080112C4.inc" - .include "data/scripts/script_080113AA.inc" - .include "data/scripts/script_08011442.inc" - .include "data/scripts/script_08011508.inc" - .include "data/scripts/script_080115D0.inc" - .include "data/scripts/script_08011608.inc" - .include "data/scripts/script_08011640.inc" - .include "data/scripts/script_080116A8.inc" - .include "data/scripts/script_0801183C.inc" - .include "data/scripts/script_08011890.inc" - .include "data/scripts/script_080118D4.inc" - .include "data/scripts/script_08011930.inc" - .include "data/scripts/script_08011940.inc" - .include "data/scripts/script_0801194C.inc" - .include "data/scripts/script_08011B20.inc" - .include "data/scripts/script_08011B40.inc" - .include "data/scripts/script_08011C50.inc" - .include "data/scripts/script_08011C7C.inc" - .include "data/scripts/script_0801232C.inc" - .include "data/scripts/script_08012410.inc" - .include "data/scripts/script_08012430.inc" - .include "data/scripts/script_080126FC.inc" - .include "data/scripts/script_08012AB0.inc" - .include "data/scripts/script_08012AC8.inc" - .include "data/scripts/script_08012AF0.inc" - .include "data/scripts/script_08012B18.inc" - .include "data/scripts/script_08012B24.inc" - .include "data/scripts/script_08012B50.inc" - .include "data/scripts/script_08012B7C.inc" - .include "data/scripts/script_08012BA8.inc" - .include "data/scripts/script_08012BF8.inc" - .include "data/scripts/script_08012C48.inc" - .include "data/scripts/script_08012C68.inc" - .include "data/scripts/script_08012CD8.inc" - .include "data/scripts/script_08012D18.inc" - .include "data/scripts/script_08012D70.inc" - .include "data/scripts/script_08012DB0.inc" - .include "data/scripts/script_08012DD8.inc" - .include "data/scripts/script_08012DF8.inc" - .include "data/scripts/script_08012E20.inc" - .include "data/scripts/script_08012E44.inc" - .include "data/scripts/script_08012E88.inc" - .include "data/scripts/script_08012F0C.inc" - .include "data/scripts/script_08012F86.inc" - .include "data/scripts/script_080130E4.inc" - .include "data/scripts/script_08013114.inc" - .include "data/scripts/script_0801319A.inc" - .include "data/scripts/script_080132E4.inc" - .include "data/scripts/script_0801330C.inc" - .include "data/scripts/script_08013330.inc" - .include "data/scripts/script_0801334C.inc" - .include "data/scripts/script_08013378.inc" - .include "data/scripts/script_080133C4.inc" - .include "data/scripts/script_080133F8.inc" - .include "data/scripts/script_08013494.inc" - .include "data/scripts/script_080134DC.inc" - .include "data/scripts/script_08013650.inc" - .include "data/scripts/script_080136B4.inc" - .include "data/scripts/script_080136D8.inc" - .include "data/scripts/script_08013720.inc" - .include "data/scripts/script_080138B4.inc" - .include "data/scripts/script_08013AA6.inc" - .include "data/scripts/script_08013B18.inc" - .include "data/scripts/script_08013B70.inc" - .include "data/scripts/script_08013BA8.inc" - .include "data/scripts/script_08013BE8.inc" - .include "data/scripts/script_08013CA4.inc" - .include "data/scripts/script_08013D04.inc" - .include "data/scripts/script_08013D44.inc" - .include "data/scripts/script_08013D84.inc" - .include "data/scripts/script_08013DC4.inc" - .include "data/scripts/script_08013E04.inc" - .include "data/scripts/script_08013E28.inc" - .include "data/scripts/script_08013E4C.inc" - .include "data/scripts/script_08013E70.inc" - .include "data/scripts/script_08013E94.inc" - .include "data/scripts/script_08013EB0.inc" - .include "data/scripts/script_08013ECC.inc" - .include "data/scripts/script_08013EE8.inc" - .include "data/scripts/script_08013F04.inc" - .include "data/scripts/script_08013F34.inc" - .include "data/scripts/script_08013F64.inc" - .include "data/scripts/script_08013F94.inc" - .include "data/scripts/script_08013FE8.inc" - .include "data/scripts/script_08014054.inc" - .include "data/scripts/script_08014074.inc" - .include "data/scripts/script_08014094.inc" - .include "data/scripts/script_080140B8.inc" - .include "data/scripts/script_080140DC.inc" - .include "data/scripts/script_08014118.inc" - .include "data/scripts/script_08014154.inc" - .include "data/scripts/script_08014198.inc" - .include "data/scripts/script_080141DC.inc" - .include "data/scripts/script_08014210.inc" - .include "data/scripts/script_08014248.inc" - .include "data/scripts/script_080142B0.inc" - .include "data/scripts/script_08014384.inc" - .include "data/scripts/script_080143C0.inc" - .include "data/scripts/script_08014450.inc" - .include "data/scripts/script_0801450C.inc" - .include "data/scripts/script_08014588.inc" - .include "data/scripts/script_080145B0.inc" - .include "data/scripts/script_080145E8.inc" - .include "data/scripts/script_080147DC.inc" - .include "data/scripts/script_08014804.inc" - .include "data/scripts/script_08014958.inc" - .include "data/scripts/script_080149CC.inc" - .include "data/scripts/script_08014A80.inc" - .include "data/scripts/script_08014B10.inc" - .include "data/scripts/script_08014B34.inc" - .include "data/scripts/script_08014CDC.inc" - .include "data/scripts/script_08014DCC.inc" - .include "data/scripts/script_08014E14.inc" - .include "data/scripts/script_08015234.inc" - .include "data/scripts/script_080152B4.inc" - .include "data/scripts/script_080152DC.inc" - .include "data/scripts/script_08015304.inc" - .include "data/scripts/script_08015338.inc" - .include "data/scripts/script_08015360.inc" - .include "data/scripts/script_08015384.inc" - .include "data/scripts/script_08015390.inc" - .include "data/scripts/script_080153EC.inc" - .include "data/scripts/script_0801548E.inc" - .include "data/scripts/script_0801550C.inc" - .include "data/scripts/script_080155F4.inc" - .include "data/scripts/script_08015618.inc" - .include "data/scripts/script_08015684.inc" - .include "data/scripts/script_08015754.inc" - .include "data/scripts/script_080157AC.inc" - .include "data/scripts/script_080158F8.inc" - .include "data/scripts/script_08015918.inc" - .include "data/scripts/script_08015938.inc" - .include "data/scripts/script_08015958.inc" - .include "data/scripts/script_08015A7C.inc" - .include "data/scripts/script_08015AA0.inc" - .include "data/scripts/script_08015AC4.inc" - .include "data/scripts/script_08015B14.inc" - .include "data/scripts/script_08015B34.inc" - .include "data/scripts/script_08015B84.inc" - .include "data/scripts/script_08015BA8.inc" - .include "data/scripts/script_08015BE8.inc" - .include "data/scripts/script_08015C7C.inc" - .include "data/scripts/script_08015CD4.inc" - .include "data/scripts/script_08015DF0.inc" - .include "data/scripts/script_08015E58.inc" - .include "data/scripts/script_08015F08.inc" - .include "data/scripts/script_08015F3C.inc" - .include "data/scripts/script_08015F80.inc" - .include "data/scripts/script_08015FA4.inc" - .include "data/scripts/script_08015FC0.inc" - .include "data/scripts/script_08016004.inc" - .include "data/scripts/script_08016030.inc" - .include "data/scripts/script_08016062.inc" - .include "data/scripts/script_0801606C.inc" - .include "data/scripts/script_0801609E.inc" - .include "data/scripts/script_080160A8.inc" - .include "data/scripts/script_0801635C.inc" - .include "data/scripts/script_0801637C.inc" - .include "data/scripts/script_08016384.inc" - .include "data/scripts/script_08016482.inc" - .include "data/scripts/script_080165A4.inc" - .include "data/scripts/script_080165D8.inc" + .include "data/scripts/hyruleTown/script_LibrarianRight.inc" + .include "data/scripts/hyruleTown/script_LibrarianLeft.inc" + .include "data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc" + .include "data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc" + .include "data/scripts/hyruleTown/script_Object69AllBooksCollected.inc" + .include "data/scripts/hyruleTown/script_LibraryVisitor.inc" + .include "data/scripts/hyruleCastle/script_GuardAtEntry.inc" + .include "data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc" + .include "data/scripts/cutscene/introAssembly/script_PlayerEnters.inc" + .include "data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc" + .include "data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc" + .include "data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc" + .include "data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc" + .include "data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc" + .include "data/scripts/hyruleCastle/script_MinisterPotho.inc" + .include "data/scripts/hyruleCastle/script_SmithAtCastle.inc" + .include "data/scripts/hyruleCastle/script_KingDaltus.inc" + .include "data/scripts/hyruleCastle/script_StoneZelda.inc" + .include "data/scripts/veilFalls/script_BigGoron1.inc" + .include "data/scripts/veilFalls/script_BigGoronHiding.inc" + .include "data/scripts/veilFalls/script_BigGoron2.inc" + .include "data/scripts/veilFalls/script_BigGoron3.inc" + .include "data/scripts/veilFalls/script_BigGoronTalk.inc" + .include "data/scripts/veilFalls/script_BigGoronMirrorShield.inc" + .include "data/scripts/veilFalls/script_Object6AVeilFallsTop.inc" + .include "data/scripts/veilFalls/script_Object6AMirrorShield.inc" + .include "data/scripts/northHyruleField/script_MutohOutsideTown.inc" + .include "data/scripts/hyruleTown/script_MutohInMill.inc" + .include "data/scripts/northHyruleField/script_CarpenterOutsideTown.inc" + .include "data/scripts/graveyard/script_DampeInside2.inc" + .include "data/scripts/graveyard/script_DampeInside.inc" + .include "data/scripts/graveyard/script_DampeOuside.inc" + .include "data/scripts/graveyard/script_GraveyardHouseDoor.inc" + .include "data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc" + .include "data/scripts/graveyard/script_GhostBrothers.inc" + .include "data/scripts/graveyard/script_Object69CrowStealingKey.inc" + .include "data/scripts/graveyard/script_Object97FirstCrow.inc" + .include "data/scripts/graveyard/script_Object97SecondCrow.inc" + .include "data/scripts/graveyard/script_PlayerGetKeyStolen.inc" + .include "data/scripts/graveyard/script_Object69GetKeyBack.inc" + .include "data/scripts/cutscene/intro/script_Object69Intro.inc" + .include "data/scripts/cutscene/intro/script_SmithIntro.inc" + .include "data/scripts/cutscene/intro/script_ZeldaIntro.inc" + .include "data/scripts/cutscene/intro/script_Object69Intro2.inc" + .include "data/scripts/cutscene/intro/script_IntroCameraTarget.inc" + .include "data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc" + .include "data/scripts/cutscene/intro/script_HouseDoorIntro.inc" + .include "data/scripts/cutscene/intro/script_PlayerIntro.inc" + .include "data/scripts/cutscene/intro/script_SmithIntro2.inc" + .include "data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc" + .include "data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc" + .include "data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc" + .include "data/scripts/southHyruleField/script_SmithAtLinksHouse.inc" + .include "data/scripts/southHyruleField/script_Object69LinksHouseBed.inc" + .include "data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc" + .include "data/scripts/unused/script_08009E80.inc" + .include "data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc" + .include "data/scripts/southHyruleField/script_BedInLinksRoom.inc" + .include "data/scripts/hyruleTown/script_BedAtSimons.inc" + .include "data/scripts/minishWoods/script_BombMinish.inc" + .include "data/scripts/minishWoods/script_PlayerAtBombMinish.inc" + .include "data/scripts/sanctuary/script_PlayerGetElement.inc" + .include "data/scripts/dhc/script_Npc4EV3Defeated.inc" + .include "data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc" + .include "data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc" + .include "data/scripts/cutscene/outro/script_Npc4EOutro.inc" + .include "data/scripts/cutscene/outro/script_PlayerAtOutro.inc" + .include "data/scripts/cutscene/outro/script_MinishEzloOutro.inc" + .include "data/scripts/cutscene/outro/script_ZeldaOutro.inc" + .include "data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc" + .include "data/scripts/cutscene/outro/script_EzloCapOutro.inc" + .include "data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc" + .include "data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc" + .include "data/scripts/cutscene/outro/script_EzloZeldaMagic.inc" + .include "data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc" + .include "data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc" + .include "data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc" + .include "data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc" + .include "data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc" + .include "data/scripts/cutscene/outro/script_GuardStoneOutro1.inc" + .include "data/scripts/cutscene/outro/script_GuardStoneOutro2.inc" + .include "data/scripts/cutscene/outro/script_GuardStoneOutro3.inc" + .include "data/scripts/cutscene/outro/script_MaidStoneOutro1.inc" + .include "data/scripts/cutscene/outro/script_MaidStoneOutro2.inc" + .include "data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc" + .include "data/scripts/cutscene/outro/script_Object6AOctorok1.inc" + .include "data/scripts/cutscene/outro/script_Object6AOctorok2.inc" + .include "data/scripts/cutscene/outro/script_Object6AOctorok3.inc" + .include "data/scripts/cutscene/outro/script_Object6AOctorok4.inc" + .include "data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc" + .include "data/scripts/cutscene/outro/script_Object6ATektite1.inc" + .include "data/scripts/cutscene/outro/script_Object6ATektite2.inc" + .include "data/scripts/cutscene/outro/script_Object6ATektite3.inc" + .include "data/scripts/cutscene/outro/script_Object6ATektite4.inc" + .include "data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc" + .include "data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc" + .include "data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc" + .include "data/scripts/cutscene/outro/script_PlayerAtEzlo.inc" + .include "data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc" + .include "data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc" + .include "data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc" + .include "data/scripts/cutscene/outro/script_ZeldaGoodbye.inc" + .include "data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc" + .include "data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc" + .include "data/scripts/minishWoods/script_EzloTalkDWS.inc" + .include "data/scripts/mtCrenel/script_EzloTalkCoF.inc" + .include "data/scripts/windRuins/script_EzloTalkFoW.inc" + .include "data/scripts/lakeHylia/script_Object69AfterToD.inc" + .include "data/scripts/cloudTops/script_EzloTalkPoW.inc" + .include "data/scripts/npc/script_Windcrest.inc" + .include "data/scripts/lakeHylia/script_EzloTalkOcarina.inc" + .include "data/scripts/npc/script_Farmer.inc" + .include "data/scripts/castorWilds/script_Object69DarknutFight.inc" + .include "data/scripts/castorWilds/script_PlayerAtDarknutFight.inc" + .include "data/scripts/castorWilds/script_Object69.inc" + .include "data/scripts/castorWilds/script_CastorWildsStatueLeft.inc" + .include "data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc" + .include "data/scripts/castorWilds/script_CastorWildsStatueRight.inc" + .include "data/scripts/castorWilds/script_CastorWildsStatueRock.inc" + .include "data/scripts/lonLonRanch/script_TalonLostKey.inc" + .include "data/scripts/lonLonRanch/script_TalonGotKey.inc" + .include "data/scripts/lonLonRanch/script_MalonLostKey.inc" + .include "data/scripts/lonLonRanch/script_PlayerGiveKey.inc" + .include "data/scripts/lonLonRanch/script_LonLonRanchDoor.inc" + .include "data/scripts/lakeHylia/script_ShopwellsDog.inc" + .include "data/scripts/castorWilds/script_MalonAtRanch.inc" + .include "data/scripts/graveyard/script_GreatFairyArrows.inc" + .include "data/scripts/castorWilds/script_GreatFairyRupees.inc" + .include "data/scripts/mtCrenel/script_GreatFairyBombs.inc" + .include "data/scripts/npc/script_PlayerAtGreatFairy.inc" + .include "data/scripts/unused/script_0800B828.inc" + .include "data/scripts/hyruleCastle/script_CastleMaid.inc" + .include "data/scripts/mtCrenel/script_CrenelHermit.inc" + .include "data/scripts/graveyard/script_Gina.inc" + .include "data/scripts/npc/script_MysteriousWall.inc" + .include "data/scripts/lonLonRanch/script_GoronPunching.inc" + .include "data/scripts/hyruleTown/script_Phonograph.inc" + .include "data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc" + .include "data/scripts/kinstoneFusion/script_MutohKinstone.inc" + .include "data/scripts/kinstoneFusion/script_SyrupKinstone.inc" + .include "data/scripts/kinstoneFusion/script_BombMinishKinstone.inc" + .include "data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc" + .include "data/scripts/kinstoneFusion/script_StampKinstone.inc" + .include "data/scripts/kinstoneFusion/script_CarlovKinstone.inc" + .include "data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc" + .include "data/scripts/kinstoneFusion/script_GoronKinstone.inc" + .include "data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc" + .include "data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc" + .include "data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc" + .include "data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc" + .include "data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc" + .include "data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc" + .include "data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc" + .include "data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc" + .include "data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc" + .include "data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc" + .include "data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc" + .include "data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc" + .include "data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc" + .include "data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc" + .include "data/scripts/kinstoneFusion/script_BigGoronKinstone1.inc" + .include "data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc" + .include "data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc" + .include "data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc" + .include "data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc" + .include "data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc" + .include "data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc" + .include "data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc" + .include "data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc" + .include "data/scripts/westernWood/script_ForestMinish1.inc" + .include "data/scripts/southHyruleField/script_ForestMinish2.inc" + .include "data/scripts/lakeHylia/script_ForestMinish3.inc" + .include "data/scripts/minishWoods/script_ForestMinish4.inc" + .include "data/scripts/minishWoods/script_Festari.inc" + .include "data/scripts/minishWoods/script_Gentari.inc" + .include "data/scripts/minishWoods/script_PlayerAtFestari.inc" + .include "data/scripts/minishWoods/script_PlayerAtGentari.inc" + .include "data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc" + .include "data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc" + .include "data/scripts/cutscene/minishVillage/script_ForestMinish5.inc" + .include "data/scripts/cutscene/minishVillage/script_ForestMinish6.inc" + .include "data/scripts/cutscene/minishVillage/script_ForestMinish7.inc" + .include "data/scripts/cutscene/minishVillage/script_ForestMinish8.inc" + .include "data/scripts/cutscene/minishVillage/script_ForestMinish9.inc" + .include "data/scripts/minishWoods/script_ForestMinish10.inc" + .include "data/scripts/mtCrenel/script_MountainMinish1.inc" + .include "data/scripts/mtCrenel/script_MountainMinish2.inc" + .include "data/scripts/mtCrenel/script_Melari.inc" + .include "data/scripts/mtCrenel/script_PlayerAtMelari.inc" + .include "data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc" + .include "data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc" + .include "data/scripts/mtCrenel/script_Object6ABrokenSword.inc" + .include "data/scripts/mtCrenel/script_Object6ARepairedSword.inc" + .include "data/scripts/mtCrenel/script_MountainMinish3.inc" + .include "data/scripts/mtCrenel/script_MelariInRoom.inc" + .include "data/scripts/mtCrenel/script_MountainMinish4.inc" + .include "data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc" + .include "data/scripts/mtCrenel/script_MountainMinish5.inc" + .include "data/scripts/hyruleTown/script_KidInn.inc" + .include "data/scripts/cloudTops/script_Npc4EFirstCloud.inc" + .include "data/scripts/cloudTops/script_Npc4EKinstoneFused.inc" + .include "data/scripts/cloudTops/script_Object6AMysteriousCloud.inc" + .include "data/scripts/cloudTops/script_HiddenWhirlwind1.inc" + .include "data/scripts/cloudTops/script_HiddenWhirlwind2.inc" + .include "data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc" + .include "data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc" + .include "data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc" + .include "data/scripts/unused/script_0800D84C.inc" + .include "data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc" + .include "data/scripts/windRuins/script_Npc4EReceiveOcarina.inc" + .include "data/scripts/windRuins/script_PlayerAtTextboard.inc" + .include "data/scripts/graveyard/script_KingGustav.inc" + .include "data/scripts/graveyard/script_PlayerAtKingGustav.inc" + .include "data/scripts/graveyard/script_Object6AKingsGravestone.inc" + .include "data/scripts/dhc/script_Object69VaatiWithZelda.inc" + .include "data/scripts/dhc/script_ZeldaStoneInDHC.inc" + .include "data/scripts/dhc/script_VaatiWithZelda.inc" + .include "data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc" + .include "data/scripts/dhc/script_Npc4ECastleCollapsing.inc" + .include "data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc" + .include "data/scripts/dhc/script_PlayerRescuedZelda.inc" + .include "data/scripts/dhc/script_PlayerAfterDefeatingV2.inc" + .include "data/scripts/dhc/script_PlayerCastleCollapsing.inc" + .include "data/scripts/dhc/script_PlayerStonesFall.inc" + .include "data/scripts/dhc/script_Object69CastleEscape.inc" + .include "data/scripts/dhc/script_PlayerCastleEscape.inc" + .include "data/scripts/dhc/script_ZeldaCastleEscape.inc" + .include "data/scripts/dhc/script_Vaati1Intro.inc" + .include "data/scripts/dhc/script_Object69V1Defeated.inc" + .include "data/scripts/dhc/script_Object69V2Intro.inc" + .include "data/scripts/dhc/script_Object69V2Defeated.inc" + .include "data/scripts/dhc/script_PlayerV2Defeated.inc" + .include "data/scripts/dhc/script_MinishterPothoStone.inc" + .include "data/scripts/dhc/script_GuardStone1.inc" + .include "data/scripts/dhc/script_GuardStone2.inc" + .include "data/scripts/dhc/script_KingDaltusStone.inc" + .include "data/scripts/dhc/script_MinisterPothoCell.inc" + .include "data/scripts/dhc/script_GuardCellLeft.inc" + .include "data/scripts/dhc/script_GuardCellRight.inc" + .include "data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc" + .include "data/scripts/dhc/script_Object69KeatonsRoom.inc" + .include "data/scripts/dhc/script_Object69DarkNutsRoom.inc" + .include "data/scripts/dhc/script_ZeldaStoneDHC.inc" + .include "data/scripts/dhc/script_Object69DHC.inc" + .include "data/scripts/dhc/script_Object69KillDarkNut.inc" + .include "data/scripts/dhc/script_PlayerAtDarkNut1.inc" + .include "data/scripts/dhc/script_PlayerAtDarkNut2.inc" + .include "data/scripts/dhc/script_PlayerAtDarkNut3.inc" + .include "data/scripts/minishWoods/script_PlayerAtMadderpillar.inc" + .include "data/scripts/hyruleTown/script_ForestMinish11.inc" + .include "data/scripts/hyruleTown/script_TownMinish1.inc" + .include "data/scripts/hyruleTown/script_TownMinish2.inc" + .include "data/scripts/hyruleTown/script_TownMinish3.inc" + .include "data/scripts/hyruleTown/script_Teachers.inc" + .include "data/scripts/hyruleTown/script_Emma.inc" + .include "data/scripts/hyruleTown/script_RentRegularRoom.inc" + .include "data/scripts/hyruleTown/script_RentSmallRoom.inc" + .include "data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc" + .include "data/scripts/hyruleTown/script_Mama.inc" + .include "data/scripts/hyruleTown/script_Librari.inc" + .include "data/scripts/hyruleTown/script_PlayerStepOnTrap.inc" + .include "data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc" + .include "data/scripts/hyruleTown/script_Mayor.inc" + .include "data/scripts/hyruleTown/script_DrLeft.inc" + .include "data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc" + .include "data/scripts/hyruleTown/script_TownspersonInDogHouse.inc" + .include "data/scripts/hyruleTown/script_DogPersonInCatHouse.inc" + .include "data/scripts/hyruleTown/script_OldLadyCatHouse1.inc" + .include "data/scripts/hyruleTown/script_OldLadyCatHouse2.inc" + .include "data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc" + .include "data/scripts/hyruleTown/script_CatPerson.inc" + .include "data/scripts/hyruleTown/script_CafeGuy.inc" + .include "data/scripts/hyruleTown/script_SittingPerson.inc" + .include "data/scripts/hyruleTown/script_Sturgeon.inc" + .include "data/scripts/hyruleTown/script_TownMinish4.inc" + .include "data/scripts/hyruleTown/script_TownMinish5.inc" + .include "data/scripts/hyruleTown/script_DrLeftDoor.inc" + .include "data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc" + .include "data/scripts/hyruleTown/script_TownMinish6.inc" + .include "data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc" + .include "data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc" + .include "data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc" + .include "data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc" + .include "data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc" + .include "data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc" + .include "data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc" + .include "data/scripts/cutscene/kinstones/script_KidKinstone1.inc" + .include "data/scripts/cutscene/kinstones/script_KidKinstone2.inc" + .include "data/scripts/cutscene/kinstones/script_KidKinstone3.inc" + .include "data/scripts/cutscene/introTown/script_TownsperonIntro.inc" + .include "data/scripts/cutscene/introTown/script_KidIntro1.inc" + .include "data/scripts/cutscene/introTown/script_GuardIntro.inc" + .include "data/scripts/cutscene/introTown/script_BeedleIntro.inc" + .include "data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc" + .include "data/scripts/cutscene/introTown/script_PercyIntro.inc" + .include "data/scripts/cutscene/introTown/script_PinaIntro.inc" + .include "data/scripts/cutscene/introTown/script_KidIntro2.inc" + .include "data/scripts/cutscene/introTown/script_KidIntro3.inc" + .include "data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntro1.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntro2.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntro3.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntro4.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntro5.inc" + .include "data/scripts/unused/script_0800FB2C.inc" + .include "data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc" + .include "data/scripts/cutscene/introTown/script_Object69IntroTown.inc" + .include "data/scripts/cutscene/introTown/script_PlayerIntroTown.inc" + .include "data/scripts/hyruleTown/script_GormanFirstHouse.inc" + .include "data/scripts/hyruleTown/script_GormanSecondHouse.inc" + .include "data/scripts/hyruleTown/script_GormanCats.inc" + .include "data/scripts/hyruleTown/script_GuardNorth.inc" + .include "data/scripts/hyruleTown/script_GuardEast.inc" + .include "data/scripts/hyruleTown/script_GuardWest.inc" + .include "data/scripts/hyruleTown/script_Townsperson1.inc" + .include "data/scripts/hyruleTown/script_Townsperson2.inc" + .include "data/scripts/hyruleTown/script_AnjuInside.inc" + .include "data/scripts/hyruleTown/script_Anju.inc" + .include "data/scripts/hyruleTown/script_Ghost.inc" + .include "data/scripts/hyruleTown/script_Kid1.inc" + .include "data/scripts/hyruleTown/script_Kid2.inc" + .include "data/scripts/hyruleTown/script_Kid3.inc" + .include "data/scripts/hyruleTown/script_Kid4.inc" + .include "data/scripts/hyruleTown/script_GuardPatrolling.inc" + .include "data/scripts/hyruleTown/script_GuardLibrary.inc" + .include "data/scripts/hyruleTown/script_MaidTown.inc" + .include "data/scripts/hyruleTown/script_Brocco.inc" + .include "data/scripts/hyruleTown/script_Pina.inc" + .include "data/scripts/hyruleTown/script_Beedle.inc" + .include "data/scripts/hyruleTown/script_Kid5.inc" + .include "data/scripts/hyruleTown/script_Kid6.inc" + .include "data/scripts/hyruleTown/script_Kid7.inc" + .include "data/scripts/hyruleTown/script_Wheaton.inc" + .include "data/scripts/hyruleTown/script_Pita.inc" + .include "data/scripts/hyruleTown/script_Marcy.inc" + .include "data/scripts/hyruleTown/script_Stamp.inc" + .include "data/scripts/hyruleTown/script_GoronMerchant.inc" + .include "data/scripts/hyruleTown/script_InnDoor.inc" + .include "data/scripts/hyruleTown/script_FirstHouseDoor.inc" + .include "data/scripts/hyruleTown/script_SimonsDoor.inc" + .include "data/scripts/hyruleTown/script_PhonographDoor.inc" + .include "data/scripts/hyruleTown/script_PlayerAtInnDoor.inc" + .include "data/scripts/sanctuary/script_PlayerSanctuary.inc" + .include "data/scripts/hyruleTown/script_PlayerCannotEnter.inc" + .include "data/scripts/hyruleTown/script_PlayerSleepingInn.inc" + .include "data/scripts/hyruleTown/script_Carpenter.inc" + .include "data/scripts/hyruleTown/script_Postman.inc" + .include "data/scripts/hyruleTown/script_SmallTownMinish.inc" + .include "data/scripts/hyruleTown/script_HurdyGurdyMan.inc" + .include "data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc" + .include "data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc" + .include "data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc" + .include "data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc" + .include "data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc" + .include "data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc" + .include "data/scripts/cutscene/introCeremony/script_PlayerFainting.inc" + .include "data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc" + .include "data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardTopRight.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc" + .include "data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc" + .include "data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc" + .include "data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc" + .include "data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc" + .include "data/scripts/cutscene/introCeremony/script_08011890.inc" + .include "data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc" + .include "data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc" + .include "data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden1.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden2.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden3.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden4.inc" + .include "data/scripts/hyruleCastleGarden/script_GardGarden5.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden6.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardEntry1.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardEntry2.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardEntry3.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden7.inc" + .include "data/scripts/hyruleCastleGarden/script_GuardGarden8.inc" + .include "data/scripts/hyruleTown/script_Simon.inc" + .include "data/scripts/hyruleTown/script_Object69SimonsSimulation.inc" + .include "data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc" + .include "data/scripts/hyruleTown/script_Din.inc" + .include "data/scripts/hyruleTown/script_Nayru.inc" + .include "data/scripts/hyruleTown/script_Farore.inc" + .include "data/scripts/hyruleTown/script_Din2.inc" + .include "data/scripts/hyruleTown/script_Nayru2.inc" + .include "data/scripts/hyruleTown/script_Farore2.inc" + .include "data/scripts/hyruleTown/script_DinMovedIn.inc" + .include "data/scripts/hyruleTown/script_NayruMovedIn.inc" + .include "data/scripts/hyruleTown/script_FaroreMovedIn.inc" + .include "data/scripts/hyruleTown/script_DinAlone.inc" + .include "data/scripts/hyruleTown/script_NayruAlone.inc" + .include "data/scripts/hyruleTown/script_FaroreAlone.inc" + .include "data/scripts/westernWood/script_MoblinLadyDisguised.inc" + .include "data/scripts/westernWood/script_MoblinLady.inc" + .include "data/scripts/lakeHylia/script_KingGustafHologram.inc" + .include "data/scripts/lakeHylia/script_PlayerAfterToD.inc" + .include "data/scripts/hyruleTown/script_LibrariLater.inc" + .include "data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc" + .include "data/scripts/cutscene/ezlo/script_EzloCap.inc" + .include "data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc" + .include "data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc" + .include "data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc" + .include "data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc" + .include "data/scripts/unused/script_08012B24.inc" + .include "data/scripts/unused/script_08012B50.inc" + .include "data/scripts/unused/script_08012B7C.inc" + .include "data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc" + .include "data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc" + .include "data/scripts/npc/script_08012C48.inc" + .include "data/scripts/unused/script_08012C68.inc" + .include "data/scripts/minishWoods/script_08012C98.inc" + .include "data/scripts/minishWoods/script_EzloTalkMinishPortal.inc" + .include "data/scripts/minishWoods/script_08012D18.inc" + .include "data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc" + .include "data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc" + .include "data/scripts/fow/script_Object89Mazaal.inc" + .include "data/scripts/fow/script_PlayerAtMazaal.inc" + .include "data/scripts/fow/script_MazaalMacroDefeated.inc" + .include "data/scripts/fow/script_PlayerDefeatedMazaal.inc" + .include "data/scripts/westernWood/script_PercyInside.inc" + .include "data/scripts/westernWood/script_PercyOutside.inc" + .include "data/scripts/hyruleTown/script_Rem.inc" + .include "data/scripts/hyruleTown/script_RemFallingAsleep.inc" + .include "data/scripts/hyruleTown/script_PlayerAtRem.inc" + .include "data/scripts/hyruleTown/script_RemTownMinish.inc" + .include "data/scripts/hyruleTown/script_Object69Rem.inc" + .include "data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc" + .include "data/scripts/cutscene/reveal/script_PlayerAtPicture.inc" + .include "data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc" + .include "data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc" + .include "data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc" + .include "data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc" + .include "data/scripts/cutscene/reveal/script_FakeKingDaltus.inc" + .include "data/scripts/cutscene/reveal/script_VaatiSanctuary.inc" + .include "data/scripts/cutscene/reveal/script_08013494.inc" + .include "data/scripts/sanctuary/script_Npc4EPedestal.inc" + .include "data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc" + .include "data/scripts/sanctuary/script_PlayerTextBoardAppears.inc" + .include "data/scripts/sanctuary/script_PlayerAtPedestal.inc" + .include "data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc" + .include "data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc" + .include "data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc" + .include "data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc" + .include "data/scripts/sanctuary/script_PlayerPickUpSword.inc" + .include "data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc" + .include "data/scripts/sanctuary/script_Object6ATextBoard.inc" + .include "data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc" + .include "data/scripts/unused/script_08013D04.inc" + .include "data/scripts/unused/script_08013D44.inc" + .include "data/scripts/unused/script_08013D84.inc" + .include "data/scripts/unused/script_08013DC4.inc" + .include "data/scripts/sanctuary/script_Object6AEarthElementFloating.inc" + .include "data/scripts/sanctuary/script_Object6AFireElementFloating.inc" + .include "data/scripts/sanctuary/script_Object6AWaterElementFloating.inc" + .include "data/scripts/sanctuary/script_Object6AWindElementFloating.inc" + .include "data/scripts/sanctuary/script_Object6AEarthElement.inc" + .include "data/scripts/sanctuary/script_Object6AFireElement.inc" + .include "data/scripts/sanctuary/script_Object6AWaterElement.inc" + .include "data/scripts/sanctuary/script_Object6AWindElement.inc" + .include "data/scripts/sanctuary/script_Object6ASwordInPedestal.inc" + .include "data/scripts/sanctuary/script_Object6ASword2.inc" + .include "data/scripts/sanctuary/script_Object6ASword3.inc" + .include "data/scripts/sanctuary/script_08013F94.inc" + .include "data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc" + .include "data/scripts/sanctuary/script_Object6ASwordChange1.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge2.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge3.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge4.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge5.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge6.inc" + .include "data/scripts/sanctuary/script_Objet6ASwordCharge7.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge8.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge9.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge10.inc" + .include "data/scripts/sanctuary/script_Object6ASwordCharge11.inc" +.ifndef EU + .include "data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc" +.endif + .include "data/scripts/hyruleTown/script_Stockwell.inc" + .include "data/scripts/hyruleTown/script_StockwellBuy.inc" + .include "data/scripts/hyruleTown/script_StockwellDogFood.inc" + .include "data/scripts/hyruleTown/script_Carlov.inc" + .include "data/scripts/hyruleTown/script_CarlovWon.inc" + .include "data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc" + .include "data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc" + .include "data/scripts/hyruleTown/script_Object6ACarlov.inc" + .include "data/scripts/hyruleTown/script_Object6ACarlov2.inc" + .include "data/scripts/hyruleTown/script_Carlov2.inc" + .include "data/scripts/hyruleTown/script_PlayerAtCarlov.inc" + .include "data/scripts/hyruleTown/script_CarlovGame.inc" + .include "data/scripts/hyruleTown/script_CarlovChest.inc" + .include "data/scripts/cloudTops/script_WindTribespeople1.inc" + .include "data/scripts/cloudTops/script_WindTribespeople2.inc" + .include "data/scripts/cloudTops/script_WindTribespeople3.inc" + .include "data/scripts/cloudTops/script_WindTribespeople4.inc" + .include "data/scripts/cloudTops/script_WindTribespeople5.inc" + .include "data/scripts/cloudTops/script_WindTribespeople6.inc" + .include "data/scripts/cloudTops/script_Siroc.inc" + .include "data/scripts/cloudTops/script_PlayerAtSiroc.inc" + .include "data/scripts/cloudTops/script_GregalSick.inc" + .include "data/scripts/cloudTops/script_GregalHealthy.inc" + .include "data/scripts/cloudTops/script_WindTribespeople7.inc" + .include "data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc" + .include "data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc" + .include "data/scripts/northHyruleField/script_GuardNorthHyruleField.inc" + .include "data/scripts/lonLonRanch/script_TalonInside.inc" + .include "data/scripts/lonLonRanch/script_TalonInside2.inc" + .include "data/scripts/lonLonRanch/scriptMalonInside.inc" + .include "data/scripts/hyruleTown/script_MalonHyruleTown.inc" + .include "data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc" + .include "data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc" + .include "data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc" + .include "data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc" + .include "data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc" + .include "data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc" + .include "data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc" + .include "data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc" + .include "data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc" + .include "data/scripts/cutscene/originStory/script_Object69MinishVaati.inc" + .include "data/scripts/cutscene/originStory/script_Object69CameraTarget.inc" + .include "data/scripts/cutscene/originStory/script_MinishEzlo.inc" + .include "data/scripts/unused/script_080155F4.inc" + .include "data/scripts/cutscene/originStory/script_Object6AMinishCap.inc" + .include "data/scripts/cutscene/originStory/script_Vaati.inc" + .include "data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_080157AC.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc" + .include "data/scripts/unused/script_08015A7C.inc" + .include "data/scripts/unused/script_08015AA0.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_08015B14.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_08015B34.inc" + .include "data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc" + .include "data/scripts/northHyruleField/script_Object69FixBridge.inc" + .include "data/scripts/cutscene/takeover/script_Object69Takeover.inc" + .include "data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc" + .include "data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc" + .include "data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc" + .include "data/scripts/cutscene/takeover/script_VaatiTakeover.inc" + .include "data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc" + .include "data/scripts/cutscene/takeover/script_GuardTakeover.inc" + .include "data/scripts/unused/script_08015F80.inc" + .include "data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc" + .include "data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc" + .include "data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc" + .include "data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc" + .include "data/scripts/veilFalls/script_Object3ELeftStone.inc" + .include "data/scripts/veilFalls/script_Object3ERightStoneOpening.inc" + .include "data/scripts/veilFalls/script_Object3ERightStone.inc" + .include "data/scripts/minishWoods/script_Syrup.inc" + .include "data/scripts/minishWoods/script_Object69PotionBlue.inc" + .include "data/scripts/minishWoods/script_Object69PotionRed.inc" + .include "data/scripts/npc/script_BladeBrothers.inc" + .include "data/scripts/npc/script_PlayerAtBladeBrothers.inc" + .include "data/scripts/CreateDustFromScript.inc" + .include "data/scripts/unused/script_08016384.inc" + .include "data/scripts/unused/script_08016482.inc" + .include "data/scripts/unused/script_080165A4.inc" + .include "data/scripts/unused/script_080165D8.inc" + .include "data/scripts/npc/script_ForestMinish12.inc" + .include "data/scripts/npc/script_ForestMinish13.inc" + .include "data/scripts/npc/script_ForestMinish14.inc" + .include "data/scripts/npc/script_ForestMinish15.inc" + .include "data/scripts/npc/script_ForestMinish16.inc" + .include "data/scripts/npc/script_ForestMinish17.inc" + .include "data/scripts/npc/script_ForestMinish18.inc" + .include "data/scripts/npc/script_ForestMinish19.inc" + .include "data/scripts/npc/script_ForestMinish20.inc" + .include "data/scripts/npc/script_ForestMinish21.inc" + .include "data/scripts/npc/script_TingleSiblings.inc" diff --git a/data/scripts/CreateDustFromScript.inc b/data/scripts/CreateDustFromScript.inc new file mode 100644 index 00000000..859b127f --- /dev/null +++ b/data/scripts/CreateDustFromScript.inc @@ -0,0 +1,5 @@ +thumb_func_start CreateDustFromScript +CreateDustFromScript: + push {lr} + bl CreateDust + pop {pc} diff --git a/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc new file mode 100644 index 00000000..b8055c03 --- /dev/null +++ b/data/scripts/castorWilds/script_CastorWildsStatueLeft.inc @@ -0,0 +1,18 @@ +@ Castor Wilds Statue left +SCRIPT_START script_CastorWildsStatueLeft + BeginBlock + CheckKinstoneFused 0x0006 + JumpIf script_0800B302 + _0807EA88 0x0006 + _0807EB44 0x0002 + EndBlock +script_0800B268: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0006 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B268 + .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc new file mode 100644 index 00000000..19b2defb --- /dev/null +++ b/data/scripts/castorWilds/script_CastorWildsStatueMiddle.inc @@ -0,0 +1,18 @@ +@ Castor Wilds Statue middle +SCRIPT_START script_CastorWildsStatueMiddle + BeginBlock + CheckKinstoneFused 0x0007 + JumpIf script_0800B302 + _0807EA88 0x0007 + _0807EB44 0x0002 + EndBlock +script_0800B298: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0007 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B298 + .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_CastorWildsStatueRight.inc b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc new file mode 100644 index 00000000..e5553e6f --- /dev/null +++ b/data/scripts/castorWilds/script_CastorWildsStatueRight.inc @@ -0,0 +1,29 @@ +@ Castor Wilds Statue right +SCRIPT_START script_CastorWildsStatueRight + BeginBlock + CheckKinstoneFused 0x0008 + JumpIf script_0800B302 + _0807EA88 0x0008 + _0807EB44 0x0002 + EndBlock +script_0800B2C8: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0008 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B2C8 +script_0800B2E2: + DoPostScriptAction 0x0013 + _0807EB44 0x0004 + _0807E9DC + Call sub_080676E0 + Call sub_08067534 + DoPostScriptAction 0x0012 + SetSyncFlag 0x00000001 +script_0800B302: + EndBlock +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc similarity index 90% rename from data/scripts/script_0800B308.inc rename to data/scripts/castorWilds/script_CastorWildsStatueRock.inc index 51dd64ea..3cb8cec3 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/castorWilds/script_CastorWildsStatueRock.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B308 +@ Castor Wilds Statue rock +SCRIPT_START script_CastorWildsStatueRock BeginBlock .ifdef JP CheckLocalFlag 0x001e @@ -33,14 +34,14 @@ script_0800B348: Call sub_0806757C script_0800B350: EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_ITEM_BOMB_EXPLODE Call sub_080676D8 Call sub_0806757C Call sub_080675D4 Wait 0x0014 BeginBlock - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 CheckKinstoneFused 0x0006 JumpIfNot script_0800B350 CheckKinstoneFused 0x0007 diff --git a/data/scripts/castorWilds/script_GreatFairyRupees.inc b/data/scripts/castorWilds/script_GreatFairyRupees.inc new file mode 100644 index 00000000..2385d474 --- /dev/null +++ b/data/scripts/castorWilds/script_GreatFairyRupees.inc @@ -0,0 +1,28 @@ +@ Lake Hylia Great Fairy OBJECT_69 +SCRIPT_START script_GreatFairyRupees + BeginBlock + EndBlock +script_0800B6CC: + HasRupees 0x0001 + JumpIfNot script_0800B6CC +script_0800B6D4: + CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 + JumpIfNot script_0800B6D4 + Call sub_08079184 + _0807E864 + Call sub_0807F9A4 + StartPlayerScript script_PlayerAtGreatFairy + WaitForSyncFlagAndClear 0x00000004 + SetRoomFlag 0x0000 + WaitForSyncFlagAndClear 0x00000004 + CheckLocalFlag 0x009f + JumpIf script_0800B7A2 + MessageNoOverlap 0x057b + WaitUntilTextboxCloses + CallWithArg sub_0807F970, 0x0000057d + JumpIf script_0800B6A6 + WaitUntilTextboxCloses + SetLocalFlag 0x009f + GivePlayerItem 0x0064 + Jump script_0800B698 + .2byte 0x0000 diff --git a/data/scripts/castorWilds/script_MalonAtRanch.inc b/data/scripts/castorWilds/script_MalonAtRanch.inc new file mode 100644 index 00000000..640be984 --- /dev/null +++ b/data/scripts/castorWilds/script_MalonAtRanch.inc @@ -0,0 +1,17 @@ +@ Lon Lon Ranch Malon +SCRIPT_START script_MalonAtRanch + BeginBlock + DoPostScriptAction 0x000a + DoPostScriptAction 0x0001 + _0807E9D4 + EndBlock +script_0800B5FA: + CheckEntityInteractType + JumpIfNot script_0800B5FA + _0807E864 + _0807EB74 + MessageNoOverlap 0x2009 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + Jump script_0800B5FA diff --git a/data/scripts/script_0800B200.inc b/data/scripts/castorWilds/script_Object69.inc similarity index 79% rename from data/scripts/script_0800B200.inc rename to data/scripts/castorWilds/script_Object69.inc index 5bc8481a..0bb907d2 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/castorWilds/script_Object69.inc @@ -1,6 +1,7 @@ -SCRIPT_START script_0800B200 +@ Castor Wilds OBJECT_69? +SCRIPT_START script_Object69 BeginBlock - _0807E5F8 0x00000000 + SetSyncFlag 0x00000000 .ifdef JP CheckLocalFlag 0x001e .else @@ -18,13 +19,13 @@ SCRIPT_START script_0800B200 SetEntitySpeed 0x00c0 EndBlock script_0800B216: - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF28 MoveEntityToPlayer CameraTargetEntity _0807EDD4 0x0068, 0x0380 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 Wait 0x000c CameraTargetPlayer diff --git a/data/scripts/castorWilds/script_Object69DarknutFight.inc b/data/scripts/castorWilds/script_Object69DarknutFight.inc new file mode 100644 index 00000000..c62e659d --- /dev/null +++ b/data/scripts/castorWilds/script_Object69DarknutFight.inc @@ -0,0 +1,20 @@ +@ Castor Wilds OBJECT_69 darknut fight for kinstone piece +SCRIPT_START script_Object69DarknutFight + BeginBlock + Call sub_0807DF28 + SetLocalFlag 0x0039 + _0807E864 + EndBlock + WaitForPlayerAction0x17 + StartPlayerScript script_PlayerAtDarknutFight + Wait 0x0018 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + SetRoomFlag 0x0000 + Wait 0x0010 + PlayBgm BGM_FIGHT_THEME + _0807EB28 0x2701 + _0807E878 + Call sub_0807DF50 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc similarity index 65% rename from data/scripts/script_0800B1C0.inc rename to data/scripts/castorWilds/script_PlayerAtDarknutFight.inc index 64277512..1c974574 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/castorWilds/script_PlayerAtDarknutFight.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_0800B1C0 +@ Player at darknut in Castor Wilds +SCRIPT_START script_PlayerAtDarknutFight BeginBlock DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0088, 0x0090 ClearLocalFlag 0x0039 @@ -11,6 +12,6 @@ SCRIPT_START script_0800B1C0 Wait 0x002c LoadRoomEntityList gUnk_080DA260 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/cloudTops/script_EzloTalkPoW.inc similarity index 72% rename from data/scripts/script_0800AFE8.inc rename to data/scripts/cloudTops/script_EzloTalkPoW.inc index 9dc089b6..bba202e7 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/data/scripts/cloudTops/script_EzloTalkPoW.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AFE8 +@ Ezlo talk after getting wind element +SCRIPT_START script_EzloTalkPoW _0807E864 Call sub_0807DF28 _0807EB28 0x1c05 diff --git a/data/scripts/cloudTops/script_GregalHealthy.inc b/data/scripts/cloudTops/script_GregalHealthy.inc new file mode 100644 index 00000000..646b5d39 --- /dev/null +++ b/data/scripts/cloudTops/script_GregalHealthy.inc @@ -0,0 +1,36 @@ +@ Cloud Tops Gregal healthy +SCRIPT_START script_GregalHealthy + BeginBlock + Call sub_0806CD58 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0006 + EndBlock +script_08014C42: + CheckEntityInteractType + JumpIfNot script_08014C42 + _0807E864 + _0807EB74 +script_08014C4C: + Call sub_0806CCD0 + JumpIfNot script_08014C4C +script_08014C56: + Call sub_0806CCB4 + JumpIfNot script_08014C56 + CheckLocalFlag 0x0066 + JumpIf script_08014C7C + SetLocalFlag 0x0066 + MessageNoOverlap 0x2f0d + WaitUntilTextboxCloses + GivePlayerItem 0x000a + WaitPlayerGetItem + Jump script_08014C82 +script_08014C7C: + MessageNoOverlap 0x2f09 + WaitUntilTextboxCloses +script_08014C82: + Wait 0x000f + _0807E878 + _0807EB44 0x0004 + _0807E930 0x0006 + Jump script_08014C42 diff --git a/data/scripts/cloudTops/script_GregalSick.inc b/data/scripts/cloudTops/script_GregalSick.inc new file mode 100644 index 00000000..dac29473 --- /dev/null +++ b/data/scripts/cloudTops/script_GregalSick.inc @@ -0,0 +1,72 @@ +@ Cloud Tops Gregal sick +SCRIPT_START script_GregalSick + BeginBlock + DoPostScriptAction 0x000a + _0807E930 0x0000 + EndBlock + CheckLocalFlag 0x0063 + JumpIf script_08014BE8 +script_08014B48: + EndBlock + BeginBlock + CheckRoomFlag 0x0000 + JumpIf script_08014B70 + CheckEntityInteractType + JumpIfNot script_08014B48 + EndBlock + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f01 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08014B48 +script_08014B70: + EndBlock + _0807E864 + Call sub_0807DF28 + SetSyncFlag 0x00000001 + DoPostScriptAction 0x0004 + WaitForSyncFlagAndClear 0x00000002 + _0807E930 0x0010 + Call sub_0806CCF8 + Wait 0x0014 + Call sub_0806CD04 + Wait 0x0014 + Call sub_0806CD14 + Wait 0x0014 + Call sub_0806CD20 + Wait 0x0014 + Call sub_0806CD30 + Wait 0x0014 + Call sub_0806CD3C + Wait 0x0014 + Call sub_0806CD4C + PlaySound SFX_SECRET + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + Call sub_0807DF50 + _0807E878 +script_08014BE8: + _0807E930 0x0010 + Call sub_0806CD4C +script_08014BF2: + CheckEntityInteractType + JumpIfNot script_08014BF2 + _0807E864 + CheckLocalFlag 0x0065 + JumpIf script_08014C1C + SetLocalFlag 0x0065 + MessageNoOverlap 0x2f07 + WaitUntilTextboxCloses + SetIntVariable 0x00000064 + GivePlayerItem 0x003f + WaitPlayerGetItem + Jump script_08014C22 +script_08014C1C: + MessageNoOverlap 0x2f08 + WaitUntilTextboxCloses +script_08014C22: + Wait 0x000f + _0807E878 + Jump script_08014BF2 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/cloudTops/script_HiddenWhirlwind1.inc similarity index 87% rename from data/scripts/script_0800D6D0.inc rename to data/scripts/cloudTops/script_HiddenWhirlwind1.inc index ab61e061..5cfb88b9 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/cloudTops/script_HiddenWhirlwind1.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D6D0 +@ Cloud Tops Whirlwind hidden in clouds +SCRIPT_START script_HiddenWhirlwind1 BeginBlock .ifdef JP CheckLocalFlag 0x00f0 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/cloudTops/script_HiddenWhirlwind2.inc similarity index 87% rename from data/scripts/script_0800D6F0.inc rename to data/scripts/cloudTops/script_HiddenWhirlwind2.inc index 4cbdf8b2..efbd3eb3 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/cloudTops/script_HiddenWhirlwind2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D6F0 +@ Cloud Tops Whirlwind hidden in clouds +SCRIPT_START script_HiddenWhirlwind2 BeginBlock .ifdef JP CheckLocalFlag 0x00f2 diff --git a/data/scripts/cloudTops/script_Npc4EFirstCloud.inc b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc new file mode 100644 index 00000000..14cce552 --- /dev/null +++ b/data/scripts/cloudTops/script_Npc4EFirstCloud.inc @@ -0,0 +1,37 @@ +@ Cloud Tops NPC4E at first Mysterious Cloud +@ Reponsible for Kinstone cutscenes +SCRIPT_START script_Npc4EFirstCloud + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 + Call sub_0806DAAC + JumpIf script_0800D6AE + Call sub_0806DAD0 + CallWithArg sub_0806DA04, 0x00000002 + EndBlock +script_0800D636: + _0807EA4C + _0807E9F0 + Call sub_0806DAAC + JumpIf script_0800D650 + Call sub_0807DF50 + _0807E878 + Jump script_0800D636 +script_0800D650: + _0807E864 + Call sub_0807DF28 + Call sub_0807FBC4 + Call sub_0807FBA0 + SetEntitySpeed 0x0700 + _0807F0B4 0x0007 + CameraTargetEntity + _0807EDD4 0x01e8, 0x01b8 + Wait 0x003c + Call sub_0806DAE8 + Wait 0x0078 + Call sub_0806DB44 + JumpIfNot script_Npc4EKinstoneFused + LoadRoomEntityList gUnk_080DD730 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_0800D698.inc b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc similarity index 63% rename from data/scripts/script_0800D698.inc rename to data/scripts/cloudTops/script_Npc4EKinstoneFused.inc index a9418e17..91d9eae4 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/cloudTops/script_Npc4EKinstoneFused.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D698 +@ Cloud Tops NPC4E after Kinstone has been fused +SCRIPT_START script_Npc4EKinstoneFused _0807EEB4 _0807F0B4 0x0004 CameraTargetPlayer diff --git a/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc new file mode 100644 index 00000000..c2d465d4 --- /dev/null +++ b/data/scripts/cloudTops/script_Object69GreatWhirlwindRevealed.inc @@ -0,0 +1,24 @@ +@ Cloud Tops OBJECT_69 great whirlwind revealed +SCRIPT_START script_Object69GreatWhirlwindRevealed + BeginBlock + Call sub_0807F360 + SetEntitySpeed 0x0700 + _0807F0B4 0x0007 + CameraTargetEntity + Call sub_0807FBC4 + EndBlock + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x0000000a + WaitForSyncFlagAndClear 0x00000004 + _0807EEB4 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807FBCC + _0807E878 + Call sub_0807DF50 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc similarity index 62% rename from data/scripts/script_0800D6B4.inc rename to data/scripts/cloudTops/script_Object6AMysteriousCloud.inc index ea0deeed..f2c812eb 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/cloudTops/script_Object6AMysteriousCloud.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D6B4 +@ Cloud Tops OBJECT_6A Mysterious Cloud +SCRIPT_START script_Object6AMysteriousCloud BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x0011 diff --git a/data/scripts/script_08014B10.inc b/data/scripts/cloudTops/script_PlayerAtSiroc.inc similarity index 59% rename from data/scripts/script_08014B10.inc rename to data/scripts/cloudTops/script_PlayerAtSiroc.inc index 42a6c2b1..5dd59161 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/cloudTops/script_PlayerAtSiroc.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08014B10 +@ Player at Windtribespeople leader Siroc +SCRIPT_START script_PlayerAtSiroc BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x0040 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cloudTops/script_Siroc.inc b/data/scripts/cloudTops/script_Siroc.inc new file mode 100644 index 00000000..679d1966 --- /dev/null +++ b/data/scripts/cloudTops/script_Siroc.inc @@ -0,0 +1,27 @@ +@ Cloud Tops Windtribespeople Leader Siroc +SCRIPT_START script_Siroc + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + EndBlock +script_08014AD2: + _0807E30C + JumpIfNot script_08014AD2 + _0807E864 + _0807EB74 + StartPlayerScript script_PlayerAtSiroc + WaitForSyncFlagAndClear 0x00000001 + _0807EB74 + CheckLocalFlag 0x0064 + JumpIf script_08014AFE + SetLocalFlag 0x0064 + MessageNoOverlap 0x2f0b + Jump script_08014B02 +script_08014AFE: + MessageNoOverlap 0x2f0c +script_08014B02: + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08014AD2 + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople1.inc b/data/scripts/cloudTops/script_WindTribespeople1.inc new file mode 100644 index 00000000..987d6b13 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople1.inc @@ -0,0 +1,21 @@ +@ Cloud Tops WindTribespeople blocking exit +SCRIPT_START script_WindTribespeople1 + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + CheckGlobalFlag 0x0058 + JumpIf script_08014976 + _0807EB44 0x0004 + SetEntityPositionRelative 0x0078, 0x0128 +script_08014976: + EndBlock +script_08014978: + _0807E30C + JumpIfNot script_08014978 + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08014978 diff --git a/data/scripts/cloudTops/script_WindTribespeople2.inc b/data/scripts/cloudTops/script_WindTribespeople2.inc new file mode 100644 index 00000000..6cf49d01 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople2.inc @@ -0,0 +1,21 @@ +@ Cloud Top Windtribespeople woman on first floor +SCRIPT_START script_WindTribespeople2 + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + CheckGlobalFlag 0x0058 + JumpIfNot script_080149C6 + EndBlock +script_080149AA: + _0807E30C + JumpIfNot script_080149AA + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_080149AA +script_080149C6: + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cloudTops/script_WindTribespeople3.inc b/data/scripts/cloudTops/script_WindTribespeople3.inc new file mode 100644 index 00000000..01977684 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople3.inc @@ -0,0 +1,30 @@ +@ Cloud Tops Windtribespeople blocking the way up to the palace +SCRIPT_START script_WindTribespeople3 + BeginBlock + SetEntitySpeed 0x0080 + Call sub_0806C870 + DoPostScriptAction 0x000a + EndBlock +script_080149DE: + _0807E30C + JumpIfNot script_080149DE + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + CheckLocalFlag 0x0064 + JumpIfNot script_08014A20 + CheckLocalFlag 0x00b1 + JumpIf script_08014A20 + SetLocalFlag 0x00b1 + DoPostScriptAction 0x000b + DoPostScriptAction 0x0001 + _0807EDD4 0x0068, 0x00f8 + PlaySound SFX_SECRET + _0807EB74 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a +script_08014A20: + _0807E878 + Jump script_080149DE + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople4.inc b/data/scripts/cloudTops/script_WindTribespeople4.inc new file mode 100644 index 00000000..31e036e3 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople4.inc @@ -0,0 +1,17 @@ +@ Cloud Tops Windtribespeople blocking way up +SCRIPT_START script_WindTribespeople4 + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + EndBlock +script_08014A36: + _0807E30C + JumpIfNot script_08014A36 + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08014A36 + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople5.inc b/data/scripts/cloudTops/script_WindTribespeople5.inc new file mode 100644 index 00000000..cf3a995e --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople5.inc @@ -0,0 +1,17 @@ +@ Cloud Tops Windtribespeople at the bed +SCRIPT_START script_WindTribespeople5 + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + EndBlock +script_08014A62: + _0807E30C + JumpIfNot script_08014A62 + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08014A62 + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople6.inc b/data/scripts/cloudTops/script_WindTribespeople6.inc new file mode 100644 index 00000000..fea83201 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople6.inc @@ -0,0 +1,23 @@ +@ Cloud Tops Windtribespeople sucked up ghost +SCRIPT_START script_WindTribespeople6 + BeginBlock + DoPostScriptAction 0x000a + EndBlock + WaitForSyncFlagAndClear 0x00000001 + _0807EB74 + DoPostScriptAction 0x0004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + MessageNoOverlap 0x2f0a + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 +script_08014AAC: + _0807E30C + JumpIfNot script_08014AAC + _0807E864 + _0807EB74 + MessageNoOverlap 0x2f0a + WaitUntilTextboxCloses + _0807E878 + Jump script_08014AAC + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeople7.inc b/data/scripts/cloudTops/script_WindTribespeople7.inc new file mode 100644 index 00000000..a4c71788 --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeople7.inc @@ -0,0 +1,27 @@ +@ Cloud Tops Windtribespeople +SCRIPT_START script_WindTribespeople7 + BeginBlock + CheckGlobalFlag 0x0024 + JumpIf script_08014CD4 + Call sub_0806C870 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0000 + EndBlock +script_08014CAE: + EndBlock + BeginBlock + CheckGlobalFlag 0x0024 + JumpIf script_08014CD4 + _0807E30C + JumpIfNot script_08014CAE + EndBlock + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + _0807E878 + Jump script_08014CAE +script_08014CD4: + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc new file mode 100644 index 00000000..0561a0fb --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed1.inc @@ -0,0 +1,26 @@ +@ Cloud Tops WindTribespeople great whirlwind revealed 2 +SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed1 + BeginBlock + Call sub_0807F360 + DoPostScriptAction 0x000b + SetEntitySpeed 0x0200 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock + WaitForSyncFlagAndClear 0x00000008 + DoPostScriptAction 0x0004 + Wait 0x003c + PlaySound SFX_123 + CallWithArg sub_0807F464, 0x000001e0 + _0807EDD4 0x01e0, 0x01d8 + _0807EB44 0x0002 + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000010 + PlaySound SFX_PLY_JUMP + _0807EF3C 0x0180, 0x0030 + PlaySound SFX_PLY_JUMP + _0807EF3C 0x0180, 0x0030 + _0807EB44 0x0002 + DoPostScriptAction 0x0001 + WaitForSyncFlagAndClear 0x00000008 + Jump script_0800D80C diff --git a/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc new file mode 100644 index 00000000..53f64c9b --- /dev/null +++ b/data/scripts/cloudTops/script_WindTribespeopleGreatWhirlwindRevealed2.inc @@ -0,0 +1,27 @@ +@ Cloud Tops WindTribespeople great whirlwind revealed +SCRIPT_START script_WindTribespeopleGreatWhirlwindRevealed2 + BeginBlock + Call sub_0807F360 + DoPostScriptAction 0x000b + SetEntityPositionRelative 0x0268, 0x01d8 + SetEntitySpeed 0x0100 + EndBlock + WaitForSyncFlagAndClear 0x00000002 + _0807EDD4 0x01f0, 0x01d8 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 +script_0800D80C: + SetEntitySpeed 0x0100 + _0807EEF4 0x0000, 0xffe0 + DoPostScriptAction 0x000e + Call sub_0806CA5C + SetEntity0x20 0x00040000 + PlaySound SFX_F5 +script_0800D82A: + CallWithArg sub_0807F8D0, 0xffffe000 + Call sub_0807F8BC + JumpIf script_0800D82A + SetSyncFlag 0x00000004 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_080126FC.inc b/data/scripts/cutscene/ezlo/script_EzloCap.inc similarity index 80% rename from data/scripts/script_080126FC.inc rename to data/scripts/cutscene/ezlo/script_EzloCap.inc index 4470cf0e..29b94ee9 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/cutscene/ezlo/script_EzloCap.inc @@ -1,35 +1,36 @@ -SCRIPT_START script_080126FC +@ First look at Ezlo EzloCap +SCRIPT_START script_EzloCap BeginBlock SetEntitySpeed 0x0040 DoPostScriptAction 0x0007 EndBlock _0807E930 0x0020 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1102, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1103, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0011 _0807E930 0x001c MessageFromTargetPos 0x1105, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0022 Call sub_0807F3C8 MessageFromTargetPos 0x1106, 0x000c @@ -39,8 +40,8 @@ SCRIPT_START script_080126FC MessageFromTargetPos 0x1107, 0x000c WaitUntilTextboxCloses _0807E930 0x0020 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0021 Call sub_0807F3C8 MessageFromTargetPos 0x1108, 0x000c @@ -52,7 +53,7 @@ SCRIPT_START script_080126FC _0807E930 0x0020 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 script_080127F2: EndBlock BeginBlock @@ -75,38 +76,38 @@ script_08012824: CallWithArg sub_0807F5B0, 0x0000003c Call sub_080791D0 EndBlock - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000b - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 Call sub_0806D944 _0807E930 0x0010 MessageFromTargetPos 0x110a, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110b, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0010 MessageFromTargetPos 0x110c, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110d, 0x000c WaitUntilTextboxCloses _0807E930 0x001f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0010 MessageFromTargetPos 0x110e, 0x000c WaitUntilTextboxCloses @@ -116,8 +117,8 @@ script_08012824: _0807EC1C 0x0010 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012904: EndBlock BeginBlock @@ -152,8 +153,8 @@ script_0801293A: WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012984: EndBlock BeginBlock @@ -189,8 +190,8 @@ script_080129BA: WaitUntilTextboxCloses Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 script_08012A08: EndBlock BeginBlock @@ -228,7 +229,7 @@ script_08012A74: JumpIfNot script_08012A74 _0807E930 0x001f WaitUntilTextboxCloses - StartPlayerScript script_08012B18 + StartPlayerScript script_PlayerGetEzloCap Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 @@ -238,6 +239,6 @@ script_08012A74: _0807EB28 0x1112 EndBlock WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc new file mode 100644 index 00000000..f059f75b --- /dev/null +++ b/data/scripts/cutscene/ezlo/script_Npc4EEzloCutscene.inc @@ -0,0 +1,135 @@ +@ Minish Woods Ezlo Cutscene NPC4E +SCRIPT_START script_Npc4EEzloCutscene + BeginBlock + Call sub_08054564 + EndBlock +script_0801248A: + CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 + JumpIfNot script_0801248A + StopBgm + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtFirstLookAtEzlo + MessageFromTargetPos 0x1101, 0x0007 + WaitUntilTextboxCloses + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitForFadeFinish + _0807E858 0x0000 + Call sub_080791BC + LoadRoomEntityList gUnk_080F4D70 + Call DeleteAllEnemies + SetEntityPositionRelative 0x0388, 0x0168 + Call sub_0807F844 + _0807E778 0x0004 + _0807E800 0x00000000 + WaitForFadeFinish + PlayBgm BGM_EZLO_THEME + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StopBgm + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitForFadeFinish + MoveEntityToPlayer + Call sub_0807F844 + CameraTargetPlayer + SetFadeMask 0xffffffff + _0807E778 0x0004 + _0807E800 0x00000000 + WaitForFadeFinish + Call sub_0807DF50 + _0807E878 + PlayBGM +script_08012566: + CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 + JumpIfNot script_08012566 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0806DC7C + StopBgm + StartPlayerScript script_PlayerEzloBeingBullied + WaitForSyncFlagAndClear 0x00000001 + SetEntityPositionRelative 0x0388, 0x0168 + _0807F0B4 0x0001 + CameraTargetEntity + Wait 0x005a + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + PlayBgm BGM_EZLO_THEME + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StopBgm + PlayBgm BGM_FIGHT_THEME2 + Call sub_0807DF50 + _0807E878 + SetSyncFlag 0x00000050 + LoadRoomEntityList gUnk_080F51D0 + WaitForSyncFlagAndClear 0x00000008 + _0807E864 + Call sub_0807FA40 + Call sub_0807DF28 + PlaySound SFX_SECRET + StopBgm + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StartPlayerScript script_PlayerDefeatedOctoroks + WaitForSyncFlagAndClear 0x00000001 + _0807E8E4_0 + PlayBgm BGM_EZLO_THEME + Wait 0x001e + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StopBgm + Wait 0x003c + PlayBGM + Call sub_0806DCA0 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807DF50 + _0807E878 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StopBgm + Wait 0x003c + PlayBGM + Call sub_08054570 + SetGlobalFlag 0x0014 + CallWithArg sub_0807F6F8, 0x00000008 + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc new file mode 100644 index 00000000..4528f6df --- /dev/null +++ b/data/scripts/cutscene/ezlo/script_Object6ALeftBullyingOctorok.inc @@ -0,0 +1,21 @@ +@ First look at Ezlo OBJECT_6A left octorok +SCRIPT_START script_Object6ALeftBullyingOctorok + BeginBlock + _0807EB44 0x0002 + DoPostScriptAction 0x0007 + _0807E930 0x0001 + EndBlock + WaitForSyncFlagAndClear 0x00000040 + _0807E930 0x0005 + Wait 0x001e + SetSyncFlag 0x00000080 + _0807E930 0x0001 + WaitForSyncFlagAndClear 0x00000040 + _0807E930 0x0005 + Wait 0x001e + SetSyncFlag 0x00000080 + _0807E930 0x0001 + WaitForSyncFlagAndClear 0x00000040 + Wait 0x0001 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc new file mode 100644 index 00000000..8051b6b5 --- /dev/null +++ b/data/scripts/cutscene/ezlo/script_Object6ARightBullyingOctorok.inc @@ -0,0 +1,21 @@ +@ First look at Ezlo OBJECT_6A right octorok +SCRIPT_START script_Object6ARightBullyingOctorok + BeginBlock + _0807EB44 0x0006 + DoPostScriptAction 0x0007 + _0807E930 0x0003 + EndBlock + WaitForSyncFlagAndClear 0x00000010 + _0807E930 0x0007 + Wait 0x001e + SetSyncFlag 0x00000020 + _0807E930 0x0003 + WaitForSyncFlagAndClear 0x00000010 + _0807E930 0x0007 + Wait 0x001e + SetSyncFlag 0x00000020 + _0807E930 0x0003 + WaitForSyncFlagAndClear 0x00000010 + Wait 0x0001 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc similarity index 63% rename from data/scripts/script_08012AB0.inc rename to data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc index 8c0a07dd..1330fd87 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerAtFirstLookAtEzlo.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012AB0 +@ First look at Ezlo Player +SCRIPT_START script_PlayerAtFirstLookAtEzlo EndBlock script_08012AB2: _0807EB44 0x0002 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc similarity index 63% rename from data/scripts/script_08012AF0.inc rename to data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc index 3250384f..f53814e1 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerDefeatedOctoroks.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012AF0 +@ Ezlo octoroks defeated Player +SCRIPT_START script_PlayerDefeatedOctoroks BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_08012AF0 _0807EDD4 0x0388, 0x0180 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc similarity index 64% rename from data/scripts/script_08012AC8.inc rename to data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc index 549da3a5..edf2a936 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/cutscene/ezlo/script_PlayerEzloBeingBullied.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012AC8 +@ Ezlo being bullied Player +SCRIPT_START script_PlayerEzloBeingBullied BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,7 +7,7 @@ SCRIPT_START script_08012AC8 DoPostScriptAction 0x0000 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc b/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc new file mode 100644 index 00000000..545b7a6c --- /dev/null +++ b/data/scripts/cutscene/ezlo/script_PlayerGetEzloCap.inc @@ -0,0 +1,5 @@ +@ Get Ezlo cap Player +SCRIPT_START script_PlayerGetEzloCap + DoPostScriptAction 0x0015 + Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc similarity index 54% rename from data/scripts/script_08009AF8.inc rename to data/scripts/cutscene/intro/script_HouseDoorIntro.inc index 48ef802b..45d64e58 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/cutscene/intro/script_HouseDoorIntro.inc @@ -1,16 +1,20 @@ -SCRIPT_START script_08009AF8 +@ Intro house door +SCRIPT_START script_HouseDoorIntro BeginBlock EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 + @ Open door PlaySound SFX_F0 DoPostScriptAction 0x0008 Wait 0x001e + @ Close door PlaySound SFX_F1 DoPostScriptAction 0x0007 Wait 0x005a _0807E778 0x0004 + @ Circle transition _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish @ Wait for end of transition Call sub_0805367C SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009A34.inc b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc similarity index 51% rename from data/scripts/script_08009A34.inc rename to data/scripts/cutscene/intro/script_IntroCameraTarget.inc index 03504b53..1df4f5a3 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/cutscene/intro/script_IntroCameraTarget.inc @@ -1,22 +1,17 @@ -SCRIPT_START script_08009A34 - Wait 0x003c -script_08009A38: - Call sub_08066258 - Wait 0x001e - Call sub_08066258 - Wait 0x005a - Jump script_08009A38 -SCRIPT_START script_08009A50 +@ Intro camera target +SCRIPT_START script_IntroCameraTarget SetEntityPositionRelative 0x0240, 0x0178 CameraTargetEntity SetEntitySpeed 0x0080 Wait 0x0078 PlayBgm BGM_MINISH_CAP _0807E778 0x0002 + @ Fade in DoFade4 - WaitFor_2 + WaitForFadeFinish @ TODO wait for fade to be finished Wait 0x0078 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_08053648 + @ Move camera target down _0807EDD4 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc similarity index 62% rename from data/scripts/script_08014DCC.inc rename to data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc index f8d36d7f..4fe5b4ae 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/cutscene/intro/script_Npc4EOutsideLinksHouse.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08014DCC +@ NPC4E in front of links house during intro +SCRIPT_START script_Npc4EOutsideLinksHouse BeginBlock SetEntityPositionRelative 0x0238, 0x01a8 Call sub_0807F844 @@ -8,9 +9,9 @@ SCRIPT_START script_08014DCC EndBlock _0807E778 0x0010 DoFade6 - WaitFor_2 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForFadeFinish + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 diff --git a/data/scripts/cutscene/intro/script_Object69Intro.inc b/data/scripts/cutscene/intro/script_Object69Intro.inc new file mode 100644 index 00000000..059bb9f7 --- /dev/null +++ b/data/scripts/cutscene/intro/script_Object69Intro.inc @@ -0,0 +1,16 @@ +@ Intro smith OBJECT_69 ? +SCRIPT_START script_Object69Intro + BeginBlock + Call sub_0807DF28 + _0807E864 + SetSyncFlag 0x00000000 + EndBlock + WaitForFadeFinish + Wait 0x0078 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + SetGlobalFlag 0x001c + Call sub_0807DF50 + _0807E878 + Call sub_0807921C +SCRIPT_END diff --git a/data/scripts/cutscene/intro/script_Object69Intro2.inc b/data/scripts/cutscene/intro/script_Object69Intro2.inc new file mode 100644 index 00000000..2da80def --- /dev/null +++ b/data/scripts/cutscene/intro/script_Object69Intro2.inc @@ -0,0 +1,9 @@ +@ Intro unknown second OBJECT_69 +SCRIPT_START script_Object69Intro2 + Wait 0x003c +script_08009A38: + Call sub_08066258 + Wait 0x001e + Call sub_08066258 + Wait 0x005a + Jump script_08009A38 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/cutscene/intro/script_PlayerIntro.inc similarity index 68% rename from data/scripts/script_08009B30.inc rename to data/scripts/cutscene/intro/script_PlayerIntro.inc index 93160763..e89495c8 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/cutscene/intro/script_PlayerIntro.inc @@ -1,18 +1,22 @@ -SCRIPT_START script_08009B30 +@ Intro Player +SCRIPT_START script_PlayerIntro BeginBlock Call sub_0807DF28 _0807E864 SetLocalFlag 0x0046 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x001e + @ Wake up message MessageFromTarget 0x1005 WaitUntilTextboxCloses Wait 0x003c Call sub_0807529C Wait 0x003c + @ Exclamation mark DoPostScriptAction 0x0014 Wait 0x001e + @ Give control to the player? Call sub_08053250 _0807E878 Call sub_0807DF50 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc similarity index 57% rename from data/scripts/script_08009CFC.inc rename to data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc index 613aaba8..8bec701d 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/cutscene/intro/script_PlayerMoveToSmith.inc @@ -1,27 +1,28 @@ -SCRIPT_START script_08009CFC +@ Player at Smith during intro +SCRIPT_START script_PlayerMoveToSmith BeginBlock _0807E8E4_1 SetEntitySpeed 0x00c0 EndBlock - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c _0807EDD4 0x0040, 0x0060 _0807EDD4 0x0060, 0x0068 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0000 _0807E8E4_0 Wait 0x000f PlaySound SFX_VO_ZELDA1 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000008 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000002 _0807EDD4 0x0070, 0x005c _0807E8E4_1 DoPostScriptAction 0x0000 Wait 0x000f - _0807E5F8 0x00000008 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000008 SCRIPT_END diff --git a/data/scripts/script_08009950.inc b/data/scripts/cutscene/intro/script_SmithIntro.inc similarity index 76% rename from data/scripts/script_08009950.inc rename to data/scripts/cutscene/intro/script_SmithIntro.inc index 18c18086..d26a3683 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009950 +@ Intro Smith 1 +SCRIPT_START script_SmithIntro BeginBlock Call sub_0807F348 SetEntitySpeed 0x0040 @@ -10,8 +11,8 @@ SCRIPT_START script_08009950 CameraTargetEntity _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 - WaitForSomething2 0x00000008 + WaitForFadeFinish + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0004 Wait 0x001e _0807E930 0x000b @@ -19,8 +20,8 @@ SCRIPT_START script_08009950 MessageFromTarget 0x1002 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0001 _0807EB44 0x0004 _0807EDD4 0x00b8, 0x005c @@ -32,6 +33,6 @@ SCRIPT_START script_08009950 Wait 0x001e _0807E778 0x0002 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_08053634 SCRIPT_END diff --git a/data/scripts/script_08009B78.inc b/data/scripts/cutscene/intro/script_SmithIntro2.inc similarity index 73% rename from data/scripts/script_08009B78.inc rename to data/scripts/cutscene/intro/script_SmithIntro2.inc index 10bffa01..fff723fa 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/cutscene/intro/script_SmithIntro2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009B78 +@ Intro Smith 2 +SCRIPT_START script_SmithIntro2 BeginBlock _0807EB44 0x0006 SetEntitySpeed 0x0080 @@ -10,9 +11,9 @@ SCRIPT_START script_08009B78 _0807E888 Wait 0x000a _0807E864 - StartPlayerScript script_08009CFC + StartPlayerScript script_PlayerMoveToSmith Call sub_0807DF28 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x0080, 0x005c _0807EB44 0x0006 DoPostScriptAction 0x0000 @@ -22,15 +23,15 @@ SCRIPT_START script_08009B78 _0807E8E4_1 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100b, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000008 _0807EDD4 0x007c, 0x005c Wait 0x000f DoPostScriptAction 0x000d @@ -38,18 +39,20 @@ SCRIPT_START script_08009B78 _0807EB44 0x0006 DoPostScriptAction 0x000c DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000008 Call sub_08053250 - _0807F034 0x0034 + @ Give player rusty sword + GivePlayerItem 0x0034 WaitPlayerGetItem _0807E8E4_1 DoPostScriptAction 0x0001 MessageFromTargetPos 0x100c, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 script_08009C4C: + @ Talk to Smith DoPostScriptAction 0x000a script_08009C50: CheckEntityInteractType diff --git a/data/scripts/script_080099DC.inc b/data/scripts/cutscene/intro/script_ZeldaIntro.inc similarity index 68% rename from data/scripts/script_080099DC.inc rename to data/scripts/cutscene/intro/script_ZeldaIntro.inc index 9fec298d..6f2c28ec 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/cutscene/intro/script_ZeldaIntro.inc @@ -1,23 +1,24 @@ -SCRIPT_START script_080099DC +@ Intro Zelda at Smith +SCRIPT_START script_ZeldaIntro BeginBlock Call sub_0807F348 SetEntitySpeed 0x00c0 _0807EB44 0x0002 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x0068, 0x0060 Wait 0x000f MessageFromTarget 0x1001 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0001 MessageFromTarget 0x1003 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc similarity index 78% rename from data/scripts/script_08009D6C.inc rename to data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc index ea71cbc3..7386e1cf 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/cutscene/intro/script_ZeldaLeaveLinksHouse.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009D6C +@ Intro Zelda leaving +SCRIPT_START script_ZeldaLeaveLinksHouse BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0006 @@ -12,7 +13,7 @@ SCRIPT_START script_08009D6C DoPostScriptAction 0x0008 _0807E778 0x0010 DoFade5 - WaitFor_2 + WaitForFadeFinish Call sub_08053634 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009A84.inc b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc similarity index 71% rename from data/scripts/script_08009A84.inc rename to data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc index 6b3e05a7..d86a142b 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/cutscene/intro/script_ZeldaMoveToLinksHouse.inc @@ -1,15 +1,17 @@ -SCRIPT_START script_08009A84 +@ Intro Zelda moves to links house +SCRIPT_START script_ZeldaMoveToLinksHouse BeginBlock SetEntityPositionRelative 0x01e8, 0x0110 SetEntitySpeed 0x00c0 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01e8, 0x0200 _0807EDD4 0x01f8, 0x0218 _0807EDD4 0x0220, 0x0228 _0807EDD4 0x0240, 0x0228 + @ Now the camera follows Zelda CameraTargetEntity _0807EDD4 0x0290, 0x0228 _0807EDD4 0x0290, 0x01f8 @@ -18,7 +20,8 @@ SCRIPT_START script_08009A84 SetEntitySpeed 0x00c0 _0807EDD4 0x0290, 0x0198 Wait 0x001e - _0807E5F8 0x00000010 + @ Door is opening + SetSyncFlag 0x00000010 @ Send signal to door _0807EDD4 0x0290, 0x0190 DoPostScriptAction 0x0008 _0807EDD4 0x0290, 0x0188 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc similarity index 86% rename from data/scripts/script_08014CDC.inc rename to data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc index c7c09148..9a200b2f 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/cutscene/intro/script_ZeldaOutsideLinksHouse.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08014CDC +@ Zelda intro in front of links house +SCRIPT_START script_ZeldaOutsideLinksHouse BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x000a @@ -8,15 +9,16 @@ SCRIPT_START script_08014CDC _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_08066E08 _0807E864 MessageFromTargetPos 0x1010, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_08014D1E: EndBlock BeginBlock + @ Left of links house CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 JumpIfNot script_08014D1E EndBlock @@ -32,6 +34,7 @@ script_08014D1E: Call sub_0807DF50 _0807E878 script_08014D60: + @ Between trees CallWithArg sub_0807F6B4, 0x000000e8 JumpIf script_08014D60 _0807E864 @@ -45,6 +48,7 @@ script_08014D60: Call sub_0807DF50 _0807E878 script_08014D96: + @ Before hyrule town entry CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 JumpIfNot script_08014D96 _0807E864 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc similarity index 71% rename from data/scripts/script_08009C68.inc rename to data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc index d4f1e156..282bbec0 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/cutscene/intro/script_ZeldaTalkToSmith.inc @@ -1,23 +1,24 @@ -SCRIPT_START script_08009C68 +@ Intro Zelda at Smith 2 +SCRIPT_START script_ZeldaTalkToSmith BeginBlock _0807EB44 0x0002 SetEntitySpeed 0x0100 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 _0807EB8C DoPostScriptAction 0x0001 MessageFromTargetPos 0x100a, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB8C DoPostScriptAction 0x0001 _0807EB8C @@ -25,6 +26,7 @@ SCRIPT_START script_08009C68 MessageFromTargetPos 0x100d, 0x0000 WaitUntilTextboxCloses DoPostScriptAction 0x0000 + @ Leave room _0807EDD4 0x0028, 0x0060 _0807EDD4 0x0000, 0x0060 Call sub_080536A8 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc similarity index 76% rename from data/scripts/script_08008FFC.inc rename to data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc index 0a8bb0c9..804be255 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/cutscene/introAssembly/script_GuardAtAssembly.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_08008FFC +@ Intro Assembly Guard +SCRIPT_START script_GuardAtAssembly BeginBlock _0807EB44 0x0000 _0807E930 0x0000 EndBlock - WaitForSomething 0x00000010 + WaitForSyncFlag 0x00000010 PlaySound SFX_11C _0807E930 0x0001 Wait 0x0010 diff --git a/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc new file mode 100644 index 00000000..5ea4ba26 --- /dev/null +++ b/data/scripts/cutscene/introAssembly/script_KingDaltusAtAssembly.inc @@ -0,0 +1,68 @@ +@ Intro Assembly King Daltus +SCRIPT_START script_KingDaltusAtAssembly + BeginBlock + Call sub_0807F348 + SetEntitySpeed 0x0100 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock + WaitForSyncFlagAndClear 0x00000080 + _0807EB44 0x0004 + _0807ECC4 0x0008 + _0807E930 0x0004 + MessageFromTargetPos 0x1050, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x0004 + MessageFromTargetPos 0x1052, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807EB44 0x0006 + _0807E930 0x0005 + MessageFromTargetPos 0x1054, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807EB44 0x0004 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x0004 + MessageFromTargetPos 0x1056, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x0004 + MessageFromTargetPos 0x1057, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x0004 + MessageFromTargetPos 0x1058, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x0004 + MessageFromTargetPos 0x105c, 0x000e + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000100 +script_0800917C: + CheckEntityInteractType + JumpIfNot script_0800917C + _0807E864 + _0807EB74 + Call sub_0806673C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800917C diff --git a/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc new file mode 100644 index 00000000..fe1106ed --- /dev/null +++ b/data/scripts/cutscene/introAssembly/script_MinisterPothoAtAssembly.inc @@ -0,0 +1,19 @@ +@ Intro Assembly Minister Potho +SCRIPT_START script_MinisterPothoAtAssembly + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock + WaitForSyncFlagAndClear 0x00000004 + PlaySound SFX_PLY_JUMP + _0807EF3C 0x0180, 0x0030 + _0807EB44 0x0002 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 + _0807EB44 0x0004 + SetSyncFlag 0x00000008 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + Jump script_0800927E + .2byte 0x0000 diff --git a/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc new file mode 100644 index 00000000..e871a204 --- /dev/null +++ b/data/scripts/cutscene/introAssembly/script_Npc4EIntroAssembly.inc @@ -0,0 +1,77 @@ +@ Intro Assembly NPC4E +SCRIPT_START script_Npc4EIntroAssembly + BeginBlock + SetEntityPositionRelative 0x0088, 0x0078 + EndBlock +script_08008E12: + CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 + JumpIfNot script_08008E12 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807F0B4 0x0001 + CameraTargetEntity + WaitForPlayerAction0x17 + Wait 0x003c + StartPlayerScript script_PlayerEnters + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + Wait 0x003c + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + Wait 0x000f + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + MessageFromTargetPos 0x1053, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + GivePlayerItem 0x0035 + WaitPlayerGetItem + StartPlayerScript script_PlayerGetSword + WaitForSyncFlagAndClear 0x00000020 + _0807E8E4_0 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000010 + Wait 0x0078 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + _0807E8E4_1 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + GivePlayerItem 0x0047 + WaitPlayerGetItem + SetIntVariable 0x00000003 + Call sub_0807F420 + _0807E8E4_0 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + _0807F0B4 0x0004 + CameraTargetPlayer + SetGlobalFlag 0x0015 + Call sub_0806DCC0 + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc similarity index 67% rename from data/scripts/script_08008F74.inc rename to data/scripts/cutscene/introAssembly/script_PlayerEnters.inc index 8db32075..c2b49497 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerEnters.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08008F74 +@ Intro Assembly Player +SCRIPT_START script_PlayerEnters BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,14 +7,14 @@ SCRIPT_START script_08008F74 _0807EDD4 0x00b8, 0x0090 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0001 _0807EDD4 0x0088, 0x0078 _0807EB44 0x0000 DoPostScriptAction 0x0000 Wait 0x000f - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc similarity index 72% rename from data/scripts/script_08008FC0.inc rename to data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc index 04ab3012..af4e4dd7 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerGetSword.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08008FC0 +@ Intro Assembly Player gets Sword +SCRIPT_START script_PlayerGetSword _0807F078 0x0001, 0x0001 CallWithArg sub_0807F918, 0x00000001 PlaySound SFX_109 @@ -6,7 +7,7 @@ SCRIPT_START script_08008FC0 Call sub_0807F304 MessageFromTargetPos 0x0501, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009E88.inc b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc similarity index 80% rename from data/scripts/script_08009E88.inc rename to data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc index 4fc207f9..931c03f4 100644 --- a/data/scripts/script_08009E88.inc +++ b/data/scripts/cutscene/introAssembly/script_PlayerWakingUpInHyruleCastle.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009E88 +@ Intro Hyrule Castle Player Sleeping +SCRIPT_START script_PlayerWakingUpInHyruleCastle BeginBlock Call sub_0807DF28 _0807E864 @@ -19,7 +20,7 @@ SCRIPT_START script_08009E88 Wait 0x003c _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish script_08009EA4: Call sub_0807F0D8 JumpIfNot script_08009EA4 diff --git a/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc new file mode 100644 index 00000000..56c32d55 --- /dev/null +++ b/data/scripts/cutscene/introAssembly/script_SmithAtAssembly.inc @@ -0,0 +1,55 @@ +@ Intro Assembly Smith +SCRIPT_START script_SmithAtAssembly + BeginBlock + Call sub_0807F348 + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + EndBlock + WaitForSyncFlagAndClear 0x00000001 + _0807EB74 + DoPostScriptAction 0x0001 + MessageFromTargetPos 0x105b, 0x0000 + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + DoPostScriptAction 0x0005 + Wait 0x003c + DoPostScriptAction 0x0001 + MessageFromTargetPos 0x1051, 0x0000 + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + DoPostScriptAction 0x0004 + Wait 0x003c + _0807EB74 + _0807EB8C + DoPostScriptAction 0x0001 + MessageFromTargetPos 0x1055, 0x0000 + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + _0807EB74 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + SetEntitySpeed 0x0080 + DoPostScriptAction 0x0001 + _0807EDD4 0x0098, 0x0078 + _0807EB74 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x0001 + MessageFromTargetPos 0x1059, 0x0000 + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000002 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + Jump script_080092B2 + .2byte 0x0000 diff --git a/data/scripts/script_080157AC.inc b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc similarity index 62% rename from data/scripts/script_080157AC.inc rename to data/scripts/cutscene/introBusinessScrub/script_080157AC.inc index 2cb7bc3c..6771b682 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_080157AC.inc @@ -1,11 +1,12 @@ +@ Intro Outside Castle OBJECT_69 1? SCRIPT_START script_080157AC CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 JumpIfNot script_080157AC _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 script_080157DA: @@ -16,30 +17,30 @@ script_080157DA: Call sub_0807DF28 Call sub_0807F3F8 Wait 0x003c - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - StartPlayerScript script_080158F8 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + StartPlayerScript script_PlayerIntroBusinessScrub1 _0807F0B4 0x0001 SetEntityPositionRelative 0x0248, 0x0218 CameraTargetEntity Call sub_0807F5C0 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - StartPlayerScript script_08015918 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + StartPlayerScript script_PlayerIntroBusinessScrub2 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x1066, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 Call sub_08066F94 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 script_08015880: CheckRoomFlag 0x0000 JumpIfNot script_08015880 @@ -52,17 +53,17 @@ script_08015888: _0807F0B4 0x0002 SetEntityPositionRelative 0x0248, 0x0208 CameraTargetEntity - StartPlayerScript script_08015938 - WaitForSomething2 0x00000010 + StartPlayerScript script_PlayerIntroBusinessScrub3 + WaitForSyncFlagAndClear 0x00000010 MessageFromTargetPos 0x106a, 0x000c WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0078 _0807E8E4_2 MessageFromTargetPos 0x1068, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 .ifdef JP SetLocalFlag 0x0089 .else diff --git a/data/scripts/script_08015B14.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc similarity index 68% rename from data/scripts/script_08015B14.inc rename to data/scripts/cutscene/introBusinessScrub/script_08015B14.inc index f0f3c82a..0ec77806 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B14.inc @@ -1,10 +1,11 @@ +@ OBJECT_6A in sub_080954AC ? businessScrubPrologue? SCRIPT_START script_08015B14 BeginBlock _0807E930 0x0018 SetEntitySpeed 0x0300 EndBlock _0807EDD4 0x0248, 0x0218 - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc similarity index 76% rename from data/scripts/script_08015B34.inc rename to data/scripts/cutscene/introBusinessScrub/script_08015B34.inc index 6c5d3065..d93ccb08 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_08015B34.inc @@ -1,3 +1,4 @@ +@ Intro Outside Castle OBJECT_69 2? SCRIPT_START script_08015B34 EndBlock BeginBlock @@ -15,6 +16,7 @@ SCRIPT_START script_08015B34 .endif .endif JumpIf script_08015B7E + @ Prevent player from leaving to Hyrule Town CallWithArg sub_0807F6B4, 0x00000318 JumpIfNot script_08015B34 EndBlock @@ -23,8 +25,8 @@ SCRIPT_START script_08015B34 Call sub_0807DF28 MessageFromTargetPos 0x2506, 0x0002 WaitUntilTextboxCloses - StartPlayerScript script_08015B84 - WaitForSomething2 0x00000004 + StartPlayerScript script_PlayerAtIntroBusinessScrub4 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 Jump script_08015B34 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc similarity index 64% rename from data/scripts/script_08015AC4.inc rename to data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc index b0b245f7..52ceeee2 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_BusinessScrubIntro.inc @@ -1,18 +1,19 @@ -SCRIPT_START script_08015AC4 +@ Intro Outside Castle Business Scrub +SCRIPT_START script_BusinessScrubIntro BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0007 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E908 0x0006 SetRoomFlag 0x0000 _0807EB44 0x0004 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Wait 0x003c PlaySound SFX_SECRET Call sub_08046078 diff --git a/data/scripts/script_08015B84.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc similarity index 60% rename from data/scripts/script_08015B84.inc rename to data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc index afe2682a..02806a81 100644 --- a/data/scripts/script_08015B84.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerAtIntroBusinessScrub4.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08015B84 +@ Player at intro outside castle +SCRIPT_START script_PlayerAtIntroBusinessScrub4 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080158F8.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc similarity index 53% rename from data/scripts/script_080158F8.inc rename to data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc index 0c4d7f69..a83e7979 100644 --- a/data/scripts/script_080158F8.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub1.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_080158F8 +@ Player at intro outside castle 1? +SCRIPT_START script_PlayerIntroBusinessScrub1 SetEntitySpeed 0x0100 _0807EDD4 0x0218, 0x0238 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015918.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc similarity index 54% rename from data/scripts/script_08015918.inc rename to data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc index 2c49a5c5..ca673adf 100644 --- a/data/scripts/script_08015918.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub2.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_08015918 +@ Player at intro outside castle +SCRIPT_START script_PlayerIntroBusinessScrub2 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0228 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015938.inc b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc similarity index 55% rename from data/scripts/script_08015938.inc rename to data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc index df0c766b..d9bb7e36 100644 --- a/data/scripts/script_08015938.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_PlayerIntroBusinessScrub3.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_08015938 +@ Intro Outside Castle Player +SCRIPT_START script_PlayerIntroBusinessScrub3 SetEntitySpeed 0x0100 _0807EDD4 0x0248, 0x0208 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015958.inc b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc similarity index 74% rename from data/scripts/script_08015958.inc rename to data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc index a8d05e76..1d91c7f0 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08015958 +@ Intro Outside Castle Zelda +SCRIPT_START script_ZeldaIntroBusinessScrub BeginBlock SetEntitySpeed 0x0180 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_08066D04 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 BeginBlock Call sub_08066D14 MoveEntityToPlayer @@ -21,12 +22,12 @@ SCRIPT_START script_08015958 SetEntityPositionRelative 0x0248, 0x0218 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 Call sub_0807F3C8 PlaySound SFX_VO_ZELDA3 SetEntitySpeed 0x0200 @@ -35,19 +36,19 @@ SCRIPT_START script_08015958 Call sub_0807F2D4 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EDD4 0x0238, 0x0238 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a _0807E9D4 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_08015A32: EndBlock BeginBlock @@ -65,9 +66,9 @@ script_08015A54: DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call sub_08066D4C - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/cutscene/introCeremony/script_08011890.inc similarity index 66% rename from data/scripts/script_08011890.inc rename to data/scripts/cutscene/introCeremony/script_08011890.inc index f820b99f..9ccc9bc5 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/cutscene/introCeremony/script_08011890.inc @@ -1,3 +1,4 @@ +@ Something during Intro Ceremony? Called via script_VaatiIntroCeremony SCRIPT_START script_08011890 BeginBlock _0807E930 0x0000 @@ -10,7 +11,7 @@ SCRIPT_START script_08011890 _0807EDD4 0x01f8, 0x0088 Call sub_08094B80 PlaySound SFX_1CC - _0807E5F8 0x10000000 - WaitForSomething2 0x08000000 + SetSyncFlag 0x10000000 + WaitForSyncFlagAndClear 0x08000000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080113AA.inc b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc similarity index 62% rename from data/scripts/script_080113AA.inc rename to data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc index c2dd7844..59b81dea 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardBottomRight.inc @@ -1,14 +1,15 @@ -SCRIPT_START script_080113AA - _0807E610 0x00002000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 +@ Intro Ceremony Guard bottom right +SCRIPT_START script_GuardBottomRight + ClearSyncFlag 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 _0807E930 0x0005 _0807EB44 0x0002 _0807EC94 0x0010 _0807EB44 0x0004 _0807E930 0x0002 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 @@ -19,8 +20,8 @@ SCRIPT_START script_080113AA _0807EDD4 0x0200, 0x0098 _0807EDD4 0x0200, 0x00c8 _0807E930 0x0013 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 @@ -29,6 +30,6 @@ SCRIPT_START script_080113AA SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c - _0807E5F8 0x00004000 + SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080112C4.inc b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc similarity index 62% rename from data/scripts/script_080112C4.inc rename to data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc index ef5f171c..33d049b7 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardCarryingChest.inc @@ -1,11 +1,13 @@ -SCRIPT_START script_080112C4 +@ Intro Ceremony Chest carrying Guard +@ and guard bottom left? +SCRIPT_START script_GuardCarryingChest BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08095244 Call sub_0807F338 EndBlock - WaitForSomething 0x0002a800 + WaitForSyncFlag 0x0002a800 DoPostScriptAction 0x0007 _0807E930 0x0006 _0807ECC4 0x0010 @@ -15,18 +17,19 @@ SCRIPT_START script_080112C4 _0807ECC4 0x0010 _0807E930 0x0002 Call sub_08064050 - JumpTable script_08011312, script_080113AA, script_08011442, script_08011508 + JumpTable script_08011312, script_GuardBottomRight, script_GuardTopLeft, script_GuardTopRight +@ Guard bottom left: script_08011312: - _0807E610 0x00000800 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + ClearSyncFlag 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 _0807E930 0x0007 _0807EB44 0x0006 _0807ECF4 0x0010 _0807EB44 0x0004 _0807E930 0x0002 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 @@ -37,8 +40,8 @@ script_08011312: _0807EDD4 0x01f0, 0x0098 _0807EDD4 0x01f0, 0x00c8 _0807E930 0x0013 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0010 Wait 0x000a DoPostScriptAction 0x0010 @@ -47,6 +50,6 @@ script_08011312: SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080115D0.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc similarity index 53% rename from data/scripts/script_080115D0.inc rename to data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc index bc84211f..c826ed27 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryLeft.inc @@ -1,15 +1,16 @@ -SCRIPT_START script_080115D0 +@ Intro Ceremony Entrance Guard left +SCRIPT_START script_GuardEntryLeft BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807E930 0x0001 EndBlock - WaitForSomething2 0x00080000 + WaitForSyncFlagAndClear 0x00080000 _0807E930 0x0005 PlaySound SFX_11C _0807ECF4 0x0010 _0807E930 0x0001 - _0807E5F8 0x00100000 - WaitForSomething2 0x00080000 + SetSyncFlag 0x00100000 + WaitForSyncFlagAndClear 0x00080000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011608.inc b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc similarity index 53% rename from data/scripts/script_08011608.inc rename to data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc index f540d792..3a132ca8 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardEntryRight.inc @@ -1,15 +1,16 @@ -SCRIPT_START script_08011608 +@ Intro Ceremony Entrace Guard right +SCRIPT_START script_GuardEntryRight BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0006 _0807E930 0x0003 EndBlock - WaitForSomething2 0x00200000 + WaitForSyncFlagAndClear 0x00200000 _0807E930 0x0007 PlaySound SFX_11C _0807EC94 0x0010 _0807E930 0x0003 - _0807E5F8 0x00400000 - WaitForSomething2 0x00200000 + SetSyncFlag 0x00400000 + WaitForSyncFlagAndClear 0x00200000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011442.inc b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc similarity index 60% rename from data/scripts/script_08011442.inc rename to data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc index 60fb8b68..d8dd17d9 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopLeft.inc @@ -1,7 +1,8 @@ -SCRIPT_START script_08011442 - _0807E610 0x00008000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 +@ Intro Ceremony Guard top left +SCRIPT_START script_GuardTopLeft + ClearSyncFlag 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x0007 _0807EB44 0x0006 _0807ECF4 0x0020 @@ -9,35 +10,35 @@ SCRIPT_START script_08011442 _0807E930 0x0006 _0807ECC4 0x0010 _0807E930 0x0002 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x01e8, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d _0807E930 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 Call sub_0807F3C8 _0807E930 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x001e _0807EC1C 0x003c - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011508.inc b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc similarity index 60% rename from data/scripts/script_08011508.inc rename to data/scripts/cutscene/introCeremony/script_GuardTopRight.inc index 4b312019..1a5b8eb3 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/cutscene/introCeremony/script_GuardTopRight.inc @@ -1,7 +1,8 @@ -SCRIPT_START script_08011508 - _0807E610 0x00020000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 +@ Intro Ceremony Guard top right +SCRIPT_START script_GuardTopRight + ClearSyncFlag 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 _0807E930 0x0005 _0807EB44 0x0002 _0807EC94 0x0020 @@ -9,36 +10,36 @@ SCRIPT_START script_08011508 _0807E930 0x0006 _0807ECC4 0x0010 _0807E930 0x0002 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0004 Wait 0x003c _0807E930 0x0012 PlaySound SFX_EM_MOBLIN_SPEAR - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 _0807E930 0x0014 SetEntitySpeed 0x0100 _0807EDD4 0x0208, 0x0098 SetEntitySpeed 0x0040 _0807EEF4 0x0000, 0x0010 _0807E930 0x0013 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x000d _0807E930 0x0014 SetEntitySpeed 0x0020 _0807EEF4 0x0000, 0xfff0 _0807E930 0x0013 DoPostScriptAction 0x0010 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 Call sub_0807F3C8 _0807E930 0x0014 SetEntitySpeed 0x0400 SetEntityDirection 0x0002 _0807EC1C 0x003c - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08011640.inc b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc similarity index 69% rename from data/scripts/script_08011640.inc rename to data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc index aecf84a6..cab32512 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/cutscene/introCeremony/script_KingDaltusIntroCeremony.inc @@ -1,18 +1,19 @@ -SCRIPT_START script_08011640 +@ Intro Ceremony King Daltus +SCRIPT_START script_KingDaltusIntroCeremony BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 _0807EDD4 0x01f8, 0x0048 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000040 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000040 DoPostScriptAction 0x0010 Wait 0x001e DoPostScriptAction 0x0010 @@ -20,6 +21,6 @@ SCRIPT_START script_08011640 SetEntitySpeed 0x0400 SetEntityDirection 0x0008 _0807EC1C 0x003c - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011128.inc b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc similarity index 68% rename from data/scripts/script_08011128.inc rename to data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc index a2789561..0af3031f 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/cutscene/introCeremony/script_MinisterPothoIntroCastle.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08011128 +@ Intro Hyrule Castle Minister Potho +SCRIPT_START script_MinisterPothoIntroCastle BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -19,23 +20,23 @@ script_08011134: JumpIfNot script_08011134 LoadRoomEntityList gUnk_080F06B0 DoPostScriptAction 0x000b - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetEntityPositionRelative 0x01b8, 0x0058 _0807EB44 0x0004 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0006 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0004 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807ECC4 0x0010 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0010 Wait 0x001e DoPostScriptAction 0x0010 @@ -43,7 +44,7 @@ script_08011134: SetEntitySpeed 0x0400 SetEntityDirection 0x001c _0807EC1C 0x003c - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END .ifdef JP diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc similarity index 64% rename from data/scripts/script_08010E5A.inc rename to data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc index 62f2874d..f64d4428 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08010E5A +@ Intro Ceremony NPC4E monsters +SCRIPT_START script_Npc4EMonsters Wait 0x001e PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 @@ -10,20 +11,20 @@ SCRIPT_START script_08010E5A CallWithArg sub_0807FB28, 0x00000003 Wait 0x001e PlaySound SFX_12C - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 _0807E778 0x0004 DoFade7 - WaitFor_2 + WaitForFadeFinish Wait 0x003c PlaySound SFX_SPIRITS_RELEASE PlaySound SFX_1C2 LoadRoomEntityList gUnk_080F0770 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 Call sub_0806DC3C @@ -32,21 +33,21 @@ SCRIPT_START script_08010E5A CallWithArg sub_0807F29C, gUnk_080049F6 _0807F0B4 0x0001 SetEntityPositionRelative 0x01f8, 0x0068 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x001e - _0807E5F8 0x00000040 - WaitForSomething2 0x00000008 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000008 + WaitForSyncFlagAndClear 0x00000080 PlaySound SFX_1C3 - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 Wait 0x0078 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 - _0807E5F8 0x40000000 - _0807E5F8 0x00000010 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000200 + SetSyncFlag 0x40000000 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000200 MessageFromTargetPos 0x1045, 0x000c WaitUntilTextboxCloses MessageFromTargetPos 0x1046, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc similarity index 60% rename from data/scripts/script_08010F84.inc rename to data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc index 64f3c058..69a6d693 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_08010F84 +@ Intro Ceremony NPC4E Vaati attacking +SCRIPT_START script_Npc4EVaatiAttacking Wait 0x003c - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - StartPlayerScript script_080110BC - WaitForSomething2 0x00000400 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + StartPlayerScript script_PlayerProtectingZelda + WaitForSyncFlagAndClear 0x00000400 MessageFromTargetPos 0x1047, 0x0000 WaitUntilTextboxCloses Call sub_0806DC3C @@ -11,12 +12,12 @@ SCRIPT_START script_08010F84 CallWithArg sub_0807F244, 0x0000000d CallWithArg sub_0807F29C, gUnk_080049F6 Wait 0x001e - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 Wait 0x003c - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 PlaySound SFX_125 CallWithArg sub_0807FB28, 0x00000003 Wait 0x000f @@ -24,20 +25,20 @@ SCRIPT_START script_08010F84 CallWithArg sub_0807FB28, 0x00000003 CallWithArg DeleteManager36, 0x00000002 _0807F0C8 0x0000, 0x0000 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 StopBgm Wait 0x003c MessageFromTargetPos 0x104a, 0x0000 WaitUntilTextboxCloses - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 MessageFromTargetPos 0x1049, 0x0000 WaitUntilTextboxCloses SetEntityPositionRelative 0x01f8, 0x0098 Wait 0x0078 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 Call sub_0804BCDC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc b/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc new file mode 100644 index 00000000..786aa81e --- /dev/null +++ b/data/scripts/cutscene/introCeremony/script_Object6AMonsterFromChest.inc @@ -0,0 +1,6 @@ +@ Intro Ceremony OBJECT_6A Monster from Chest +SCRIPT_START script_Object6AMonsterFromChest + WaitForSyncFlag 0x20000000 + Call sub_0809567C +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc new file mode 100644 index 00000000..3b4b91f2 --- /dev/null +++ b/data/scripts/cutscene/introCeremony/script_Object6ASwordInChest.inc @@ -0,0 +1,20 @@ +@ Intro Ceremony OBJECT_6A Sword in Chest +SCRIPT_START script_Object6ASwordInChest + BeginBlock + Call sub_08095330 + EndBlock + WaitForSyncFlagAndClear 0x00800000 + _0807EF3C 0x0000, 0x0020 + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 + Call sub_08095364 + PlaySound SFX_122 + Wait 0x003c + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 + _0807E930 0x0002 + SetSyncFlag 0x01000000 + WaitForSyncFlagAndClear 0x00800000 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08011098.inc b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc similarity index 52% rename from data/scripts/script_08011098.inc rename to data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc index 5a5b24bb..0d800ec9 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerAtIntroCeremony.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_08011098 +@ Intro Ceremony Player +SCRIPT_START script_PlayerAtIntroCeremony SetEntityPositionRelative 0x01a8, 0x0058 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - _0807E610 0x00000002 + SetSyncFlag 0x00000400 + ClearSyncFlag 0x00000002 EndBlock Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110E8.inc b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc similarity index 73% rename from data/scripts/script_080110E8.inc rename to data/scripts/cutscene/introCeremony/script_PlayerFainting.inc index 95ed5ca6..386826af 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerFainting.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080110E8 +@ Intro Ceremony Player fainting +SCRIPT_START script_PlayerFainting PlaySound SFX_PLY_VO6 _0807EB44 0x0004 DoPostScriptAction 0x000d @@ -11,6 +12,6 @@ SCRIPT_START script_080110E8 DoPostScriptAction 0x0011 EndBlock Call sub_0807F2D4 - WaitForSomething 0x80000000 + WaitForSyncFlag 0x80000000 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08011074.inc b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc similarity index 61% rename from data/scripts/script_08011074.inc rename to data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc index 4f3ea168..f3d1557d 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerIntroCastle.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08011074 +@ Intro Hyrule Castle Player +SCRIPT_START script_PlayerIntroCastle BeginBlock SetEntitySpeed 0x0080 EndBlock _0807EDD4 0x01e8, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110BC.inc b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc similarity index 64% rename from data/scripts/script_080110BC.inc rename to data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc index 9827dbfb..e0c26443 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/cutscene/introCeremony/script_PlayerProtectingZelda.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080110BC +@ Intro ceremony Player protecting Zelda +SCRIPT_START script_PlayerProtectingZelda BeginBlock SetEntitySpeed 0x0040 EndBlock @@ -7,6 +8,6 @@ SCRIPT_START script_080110BC _0807EDD4 0x01d8, 0x0068 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080118D4.inc b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc similarity index 59% rename from data/scripts/script_080118D4.inc rename to data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc index f27d95f1..c00eb537 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiDarkMagic.inc @@ -1,20 +1,21 @@ -SCRIPT_START script_080118D4 +@ Intro Ceremony Vaati Dark magic? +SCRIPT_START script_VaatiDarkMagic BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 Call nullsub_527 Call sub_08094B80 EndBlock - WaitForSomething2 0x08000000 + WaitForSyncFlagAndClear 0x08000000 Call sub_08094B6C _0807EDD4 0x01d8, 0x0078 - StartPlayerScript script_080110E8 + StartPlayerScript script_PlayerFainting _0807EDD4 0x01d8, 0x0058 Call sub_08094B80 PlaySound SFX_VO_ZELDA7 PlaySound SFX_1C6 - _0807E5F8 0x10000000 - WaitForSomething2 0x08000000 + SetSyncFlag 0x10000000 + WaitForSyncFlagAndClear 0x08000000 PlaySound SFX_11D DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080116A8.inc b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc similarity index 62% rename from data/scripts/script_080116A8.inc rename to data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc index 57538123..2557a4c2 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc @@ -1,35 +1,36 @@ -SCRIPT_START script_080116A8 +@ Intro Ceremony Vaati +SCRIPT_START script_VaatiIntroCeremony BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0100 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000100 + WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x00d0 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0004 DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x001c Call sub_0807F2D4 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x001a Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 _0807EB44 0x0000 DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP @@ -37,30 +38,30 @@ SCRIPT_START script_080116A8 Wait 0x00f0 DoPostScriptAction 0x0016 PlaySound SFX_1CB - WaitForSomething2 0x10000000 + WaitForSyncFlagAndClear 0x10000000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 DoPostScriptAction 0x0014 PlaySound SFX_1C4 - CallWithArg sub_0809545C, script_080118D4 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + CallWithArg sub_0809545C, script_VaatiDarkMagic + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 Wait 0x003c DoPostScriptAction 0x0016 PlaySound SFX_1C5 - _0807E5F8 0x08000000 - WaitForSomething2 0x10000000 + SetSyncFlag 0x08000000 + WaitForSyncFlagAndClear 0x10000000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0098 @@ -74,12 +75,12 @@ SCRIPT_START script_080116A8 _0807EB44 0x0004 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000200 - WaitForSomething2 0x00000100 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000100 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080111CC.inc b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc similarity index 66% rename from data/scripts/script_080111CC.inc rename to data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc index 6c63ae50..b0554ed0 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_080111CC +@ Intro Hyrule Castle Zelda +SCRIPT_START script_ZeldaIntroCastle BeginBlock DoPostScriptAction 0x0008 SetEntitySpeed 0x0100 Call sub_08066D04 EndBlock Call sub_0807F338 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066D14 JumpIf script_080111F6 MoveEntityToPlayer @@ -19,28 +20,28 @@ script_08011206: _0807EDD4 0x01f8, 0x0050 _0807EB74 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 _0807EDD4 0x01f8, 0x0020 DoPostScriptAction 0x0008 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 DoPostScriptAction 0x0001 SetEntitySpeed 0x0040 _0807EDD4 0x01e8, 0x0040 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 Call sub_08095810 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0001 _0807EDD4 0x01d8, 0x0058 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 PlaySound SFX_1C9 DoPostScriptAction 0x0010 Wait 0x0014 @@ -49,7 +50,7 @@ script_08011206: DoPostScriptAction 0x0010 Call sub_0807F2D4 PlaySound SFX_1CA - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc new file mode 100644 index 00000000..03506c59 --- /dev/null +++ b/data/scripts/cutscene/introCeremony/script_ZeldaMagic.inc @@ -0,0 +1,5 @@ +@ Intro Ceremony OBJECT_6A Zelda shine or something? +SCRIPT_START script_ZeldaMagic + WaitForSyncFlag 0x40000000 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_BeedleIntro.inc b/data/scripts/cutscene/introTown/script_BeedleIntro.inc new file mode 100644 index 00000000..e0e1359b --- /dev/null +++ b/data/scripts/cutscene/introTown/script_BeedleIntro.inc @@ -0,0 +1,20 @@ +@ Intro Hyrule Town Beedle +SCRIPT_START script_BeedleIntro + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0000 + _0807E9D4 + DoPostScriptAction 0x000a + Call sub_0807F348 + EndBlock +script_0800F604: + CheckEntityInteractType + JumpIfNot script_0800F604 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + MessageNoOverlap 0x2511 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800F604 diff --git a/data/scripts/cutscene/introTown/script_GuardIntro.inc b/data/scripts/cutscene/introTown/script_GuardIntro.inc new file mode 100644 index 00000000..9424bff8 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_GuardIntro.inc @@ -0,0 +1,19 @@ +@ Intro Hyrule Town Guard +SCRIPT_START script_GuardIntro + BeginBlock + _0807EB44 0x0006 + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000008 + EndBlock +script_0800F5C8: + CheckEntityInteractType + JumpIfNot script_0800F5C8 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_08064428 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800F5C8 + .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro1.inc b/data/scripts/cutscene/introTown/script_KidIntro1.inc new file mode 100644 index 00000000..c705c186 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_KidIntro1.inc @@ -0,0 +1,18 @@ +@ Intro Hyrule Town Kid listening to Townsperson +SCRIPT_START script_KidIntro1 + BeginBlock + DoPostScriptAction 0x0001 + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_0800F592: + CheckEntityInteractType + JumpIfNot script_0800F592 + _0807E864 + _0807EB74 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + DoPostScriptAction 0x0001 + Jump script_0800F592 + .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_KidIntro2.inc b/data/scripts/cutscene/introTown/script_KidIntro2.inc new file mode 100644 index 00000000..008ef2e8 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_KidIntro2.inc @@ -0,0 +1,36 @@ +@ Hyrule Town Intro Kid blocking the way +SCRIPT_START script_KidIntro2 + BeginBlock + DoPostScriptAction 0x0001 + _0807E9D4 + DoPostScriptAction 0x000a + Call sub_08062788 + EndBlock +script_0800F6F4: +.ifdef JP + CheckLocalFlag 0x00ca +.else +.ifdef EU + CheckLocalFlag 0x00ca +.else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else + CheckLocalFlag 0x00cd +.endif +.endif +.endif + JumpIf script_0800F718 + CheckEntityInteractType + JumpIfNot script_0800F6F4 + _0807E864 + _0807EB74 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + DoPostScriptAction 0x0001 + Jump script_0800F6F4 +script_0800F718: + Call sub_080627E8 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/introTown/script_KidIntro3.inc b/data/scripts/cutscene/introTown/script_KidIntro3.inc new file mode 100644 index 00000000..d9813de7 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_KidIntro3.inc @@ -0,0 +1,24 @@ +@ Intro Hyrule Town Kid +SCRIPT_START script_KidIntro3 + BeginBlock + DoPostScriptAction 0x0008 + EndBlock +script_0800F72C: +.ifdef JP + CheckLocalFlag 0x00ca +.else +.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_KidIntro1 + + diff --git a/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc new file mode 100644 index 00000000..ea3471c4 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroCastle.inc @@ -0,0 +1,121 @@ +@ Intro Hyrule Castle NPC4E +SCRIPT_START script_Npc4EIntroCastle + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerIntroCastle + WaitForSyncFlagAndClear 0x00000400 + _0807F078 0x0034, 0x0002 + MessageFromTargetPos 0x1036, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + MessageFromTargetPos 0x1037, 0x0002 + WaitUntilTextboxCloses + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + MessageFromTargetPos 0x1038, 0x000c + WaitUntilTextboxCloses + StopBgm + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + Call sub_08064180 + LoadRoomEntityList gUnk_080F06E0 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + StartPlayerScript script_PlayerAtIntroCeremony + WaitForSyncFlagAndClear 0x00000400 + SetEntityPositionRelative 0x01f8, 0x0050 + _0807F0B4 0x0007 + CameraTargetEntity + Wait 0x000a + _0807F0B4 0x0001 + _0807E778 0x0001 + DoFade4 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 + SetEntityPositionRelative 0x01f8, 0x0078 + Wait 0x003c + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 + _0807E8E4_1 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + MessageFromTargetPos 0x1039, 0x000c + WaitUntilTextboxCloses + PlayBgm BGM_CASTLE_TOURNAMENT + _0807E8E4_2 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 + WaitForSyncFlagAndClear 0x00000080 + Wait 0x012c + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + MessageFromTargetPos 0x103a, 0x000c + WaitUntilTextboxCloses + SetEntityPositionRelative 0x01f8, 0x01c0 + _0807F0B4 0x0004 + Wait 0x0078 + SetSyncFlag 0x00280000 + WaitForSyncFlagAndClear 0x00500000 + SetSyncFlag 0x00000100 + SetEntityPositionRelative 0x01f8, 0x0220 + SetEntitySpeed 0x0100 + _0807EDD4 0x01f8, 0x0098 + Wait 0x003c + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00280000 + StopBgm + PlaySound SFX_9B + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + MessageFromTargetPos 0x1043, 0x0000 + WaitUntilTextboxCloses + PlayBgm BGM_VAATI_THEME + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x0002a800 + WaitForSyncFlagAndClear 0x00055000 + PlaySound SFX_1C7 + PlaySound SFX_BUTTON_DEPRESS + SetSyncFlag 0x00000100 + SetSyncFlag 0x00002800 + CallWithArg sub_0807FB28, 0x00000003 + WaitForSyncFlagAndClear 0x00000200 + WaitForSyncFlagAndClear 0x00005000 + SetSyncFlag 0x00028000 + WaitForSyncFlagAndClear 0x00050000 + MessageFromTargetPos 0x1044, 0x0000 + WaitUntilTextboxCloses + SetEntityPositionRelative 0x01f8, 0x0098 + StopBgm + Wait 0x003c + PlayBgm BGM_VAATI_REBORN + SetSyncFlag 0x00028000 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000200 + WaitForSyncFlagAndClear 0x00050000 + CallWithArg sub_0807FB28, 0x00000003 + PlaySound SFX_BUTTON_DEPRESS + SetSyncFlag 0x00028000 + WaitForSyncFlagAndClear 0x00050000 + PlaySound SFX_125 + CallWithArg sub_0807FB28, 0x00000003 + SetSyncFlag 0x08000000 + SetSyncFlag 0x00800000 + WaitForSyncFlagAndClear 0x01000000 + CallWithArg CreateManager36, 0x00000002 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800F724.inc b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc similarity index 67% rename from data/scripts/script_0800F724.inc rename to data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc index acc3e12f..67df44fd 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc @@ -1,27 +1,5 @@ -SCRIPT_START script_0800F724 - BeginBlock - DoPostScriptAction 0x0008 - EndBlock -script_0800F72C: -.ifdef JP - CheckLocalFlag 0x00ca -.else -.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 - - -SCRIPT_START script_0800F73C +@ Intro Hyrule Town NPC4E +SCRIPT_START script_Npc4EIntroTown .ifdef JP CheckLocalFlag 0x00ca .else @@ -42,67 +20,71 @@ SCRIPT_START script_0800F73C Call sub_0807F844 _0807E778 0x0002 DoFade6 - WaitFor_2 - StartPlayerScript script_0800FA54 - _0807E5F8 0x00000002 + WaitForFadeFinish + StartPlayerScript script_PlayerIntro1 + SetSyncFlag 0x00000002 _0807F0B4 0x0001 SetEntityPositionRelative 0x00c8, 0x0218 Call sub_0807F5C0 Wait 0x0064 + @ Camera reaches center of town square _0807F0B4 0x0002 SetEntityPositionRelative 0x00c8, 0x0368 Call sub_0807F5C0 - WaitForSomething2 0x00000001 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + @ First message from Zelda MessageFromTargetPos 0x2501, 0x0000 WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + @ Zelda ran off. Give control to the player _0807F0B4 0x0004 CameraTargetPlayer Call sub_0807DF50 _0807E878 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 - StartPlayerScript script_0800FA78 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + StartPlayerScript script_PlayerIntro2 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2503, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 - StartPlayerScript script_0800FA9C - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + StartPlayerScript script_PlayerIntro3 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2504, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 - StartPlayerScript script_0800FAC0 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + StartPlayerScript script_PlayerIntro4 + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 MessageFromTargetPos 0x2505, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_0807DF50 _0807E878 - WaitForSomething2 0x00000004 + @ Wait for Link at Pina + WaitForSyncFlagAndClear 0x00000004 _0807E864 Call sub_0807DF28 Call sub_08063C5C @@ -113,13 +95,13 @@ SCRIPT_START script_0800F73C Wait 0x003c MessageFromTargetPos 0x1021, 0x000e WaitUntilTextboxCloses - StartPlayerScript script_0800FAE4 + StartPlayerScript script_PlayerIntro5 SetEntityPositionRelative 0x00f0, 0x0258 _0807F0B4 0x0001 CameraTargetEntity Wait 0x001e Call sub_08063C2C - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 MessageFromTargetPos 0x1022, 0x000e WaitUntilTextboxCloses _0807E8E4_0 @@ -141,8 +123,8 @@ SCRIPT_START script_0800F73C Call sub_08063C5C MessageFromTargetPos 0x1026, 0x000e WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807E8E4_1 Call sub_08063C2C MessageFromTargetPos 0x1027, 0x0000 @@ -162,8 +144,8 @@ SCRIPT_START script_0800F73C Call sub_08063C14 Call sub_08094D70 PlaySound SFX_103 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 Call sub_08063C14 Call sub_08094D10 Wait 0x001e @@ -174,7 +156,8 @@ SCRIPT_START script_0800F73C Wait 0x003c MessageFromTargetPos 0x102b, 0x0000 WaitUntilTextboxCloses - _0807F034 0x000d + @ Give the shield to the player + GivePlayerItem 0x000d WaitPlayerGetItem Call sub_0806DC3C Call sub_080791BC @@ -187,12 +170,13 @@ SCRIPT_START script_0800F73C Call sub_0807F5B0 MessageFromTargetPos 0x102c, 0x0000 WaitUntilTextboxCloses + @ Give control back to the player CallWithArg sub_0807F29C, 0x00000000 Call sub_0806DC58 _0807F0B4 0x0004 CameraTargetPlayer Wait 0x000a - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08063C44 .ifdef JP SetLocalFlag 0x00ca diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc similarity index 75% rename from data/scripts/script_0800FD0C.inc rename to data/scripts/cutscene/introTown/script_Object69IntroTown.inc index c922a2fb..ff9f8d27 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/cutscene/introTown/script_Object69IntroTown.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800FD0C +@ Intro Hyrule Town OBJECT_69 ? +SCRIPT_START script_Object69IntroTown .ifdef JP CheckLocalFlag 0x00ca .else @@ -13,8 +14,9 @@ SCRIPT_START script_0800FD0C .endif .endif JumpIf script_0800FD50 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 script_0800FD1A: + @ Prevent Link from leaving CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 JumpIfNot script_0800FD1A .ifdef JP @@ -35,8 +37,8 @@ script_0800FD1A: Call sub_0807F9A4 MessageFromTargetPos 0x2506, 0x0000 WaitUntilTextboxCloses - StartPlayerScript script_0800FD80 - WaitForSomething2 0x00000008 + StartPlayerScript script_PlayerIntroTown + WaitForSyncFlagAndClear 0x00000008 _0807E878 Jump script_0800FD1A script_0800FD50: @@ -47,8 +49,8 @@ script_0800FD5C: Call sub_0807F9A4 MessageFromTargetPos 0x106c, 0x0000 WaitUntilTextboxCloses - StartPlayerScript script_0800FD80 - WaitForSomething2 0x00000008 + StartPlayerScript script_PlayerIntroTown + WaitForSyncFlagAndClear 0x00000008 _0807E878 Jump script_0800FD50 .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_PercyIntro.inc b/data/scripts/cutscene/introTown/script_PercyIntro.inc new file mode 100644 index 00000000..a8fda42a --- /dev/null +++ b/data/scripts/cutscene/introTown/script_PercyIntro.inc @@ -0,0 +1,23 @@ +@ Intro Hyrule Town Percy +SCRIPT_START script_PercyIntro + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + _0807E9D4 + EndBlock +script_0800F662: + CheckEntityInteractType + JumpIfNot script_0800F662 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0001 + Call sub_0806B4F0 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + DoPostScriptAction 0x0000 + Jump script_0800F662 + .2byte 0x0000 + + diff --git a/data/scripts/cutscene/introTown/script_PinaIntro.inc b/data/scripts/cutscene/introTown/script_PinaIntro.inc new file mode 100644 index 00000000..bfe9dcf9 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_PinaIntro.inc @@ -0,0 +1,40 @@ +@ Intro Hyrule Town Pina +SCRIPT_START script_PinaIntro + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0000 + _0807E9D4 + DoPostScriptAction 0x000a + Call sub_0807F348 + EndBlock +script_0800F6A0: + CheckEntityInteractType + JumpIfNot script_0800F6A0 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 +.ifdef JP + CheckLocalFlag 0x00ca +.else +.ifdef EU + CheckLocalFlag 0x00ca +.else +.ifdef DEMO_JP + CheckLocalFlag 0x00ca @ TODO deduplicate +.else + CheckLocalFlag 0x00cd +.endif +.endif +.endif + JumpIf script_0800F6C4 + MessageNoOverlap 0x2512 + Jump script_0800F6C8 +script_0800F6C4: + MessageNoOverlap 0x251f +script_0800F6C8: + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_0800F6A0 + .2byte 0x0000 diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc similarity index 65% rename from data/scripts/script_0800FA54.inc rename to data/scripts/cutscene/introTown/script_PlayerIntro1.inc index f860b75f..4732932e 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro1.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800FA54 +@ Intro Hyrule Town Player +SCRIPT_START script_PlayerIntro1 BeginBlock SetEntitySpeed 0x0100 EndBlock SetEntityPositionRelative 0x00d8, 0x0398 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc similarity index 62% rename from data/scripts/script_0800FA78.inc rename to data/scripts/cutscene/introTown/script_PlayerIntro2.inc index 1586c6f1..94540b8a 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800FA78 +@ Intro Hyrule Town Player 2 +SCRIPT_START script_PlayerIntro2 BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00a0, 0x0278 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc similarity index 62% rename from data/scripts/script_0800FA9C.inc rename to data/scripts/cutscene/introTown/script_PlayerIntro3.inc index cf738fff..4f48ea8c 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro3.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800FA9C +@ Intro Hyrule Town Player 3 +SCRIPT_START script_PlayerIntro3 BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0078, 0x01c0 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc similarity index 62% rename from data/scripts/script_0800FAC0.inc rename to data/scripts/cutscene/introTown/script_PlayerIntro4.inc index c9240cf5..9d304aea 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro4.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800FAC0 +@ Intro Hyrule Town Player 4 +SCRIPT_START script_PlayerIntro4 BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0108, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc similarity index 80% rename from data/scripts/script_0800FAE4.inc rename to data/scripts/cutscene/introTown/script_PlayerIntro5.inc index 957eb40f..ce887cd2 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntro5.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800FAE4 +@ Intro Hyrule Town Player at Pina +SCRIPT_START script_PlayerIntro5 BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -12,6 +13,6 @@ script_0800FB10: _0807EDD4 0x00e8, 0x0270 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc similarity index 60% rename from data/scripts/script_0800FD80.inc rename to data/scripts/cutscene/introTown/script_PlayerIntroTown.inc index 2d707a67..a15642df 100644 --- a/data/scripts/script_0800FD80.inc +++ b/data/scripts/cutscene/introTown/script_PlayerIntroTown.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_0800FD80 +@ Hyrule Town Intro Player +SCRIPT_START script_PlayerIntroTown SetEntitySpeed 0x0080 _0807EC64 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_TownsperonIntro.inc b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc new file mode 100644 index 00000000..27ae1e54 --- /dev/null +++ b/data/scripts/cutscene/introTown/script_TownsperonIntro.inc @@ -0,0 +1,18 @@ +@ Intro Hyrule Town Townsperson +SCRIPT_START script_TownsperonIntro + BeginBlock + Call sub_08061FE4 + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_0800F564: + CheckEntityInteractType + JumpIfNot script_0800F564 + _0807E864 + _0807EB74 + Call sub_08061FE4 + Call sub_08061FF4 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800F564 + .2byte 0x0000 diff --git a/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc new file mode 100644 index 00000000..14a141fe --- /dev/null +++ b/data/scripts/cutscene/introTown/script_WindtribespeopleIntro.inc @@ -0,0 +1,17 @@ +@ Intro Hyrule Town WindTribespeople +SCRIPT_START script_WindtribespeopleIntro + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0001 + EndBlock +script_0800F636: + _0807E30C + JumpIfNot script_0800F636 + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + _0807E878 + Jump script_0800F636 + .2byte 0x0000 diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc similarity index 69% rename from data/scripts/script_0800FB44.inc rename to data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc index 687e719e..6cda5954 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/cutscene/introTown/script_ZeldaIntroTown.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800FB44 +@ Intro Hyrule Town Zelda +SCRIPT_START script_ZeldaIntroTown BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x000b SetEntitySpeed 0x0080 Call sub_08066D04 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066D14 JumpIf script_0800FB6C MoveEntityToPlayer @@ -14,26 +15,26 @@ script_0800FB6C: SetEntityPositionRelative 0x00b8, 0x0398 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00b8, 0x0318 SetEntityPositionRelative 0x00a0, 0x0260 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a _0807E9D4 script_0800FBAE: _0807E30C JumpIfNot script_0800FBAE DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00a0, 0x0268 _0807EDD4 0x0070, 0x0268 @@ -41,65 +42,66 @@ script_0800FBAE: SetEntityPositionRelative 0x0078, 0x01a8 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC06: _0807E30C JumpIfNot script_0800FC06 DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x00f8, 0x01a8 SetEntityPositionRelative 0x0118, 0x01c8 _0807EB44 0x0002 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC52: _0807E30C JumpIfNot script_0800FC52 DoPostScriptAction 0x000b - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0200 _0807EDD4 0x0118, 0x0260 SetEntityPositionRelative 0x00f8, 0x0270 _0807EB44 0x0000 DoPostScriptAction 0x0001 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000a script_0800FC9E: + @ Wait at Pina for Link CheckEntityInteractType JumpIfNot script_0800FC9E DoPostScriptAction 0x000b _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0004 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000d SetEntitySpeed 0x0040 _0807EC94 0x0020 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x000c SetEntitySpeed 0x0040 _0807ECF4 0x0020 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066D4C DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F184.inc b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc similarity index 71% rename from data/scripts/script_0800F184.inc rename to data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc index ee317b85..2f96db73 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/cutscene/kinstones/script_HurdyGurdyManFirstKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800F184 +@ Hyrule Town Kinstone cutscene HurdyGurdyMan +SCRIPT_START script_HurdyGurdyManFirstKinstone BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0008 @@ -6,20 +7,20 @@ SCRIPT_START script_0800F184 EndBlock Call sub_0807F348 _0807EB44 0x0002 - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0328 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 _0807EDD4 0x01f8, 0x0328 _0807EB44 0x0004 _0807E930 0x0008 _0807E8E4_0 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 Call sub_0806E440 Wait 0x0078 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 script_0800F1E6: EndBlock BeginBlock @@ -34,8 +35,8 @@ script_0800F1E6: Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses - StartPlayerScript script_0800F33C - WaitForSomething2 0x00000400 + StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone1 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F22A: @@ -50,8 +51,8 @@ script_0800F22A: Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses - StartPlayerScript script_0800F354 - WaitForSomething2 0x00000400 + StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone2 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F26A: @@ -66,8 +67,8 @@ script_0800F26A: Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses - StartPlayerScript script_0800F36C - WaitForSomething2 0x00000400 + StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone3 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F2AA: @@ -82,8 +83,8 @@ script_0800F2AA: Wait 0x003c MessageFromTargetPos 0x1206, 0x000c WaitUntilTextboxCloses - StartPlayerScript script_0800F384 - WaitForSomething2 0x00000400 + StartPlayerScript script_PlayerAtHurdyGurdyManFirstKinstone4 + WaitForSyncFlagAndClear 0x00000400 _0807E878 Jump script_0800F1E6 script_0800F2EA: @@ -103,11 +104,11 @@ script_0800F2EA: Jump script_0800F1E6 script_0800F314: EndBlock - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EB44 0x0002 _0807EEF4 0x00c0, 0x0000 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc similarity index 79% rename from data/scripts/script_0800F39C.inc rename to data/scripts/cutscene/kinstones/script_KidKinstone1.inc index a03aa9fa..21c9883d 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone1.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800F39C +@ Hyrule Town Kinstone cutscene Kid 1 +SCRIPT_START script_KidKinstone1 BeginBlock _0807E9D4 _0807EB44 0x0002 @@ -8,7 +9,7 @@ SCRIPT_START script_0800F39C DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0007 _0807EDD4 0x01f8, 0x0318 _0807EDD4 0x0208, 0x0318 @@ -16,7 +17,7 @@ SCRIPT_START script_0800F39C _0807EB44 0x0006 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 script_0800F3EA: EndBlock BeginBlock @@ -29,7 +30,7 @@ script_0800F3EA: WaitUntilTextboxCloses _0807E878 script_0800F402: - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIfNot script_0800F3EA EndBlock DoPostScriptAction 0x000b @@ -37,6 +38,6 @@ script_0800F402: SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F430.inc b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc similarity index 79% rename from data/scripts/script_0800F430.inc rename to data/scripts/cutscene/kinstones/script_KidKinstone2.inc index b601ce10..d3cdd400 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800F430 +@ Hyrule Town Kinstone cutscene Kid 2 +SCRIPT_START script_KidKinstone2 BeginBlock _0807E9D4 _0807EB44 0x0002 @@ -8,14 +9,14 @@ SCRIPT_START script_0800F430 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0007 _0807EDD4 0x01d8, 0x0328 _0807EDD4 0x01f8, 0x0348 _0807EB44 0x0000 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 script_0800F478: EndBlock BeginBlock @@ -28,7 +29,7 @@ script_0800F478: WaitUntilTextboxCloses _0807E878 script_0800F490: - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIfNot script_0800F478 EndBlock DoPostScriptAction 0x000b @@ -37,7 +38,7 @@ script_0800F490: _0807EC94 0x0010 _0807EC64 0x0020 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc similarity index 79% rename from data/scripts/script_0800F4C4.inc rename to data/scripts/cutscene/kinstones/script_KidKinstone3.inc index 41815127..1039e878 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/cutscene/kinstones/script_KidKinstone3.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800F4C4 +@ Hyrule Town Kinstone cutscene Kid 3 +SCRIPT_START script_KidKinstone3 BeginBlock _0807E9D4 _0807EB44 0x0002 @@ -8,14 +9,14 @@ SCRIPT_START script_0800F4C4 DoPostScriptAction 0x000b EndBlock Call sub_0807F348 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 _0807EDD4 0x01c8, 0x0328 _0807EDD4 0x01e8, 0x0338 _0807EB44 0x0002 DoPostScriptAction 0x0000 DoPostScriptAction 0x000a - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 script_0800F50C: EndBlock BeginBlock @@ -28,7 +29,7 @@ script_0800F50C: WaitUntilTextboxCloses _0807E878 script_0800F524: - TestBit 0x00000010 + CheckSyncFlagAndClear 0x00000010 JumpIfNot script_0800F50C EndBlock DoPostScriptAction 0x000b @@ -36,7 +37,7 @@ script_0800F524: SetEntitySpeed 0x0100 _0807EC64 0x0010 _0807EDD4 0x0288, 0x0328 - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc new file mode 100644 index 00000000..80a76584 --- /dev/null +++ b/data/scripts/cutscene/kinstones/script_Npc4EFirstKinstone.inc @@ -0,0 +1,48 @@ +@ Hyrule Town NPC4E Kinstone Cutscene +SCRIPT_START script_Npc4EFirstKinstone + BeginBlock + _0807F0B4 0x0001 + CameraTargetPlayer + EndBlock +script_0800F09A: + CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 + JumpIfNot script_0800F09A + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + LoadRoomEntityList gUnk_080EE8AC + StartPlayerScript script_PlayerAtFirstKinstone + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x0000001e + WaitForSyncFlagAndClear 0x00000040 + MessageFromTargetPos 0x1201, 0x000c + WaitUntilTextboxCloses + WaitForSyncFlagAndClear 0x000003c0 + _0807E8E4_0 + MessageFromTargetPos 0x1202, 0x000c + WaitUntilTextboxCloses + GivePlayerItem 0x0067 + WaitPlayerGetItem + _0807E8E4_0 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 + MessageFromTargetPos 0x1203, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + Call sub_0807DF50 + _0807E878 + WaitForSyncFlagAndClear 0x00000040 +script_0800F11A: + CheckKinstoneFused 0x0032 + JumpIfNot script_0800F11A + _0807E864 + Call sub_0807DF28 + SetSyncFlag 0x0000001e + Wait 0x003c + _0807E8E4_1 + WaitForSyncFlagAndClear 0x000003c0 + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc similarity index 71% rename from data/scripts/script_0800F14C.inc rename to data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc index debc95ba..d039a201 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/cutscene/kinstones/script_PlayerAtFirstKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800F14C +@ Hyrule Town Kinstone cutscene Player +SCRIPT_START script_PlayerAtFirstKinstone BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -10,6 +11,6 @@ SCRIPT_START script_0800F14C _0807EDD4 0x01f8, 0x0338 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc new file mode 100644 index 00000000..941d969d --- /dev/null +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone1.inc @@ -0,0 +1,8 @@ +@ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan +SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone1 + SetEntitySpeed 0x0100 + _0807EC94 0x0008 + SetSyncFlag 0x00000400 + Call sub_080791BC +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc new file mode 100644 index 00000000..8bcc7ac1 --- /dev/null +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone2.inc @@ -0,0 +1,8 @@ +@ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 2 +SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone2 + SetEntitySpeed 0x0100 + _0807ECF4 0x0008 + SetSyncFlag 0x00000400 + Call sub_080791BC +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc new file mode 100644 index 00000000..a86cda57 --- /dev/null +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone3.inc @@ -0,0 +1,8 @@ +@ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 3 +SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone3 + SetEntitySpeed 0x0100 + _0807ECC4 0x0008 + SetSyncFlag 0x00000400 + Call sub_080791BC +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc new file mode 100644 index 00000000..01316111 --- /dev/null +++ b/data/scripts/cutscene/kinstones/script_PlayerAtHurdyGurdyManFirstKinstone4.inc @@ -0,0 +1,8 @@ +@ Player at Hyrule Town Kinstone cutscene HurdyGurdyMan 4 +SCRIPT_START script_PlayerAtHurdyGurdyManFirstKinstone4 + SetEntitySpeed 0x0100 + _0807EC64 0x0008 + SetSyncFlag 0x00000400 + Call sub_080791BC +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc similarity index 64% rename from data/scripts/script_0800CABC.inc rename to data/scripts/cutscene/minishVillage/script_ForestMinish5.inc index 33cb62c3..c1d7b3bb 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish5.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CABC +@ Minish Village Intro Forest Minish +SCRIPT_START script_ForestMinish5 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 @@ -6,29 +7,29 @@ SCRIPT_START script_0800CABC DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00000200 + WaitForSyncFlagAndClear 0x00000200 DoPostScriptAction 0x0007 _0807EDD4 0x0208, 0x0308 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x0328 DoPostScriptAction 0x0000 - _0807E5F8 0x00000400 - WaitForSomething2 0x00000200 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00000200 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0208, 0x02b0 - _0807E5F8 0x00000400 + SetSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc similarity index 67% rename from data/scripts/script_0800CB54.inc rename to data/scripts/cutscene/minishVillage/script_ForestMinish6.inc index 33d6ea64..06076fd2 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish6.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CB54 +@ Minish Village Intro Forest Minish 2 +SCRIPT_START script_ForestMinish6 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 @@ -6,25 +7,25 @@ SCRIPT_START script_0800CB54 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0007 _0807EB44 0x0002 DoPostScriptAction 0x0001 _0807EDD4 0x01a8, 0x0330 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0348 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0178, 0x0328 - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc similarity index 64% rename from data/scripts/script_0800CBD4.inc rename to data/scripts/cutscene/minishVillage/script_ForestMinish7.inc index 20423e5c..4e862a77 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish7.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CBD4 +@ Minish Village Intro Forest Minish 3 +SCRIPT_START script_ForestMinish7 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 @@ -6,29 +7,29 @@ SCRIPT_START script_0800CBD4 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00002000 + WaitForSyncFlagAndClear 0x00002000 DoPostScriptAction 0x0007 _0807EDD4 0x0258, 0x0330 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0340 DoPostScriptAction 0x0000 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00004000 - WaitForSomething2 0x00002000 + SetSyncFlag 0x00004000 + WaitForSyncFlagAndClear 0x00002000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0288, 0x02d8 - _0807E5F8 0x00004000 + SetSyncFlag 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc similarity index 64% rename from data/scripts/script_0800CC6C.inc rename to data/scripts/cutscene/minishVillage/script_ForestMinish8.inc index ea083bc7..945415dc 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish8.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CC6C +@ Minish Village Intro Forest Minish 4 +SCRIPT_START script_ForestMinish8 BeginBlock DoPostScriptAction 0x0008 DoPostScriptAction 0x0000 @@ -6,29 +7,29 @@ SCRIPT_START script_0800CC6C DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00008000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x0007 _0807EDD4 0x01b8, 0x0320 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x01f8, 0x0330 DoPostScriptAction 0x0000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 PlaySound SFX_PLY_JUMP _0807EF3C 0x0180, 0x0030 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x0188, 0x02d8 - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc similarity index 65% rename from data/scripts/script_0800CD04.inc rename to data/scripts/cutscene/minishVillage/script_ForestMinish9.inc index 9519af22..4b350a06 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/cutscene/minishVillage/script_ForestMinish9.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CD04 +@ Minish Village Intro Forest Minish 5 +SCRIPT_START script_ForestMinish9 BeginBlock DoPostScriptAction 0x0000 DoPostScriptAction 0x0008 @@ -6,23 +7,23 @@ SCRIPT_START script_0800CD04 DoPostScriptAction 0x000f Call sub_0807F338 EndBlock - WaitForSomething2 0x00020000 + WaitForSyncFlagAndClear 0x00020000 DoPostScriptAction 0x0007 _0807EDD4 0x0268, 0x0338 _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0200 DoPostScriptAction 0x000f _0807EDD4 0x0218, 0x0350 DoPostScriptAction 0x0000 - _0807E5F8 0x00040000 - WaitForSomething2 0x00020000 + SetSyncFlag 0x00040000 + WaitForSyncFlagAndClear 0x00020000 SetEntitySpeed 0x0300 DoPostScriptAction 0x000f _0807EDD4 0x02a8, 0x0328 - _0807E5F8 0x00040000 + SetSyncFlag 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc new file mode 100644 index 00000000..6419dba0 --- /dev/null +++ b/data/scripts/cutscene/minishVillage/script_Object69VillageIntro.inc @@ -0,0 +1,83 @@ +@ Minish Village OBJECT_69 Intro Cutscene? +SCRIPT_START script_Object69VillageIntro + BeginBlock + _0807EB44 0x0004 + SetEntitySpeed 0x0300 + EndBlock +script_0800C928: + CheckPlayerInRegion 0x0208, 0x0360, 0x2040 + JumpIfNot script_0800C928 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtVillageIntro + WaitForSyncFlagAndClear 0x00000002 + Wait 0x003c + _0807EB28 0x1125 + WaitUntilTextboxCloses + SetSyncFlag 0x00000800 + _0807E8E4_3 + Wait 0x003c + SetSyncFlag 0x00000200 + _0807E8E4_0 + Wait 0x001e + SetSyncFlag 0x00002000 + _0807E8E4_1 + Wait 0x0014 + SetSyncFlag 0x00020000 + _0807E8E4_1 + Wait 0x000a + SetSyncFlag 0x00008000 + _0807E8E4_3 + Wait 0x001e + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 + _0807E8E4_0 + Wait 0x003c + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000400 + _0807E8E4_0 + MessageFromTarget 0x1126 + Call sub_0807F40C + WaitUntilTextboxCloses + SetSyncFlag 0x00000200 + SetSyncFlag 0x00000800 + SetSyncFlag 0x00002000 + SetSyncFlag 0x00008000 + SetSyncFlag 0x00020000 + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 + _0807E8E4_3 + MessageFromTarget 0x1127 + WaitUntilTextboxCloses + SetSyncFlag 0x00002000 + WaitForSyncFlagAndClear 0x00004000 + _0807E8E4_1 + MessageFromTarget 0x1128 + WaitUntilTextboxCloses + SetSyncFlag 0x00000200 + SetSyncFlag 0x00000800 + SetSyncFlag 0x00002000 + SetSyncFlag 0x00008000 + SetSyncFlag 0x00020000 + WaitForSyncFlagAndClear 0x00000400 + WaitForSyncFlagAndClear 0x00001000 + WaitForSyncFlagAndClear 0x00004000 + WaitForSyncFlagAndClear 0x00010000 + WaitForSyncFlagAndClear 0x00040000 + _0807E8E4_0 + _0807EB28 0x1129 + WaitUntilTextboxCloses + SetLocalFlag 0x008d + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc similarity index 69% rename from data/scripts/script_0800CA8C.inc rename to data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc index b77826a4..81855968 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/cutscene/minishVillage/script_PlayerAtVillageIntro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800CA8C +@ Minish Village Intro Player +SCRIPT_START script_PlayerAtVillageIntro BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -7,7 +8,7 @@ SCRIPT_START script_0800CA8C SetEntitySpeed 0x0080 _0807EDD4 0x0208, 0x0340 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015390.inc b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc similarity index 65% rename from data/scripts/script_08015390.inc rename to data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc index d7337b44..5931fc5e 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/cutscene/originStory/script_EzloCapExplainingOriginStory.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08015390 +@ Outside Castle after ezlo cutscene EzloCap +SCRIPT_START script_EzloCapExplainingOriginStory BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 EndBlock _0807E930 0x001f Call sub_0806D944 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 _0807E930 0x0010 MessageFromTargetPos 0x1314, 0x000c WaitUntilTextboxCloses @@ -15,10 +16,10 @@ script_080153C2: _0807EE30 JumpIfNot script_080153C2 _0807E930 0x001f - StartPlayerScript script_08015384 + StartPlayerScript script_PlayerReceivedExposition Call sub_0806D9A4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801550C.inc b/data/scripts/cutscene/originStory/script_MinishEzlo.inc similarity index 73% rename from data/scripts/script_0801550C.inc rename to data/scripts/cutscene/originStory/script_MinishEzlo.inc index 267b9dd6..bd1ee7c1 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/cutscene/originStory/script_MinishEzlo.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0801550C +@ Ezlo Cutscene MinishEzlo +SCRIPT_START script_MinishEzlo BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -6,19 +7,19 @@ SCRIPT_START script_0801550C Call sub_0807F338 EndBlock CallWithArg sub_0806AF60, 0x00000000 - WaitForSomething2 0x00008000 + WaitForSyncFlagAndClear 0x00008000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00b8 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 DoPostScriptAction 0x000d _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000004 _0807EDD4 0x0078, 0x00c8 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807EB44 0x0000 CallWithArg sub_0806AF60, 0x00000000 DoPostScriptAction 0x0010 @@ -30,11 +31,11 @@ SCRIPT_START script_0801550C CallWithArg sub_0807FB28, 0x00000003 Wait 0x000a DoPostScriptAction 0x0010 - _0807E5F8 0x00010000 - WaitForSomething2 0x00008000 + SetSyncFlag 0x00010000 + WaitForSyncFlagAndClear 0x00008000 _0807E930 0x000d Call sub_0807F2D4 - _0807E5F8 0x00010000 + SetSyncFlag 0x00010000 Wait 0x003c DoPostScriptAction 0x0005 Wait 0x003c diff --git a/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc new file mode 100644 index 00000000..c505a57d --- /dev/null +++ b/data/scripts/cutscene/originStory/script_Object69CameraTarget.inc @@ -0,0 +1,27 @@ +@ Ezlo Cutscene OBJECT_69 Camera Target? +SCRIPT_START script_Object69CameraTarget + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 + PlaySound SFX_125 + CallWithArg sub_0807FB28, 0x00000003 + SetSyncFlag 0x00048000 + WaitForSyncFlagAndClear 0x00090000 + MessageFromTargetPos 0x1311, 0x0002 + WaitUntilTextboxCloses + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 + SetSyncFlag 0x00048000 + WaitForSyncFlagAndClear 0x00010000 + CallWithArg DeleteManager36, 0x00000001 + _0807F0C8 0x0000, 0x0000 + MessageFromTargetPos 0x1312, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 + StopBgm + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + SetRoomFlag 0x0001 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_080153EC.inc b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc similarity index 60% rename from data/scripts/script_080153EC.inc rename to data/scripts/cutscene/originStory/script_Object69MinishVaati.inc index 019ff352..2ad51bff 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/cutscene/originStory/script_Object69MinishVaati.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080153EC +@ Ezlo Cutscene OBJECT_69 MinishVaati +SCRIPT_START script_Object69MinishVaati BeginBlock _0807F0B4 0x0007 SetEntityPositionRelative 0x0078, 0x0068 @@ -7,22 +8,22 @@ SCRIPT_START script_080153EC PlayBgm BGM_EZLO_STORY _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 - _0807E5F8 0x00000880 - WaitForSomething2 0x00001100 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00001000 + SetSyncFlag 0x00000880 + WaitForSyncFlagAndClear 0x00001100 _0807F0B4 0x0004 SetEntityPositionRelative 0x0078, 0x0090 MessageFromTargetPos 0x1330, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 - _0807E5F8 0x00000880 - WaitForSomething2 0x00001000 + SetSyncFlag 0x00008000 + WaitForSyncFlagAndClear 0x00010000 + SetSyncFlag 0x00000880 + WaitForSyncFlagAndClear 0x00001000 Wait 0x003c MessageFromTargetPos 0x130d, 0x0002 WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc new file mode 100644 index 00000000..b1f37aad --- /dev/null +++ b/data/scripts/cutscene/originStory/script_Object69VaatiAppears.inc @@ -0,0 +1,161 @@ +@ Outside Castle OBJECT_69 Vaati appearance +SCRIPT_START script_Object69VaatiAppears + BeginBlock + SetEntityPositionRelative 0x01f8, 0x00e0 + Call sub_08054564 + EndBlock +script_08014FCC: + CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 + JumpIfNot script_08014FCC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StopBgm + _0807F0B4 0x0001 + CameraTargetEntity + StartPlayerScript script_PlayerAtVaatisAppearance + WaitForSyncFlagAndClear 0x00000001 + MessageFromTargetPos 0x1301, 0x0002 + WaitUntilTextboxCloses + Call sub_0807F3F8 + Wait 0x003c + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + PlayBgm BGM_VAATI_THEME + _0807EB28 0x1302 + WaitUntilTextboxCloses + MessageFromTargetPos 0x1303, 0x0002 + WaitUntilTextboxCloses + _0807EB28 0x1304 + WaitUntilTextboxCloses + MessageFromTargetPos 0x1305, 0x0002 + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + _0807EB28 0x1306 + WaitUntilTextboxCloses + StopBgm + StartPlayerScript script_PlayerTryToFollowVaati + CameraTargetEntity + _0807F0B4 0x0003 + SetEntityPositionRelative 0x01f8, 0x0148 + WaitForSyncFlagAndClear 0x00000001 + Call sub_0804F6A8 + Wait 0x0004 + Call sub_0804F808 + PlaySound SFX_10B + StartPlayerScript script_PlayerStoneWallsAppear + Call sub_0804F6C8 + Wait 0x0004 + Call sub_0804F830 + PlaySound SFX_10B + Call sub_0804F6E8 + Wait 0x0004 + Call sub_0804F854 + PlaySound SFX_10B + Call sub_0804F724 + Wait 0x0004 + Call sub_0804F89C + PlaySound SFX_10B + Call sub_0804F760 + Wait 0x0004 + Call sub_0804F8E0 + PlaySound SFX_10B + Wait 0x003c + WaitForSyncFlagAndClear 0x00000001 + PlaySound SFX_1B0 + Call sub_0804F79C + Wait 0x000a + LoadRoomEntityList gUnk_080F7FC0 + PlayBgm BGM_FIGHT_THEME + Call sub_0807DF50 + _0807E878 +script_08015104: + CheckRoomFlag 0x0000 + JumpIfNot script_08015104 + @ Defeated Moblins + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StopBgm + StartPlayerScript script_PlayerDefeatedMoblins + WaitForSyncFlagAndClear 0x00000001 + Wait 0x003c + Call sub_0804F6A8 + Wait 0x0004 + Call sub_0804F928 + PlaySound SFX_10B + Call sub_0804F6C8 + Wait 0x0004 + Call sub_0804F944 + PlaySound SFX_10B + Call sub_0804F6E8 + Wait 0x0004 + Call sub_0804F960 + PlaySound SFX_10B + Call sub_0804F724 + Wait 0x0004 + Call sub_0804F994 + PlaySound SFX_10B + Call sub_0804F760 + Wait 0x0004 + Call sub_0804F9C8 + PlaySound SFX_10B + Wait 0x003c + PlaySound SFX_SECRET + _0807F0B4 0x0004 + 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 + WaitUntilTextboxCloses + @ Ezlo cutscene starts + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitForFadeFinish + Call sub_08053B3C + BeginBlock + _0807E864 + CallWithArg sub_0807F6E8, 0x00000008 + MoveEntityToPlayer + _0807F0B4 0x0004 + CameraTargetEntity + _0807E778 0x0100 + DoFade4 + _0807E80C 0x00000000 + EndBlock + StartPlayerScript script_PlayerSeenOriginStory + WaitForSyncFlagAndClear 0x00000001 + LoadRoomEntityList gUnk_080F7CB0 + _0807E778 0x0004 + _0807E800 0x00000000 + WaitForFadeFinish + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + BeginBlock + _0807E8E4_2 + _0807EB28 0x1315 + EndBlock + WaitUntilTextboxCloses + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_08054570 + PlayBGM + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_08015754.inc b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc similarity index 59% rename from data/scripts/script_08015754.inc rename to data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc index 8495df7f..8b914690 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/cutscene/originStory/script_Object6ADarkMagic.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015754 +@ Ezlo Cutscene OBJECT_6A dark magic +SCRIPT_START script_Object6ADarkMagic BeginBlock _0807E930 0x0000 SetEntitySpeed 0x0200 @@ -10,11 +11,11 @@ SCRIPT_START script_08015754 _0807EDD4 0x0078, 0x00b8 PlaySound SFX_1C6 Call sub_08094B80 - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 SetEntitySpeed 0x0080 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00040000 _0807EDD4 0x0078, 0x00c8 - _0807E5F8 0x00080000 - WaitForSomething2 0x00040000 + SetSyncFlag 0x00080000 + WaitForSyncFlagAndClear 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015618.inc b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc similarity index 60% rename from data/scripts/script_08015618.inc rename to data/scripts/cutscene/originStory/script_Object6AMinishCap.inc index cc21ef92..93cafa90 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/cutscene/originStory/script_Object6AMinishCap.inc @@ -1,20 +1,21 @@ -SCRIPT_START script_08015618 +@ Ezlo Cutscene OBJECT_6A Minish Cap +SCRIPT_START script_Object6AMinishCap BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0040 Call sub_08094B80 EndBlock - WaitForSomething2 0x00000080 + WaitForSyncFlagAndClear 0x00000080 CallWithArg CreateManager36, 0x00000003 Call sub_08094B0C _0807EDD4 0x0078, 0x0068 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807EF3C 0xff80, 0x0000 CallWithArg DeleteManager36, 0x00000003 Wait 0x003c - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 _0807E930 0x0001 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080152B4.inc b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc similarity index 60% rename from data/scripts/script_080152B4.inc rename to data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc index 61ae2f32..39c0de0c 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/cutscene/originStory/script_PlayerAtVaatisAppearance.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080152B4 +@ Player outside castle for Vaati appearance +SCRIPT_START script_PlayerAtVaatisAppearance BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_080152B4 _0807EDD4 0x01f8, 0x00b8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015338.inc b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc similarity index 60% rename from data/scripts/script_08015338.inc rename to data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc index 5dd2c48f..76d0f7dc 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/cutscene/originStory/script_PlayerDefeatedMoblins.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015338 +@ Player Outside Castle after defeating Moblins +SCRIPT_START script_PlayerDefeatedMoblins BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_08015338 _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc b/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc new file mode 100644 index 00000000..77508e79 --- /dev/null +++ b/data/scripts/cutscene/originStory/script_PlayerReceivedExposition.inc @@ -0,0 +1,5 @@ +@ Player Outside Castle after Ezlo explanation after ezlo cutscene +SCRIPT_START script_PlayerReceivedExposition + DoPostScriptAction 0x0015 + Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/script_08015360.inc b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc similarity index 63% rename from data/scripts/script_08015360.inc rename to data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc index 98b78e13..0445fe14 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/cutscene/originStory/script_PlayerSeenOriginStory.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08015360 +@ Player after Ezlo Cutscene +SCRIPT_START script_PlayerSeenOriginStory BeginBlock SetEntitySpeed 0x0100 SetEntityPositionRelative 0x0208, 0x0148 EndBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc new file mode 100644 index 00000000..4f30a21d --- /dev/null +++ b/data/scripts/cutscene/originStory/script_PlayerStoneWallsAppear.inc @@ -0,0 +1,15 @@ +@ Player Outside Castle when stones appear before Moblin Fight +SCRIPT_START script_PlayerStoneWallsAppear + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0004 + SetSyncFlag 0x00000001 + Call sub_080791BC +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_080152DC.inc b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc similarity index 60% rename from data/scripts/script_080152DC.inc rename to data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc index 5e55ee16..50664ad7 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/cutscene/originStory/script_PlayerTryToFollowVaati.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080152DC +@ Player trying to follow Vaati outside castle +SCRIPT_START script_PlayerTryToFollowVaati BeginBlock SetEntitySpeed 0x0200 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_080152DC _0807EDD4 0x01f8, 0x0148 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015684.inc b/data/scripts/cutscene/originStory/script_Vaati.inc similarity index 60% rename from data/scripts/script_08015684.inc rename to data/scripts/cutscene/originStory/script_Vaati.inc index 4bcb6dc9..fd727120 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/cutscene/originStory/script_Vaati.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015684 +@ Ezlo Cutscene Vaati +SCRIPT_START script_Vaati BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b @@ -6,7 +7,7 @@ SCRIPT_START script_08015684 DoPostScriptAction 0x0017 Call sub_0807F180 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 _0807EB44 0x0002 DoPostScriptAction 0x0017 Wait 0x000a @@ -14,33 +15,33 @@ SCRIPT_START script_08015684 DoPostScriptAction 0x0017 _0807EB44 0x0004 DoPostScriptAction 0x001b - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 Wait 0x0078 DoPostScriptAction 0x0004 Wait 0x0014 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 DoPostScriptAction 0x0018 Call sub_0807F2D4 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 _0807EB44 0x0004 DoPostScriptAction 0x0014 - CallWithArg sub_0809545C, script_08015754 + CallWithArg sub_0809545C, script_Object6ADarkMagic PlaySound SFX_1C4 Wait 0x0078 DoPostScriptAction 0x0016 - WaitForSomething2 0x00020000 + WaitForSyncFlagAndClear 0x00020000 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00000800 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00000800 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00001000 + SetSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015234.inc b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc similarity index 66% rename from data/scripts/script_08015234.inc rename to data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc index c7060e78..26990404 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc @@ -1,30 +1,31 @@ -SCRIPT_START script_08015234 +@ Outside Castle Vaati +SCRIPT_START script_VaatiAppearsAgain BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 Call sub_0807F354 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 DoPostScriptAction 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Wait 0x0014 _0807EB44 0x0000 DoPostScriptAction 0x001c Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_F5 DoPostScriptAction 0x001f SetEntitySpeed 0x0200 DoPostScriptAction 0x000d DoPostScriptAction 0x0000 _0807ECC4 0x0030 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A590.inc b/data/scripts/cutscene/outro/script_EzloCapOutro.inc similarity index 63% rename from data/scripts/script_0800A590.inc rename to data/scripts/cutscene/outro/script_EzloCapOutro.inc index 6bec907c..a923e5cc 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/cutscene/outro/script_EzloCapOutro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A590 +@ Outro EzloCap +SCRIPT_START script_EzloCapOutro BeginBlock SetEntitySpeed 0x0080 SetEntity0x20 0x00000000 @@ -9,27 +10,27 @@ SCRIPT_START script_0800A590 CallWithArg sub_0807F98C, 0xfff00000 EndBlock _0807E930 0x0023 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 CallWithArg sub_0807F6E8, 0x00000008 DoPostScriptAction 0x0007 PlaySound SFX_SPARKLES - _0807E610 0x00000800 - CallWithArg sub_080960C4, script_0800A65C + ClearSyncFlag 0x00000800 + CallWithArg sub_080960C4, script_Object6AEzloDismounting Wait 0x003c _0807EDD4 0x0088, 0x0068 Wait 0x0078 - _0807E5F8 0x00000800 + SetSyncFlag 0x00000800 PlaySound SFX_143 _0807EF3C 0x0000, 0x0020 _0807E930 0x001f - _0807E5F8 0x00000200 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00000010 Wait 0x0078 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000200 + SetSyncFlag 0x00000200 Wait 0x0001 DoPostScriptAction 0x0008 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc similarity index 62% rename from data/scripts/script_0800A1B4.inc rename to data/scripts/cutscene/outro/script_EzloZeldaMagic.inc index 51ac4526..e7707cc8 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/cutscene/outro/script_EzloZeldaMagic.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A1B4 +@ Outro OBJECT_6A Ezlo and Zelda magic +SCRIPT_START script_EzloZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000002 + WaitForSyncFlag 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc new file mode 100644 index 00000000..bdfb1c15 --- /dev/null +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro1.inc @@ -0,0 +1,18 @@ +@ Outro Guard stone +SCRIPT_START script_GuardStoneOutro1 + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + EndBlock + WaitForSyncFlag 0x00000001 + _0807E930 0x0002 + WaitForSyncFlagAndClear 0x00000002 + DoPostScriptAction 0x0004 + Wait 0x003c +script_0800A80C: + _0807E930 0x0001 + Wait 0x001e + _0807E930 0x0003 + Wait 0x001e + Jump script_0800A80C diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc new file mode 100644 index 00000000..59f06757 --- /dev/null +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro2.inc @@ -0,0 +1,18 @@ +@ Outro Guard stone 2 +SCRIPT_START script_GuardStoneOutro2 + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + EndBlock + WaitForSyncFlag 0x00000001 + _0807E930 0x0002 + WaitForSyncFlagAndClear 0x00000004 + DoPostScriptAction 0x0004 + Wait 0x003c +script_0800A848: + _0807E930 0x0001 + Wait 0x0014 + _0807E930 0x0003 + Wait 0x0014 + Jump script_0800A848 diff --git a/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc new file mode 100644 index 00000000..f7d9c800 --- /dev/null +++ b/data/scripts/cutscene/outro/script_GuardStoneOutro3.inc @@ -0,0 +1,18 @@ +@ Outro Guard stone 3 +SCRIPT_START script_GuardStoneOutro3 + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + EndBlock + WaitForSyncFlag 0x00000001 + _0807E930 0x0002 + WaitForSyncFlagAndClear 0x00000008 + DoPostScriptAction 0x0004 + Wait 0x003c +script_0800A884: + _0807E930 0x0001 + Wait 0x000a + _0807E930 0x0003 + Wait 0x000a + Jump script_0800A884 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc new file mode 100644 index 00000000..46f28809 --- /dev/null +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro1.inc @@ -0,0 +1,18 @@ +@ Outro Maid stone +SCRIPT_START script_MaidStoneOutro1 + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0008 + EndBlock + WaitForSyncFlag 0x00000001 + DoPostScriptAction 0x0000 + WaitForSyncFlagAndClear 0x00000010 + DoPostScriptAction 0x0004 + Wait 0x003c +script_0800A8C0: + _0807EB44 0x0002 + Wait 0x0019 + _0807EB44 0x0006 + Wait 0x0019 + Jump script_0800A8C0 diff --git a/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc new file mode 100644 index 00000000..f25c8c27 --- /dev/null +++ b/data/scripts/cutscene/outro/script_MaidStoneOutro2.inc @@ -0,0 +1,18 @@ +@ Outro Maid stone 2 +SCRIPT_START script_MaidStoneOutro2 + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0008 + EndBlock + WaitForSyncFlag 0x00000001 + DoPostScriptAction 0x0000 + WaitForSyncFlagAndClear 0x00000020 + DoPostScriptAction 0x0004 + Wait 0x003c +script_0800A8FC: + _0807EB44 0x0002 + Wait 0x000f + _0807EB44 0x0006 + Wait 0x000f + Jump script_0800A8FC diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc similarity index 56% rename from data/scripts/script_0800AD54.inc rename to data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc index 0b2c4414..83ef8867 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc @@ -1,13 +1,5 @@ -SCRIPT_START script_0800AD54 - BeginBlock - SetEntitySpeed 0x0080 - EndBlock - _0807EC64 0x0020 - _0807EB44 0x0000 - DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 - Call sub_080791BC -SCRIPT_START script_0800AD74 +@ Outro MinishEzlo after fixing everything +SCRIPT_START script_MinishEzloGoodbye BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -15,7 +7,7 @@ SCRIPT_START script_0800AD74 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0004 Wait 0x001e _0807EB44 0x0002 @@ -23,44 +15,44 @@ SCRIPT_START script_0800AD74 Wait 0x0006 _0807EB44 0x0000 CallWithArg sub_0807F3D8, 0x00000000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EB44 0x0002 CallWithArg sub_0807F3D8, 0x00000000 Wait 0x0014 _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000c Call sub_0807F2D4 Call sub_08094B94 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807E930 0x000f Call sub_0807F2D4 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 - CallWithArg sub_080960C4, script_0800AF18 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 + CallWithArg sub_080960C4, script_Object6AEzloFinalMagic _0807E930 0x0012 Call sub_0807F2D4 Wait 0x001e - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 StopBgm Call CreateDust Call sub_0806305C Call sub_080630A4 _0807EF3C 0x0000, 0x0020 Wait 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xfff0 Wait 0x003c _0807EEF4 0x0000, 0xfff0 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807EDD4 0x0088, 0x0040 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_MinishEzloOutro.inc b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc new file mode 100644 index 00000000..55f29440 --- /dev/null +++ b/data/scripts/cutscene/outro/script_MinishEzloOutro.inc @@ -0,0 +1,32 @@ +@ Outro Minish Ezlo +SCRIPT_START script_MinishEzloOutro + BeginBlock + DoPostScriptAction 0x0008 + SetEntitySpeed 0x0080 + DoPostScriptAction 0x000b + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock + WaitForSyncFlagAndClear 0x00000002 + _0807E930 0x000e + DoPostScriptAction 0x0007 + Call sub_0807F2D4 + DoPostScriptAction 0x0004 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 + _0807E930 0x000c + Call sub_0807F2D4 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 + _0807E930 0x000f + Call sub_0807F2D4 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 + _0807E930 0x000c + Call sub_0807F2D4 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000002 + CallWithArg sub_080960C4, script_EzloZeldaMagic + SetSyncFlag 0x00000040 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800A704.inc b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc similarity index 76% rename from data/scripts/script_0800A704.inc rename to data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc index 64262eab..3f04796f 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCEntrance.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A704 +@ Outro NPC4E Fix DHC Entrance +SCRIPT_START script_Npc4EDHCEntrance BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc similarity index 78% rename from data/scripts/script_0800A6A4.inc rename to data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc index 89faff49..4349136f 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/cutscene/outro/script_Npc4EDHCThrone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A6A4 +@ Outro NPC4E Fix DHC Throne +SCRIPT_START script_Npc4EDHCThrone BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc similarity index 87% rename from data/scripts/script_0800AB08.inc rename to data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc index 32c0454d..f92b36db 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/cutscene/outro/script_Npc4EFixedEverything.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AB08 +@ Outro NPC4E Fixed everything +SCRIPT_START script_Npc4EFixedEverything BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_0800A734.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc similarity index 72% rename from data/scripts/script_0800A734.inc rename to data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc index 3a60f672..97e8bc47 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleEntrance.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A734 +@ Outro NPC4E Fix Hyrule Castle Entrance +SCRIPT_START script_Npc4EHyruleCastleEntrance BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc similarity index 73% rename from data/scripts/script_0800A6D4.inc rename to data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc index 80e01e1d..890d3814 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/cutscene/outro/script_Npc4EHyruleCastleThrone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A6D4 +@ Outro NPC4E Fix Hyrule Castle Throne +SCRIPT_START script_Npc4EHyruleCastleThrone BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc new file mode 100644 index 00000000..06f842dd --- /dev/null +++ b/data/scripts/cutscene/outro/script_Npc4EMinishPortalClosing.inc @@ -0,0 +1,70 @@ +@ Outro NPC4E Minish Portal is closing +SCRIPT_START script_Npc4EMinishPortalClosing + Call sub_0808D2CC + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + _0807E8E4_0 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + OffsetEntityPosition 0x0000, 0xffe0 + Call sub_0807F5C0 + Wait 0x003c + CallWithArg DeleteManager36, 0x00000001 + _0807F0C8 0x0000, 0x0000 + Wait 0x003c + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + MessageFromTargetPos 0x165f, 0x000e + WaitUntilTextboxCloses + StartPlayerScript script_PlayerAtEzlo + WaitForSyncFlagAndClear 0x00000001 + MessageFromTargetPos 0x1660, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + MessageFromTargetPos 0x1661, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + OffsetEntityPosition 0x0000, 0x0020 + Call sub_0807F5C0 + WaitForSyncFlagAndClear 0x00000010 + StartPlayerScript script_PlayerGetGreenCap + WaitForSyncFlagAndClear 0x00000001 + Wait 0x003c + MessageFromTargetPos 0x1662, 0x000e + WaitUntilTextboxCloses + MessageFromTargetPos 0x1663, 0x000e + WaitUntilTextboxCloses + OffsetEntityPosition 0x0000, 0xffe0 + Call sub_0807F5C0 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + StartPlayerScript script_PlayerSayGoodbye + WaitForSyncFlagAndClear 0x00000001 + Wait 0x003c + MessageFromTargetPos 0x1665, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + Wait 0x0078 + Call sub_0808D280 + Wait 0x0078 + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + Call sub_0807FB94 @ Roll Credits + MoveEntityToPlayer + Call sub_0807F844 + _0807F0B4 0x0004 + CameraTargetPlayer + SetSyncFlag 0x80000000 + DoFade4 + WaitForFadeFinish + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc new file mode 100644 index 00000000..83c7004d --- /dev/null +++ b/data/scripts/cutscene/outro/script_Npc4EMinishWoods.inc @@ -0,0 +1,20 @@ +@ Outro NPC4E Minish Woods +SCRIPT_START script_Npc4EMinishWoods + BeginBlock + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x0378, 0x0178 + Call sub_0807F844 + EndBlock + Wait 0x003c + SetSyncFlag 0x00000001 + Wait 0x001e + SetSyncFlag 0x00000002 + Wait 0x0014 + SetSyncFlag 0x00000004 + Wait 0x000a + SetSyncFlag 0x00000008 + Wait 0x003c + CallWithArg sub_0806DA1C, 0x0000000d + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc similarity index 62% rename from data/scripts/script_0800A9F4.inc rename to data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc index 7c33419b..22d244b2 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/data/scripts/cutscene/outro/script_Npc4EMtCrenel.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A9F4 +@ Outro NPC4E Mt. Crenel +SCRIPT_START script_Npc4EMtCrenel BeginBlock _0807E864 Call sub_0807DF28 @@ -6,13 +7,13 @@ SCRIPT_START script_0800A9F4 Call sub_0807F844 EndBlock Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x000a - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x0014 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x001e - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x003c CallWithArg sub_0806DA1C, 0x0000000e DoPostScriptAction 0x0006 diff --git a/data/scripts/cutscene/outro/script_Npc4EOutro.inc b/data/scripts/cutscene/outro/script_Npc4EOutro.inc new file mode 100644 index 00000000..844ac95f --- /dev/null +++ b/data/scripts/cutscene/outro/script_Npc4EOutro.inc @@ -0,0 +1,64 @@ +@ Outro NPC4E +SCRIPT_START script_Npc4EOutro + BeginBlock + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x0088, 0x0080 + Call sub_0807F844 + _0807E8E4_3 + CallWithArg sub_0807F75C, 0x00a80088 + EndBlock + Wait 0x003c + StartPlayerScript script_PlayerAtOutro + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000080 + MessageFromTargetPos 0x1659, 0x0000 + WaitUntilTextboxCloses + Wait 0x003c + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00000004 + _0807E8E4_0 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000200 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000004 + Call sub_0807F3F8 + WaitForSyncFlagAndClear 0x00000080 + MessageFromTargetPos 0x165a, 0x000e + WaitUntilTextboxCloses + Wait 0x003c + MessageFromTargetPos 0x165b, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 + Wait 0x003c + _0807E8E4_3 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000080 + Wait 0x003c + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x000000c0 + MessageFromTargetPos 0x165c, 0x000e + WaitUntilTextboxCloses + StopBgm + MessageFromTargetPos 0x165d, 0x000e + WaitUntilTextboxCloses + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x000000c0 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000100 + PlayBgm BGM_INTRO_CUTSCENE + PlaySound SFX_APPARATE + CallWithArg sub_0806DA1C, 0x00000007 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc similarity index 72% rename from data/scripts/script_0800AAD8.inc rename to data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc index 50cb8c6d..a9f2a329 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/cutscene/outro/script_Npc4ESanctuaryEntrance.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AAD8 +@ Outro NPC4E DHC Fix Sanctuary entrance +SCRIPT_START script_Npc4ESanctuaryEntrance BeginBlock _0807E864 Call sub_0807DF28 diff --git a/data/scripts/script_0800A764.inc b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc similarity index 59% rename from data/scripts/script_0800A764.inc rename to data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc index ce2dd0f7..9cbea7ad 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/cutscene/outro/script_Npc4EUnfreezeCastleStaff.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A764 +@ Outro NPC4E Unfreeze castle staff +SCRIPT_START script_Npc4EUnfreezeCastleStaff BeginBlock _0807E864 Call sub_0807DF28 @@ -9,22 +10,22 @@ SCRIPT_START script_0800A764 PlaySound SFX_EVAPORATE _0807E778 0x0004 DoFade7 - WaitFor_2 - _0807E5F8 0x00000001 + WaitForFadeFinish + SetSyncFlag 0x00000001 PlaySound SFX_APPARATE _0807E778 0x0002 DoFade6 - WaitFor_2 + WaitForFadeFinish Wait 0x001e - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x0014 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x000a - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0005 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 Wait 0x0002 - _0807E5F8 0x00000020 + SetSyncFlag 0x00000020 Wait 0x0078 CallWithArg sub_0806DA1C, 0x0000000c DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc similarity index 58% rename from data/scripts/script_0800A65C.inc rename to data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc index 759fef06..e97a4de3 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloDismounting.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A65C +@ Outro OBJECT_6A Ezlo moving from Links head +SCRIPT_START script_Object6AEzloDismounting BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000800 + WaitForSyncFlag 0x00000800 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc similarity index 64% rename from data/scripts/script_0800AF18.inc rename to data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc index 6c6c70ed..93468e3d 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/cutscene/outro/script_Object6AEzloFinalMagic.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800AF18 +@ Outro OBJECT_6A Ezlo final magic shrinking +SCRIPT_START script_Object6AEzloFinalMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 PlaySound SFX_SPARKLES EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 PlaySound SFX_143 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A500.inc b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc similarity index 51% rename from data/scripts/script_0800A500.inc rename to data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc index 55f56c7e..3b5704d0 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/cutscene/outro/script_Object6AMinishCapOutro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A500 +@ Outro OBJECT_6A Minish Cap +SCRIPT_START script_Object6AMinishCapOutro BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -6,25 +7,25 @@ SCRIPT_START script_0800A500 _0807E930 0x0005 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 PlaySound SFX_SPARKLES - _0807E610 0x00000800 - CallWithArg sub_080960C4, script_0800A65C + ClearSyncFlag 0x00000800 + CallWithArg sub_080960C4, script_Object6AEzloDismounting _0807E930 0x0002 Call sub_08094B0C _0807EDD4 0x0068, 0x0088 Call sub_08094B80 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000008 Call sub_08094B3C _0807E930 0x0004 - _0807E5F8 0x00000800 + SetSyncFlag 0x00000800 PlaySound SFX_143 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0008 Call sub_080961B0 PlaySound SFX_FA Wait 0x003c - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 SCRIPT_END diff --git a/data/scripts/script_0800A964.inc b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc similarity index 60% rename from data/scripts/script_0800A964.inc rename to data/scripts/cutscene/outro/script_Object6AOctorok1.inc index 258b3451..71af9ff5 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok1.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A964 +@ Outro OBJECT_6A Octorok 1 +SCRIPT_START script_Object6AOctorok1 BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0001 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A988.inc b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc similarity index 60% rename from data/scripts/script_0800A988.inc rename to data/scripts/cutscene/outro/script_Object6AOctorok2.inc index 0323f7b4..1a823f2d 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A988 +@ Outro OBJECT_6A Octorok 2 +SCRIPT_START script_Object6AOctorok2 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 _0807E930 0x0002 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc similarity index 60% rename from data/scripts/script_0800A9AC.inc rename to data/scripts/cutscene/outro/script_Object6AOctorok3.inc index 3bafd5c1..9e970232 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok3.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A9AC +@ Outro OBJECT_6A Octorok 3 +SCRIPT_START script_Object6AOctorok3 BeginBlock _0807EB44 0x0000 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc similarity index 60% rename from data/scripts/script_0800A9D0.inc rename to data/scripts/cutscene/outro/script_Object6AOctorok4.inc index 7f7495c8..ce4e0e15 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/cutscene/outro/script_Object6AOctorok4.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A9D0 +@ Outro OBJECT_6A Octorok 4 +SCRIPT_START script_Object6AOctorok4 BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0003 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/cutscene/outro/script_Object6ATektite1.inc similarity index 60% rename from data/scripts/script_0800AA48.inc rename to data/scripts/cutscene/outro/script_Object6ATektite1.inc index a96c6c4f..a8599488 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite1.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800AA48 +@ Outro OBJECT_6A Tektite 1 +SCRIPT_START script_Object6ATektite1 BeginBlock _0807EB44 0x0002 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/cutscene/outro/script_Object6ATektite2.inc similarity index 60% rename from data/scripts/script_0800AA6C.inc rename to data/scripts/cutscene/outro/script_Object6ATektite2.inc index 448bf96b..3f666062 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800AA6C +@ Outro OBJECT_6A Tektite 2 +SCRIPT_START script_Object6ATektite2 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/cutscene/outro/script_Object6ATektite3.inc similarity index 60% rename from data/scripts/script_0800AA90.inc rename to data/scripts/cutscene/outro/script_Object6ATektite3.inc index 96901853..c088f9cf 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite3.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800AA90 +@ Outro OBJECT_6A Tektite 3 +SCRIPT_START script_Object6ATektite3 BeginBlock _0807EB44 0x0000 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/cutscene/outro/script_Object6ATektite4.inc similarity index 60% rename from data/scripts/script_0800AAB4.inc rename to data/scripts/cutscene/outro/script_Object6ATektite4.inc index 8c494dd7..68f9a905 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/cutscene/outro/script_Object6ATektite4.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800AAB4 +@ Outro OBJECT_6A Tektite 4 +SCRIPT_START script_Object6ATektite4 BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0007 _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc similarity index 56% rename from data/scripts/script_0800AEDC.inc rename to data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc index 6c4e6b61..da1e3fab 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/cutscene/outro/script_Object6ATheLittleHat.inc @@ -1,15 +1,16 @@ -SCRIPT_START script_0800AEDC +@ Outro OBJECT_6A The Little Hat (Green) +SCRIPT_START script_Object6ATheLittleHat BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b _0807E930 0x0000 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_08094B80 _0807EF3C 0x0000, 0x0001 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000008 DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A638.inc b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc similarity index 62% rename from data/scripts/script_0800A638.inc rename to data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc index cce609e8..b4456a55 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/cutscene/outro/script_Object6AZeldaMagic.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A638 +@ Outro OBJECT_6A Zelda glowing? +SCRIPT_START script_Object6AZeldaMagic BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00001000 + WaitForSyncFlag 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc similarity index 63% rename from data/scripts/script_0800ACBC.inc rename to data/scripts/cutscene/outro/script_PlayerAtEzlo.inc index a8e89bb6..c04735bc 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtEzlo.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800ACBC +@ Outro Player move to Ezlo +SCRIPT_START script_PlayerAtEzlo BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0088, 0x0080 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC .2byte 0x0000 diff --git a/data/scripts/script_08015304.inc b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc similarity index 64% rename from data/scripts/script_08015304.inc rename to data/scripts/cutscene/outro/script_PlayerAtOutro.inc index 85133e67..3aef29f7 100644 --- a/data/scripts/script_08015304.inc +++ b/data/scripts/cutscene/outro/script_PlayerAtOutro.inc @@ -1,4 +1,6 @@ -SCRIPT_START script_08015304 +@ Player at Outro +SCRIPT_START script_PlayerAtOutro + EndBlock _0807EB44 0x0002 Wait 0x000a _0807EB44 0x0006 @@ -7,8 +9,6 @@ SCRIPT_START script_08015304 Wait 0x000a _0807EB44 0x0006 Wait 0x000a - _0807EB44 0x0004 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC -SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc similarity index 78% rename from data/scripts/script_0800ACE0.inc rename to data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc index ad53174a..9b99fff7 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/cutscene/outro/script_PlayerGetGreenCap.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800ACE0 +@ Outro Player got the green cap +SCRIPT_START script_PlayerGetGreenCap BeginBlock Call sub_08094BE0 CallWithArg sub_0807F238, 0x0000045b @@ -6,7 +7,7 @@ SCRIPT_START script_0800ACE0 EndBlock Call sub_0807F304 Wait 0x005a - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 BeginBlock CallWithArg sub_0807F6F8, 0x00000008 CallWithArg sub_0807F238, 0x000008e4 @@ -20,6 +21,6 @@ SCRIPT_START script_0800ACE0 Wait 0x0004 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC .2byte 0x0000 diff --git a/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc new file mode 100644 index 00000000..a209c670 --- /dev/null +++ b/data/scripts/cutscene/outro/script_PlayerSayGoodbye.inc @@ -0,0 +1,10 @@ +@ Outro Player goes to say goodbye to Minish Ezlo +SCRIPT_START script_PlayerSayGoodbye + BeginBlock + SetEntitySpeed 0x0080 + EndBlock + _0807EC64 0x0020 + _0807EB44 0x0000 + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000001 + Call sub_080791BC diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc similarity index 57% rename from data/scripts/script_0800AEA4.inc rename to data/scripts/cutscene/outro/script_ZeldaGoodbye.inc index b206732e..470bddb0 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/cutscene/outro/script_ZeldaGoodbye.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AEA4 +@ Outro Zelda after fixing everything +SCRIPT_START script_ZeldaGoodbye BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -6,10 +7,10 @@ SCRIPT_START script_0800AEA4 _0807EB44 0x0002 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000040 + WaitForSyncFlagAndClear 0x00000040 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x80000000 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x80000000 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/cutscene/outro/script_ZeldaOutro.inc similarity index 57% rename from data/scripts/script_0800A3D8.inc rename to data/scripts/cutscene/outro/script_ZeldaOutro.inc index fbb04752..d639a25a 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/cutscene/outro/script_ZeldaOutro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A3D8 +@ Outro Zelda +SCRIPT_START script_ZeldaOutro BeginBlock SetEntitySpeed 0x0100 DoPostScriptAction 0x0007 @@ -6,7 +7,7 @@ SCRIPT_START script_0800A3D8 _0807EB44 0x0002 DoPostScriptAction 0x0000 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock DoPostScriptAction 0x0004 Call sub_0807F3F8 @@ -15,31 +16,31 @@ SCRIPT_START script_0800A3D8 _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0004 DoPostScriptAction 0x0000 PlaySound SFX_SPARKLES - CallWithArg sub_080960C4, script_0800A638 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + CallWithArg sub_080960C4, script_Object6AZeldaMagic + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_143 - _0807E5F8 0x00001000 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00001000 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 Call sub_08066E68 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_SPARKLES - CallWithArg sub_080960C4, script_0800A680 + CallWithArg sub_080960C4, script_EzloZeldaMagic Wait 0x0078 PlaySound SFX_153 CallWithArg sub_0807FADC, 0x00000003 @@ -53,8 +54,8 @@ SCRIPT_START script_0800A3D8 PlaySound SFX_153 CallWithArg sub_0807FADC, 0x00000001 PlaySound SFX_143 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013494.inc b/data/scripts/cutscene/reveal/script_08013494.inc similarity index 74% rename from data/scripts/script_08013494.inc rename to data/scripts/cutscene/reveal/script_08013494.inc index 077f4297..fb3b1606 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/cutscene/reveal/script_08013494.inc @@ -1,3 +1,4 @@ +@ Something during Sanctuary Vaati cutscene? Called from script_VaatiSanctuary SCRIPT_START script_08013494 BeginBlock _0807E930 0x0000 @@ -12,7 +13,7 @@ SCRIPT_START script_08013494 Call sub_08094B80 PlaySound SFX_1CC Call sub_0807F36C - _0807E5F8 0x00000080 + SetSyncFlag 0x00000080 EndBlock DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080133C4.inc b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc similarity index 62% rename from data/scripts/script_080133C4.inc rename to data/scripts/cutscene/reveal/script_FakeKingDaltus.inc index 7b1a62fd..4f9e3683 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/cutscene/reveal/script_FakeKingDaltus.inc @@ -1,14 +1,15 @@ -SCRIPT_START script_080133C4 +@ Sanctuary King Daltus +SCRIPT_START script_FakeKingDaltus BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0007 DoPostScriptAction 0x000b Call sub_0807F338 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_08061F94 Wait 0x000a - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc new file mode 100644 index 00000000..9d81e3fb --- /dev/null +++ b/data/scripts/cutscene/reveal/script_Object3EPictureBackRoom.inc @@ -0,0 +1,72 @@ +@ Sanctuary OBJECT_3E Look at picture in back room +SCRIPT_START script_Object3EPictureBackRoom + CheckPlayerInRegion 0x0098, 0x0038, 0x2060 + JumpIfNot script_Object3EPictureBackRoom + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtPicture + WaitForSyncFlagAndClear 0x00000002 + _0807EB28 0x1601 + WaitUntilTextboxCloses + StartPlayerScript script_PlayerMoveToPicture + WaitForSyncFlagAndClear 0x00000002 + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + LoadRoomEntityList gUnk_080F5680 + StartPlayerScript script_PlayerSanctuaryIntro + WaitForSyncFlagAndClear 0x00000002 + MoveEntityToPlayer + OffsetEntityPosition 0x0000, 0xfff0 + Call sub_0807F844 + CameraTargetEntity + Call sub_080536B8 + _0807E864 + Call sub_0807DF28 + WaitForFadeFinish + MessageFromTargetPos 0x1602, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 + PlayBgm BGM_VAATI_THEME + StartPlayerScript script_PlayerDistanceFromVaati + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 + StartPlayerScript script_PlayerFaintAgain + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000042 + MessageFromTargetPos 0x1603, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 + SetFadeMask 0xffff7fff + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + StopBgm + _0807E858 0x0000 + Wait 0x003c + CameraTargetPlayer + Call sub_0807F5C0 + MessageFromTargetPos 0x1604, 0x0007 + WaitUntilTextboxCloses + SetFadeMask 0xffffffff + _0807E778 0x0004 + DoFade4 + WaitForFadeFinish + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 + _0807EB28 0x1605 + WaitUntilTextboxCloses + SetLocalFlag 0x0078 + PlayBgm BGM_CASTLE_COLLAPSE + SetGlobalFlag 0x005d + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc similarity index 65% rename from data/scripts/script_080132E4.inc rename to data/scripts/cutscene/reveal/script_PlayerAtPicture.inc index 78146e83..69a76452 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/cutscene/reveal/script_PlayerAtPicture.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080132E4 +@ Player in Sanctuary at picture +SCRIPT_START script_PlayerAtPicture BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_080132E4 _0807EDD4 0x0098, 0x0058 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc similarity index 66% rename from data/scripts/script_0801334C.inc rename to data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc index f353b8f8..ed636572 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/cutscene/reveal/script_PlayerDistanceFromVaati.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0801334C +@ Sanctuary Player move back from Vaati +SCRIPT_START script_PlayerDistanceFromVaati BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x000d @@ -7,7 +8,7 @@ SCRIPT_START script_0801334C _0807ECC4 0x0020 DoPostScriptAction 0x0000 DoPostScriptAction 0x000c - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013378.inc b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc similarity index 58% rename from data/scripts/script_08013378.inc rename to data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc index 3c2a52bf..91f9285d 100644 --- a/data/scripts/script_08013378.inc +++ b/data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc @@ -1,16 +1,17 @@ -SCRIPT_START script_08013378 +@ Sanctuary Player faint from Vaati attack +SCRIPT_START script_PlayerFaintAgain Call sub_0807F1C4 Call sub_0807F2D4 Call sub_0807F1E8 Call sub_0807F2D4 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 PlaySound SFX_PLY_JUMP _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc similarity index 60% rename from data/scripts/script_0801330C.inc rename to data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc index fd756c78..76237d60 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/cutscene/reveal/script_PlayerMoveToPicture.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0801330C +@ Player in Sanctuary move towards picture +SCRIPT_START script_PlayerMoveToPicture BeginBlock SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080133F8.inc b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc similarity index 61% rename from data/scripts/script_080133F8.inc rename to data/scripts/cutscene/reveal/script_VaatiSanctuary.inc index d489dda4..ca88188c 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/cutscene/reveal/script_VaatiSanctuary.inc @@ -1,34 +1,35 @@ -SCRIPT_START script_080133F8 +@ Sanctuary Vaati +SCRIPT_START script_VaatiSanctuary BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0008 DoPostScriptAction 0x000b Call sub_0807F338 EndBlock - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 SetEntityPositionRelative 0x0098, 0x0048 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 Wait 0x003c DoPostScriptAction 0x0014 PlaySound SFX_CHARGING_UP CallWithArg sub_08095420, script_08013494 Wait 0x005a DoPostScriptAction 0x0016 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x0078 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/cutscene/takeover/script_GuardTakeover.inc similarity index 57% rename from data/scripts/script_08015F3C.inc rename to data/scripts/cutscene/takeover/script_GuardTakeover.inc index b90cb216..42af6737 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/cutscene/takeover/script_GuardTakeover.inc @@ -1,18 +1,19 @@ -SCRIPT_START script_08015F3C +@ Western Wood Cutscene Guard +SCRIPT_START script_GuardTakeover BeginBlock SetEntitySpeed 0x0080 _0807EB44 0x0000 _0807E930 0x0000 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 _0807E930 0x0004 _0807EC64 0x00c0 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething 0x00000200 + SetSyncFlag 0x00000080 + WaitForSyncFlag 0x00000200 DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc new file mode 100644 index 00000000..f4263027 --- /dev/null +++ b/data/scripts/cutscene/takeover/script_KingDaltusTakeover.inc @@ -0,0 +1,27 @@ +@ Western Wood Cutscene King Daltus +SCRIPT_START script_KingDaltusTakeover + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock + WaitForSyncFlagAndClear 0x00000004 + DoPostScriptAction 0x0004 + Wait 0x003c + MessageNoOverlap 0x1319 + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 + MessageNoOverlap 0x131a + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 + MessageNoOverlap 0x131d + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000004 + MessageNoOverlap 0x131e + WaitUntilTextboxCloses + SetSyncFlag 0x00000008 + WaitForSyncFlag 0x00000400 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc new file mode 100644 index 00000000..c3f81281 --- /dev/null +++ b/data/scripts/cutscene/takeover/script_MinisterPothoTakeover.inc @@ -0,0 +1,15 @@ +@ Western Wood Cutscene Minister Potho +SCRIPT_START script_MinisterPothoTakeover + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock + WaitForSyncFlagAndClear 0x00000001 + MessageNoOverlap 0x131c + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + WaitForSyncFlag 0x00000200 + DoPostScriptAction 0x0005 + WaitForSyncFlag 0x00000400 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/cutscene/takeover/script_Object69Takeover.inc similarity index 80% rename from data/scripts/script_08015BE8.inc rename to data/scripts/cutscene/takeover/script_Object69Takeover.inc index e6a52ab6..d8ff3cae 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/cutscene/takeover/script_Object69Takeover.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015BE8 +@ Western Wood OBJECT_69 Cutscene +SCRIPT_START script_Object69Takeover BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -9,12 +10,12 @@ script_08015BF0: Call sub_0807F9A4 Call sub_0807DF28 Call sub_0807FBC4 - StartPlayerScript script_08015C7C - WaitForSomething2 0x00000100 + StartPlayerScript script_PlayerAtTakeover + WaitForSyncFlagAndClear 0x00000100 CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish StopBgm Call sub_08053BE8 BeginBlock @@ -27,7 +28,7 @@ script_08015BF0: EndBlock _0807E778 0x0004 _0807E800 0x00000000 - WaitFor_2 + WaitForFadeFinish PlayBGM _0807EB28 0x131f WaitUntilTextboxCloses diff --git a/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc new file mode 100644 index 00000000..10feed63 --- /dev/null +++ b/data/scripts/cutscene/takeover/script_Object69TakeoverCutscene.inc @@ -0,0 +1,68 @@ +@ Western Wood Cutscene OBJECT_69 in Castle +SCRIPT_START script_Object69TakeoverCutscene + BeginBlock + _0807F0B4 0x0007 + SetEntityPositionRelative 0x0088, 0x0068 + CameraTargetEntity + EndBlock + _0807E778 0x0004 + DoFade4 + WaitForFadeFinish + Wait 0x003c + _0807F0B4 0x0004 + SetEntityPositionRelative 0x0088, 0x00e0 + CameraTargetEntity + Wait 0x003c + PlayBgm BGM_VAATI_THEME + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x0088, 0x0070 + CameraTargetEntity + Wait 0x003c + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x0088, 0x00e0 + CameraTargetEntity + Wait 0x003c + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x0088, 0x0070 + CameraTargetEntity + Wait 0x003c + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000010 + WaitForSyncFlagAndClear 0x00000020 + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + SetSyncFlag 0x00000010 + LoadRoomEntityList gUnk_080FCE30 + StopBgm + Wait 0x0078 + _0807E778 0x0004 + DoFade4 + WaitForFadeFinish + PlayBgm BGM_DIGGING_CAVE + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000080 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000200 + Wait 0x003c + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + _0807E778 0x0004 + DoFade5 + WaitForFadeFinish + StopBgm + SetRoomFlag 0x0000 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc similarity index 80% rename from data/scripts/script_08015C7C.inc rename to data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc index 48ae9e24..551025aa 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/cutscene/takeover/script_PlayerAtTakeover.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015C7C +@ Player at Western Wood Cutscene +SCRIPT_START script_PlayerAtTakeover BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -14,6 +15,6 @@ SCRIPT_START script_08015C7C Call sub_0807F304 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015E58.inc b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc similarity index 65% rename from data/scripts/script_08015E58.inc rename to data/scripts/cutscene/takeover/script_VaatiTakeover.inc index 457d8fb6..14796d93 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/cutscene/takeover/script_VaatiTakeover.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08015E58 +@ Western Wood Cutscene Vaati +SCRIPT_START script_VaatiTakeover BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 DoPostScriptAction 0x0000 DoPostScriptAction 0x001d EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066C94 Wait 0x00e9 DoPostScriptAction 0x0007 @@ -15,26 +16,26 @@ SCRIPT_START script_08015E58 DoPostScriptAction 0x001c Call sub_0807F2D4 DoPostScriptAction 0x0000 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 Call sub_08066CA4 DoPostScriptAction 0x0008 Wait 0x00bc - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 SetEntityPositionRelative 0x0088, 0x0068 Call sub_08066C94 Wait 0x00e8 DoPostScriptAction 0x0007 DoPostScriptAction 0x001e Wait 0x0014 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0014 Wait 0x001e MessageNoOverlap 0x131b WaitUntilTextboxCloses - _0807E5F8 0x00000020 - WaitForSomething2 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc similarity index 55% rename from data/scripts/script_08015FA4.inc rename to data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc index 3f743ae6..00b1bc9a 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/cutscene/takeover/script_ZeldaStoneTakeover.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_08015FA4 +@ Western Wood Cutscene Zelda +SCRIPT_START script_ZeldaStoneTakeover BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 EndBlock - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/dhc/script_GuardCellLeft.inc b/data/scripts/dhc/script_GuardCellLeft.inc new file mode 100644 index 00000000..a44c7ed5 --- /dev/null +++ b/data/scripts/dhc/script_GuardCellLeft.inc @@ -0,0 +1,18 @@ +@ DHC left Guard at King cell +SCRIPT_START script_GuardCellLeft + BeginBlock + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + DoPostScriptAction 0x000a + _0807E9D4 + EndBlock +script_0800E44C: + CheckEntityInteractType + JumpIfNot script_0800E44C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageNoOverlap 0x2405 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E44C diff --git a/data/scripts/dhc/script_GuardCellRight.inc b/data/scripts/dhc/script_GuardCellRight.inc new file mode 100644 index 00000000..9f85273b --- /dev/null +++ b/data/scripts/dhc/script_GuardCellRight.inc @@ -0,0 +1,20 @@ +@ DHC right Guard at King cell +SCRIPT_START script_GuardCellRight + BeginBlock + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + DoPostScriptAction 0x000a + _0807E9D4 + EndBlock +script_0800E484: + CheckEntityInteractType + JumpIfNot script_0800E484 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageNoOverlap 0x2407 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E484 + + diff --git a/data/scripts/dhc/script_GuardStone1.inc b/data/scripts/dhc/script_GuardStone1.inc new file mode 100644 index 00000000..506abd38 --- /dev/null +++ b/data/scripts/dhc/script_GuardStone1.inc @@ -0,0 +1,49 @@ +@ DHC Guard stone +SCRIPT_START script_GuardStone1 + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CheckLocalFlag 0x0094 + JumpIf script_0800E1D0 + _0807E930 0x0010 + CallWithArg sub_0807F8E8, 0x00000001 + EndBlock +script_0800E176: + CheckRoomFlag 0x0001 + JumpIfNot script_0800E176 + _0807E864 + Wait 0x001e + DoPostScriptAction 0x0010 + PlaySound SFX_1C9 + _0807E930 0x0015 + Wait 0x003c + PlaySound SFX_1CA + DoPostScriptAction 0x0010 + Wait 0x001e + PlaySound SFX_SECRET + Wait 0x0078 + DoPostScriptAction 0x0004 + Wait 0x001e + DoPostScriptAction 0x0000 + _0807EB8C + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Wait 0x000a + MessageNoOverlap 0x2401 + WaitUntilTextboxCloses + SetLocalFlag 0x0094 +script_0800E1D0: + CallWithArg sub_0807F3D8, 0x00000000 + _0807E9D4 + _0807E878 + EndBlock +script_0800E1E0: + CheckEntityInteractType + JumpIfNot script_0800E1E0 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageNoOverlap 0x2401 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E1E0 diff --git a/data/scripts/dhc/script_GuardStone2.inc b/data/scripts/dhc/script_GuardStone2.inc new file mode 100644 index 00000000..d7e613af --- /dev/null +++ b/data/scripts/dhc/script_GuardStone2.inc @@ -0,0 +1,91 @@ +@ DHC guard stone 2 +SCRIPT_START script_GuardStone2 + BeginBlock + SetEntitySpeed 0x0100 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CheckLocalFlag 0x0073 + JumpIfNot script_0800E232 + _0807E9D4 + SetEntityPositionRelative 0x0070, 0x0168 + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock + Jump script_0800E32E +script_0800E232: + CheckLocalFlag 0x0095 + JumpIf script_0800E29A + _0807E930 0x0010 + CallWithArg sub_0807F8E8, 0x00000002 + EndBlock +script_0800E24A: + CheckRoomFlag 0x0002 + JumpIfNot script_0800E24A + _0807E864 + Wait 0x001e + DoPostScriptAction 0x0010 + PlaySound SFX_1C9 + _0807E930 0x0015 + Wait 0x003c + PlaySound SFX_1CA + DoPostScriptAction 0x0010 + Wait 0x001e + PlaySound SFX_SECRET + Wait 0x0078 + DoPostScriptAction 0x0004 + Wait 0x001e + DoPostScriptAction 0x0000 + _0807EB8C + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + SetLocalFlag 0x0095 +script_0800E29A: + DoPostScriptAction 0x0000 + CallWithArg sub_0807F3D8, 0x00000000 + _0807E9D4 + _0807E878 + EndBlock +script_0800E2AE: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800E312 + CheckLocalFlag 0x0093 + JumpIfNot script_0800E2AE + CheckLocalFlag 0x0094 + JumpIfNot script_0800E2AE + CheckLocalFlag 0x0095 + JumpIfNot script_0800E2AE + _0807E9DC + SetLocalFlag 0x0073 + EndBlock + _0807EB44 0x0000 + CallWithArg sub_0807F3D8, 0x00000004 + _0807EDD4 0x0088, 0x0168 + _0807EB44 0x0006 + CallWithArg sub_0807F3D8, 0x00000004 + _0807EDD4 0x0070, 0x0168 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + _0807E9D4 + Jump script_0800E32E +script_0800E312: + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock + MessageNoOverlap 0x2404 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E2AE +script_0800E32E: + CheckEntityInteractType + JumpIfNot script_0800E32E + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageNoOverlap 0x2403 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E32E + .2byte 0x0000 diff --git a/data/scripts/dhc/script_KingDaltusStone.inc b/data/scripts/dhc/script_KingDaltusStone.inc new file mode 100644 index 00000000..ee83a886 --- /dev/null +++ b/data/scripts/dhc/script_KingDaltusStone.inc @@ -0,0 +1,62 @@ +@ DHC King Daltus stone +SCRIPT_START script_KingDaltusStone + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CheckLocalFlag 0x0071 + JumpIf script_0800E3E8 + CheckLocalFlag 0x0096 + JumpIf script_0800E3BE + _0807E930 0x000c + CallWithArg sub_0807F8E8, 0x00000000 + EndBlock +script_0800E37A: + CheckRoomFlag 0x0000 + JumpIfNot script_0800E37A + _0807E864 + Wait 0x001e + DoPostScriptAction 0x0010 + PlaySound SFX_1C9 + _0807E930 0x000d + Wait 0x003c + PlaySound SFX_1CA + DoPostScriptAction 0x0010 + Wait 0x001e + PlaySound SFX_SECRET + Wait 0x0078 + DoPostScriptAction 0x0004 + Wait 0x001e + DoPostScriptAction 0x0000 + _0807EB74 + SetLocalFlag 0x0096 +script_0800E3BE: + DoPostScriptAction 0x0000 + _0807E9D4 + _0807E878 + EndBlock +script_0800E3C8: + CheckEntityInteractType + JumpIfNot script_0800E3C8 + _0807E864 + _0807EB74 + MessageNoOverlap 0x240c + WaitUntilTextboxCloses + Wait 0x000f + GivePlayerItem 0x0053 + WaitPlayerGetItem + SetLocalFlag 0x0071 + _0807E878 +script_0800E3E8: + _0807E9D4 + _0807E878 + EndBlock +script_0800E3EE: + CheckEntityInteractType + JumpIfNot script_0800E3EE + _0807E864 + _0807EB74 + MessageNoOverlap 0x240d + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E3EE diff --git a/data/scripts/dhc/script_MinishterPothoStone.inc b/data/scripts/dhc/script_MinishterPothoStone.inc new file mode 100644 index 00000000..b01fa4fa --- /dev/null +++ b/data/scripts/dhc/script_MinishterPothoStone.inc @@ -0,0 +1,48 @@ +@ DHC Minister Potho stone +SCRIPT_START script_MinishterPothoStone + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CheckLocalFlag 0x0093 + JumpIf script_0800E12E + _0807E930 0x0008 + CallWithArg sub_0807F8E8, 0x00000000 + EndBlock +script_0800E0DE: + CheckRoomFlag 0x0000 + JumpIfNot script_0800E0DE + _0807E864 + Wait 0x001e + DoPostScriptAction 0x0010 + PlaySound SFX_1C9 + _0807E930 0x0009 + Wait 0x003c + PlaySound SFX_1CA + DoPostScriptAction 0x0010 + Wait 0x001e + PlaySound SFX_SECRET + Wait 0x0078 + DoPostScriptAction 0x0004 + Wait 0x001e + DoPostScriptAction 0x0000 + _0807EB8C + _0807EB74 + Wait 0x000a + MessageNoOverlap 0x2402 + WaitUntilTextboxCloses + SetLocalFlag 0x0093 +script_0800E12E: + Call sub_080668F0 + _0807E878 + EndBlock +script_0800E138: + CheckEntityInteractType + JumpIfNot script_0800E138 + _0807E864 + _0807EB74 + MessageNoOverlap 0x2402 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E138 + .2byte 0x0000 diff --git a/data/scripts/dhc/script_MinisterPothoCell.inc b/data/scripts/dhc/script_MinisterPothoCell.inc new file mode 100644 index 00000000..92639487 --- /dev/null +++ b/data/scripts/dhc/script_MinisterPothoCell.inc @@ -0,0 +1,17 @@ +@ DHC Minister Potho in King cell +SCRIPT_START script_MinisterPothoCell + BeginBlock + _0807EB44 0x0002 + DoPostScriptAction 0x000a + Call sub_080668F0 + EndBlock +script_0800E41A: + CheckEntityInteractType + JumpIfNot script_0800E41A + _0807E864 + _0807EB74 + MessageNoOverlap 0x2406 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E41A diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc similarity index 63% rename from data/scripts/script_0800DB78.inc rename to data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc index 95192f9d..7862193e 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/dhc/script_Npc4EAfterDefeatingV2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DB78 +@ DHC NPC4E At Zelda after defeating V2 +SCRIPT_START script_Npc4EAfterDefeatingV2 BeginBlock EndBlock script_0800DB7C: @@ -14,8 +15,8 @@ script_0800DB7C: _0807EB28 0x1648 WaitUntilTextboxCloses Call sub_0804D7EC - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 script_0800DBCA: @@ -27,19 +28,19 @@ script_0800DBCA: Call sub_0804D810 Call sub_0807F3F8 Wait 0x003c - StartPlayerScript script_0800DDD0 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000001 - StartPlayerScript script_0800DE00 - WaitForSomething2 0x00000006 + StartPlayerScript script_PlayerRescuedZelda + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000001 + StartPlayerScript script_PlayerAfterDefeatingV2 + WaitForSyncFlagAndClear 0x00000006 MessageFromTargetPos 0x1643, 0x0002 WaitUntilTextboxCloses _0807EB28 0x1645 WaitUntilTextboxCloses Call sub_0807F3F8 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 StopBgm Call sub_08094F98 CallWithArg CreateManager36, 0x00000001 diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc similarity index 58% rename from data/scripts/script_0800DC4C.inc rename to data/scripts/dhc/script_Npc4ECastleCollapsing.inc index 6e987b02..901ce247 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/dhc/script_Npc4ECastleCollapsing.inc @@ -1,16 +1,17 @@ -SCRIPT_START script_0800DC4C +@ DHC NPC4E Castle collapsing +SCRIPT_START script_Npc4ECastleCollapsing Wait 0x003c PlayBgm BGM_CASTLE_COLLAPSE - StartPlayerScript script_0800DE50 - WaitForSomething2 0x00000006 + StartPlayerScript script_PlayerStonesFall + WaitForSyncFlagAndClear 0x00000006 _0807EB28 0x1646 WaitUntilTextboxCloses - _0807E5F8 0x00000001 - StartPlayerScript script_0800DE2C + SetSyncFlag 0x00000001 + StartPlayerScript script_PlayerCastleCollapsing CameraTargetPlayer _0807E778 0x0004 _0807E80C 0x00000000 - WaitFor_2 + WaitForFadeFinish CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 SetLocalFlag 0x0079 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/dhc/script_Npc4EV3Defeated.inc similarity index 71% rename from data/scripts/script_0800A0FC.inc rename to data/scripts/dhc/script_Npc4EV3Defeated.inc index eadf25ba..c2f60ee1 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/dhc/script_Npc4EV3Defeated.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A0FC +@ DHC NPC4E V3 defeated +SCRIPT_START script_Npc4EV3Defeated EndBlock script_0800A0FE: CheckGlobalFlag 0x0051 @@ -14,13 +15,13 @@ script_0800A0FE: Call sub_0807F844 _0807E8E4_3 CallWithArg sub_0807F75C, 0x00d00060 - CallWithArg sub_08094AE8, script_0800A160 + CallWithArg sub_08094AE8, script_Object6AV3DefeatedMinishCap PlaySound SFX_APPARATE _0807E778 0x0002 DoFade6 EndBlock - WaitFor_2 - WaitForSomething2 0x00000004 + WaitForFadeFinish + WaitForSyncFlagAndClear 0x00000004 CallWithArg sub_0806DA1C, 0x00000006 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc new file mode 100644 index 00000000..b583efe7 --- /dev/null +++ b/data/scripts/dhc/script_Object69BallAndChainSoldierRoom.inc @@ -0,0 +1,58 @@ +@ DHC OBJECT_69 Towards Vaati in room with Ball&Chain soldier +SCRIPT_START script_Object69BallAndChainSoldierRoom + BeginBlock + Call sub_0807F354 + EndBlock + CheckLocalFlag 0x007c + JumpIf script_0800E4FA +script_0800E4B6: +.ifdef JP + CheckPlayerInRegion 0x0088, 0x0100, 0x0820 +.else +.ifdef EU + CheckPlayerInRegion 0x0088, 0x0100, 0x0820 +.else + CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 +.endif +.endif + JumpIfNot script_0800E4B6 + BeginBlock + _0807E864 +.ifdef JP +.ifndef DEMO_JP + Call SetPlayerEventPriority +.endif +.else +.ifdef EU + Call SetPlayerEventPriority +.endif +.endif + EndBlock + Call sub_0807F3F8 + Wait 0x003c + MessageFromTarget 0x160c + WaitUntilTextboxCloses + Wait 0x001e + MessageFromTarget 0x160d + WaitUntilTextboxCloses + Wait 0x001e + _0807EB28 0x160e + Wait 0x003c + WaitUntilTextboxCloses + BeginBlock + PlayBgm BGM_FIGHT_THEME2 + SetLocalFlag 0x007c +.ifdef JP +.ifndef DEMO_JP + Call ResetPlayerEventPriority +.endif +.else +.ifdef EU + Call ResetPlayerEventPriority +.endif +.endif +script_0800E4FA: + _0807E878 + DoPostScriptAction 0x0006 + EndBlock +SCRIPT_END diff --git a/data/scripts/dhc/script_Object69CastleEscape.inc b/data/scripts/dhc/script_Object69CastleEscape.inc new file mode 100644 index 00000000..ffd72119 --- /dev/null +++ b/data/scripts/dhc/script_Object69CastleEscape.inc @@ -0,0 +1,15 @@ +@ DHC OBJECT_69 trying to escape the collapsing castle +SCRIPT_START script_Object69CastleEscape + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerCastleEscape + WaitForSyncFlagAndClear 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + _0807EB28 0x1647 + WaitUntilTextboxCloses + SetLocalFlag 0x007a + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/dhc/script_Object69DHC.inc b/data/scripts/dhc/script_Object69DHC.inc new file mode 100644 index 00000000..c83d9c0b --- /dev/null +++ b/data/scripts/dhc/script_Object69DHC.inc @@ -0,0 +1,8 @@ +@ OBJECT_69 somewhere in DHC? +SCRIPT_START script_Object69DHC + BeginBlock + CheckLocalFlag 0x0086 + JumpIfNot script_Object69KillDarkNut + DoPostScriptAction 0x0006 + EndBlock +SCRIPT_END diff --git a/data/scripts/script_0800E544.inc b/data/scripts/dhc/script_Object69DarkNutsRoom.inc similarity index 80% rename from data/scripts/script_0800E544.inc rename to data/scripts/dhc/script_Object69DarkNutsRoom.inc index 1b7a7f95..44712e30 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/dhc/script_Object69DarkNutsRoom.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E544 +@ DHC OBJECT_69 Towards Vaati room with Dark Nuts +SCRIPT_START script_Object69DarkNutsRoom BeginBlock EndBlock CheckLocalFlag 0x007e diff --git a/data/scripts/script_0800E504.inc b/data/scripts/dhc/script_Object69KeatonsRoom.inc similarity index 79% rename from data/scripts/script_0800E504.inc rename to data/scripts/dhc/script_Object69KeatonsRoom.inc index 52e85d09..ef855c7e 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/dhc/script_Object69KeatonsRoom.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E504 +@ DHC OBJECT_69 Towards Vaati in room with Keatons +SCRIPT_START script_Object69KeatonsRoom BeginBlock EndBlock CheckLocalFlag 0x007d diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/dhc/script_Object69KillDarkNut.inc similarity index 74% rename from data/scripts/script_0800E5D6.inc rename to data/scripts/dhc/script_Object69KillDarkNut.inc index b2e3dd76..24b83cb0 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/dhc/script_Object69KillDarkNut.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E5D6 +@ DHC OBJECT_69 Kill first Dark Nut +SCRIPT_START script_Object69KillDarkNut EndBlock script_0800E5D8: CheckLocalFlag 0x0086 diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/dhc/script_Object69V1Defeated.inc similarity index 78% rename from data/scripts/script_0800DFB4.inc rename to data/scripts/dhc/script_Object69V1Defeated.inc index 99f9742c..5acee128 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/dhc/script_Object69V1Defeated.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DFB4 +@ DHC OBJECT_69 V1 defeated +SCRIPT_START script_Object69V1Defeated EndBlock script_0800DFB6: CheckRoomFlag 0x0001 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/dhc/script_Object69V2Defeated.inc similarity index 57% rename from data/scripts/script_0800E050.inc rename to data/scripts/dhc/script_Object69V2Defeated.inc index 188e9ae2..9d356a54 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/dhc/script_Object69V2Defeated.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E050 +@ DHC OBJECT_69 After defeating V2 +SCRIPT_START script_Object69V2Defeated BeginBlock Call sub_0807DF28 _0807E864 @@ -10,9 +11,9 @@ SCRIPT_START script_0800E050 WaitUntilTextboxCloses SetRoomFlag 0x0000 Wait 0x001e - _0807E5F8 0x00000001 - StartPlayerScript script_0800E094 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + StartPlayerScript script_PlayerV2Defeated + WaitForSyncFlagAndClear 0x00000002 Call sub_0807DF50 _0807E878 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/dhc/script_Object69V2Intro.inc similarity index 89% rename from data/scripts/script_0800DFE4.inc rename to data/scripts/dhc/script_Object69V2Intro.inc index e9ffcfb9..a485ffb9 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/dhc/script_Object69V2Intro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DFE4 +@ DHC OBJECT_69 V2 intro +SCRIPT_START script_Object69V2Intro BeginBlock Call sub_0807DF28 _0807E864 @@ -14,6 +15,7 @@ script_0800DFFE: Call sub_0807DF50 _0807E878 script_0800E012: + @ Defeated CheckRoomFlag 0x0002 JumpIfNot script_0800E012 _0807E864 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/dhc/script_Object69VaatiWithZelda.inc similarity index 83% rename from data/scripts/script_0800DA60.inc rename to data/scripts/dhc/script_Object69VaatiWithZelda.inc index 071becb7..e66a3b15 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/dhc/script_Object69VaatiWithZelda.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DA60 +@ DHC OBJECT_69 Vaati with Zelda +SCRIPT_START script_Object69VaatiWithZelda BeginBlock EndBlock script_0800DA64: @@ -14,11 +15,11 @@ script_0800DA64: SetEntityPositionRelative 0x0078, 0x0080 CameraTargetEntity Call sub_0807F5C0 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 MessageFromTargetPos 0x162d, 0x0002 WaitUntilTextboxCloses - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Wait 0x001e MessageFromTargetPos 0x162e, 0x0002 WaitUntilTextboxCloses diff --git a/data/scripts/script_0800A160.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc similarity index 61% rename from data/scripts/script_0800A160.inc rename to data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc index ecc539d6..77dc7aaa 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A160 +@ DHC Vaati defeated OBJECT_6A Minish Cap? +SCRIPT_START script_Object6AV3DefeatedMinishCap BeginBlock SetEntitySpeed 0x0080 DoPostScriptAction 0x0007 @@ -6,14 +7,14 @@ SCRIPT_START script_0800A160 _0807E930 0x0002 SetEntityPositionRelative 0x00b0, 0x0080 CallWithArg sub_0807F98C, 0xff800000 - CallWithArg sub_080960C4, script_0800A1B4 + CallWithArg sub_080960C4, script_Object6AV3DefeatedMinishCap2 EndBlock PlaySound SFX_SPARKLES _0807EF3C 0xff80, 0x0000 PlaySound SFX_143 _0807E930 0x0004 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Wait 0x003c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800A680.inc b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc similarity index 58% rename from data/scripts/script_0800A680.inc rename to data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc index 5ed4c24a..093a1833 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/dhc/script_Object6AV3DefeatedMinishCap2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800A680 +@ DHC Vaati defeated OBJECT_6A Minish Cap? +SCRIPT_START script_Object6AV3DefeatedMinishCap2 BeginBlock DoPostScriptAction 0x0007 DoPostScriptAction 0x000b CallWithArg sub_0807F994, 0x0000fff8 EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc similarity index 66% rename from data/scripts/script_0800DE00.inc rename to data/scripts/dhc/script_PlayerAfterDefeatingV2.inc index 00579691..8c72e4c3 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/dhc/script_PlayerAfterDefeatingV2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DE00 +@ Player at Zelda after defeating V2 +SCRIPT_START script_PlayerAfterDefeatingV2 BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -7,7 +8,7 @@ SCRIPT_START script_0800DE00 DoPostScriptAction 0x0000 _0807ECC4 0x0010 DoPostScriptAction 0x000c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/dhc/script_PlayerAtDarkNut1.inc similarity index 72% rename from data/scripts/script_0800E600.inc rename to data/scripts/dhc/script_PlayerAtDarkNut1.inc index f5bf0e9e..fd697e62 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut1.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E600 +@ DHC Player entering yet another Dark Nut fight +SCRIPT_START script_PlayerAtDarkNut1 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0000 diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/dhc/script_PlayerAtDarkNut2.inc similarity index 76% rename from data/scripts/script_0800E62C.inc rename to data/scripts/dhc/script_PlayerAtDarkNut2.inc index d19fe97c..274f6746 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E62C +@ DHC player at a dark nut fight +SCRIPT_START script_PlayerAtDarkNut2 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0008 diff --git a/data/scripts/script_0800E658.inc b/data/scripts/dhc/script_PlayerAtDarkNut3.inc similarity index 73% rename from data/scripts/script_0800E658.inc rename to data/scripts/dhc/script_PlayerAtDarkNut3.inc index ca0d71bf..8cd1c2c9 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/dhc/script_PlayerAtDarkNut3.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E658 +@ DHC Player entering another Dark Nut fight +SCRIPT_START script_PlayerAtDarkNut3 BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0010 diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/dhc/script_PlayerCastleCollapsing.inc similarity index 60% rename from data/scripts/script_0800DE2C.inc rename to data/scripts/dhc/script_PlayerCastleCollapsing.inc index 12867776..dff8b0a0 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/dhc/script_PlayerCastleCollapsing.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800DE2C +@ Player at Castle Collapsing +SCRIPT_START script_PlayerCastleCollapsing BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 _0807EEF4 0x0000, 0x0080 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/dhc/script_PlayerCastleEscape.inc similarity index 55% rename from data/scripts/script_0800DEB0.inc rename to data/scripts/dhc/script_PlayerCastleEscape.inc index 2c43999a..997799ad 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/dhc/script_PlayerCastleEscape.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800DEB0 +@ DHC Player trying to escape the collapsing castle +SCRIPT_START script_PlayerCastleEscape BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0198, 0x01c8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/dhc/script_PlayerRescuedZelda.inc similarity index 64% rename from data/scripts/script_0800DDD0.inc rename to data/scripts/dhc/script_PlayerRescuedZelda.inc index b2c5c367..23a6112c 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/dhc/script_PlayerRescuedZelda.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DDD0 +@ Player after turning Zelda back from stone +SCRIPT_START script_PlayerRescuedZelda BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,7 +7,7 @@ SCRIPT_START script_0800DDD0 _0807EDD4 0x0078, 0x00a0 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/dhc/script_PlayerStonesFall.inc similarity index 57% rename from data/scripts/script_0800DE50.inc rename to data/scripts/dhc/script_PlayerStonesFall.inc index 012e71d1..5f9e57d1 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/dhc/script_PlayerStonesFall.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_0800DE50 +@ Player after turning Zelda when stones fall +SCRIPT_START script_PlayerStonesFall EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 CallWithArg sub_0807F238, 0x000003c5 Call sub_0807F304 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800E094.inc b/data/scripts/dhc/script_PlayerV2Defeated.inc similarity index 53% rename from data/scripts/script_0800E094.inc rename to data/scripts/dhc/script_PlayerV2Defeated.inc index 269c0dcd..33f6d785 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/dhc/script_PlayerV2Defeated.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800E094 +@ Player after defeating V2 +SCRIPT_START script_PlayerV2Defeated BeginBlock SetEntitySpeed 0x00c0 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0001 _0807EDD4 0x00a8, 0x002c - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/dhc/script_Vaati1Intro.inc similarity index 92% rename from data/scripts/script_0800DF24.inc rename to data/scripts/dhc/script_Vaati1Intro.inc index 13de03c2..cbf2d189 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/dhc/script_Vaati1Intro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DF24 +@ DHC Vaati V1 intro +SCRIPT_START script_Vaati1Intro BeginBlock DoPostScriptAction 0x0008 _0807EB44 0x0004 diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/dhc/script_VaatiWithZelda.inc similarity index 66% rename from data/scripts/script_0800DB28.inc rename to data/scripts/dhc/script_VaatiWithZelda.inc index dc596557..252052f3 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/dhc/script_VaatiWithZelda.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800DB28 +@ DHC Vaati when with Zelda +SCRIPT_START script_VaatiWithZelda BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 DoPostScriptAction 0x0014 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c DoPostScriptAction 0x0004 Wait 0x003c @@ -13,8 +14,8 @@ SCRIPT_START script_0800DB28 Call sub_0807F2D4 DoPostScriptAction 0x0000 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807EB44 0x0004 DoPostScriptAction 0x0014 SCRIPT_END diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc similarity index 76% rename from data/scripts/script_0800DCAC.inc rename to data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc index f0d48c29..c52b1a81 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800DCAC +@ DHC Zelda after defeating V2 +SCRIPT_START script_ZeldaAfterDefeatingV2 BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 CallWithArg sub_0807F8E8, 0x00000000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 script_0800DCD0: CheckRoomFlag 0x0000 JumpIfNot script_0800DCD0 @@ -13,7 +14,7 @@ script_0800DCD0: Wait 0x003c DoPostScriptAction 0x0010 SetEntityPositionRelative 0x0078, 0x0068 - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 StopBgm Call sub_08066E50 PlaySound SFX_1C9 @@ -35,8 +36,8 @@ script_0800DCD0: _0807EB44 0x0004 DoPostScriptAction 0x0000 Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0008 _0807EB44 0x0004 @@ -45,8 +46,8 @@ script_0800DCD0: Call sub_08066E80 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 DoPostScriptAction 0x0004 Wait 0x003c _0807EB44 0x0002 @@ -60,8 +61,8 @@ script_0800DCD0: Wait 0x000a _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 SetEntitySpeed 0x0100 _0807EEF4 0x0000, 0x0080 SCRIPT_END diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/dhc/script_ZeldaCastleEscape.inc similarity index 77% rename from data/scripts/script_0800DED4.inc rename to data/scripts/dhc/script_ZeldaCastleEscape.inc index 3c5f2e5e..83fd2afd 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/dhc/script_ZeldaCastleEscape.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DED4 +@ DHC Zelda trying to escape the collapsing castle +SCRIPT_START script_ZeldaCastleEscape BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -14,7 +15,7 @@ SCRIPT_START script_0800DED4 _0807EDD4 0x0198, 0x01a8 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08066D4C DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/dhc/script_ZeldaStoneDHC.inc similarity index 77% rename from data/scripts/script_0800E58C.inc rename to data/scripts/dhc/script_ZeldaStoneDHC.inc index e2f26ffa..04ab862d 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/dhc/script_ZeldaStoneDHC.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E58C +@ Maybe also DHC Zelda stone? -> gUnk_080FCEBC +SCRIPT_START script_ZeldaStoneDHC BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0000 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/dhc/script_ZeldaStoneInDHC.inc similarity index 59% rename from data/scripts/script_0800DB18.inc rename to data/scripts/dhc/script_ZeldaStoneInDHC.inc index 6af5c26a..b930c322 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/dhc/script_ZeldaStoneInDHC.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DB18 +@ DHC Zelda stone +SCRIPT_START script_ZeldaStoneInDHC BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 diff --git a/data/scripts/fow/script_MazaalMacroDefeated.inc b/data/scripts/fow/script_MazaalMacroDefeated.inc new file mode 100644 index 00000000..624a5513 --- /dev/null +++ b/data/scripts/fow/script_MazaalMacroDefeated.inc @@ -0,0 +1,12 @@ +@ Mazaal Macro when defeated +SCRIPT_START script_MazaalMacroDefeated + BeginBlock + _0807E864 + EndBlock + Wait 0x0078 + _0807E908 0x0004 + StartPlayerScript script_PlayerDefeatedMazaal + WaitForSyncFlagAndClear 0x00000002 + Wait 0x000c + _0807E908 0x0005 +SCRIPT_END diff --git a/data/scripts/fow/script_Object89Mazaal.inc b/data/scripts/fow/script_Object89Mazaal.inc new file mode 100644 index 00000000..b5c522c0 --- /dev/null +++ b/data/scripts/fow/script_Object89Mazaal.inc @@ -0,0 +1,12 @@ +@ Mazaal OBJECT_89 +SCRIPT_START script_Object89Mazaal + BeginBlock + EndBlock + _0807E888 + Wait 0x0018 + _0807E864 + StartPlayerScript script_PlayerAtMazaal + WaitForSyncFlagAndClear 0x00000001 + _0807E908 0x0002 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/fow/script_PlayerAtMazaal.inc similarity index 66% rename from data/scripts/script_08012DF8.inc rename to data/scripts/fow/script_PlayerAtMazaal.inc index 3e47a89b..75086071 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/fow/script_PlayerAtMazaal.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012DF8 +@ Player entering Mazaal +SCRIPT_START script_PlayerAtMazaal BeginBlock _0807EB44 0x0000 SetEntitySpeed 0x0140 @@ -7,6 +8,6 @@ SCRIPT_START script_08012DF8 Wait 0x0008 DoPostScriptAction 0x0000 Wait 0x0008 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/fow/script_PlayerDefeatedMazaal.inc similarity index 73% rename from data/scripts/script_08012E44.inc rename to data/scripts/fow/script_PlayerDefeatedMazaal.inc index bc828aa9..0f6d278a 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/fow/script_PlayerDefeatedMazaal.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012E44 +@ Player when defeating Mazaal +SCRIPT_START script_PlayerDefeatedMazaal BeginBlock SetEntitySpeed 0x0140 EndBlock @@ -13,7 +14,7 @@ SCRIPT_START script_08012E44 Wait 0x0015 _0807EB44 0x0004 Wait 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 _0807EDD4 0x0088, 0x0158 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/graveyard/script_DampeInside.inc b/data/scripts/graveyard/script_DampeInside.inc new file mode 100644 index 00000000..4f7b7f6f --- /dev/null +++ b/data/scripts/graveyard/script_DampeInside.inc @@ -0,0 +1,20 @@ +@ Graveyard Dampe in house +SCRIPT_START script_DampeInside + CheckEntityInteractType + JumpIfNot script_080095DE + _0807E864 + _0807EB74 + DoPostScriptAction 0x0001 + Call sub_0806BE84 + WaitUntilTextboxCloses + JumpIfNot script_08009622 + PlaySound SFX_109 + _0807F088 0x003c + MessageFromTarget 0x053c + WaitPlayerGetItem + WaitUntilTextboxCloses + _0807F078 0x003c, 0x0001 +script_08009622: + _0807E878 + DoPostScriptAction 0x0000 + Jump script_080095DE diff --git a/data/scripts/graveyard/script_DampeInside2.inc b/data/scripts/graveyard/script_DampeInside2.inc new file mode 100644 index 00000000..fba10fd3 --- /dev/null +++ b/data/scripts/graveyard/script_DampeInside2.inc @@ -0,0 +1,13 @@ +@ Graveyard Dampe in house 2? +SCRIPT_START script_DampeInside2 + BeginBlock + Call sub_0806BE3C + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + EndBlock +script_080095DE: + Call sub_0806BF44 + JumpIf script_DampeInside + DoPostScriptAction 0x000b + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/graveyard/script_DampeOuside.inc b/data/scripts/graveyard/script_DampeOuside.inc new file mode 100644 index 00000000..fd0d90a2 --- /dev/null +++ b/data/scripts/graveyard/script_DampeOuside.inc @@ -0,0 +1,36 @@ +@ Graveyard Dampe outside +SCRIPT_START script_DampeOuside + BeginBlock + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 + EndBlock +script_08009638: + EndBlock + BeginBlock + CheckGlobalFlag 0x0020 + JumpIfNot script_08009638 + EndBlock +script_08009646: + Call sub_0806BF44 + JumpIf script_08009646 + EndBlock + Call sub_0806BE3C + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 +script_08009660: + CheckEntityInteractType + JumpIfNot script_08009660 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0001 + Call sub_0806BEC8 + WaitUntilTextboxCloses + JumpIfNot script_0800968E + PlaySound SFX_111 + PlaySound SFX_SECRET + _0807F078 0x003c, 0x0002 + Call sub_0806BEFC +script_0800968E: + _0807E878 + DoPostScriptAction 0x0000 + Jump script_08009660 diff --git a/data/scripts/graveyard/script_GhostBrothers.inc b/data/scripts/graveyard/script_GhostBrothers.inc new file mode 100644 index 00000000..4f734e51 --- /dev/null +++ b/data/scripts/graveyard/script_GhostBrothers.inc @@ -0,0 +1,20 @@ +@ Graveyard GhostBrothers +SCRIPT_START script_GhostBrothers + BeginBlock + Call sub_08065D00 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + EndBlock +script_0800975A: + CheckEntityInteractType + JumpIfNot script_0800975A + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + Call sub_08065F64 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800975A + .2byte 0x0000 diff --git a/data/scripts/graveyard/script_Gina.inc b/data/scripts/graveyard/script_Gina.inc new file mode 100644 index 00000000..2f0422c7 --- /dev/null +++ b/data/scripts/graveyard/script_Gina.inc @@ -0,0 +1,28 @@ +@ Graveyard Gina +SCRIPT_START script_Gina + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + EndBlock + CheckLocalFlag 0x005f + JumpIf script_0800B94E +script_0800B934: + CheckEntityInteractType + JumpIfNot script_0800B934 + _0807E864 + _0807EB74 + MessageFromTarget 0x3f19 + WaitUntilTextboxCloses + SetLocalFlag 0x005f + _0807E878 + Jump script_0800B934 +script_0800B94E: + CheckEntityInteractType + JumpIfNot script_0800B94E + _0807E864 + _0807EB74 + MessageFromTarget 0x3f1a + WaitUntilTextboxCloses + _0807E878 + Jump script_0800B94E diff --git a/data/scripts/graveyard/script_GraveyardHouseDoor.inc b/data/scripts/graveyard/script_GraveyardHouseDoor.inc new file mode 100644 index 00000000..631a1c19 --- /dev/null +++ b/data/scripts/graveyard/script_GraveyardHouseDoor.inc @@ -0,0 +1,30 @@ +@ Graveyard house door +SCRIPT_START script_GraveyardHouseDoor + BeginBlock + DoPostScriptAction 0x0007 + Jump script_080096FC + CheckGlobalFlag 0x0020 + JumpIf script_080096FC + EndBlock +script_080096AC: + CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 + JumpIfNot script_080096AC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtGraveyardHouseDoor + WaitForSyncFlagAndClear 0x00000001 + PlaySound SFX_111 + DoPostScriptAction 0x0008 + LoadRoomEntityList gUnk_080D9048 + Wait 0x000f + PlaySound SFX_111 + DoPostScriptAction 0x0007 +script_080096EC: + CheckGlobalFlag 0x0020 + JumpIfNot script_080096EC + Call sub_0807DF50 + _0807E878 +script_080096FC: + Call sub_0808692C +SCRIPT_END diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/graveyard/script_GreatFairyArrows.inc similarity index 64% rename from data/scripts/script_0800B5EC.inc rename to data/scripts/graveyard/script_GreatFairyArrows.inc index 2ec4bf11..e43be1bd 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/graveyard/script_GreatFairyArrows.inc @@ -1,20 +1,5 @@ -SCRIPT_START script_0800B5EC - BeginBlock - DoPostScriptAction 0x000a - DoPostScriptAction 0x0001 - _0807E9D4 - EndBlock -script_0800B5FA: - CheckEntityInteractType - JumpIfNot script_0800B5FA - _0807E864 - _0807EB74 - MessageNoOverlap 0x2009 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - Jump script_0800B5FA -SCRIPT_START script_0800B614 +@ Graveyard Great Fairy OBJECT_69 +SCRIPT_START script_GreatFairyArrows BeginBlock EndBlock script_0800B618: @@ -23,15 +8,15 @@ script_0800B618: Call sub_08079184 _0807E864 Call sub_0807F9A4 - StartPlayerScript script_0800B7C4 - WaitForSomething2 0x00000004 + StartPlayerScript script_PlayerAtGreatFairy + WaitForSyncFlagAndClear 0x00000004 SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 CheckLocalFlag 0x009e JumpIf script_0800B7A2 MessageNoOverlap 0x0583 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_0800B684 Wait 0x000f MessageNoOverlap 0x0584 @@ -47,7 +32,7 @@ script_0800B684: script_0800B68E: WaitUntilTextboxCloses SetLocalFlag 0x009e - _0807F034 0x0066 + GivePlayerItem 0x0066 script_0800B698: WaitPlayerGetItem _0807EB8C @@ -57,10 +42,10 @@ script_0800B698: script_0800B6A6: _0807E778 0x0004 DoFade7 - WaitFor_2 + WaitForFadeFinish Call sub_080873FC DoFade6 - WaitFor_2 + WaitForFadeFinish CameraTargetPlayer Wait 0x001e Call sub_0807DF50 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/graveyard/script_KingGustav.inc similarity index 74% rename from data/scripts/script_0800D954.inc rename to data/scripts/graveyard/script_KingGustav.inc index 3ddd4c9d..f1b2e0fc 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/graveyard/script_KingGustav.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D954 +@ Graveyard King Gustav +SCRIPT_START script_KingGustav BeginBlock DoPostScriptAction 0x0008 Call sub_0807F180 @@ -9,8 +10,8 @@ script_0800D962: _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - StartPlayerScript script_0800DA00 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerAtKingGustav + WaitForSyncFlagAndClear 0x00000001 Wait 0x003c _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -19,13 +20,13 @@ script_0800D962: SetEntity0x20 0xffff8000 MessageNoOverlap 0x1701 WaitUntilTextboxCloses - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 MessageNoOverlap 0x1702 WaitUntilTextboxCloses SetEntity0x20 0x00010000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 _0807F050 0x006d WaitPlayerGetItem _0807EB28 0x1703 diff --git a/data/scripts/graveyard/script_Object69CrowStealingKey.inc b/data/scripts/graveyard/script_Object69CrowStealingKey.inc new file mode 100644 index 00000000..9c0bf816 --- /dev/null +++ b/data/scripts/graveyard/script_Object69CrowStealingKey.inc @@ -0,0 +1,29 @@ +@ Graveyard OBJECT_69 Crow stealing key cutscene +SCRIPT_START script_Object69CrowStealingKey + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + PlaySound SFX_1F3 + Call sub_0807F40C + _0807E8E4_1 + Wait 0x000a + _0807E8E4_3 + Wait 0x0032 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + StartPlayerScript script_PlayerGetKeyStolen + WaitForSyncFlagAndClear 0x00000040 + SetSyncFlag 0x00000008 + WaitForSyncFlagAndClear 0x00000010 + SetSyncFlag 0x00000020 + WaitForSyncFlagAndClear 0x00000040 + _0807F078 0x003c, 0x0000 + SetGlobalFlag 0x0020 + _0807E8E4_3 + Wait 0x001e + _0807EB28 0x2809 + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_080098D4.inc b/data/scripts/graveyard/script_Object69GetKeyBack.inc similarity index 89% rename from data/scripts/script_080098D4.inc rename to data/scripts/graveyard/script_Object69GetKeyBack.inc index f35937cc..7c9b1a25 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/graveyard/script_Object69GetKeyBack.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080098D4 +@ Graveyard OBJECT_69 When getting the key back +SCRIPT_START script_Object69GetKeyBack BeginBlock EndBlock script_080098D8: diff --git a/data/scripts/graveyard/script_Object6AKingsGravestone.inc b/data/scripts/graveyard/script_Object6AKingsGravestone.inc new file mode 100644 index 00000000..b8a09309 --- /dev/null +++ b/data/scripts/graveyard/script_Object6AKingsGravestone.inc @@ -0,0 +1,15 @@ +@ Graveyard OBJECT_6A Kings gravestone? or King ghost representation? +SCRIPT_START script_Object6AKingsGravestone + BeginBlock + DoPostScriptAction 0x0008 + SetEntitySpeed 0x0080 + EndBlock + WaitForSyncFlagAndClear 0x00000004 + DoPostScriptAction 0x0007 + Wait 0x003c + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + _0807EDD4 0x0118, 0x0060 + SetSyncFlag 0x00000002 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/script_080097F0.inc b/data/scripts/graveyard/script_Object97FirstCrow.inc similarity index 62% rename from data/scripts/script_080097F0.inc rename to data/scripts/graveyard/script_Object97FirstCrow.inc index dd31d91e..4c5e2c80 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/graveyard/script_Object97FirstCrow.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_080097F0 +@ Graveyard OBJECT_97 Crow stealing the key? first crow that makes link loose the key +SCRIPT_START script_Object97FirstCrow BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 PlaySound SFX_123 Call sub_0807F1A0 script_08009816: @@ -14,7 +15,7 @@ script_08009816: _0807EE30 JumpIfNot script_08009816 EndBlock - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_0807FBD4 PlaySound SFX_1F3 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08009838.inc b/data/scripts/graveyard/script_Object97SecondCrow.inc similarity index 59% rename from data/scripts/script_08009838.inc rename to data/scripts/graveyard/script_Object97SecondCrow.inc index dab8ef69..131fe158 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/graveyard/script_Object97SecondCrow.inc @@ -1,17 +1,18 @@ -SCRIPT_START script_08009838 +@ Graveyard OBJECT_97 Crow stealing the key? Second crow that picks up the key +SCRIPT_START script_Object97SecondCrow BeginBlock _0807E930 0x0003 DoPostScriptAction 0x0007 SetEntitySpeed 0x0300 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 Call sub_0809E0A0 Call sub_0809E0D4 PlaySound SFX_1F3 Call sub_0807FBD4 PlaySound SFX_1F3 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08009704.inc b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc similarity index 72% rename from data/scripts/script_08009704.inc rename to data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc index a37836bb..5d193069 100644 --- a/data/scripts/script_08009704.inc +++ b/data/scripts/graveyard/script_PlayerAtGraveyardHouseDoor.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009704 +@ Player at Graveyard house door +SCRIPT_START script_PlayerAtGraveyardHouseDoor SetEntitySpeed 0x0080 DoPostScriptAction 0x0001 _0807EDD4 0x01a0, 0x01b0 @@ -7,7 +8,7 @@ SCRIPT_START script_08009704 Wait 0x000a DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 DoPostScriptAction 0x000d SetEntitySpeed 0x0100 _0807ECC4 0x0010 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/graveyard/script_PlayerAtKingGustav.inc similarity index 64% rename from data/scripts/script_0800DA00.inc rename to data/scripts/graveyard/script_PlayerAtKingGustav.inc index 3c9463ec..d1214171 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/graveyard/script_PlayerAtKingGustav.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800DA00 +@ Player at Graveyard King Gustaf +SCRIPT_START script_PlayerAtKingGustav BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_0800DA00 _0807EDD4 0x0118, 0x0060 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800987C.inc b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc similarity index 66% rename from data/scripts/script_0800987C.inc rename to data/scripts/graveyard/script_PlayerGetKeyStolen.inc index b6cf02a9..c805299a 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/graveyard/script_PlayerGetKeyStolen.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800987C +@ Player when crow steals key +SCRIPT_START script_PlayerGetKeyStolen PlaySound SFX_PLY_VO6 _0807EB44 0x0004 PlaySound SFX_86 @@ -7,14 +8,14 @@ SCRIPT_START script_0800987C _0807ECF4 0x0004 Call sub_0807F1E8 Wait 0x001e - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 + SetSyncFlag 0x00000040 + WaitForSyncFlagAndClear 0x00000020 PlaySound SFX_PLY_JUMP _0807EB44 0x0004 Call sub_0807F210 _0807EF3C 0x0200, 0x0020 DoPostScriptAction 0x0000 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_CastleMaid.inc b/data/scripts/hyruleCastle/script_CastleMaid.inc new file mode 100644 index 00000000..8e3726ba --- /dev/null +++ b/data/scripts/hyruleCastle/script_CastleMaid.inc @@ -0,0 +1,14 @@ +@ Intro Hyrule Castle Maid +SCRIPT_START script_CastleMaid + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + CallWithArg sub_08064644, sub_0806464C + EndBlock +script_0800B8D4: + Wait 0x003c + Call sub_080646A4 + Jump script_0800B8D4 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_GuardAtEntry.inc b/data/scripts/hyruleCastle/script_GuardAtEntry.inc new file mode 100644 index 00000000..9fa561fc --- /dev/null +++ b/data/scripts/hyruleCastle/script_GuardAtEntry.inc @@ -0,0 +1,20 @@ +@ Hyrule Castle inside Guard at entry +SCRIPT_START script_GuardAtEntry + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08008DD8: + CheckEntityInteractType + JumpIfNot script_08008DD8 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_080643D8 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_08008DD8 diff --git a/data/scripts/hyruleCastle/script_KingDaltus.inc b/data/scripts/hyruleCastle/script_KingDaltus.inc new file mode 100644 index 00000000..9c47505b --- /dev/null +++ b/data/scripts/hyruleCastle/script_KingDaltus.inc @@ -0,0 +1,10 @@ +@ Hyrule Castle King Daltus +SCRIPT_START script_KingDaltus + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Call sub_0806672C + DoPostScriptAction 0x000a + EndBlock + Jump script_0800917C + .2byte 0x0000 diff --git a/data/scripts/hyruleCastle/script_MinisterPotho.inc b/data/scripts/hyruleCastle/script_MinisterPotho.inc new file mode 100644 index 00000000..7cea778c --- /dev/null +++ b/data/scripts/hyruleCastle/script_MinisterPotho.inc @@ -0,0 +1,20 @@ +@ Hyrule Castle Minister Potho +SCRIPT_START script_MinisterPotho + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 +script_0800927E: + Call sub_080668F0 + DoPostScriptAction 0x000a + EndBlock +script_0800928A: + CheckEntityInteractType + JumpIfNot script_0800928A + _0807E864 + _0807EB74 + Call sub_08066904 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800928A + .2byte 0x0000 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc similarity index 63% rename from data/scripts/script_08012D70.inc rename to data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc index f74d2b21..9f2a3cd7 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/hyruleCastle/script_Object69SanctuaryEntrance.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08012D70 +@ Hyrule Castle OBJECT_69 Sanctuary Entrance +SCRIPT_START script_Object69SanctuaryEntrance CheckPlayerInRegion 0x0088, 0x0048, 0x3030 - JumpIfNot script_08012D70 + JumpIfNot script_Object69SanctuaryEntrance _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - StartPlayerScript script_08012DB0 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerAtSanctuaryEntrance + WaitForSyncFlagAndClear 0x00000001 _0807EB28 0x132d WaitUntilTextboxCloses .ifdef JP diff --git a/data/scripts/hyruleCastle/script_SmithAtCastle.inc b/data/scripts/hyruleCastle/script_SmithAtCastle.inc new file mode 100644 index 00000000..5aa10b08 --- /dev/null +++ b/data/scripts/hyruleCastle/script_SmithAtCastle.inc @@ -0,0 +1,19 @@ +@ Hyrule Castle Smith +SCRIPT_START script_SmithAtCastle + BeginBlock + _0807EB44 0x0006 + DoPostScriptAction 0x0000 +script_080092B2: + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_080092BA: + CheckEntityInteractType + JumpIfNot script_080092BA + _0807E864 + _0807EB74 + MessageNoOverlap 0x105e + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_080092BA diff --git a/data/scripts/hyruleCastle/script_StoneZelda.inc b/data/scripts/hyruleCastle/script_StoneZelda.inc new file mode 100644 index 00000000..7c9cacd8 --- /dev/null +++ b/data/scripts/hyruleCastle/script_StoneZelda.inc @@ -0,0 +1,17 @@ +@ Hyrule Castle Stone Zelda +SCRIPT_START script_StoneZelda + BeginBlock + DoPostScriptAction 0x000a + Call sub_08066E38 + _0807E9D4 + EndBlock +script_08009300: + CheckEntityInteractType + JumpIfNot script_08009300 + _0807E864 + _0807EB74 + MessageNoOverlap 0x1071 + WaitUntilTextboxCloses + _0807E878 + Jump script_08009300 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GardGarden5.inc b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc new file mode 100644 index 00000000..4d280b98 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GardGarden5.inc @@ -0,0 +1,6 @@ +@ Guard in Castle garden? +SCRIPT_START script_GardGarden5 + BeginBlock + _0807EB44 0x0002 + Jump script_080119F6 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc new file mode 100644 index 00000000..36724e50 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry1.inc @@ -0,0 +1,20 @@ +@ Intro Hyrule Castle Entrance Guard +SCRIPT_START script_GuardEntry1 + BeginBlock + _0807EB44 0x0006 +script_080119F6: + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08011A08: + CheckEntityInteractType + JumpIfNot script_08011A08 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_08064428 + WaitUntilTextboxCloses + _0807E878 + Jump script_08011A08 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc new file mode 100644 index 00000000..061b8cb7 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry2.inc @@ -0,0 +1,18 @@ +@ Hyrule Castle Guard guarding entry to castle +SCRIPT_START script_GuardEntry2 + BeginBlock + _0807EB44 0x0004 + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08011A44: + CheckEntityInteractType + JumpIfNot script_08011A44 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageFromTarget 0x1320 + WaitUntilTextboxCloses + _0807E878 + Jump script_08011A44 diff --git a/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc new file mode 100644 index 00000000..c1b2985d --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardEntry3.inc @@ -0,0 +1,38 @@ +@ Hyrule Castle Guard guarding entry to garden +SCRIPT_START script_GuardEntry3 + BeginBlock + _0807EB44 0x0002 + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08011A7C: + CheckEntityInteractType + JumpIfNot script_08011A7C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + CallWithArg sub_080644B4, 0x00000006 + JumpIf script_08011AFA + MessageFromTarget 0x1320 + WaitUntilTextboxCloses + _0807E878 + Jump script_08011A7C + .2byte 0x0000 + BeginBlock + _0807EB44 0x0004 + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08011AC4: + CheckEntityInteractType + JumpIfNot script_08011AC4 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + MessageFromTarget 0x1322 + WaitUntilTextboxCloses + _0807E878 + Jump script_08011AC4 + diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc new file mode 100644 index 00000000..ac2385f2 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden1.inc @@ -0,0 +1,6 @@ +@ Guard in Castle garden? +SCRIPT_START script_GuardGarden1 + BeginBlock + _0807EB44 0x0002 + Jump script_0801196A + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc new file mode 100644 index 00000000..72a8627b --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden2.inc @@ -0,0 +1,6 @@ +@ Guard in Castle garden? +SCRIPT_START script_GuardGarden2 + BeginBlock + _0807EB44 0x0006 + Jump script_0801196A + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc new file mode 100644 index 00000000..c59e34cc --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden3.inc @@ -0,0 +1,26 @@ +@ Intro Hyrule Castle Garden Guard +SCRIPT_START script_GuardGarden3 + BeginBlock + _0807EB44 0x0004 +script_0801196A: + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_0801197C: + CheckEntityInteractType + JumpIfNot script_0801197C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + CheckGlobalFlag 0x0015 + JumpIf script_080119A0 + MessageFromTarget 0x103d + Jump script_080119A4 +script_080119A0: + MessageFromTarget 0x103f +script_080119A4: + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0801197C diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc new file mode 100644 index 00000000..ce7e7680 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden4.inc @@ -0,0 +1,13 @@ +@ Intro Hyrule Castle roaming Guard +SCRIPT_START script_GuardGarden4 + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x0000000c + EndBlock +script_080119C8: + Wait 0x003c + Call sub_0806407C + Jump script_080119C8 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc new file mode 100644 index 00000000..244345f9 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden6.inc @@ -0,0 +1,6 @@ +@ Guard in Castle garden? +SCRIPT_START script_GuardGarden6 + BeginBlock + _0807EB44 0x0004 + Jump script_080119F6 + .2byte 0x0000 diff --git a/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc new file mode 100644 index 00000000..0dd6ee73 --- /dev/null +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden7.inc @@ -0,0 +1,29 @@ +@ Hyrule Castle Guard kicking Link out +SCRIPT_START script_GuardGarden7 + CheckRoomFlag 0x000f + JumpIfNot script_GuardGarden7 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 +script_08011AFA: + MessageFromTargetPos 0x1321, 0x0007 + WaitUntilTextboxCloses +.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 + Call sub_0807DF50 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc similarity index 68% rename from data/scripts/script_08011B20.inc rename to data/scripts/hyruleCastleGarden/script_GuardGarden8.inc index c679db6d..beff4e16 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/hyruleCastleGarden/script_GuardGarden8.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08011B20 +@ Hyrule Castle Guard kicking Link out of garden +SCRIPT_START script_GuardGarden8 _0807E864 Call sub_0807DF28 MessageFromTargetPos 0x1320, 0x000c diff --git a/data/scripts/script_080100C8.inc b/data/scripts/hyruleTown/script_Anju.inc similarity index 62% rename from data/scripts/script_080100C8.inc rename to data/scripts/hyruleTown/script_Anju.inc index 360411e1..827726c2 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/hyruleTown/script_Anju.inc @@ -1,48 +1,5 @@ -SCRIPT_START script_080100C8 - BeginBlock - Call sub_08061FE4 - Call sub_08061E70 - DoPostScriptAction 0x000a - EndBlock -script_080100DC: - CheckEntityInteractType - JumpIfNot script_080100DC - _0807E864 - _0807EB74 - Call sub_08061FE4 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_080100DC - .2byte 0x0000 -SCRIPT_START script_080100FC - BeginBlock - Call sub_08061FE4 - Call sub_08061E70 - DoPostScriptAction 0x000a - EndBlock -script_08010110: - Wait 0x003c - Call sub_08061E90 - Jump script_08010110 - .2byte 0x0000 -SCRIPT_START script_08010120 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_08010132: - CheckEntityInteractType - JumpIfNot script_08010132 - _0807E864 - _0807EB74 - MessageFromTarget 0x4f22 - WaitUntilTextboxCloses - _0807E878 - Jump script_08010132 -SCRIPT_START script_08010148 +@ Hyrule Town Anju +SCRIPT_START script_Anju BeginBlock DoPostScriptAction 0x0001 Call sub_0806C354 @@ -57,7 +14,7 @@ script_0801015A: JumpIf script_0801019E MessageFromTargetPos 0x3001, 0x0000 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080101A6 Call sub_080A1608 WaitUntilTextboxCloses @@ -86,7 +43,7 @@ script_080101AC: StopBgm _0807E778 0x0004 DoFade5 - WaitFor_2 + WaitForFadeFinish CallWithArg sub_0807F75C, 0x03400378 Call sub_080791BC Call sub_0807FB74 @@ -101,7 +58,7 @@ script_080101AC: EndBlock _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish PlayBGM Call sub_080A13B4 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_AnjuInside.inc b/data/scripts/hyruleTown/script_AnjuInside.inc new file mode 100644 index 00000000..7494a7a3 --- /dev/null +++ b/data/scripts/hyruleTown/script_AnjuInside.inc @@ -0,0 +1,17 @@ +@ Hyrule Town Anju inside +SCRIPT_START script_AnjuInside + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_08010132: + CheckEntityInteractType + JumpIfNot script_08010132 + _0807E864 + _0807EB74 + MessageFromTarget 0x4f22 + WaitUntilTextboxCloses + _0807E878 + Jump script_08010132 diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/hyruleTown/script_BedAtSimons.inc similarity index 54% rename from data/scripts/script_08009EF0.inc rename to data/scripts/hyruleTown/script_BedAtSimons.inc index d07f072c..3d37f36d 100644 --- a/data/scripts/script_08009EF0.inc +++ b/data/scripts/hyruleTown/script_BedAtSimons.inc @@ -1,9 +1,12 @@ -SCRIPT_START script_08009EF0 +@ OBJECT_5B Bed at Simons +@ also at Inn +@ also at Links house later +SCRIPT_START script_BedAtSimons BeginBlock SetIntVariable 0x00000000 DoPostScriptAction 0x0001 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock SetIntVariable 0x00000001 DoPostScriptAction 0x0001 diff --git a/data/scripts/hyruleTown/script_Beedle.inc b/data/scripts/hyruleTown/script_Beedle.inc new file mode 100644 index 00000000..38c53a6c --- /dev/null +++ b/data/scripts/hyruleTown/script_Beedle.inc @@ -0,0 +1,90 @@ +@ Hyrule Town Beedle +SCRIPT_START script_Beedle + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0000 + DoPostScriptAction 0x000a + Call sub_0807F348 + EndBlock +script_08010502: + CheckEntityInteractType + JumpIfNot script_08010502 + _0807E864 + Call sub_0807DF28 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + CheckRoomFlag 0x000e + JumpIf script_0801052E + SetRoomFlag 0x000e + MessageNoOverlap 0x2b10 + WaitUntilTextboxCloses +script_0801052E: + Call sub_080634E4 + JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 +script_08010544: + MessageNoOverlap 0x2b0d + Jump script_080105E0 +script_0801054C: + CheckGlobalFlag 0x003d + JumpIfNot script_080105DC + Jump script_08010570 +script_08010558: + CheckGlobalFlag 0x003c + JumpIfNot script_080105DC + Jump script_08010570 +script_08010564: + CheckGlobalFlag 0x003b + JumpIfNot script_080105DC + Jump script_08010570 +script_08010570: + Call sub_080634EC + CallWithArg sub_0807F78C, 0x00000000 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_080105E0 + CallWithArg sub_0807F7C4, 0x00000000 + JumpIfNot script_080105C4 + CheckBottleContaining 0x0020 + JumpIfNot script_080105CC + Call sub_08063504 + JumpIf script_080105D4 + MessageNoOverlap 0x2b07 + WaitUntilTextboxCloses + CallWithArg sub_0807F800, 0x00000000 + WaitPlayerGetItem + WaitUntilTextboxCloses + MessageNoOverlap 0x2b0c + Jump script_080105E0 +script_080105C4: + MessageNoOverlap 0x2b09 + Jump script_080105E0 +script_080105CC: + MessageNoOverlap 0x2b0a + Jump script_080105E0 +script_080105D4: + MessageNoOverlap 0x2b0b + Jump script_080105E0 +script_080105DC: + MessageNoOverlap 0x2b0e +script_080105E0: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_08010502 + .2byte 0x0000 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_08010602: + CheckEntityInteractType + JumpIfNot script_08010602 + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + Jump script_08010602 diff --git a/data/scripts/hyruleTown/script_Brocco.inc b/data/scripts/hyruleTown/script_Brocco.inc new file mode 100644 index 00000000..58b41e24 --- /dev/null +++ b/data/scripts/hyruleTown/script_Brocco.inc @@ -0,0 +1,21 @@ +@ (Intro) Hyrule Town Brocco +SCRIPT_START script_Brocco + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0000 + Call sub_080636F4 + DoPostScriptAction 0x000a + Call sub_0807F348 + EndBlock +script_08010470: + CheckEntityInteractType + JumpIfNot script_08010470 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_080636D8 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_08010470 diff --git a/data/scripts/hyruleTown/script_CafeGuy.inc b/data/scripts/hyruleTown/script_CafeGuy.inc new file mode 100644 index 00000000..32473eb5 --- /dev/null +++ b/data/scripts/hyruleTown/script_CafeGuy.inc @@ -0,0 +1,32 @@ +@ Hyrule Town Cafe guy +SCRIPT_START script_CafeGuy + BeginBlock + _0807E9D4 + CallWithArg sub_08061FB8, 0x00000001 + SetEntitySpeed 0x0040 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0002 + EndBlock +script_0800ECAC: + _0807EB44 0x0006 + _0807E930 0x0007 + _0807EDD4 0x0028, 0x0050 + Wait 0x001e + _0807EB44 0x0004 + _0807E930 0x0002 + Wait 0x001e + _0807EB44 0x0002 + _0807E930 0x0001 + Wait 0x001e + _0807EB44 0x0002 + _0807E930 0x0005 + _0807EDD4 0x0048, 0x0050 + Wait 0x001e + _0807EB44 0x0004 + _0807E930 0x0002 + Wait 0x001e + _0807EB44 0x0006 + _0807E930 0x0003 + Wait 0x001e + Jump script_0800ECAC diff --git a/data/scripts/script_08014450.inc b/data/scripts/hyruleTown/script_Carlov.inc similarity index 94% rename from data/scripts/script_08014450.inc rename to data/scripts/hyruleTown/script_Carlov.inc index 6888e5d0..ac6a116b 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/hyruleTown/script_Carlov.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08014450 +@ Hyrule Town Carlov +SCRIPT_START script_Carlov BeginBlock _0807E9D4 _0807EB44 0x0000 @@ -15,7 +16,7 @@ script_08014462: MessageFromTarget 0x4202 MessageFromTarget 0x4203 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080144F0 DoPostScriptAction 0x0001 Wait 0x008c diff --git a/data/scripts/script_080145E8.inc b/data/scripts/hyruleTown/script_Carlov2.inc similarity index 73% rename from data/scripts/script_080145E8.inc rename to data/scripts/hyruleTown/script_Carlov2.inc index 43290291..89c39d57 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/hyruleTown/script_Carlov2.inc @@ -1,56 +1,5 @@ -SCRIPT_START script_080145E8 - BeginBlock - DoPostScriptAction 0x0008 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_080145F8: -.ifdef EU - CheckPlayerInRegion 0x00a8, 0x0054, 0x080c - JumpIfNot script_080145F8 - ComparePlayerAnimationState 0x0000 - JumpIfNot script_080145F8 - CheckRoomFlag 0x0009 - JumpIf script_08014632 - _0807E864 - Wait 0x0018 - _0807E8E4_3 - _0807EB44 0x0002 - MessageFromTargetPos 0x432b, 0x000c - WaitUntilTextboxCloses - Wait 0x0018 - _0807E878 - Jump script_080145F8 -script_08014632: - CheckRoomFlag 0x0000 - JumpIfNot script_08014632 - _0807E864 - Call sub_0807DF28 -script_08014642: - CheckRoomFlag 0x0009 - JumpIf script_08014642 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - Call sub_0807DF50 - _0807E878 - Jump script_080145F8 -.else - CheckRoomFlag 0x0000 - JumpIfNot script_080145F8 - _0807E864 - Call sub_0807DF28 -script_08014608: - CheckRoomFlag 0x0004 - JumpIf script_08014608 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - Call sub_0807DF50 - _0807E878 - Jump script_080145F8 -.endif - .align 2, 0 - -SCRIPT_START script_08014628 +@ Hyrule Town Carlov +SCRIPT_START script_Carlov2 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -64,7 +13,7 @@ script_0801463A: .else JumpIf script_080146A0 .endif - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_0801477A .ifdef EU CheckPlayerInRegion 0x0078, 0x0078, 0x0810 @@ -75,10 +24,10 @@ script_0801463A: _0807EB28 0x431f WaitUntilTextboxCloses script_0801469A: - StartPlayerScript script_080147DC + StartPlayerScript script_PlayerAtCarlov Wait 0x0010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807E878 Jump script_0801463A script_080146E2: @@ -103,7 +52,7 @@ script_080146E2: Jump script_0801473C script_0801472E_2: MessageFromTargetPos 0x432f, 0x000c - Jump script_080147CE @ TODO script_08014816 + Jump script_080147CE .else CheckRoomFlag 0x0004 JumpIf script_08014672 @@ -129,10 +78,10 @@ script_08014672: _0807E864 _0807EB28 0x431f WaitUntilTextboxCloses - StartPlayerScript script_080147DC + StartPlayerScript script_PlayerAtCarlov Wait 0x0010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 _0807E878 Jump script_0801463A script_080146A0: @@ -197,7 +146,7 @@ script_0801472E: ClearRoomFlag 0x0006 Call sub_08088544 script_0801473C: - _0807E3E8 + CheckTextboxResult JumpIfNot script_08014770 WaitUntilTextboxCloses _0807E3BC 0x0001 @@ -234,7 +183,7 @@ script_0801478A: WaitUntilTextboxCloses Call sub_080885B0 WaitPlayerGetItem - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_080147CE script_080147A4: _0807E930 0x0009 diff --git a/data/scripts/hyruleTown/script_CarlovChest.inc b/data/scripts/hyruleTown/script_CarlovChest.inc new file mode 100644 index 00000000..88a59859 --- /dev/null +++ b/data/scripts/hyruleTown/script_CarlovChest.inc @@ -0,0 +1,32 @@ +@ Hyrule Town Picolyte Bottle object in Carlov Chest room +SCRIPT_START script_CarlovChest + BeginBlock + EndBlock +script_080148F4: + CheckRoomFlag 0x0000 + JumpIfNot script_080148F4 + ClearRoomFlag 0x0000 + Call sub_0806E140 + JumpIfNot script_08014932 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08014938 + _0807E864 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + Call sub_0806E1E0 + WaitUntilTextboxCloses + Wait 0x0018 + _0807E878 + Jump script_080148F4 +script_08014932: + WaitUntilTextboxCloses + Jump script_08014938 +script_08014938: + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + Call sub_0806E1FC + Wait 0x001e + Call sub_0807DF50 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08014804.inc b/data/scripts/hyruleTown/script_CarlovGame.inc similarity index 57% rename from data/scripts/script_08014804.inc rename to data/scripts/hyruleTown/script_CarlovGame.inc index 98d12714..f22343fa 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/hyruleTown/script_CarlovGame.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08014804 +@ Carlov in Chest room +SCRIPT_START script_CarlovGame BeginBlock _0807E9D4 _0807EB44 0x0000 @@ -12,9 +13,9 @@ SCRIPT_START script_08014804 MessageFromTargetPos 0x4215, 0x000c _0807E878 script_0801482E: - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_08014862 - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_08014878 _0807E30C JumpIfNot script_0801482E @@ -29,18 +30,18 @@ script_08014862: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Jump script_0801482E script_08014878: _0807E930 0x0009 Wait 0x003c _0807E930 0x0002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_0801482E script_0801488E: - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 JumpIf script_080148C2 - TestBit 0x00000004 + CheckSyncFlagAndClear 0x00000004 JumpIf script_080148D8 _0807E30C JumpIfNot script_0801488E @@ -56,43 +57,12 @@ script_080148C2: _0807E930 0x0008 Wait 0x0020 _0807E930 0x0002 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Jump script_0801488E script_080148D8: _0807E930 0x0009 Wait 0x003c _0807E930 0x0002 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Jump script_0801488E .2byte 0x0000 -SCRIPT_START script_080148F0 - BeginBlock - EndBlock -script_080148F4: - CheckRoomFlag 0x0000 - JumpIfNot script_080148F4 - ClearRoomFlag 0x0000 - Call sub_0806E140 - JumpIfNot script_08014932 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08014938 - _0807E864 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - Call sub_0806E1E0 - WaitUntilTextboxCloses - Wait 0x0018 - _0807E878 - Jump script_080148F4 -script_08014932: - WaitUntilTextboxCloses - Jump script_08014938 -script_08014938: - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - Call sub_0806E1FC - Wait 0x001e - Call sub_0807DF50 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CarlovWon.inc b/data/scripts/hyruleTown/script_CarlovWon.inc new file mode 100644 index 00000000..b8c535ca --- /dev/null +++ b/data/scripts/hyruleTown/script_CarlovWon.inc @@ -0,0 +1,18 @@ +@ Carlov when won +SCRIPT_START script_CarlovWon + BeginBlock + _0807E9D4 + _0807EB44 0x0000 + SetEntitySpeed 0x01c0 + DoPostScriptAction 0x000a + EndBlock + _0807E864 + Call sub_0807DF28 + Call sub_0806E20C + WaitUntilTextboxCloses + Call sub_0806E23C + ClearLocalFlag 0x0093 + ClearLocalFlag 0x0092 + Call sub_0807DF50 + Jump script_080144FC + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Carpenter.inc b/data/scripts/hyruleTown/script_Carpenter.inc new file mode 100644 index 00000000..2ea50d73 --- /dev/null +++ b/data/scripts/hyruleTown/script_Carpenter.inc @@ -0,0 +1,20 @@ +@ Hyrule Town carpeter next to post +SCRIPT_START script_Carpenter + BeginBlock + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + DoPostScriptAction 0x000a + Call sub_08067314 + EndBlock +script_08010AB4: + CheckEntityInteractType + JumpIfNot script_08010AB4 + _0807E864 + _0807EB74 + CallWithArg sub_080672B0, 0x00000004 + Call sub_08067304 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + Jump script_08010AB4 diff --git a/data/scripts/hyruleTown/script_CatPerson.inc b/data/scripts/hyruleTown/script_CatPerson.inc new file mode 100644 index 00000000..18c982e8 --- /dev/null +++ b/data/scripts/hyruleTown/script_CatPerson.inc @@ -0,0 +1,19 @@ +@ Hyrule Townsperson house with cat +SCRIPT_START script_CatPerson + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + EndBlock +script_0800EC6C: + CheckEntityInteractType + JumpIfNot script_0800EC6C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800EC6C + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc new file mode 100644 index 00000000..4b8a69e0 --- /dev/null +++ b/data/scripts/hyruleTown/script_CatPersonTalkingToDogPerson.inc @@ -0,0 +1,20 @@ +@ Hyrule Town Cat person talking to Dog person +SCRIPT_START script_CatPersonTalkingToDogPerson + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0002 + Call sub_08061FD8 + EndBlock +script_0800EC2C: + CheckEntityInteractType + JumpIfNot script_0800EC2C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0002 + Call sub_08061FD8 + Jump script_0800EC2C diff --git a/data/scripts/hyruleTown/script_Din.inc b/data/scripts/hyruleTown/script_Din.inc new file mode 100644 index 00000000..b78e1802 --- /dev/null +++ b/data/scripts/hyruleTown/script_Din.inc @@ -0,0 +1,61 @@ +@ Hyrule Town Din +SCRIPT_START script_Din + BeginBlock + Call sub_08064828 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011CC2 + EndBlock +script_08011C9A: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIfNot script_08011C9A + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4515 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011C9A +script_08011CC2: + EndBlock + BeginBlock + CheckGlobalFlag 0x002c + JumpIf script_08011C9A + CheckGlobalFlag 0x002d + JumpIf script_08011C9A + CheckEntityInteractType + JumpIfNot script_08011CC2 + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x3105 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_08011D0E + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011CC2 +script_08011D00: + CheckEntityInteractType + JumpIfNot script_08011D00 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_08011D0E: + MessageNoOverlap 0x3108 + WaitUntilTextboxCloses + SetGlobalFlag 0x002b + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011D00 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Din2.inc b/data/scripts/hyruleTown/script_Din2.inc new file mode 100644 index 00000000..31c5c728 --- /dev/null +++ b/data/scripts/hyruleTown/script_Din2.inc @@ -0,0 +1,50 @@ +@ Hyrule Town Din when one of them has moved in +SCRIPT_START script_Din2 + BeginBlock + Call sub_08064828 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_08011E96: + EndBlock + BeginBlock + CheckGlobalFlag 0x002f + JumpIf script_08011C9A + CheckGlobalFlag 0x0030 + JumpIf script_08011C9A + CheckEntityInteractType + JumpIfNot script_08011E96 + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011ECC + MessageNoOverlap 0x4524 + WaitUntilTextboxCloses + Jump script_08011ED8 +script_08011ECC: + MessageNoOverlap 0x3111 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_08011EF4 +script_08011ED8: + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011E96 +script_08011EE6: + CheckEntityInteractType + JumpIfNot script_08011EE6 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_08011EF4: + MessageNoOverlap 0x3114 + WaitUntilTextboxCloses + SetGlobalFlag 0x002e + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011EE6 diff --git a/data/scripts/hyruleTown/script_DinAlone.inc b/data/scripts/hyruleTown/script_DinAlone.inc new file mode 100644 index 00000000..0a722830 --- /dev/null +++ b/data/scripts/hyruleTown/script_DinAlone.inc @@ -0,0 +1,20 @@ +@ Din completely alone +SCRIPT_START script_DinAlone + BeginBlock + Call sub_08064828 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_080121DE: + CheckEntityInteractType + JumpIfNot script_080121DE + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4527 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_080121DE diff --git a/data/scripts/hyruleTown/script_DinMovedIn.inc b/data/scripts/hyruleTown/script_DinMovedIn.inc new file mode 100644 index 00000000..c0ee74ba --- /dev/null +++ b/data/scripts/hyruleTown/script_DinMovedIn.inc @@ -0,0 +1,59 @@ +@ Hyrule Town Din moved in +SCRIPT_START script_DinMovedIn + BeginBlock + Call sub_08064828 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_0801203A: + CheckEntityInteractType + JumpIfNot script_0801203A + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckLocalFlag 0x0094 + JumpIf script_0801205E + MessageNoOverlap 0x3122 + WaitUntilTextboxCloses + SetLocalFlag 0x0094 + Jump script_0801209E +script_0801205E: + CheckBottleContaining 0x0031 + JumpIfNot script_08012070 + MessageNoOverlap 0x3123 + WaitUntilTextboxCloses + Jump script_0801209E +script_08012070: + MessageNoOverlap 0x3124 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0801209E + CheckBottleContaining 0x0020 + JumpIfNot script_0801209A + MessageNoOverlap 0x3125 + WaitUntilTextboxCloses + GivePlayerItem 0x0031 + WaitPlayerGetItem +.ifdef USA + Call sub_0807FC24 +.else +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif +.endif +.endif + Jump script_0801209E +script_0801209A: + MessageNoOverlap 0x3127 +script_0801209E: + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_0801203A + .align 2, 0 + diff --git a/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc new file mode 100644 index 00000000..a26f16c7 --- /dev/null +++ b/data/scripts/hyruleTown/script_DogPersonInCatHouse.inc @@ -0,0 +1,27 @@ +@ Hyrule Town Dog person talking to Cat person +SCRIPT_START script_DogPersonInCatHouse + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0006 + Call sub_08061FD8 + EndBlock +script_0800EB7C: + CheckEntityInteractType + JumpIfNot script_0800EB7C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0006 + Call sub_08061FD8 + Jump script_0800EB7C + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0002 + Call sub_08061FD8 + EndBlock + Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_DrLeft.inc b/data/scripts/hyruleTown/script_DrLeft.inc new file mode 100644 index 00000000..ae71d84b --- /dev/null +++ b/data/scripts/hyruleTown/script_DrLeft.inc @@ -0,0 +1,27 @@ +@ Dr Left +SCRIPT_START script_DrLeft + BeginBlock + _0807E9D4 + Call sub_0806C09C + DoPostScriptAction 0x000a + _0807E930 0x0000 + _0807EB44 0x0004 + EndBlock +script_0800EABC: + CheckEntityInteractType + JumpIfNot script_0800EABC + BeginBlock + _0807E864 + _0807EB74 + CallWithArg sub_0806C028, 0x00000004 + EndBlock +script_0800EAD4: + Call sub_0806C00C + JumpIfNot script_0800EAD4 + _0807E930 0x0008 + Call sub_0806C038 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + _0807E930 0x0000 + Jump script_0800EABC diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/hyruleTown/script_DrLeftDoor.inc similarity index 77% rename from data/scripts/script_0800EF40.inc rename to data/scripts/hyruleTown/script_DrLeftDoor.inc index f10aba5e..9e92d307 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/hyruleTown/script_DrLeftDoor.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800EF40 +@ Hyrule Town door closed DrLeft +SCRIPT_START script_DrLeftDoor BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001f @@ -12,8 +13,8 @@ script_0800EF50: JumpIf script_0800EF82 MessageFromTarget 0x4d01 WaitUntilTextboxCloses - StartPlayerScript script_0800EF9C - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerAtDrLeftDoor + WaitForSyncFlagAndClear 0x00000001 Wait 0x000f _0807E878 Jump script_0800EF50 diff --git a/data/scripts/hyruleTown/script_Emma.inc b/data/scripts/hyruleTown/script_Emma.inc new file mode 100644 index 00000000..8e842540 --- /dev/null +++ b/data/scripts/hyruleTown/script_Emma.inc @@ -0,0 +1,35 @@ +@ Hyrule Town Emma +SCRIPT_START script_Emma + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0000 + EndBlock +script_0800E832: + CheckEntityInteractType + JumpIfNot script_0800E832 + _0807E864 + _0807EB44 0x0004 + BeginBlock + MessageFromTarget 0x4501 + CallWithArg sub_0807F854, 0x00010032 + CallWithArg sub_0807F854, 0x000200c8 + CallWithArg sub_0807F854, 0x00030190 + EndBlock + WaitUntilTextboxCloses + _0807EB38 + JumpTable script_0800E910, script_RentSmallRoom, script_RentRegularRoom, script_0800E872 +script_0800E872: @ Rent large room + BeginBlock + MessageFromTarget 0x4505 + CallWithArg sub_0807F854, 0x00010190 + EndBlock + WaitUntilTextboxCloses + HasRupees 0x0190 + JumpIfNot script_EmmaNotEnoughRupees + ModRupees 0xfe70 + SetLocalFlag 0x0091 + MessageFromTarget 0x4508 + WaitUntilTextboxCloses + Call sub_0806C578 +SCRIPT_END diff --git a/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc new file mode 100644 index 00000000..c3a59c92 --- /dev/null +++ b/data/scripts/hyruleTown/script_EmmaNotEnoughRupees.inc @@ -0,0 +1,11 @@ +@ Hyrule Town Inn Emma not enough rupees +SCRIPT_START script_EmmaNotEnoughRupees + MessageFromTarget 0x4507 + Jump script_0800E914 +script_0800E910: @ Rent no room + MessageFromTarget 0x4509 +script_0800E914: + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0000 + Jump script_0800E832 diff --git a/data/scripts/hyruleTown/script_Farore.inc b/data/scripts/hyruleTown/script_Farore.inc new file mode 100644 index 00000000..23de485b --- /dev/null +++ b/data/scripts/hyruleTown/script_Farore.inc @@ -0,0 +1,61 @@ +@ Hyrule Town Farore +SCRIPT_START script_Farore + BeginBlock + Call sub_08064A28 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011E1A + EndBlock +script_08011DF2: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIfNot script_08011DF2 + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4514 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011DF2 +script_08011E1A: + EndBlock + BeginBlock + CheckGlobalFlag 0x002b + JumpIf script_08011DF2 + CheckGlobalFlag 0x002c + JumpIf script_08011DF2 + CheckEntityInteractType + JumpIfNot script_08011E1A + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x3104 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_08011E66 + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011E1A +script_08011E58: + CheckEntityInteractType + JumpIfNot script_08011E58 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_08011E66: + MessageNoOverlap 0x3107 + WaitUntilTextboxCloses + SetGlobalFlag 0x002d + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011E58 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Farore2.inc b/data/scripts/hyruleTown/script_Farore2.inc new file mode 100644 index 00000000..7920be1f --- /dev/null +++ b/data/scripts/hyruleTown/script_Farore2.inc @@ -0,0 +1,52 @@ +@ Hyrule Town Farore when one of them has moved in +SCRIPT_START script_Farore2 + BeginBlock + Call sub_08064A28 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_08011FAE: + EndBlock + BeginBlock + CheckGlobalFlag 0x002e + JumpIf script_08011DF2 + CheckGlobalFlag 0x002f + JumpIf script_08011DF2 + CheckEntityInteractType + JumpIfNot script_08011FAE + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011FE4 + MessageNoOverlap 0x4523 + WaitUntilTextboxCloses + Jump script_08011FF0 +script_08011FE4: + MessageNoOverlap 0x3110 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_0801200C +script_08011FF0: + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011FAE +script_08011FFE: + CheckEntityInteractType + JumpIfNot script_08011FFE + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_0801200C: + MessageNoOverlap 0x3113 + WaitUntilTextboxCloses + SetGlobalFlag 0x0030 + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011FFE + + diff --git a/data/scripts/hyruleTown/script_FaroreAlone.inc b/data/scripts/hyruleTown/script_FaroreAlone.inc new file mode 100644 index 00000000..294915d9 --- /dev/null +++ b/data/scripts/hyruleTown/script_FaroreAlone.inc @@ -0,0 +1,20 @@ +@ Farore completely alone +SCRIPT_START script_FaroreAlone + BeginBlock + Call sub_08064A28 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_0801224E: + CheckEntityInteractType + JumpIfNot script_0801224E + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4526 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_0801224E diff --git a/data/scripts/hyruleTown/script_FaroreMovedIn.inc b/data/scripts/hyruleTown/script_FaroreMovedIn.inc new file mode 100644 index 00000000..474b8dea --- /dev/null +++ b/data/scripts/hyruleTown/script_FaroreMovedIn.inc @@ -0,0 +1,59 @@ +@ Farore moved in +SCRIPT_START script_FaroreMovedIn + BeginBlock + Call sub_08064A28 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_08012152: + CheckEntityInteractType + JumpIfNot script_08012152 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckLocalFlag 0x0096 + JumpIf script_08012176 + MessageNoOverlap 0x311c + WaitUntilTextboxCloses + SetLocalFlag 0x0096 + Jump script_080121B6 +script_08012176: + CheckBottleContaining 0x0030 + JumpIfNot script_08012188 + MessageNoOverlap 0x311d + WaitUntilTextboxCloses + Jump script_080121B6 +script_08012188: + MessageNoOverlap 0x311e + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_080121B6 + CheckBottleContaining 0x0020 + JumpIfNot script_080121B2 + MessageNoOverlap 0x311f + WaitUntilTextboxCloses + GivePlayerItem 0x0030 + WaitPlayerGetItem +.ifdef USA + Call sub_0807FC24 +.else +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif +.endif +.endif + Jump script_080121B6 +script_080121B2: + MessageNoOverlap 0x3121 +script_080121B6: + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08012152 + .align 2, 0 + diff --git a/data/scripts/hyruleTown/script_FirstHouseDoor.inc b/data/scripts/hyruleTown/script_FirstHouseDoor.inc new file mode 100644 index 00000000..56501984 --- /dev/null +++ b/data/scripts/hyruleTown/script_FirstHouseDoor.inc @@ -0,0 +1,26 @@ +@ Hyrule Town closed door for first empty house +SCRIPT_START script_FirstHouseDoor + BeginBlock + DoPostScriptAction 0x0007 + CheckKinstoneFused 0x001b + JumpIf script_0800EF92 + EndBlock +script_0801091C: + Call sub_080869A4 + JumpIfNot script_0801091C + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + CheckRoomFlag 0x0001 + JumpIf script_08010942 + _0807EB28 0x0b62 + WaitUntilTextboxCloses +script_08010942: + StartPlayerScript script_PlayerAtInnDoor + WaitForSyncFlagAndClear 0x00000001 + Call sub_0807DF50 + _0807E878 + Jump script_0801091C + Call sub_0808692C +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_ForestMinish11.inc b/data/scripts/hyruleTown/script_ForestMinish11.inc new file mode 100644 index 00000000..7cbb90db --- /dev/null +++ b/data/scripts/hyruleTown/script_ForestMinish11.inc @@ -0,0 +1,21 @@ +@ Forest Minish above cafe +SCRIPT_START script_ForestMinish11 + BeginBlock + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800E6BE: + BeginBlock + CheckEntityInteractType + JumpIf script_0800E6D2 + Call sub_08060158 + EndBlock + Jump script_0800E6BE +script_0800E6D2: + EndBlock + _0807E864 + Call sub_0806025C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E6BE diff --git a/data/scripts/hyruleTown/script_Ghost.inc b/data/scripts/hyruleTown/script_Ghost.inc new file mode 100644 index 00000000..d8e0119a --- /dev/null +++ b/data/scripts/hyruleTown/script_Ghost.inc @@ -0,0 +1,19 @@ +@ Hyrule Town Ghost +SCRIPT_START script_Ghost + BeginBlock + DoPostScriptAction 0x0007 + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + EndBlock +script_0801027A: + CheckEntityInteractType + JumpIfNot script_0801027A + _0807E864 + _0807EB74 + Call sub_08065F64 + WaitUntilTextboxCloses + _0807E878 + Jump script_0801027A + .align 2 diff --git a/data/scripts/hyruleTown/script_GormanCats.inc b/data/scripts/hyruleTown/script_GormanCats.inc new file mode 100644 index 00000000..c8d96d9e --- /dev/null +++ b/data/scripts/hyruleTown/script_GormanCats.inc @@ -0,0 +1,38 @@ +@ Gorman at third house +SCRIPT_START script_GormanCats + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + _0807E9D4 + SetEntitySpeed 0x0040 + EndBlock +script_0800FE5A: + Call sub_08069AA8 +script_0800FE60: + Call sub_080699AC +script_0800FE66: + EndBlock + BeginBlock + Call sub_08069ACC + JumpIf script_0800FE7E + _0807EE30 + JumpIfNot script_0800FE66 + Jump script_0800FE5A +script_0800FE7E: + EndBlock + _0807EB44 0x0002 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0002 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + Wait 0x003c + Call sub_08069A84 + Jump script_0800FE60 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_GormanFirstHouse.inc b/data/scripts/hyruleTown/script_GormanFirstHouse.inc new file mode 100644 index 00000000..013e6afe --- /dev/null +++ b/data/scripts/hyruleTown/script_GormanFirstHouse.inc @@ -0,0 +1,19 @@ +@ Hyrule Town Gorman at first house +@ and at second house when ready to sell +SCRIPT_START script_GormanFirstHouse + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + _0807E9D4 + EndBlock +script_0800FDB2: + CheckEntityInteractType + JumpIfNot script_0800FDB2 + _0807E864 + _0807EB74 + Call sub_08069888 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800FDB2 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_GormanSecondHouse.inc b/data/scripts/hyruleTown/script_GormanSecondHouse.inc new file mode 100644 index 00000000..f75d0452 --- /dev/null +++ b/data/scripts/hyruleTown/script_GormanSecondHouse.inc @@ -0,0 +1,38 @@ +@ Hyrule Town Gorman at second house +SCRIPT_START script_GormanSecondHouse + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + _0807E9D4 + SetEntitySpeed 0x0040 + EndBlock +script_0800FDE2: + Call sub_08069A60 +script_0800FDE8: + Call sub_0806991C +script_0800FDEE: + EndBlock + BeginBlock + Call sub_08069ACC + JumpIf script_0800FE06 + _0807EE30 + JumpIfNot script_0800FDEE + Jump script_0800FDE2 +script_0800FE06: + EndBlock + _0807EB44 0x0002 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0002 + DoPostScriptAction 0x0000 + Wait 0x001e + _0807EB44 0x0006 + DoPostScriptAction 0x0000 + Wait 0x003c + Call sub_08069A3C + Jump script_0800FDE8 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_GoronMerchant.inc b/data/scripts/hyruleTown/script_GoronMerchant.inc new file mode 100644 index 00000000..66d1a451 --- /dev/null +++ b/data/scripts/hyruleTown/script_GoronMerchant.inc @@ -0,0 +1,87 @@ +@ Hyrule Town Goron Merchant +SCRIPT_START script_GoronMerchant + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807E9D4 + Call sub_0807F348 + Call sub_08069684 + EndBlock +script_080107F2: + EndBlock + BeginBlock + CheckPlayerInRegion2 0x3030 + JumpIfNot script_080107F2 + Call sub_080696B0 +script_08010804: + EndBlock + BeginBlock + CheckPlayerInRegion2 0x3030 + JumpIfNot script_080107F2 + HasRoomItemForSale + JumpIf script_08010860 + CheckEntityInteractType + JumpIfNot script_08010804 + EndBlock + _0807E864 + Call sub_0807DF28 + _0807EB74 + CheckGlobalFlag 0x0042 + JumpIfNot script_08010858 + CheckGlobalFlag 0x0043 + JumpIfNot script_08010858 + CheckGlobalFlag 0x0044 + JumpIfNot script_08010858 + CheckGlobalFlag 0x0041 + JumpIfNot script_08010850 + MessageNoOverlap 0x3f39 + Jump script_080108BA +script_08010850: + MessageNoOverlap 0x2c1b + Jump script_080108BA +script_08010858: + MessageNoOverlap 0x2c1a + Jump script_080108BA +script_08010860: + EndBlock + _0807E864 + Call sub_0807DF38 + _0807EB74 + Call sub_08069660 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_080108B2 + Call GoronMerchant_TryToBuyKinstone + JumpIfNot script_080108B2 + WaitPlayerGetItem + WaitUntilTextboxCloses + _0807EB8C + CheckGlobalFlag 0x0042 + JumpIfNot script_080108AA + CheckGlobalFlag 0x0043 + JumpIfNot script_080108AA + CheckGlobalFlag 0x0044 + JumpIfNot script_080108AA + MessageNoOverlap 0x2c21 + Jump script_080108B2 +script_080108AA: +.ifdef USA + SetLocalFlag 0x00fa +.else +.ifdef DEMO_USA + SetLocalFlag 0x00fa +.endif +.endif + MessageNoOverlap 0x2c20 +script_080108B2: + WaitUntilTextboxCloses + Call sub_0807F83C +script_080108BA: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Jump script_08010804 diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/hyruleTown/script_GuardEast.inc similarity index 90% rename from data/scripts/script_0800FF18.inc rename to data/scripts/hyruleTown/script_GuardEast.inc index eee6feb4..9bf0316a 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/hyruleTown/script_GuardEast.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800FF18 +@ Hyrule Town Guard east +SCRIPT_START script_GuardEast BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF6A diff --git a/data/scripts/hyruleTown/script_GuardLibrary.inc b/data/scripts/hyruleTown/script_GuardLibrary.inc new file mode 100644 index 00000000..7944844b --- /dev/null +++ b/data/scripts/hyruleTown/script_GuardLibrary.inc @@ -0,0 +1,17 @@ +@ Hyrule Town Guard closing Library +SCRIPT_START script_GuardLibrary + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08010410: + CheckEntityInteractType + JumpIfNot script_08010410 + _0807E864 + _0807EB74 + Call sub_08064428 + WaitUntilTextboxCloses + _0807E878 + Jump script_08010410 diff --git a/data/scripts/hyruleTown/script_GuardNorth.inc b/data/scripts/hyruleTown/script_GuardNorth.inc new file mode 100644 index 00000000..81e2d9af --- /dev/null +++ b/data/scripts/hyruleTown/script_GuardNorth.inc @@ -0,0 +1,29 @@ +@ Hyrule Town Guard north +SCRIPT_START script_GuardNorth + BeginBlock + CheckInventory1 0x0012 + JumpIf script_0800FF0E + _0807EB44 0x0006 + _0807E9D4 + CallWithArg sub_0807F3D8, 0x00000008 + EndBlock +script_0800FED8: + EndBlock + BeginBlock + DoPostScriptAction 0x000b + Call sub_080642B8 + CheckEntityInteractType + JumpIfNot script_0800FED8 + EndBlock + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_08064428 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800FED8 +script_0800FF0E: + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/hyruleTown/script_GuardPatrolling.inc b/data/scripts/hyruleTown/script_GuardPatrolling.inc new file mode 100644 index 00000000..df0a7b81 --- /dev/null +++ b/data/scripts/hyruleTown/script_GuardPatrolling.inc @@ -0,0 +1,13 @@ +@ Hyrule Town Guard patrolling +SCRIPT_START script_GuardPatrolling + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000004 + EndBlock +script_080103E8: + Wait 0x003c + Call sub_0806407C + Jump script_080103E8 + .2byte 0x0000 diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/hyruleTown/script_GuardWest.inc similarity index 98% rename from data/scripts/script_0800FF74.inc rename to data/scripts/hyruleTown/script_GuardWest.inc index 4da89980..3792ad68 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/hyruleTown/script_GuardWest.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800FF74 +@ Hyrule Town Guard west +SCRIPT_START script_GuardWest BeginBlock _0807EB44 0x0002 _0807E9D4 diff --git a/data/scripts/hyruleTown/script_HurdyGurdyMan.inc b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc new file mode 100644 index 00000000..0c01f429 --- /dev/null +++ b/data/scripts/hyruleTown/script_HurdyGurdyMan.inc @@ -0,0 +1,20 @@ +@ Hyrule Town Cafe HurdyGurdyMan +SCRIPT_START script_HurdyGurdyMan + BeginBlock + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0806E440 + EndBlock +script_08010BCA: + CheckEntityInteractType + JumpIfNot script_08010BCA + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + Call sub_0806E418 + WaitUntilTextboxCloses + _0807E878 + _0807E930 0x0008 + Jump script_08010BCA + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_InnDoor.inc b/data/scripts/hyruleTown/script_InnDoor.inc new file mode 100644 index 00000000..931ee30e --- /dev/null +++ b/data/scripts/hyruleTown/script_InnDoor.inc @@ -0,0 +1,17 @@ +@ Hyrule Town closed door for Inn +SCRIPT_START script_InnDoor + CheckPlayerInRegion2 0x0808 + JumpIfNot script_InnDoor + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtInnDoor + WaitForSyncFlagAndClear 0x00000001 + CheckRoomFlag 0x0001 + JumpIf script_08010900 + _0807EB28 0x0b63 + WaitUntilTextboxCloses +script_08010900: + Call sub_0807DF50 + _0807E878 + Jump script_InnDoor diff --git a/data/scripts/hyruleTown/script_Kid1.inc b/data/scripts/hyruleTown/script_Kid1.inc new file mode 100644 index 00000000..dffebca2 --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid1.inc @@ -0,0 +1,27 @@ +@ Hyrule Town Kid standing outside school garden +SCRIPT_START script_Kid1 + BeginBlock + DoPostScriptAction 0x0000 + Call sub_08062A48 + DoPostScriptAction 0x000a + EndBlock +script_080102A6: + CheckEntityInteractType + JumpIfNot script_080102A6 + CheckRoomFlag 0x0009 + JumpIfNot script_080102CC + _0807E864 + _0807EB74 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + Call sub_08062500 + Jump script_080102A6 +script_080102CC: + _0807E864 + _0807EB74 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + Jump script_080102A6 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid2.inc b/data/scripts/hyruleTown/script_Kid2.inc new file mode 100644 index 00000000..c5dc472e --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid2.inc @@ -0,0 +1,17 @@ +@ Hyrule Town Kid +SCRIPT_START script_Kid2 + BeginBlock + DoPostScriptAction 0x0000 + Call sub_08062A48 + DoPostScriptAction 0x000a + EndBlock +script_080102F2: + CheckEntityInteractType + JumpIfNot script_080102F2 + _0807E864 + _0807EB74 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + Jump script_080102F2 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid3.inc b/data/scripts/hyruleTown/script_Kid3.inc new file mode 100644 index 00000000..5147a331 --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid3.inc @@ -0,0 +1,46 @@ +@ Hyrule Town Kid running in school garden +SCRIPT_START script_Kid3 + BeginBlock + DoPostScriptAction 0x0000 + EndBlock +script_08010314: + EndBlock + Call sub_08062698 + Call sub_080626AC + CallWithArg sub_0807F0EC, 0x00000009 + JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 +script_08010340: + _0807EE04 0x0358, 0x0078 + Jump script_08010396 +script_0801034A: + _0807EE04 0x0390, 0x0078 + Jump script_08010396 +script_08010354: + _0807EE04 0x03c8, 0x0078 + Jump script_08010396 +script_0801035E: + _0807EE04 0x0358, 0x0098 + Jump script_08010396 +script_08010368: + _0807EE04 0x0390, 0x0098 + Jump script_08010396 +script_08010372: + _0807EE04 0x03c8, 0x0098 + Jump script_08010396 +script_0801037C: + _0807EE04 0x0358, 0x00b8 + Jump script_08010396 +script_08010386: + _0807EE04 0x0390, 0x00b8 + Jump script_08010396 +script_08010390: + _0807EE04 0x03c8, 0x00b8 +script_08010396: + EndBlock + BeginBlock + Call sub_080626C0 + JumpIf script_08010314 + _0807EE30 + JumpIfNot script_08010396 + Jump script_08010314 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid4.inc b/data/scripts/hyruleTown/script_Kid4.inc new file mode 100644 index 00000000..da188edd --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid4.inc @@ -0,0 +1,11 @@ +@ Hyrule Town Kid pacing around in school garden +SCRIPT_START script_Kid4 + BeginBlock + DoPostScriptAction 0x0000 + Call sub_08062A48 + DoPostScriptAction 0x000a + EndBlock +script_080103C2: + Wait 0x001e + Call sub_08062948 + Jump script_080103C2 diff --git a/data/scripts/hyruleTown/script_Kid5.inc b/data/scripts/hyruleTown/script_Kid5.inc new file mode 100644 index 00000000..84453c61 --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid5.inc @@ -0,0 +1,16 @@ +@ Hyrule Town Kid in school +SCRIPT_START script_Kid5 + BeginBlock + _0807E930 0x0008 +script_08010622: + Call sub_08062A48 + DoPostScriptAction 0x000a + EndBlock +script_0801062E: + CheckEntityInteractType + JumpIfNot script_0801062E + _0807E864 + Call sub_0806265C + WaitUntilTextboxCloses + _0807E878 + Jump script_0801062E diff --git a/data/scripts/hyruleTown/script_Kid6.inc b/data/scripts/hyruleTown/script_Kid6.inc new file mode 100644 index 00000000..58553883 --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid6.inc @@ -0,0 +1,6 @@ +@ Hyrule Town Kid in school 2? +SCRIPT_START script_Kid6 + BeginBlock + _0807E930 0x0009 + Jump script_08010622 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Kid7.inc b/data/scripts/hyruleTown/script_Kid7.inc new file mode 100644 index 00000000..599ee869 --- /dev/null +++ b/data/scripts/hyruleTown/script_Kid7.inc @@ -0,0 +1,14 @@ +@ Hyrule Town Kid in school 3? +SCRIPT_START script_Kid7 + BeginBlock + _0807E930 0x000b + Jump script_08010622 + .2byte 0x0000 + BeginBlock + _0807E930 0x000c + Jump script_08010622 + .2byte 0x0000 + BeginBlock + _0807E930 0x000d + Jump script_08010622 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_KidInn.inc b/data/scripts/hyruleTown/script_KidInn.inc new file mode 100644 index 00000000..f3de7eb9 --- /dev/null +++ b/data/scripts/hyruleTown/script_KidInn.inc @@ -0,0 +1,32 @@ +@ Hyrule Town Kid in the Inn on the 2nd floor +SCRIPT_START script_KidInn + BeginBlock + DoPostScriptAction 0x000a + Call sub_08062A48 + DoPostScriptAction 0x0000 +script_0800D5AC: + EndBlock + Call sub_08062698 + Call sub_080626AC + CallWithArg sub_0807F0EC, 0x00000004 + JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC +script_0800D5CE: + _0807EE04 0x0038, 0x0098 + Jump script_0800D5F2 +script_0800D5D8: + _0807EE04 0x0058, 0x0098 + Jump script_0800D5F2 +script_0800D5E2: + _0807EE04 0x0038, 0x00c8 + Jump script_0800D5F2 +script_0800D5EC: + _0807EE04 0x0058, 0x00c8 +script_0800D5F2: + EndBlock + BeginBlock + Call sub_080626C0 + JumpIf script_0800D5AC + _0807EE30 + JumpIfNot script_0800D5F2 + Jump script_0800D5AC + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Librari.inc b/data/scripts/hyruleTown/script_Librari.inc new file mode 100644 index 00000000..8aa1476a --- /dev/null +++ b/data/scripts/hyruleTown/script_Librari.inc @@ -0,0 +1,42 @@ +@ Librari +SCRIPT_START script_Librari + BeginBlock + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock +script_0800E974: + CheckEntityInteractType + JumpIfNot script_0800E974 + _0807E864 + _0807E930 0x0008 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806B260 + JumpIfNot script_0800E9E4 + WaitUntilTextboxCloses + DoPostScriptAction 0x000b + StartPlayerScript script_PlayerStepOnTrap + WaitForSyncFlagAndClear 0x00000001 + DoPostScriptAction 0x000a + MessageFromTarget 0x4a24 + WaitUntilTextboxCloses + _0807E930 0x000a + Wait 0x0014 + MessageFromTarget 0x4a25 + WaitUntilTextboxCloses + _0807E930 0x0000 + StartPlayerScript script_PlayerActivatedTrapCard + WaitForSyncFlagAndClear 0x00000001 + SetLocalFlag 0x0074 + PlaySound SFX_SECRET + Wait 0x00f0 + MessageFromTarget 0x4a26 + WaitUntilTextboxCloses + SetLocalFlag 0x0075 +script_0800E9E4: + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + _0807E930 0x0000 + Jump script_0800E974 diff --git a/data/scripts/hyruleTown/script_LibrariLater.inc b/data/scripts/hyruleTown/script_LibrariLater.inc new file mode 100644 index 00000000..cca9ae05 --- /dev/null +++ b/data/scripts/hyruleTown/script_LibrariLater.inc @@ -0,0 +1,35 @@ +@ Library if you talk to him later? +SCRIPT_START script_LibrariLater + BeginBlock + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock +script_08012440: + CheckEntityInteractType + JumpIfNot script_08012440 + _0807E864 + _0807E930 0x0008 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806B2B4 + WaitUntilTextboxCloses + CheckLocalFlag 0x00b3 + JumpIf script_08012474 + SetLocalFlag 0x00b3 + GivePlayerItem 0x0062 + WaitPlayerGetItem +.ifdef USA + SetLocalFlag 0x00d0 +.else +.ifdef DEMO_USA + SetLocalFlag 0x00d0 +.endif +.endif +script_08012474: + _0807E878 + _0807E930 0x0000 + Jump script_08012440 + .align 2, 0 + + diff --git a/data/scripts/hyruleTown/script_LibrarianLeft.inc b/data/scripts/hyruleTown/script_LibrarianLeft.inc new file mode 100644 index 00000000..89861977 --- /dev/null +++ b/data/scripts/hyruleTown/script_LibrarianLeft.inc @@ -0,0 +1,18 @@ +@ Librarian left +SCRIPT_START script_LibrarianLeft + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + _0807E930 0x0000 + EndBlock +script_08008BA2: + _0807E944 + _0807E864 + _0807E930 0x0004 + Call sub_0807F2D4 + MessageFromTarget 0x4912 + WaitUntilTextboxCloses + _0807E930 0x0008 + _0807E878 + Jump script_08008BA2 diff --git a/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc new file mode 100644 index 00000000..888e490f --- /dev/null +++ b/data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc @@ -0,0 +1,49 @@ +@ Librarian left with book quest +SCRIPT_START script_LibrarianLeftWithQuest + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x000a + _0807E930 0x0000 +.ifdef EU + SetGlobalFlag 0x0061 +.endif + EndBlock +script_08008BD2: + _0807E944 + _0807E864 +.ifndef EU + SetGlobalFlag 0x0061 +.endif + _0807E930 0x0004 + Call sub_0807F2D4 + WaitUntilTextboxCloses + Call sub_0806BA34 + JumpIfNot script_08008C54 + WaitUntilTextboxCloses + CallWithArg sub_0806BB1C, 0x00000000 + Call sub_0807F2D4 + CallWithArg sub_0806BB1C, 0x00000001 + Call sub_0806BB7C + JumpIfNot script_08008C5C + MessageNoOverlap 0x490c + WaitUntilTextboxCloses + LoadRoomEntityList gUnk_080D6784 + WaitForSyncFlag 0x00000001 + WaitForSyncFlag 0x00000004 + Wait 0x000f + PlaySound SFX_SECRET + _0807E930 0x0004 + Call sub_0807F2D4 + MessageNoOverlap 0x4913 + WaitUntilTextboxCloses + _0807E930 0x0008 + Call sub_0807F2D4 + Jump script_08008C5C +script_08008C54: + _0807E930 0x0008 + Wait 0x000f +script_08008C5C: + WaitUntilTextboxCloses + _0807E878 + Jump script_08008BD2 diff --git a/data/scripts/hyruleTown/script_LibrarianRight.inc b/data/scripts/hyruleTown/script_LibrarianRight.inc new file mode 100644 index 00000000..b5af0dfc --- /dev/null +++ b/data/scripts/hyruleTown/script_LibrarianRight.inc @@ -0,0 +1,19 @@ +@ Librarian right +SCRIPT_START script_LibrarianRight + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + _0807E930 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_08008B6E: + _0807E944 + _0807E864 + _0807E930 0x0004 + Call sub_0807F2D4 + Call sub_0806BBB0 + WaitUntilTextboxCloses + _0807E930 0x0008 + _0807E878 + Jump script_08008B6E + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_LibraryVisitor.inc b/data/scripts/hyruleTown/script_LibraryVisitor.inc new file mode 100644 index 00000000..1a5015fe --- /dev/null +++ b/data/scripts/hyruleTown/script_LibraryVisitor.inc @@ -0,0 +1,18 @@ +@ Library Townsperson +SCRIPT_START script_LibraryVisitor + BeginBlock + Call sub_08061FD8 + Call sub_08061E70 + DoPostScriptAction 0x000a + EndBlock +script_08008DA0: + CheckEntityInteractType + JumpIfNot script_08008DA0 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_08008DA0 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_MaidTown.inc b/data/scripts/hyruleTown/script_MaidTown.inc new file mode 100644 index 00000000..c75426d4 --- /dev/null +++ b/data/scripts/hyruleTown/script_MaidTown.inc @@ -0,0 +1,14 @@ +@ Hyrule Town Maid +SCRIPT_START script_MaidTown + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + SetIntVariable sub_08064688 + Call sub_08064644 + EndBlock +script_08010446: + Wait 0x003c + Call sub_080646A4 + Jump script_08010446 diff --git a/data/scripts/hyruleTown/script_MalonHyruleTown.inc b/data/scripts/hyruleTown/script_MalonHyruleTown.inc new file mode 100644 index 00000000..6e1f2b13 --- /dev/null +++ b/data/scripts/hyruleTown/script_MalonHyruleTown.inc @@ -0,0 +1,44 @@ +@ Hyrule Town Malon +SCRIPT_START script_MalonHyruleTown + BeginBlock + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x000e + EndBlock + Call sub_08065914 +script_08014F4A: + CheckEntityInteractType + JumpIfNot script_08014F4A + _0807E864 + Call sub_0807DF28 + _0807EB74 + DoPostScriptAction 0x0000 + BeginBlock + MessageNoOverlap 0x3b0b + CallWithArg sub_0807F854, 0x00010064 + EndBlock + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08014FA6 + HasRupees 0x0064 + JumpIfNot script_08014F9A + CheckBottleContaining 0x0020 + JumpIfNot script_08014FA2 + ModRupees 0xff9c + GivePlayerItem 0x0022 + WaitPlayerGetItem + MessageNoOverlap 0x3b11 + Jump script_08014FA6 +script_08014F9A: + MessageNoOverlap 0x3b0e + Jump script_08014FA6 +script_08014FA2: + MessageNoOverlap 0x3b0f +script_08014FA6: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + _0807E930 0x000e + Jump script_08014F4A diff --git a/data/scripts/hyruleTown/script_Mama.inc b/data/scripts/hyruleTown/script_Mama.inc new file mode 100644 index 00000000..c7a31761 --- /dev/null +++ b/data/scripts/hyruleTown/script_Mama.inc @@ -0,0 +1,23 @@ +@ Hyrule Town Mama +SCRIPT_START script_Mama + BeginBlock + Call sub_0806C4F8 + DoPostScriptAction 0x000a + _0807EB44 0x0000 + EndBlock +script_0800E932: + CheckEntityInteractType + JumpIfNot script_0800E932 + _0807E864 + _0807EB44 0x0004 + _0807E930 0x0004 +script_0800E942: + Call sub_0806C4A8 + JumpIfNot script_0800E942 + Call sub_0806C4DC + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0000 + _0807E930 0x0000 + Jump script_0800E932 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Marcy.inc b/data/scripts/hyruleTown/script_Marcy.inc new file mode 100644 index 00000000..f54f82fd --- /dev/null +++ b/data/scripts/hyruleTown/script_Marcy.inc @@ -0,0 +1,34 @@ +@ Hyrule Town Marcy selling the newsletter +SCRIPT_START script_Marcy + BeginBlock + DoPostScriptAction 0x0007 + _0807E9D4 + DoPostScriptAction 0x000a + _0807E930 0x0000 + EndBlock +script_08010746: + CheckEntityInteractType + JumpIfNot script_08010746 + _0807E864 + _0807E930 0x0004 + BeginBlock + Call sub_08062D18 + JumpIfNot script_08010786 + EndBlock + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08010786 + HasRupees 0x00c8 + JumpIf script_08010778 + MessageNoOverlap 0x4008 + Jump script_08010786 +script_08010778: + ModRupees 0xff38 + Call sub_08062E14 + MessageNoOverlap 0x4007 +script_08010786: + EndBlock + WaitUntilTextboxCloses + _0807E878 + _0807E930 0x0008 + Jump script_08010746 diff --git a/data/scripts/hyruleTown/script_Mayor.inc b/data/scripts/hyruleTown/script_Mayor.inc new file mode 100644 index 00000000..53885de4 --- /dev/null +++ b/data/scripts/hyruleTown/script_Mayor.inc @@ -0,0 +1,23 @@ +@ Hyrule Town Mayor Hagen +SCRIPT_START script_Mayor + BeginBlock + Call sub_0806CE5C + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0008 + EndBlock +script_0800EA6A: + CheckEntityInteractType + JumpIfNot script_0800EA6A + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806CE80 + WaitUntilTextboxCloses + _0807E878 + _0807E930 0x000a + Call sub_0807F2D4 + _0807E930 0x0008 + Jump script_0800EA6A diff --git a/data/scripts/hyruleTown/script_MutohInMill.inc b/data/scripts/hyruleTown/script_MutohInMill.inc new file mode 100644 index 00000000..fdefdeb9 --- /dev/null +++ b/data/scripts/hyruleTown/script_MutohInMill.inc @@ -0,0 +1,21 @@ +@ Hyrule Town Mutoh +SCRIPT_START script_MutohInMill + BeginBlock + Call sub_08067100 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_0800954E: + CheckEntityInteractType + JumpIfNot script_0800954E + _0807E864 + DoPostScriptAction 0x0001 + _0807EB74 + Call sub_080670E4 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Jump script_0800954E + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru.inc b/data/scripts/hyruleTown/script_Nayru.inc new file mode 100644 index 00000000..2815c9c5 --- /dev/null +++ b/data/scripts/hyruleTown/script_Nayru.inc @@ -0,0 +1,61 @@ +@ Hyrule Town Nayru +SCRIPT_START script_Nayru + BeginBlock + Call sub_08064928 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011D6E + EndBlock +script_08011D46: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIfNot script_08011D46 + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4513 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011D46 +script_08011D6E: + EndBlock + BeginBlock + CheckGlobalFlag 0x002b + JumpIf script_08011D46 + CheckGlobalFlag 0x002d + JumpIf script_08011D46 + CheckEntityInteractType + JumpIfNot script_08011D6E + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x3103 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_08011DBA + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011D6E +script_08011DAC: + CheckEntityInteractType + JumpIfNot script_08011DAC + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_08011DBA: + MessageNoOverlap 0x3106 + WaitUntilTextboxCloses + SetGlobalFlag 0x002c + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011DAC + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Nayru2.inc b/data/scripts/hyruleTown/script_Nayru2.inc new file mode 100644 index 00000000..c4ab770d --- /dev/null +++ b/data/scripts/hyruleTown/script_Nayru2.inc @@ -0,0 +1,50 @@ +@ Hyrule Town Nayru when one of them has moved in +SCRIPT_START script_Nayru2 + BeginBlock + Call sub_08064928 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_08011F22: + EndBlock + BeginBlock + CheckGlobalFlag 0x002e + JumpIf script_08011D46 + CheckGlobalFlag 0x0030 + JumpIf script_08011D46 + CheckEntityInteractType + JumpIfNot script_08011F22 + EndBlock + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011F58 + MessageNoOverlap 0x4522 + WaitUntilTextboxCloses + Jump script_08011F64 +script_08011F58: + MessageNoOverlap 0x310f + WaitUntilTextboxCloses + CheckTextboxResult + JumpIf script_08011F80 +script_08011F64: + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011F22 +script_08011F72: + CheckEntityInteractType + JumpIfNot script_08011F72 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 +script_08011F80: + MessageNoOverlap 0x3112 + WaitUntilTextboxCloses + SetGlobalFlag 0x002f + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08011F72 diff --git a/data/scripts/hyruleTown/script_NayruAlone.inc b/data/scripts/hyruleTown/script_NayruAlone.inc new file mode 100644 index 00000000..7436a2c2 --- /dev/null +++ b/data/scripts/hyruleTown/script_NayruAlone.inc @@ -0,0 +1,20 @@ +@ Nayru completely alone +SCRIPT_START script_NayruAlone + BeginBlock + Call sub_08064928 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_08012216: + CheckEntityInteractType + JumpIfNot script_08012216 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x4525 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_08012216 diff --git a/data/scripts/hyruleTown/script_NayruMovedIn.inc b/data/scripts/hyruleTown/script_NayruMovedIn.inc new file mode 100644 index 00000000..dbef277e --- /dev/null +++ b/data/scripts/hyruleTown/script_NayruMovedIn.inc @@ -0,0 +1,59 @@ +@ Nayru moved in +SCRIPT_START script_NayruMovedIn + BeginBlock + Call sub_08064928 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + DoPostScriptAction 0x000a + EndBlock +script_080120C6: + CheckEntityInteractType + JumpIfNot script_080120C6 + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + CheckLocalFlag 0x0095 + JumpIf script_080120EA + MessageNoOverlap 0x3116 + WaitUntilTextboxCloses + SetLocalFlag 0x0095 + Jump script_0801212A +script_080120EA: + CheckBottleContaining 0x002f + JumpIfNot script_080120FC + MessageNoOverlap 0x3117 + WaitUntilTextboxCloses + Jump script_0801212A +script_080120FC: + MessageNoOverlap 0x3118 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0801212A + CheckBottleContaining 0x0020 + JumpIfNot script_08012126 + MessageNoOverlap 0x3119 + WaitUntilTextboxCloses + GivePlayerItem 0x002f + WaitPlayerGetItem +.ifdef USA + Call sub_0807FC24 +.else +.ifdef DEMO_USA + Call sub_0807FC24 +.else +.ifdef DEMO_JP + Call sub_0807FC24 +.endif +.endif +.endif + Jump script_0801212A +script_08012126: + MessageNoOverlap 0x311b +script_0801212A: + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0001 + Jump script_080120C6 + .align 2, 0 + diff --git a/data/scripts/script_08008D50.inc b/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc similarity index 58% rename from data/scripts/script_08008D50.inc rename to data/scripts/hyruleTown/script_Object69AllBooksCollected.inc index 76375a89..dabc4629 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/hyruleTown/script_Object69AllBooksCollected.inc @@ -1,17 +1,18 @@ -SCRIPT_START script_08008D50 +@ Library OBJECT_69 all books collected +SCRIPT_START script_Object69AllBooksCollected BeginBlock SetEntityPositionRelative 0x0068, 0x0068 _0807F0B4 0x0004 CameraTargetEntity EndBlock Wait 0x001e - _0807E5F8 0x00000002 - WaitForSomething 0x00000001 + SetSyncFlag 0x00000002 + WaitForSyncFlag 0x00000001 Wait 0x000f _0807F0B4 0x0004 CameraTargetPlayer Wait 0x001e - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Object69Rem.inc b/data/scripts/hyruleTown/script_Object69Rem.inc new file mode 100644 index 00000000..727fe03a --- /dev/null +++ b/data/scripts/hyruleTown/script_Object69Rem.inc @@ -0,0 +1,15 @@ +@ OBJECT_69 in Rems shoe shop ? +SCRIPT_START script_Object69Rem + BeginBlock + CheckLocalFlag 0x0062 + JumpIfNot script_0801319A + DoPostScriptAction 0x0006 + EndBlock +SCRIPT_END +SCRIPT_START script_0801319A + EndBlock + BeginBlock + CameraTargetEntity + MoveEntityToPlayer + Call sub_0806AB74 + Jump script_0801319A diff --git a/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc new file mode 100644 index 00000000..00761031 --- /dev/null +++ b/data/scripts/hyruleTown/script_Object69SimonsSimulation.inc @@ -0,0 +1,34 @@ +@ Simons Simulation OBJECT_69 +SCRIPT_START script_Object69SimonsSimulation + BeginBlock + _0807E888 + EndBlock + CallWithArg sub_0806C2A0, 0x00000001 + WaitForFadeFinish + Wait 0x003c + _0807E878 + SetRoomFlag 0x0000 + PlayBgm BGM_FIGHT_THEME2 +script_08011C04: + CheckRoomFlag 0x0064 + JumpIfNot script_08011C04 + StopBgm + _0807E864 + Wait 0x003c + CameraTargetEntity + Wait 0x003c + Call Simon_CreateChest + Wait 0x003c + CameraTargetPlayer + _0807E878 +script_08011C28: + CheckLocalFlag 0x0001 + JumpIfNot script_08011C28 + _0807E888 + WaitPlayerGetItem + Wait 0x001e + CallWithArg sub_0806C2A0, 0x00000000 + WaitForFadeFinish + Wait 0x003c + Call sub_0806C280 +SCRIPT_END diff --git a/data/scripts/script_080145B0.inc b/data/scripts/hyruleTown/script_Object6ACarlov.inc similarity index 86% rename from data/scripts/script_080145B0.inc rename to data/scripts/hyruleTown/script_Object6ACarlov.inc index 0b0264e5..b4987e83 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/hyruleTown/script_Object6ACarlov.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080145B0 +@ Hyrule Town OBJECT_69 at Carlov 2 +SCRIPT_START script_Object6ACarlov BeginBlock SetEntityPositionRelative 0x01f8, 0x00e0 CheckLocalFlag 0x005e diff --git a/data/scripts/hyruleTown/script_Object6ACarlov2.inc b/data/scripts/hyruleTown/script_Object6ACarlov2.inc new file mode 100644 index 00000000..a10f0656 --- /dev/null +++ b/data/scripts/hyruleTown/script_Object6ACarlov2.inc @@ -0,0 +1,53 @@ +@ Hyrule Town OBJECT_69 at Carlov +SCRIPT_START script_Object6ACarlov2 + BeginBlock + DoPostScriptAction 0x0008 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_080145F8: +.ifdef EU + CheckPlayerInRegion 0x00a8, 0x0054, 0x080c + JumpIfNot script_080145F8 + ComparePlayerAnimationState 0x0000 + JumpIfNot script_080145F8 + CheckRoomFlag 0x0009 + JumpIf script_08014632 + _0807E864 + Wait 0x0018 + _0807E8E4_3 + _0807EB44 0x0002 + MessageFromTargetPos 0x432b, 0x000c + WaitUntilTextboxCloses + Wait 0x0018 + _0807E878 + Jump script_080145F8 +script_08014632: + CheckRoomFlag 0x0000 + JumpIfNot script_08014632 + _0807E864 + Call sub_0807DF28 +script_08014642: + CheckRoomFlag 0x0009 + JumpIf script_08014642 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + Call sub_0807DF50 + _0807E878 + Jump script_080145F8 +.else + CheckRoomFlag 0x0000 + JumpIfNot script_080145F8 + _0807E864 + Call sub_0807DF28 +script_08014608: + CheckRoomFlag 0x0004 + JumpIf script_08014608 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000008 + Call sub_0807DF50 + _0807E878 + Jump script_080145F8 +.endif + .align 2, 0 + diff --git a/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc new file mode 100644 index 00000000..ad162bf7 --- /dev/null +++ b/data/scripts/hyruleTown/script_Object6APreventPlayerLeaveCarlov.inc @@ -0,0 +1,20 @@ +@ Hyrule Town OBJECT_69 at Carlov. Prevent from leaving if already paid. +SCRIPT_START script_Object6APreventPlayerLeaveCarlov + BeginBlock + EndBlock +script_0801454C: + CheckPlayerInRegion 0x0078, 0x0088, 0x0810 + JumpIfNot script_0801454C + CheckRoomFlag 0x0000 + JumpIfNot script_0801454C + _0807E864 + _0807EB28 0x4217 + WaitUntilTextboxCloses + StartPlayerScript script_PlayerWhenLeavingCarlovAlreadyPaid + Wait 0x0010 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 + _0807E878 + Jump script_0801454C +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc new file mode 100644 index 00000000..cfd7bef0 --- /dev/null +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse1.inc @@ -0,0 +1,9 @@ +@ Older lady in cat persons house +SCRIPT_START script_OldLadyCatHouse1 + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + EndBlock + Jump script_0800EBF4 diff --git a/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc new file mode 100644 index 00000000..a2b33563 --- /dev/null +++ b/data/scripts/hyruleTown/script_OldLadyCatHouse2.inc @@ -0,0 +1,20 @@ +@ Older lady in cat persons house +SCRIPT_START script_OldLadyCatHouse2 + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0006 + Call sub_08061FD8 + EndBlock +@ Common end code for Townspersons? +script_0800EBF4: + CheckEntityInteractType + JumpIfNot script_0800EBF4 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800EBF4 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Phonograph.inc b/data/scripts/hyruleTown/script_Phonograph.inc new file mode 100644 index 00000000..b4cae722 --- /dev/null +++ b/data/scripts/hyruleTown/script_Phonograph.inc @@ -0,0 +1,21 @@ +@ Phonograph +SCRIPT_START script_Phonograph + BeginBlock + Call sub_0807F934 + EndBlock +script_0800BA46: + CheckEntityInteractType + JumpIfNot script_0800BA46 + _0807E864 + Call sub_0807DF28 + MessageFromTarget 0x3301 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0800BA6C + StopBgm + Call sub_0806E964 + PlayBGM +script_0800BA6C: + Call sub_0807DF50 + _0807E878 + Jump script_0800BA46 diff --git a/data/scripts/script_08010964.inc b/data/scripts/hyruleTown/script_PhonographDoor.inc similarity index 50% rename from data/scripts/script_08010964.inc rename to data/scripts/hyruleTown/script_PhonographDoor.inc index a1df913b..f5de6c5e 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/hyruleTown/script_PhonographDoor.inc @@ -1,22 +1,5 @@ -SCRIPT_START script_08010964 - CheckPlayerInRegion2 0x0808 - JumpIfNot script_08010964 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_08010A38 - WaitForSomething2 0x00000001 - CheckRoomFlag 0x0001 - JumpIf script_08010994 - _0807EB28 0x0b63 - WaitUntilTextboxCloses -script_08010994: - Call sub_0807DF50 - _0807E878 - Jump script_08010964 - - -SCRIPT_START script_080109A0 +@ Hyrule Town locked door NPC4E for music room +SCRIPT_START script_PhonographDoor BeginBlock EndBlock .ifdef JP @@ -34,13 +17,13 @@ SCRIPT_START script_080109A0 .endif JumpIf script_080109EA CheckPlayerInRegion2 0x0808 - JumpIfNot script_080109A0 + JumpIfNot script_PhonographDoor EndBlock _0807E864 Call sub_0807F9A4 Call sub_0807DF28 - StartPlayerScript script_08010A38 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerCannotEnter + WaitForSyncFlagAndClear 0x00000001 CheckRoomFlag 0x0001 JumpIf script_080109DE _0807EB28 0x0b64 @@ -48,7 +31,7 @@ SCRIPT_START script_080109A0 script_080109DE: Call sub_0807DF50 _0807E878 - Jump script_080109A0 + Jump script_PhonographDoor script_080109EA: DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/hyruleTown/script_Pina.inc b/data/scripts/hyruleTown/script_Pina.inc new file mode 100644 index 00000000..2218ed8d --- /dev/null +++ b/data/scripts/hyruleTown/script_Pina.inc @@ -0,0 +1,21 @@ +@ Hyrule Town Pina +SCRIPT_START script_Pina + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0000 + Call sub_08063CAC + DoPostScriptAction 0x000a + Call sub_0807F348 + EndBlock +script_080104BC: + CheckEntityInteractType + JumpIfNot script_080104BC + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_08063C90 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_080104BC diff --git a/data/scripts/hyruleTown/script_Pita.inc b/data/scripts/hyruleTown/script_Pita.inc new file mode 100644 index 00000000..eaa60fe9 --- /dev/null +++ b/data/scripts/hyruleTown/script_Pita.inc @@ -0,0 +1,45 @@ +@ Hyrule Town Pita +SCRIPT_START script_Pita + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_080106BE: + CheckEntityInteractType + JumpIfNot script_080106BE + _0807E864 + _0807EB74 + Call sub_0807F2D4 + DoPostScriptAction 0x0000 + HasRoomItemForSale + JumpIf script_080106E0 + MessageNoOverlap 0x3c07 + Jump script_08010726 +script_080106E0: + Call sub_08062EB8 + CallWithArg sub_0807F78C, 0x00000000 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08010726 + WaitUntilTextboxCloses + BuyItem 0x0000, 0x0000 + JumpIf script_0801070C + MessageNoOverlap 0x3c04 + Jump script_08010726 +script_0801070C: + WaitPlayerGetItem + ModHealth 0x0008 + Call sub_08062EDC + JumpIf script_08010724 + MessageNoOverlap 0x3c06 + Jump script_08010726 +script_08010724: + WaitPlayerGetItem +script_08010726: + WaitUntilTextboxCloses + _0807E878 + DoPostScriptAction 0x0001 + Jump script_080106BE + .2byte 0x0000 diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc similarity index 69% rename from data/scripts/script_0800EA1C.inc rename to data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc index 57360433..32ceacb2 100644 --- a/data/scripts/script_0800EA1C.inc +++ b/data/scripts/hyruleTown/script_PlayerActivatedTrapCard.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800EA1C +@ Player at Library fall through trap +SCRIPT_START script_PlayerActivatedTrapCard _0807EB44 0x0006 DoPostScriptAction 0x0000 Wait 0x0014 @@ -9,7 +10,7 @@ SCRIPT_START script_0800EA1C DoPostScriptAction 0x0000 DoPostScriptAction 0x0005 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc similarity index 53% rename from data/scripts/script_080147DC.inc rename to data/scripts/hyruleTown/script_PlayerAtCarlov.inc index d5b0ad59..68bd0226 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/hyruleTown/script_PlayerAtCarlov.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_080147DC +@ Player at Carlov +SCRIPT_START script_PlayerAtCarlov EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x00e0 _0807EDD4 0x0078, 0x0068 DoPostScriptAction 0x0000 Wait 0x0010 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc similarity index 61% rename from data/scripts/script_0800EF9C.inc rename to data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc index d3e025d2..985483a2 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/hyruleTown/script_PlayerAtDrLeftDoor.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800EF9C +@ Player tries to enter DrLeft +SCRIPT_START script_PlayerAtDrLeftDoor BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EB44 0x0004 DoPostScriptAction 0x0001 _0807ECC4 0x0008 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc similarity index 60% rename from data/scripts/script_080109F0.inc rename to data/scripts/hyruleTown/script_PlayerAtInnDoor.inc index d8d9abbb..d74971cd 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/hyruleTown/script_PlayerAtInnDoor.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_080109F0 +@ Hyrule Town player tries to enter Inn +SCRIPT_START script_PlayerAtInnDoor BeginBlock SetEntitySpeed 0x0100 EndBlock _0807ECC4 0x0010 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/hyruleTown/script_PlayerAtRem.inc similarity index 74% rename from data/scripts/script_080130E4.inc rename to data/scripts/hyruleTown/script_PlayerAtRem.inc index 38df27bf..14ab94ad 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/hyruleTown/script_PlayerAtRem.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080130E4 +@ Player at Rem +SCRIPT_START script_PlayerAtRem BeginBlock _0807EB44 0x0006 SetEntitySpeed 0x0140 @@ -9,6 +10,6 @@ SCRIPT_START script_080130E4 Wait 0x0008 DoPostScriptAction 0x0004 Wait 0x000f - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc similarity index 59% rename from data/scripts/script_08010A38.inc rename to data/scripts/hyruleTown/script_PlayerCannotEnter.inc index e3dae7ae..9ae17985 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/hyruleTown/script_PlayerCannotEnter.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08010A38 +@ Player cannot enter something to the left +SCRIPT_START script_PlayerCannotEnter BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc similarity index 77% rename from data/scripts/script_08010A5C.inc rename to data/scripts/hyruleTown/script_PlayerSleepingInn.inc index b08284b9..eb09df0a 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/hyruleTown/script_PlayerSleepingInn.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08010A5C +@ Player sleeping at Inn +SCRIPT_START script_PlayerSleepingInn BeginBlock Call sub_0807DF28 _0807E864 @@ -7,7 +8,7 @@ SCRIPT_START script_08010A5C Wait 0x003c _0807E778 0x0004 DoFade4 - WaitFor_2 + WaitForFadeFinish script_08010A78: Call sub_0807F0D8 JumpIfNot script_08010A78 diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc similarity index 64% rename from data/scripts/script_0800E9F4.inc rename to data/scripts/hyruleTown/script_PlayerStepOnTrap.inc index c801e9d9..1666a56b 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/hyruleTown/script_PlayerStepOnTrap.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800E9F4 +@ Player at Librari move on trap +SCRIPT_START script_PlayerStepOnTrap BeginBlock _0807EB44 0x0004 SetEntitySpeed 0x0100 @@ -6,6 +7,6 @@ SCRIPT_START script_0800E9F4 DoPostScriptAction 0x0001 _0807EDD4 0x0078, 0x0080 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08011C50.inc b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc similarity index 55% rename from data/scripts/script_08011C50.inc rename to data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc index 154bc0ab..748c70ef 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/hyruleTown/script_PlayerWakingUpAtSimons.inc @@ -1,13 +1,14 @@ -SCRIPT_START script_08011C50 +@ Player waking up after Simons Simulation +SCRIPT_START script_PlayerWakingUpAtSimons BeginBlock _0807E864 EndBlock Wait 0x003c CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 + WaitForFadeFinish Wait 0x003c DoPostScriptAction 0x0014 Wait 0x001e - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc new file mode 100644 index 00000000..be67e071 --- /dev/null +++ b/data/scripts/hyruleTown/script_PlayerWhenLeavingCarlovAlreadyPaid.inc @@ -0,0 +1,11 @@ +@ Player at Carlov when trying to leave when already paid +SCRIPT_START script_PlayerWhenLeavingCarlovAlreadyPaid + EndBlock + WaitForSyncFlagAndClear 0x00000001 + SetEntitySpeed 0x00e0 + _0807EDD4 0x0078, 0x0078 + DoPostScriptAction 0x0000 + Wait 0x0010 + SetSyncFlag 0x00000002 + Call sub_0807921C +SCRIPT_END diff --git a/data/scripts/script_08010A98.inc b/data/scripts/hyruleTown/script_Postman.inc similarity index 64% rename from data/scripts/script_08010A98.inc rename to data/scripts/hyruleTown/script_Postman.inc index c76ce7b0..01b75b3f 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/hyruleTown/script_Postman.inc @@ -1,23 +1,5 @@ -SCRIPT_START script_08010A98 - BeginBlock - _0807EB44 0x0004 - CallWithArg sub_080672B0, 0x00000000 - DoPostScriptAction 0x000a - Call sub_08067314 - EndBlock -script_08010AB4: - CheckEntityInteractType - JumpIfNot script_08010AB4 - _0807E864 - _0807EB74 - CallWithArg sub_080672B0, 0x00000004 - Call sub_08067304 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - CallWithArg sub_080672B0, 0x00000000 - Jump script_08010AB4 -SCRIPT_START script_08010AE4 +@ Hyrule Town Postman +SCRIPT_START script_Postman BeginBlock CheckInventory1 0x0067 JumpIfNot script_08010B62 diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/hyruleTown/script_Rem.inc similarity index 90% rename from data/scripts/script_08012F0C.inc rename to data/scripts/hyruleTown/script_Rem.inc index 17ccbb21..85487b0e 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/hyruleTown/script_Rem.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012F0C +@ Hyrule Town Rem +SCRIPT_START script_Rem BeginBlock CallWithArg sub_0806A93C, 0x12345678 _0807EB44 0x0004 @@ -8,7 +9,7 @@ SCRIPT_START script_08012F0C CheckLocalFlag 0x0060 JumpIf script_08012FD2 CheckGlobalFlag 0x001e - JumpIf script_08012F86 + JumpIf script_RemFallingAsleep EndBlock CheckLocalFlag 0x0062 JumpIfNot script_08012F48 diff --git a/data/scripts/script_08012F86.inc b/data/scripts/hyruleTown/script_RemFallingAsleep.inc similarity index 88% rename from data/scripts/script_08012F86.inc rename to data/scripts/hyruleTown/script_RemFallingAsleep.inc index 13ddc6bf..b685fd1f 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/hyruleTown/script_RemFallingAsleep.inc @@ -1,14 +1,15 @@ -SCRIPT_START script_08012F86 +@ Rem falling asleep +SCRIPT_START script_RemFallingAsleep BeginBlock CheckLocalFlag 0x0060 JumpIf script_08012FD2 _0807E864 Call sub_0807DF28 - StartPlayerScript script_080130E4 + StartPlayerScript script_PlayerAtRem SetLocalFlag 0x0060 ClearLocalFlag 0x0061 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E908 0x0004 Call sub_0806A958 CallWithArg sub_0807F93C, 0x0000f2f4 @@ -27,7 +28,7 @@ script_08012FD2: CheckInventory1 0x0038 JumpIf script_08013006 script_08012FFA: - _0807E944 + _0807E944 MessageNoOverlap 0x4403 WaitUntilTextboxCloses Jump script_08012FFA @@ -60,10 +61,10 @@ script_08013006: Wait 0x00f0 MessageNoOverlap 0x4405 WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807F034 0x0015 - WaitPlayerGetItem - _0807EB8C + SetSyncFlag 0x00000200 + GivePlayerItem 0x0015 + WaitPlayerGetItem + _0807EB8C MessageNoOverlap 0x4406 WaitUntilTextboxCloses _0807E908 0x0001 diff --git a/data/scripts/script_08013114.inc b/data/scripts/hyruleTown/script_RemTownMinish.inc similarity index 79% rename from data/scripts/script_08013114.inc rename to data/scripts/hyruleTown/script_RemTownMinish.inc index 1adcb058..d7f649b8 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/hyruleTown/script_RemTownMinish.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013114 +@ Rem Town Minish +SCRIPT_START script_RemTownMinish BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -31,10 +32,3 @@ script_08013176: Call sub_0807F420 _0807E878 Jump script_08013128 -SCRIPT_START script_08013188 - BeginBlock - CheckLocalFlag 0x0062 - JumpIfNot script_0801319A - DoPostScriptAction 0x0006 - EndBlock -SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/hyruleTown/script_RentRegularRoom.inc similarity index 66% rename from data/scripts/script_0800E8A4.inc rename to data/scripts/hyruleTown/script_RentRegularRoom.inc index bb0dd75f..05284b24 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/hyruleTown/script_RentRegularRoom.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800E8A4 +@ Hyrule Town Inn Emma after renting regular room +SCRIPT_START script_RentRegularRoom BeginBlock MessageFromTarget 0x4504 CallWithArg sub_0807F854, 0x000100c8 EndBlock WaitUntilTextboxCloses HasRupees 0x00c8 - JumpIfNot script_0800E908 + JumpIfNot script_EmmaNotEnoughRupees ModRupees 0xff38 SetLocalFlag 0x0091 MessageFromTarget 0x4508 diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/hyruleTown/script_RentSmallRoom.inc similarity index 67% rename from data/scripts/script_0800E8D6.inc rename to data/scripts/hyruleTown/script_RentSmallRoom.inc index facf15c1..c6794b6d 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/hyruleTown/script_RentSmallRoom.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_0800E8D6 +@ Hyrule Town Inn Emma after renting small room +SCRIPT_START script_RentSmallRoom BeginBlock MessageFromTarget 0x4503 CallWithArg sub_0807F854, 0x00010032 EndBlock WaitUntilTextboxCloses HasRupees 0x0032 - JumpIfNot script_0800E908 + JumpIfNot script_EmmaNotEnoughRupees ModRupees 0xffce SetLocalFlag 0x0091 MessageFromTarget 0x4508 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/hyruleTown/script_Simon.inc similarity index 57% rename from data/scripts/script_08011B40.inc rename to data/scripts/hyruleTown/script_Simon.inc index 461cbf23..4eb0c09c 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/hyruleTown/script_Simon.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08011B40 +@ Simon +SCRIPT_START script_Simon BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -7,7 +8,7 @@ SCRIPT_START script_08011B40 EndBlock CheckGlobalFlag 0x0050 JumpIfNot script_08011B84 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB44 0x0006 DoPostScriptAction 0x0004 Wait 0x003c @@ -25,7 +26,7 @@ script_08011B84: _0807EB74 MessageNoOverlap 0x3d01 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_08011BA4 script_08011B9A: _0807E878 @@ -44,40 +45,7 @@ script_08011BBC: MessageNoOverlap 0x3d06 WaitUntilTextboxCloses CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 + WaitForFadeFinish Wait 0x003c Call sub_0806C224 Jump script_08011B9A -SCRIPT_START script_08011BE4 - BeginBlock - _0807E888 - EndBlock - CallWithArg sub_0806C2A0, 0x00000001 - WaitFor_2 - Wait 0x003c - _0807E878 - SetRoomFlag 0x0000 - PlayBgm BGM_FIGHT_THEME2 -script_08011C04: - CheckRoomFlag 0x0064 - JumpIfNot script_08011C04 - StopBgm - _0807E864 - Wait 0x003c - CameraTargetEntity - Wait 0x003c - Call Simon_CreateChest - Wait 0x003c - CameraTargetPlayer - _0807E878 -script_08011C28: - CheckLocalFlag 0x0001 - JumpIfNot script_08011C28 - _0807E888 - WaitPlayerGetItem - Wait 0x001e - CallWithArg sub_0806C2A0, 0x00000000 - WaitFor_2 - Wait 0x003c - Call sub_0806C280 -SCRIPT_END diff --git a/data/scripts/hyruleTown/script_SimonsDoor.inc b/data/scripts/hyruleTown/script_SimonsDoor.inc new file mode 100644 index 00000000..af0ab35f --- /dev/null +++ b/data/scripts/hyruleTown/script_SimonsDoor.inc @@ -0,0 +1,19 @@ +@ Hyrule Town locked door NPC4E for Simons Simulations +SCRIPT_START script_SimonsDoor + CheckPlayerInRegion2 0x0808 + JumpIfNot script_SimonsDoor + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_PlayerCannotEnter + WaitForSyncFlagAndClear 0x00000001 + CheckRoomFlag 0x0001 + JumpIf script_08010994 + _0807EB28 0x0b63 + WaitUntilTextboxCloses +script_08010994: + Call sub_0807DF50 + _0807E878 + Jump script_SimonsDoor + + diff --git a/data/scripts/hyruleTown/script_SittingPerson.inc b/data/scripts/hyruleTown/script_SittingPerson.inc new file mode 100644 index 00000000..de9aafde --- /dev/null +++ b/data/scripts/hyruleTown/script_SittingPerson.inc @@ -0,0 +1,25 @@ +@ Hyrule Town SittingPerson +SCRIPT_START script_SittingPerson + BeginBlock + Call sub_080639D0 + DoPostScriptAction 0x000a + EndBlock + BeginBlock + CallWithArg sub_08063850, 0x00000000 + EndBlock +script_0800ED20: + CheckEntityInteractType + JumpIfNot script_0800ED20 + _0807E864 + _0807EB74 + CallWithArg sub_08063850, 0x00000000 + Call sub_08063944 + WaitUntilTextboxCloses + JumpIfNot script_0800ED46 + _0807F050 0x0070 + WaitPlayerGetItem +script_0800ED46: + _0807E878 + Call sub_08063874 + CallWithArg sub_08063850, 0x00000000 + Jump script_0800ED20 diff --git a/data/scripts/script_08010B68.inc b/data/scripts/hyruleTown/script_SmallTownMinish.inc similarity index 88% rename from data/scripts/script_08010B68.inc rename to data/scripts/hyruleTown/script_SmallTownMinish.inc index f5b0775f..7438f1cd 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/hyruleTown/script_SmallTownMinish.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08010B68 +@ Hyrule Town SmallTownMinish +SCRIPT_START script_SmallTownMinish BeginBlock _0807E564 JumpIfNot script_08010BAC diff --git a/data/scripts/hyruleTown/script_Stamp.inc b/data/scripts/hyruleTown/script_Stamp.inc new file mode 100644 index 00000000..c26672bc --- /dev/null +++ b/data/scripts/hyruleTown/script_Stamp.inc @@ -0,0 +1,21 @@ +@ Hyrule Town Stamp +SCRIPT_START script_Stamp + BeginBlock + DoPostScriptAction 0x0007 + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_080107AA: + CheckEntityInteractType + JumpIfNot script_080107AA + _0807E864 + Call sub_0807F2D4 + DoPostScriptAction 0x0001 + Call sub_08062CBC + WaitUntilTextboxCloses + _0807E878 + DoPostScriptAction 0x0000 + Jump script_080107AA + .2byte 0x0000 diff --git a/data/scripts/script_080142B0.inc b/data/scripts/hyruleTown/script_Stockwell.inc similarity index 95% rename from data/scripts/script_080142B0.inc rename to data/scripts/hyruleTown/script_Stockwell.inc index 7a9188ad..c079da2b 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/hyruleTown/script_Stockwell.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080142B0 +@ Hyrule Town Stockwell +SCRIPT_START script_Stockwell BeginBlock CheckLocalFlag 0x0054 JumpIf script_08014382 diff --git a/data/scripts/script_08014384.inc b/data/scripts/hyruleTown/script_StockwellBuy.inc similarity index 77% rename from data/scripts/script_08014384.inc rename to data/scripts/hyruleTown/script_StockwellBuy.inc index ac5a30fe..66e1b75f 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/hyruleTown/script_StockwellBuy.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_08014384 +@ Hyrule Town Stockwell do you want to buy? +SCRIPT_START script_StockwellBuy EndBlock _0807E864 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_080143AC Wait 0x001e Call sub_08065370 diff --git a/data/scripts/script_080143C0.inc b/data/scripts/hyruleTown/script_StockwellDogFood.inc similarity index 86% rename from data/scripts/script_080143C0.inc rename to data/scripts/hyruleTown/script_StockwellDogFood.inc index a47c473e..ea0f8908 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/hyruleTown/script_StockwellDogFood.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080143C0 +@ Stockwell pick up dog food +SCRIPT_START script_StockwellDogFood EndBlock _0807E864 Call sub_0807DF28 @@ -8,7 +9,7 @@ SCRIPT_START script_080143C0 Wait 0x003c MessageNoOverlap 0x2c16 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_080143FA SetIntVariable 0x00000002 Call sub_08065528 @@ -21,7 +22,7 @@ script_080143FA: Wait 0x000a SetIntVariable 0x00000000 Call sub_08065528 - _0807F034 0x0036 + GivePlayerItem 0x0036 WaitPlayerGetItem MessageNoOverlap 0x2c19 WaitUntilTextboxCloses diff --git a/data/scripts/hyruleTown/script_Sturgeon.inc b/data/scripts/hyruleTown/script_Sturgeon.inc new file mode 100644 index 00000000..69be9796 --- /dev/null +++ b/data/scripts/hyruleTown/script_Sturgeon.inc @@ -0,0 +1,19 @@ +@ Library Sturgeon +SCRIPT_START script_Sturgeon + BeginBlock + Call sub_08064CC0 + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807EB44 0x0002 + _0807E930 0x0000 + EndBlock +script_0800ED76: + _0807E944 + _0807E864 + _0807EB74 + Call sub_08064CD8 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800ED76 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc new file mode 100644 index 00000000..a0742182 --- /dev/null +++ b/data/scripts/hyruleTown/script_SturgeonAllBooksCollected.inc @@ -0,0 +1,55 @@ +@ Library Sturgeon all books collected +SCRIPT_START script_SturgeonAllBooksCollected + BeginBlock + SetEntityPositionRelative 0x0068, 0x0018 + DoPostScriptAction 0x000f + _0807EB44 0x0004 + _0807E930 0x0004 + SetEntitySpeed 0x0300 + PlaySound SFX_STAIRS + EndBlock + WaitForSyncFlag 0x00000002 + MessageNoOverlap 0x490d + WaitUntilTextboxCloses + DoPostScriptAction 0x0007 + Call sub_08064D08 + _0807EDD4 0x0068, 0x0078 + Call sub_08064D10 + Wait 0x000f + _0807EB44 0x0002 + Wait 0x000f + Call sub_08064D08 + _0807EDD4 0x0098, 0x0078 + Call sub_08064D10 + Wait 0x000f + _0807EB44 0x0004 + PlaySound SFX_PLY_LIFT + Wait 0x000f + _0807EB44 0x0002 + _0807EDD4 0x00ac, 0x0078 + Wait 0x000f + _0807EB44 0x0004 + PlaySound SFX_PLY_LIFT + Wait 0x000f + _0807EB44 0x0002 + _0807EDD4 0x00c0, 0x0078 + Wait 0x000f + _0807EB44 0x0004 + PlaySound SFX_PLY_LIFT + Wait 0x000f + _0807EB44 0x0006 + Wait 0x001e + Call sub_08064D08 + _0807EDD4 0x0068, 0x0078 + Call sub_08064D10 + Wait 0x000f + _0807EB44 0x0000 + Wait 0x000f + Call sub_08064D08 + _0807EDD4 0x0068, 0x0018 + Call sub_08064D10 + PlaySound SFX_STAIRS + SetSyncFlag 0x00000001 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Teachers.inc b/data/scripts/hyruleTown/script_Teachers.inc new file mode 100644 index 00000000..5a9dfd9f --- /dev/null +++ b/data/scripts/hyruleTown/script_Teachers.inc @@ -0,0 +1,18 @@ +@ Hyrule Town Teachers +SCRIPT_START script_Teachers + BeginBlock + Call sub_0806C674 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + EndBlock +script_0800E806: + CheckEntityInteractType + JumpIfNot script_0800E806 + _0807E864 + _0807EB74 + Call sub_0806C70C + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + Jump script_0800E806 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish1.inc b/data/scripts/hyruleTown/script_TownMinish1.inc new file mode 100644 index 00000000..48a4ba7c --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish1.inc @@ -0,0 +1,30 @@ +@ Hyrule Town TownMinish above carpenters +@ also in library, cafe +SCRIPT_START script_TownMinish1 + BeginBlock + Call sub_0806ADFC + DoPostScriptAction 0x000a +script_0800E6F4: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800E708 + Call sub_0806AEE4 + Jump script_0800E6F4 +script_0800E708: + EndBlock + _0807E864 + Call sub_0806AFE8 + JumpIf script_0800E722 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E6F4 +script_0800E722: + WaitUntilTextboxCloses + GivePlayerItem 0x0057 + WaitPlayerGetItem + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E6F4 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownMinish2.inc b/data/scripts/hyruleTown/script_TownMinish2.inc new file mode 100644 index 00000000..14f1a7ea --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish2.inc @@ -0,0 +1,16 @@ +@ Town Minish above cafe +SCRIPT_START script_TownMinish2 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_0800E73E: + CheckEntityInteractType + JumpIfNot script_0800E73E + _0807E864 + _0807EB74 + CallWithArg sub_0806AF60, 0x00000000 + Call sub_0806AFE8 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800E73E diff --git a/data/scripts/hyruleTown/script_TownMinish3.inc b/data/scripts/hyruleTown/script_TownMinish3.inc new file mode 100644 index 00000000..468a7163 --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish3.inc @@ -0,0 +1,48 @@ +@ Town Minish on book above Dr Left +SCRIPT_START script_TownMinish3 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + SetEntitySpeed 0x0200 + CheckGlobalFlag 0x0029 + JumpIfNot script_0800E77C + CheckGlobalFlag 0x002a + JumpIfNot script_0800E786 +script_0800E77C: + SetEntityPositionRelative 0x0188, 0x0098 + Jump script_0800E6F4 +script_0800E786: + EndBlock +script_0800E788: + BeginBlock + CheckGlobalFlag 0x002a + JumpIf script_0800E7BA + CheckEntityInteractType + JumpIf script_0800E7A4 + Call sub_0806AEE4 + EndBlock + Jump script_0800E788 +script_0800E7A4: + EndBlock + _0807E864 + Call sub_0806AFE8 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800E788 +script_0800E7BA: + DoPostScriptAction 0x000f + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000004 + Call sub_0806AF70 + _0807EE04 0x0188, 0x0058 +script_0800E7D8: + EndBlock + BeginBlock + Call sub_0806AF78 + _0807EE30 + JumpIfNot script_0800E7D8 + EntityHasHeight + JumpIf script_0800E7D8 + EndBlock + Jump script_0800E6F4 diff --git a/data/scripts/hyruleTown/script_TownMinish4.inc b/data/scripts/hyruleTown/script_TownMinish4.inc new file mode 100644 index 00000000..e28d7805 --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish4.inc @@ -0,0 +1,52 @@ +@ Town Minish above Mayor left +SCRIPT_START script_TownMinish4 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a +script_0800ED98: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800EDB6 + CheckSyncFlagAndClear 0x00000001 + JumpIf script_0800EE12 + Call sub_0806AEE4 + Jump script_0800ED98 +script_0800EDB6: + EndBlock + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x00ae + JumpIf script_0800EE3E + Wait 0x000a + SetSyncFlag 0x00000001 + MessageFromTarget 0x4c07 + WaitUntilTextboxCloses + SetSyncFlag 0x00000010 + MessageFromTarget 0x4c08 + WaitUntilTextboxCloses + SetSyncFlag 0x00000020 + MessageFromTarget 0x4c09 + WaitUntilTextboxCloses + SetIntVariable 0x00000503 + Call sub_0807F420 + SetSyncFlag 0x00000040 + Call sub_0807DF50 + _0807E878 + SetLocalFlag 0x00ae + Jump script_0800ED98 +script_0800EE12: + EndBlock + WaitForSyncFlagAndClear 0x00000002 + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000008 + WaitForSyncFlagAndClear 0x00000004 + Call sub_0806AED8 + WaitForSyncFlagAndClear 0x00000008 + Jump script_0800ED98 +script_0800EE3E: + MessageFromTarget 0x4c16 + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_0800ED98 diff --git a/data/scripts/hyruleTown/script_TownMinish5.inc b/data/scripts/hyruleTown/script_TownMinish5.inc new file mode 100644 index 00000000..e389bbcc --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish5.inc @@ -0,0 +1,64 @@ +@ Town Minish above Mayor right +SCRIPT_START script_TownMinish5 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a +script_0800EE58: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800EE76 + CheckSyncFlagAndClear 0x00000001 + JumpIf script_0800EED2 + Call sub_0806AEE4 + Jump script_0800EE58 +script_0800EE76: + EndBlock + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x00ae + JumpIf script_0800EEFE + Wait 0x000a + SetSyncFlag 0x00000001 + MessageFromTarget 0x4c07 + WaitUntilTextboxCloses + SetSyncFlag 0x00000002 + MessageFromTarget 0x4c08 + WaitUntilTextboxCloses + SetSyncFlag 0x00000004 + MessageFromTarget 0x4c09 + WaitUntilTextboxCloses + SetIntVariable 0x00000503 + Call sub_0807F420 + SetSyncFlag 0x00000008 + Call sub_0807DF50 + _0807E878 + SetLocalFlag 0x00ae + Jump script_0800EE58 +script_0800EED2: + EndBlock + WaitForSyncFlagAndClear 0x00000010 + _0807EB44 0x0006 + CallWithArg sub_0806AF60, 0x00000008 + WaitForSyncFlagAndClear 0x00000020 + Call sub_0806AED8 + WaitForSyncFlagAndClear 0x00000040 + Jump script_0800EE58 +script_0800EEFE: + MessageFromTarget 0x4c15 + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_0800EE58 + MessageFromTarget 0x4c07 + WaitUntilTextboxCloses + SetSyncFlag 0x00000012 + Wait 0x000a + MessageFromTarget 0x4c08 + WaitUntilTextboxCloses + SetSyncFlag 0x00000024 + MessageFromTarget 0x4c09 + WaitUntilTextboxCloses + SetSyncFlag 0x00000048 + Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/hyruleTown/script_TownMinish6.inc b/data/scripts/hyruleTown/script_TownMinish6.inc new file mode 100644 index 00000000..40da66be --- /dev/null +++ b/data/scripts/hyruleTown/script_TownMinish6.inc @@ -0,0 +1,46 @@ +@ Hyrule Town TownMinish at Dr Left +SCRIPT_START script_TownMinish6 + BeginBlock + SetEntitySpeed 0x0080 + _0807E9D4 + DoPostScriptAction 0x000a + CheckLocalFlag 0x007b + JumpIf script_0800F082 + EndBlock + Jump script_0800EFFE +script_0800EFDA: + _0807EB44 0x0006 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 + _0807EB44 0x0004 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 +script_0800EFFE: + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0088, 0x0040 + DoPostScriptAction 0x000a + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 + _0807EB44 0x0004 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 + _0807EB44 0x0006 + CallWithArg sub_0806AF60, 0x00000008 + Wait 0x0004 + _0807EB44 0x0006 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0068, 0x0040 + DoPostScriptAction 0x000a + CheckLocalFlag 0x007b + JumpIf script_0800F082 + Jump script_0800EFDA +script_0800F082: + EndBlock + Call sub_0806AEE4 + Jump script_0800F082 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Townsperson1.inc b/data/scripts/hyruleTown/script_Townsperson1.inc new file mode 100644 index 00000000..a3e3fa02 --- /dev/null +++ b/data/scripts/hyruleTown/script_Townsperson1.inc @@ -0,0 +1,18 @@ +@ Hyrule Townsperson 2? +SCRIPT_START script_Townsperson1 + BeginBlock + Call sub_08061FE4 + Call sub_08061E70 + DoPostScriptAction 0x000a + EndBlock +script_080100DC: + CheckEntityInteractType + JumpIfNot script_080100DC + _0807E864 + _0807EB74 + Call sub_08061FE4 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_080100DC + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Townsperson2.inc b/data/scripts/hyruleTown/script_Townsperson2.inc new file mode 100644 index 00000000..535ade2e --- /dev/null +++ b/data/scripts/hyruleTown/script_Townsperson2.inc @@ -0,0 +1,12 @@ +@ Hyrule Town Townsperson +SCRIPT_START script_Townsperson2 + BeginBlock + Call sub_08061FE4 + Call sub_08061E70 + DoPostScriptAction 0x000a + EndBlock +script_08010110: + Wait 0x003c + Call sub_08061E90 + Jump script_08010110 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc new file mode 100644 index 00000000..b9db7e3c --- /dev/null +++ b/data/scripts/hyruleTown/script_TownspersonInDogHouse.inc @@ -0,0 +1,19 @@ +@ Hyrule Townsperson house with dog +SCRIPT_START script_TownspersonInDogHouse + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + EndBlock +script_0800EB44: + CheckEntityInteractType + JumpIfNot script_0800EB44 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800EB44 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_Wheaton.inc b/data/scripts/hyruleTown/script_Wheaton.inc new file mode 100644 index 00000000..277fcf4d --- /dev/null +++ b/data/scripts/hyruleTown/script_Wheaton.inc @@ -0,0 +1,21 @@ +@ Hyrule Town Wheaton +SCRIPT_START script_Wheaton + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_08010686: + CheckEntityInteractType + JumpIfNot script_08010686 + _0807E864 + _0807EB74 + HasRoomItemForSale + Call sub_0807F77C + MessageFromTargetTable 0x3c08, 0x3c09 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + Jump script_08010686 + .2byte 0x0000 diff --git a/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc new file mode 100644 index 00000000..c9cc110b --- /dev/null +++ b/data/scripts/hyruleTown/script_WindTribespeopleVisitor.inc @@ -0,0 +1,19 @@ +@ Hyrule Town Windstribepeople in house +SCRIPT_START script_WindTribespeopleVisitor + BeginBlock + Call sub_0806C870 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock +script_0800EB0E: + _0807E30C + JumpIfNot script_0800EB0E + _0807E864 + _0807EB74 + Call sub_0806C90C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800EB0E + .2byte 0x0000 diff --git a/data/scripts/script_0800C350.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone1.inc similarity index 71% rename from data/scripts/script_0800C350.inc rename to data/scripts/kinstoneFusion/script_BigGoronKinstone1.inc index 06f641d6..a7bee66e 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone1.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C350 +@ BigGoron Kinstone cutscene 1 +SCRIPT_START script_BigGoronKinstone1 BeginBlock CallWithArg sub_0806D658, 0x00000003 SetEntitySpeed 0x0200 diff --git a/data/scripts/script_0800C410.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc similarity index 70% rename from data/scripts/script_0800C410.inc rename to data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc index a0cd7597..527e5cd8 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone2.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_0800C410 +@ BigGoron Kinstone cutscene2 +SCRIPT_START script_BigGoronKinstone2 BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000002 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f @@ -11,6 +12,4 @@ SCRIPT_START script_0800C410 Call sub_0806D67C _0807F0C8 0x001e, 0x0000 PlaySound SFX_10B - _0807E5F8 0x00000001 SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc similarity index 63% rename from data/scripts/script_0800C3CC.inc rename to data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc index 3e0cd6d7..cd1f8fca 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone3.inc @@ -1,9 +1,10 @@ -SCRIPT_START script_0800C3CC +@ BigGoron Kinstone cutscene 3 +SCRIPT_START script_BigGoronKinstone3 BeginBlock Call sub_0806D660 SetEntitySpeed 0x0080 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000004 CallWithArg sub_0807F4F8, 0x00000048 Call sub_0806D66C Wait 0x000f @@ -11,4 +12,6 @@ SCRIPT_START script_0800C3CC Call sub_0806D67C _0807F0C8 0x001e, 0x0000 PlaySound SFX_10B + SetSyncFlag 0x00000001 SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc similarity index 65% rename from data/scripts/script_0800C370.inc rename to data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc index 43489062..f4a43257 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone4.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C370 +@ BigGoron Kinstone cutscene 4 +SCRIPT_START script_BigGoronKinstone4 _0807EEF4 0xfff8, 0x0000 _0807EEF4 0x0010, 0x0000 _0807EEF4 0xfff0, 0x0000 @@ -8,6 +9,6 @@ SCRIPT_START script_0800C370 Wait 0x001e MessageNoOverlap 0x1d00 WaitUntilTextboxCloses - _0807E5F8 0x00000006 - WaitForSomething2 0x00000001 + SetSyncFlag 0x00000006 + WaitForSyncFlagAndClear 0x00000001 _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800C3B0.inc b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc similarity index 63% rename from data/scripts/script_0800C3B0.inc rename to data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc index 7c2582f8..73498142 100644 --- a/data/scripts/script_0800C3B0.inc +++ b/data/scripts/kinstoneFusion/script_BigGoronKinstone5.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C3B0 +@ BigGoron Kinstone Cutscene 5 +SCRIPT_START script_BigGoronKinstone5 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xff30 _0807F0C8 0x0000, 0x0000 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc similarity index 76% rename from data/scripts/script_0800BB30.inc rename to data/scripts/kinstoneFusion/script_BombMinishKinstone.inc index 5b5871ad..b72d6684 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/kinstoneFusion/script_BombMinishKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BB30 +@ Bomb Forest Minish during Kinstone cutscene +SCRIPT_START script_BombMinishKinstone BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc similarity index 79% rename from data/scripts/script_0800BBDC.inc rename to data/scripts/kinstoneFusion/script_CarlovKinstone.inc index bed21d4e..93101d5e 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/kinstoneFusion/script_CarlovKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BBDC +@ Kinstone Cutscene for Carlov +SCRIPT_START script_CarlovKinstone BeginBlock _0807E930 0x0000 EndBlock diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc similarity index 83% rename from data/scripts/script_0800BC08.inc rename to data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc index 237767b7..ffa2b0be 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/kinstoneFusion/script_GhostBrotherKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BC08 +@ Ghost Brother in Kinstone cutscene +SCRIPT_START script_GhostBrotherKinstone BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 diff --git a/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc new file mode 100644 index 00000000..ea1e2150 --- /dev/null +++ b/data/scripts/kinstoneFusion/script_GormanFirstAppearance.inc @@ -0,0 +1,24 @@ +@ Hyrule Town Gorman during Kinstone cutscene for first empty house +SCRIPT_START script_GormanFirstAppearance + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + SetEntitySpeed 0x0040 + Call sub_0807F348 + EndBlock +script_0800BA8E: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BA8E + _0807EDD4 0x02f8, 0x0350 + Wait 0x001e + DoPostScriptAction 0x0004 + Wait 0x003c + _0807EB44 0x0006 + Wait 0x001e + _0807EDD4 0x02f0, 0x0350 + Wait 0x001e + MessageNoOverlap 0x0e00 + WaitUntilTextboxCloses + Wait 0x0078 + Call sub_08054968 +SCRIPT_END diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc similarity index 65% rename from data/scripts/script_0800BCE8.inc rename to data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc index f8c1841c..2262d29c 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800BCE8 +@ 1st Goron during Kinstone cutscene for 2nd Goron +SCRIPT_START script_Goron1Kinstone2 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 Wait 0x003c @@ -12,26 +13,26 @@ SCRIPT_START script_0800BCE8 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BD1C: CheckRoomFlag 0x00ff JumpIfNot script_0800BD1C - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0c WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x0168 _0807E930 0x0000 Wait 0x003c _0807EB44 0x0002 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc new file mode 100644 index 00000000..145f5a99 --- /dev/null +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone3.inc @@ -0,0 +1,18 @@ +@ 1st Goron during 3rd Goron Kinstone cutscene +SCRIPT_START script_Goron1Kinstone3 + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + EndBlock + WaitForFadeFinish + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + MessageNoOverlap 0x0e0d + WaitUntilTextboxCloses + _0807E930 0x0008 + Wait 0x003c + Jump script_0800BE88 + .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc new file mode 100644 index 00000000..0756ea9e --- /dev/null +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone4.inc @@ -0,0 +1,18 @@ +@ 1st Goron during 4th Goron cutscene +SCRIPT_START script_Goron1Kinstone4 + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + EndBlock + WaitForFadeFinish + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + MessageNoOverlap 0x0e10 + WaitUntilTextboxCloses + _0807E930 0x0008 + Wait 0x003c + Jump script_0800BFA4 + .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc new file mode 100644 index 00000000..d1561411 --- /dev/null +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone5.inc @@ -0,0 +1,18 @@ +@ 1st Goron during 5th Goron cutscene +SCRIPT_START script_Goron1Kinstone5 + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + EndBlock + WaitForFadeFinish + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + MessageNoOverlap 0x0e13 + WaitUntilTextboxCloses + _0807E930 0x0008 + Wait 0x003c + Jump script_0800C11C + .2byte 0x0000 diff --git a/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc new file mode 100644 index 00000000..6d2ee65f --- /dev/null +++ b/data/scripts/kinstoneFusion/script_Goron1Kinstone6.inc @@ -0,0 +1,18 @@ +@ 1st Goron in 6th Goron cutscene +SCRIPT_START script_Goron1Kinstone6 + BeginBlock + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + EndBlock + WaitForFadeFinish + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + MessageNoOverlap 0x0e16 + WaitUntilTextboxCloses + _0807E930 0x0008 + Wait 0x003c + Jump script_0800C244 + .2byte 0x0000 diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc similarity index 72% rename from data/scripts/script_0800BD78.inc rename to data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc index 814887f0..5aeac45c 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone2.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BD78 +@ 2nd Goron during Kinstone cutscene for 2nd Goron +SCRIPT_START script_Goron2Kinstone2 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 @@ -6,18 +7,18 @@ SCRIPT_START script_0800BD78 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000270 Wait 0x001e MessageNoOverlap 0x0e0b WaitUntilTextboxCloses - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0228 Wait 0x000f - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -28,7 +29,7 @@ SCRIPT_START script_0800BD78 _0807E930 0x0000 Wait 0x003c _0807EB44 0x0006 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc similarity index 55% rename from data/scripts/script_0800BE1C.inc rename to data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc index d5217ce9..99a41fc4 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone3.inc @@ -1,27 +1,11 @@ -SCRIPT_START script_0800BE1C +@ 2nd Goron during 3rd Goron cutscene +SCRIPT_START script_Goron2Kinstone3 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 - Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 - Wait 0x003c - MessageNoOverlap 0x0e0d - WaitUntilTextboxCloses - _0807E930 0x0008 - Wait 0x003c - Jump script_0800BE88 - .2byte 0x0000 -SCRIPT_START script_0800BE54 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 - EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -29,20 +13,20 @@ SCRIPT_START script_0800BE54 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BE88: _0807EB44 0x0004 script_0800BE8C: CheckRoomFlag 0x00ff JumpIfNot script_0800BE8C - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e0f WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc similarity index 60% rename from data/scripts/script_0800BF38.inc rename to data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc index 5c982ab0..c8305e1f 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone4.inc @@ -1,27 +1,11 @@ -SCRIPT_START script_0800BF38 +@ 2nd and 3rd Goron during 4th Goron cutscene +SCRIPT_START script_Goron2Kinstone4 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 - Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 - Wait 0x003c - MessageNoOverlap 0x0e10 - WaitUntilTextboxCloses - _0807E930 0x0008 - Wait 0x003c - Jump script_0800BFA4 - .2byte 0x0000 -SCRIPT_START script_0800BF70 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 - EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -29,20 +13,20 @@ SCRIPT_START script_0800BF70 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800BFA4: _0807EB44 0x0004 script_0800BFA8: CheckRoomFlag 0x00ff JumpIfNot script_0800BFA8 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e12 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc similarity index 55% rename from data/scripts/script_0800C0B0.inc rename to data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc index e02b5368..c82afd3a 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone5.inc @@ -1,27 +1,11 @@ -SCRIPT_START script_0800C0B0 +@ 2nd, 3rd and 4th Goron during 5th Goron cutscene +SCRIPT_START script_Goron2Kinstone5 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 - Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 - Wait 0x003c - MessageNoOverlap 0x0e13 - WaitUntilTextboxCloses - _0807E930 0x0008 - Wait 0x003c - Jump script_0800C11C - .2byte 0x0000 -SCRIPT_START script_0800C0E8 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 - EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -29,20 +13,20 @@ SCRIPT_START script_0800C0E8 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800C11C: _0807EB44 0x0004 script_0800C120: CheckRoomFlag 0x00ff JumpIfNot script_0800C120 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e15 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc similarity index 60% rename from data/scripts/script_0800C1D8.inc rename to data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc index 0d78bf42..87a5b960 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/kinstoneFusion/script_Goron2Kinstone6.inc @@ -1,27 +1,11 @@ -SCRIPT_START script_0800C1D8 +@ 2nd to 5th Goron in 6th Goron cutscene +SCRIPT_START script_Goron2Kinstone6 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 Call sub_0807F348 EndBlock - WaitFor_2 - Wait 0x00f0 - _0807E930 0x0000 - _0807EB44 0x0002 - Wait 0x003c - MessageNoOverlap 0x0e16 - WaitUntilTextboxCloses - _0807E930 0x0008 - Wait 0x003c - Jump script_0800C244 - .2byte 0x0000 -SCRIPT_START script_0800C210 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0807F348 - EndBlock - WaitFor_2 + WaitForFadeFinish Wait 0x00f0 _0807E930 0x0000 _0807EB44 0x0006 @@ -29,20 +13,20 @@ SCRIPT_START script_0800C210 WaitUntilTextboxCloses _0807E930 0x0008 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 script_0800C244: _0807EB44 0x0004 script_0800C248: CheckRoomFlag 0x00ff JumpIfNot script_0800C248 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 _0807E930 0x0000 DoPostScriptAction 0x0004 Wait 0x003c MessageNoOverlap 0x0e18 WaitUntilTextboxCloses - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_08054F64 DoPostScriptAction 0x000f _0807E930 0x0008 diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc similarity index 67% rename from data/scripts/script_0800BECC.inc rename to data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc index e16b42dd..fc4e637f 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/kinstoneFusion/script_Goron3Kinstone3.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BECC +@ 3rd Goron during 3rd Goron cutscene +SCRIPT_START script_Goron3Kinstone3 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 @@ -6,18 +7,18 @@ SCRIPT_START script_0800BECC SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e MessageNoOverlap 0x0e0e WaitUntilTextboxCloses - _0807E5F8 0x0000000c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000000c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0178 Wait 0x000f - _0807E5F8 0x0000000c + SetSyncFlag 0x0000000c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/script_0800C004.inc b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc similarity index 74% rename from data/scripts/script_0800C004.inc rename to data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc index 46d7e104..9d81f728 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/kinstoneFusion/script_Goron4Kinstone4.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C004 +@ 4th Goron during 4th Goron cutscene +SCRIPT_START script_Goron4Kinstone4 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 @@ -6,20 +7,20 @@ SCRIPT_START script_0800C004 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x000001b8 Wait 0x001e MessageNoOverlap 0x0e11 WaitUntilTextboxCloses - _0807E5F8 0x0000001c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000001c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0088, 0x0188 _0807EDD4 0x00a8, 0x0188 _0807EDD4 0x00a8, 0x0178 Wait 0x000f - _0807E5F8 0x0000001c + SetSyncFlag 0x0000001c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -29,7 +30,7 @@ SCRIPT_START script_0800C004 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x0000001c + SetSyncFlag 0x0000001c SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/script_0800C160.inc b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc similarity index 70% rename from data/scripts/script_0800C160.inc rename to data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc index 3fa4ab2c..7f86fcd3 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/kinstoneFusion/script_Goron5Kinstone5.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C160 +@ 5th Goron during 5th Goron cutscene +SCRIPT_START script_Goron5Kinstone5 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 @@ -6,20 +7,20 @@ SCRIPT_START script_0800C160 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e MessageNoOverlap 0x0e14 WaitUntilTextboxCloses - _0807E5F8 0x0000003c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000003c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00a8, 0x00e8 _0807EDD4 0x00a8, 0x00d8 Wait 0x000f - _0807E5F8 0x0000003c + SetSyncFlag 0x0000003c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00f0 diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc similarity index 74% rename from data/scripts/script_0800C2A4.inc rename to data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc index 5c40fc25..54967407 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/kinstoneFusion/script_Goron6Kindstone6.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C2A4 +@ 6th Goron in 6th Goron cutscene +SCRIPT_START script_Goron6Kindstone6 BeginBlock _0807EB44 0x0000 _0807E930 0x0000 @@ -6,20 +7,20 @@ SCRIPT_START script_0800C2A4 SetEntitySpeed 0x0080 Call sub_0807F348 EndBlock - WaitForSomething2 0x00000002 + WaitForSyncFlagAndClear 0x00000002 DoPostScriptAction 0x0007 CallWithArg sub_0807F4F8, 0x00000128 Wait 0x001e MessageNoOverlap 0x0e17 WaitUntilTextboxCloses - _0807E5F8 0x0000007c - WaitForSomething2 0x00000002 + SetSyncFlag 0x0000007c + WaitForSyncFlagAndClear 0x00000002 SetEntitySpeed 0x0100 _0807EDD4 0x0098, 0x00e8 _0807EDD4 0x00c8, 0x00e8 _0807EDD4 0x00c8, 0x00d8 Wait 0x000f - _0807E5F8 0x0000007c + SetSyncFlag 0x0000007c DoPostScriptAction 0x000f _0807E930 0x0008 Wait 0x00b4 @@ -29,7 +30,7 @@ SCRIPT_START script_0800C2A4 _0807EB44 0x0004 _0807E930 0x0000 Wait 0x003c - _0807E5F8 0x0000007c + SetSyncFlag 0x0000007c SetEntitySpeed 0x0080 _0807EEF4 0x0000, 0xffe0 Call sub_08054968 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/kinstoneFusion/script_GoronKinstone.inc similarity index 91% rename from data/scripts/script_0800BC50.inc rename to data/scripts/kinstoneFusion/script_GoronKinstone.inc index 377ff8ef..3c4e7716 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/kinstoneFusion/script_GoronKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BC50 +@ Goron in fusing kinstone cutscene +SCRIPT_START script_GoronKinstone BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc similarity index 78% rename from data/scripts/script_0800BB64.inc rename to data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc index 2e582383..7787515f 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/kinstoneFusion/script_GoronMerchantArriving.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BB64 +@ Goron Merchant in arriving Kinstone cutscene +SCRIPT_START script_GoronMerchantArriving BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/kinstoneFusion/script_MutohKinstone.inc similarity index 79% rename from data/scripts/script_0800BACC.inc rename to data/scripts/kinstoneFusion/script_MutohKinstone.inc index 5195fe1e..ecc3f65b 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/kinstoneFusion/script_MutohKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BACC +@ Hyrule Town Mutoh in Kinstone cutscene +SCRIPT_START script_MutohKinstone BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc similarity index 75% rename from data/scripts/script_0800C45C.inc rename to data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc index c98b696d..bc194636 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSpark.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C45C +@ OBJECT_B3 spark in all fusing kinstone cutscenes +SCRIPT_START script_ObjectB3KinstoneSpark BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 diff --git a/data/scripts/script_0800C494.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc similarity index 72% rename from data/scripts/script_0800C494.inc rename to data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc index 6e278038..6b6cfe46 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkFromBottom.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C494 +@ Hyrule Town OBJECT_B3 Kinstone spark red from bottom +SCRIPT_START script_ObjectB3KinstoneSparkFromBottom BeginBlock SetEntitySpeed 0x0120 _0807E930 0x0004 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc similarity index 68% rename from data/scripts/script_0800C50C.inc rename to data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc index fbb7b440..e6bb438f 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoron.inc @@ -1,10 +1,12 @@ -SCRIPT_START script_0800C50C +@ OBJECT_B3 during Goron cutscene +@ blue from top +SCRIPT_START script_ObjectB3KinstoneSparkGoron BeginBlock SetEntitySpeed 0x0100 _0807E930 0x0004 DoPostScriptAction 0x0008 EndBlock - WaitForSomething2 0x00000001 + WaitForSyncFlagAndClear 0x00000001 Wait 0x000a DoPostScriptAction 0x0007 PlaySound SFX_136 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc similarity index 66% rename from data/scripts/script_0800C4D0.inc rename to data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc index bdd65634..24ef7101 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/kinstoneFusion/script_ObjectB3KinstoneSparkGoronMerchang.inc @@ -1,4 +1,6 @@ -SCRIPT_START script_0800C4D0 +@ OBJECT_B3 in Goron Merchant arriving Kinstone cutscene +@ blue from left to right +SCRIPT_START script_ObjectB3KinstoneSparkGoronMerchang BeginBlock SetEntitySpeed 0x0180 _0807E930 0x0004 diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/kinstoneFusion/script_StampKinstone.inc similarity index 80% rename from data/scripts/script_0800BBA4.inc rename to data/scripts/kinstoneFusion/script_StampKinstone.inc index 76aa8ebe..2e026161 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/kinstoneFusion/script_StampKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BBA4 +@ Hyrule Town Stamp in Kinstone Cutscene +SCRIPT_START script_StampKinstone BeginBlock DoPostScriptAction 0x0007 _0807EB44 0x0004 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/kinstoneFusion/script_SyrupKinstone.inc similarity index 80% rename from data/scripts/script_0800BB00.inc rename to data/scripts/kinstoneFusion/script_SyrupKinstone.inc index 31c1ae72..c76dd55b 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/kinstoneFusion/script_SyrupKinstone.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800BB00 +@ Syrup during Kinstone cutscene +SCRIPT_START script_SyrupKinstone BeginBlock EndBlock script_0800BB04: diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc similarity index 69% rename from data/scripts/script_0800B0AC.inc rename to data/scripts/lakeHylia/script_EzloTalkOcarina.inc index 4fd99865..0846a9a4 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/lakeHylia/script_EzloTalkOcarina.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B0AC +@ Ezlo talk after first ocarina travel +SCRIPT_START script_EzloTalkOcarina EndBlock _0807E864 Call sub_0807FA40 diff --git a/data/scripts/lakeHylia/script_ForestMinish3.inc b/data/scripts/lakeHylia/script_ForestMinish3.inc new file mode 100644 index 00000000..583eeaa9 --- /dev/null +++ b/data/scripts/lakeHylia/script_ForestMinish3.inc @@ -0,0 +1,20 @@ +@ Lake Hylia Forest Minish telling us to go to the library +SCRIPT_START script_ForestMinish3 + BeginBlock + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800C5D6: + BeginBlock + CheckEntityInteractType + JumpIf script_0800C5EA + Call sub_08060158 + EndBlock + Jump script_0800C5D6 +script_0800C5EA: + EndBlock + _0807E864 + Call sub_08060270 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800C5D6 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/lakeHylia/script_KingGustafHologram.inc similarity index 62% rename from data/scripts/script_0801232C.inc rename to data/scripts/lakeHylia/script_KingGustafHologram.inc index 82ed1d1a..66c576f1 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/lakeHylia/script_KingGustafHologram.inc @@ -1,25 +1,5 @@ -SCRIPT_START script_0801232C - BeginBlock - _0807EB74 - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_08012338: - CheckEntityInteractType - JumpIfNot script_08012338 - _0807EB74 - _0807E864 - MessageFromTarget 0x2304 - WaitUntilTextboxCloses - CheckLocalFlag 0x0042 - JumpIf script_0801235A - SetLocalFlag 0x0042 - _0807F034 0x0057 - WaitPlayerGetItem -script_0801235A: - _0807E878 - Jump script_08012338 -SCRIPT_START script_08012360 +@ After ToD King Gustaf +SCRIPT_START script_KingGustafHologram BeginBlock DoPostScriptAction 0x0008 EndBlock @@ -35,7 +15,7 @@ script_08012368: DoFade5 _0807E858 0x0080 EndBlock - WaitFor_2 + WaitForFadeFinish PlayBgm BGM_ELEMENTAL_SANCTUARY _0807EB28 0x1401 WaitUntilTextboxCloses @@ -46,8 +26,8 @@ script_08012368: SetEntity0x20 0xffff8000 Wait 0x003c _0807E8E4_0 - StartPlayerScript script_08012410 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerAfterToD + WaitForSyncFlagAndClear 0x00000001 MessageNoOverlap 0x1402 WaitUntilTextboxCloses StopBgm @@ -59,7 +39,7 @@ script_08012368: DoFade4 _0807E858 0x0080 EndBlock - WaitFor_2 + WaitForFadeFinish PlayBGM _0807EB28 0x1403 WaitUntilTextboxCloses diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/lakeHylia/script_Object69AfterToD.inc similarity index 82% rename from data/scripts/script_0800AFB0.inc rename to data/scripts/lakeHylia/script_Object69AfterToD.inc index 88878bca..2ec33ffe 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/lakeHylia/script_Object69AfterToD.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AFB0 +@ After ToD OBJECT_69 Cutscene +SCRIPT_START script_Object69AfterToD _0807E864 script_0800AFB2: EndBlock diff --git a/data/scripts/script_08012410.inc b/data/scripts/lakeHylia/script_PlayerAfterToD.inc similarity index 62% rename from data/scripts/script_08012410.inc rename to data/scripts/lakeHylia/script_PlayerAfterToD.inc index 82f5c189..8ad9a855 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/lakeHylia/script_PlayerAfterToD.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08012410 +@ Player after ToD +SCRIPT_START script_PlayerAfterToD BeginBlock SetEntitySpeed 0x0080 EndBlock DoPostScriptAction 0x0004 Wait 0x003c - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/lakeHylia/script_ShopwellsDog.inc similarity index 78% rename from data/scripts/script_0800B5C4.inc rename to data/scripts/lakeHylia/script_ShopwellsDog.inc index 30532b5e..fbf22a4f 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/lakeHylia/script_ShopwellsDog.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B5C4 +@ Lake Hylia Dog +SCRIPT_START script_ShopwellsDog BeginBlock SetEntitySpeed 0x0100 _0807EB44 0x0004 diff --git a/data/scripts/lonLonRanch/scriptMalonInside.inc b/data/scripts/lonLonRanch/scriptMalonInside.inc new file mode 100644 index 00000000..6cbe0145 --- /dev/null +++ b/data/scripts/lonLonRanch/scriptMalonInside.inc @@ -0,0 +1,21 @@ +@ Lon Lon Farm Malon in ranch house? +SCRIPT_START scriptMalonInside + BeginBlock + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x000a + EndBlock +script_08014F0C: + CheckEntityInteractType + JumpIfNot script_08014F0C + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + MessageNoOverlap 0x200e + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + _0807E930 0x000a + Jump script_08014F0C + .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_GoronPunching.inc b/data/scripts/lonLonRanch/script_GoronPunching.inc new file mode 100644 index 00000000..77b616b6 --- /dev/null +++ b/data/scripts/lonLonRanch/script_GoronPunching.inc @@ -0,0 +1,42 @@ +@ Lon Lon Ranch Goron punching at cave +SCRIPT_START script_GoronPunching + BeginBlock + _0807E9D4 + Call sub_080694EC + DoPostScriptAction 0x000a + Call sub_080694B0 + EndBlock +script_0800B9CA: + Call sub_0807F434 + JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 +script_0800B9D8: + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + Call sub_080694D8 + WaitUntilTextboxCloses + Call sub_080694EC + _0807E878 + Jump script_0800B9CA +script_0800B9F4: + _0807E864 + _0807EB74 + DoPostScriptAction 0x0000 + Call sub_0807F650 + _0807E9F0 + _0807E864 + Call sub_0806948C + JumpIf script_0800BA24 + WaitUntilTextboxCloses + Call sub_080694EC + Call sub_0807DF50 + _0807E878 + Jump script_0800B9CA +script_0800BA24: + WaitUntilTextboxCloses + _0807E9DC + _0807E9D4 + Call sub_080694EC + Call sub_0807DF50 + _0807E878 + Jump script_0800B9CA diff --git a/data/scripts/script_0800B574.inc b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc similarity index 62% rename from data/scripts/script_0800B574.inc rename to data/scripts/lonLonRanch/script_LonLonRanchDoor.inc index 1170c517..6172c951 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/lonLonRanch/script_LonLonRanchDoor.inc @@ -1,19 +1,20 @@ -SCRIPT_START script_0800B574 +@ Lon Lon Ranch Door +SCRIPT_START script_LonLonRanchDoor BeginBlock DoPostScriptAction 0x0007 CheckGlobalFlag 0x001d JumpIf script_0800B5BC EndBlock - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0008 PlaySound SFX_111 - WaitForSomething2 0x00000010 + WaitForSyncFlagAndClear 0x00000010 DoPostScriptAction 0x0007 PlaySound SFX_111 script_0800B5BC: diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/lonLonRanch/script_MalonLostKey.inc similarity index 78% rename from data/scripts/script_0800B4AC.inc rename to data/scripts/lonLonRanch/script_MalonLostKey.inc index d8d094a2..7298bdca 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/lonLonRanch/script_MalonLostKey.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B4AC +@ Lon Lon Ranch Malon lost key +SCRIPT_START script_MalonLostKey BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0001 @@ -9,7 +10,7 @@ script_0800B4BC: BeginBlock CheckEntityInteractType JumpIf script_0800B4D4 - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIf script_0800B4F0 Jump script_0800B4BC script_0800B4D4: @@ -24,20 +25,20 @@ script_0800B4D4: Jump script_0800B4BC script_0800B4F0: EndBlock - _0807E610 0x00000008 + ClearSyncFlag 0x00000008 _0807EDD4 0x0134, 0x0288 _0807EB44 0x0004 - WaitForSomething2 0x00000008 + WaitForSyncFlagAndClear 0x00000008 MessageFromTarget 0x2016 WaitUntilTextboxCloses _0807EDD4 0x0158, 0x0288 DoPostScriptAction 0x0000 _0807EB44 0x0000 Wait 0x000a - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 DoPostScriptAction 0x0008 Wait 0x001e - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 SetGlobalFlag 0x001d Call sub_0807921C _0807E878 diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc similarity index 52% rename from data/scripts/script_0800B54C.inc rename to data/scripts/lonLonRanch/script_PlayerGiveKey.inc index 2b50271b..2034cd11 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/lonLonRanch/script_PlayerGiveKey.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B54C +@ Player at Lon Lon Ranch give key +SCRIPT_START script_PlayerGiveKey BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_0800B54C Wait 0x000a _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 SCRIPT_END diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/lonLonRanch/script_TalonGotKey.inc similarity index 69% rename from data/scripts/script_0800B41C.inc rename to data/scripts/lonLonRanch/script_TalonGotKey.inc index edc7331b..1fb43ad5 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/lonLonRanch/script_TalonGotKey.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B41C +@ Lon Lon Ranch Talon you have the key +SCRIPT_START script_TalonGotKey BeginBlock SetEntitySpeed 0x00c0 _0807E908 0x0001 @@ -8,11 +9,11 @@ SCRIPT_START script_0800B41C EndBlock Wait 0x000a DoPostScriptAction 0x0004 - _0807E5F8 0x00000008 - StartPlayerScript script_0800B54C + SetSyncFlag 0x00000008 + StartPlayerScript script_PlayerGiveKey _0807EDD4 0x0140, 0x0298 _0807EB74 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807EB74 Wait 0x003c PlaySound SFX_TASK_COMPLETE @@ -26,11 +27,11 @@ SCRIPT_START script_0800B41C Wait 0x000a _0807EDD4 0x0158, 0x0288 Wait 0x0014 - _0807E5F8 0x00000010 + SetSyncFlag 0x00000010 _0807EDD4 0x0158, 0x0280 Wait 0x000a DoPostScriptAction 0x0008 - _0807E5F8 0x00000010 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000010 + SetSyncFlag 0x00000008 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/lonLonRanch/script_TalonInside.inc b/data/scripts/lonLonRanch/script_TalonInside.inc new file mode 100644 index 00000000..71485a34 --- /dev/null +++ b/data/scripts/lonLonRanch/script_TalonInside.inc @@ -0,0 +1,37 @@ +@ Lon Lon Farm Talon in ranch house? +SCRIPT_START script_TalonInside + BeginBlock + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_08014E64: + CheckEntityInteractType + JumpIfNot script_08014E64 + _0807E864 + Call sub_0807DF28 + _0807EB74 + CallWithArg sub_0807F78C, 0x00000022 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08014EBC + CallWithArg sub_0807F7C4, 0x00000022 + JumpIfNot script_08014EB0 + CheckBottleContaining 0x0020 + JumpIfNot script_08014EB8 + CallWithArg sub_0807F800, 0x00000022 + WaitPlayerGetItem + MessageNoOverlap 0x0a04 + Jump script_08014EBC +script_08014EB0: + MessageNoOverlap 0x0a03 + Jump script_08014EBC +script_08014EB8: + MessageNoOverlap 0x0a02 +script_08014EBC: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_08014E64 + .2byte 0x0000 diff --git a/data/scripts/lonLonRanch/script_TalonInside2.inc b/data/scripts/lonLonRanch/script_TalonInside2.inc new file mode 100644 index 00000000..ff3fcf53 --- /dev/null +++ b/data/scripts/lonLonRanch/script_TalonInside2.inc @@ -0,0 +1,18 @@ +@ Lon Lon Ranch Talon inside +SCRIPT_START script_TalonInside2 + BeginBlock + DoPostScriptAction 0x000a + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_08014EE0: + CheckEntityInteractType + JumpIfNot script_08014EE0 + _0807E864 + _0807EB74 + MessageNoOverlap 0x200d + WaitUntilTextboxCloses + _0807E878 + Jump script_08014EE0 + .2byte 0x0000 diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/lonLonRanch/script_TalonLostKey.inc similarity index 88% rename from data/scripts/script_0800B3A4.inc rename to data/scripts/lonLonRanch/script_TalonLostKey.inc index 4347fbfc..244d7435 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/lonLonRanch/script_TalonLostKey.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B3A4 +@ Lon Lon Ranch Talon lost key +SCRIPT_START script_TalonLostKey BeginBlock DoPostScriptAction 0x000a Call sub_0807F158 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/minishWoods/script_08012C98.inc similarity index 62% rename from data/scripts/script_08012C68.inc rename to data/scripts/minishWoods/script_08012C98.inc index c63f591e..64ddd7ac 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/minishWoods/script_08012C98.inc @@ -1,21 +1,5 @@ -SCRIPT_START script_08012C68 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x0008 - SetIntVariable 0x00000000 - Call sub_0806DA04 - EndBlock -script_08012C7E: - CheckEntityInteractType - JumpIfNot script_08012C7E - _0807E864 - _0807E8E4_0 - MessageFromTarget 0x111d - WaitUntilTextboxCloses - SetGlobalFlag 0x0022 - _0807E878 - Jump script_08012C7E - +@ Minish Woods OBJECT_69 ? +@ Ezlo Trigger to explain how portals work SCRIPT_START script_08012C98 CheckGlobalFlag 0x0014 JumpIfNot script_08012C98 diff --git a/data/scripts/script_08012D18.inc b/data/scripts/minishWoods/script_08012D18.inc similarity index 80% rename from data/scripts/script_08012D18.inc rename to data/scripts/minishWoods/script_08012D18.inc index 206fd304..9b8be5cf 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/minishWoods/script_08012D18.inc @@ -1,3 +1,4 @@ +@ Minish Woods OBJECT_69 2? SCRIPT_START script_08012D18 EndBlock BeginBlock @@ -13,8 +14,8 @@ SCRIPT_START script_08012D18 Call sub_0807DF28 _0807EB28 0x111a WaitUntilTextboxCloses - StartPlayerScript script_08010A38 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerCannotEnter + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08012D18 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/minishWoods/script_BombMinish.inc similarity index 88% rename from data/scripts/script_08009F14.inc rename to data/scripts/minishWoods/script_BombMinish.inc index 16130637..7a57205d 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/minishWoods/script_BombMinish.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009F14 +@ Minish Woods Bomb Minish +SCRIPT_START script_BombMinish BeginBlock _0807EB44 0x0004 Call sub_08060090 @@ -18,13 +19,13 @@ script_08009F36: _0807E864 Call sub_0807DF28 DoPostScriptAction 0x000b - StartPlayerScript script_0800A088 - WaitForSomething2 0x00000002 + StartPlayerScript script_PlayerAtBombMinish + WaitForSyncFlagAndClear 0x00000002 Call sub_0806014C MessageFromTargetPos 0x1f01, 0x0000 WaitUntilTextboxCloses Wait 0x001e - _0807F034 0x0065 + GivePlayerItem 0x0065 WaitPlayerGetItem DoPostScriptAction 0x000a Call sub_0807DF50 @@ -66,13 +67,13 @@ script_08009FDC: _0807E864 MessageNoOverlap 0x1f0e WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A002 _0807E878 Jump script_08009FDC script_0800A002: Wait 0x0008 - _0807F034 0x0008 + GivePlayerItem 0x0008 Call sub_08060318 WaitPlayerGetItem Wait 0x0008 @@ -93,20 +94,20 @@ script_0800A024: JumpIf script_0800A052 MessageNoOverlap 0x1f14 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A002 _0807E878 Jump script_0800A024 script_0800A052: MessageNoOverlap 0x1f11 WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIf script_0800A064 _0807E878 Jump script_0800A024 script_0800A064: Wait 0x0008 - _0807F034 0x0007 + GivePlayerItem 0x0007 Call sub_08060318 WaitPlayerGetItem Wait 0x0008 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/minishWoods/script_EzloTalkDWS.inc similarity index 68% rename from data/scripts/script_0800AF44.inc rename to data/scripts/minishWoods/script_EzloTalkDWS.inc index 8ff3f94a..942b81bf 100644 --- a/data/scripts/script_0800AF44.inc +++ b/data/scripts/minishWoods/script_EzloTalkDWS.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AF44 +@ Minish Woods Ezlo talks after finishing earth temple +SCRIPT_START script_EzloTalkDWS _0807E864 Call sub_0807DF28 _0807EB28 0x1c01 diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc similarity index 66% rename from data/scripts/script_08012CD8.inc rename to data/scripts/minishWoods/script_EzloTalkMinishPortal.inc index 1d6bda91..b97e943e 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/minishWoods/script_EzloTalkMinishPortal.inc @@ -1,12 +1,13 @@ -SCRIPT_START script_08012CD8 +@ Minish Woods Ezlo Talks after exiting portal for the first time +SCRIPT_START script_EzloTalkMinishPortal EndBlock BeginBlock _0807E564 - JumpIfNot script_08012CD8 + JumpIfNot script_EzloTalkMinishPortal CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 - JumpIfNot script_08012CD8 + JumpIfNot script_EzloTalkMinishPortal ComparePlayerAction 0x0015 - JumpIf script_08012CD8 + JumpIf script_EzloTalkMinishPortal _0807E864 Call sub_0807DF28 EndBlock diff --git a/data/scripts/minishWoods/script_Festari.inc b/data/scripts/minishWoods/script_Festari.inc new file mode 100644 index 00000000..ebaca487 --- /dev/null +++ b/data/scripts/minishWoods/script_Festari.inc @@ -0,0 +1,93 @@ +@ Festari at beginning +SCRIPT_START script_Festari + BeginBlock + DoPostScriptAction 0x000a + SetEntitySpeed 0x0080 + _0807EB44 0x0004 + CheckLocalFlag 0x0082 + JumpIfNot script_0800C650 + OffsetEntityPosition 0x0010, 0x0000 +script_0800C650: + EndBlock +script_0800C652: + _0807E944 + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x0082 + JumpIf script_0800C684 + CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 + JumpIfNot script_0800C674 + DoPostScriptAction 0x000b +script_0800C674: + StartPlayerScript script_PlayerAtFestari + WaitForSyncFlagAndClear 0x00000001 + DoPostScriptAction 0x000a +script_0800C684: + CheckInventory1 0x0040 + JumpIf script_0800C730 + CheckInventory1 0x005b + JumpIf script_0800C6B6 + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f16 + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + SetLocalFlag 0x0080 + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C6B6: + CheckLocalFlag 0x0081 + JumpIf script_0800C6DC + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f1b + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C6DC: + CheckLocalFlag 0x0082 + JumpIf script_0800C712 + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f17 + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + _0807EB44 0x0002 + DoPostScriptAction 0x0001 + _0807EC94 0x0020 + _0807EB44 0x0004 + Wait 0x000f + PlaySound SFX_SECRET + SetLocalFlag 0x0082 +script_0800C712: + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f18 + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C730: + CheckLocalFlag 0x0083 + JumpIf script_0800C756 + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f19 + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C756: + DoPostScriptAction 0x0002 + MessageFromTarget 0x1f1a + WaitUntilTextboxCloses + DoPostScriptAction 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 diff --git a/data/scripts/minishWoods/script_ForestMinish10.inc b/data/scripts/minishWoods/script_ForestMinish10.inc new file mode 100644 index 00000000..cc7dfc2e --- /dev/null +++ b/data/scripts/minishWoods/script_ForestMinish10.inc @@ -0,0 +1,148 @@ +@ Minish Village ForestMinish at the back of the pico flowers +SCRIPT_START script_ForestMinish10 + BeginBlock + CheckInventory1 0x005b + JumpIfNot script_0800C5FE + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800CD92: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800CDA6 + Call sub_08060158 + Jump script_0800CD92 +script_0800CDA6: + EndBlock + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x009d + JumpIf script_0800CDC4 + SetLocalFlag 0x009d + MessageNoOverlap 0x213d + Jump script_0800CF40 +script_0800CDC4: + CheckGlobalFlag 0x003b + JumpIf script_0800CE46 + CheckGlobalFlag 0x0054 + JumpIfNot script_0800CDEC + CheckRoomFlag 0x0000 + JumpIfNot script_0800CF2A + SetGlobalFlag 0x003b + ClearGlobalFlag 0x0054 + MessageNoOverlap 0x2141 + Jump script_0800CF40 +script_0800CDEC: + MessageNoOverlap 0x213e + WaitUntilTextboxCloses + CheckBottleContaining 0x0023 + JumpIfNot script_0800CE14 + MessageNoOverlap 0x214b + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0800CF40 + PlaySound SFX_TASK_COMPLETE + _0807F088 0x0023 + WaitPlayerGetItem + Jump script_0800CE32 +script_0800CE14: + CheckBottleContaining 0x0022 + JumpIfNot script_0800CF40 + MessageNoOverlap 0x214b + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0800CF40 + PlaySound SFX_TASK_COMPLETE + _0807F088 0x0022 + WaitPlayerGetItem +script_0800CE32: + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + MessageNoOverlap 0x213f + Jump script_0800CF02 +script_0800CE46: + CheckGlobalFlag 0x003c + JumpIf script_0800CEA6 + CheckGlobalFlag 0x0054 + JumpIfNot script_0800CE6E + CheckRoomFlag 0x0000 + JumpIfNot script_0800CF2A + SetGlobalFlag 0x003c + ClearGlobalFlag 0x0054 + MessageNoOverlap 0x2145 + Jump script_0800CF40 +script_0800CE6E: + MessageNoOverlap 0x2142 + WaitUntilTextboxCloses + CheckBottleContaining 0x0027 + JumpIfNot script_0800CF40 + MessageNoOverlap 0x214c + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0800CF40 + PlaySound SFX_TASK_COMPLETE + _0807F088 0x0027 + WaitPlayerGetItem + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + MessageNoOverlap 0x2143 + Jump script_0800CF02 +script_0800CEA6: + CheckGlobalFlag 0x003d + JumpIf script_0800CF3C + CheckGlobalFlag 0x0054 + JumpIfNot script_0800CECE + CheckRoomFlag 0x0000 + JumpIfNot script_0800CF2A + SetGlobalFlag 0x003d + ClearGlobalFlag 0x0054 + MessageNoOverlap 0x2149 + Jump script_0800CF40 +script_0800CECE: + MessageNoOverlap 0x2146 + WaitUntilTextboxCloses + CheckBottleContaining 0x0024 + JumpIfNot script_0800CF40 + MessageNoOverlap 0x214d + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_0800CF40 + PlaySound SFX_TASK_COMPLETE + _0807F088 0x0024 + WaitPlayerGetItem + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + MessageNoOverlap 0x2147 +script_0800CF02: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 +script_0800CF0C: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_0800CF20 + Call sub_08060158 + Jump script_0800CF0C +script_0800CF20: + EndBlock + _0807E864 + Call sub_0807DF28 +script_0800CF2A: + MessageNoOverlap 0x2140 + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_0800CF0C +script_0800CF3C: + MessageNoOverlap 0x214a +script_0800CF40: + WaitUntilTextboxCloses + Call sub_0807DF50 + _0807E878 + Jump script_0800CD92 + .2byte 0x0000 diff --git a/data/scripts/minishWoods/script_ForestMinish4.inc b/data/scripts/minishWoods/script_ForestMinish4.inc new file mode 100644 index 00000000..792f37d0 --- /dev/null +++ b/data/scripts/minishWoods/script_ForestMinish4.inc @@ -0,0 +1,22 @@ +@ Minish Village Forest Minish +SCRIPT_START script_ForestMinish4 + BeginBlock +script_0800C5FE: + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800C60A: + BeginBlock + CheckEntityInteractType + JumpIf script_0800C61E + Call sub_08060158 + EndBlock + Jump script_0800C60A +script_0800C61E: + EndBlock + _0807E864 + Call sub_0806021C + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800C60A diff --git a/data/scripts/minishWoods/script_Gentari.inc b/data/scripts/minishWoods/script_Gentari.inc new file mode 100644 index 00000000..4d7c8507 --- /dev/null +++ b/data/scripts/minishWoods/script_Gentari.inc @@ -0,0 +1,99 @@ +@ Gentari at beginning +SCRIPT_START script_Gentari + BeginBlock + DoPostScriptAction 0x000a + _0807EB44 0x0004 + EndBlock +script_0800C780: + _0807E944 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtGentari + WaitForSyncFlagAndClear 0x00000001 + CheckInventory1 0x0040 + JumpIf script_0800C824 + CheckInventory1 0x005b + JumpIf script_0800C7C0 + _0807E930 0x0008 + MessageFromTarget 0x2122 + WaitUntilTextboxCloses + DoPostScriptAction 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C7C0: + _0807E930 0x0008 + CheckLocalFlag 0x0081 + JumpIf script_0800C80A + MessageFromTarget 0x1130 + WaitUntilTextboxCloses + _0807EB28 0x1131 + WaitUntilTextboxCloses + _0807EB8C + MessageFromTarget 0x1132 + WaitUntilTextboxCloses + SetIntVariable 0x00000103 + Call sub_0807F420 + MessageFromTarget 0x1133 + WaitUntilTextboxCloses + Wait 0x000a + DoPostScriptAction 0x0000 + SetLocalFlag 0x0081 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C80A: + MessageFromTarget 0x1133 + WaitUntilTextboxCloses + Wait 0x000a + _0807E930 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C824: + _0807E930 0x0008 + CheckLocalFlag 0x0083 + JumpIf script_0800C8AE + MessageFromTarget 0x1135 + WaitUntilTextboxCloses + SetEntitySpeed 0x0040 + _0807EDD4 0x0038, 0x0044 + DoPostScriptAction 0x0000 + Wait 0x000f + SetLocalFlag 0x0083 + Wait 0x003c + PlaySound SFX_SECRET + Wait 0x003c + _0807EB74 + _0807EB8C + MessageFromTarget 0x1136 + WaitUntilTextboxCloses + _0807EB28 0x1137 + WaitUntilTextboxCloses + Wait 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Call sub_0807DF50 + _0807E878 +script_0800C87C: + _0807E944 + _0807E864 + Call sub_0807DF28 + _0807EB74 + SetIntVariable 0x00000008 + Call sub_0807F3D8 + MessageFromTarget 0x1136 + WaitUntilTextboxCloses + Wait 0x000a + DoPostScriptAction 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C87C +script_0800C8AE: + MessageFromTarget 0x1136 + WaitUntilTextboxCloses + Wait 0x000a + DoPostScriptAction 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 diff --git a/data/scripts/minishWoods/script_Object69PotionBlue.inc b/data/scripts/minishWoods/script_Object69PotionBlue.inc new file mode 100644 index 00000000..365530bf --- /dev/null +++ b/data/scripts/minishWoods/script_Object69PotionBlue.inc @@ -0,0 +1,30 @@ +@ Syrup OBJECT_69 Potion +SCRIPT_START script_Object69PotionBlue + BeginBlock + Call sub_080787B4 + EndBlock +script_08016146: + CheckEntityInteractType + JumpIfNot script_08016146 + _0807E864 + GetInventoryValue 0x0025 + MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 + CheckTextboxResult + JumpIfNot script_0801618A + CheckBottleContaining 0x0020 + JumpIf script_08016172 + MessageFromTarget 0x2d0c + Jump script_0801618A +script_08016172: + BuyItem 0x0025, 0x0000 + JumpIf script_08016184 + MessageFromTarget 0x2d0b + Jump script_0801618A +script_08016184: + WaitPlayerGetItem + MessageFromTarget 0x2d06 +script_0801618A: + _0807E878 + Jump script_08016146 + .align 2, 0 + diff --git a/data/scripts/minishWoods/script_Object69PotionRed.inc b/data/scripts/minishWoods/script_Object69PotionRed.inc new file mode 100644 index 00000000..6e3ed4a2 --- /dev/null +++ b/data/scripts/minishWoods/script_Object69PotionRed.inc @@ -0,0 +1,36 @@ +@ OBJECT_69 in witch hut? +SCRIPT_START script_Object69PotionRed + BeginBlock + Call sub_080787B4 + EndBlock +script_0801619A: + CheckEntityInteractType + JumpIfNot script_0801619A + _0807E864 + GetInventoryValue 0x0024 + MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 + CheckTextboxResult + JumpIfNot script_080161E2 + CheckBottleContaining 0x0020 + JumpIf script_080161C6 + MessageFromTarget 0x2d0c + Jump script_080161E2 +script_080161C6: + BuyItem 0x0024, 0x0000 + JumpIf script_080161D8 + MessageFromTarget 0x2d0b + Jump script_080161E2 +script_080161D8: +.ifndef EU + WaitPlayerGetItem + WaitUntilTextboxCloses + _0807EB8C + MessageNoOverlap 0x2d06 +.else + MessageFromTarget 0x2d06 +.endif +script_080161E2: + _0807E878 + Jump script_0801619A + .align 2, 0 + diff --git a/data/scripts/script_0800A088.inc b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc similarity index 63% rename from data/scripts/script_0800A088.inc rename to data/scripts/minishWoods/script_PlayerAtBombMinish.inc index 4103d535..8d5d71c9 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/minishWoods/script_PlayerAtBombMinish.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A088 +@ Minish Woods Player at Bomb Minish +SCRIPT_START script_PlayerAtBombMinish BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -7,6 +8,6 @@ SCRIPT_START script_0800A088 _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/minishWoods/script_PlayerAtFestari.inc similarity index 66% rename from data/scripts/script_0800C8C8.inc rename to data/scripts/minishWoods/script_PlayerAtFestari.inc index ed1e9998..3f69b969 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/minishWoods/script_PlayerAtFestari.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C8C8 +@ Player at Festari +SCRIPT_START script_PlayerAtFestari BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_0800C8C8 _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/minishWoods/script_PlayerAtGentari.inc similarity index 68% rename from data/scripts/script_0800C8F0.inc rename to data/scripts/minishWoods/script_PlayerAtGentari.inc index c39b1353..f53f6f0e 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/minishWoods/script_PlayerAtGentari.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800C8F0 +@ Player at Gentari +SCRIPT_START script_PlayerAtGentari BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -7,6 +8,6 @@ SCRIPT_START script_0800C8F0 _0807EB44 0x0000 Wait 0x000f DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800E684.inc b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc similarity index 64% rename from data/scripts/script_0800E684.inc rename to data/scripts/minishWoods/script_PlayerAtMadderpillar.inc index 428f2ece..8a0c171a 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/minishWoods/script_PlayerAtMadderpillar.inc @@ -1,4 +1,6 @@ -SCRIPT_START script_0800E684 +@ DWS Player entering Madderpiller fight +@ also DHC Player entering a Dark Nut fight +SCRIPT_START script_PlayerAtMadderpillar BeginBlock SetEntitySpeed 0x0140 SetEntityDirection 0x0018 diff --git a/data/scripts/minishWoods/script_Syrup.inc b/data/scripts/minishWoods/script_Syrup.inc new file mode 100644 index 00000000..332de656 --- /dev/null +++ b/data/scripts/minishWoods/script_Syrup.inc @@ -0,0 +1,60 @@ +@ Syrup +SCRIPT_START script_Syrup + BeginBlock + _0807E9D4 + _0807E930 0x0008 +script_080160B0: + EndBlock + BeginBlock + CheckEntityInteractType + JumpIf script_080160E0 + CheckSyncFlagAndClear 0x00000008 + JumpIf script_080160D2 + CheckSyncFlagAndClear 0x00000010 + JumpIf script_080160D2 + Jump script_080160B0 +script_080160D2: + EndBlock + _0807EB74 + WaitForSyncFlagAndClear 0x00000004 + Jump script_080160B0 +script_080160E0: + _0807E864 + _0807EB74 + EndBlock + HasRoomItemForSale + JumpIfNot script_0801611A + MessageFromTarget 0x2d07 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08016132 + BuyItem 0x0000, 0x0000 + JumpIf script_0801610C + MessageFromTarget 0x2d0b + WaitUntilTextboxCloses + Jump script_08016132 +script_0801610C: + WaitPlayerGetItem +.ifndef EU + _0807EB8C + MessageFromTarget 0x2d0d +.else + MessageFromTarget 0x2d08 +.endif + WaitUntilTextboxCloses + Jump script_08016132 +script_0801611A: + CheckKinstoneFused 0x0014 + JumpIfNot script_0801612C + MessageFromTarget 0x2d09 + WaitUntilTextboxCloses + Jump script_08016132 +script_0801612C: + MessageFromTarget 0x2d01 + WaitUntilTextboxCloses +script_08016132: + _0807E878 + _0807EB44 0x0004 + Jump script_080160B0 + .align 2, 0 + diff --git a/data/scripts/mtCrenel/script_CrenelHermit.inc b/data/scripts/mtCrenel/script_CrenelHermit.inc new file mode 100644 index 00000000..9a05a3cf --- /dev/null +++ b/data/scripts/mtCrenel/script_CrenelHermit.inc @@ -0,0 +1,19 @@ +@ Crenel Hermit +SCRIPT_START script_CrenelHermit + BeginBlock + Call sub_08061E70 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + EndBlock +script_0800B8FC: + CheckEntityInteractType + JumpIfNot script_0800B8FC + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800B8FC + .2byte 0x0000 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/mtCrenel/script_EzloTalkCoF.inc similarity index 72% rename from data/scripts/script_0800AF68.inc rename to data/scripts/mtCrenel/script_EzloTalkCoF.inc index e9ae8510..bfc736fb 100644 --- a/data/scripts/script_0800AF68.inc +++ b/data/scripts/mtCrenel/script_EzloTalkCoF.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AF68 +@ Mountain Ezlo text after beating CoF +SCRIPT_START script_EzloTalkCoF _0807E864 Call sub_0807DF28 _0807EB28 0x1c02 diff --git a/data/scripts/mtCrenel/script_GreatFairyBombs.inc b/data/scripts/mtCrenel/script_GreatFairyBombs.inc new file mode 100644 index 00000000..e25eb65f --- /dev/null +++ b/data/scripts/mtCrenel/script_GreatFairyBombs.inc @@ -0,0 +1,42 @@ +@ Mountain Great Fairy OBJECT_69 +SCRIPT_START script_GreatFairyBombs + BeginBlock + EndBlock +script_0800B734: + Call sub_0808747C + JumpIfNot script_0800B734 + Call sub_08079184 + _0807E864 + Wait 0x000a + Call sub_0807F9A4 + StartPlayerScript script_PlayerAtGreatFairy + WaitForSyncFlagAndClear 0x00000004 + SetRoomFlag 0x0000 + WaitForSyncFlagAndClear 0x00000004 + CheckLocalFlag 0x00a0 + JumpIf script_0800B7A2 + MessageNoOverlap 0x0580 + WaitUntilTextboxCloses + CallWithArg sub_0807F970, 0x00000582 + JumpIf script_0800B794 + CallWithArg sub_08087424, 0x00000001 + Wait 0x00b4 + Jump script_0800B6A6 +script_0800B794: + WaitUntilTextboxCloses + SetLocalFlag 0x00a0 + GivePlayerItem 0x0065 + Jump script_0800B698 +script_0800B7A2: + MessageNoOverlap 0x0590 + WaitUntilTextboxCloses + _0807E778 0x0010 + DoFade7 + WaitForFadeFinish + ModHealth 0x00a0 + DoFade6 + WaitForFadeFinish + MessageNoOverlap 0x057f + WaitUntilTextboxCloses + Jump script_0800B6A6 + .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_Melari.inc b/data/scripts/mtCrenel/script_Melari.inc new file mode 100644 index 00000000..ccf1c55a --- /dev/null +++ b/data/scripts/mtCrenel/script_Melari.inc @@ -0,0 +1,117 @@ +@ Mines Melari +SCRIPT_START script_Melari + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock + CheckInventory1 0x0041 + JumpIf script_0800CFD2 + CheckLocalFlag 0x007e + JumpIfNot script_0800CFD2 + _0807E930 0x0008 +script_0800CFD2: + CheckInventory1 0x0002 + JumpIf script_0800CFFA + CheckInventory1 0x0041 + JumpIfNot script_0800CFEC + SetSyncFlag 0x00000020 + Jump script_0800CFFA +script_0800CFEC: + CheckLocalFlag 0x007e + JumpIfNot script_0800CFFA + SetSyncFlag 0x00000010 +script_0800CFFA: + EndBlock + BeginBlock + Call sub_08068910 + CheckEntityInteractType + JumpIfNot script_0800CFFA + EndBlock + _0807E864 + Call sub_0807DF28 + CheckInventory1 0x0002 + JumpIfNot script_0800D032 + _0807EB74 + SetIntVariable 0x00000000 + Call sub_0806C028 + MessageNoOverlap 0x1219 + Jump script_0800D17C +script_0800D032: + CheckInventory1 0x0041 + JumpIfNot script_0800D098 + StartPlayerScript script_PlayerAtMelari + WaitForSyncFlagAndClear 0x00000008 + _0807EB74 + SetIntVariable 0x00000000 + Call sub_0806C028 + MessageFromTargetPos 0x125c, 0x0002 + WaitUntilTextboxCloses + StartPlayerScript script_PlayerPlaceBrokenSword + WaitForSyncFlagAndClear 0x00000008 + _0807EB44 0x0002 + SetIntVariable 0x00000000 + Call sub_0806C028 + Wait 0x000f + SetSyncFlag 0x00000020 + StartPlayerScript script_PlayerGetWhiteSword + WaitForSyncFlagAndClear 0x00000008 + MessageFromTargetPos 0x125d, 0x0002 + Jump script_0800D17C +script_0800D098: + CheckLocalFlag 0x007e + JumpIfNot script_0800D0A8 + MessageFromTarget 0x123e + Jump script_0800D17C +script_0800D0A8: + StartPlayerScript script_PlayerAtMelari + WaitForSyncFlagAndClear 0x00000008 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + _0807EB74 + SetIntVariable 0x00000000 + Call sub_0806C028 + MessageFromTargetPos 0x123d, 0x0002 + WaitUntilTextboxCloses + StartPlayerScript script_PlayerPlaceBrokenSword + WaitForSyncFlagAndClear 0x00000008 + _0807EB44 0x0002 + SetIntVariable 0x00000000 + Call sub_0806C028 + PlaySound SFX_TASK_COMPLETE + Call sub_08068964 +script_0800D108: + ComparePlayerAction 0x0008 + JumpIf script_0800D108 + PlaySound SFX_F8 + SetSyncFlag 0x00000010 + SetLocalFlag 0x007e + MessageFromTargetPos 0x123e, 0x0002 + WaitUntilTextboxCloses + Wait 0x000f + _0807E930 0x0009 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000004 + Wait 0x001e + MessageFromTargetPos 0x123f, 0x0002 + WaitUntilTextboxCloses + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + SetSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000004 + _0807E930 0x0008 + Wait 0x003c + Call sub_08095164 + _0807EB28 0x1240 +script_0800D17C: + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Call sub_0807DF50 + Jump script_0800CFFA + .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_MelariInRoom.inc b/data/scripts/mtCrenel/script_MelariInRoom.inc new file mode 100644 index 00000000..255d95e6 --- /dev/null +++ b/data/scripts/mtCrenel/script_MelariInRoom.inc @@ -0,0 +1,24 @@ +@ Mines Melari in his room +SCRIPT_START script_MelariInRoom + BeginBlock + Call sub_08068884 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock +script_0800D31E: + EndBlock + BeginBlock + Call sub_08068910 + CheckEntityInteractType + JumpIfNot script_0800D31E + EndBlock + _0807E864 + _0807EB74 + SetIntVariable 0x00000000 + Call sub_0806C028 + MessageFromTarget 0x1219 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800D31E diff --git a/data/scripts/mtCrenel/script_MountainMinish1.inc b/data/scripts/mtCrenel/script_MountainMinish1.inc new file mode 100644 index 00000000..ef7567fc --- /dev/null +++ b/data/scripts/mtCrenel/script_MountainMinish1.inc @@ -0,0 +1,21 @@ +@ Mines Mountain Minish before beds +SCRIPT_START script_MountainMinish1 + BeginBlock + Call sub_08068104 + DoPostScriptAction 0x000a + EndBlock +script_0800CF5E: + BeginBlock + CheckEntityInteractType + JumpIf script_0800CF72 + Call sub_0806811C + EndBlock + Jump script_0800CF5E +script_0800CF72: + EndBlock + _0807E864 + Call sub_08068190 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800CF5E diff --git a/data/scripts/mtCrenel/script_MountainMinish2.inc b/data/scripts/mtCrenel/script_MountainMinish2.inc new file mode 100644 index 00000000..ff89c97d --- /dev/null +++ b/data/scripts/mtCrenel/script_MountainMinish2.inc @@ -0,0 +1,14 @@ +@ Mines Mountain Minish +SCRIPT_START script_MountainMinish2 + BeginBlock + Call sub_08068104 + DoPostScriptAction 0x000a + EndBlock +script_0800CF96: + _0807E944 + _0807E864 + Call sub_08068190 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800CF96 diff --git a/data/scripts/mtCrenel/script_MountainMinish3.inc b/data/scripts/mtCrenel/script_MountainMinish3.inc new file mode 100644 index 00000000..2fe3f475 --- /dev/null +++ b/data/scripts/mtCrenel/script_MountainMinish3.inc @@ -0,0 +1,47 @@ +@ Mines Mountain Minish helpers +SCRIPT_START script_MountainMinish3 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_0800D282: + CheckInventory1 0x0041 + JumpIf script_0800D292 + CheckLocalFlag 0x007e + JumpIf script_0800D2EA +script_0800D292: + BeginBlock + CheckSyncFlagAndClear 0x00000001 + JumpIf script_0800D2C6 + CheckEntityInteractType + JumpIf script_0800D2B0 + Call sub_0806811C + EndBlock + Jump script_0800D282 +script_0800D2B0: + EndBlock + _0807E864 + Call sub_08068190 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800D282 +script_0800D2C6: + EndBlock + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 + SetSyncFlag 0x00000004 + _0807E930 0x000c + WaitForSyncFlagAndClear 0x00000001 + SetSyncFlag 0x00000004 +script_0800D2EA: + _0807E930 0x000b +script_0800D2EE: + CheckEntityInteractType + JumpIfNot script_0800D2EE + _0807E864 + Call sub_08068190 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800D2EE diff --git a/data/scripts/mtCrenel/script_MountainMinish4.inc b/data/scripts/mtCrenel/script_MountainMinish4.inc new file mode 100644 index 00000000..a953ebfa --- /dev/null +++ b/data/scripts/mtCrenel/script_MountainMinish4.inc @@ -0,0 +1,45 @@ +@ Mines Mountain Minish at exit +SCRIPT_START script_MountainMinish4 + BeginBlock + Call sub_08068104 + DoPostScriptAction 0x000a + EndBlock +script_0800D35E: + BeginBlock + CheckEntityInteractType + JumpIf script_0800D372 + Call sub_0806811C + EndBlock + Jump script_0800D35E +script_0800D372: + EndBlock + _0807E864 + Call sub_08068190 + WaitUntilTextboxCloses + Wait 0x000f + CheckLocalFlag 0x007f + JumpIf script_0800D3E4 + CheckLocalFlag 0x007e + JumpIfNot script_0800D3E4 + DoPostScriptAction 0x000b + SetEntitySpeed 0x0100 + CheckPlayerInRegion 0x0090, 0x0130, 0x0810 + JumpIfNot script_0800D3B2 + StartPlayerScript script_PlayerAtMountainMinishExit + WaitForSyncFlagAndClear 0x00000001 +script_0800D3B2: + _0807EB44 0x0002 + _0807E930 0x0005 + _0807EDD4 0x00a0, 0x0130 + _0807EB44 0x0006 + _0807E930 0x0003 + SetIntVariable 0x00000004 + Call sub_080681D8 + PlaySound SFX_TASK_COMPLETE + Wait 0x001e + DoPostScriptAction 0x000a + SetLocalFlag 0x007f +script_0800D3E4: + _0807E878 + Jump script_0800D35E + .2byte 0x0000 diff --git a/data/scripts/script_0800D414.inc b/data/scripts/mtCrenel/script_MountainMinish5.inc similarity index 59% rename from data/scripts/script_0800D414.inc rename to data/scripts/mtCrenel/script_MountainMinish5.inc index 76a31a6e..a31a712b 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/mtCrenel/script_MountainMinish5.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D414 +@ Mines Mountain Minish running +SCRIPT_START script_MountainMinish5 BeginBlock SetEntitySpeed 0x0100 Call sub_08068104 @@ -95,69 +96,3 @@ script_0800D584: Wait 0x000f _0807E878 Jump script_0800D4E4 -SCRIPT_START script_0800D59C - BeginBlock - DoPostScriptAction 0x000a - Call sub_08062A48 - DoPostScriptAction 0x0000 -script_0800D5AC: - EndBlock - Call sub_08062698 - Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000004 - JumpTable script_0800D5CE, script_0800D5D8, script_0800D5E2, script_0800D5EC -script_0800D5CE: - _0807EE04 0x0038, 0x0098 - Jump script_0800D5F2 -script_0800D5D8: - _0807EE04 0x0058, 0x0098 - Jump script_0800D5F2 -script_0800D5E2: - _0807EE04 0x0038, 0x00c8 - Jump script_0800D5F2 -script_0800D5EC: - _0807EE04 0x0058, 0x00c8 -script_0800D5F2: - EndBlock - BeginBlock - Call sub_080626C0 - JumpIf script_0800D5AC - _0807EE30 - JumpIfNot script_0800D5F2 - Jump script_0800D5AC - .2byte 0x0000 -SCRIPT_START script_0800D60C - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x000b - DoPostScriptAction 0x0008 - Call sub_0806DAAC - JumpIf script_0800D6AE - Call sub_0806DAD0 - CallWithArg sub_0806DA04, 0x00000002 - EndBlock -script_0800D636: - _0807EA4C - _0807E9F0 - Call sub_0806DAAC - JumpIf script_0800D650 - Call sub_0807DF50 - _0807E878 - Jump script_0800D636 -script_0800D650: - _0807E864 - Call sub_0807DF28 - Call sub_0807FBC4 - Call sub_0807FBA0 - SetEntitySpeed 0x0700 - _0807F0B4 0x0007 - CameraTargetEntity - _0807EDD4 0x01e8, 0x01b8 - Wait 0x003c - Call sub_0806DAE8 - Wait 0x0078 - Call sub_0806DB44 - JumpIfNot script_0800D698 - LoadRoomEntityList gUnk_080DD730 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/mtCrenel/script_Object6ABrokenSword.inc b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc new file mode 100644 index 00000000..d586f992 --- /dev/null +++ b/data/scripts/mtCrenel/script_Object6ABrokenSword.inc @@ -0,0 +1,21 @@ +@ Mines OBJECT_6A Broken Sword on Table? +SCRIPT_START script_Object6ABrokenSword + BeginBlock + CheckInventory1 0x0041 + JumpIf script_0800D24C + CheckLocalFlag 0x007e + JumpIf script_0800D242 + DoPostScriptAction 0x0008 + EndBlock + WaitForSyncFlagAndClear 0x00000010 + DoPostScriptAction 0x0007 + WaitForSyncFlagAndClear 0x00000010 +SCRIPT_END +script_0800D242: + DoPostScriptAction 0x0007 + _0807E930 0x0003 +SCRIPT_END +script_0800D24C: + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/mtCrenel/script_Object6ARepairedSword.inc b/data/scripts/mtCrenel/script_Object6ARepairedSword.inc new file mode 100644 index 00000000..d857059e --- /dev/null +++ b/data/scripts/mtCrenel/script_Object6ARepairedSword.inc @@ -0,0 +1,12 @@ +@ Mines OBJECT_6A Repaired Sword on Table? +SCRIPT_START script_Object6ARepairedSword + BeginBlock + DoPostScriptAction 0x0008 + EndBlock + WaitForSyncFlagAndClear 0x00000020 + DoPostScriptAction 0x0007 + WaitForSyncFlagAndClear 0x00000020 + DoPostScriptAction 0x0008 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/mtCrenel/script_PlayerAtMelari.inc similarity index 65% rename from data/scripts/script_0800D190.inc rename to data/scripts/mtCrenel/script_PlayerAtMelari.inc index 1cec26bd..409ed3cc 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMelari.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_0800D190 +@ Player at Melari +SCRIPT_START script_PlayerAtMelari BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x0170, 0x0140 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc similarity index 62% rename from data/scripts/script_0800D3EC.inc rename to data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc index 4a39c3f8..0934f626 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/mtCrenel/script_PlayerAtMountainMinishExit.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D3EC +@ Player at Mountain Minish at exit +SCRIPT_START script_PlayerAtMountainMinishExit BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,7 +7,7 @@ SCRIPT_START script_0800D3EC DoPostScriptAction 0x0000 DoPostScriptAction 0x000d _0807ECC4 0x0020 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc similarity index 69% rename from data/scripts/script_0800D1E0.inc rename to data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc index 5a9f4e39..d9138b1b 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/mtCrenel/script_PlayerGetWhiteSword.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D1E0 +@ Mines Player get white sword +SCRIPT_START script_PlayerGetWhiteSword _0807F078 0x0002, 0x0001 CallWithArg sub_0807F918, 0x00000002 PlaySound SFX_109 @@ -6,6 +7,6 @@ SCRIPT_START script_0800D1E0 Call sub_0807F304 MessageNoOverlap 0x0502 WaitUntilTextboxCloses - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc similarity index 64% rename from data/scripts/script_0800D1B4.inc rename to data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc index cf4aa40f..0cda5bcd 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/mtCrenel/script_PlayerPlaceBrokenSword.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D1B4 +@ Player at Melari place broken Sword +SCRIPT_START script_PlayerPlaceBrokenSword BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,7 +7,7 @@ SCRIPT_START script_0800D1B4 _0807EDD4 0x01a8, 0x0120 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc new file mode 100644 index 00000000..c081612b --- /dev/null +++ b/data/scripts/northHyruleField/script_CarpenterOutsideTown.inc @@ -0,0 +1,26 @@ +@ Outside Castle Carpenter +@ Hyrule Town Carpenter +SCRIPT_START script_CarpenterOutsideTown + BeginBlock + Call sub_08067314 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + SetIntVariable 0x00000000 + Call sub_080672B0 + EndBlock +script_08009592: + CheckEntityInteractType + JumpIfNot script_08009592 + _0807E864 + _0807EB74 + SetIntVariable 0x00000004 + Call sub_080672B0 + Call sub_080672C8 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + _0807EB44 0x0004 + SetIntVariable 0x00000000 + Call sub_080672B0 + Jump script_08009592 + .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc new file mode 100644 index 00000000..fb4474ad --- /dev/null +++ b/data/scripts/northHyruleField/script_GuardNorthHyruleField.inc @@ -0,0 +1,20 @@ +@ Outside Castle Guard +@ also at Lon Lon Ranch +SCRIPT_START script_GuardNorthHyruleField + BeginBlock + _0807EB44 0x0004 + _0807E9D4 + DoPostScriptAction 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + EndBlock +script_08014E2C: + CheckEntityInteractType + JumpIfNot script_08014E2C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_08064428 + WaitUntilTextboxCloses + _0807E878 + Jump script_08014E2C + .2byte 0x0000 diff --git a/data/scripts/northHyruleField/script_MutohOutsideTown.inc b/data/scripts/northHyruleField/script_MutohOutsideTown.inc new file mode 100644 index 00000000..11002fe7 --- /dev/null +++ b/data/scripts/northHyruleField/script_MutohOutsideTown.inc @@ -0,0 +1,21 @@ +@ Outside Castle Mutoh +SCRIPT_START script_MutohOutsideTown + BeginBlock + Call sub_08067100 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_08009512: + CheckEntityInteractType + JumpIfNot script_08009512 + _0807E864 + DoPostScriptAction 0x0001 + _0807EB74 + Call sub_080670B4 + WaitUntilTextboxCloses + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Jump script_08009512 + .2byte 0x0000 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/northHyruleField/script_Object69FixBridge.inc similarity index 86% rename from data/scripts/script_08015BA8.inc rename to data/scripts/northHyruleField/script_Object69FixBridge.inc index 70876df6..3dff4c45 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/northHyruleField/script_Object69FixBridge.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015BA8 +@ Outside Caste OBJECT_69 Fix bridge +SCRIPT_START script_Object69FixBridge BeginBlock .ifdef JP SetLocalFlag 0x008c diff --git a/data/scripts/script_08012C48.inc b/data/scripts/npc/script_08012C48.inc similarity index 76% rename from data/scripts/script_08012C48.inc rename to data/scripts/npc/script_08012C48.inc index 63b3e809..18d2a03d 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/npc/script_08012C48.inc @@ -1,10 +1,11 @@ +@ OBJECT_6A in sub_08095954 ? SCRIPT_START script_08012C48 BeginBlock DoPostScriptAction 0x0007 SetEntitySpeed 0x0280 EndBlock _0807EDD4 0x0388, 0x0168 - _0807E5F8 0x00000100 + SetSyncFlag 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/npc/script_BladeBrothers.inc b/data/scripts/npc/script_BladeBrothers.inc new file mode 100644 index 00000000..8fec6673 --- /dev/null +++ b/data/scripts/npc/script_BladeBrothers.inc @@ -0,0 +1,102 @@ +@ Blade Brothers +SCRIPT_START script_BladeBrothers + BeginBlock + Call sub_0807F348 + DoPostScriptAction 0x000a + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + EndBlock +script_080161FE: + Call sub_08068C28 +script_08016204: + CheckEntityInteractType + JumpIfNot script_08016204 + _0807E864 + Call sub_0807DF28 + _0807EB74 + Call sub_08068CA0 + JumpIf script_0801633E + Call sub_08068CFC + JumpIfNot script_08016332 + Call sub_08068DB8 + WaitUntilTextboxCloses + Call sub_08068DD0 + WaitUntilTextboxCloses + CheckTextboxResult + JumpIfNot script_08016346 + StartPlayerScript script_PlayerAtBladeBrothers + WaitForSyncFlagAndClear 0x00000001 + _0807EB74 + Call sub_08068C8C + JumpIf script_08016262 + Call sub_08068DE8 + WaitUntilTextboxCloses + Wait 0x001e +script_08016262: + Call sub_08068E00 + WaitUntilTextboxCloses + DoPostScriptAction 0x0001 + Call sub_0807F2D4 + Call sub_08068E90 + Call sub_08068C8C + JumpIf script_0801631C + Call sub_08068F00 + Call sub_08068F14 + Call sub_08068BB4 + CallWithArg sub_0807F244, 0x00010001 + Call sub_08068B84 + Call sub_0807F2A8 + Call sub_08068BD0 + Wait 0x001e + Call sub_08068E18 + WaitUntilTextboxCloses + Call sub_08068EB4 + Call sub_0807DF50 + _0807E878 +script_080162CC: + EndBlock + BeginBlock + Call sub_08068EC4 + JumpIf script_080162F6 + CheckEntityInteractType + JumpIf script_080162E4 + Jump script_080162CC +script_080162E4: + EndBlock + _0807E864 + Call sub_08068E78 + WaitUntilTextboxCloses + _0807E878 + Jump script_080162CC +script_080162F6: + EndBlock + _0807E888 + Call sub_0807F594 + Call sub_0807DF28 + _0807E864 + StopBgm + PlaySound SFX_TASK_COMPLETE + Wait 0x003c + PlayBgm BGM_LEARN_SCROLL + Call sub_08068F3C +script_0801631C: + Call sub_08068E30 + WaitUntilTextboxCloses + Call sub_08068C6C + WaitPlayerGetItem + WaitUntilTextboxCloses + Jump script_08016346 +script_08016332: + Call sub_08068E60 + WaitUntilTextboxCloses + Jump script_08016346 +script_0801633E: + Call sub_08068E48 + WaitUntilTextboxCloses +script_08016346: + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + Jump script_080161FE + .2byte 0x0000 diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/npc/script_Farmer.inc similarity index 67% rename from data/scripts/script_0800B0D0.inc rename to data/scripts/npc/script_Farmer.inc index b7504878..7316606b 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/npc/script_Farmer.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B0D0 +@ Farmer +SCRIPT_START script_Farmer BeginBlock Call sub_0806BCD4 DoPostScriptAction 0x000a @@ -38,22 +39,3 @@ script_0800B160: Call sub_0806BCB8 CallWithArg sub_0806BC94, 0x00000000 Jump script_0800B0E8 -SCRIPT_START script_0800B17C - BeginBlock - Call sub_0807DF28 - SetLocalFlag 0x0039 - _0807E864 - EndBlock - WaitForPlayerAction0x17 - StartPlayerScript script_0800B1C0 - Wait 0x0018 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - SetRoomFlag 0x0000 - Wait 0x0010 - PlayBgm BGM_FIGHT_THEME - _0807EB28 0x2701 - _0807E878 - Call sub_0807DF50 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish12.inc b/data/scripts/npc/script_ForestMinish12.inc new file mode 100644 index 00000000..0ba2e7ea --- /dev/null +++ b/data/scripts/npc/script_ForestMinish12.inc @@ -0,0 +1,10 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish12 + BeginBlock + _0807E9D4 + EndBlock +script_080165FE: + _0807E30C + JumpIfNot script_080165FE + MessageFromTarget 0x0601 + Jump script_080165FE diff --git a/data/scripts/npc/script_ForestMinish13.inc b/data/scripts/npc/script_ForestMinish13.inc new file mode 100644 index 00000000..c277126a --- /dev/null +++ b/data/scripts/npc/script_ForestMinish13.inc @@ -0,0 +1,14 @@ +@ Some Forest Minish? +SCRIPT_START script_ForestMinish13 + BeginBlock + _0807E9D4 + EndBlock +script_08016612: + _0807E944 + _0807E864 + MessageFromTarget 0x0602 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_08016612 + .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish14.inc b/data/scripts/npc/script_ForestMinish14.inc new file mode 100644 index 00000000..7eb3fa47 --- /dev/null +++ b/data/scripts/npc/script_ForestMinish14.inc @@ -0,0 +1,14 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish14 + BeginBlock + _0807E9D4 + EndBlock +script_0801662E: + _0807E944 + _0807E864 + _0807EB28 0x0603 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0801662E + .2byte 0x0000 diff --git a/data/scripts/npc/script_ForestMinish15.inc b/data/scripts/npc/script_ForestMinish15.inc new file mode 100644 index 00000000..c9b227b0 --- /dev/null +++ b/data/scripts/npc/script_ForestMinish15.inc @@ -0,0 +1,13 @@ +@ Some Forest Minish? +SCRIPT_START script_ForestMinish15 + SetEntitySpeed 0x0100 +script_08016648: + _0807ECF4 0x0030 + Wait 0x0008 + _0807ECC4 0x0030 + Wait 0x0008 + _0807EC94 0x0030 + Wait 0x0008 + _0807EC64 0x0030 + Wait 0x0008 + Jump script_08016648 diff --git a/data/scripts/npc/script_ForestMinish16.inc b/data/scripts/npc/script_ForestMinish16.inc new file mode 100644 index 00000000..6978bbde --- /dev/null +++ b/data/scripts/npc/script_ForestMinish16.inc @@ -0,0 +1,15 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish16 + _0807ED24 0x0055, 0x0039, 0x00b4 + Wait 0x0008 + _0807ED24 0x0075, 0x0076, 0x003c + Wait 0x0008 + _0807ED24 0x0105, 0x006c, 0x0078 + Wait 0x0008 + _0807ED24 0x018e, 0x007a, 0x0078 + Wait 0x0008 + _0807ED24 0x0173, 0x0023, 0x003c + Wait 0x0008 + _0807ED24 0x00d8, 0x003f, 0x003c + Wait 0x0008 + Jump script_ForestMinish16 diff --git a/data/scripts/npc/script_ForestMinish17.inc b/data/scripts/npc/script_ForestMinish17.inc new file mode 100644 index 00000000..376c28db --- /dev/null +++ b/data/scripts/npc/script_ForestMinish17.inc @@ -0,0 +1,17 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish17 + SetEntitySpeed 0x0100 +script_080166BC: + _0807EDD4 0x0055, 0x0039 + Wait 0x0008 + _0807EDD4 0x0075, 0x0076 + Wait 0x0008 + _0807EDD4 0x0105, 0x006c + Wait 0x0008 + _0807EDD4 0x018e, 0x007a + Wait 0x0008 + _0807EDD4 0x0173, 0x0023 + Wait 0x0008 + _0807EDD4 0x00d8, 0x003f + Wait 0x0008 + Jump script_080166BC diff --git a/data/scripts/npc/script_ForestMinish18.inc b/data/scripts/npc/script_ForestMinish18.inc new file mode 100644 index 00000000..4198e7da --- /dev/null +++ b/data/scripts/npc/script_ForestMinish18.inc @@ -0,0 +1,39 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish18 + SetEntitySpeed 0x0100 +script_08016700: + _0807EC94 0x0030 + SetSyncFlag 0x00000002 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000001 + ClearSyncFlag 0x00000001 + _0807ECF4 0x0030 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + Wait 0x001e + SetSyncFlag 0x00000006 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Wait 0x003c + Jump script_08016700 diff --git a/data/scripts/npc/script_ForestMinish19.inc b/data/scripts/npc/script_ForestMinish19.inc new file mode 100644 index 00000000..1e5e8056 --- /dev/null +++ b/data/scripts/npc/script_ForestMinish19.inc @@ -0,0 +1,41 @@ +@ Some Forest Minish? +SCRIPT_START script_ForestMinish19 + SetEntitySpeed 0x0100 +script_0801679C: + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 + _0807EC94 0x0030 + SetSyncFlag 0x00000004 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 + _0807ECF4 0x0030 + SetSyncFlag 0x00000001 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000002 + ClearSyncFlag 0x00000002 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Jump script_0801679C diff --git a/data/scripts/npc/script_ForestMinish20.inc b/data/scripts/npc/script_ForestMinish20.inc new file mode 100644 index 00000000..e9aa1833 --- /dev/null +++ b/data/scripts/npc/script_ForestMinish20.inc @@ -0,0 +1,39 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish20 + SetEntitySpeed 0x0100 +script_08016848: + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 + _0807EC94 0x0030 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + Wait 0x001e + SetSyncFlag 0x00000003 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Wait 0x003c + _0807ECF4 0x0030 + SetSyncFlag 0x00000002 + Wait 0x000f + DoPostScriptAction 0x0000 + _0807EB44 0x0004 + WaitForSyncFlag 0x00000004 + ClearSyncFlag 0x00000004 + DoPostScriptAction 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Jump script_08016848 diff --git a/data/scripts/npc/script_ForestMinish21.inc b/data/scripts/npc/script_ForestMinish21.inc new file mode 100644 index 00000000..4708f47d --- /dev/null +++ b/data/scripts/npc/script_ForestMinish21.inc @@ -0,0 +1,11 @@ +@ Some Forest Minish ? +SCRIPT_START script_ForestMinish21 + BeginBlock + _0807E9D4 + EndBlock +script_080168E6: + _0807E944 + _0807E864 + Wait 0x000f + _0807E878 + Jump script_080168E6 diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc new file mode 100644 index 00000000..a55a6817 --- /dev/null +++ b/data/scripts/npc/script_MysteriousWall.inc @@ -0,0 +1,25 @@ +@ Cave NPC4E Fusion thingy Mysterious Wall +SCRIPT_START script_MysteriousWall + BeginBlock + DoPostScriptAction 0x000b + DoPostScriptAction 0x0008 + Call sub_0806DAAC + JumpIf script_0800B9AC + Call sub_0806DAD0 + CallWithArg sub_0806DA04, 0x00000005 + EndBlock +script_0800B98A: + _0807EA4C + _0807E9F0 + JumpIf script_0800B99E + Call sub_0807DF50 + _0807E878 + Jump script_0800B98A +script_0800B99E: + Call sub_0806F188 + Call sub_0807DF50 + _0807E878 +script_0800B9AC: + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0801635C.inc b/data/scripts/npc/script_PlayerAtBladeBrothers.inc similarity index 57% rename from data/scripts/script_0801635C.inc rename to data/scripts/npc/script_PlayerAtBladeBrothers.inc index 002227b9..7db4fb9c 100644 --- a/data/scripts/script_0801635C.inc +++ b/data/scripts/npc/script_PlayerAtBladeBrothers.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_0801635C +@ Player at Blade Brothers +SCRIPT_START script_PlayerAtBladeBrothers SetEntitySpeed 0x0100 _0807EDD4 0x0078, 0x0050 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/npc/script_PlayerAtGreatFairy.inc b/data/scripts/npc/script_PlayerAtGreatFairy.inc new file mode 100644 index 00000000..8839a3cb --- /dev/null +++ b/data/scripts/npc/script_PlayerAtGreatFairy.inc @@ -0,0 +1,25 @@ +@ Player at Great Fairy +SCRIPT_START script_PlayerAtGreatFairy + BeginBlock + SetEntitySpeed 0x0100 + EndBlock + CallWithArg sub_0807F6B4, 0x00000090 + JumpIfNot script_0800B7FC + CallWithArg sub_0807F464, 0x00000078 + CallWithArg sub_0807F4F8, 0x00000090 +script_0800B7EE: + _0807E8E4_0 + DoPostScriptAction 0x0000 + SetSyncFlag 0x00000004 +SCRIPT_END +script_0800B7FC: + CallWithArg sub_0807F4F8, 0x00000090 + CallWithArg sub_0807F464, 0x00000078 + Jump script_0800B7EE + BeginBlock + DoPostScriptAction 0x0007 + _0807EB44 0x0004 + _0807E930 0x0000 + EndBlock +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/npc/script_TingleSiblings.inc b/data/scripts/npc/script_TingleSiblings.inc new file mode 100644 index 00000000..8393ee87 --- /dev/null +++ b/data/scripts/npc/script_TingleSiblings.inc @@ -0,0 +1,53 @@ +@ Tingle Siblings +SCRIPT_START script_TingleSiblings + BeginBlock + Call sub_08064EA4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0801690A: + _0807E30C + JumpIfNot script_0801690A + _0807E864 + _0807EB74 + Call sub_08064F28 + WaitUntilTextboxCloses + JumpIfNot script_08016926 + GivePlayerItem 0x003d + WaitPlayerGetItem +script_08016926: + _0807E878 + SetGlobalFlag 0x005c + Jump script_0801690A + BeginBlock + _0807E9D4 + _0807EB44 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0801693E: + _0807E944 + _0807E864 + Wait 0x0018 + MessageFromTarget 0x0a01 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0801693E + .2byte 0x0000 + BeginBlock + _0807E9D4 + _0807EB44 0x0000 + DoPostScriptAction 0x000a + _0807E930 0x0000 + EndBlock +script_0801696A: + _0807E944 + _0807E864 + Wait 0x0018 + MessageFromTarget 0x0a01 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0801696A + .2byte 0x0000 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/npc/script_Windcrest.inc similarity index 95% rename from data/scripts/script_0800B00C.inc rename to data/scripts/npc/script_Windcrest.inc index 78d910d2..ef4d0c4d 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/npc/script_Windcrest.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800B00C +@ All Windcrests +SCRIPT_START script_Windcrest BeginBlock Call sub_0807F934 Call sub_080A2124 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/sanctuary/script_08013F94.inc similarity index 96% rename from data/scripts/script_08013F94.inc rename to data/scripts/sanctuary/script_08013F94.inc index a44e8e88..ec8cf7c0 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/sanctuary/script_08013F94.inc @@ -1,3 +1,4 @@ +@ Sanctuary NPC4E 1? SCRIPT_START script_08013F94 BeginBlock DoPostScriptAction 0x0008 diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc similarity index 74% rename from data/scripts/script_08013FE8.inc rename to data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc index 6b33e01b..56929281 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/sanctuary/script_NPC4EPreventPlayerLeave.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013FE8 +@ Sanctuary NPC4E Link has to try his new ability before leaving +SCRIPT_START script_NPC4EPreventPlayerLeave BeginBlock DoPostScriptAction 0x0008 EndBlock @@ -21,8 +22,8 @@ script_08013FF0: EndBlock _0807EB28 0x1508 WaitUntilTextboxCloses - StartPlayerScript script_08010A14 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerSanctuary + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08013FF0 diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc similarity index 84% rename from data/scripts/script_08013AA6.inc rename to data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc index a34b2009..3939de1e 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/sanctuary/script_Npc4EFinalSwordRumble.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013AA6 +@ Sanctuary NPC4E Rumble after fusing final sword +SCRIPT_START script_Npc4EFinalSwordRumble Call sub_0807F3F8 Wait 0x003c .ifdef EU @@ -7,7 +8,7 @@ SCRIPT_START script_08013AA6 CameraTargetEntity Wait 0x003c .endif - _0807E5F8 0x00000008 + SetSyncFlag 0x00000008 Wait 0x0078 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 diff --git a/data/scripts/script_08014248.inc b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc similarity index 57% rename from data/scripts/script_08014248.inc rename to data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc index b0ec2caf..26ed2582 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/sanctuary/script_Npc4ELookAtPictureAgain.inc @@ -1,16 +1,5 @@ -SCRIPT_START script_08014248 - TestBit 0x00020000 - JumpIf script_08014264 - Wait 0x0008 - CallWithArg sub_08095EAC, 0x00000000 - Jump script_08014248 -script_08014264: - CallWithArg sub_08095EAC, 0x00000001 - Jump script_08014264 - .align 2, 0 - -.ifndef EU -SCRIPT_START script_08014274 +@ Sanctuary NPC4E Inspect picture in back room after Vaati has revealed himself +SCRIPT_START script_Npc4ELookAtPictureAgain BeginBlock DoPostScriptAction 0x0008 EndBlock @@ -30,4 +19,3 @@ script_08014298: _0807E878 Jump script_08014298 .2byte 0x0000 -.endif diff --git a/data/scripts/sanctuary/script_Npc4EPedestal.inc b/data/scripts/sanctuary/script_Npc4EPedestal.inc new file mode 100644 index 00000000..43bc49a9 --- /dev/null +++ b/data/scripts/sanctuary/script_Npc4EPedestal.inc @@ -0,0 +1,74 @@ +@ Sanctuary NPC4E Pedestal for sword +SCRIPT_START script_Npc4EPedestal + BeginBlock + DoPostScriptAction 0x0008 + EndBlock + BeginBlock + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + EndBlock +script_080134F8: + CheckEntityInteractType + JumpIfNot script_080134F8 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtPedestal + WaitForSyncFlagAndClear 0x00000001 + CallWithArg sub_08095A1C, script_Object6ASwordInPedestal + PlaySound SFX_ELEMENT_PLACE + Wait 0x005a + BeginBlock + PlaySound SFX_ELEMENT_FLOAT + CallWithArg sub_08095D54, script_Object6AEarthElementFloating + CallWithArg sub_08095D54, script_Object6AFireElementFloating + EndBlock + WaitForSyncFlagAndClear 0x18000000 + BeginBlock + PlaySound SFX_ELEMENT_CHARGE + CallWithArg sub_08095D8C, script_Object6ASwordChange1 + CallWithArg sub_08095D8C, script_Object6ASwordCharge2 + EndBlock + Wait 0x001e + BeginBlock + PlaySound SFX_1D0 + CallWithArg sub_08095D8C, script_Object6ASwordCharge5 + CallWithArg sub_08095D8C, script_Object6ASwordCharge6 + EndBlock + Wait 0x003c + CallWithArg CreateManager36, 0x00000000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 + PlaySound SFX_1D2 + CallWithArg sub_08095D8C, script_Object6ASwordCharge9 + CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 + Wait 0x0078 + SetSyncFlag 0x00000060 + CallWithArg DeleteManager36, 0x00000000 + Wait 0x0078 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + Wait 0x003c + StartPlayerScript script_PlayerPickUpSword + SetSyncFlag 0x00000080 + _0807F078 0x0003, 0x0001 + Call sub_0806DC3C + Call sub_0806DC58 + Call sub_0807F304 + Wait 0x003c + _0807E778 0x0004 + DoFade7 + PlaySound SFX_EVAPORATE + WaitForFadeFinish + Wait 0x003c + SetSyncFlag 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitForFadeFinish + PlaySound SFX_109 + MessageFromTargetPos 0x0503, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00040000 + CallWithArg CreateManager36, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013B18.inc b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc similarity index 67% rename from data/scripts/script_08013B18.inc rename to data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc index 871595af..d34f479b 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/sanctuary/script_Npc4EPreventPlayerLeaving.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013B18 +@ Sanctuary NPC4E Prevent link from leaving after fusing final sword +SCRIPT_START script_Npc4EPreventPlayerLeaving BeginBlock DoPostScriptAction 0x0008 script_08013B1E: @@ -16,8 +17,8 @@ script_08013B1E: Call sub_0807DF28 _0807EB28 0x1507 WaitUntilTextboxCloses - StartPlayerScript script_08010A14 - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerSanctuary + WaitForSyncFlagAndClear 0x00000001 Call sub_0807DF50 _0807E878 Jump script_08013B1E diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc similarity index 86% rename from data/scripts/script_08013CA4.inc rename to data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc index a04b072e..d52e0ba7 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/sanctuary/script_Npc4ESanctuaryIntro.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013CA4 +@ Sanctuary NPC4E Intro Cutscene +SCRIPT_START script_Npc4ESanctuaryIntro EndBlock script_08013CA6: CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 diff --git a/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc new file mode 100644 index 00000000..e5bef48f --- /dev/null +++ b/data/scripts/sanctuary/script_Npc4ESecondSanctuary.inc @@ -0,0 +1,82 @@ +@ Sanctuary second time NPC4E? Handles cutscene +SCRIPT_START script_Npc4ESecondSanctuary + BeginBlock + DoPostScriptAction 0x0008 + EndBlock + BeginBlock + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + EndBlock +script_0801373C: + CheckEntityInteractType + JumpIfNot script_0801373C + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtPedestal + WaitForSyncFlagAndClear 0x00000001 + CallWithArg sub_08095A1C, script_Object6ASword2 + PlaySound SFX_ELEMENT_PLACE + Wait 0x005a + BeginBlock + PlaySound SFX_ELEMENT_FLOAT + CallWithArg sub_08095D54, script_Object6AWaterElementFloating + EndBlock + WaitForSyncFlagAndClear 0x20000000 + BeginBlock + PlaySound SFX_ELEMENT_CHARGE + CallWithArg sub_08095D8C, script_Object6ASwordChange1 + CallWithArg sub_08095D8C, script_Object6ASwordCharge2 + CallWithArg sub_08095D8C, script_Object6ASwordCharge3 + EndBlock + Wait 0x001e + BeginBlock + PlaySound SFX_1D0 + CallWithArg sub_08095D8C, script_Object6ASwordCharge5 + CallWithArg sub_08095D8C, script_Object6ASwordCharge6 + CallWithArg sub_08095D8C, script_Objet6ASwordCharge7 + EndBlock + Wait 0x003c + CallWithArg CreateManager36, 0x00000000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 + PlaySound SFX_1D2 + CallWithArg sub_08095D8C, script_Object6ASwordCharge9 + CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00008000 + Wait 0x0078 + SetSyncFlag 0x00000060 + CallWithArg DeleteManager36, 0x00000000 + Wait 0x0078 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + Wait 0x003c + StartPlayerScript script_PlayerPickUpSword + SetSyncFlag 0x00000080 + _0807F078 0x0004, 0x0001 + Call sub_0806DC3C + Call sub_0806DC58 + Call sub_0807F304 + Wait 0x003c + _0807E778 0x0004 + DoFade7 + PlaySound SFX_EVAPORATE + WaitForFadeFinish + Wait 0x003c + SetSyncFlag 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitForFadeFinish + PlaySound SFX_109 + MessageFromTargetPos 0x0504, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00040000 + SetLocalFlag 0x007b + Call sub_08053250 + Call sub_0807DF50 + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08013650.inc b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc similarity index 68% rename from data/scripts/script_08013650.inc rename to data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc index 9e6b1d46..24eb4ce1 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/sanctuary/script_Npc4ESpawnTextBoard.inc @@ -1,16 +1,17 @@ -SCRIPT_START script_08013650 +@ Sanctuary NPC4E spawn text board +SCRIPT_START script_Npc4ESpawnTextBoard Call sub_0807F3F8 Wait 0x003c _0807F0B4 0x0007 SetEntityPositionRelative 0x00e8, 0x00a8 CameraTargetEntity Wait 0x003c - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Wait 0x0078 CallWithArg DeleteManager36, 0x00000001 _0807F0C8 0x0000, 0x0000 - StartPlayerScript script_080136B4 - WaitForSomething2 0x00000002 + StartPlayerScript script_PlayerTextBoardAppears + WaitForSyncFlagAndClear 0x00000002 _0807EB28 0x1501 WaitUntilTextboxCloses _0807F0B4 0x0004 diff --git a/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc new file mode 100644 index 00000000..05e2ccd9 --- /dev/null +++ b/data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc @@ -0,0 +1,98 @@ +@ Sanctuary third time NPC4E controlling cutscene +SCRIPT_START script_Npc4EThirdSanctuary + BeginBlock + DoPostScriptAction 0x0008 + EndBlock + BeginBlock + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + EndBlock +script_080138D0: + CheckEntityInteractType + JumpIfNot script_080138D0 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_PlayerAtPedestal + WaitForSyncFlagAndClear 0x00000001 + CallWithArg sub_08095A1C, script_Object6ASword3 + PlaySound SFX_ELEMENT_PLACE + Wait 0x005a + BeginBlock + PlaySound SFX_ELEMENT_FLOAT + CallWithArg sub_08095D54, script_Object6AWindElementFloating + EndBlock + WaitForSyncFlagAndClear 0x40000000 + BeginBlock + PlaySound SFX_ELEMENT_CHARGE + CallWithArg sub_08095D8C, script_Object6ASwordChange1 + CallWithArg sub_08095D8C, script_Object6ASwordCharge2 + CallWithArg sub_08095D8C, script_Object6ASwordCharge3 + CallWithArg sub_08095D8C, script_Object6ASwordCharge4 + EndBlock + Wait 0x001e + BeginBlock + PlaySound SFX_1D0 + CallWithArg sub_08095D8C, script_Object6ASwordCharge5 + CallWithArg sub_08095D8C, script_Object6ASwordCharge6 + CallWithArg sub_08095D8C, script_Objet6ASwordCharge7 + CallWithArg sub_08095D8C, script_Object6ASwordCharge8 + EndBlock + Wait 0x003c + CallWithArg CreateManager36, 0x00000000 + SetSyncFlag 0x00000200 + WaitForSyncFlagAndClear 0x00002000 + PlaySound SFX_1D2 + CallWithArg sub_08095D8C, script_Object6ASwordCharge9 + CallWithArg sub_08095D8C, script_Object6ASwordCharge10 + SetSyncFlag 0x00000400 + WaitForSyncFlagAndClear 0x00004000 + SetSyncFlag 0x00000800 + WaitForSyncFlagAndClear 0x00008000 + SetSyncFlag 0x00001000 + WaitForSyncFlagAndClear 0x00010000 + Wait 0x0078 + SetSyncFlag 0x00000060 + CallWithArg DeleteManager36, 0x00000000 + Wait 0x0078 + SetSyncFlag 0x00000080 + WaitForSyncFlagAndClear 0x00000100 + Wait 0x003c + StartPlayerScript script_PlayerPickUpFinalSword + SetSyncFlag 0x00000080 + _0807F078 0x0006, 0x0001 + Call sub_0807AEE4 + Call sub_0806DC3C + Call sub_0806DC58 + Call sub_0807F304 + Wait 0x003c + _0807E778 0x0004 + DoFade7 + PlaySound SFX_EVAPORATE + WaitForFadeFinish + Wait 0x003c + SetSyncFlag 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitForFadeFinish + PlaySound SFX_109 + MessageFromTargetPos 0x0505, 0x000c + WaitUntilTextboxCloses + SetSyncFlag 0x00040000 +.ifndef EU + _0807F0B4 0x0002 + SetEntityPositionRelative 0x00e8, 0x00d8 + CameraTargetEntity +.endif + Call sub_0806DC3C + CallWithArg sub_0807F244, 0x00010001 + CallWithArg sub_0807F29C, gUnk_080049FE + Wait 0x00c8 + CallWithArg sub_0807F29C, 0x00000000 + Call sub_0806DC58 +script_08013A8E: +.ifndef EU + CheckRoomFlag 0x0004 + JumpIfNot script_08013A8E +.endif + CallWithArg CreateManager36, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/sanctuary/script_Object6AEarthElement.inc similarity index 63% rename from data/scripts/script_08013E94.inc rename to data/scripts/sanctuary/script_Object6AEarthElement.inc index 6da73541..55980676 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElement.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013E94 +@ Sanctuary second time OBJECT_6A Earth Element +SCRIPT_START script_Object6AEarthElement BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 diff --git a/data/scripts/script_08013E04.inc b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc similarity index 57% rename from data/scripts/script_08013E04.inc rename to data/scripts/sanctuary/script_Object6AEarthElementFloating.inc index 47abff69..4ab4fd4d 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/sanctuary/script_Object6AEarthElementFloating.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013E04 +@ Sanctuary OBJECT_6A floating Earth Element +SCRIPT_START script_Object6AEarthElementFloating BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 @@ -6,6 +7,6 @@ SCRIPT_START script_08013E04 SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x00f8 _0807E930 0x0001 - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/sanctuary/script_Object6AFireElement.inc similarity index 63% rename from data/scripts/script_08013EB0.inc rename to data/scripts/sanctuary/script_Object6AFireElement.inc index f02fef23..48385c7a 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/sanctuary/script_Object6AFireElement.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013EB0 +@ Sanctuary second time OBJECT_6A Fire Element +SCRIPT_START script_Object6AFireElement BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc similarity index 57% rename from data/scripts/script_08013E28.inc rename to data/scripts/sanctuary/script_Object6AFireElementFloating.inc index e996cf56..0e1febcc 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/sanctuary/script_Object6AFireElementFloating.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013E28 +@ Sanctuary OBJECT_6A floating Fire Element +SCRIPT_START script_Object6AFireElementFloating BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 @@ -6,6 +7,6 @@ SCRIPT_START script_08013E28 SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x00f8 _0807E930 0x0003 - _0807E5F8 0x10000000 + SetSyncFlag 0x10000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword2.inc b/data/scripts/sanctuary/script_Object6ASword2.inc new file mode 100644 index 00000000..fab7bbba --- /dev/null +++ b/data/scripts/sanctuary/script_Object6ASword2.inc @@ -0,0 +1,14 @@ +@ Sanctuary second time OBJECT_6A sword? +SCRIPT_START script_Object6ASword2 + BeginBlock + DoPostScriptAction 0x0007 + _0807E930 0x0009 + EndBlock + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x000c + Call sub_0807F2D4 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/sanctuary/script_Object6ASword3.inc b/data/scripts/sanctuary/script_Object6ASword3.inc new file mode 100644 index 00000000..74a51519 --- /dev/null +++ b/data/scripts/sanctuary/script_Object6ASword3.inc @@ -0,0 +1,14 @@ +@ Sanctuary third time OBJECT_6A ? +SCRIPT_START script_Object6ASword3 + BeginBlock + DoPostScriptAction 0x0007 + _0807E930 0x000a + EndBlock + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x000d + Call sub_0807F2D4 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08014054.inc b/data/scripts/sanctuary/script_Object6ASwordChange1.inc similarity index 56% rename from data/scripts/script_08014054.inc rename to data/scripts/sanctuary/script_Object6ASwordChange1.inc index 52fc4e4f..d17fcb9e 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/sanctuary/script_Object6ASwordChange1.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08014054 +@ Sanctuary OBJECT_6A Sword charging? +SCRIPT_START script_Object6ASwordChange1 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0000 Call sub_0807F738 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014210.inc b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc similarity index 65% rename from data/scripts/script_08014210.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge10.inc index 4119ab95..11e22661 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge10.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08014210 +@ Sanctuary OBJECT_6A Sword charging 5? +SCRIPT_START script_Object6ASwordCharge10 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0015 @@ -6,7 +7,7 @@ SCRIPT_START script_08014210 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 Wait 0x0078 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordCharge11.inc b/data/scripts/sanctuary/script_Object6ASwordCharge11.inc new file mode 100644 index 00000000..9bc8084e --- /dev/null +++ b/data/scripts/sanctuary/script_Object6ASwordCharge11.inc @@ -0,0 +1,11 @@ +@ Sanctuary third time OBJECT_6A ? +SCRIPT_START script_Object6ASwordCharge11 + CheckSyncFlagAndClear 0x00020000 + JumpIf script_08014264 + Wait 0x0008 + CallWithArg sub_08095EAC, 0x00000000 + Jump script_Object6ASwordCharge11 +script_08014264: + CallWithArg sub_08095EAC, 0x00000001 + Jump script_08014264 + .align 2, 0 diff --git a/data/scripts/script_08014074.inc b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc similarity index 56% rename from data/scripts/script_08014074.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge2.inc index 94ac4516..d4ad0786 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge2.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08014074 +@ Sanctuary OBJECT_6A Sword charging 2? +SCRIPT_START script_Object6ASwordCharge2 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0001 Call sub_0807F738 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014094.inc b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc similarity index 57% rename from data/scripts/script_08014094.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge3.inc index ba91ee5c..dc8c915c 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge3.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_08014094 +@ Sanctuary second time OBJECT_6A sword charging? +SCRIPT_START script_Object6ASwordCharge3 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0002 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc similarity index 60% rename from data/scripts/script_080140B8.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge4.inc index 200930ac..55fea219 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge4.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_080140B8 +@ Sanctuary third time OBJECT_6A ? +SCRIPT_START script_Object6ASwordCharge4 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0003 Call sub_0807F738 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething 0x00000040 + WaitForSyncFlag 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc similarity index 53% rename from data/scripts/script_080140DC.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge5.inc index 14d92521..deba7486 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge5.inc @@ -1,14 +1,15 @@ -SCRIPT_START script_080140DC +@ Sanctuary OBJECT_6A Sword charging 3? +SCRIPT_START script_Object6ASwordCharge5 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 EndBlock - WaitForSomething2 0x00000200 + WaitForSyncFlagAndClear 0x00000200 _0807E930 0x0008 Call sub_0807F2D4 _0807E930 0x000c - _0807E5F8 0x00002000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00002000 + WaitForSyncFlag 0x00000020 _0807E930 0x0010 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014118.inc b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc similarity index 53% rename from data/scripts/script_08014118.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge6.inc index 3576334e..6712fe80 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge6.inc @@ -1,14 +1,15 @@ -SCRIPT_START script_08014118 +@ Sanctuary OBJECT_6A Sword charging 3? +SCRIPT_START script_Object6ASwordCharge6 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0005 EndBlock - WaitForSomething2 0x00000400 + WaitForSyncFlagAndClear 0x00000400 _0807E930 0x0009 Call sub_0807F2D4 _0807E930 0x000d - _0807E5F8 0x00004000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00004000 + WaitForSyncFlag 0x00000020 _0807E930 0x0011 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_08014198.inc b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc similarity index 60% rename from data/scripts/script_08014198.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge8.inc index 23954b49..db235e91 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge8.inc @@ -1,15 +1,16 @@ -SCRIPT_START script_08014198 +@ Sanctuary third time OBJECT_6A ? +SCRIPT_START script_Object6ASwordCharge8 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0007 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething2 0x00001000 + WaitForSyncFlagAndClear 0x00001000 _0807E930 0x000b Call sub_0807F2D4 _0807E930 0x000f - _0807E5F8 0x00010000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00010000 + WaitForSyncFlag 0x00000020 _0807E930 0x0013 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc similarity index 65% rename from data/scripts/script_080141DC.inc rename to data/scripts/sanctuary/script_Object6ASwordCharge9.inc index cdb648e7..2920f0bc 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/sanctuary/script_Object6ASwordCharge9.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_080141DC +@ Sanctuary OBJECT_6A Sword charging 4? +SCRIPT_START script_Object6ASwordCharge9 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0014 Call sub_0807F714 CallWithArg sub_0807F994, 0x0000fffc EndBlock - WaitForSomething 0x00000020 + WaitForSyncFlag 0x00000020 Wait 0x0078 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc new file mode 100644 index 00000000..7681251b --- /dev/null +++ b/data/scripts/sanctuary/script_Object6ASwordInPedestal.inc @@ -0,0 +1,14 @@ +@ Sanctuary OBJECT_6A Sword in pedestal +SCRIPT_START script_Object6ASwordInPedestal + BeginBlock + DoPostScriptAction 0x0007 + _0807E930 0x0008 + EndBlock + WaitForSyncFlagAndClear 0x00000080 + _0807E930 0x000b + Call sub_0807F2D4 + SetSyncFlag 0x00000100 + WaitForSyncFlagAndClear 0x00000080 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/sanctuary/script_Object6ATextBoard.inc similarity index 88% rename from data/scripts/script_08013BE8.inc rename to data/scripts/sanctuary/script_Object6ATextBoard.inc index 61fa4b10..174f0b6d 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/sanctuary/script_Object6ATextBoard.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013BE8 +@ Sanctuary OBJECT_6A text board +SCRIPT_START script_Object6ATextBoard BeginBlock CheckLocalFlag 0x007a JumpIf script_08013C2A @@ -12,7 +13,7 @@ SCRIPT_START script_08013BE8 JumpIfNot script_08013C98 EndBlock DoPostScriptAction 0x0008 - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 _0807E908 0x0002 PlaySound SFX_134 Jump script_08013C32 @@ -32,7 +33,7 @@ script_08013C32: script_08013C58: EndBlock BeginBlock - TestBit 0x00000008 + CheckSyncFlagAndClear 0x00000008 JumpIf script_08013C92 CheckEntityInteractType JumpIfNot script_08013C58 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/sanctuary/script_Object6AWaterElement.inc similarity index 66% rename from data/scripts/script_08013ECC.inc rename to data/scripts/sanctuary/script_Object6AWaterElement.inc index 4ea11b20..0d40a625 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElement.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013ECC +@ Sanctuary OBJECT_6A Water Element +SCRIPT_START script_Object6AWaterElement BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc similarity index 57% rename from data/scripts/script_08013E4C.inc rename to data/scripts/sanctuary/script_Object6AWaterElementFloating.inc index 7180dae7..5571ce4f 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/sanctuary/script_Object6AWaterElementFloating.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013E4C +@ Sanctuary second time floating water element +SCRIPT_START script_Object6AWaterElementFloating BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0004 @@ -6,6 +7,6 @@ SCRIPT_START script_08013E4C SetEntitySpeed 0x0080 _0807EDD4 0x0120, 0x0168 _0807E930 0x0005 - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/sanctuary/script_Object6AWindElement.inc similarity index 67% rename from data/scripts/script_08013EE8.inc rename to data/scripts/sanctuary/script_Object6AWindElement.inc index 924a762e..b0a2e2c4 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/sanctuary/script_Object6AWindElement.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013EE8 +@ Sanctuary OBJECT_6A Wind Element +SCRIPT_START script_Object6AWindElement BeginBlock DoPostScriptAction 0x0007 Call sub_0807F180 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc similarity index 59% rename from data/scripts/script_08013E70.inc rename to data/scripts/sanctuary/script_Object6AWindElementFloating.inc index fb6a48c8..c88547f6 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/sanctuary/script_Object6AWindElementFloating.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08013E70 +@ Sanctuary third time OBJECT_6A ? +SCRIPT_START script_Object6AWindElementFloating BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 @@ -6,6 +7,6 @@ SCRIPT_START script_08013E70 SetEntitySpeed 0x0080 _0807EDD4 0x00b0, 0x0168 _0807E930 0x0007 - _0807E5F8 0x40000000 + SetSyncFlag 0x40000000 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08014154.inc b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc similarity index 58% rename from data/scripts/script_08014154.inc rename to data/scripts/sanctuary/script_Objet6ASwordCharge7.inc index 175080d4..e56b82e0 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/sanctuary/script_Objet6ASwordCharge7.inc @@ -1,15 +1,16 @@ -SCRIPT_START script_08014154 +@ Sanctuary second time OBJECT_6A sword charging? +SCRIPT_START script_Objet6ASwordCharge7 BeginBlock DoPostScriptAction 0x0007 _0807E930 0x0006 OffsetEntityPosition 0x0000, 0xfff0 EndBlock - WaitForSomething2 0x00000800 + WaitForSyncFlagAndClear 0x00000800 _0807E930 0x000a Call sub_0807F2D4 _0807E930 0x000e - _0807E5F8 0x00008000 - WaitForSomething 0x00000020 + SetSyncFlag 0x00008000 + WaitForSyncFlag 0x00000020 _0807E930 0x0012 Call sub_0807F2D4 DoPostScriptAction 0x0006 diff --git a/data/scripts/script_080136D8.inc b/data/scripts/sanctuary/script_PlayerAtPedestal.inc similarity index 80% rename from data/scripts/script_080136D8.inc rename to data/scripts/sanctuary/script_PlayerAtPedestal.inc index bd7e8f9c..f67ff329 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/sanctuary/script_PlayerAtPedestal.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080136D8 +@ Player at Sanctuary pedestal +SCRIPT_START script_PlayerAtPedestal BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -12,6 +13,6 @@ script_08013704: _0807EDD4 0x00e8, 0x0124 _0807EB44 0x0004 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc similarity index 61% rename from data/scripts/script_08012DB0.inc rename to data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc index 5e9b2640..69721bca 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/sanctuary/script_PlayerAtSanctuaryEntrance.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08012DB0 +@ Player at Sanctuary Entrance +SCRIPT_START script_PlayerAtSanctuaryEntrance BeginBlock SetEntitySpeed 0x0100 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_08012DB0 _0807EB44 0x0000 DoPostScriptAction 0x0000 Wait 0x001e - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/sanctuary/script_PlayerGetElement.inc similarity index 72% rename from data/scripts/script_0800A0B4.inc rename to data/scripts/sanctuary/script_PlayerGetElement.inc index 25fbd63c..c1285a04 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/sanctuary/script_PlayerGetElement.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800A0B4 +@ Player get element +SCRIPT_START script_PlayerGetElement BeginBlock SetEntitySpeed 0x0140 _0807E864 @@ -13,8 +14,8 @@ script_0800A0D2: _0807E8E4_0 Wait 0x0008 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 + SetSyncFlag 0x00000004 + WaitForSyncFlagAndClear 0x00000002 Wait 0x003c SetEntitySpeed 0x0080 _0807EC64 0x0030 diff --git a/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc new file mode 100644 index 00000000..e2e0c734 --- /dev/null +++ b/data/scripts/sanctuary/script_PlayerPickUpFinalSword.inc @@ -0,0 +1,13 @@ +@ Player at Sanctuary draw final sword +SCRIPT_START script_PlayerPickUpFinalSword + CallWithArg sub_08095E7C, script_Object6ASwordCharge11 + PlaySound SFX_1D3 + CallWithArg sub_0807F238, 0x000008e3 + Call sub_08096028 + Wait 0x0078 + SetSyncFlag 0x00020000 + Call sub_0807F304 + Wait 0x0078 + WaitForSyncFlagAndClear 0x00040000 + Call sub_080791BC +SCRIPT_END diff --git a/data/scripts/script_08013B70.inc b/data/scripts/sanctuary/script_PlayerPickUpSword.inc similarity index 55% rename from data/scripts/script_08013B70.inc rename to data/scripts/sanctuary/script_PlayerPickUpSword.inc index 15c75a3c..49aea300 100644 --- a/data/scripts/script_08013B70.inc +++ b/data/scripts/sanctuary/script_PlayerPickUpSword.inc @@ -1,12 +1,13 @@ -SCRIPT_START script_08013B70 +@ Player at Sanctuary pick up sword +SCRIPT_START script_PlayerPickUpSword PlaySound SFX_1D3 CallWithArg sub_0807F238, 0x000008bf Call sub_08096028 Wait 0x003c - _0807E5F8 0x00020000 + SetSyncFlag 0x00020000 Call sub_0807F304 Wait 0x0078 - WaitForSomething2 0x00040000 + WaitForSyncFlagAndClear 0x00040000 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/sanctuary/script_PlayerSanctuary.inc similarity index 54% rename from data/scripts/script_08010A14.inc rename to data/scripts/sanctuary/script_PlayerSanctuary.inc index 8e7c7ca4..2548d3a1 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuary.inc @@ -1,11 +1,12 @@ -SCRIPT_START script_08010A14 +@ Player in Sanctuary when trying clone ability for the first time +SCRIPT_START script_PlayerSanctuary BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08013330.inc b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc similarity index 50% rename from data/scripts/script_08013330.inc rename to data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc index e1622710..7ba6faad 100644 --- a/data/scripts/script_08013330.inc +++ b/data/scripts/sanctuary/script_PlayerSanctuaryIntro.inc @@ -1,8 +1,9 @@ -SCRIPT_START script_08013330 +@ Player in Sanctuary during intro cutscene +SCRIPT_START script_PlayerSanctuaryIntro BeginBlock _0807EB44 0x0000 SetEntityPositionRelative 0x0098, 0x0070 EndBlock - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080136B4.inc b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc similarity index 56% rename from data/scripts/script_080136B4.inc rename to data/scripts/sanctuary/script_PlayerTextBoardAppears.inc index 3cd43738..29f92dd2 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/sanctuary/script_PlayerTextBoardAppears.inc @@ -1,10 +1,11 @@ -SCRIPT_START script_080136B4 +@ Player in Sanctuary when spawning text board +SCRIPT_START script_PlayerTextBoardAppears BeginBlock SetEntitySpeed 0x0100 EndBlock _0807EDD4 0x00e8, 0x00a8 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc deleted file mode 100644 index c1bc824e..00000000 --- a/data/scripts/script_08008B5C.inc +++ /dev/null @@ -1,137 +0,0 @@ -SCRIPT_START script_08008B5C - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_08008B6E: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 - Call sub_0806BBB0 - WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 - Jump script_08008B6E - .2byte 0x0000 -SCRIPT_START script_08008B90 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - _0807E930 0x0000 - EndBlock -script_08008BA2: - _0807E944 - _0807E864 - _0807E930 0x0004 - Call sub_0807F2D4 - MessageFromTarget 0x4912 - WaitUntilTextboxCloses - _0807E930 0x0008 - _0807E878 - Jump script_08008BA2 -SCRIPT_START script_08008BC0 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - _0807E930 0x0000 -.ifdef EU - SetGlobalFlag 0x0061 -.endif - EndBlock -script_08008BD2: - _0807E944 - _0807E864 -.ifndef EU - SetGlobalFlag 0x0061 -.endif - _0807E930 0x0004 - Call sub_0807F2D4 - WaitUntilTextboxCloses - Call sub_0806BA34 - JumpIfNot script_08008C54 - WaitUntilTextboxCloses - CallWithArg sub_0806BB1C, 0x00000000 - Call sub_0807F2D4 - CallWithArg sub_0806BB1C, 0x00000001 - Call sub_0806BB7C - JumpIfNot script_08008C5C - MessageNoOverlap 0x490c - WaitUntilTextboxCloses - LoadRoomEntityList gUnk_080D6784 - WaitForSomething 0x00000001 - WaitForSomething 0x00000004 - Wait 0x000f - PlaySound SFX_SECRET - _0807E930 0x0004 - Call sub_0807F2D4 - MessageNoOverlap 0x4913 - WaitUntilTextboxCloses - _0807E930 0x0008 - Call sub_0807F2D4 - Jump script_08008C5C -script_08008C54: - _0807E930 0x0008 - Wait 0x000f -script_08008C5C: - WaitUntilTextboxCloses - _0807E878 - Jump script_08008BD2 -SCRIPT_START script_08008C64 - BeginBlock - SetEntityPositionRelative 0x0068, 0x0018 - DoPostScriptAction 0x000f - _0807EB44 0x0004 - _0807E930 0x0004 - SetEntitySpeed 0x0300 - PlaySound SFX_STAIRS - EndBlock - WaitForSomething 0x00000002 - MessageNoOverlap 0x490d - WaitUntilTextboxCloses - DoPostScriptAction 0x0007 - Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 - Call sub_08064D10 - Wait 0x000f - _0807EB44 0x0002 - Wait 0x000f - Call sub_08064D08 - _0807EDD4 0x0098, 0x0078 - Call sub_08064D10 - Wait 0x000f - _0807EB44 0x0004 - PlaySound SFX_PLY_LIFT - Wait 0x000f - _0807EB44 0x0002 - _0807EDD4 0x00ac, 0x0078 - Wait 0x000f - _0807EB44 0x0004 - PlaySound SFX_PLY_LIFT - Wait 0x000f - _0807EB44 0x0002 - _0807EDD4 0x00c0, 0x0078 - Wait 0x000f - _0807EB44 0x0004 - PlaySound SFX_PLY_LIFT - Wait 0x000f - _0807EB44 0x0006 - Wait 0x001e - Call sub_08064D08 - _0807EDD4 0x0068, 0x0078 - Call sub_08064D10 - Wait 0x000f - _0807EB44 0x0000 - Wait 0x000f - Call sub_08064D08 - _0807EDD4 0x0068, 0x0018 - Call sub_08064D10 - PlaySound SFX_STAIRS - _0807E5F8 0x00000001 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc deleted file mode 100644 index 1b34fcb9..00000000 --- a/data/scripts/script_08008D8C.inc +++ /dev/null @@ -1,112 +0,0 @@ -SCRIPT_START script_08008D8C - BeginBlock - Call sub_08061FD8 - Call sub_08061E70 - DoPostScriptAction 0x000a - EndBlock -script_08008DA0: - CheckEntityInteractType - JumpIfNot script_08008DA0 - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_08008DA0 - .2byte 0x0000 -SCRIPT_START script_08008DC0 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08008DD8: - CheckEntityInteractType - JumpIfNot script_08008DD8 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - Call sub_080643D8 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - CallWithArg sub_0807F3D8, 0x00000000 - Jump script_08008DD8 -SCRIPT_START script_08008E08 - BeginBlock - SetEntityPositionRelative 0x0088, 0x0078 - EndBlock -script_08008E12: - CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 - JumpIfNot script_08008E12 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - _0807F0B4 0x0001 - CameraTargetEntity - WaitForPlayerAction0x17 - Wait 0x003c - StartPlayerScript script_08008F74 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - Wait 0x003c - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - Wait 0x000f - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - MessageFromTargetPos 0x1053, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807F034 0x0035 - WaitPlayerGetItem - StartPlayerScript script_08008FC0 - WaitForSomething2 0x00000020 - _0807E8E4_0 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000010 - Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807E8E4_1 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807F034 0x0047 - WaitPlayerGetItem - SetIntVariable 0x00000003 - Call sub_0807F420 - _0807E8E4_0 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - _0807F0B4 0x0004 - CameraTargetPlayer - SetGlobalFlag 0x0015 - Call sub_0806DCC0 - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc deleted file mode 100644 index ba22fe01..00000000 --- a/data/scripts/script_0800903C.inc +++ /dev/null @@ -1,206 +0,0 @@ -SCRIPT_START script_0800903C - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock - WaitForSomething2 0x00000004 - PlaySound SFX_PLY_JUMP - _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 - _0807EB44 0x0004 - _0807E5F8 0x00000008 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - Jump script_0800927E - .2byte 0x0000 -SCRIPT_START script_08009080 - BeginBlock - Call sub_0807F348 - SetEntitySpeed 0x0100 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock - WaitForSomething2 0x00000080 - _0807EB44 0x0004 - _0807ECC4 0x0008 - _0807E930 0x0004 - MessageFromTargetPos 0x1050, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807E930 0x0004 - MessageFromTargetPos 0x1052, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807EB44 0x0006 - _0807E930 0x0005 - MessageFromTargetPos 0x1054, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807EB44 0x0004 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807E930 0x0004 - MessageFromTargetPos 0x1056, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807E930 0x0004 - MessageFromTargetPos 0x1057, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807E930 0x0004 - MessageFromTargetPos 0x1058, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - _0807E930 0x0004 - MessageFromTargetPos 0x105c, 0x000e - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000100 -script_0800917C: - CheckEntityInteractType - JumpIfNot script_0800917C - _0807E864 - _0807EB74 - Call sub_0806673C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800917C -SCRIPT_START script_08009198 - BeginBlock - Call sub_0807F348 - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - EndBlock - WaitForSomething2 0x00000001 - _0807EB74 - DoPostScriptAction 0x0001 - MessageFromTargetPos 0x105b, 0x0000 - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - DoPostScriptAction 0x0005 - Wait 0x003c - DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1051, 0x0000 - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - DoPostScriptAction 0x0004 - Wait 0x003c - _0807EB74 - _0807EB8C - DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1055, 0x0000 - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - _0807EB74 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - SetEntitySpeed 0x0080 - DoPostScriptAction 0x0001 - _0807EDD4 0x0098, 0x0078 - _0807EB74 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x0001 - MessageFromTargetPos 0x1059, 0x0000 - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - _0807E5F8 0x00000002 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - Jump script_080092B2 - .2byte 0x0000 -SCRIPT_START script_08009274 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 -script_0800927E: - Call sub_080668F0 - DoPostScriptAction 0x000a - EndBlock -script_0800928A: - CheckEntityInteractType - JumpIfNot script_0800928A - _0807E864 - _0807EB74 - Call sub_08066904 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800928A - .2byte 0x0000 -SCRIPT_START script_080092A8 - BeginBlock - _0807EB44 0x0006 - DoPostScriptAction 0x0000 -script_080092B2: - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_080092BA: - CheckEntityInteractType - JumpIfNot script_080092BA - _0807E864 - _0807EB74 - MessageNoOverlap 0x105e - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_080092BA -SCRIPT_START script_080092D4 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Call sub_0806672C - DoPostScriptAction 0x000a - EndBlock - Jump script_0800917C - .2byte 0x0000 -SCRIPT_START script_080092F0 - BeginBlock - DoPostScriptAction 0x000a - Call sub_08066E38 - _0807E9D4 - EndBlock -script_08009300: - CheckEntityInteractType - JumpIfNot script_08009300 - _0807E864 - _0807EB74 - MessageNoOverlap 0x1071 - WaitUntilTextboxCloses - _0807E878 - Jump script_08009300 - .2byte 0x0000 -SCRIPT_START script_08009318 - BeginBlock - EndBlock -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc deleted file mode 100644 index d5ecf24e..00000000 --- a/data/scripts/script_08009340.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START script_08009340 - BeginBlock - EndBlock -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc deleted file mode 100644 index ca1dae02..00000000 --- a/data/scripts/script_080094FC.inc +++ /dev/null @@ -1,76 +0,0 @@ -SCRIPT_START script_080094FC - BeginBlock - Call sub_08067100 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_08009512: - CheckEntityInteractType - JumpIfNot script_08009512 - _0807E864 - DoPostScriptAction 0x0001 - _0807EB74 - Call sub_080670B4 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Jump script_08009512 - .2byte 0x0000 -SCRIPT_START script_08009538 - BeginBlock - Call sub_08067100 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_0800954E: - CheckEntityInteractType - JumpIfNot script_0800954E - _0807E864 - DoPostScriptAction 0x0001 - _0807EB74 - Call sub_080670E4 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Jump script_0800954E - .2byte 0x0000 -SCRIPT_START script_08009574 - BeginBlock - Call sub_08067314 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - SetIntVariable 0x00000000 - Call sub_080672B0 - EndBlock -script_08009592: - CheckEntityInteractType - JumpIfNot script_08009592 - _0807E864 - _0807EB74 - SetIntVariable 0x00000004 - Call sub_080672B0 - Call sub_080672C8 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - _0807EB44 0x0004 - SetIntVariable 0x00000000 - Call sub_080672B0 - Jump script_08009592 - .2byte 0x0000 -SCRIPT_START script_080095CC - BeginBlock - Call sub_0806BE3C - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - EndBlock -script_080095DE: - Call sub_0806BF44 - JumpIf script_080095F2 - DoPostScriptAction 0x000b - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc deleted file mode 100644 index a0b52a09..00000000 --- a/data/scripts/script_080095F2.inc +++ /dev/null @@ -1,83 +0,0 @@ -SCRIPT_START script_080095F2 - CheckEntityInteractType - JumpIfNot script_080095DE - _0807E864 - _0807EB74 - DoPostScriptAction 0x0001 - Call sub_0806BE84 - WaitUntilTextboxCloses - JumpIfNot script_08009622 - PlaySound SFX_109 - _0807F088 0x003c - MessageFromTarget 0x053c - WaitPlayerGetItem - WaitUntilTextboxCloses - _0807F078 0x003c, 0x0001 -script_08009622: - _0807E878 - DoPostScriptAction 0x0000 - Jump script_080095DE -SCRIPT_START script_0800962C - BeginBlock - DoPostScriptAction 0x000b - DoPostScriptAction 0x0008 - EndBlock -script_08009638: - EndBlock - BeginBlock - CheckGlobalFlag 0x0020 - JumpIfNot script_08009638 - EndBlock -script_08009646: - Call sub_0806BF44 - JumpIf script_08009646 - EndBlock - Call sub_0806BE3C - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 -script_08009660: - CheckEntityInteractType - JumpIfNot script_08009660 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0001 - Call sub_0806BEC8 - WaitUntilTextboxCloses - JumpIfNot script_0800968E - PlaySound SFX_111 - PlaySound SFX_SECRET - _0807F078 0x003c, 0x0002 - Call sub_0806BEFC -script_0800968E: - _0807E878 - DoPostScriptAction 0x0000 - Jump script_08009660 -SCRIPT_START script_08009698 - BeginBlock - DoPostScriptAction 0x0007 - Jump script_080096FC - CheckGlobalFlag 0x0020 - JumpIf script_080096FC - EndBlock -script_080096AC: - CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 - JumpIfNot script_080096AC - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_08009704 - WaitForSomething2 0x00000001 - PlaySound SFX_111 - DoPostScriptAction 0x0008 - LoadRoomEntityList gUnk_080D9048 - Wait 0x000f - PlaySound SFX_111 - DoPostScriptAction 0x0007 -script_080096EC: - CheckGlobalFlag 0x0020 - JumpIfNot script_080096EC - Call sub_0807DF50 - _0807E878 -script_080096FC: - Call sub_0808692C -SCRIPT_END diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc deleted file mode 100644 index ecf4ee25..00000000 --- a/data/scripts/script_08009740.inc +++ /dev/null @@ -1,47 +0,0 @@ -SCRIPT_START script_08009740 - BeginBlock - Call sub_08065D00 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - EndBlock -script_0800975A: - CheckEntityInteractType - JumpIfNot script_0800975A - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - Call sub_08065F64 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800975A - .2byte 0x0000 -SCRIPT_START script_08009778 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - PlaySound SFX_1F3 - Call sub_0807F40C - _0807E8E4_1 - Wait 0x000a - _0807E8E4_3 - Wait 0x0032 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - StartPlayerScript script_0800987C - WaitForSomething2 0x00000040 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 - _0807F078 0x003c, 0x0000 - SetGlobalFlag 0x0020 - _0807E8E4_3 - Wait 0x001e - _0807EB28 0x2809 - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc deleted file mode 100644 index 77f4fe2a..00000000 --- a/data/scripts/script_08009918.inc +++ /dev/null @@ -1,15 +0,0 @@ -SCRIPT_START script_08009918 - BeginBlock - Call sub_0807DF28 - _0807E864 - _0807E5F8 0x00000000 - EndBlock - WaitFor_2 - Wait 0x0078 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000001 - SetGlobalFlag 0x001c - Call sub_0807DF50 - _0807E878 - Call sub_0807921C -SCRIPT_END diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc deleted file mode 100644 index ee4fe00c..00000000 --- a/data/scripts/script_08009DB0.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START script_08009DB0 - BeginBlock - Call sub_0807F348 - Call sub_08066288 - Call sub_08066274 - DoPostScriptAction 0x000a - _0807E930 0x000c - _0807E908 0x0003 - EndBlock -script_08009DD2: - _0807E944 - _0807E908 0x0002 - Call sub_0806622C - WaitUntilTextboxCloses - _0807E908 0x0003 - _0807E930 0x000c - Jump script_08009DD2 -SCRIPT_START script_08009DEC - BeginBlock - EndBlock -script_08009DF0: - CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 - JumpIfNot script_08009DF0 - _0807E864 - Call sub_0807F9A4 - Wait 0x0008 - _0807EB28 0x3207 - _0807E3E8 - JumpIfNot script_08009E4E - Call sub_0807DF28 - _0807E778 0x0002 - DoFade5 - WaitFor_2 - Call sub_0804E864 - Wait 0x001e - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - _0807EB28 0x3209 - Wait 0x000f - WaitUntilTextboxCloses - _0807E878 - Call sub_0807DF50 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc deleted file mode 100644 index 62c60d42..00000000 --- a/data/scripts/script_08009E4E.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START script_08009E4E - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc deleted file mode 100644 index 9603cf05..00000000 --- a/data/scripts/script_08009E58.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START script_08009E58 - BeginBlock - Call sub_0807DF28 - EndBlock - WaitForSomething2 0x00000002 - _0807E778 0x0002 - DoFade4 - WaitFor_2 - DoPostScriptAction 0x0014 - Wait 0x001e - _0807E5F8 0x00000001 -SCRIPT_END diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc deleted file mode 100644 index 90b926db..00000000 --- a/data/scripts/script_0800A1D8.inc +++ /dev/null @@ -1,63 +0,0 @@ -SCRIPT_START script_0800A1D8 - BeginBlock - _0807E864 - Call sub_0807DF28 - SetEntityPositionRelative 0x0088, 0x0080 - Call sub_0807F844 - _0807E8E4_3 - CallWithArg sub_0807F75C, 0x00a80088 - EndBlock - Wait 0x003c - StartPlayerScript script_0800A310 - WaitForSomething2 0x00000001 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000080 - MessageFromTargetPos 0x1659, 0x0000 - WaitUntilTextboxCloses - Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000200 - _0807E5F8 0x00000004 - _0807E8E4_0 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000200 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 - _0807E5F8 0x00000004 - Call sub_0807F3F8 - WaitForSomething2 0x00000080 - MessageFromTargetPos 0x165a, 0x000e - WaitUntilTextboxCloses - Wait 0x003c - MessageFromTargetPos 0x165b, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 - Wait 0x003c - _0807E8E4_3 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000080 - Wait 0x003c - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000006 - WaitForSomething2 0x000000c0 - MessageFromTargetPos 0x165c, 0x000e - WaitUntilTextboxCloses - StopBgm - MessageFromTargetPos 0x165d, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000006 - WaitForSomething2 0x000000c0 - _0807E5F8 0x00000006 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000100 - PlayBgm BGM_INTRO_CUTSCENE - PlaySound SFX_APPARATE - CallWithArg sub_0806DA1C, 0x00000007 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc deleted file mode 100644 index b8d89502..00000000 --- a/data/scripts/script_0800A310.inc +++ /dev/null @@ -1,44 +0,0 @@ -SCRIPT_START script_0800A310 - EndBlock - _0807EB44 0x0002 - Wait 0x000a - _0807EB44 0x0006 - Wait 0x000a - _0807EB44 0x0002 - Wait 0x000a - _0807EB44 0x0006 - Wait 0x000a - _0807E5F8 0x00000001 - Call sub_080791BC - .2byte 0x0000 -SCRIPT_START script_0800A340 - BeginBlock - DoPostScriptAction 0x0008 - SetEntitySpeed 0x0080 - DoPostScriptAction 0x000b - _0807EB44 0x0004 - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - WaitForSomething2 0x00000002 - _0807E930 0x000e - DoPostScriptAction 0x0007 - Call sub_0807F2D4 - DoPostScriptAction 0x0004 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 - _0807E930 0x000f - Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 - _0807E930 0x000c - Call sub_0807F2D4 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000002 - CallWithArg sub_080960C4, script_0800A680 - _0807E5F8 0x00000040 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc deleted file mode 100644 index 719c802a..00000000 --- a/data/scripts/script_0800A7E4.inc +++ /dev/null @@ -1,104 +0,0 @@ -SCRIPT_START script_0800A7E4 - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 - EndBlock - WaitForSomething 0x00000001 - _0807E930 0x0002 - WaitForSomething2 0x00000002 - DoPostScriptAction 0x0004 - Wait 0x003c -script_0800A80C: - _0807E930 0x0001 - Wait 0x001e - _0807E930 0x0003 - Wait 0x001e - Jump script_0800A80C -SCRIPT_START script_0800A820 - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 - EndBlock - WaitForSomething 0x00000001 - _0807E930 0x0002 - WaitForSomething2 0x00000004 - DoPostScriptAction 0x0004 - Wait 0x003c -script_0800A848: - _0807E930 0x0001 - Wait 0x0014 - _0807E930 0x0003 - Wait 0x0014 - Jump script_0800A848 -SCRIPT_START script_0800A85C - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0010 - EndBlock - WaitForSomething 0x00000001 - _0807E930 0x0002 - WaitForSomething2 0x00000008 - DoPostScriptAction 0x0004 - Wait 0x003c -script_0800A884: - _0807E930 0x0001 - Wait 0x000a - _0807E930 0x0003 - Wait 0x000a - Jump script_0800A884 -SCRIPT_START script_0800A898 - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 - EndBlock - WaitForSomething 0x00000001 - DoPostScriptAction 0x0000 - WaitForSomething2 0x00000010 - DoPostScriptAction 0x0004 - Wait 0x003c -script_0800A8C0: - _0807EB44 0x0002 - Wait 0x0019 - _0807EB44 0x0006 - Wait 0x0019 - Jump script_0800A8C0 -SCRIPT_START script_0800A8D4 - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0008 - EndBlock - WaitForSomething 0x00000001 - DoPostScriptAction 0x0000 - WaitForSomething2 0x00000020 - DoPostScriptAction 0x0004 - Wait 0x003c -script_0800A8FC: - _0807EB44 0x0002 - Wait 0x000f - _0807EB44 0x0006 - Wait 0x000f - Jump script_0800A8FC -SCRIPT_START script_0800A910 - BeginBlock - _0807E864 - Call sub_0807DF28 - SetEntityPositionRelative 0x0378, 0x0178 - Call sub_0807F844 - EndBlock - Wait 0x003c - _0807E5F8 0x00000001 - Wait 0x001e - _0807E5F8 0x00000002 - Wait 0x0014 - _0807E5F8 0x00000004 - Wait 0x000a - _0807E5F8 0x00000008 - Wait 0x003c - CallWithArg sub_0806DA1C, 0x0000000d - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc deleted file mode 100644 index 6b859b90..00000000 --- a/data/scripts/script_0800AB6E.inc +++ /dev/null @@ -1,69 +0,0 @@ -SCRIPT_START script_0800AB6E - Call sub_0808D2CC - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E8E4_0 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 - Wait 0x003c - CallWithArg DeleteManager36, 0x00000001 - _0807F0C8 0x0000, 0x0000 - Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - MessageFromTargetPos 0x165f, 0x000e - WaitUntilTextboxCloses - StartPlayerScript script_0800ACBC - WaitForSomething2 0x00000001 - MessageFromTargetPos 0x1660, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - MessageFromTargetPos 0x1661, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - OffsetEntityPosition 0x0000, 0x0020 - Call sub_0807F5C0 - WaitForSomething2 0x00000010 - StartPlayerScript script_0800ACE0 - WaitForSomething2 0x00000001 - Wait 0x003c - MessageFromTargetPos 0x1662, 0x000e - WaitUntilTextboxCloses - MessageFromTargetPos 0x1663, 0x000e - WaitUntilTextboxCloses - OffsetEntityPosition 0x0000, 0xffe0 - Call sub_0807F5C0 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - StartPlayerScript script_0800AD54 - WaitForSomething2 0x00000001 - Wait 0x003c - MessageFromTargetPos 0x1665, 0x000e - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - Wait 0x0078 - Call sub_0808D280 - Wait 0x0078 - _0807E778 0x0004 - DoFade5 - WaitFor_2 - Call sub_0807FB94 - MoveEntityToPlayer - Call sub_0807F844 - _0807F0B4 0x0004 - CameraTargetPlayer - _0807E5F8 0x80000000 - DoFade4 - WaitFor_2 - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc deleted file mode 100644 index 3e51c2ce..00000000 --- a/data/scripts/script_0800B254.inc +++ /dev/null @@ -1,62 +0,0 @@ -SCRIPT_START script_0800B254 - BeginBlock - CheckKinstoneFused 0x0006 - JumpIf script_0800B302 - _0807EA88 0x0006 - _0807EB44 0x0002 - EndBlock -script_0800B268: - _0807EA4C - _0807E9F0 - _0807E864 - CheckKinstoneFused 0x0006 - JumpIf script_0800B2E2 - Call sub_0807DF50 - _0807E878 - Jump script_0800B268 - .2byte 0x0000 -SCRIPT_START script_0800B284 - BeginBlock - CheckKinstoneFused 0x0007 - JumpIf script_0800B302 - _0807EA88 0x0007 - _0807EB44 0x0002 - EndBlock -script_0800B298: - _0807EA4C - _0807E9F0 - _0807E864 - CheckKinstoneFused 0x0007 - JumpIf script_0800B2E2 - Call sub_0807DF50 - _0807E878 - Jump script_0800B298 - .2byte 0x0000 -SCRIPT_START script_0800B2B4 - BeginBlock - CheckKinstoneFused 0x0008 - JumpIf script_0800B302 - _0807EA88 0x0008 - _0807EB44 0x0002 - EndBlock -script_0800B2C8: - _0807EA4C - _0807E9F0 - _0807E864 - CheckKinstoneFused 0x0008 - JumpIf script_0800B2E2 - Call sub_0807DF50 - _0807E878 - Jump script_0800B2C8 -script_0800B2E2: - DoPostScriptAction 0x0013 - _0807EB44 0x0004 - _0807E9DC - Call sub_080676E0 - Call sub_08067534 - DoPostScriptAction 0x0012 - _0807E5F8 0x00000001 -script_0800B302: - EndBlock -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc deleted file mode 100644 index f0608d4b..00000000 --- a/data/scripts/script_0800B6C8.inc +++ /dev/null @@ -1,68 +0,0 @@ -SCRIPT_START script_0800B6C8 - BeginBlock - EndBlock -script_0800B6CC: - HasRupees 0x0001 - JumpIfNot script_0800B6CC -script_0800B6D4: - CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 - JumpIfNot script_0800B6D4 - Call sub_08079184 - _0807E864 - Call sub_0807F9A4 - StartPlayerScript script_0800B7C4 - WaitForSomething2 0x00000004 - SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 - CheckLocalFlag 0x009f - JumpIf script_0800B7A2 - MessageNoOverlap 0x057b - WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x0000057d - JumpIf script_0800B6A6 - WaitUntilTextboxCloses - SetLocalFlag 0x009f - _0807F034 0x0064 - Jump script_0800B698 - .2byte 0x0000 -SCRIPT_START script_0800B730 - BeginBlock - EndBlock -script_0800B734: - Call sub_0808747C - JumpIfNot script_0800B734 - Call sub_08079184 - _0807E864 - Wait 0x000a - Call sub_0807F9A4 - StartPlayerScript script_0800B7C4 - WaitForSomething2 0x00000004 - SetRoomFlag 0x0000 - WaitForSomething2 0x00000004 - CheckLocalFlag 0x00a0 - JumpIf script_0800B7A2 - MessageNoOverlap 0x0580 - WaitUntilTextboxCloses - CallWithArg sub_0807F970, 0x00000582 - JumpIf script_0800B794 - CallWithArg sub_08087424, 0x00000001 - Wait 0x00b4 - Jump script_0800B6A6 -script_0800B794: - WaitUntilTextboxCloses - SetLocalFlag 0x00a0 - _0807F034 0x0065 - Jump script_0800B698 -script_0800B7A2: - MessageNoOverlap 0x0590 - WaitUntilTextboxCloses - _0807E778 0x0010 - DoFade7 - WaitFor_2 - ModHealth 0x00a0 - DoFade6 - WaitFor_2 - MessageNoOverlap 0x057f - WaitUntilTextboxCloses - Jump script_0800B6A6 - .2byte 0x0000 diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc deleted file mode 100644 index 32b4d19b..00000000 --- a/data/scripts/script_0800B7C4.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START script_0800B7C4 - BeginBlock - SetEntitySpeed 0x0100 - EndBlock - CallWithArg sub_0807F6B4, 0x00000090 - JumpIfNot script_0800B7FC - CallWithArg sub_0807F464, 0x00000078 - CallWithArg sub_0807F4F8, 0x00000090 -script_0800B7EE: - _0807E8E4_0 - DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 -SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc deleted file mode 100644 index 75771a0a..00000000 --- a/data/scripts/script_0800B7FC.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START script_0800B7FC - CallWithArg sub_0807F4F8, 0x00000090 - CallWithArg sub_0807F464, 0x00000078 - Jump script_0800B7EE - BeginBlock - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc deleted file mode 100644 index 43faad8a..00000000 --- a/data/scripts/script_0800B828.inc +++ /dev/null @@ -1,133 +0,0 @@ -SCRIPT_START script_0800B828 - BeginBlock - _0807E9D4 - _0807EB44 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0800B836: - _0807E944 - _0807E864 - MessageFromTarget 0x0a01 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800B836 - .2byte 0x0000 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0800B85E: - Wait 0x003c - Call sub_080646A4 - Jump script_0800B85E - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - _0807E930 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0800B87E: - Wait 0x003c - Call sub_0806407C - Jump script_0800B87E - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0800B89E: - CheckEntityInteractType - JumpIfNot script_0800B89E - _0807E864 - _0807EB74 - MessageFromTarget 0x0a01 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800B89E -SCRIPT_START script_0800B8B8 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - CallWithArg sub_08064644, sub_0806464C - EndBlock -script_0800B8D4: - Wait 0x003c - Call sub_080646A4 - Jump script_0800B8D4 - .2byte 0x0000 -SCRIPT_START script_0800B8E4 - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - Call sub_08061FD8 - EndBlock -script_0800B8FC: - CheckEntityInteractType - JumpIfNot script_0800B8FC - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800B8FC - .2byte 0x0000 -SCRIPT_START script_0800B91C - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - EndBlock - CheckLocalFlag 0x005f - JumpIf script_0800B94E -script_0800B934: - CheckEntityInteractType - JumpIfNot script_0800B934 - _0807E864 - _0807EB74 - MessageFromTarget 0x3f19 - WaitUntilTextboxCloses - SetLocalFlag 0x005f - _0807E878 - Jump script_0800B934 -script_0800B94E: - CheckEntityInteractType - JumpIfNot script_0800B94E - _0807E864 - _0807EB74 - MessageFromTarget 0x3f1a - WaitUntilTextboxCloses - _0807E878 - Jump script_0800B94E -SCRIPT_START script_0800B964 - BeginBlock - DoPostScriptAction 0x000b - DoPostScriptAction 0x0008 - Call sub_0806DAAC - JumpIf script_0800B9AC - Call sub_0806DAD0 - CallWithArg sub_0806DA04, 0x00000005 - EndBlock -script_0800B98A: - _0807EA4C - _0807E9F0 - JumpIf script_0800B99E - Call sub_0807DF50 - _0807E878 - Jump script_0800B98A -script_0800B99E: - Call sub_0806F188 - Call sub_0807DF50 - _0807E878 -script_0800B9AC: - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc deleted file mode 100644 index 79b4f784..00000000 --- a/data/scripts/script_0800B9B4.inc +++ /dev/null @@ -1,84 +0,0 @@ -SCRIPT_START script_0800B9B4 - BeginBlock - _0807E9D4 - Call sub_080694EC - DoPostScriptAction 0x000a - Call sub_080694B0 - EndBlock -script_0800B9CA: - Call sub_0807F434 - JumpTable script_0800B9CA, script_0800B9D8, script_0800B9F4 -script_0800B9D8: - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - Call sub_080694D8 - WaitUntilTextboxCloses - Call sub_080694EC - _0807E878 - Jump script_0800B9CA -script_0800B9F4: - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - Call sub_0807F650 - _0807E9F0 - _0807E864 - Call sub_0806948C - JumpIf script_0800BA24 - WaitUntilTextboxCloses - Call sub_080694EC - Call sub_0807DF50 - _0807E878 - Jump script_0800B9CA -script_0800BA24: - WaitUntilTextboxCloses - _0807E9DC - _0807E9D4 - Call sub_080694EC - Call sub_0807DF50 - _0807E878 - Jump script_0800B9CA -SCRIPT_START script_0800BA3C - BeginBlock - Call sub_0807F934 - EndBlock -script_0800BA46: - CheckEntityInteractType - JumpIfNot script_0800BA46 - _0807E864 - Call sub_0807DF28 - MessageFromTarget 0x3301 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0800BA6C - StopBgm - Call sub_0806E964 - PlayBGM -script_0800BA6C: - Call sub_0807DF50 - _0807E878 - Jump script_0800BA46 -SCRIPT_START script_0800BA78 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - SetEntitySpeed 0x0040 - Call sub_0807F348 - EndBlock -script_0800BA8E: - CheckRoomFlag 0x00ff - JumpIfNot script_0800BA8E - _0807EDD4 0x02f8, 0x0350 - Wait 0x001e - DoPostScriptAction 0x0004 - Wait 0x003c - _0807EB44 0x0006 - Wait 0x001e - _0807EDD4 0x02f0, 0x0350 - Wait 0x001e - MessageNoOverlap 0x0e00 - WaitUntilTextboxCloses - Wait 0x0078 - Call sub_08054968 -SCRIPT_END diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc deleted file mode 100644 index 14f85748..00000000 --- a/data/scripts/script_0800C550.inc +++ /dev/null @@ -1,274 +0,0 @@ -SCRIPT_START script_0800C550 - BeginBlock - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800C55E: - BeginBlock - CheckEntityInteractType - JumpIf script_0800C572 - Call sub_08060158 - EndBlock - Jump script_0800C55E -script_0800C572: - EndBlock - _0807E864 - Call sub_08060208 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800C55E -SCRIPT_START script_0800C584 - BeginBlock - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800C592: - BeginBlock - CheckEntityInteractType - JumpIf script_0800C5A6 - Call sub_08060158 - EndBlock - Jump script_0800C592 -script_0800C5A6: - EndBlock - _0807E864 - CheckInventory1 0x0067 - JumpIfNot script_0800C5BC - Call sub_08060208 - Jump script_0800C5C0 -script_0800C5BC: - MessageNoOverlap 0x4710 -script_0800C5C0: - WaitUntilTextboxCloses - _0807E878 - Jump script_0800C592 -SCRIPT_START script_0800C5C8 - BeginBlock - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800C5D6: - BeginBlock - CheckEntityInteractType - JumpIf script_0800C5EA - Call sub_08060158 - EndBlock - Jump script_0800C5D6 -script_0800C5EA: - EndBlock - _0807E864 - Call sub_08060270 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800C5D6 -SCRIPT_START script_0800C5FC - BeginBlock -script_0800C5FE: - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800C60A: - BeginBlock - CheckEntityInteractType - JumpIf script_0800C61E - Call sub_08060158 - EndBlock - Jump script_0800C60A -script_0800C61E: - EndBlock - _0807E864 - Call sub_0806021C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800C60A -SCRIPT_START script_0800C634 - BeginBlock - DoPostScriptAction 0x000a - SetEntitySpeed 0x0080 - _0807EB44 0x0004 - CheckLocalFlag 0x0082 - JumpIfNot script_0800C650 - OffsetEntityPosition 0x0010, 0x0000 -script_0800C650: - EndBlock -script_0800C652: - _0807E944 - _0807E864 - Call sub_0807DF28 - CheckLocalFlag 0x0082 - JumpIf script_0800C684 - CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 - JumpIfNot script_0800C674 - DoPostScriptAction 0x000b -script_0800C674: - StartPlayerScript script_0800C8C8 - WaitForSomething2 0x00000001 - DoPostScriptAction 0x000a -script_0800C684: - CheckInventory1 0x0040 - JumpIf script_0800C730 - CheckInventory1 0x005b - JumpIf script_0800C6B6 - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f16 - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - SetLocalFlag 0x0080 - Call sub_0807DF50 - _0807E878 - Jump script_0800C652 -script_0800C6B6: - CheckLocalFlag 0x0081 - JumpIf script_0800C6DC - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f1b - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - Call sub_0807DF50 - _0807E878 - Jump script_0800C652 -script_0800C6DC: - CheckLocalFlag 0x0082 - JumpIf script_0800C712 - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f17 - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - _0807EB44 0x0002 - DoPostScriptAction 0x0001 - _0807EC94 0x0020 - _0807EB44 0x0004 - Wait 0x000f - PlaySound SFX_SECRET - SetLocalFlag 0x0082 -script_0800C712: - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f18 - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - Call sub_0807DF50 - _0807E878 - Jump script_0800C652 -script_0800C730: - CheckLocalFlag 0x0083 - JumpIf script_0800C756 - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f19 - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - Call sub_0807DF50 - _0807E878 - Jump script_0800C652 -script_0800C756: - DoPostScriptAction 0x0002 - MessageFromTarget 0x1f1a - WaitUntilTextboxCloses - DoPostScriptAction 0x0015 - Wait 0x000a - Call sub_0807DF50 - _0807E878 - Jump script_0800C652 -SCRIPT_START script_0800C774 - BeginBlock - DoPostScriptAction 0x000a - _0807EB44 0x0004 - EndBlock -script_0800C780: - _0807E944 - _0807E864 - Call sub_0807DF28 - StartPlayerScript script_0800C8F0 - WaitForSomething2 0x00000001 - CheckInventory1 0x0040 - JumpIf script_0800C824 - CheckInventory1 0x005b - JumpIf script_0800C7C0 - _0807E930 0x0008 - MessageFromTarget 0x2122 - WaitUntilTextboxCloses - DoPostScriptAction 0x0000 - Call sub_0807DF50 - _0807E878 - Jump script_0800C780 -script_0800C7C0: - _0807E930 0x0008 - CheckLocalFlag 0x0081 - JumpIf script_0800C80A - MessageFromTarget 0x1130 - WaitUntilTextboxCloses - _0807EB28 0x1131 - WaitUntilTextboxCloses - _0807EB8C - MessageFromTarget 0x1132 - WaitUntilTextboxCloses - SetIntVariable 0x00000103 - Call sub_0807F420 - MessageFromTarget 0x1133 - WaitUntilTextboxCloses - Wait 0x000a - DoPostScriptAction 0x0000 - SetLocalFlag 0x0081 - Call sub_0807DF50 - _0807E878 - Jump script_0800C780 -script_0800C80A: - MessageFromTarget 0x1133 - WaitUntilTextboxCloses - Wait 0x000a - _0807E930 0x0000 - Call sub_0807DF50 - _0807E878 - Jump script_0800C780 -script_0800C824: - _0807E930 0x0008 - CheckLocalFlag 0x0083 - JumpIf script_0800C8AE - MessageFromTarget 0x1135 - WaitUntilTextboxCloses - SetEntitySpeed 0x0040 - _0807EDD4 0x0038, 0x0044 - DoPostScriptAction 0x0000 - Wait 0x000f - SetLocalFlag 0x0083 - Wait 0x003c - PlaySound SFX_SECRET - Wait 0x003c - _0807EB74 - _0807EB8C - MessageFromTarget 0x1136 - WaitUntilTextboxCloses - _0807EB28 0x1137 - WaitUntilTextboxCloses - Wait 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Call sub_0807DF50 - _0807E878 -script_0800C87C: - _0807E944 - _0807E864 - Call sub_0807DF28 - _0807EB74 - SetIntVariable 0x00000008 - Call sub_0807F3D8 - MessageFromTarget 0x1136 - WaitUntilTextboxCloses - Wait 0x000a - DoPostScriptAction 0x0000 - Call sub_0807DF50 - _0807E878 - Jump script_0800C87C -script_0800C8AE: - MessageFromTarget 0x1136 - WaitUntilTextboxCloses - Wait 0x000a - DoPostScriptAction 0x0000 - Call sub_0807DF50 - _0807E878 - Jump script_0800C780 diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc deleted file mode 100644 index 05613e87..00000000 --- a/data/scripts/script_0800C91C.inc +++ /dev/null @@ -1,82 +0,0 @@ -SCRIPT_START script_0800C91C - BeginBlock - _0807EB44 0x0004 - SetEntitySpeed 0x0300 - EndBlock -script_0800C928: - CheckPlayerInRegion 0x0208, 0x0360, 0x2040 - JumpIfNot script_0800C928 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_0800CA8C - WaitForSomething2 0x00000002 - Wait 0x003c - _0807EB28 0x1125 - WaitUntilTextboxCloses - _0807E5F8 0x00000800 - _0807E8E4_3 - Wait 0x003c - _0807E5F8 0x00000200 - _0807E8E4_0 - Wait 0x001e - _0807E5F8 0x00002000 - _0807E8E4_1 - Wait 0x0014 - _0807E5F8 0x00020000 - _0807E8E4_1 - Wait 0x000a - _0807E5F8 0x00008000 - _0807E8E4_3 - Wait 0x001e - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 - _0807E8E4_0 - Wait 0x003c - _0807E5F8 0x00000200 - WaitForSomething2 0x00000400 - _0807E8E4_0 - MessageFromTarget 0x1126 - Call sub_0807F40C - WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807E5F8 0x00000800 - _0807E5F8 0x00002000 - _0807E5F8 0x00008000 - _0807E5F8 0x00020000 - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 - _0807E8E4_3 - MessageFromTarget 0x1127 - WaitUntilTextboxCloses - _0807E5F8 0x00002000 - WaitForSomething2 0x00004000 - _0807E8E4_1 - MessageFromTarget 0x1128 - WaitUntilTextboxCloses - _0807E5F8 0x00000200 - _0807E5F8 0x00000800 - _0807E5F8 0x00002000 - _0807E5F8 0x00008000 - _0807E5F8 0x00020000 - WaitForSomething2 0x00000400 - WaitForSomething2 0x00001000 - WaitForSomething2 0x00004000 - WaitForSomething2 0x00010000 - WaitForSomething2 0x00040000 - _0807E8E4_0 - _0807EB28 0x1129 - WaitUntilTextboxCloses - SetLocalFlag 0x008d - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc deleted file mode 100644 index 5a3bef29..00000000 --- a/data/scripts/script_0800CD7C.inc +++ /dev/null @@ -1,296 +0,0 @@ -SCRIPT_START script_0800CD7C - BeginBlock - CheckInventory1 0x005b - JumpIfNot script_0800C5FE - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800CD92: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800CDA6 - Call sub_08060158 - Jump script_0800CD92 -script_0800CDA6: - EndBlock - _0807E864 - Call sub_0807DF28 - CheckLocalFlag 0x009d - JumpIf script_0800CDC4 - SetLocalFlag 0x009d - MessageNoOverlap 0x213d - Jump script_0800CF40 -script_0800CDC4: - CheckGlobalFlag 0x003b - JumpIf script_0800CE46 - CheckGlobalFlag 0x0054 - JumpIfNot script_0800CDEC - CheckRoomFlag 0x0000 - JumpIfNot script_0800CF2A - SetGlobalFlag 0x003b - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2141 - Jump script_0800CF40 -script_0800CDEC: - MessageNoOverlap 0x213e - WaitUntilTextboxCloses - _0807E48C 0x0023 - JumpIfNot script_0800CE14 - MessageNoOverlap 0x214b - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0800CF40 - PlaySound SFX_TASK_COMPLETE - _0807F088 0x0023 - WaitPlayerGetItem - Jump script_0800CE32 -script_0800CE14: - _0807E48C 0x0022 - JumpIfNot script_0800CF40 - MessageNoOverlap 0x214b - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0800CF40 - PlaySound SFX_TASK_COMPLETE - _0807F088 0x0022 - WaitPlayerGetItem -script_0800CE32: - _0807EB8C - SetGlobalFlag 0x0054 - Call sub_08060340 - MessageNoOverlap 0x213f - Jump script_0800CF02 -script_0800CE46: - CheckGlobalFlag 0x003c - JumpIf script_0800CEA6 - CheckGlobalFlag 0x0054 - JumpIfNot script_0800CE6E - CheckRoomFlag 0x0000 - JumpIfNot script_0800CF2A - SetGlobalFlag 0x003c - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2145 - Jump script_0800CF40 -script_0800CE6E: - MessageNoOverlap 0x2142 - WaitUntilTextboxCloses - _0807E48C 0x0027 - JumpIfNot script_0800CF40 - MessageNoOverlap 0x214c - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0800CF40 - PlaySound SFX_TASK_COMPLETE - _0807F088 0x0027 - WaitPlayerGetItem - _0807EB8C - SetGlobalFlag 0x0054 - Call sub_08060340 - MessageNoOverlap 0x2143 - Jump script_0800CF02 -script_0800CEA6: - CheckGlobalFlag 0x003d - JumpIf script_0800CF3C - CheckGlobalFlag 0x0054 - JumpIfNot script_0800CECE - CheckRoomFlag 0x0000 - JumpIfNot script_0800CF2A - SetGlobalFlag 0x003d - ClearGlobalFlag 0x0054 - MessageNoOverlap 0x2149 - Jump script_0800CF40 -script_0800CECE: - MessageNoOverlap 0x2146 - WaitUntilTextboxCloses - _0807E48C 0x0024 - JumpIfNot script_0800CF40 - MessageNoOverlap 0x214d - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0800CF40 - PlaySound SFX_TASK_COMPLETE - _0807F088 0x0024 - WaitPlayerGetItem - _0807EB8C - SetGlobalFlag 0x0054 - Call sub_08060340 - MessageNoOverlap 0x2147 -script_0800CF02: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 -script_0800CF0C: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800CF20 - Call sub_08060158 - Jump script_0800CF0C -script_0800CF20: - EndBlock - _0807E864 - Call sub_0807DF28 -script_0800CF2A: - MessageNoOverlap 0x2140 - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_0800CF0C -script_0800CF3C: - MessageNoOverlap 0x214a -script_0800CF40: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_0800CD92 - .2byte 0x0000 -SCRIPT_START script_0800CF50 - BeginBlock - Call sub_08068104 - DoPostScriptAction 0x000a - EndBlock -script_0800CF5E: - BeginBlock - CheckEntityInteractType - JumpIf script_0800CF72 - Call sub_0806811C - EndBlock - Jump script_0800CF5E -script_0800CF72: - EndBlock - _0807E864 - Call sub_08068190 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800CF5E -SCRIPT_START script_0800CF88 - BeginBlock - Call sub_08068104 - DoPostScriptAction 0x000a - EndBlock -script_0800CF96: - _0807E944 - _0807E864 - Call sub_08068190 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800CF96 -SCRIPT_START script_0800CFAC - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock - CheckInventory1 0x0041 - JumpIf script_0800CFD2 - CheckLocalFlag 0x007e - JumpIfNot script_0800CFD2 - _0807E930 0x0008 -script_0800CFD2: - CheckInventory1 0x0002 - JumpIf script_0800CFFA - CheckInventory1 0x0041 - JumpIfNot script_0800CFEC - _0807E5F8 0x00000020 - Jump script_0800CFFA -script_0800CFEC: - CheckLocalFlag 0x007e - JumpIfNot script_0800CFFA - _0807E5F8 0x00000010 -script_0800CFFA: - EndBlock - BeginBlock - Call sub_08068910 - CheckEntityInteractType - JumpIfNot script_0800CFFA - EndBlock - _0807E864 - Call sub_0807DF28 - CheckInventory1 0x0002 - JumpIfNot script_0800D032 - _0807EB74 - SetIntVariable 0x00000000 - Call sub_0806C028 - MessageNoOverlap 0x1219 - Jump script_0800D17C -script_0800D032: - CheckInventory1 0x0041 - JumpIfNot script_0800D098 - StartPlayerScript script_0800D190 - WaitForSomething2 0x00000008 - _0807EB74 - SetIntVariable 0x00000000 - Call sub_0806C028 - MessageFromTargetPos 0x125c, 0x0002 - WaitUntilTextboxCloses - StartPlayerScript script_0800D1B4 - WaitForSomething2 0x00000008 - _0807EB44 0x0002 - SetIntVariable 0x00000000 - Call sub_0806C028 - Wait 0x000f - _0807E5F8 0x00000020 - StartPlayerScript script_0800D1E0 - WaitForSomething2 0x00000008 - MessageFromTargetPos 0x125d, 0x0002 - Jump script_0800D17C -script_0800D098: - CheckLocalFlag 0x007e - JumpIfNot script_0800D0A8 - MessageFromTarget 0x123e - Jump script_0800D17C -script_0800D0A8: - StartPlayerScript script_0800D190 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807EB74 - SetIntVariable 0x00000000 - Call sub_0806C028 - MessageFromTargetPos 0x123d, 0x0002 - WaitUntilTextboxCloses - StartPlayerScript script_0800D1B4 - WaitForSomething2 0x00000008 - _0807EB44 0x0002 - SetIntVariable 0x00000000 - Call sub_0806C028 - PlaySound SFX_TASK_COMPLETE - Call sub_08068964 -script_0800D108: - ComparePlayerAction 0x0008 - JumpIf script_0800D108 - PlaySound SFX_F8 - _0807E5F8 0x00000010 - SetLocalFlag 0x007e - MessageFromTargetPos 0x123e, 0x0002 - WaitUntilTextboxCloses - Wait 0x000f - _0807E930 0x0009 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - Wait 0x001e - MessageFromTargetPos 0x123f, 0x0002 - WaitUntilTextboxCloses - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000004 - _0807E930 0x0008 - Wait 0x003c - Call sub_08095164 - _0807EB28 0x1240 -script_0800D17C: - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Call sub_0807DF50 - Jump script_0800CFFA - .2byte 0x0000 diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc deleted file mode 100644 index 741fe977..00000000 --- a/data/scripts/script_0800D218.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START script_0800D218 - BeginBlock - CheckInventory1 0x0041 - JumpIf script_0800D24C - CheckLocalFlag 0x007e - JumpIf script_0800D242 - DoPostScriptAction 0x0008 - EndBlock - WaitForSomething2 0x00000010 - DoPostScriptAction 0x0007 - WaitForSomething2 0x00000010 -SCRIPT_END diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc deleted file mode 100644 index c441c743..00000000 --- a/data/scripts/script_0800D242.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_0800D242 - DoPostScriptAction 0x0007 - _0807E930 0x0003 -SCRIPT_END diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc deleted file mode 100644 index f56e72d8..00000000 --- a/data/scripts/script_0800D24C.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_0800D24C - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc deleted file mode 100644 index f601fb80..00000000 --- a/data/scripts/script_0800D254.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START script_0800D254 - BeginBlock - DoPostScriptAction 0x0008 - EndBlock - WaitForSomething2 0x00000020 - DoPostScriptAction 0x0007 - WaitForSomething2 0x00000020 - DoPostScriptAction 0x0008 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc deleted file mode 100644 index 7187c45d..00000000 --- a/data/scripts/script_0800D278.inc +++ /dev/null @@ -1,113 +0,0 @@ -SCRIPT_START script_0800D278 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_0800D282: - CheckInventory1 0x0041 - JumpIf script_0800D292 - CheckLocalFlag 0x007e - JumpIf script_0800D2EA -script_0800D292: - BeginBlock - TestBit 0x00000001 - JumpIf script_0800D2C6 - CheckEntityInteractType - JumpIf script_0800D2B0 - Call sub_0806811C - EndBlock - Jump script_0800D282 -script_0800D2B0: - EndBlock - _0807E864 - Call sub_08068190 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800D282 -script_0800D2C6: - EndBlock - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000004 - _0807E930 0x000c - WaitForSomething2 0x00000001 - _0807E5F8 0x00000004 -script_0800D2EA: - _0807E930 0x000b -script_0800D2EE: - CheckEntityInteractType - JumpIfNot script_0800D2EE - _0807E864 - Call sub_08068190 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800D2EE -SCRIPT_START script_0800D308 - BeginBlock - Call sub_08068884 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock -script_0800D31E: - EndBlock - BeginBlock - Call sub_08068910 - CheckEntityInteractType - JumpIfNot script_0800D31E - EndBlock - _0807E864 - _0807EB74 - SetIntVariable 0x00000000 - Call sub_0806C028 - MessageFromTarget 0x1219 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800D31E -SCRIPT_START script_0800D350 - BeginBlock - Call sub_08068104 - DoPostScriptAction 0x000a - EndBlock -script_0800D35E: - BeginBlock - CheckEntityInteractType - JumpIf script_0800D372 - Call sub_0806811C - EndBlock - Jump script_0800D35E -script_0800D372: - EndBlock - _0807E864 - Call sub_08068190 - WaitUntilTextboxCloses - Wait 0x000f - CheckLocalFlag 0x007f - JumpIf script_0800D3E4 - CheckLocalFlag 0x007e - JumpIfNot script_0800D3E4 - DoPostScriptAction 0x000b - SetEntitySpeed 0x0100 - CheckPlayerInRegion 0x0090, 0x0130, 0x0810 - JumpIfNot script_0800D3B2 - StartPlayerScript script_0800D3EC - WaitForSomething2 0x00000001 -script_0800D3B2: - _0807EB44 0x0002 - _0807E930 0x0005 - _0807EDD4 0x00a0, 0x0130 - _0807EB44 0x0006 - _0807E930 0x0003 - SetIntVariable 0x00000004 - Call sub_080681D8 - PlaySound SFX_TASK_COMPLETE - Wait 0x001e - DoPostScriptAction 0x000a - SetLocalFlag 0x007f -script_0800D3E4: - _0807E878 - Jump script_0800D35E - .2byte 0x0000 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc deleted file mode 100644 index 84de7598..00000000 --- a/data/scripts/script_0800D710.inc +++ /dev/null @@ -1,23 +0,0 @@ -SCRIPT_START script_0800D710 - BeginBlock - Call sub_0807F360 - SetEntitySpeed 0x0700 - _0807F0B4 0x0007 - CameraTargetEntity - Call sub_0807FBC4 - EndBlock - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x0000000a - WaitForSomething2 0x00000004 - _0807EEB4 - _0807F0B4 0x0004 - CameraTargetPlayer - Call sub_0807FBCC - _0807E878 - Call sub_0807DF50 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc deleted file mode 100644 index 01e60a1f..00000000 --- a/data/scripts/script_0800D76C.inc +++ /dev/null @@ -1,51 +0,0 @@ -SCRIPT_START script_0800D76C - BeginBlock - Call sub_0807F360 - DoPostScriptAction 0x000b - SetEntitySpeed 0x0200 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock - WaitForSomething2 0x00000008 - DoPostScriptAction 0x0004 - Wait 0x003c - PlaySound SFX_123 - CallWithArg sub_0807F464, 0x000001e0 - _0807EDD4 0x01e0, 0x01d8 - _0807EB44 0x0002 - DoPostScriptAction 0x0000 - _0807E5F8 0x00000010 - PlaySound SFX_PLY_JUMP - _0807EF3C 0x0180, 0x0030 - PlaySound SFX_PLY_JUMP - _0807EF3C 0x0180, 0x0030 - _0807EB44 0x0002 - DoPostScriptAction 0x0001 - WaitForSomething2 0x00000008 - Jump script_0800D80C -SCRIPT_START script_0800D7DC - BeginBlock - Call sub_0807F360 - DoPostScriptAction 0x000b - SetEntityPositionRelative 0x0268, 0x01d8 - SetEntitySpeed 0x0100 - EndBlock - WaitForSomething2 0x00000002 - _0807EDD4 0x01f0, 0x01d8 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 -script_0800D80C: - SetEntitySpeed 0x0100 - _0807EEF4 0x0000, 0xffe0 - DoPostScriptAction 0x000e - Call sub_0806CA5C - SetEntity0x20 0x00040000 - PlaySound SFX_F5 -script_0800D82A: - CallWithArg sub_0807F8D0, 0xffffe000 - Call sub_0807F8BC - JumpIf script_0800D82A - _0807E5F8 0x00000004 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc deleted file mode 100644 index bfed0909..00000000 --- a/data/scripts/script_0800DA28.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START script_0800DA28 - BeginBlock - DoPostScriptAction 0x0008 - SetEntitySpeed 0x0080 - EndBlock - WaitForSomething2 0x00000004 - DoPostScriptAction 0x0007 - Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807EDD4 0x0118, 0x0060 - _0807E5F8 0x00000002 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc deleted file mode 100644 index 3d28d73b..00000000 --- a/data/scripts/script_0800DE78.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START script_0800DE78 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_0800DEB0 - WaitForSomething2 0x00000001 - WaitForSomething2 0x00000002 - _0807EB28 0x1647 - WaitUntilTextboxCloses - SetLocalFlag 0x007a - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc deleted file mode 100644 index 3b30dd5e..00000000 --- a/data/scripts/script_0800E0BC.inc +++ /dev/null @@ -1,355 +0,0 @@ -SCRIPT_START script_0800E0BC - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CheckLocalFlag 0x0093 - JumpIf script_0800E12E - _0807E930 0x0008 - CallWithArg sub_0807F8E8, 0x00000000 - EndBlock -script_0800E0DE: - CheckRoomFlag 0x0000 - JumpIfNot script_0800E0DE - _0807E864 - Wait 0x001e - DoPostScriptAction 0x0010 - PlaySound SFX_1C9 - _0807E930 0x0009 - Wait 0x003c - PlaySound SFX_1CA - DoPostScriptAction 0x0010 - Wait 0x001e - PlaySound SFX_SECRET - Wait 0x0078 - DoPostScriptAction 0x0004 - Wait 0x001e - DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 - Wait 0x000a - MessageNoOverlap 0x2402 - WaitUntilTextboxCloses - SetLocalFlag 0x0093 -script_0800E12E: - Call sub_080668F0 - _0807E878 - EndBlock -script_0800E138: - CheckEntityInteractType - JumpIfNot script_0800E138 - _0807E864 - _0807EB74 - MessageNoOverlap 0x2402 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E138 - .2byte 0x0000 -SCRIPT_START script_0800E154 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CheckLocalFlag 0x0094 - JumpIf script_0800E1D0 - _0807E930 0x0010 - CallWithArg sub_0807F8E8, 0x00000001 - EndBlock -script_0800E176: - CheckRoomFlag 0x0001 - JumpIfNot script_0800E176 - _0807E864 - Wait 0x001e - DoPostScriptAction 0x0010 - PlaySound SFX_1C9 - _0807E930 0x0015 - Wait 0x003c - PlaySound SFX_1CA - DoPostScriptAction 0x0010 - Wait 0x001e - PlaySound SFX_SECRET - Wait 0x0078 - DoPostScriptAction 0x0004 - Wait 0x001e - DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - Wait 0x000a - MessageNoOverlap 0x2401 - WaitUntilTextboxCloses - SetLocalFlag 0x0094 -script_0800E1D0: - CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock -script_0800E1E0: - CheckEntityInteractType - JumpIfNot script_0800E1E0 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2401 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E1E0 -SCRIPT_START script_0800E200 - BeginBlock - SetEntitySpeed 0x0100 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CheckLocalFlag 0x0073 - JumpIfNot script_0800E232 - _0807E9D4 - SetEntityPositionRelative 0x0070, 0x0168 - _0807EB44 0x0002 - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - Jump script_0800E32E -script_0800E232: - CheckLocalFlag 0x0095 - JumpIf script_0800E29A - _0807E930 0x0010 - CallWithArg sub_0807F8E8, 0x00000002 - EndBlock -script_0800E24A: - CheckRoomFlag 0x0002 - JumpIfNot script_0800E24A - _0807E864 - Wait 0x001e - DoPostScriptAction 0x0010 - PlaySound SFX_1C9 - _0807E930 0x0015 - Wait 0x003c - PlaySound SFX_1CA - DoPostScriptAction 0x0010 - Wait 0x001e - PlaySound SFX_SECRET - Wait 0x0078 - DoPostScriptAction 0x0004 - Wait 0x001e - DoPostScriptAction 0x0000 - _0807EB8C - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - SetLocalFlag 0x0095 -script_0800E29A: - DoPostScriptAction 0x0000 - CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - _0807E878 - EndBlock -script_0800E2AE: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800E312 - CheckLocalFlag 0x0093 - JumpIfNot script_0800E2AE - CheckLocalFlag 0x0094 - JumpIfNot script_0800E2AE - CheckLocalFlag 0x0095 - JumpIfNot script_0800E2AE - _0807E9DC - SetLocalFlag 0x0073 - EndBlock - _0807EB44 0x0000 - CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0088, 0x0168 - _0807EB44 0x0006 - CallWithArg sub_0807F3D8, 0x00000004 - _0807EDD4 0x0070, 0x0168 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - _0807E9D4 - Jump script_0800E32E -script_0800E312: - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock - MessageNoOverlap 0x2404 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E2AE -script_0800E32E: - CheckEntityInteractType - JumpIfNot script_0800E32E - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2403 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E32E - .2byte 0x0000 -SCRIPT_START script_0800E350 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CheckLocalFlag 0x0071 - JumpIf script_0800E3E8 - CheckLocalFlag 0x0096 - JumpIf script_0800E3BE - _0807E930 0x000c - CallWithArg sub_0807F8E8, 0x00000000 - EndBlock -script_0800E37A: - CheckRoomFlag 0x0000 - JumpIfNot script_0800E37A - _0807E864 - Wait 0x001e - DoPostScriptAction 0x0010 - PlaySound SFX_1C9 - _0807E930 0x000d - Wait 0x003c - PlaySound SFX_1CA - DoPostScriptAction 0x0010 - Wait 0x001e - PlaySound SFX_SECRET - Wait 0x0078 - DoPostScriptAction 0x0004 - Wait 0x001e - DoPostScriptAction 0x0000 - _0807EB74 - SetLocalFlag 0x0096 -script_0800E3BE: - DoPostScriptAction 0x0000 - _0807E9D4 - _0807E878 - EndBlock -script_0800E3C8: - CheckEntityInteractType - JumpIfNot script_0800E3C8 - _0807E864 - _0807EB74 - MessageNoOverlap 0x240c - WaitUntilTextboxCloses - Wait 0x000f - _0807F034 0x0053 - WaitPlayerGetItem - SetLocalFlag 0x0071 - _0807E878 -script_0800E3E8: - _0807E9D4 - _0807E878 - EndBlock -script_0800E3EE: - CheckEntityInteractType - JumpIfNot script_0800E3EE - _0807E864 - _0807EB74 - MessageNoOverlap 0x240d - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E3EE -SCRIPT_START script_0800E408 - BeginBlock - _0807EB44 0x0002 - DoPostScriptAction 0x000a - Call sub_080668F0 - EndBlock -script_0800E41A: - CheckEntityInteractType - JumpIfNot script_0800E41A - _0807E864 - _0807EB74 - MessageNoOverlap 0x2406 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E41A -SCRIPT_START script_0800E434 - BeginBlock - _0807EB44 0x0002 - CallWithArg sub_0807F3D8, 0x00000000 - DoPostScriptAction 0x000a - _0807E9D4 - EndBlock -script_0800E44C: - CheckEntityInteractType - JumpIfNot script_0800E44C - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2405 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E44C -SCRIPT_START script_0800E46C - BeginBlock - _0807EB44 0x0004 - CallWithArg sub_0807F3D8, 0x00000000 - DoPostScriptAction 0x000a - _0807E9D4 - EndBlock -script_0800E484: - CheckEntityInteractType - JumpIfNot script_0800E484 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageNoOverlap 0x2407 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E484 - - -SCRIPT_START script_0800E4A4 - BeginBlock - Call sub_0807F354 - EndBlock - CheckLocalFlag 0x007c - JumpIf script_0800E4FA -script_0800E4B6: -.ifdef JP - CheckPlayerInRegion 0x0088, 0x0100, 0x0820 -.else -.ifdef EU - CheckPlayerInRegion 0x0088, 0x0100, 0x0820 -.else - CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 -.endif -.endif - JumpIfNot script_0800E4B6 - BeginBlock - _0807E864 -.ifdef JP -.ifndef DEMO_JP - Call SetPlayerEventPriority -.endif -.else -.ifdef EU - Call SetPlayerEventPriority -.endif -.endif - EndBlock - Call sub_0807F3F8 - Wait 0x003c - MessageFromTarget 0x160c - WaitUntilTextboxCloses - Wait 0x001e - MessageFromTarget 0x160d - WaitUntilTextboxCloses - Wait 0x001e - _0807EB28 0x160e - Wait 0x003c - WaitUntilTextboxCloses - BeginBlock - PlayBgm BGM_FIGHT_THEME2 - SetLocalFlag 0x007c -.ifdef JP -.ifndef DEMO_JP - Call ResetPlayerEventPriority -.endif -.else -.ifdef EU - Call ResetPlayerEventPriority -.endif -.endif -script_0800E4FA: - _0807E878 - DoPostScriptAction 0x0006 - EndBlock -SCRIPT_END diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc deleted file mode 100644 index 49daf384..00000000 --- a/data/scripts/script_0800E5C4.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START script_0800E5C4 - BeginBlock - CheckLocalFlag 0x0086 - JumpIfNot script_0800E5D6 - DoPostScriptAction 0x0006 - EndBlock -SCRIPT_END diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc deleted file mode 100644 index 3ecd0d05..00000000 --- a/data/scripts/script_0800E6B0.inc +++ /dev/null @@ -1,161 +0,0 @@ -SCRIPT_START script_0800E6B0 - BeginBlock - Call sub_08060090 - DoPostScriptAction 0x000a - EndBlock -script_0800E6BE: - BeginBlock - CheckEntityInteractType - JumpIf script_0800E6D2 - Call sub_08060158 - EndBlock - Jump script_0800E6BE -script_0800E6D2: - EndBlock - _0807E864 - Call sub_0806025C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E6BE -SCRIPT_START script_0800E6E8 - BeginBlock - Call sub_0806ADFC - DoPostScriptAction 0x000a -script_0800E6F4: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800E708 - Call sub_0806AEE4 - Jump script_0800E6F4 -script_0800E708: - EndBlock - _0807E864 - Call sub_0806AFE8 - JumpIf script_0800E722 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E6F4 -script_0800E722: - WaitUntilTextboxCloses - _0807F034 0x0057 - WaitPlayerGetItem - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E6F4 - .2byte 0x0000 -SCRIPT_START script_0800E734 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_0800E73E: - CheckEntityInteractType - JumpIfNot script_0800E73E - _0807E864 - _0807EB74 - CallWithArg sub_0806AF60, 0x00000000 - Call sub_0806AFE8 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800E73E -SCRIPT_START script_0800E760 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - SetEntitySpeed 0x0200 - CheckGlobalFlag 0x0029 - JumpIfNot script_0800E77C - CheckGlobalFlag 0x002a - JumpIfNot script_0800E786 -script_0800E77C: - SetEntityPositionRelative 0x0188, 0x0098 - Jump script_0800E6F4 -script_0800E786: - EndBlock -script_0800E788: - BeginBlock - CheckGlobalFlag 0x002a - JumpIf script_0800E7BA - CheckEntityInteractType - JumpIf script_0800E7A4 - Call sub_0806AEE4 - EndBlock - Jump script_0800E788 -script_0800E7A4: - EndBlock - _0807E864 - Call sub_0806AFE8 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800E788 -script_0800E7BA: - DoPostScriptAction 0x000f - _0807EB44 0x0002 - CallWithArg sub_0806AF60, 0x00000004 - Call sub_0806AF70 - _0807EE04 0x0188, 0x0058 -script_0800E7D8: - EndBlock - BeginBlock - Call sub_0806AF78 - _0807EE30 - JumpIfNot script_0800E7D8 - EntityHasHeight - JumpIf script_0800E7D8 - EndBlock - Jump script_0800E6F4 -SCRIPT_START script_0800E7F4 - BeginBlock - Call sub_0806C674 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - EndBlock -script_0800E806: - CheckEntityInteractType - JumpIfNot script_0800E806 - _0807E864 - _0807EB74 - Call sub_0806C70C - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - Jump script_0800E806 - .2byte 0x0000 -SCRIPT_START script_0800E824 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0000 - EndBlock -script_0800E832: - CheckEntityInteractType - JumpIfNot script_0800E832 - _0807E864 - _0807EB44 0x0004 - BeginBlock - MessageFromTarget 0x4501 - CallWithArg sub_0807F854, 0x00010032 - CallWithArg sub_0807F854, 0x000200c8 - CallWithArg sub_0807F854, 0x00030190 - EndBlock - WaitUntilTextboxCloses - _0807EB38 - JumpTable script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 -script_0800E872: - BeginBlock - MessageFromTarget 0x4505 - CallWithArg sub_0807F854, 0x00010190 - EndBlock - WaitUntilTextboxCloses - HasRupees 0x0190 - JumpIfNot script_0800E908 - ModRupees 0xfe70 - SetLocalFlag 0x0091 - MessageFromTarget 0x4508 - WaitUntilTextboxCloses - Call sub_0806C578 -SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc deleted file mode 100644 index be2a5614..00000000 --- a/data/scripts/script_0800E908.inc +++ /dev/null @@ -1,73 +0,0 @@ -SCRIPT_START script_0800E908 - MessageFromTarget 0x4507 - Jump script_0800E914 -script_0800E910: - MessageFromTarget 0x4509 -script_0800E914: - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 - Jump script_0800E832 -SCRIPT_START script_0800E920 - BeginBlock - Call sub_0806C4F8 - DoPostScriptAction 0x000a - _0807EB44 0x0000 - EndBlock -script_0800E932: - CheckEntityInteractType - JumpIfNot script_0800E932 - _0807E864 - _0807EB44 0x0004 - _0807E930 0x0004 -script_0800E942: - Call sub_0806C4A8 - JumpIfNot script_0800E942 - Call sub_0806C4DC - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0000 - _0807E930 0x0000 - Jump script_0800E932 - .2byte 0x0000 -SCRIPT_START script_0800E964 - BeginBlock - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock -script_0800E974: - CheckEntityInteractType - JumpIfNot script_0800E974 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 - Call sub_0806B260 - JumpIfNot script_0800E9E4 - WaitUntilTextboxCloses - DoPostScriptAction 0x000b - StartPlayerScript script_0800E9F4 - WaitForSomething2 0x00000001 - DoPostScriptAction 0x000a - MessageFromTarget 0x4a24 - WaitUntilTextboxCloses - _0807E930 0x000a - Wait 0x0014 - MessageFromTarget 0x4a25 - WaitUntilTextboxCloses - _0807E930 0x0000 - StartPlayerScript script_0800EA1C - WaitForSomething2 0x00000001 - SetLocalFlag 0x0074 - PlaySound SFX_SECRET - Wait 0x00f0 - MessageFromTarget 0x4a26 - WaitUntilTextboxCloses - SetLocalFlag 0x0075 -script_0800E9E4: - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - _0807E930 0x0000 - Jump script_0800E974 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc deleted file mode 100644 index be000e41..00000000 --- a/data/scripts/script_0800EA54.inc +++ /dev/null @@ -1,360 +0,0 @@ -SCRIPT_START script_0800EA54 - BeginBlock - Call sub_0806CE5C - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 - EndBlock -script_0800EA6A: - CheckEntityInteractType - JumpIfNot script_0800EA6A - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000004 - Call sub_0807F2D4 - _0807E930 0x0009 - Call sub_0806CE80 - WaitUntilTextboxCloses - _0807E878 - _0807E930 0x000a - Call sub_0807F2D4 - _0807E930 0x0008 - Jump script_0800EA6A -SCRIPT_START script_0800EAA4 - BeginBlock - _0807E9D4 - Call sub_0806C09C - DoPostScriptAction 0x000a - _0807E930 0x0000 - _0807EB44 0x0004 - EndBlock -script_0800EABC: - CheckEntityInteractType - JumpIfNot script_0800EABC - BeginBlock - _0807E864 - _0807EB74 - CallWithArg sub_0806C028, 0x00000004 - EndBlock -script_0800EAD4: - Call sub_0806C00C - JumpIfNot script_0800EAD4 - _0807E930 0x0008 - Call sub_0806C038 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - _0807E930 0x0000 - Jump script_0800EABC -SCRIPT_START script_0800EAF8 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock -script_0800EB0E: - _0807E30C - JumpIfNot script_0800EB0E - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800EB0E - .2byte 0x0000 -SCRIPT_START script_0800EB2C - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - Call sub_08061FD8 - EndBlock -script_0800EB44: - CheckEntityInteractType - JumpIfNot script_0800EB44 - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800EB44 - .2byte 0x0000 -SCRIPT_START script_0800EB64 - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0006 - Call sub_08061FD8 - EndBlock -script_0800EB7C: - CheckEntityInteractType - JumpIfNot script_0800EB7C - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0006 - Call sub_08061FD8 - Jump script_0800EB7C - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0002 - Call sub_08061FD8 - EndBlock - Jump script_0800EBF4 -SCRIPT_START script_0800EBC0 - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - Call sub_08061FD8 - EndBlock - Jump script_0800EBF4 -SCRIPT_START script_0800EBDC - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0006 - Call sub_08061FD8 - EndBlock -script_0800EBF4: - CheckEntityInteractType - JumpIfNot script_0800EBF4 - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800EBF4 - .2byte 0x0000 -SCRIPT_START script_0800EC14 - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0002 - Call sub_08061FD8 - EndBlock -script_0800EC2C: - CheckEntityInteractType - JumpIfNot script_0800EC2C - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0002 - Call sub_08061FD8 - Jump script_0800EC2C -SCRIPT_START script_0800EC54 - BeginBlock - Call sub_08061E70 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - Call sub_08061FD8 - EndBlock -script_0800EC6C: - CheckEntityInteractType - JumpIfNot script_0800EC6C - _0807E864 - _0807EB74 - Call sub_08061FD8 - Call sub_08062048 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800EC6C - .2byte 0x0000 -SCRIPT_START script_0800EC8C - BeginBlock - _0807E9D4 - CallWithArg sub_08061FB8, 0x00000001 - SetEntitySpeed 0x0040 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0002 - EndBlock -script_0800ECAC: - _0807EB44 0x0006 - _0807E930 0x0007 - _0807EDD4 0x0028, 0x0050 - Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 - Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0001 - Wait 0x001e - _0807EB44 0x0002 - _0807E930 0x0005 - _0807EDD4 0x0048, 0x0050 - Wait 0x001e - _0807EB44 0x0004 - _0807E930 0x0002 - Wait 0x001e - _0807EB44 0x0006 - _0807E930 0x0003 - Wait 0x001e - Jump script_0800ECAC -SCRIPT_START script_0800ED04 - BeginBlock - Call sub_080639D0 - DoPostScriptAction 0x000a - EndBlock - BeginBlock - CallWithArg sub_08063850, 0x00000000 - EndBlock -script_0800ED20: - CheckEntityInteractType - JumpIfNot script_0800ED20 - _0807E864 - _0807EB74 - CallWithArg sub_08063850, 0x00000000 - Call sub_08063944 - WaitUntilTextboxCloses - JumpIfNot script_0800ED46 - _0807F050 0x0070 - WaitPlayerGetItem -script_0800ED46: - _0807E878 - Call sub_08063874 - CallWithArg sub_08063850, 0x00000000 - Jump script_0800ED20 -SCRIPT_START script_0800ED5C - BeginBlock - Call sub_08064CC0 - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807EB44 0x0002 - _0807E930 0x0000 - EndBlock -script_0800ED76: - _0807E944 - _0807E864 - _0807EB74 - Call sub_08064CD8 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800ED76 - .2byte 0x0000 -SCRIPT_START script_0800ED90 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a -script_0800ED98: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800EDB6 - TestBit 0x00000001 - JumpIf script_0800EE12 - Call sub_0806AEE4 - Jump script_0800ED98 -script_0800EDB6: - EndBlock - _0807E864 - Call sub_0807DF28 - CheckLocalFlag 0x00ae - JumpIf script_0800EE3E - Wait 0x000a - _0807E5F8 0x00000001 - MessageFromTarget 0x4c07 - WaitUntilTextboxCloses - _0807E5F8 0x00000010 - MessageFromTarget 0x4c08 - WaitUntilTextboxCloses - _0807E5F8 0x00000020 - MessageFromTarget 0x4c09 - WaitUntilTextboxCloses - SetIntVariable 0x00000503 - Call sub_0807F420 - _0807E5F8 0x00000040 - Call sub_0807DF50 - _0807E878 - SetLocalFlag 0x00ae - Jump script_0800ED98 -script_0800EE12: - EndBlock - WaitForSomething2 0x00000002 - _0807EB44 0x0002 - CallWithArg sub_0806AF60, 0x00000008 - WaitForSomething2 0x00000004 - Call sub_0806AED8 - WaitForSomething2 0x00000008 - Jump script_0800ED98 -script_0800EE3E: - MessageFromTarget 0x4c16 - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_0800ED98 -SCRIPT_START script_0800EE50 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a -script_0800EE58: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_0800EE76 - TestBit 0x00000001 - JumpIf script_0800EED2 - Call sub_0806AEE4 - Jump script_0800EE58 -script_0800EE76: - EndBlock - _0807E864 - Call sub_0807DF28 - CheckLocalFlag 0x00ae - JumpIf script_0800EEFE - Wait 0x000a - _0807E5F8 0x00000001 - MessageFromTarget 0x4c07 - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - MessageFromTarget 0x4c08 - WaitUntilTextboxCloses - _0807E5F8 0x00000004 - MessageFromTarget 0x4c09 - WaitUntilTextboxCloses - SetIntVariable 0x00000503 - Call sub_0807F420 - _0807E5F8 0x00000008 - Call sub_0807DF50 - _0807E878 - SetLocalFlag 0x00ae - Jump script_0800EE58 -script_0800EED2: - EndBlock - WaitForSomething2 0x00000010 - _0807EB44 0x0006 - CallWithArg sub_0806AF60, 0x00000008 - WaitForSomething2 0x00000020 - Call sub_0806AED8 - WaitForSomething2 0x00000040 - Jump script_0800EE58 -script_0800EEFE: - MessageFromTarget 0x4c15 - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_0800EE58 - MessageFromTarget 0x4c07 - WaitUntilTextboxCloses - _0807E5F8 0x00000012 - Wait 0x000a - MessageFromTarget 0x4c08 - WaitUntilTextboxCloses - _0807E5F8 0x00000024 - MessageFromTarget 0x4c09 - WaitUntilTextboxCloses - _0807E5F8 0x00000048 - Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc deleted file mode 100644 index 58456975..00000000 --- a/data/scripts/script_0800EFC0.inc +++ /dev/null @@ -1,92 +0,0 @@ -SCRIPT_START script_0800EFC0 - BeginBlock - SetEntitySpeed 0x0080 - _0807E9D4 - DoPostScriptAction 0x000a - CheckLocalFlag 0x007b - JumpIf script_0800F082 - EndBlock - Jump script_0800EFFE -script_0800EFDA: - _0807EB44 0x0006 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 - _0807EB44 0x0004 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 -script_0800EFFE: - _0807EB44 0x0002 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 - _0807EB44 0x0002 - CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0088, 0x0040 - DoPostScriptAction 0x000a - _0807EB44 0x0002 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 - _0807EB44 0x0004 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 - _0807EB44 0x0006 - CallWithArg sub_0806AF60, 0x00000008 - Wait 0x0004 - _0807EB44 0x0006 - CallWithArg sub_0806AF60, 0x00000004 - _0807EDD4 0x0068, 0x0040 - DoPostScriptAction 0x000a - CheckLocalFlag 0x007b - JumpIf script_0800F082 - Jump script_0800EFDA -script_0800F082: - EndBlock - Call sub_0806AEE4 - Jump script_0800F082 - .2byte 0x0000 -SCRIPT_START script_0800F090 - BeginBlock - _0807F0B4 0x0001 - CameraTargetPlayer - EndBlock -script_0800F09A: - CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 - JumpIfNot script_0800F09A - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - LoadRoomEntityList gUnk_080EE8AC - StartPlayerScript script_0800F14C - WaitForSomething2 0x00000001 - _0807E5F8 0x0000001e - WaitForSomething2 0x00000040 - MessageFromTargetPos 0x1201, 0x000c - WaitUntilTextboxCloses - WaitForSomething2 0x000003c0 - _0807E8E4_0 - MessageFromTargetPos 0x1202, 0x000c - WaitUntilTextboxCloses - _0807F034 0x0067 - WaitPlayerGetItem - _0807E8E4_0 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000040 - MessageFromTargetPos 0x1203, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - Call sub_0807DF50 - _0807E878 - WaitForSomething2 0x00000040 -script_0800F11A: - CheckKinstoneFused 0x0032 - JumpIfNot script_0800F11A - _0807E864 - Call sub_0807DF28 - _0807E5F8 0x0000001e - Wait 0x003c - _0807E8E4_1 - WaitForSomething2 0x000003c0 - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc deleted file mode 100644 index 11c63b10..00000000 --- a/data/scripts/script_0800F33C.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START script_0800F33C - SetEntitySpeed 0x0100 - _0807EC94 0x0008 - _0807E5F8 0x00000400 - Call sub_080791BC -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc deleted file mode 100644 index 4a43ec65..00000000 --- a/data/scripts/script_0800F354.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START script_0800F354 - SetEntitySpeed 0x0100 - _0807ECF4 0x0008 - _0807E5F8 0x00000400 - Call sub_080791BC -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc deleted file mode 100644 index 7fb077c6..00000000 --- a/data/scripts/script_0800F36C.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START script_0800F36C - SetEntitySpeed 0x0100 - _0807ECC4 0x0008 - _0807E5F8 0x00000400 - Call sub_080791BC -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc deleted file mode 100644 index 488420ce..00000000 --- a/data/scripts/script_0800F384.inc +++ /dev/null @@ -1,7 +0,0 @@ -SCRIPT_START script_0800F384 - SetEntitySpeed 0x0100 - _0807EC64 0x0008 - _0807E5F8 0x00000400 - Call sub_080791BC -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc deleted file mode 100644 index 14b29ac3..00000000 --- a/data/scripts/script_0800F554.inc +++ /dev/null @@ -1,183 +0,0 @@ -SCRIPT_START script_0800F554 - BeginBlock - Call sub_08061FE4 - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_0800F564: - CheckEntityInteractType - JumpIfNot script_0800F564 - _0807E864 - _0807EB74 - Call sub_08061FE4 - Call sub_08061FF4 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800F564 - .2byte 0x0000 -SCRIPT_START script_0800F584 - BeginBlock - DoPostScriptAction 0x0001 - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_0800F592: - CheckEntityInteractType - JumpIfNot script_0800F592 - _0807E864 - _0807EB74 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - DoPostScriptAction 0x0001 - Jump script_0800F592 - .2byte 0x0000 -SCRIPT_START script_0800F5B0 - BeginBlock - _0807EB44 0x0006 - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000008 - EndBlock -script_0800F5C8: - CheckEntityInteractType - JumpIfNot script_0800F5C8 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000008 - Call sub_08064428 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800F5C8 - .2byte 0x0000 -SCRIPT_START script_0800F5EC - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 - _0807E9D4 - DoPostScriptAction 0x000a - Call sub_0807F348 - EndBlock -script_0800F604: - CheckEntityInteractType - JumpIfNot script_0800F604 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000008 - MessageNoOverlap 0x2511 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800F604 -SCRIPT_START script_0800F628 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - DoPostScriptAction 0x0001 - EndBlock -script_0800F636: - _0807E30C - JumpIfNot script_0800F636 - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - _0807E878 - Jump script_0800F636 - .2byte 0x0000 -SCRIPT_START script_0800F650 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - _0807E9D4 - EndBlock -script_0800F662: - CheckEntityInteractType - JumpIfNot script_0800F662 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0001 - Call sub_0806B4F0 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - DoPostScriptAction 0x0000 - Jump script_0800F662 - .2byte 0x0000 - - -SCRIPT_START script_0800F688 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 - _0807E9D4 - DoPostScriptAction 0x000a - Call sub_0807F348 - EndBlock -script_0800F6A0: - CheckEntityInteractType - JumpIfNot script_0800F6A0 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000004 -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif - JumpIf script_0800F6C4 - MessageNoOverlap 0x2512 - Jump script_0800F6C8 -script_0800F6C4: - MessageNoOverlap 0x251f -script_0800F6C8: - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - CallWithArg sub_0807F3D8, 0x00000000 - Jump script_0800F6A0 - .2byte 0x0000 -SCRIPT_START script_0800F6E0 - BeginBlock - DoPostScriptAction 0x0001 - _0807E9D4 - DoPostScriptAction 0x000a - Call sub_08062788 - EndBlock -script_0800F6F4: -.ifdef JP - CheckLocalFlag 0x00ca -.else -.ifdef EU - CheckLocalFlag 0x00ca -.else -.ifdef DEMO_JP - CheckLocalFlag 0x00ca @ TODO deduplicate -.else - CheckLocalFlag 0x00cd -.endif -.endif -.endif - JumpIf script_0800F718 - CheckEntityInteractType - JumpIfNot script_0800F6F4 - _0807E864 - _0807EB74 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - DoPostScriptAction 0x0001 - Jump script_0800F6F4 -script_0800F718: - Call sub_080627E8 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc deleted file mode 100644 index 3e0e6277..00000000 --- a/data/scripts/script_0800FDA0.inc +++ /dev/null @@ -1,119 +0,0 @@ -SCRIPT_START script_0800FDA0 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - _0807E9D4 - EndBlock -script_0800FDB2: - CheckEntityInteractType - JumpIfNot script_0800FDB2 - _0807E864 - _0807EB74 - Call sub_08069888 - WaitUntilTextboxCloses - _0807E878 - Jump script_0800FDB2 - .2byte 0x0000 -SCRIPT_START script_0800FDCC - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - _0807E9D4 - SetEntitySpeed 0x0040 - EndBlock -script_0800FDE2: - Call sub_08069A60 -script_0800FDE8: - Call sub_0806991C -script_0800FDEE: - EndBlock - BeginBlock - Call sub_08069ACC - JumpIf script_0800FE06 - _0807EE30 - JumpIfNot script_0800FDEE - Jump script_0800FDE2 -script_0800FE06: - EndBlock - _0807EB44 0x0002 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0002 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - Wait 0x003c - Call sub_08069A3C - Jump script_0800FDE8 - .2byte 0x0000 -SCRIPT_START script_0800FE44 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - _0807E9D4 - SetEntitySpeed 0x0040 - EndBlock -script_0800FE5A: - Call sub_08069AA8 -script_0800FE60: - Call sub_080699AC -script_0800FE66: - EndBlock - BeginBlock - Call sub_08069ACC - JumpIf script_0800FE7E - _0807EE30 - JumpIfNot script_0800FE66 - Jump script_0800FE5A -script_0800FE7E: - EndBlock - _0807EB44 0x0002 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0002 - DoPostScriptAction 0x0000 - Wait 0x001e - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - Wait 0x003c - Call sub_08069A84 - Jump script_0800FE60 - .2byte 0x0000 -SCRIPT_START script_0800FEBC - BeginBlock - CheckInventory1 0x0012 - JumpIf script_0800FF0E - _0807EB44 0x0006 - _0807E9D4 - CallWithArg sub_0807F3D8, 0x00000008 - EndBlock -script_0800FED8: - EndBlock - BeginBlock - DoPostScriptAction 0x000b - Call sub_080642B8 - CheckEntityInteractType - JumpIfNot script_0800FED8 - EndBlock - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000008 - Call sub_08064428 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0800FED8 -script_0800FF0E: - DoPostScriptAction 0x0008 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc deleted file mode 100644 index d088e35d..00000000 --- a/data/scripts/script_08010264.inc +++ /dev/null @@ -1,562 +0,0 @@ -SCRIPT_START script_08010264 - BeginBlock - DoPostScriptAction 0x0007 - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0006 - DoPostScriptAction 0x0000 - EndBlock -script_0801027A: - CheckEntityInteractType - JumpIfNot script_0801027A - _0807E864 - _0807EB74 - Call sub_08065F64 - WaitUntilTextboxCloses - _0807E878 - Jump script_0801027A - .align 2 -SCRIPT_START script_08010294 - BeginBlock - DoPostScriptAction 0x0000 - Call sub_08062A48 - DoPostScriptAction 0x000a - EndBlock -script_080102A6: - CheckEntityInteractType - JumpIfNot script_080102A6 - CheckRoomFlag 0x0009 - JumpIfNot script_080102CC - _0807E864 - _0807EB74 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - Call sub_08062500 - Jump script_080102A6 -script_080102CC: - _0807E864 - _0807EB74 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - Jump script_080102A6 - .2byte 0x0000 -SCRIPT_START script_080102E0 - BeginBlock - DoPostScriptAction 0x0000 - Call sub_08062A48 - DoPostScriptAction 0x000a - EndBlock -script_080102F2: - CheckEntityInteractType - JumpIfNot script_080102F2 - _0807E864 - _0807EB74 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - Jump script_080102F2 - .2byte 0x0000 -SCRIPT_START script_0801030C - BeginBlock - DoPostScriptAction 0x0000 - EndBlock -script_08010314: - EndBlock - Call sub_08062698 - Call sub_080626AC - CallWithArg sub_0807F0EC, 0x00000009 - JumpTable script_08010340, script_0801034A, script_08010354, script_0801035E, script_08010368, script_08010372, script_0801037C, script_08010386, script_08010390 -script_08010340: - _0807EE04 0x0358, 0x0078 - Jump script_08010396 -script_0801034A: - _0807EE04 0x0390, 0x0078 - Jump script_08010396 -script_08010354: - _0807EE04 0x03c8, 0x0078 - Jump script_08010396 -script_0801035E: - _0807EE04 0x0358, 0x0098 - Jump script_08010396 -script_08010368: - _0807EE04 0x0390, 0x0098 - Jump script_08010396 -script_08010372: - _0807EE04 0x03c8, 0x0098 - Jump script_08010396 -script_0801037C: - _0807EE04 0x0358, 0x00b8 - Jump script_08010396 -script_08010386: - _0807EE04 0x0390, 0x00b8 - Jump script_08010396 -script_08010390: - _0807EE04 0x03c8, 0x00b8 -script_08010396: - EndBlock - BeginBlock - Call sub_080626C0 - JumpIf script_08010314 - _0807EE30 - JumpIfNot script_08010396 - Jump script_08010314 - .2byte 0x0000 -SCRIPT_START script_080103B0 - BeginBlock - DoPostScriptAction 0x0000 - Call sub_08062A48 - DoPostScriptAction 0x000a - EndBlock -script_080103C2: - Wait 0x001e - Call sub_08062948 - Jump script_080103C2 -SCRIPT_START script_080103D0 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000004 - EndBlock -script_080103E8: - Wait 0x003c - Call sub_0806407C - Jump script_080103E8 - .2byte 0x0000 -SCRIPT_START script_080103F8 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08010410: - CheckEntityInteractType - JumpIfNot script_08010410 - _0807E864 - _0807EB74 - Call sub_08064428 - WaitUntilTextboxCloses - _0807E878 - Jump script_08010410 -SCRIPT_START script_08010428 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - SetIntVariable sub_08064688 - Call sub_08064644 - EndBlock -script_08010446: - Wait 0x003c - Call sub_080646A4 - Jump script_08010446 -SCRIPT_START script_08010454 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 - Call sub_080636F4 - DoPostScriptAction 0x000a - Call sub_0807F348 - EndBlock -script_08010470: - CheckEntityInteractType - JumpIfNot script_08010470 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000004 - Call sub_080636D8 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - CallWithArg sub_0807F3D8, 0x00000000 - Jump script_08010470 -SCRIPT_START script_080104A0 - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 - Call sub_08063CAC - DoPostScriptAction 0x000a - Call sub_0807F348 - EndBlock -script_080104BC: - CheckEntityInteractType - JumpIfNot script_080104BC - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000004 - Call sub_08063C90 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - CallWithArg sub_0807F3D8, 0x00000000 - Jump script_080104BC -SCRIPT_START script_080104EC - BeginBlock - _0807EB44 0x0004 - _0807E930 0x0000 - DoPostScriptAction 0x000a - Call sub_0807F348 - EndBlock -script_08010502: - CheckEntityInteractType - JumpIfNot script_08010502 - _0807E864 - Call sub_0807DF28 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000008 - CheckRoomFlag 0x000e - JumpIf script_0801052E - SetRoomFlag 0x000e - MessageNoOverlap 0x2b10 - WaitUntilTextboxCloses -script_0801052E: - Call sub_080634E4 - JumpTable script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 -script_08010544: - MessageNoOverlap 0x2b0d - Jump script_080105E0 -script_0801054C: - CheckGlobalFlag 0x003d - JumpIfNot script_080105DC - Jump script_08010570 -script_08010558: - CheckGlobalFlag 0x003c - JumpIfNot script_080105DC - Jump script_08010570 -script_08010564: - CheckGlobalFlag 0x003b - JumpIfNot script_080105DC - Jump script_08010570 -script_08010570: - Call sub_080634EC - CallWithArg sub_0807F78C, 0x00000000 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_080105E0 - CallWithArg sub_0807F7C4, 0x00000000 - JumpIfNot script_080105C4 - _0807E48C 0x0020 - JumpIfNot script_080105CC - Call sub_08063504 - JumpIf script_080105D4 - MessageNoOverlap 0x2b07 - WaitUntilTextboxCloses - CallWithArg sub_0807F800, 0x00000000 - WaitPlayerGetItem - WaitUntilTextboxCloses - MessageNoOverlap 0x2b0c - Jump script_080105E0 -script_080105C4: - MessageNoOverlap 0x2b09 - Jump script_080105E0 -script_080105CC: - MessageNoOverlap 0x2b0a - Jump script_080105E0 -script_080105D4: - MessageNoOverlap 0x2b0b - Jump script_080105E0 -script_080105DC: - MessageNoOverlap 0x2b0e -script_080105E0: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_08010502 - .2byte 0x0000 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_08010602: - CheckEntityInteractType - JumpIfNot script_08010602 - _0807E864 - _0807EB74 - MessageFromTarget 0x0a01 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - Jump script_08010602 -SCRIPT_START script_0801061C - BeginBlock - _0807E930 0x0008 -script_08010622: - Call sub_08062A48 - DoPostScriptAction 0x000a - EndBlock -script_0801062E: - CheckEntityInteractType - JumpIfNot script_0801062E - _0807E864 - Call sub_0806265C - WaitUntilTextboxCloses - _0807E878 - Jump script_0801062E -SCRIPT_START script_08010644 - BeginBlock - _0807E930 0x0009 - Jump script_08010622 - .2byte 0x0000 -SCRIPT_START script_08010650 - BeginBlock - _0807E930 0x000b - Jump script_08010622 - .2byte 0x0000 - BeginBlock - _0807E930 0x000c - Jump script_08010622 - .2byte 0x0000 - BeginBlock - _0807E930 0x000d - Jump script_08010622 - .2byte 0x0000 -SCRIPT_START script_08010674 - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_08010686: - CheckEntityInteractType - JumpIfNot script_08010686 - _0807E864 - _0807EB74 - HasRoomItemForSale - Call sub_0807F77C - MessageFromTargetTable 0x3c08, 0x3c09 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - Jump script_08010686 - .2byte 0x0000 -SCRIPT_START script_080106AC - BeginBlock - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_080106BE: - CheckEntityInteractType - JumpIfNot script_080106BE - _0807E864 - _0807EB74 - Call sub_0807F2D4 - DoPostScriptAction 0x0000 - HasRoomItemForSale - JumpIf script_080106E0 - MessageNoOverlap 0x3c07 - Jump script_08010726 -script_080106E0: - Call sub_08062EB8 - CallWithArg sub_0807F78C, 0x00000000 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08010726 - WaitUntilTextboxCloses - BuyItem 0x0000, 0x0000 - JumpIf script_0801070C - MessageNoOverlap 0x3c04 - Jump script_08010726 -script_0801070C: - WaitPlayerGetItem - ModHealth 0x0008 - Call sub_08062EDC - JumpIf script_08010724 - MessageNoOverlap 0x3c06 - Jump script_08010726 -script_08010724: - WaitPlayerGetItem -script_08010726: - WaitUntilTextboxCloses - _0807E878 - DoPostScriptAction 0x0001 - Jump script_080106BE - .2byte 0x0000 -SCRIPT_START script_08010734 - BeginBlock - DoPostScriptAction 0x0007 - _0807E9D4 - DoPostScriptAction 0x000a - _0807E930 0x0000 - EndBlock -script_08010746: - CheckEntityInteractType - JumpIfNot script_08010746 - _0807E864 - _0807E930 0x0004 - BeginBlock - Call sub_08062D18 - JumpIfNot script_08010786 - EndBlock - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08010786 - HasRupees 0x00c8 - JumpIf script_08010778 - MessageNoOverlap 0x4008 - Jump script_08010786 -script_08010778: - ModRupees 0xff38 - Call sub_08062E14 - MessageNoOverlap 0x4007 -script_08010786: - EndBlock - WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 - Jump script_08010746 -SCRIPT_START script_08010794 - BeginBlock - DoPostScriptAction 0x0007 - _0807E9D4 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_080107AA: - CheckEntityInteractType - JumpIfNot script_080107AA - _0807E864 - Call sub_0807F2D4 - DoPostScriptAction 0x0001 - Call sub_08062CBC - WaitUntilTextboxCloses - _0807E878 - DoPostScriptAction 0x0000 - Jump script_080107AA - .2byte 0x0000 -SCRIPT_START script_080107D0 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807E9D4 - Call sub_0807F348 - Call sub_08069684 - EndBlock -script_080107F2: - EndBlock - BeginBlock - CheckPlayerInRegion2 0x3030 - JumpIfNot script_080107F2 - Call sub_080696B0 -script_08010804: - EndBlock - BeginBlock - CheckPlayerInRegion2 0x3030 - JumpIfNot script_080107F2 - HasRoomItemForSale - JumpIf script_08010860 - CheckEntityInteractType - JumpIfNot script_08010804 - EndBlock - _0807E864 - Call sub_0807DF28 - _0807EB74 - CheckGlobalFlag 0x0042 - JumpIfNot script_08010858 - CheckGlobalFlag 0x0043 - JumpIfNot script_08010858 - CheckGlobalFlag 0x0044 - JumpIfNot script_08010858 - CheckGlobalFlag 0x0041 - JumpIfNot script_08010850 - MessageNoOverlap 0x3f39 - Jump script_080108BA -script_08010850: - MessageNoOverlap 0x2c1b - Jump script_080108BA -script_08010858: - MessageNoOverlap 0x2c1a - Jump script_080108BA -script_08010860: - EndBlock - _0807E864 - Call sub_0807DF38 - _0807EB74 - Call sub_08069660 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_080108B2 - Call GoronMerchant_TryToBuyKinstone - JumpIfNot script_080108B2 - WaitPlayerGetItem - WaitUntilTextboxCloses - _0807EB8C - CheckGlobalFlag 0x0042 - JumpIfNot script_080108AA - CheckGlobalFlag 0x0043 - JumpIfNot script_080108AA - CheckGlobalFlag 0x0044 - JumpIfNot script_080108AA - MessageNoOverlap 0x2c21 - Jump script_080108B2 -script_080108AA: -.ifdef USA - SetLocalFlag 0x00fa -.else -.ifdef DEMO_USA - SetLocalFlag 0x00fa -.endif -.endif - MessageNoOverlap 0x2c20 -script_080108B2: - WaitUntilTextboxCloses - Call sub_0807F83C -script_080108BA: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Jump script_08010804 -SCRIPT_START script_080108D0 - CheckPlayerInRegion2 0x0808 - JumpIfNot script_080108D0 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_080109F0 - WaitForSomething2 0x00000001 - CheckRoomFlag 0x0001 - JumpIf script_08010900 - _0807EB28 0x0b63 - WaitUntilTextboxCloses -script_08010900: - Call sub_0807DF50 - _0807E878 - Jump script_080108D0 -SCRIPT_START script_0801090C - BeginBlock - DoPostScriptAction 0x0007 - CheckKinstoneFused 0x001b - JumpIf script_0800EF92 - EndBlock -script_0801091C: - Call sub_080869A4 - JumpIfNot script_0801091C - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - CheckRoomFlag 0x0001 - JumpIf script_08010942 - _0807EB28 0x0b62 - WaitUntilTextboxCloses -script_08010942: - StartPlayerScript script_080109F0 - WaitForSomething2 0x00000001 - Call sub_0807DF50 - _0807E878 - Jump script_0801091C - Call sub_0808692C -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc deleted file mode 100644 index 79bd4c24..00000000 --- a/data/scripts/script_08010BB4.inc +++ /dev/null @@ -1,139 +0,0 @@ -SCRIPT_START script_08010BB4 - BeginBlock - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0008 - Call sub_0806E440 - EndBlock -script_08010BCA: - CheckEntityInteractType - JumpIfNot script_08010BCA - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - Call sub_0806E418 - WaitUntilTextboxCloses - _0807E878 - _0807E930 0x0008 - Jump script_08010BCA - .2byte 0x0000 -SCRIPT_START script_08010BEC - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_08011074 - WaitForSomething2 0x00000400 - _0807F078 0x0034, 0x0002 - MessageFromTargetPos 0x1036, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - MessageFromTargetPos 0x1037, 0x0002 - WaitUntilTextboxCloses - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - MessageFromTargetPos 0x1038, 0x000c - WaitUntilTextboxCloses - StopBgm - _0807E778 0x0004 - DoFade5 - WaitFor_2 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - Call sub_08064180 - LoadRoomEntityList gUnk_080F06E0 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StartPlayerScript script_08011098 - WaitForSomething2 0x00000400 - SetEntityPositionRelative 0x01f8, 0x0050 - _0807F0B4 0x0007 - CameraTargetEntity - Wait 0x000a - _0807F0B4 0x0001 - _0807E778 0x0001 - DoFade4 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 - SetEntityPositionRelative 0x01f8, 0x0078 - Wait 0x003c - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 - _0807E8E4_1 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - MessageFromTargetPos 0x1039, 0x000c - WaitUntilTextboxCloses - PlayBgm BGM_CASTLE_TOURNAMENT - _0807E8E4_2 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000080 - Wait 0x012c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - MessageFromTargetPos 0x103a, 0x000c - WaitUntilTextboxCloses - SetEntityPositionRelative 0x01f8, 0x01c0 - _0807F0B4 0x0004 - Wait 0x0078 - _0807E5F8 0x00280000 - WaitForSomething2 0x00500000 - _0807E5F8 0x00000100 - SetEntityPositionRelative 0x01f8, 0x0220 - SetEntitySpeed 0x0100 - _0807EDD4 0x01f8, 0x0098 - Wait 0x003c - WaitForSomething2 0x00000200 - _0807E5F8 0x00280000 - StopBgm - PlaySound SFX_9B - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - MessageFromTargetPos 0x1043, 0x0000 - WaitUntilTextboxCloses - PlayBgm BGM_VAATI_THEME - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - _0807E5F8 0x0002a800 - WaitForSomething2 0x00055000 - PlaySound SFX_1C7 - PlaySound SFX_BUTTON_DEPRESS - _0807E5F8 0x00000100 - _0807E5F8 0x00002800 - CallWithArg sub_0807FB28, 0x00000003 - WaitForSomething2 0x00000200 - WaitForSomething2 0x00005000 - _0807E5F8 0x00028000 - WaitForSomething2 0x00050000 - MessageFromTargetPos 0x1044, 0x0000 - WaitUntilTextboxCloses - SetEntityPositionRelative 0x01f8, 0x0098 - StopBgm - Wait 0x003c - PlayBgm BGM_VAATI_REBORN - _0807E5F8 0x00028000 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000200 - WaitForSomething2 0x00050000 - CallWithArg sub_0807FB28, 0x00000003 - PlaySound SFX_BUTTON_DEPRESS - _0807E5F8 0x00028000 - WaitForSomething2 0x00050000 - PlaySound SFX_125 - CallWithArg sub_0807FB28, 0x00000003 - _0807E5F8 0x08000000 - _0807E5F8 0x00800000 - WaitForSomething2 0x01000000 - CallWithArg CreateManager36, 0x00000002 - _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc deleted file mode 100644 index f1c733d5..00000000 --- a/data/scripts/script_0801183C.inc +++ /dev/null @@ -1,19 +0,0 @@ -SCRIPT_START script_0801183C - BeginBlock - Call sub_08095330 - EndBlock - WaitForSomething2 0x00800000 - _0807EF3C 0x0000, 0x0020 - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 - Call sub_08095364 - PlaySound SFX_122 - Wait 0x003c - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 - _0807E930 0x0002 - _0807E5F8 0x01000000 - WaitForSomething2 0x00800000 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08011930.inc b/data/scripts/script_08011930.inc deleted file mode 100644 index 2dcc1588..00000000 --- a/data/scripts/script_08011930.inc +++ /dev/null @@ -1,5 +0,0 @@ -SCRIPT_START script_08011930 - WaitForSomething 0x20000000 - Call sub_0809567C -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08011940.inc b/data/scripts/script_08011940.inc deleted file mode 100644 index 0fdf418f..00000000 --- a/data/scripts/script_08011940.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_08011940 - WaitForSomething 0x40000000 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc deleted file mode 100644 index 18b0d47a..00000000 --- a/data/scripts/script_0801194C.inc +++ /dev/null @@ -1,158 +0,0 @@ -SCRIPT_START script_0801194C - BeginBlock - _0807EB44 0x0002 - Jump script_0801196A - .2byte 0x0000 -SCRIPT_START script_08011958 - BeginBlock - _0807EB44 0x0006 - Jump script_0801196A - .2byte 0x0000 -SCRIPT_START script_08011964 - BeginBlock - _0807EB44 0x0004 -script_0801196A: - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_0801197C: - CheckEntityInteractType - JumpIfNot script_0801197C - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - CheckGlobalFlag 0x0015 - JumpIf script_080119A0 - MessageFromTarget 0x103d - Jump script_080119A4 -script_080119A0: - MessageFromTarget 0x103f -script_080119A4: - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0801197C -SCRIPT_START script_080119B0 - BeginBlock - _0807E9D4 - _0807EB44 0x0004 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x0000000c - EndBlock -script_080119C8: - Wait 0x003c - Call sub_0806407C - Jump script_080119C8 - .2byte 0x0000 -SCRIPT_START script_080119D8 - BeginBlock - _0807EB44 0x0002 - Jump script_080119F6 - .2byte 0x0000 -SCRIPT_START script_080119E4 - BeginBlock - _0807EB44 0x0004 - Jump script_080119F6 - .2byte 0x0000 -SCRIPT_START script_080119F0 - BeginBlock - _0807EB44 0x0006 -script_080119F6: - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08011A08: - CheckEntityInteractType - JumpIfNot script_08011A08 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - Call sub_08064428 - WaitUntilTextboxCloses - _0807E878 - Jump script_08011A08 - .2byte 0x0000 -SCRIPT_START script_08011A2C - BeginBlock - _0807EB44 0x0004 - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08011A44: - CheckEntityInteractType - JumpIfNot script_08011A44 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageFromTarget 0x1320 - WaitUntilTextboxCloses - _0807E878 - Jump script_08011A44 -SCRIPT_START script_08011A64 - BeginBlock - _0807EB44 0x0002 - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08011A7C: - CheckEntityInteractType - JumpIfNot script_08011A7C - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - CallWithArg sub_080644B4, 0x00000006 - JumpIf script_08011AFA - MessageFromTarget 0x1320 - WaitUntilTextboxCloses - _0807E878 - Jump script_08011A7C - .2byte 0x0000 - BeginBlock - _0807EB44 0x0004 - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08011AC4: - CheckEntityInteractType - JumpIfNot script_08011AC4 - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - MessageFromTarget 0x1322 - WaitUntilTextboxCloses - _0807E878 - Jump script_08011AC4 - -SCRIPT_START script_08011AE4 - CheckRoomFlag 0x000f - JumpIfNot script_08011AE4 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 -script_08011AFA: - MessageFromTargetPos 0x1321, 0x0007 - WaitUntilTextboxCloses -.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 - Call sub_0807DF50 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc deleted file mode 100644 index bc4f9a5e..00000000 --- a/data/scripts/script_08011C7C.inc +++ /dev/null @@ -1,622 +0,0 @@ -SCRIPT_START script_08011C7C - BeginBlock - Call sub_08064828 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 - JumpIf script_08011CC2 - EndBlock -script_08011C9A: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIfNot script_08011C9A - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4515 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011C9A -script_08011CC2: - EndBlock - BeginBlock - CheckGlobalFlag 0x002c - JumpIf script_08011C9A - CheckGlobalFlag 0x002d - JumpIf script_08011C9A - CheckEntityInteractType - JumpIfNot script_08011CC2 - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x3105 - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_08011D0E - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011CC2 -script_08011D00: - CheckEntityInteractType - JumpIfNot script_08011D00 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_08011D0E: - MessageNoOverlap 0x3108 - WaitUntilTextboxCloses - SetGlobalFlag 0x002b - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011D00 - .2byte 0x0000 -SCRIPT_START script_08011D28 - BeginBlock - Call sub_08064928 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 - JumpIf script_08011D6E - EndBlock -script_08011D46: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIfNot script_08011D46 - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4513 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011D46 -script_08011D6E: - EndBlock - BeginBlock - CheckGlobalFlag 0x002b - JumpIf script_08011D46 - CheckGlobalFlag 0x002d - JumpIf script_08011D46 - CheckEntityInteractType - JumpIfNot script_08011D6E - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x3103 - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_08011DBA - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011D6E -script_08011DAC: - CheckEntityInteractType - JumpIfNot script_08011DAC - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_08011DBA: - MessageNoOverlap 0x3106 - WaitUntilTextboxCloses - SetGlobalFlag 0x002c - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011DAC - .2byte 0x0000 -SCRIPT_START script_08011DD4 - BeginBlock - Call sub_08064A28 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - CheckGlobalFlag 0x0047 - JumpIf script_08011E1A - EndBlock -script_08011DF2: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIfNot script_08011DF2 - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4514 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011DF2 -script_08011E1A: - EndBlock - BeginBlock - CheckGlobalFlag 0x002b - JumpIf script_08011DF2 - CheckGlobalFlag 0x002c - JumpIf script_08011DF2 - CheckEntityInteractType - JumpIfNot script_08011E1A - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x3104 - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_08011E66 - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011E1A -script_08011E58: - CheckEntityInteractType - JumpIfNot script_08011E58 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_08011E66: - MessageNoOverlap 0x3107 - WaitUntilTextboxCloses - SetGlobalFlag 0x002d - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011E58 - .2byte 0x0000 -SCRIPT_START script_08011E80 - BeginBlock - Call sub_08064828 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_08011E96: - EndBlock - BeginBlock - CheckGlobalFlag 0x002f - JumpIf script_08011C9A - CheckGlobalFlag 0x0030 - JumpIf script_08011C9A - CheckEntityInteractType - JumpIfNot script_08011E96 - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 - JumpIf script_08011ECC - MessageNoOverlap 0x4524 - WaitUntilTextboxCloses - Jump script_08011ED8 -script_08011ECC: - MessageNoOverlap 0x3111 - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_08011EF4 -script_08011ED8: - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011E96 -script_08011EE6: - CheckEntityInteractType - JumpIfNot script_08011EE6 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_08011EF4: - MessageNoOverlap 0x3114 - WaitUntilTextboxCloses - SetGlobalFlag 0x002e - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011EE6 -SCRIPT_START script_08011F0C - BeginBlock - Call sub_08064928 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_08011F22: - EndBlock - BeginBlock - CheckGlobalFlag 0x002e - JumpIf script_08011D46 - CheckGlobalFlag 0x0030 - JumpIf script_08011D46 - CheckEntityInteractType - JumpIfNot script_08011F22 - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 - JumpIf script_08011F58 - MessageNoOverlap 0x4522 - WaitUntilTextboxCloses - Jump script_08011F64 -script_08011F58: - MessageNoOverlap 0x310f - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_08011F80 -script_08011F64: - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011F22 -script_08011F72: - CheckEntityInteractType - JumpIfNot script_08011F72 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_08011F80: - MessageNoOverlap 0x3112 - WaitUntilTextboxCloses - SetGlobalFlag 0x002f - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011F72 -SCRIPT_START script_08011F98 - BeginBlock - Call sub_08064A28 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_08011FAE: - EndBlock - BeginBlock - CheckGlobalFlag 0x002e - JumpIf script_08011DF2 - CheckGlobalFlag 0x002f - JumpIf script_08011DF2 - CheckEntityInteractType - JumpIfNot script_08011FAE - EndBlock - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckGlobalFlag 0x0048 - JumpIf script_08011FE4 - MessageNoOverlap 0x4523 - WaitUntilTextboxCloses - Jump script_08011FF0 -script_08011FE4: - MessageNoOverlap 0x3110 - WaitUntilTextboxCloses - _0807E3E8 - JumpIf script_0801200C -script_08011FF0: - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011FAE -script_08011FFE: - CheckEntityInteractType - JumpIfNot script_08011FFE - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 -script_0801200C: - MessageNoOverlap 0x3113 - WaitUntilTextboxCloses - SetGlobalFlag 0x0030 - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08011FFE - - -SCRIPT_START script_08012024 - BeginBlock - Call sub_08064828 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_0801203A: - CheckEntityInteractType - JumpIfNot script_0801203A - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckLocalFlag 0x0094 - JumpIf script_0801205E - MessageNoOverlap 0x3122 - WaitUntilTextboxCloses - SetLocalFlag 0x0094 - Jump script_0801209E -script_0801205E: - _0807E48C 0x0031 - JumpIfNot script_08012070 - MessageNoOverlap 0x3123 - WaitUntilTextboxCloses - Jump script_0801209E -script_08012070: - MessageNoOverlap 0x3124 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0801209E - _0807E48C 0x0020 - JumpIfNot script_0801209A - MessageNoOverlap 0x3125 - WaitUntilTextboxCloses - _0807F034 0x0031 - WaitPlayerGetItem -.ifdef USA - Call sub_0807FC24 -.else -.ifdef DEMO_USA - Call sub_0807FC24 -.else -.ifdef DEMO_JP - Call sub_0807FC24 -.endif -.endif -.endif - Jump script_0801209E -script_0801209A: - MessageNoOverlap 0x3127 -script_0801209E: - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_0801203A - .align 2, 0 - -SCRIPT_START script_080120B0 - BeginBlock - Call sub_08064928 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_080120C6: - CheckEntityInteractType - JumpIfNot script_080120C6 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckLocalFlag 0x0095 - JumpIf script_080120EA - MessageNoOverlap 0x3116 - WaitUntilTextboxCloses - SetLocalFlag 0x0095 - Jump script_0801212A -script_080120EA: - _0807E48C 0x002f - JumpIfNot script_080120FC - MessageNoOverlap 0x3117 - WaitUntilTextboxCloses - Jump script_0801212A -script_080120FC: - MessageNoOverlap 0x3118 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_0801212A - _0807E48C 0x0020 - JumpIfNot script_08012126 - MessageNoOverlap 0x3119 - WaitUntilTextboxCloses - _0807F034 0x002f - WaitPlayerGetItem -.ifdef USA - Call sub_0807FC24 -.else -.ifdef DEMO_USA - Call sub_0807FC24 -.else -.ifdef DEMO_JP - Call sub_0807FC24 -.endif -.endif -.endif - Jump script_0801212A -script_08012126: - MessageNoOverlap 0x311b -script_0801212A: - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_080120C6 - .align 2, 0 - -SCRIPT_START script_0801213C - BeginBlock - Call sub_08064A28 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_08012152: - CheckEntityInteractType - JumpIfNot script_08012152 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - CheckLocalFlag 0x0096 - JumpIf script_08012176 - MessageNoOverlap 0x311c - WaitUntilTextboxCloses - SetLocalFlag 0x0096 - Jump script_080121B6 -script_08012176: - _0807E48C 0x0030 - JumpIfNot script_08012188 - MessageNoOverlap 0x311d - WaitUntilTextboxCloses - Jump script_080121B6 -script_08012188: - MessageNoOverlap 0x311e - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_080121B6 - _0807E48C 0x0020 - JumpIfNot script_080121B2 - MessageNoOverlap 0x311f - WaitUntilTextboxCloses - _0807F034 0x0030 - WaitPlayerGetItem -.ifdef USA - Call sub_0807FC24 -.else -.ifdef DEMO_USA - Call sub_0807FC24 -.else -.ifdef DEMO_JP - Call sub_0807FC24 -.endif -.endif -.endif - Jump script_080121B6 -script_080121B2: - MessageNoOverlap 0x3121 -script_080121B6: - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08012152 - .align 2, 0 - -SCRIPT_START script_080121C8 - BeginBlock - Call sub_08064828 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_080121DE: - CheckEntityInteractType - JumpIfNot script_080121DE - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4527 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_080121DE -SCRIPT_START script_08012200 - BeginBlock - Call sub_08064928 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_08012216: - CheckEntityInteractType - JumpIfNot script_08012216 - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4525 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_08012216 -SCRIPT_START script_08012238 - BeginBlock - Call sub_08064A28 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - DoPostScriptAction 0x000a - EndBlock -script_0801224E: - CheckEntityInteractType - JumpIfNot script_0801224E - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x4526 - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0001 - Jump script_0801224E -SCRIPT_START script_08012270 - BeginBlock - _0807EB44 0x0004 - Call sub_08061FD8 - _0807E9D4 - DoPostScriptAction 0x000a - EndBlock -script_08012284: - EndBlock - BeginBlock - CheckGlobalFlag 0x001e - JumpIfNot script_08012298 - CheckInventory1 0x0015 - JumpIf script_080122BA -script_08012298: - CheckEntityInteractType - JumpIfNot script_08012284 - EndBlock - _0807EB74 - _0807E864 - Call sub_08061FD8 - MessageFromTarget 0x2302 - WaitUntilTextboxCloses - _0807E878 - SetGlobalFlag 0x001e - Jump script_08012284 -script_080122BA: - EndBlock - BeginBlock - CheckRoomFlag 0x0000 - JumpIfNot script_080122CE - CheckRoomFlag 0x0001 - JumpIf script_080122EC -script_080122CE: - CheckEntityInteractType - JumpIfNot script_080122BA - EndBlock - _0807EB74 - _0807E864 - Call sub_08061FD8 - MessageFromTarget 0x2303 - WaitUntilTextboxCloses - _0807E878 - Jump script_080122BA -script_080122EC: - EndBlock - _0807EB74 - _0807E864 - Call sub_08061FD8 - DoPostScriptAction 0x000b - Call sub_08061FB0 - Call sub_08061F94 - LoadRoomEntityList gUnk_additional_a_HouseInteriors2_Percy - DoPostScriptAction 0x0008 - Wait 0x003c - PlaySound SFX_SECRET - SetLocalFlag 0x0043 - Wait 0x001e - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .align 2, 0 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc deleted file mode 100644 index 5390ddeb..00000000 --- a/data/scripts/script_08012430.inc +++ /dev/null @@ -1,168 +0,0 @@ -SCRIPT_START script_08012430 - BeginBlock - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0000 - EndBlock -script_08012440: - CheckEntityInteractType - JumpIfNot script_08012440 - _0807E864 - _0807E930 0x0008 - Call sub_0807F2D4 - _0807E930 0x0009 - Call sub_0806B2B4 - WaitUntilTextboxCloses - CheckLocalFlag 0x00b3 - JumpIf script_08012474 - SetLocalFlag 0x00b3 - _0807F034 0x0062 - WaitPlayerGetItem -.ifdef USA - SetLocalFlag 0x00d0 -.else -.ifdef DEMO_USA - SetLocalFlag 0x00d0 -.endif -.endif -script_08012474: - _0807E878 - _0807E930 0x0000 - Jump script_08012440 - .align 2, 0 - - -SCRIPT_START script_08012480 - BeginBlock - Call sub_08054564 - EndBlock -script_0801248A: - CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 - JumpIfNot script_0801248A - StopBgm - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_08012AB0 - MessageFromTargetPos 0x1101, 0x0007 - WaitUntilTextboxCloses - CameraTargetPlayer - _0807E778 0x0004 - _0807E80C 0x00000000 - WaitFor_2 - _0807E858 0x0000 - Call sub_080791BC - LoadRoomEntityList gUnk_080F4D70 - Call DeleteAllEnemies - SetEntityPositionRelative 0x0388, 0x0168 - Call sub_0807F844 - _0807E778 0x0004 - _0807E800 0x00000000 - WaitFor_2 - PlayBgm BGM_EZLO_THEME - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StopBgm - _0807E778 0x0004 - _0807E80C 0x00000000 - WaitFor_2 - MoveEntityToPlayer - Call sub_0807F844 - CameraTargetPlayer - SetFadeMask 0xffffffff - _0807E778 0x0004 - _0807E800 0x00000000 - WaitFor_2 - Call sub_0807DF50 - _0807E878 - PlayBGM -script_08012566: - CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 - JumpIfNot script_08012566 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - Call sub_0806DC7C - StopBgm - StartPlayerScript script_08012AC8 - WaitForSomething2 0x00000001 - SetEntityPositionRelative 0x0388, 0x0168 - _0807F0B4 0x0001 - CameraTargetEntity - Wait 0x005a - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - PlayBgm BGM_EZLO_THEME - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - WaitForSomething2 0x00000100 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StopBgm - PlayBgm BGM_FIGHT_THEME2 - Call sub_0807DF50 - _0807E878 - _0807E5F8 0x00000050 - LoadRoomEntityList gUnk_080F51D0 - WaitForSomething2 0x00000008 - _0807E864 - Call sub_0807FA40 - Call sub_0807DF28 - PlaySound SFX_SECRET - StopBgm - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StartPlayerScript script_08012AF0 - WaitForSomething2 0x00000001 - _0807E8E4_0 - PlayBgm BGM_EZLO_THEME - Wait 0x001e - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StopBgm - Wait 0x003c - PlayBGM - Call sub_0806DCA0 - _0807F0B4 0x0004 - CameraTargetPlayer - Call sub_0807DF50 - _0807E878 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - StopBgm - Wait 0x003c - PlayBGM - Call sub_08054570 - SetGlobalFlag 0x0014 - CallWithArg sub_0807F6F8, 0x00000008 - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08012B18.inc b/data/scripts/script_08012B18.inc deleted file mode 100644 index c317235e..00000000 --- a/data/scripts/script_08012B18.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_08012B18 - DoPostScriptAction 0x0015 - Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc deleted file mode 100644 index b23bee96..00000000 --- a/data/scripts/script_08012BA8.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START script_08012BA8 - BeginBlock - _0807EB44 0x0002 - DoPostScriptAction 0x0007 - _0807E930 0x0001 - EndBlock - WaitForSomething2 0x00000040 - _0807E930 0x0005 - Wait 0x001e - _0807E5F8 0x00000080 - _0807E930 0x0001 - WaitForSomething2 0x00000040 - _0807E930 0x0005 - Wait 0x001e - _0807E5F8 0x00000080 - _0807E930 0x0001 - WaitForSomething2 0x00000040 - Wait 0x0001 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc deleted file mode 100644 index 2d3bc84f..00000000 --- a/data/scripts/script_08012BF8.inc +++ /dev/null @@ -1,20 +0,0 @@ -SCRIPT_START script_08012BF8 - BeginBlock - _0807EB44 0x0006 - DoPostScriptAction 0x0007 - _0807E930 0x0003 - EndBlock - WaitForSomething2 0x00000010 - _0807E930 0x0007 - Wait 0x001e - _0807E5F8 0x00000020 - _0807E930 0x0003 - WaitForSomething2 0x00000010 - _0807E930 0x0007 - Wait 0x001e - _0807E5F8 0x00000020 - _0807E930 0x0003 - WaitForSomething2 0x00000010 - Wait 0x0001 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc deleted file mode 100644 index 21a77241..00000000 --- a/data/scripts/script_08012DD8.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START script_08012DD8 - BeginBlock - EndBlock - _0807E888 - Wait 0x0018 - _0807E864 - StartPlayerScript script_08012DF8 - WaitForSomething2 0x00000001 - _0807E908 0x0002 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc deleted file mode 100644 index 2a6bee16..00000000 --- a/data/scripts/script_08012E20.inc +++ /dev/null @@ -1,11 +0,0 @@ -SCRIPT_START script_08012E20 - BeginBlock - _0807E864 - EndBlock - Wait 0x0078 - _0807E908 0x0004 - StartPlayerScript script_08012E44 - WaitForSomething2 0x00000002 - Wait 0x000c - _0807E908 0x0005 -SCRIPT_END diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc deleted file mode 100644 index 3f8ae14f..00000000 --- a/data/scripts/script_08012E88.inc +++ /dev/null @@ -1,38 +0,0 @@ -SCRIPT_START script_08012E88 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - Call sub_0806B60C - EndBlock -script_08012E9E: - CheckEntityInteractType - JumpIfNot script_08012E9E - _0807E864 - _0807EB74 - DoPostScriptAction 0x0001 - Call sub_0806B4F0 - WaitUntilTextboxCloses - _0807E878 - DoPostScriptAction 0x0000 - Jump script_08012E9E - .2byte 0x0000 -SCRIPT_START script_08012EC0 - BeginBlock - _0807EB44 0x0004 - CallWithArg sub_0807F3D8, 0x00000008 - DoPostScriptAction 0x000a - Call sub_0806B60C - EndBlock -script_08012EDC: - CheckEntityInteractType - JumpIfNot script_08012EDC - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x0000000c - Call sub_0806B4F0 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - CallWithArg sub_0807F3D8, 0x00000008 - Jump script_08012EDC diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc deleted file mode 100644 index 0f1b052e..00000000 --- a/data/scripts/script_0801319A.inc +++ /dev/null @@ -1,78 +0,0 @@ -SCRIPT_START script_0801319A - EndBlock - BeginBlock - CameraTargetEntity - MoveEntityToPlayer - Call sub_0806AB74 - Jump script_0801319A -SCRIPT_START script_080131AC - CheckPlayerInRegion 0x0098, 0x0038, 0x2060 - JumpIfNot script_080131AC - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StartPlayerScript script_080132E4 - WaitForSomething2 0x00000002 - _0807EB28 0x1601 - WaitUntilTextboxCloses - StartPlayerScript script_0801330C - WaitForSomething2 0x00000002 - _0807E778 0x0004 - DoFade5 - WaitFor_2 - LoadRoomEntityList gUnk_080F5680 - StartPlayerScript script_08013330 - WaitForSomething2 0x00000002 - MoveEntityToPlayer - OffsetEntityPosition 0x0000, 0xfff0 - Call sub_0807F844 - CameraTargetEntity - Call sub_080536B8 - _0807E864 - Call sub_0807DF28 - WaitFor_2 - MessageFromTargetPos 0x1602, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 - PlayBgm BGM_VAATI_THEME - StartPlayerScript script_0801334C - WaitForSomething2 0x00000002 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 - StartPlayerScript script_08013378 - _0807E5F8 0x00000020 - WaitForSomething2 0x00000042 - MessageFromTargetPos 0x1603, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00000020 - WaitForSomething2 0x00000040 - SetFadeMask 0xffff7fff - _0807E778 0x0004 - DoFade5 - WaitFor_2 - StopBgm - _0807E858 0x0000 - Wait 0x003c - CameraTargetPlayer - Call sub_0807F5C0 - MessageFromTargetPos 0x1604, 0x0007 - WaitUntilTextboxCloses - SetFadeMask 0xffffffff - _0807E778 0x0004 - DoFade4 - WaitFor_2 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000002 - _0807EB28 0x1605 - WaitUntilTextboxCloses - SetLocalFlag 0x0078 - PlayBgm BGM_CASTLE_COLLAPSE - SetGlobalFlag 0x005d - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc deleted file mode 100644 index 2c83e70b..00000000 --- a/data/scripts/script_080134DC.inc +++ /dev/null @@ -1,73 +0,0 @@ -SCRIPT_START script_080134DC - BeginBlock - DoPostScriptAction 0x0008 - EndBlock - BeginBlock - Call sub_0807F92C - CallWithArg sub_0806DA04, 0x00000003 - EndBlock -script_080134F8: - CheckEntityInteractType - JumpIfNot script_080134F8 - _0807E864 - Call sub_0807DF28 - StartPlayerScript script_080136D8 - WaitForSomething2 0x00000001 - CallWithArg sub_08095A1C, script_08013F04 - PlaySound SFX_ELEMENT_PLACE - Wait 0x005a - BeginBlock - PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_08013E04 - CallWithArg sub_08095D54, script_08013E28 - EndBlock - WaitForSomething2 0x18000000 - BeginBlock - PlaySound SFX_ELEMENT_CHARGE - CallWithArg sub_08095D8C, script_08014054 - CallWithArg sub_08095D8C, script_08014074 - EndBlock - Wait 0x001e - BeginBlock - PlaySound SFX_1D0 - CallWithArg sub_08095D8C, script_080140DC - CallWithArg sub_08095D8C, script_08014118 - EndBlock - Wait 0x003c - CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 - PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_080141DC - CallWithArg sub_08095D8C, script_08014210 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 - Wait 0x0078 - _0807E5F8 0x00000060 - CallWithArg DeleteManager36, 0x00000000 - Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - Wait 0x003c - StartPlayerScript script_08013B70 - _0807E5F8 0x00000080 - _0807F078 0x0003, 0x0001 - Call sub_0806DC3C - Call sub_0806DC58 - Call sub_0807F304 - Wait 0x003c - _0807E778 0x0004 - DoFade7 - PlaySound SFX_EVAPORATE - WaitFor_2 - Wait 0x003c - _0807E5F8 0x00000010 - _0807E778 0x0002 - DoFade6 - WaitFor_2 - PlaySound SFX_109 - MessageFromTargetPos 0x0503, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00040000 - CallWithArg CreateManager36, 0x00000001 - _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc deleted file mode 100644 index 1f7bb597..00000000 --- a/data/scripts/script_08013720.inc +++ /dev/null @@ -1,81 +0,0 @@ -SCRIPT_START script_08013720 - BeginBlock - DoPostScriptAction 0x0008 - EndBlock - BeginBlock - Call sub_0807F92C - CallWithArg sub_0806DA04, 0x00000003 - EndBlock -script_0801373C: - CheckEntityInteractType - JumpIfNot script_0801373C - _0807E864 - Call sub_0807DF28 - StartPlayerScript script_080136D8 - WaitForSomething2 0x00000001 - CallWithArg sub_08095A1C, script_08013F34 - PlaySound SFX_ELEMENT_PLACE - Wait 0x005a - BeginBlock - PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_08013E4C - EndBlock - WaitForSomething2 0x20000000 - BeginBlock - PlaySound SFX_ELEMENT_CHARGE - CallWithArg sub_08095D8C, script_08014054 - CallWithArg sub_08095D8C, script_08014074 - CallWithArg sub_08095D8C, script_08014094 - EndBlock - Wait 0x001e - BeginBlock - PlaySound SFX_1D0 - CallWithArg sub_08095D8C, script_080140DC - CallWithArg sub_08095D8C, script_08014118 - CallWithArg sub_08095D8C, script_08014154 - EndBlock - Wait 0x003c - CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 - PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_080141DC - CallWithArg sub_08095D8C, script_08014210 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 - _0807E5F8 0x00000800 - WaitForSomething2 0x00008000 - Wait 0x0078 - _0807E5F8 0x00000060 - CallWithArg DeleteManager36, 0x00000000 - Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - Wait 0x003c - StartPlayerScript script_08013B70 - _0807E5F8 0x00000080 - _0807F078 0x0004, 0x0001 - Call sub_0806DC3C - Call sub_0806DC58 - Call sub_0807F304 - Wait 0x003c - _0807E778 0x0004 - DoFade7 - PlaySound SFX_EVAPORATE - WaitFor_2 - Wait 0x003c - _0807E5F8 0x00000010 - _0807E778 0x0002 - DoFade6 - WaitFor_2 - PlaySound SFX_109 - MessageFromTargetPos 0x0504, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00040000 - SetLocalFlag 0x007b - Call sub_08053250 - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc deleted file mode 100644 index 2cbc2caf..00000000 --- a/data/scripts/script_080138B4.inc +++ /dev/null @@ -1,97 +0,0 @@ -SCRIPT_START script_080138B4 - BeginBlock - DoPostScriptAction 0x0008 - EndBlock - BeginBlock - Call sub_0807F92C - CallWithArg sub_0806DA04, 0x00000003 - EndBlock -script_080138D0: - CheckEntityInteractType - JumpIfNot script_080138D0 - _0807E864 - Call sub_0807DF28 - StartPlayerScript script_080136D8 - WaitForSomething2 0x00000001 - CallWithArg sub_08095A1C, script_08013F64 - PlaySound SFX_ELEMENT_PLACE - Wait 0x005a - BeginBlock - PlaySound SFX_ELEMENT_FLOAT - CallWithArg sub_08095D54, script_08013E70 - EndBlock - WaitForSomething2 0x40000000 - 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 - Wait 0x001e - 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 - Wait 0x003c - CallWithArg CreateManager36, 0x00000000 - _0807E5F8 0x00000200 - WaitForSomething2 0x00002000 - PlaySound SFX_1D2 - CallWithArg sub_08095D8C, script_080141DC - CallWithArg sub_08095D8C, script_08014210 - _0807E5F8 0x00000400 - WaitForSomething2 0x00004000 - _0807E5F8 0x00000800 - WaitForSomething2 0x00008000 - _0807E5F8 0x00001000 - WaitForSomething2 0x00010000 - Wait 0x0078 - _0807E5F8 0x00000060 - CallWithArg DeleteManager36, 0x00000000 - Wait 0x0078 - _0807E5F8 0x00000080 - WaitForSomething2 0x00000100 - Wait 0x003c - StartPlayerScript script_08013BA8 - _0807E5F8 0x00000080 - _0807F078 0x0006, 0x0001 - Call sub_0807AEE4 - Call sub_0806DC3C - Call sub_0806DC58 - Call sub_0807F304 - Wait 0x003c - _0807E778 0x0004 - DoFade7 - PlaySound SFX_EVAPORATE - WaitFor_2 - Wait 0x003c - _0807E5F8 0x00000010 - _0807E778 0x0002 - DoFade6 - WaitFor_2 - PlaySound SFX_109 - MessageFromTargetPos 0x0505, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00040000 -.ifndef EU - _0807F0B4 0x0002 - SetEntityPositionRelative 0x00e8, 0x00d8 - CameraTargetEntity -.endif - Call sub_0806DC3C - CallWithArg sub_0807F244, 0x00010001 - CallWithArg sub_0807F29C, gUnk_080049FE - Wait 0x00c8 - CallWithArg sub_0807F29C, 0x00000000 - Call sub_0806DC58 -script_08013A8E: -.ifndef EU - CheckRoomFlag 0x0004 - JumpIfNot script_08013A8E -.endif - CallWithArg CreateManager36, 0x00000001 - _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc deleted file mode 100644 index dd34bd58..00000000 --- a/data/scripts/script_08013BA8.inc +++ /dev/null @@ -1,12 +0,0 @@ -SCRIPT_START script_08013BA8 - CallWithArg sub_08095E7C, script_08014248 - PlaySound SFX_1D3 - CallWithArg sub_0807F238, 0x000008e3 - Call sub_08096028 - Wait 0x0078 - _0807E5F8 0x00020000 - Call sub_0807F304 - Wait 0x0078 - WaitForSomething2 0x00040000 - Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc deleted file mode 100644 index 7b5162e1..00000000 --- a/data/scripts/script_08013F04.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START script_08013F04 - BeginBlock - DoPostScriptAction 0x0007 - _0807E930 0x0008 - EndBlock - WaitForSomething2 0x00000080 - _0807E930 0x000b - Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc deleted file mode 100644 index 9646a835..00000000 --- a/data/scripts/script_08013F34.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START script_08013F34 - BeginBlock - DoPostScriptAction 0x0007 - _0807E930 0x0009 - EndBlock - WaitForSomething2 0x00000080 - _0807E930 0x000c - Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc deleted file mode 100644 index 3bdd29ac..00000000 --- a/data/scripts/script_08013F64.inc +++ /dev/null @@ -1,13 +0,0 @@ -SCRIPT_START script_08013F64 - BeginBlock - DoPostScriptAction 0x0007 - _0807E930 0x000a - EndBlock - WaitForSomething2 0x00000080 - _0807E930 0x000d - Call sub_0807F2D4 - _0807E5F8 0x00000100 - WaitForSomething2 0x00000080 - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc deleted file mode 100644 index ef9e3619..00000000 --- a/data/scripts/script_0801450C.inc +++ /dev/null @@ -1,36 +0,0 @@ -SCRIPT_START script_0801450C - BeginBlock - _0807E9D4 - _0807EB44 0x0000 - SetEntitySpeed 0x01c0 - DoPostScriptAction 0x000a - EndBlock - _0807E864 - Call sub_0807DF28 - Call sub_0806E20C - WaitUntilTextboxCloses - Call sub_0806E23C - ClearLocalFlag 0x0093 - ClearLocalFlag 0x0092 - Call sub_0807DF50 - Jump script_080144FC - .2byte 0x0000 -SCRIPT_START script_08014548 - BeginBlock - EndBlock -script_0801454C: - CheckPlayerInRegion 0x0078, 0x0088, 0x0810 - JumpIfNot script_0801454C - CheckRoomFlag 0x0000 - JumpIfNot script_0801454C - _0807E864 - _0807EB28 0x4217 - WaitUntilTextboxCloses - StartPlayerScript script_08014588 - Wait 0x0010 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E878 - Jump script_0801454C -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc deleted file mode 100644 index b9971cca..00000000 --- a/data/scripts/script_08014588.inc +++ /dev/null @@ -1,10 +0,0 @@ -SCRIPT_START script_08014588 - EndBlock - WaitForSomething2 0x00000001 - SetEntitySpeed 0x00e0 - _0807EDD4 0x0078, 0x0078 - DoPostScriptAction 0x0000 - Wait 0x0010 - _0807E5F8 0x00000002 - Call sub_0807921C -SCRIPT_END diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc deleted file mode 100644 index d4ae69ff..00000000 --- a/data/scripts/script_08014958.inc +++ /dev/null @@ -1,40 +0,0 @@ -SCRIPT_START script_08014958 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - CheckGlobalFlag 0x0058 - JumpIf script_08014976 - _0807EB44 0x0004 - SetEntityPositionRelative 0x0078, 0x0128 -script_08014976: - EndBlock -script_08014978: - _0807E30C - JumpIfNot script_08014978 - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08014978 -SCRIPT_START script_08014994 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - CheckGlobalFlag 0x0058 - JumpIfNot script_080149C6 - EndBlock -script_080149AA: - _0807E30C - JumpIfNot script_080149AA - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_080149AA -script_080149C6: - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc deleted file mode 100644 index e37b94a7..00000000 --- a/data/scripts/script_080149CC.inc +++ /dev/null @@ -1,61 +0,0 @@ -SCRIPT_START script_080149CC - BeginBlock - SetEntitySpeed 0x0080 - Call sub_0806C870 - DoPostScriptAction 0x000a - EndBlock -script_080149DE: - _0807E30C - JumpIfNot script_080149DE - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - CheckLocalFlag 0x0064 - JumpIfNot script_08014A20 - CheckLocalFlag 0x00b1 - JumpIf script_08014A20 - SetLocalFlag 0x00b1 - DoPostScriptAction 0x000b - DoPostScriptAction 0x0001 - _0807EDD4 0x0068, 0x00f8 - PlaySound SFX_SECRET - _0807EB74 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a -script_08014A20: - _0807E878 - Jump script_080149DE - .2byte 0x0000 -SCRIPT_START script_08014A28 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - EndBlock -script_08014A36: - _0807E30C - JumpIfNot script_08014A36 - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08014A36 - .2byte 0x0000 -SCRIPT_START script_08014A54 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - EndBlock -script_08014A62: - _0807E30C - JumpIfNot script_08014A62 - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08014A62 - .2byte 0x0000 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc deleted file mode 100644 index 058d4364..00000000 --- a/data/scripts/script_08014A80.inc +++ /dev/null @@ -1,48 +0,0 @@ -SCRIPT_START script_08014A80 - BeginBlock - DoPostScriptAction 0x000a - EndBlock - WaitForSomething2 0x00000001 - _0807EB74 - DoPostScriptAction 0x0004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000001 - MessageNoOverlap 0x2f0a - WaitUntilTextboxCloses - _0807E5F8 0x00000002 -script_08014AAC: - _0807E30C - JumpIfNot script_08014AAC - _0807E864 - _0807EB74 - MessageNoOverlap 0x2f0a - WaitUntilTextboxCloses - _0807E878 - Jump script_08014AAC - .2byte 0x0000 -SCRIPT_START script_08014AC4 - BeginBlock - Call sub_0806C870 - DoPostScriptAction 0x000a - EndBlock -script_08014AD2: - _0807E30C - JumpIfNot script_08014AD2 - _0807E864 - _0807EB74 - StartPlayerScript script_08014B10 - WaitForSomething2 0x00000001 - _0807EB74 - CheckLocalFlag 0x0064 - JumpIf script_08014AFE - SetLocalFlag 0x0064 - MessageNoOverlap 0x2f0b - Jump script_08014B02 -script_08014AFE: - MessageNoOverlap 0x2f0c -script_08014B02: - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08014AD2 - .2byte 0x0000 diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc deleted file mode 100644 index fd880ee7..00000000 --- a/data/scripts/script_08014B34.inc +++ /dev/null @@ -1,132 +0,0 @@ -SCRIPT_START script_08014B34 - BeginBlock - DoPostScriptAction 0x000a - _0807E930 0x0000 - EndBlock - CheckLocalFlag 0x0063 - JumpIf script_08014BE8 -script_08014B48: - EndBlock - BeginBlock - CheckRoomFlag 0x0000 - JumpIf script_08014B70 - CheckEntityInteractType - JumpIfNot script_08014B48 - EndBlock - _0807E864 - _0807EB74 - MessageNoOverlap 0x2f01 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08014B48 -script_08014B70: - EndBlock - _0807E864 - Call sub_0807DF28 - _0807E5F8 0x00000001 - DoPostScriptAction 0x0004 - WaitForSomething2 0x00000002 - _0807E930 0x0010 - Call sub_0806CCF8 - Wait 0x0014 - Call sub_0806CD04 - Wait 0x0014 - Call sub_0806CD14 - Wait 0x0014 - Call sub_0806CD20 - Wait 0x0014 - Call sub_0806CD30 - Wait 0x0014 - Call sub_0806CD3C - Wait 0x0014 - Call sub_0806CD4C - PlaySound SFX_SECRET - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - Call sub_0807DF50 - _0807E878 -script_08014BE8: - _0807E930 0x0010 - Call sub_0806CD4C -script_08014BF2: - CheckEntityInteractType - JumpIfNot script_08014BF2 - _0807E864 - CheckLocalFlag 0x0065 - JumpIf script_08014C1C - SetLocalFlag 0x0065 - MessageNoOverlap 0x2f07 - WaitUntilTextboxCloses - SetIntVariable 0x00000064 - _0807F034 0x003f - WaitPlayerGetItem - Jump script_08014C22 -script_08014C1C: - MessageNoOverlap 0x2f08 - WaitUntilTextboxCloses -script_08014C22: - Wait 0x000f - _0807E878 - Jump script_08014BF2 -SCRIPT_START script_08014C2C - BeginBlock - Call sub_0806CD58 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - _0807E930 0x0006 - EndBlock -script_08014C42: - CheckEntityInteractType - JumpIfNot script_08014C42 - _0807E864 - _0807EB74 -script_08014C4C: - Call sub_0806CCD0 - JumpIfNot script_08014C4C -script_08014C56: - Call sub_0806CCB4 - JumpIfNot script_08014C56 - CheckLocalFlag 0x0066 - JumpIf script_08014C7C - SetLocalFlag 0x0066 - MessageNoOverlap 0x2f0d - WaitUntilTextboxCloses - _0807F034 0x000a - WaitPlayerGetItem - Jump script_08014C82 -script_08014C7C: - MessageNoOverlap 0x2f09 - WaitUntilTextboxCloses -script_08014C82: - Wait 0x000f - _0807E878 - _0807EB44 0x0004 - _0807E930 0x0006 - Jump script_08014C42 -SCRIPT_START script_08014C94 - BeginBlock - CheckGlobalFlag 0x0024 - JumpIf script_08014CD4 - Call sub_0806C870 - DoPostScriptAction 0x000a - DoPostScriptAction 0x0000 - EndBlock -script_08014CAE: - EndBlock - BeginBlock - CheckGlobalFlag 0x0024 - JumpIf script_08014CD4 - _0807E30C - JumpIfNot script_08014CAE - EndBlock - _0807E864 - _0807EB74 - Call sub_0806C90C - WaitUntilTextboxCloses - _0807E878 - Jump script_08014CAE -script_08014CD4: - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc deleted file mode 100644 index 86972a81..00000000 --- a/data/scripts/script_08014E14.inc +++ /dev/null @@ -1,292 +0,0 @@ -SCRIPT_START script_08014E14 - BeginBlock - _0807EB44 0x0004 - _0807E9D4 - DoPostScriptAction 0x000a - CallWithArg sub_0807F3D8, 0x00000000 - EndBlock -script_08014E2C: - CheckEntityInteractType - JumpIfNot script_08014E2C - _0807E864 - _0807EB74 - CallWithArg sub_0807F3D8, 0x00000000 - Call sub_08064428 - WaitUntilTextboxCloses - _0807E878 - Jump script_08014E2C - .2byte 0x0000 -SCRIPT_START script_08014E50 - BeginBlock - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_08014E64: - CheckEntityInteractType - JumpIfNot script_08014E64 - _0807E864 - Call sub_0807DF28 - _0807EB74 - CallWithArg sub_0807F78C, 0x00000022 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08014EBC - CallWithArg sub_0807F7C4, 0x00000022 - JumpIfNot script_08014EB0 - _0807E48C 0x0020 - JumpIfNot script_08014EB8 - CallWithArg sub_0807F800, 0x00000022 - WaitPlayerGetItem - MessageNoOverlap 0x0a04 - Jump script_08014EBC -script_08014EB0: - MessageNoOverlap 0x0a03 - Jump script_08014EBC -script_08014EB8: - MessageNoOverlap 0x0a02 -script_08014EBC: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - Jump script_08014E64 - .2byte 0x0000 -SCRIPT_START script_08014ECC - BeginBlock - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_08014EE0: - CheckEntityInteractType - JumpIfNot script_08014EE0 - _0807E864 - _0807EB74 - MessageNoOverlap 0x200d - WaitUntilTextboxCloses - _0807E878 - Jump script_08014EE0 - .2byte 0x0000 -SCRIPT_START script_08014EF8 - BeginBlock - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000a - EndBlock -script_08014F0C: - CheckEntityInteractType - JumpIfNot script_08014F0C - _0807E864 - _0807EB74 - DoPostScriptAction 0x0000 - MessageNoOverlap 0x200e - WaitUntilTextboxCloses - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000a - Jump script_08014F0C - .2byte 0x0000 -SCRIPT_START script_08014F30 - BeginBlock - DoPostScriptAction 0x000a - DoPostScriptAction 0x0007 - _0807EB44 0x0004 - _0807E930 0x000e - EndBlock - Call sub_08065914 -script_08014F4A: - CheckEntityInteractType - JumpIfNot script_08014F4A - _0807E864 - Call sub_0807DF28 - _0807EB74 - DoPostScriptAction 0x0000 - BeginBlock - MessageNoOverlap 0x3b0b - CallWithArg sub_0807F854, 0x00010064 - EndBlock - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08014FA6 - HasRupees 0x0064 - JumpIfNot script_08014F9A - _0807E48C 0x0020 - JumpIfNot script_08014FA2 - ModRupees 0xff9c - _0807F034 0x0022 - WaitPlayerGetItem - MessageNoOverlap 0x3b11 - Jump script_08014FA6 -script_08014F9A: - MessageNoOverlap 0x3b0e - Jump script_08014FA6 -script_08014FA2: - MessageNoOverlap 0x3b0f -script_08014FA6: - WaitUntilTextboxCloses - Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 - _0807E930 0x000e - Jump script_08014F4A -SCRIPT_START script_08014FBC - BeginBlock - SetEntityPositionRelative 0x01f8, 0x00e0 - Call sub_08054564 - EndBlock -script_08014FCC: - CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 - JumpIfNot script_08014FCC - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StopBgm - _0807F0B4 0x0001 - CameraTargetEntity - StartPlayerScript script_080152B4 - WaitForSomething2 0x00000001 - MessageFromTargetPos 0x1301, 0x0002 - WaitUntilTextboxCloses - Call sub_0807F3F8 - Wait 0x003c - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - PlayBgm BGM_VAATI_THEME - _0807EB28 0x1302 - WaitUntilTextboxCloses - MessageFromTargetPos 0x1303, 0x0002 - WaitUntilTextboxCloses - _0807EB28 0x1304 - WaitUntilTextboxCloses - MessageFromTargetPos 0x1305, 0x0002 - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething2 0x00000004 - _0807EB28 0x1306 - WaitUntilTextboxCloses - StopBgm - StartPlayerScript script_080152DC - CameraTargetEntity - _0807F0B4 0x0003 - SetEntityPositionRelative 0x01f8, 0x0148 - WaitForSomething2 0x00000001 - Call sub_0804F6A8 - Wait 0x0004 - Call sub_0804F808 - PlaySound SFX_10B - StartPlayerScript script_08015304 - Call sub_0804F6C8 - Wait 0x0004 - Call sub_0804F830 - PlaySound SFX_10B - Call sub_0804F6E8 - Wait 0x0004 - Call sub_0804F854 - PlaySound SFX_10B - Call sub_0804F724 - Wait 0x0004 - Call sub_0804F89C - PlaySound SFX_10B - Call sub_0804F760 - Wait 0x0004 - Call sub_0804F8E0 - PlaySound SFX_10B - Wait 0x003c - WaitForSomething2 0x00000001 - PlaySound SFX_1B0 - Call sub_0804F79C - Wait 0x000a - LoadRoomEntityList gUnk_080F7FC0 - PlayBgm BGM_FIGHT_THEME - Call sub_0807DF50 - _0807E878 -script_08015104: - CheckRoomFlag 0x0000 - JumpIfNot script_08015104 - _0807E864 - Call sub_0807F9A4 - Call sub_0807DF28 - StopBgm - StartPlayerScript script_08015338 - WaitForSomething2 0x00000001 - Wait 0x003c - Call sub_0804F6A8 - Wait 0x0004 - Call sub_0804F928 - PlaySound SFX_10B - Call sub_0804F6C8 - Wait 0x0004 - Call sub_0804F944 - PlaySound SFX_10B - Call sub_0804F6E8 - Wait 0x0004 - Call sub_0804F960 - PlaySound SFX_10B - Call sub_0804F724 - Wait 0x0004 - Call sub_0804F994 - PlaySound SFX_10B - Call sub_0804F760 - Wait 0x0004 - Call sub_0804F9C8 - PlaySound SFX_10B - Wait 0x003c - PlaySound SFX_SECRET - _0807F0B4 0x0004 - 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 - WaitUntilTextboxCloses - CameraTargetPlayer - _0807E778 0x0004 - _0807E80C 0x00000000 - WaitFor_2 - Call sub_08053B3C - BeginBlock - _0807E864 - CallWithArg sub_0807F6E8, 0x00000008 - MoveEntityToPlayer - _0807F0B4 0x0004 - CameraTargetEntity - _0807E778 0x0100 - DoFade4 - _0807E80C 0x00000000 - EndBlock - StartPlayerScript script_08015360 - WaitForSomething2 0x00000001 - LoadRoomEntityList gUnk_080F7CB0 - _0807E778 0x0004 - _0807E800 0x00000000 - WaitFor_2 - _0807E5F8 0x00000008 - WaitForSomething2 0x00000010 - BeginBlock - _0807E8E4_2 - _0807EB28 0x1315 - EndBlock - WaitUntilTextboxCloses - _0807F0B4 0x0004 - CameraTargetPlayer - Call sub_08054570 - PlayBGM - Call sub_0807DF50 - _0807E878 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08015384.inc b/data/scripts/script_08015384.inc deleted file mode 100644 index a46df80e..00000000 --- a/data/scripts/script_08015384.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_08015384 - DoPostScriptAction 0x0015 - Call sub_080791BC -SCRIPT_END diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc deleted file mode 100644 index d30b9978..00000000 --- a/data/scripts/script_0801548E.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START script_0801548E - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 - PlaySound SFX_125 - CallWithArg sub_0807FB28, 0x00000003 - _0807E5F8 0x00048000 - WaitForSomething2 0x00090000 - MessageFromTargetPos 0x1311, 0x0002 - WaitUntilTextboxCloses - _0807E5F8 0x00008000 - WaitForSomething2 0x00010000 - _0807E5F8 0x00048000 - WaitForSomething2 0x00010000 - CallWithArg DeleteManager36, 0x00000001 - _0807F0C8 0x0000, 0x0000 - MessageFromTargetPos 0x1312, 0x000c - WaitUntilTextboxCloses - _0807E5F8 0x00000800 - WaitForSomething2 0x00001000 - StopBgm - _0807E778 0x0004 - DoFade5 - WaitFor_2 - SetRoomFlag 0x0001 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc deleted file mode 100644 index 71dd90ee..00000000 --- a/data/scripts/script_08015CD4.inc +++ /dev/null @@ -1,67 +0,0 @@ -SCRIPT_START script_08015CD4 - BeginBlock - _0807F0B4 0x0007 - SetEntityPositionRelative 0x0088, 0x0068 - CameraTargetEntity - EndBlock - _0807E778 0x0004 - DoFade4 - WaitFor_2 - Wait 0x003c - _0807F0B4 0x0004 - SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity - Wait 0x003c - PlayBgm BGM_VAATI_THEME - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - _0807F0B4 0x0004 - SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity - Wait 0x003c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807F0B4 0x0004 - SetEntityPositionRelative 0x0088, 0x00e0 - CameraTargetEntity - Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - _0807F0B4 0x0004 - SetEntityPositionRelative 0x0088, 0x0070 - CameraTargetEntity - Wait 0x003c - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000010 - WaitForSomething2 0x00000020 - _0807E778 0x0004 - DoFade5 - WaitFor_2 - _0807E5F8 0x00000010 - LoadRoomEntityList gUnk_080FCE30 - StopBgm - Wait 0x0078 - _0807E778 0x0004 - DoFade4 - WaitFor_2 - PlayBgm BGM_DIGGING_CAVE - _0807E5F8 0x00000040 - WaitForSomething2 0x00000080 - _0807E5F8 0x00000001 - WaitForSomething2 0x00000002 - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E5F8 0x00000200 - Wait 0x003c - _0807E5F8 0x00000004 - WaitForSomething2 0x00000008 - _0807E778 0x0004 - DoFade5 - WaitFor_2 - StopBgm - SetRoomFlag 0x0000 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc deleted file mode 100644 index 9cc8db37..00000000 --- a/data/scripts/script_08015DF0.inc +++ /dev/null @@ -1,26 +0,0 @@ -SCRIPT_START script_08015DF0 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock - WaitForSomething2 0x00000004 - DoPostScriptAction 0x0004 - Wait 0x003c - MessageNoOverlap 0x1319 - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 - MessageNoOverlap 0x131a - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 - MessageNoOverlap 0x131d - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething2 0x00000004 - MessageNoOverlap 0x131e - WaitUntilTextboxCloses - _0807E5F8 0x00000008 - WaitForSomething 0x00000400 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc deleted file mode 100644 index 2bedafbe..00000000 --- a/data/scripts/script_08015F08.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START script_08015F08 - BeginBlock - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock - WaitForSomething2 0x00000001 - MessageNoOverlap 0x131c - WaitUntilTextboxCloses - _0807E5F8 0x00000002 - WaitForSomething 0x00000200 - DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc deleted file mode 100644 index 89472d82..00000000 --- a/data/scripts/script_08016030.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START script_08016030 - BeginBlock - CheckKinstoneFused 0x0009 - JumpIf script_08016062 - EndBlock - WaitForSomething2 0x00000001 - DoPostScriptAction 0x0010 - Wait 0x003c - SetEntitySpeed 0x0020 - _0807ECF4 0x0080 - Wait 0x001e - DoPostScriptAction 0x0010 - _0807E5F8 0x00000008 -SCRIPT_END diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc deleted file mode 100644 index fb0d6300..00000000 --- a/data/scripts/script_08016062.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_08016062 - OffsetEntityPosition 0xfff0, 0x0000 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc deleted file mode 100644 index 34937e0f..00000000 --- a/data/scripts/script_0801606C.inc +++ /dev/null @@ -1,14 +0,0 @@ -SCRIPT_START script_0801606C - BeginBlock - CheckKinstoneFused 0x0009 - JumpIf script_0801609E - EndBlock - WaitForSomething2 0x00000002 - DoPostScriptAction 0x0010 - Wait 0x003c - SetEntitySpeed 0x0020 - _0807EC94 0x0080 - Wait 0x001e - DoPostScriptAction 0x0010 - _0807E5F8 0x00000004 -SCRIPT_END diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc deleted file mode 100644 index e11bf37f..00000000 --- a/data/scripts/script_0801609E.inc +++ /dev/null @@ -1,4 +0,0 @@ -SCRIPT_START script_0801609E - OffsetEntityPosition 0x0010, 0x0000 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc deleted file mode 100644 index eba0a74e..00000000 --- a/data/scripts/script_080160A8.inc +++ /dev/null @@ -1,224 +0,0 @@ -SCRIPT_START script_080160A8 - BeginBlock - _0807E9D4 - _0807E930 0x0008 -script_080160B0: - EndBlock - BeginBlock - CheckEntityInteractType - JumpIf script_080160E0 - TestBit 0x00000008 - JumpIf script_080160D2 - TestBit 0x00000010 - JumpIf script_080160D2 - Jump script_080160B0 -script_080160D2: - EndBlock - _0807EB74 - WaitForSomething2 0x00000004 - Jump script_080160B0 -script_080160E0: - _0807E864 - _0807EB74 - EndBlock - HasRoomItemForSale - JumpIfNot script_0801611A - MessageFromTarget 0x2d07 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08016132 - BuyItem 0x0000, 0x0000 - JumpIf script_0801610C - MessageFromTarget 0x2d0b - WaitUntilTextboxCloses - Jump script_08016132 -script_0801610C: - WaitPlayerGetItem -.ifndef EU - _0807EB8C - MessageFromTarget 0x2d0d -.else - MessageFromTarget 0x2d08 -.endif - WaitUntilTextboxCloses - Jump script_08016132 -script_0801611A: - CheckKinstoneFused 0x0014 - JumpIfNot script_0801612C - MessageFromTarget 0x2d09 - WaitUntilTextboxCloses - Jump script_08016132 -script_0801612C: - MessageFromTarget 0x2d01 - WaitUntilTextboxCloses -script_08016132: - _0807E878 - _0807EB44 0x0004 - Jump script_080160B0 - .align 2, 0 - -SCRIPT_START script_0801613C - BeginBlock - Call sub_080787B4 - EndBlock -script_08016146: - CheckEntityInteractType - JumpIfNot script_08016146 - _0807E864 - GetInventoryValue 0x0025 - MessageFromTargetTable 0x2d03, 0x2d02, 0x2d02, 0x2d02 - _0807E3E8 - JumpIfNot script_0801618A - _0807E48C 0x0020 - JumpIf script_08016172 - MessageFromTarget 0x2d0c - Jump script_0801618A -script_08016172: - BuyItem 0x0025, 0x0000 - JumpIf script_08016184 - MessageFromTarget 0x2d0b - Jump script_0801618A -script_08016184: - WaitPlayerGetItem - MessageFromTarget 0x2d06 -script_0801618A: - _0807E878 - Jump script_08016146 - .align 2, 0 - -SCRIPT_START script_08016190 - BeginBlock - Call sub_080787B4 - EndBlock -script_0801619A: - CheckEntityInteractType - JumpIfNot script_0801619A - _0807E864 - GetInventoryValue 0x0024 - MessageFromTargetTable 0x2d05, 0x2d04, 0x2d04, 0x2d04 - _0807E3E8 - JumpIfNot script_080161E2 - _0807E48C 0x0020 - JumpIf script_080161C6 - MessageFromTarget 0x2d0c - Jump script_080161E2 -script_080161C6: - BuyItem 0x0024, 0x0000 - JumpIf script_080161D8 - MessageFromTarget 0x2d0b - Jump script_080161E2 -script_080161D8: -.ifndef EU - WaitPlayerGetItem - WaitUntilTextboxCloses - _0807EB8C - MessageNoOverlap 0x2d06 -.else - MessageFromTarget 0x2d06 -.endif -script_080161E2: - _0807E878 - Jump script_0801619A - .align 2, 0 - -SCRIPT_START script_080161E8 - BeginBlock - Call sub_0807F348 - DoPostScriptAction 0x000a - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - EndBlock -script_080161FE: - Call sub_08068C28 -script_08016204: - CheckEntityInteractType - JumpIfNot script_08016204 - _0807E864 - Call sub_0807DF28 - _0807EB74 - Call sub_08068CA0 - JumpIf script_0801633E - Call sub_08068CFC - JumpIfNot script_08016332 - Call sub_08068DB8 - WaitUntilTextboxCloses - Call sub_08068DD0 - WaitUntilTextboxCloses - _0807E3E8 - JumpIfNot script_08016346 - StartPlayerScript script_0801635C - WaitForSomething2 0x00000001 - _0807EB74 - Call sub_08068C8C - JumpIf script_08016262 - Call sub_08068DE8 - WaitUntilTextboxCloses - Wait 0x001e -script_08016262: - Call sub_08068E00 - WaitUntilTextboxCloses - DoPostScriptAction 0x0001 - Call sub_0807F2D4 - Call sub_08068E90 - Call sub_08068C8C - JumpIf script_0801631C - Call sub_08068F00 - Call sub_08068F14 - Call sub_08068BB4 - CallWithArg sub_0807F244, 0x00010001 - Call sub_08068B84 - Call sub_0807F2A8 - Call sub_08068BD0 - Wait 0x001e - Call sub_08068E18 - WaitUntilTextboxCloses - Call sub_08068EB4 - Call sub_0807DF50 - _0807E878 -script_080162CC: - EndBlock - BeginBlock - Call sub_08068EC4 - JumpIf script_080162F6 - CheckEntityInteractType - JumpIf script_080162E4 - Jump script_080162CC -script_080162E4: - EndBlock - _0807E864 - Call sub_08068E78 - WaitUntilTextboxCloses - _0807E878 - Jump script_080162CC -script_080162F6: - EndBlock - _0807E888 - Call sub_0807F594 - Call sub_0807DF28 - _0807E864 - StopBgm - PlaySound SFX_TASK_COMPLETE - Wait 0x003c - PlayBgm BGM_LEARN_SCROLL - Call sub_08068F3C -script_0801631C: - Call sub_08068E30 - WaitUntilTextboxCloses - Call sub_08068C6C - WaitPlayerGetItem - WaitUntilTextboxCloses - Jump script_08016346 -script_08016332: - Call sub_08068E60 - WaitUntilTextboxCloses - Jump script_08016346 -script_0801633E: - Call sub_08068E48 - WaitUntilTextboxCloses -script_08016346: - Call sub_0807DF50 - _0807E878 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - Jump script_080161FE - .2byte 0x0000 diff --git a/data/scripts/script_0801637C.inc b/data/scripts/script_0801637C.inc deleted file mode 100644 index 0f1c6a03..00000000 --- a/data/scripts/script_0801637C.inc +++ /dev/null @@ -1,5 +0,0 @@ -thumb_func_start script_0801637C -script_0801637C: - push {lr} - bl CreateDust - pop {pc} diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc deleted file mode 100644 index e9ef17f2..00000000 --- a/data/scripts/script_080165D8.inc +++ /dev/null @@ -1,263 +0,0 @@ -SCRIPT_START script_080165D8 - Wait 0x001e - CheckPlayerInRegion2 0x2020 - JumpAbsoluteIfNot script_080165D8 - DoPostScriptAction 0x0003 - Call script_0801637C+1 - JumpAbsolute script_080165D8 - .2byte 0x0000 -SCRIPT_START script_080165F8 - BeginBlock - _0807E9D4 - EndBlock -script_080165FE: - _0807E30C - JumpIfNot script_080165FE - MessageFromTarget 0x0601 - Jump script_080165FE -SCRIPT_START script_0801660C - BeginBlock - _0807E9D4 - EndBlock -script_08016612: - _0807E944 - _0807E864 - MessageFromTarget 0x0602 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_08016612 - .2byte 0x0000 -SCRIPT_START script_08016628 - BeginBlock - _0807E9D4 - EndBlock -script_0801662E: - _0807E944 - _0807E864 - _0807EB28 0x0603 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0801662E - .2byte 0x0000 -SCRIPT_START script_08016644 - SetEntitySpeed 0x0100 -script_08016648: - _0807ECF4 0x0030 - Wait 0x0008 - _0807ECC4 0x0030 - Wait 0x0008 - _0807EC94 0x0030 - Wait 0x0008 - _0807EC64 0x0030 - Wait 0x0008 - Jump script_08016648 -SCRIPT_START script_0801666C - _0807ED24 0x0055, 0x0039, 0x00b4 - Wait 0x0008 - _0807ED24 0x0075, 0x0076, 0x003c - Wait 0x0008 - _0807ED24 0x0105, 0x006c, 0x0078 - Wait 0x0008 - _0807ED24 0x018e, 0x007a, 0x0078 - Wait 0x0008 - _0807ED24 0x0173, 0x0023, 0x003c - Wait 0x0008 - _0807ED24 0x00d8, 0x003f, 0x003c - Wait 0x0008 - Jump script_0801666C -SCRIPT_START script_080166B8 - SetEntitySpeed 0x0100 -script_080166BC: - _0807EDD4 0x0055, 0x0039 - Wait 0x0008 - _0807EDD4 0x0075, 0x0076 - Wait 0x0008 - _0807EDD4 0x0105, 0x006c - Wait 0x0008 - _0807EDD4 0x018e, 0x007a - Wait 0x0008 - _0807EDD4 0x0173, 0x0023 - Wait 0x0008 - _0807EDD4 0x00d8, 0x003f - Wait 0x0008 - Jump script_080166BC -SCRIPT_START script_080166FC - SetEntitySpeed 0x0100 -script_08016700: - _0807EC94 0x0030 - _0807E5F8 0x00000002 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - WaitForSomething 0x00000001 - _0807E610 0x00000001 - _0807ECF4 0x0030 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - Wait 0x001e - _0807E5F8 0x00000006 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - Wait 0x003c - Jump script_08016700 -SCRIPT_START script_08016798 - SetEntitySpeed 0x0100 -script_0801679C: - WaitForSomething 0x00000002 - _0807E610 0x00000002 - _0807EC94 0x0030 - _0807E5F8 0x00000004 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 - _0807ECF4 0x0030 - _0807E5F8 0x00000001 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - WaitForSomething 0x00000002 - _0807E610 0x00000002 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - Jump script_0801679C -SCRIPT_START script_08016844 - SetEntitySpeed 0x0100 -script_08016848: - WaitForSomething 0x00000004 - _0807E610 0x00000004 - _0807EC94 0x0030 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - Wait 0x001e - _0807E5F8 0x00000003 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - Wait 0x003c - _0807ECF4 0x0030 - _0807E5F8 0x00000002 - Wait 0x000f - DoPostScriptAction 0x0000 - _0807EB44 0x0004 - WaitForSomething 0x00000004 - _0807E610 0x00000004 - DoPostScriptAction 0x0003 - Wait 0x0002 - _0807EB44 0x0006 - Wait 0x0002 - _0807EB44 0x0000 - Wait 0x0002 - _0807EB44 0x0002 - Wait 0x0002 - _0807EB44 0x0004 - Jump script_08016848 -SCRIPT_START script_080168E0 - BeginBlock - _0807E9D4 - EndBlock -script_080168E6: - _0807E944 - _0807E864 - Wait 0x000f - _0807E878 - Jump script_080168E6 -SCRIPT_START script_080168F4 - BeginBlock - Call sub_08064EA4 - _0807EB44 0x0004 - DoPostScriptAction 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0801690A: - _0807E30C - JumpIfNot script_0801690A - _0807E864 - _0807EB74 - Call sub_08064F28 - WaitUntilTextboxCloses - JumpIfNot script_08016926 - _0807F034 0x003d - WaitPlayerGetItem -script_08016926: - _0807E878 - SetGlobalFlag 0x005c - Jump script_0801690A - BeginBlock - _0807E9D4 - _0807EB44 0x0000 - DoPostScriptAction 0x000a - EndBlock -script_0801693E: - _0807E944 - _0807E864 - Wait 0x0018 - MessageFromTarget 0x0a01 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0801693E - .2byte 0x0000 - BeginBlock - _0807E9D4 - _0807EB44 0x0000 - DoPostScriptAction 0x000a - _0807E930 0x0000 - EndBlock -script_0801696A: - _0807E944 - _0807E864 - Wait 0x0018 - MessageFromTarget 0x0a01 - WaitUntilTextboxCloses - Wait 0x000f - _0807E878 - Jump script_0801696A - .2byte 0x0000 diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/southHyruleField/script_BedInLinksRoom.inc similarity index 57% rename from data/scripts/script_08009ECC.inc rename to data/scripts/southHyruleField/script_BedInLinksRoom.inc index afac33a8..4300e653 100644 --- a/data/scripts/script_08009ECC.inc +++ b/data/scripts/southHyruleField/script_BedInLinksRoom.inc @@ -1,9 +1,11 @@ -SCRIPT_START script_08009ECC +@ Bed in links room +@ also Bed in Hyrule Castle +SCRIPT_START script_BedInLinksRoom BeginBlock SetIntVariable 0x00000002 DoPostScriptAction 0x0001 EndBlock - WaitForSomething2 0x00000004 + WaitForSyncFlagAndClear 0x00000004 BeginBlock SetIntVariable 0x00000003 DoPostScriptAction 0x0001 diff --git a/data/scripts/southHyruleField/script_ForestMinish2.inc b/data/scripts/southHyruleField/script_ForestMinish2.inc new file mode 100644 index 00000000..9815dd19 --- /dev/null +++ b/data/scripts/southHyruleField/script_ForestMinish2.inc @@ -0,0 +1,26 @@ +@ Hyrule Fields? ForestMinish with Beanstock left to Minish Woods +SCRIPT_START script_ForestMinish2 + BeginBlock + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800C592: + BeginBlock + CheckEntityInteractType + JumpIf script_0800C5A6 + Call sub_08060158 + EndBlock + Jump script_0800C592 +script_0800C5A6: + EndBlock + _0807E864 + CheckInventory1 0x0067 + JumpIfNot script_0800C5BC + Call sub_08060208 + Jump script_0800C5C0 +script_0800C5BC: + MessageNoOverlap 0x4710 +script_0800C5C0: + WaitUntilTextboxCloses + _0807E878 + Jump script_0800C592 diff --git a/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc new file mode 100644 index 00000000..7fc77564 --- /dev/null +++ b/data/scripts/southHyruleField/script_Object69LinksHouseBed.inc @@ -0,0 +1,33 @@ +@ Links house OBJECT_69 bed +SCRIPT_START script_Object69LinksHouseBed + BeginBlock + EndBlock +script_08009DF0: + CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 + JumpIfNot script_08009DF0 + _0807E864 + Call sub_0807F9A4 + Wait 0x0008 + _0807EB28 0x3207 + CheckTextboxResult + JumpIfNot script_08009E4E + Call sub_0807DF28 + _0807E778 0x0002 + DoFade5 + WaitForFadeFinish + Call sub_0804E864 + Wait 0x001e + SetSyncFlag 0x00000002 + WaitForSyncFlagAndClear 0x00000001 + _0807EB28 0x3209 + Wait 0x000f + WaitUntilTextboxCloses + _0807E878 + Call sub_0807DF50 + DoPostScriptAction 0x0006 +SCRIPT_END +script_08009E4E: + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc new file mode 100644 index 00000000..1b74f94c --- /dev/null +++ b/data/scripts/southHyruleField/script_PlayerWakeAfterRest.inc @@ -0,0 +1,13 @@ +@ Player waking up after rest +SCRIPT_START script_PlayerWakeAfterRest + BeginBlock + Call sub_0807DF28 + EndBlock + WaitForSyncFlagAndClear 0x00000002 + _0807E778 0x0002 + DoFade4 + WaitForFadeFinish + DoPostScriptAction 0x0014 + Wait 0x001e + SetSyncFlag 0x00000001 +SCRIPT_END diff --git a/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc new file mode 100644 index 00000000..88aa8aa8 --- /dev/null +++ b/data/scripts/southHyruleField/script_SmithAtLinksHouse.inc @@ -0,0 +1,18 @@ +@ Links house Smith +SCRIPT_START script_SmithAtLinksHouse + BeginBlock + Call sub_0807F348 + Call sub_08066288 + Call sub_08066274 + DoPostScriptAction 0x000a + _0807E930 0x000c + _0807E908 0x0003 + EndBlock +script_08009DD2: + _0807E944 + _0807E908 0x0002 + Call sub_0806622C + WaitUntilTextboxCloses + _0807E908 0x0003 + _0807E930 0x000c + Jump script_08009DD2 diff --git a/data/scripts/script_08009E80.inc b/data/scripts/unused/script_08009E80.inc similarity index 83% rename from data/scripts/script_08009E80.inc rename to data/scripts/unused/script_08009E80.inc index 97dd114a..9d082aa4 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/unused/script_08009E80.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08009E80 BeginBlock EndBlock diff --git a/data/scripts/unused/script_0800B828.inc b/data/scripts/unused/script_0800B828.inc new file mode 100644 index 00000000..002888a2 --- /dev/null +++ b/data/scripts/unused/script_0800B828.inc @@ -0,0 +1,52 @@ +@ TODO UNUSED? +SCRIPT_START script_0800B828 + BeginBlock + _0807E9D4 + _0807EB44 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0800B836: + _0807E944 + _0807E864 + MessageFromTarget 0x0a01 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800B836 + .2byte 0x0000 + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0800B85E: + Wait 0x003c + Call sub_080646A4 + Jump script_0800B85E + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + _0807E930 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0800B87E: + Wait 0x003c + Call sub_0806407C + Jump script_0800B87E + BeginBlock + _0807E9D4 + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + EndBlock +script_0800B89E: + CheckEntityInteractType + JumpIfNot script_0800B89E + _0807E864 + _0807EB74 + MessageFromTarget 0x0a01 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + Jump script_0800B89E diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/unused/script_0800D84C.inc similarity index 94% rename from data/scripts/script_0800D84C.inc rename to data/scripts/unused/script_0800D84C.inc index cfde64fd..baf79ed1 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/unused/script_0800D84C.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_0800D84C BeginBlock EndBlock diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/unused/script_0800FB2C.inc similarity index 75% rename from data/scripts/script_0800FB2C.inc rename to data/scripts/unused/script_0800FB2C.inc index 6f074f03..2e11fe58 100644 --- a/data/scripts/script_0800FB2C.inc +++ b/data/scripts/unused/script_0800FB2C.inc @@ -1,7 +1,8 @@ +@ TODO UNUSED? SCRIPT_START script_0800FB2C _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08012B24.inc b/data/scripts/unused/script_08012B24.inc similarity index 84% rename from data/scripts/script_08012B24.inc rename to data/scripts/unused/script_08012B24.inc index 7fa4617a..fe88c6a6 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/unused/script_08012B24.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08012B24 BeginBlock SetEntitySpeed 0x0100 @@ -5,7 +6,7 @@ SCRIPT_START script_08012B24 EndBlock DoPostScriptAction 0x0001 _0807ECC4 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B50.inc b/data/scripts/unused/script_08012B50.inc similarity index 84% rename from data/scripts/script_08012B50.inc rename to data/scripts/unused/script_08012B50.inc index 8fb19805..b97d546b 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/unused/script_08012B50.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08012B50 BeginBlock SetEntitySpeed 0x0100 @@ -5,7 +6,7 @@ SCRIPT_START script_08012B50 EndBlock DoPostScriptAction 0x0001 _0807EC64 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/unused/script_08012B7C.inc similarity index 84% rename from data/scripts/script_08012B7C.inc rename to data/scripts/unused/script_08012B7C.inc index 9b90a21b..d562bd07 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/unused/script_08012B7C.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08012B7C BeginBlock SetEntitySpeed 0x0100 @@ -5,7 +6,7 @@ SCRIPT_START script_08012B7C EndBlock DoPostScriptAction 0x0001 _0807EC94 0x0008 - _0807E5F8 0x00000002 + SetSyncFlag 0x00000002 CallWithArg sub_0807FB64, 0xffffffe2 Call sub_080791BC SCRIPT_END diff --git a/data/scripts/unused/script_08012C68.inc b/data/scripts/unused/script_08012C68.inc new file mode 100644 index 00000000..c27b36b3 --- /dev/null +++ b/data/scripts/unused/script_08012C68.inc @@ -0,0 +1,19 @@ +@ TODO UNUSED? +SCRIPT_START script_08012C68 + BeginBlock + _0807E9D4 + DoPostScriptAction 0x0008 + SetIntVariable 0x00000000 + Call sub_0806DA04 + EndBlock +script_08012C7E: + CheckEntityInteractType + JumpIfNot script_08012C7E + _0807E864 + _0807E8E4_0 + MessageFromTarget 0x111d + WaitUntilTextboxCloses + SetGlobalFlag 0x0022 + _0807E878 + Jump script_08012C7E + diff --git a/data/scripts/script_08013D04.inc b/data/scripts/unused/script_08013D04.inc similarity index 89% rename from data/scripts/script_08013D04.inc rename to data/scripts/unused/script_08013D04.inc index c18da600..276d2f05 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/unused/script_08013D04.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08013D04 BeginBlock Call sub_0807F92C @@ -9,7 +10,7 @@ script_08013D1C: JumpIfNot script_08013D1C CallWithArg sub_08095D54, 0x00000000 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x08000000 + SetSyncFlag 0x08000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D44.inc b/data/scripts/unused/script_08013D44.inc similarity index 89% rename from data/scripts/script_08013D44.inc rename to data/scripts/unused/script_08013D44.inc index b2035e0e..e375acd4 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/unused/script_08013D44.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08013D44 BeginBlock Call sub_0807F92C @@ -9,7 +10,7 @@ script_08013D5C: JumpIfNot script_08013D5C CallWithArg sub_08095D54, 0x00000001 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x10000000 + SetSyncFlag 0x10000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D84.inc b/data/scripts/unused/script_08013D84.inc similarity index 89% rename from data/scripts/script_08013D84.inc rename to data/scripts/unused/script_08013D84.inc index 99a81862..53a064ac 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/unused/script_08013D84.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08013D84 BeginBlock Call sub_0807F92C @@ -9,7 +10,7 @@ script_08013D9C: JumpIfNot script_08013D9C CallWithArg sub_08095D54, 0x00000002 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x20000000 + SetSyncFlag 0x20000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/unused/script_08013DC4.inc similarity index 89% rename from data/scripts/script_08013DC4.inc rename to data/scripts/unused/script_08013DC4.inc index dbac7069..62c876c7 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/unused/script_08013DC4.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08013DC4 BeginBlock Call sub_0807F92C @@ -9,7 +10,7 @@ script_08013DDC: JumpIfNot script_08013DDC CallWithArg sub_08095D54, 0x00000003 PlaySound SFX_ELEMENT_PLACE - _0807E5F8 0x40000000 + SetSyncFlag 0x40000000 Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END diff --git a/data/scripts/script_080155F4.inc b/data/scripts/unused/script_080155F4.inc similarity index 70% rename from data/scripts/script_080155F4.inc rename to data/scripts/unused/script_080155F4.inc index 8d2bae15..7c934a2a 100644 --- a/data/scripts/script_080155F4.inc +++ b/data/scripts/unused/script_080155F4.inc @@ -1,8 +1,9 @@ +@ TODO UNUSED? SCRIPT_START script_080155F4 - WaitForSomething2 0x00000020 + WaitForSyncFlagAndClear 0x00000020 _0807E930 0x0000 Wait 0x0014 - _0807E5F8 0x00000040 + SetSyncFlag 0x00000040 script_08015608: CheckRoomFlag 0x0001 JumpIfNot script_08015608 diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/unused/script_08015A7C.inc similarity index 82% rename from data/scripts/script_08015A7C.inc rename to data/scripts/unused/script_08015A7C.inc index ade0dcff..3034137b 100644 --- a/data/scripts/script_08015A7C.inc +++ b/data/scripts/unused/script_08015A7C.inc @@ -1,10 +1,11 @@ +@ TODO UNUSED? SCRIPT_START script_08015A7C SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC64 0x0010 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/unused/script_08015AA0.inc similarity index 82% rename from data/scripts/script_08015AA0.inc rename to data/scripts/unused/script_08015AA0.inc index 24b46093..e0187879 100644 --- a/data/scripts/script_08015AA0.inc +++ b/data/scripts/unused/script_08015AA0.inc @@ -1,10 +1,11 @@ +@ TODO UNUSED? SCRIPT_START script_08015AA0 SetEntitySpeed 0x0100 DoPostScriptAction 0x0001 _0807EC94 0x0010 _0807EB44 0x0002 DoPostScriptAction 0x0000 - _0807E5F8 0x00000004 + SetSyncFlag 0x00000004 Call sub_080791BC SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/unused/script_08015F80.inc similarity index 71% rename from data/scripts/script_08015F80.inc rename to data/scripts/unused/script_08015F80.inc index 685cd467..af659a4f 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/unused/script_08015F80.inc @@ -1,11 +1,12 @@ +@ TODO UNUSED? SCRIPT_START script_08015F80 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 EndBlock - WaitForSomething 0x00000200 + WaitForSyncFlag 0x00000200 DoPostScriptAction 0x0005 - WaitForSomething 0x00000400 + WaitForSyncFlag 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END .2byte 0x0000 diff --git a/data/scripts/script_08016384.inc b/data/scripts/unused/script_08016384.inc similarity index 86% rename from data/scripts/script_08016384.inc rename to data/scripts/unused/script_08016384.inc index ff750c90..8d5b915f 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/unused/script_08016384.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08016384 BeginBlock EndBlock @@ -12,7 +13,7 @@ SCRIPT_START script_08016384 Call script_08016384 CallWithArg script_08016384, 0x12345678 LoadRoomEntityList script_08016384 - TestBit 0x00000001 + CheckSyncFlagAndClear 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 HasRoomItemForSale @@ -37,10 +38,10 @@ SCRIPT_START script_08016384 CheckEntityInteractType _0807E30C HasRupees 0x00c8 - _0807E3E8 + CheckTextboxResult CheckKinstoneFused 0x0001 BuyItem 0x006c, 0x0000 - _0807E48C 0x0020 + CheckBottleContaining 0x0020 _0807E4CC 0x00000000 _0807E4EC 0x00000000 _0807E514 0x00000000 @@ -49,8 +50,8 @@ SCRIPT_START script_08016384 EntityHasHeight ComparePlayerAction 0x0001 ComparePlayerAnimationState 0x0004 - _0807E5F8 0x00000001 - _0807E610 0x00000002 + SetSyncFlag 0x00000001 + ClearSyncFlag 0x00000002 SetLocalFlag 0x0067 SetLocalFlagByBank 0x0100, 0x0001 ClearLocalFlag 0x0067 @@ -59,11 +60,11 @@ SCRIPT_START script_08016384 SetRoomFlag 0x0000 ClearRoomFlag 0x0000 Wait 0x001e - WaitForSomething 0x00000001 - WaitForSomething2 0x00000002 + WaitForSyncFlag 0x00000001 + WaitForSyncFlagAndClear 0x00000002 WaitPlayerGetItem WaitForPlayerAction0x17 WaitFor_1 - WaitFor_2 + WaitForFadeFinish _0807E778 0x0004 SetFadeMask 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/unused/script_08016482.inc similarity index 97% rename from data/scripts/script_08016482.inc rename to data/scripts/unused/script_08016482.inc index 57c2cda5..d7a983b0 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/unused/script_08016482.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_08016482 _0807E79C Nop2 0x0080 @@ -68,7 +69,7 @@ SCRIPT_START script_08016482 ModHealth 0x0010 IncreaseMaxHealth _0807F050 0x0001 - _0807F034 0x0001 + GivePlayerItem 0x0001 GetInventoryValue 0x0001 _0807F078 0x0001, 0x0002 _0807F088 0x0001 diff --git a/data/scripts/script_080165A4.inc b/data/scripts/unused/script_080165A4.inc similarity index 88% rename from data/scripts/script_080165A4.inc rename to data/scripts/unused/script_080165A4.inc index 288a6781..f3be3358 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/unused/script_080165A4.inc @@ -1,3 +1,4 @@ +@ TODO UNUSED? SCRIPT_START script_080165A4 BeginBlock DoPostScriptAction 0x000a @@ -13,6 +14,6 @@ script_080165BC: CheckPlayerInRegion2 0x2020 JumpIfNot script_080165BC DoPostScriptAction 0x0003 - Call script_0801637C+1 + Call CreateDustFromScript+1 Jump script_080165BC .2byte 0x0000 diff --git a/data/scripts/unused/script_080165D8.inc b/data/scripts/unused/script_080165D8.inc new file mode 100644 index 00000000..698f8542 --- /dev/null +++ b/data/scripts/unused/script_080165D8.inc @@ -0,0 +1,9 @@ +@ TODO UNUSED? +SCRIPT_START script_080165D8 + Wait 0x001e + CheckPlayerInRegion2 0x2020 + JumpAbsoluteIfNot script_080165D8 + DoPostScriptAction 0x0003 + Call CreateDustFromScript+1 + JumpAbsolute script_080165D8 + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_BigGoron1.inc b/data/scripts/veilFalls/script_BigGoron1.inc new file mode 100644 index 00000000..09ab084e --- /dev/null +++ b/data/scripts/veilFalls/script_BigGoron1.inc @@ -0,0 +1,6 @@ +@ Veil Falls BigGoron 1 +SCRIPT_START script_BigGoron1 + BeginBlock + EndBlock +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_BigGoron2.inc b/data/scripts/veilFalls/script_BigGoron2.inc new file mode 100644 index 00000000..4ee4c99c --- /dev/null +++ b/data/scripts/veilFalls/script_BigGoron2.inc @@ -0,0 +1,6 @@ +@ Veil Falls BigGoron 2 +SCRIPT_START script_BigGoron2 + BeginBlock + EndBlock +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_08009348.inc b/data/scripts/veilFalls/script_BigGoron3.inc similarity index 84% rename from data/scripts/script_08009348.inc rename to data/scripts/veilFalls/script_BigGoron3.inc index 17a843d6..b6531c84 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/veilFalls/script_BigGoron3.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009348 +@ Veil Falls BigGoron 3 +SCRIPT_START script_BigGoron3 BeginBlock _0807E9D4 EndBlock @@ -11,7 +12,7 @@ script_0800934E: _0807F0B4 0x0001 CameraTargetEntity CheckGlobalFlag 0x0055 - JumpIf script_0800939A + JumpIf script_BigGoronTalk MessageNoOverlap 0x1d01 WaitUntilTextboxCloses script_08009376: diff --git a/data/scripts/script_08009320.inc b/data/scripts/veilFalls/script_BigGoronHiding.inc similarity index 70% rename from data/scripts/script_08009320.inc rename to data/scripts/veilFalls/script_BigGoronHiding.inc index ccea2c7d..1cf359ef 100644 --- a/data/scripts/script_08009320.inc +++ b/data/scripts/veilFalls/script_BigGoronHiding.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009320 +@ Veil Falls BigGoron still hiding +SCRIPT_START script_BigGoronHiding BeginBlock Call sub_0806D650 SetEntitySpeed 0x0010 diff --git a/data/scripts/script_08009464.inc b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc similarity index 63% rename from data/scripts/script_08009464.inc rename to data/scripts/veilFalls/script_BigGoronMirrorShield.inc index 05f2b9d0..43fbb794 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/veilFalls/script_BigGoronMirrorShield.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08009464 +@ Veil Falls BigGoron spit out Shield +SCRIPT_START script_BigGoronMirrorShield Wait 0x003c _0807F0C8 0x0000, 0x0000 LoadRoomEntityList gUnk_080F9C58 @@ -27,16 +28,3 @@ SCRIPT_START script_08009464 Wait 0x000a Jump script_08009376 .2byte 0x0000 -SCRIPT_START script_080094A4 - BeginBlock - Call sub_0806D7C4 - SetEntitySpeed 0x0080 - EndBlock - Wait 0x003c - SetEntity0x20 0x00018000 -script_080094BC: - _0807EE30 - JumpIfNot script_080094BC - Wait 0x003c - DoPostScriptAction 0x0006 -SCRIPT_END diff --git a/data/scripts/script_0800939A.inc b/data/scripts/veilFalls/script_BigGoronTalk.inc similarity index 95% rename from data/scripts/script_0800939A.inc rename to data/scripts/veilFalls/script_BigGoronTalk.inc index 39e1d99d..ceb73548 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/veilFalls/script_BigGoronTalk.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800939A +@ Veil Falls Talk to BigGoron +SCRIPT_START script_BigGoronTalk .ifdef JP CheckLocalFlag 0x00ac .else @@ -48,7 +49,7 @@ script_080093DA: script_080093EE: MessageNoOverlapVar WaitUntilTextboxCloses - _0807E3E8 + CheckTextboxResult JumpIfNot script_08009376 Wait 0x001e MessageNoOverlap 0x1d08 diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc similarity index 82% rename from data/scripts/script_08015FC0.inc rename to data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc index a4af16db..61995039 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/veilFalls/script_NPC4ESourceOfTheFlow.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_08015FC0 +@ Veil Falls NPC4E Source of the Flow +SCRIPT_START script_NPC4ESourceOfTheFlow BeginBlock Call sub_0806DB84 CheckKinstoneFused 0x0009 diff --git a/data/scripts/script_08016004.inc b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc similarity index 51% rename from data/scripts/script_08016004.inc rename to data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc index 7516f589..9bd85e9f 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/veilFalls/script_NPC4ESouurceOfTheFlowOpening.inc @@ -1,6 +1,7 @@ -SCRIPT_START script_08016004 - _0807E5F8 0x00000003 - WaitForSomething2 0x0000000c +@ Veil Falls NPC4E Source of the Flow during opening Kinstone cutscene +SCRIPT_START script_NPC4ESouurceOfTheFlowOpening + SetSyncFlag 0x00000003 + WaitForSyncFlagAndClear 0x0000000c _0807F0C8 0x0000, 0x0000 PlaySound SFX_SECRET _0807EB28 0x0b1f diff --git a/data/scripts/veilFalls/script_Object3ELeftStone.inc b/data/scripts/veilFalls/script_Object3ELeftStone.inc new file mode 100644 index 00000000..d92ea126 --- /dev/null +++ b/data/scripts/veilFalls/script_Object3ELeftStone.inc @@ -0,0 +1,5 @@ +@ Veil Falls OBJECT_3E left stone +SCRIPT_START script_Object3ELeftStone + OffsetEntityPosition 0xfff0, 0x0000 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc new file mode 100644 index 00000000..d14749c2 --- /dev/null +++ b/data/scripts/veilFalls/script_Object3ELeftStoneOpening.inc @@ -0,0 +1,15 @@ +@ Waterfalls OBJECT_3E during kinstone cutscene? +SCRIPT_START script_Object3ELeftStoneOpening + BeginBlock + CheckKinstoneFused 0x0009 + JumpIf script_Object3ELeftStone + EndBlock + WaitForSyncFlagAndClear 0x00000001 + DoPostScriptAction 0x0010 + Wait 0x003c + SetEntitySpeed 0x0020 + _0807ECF4 0x0080 + Wait 0x001e + DoPostScriptAction 0x0010 + SetSyncFlag 0x00000008 +SCRIPT_END diff --git a/data/scripts/veilFalls/script_Object3ERightStone.inc b/data/scripts/veilFalls/script_Object3ERightStone.inc new file mode 100644 index 00000000..76e0ddbd --- /dev/null +++ b/data/scripts/veilFalls/script_Object3ERightStone.inc @@ -0,0 +1,5 @@ +@ Veil Falls OBJECT_3E right stone +SCRIPT_START script_Object3ERightStone + OffsetEntityPosition 0x0010, 0x0000 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc new file mode 100644 index 00000000..b8dfa814 --- /dev/null +++ b/data/scripts/veilFalls/script_Object3ERightStoneOpening.inc @@ -0,0 +1,15 @@ +@ Waterfalls OBJECT_3E during kinstone cutscene? +SCRIPT_START script_Object3ERightStoneOpening + BeginBlock + CheckKinstoneFused 0x0009 + JumpIf script_Object3ERightStone + EndBlock + WaitForSyncFlagAndClear 0x00000002 + DoPostScriptAction 0x0010 + Wait 0x003c + SetEntitySpeed 0x0020 + _0807EC94 0x0080 + Wait 0x001e + DoPostScriptAction 0x0010 + SetSyncFlag 0x00000004 +SCRIPT_END diff --git a/data/scripts/script_080094CC.inc b/data/scripts/veilFalls/script_Object6AMirrorShield.inc similarity index 72% rename from data/scripts/script_080094CC.inc rename to data/scripts/veilFalls/script_Object6AMirrorShield.inc index 9b4323f2..63bca6f6 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/veilFalls/script_Object6AMirrorShield.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_080094CC +@ Veil Falls OBJECT_6A Mirror Shield being spit out +SCRIPT_START script_Object6AMirrorShield BeginBlock Call sub_0806D804 SetEntitySpeed 0x0180 diff --git a/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc new file mode 100644 index 00000000..a112bcb8 --- /dev/null +++ b/data/scripts/veilFalls/script_Object6AVeilFallsTop.inc @@ -0,0 +1,14 @@ +@ OBJECT_6A in Veil Falls Top? +SCRIPT_START script_Object6AVeilFallsTop + BeginBlock + Call sub_0806D7C4 + SetEntitySpeed 0x0080 + EndBlock + Wait 0x003c + SetEntity0x20 0x00018000 +script_080094BC: + _0807EE30 + JumpIfNot script_080094BC + Wait 0x003c + DoPostScriptAction 0x0006 +SCRIPT_END diff --git a/data/scripts/westernWood/script_ForestMinish1.inc b/data/scripts/westernWood/script_ForestMinish1.inc new file mode 100644 index 00000000..f31443f3 --- /dev/null +++ b/data/scripts/westernWood/script_ForestMinish1.inc @@ -0,0 +1,20 @@ +@ Western Wood Forest Minish +SCRIPT_START script_ForestMinish1 + BeginBlock + Call sub_08060090 + DoPostScriptAction 0x000a + EndBlock +script_0800C55E: + BeginBlock + CheckEntityInteractType + JumpIf script_0800C572 + Call sub_08060158 + EndBlock + Jump script_0800C55E +script_0800C572: + EndBlock + _0807E864 + Call sub_08060208 + WaitUntilTextboxCloses + _0807E878 + Jump script_0800C55E diff --git a/data/scripts/westernWood/script_MoblinLady.inc b/data/scripts/westernWood/script_MoblinLady.inc new file mode 100644 index 00000000..75d7093e --- /dev/null +++ b/data/scripts/westernWood/script_MoblinLady.inc @@ -0,0 +1,22 @@ +@ Western Wood MoblinLady in Percys house +SCRIPT_START script_MoblinLady + BeginBlock + _0807EB74 + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_08012338: + CheckEntityInteractType + JumpIfNot script_08012338 + _0807EB74 + _0807E864 + MessageFromTarget 0x2304 + WaitUntilTextboxCloses + CheckLocalFlag 0x0042 + JumpIf script_0801235A + SetLocalFlag 0x0042 + GivePlayerItem 0x0057 + WaitPlayerGetItem +script_0801235A: + _0807E878 + Jump script_08012338 diff --git a/data/scripts/westernWood/script_MoblinLadyDisguised.inc b/data/scripts/westernWood/script_MoblinLadyDisguised.inc new file mode 100644 index 00000000..3000aea1 --- /dev/null +++ b/data/scripts/westernWood/script_MoblinLadyDisguised.inc @@ -0,0 +1,63 @@ +@ Western Wood Moblin disguised as Townsperson in Percys house +SCRIPT_START script_MoblinLadyDisguised + BeginBlock + _0807EB44 0x0004 + Call sub_08061FD8 + _0807E9D4 + DoPostScriptAction 0x000a + EndBlock +script_08012284: + EndBlock + BeginBlock + CheckGlobalFlag 0x001e + JumpIfNot script_08012298 + CheckInventory1 0x0015 + JumpIf script_080122BA +script_08012298: + CheckEntityInteractType + JumpIfNot script_08012284 + EndBlock + _0807EB74 + _0807E864 + Call sub_08061FD8 + MessageFromTarget 0x2302 + WaitUntilTextboxCloses + _0807E878 + SetGlobalFlag 0x001e + Jump script_08012284 +script_080122BA: + EndBlock + BeginBlock + CheckRoomFlag 0x0000 + JumpIfNot script_080122CE + CheckRoomFlag 0x0001 + JumpIf script_080122EC +script_080122CE: + CheckEntityInteractType + JumpIfNot script_080122BA + EndBlock + _0807EB74 + _0807E864 + Call sub_08061FD8 + MessageFromTarget 0x2303 + WaitUntilTextboxCloses + _0807E878 + Jump script_080122BA +script_080122EC: + EndBlock + _0807EB74 + _0807E864 + Call sub_08061FD8 + DoPostScriptAction 0x000b + Call sub_08061FB0 + Call sub_08061F94 + LoadRoomEntityList gUnk_additional_a_HouseInteriors2_Percy + DoPostScriptAction 0x0008 + Wait 0x003c + PlaySound SFX_SECRET + SetLocalFlag 0x0043 + Wait 0x001e + _0807E878 + DoPostScriptAction 0x0006 +SCRIPT_END + .align 2, 0 diff --git a/data/scripts/westernWood/script_PercyInside.inc b/data/scripts/westernWood/script_PercyInside.inc new file mode 100644 index 00000000..d0794615 --- /dev/null +++ b/data/scripts/westernWood/script_PercyInside.inc @@ -0,0 +1,20 @@ +@ Tilby Highlands Percy in Tree or in his house +SCRIPT_START script_PercyInside + BeginBlock + _0807EB44 0x0004 + DoPostScriptAction 0x0000 + DoPostScriptAction 0x000a + Call sub_0806B60C + EndBlock +script_08012E9E: + CheckEntityInteractType + JumpIfNot script_08012E9E + _0807E864 + _0807EB74 + DoPostScriptAction 0x0001 + Call sub_0806B4F0 + WaitUntilTextboxCloses + _0807E878 + DoPostScriptAction 0x0000 + Jump script_08012E9E + .2byte 0x0000 diff --git a/data/scripts/westernWood/script_PercyOutside.inc b/data/scripts/westernWood/script_PercyOutside.inc new file mode 100644 index 00000000..e34359d9 --- /dev/null +++ b/data/scripts/westernWood/script_PercyOutside.inc @@ -0,0 +1,20 @@ +@ Trilby Highlands Percy in front of house +SCRIPT_START script_PercyOutside + BeginBlock + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000008 + DoPostScriptAction 0x000a + Call sub_0806B60C + EndBlock +script_08012EDC: + CheckEntityInteractType + JumpIfNot script_08012EDC + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x0000000c + Call sub_0806B4F0 + WaitUntilTextboxCloses + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000008 + Jump script_08012EDC diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/windRuins/script_EzloTalkFoW.inc similarity index 75% rename from data/scripts/script_0800AF8C.inc rename to data/scripts/windRuins/script_EzloTalkFoW.inc index b4477b56..8ac839e1 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/data/scripts/windRuins/script_EzloTalkFoW.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800AF8C +@ Ezlo talk after Wind Ruins +SCRIPT_START script_EzloTalkFoW _0807E864 Call sub_0807DF28 _0807EB28 0x1c03 diff --git a/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc new file mode 100644 index 00000000..b3a0d2f2 --- /dev/null +++ b/data/scripts/windRuins/script_Npc4EReceiveOcarina.inc @@ -0,0 +1,24 @@ +@ After Mazaal NPC4E receive ocarina +SCRIPT_START script_Npc4EReceiveOcarina + BeginBlock + DoPostScriptAction 0x0008 + CheckInventory1 0x0017 + JumpIf script_0800D924 + EndBlock +script_0800D8F4: + CheckInventory1 0x0017 + JumpIfNot script_0800D8F4 + Call sub_0807DF28 + _0807E864 + WaitPlayerGetItem + _0807EB28 0x1325 + WaitUntilTextboxCloses + PlaySound SFX_113 + SetIntVariable 0x00000000 + Call sub_0806DA1C + _0807E878 + Call sub_0807DF50 +script_0800D924: + DoPostScriptAction 0x0006 +SCRIPT_END + .2byte 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc similarity index 53% rename from data/scripts/script_0800D874.inc rename to data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc index 6e7a1185..3c0338b0 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/windRuins/script_Npc4EWindRuinsTextBoard.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D874 +@ After Mazaal NPC4E text board +SCRIPT_START script_Npc4EWindRuinsTextBoard BeginBlock Call sub_0807F934 DoPostScriptAction 0x0008 @@ -12,8 +13,8 @@ script_0800D88E: Call sub_0807DF28 CheckLocalFlag 0x0045 JumpIf script_0800D8B0 - StartPlayerScript script_0800D92C - WaitForSomething2 0x00000001 + StartPlayerScript script_PlayerAtTextboard + WaitForSyncFlagAndClear 0x00000001 script_0800D8B0: _0807E8E4_0 MessageNoOverlap 0x1324 @@ -31,26 +32,3 @@ script_0800D8D6: _0807E878 Jump script_0800D88E .2byte 0x0000 -SCRIPT_START script_0800D8E4 - BeginBlock - DoPostScriptAction 0x0008 - CheckInventory1 0x0017 - JumpIf script_0800D924 - EndBlock -script_0800D8F4: - CheckInventory1 0x0017 - JumpIfNot script_0800D8F4 - Call sub_0807DF28 - _0807E864 - WaitPlayerGetItem - _0807EB28 0x1325 - WaitUntilTextboxCloses - PlaySound SFX_113 - SetIntVariable 0x00000000 - Call sub_0806DA1C - _0807E878 - Call sub_0807DF50 -script_0800D924: - DoPostScriptAction 0x0006 -SCRIPT_END - .2byte 0x0000 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/windRuins/script_PlayerAtTextboard.inc similarity index 63% rename from data/scripts/script_0800D92C.inc rename to data/scripts/windRuins/script_PlayerAtTextboard.inc index 43b2abb5..a3c2a068 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/windRuins/script_PlayerAtTextboard.inc @@ -1,4 +1,5 @@ -SCRIPT_START script_0800D92C +@ Player at Text board after Mazaal +SCRIPT_START script_PlayerAtTextboard BeginBlock SetEntitySpeed 0x0080 EndBlock @@ -6,6 +7,6 @@ SCRIPT_START script_0800D92C _0807EDD4 0x00a0, 0x0078 _0807EB44 0x0000 DoPostScriptAction 0x0000 - _0807E5F8 0x00000001 + SetSyncFlag 0x00000001 Call sub_080791BC SCRIPT_END diff --git a/include/script.h b/include/script.h index 9dd1f116..b59d8916 100644 --- a/include/script.h +++ b/include/script.h @@ -20,13 +20,14 @@ typedef struct ScriptExecutionContext { } ScriptExecutionContext; typedef struct { - u32 unk_00; + // Sync flags are used to synchronize scripts running on different entities + u32 syncFlags; u16 commandIndex; u8 commandSize; u8 flags; u8 unk_08; -} struct_02033280; -extern struct_02033280 gActiveScriptInfo; +} ActiveScriptInfo; +extern ActiveScriptInfo gActiveScriptInfo; void ExecuteScript(Entity* entity, ScriptExecutionContext* context); diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c index 64a25711..f9977d2f 100644 --- a/src/enemy/mazaalMacro.c +++ b/src/enemy/mazaalMacro.c @@ -5,7 +5,7 @@ extern void sub_0807B600(u32); -extern const u16 script_08012E20[]; +extern const u16 script_MazaalMacroDefeated[]; void sub_08034E18(Entity*); void sub_08034FA0(Entity*); @@ -139,7 +139,7 @@ void sub_08034E68(Entity* this) { if (gScreenTransition.field_0x39 == 0) { if (sub_08079F8C() != 0) { this->action = 3; - scriptExecutionContext = StartCutscene(this, (u16*)script_08012E20); + scriptExecutionContext = StartCutscene(this, (u16*)script_MazaalMacroDefeated); *(ScriptExecutionContext**)&this->cutsceneBeh = scriptExecutionContext; } } else { diff --git a/src/manager/managerF.c b/src/manager/managerF.c index 70c810ac..c13e9588 100644 --- a/src/manager/managerF.c +++ b/src/manager/managerF.c @@ -77,16 +77,16 @@ const ManagerF_HelperStruct gUnk_08108354[] = { const u32 gUnk_08108354_terminator = 0xFFFF; // terminator for the previous array -extern u16 script_0800E600[]; -extern u16 script_0800E62C[]; -extern u16 script_0800E658[]; -extern u16 script_0800E684[]; +extern u16 script_PlayerAtDarkNut1[]; +extern u16 script_PlayerAtDarkNut2[]; +extern u16 script_PlayerAtDarkNut3[]; +extern u16 script_PlayerAtMadderpillar[]; u16* const gUnk_08108380[] = { - script_0800E600, - script_0800E62C, - script_0800E658, - script_0800E684, + script_PlayerAtDarkNut1, + script_PlayerAtDarkNut2, + script_PlayerAtDarkNut3, + script_PlayerAtMadderpillar, }; void sub_08058F44(u32, u32, u32); diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c index 0f79c152..920e7c12 100644 --- a/src/npc/npc4E.c +++ b/src/npc/npc4E.c @@ -17,8 +17,8 @@ typedef struct { extern void sub_08078850(Entity*, u32, u8 /* TODO this is a s8 in beedle.c*/, gUnk_0810C89C_struct*); -extern void script_08016030; // Cutscene data type? -extern void script_0801606C; // Cutscene data type? +extern void script_Object3ELeftStoneOpening; // Cutscene data type? +extern void script_Object3ERightStoneOpening; // Cutscene data type? const Hitbox gUnk_08114154; const u8 gUnk_0811415C[]; @@ -142,12 +142,12 @@ void sub_0806DB84(Entity* this, ScriptExecutionContext* context) { ent = CreateObject(OBJECT_3E, 4, 0); if (ent != NULL) { PositionRelative(this, ent, -0x80000, 0); - *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_08016030); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ELeftStoneOpening); } ent = CreateObject(OBJECT_3E, 5, 0); if (ent != NULL) { PositionRelative(this, ent, 0x80000, 0); - *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_0801606C); + *(ScriptExecutionContext**)&ent->cutsceneBeh = StartCutscene(ent, &script_Object3ERightStoneOpening); } } diff --git a/src/npc/rem.c b/src/npc/rem.c index cef24033..c55df7c9 100644 --- a/src/npc/rem.c +++ b/src/npc/rem.c @@ -6,7 +6,7 @@ extern void sub_0806A8C8(Entity*); extern void (*gUnk_08112260[])(Entity*); extern void (*gUnk_08112278[])(Entity*); -extern void script_08012F0C; +extern void script_Rem; extern void sub_08078850(Entity*, u32, u32, u32*); extern u32 gUnk_0811229C; @@ -51,7 +51,7 @@ void sub_0806A3D8(Entity* this) { this->actionDelay = 0xb4; SetDefaultPriority(this, PRIO_MESSAGE); sub_0806A8C8(this); - uVar1 = StartCutscene(this, &script_08012F0C); + uVar1 = StartCutscene(this, &script_Rem); *(ScriptExecutionContext**)&this->cutsceneBeh = uVar1; sub_0807DD94(this, NULL); } @@ -132,7 +132,7 @@ void sub_0806A550(Entity* this) { if (this->frame == 1) { this->frame = 0; InitScreenShake(8, 2); - gActiveScriptInfo.unk_00 |= 0x100; + gActiveScriptInfo.syncFlags |= 0x100; SoundReq(SFX_CHEST_OPEN); } if ((this->frame & 0x80) != 0) { @@ -173,7 +173,7 @@ void sub_0806A630(Entity* this) { this->action = 1; InitializeAnimation(this, 0x12); } - if ((gActiveScriptInfo.unk_00 & 0x100) != 0) { + if ((gActiveScriptInfo.syncFlags & 0x100) != 0) { GetNextFrame(this); } if (this->frame == 1) { @@ -192,7 +192,7 @@ void sub_0806A830(Entity* this) { InitializeAnimation(this, 0x14); SetDefaultPriority(this, PRIO_MESSAGE); } - if ((gActiveScriptInfo.unk_00 & 0x200) != 0) { + if ((gActiveScriptInfo.syncFlags & 0x200) != 0) { DeleteThisEntity(); } GetNextFrame(this); diff --git a/src/npc/stockwell.c b/src/npc/stockwell.c index 454b8b2a..e6beed01 100644 --- a/src/npc/stockwell.c +++ b/src/npc/stockwell.c @@ -13,7 +13,7 @@ extern bool32 sub_08056338(void); extern void sub_08078850(Entity*, u32, u8, u32*); extern u32 gUnk_0810FDA0; -extern u16 script_080142B0; +extern u16 script_Stockwell; void Stockwell(Entity* this) { gUnk_0810FDA4[this->action](this); @@ -32,7 +32,7 @@ void sub_08065080(Entity* this) { #ifndef EU sub_08078850(this, 0, 0, &gUnk_0810FDA0); #endif - context = StartCutscene(this, &script_080142B0); + context = StartCutscene(this, &script_Stockwell); *(ScriptExecutionContext**)&this->cutsceneBeh = context; } diff --git a/src/npc/talon.c b/src/npc/talon.c index 1ed653fd..a7bc1e81 100644 --- a/src/npc/talon.c +++ b/src/npc/talon.c @@ -4,7 +4,7 @@ extern void (*gUnk_0810FEC4[])(Entity* this); extern void (*gUnk_0810FEBC[])(Entity* this); extern SpriteLoadData gUnk_0810FEB0; -extern u8 script_0800B41C; +extern u8 script_TalonGotKey; extern u8 gUnk_0810FED8[]; void sub_0806574C(Entity* this); @@ -103,7 +103,7 @@ void sub_080656D4(Entity* this) { } else { if (this->interactType != 0) { if (GetInventoryValue(0x37) != 0) { // keyLonLon - StartCutscene(this, (u16*)&script_0800B41C); + StartCutscene(this, (u16*)&script_TalonGotKey); goto label2; } else { this->field_0x68.HALF.HI = this->action; diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c index f5e3d57d..a0d979eb 100644 --- a/src/npc/windTribespeople.c +++ b/src/npc/windTribespeople.c @@ -15,7 +15,7 @@ extern void (*const gUnk_08113A7C[])(Entity*); extern void (*const gUnk_08113A8C[])(Entity*, ScriptExecutionContext*); extern SpriteLoadData gUnk_08113A1C[]; -extern u16 script_08014A80; +extern u16 script_WindTribespeople6; extern Dialog gUnk_08113ABC[]; extern u16 gUnk_08113B0C[]; @@ -64,7 +64,7 @@ void sub_0806C7D4(Entity* this) { sub_0807DD94(this, NULL); if ((this->type2 == 3) && (!CheckGlobalFlag(WARP_EVENT_END)) && (CheckLocalFlag(0x63)) && (CheckRoomFlag(0))) { this->type2 = 7; - sub_0807DD80(this, &script_08014A80); + sub_0807DD80(this, &script_WindTribespeople6); } } } diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c index db393026..ccb1adbf 100644 --- a/src/object/greatFairy.c +++ b/src/object/greatFairy.c @@ -183,7 +183,7 @@ void GreatFairy_WingsUpdate(Entity* this) { this->action = 2; sub_0805EC60(this); gRoomVars.animFlags |= 32; - gActiveScriptInfo.unk_00 |= 4; + gActiveScriptInfo.syncFlags |= 4; } else { sub_0805EC9C(this, this->speed, 256, 0); } diff --git a/src/object/object6A.c b/src/object/object6A.c index c1b065a8..340a36b0 100644 --- a/src/object/object6A.c +++ b/src/object/object6A.c @@ -16,10 +16,10 @@ extern s16 gUnk_08122B0E[]; extern u16 gUnk_08122B1E[]; extern s8 gUnk_08122B2E[]; -extern u16 script_0800AEDC; -extern u16 script_0801183C; +extern u16 script_Object6ATheLittleHat; +extern u16 script_Object6ASwordInChest; extern u16 script_08015B14; -extern u16 script_08011940; +extern u16 script_ZeldaMagic; extern u16 script_08012C48; typedef struct { @@ -186,7 +186,7 @@ void sub_08094B94(Object6AEntity* this) { if (e != NULL) { CopyPosition(&gPlayerEntity, e); e->z.HALF.HI = -48; - ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0800AEDC); + ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ATheLittleHat); CreateDust(e); e->z.HALF.HI += 16; e->y.HALF.HI++; @@ -535,7 +535,7 @@ void sub_08095244(Object6AEntity* this) { if (e != NULL) { e->parent = super; PositionRelative(super, e, 0x100000, -0x100000); - ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_0801183C); + ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_Object6ASwordInChest); } } } @@ -804,7 +804,7 @@ void sub_08095810(Object6AEntity* this) { e->parent = super; CopyPosition(super, e); ResolveEntityOnTop(super, e); - ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_08011940); + ((Object6AEntity*)e)->ctx = StartCutscene(e, &script_ZeldaMagic); } } @@ -873,7 +873,7 @@ void sub_08095954(Object6AEntity* this) { EnqueueSFX(292); super->frame &= ~1; } else { - gActiveScriptInfo.unk_00 |= 0x100; + gActiveScriptInfo.syncFlags |= 0x100; } } @@ -1069,7 +1069,7 @@ void sub_08095D8C(Object6AEntity* this, ScriptExecutionContext* ctx) { } void sub_08095DBC(Object6AEntity* this) { - if (gActiveScriptInfo.unk_00 & 0x10) + if (gActiveScriptInfo.syncFlags & 0x10) DeleteThisEntity(); if (super->type2 == 0) { if (super->action == 0) { @@ -1085,7 +1085,7 @@ void sub_08095DBC(Object6AEntity* this) { super->spriteRendering.b3 = gUnk_08114F30[super->spriteRendering.b3]; ResolveEntityOnTop(super, super); } - if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.unk_00 & 0x20000) { + if ((super->type2 & 0x80) == 0 && gActiveScriptInfo.syncFlags & 0x20000) { super->type2 = -1; super->zVelocity = 0x40000; super->speed = 0xC000; diff --git a/src/player.c b/src/player.c index 3cde33dd..c50474c6 100644 --- a/src/player.c +++ b/src/player.c @@ -279,8 +279,8 @@ extern ScreenTransitionData gUnk_0813AB58; extern ScreenTransitionData gUnk_0813AD88[]; extern u8 gUnk_080082DC[]; -extern u16 script_08009ECC; -extern u16 script_08009EF0; +extern u16 script_BedInLinksRoom; +extern u16 script_BedAtSimons; extern Entity* gPlayerClones[]; extern ScriptExecutionContext gPlayerScriptExecutionContext; @@ -3765,10 +3765,10 @@ NONMATCH("asm/non_matching/player/sub_080751E8.inc", void sub_080751E8(u32 a1, u gPlayerState.flags |= 8; if (!a1) { gPlayerState.field_0x39 = 0; - tmp = &script_08009ECC; + tmp = &script_BedInLinksRoom; } else { gPlayerState.field_0x39 = 1; - tmp = &script_08009EF0; + tmp = &script_BedAtSimons; } e = CreateObject(OBJECT_5B, !gPlayerState.field_0x39 ? 2 : 0, 0); if (e != NULL) { diff --git a/src/roomInit.c b/src/roomInit.c index 80ff8a1c..c6ffda37 100644 --- a/src/roomInit.c +++ b/src/roomInit.c @@ -390,7 +390,7 @@ u32 sub_unk3_HouseInteriors1_InnWestRoom(void) { return 1; } -extern void* script_08010A5C[]; +extern void* script_PlayerSleepingInn[]; void sub_StateChange_HouseInteriors1_InnWestRoom(void) { if (CheckLocalFlag(YADO_CHECKIN)) { @@ -398,7 +398,7 @@ void sub_StateChange_HouseInteriors1_InnWestRoom(void) { DoFade(5, 256); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &script_08010A5C); + sub_080751E8(1, 2, &script_PlayerSleepingInn); } } @@ -424,7 +424,7 @@ void sub_StateChange_HouseInteriors1_InnMiddleRoom(void) { DoFade(5, 256); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x50; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &script_08010A5C); + sub_080751E8(1, 2, &script_PlayerSleepingInn); } } @@ -450,7 +450,7 @@ void sub_StateChange_HouseInteriors1_InnEastRoom(void) { DoFade(5, 256); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x60; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 2, &script_08010A5C); + sub_080751E8(1, 2, &script_PlayerSleepingInn); } } @@ -665,14 +665,14 @@ u32 sub_unk3_HyruleCastle_4(void) { return 1; } -extern u32 script_08009E88; +extern u32 script_PlayerWakingUpInHyruleCastle; void sub_StateChange_HyruleCastle_4(void) { if (!CheckLocalFlag(CASTLE_04_MEZAME)) { DoFade(5, 256); gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0xb0; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x40; - sub_080751E8(0, 6, &script_08009E88); + sub_080751E8(0, 6, &script_PlayerWakingUpInHyruleCastle); #ifdef EU SoundReq(0x80010000); gArea.musicIndex = gArea.pMusicIndex; @@ -4806,14 +4806,14 @@ u32 sub_unk3_HouseInteriors2_LinksHouseBedroom() { } extern EntityData gUnk_080F31D8; -extern u32 script_08009B30; +extern u32 script_PlayerIntro; void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) { if (!CheckGlobalFlag(START) && !CheckLocalFlag(0x46)) { sub_080A71C4(5, 1, 4, 4); gUpdateVisibleTiles = 0; DoFade(5, 256); - sub_080751E8(0, 6, &script_08009B30); + sub_080751E8(0, 6, &script_PlayerIntro); } if (!CheckGlobalFlag(OUTDOOR)) { gArea.musicIndex = gArea.pMusicIndex; @@ -4824,12 +4824,12 @@ void sub_StateChange_HouseInteriors2_LinksHouseBedroom(void) { } } -extern u32 script_08009E58; +extern u32 script_PlayerWakeAfterRest; void sub_0804E864(void) { gPlayerEntity.x.HALF.HI = gRoomControls.roomOriginX + 0x90; gPlayerEntity.y.HALF.HI = gRoomControls.roomOriginY + 0x38; - sub_080751E8(1, 6, &script_08009E58); + sub_080751E8(1, 6, &script_PlayerWakeAfterRest); ModHealth(0xa0); } @@ -5316,14 +5316,14 @@ u32 sub_unk3_HouseInteriors3_Simon(void) { } extern EntityData gUnk_080F5DD0; -extern u32 script_08011C50; +extern u32 script_PlayerWakingUpAtSimons; void sub_StateChange_HouseInteriors3_Simon(void) { if (gSave.global_progress > 7) { LoadRoomEntityList(&gUnk_080F5DD0); } if (CheckGlobalFlag(MAROYA_WAKEUP)) { - sub_080751E8(1, 2, &script_08011C50); + sub_080751E8(1, 2, &script_PlayerWakingUpAtSimons); } } diff --git a/src/script.c b/src/script.c index c771df3e..ba508cf0 100644 --- a/src/script.c +++ b/src/script.c @@ -28,7 +28,7 @@ void ScriptCommand_JumpAbsoluteTable(Entity* entity, ScriptExecutionContext* con void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_CheckSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckInventory1(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckInventory2(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckLocalFlag(Entity* entity, ScriptExecutionContext* context); @@ -41,10 +41,10 @@ void ScriptCommand_CheckEntityInteractType(Entity* entity, ScriptExecutionContex void ScriptCommand_0807E30C(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_HasRupees(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_CheckTextboxResult(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CheckKinstoneFused(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_CheckBottleContaining(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_HasRoomItemForSale(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E4CC(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E4EC(Entity* entity, ScriptExecutionContext* context); @@ -54,8 +54,8 @@ void ScriptCommand_0807E564(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_EntityHasHeight(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ComparePlayerAction(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_SetSyncFlag(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_ClearSyncFlag(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetLocalFlagByBank(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ClearLocalFlag(Entity* entity, ScriptExecutionContext* context); @@ -64,12 +64,12 @@ void ScriptCommand_ClearGlobalFlag(Entity* entity, ScriptExecutionContext* conte void ScriptCommand_SetRoomFlag(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ClearRoomFlag(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WaitForSyncFlag(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WaitForSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitPlayerGetItem(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitForPlayerAction0x17(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E778(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_SetFadeMask(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807E79C(Entity* entity, ScriptExecutionContext* context); @@ -143,7 +143,7 @@ void ScriptCommand_StopBgm(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ModRupees(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_ModHealth(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807F050(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_GetInventoryValue(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_0807F078(Entity* entity, ScriptExecutionContext* context); @@ -481,7 +481,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_Call, ScriptCommand_CallWithArg, ScriptCommand_LoadRoomEntityList, - ScriptCommand_TestBit, + ScriptCommand_CheckSyncFlagAndClear, ScriptCommand_CheckInventory1, ScriptCommand_CheckInventory2, ScriptCommand_HasRoomItemForSale, @@ -495,10 +495,10 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_0807E30C, ScriptCommand_HasRupees, ScriptCommand_0807E3BC, - ScriptCommand_0807E3E8, + ScriptCommand_CheckTextboxResult, ScriptCommand_CheckKinstoneFused, ScriptCommand_BuyItem, - ScriptCommand_0807E48C, + ScriptCommand_CheckBottleContaining, ScriptCommand_0807E4CC, ScriptCommand_0807E4EC, ScriptCommand_0807E514, @@ -507,8 +507,8 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_EntityHasHeight, ScriptCommand_ComparePlayerAction, ScriptCommand_ComparePlayerAnimationState, - ScriptCommand_0807E5F8, - ScriptCommand_0807E610, + ScriptCommand_SetSyncFlag, + ScriptCommand_ClearSyncFlag, ScriptCommand_SetLocalFlag, ScriptCommand_SetLocalFlagByBank, ScriptCommand_ClearLocalFlag, @@ -517,12 +517,12 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_SetRoomFlag, ScriptCommand_ClearRoomFlag, ScriptCommand_Wait, - ScriptCommand_WaitForSomething, - ScriptCommand_WaitForSomething2, + ScriptCommand_WaitForSyncFlag, + ScriptCommand_WaitForSyncFlagAndClear, ScriptCommand_WaitPlayerGetItem, ScriptCommand_WaitForPlayerAction0x17, ScriptCommand_WaitFor_1, - ScriptCommand_WaitFor_2, + ScriptCommand_WaitForFadeFinish, ScriptCommand_0807E778, ScriptCommand_SetFadeMask, ScriptCommand_0807E79C, @@ -597,7 +597,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { ScriptCommand_ModRupees, ScriptCommand_ModHealth, ScriptCommand_IncreaseMaxHealth, - ScriptCommand_0807F034, + ScriptCommand_GivePlayerItem, ScriptCommand_0807F050, ScriptCommand_GetInventoryValue, ScriptCommand_0807F078, @@ -613,7 +613,7 @@ void ExecuteScript(Entity* entity, ScriptExecutionContext* context) { if (context->wait) { context->wait--; } else { - struct_02033280* activeScriptInfo = &gActiveScriptInfo; + ActiveScriptInfo* activeScriptInfo = &gActiveScriptInfo; activeScriptInfo->flags = 0; do { u32 cmd = GetNextScriptCommandHalfword(context->scriptInstructionPointer); @@ -713,14 +713,14 @@ void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* co LoadRoomEntityList((EntityData*)GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer)); } -void ScriptCommand_TestBit(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_CheckSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context) { u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); u32 set = 0; - u32 field = gActiveScriptInfo.unk_00; + u32 field = gActiveScriptInfo.syncFlags; if ((field & flag) == flag) set = 1; context->condition = set; - gActiveScriptInfo.unk_00 = field & ~flag; + gActiveScriptInfo.syncFlags = field & ~flag; gActiveScriptInfo.flags |= 1; } @@ -831,7 +831,7 @@ void ScriptCommand_0807E3BC(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E3E8(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_CheckTextboxResult(Entity* entity, ScriptExecutionContext* context) { context->condition = !gUnk_02000040.unk_01; gActiveScriptInfo.flags |= 1; } @@ -861,7 +861,7 @@ void ScriptCommand_BuyItem(Entity* entity, ScriptExecutionContext* context) { gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E48C(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_CheckBottleContaining(Entity* entity, ScriptExecutionContext* context) { context->condition = GetBottleContaining(context->scriptInstructionPointer[1]); gActiveScriptInfo.flags |= 1; } @@ -914,12 +914,12 @@ void ScriptCommand_ComparePlayerAnimationState(Entity* entity, ScriptExecutionCo gActiveScriptInfo.flags |= 1; } -void ScriptCommand_0807E5F8(Entity* entity, ScriptExecutionContext* context) { - gActiveScriptInfo.unk_00 |= GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); +void ScriptCommand_SetSyncFlag(Entity* entity, ScriptExecutionContext* context) { + gActiveScriptInfo.syncFlags |= GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } -void ScriptCommand_0807E610(Entity* entity, ScriptExecutionContext* context) { - gActiveScriptInfo.unk_00 &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); +void ScriptCommand_ClearSyncFlag(Entity* entity, ScriptExecutionContext* context) { + gActiveScriptInfo.syncFlags &= ~GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); } void ScriptCommand_SetLocalFlag(Entity* entity, ScriptExecutionContext* context) { @@ -954,19 +954,19 @@ void ScriptCommand_Wait(Entity* entity, ScriptExecutionContext* context) { context->wait = GetNextScriptCommandHalfwordAfterCommandMetadata(context->scriptInstructionPointer); } -void ScriptCommand_WaitForSomething(Entity* entity, ScriptExecutionContext* context) { - u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); - if ((gActiveScriptInfo.unk_00 & tmp) != tmp) { +void ScriptCommand_WaitForSyncFlag(Entity* entity, ScriptExecutionContext* context) { + u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); + if ((gActiveScriptInfo.syncFlags & flag) != flag) { gActiveScriptInfo.commandSize = 0; } } -void ScriptCommand_WaitForSomething2(Entity* entity, ScriptExecutionContext* context) { - u32 tmp = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); - if ((gActiveScriptInfo.unk_00 & tmp) != tmp) { +void ScriptCommand_WaitForSyncFlagAndClear(Entity* entity, ScriptExecutionContext* context) { + u32 flag = GetNextScriptCommandWordAfterCommandMetadata(context->scriptInstructionPointer); + if ((gActiveScriptInfo.syncFlags & flag) != flag) { gActiveScriptInfo.commandSize = 0; } else { - gActiveScriptInfo.unk_00 &= ~tmp; + gActiveScriptInfo.syncFlags &= ~flag; gActiveScriptInfo.flags |= 1; } } @@ -995,7 +995,7 @@ void ScriptCommand_WaitFor_1(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_WaitFor_2(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_WaitForFadeFinish(Entity* entity, ScriptExecutionContext* context) { if (gFadeControl.active) { gActiveScriptInfo.commandSize = 0; } @@ -1040,7 +1040,7 @@ void ScriptCommand_0807E80C(Entity* entity, ScriptExecutionContext* context) { sub_0807E818(0x11); } -void sub_0807E818(u32 unk1) { +void sub_0807E818(u32 fadeType) { Entity* cameraTarget = gRoomControls.cameraTarget; u32 x, y; if (cameraTarget) { @@ -1050,7 +1050,7 @@ void sub_0807E818(u32 unk1) { x = 0x78; y = 0x50; } - sub_08050110(x, y, unk1, gActiveScriptInfo.unk_08); + sub_08050110(x, y, fadeType, gActiveScriptInfo.unk_08); } void ScriptCommand_0807E858(Entity* entity, ScriptExecutionContext* context) { @@ -1489,7 +1489,7 @@ void ScriptCommand_IncreaseMaxHealth(Entity* entity, ScriptExecutionContext* con gSave.stats.health = gSave.stats.maxHealth; } -void ScriptCommand_0807F034(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_GivePlayerItem(Entity* entity, ScriptExecutionContext* context) { u32 tmp = 0; if (context->scriptInstructionPointer[1] == 0x3F) { tmp = context->intVariable;