mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-08 14:36:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into transitions

Browse Source
This commit is contained in:
Henny022p
2022-03-23 22:43:39 +01:00
parent eb5d9a6726 fc3dc16951
commit 92cdc57ecd
369 changed files with 5173 additions and 10141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/const/enemy/flyingPot.s
-34
View File
@@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_080CF244:: @ 080CF244
.4byte sub_0803708C
.4byte sub_080370A4
.4byte GenericKnockback
.4byte GenericDeath
.4byte GenericConfused
.4byte sub_0803712C
gUnk_080CF25C:: @ 080CF25C
.4byte sub_08037220
.4byte sub_08037280
.4byte sub_080372E8
.4byte sub_0803737C
.4byte sub_080373B0
.4byte sub_080373C8
.4byte sub_080373E0
gUnk_080CF278:: @ 080CF278
.4byte sub_08037144
.4byte sub_0803715C
.4byte sub_0803718C
.4byte sub_080371F8
.4byte nullsub_161
.4byte sub_08037218
gUnk_080CF290:: @ 080CF290
.incbin "flyingPot/gUnk_080CF290.bin"
data/const/item/itemTryPickupObject.s
+1 -1
View File
@@ -6,7 +6,7 @@
gUnk_0811BDB4:: @ 0811BDB4
.4byte sub_080761C0
.4byte ItemPickupCheck
.4byte sub_080762D8
.4byte sub_08076488
.4byte sub_08076518
data/const/object/bird.s
-34
View File
@@ -1,34 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123EC0:: @ 08123EC0
.4byte sub_0809CF3C
.4byte sub_0809D030
.4byte sub_0809D0F4
.4byte sub_0809D178
.4byte sub_0809D178
.4byte sub_0809D178
.4byte sub_0809D178
.4byte sub_0809D178
.4byte sub_0809D1F0
.4byte sub_0809D498
.4byte sub_0809D66C
gUnk_08123EEC:: @ 08123EEC
.4byte sub_0809CF54
.4byte sub_0809CFEC
gUnk_08123EF4:: @ 08123EF4
.4byte sub_0809D048
.4byte sub_0809D06C
gUnk_08123EFC:: @ 08123EFC
.4byte sub_0809D084
.4byte sub_0809D0AC
gUnk_08123F04:: @ 08123F04
.4byte sub_0809D10C
.4byte sub_0809D130
data/const/object/mazaalBossObject.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123D28:: @ 08123D28
.4byte sub_0809AB04
.4byte sub_0809ABA4
.4byte sub_0809ABB0
.4byte sub_0809ABD4
.4byte sub_0809ABF4
.4byte sub_0809AC3C
.4byte sub_0809ACA0
.4byte sub_0809ACCC
.4byte sub_0809ACE8
data/const/object/minecart.s
-21
View File
@@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081223A8:: @ 081223A8
.4byte sub_080916EC
.4byte sub_080917DC
.4byte sub_080918A4
.4byte sub_080919AC
.4byte sub_08091C0C
.4byte sub_08091C98
.4byte sub_08091CC8
.4byte sub_08091D90
gUnk_081223C8:: @ 081223C8
.incbin "minecart/gUnk_081223C8.bin"
gUnk_081223D0:: @ 081223D0
.incbin "minecart/gUnk_081223D0.bin"
data/const/object/object96.s
-83
View File
@@ -1,83 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123FB0:: @ 08123FB0
.4byte sub_0809D91C
.4byte sub_0809D93C
.4byte 0x30300000
.4byte 0x133c3c01
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x10636300
.4byte 00000000
.4byte 0x00001800
.4byte 0x00180000
.ifdef JP
.4byte 0x000000CD
.else
.ifdef DEMO_JP
.4byte 0x000000CD
.else
.ifdef EU
.4byte 0x000000CD @ TODO deduplicate
.else
.4byte 0x000000d0
.endif
.endif
.endif
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x0f3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x023c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400140
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x0d3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x1a3c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400100
.4byte 0x00014021
.4byte sub_0809D91C
.4byte 00000000
.4byte 00000000
.4byte 0x133c3c00
.4byte 0x00010000
.4byte 0x00001800
.4byte 0x00400060
.incbin "object96/gUnk_08123FB0.bin"
gUnk_081240B0:: @ 081240B0
.4byte sub_0809D7A8
.4byte sub_0809D824
.4byte sub_0809D860
.4byte sub_0809D8C8
data/const/object/object98.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812418C:: @ 0812418C
.4byte sub_0809E360
.4byte sub_0809E3E4
data/const/object/objectA6.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124800:: @ 08124800
.4byte sub_0809F920
.4byte sub_0809F964
data/const/object/objectA9.s
-16
View File
@@ -1,16 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124850:: @ 08124850
.4byte sub_0809FEF8
.4byte sub_0809FF28
.4byte DeleteEntity
gUnk_0812485C:: @ 0812485C
.incbin "objectA9/gUnk_0812485C.bin"
gUnk_08124860:: @ 08124860
.incbin "objectA9/gUnk_08124860.bin"
data/const/object/objectAB.s
-10
View File
@@ -1,10 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812486C:: @ 0812486C
.4byte sub_080A00F8
.4byte sub_080A012C
.4byte sub_080A0158
data/const/object/objectAD.s
-9
View File
@@ -1,9 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_081248BC:: @ 081248BC
.4byte sub_080A04A4
.4byte sub_080A04E0
data/const/object/objectB4.s
-17
View File
@@ -1,17 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124B10:: @ 08124B10
.incbin "objectB4/gUnk_08124B10.bin"
gUnk_08124B20:: @ 08124B20
.4byte sub_080A0BA8
.4byte sub_080A0CE8
.4byte sub_080A0D70
.4byte sub_080A0E08
gUnk_08124B30:: @ 08124B30
.incbin "objectB4/gUnk_08124B30.bin"
data/const/object/objectB9.s
-21
View File
@@ -1,21 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08124C20:: @ 08124C20
.incbin "objectB9/gUnk_08124C20.bin"
gUnk_08124C48:: @ 08124C48
.incbin "objectB9/gUnk_08124C48.bin"
gUnk_08124EA0:: @ 08124EA0
.incbin "objectB9/gUnk_08124EA0.bin"
gUnk_08124EC8:: @ 08124EC8
.incbin "objectB9/gUnk_08124EC8.bin"
gUnk_08124ECC:: @ 08124ECC
.incbin "objectB9/gUnk_08124ECC.bin"
data/const/object/objectBlockingStairs.s
-27
View File
@@ -1,27 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_0812283C:: @ 0812283C
.4byte sub_08092EEC
.4byte sub_08092F68
.4byte sub_080930F4
.4byte sub_08093178
.4byte nullsub_120
gUnk_08122850:: @ 08122850
.incbin "objectBlockingStairs/gUnk_08122850.bin"
gUnk_08122862:: @ 08122862
.incbin "objectBlockingStairs/gUnk_08122862.bin"
gUnk_08122874:: @ 08122874
.incbin "objectBlockingStairs/gUnk_08122874.bin"
gUnk_08122886:: @ 08122886
.incbin "objectBlockingStairs/gUnk_08122886.bin"
gUnk_08122898:: @ 08122898
.incbin "objectBlockingStairs/gUnk_08122898.bin"
data/const/object/picoBloom.s
-13
View File
@@ -1,13 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnk_08123568:: @ 08123568
.4byte sub_08098A90
.4byte sub_08098AD0
.4byte sub_08098AE8
gUnk_08123574:: @ 08123574
.incbin "picoBloom/gUnk_08123574.bin"
data/data_08108E6C.s
+1 -1
View File
@@ -390,7 +390,7 @@ gUnk_081091F8:: @ 081091F8
gUnk_08109202:: @ 08109202
.incbin "data_08108E6C/gUnk_08109202.bin"
gUnk_08109214:: @ 08109214
gTranslations:: @ 08109214
.4byte translation
.4byte translation
.4byte translation
data/data_0811E750.s
+1 -21
View File
@@ -4,30 +4,10 @@
.section .rodata
.align 2
gUnk_0811E768:: @ 0811E768
.4byte sub_0807FC64
.4byte sub_0807FC7C
.4byte sub_0807FDB0
.4byte 00000000
.4byte sub_0807FEF0
.4byte sub_0807FF54
gUnk_0811E780:: @ 0811E780
.4byte sub_0807FDC8
.4byte sub_0807FDE4
.4byte sub_0807FDF8
gUnk_0811E78C:: @ 0811E78C
.4byte sub_0807FF08
.4byte sub_0807FF1C
gUnk_0811E794:: @ 0811E794
.4byte sub_0807FF6C
.4byte sub_0807FFE4
.4byte sub_08080040
.4byte sub_08080108
.4byte sub_08080198
.4byte sub_080801BC
gUnk_0811E7AC:: @ 0811E7AC
.4byte sub_08080794
data/data_08127280.s
+16 -29
View File
@@ -4,23 +4,7 @@
.section .rodata
.align 2
gUnk_08127280:: @ 08127280
.incbin "data_08127280/gUnk_08127280.bin"
gUnk_08127298:: @ 08127298
.incbin "data_08127280/gUnk_08127298.bin"
gUnk_081272B0:: @ 081272B0
.incbin "data_08127280/gUnk_081272B0.bin"
gUnk_081272C8:: @ 081272C8
.incbin "data_08127280/gUnk_081272C8.bin"
gUnk_081272E0:: @ 081272E0
.4byte gUnk_08127280
.4byte gUnk_08127298
.4byte gUnk_081272B0
.4byte gUnk_081272C8
@ staffroll rodata
gUnk_081272F0:: @ 081272F0
.incbin "data_08127280/gUnk_081272F0.bin"
@@ -35,20 +19,23 @@ gUnk_08127CEC:: @ 08127CEC
.incbin "data_08127280/gUnk_08127CEC.bin"
gUnk_08127D00:: @ 08127D00
.4byte sub_080A3608
.4byte sub_080A36C0
.4byte sub_080A3994
.4byte sub_080A3980
.4byte StaffrollTask_State0
.4byte StaffrollTask_State1
.4byte StaffrollTask_State2
.4byte StaffrollTask_State3
gUnk_08127D10:: @ 08127D10
.4byte sub_080A36DC
.4byte sub_080A36F8
.4byte sub_080A3768
.4byte sub_080A3864
.4byte sub_080A3888
.4byte sub_080A38B4
.4byte sub_080A38D0
.4byte sub_080A3930
.4byte StaffrollTask_State1MenuType0
.4byte StaffrollTask_State1MenuType1
.4byte StaffrollTask_State1MenuType2
.4byte StaffrollTask_State1MenuType3
.4byte StaffrollTask_State1MenuType4
.4byte StaffrollTask_State1MenuType5
.4byte StaffrollTask_State1MenuType6
.4byte StaffrollTask_State1MenuType7
@ End of staffroll
gAreaMetadata:: @ 08127D30
.ifdef EU
data/scripts/cutscene/introBusinessScrub/script_ZeldaIntroBusinessScrub.inc
+1 -1
View File
@@ -33,7 +33,7 @@ SCRIPT_START script_ZeldaIntroBusinessScrub
SetEntitySpeed 0x0200
WalkSouth 0x0008
SetAnimation 0x0040
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0006
DoPostScriptAction 0x0000
SetSyncFlag 0x00000002
data/scripts/cutscene/introCeremony/script_Npc4EMonsters.inc
+2 -2
View File
@@ -30,7 +30,7 @@ SCRIPT_START script_Npc4EMonsters
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
CallWithArg SetInputMacro, gUnk_080049F6
_0807F0B4 0x0001
SetEntityPositionRelative 0x01f8, 0x0068
SetSyncFlag 0x00000004
@@ -41,7 +41,7 @@ SCRIPT_START script_Npc4EMonsters
PlaySound SFX_1C3
SetSyncFlag 0x20000000
Wait 0x0078
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
SetSyncFlag 0x40000000
SetSyncFlag 0x00000010
data/scripts/cutscene/introCeremony/script_Npc4EVaatiAttacking.inc
+2 -2
View File
@@ -10,11 +10,11 @@ SCRIPT_START script_Npc4EVaatiAttacking
Call NPC4E_SaveEquippedItems
Call SetPlayerActionNormal
CallWithArg EquipItem, 0x0000000d
CallWithArg sub_0807F29C, gUnk_080049F6
CallWithArg SetInputMacro, gUnk_080049F6
Wait 0x001e
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000200
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
Wait 0x003c
SetSyncFlag 0x08000000
data/scripts/cutscene/introCeremony/script_PlayerFainting.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SCRIPT_START script_PlayerFainting
Call sub_0807F1E8
DoPostScriptAction 0x0011
EndBlock
Call WaitForFrameHiBit
Call WaitForAnimDone
WaitForSyncFlag 0x80000000
Call SetPlayerActionNormal
SCRIPT_END
data/scripts/cutscene/introCeremony/script_VaatiIntroCeremony.inc
+4 -4
View File
@@ -13,21 +13,21 @@ SCRIPT_START script_VaatiIntroCeremony
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0000
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
SetAnimationState 0x0000
DoPostScriptAction 0x001a
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000200
WaitForSyncFlagAndClear 0x00000100
@@ -71,7 +71,7 @@ SCRIPT_START script_VaatiIntroCeremony
Wait 0x005a
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
Wait 0x001e
data/scripts/cutscene/introCeremony/script_ZeldaIntroCastle.inc
+1 -1
View File
@@ -48,7 +48,7 @@ script_08011206:
Call sub_08066E20
Wait 0x0014
DoPostScriptAction 0x0010
Call WaitForFrameHiBit
Call WaitForAnimDone
PlaySound SFX_1CA
SetSyncFlag 0x00000020
WaitForSyncFlagAndClear 0x00000010
data/scripts/cutscene/introTown/script_Npc4EIntroTown.inc
+2 -2
View File
@@ -164,14 +164,14 @@ SCRIPT_START script_Npc4EIntroTown
CallWithArg EquipItem, 0x0000000d
SetIntVariable 0x000000ff
Call sub_0807F5B0
CallWithArg sub_0807F29C, gUnk_080049D6
CallWithArg SetInputMacro, gUnk_080049D6
Wait 0x00b7
SetIntVariable 0x00000000
Call sub_0807F5B0
MessageFromTargetPos 0x102c, 0x0000
WaitUntilTextboxCloses
@ Give control back to the player
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
_0807F0B4 0x0004
CameraTargetPlayer
data/scripts/cutscene/originStory/script_MinishEzlo.inc
+1 -1
View File
@@ -34,7 +34,7 @@ SCRIPT_START script_MinishEzlo
SetSyncFlag 0x00010000
WaitForSyncFlagAndClear 0x00008000
SetAnimation 0x000d
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00010000
Wait 0x003c
DoPostScriptAction 0x0005
data/scripts/cutscene/originStory/script_Object6AMinishCap.inc
+1 -1
View File
@@ -17,7 +17,7 @@ SCRIPT_START script_Object6AMinishCap
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x0001
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
data/scripts/cutscene/originStory/script_Vaati.inc
+1 -1
View File
@@ -23,7 +23,7 @@ SCRIPT_START script_Vaati
SetSyncFlag 0x00001000
WaitForSyncFlagAndClear 0x00000800
DoPostScriptAction 0x0018
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimationState 0x0004
DoPostScriptAction 0x0000
SetSyncFlag 0x00001000
data/scripts/cutscene/originStory/script_VaatiAppearsAgain.inc
+1 -1
View File
@@ -16,7 +16,7 @@ SCRIPT_START script_VaatiAppearsAgain
Wait 0x0014
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
data/scripts/cutscene/outro/script_MinishEzloGoodbye.inc
+3 -3
View File
@@ -25,17 +25,17 @@ SCRIPT_START script_MinishEzloGoodbye
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_08094B94
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000f
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000004
WaitForSyncFlagAndClear 0x00000002
CallWithArg sub_080960C4, script_Object6AEzloFinalMagic
SetAnimation 0x0012
Call WaitForFrameHiBit
Call WaitForAnimDone
Wait 0x001e
SetSyncFlag 0x00000020
StopBgm
data/scripts/cutscene/outro/script_MinishEzloOutro.inc
+4 -4
View File
@@ -10,20 +10,20 @@ SCRIPT_START script_MinishEzloOutro
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000e
DoPostScriptAction 0x0007
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0004
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000f
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000040
WaitForSyncFlagAndClear 0x00000002
CallWithArg sub_080960C4, script_EzloZeldaMagic
data/scripts/cutscene/reveal/script_PlayerFaintAgain.inc
+2 -2
View File
@@ -1,9 +1,9 @@
@ Sanctuary Player faint from Vaati attack
SCRIPT_START script_PlayerFaintAgain
Call sub_0807F1C4
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_0807F1E8
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000002
WaitForSyncFlagAndClear 0x00000004
PlaySound SFX_PLY_JUMP
data/scripts/cutscene/takeover/script_VaatiTakeover.inc
+1 -1
View File
@@ -14,7 +14,7 @@ SCRIPT_START script_VaatiTakeover
Wait 0x0014
SetAnimationState 0x0000
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
SetSyncFlag 0x00000020
WaitForSyncFlagAndClear 0x00000010
data/scripts/dhc/script_Vaati1Intro.inc
+1 -1
View File
@@ -25,7 +25,7 @@ SCRIPT_START script_Vaati1Intro
PlayBgm BGM_VAATI_REBORN
DoPostScriptAction 0x0019
PlaySound SFX_198
Call WaitForFrameHiBit
Call WaitForAnimDone
SetRoomFlag 0x0000
DoPostScriptAction 0x0008
Wait 0x0080
data/scripts/dhc/script_VaatiWithZelda.inc
+1 -1
View File
@@ -11,7 +11,7 @@ SCRIPT_START script_VaatiWithZelda
Wait 0x003c
SetAnimationState 0x0004
DoPostScriptAction 0x001c
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
Wait 0x003c
SetSyncFlag 0x00000002
data/scripts/dhc/script_ZeldaAfterDefeatingV2.inc
+1 -1
View File
@@ -18,7 +18,7 @@ script_0800DCD0:
StopBgm
Call sub_08066E50
PlaySound SFX_1C9
Call WaitForFrameHiBit
Call WaitForAnimDone
PlaySound SFX_1CA
Wait 0x003c
DoPostScriptAction 0x0004
data/scripts/hyruleTown/script_Anju.inc
+2 -2
View File
@@ -19,7 +19,7 @@ script_0801015A:
Call sub_080A1608
WaitUntilTextboxCloses
EnablePlayerControl
CallWithArg sub_080A1550, script_080101AC
CallWithArg CuccoMinigame_Init, script_080101AC
JumpIfNot script_0801015A
PlayBgm BGM_CUCCO_MINIGAME
SetRoomFlag 0x0001
@@ -49,7 +49,7 @@ script_080101AC:
Call sub_0807FB74
_0807E8E4_1
Call SetPlayerCollisionLayer1
Call sub_080A1388
Call CuccoMinigame_Cleanup
Call sub_0806EC38
BeginBlock
MoveEntityToPlayer
data/scripts/hyruleTown/script_Librari.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_0800E974:
JumpIfNot script_0800E974
SetPlayerIdle
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806B260
JumpIfNot script_0800E9E4
data/scripts/hyruleTown/script_LibrariLater.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_08012440:
JumpIfNot script_08012440
SetPlayerIdle
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806B2B4
WaitUntilTextboxCloses
data/scripts/hyruleTown/script_LibrarianLeft.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_08008BA2:
TriggerInteract
SetPlayerIdle
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
MessageFromTarget 0x4912
WaitUntilTextboxCloses
SetAnimation 0x0008
data/scripts/hyruleTown/script_LibrarianLeftWithQuest.inc
+4 -4
View File
@@ -16,13 +16,13 @@ script_08008BD2:
SetGlobalFlag 0x0061
.endif
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
WaitUntilTextboxCloses
Call sub_0806BA34
JumpIfNot script_08008C54
WaitUntilTextboxCloses
CallWithArg sub_0806BB1C, 0x00000000
Call WaitForFrameHiBit
Call WaitForAnimDone
CallWithArg sub_0806BB1C, 0x00000001
Call sub_0806BB7C
JumpIfNot script_08008C5C
@@ -34,11 +34,11 @@ script_08008BD2:
Wait 0x000f
PlaySound SFX_SECRET
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
MessageNoOverlap 0x4913
WaitUntilTextboxCloses
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
Jump script_08008C5C
script_08008C54:
SetAnimation 0x0008
data/scripts/hyruleTown/script_LibrarianRight.inc
+1 -1
View File
@@ -10,7 +10,7 @@ script_08008B6E:
TriggerInteract
SetPlayerIdle
SetAnimation 0x0004
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_0806BBB0
WaitUntilTextboxCloses
SetAnimation 0x0008
data/scripts/hyruleTown/script_Mayor.inc
+2 -2
View File
@@ -12,12 +12,12 @@ script_0800EA6A:
SetPlayerIdle
FacePlayer
CallWithArg sub_0807F3D8, 0x00000004
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0009
Call sub_0806CE80
WaitUntilTextboxCloses
EnablePlayerControl
SetAnimation 0x000a
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x0008
Jump script_0800EA6A
data/scripts/hyruleTown/script_Pita.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_080106BE:
JumpIfNot script_080106BE
SetPlayerIdle
FacePlayer
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0000
HasRoomItemForSale
JumpIf script_080106E0
data/scripts/hyruleTown/script_Stamp.inc
+1 -1
View File
@@ -11,7 +11,7 @@ script_080107AA:
CheckEntityInteractType
JumpIfNot script_080107AA
SetPlayerIdle
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0001
Call sub_08062CBC
WaitUntilTextboxCloses
data/scripts/npc/script_BladeBrothers.inc
+1 -1
View File
@@ -36,7 +36,7 @@ script_08016262:
Call sub_08068E00
WaitUntilTextboxCloses
DoPostScriptAction 0x0001
Call WaitForFrameHiBit
Call WaitForAnimDone
Call sub_08068E90
Call sub_08068C8C
JumpIf script_0801631C
data/scripts/npc/script_Farmer.inc
+2 -2
View File
@@ -11,7 +11,7 @@ script_0800B0E8:
script_0800B0F6:
SetPlayerIdle
Call sub_0807DF28
Call WaitForFrameHiBit
Call WaitForAnimDone
FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0806BCE8
@@ -24,7 +24,7 @@ script_0800B0F6:
script_0800B134:
SetPlayerIdle
Call sub_0807DF28
Call WaitForFrameHiBit
Call WaitForAnimDone
FacePlayer
CallWithArg sub_0806BC94, 0x00000004
Call sub_0807F650
data/scripts/sanctuary/script_Npc4EThirdSanctuary.inc
+2 -2
View File
@@ -85,9 +85,9 @@ script_080138D0:
.endif
Call NPC4E_SaveEquippedItems
CallWithArg EquipItem, 0x00010001
CallWithArg sub_0807F29C, gUnk_080049FE
CallWithArg SetInputMacro, gUnk_080049FE
Wait 0x00c8
CallWithArg sub_0807F29C, 0x00000000
CallWithArg SetInputMacro, 0x00000000
Call NPC4E_RestoreEquippedItems
script_08013A8E:
.ifndef EU
data/scripts/sanctuary/script_Object6ASword2.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword2
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000c
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
data/scripts/sanctuary/script_Object6ASword3.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASword3
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000d
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
data/scripts/sanctuary/script_Object6ASwordCharge10.inc
+1 -1
View File
@@ -9,6 +9,6 @@ SCRIPT_START script_Object6ASwordCharge10
EndBlock
WaitForSyncFlag 0x00000020
Wait 0x0078
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/sanctuary/script_Object6ASwordCharge5.inc
+2 -2
View File
@@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge5
EndBlock
WaitForSyncFlagAndClear 0x00000200
SetAnimation 0x0008
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000c
SetSyncFlag 0x00002000
WaitForSyncFlag 0x00000020
SetAnimation 0x0010
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/sanctuary/script_Object6ASwordCharge6.inc
+2 -2
View File
@@ -6,11 +6,11 @@ SCRIPT_START script_Object6ASwordCharge6
EndBlock
WaitForSyncFlagAndClear 0x00000400
SetAnimation 0x0009
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000d
SetSyncFlag 0x00004000
WaitForSyncFlag 0x00000020
SetAnimation 0x0011
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
data/scripts/sanctuary/script_Object6ASwordCharge8.inc
+2 -2
View File
@@ -7,12 +7,12 @@ SCRIPT_START script_Object6ASwordCharge8
EndBlock
WaitForSyncFlagAndClear 0x00001000
SetAnimation 0x000b
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000f
SetSyncFlag 0x00010000
WaitForSyncFlag 0x00000020
SetAnimation 0x0013
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
data/scripts/sanctuary/script_Object6ASwordCharge9.inc
+1 -1
View File
@@ -8,7 +8,7 @@ SCRIPT_START script_Object6ASwordCharge9
EndBlock
WaitForSyncFlag 0x00000020
Wait 0x0078
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000
data/scripts/sanctuary/script_Object6ASwordInPedestal.inc
+1 -1
View File
@@ -6,7 +6,7 @@ SCRIPT_START script_Object6ASwordInPedestal
EndBlock
WaitForSyncFlagAndClear 0x00000080
SetAnimation 0x000b
Call WaitForFrameHiBit
Call WaitForAnimDone
SetSyncFlag 0x00000100
WaitForSyncFlagAndClear 0x00000080
DoPostScriptAction 0x0006
data/scripts/sanctuary/script_Objet6ASwordCharge7.inc
+2 -2
View File
@@ -7,12 +7,12 @@ SCRIPT_START script_Objet6ASwordCharge7
EndBlock
WaitForSyncFlagAndClear 0x00000800
SetAnimation 0x000a
Call WaitForFrameHiBit
Call WaitForAnimDone
SetAnimation 0x000e
SetSyncFlag 0x00008000
WaitForSyncFlag 0x00000020
SetAnimation 0x0012
Call WaitForFrameHiBit
Call WaitForAnimDone
DoPostScriptAction 0x0006
SCRIPT_END
.2byte 0x0000