diff --git a/asm/macros/script.inc b/asm/macros/script.inc deleted file mode 100644 index 314edf4c..00000000 --- a/asm/macros/script.inc +++ /dev/null @@ -1,682 +0,0 @@ -@ All the macro functions for scripts -@ Generated by disassemble_script.py -.macro SCRIPT_START name - .globl \name - .section .text -\name: -.endm -.macro SCRIPT_END - .short 0xffff -.endm - -.macro ScriptCommandNop - .short 0x0400 -.endm - -.macro StartScript - .short 0x0401 -.endm - -.macro StopScript - .short 0x0402 -.endm - -.macro Jump s - .short 0x0803 - .short \s -.endm - -.macro JumpIf s - .short 0x0804 - .short \s -.endm - -.macro JumpIfNot s - .short 0x0805 - .short \s -.endm - -.macro _0807E078 s - .short 0x0806 - .short \s -.endm - -.macro JumpAbsolute w - .short 0x0c07 - .word \w -.endm - -.macro JumpAbsoluteIf w - .short 0x0c08 - .word \w -.endm - -.macro JumpAbsoluteIfNot w - .short 0x0c09 - .word \w -.endm - -.macro _0807E0E0 w - .short 0x0c0a - .word \w -.endm - -.macro Call w - .short 0x0c0b - .word \w -.endm - -.macro CallWithArg a,b - .short 0x140c - .word \a - .word \b -.endm - -.macro LoadRoomEntityList w - .short 0x0c0d - .word \w -.endm - -.macro TestBit w - .short 0x0c0e - .word \w -.endm - -.macro CheckInventory1 s - .short 0x080f - .short \s -.endm - -.macro CheckInventory2 s - .short 0x0810 - .short \s -.endm - -.macro HasRoomItemForSale s - .short 0x0811 - .short \s -.endm - -.macro CheckLocalFlag s - .short 0x0812 - .short \s -.endm - -.macro CheckLocalFlagByOffset a,b - .short 0x0c13 - .short \a - .short \b -.endm - -.macro CheckGlobalFlag s - .short 0x0814 - .short \s -.endm - -.macro CheckRoomFlag s - .short 0x0815 - .short \s -.endm - -.macro CheckPlayerInRegion a,b,c - .short 0x1016 - .short \a - .short \b - .short \c -.endm - -.macro CheckPlayerInRegion2 s - .short 0x0817 - .short \s -.endm - -.macro CheckEntityInteractType - .short 0x0418 -.endm - -.macro _0807E30C - .short 0x0419 -.endm - -.macro HasRupees s - .short 0x081a - .short \s -.endm - -.macro _0807E3BC s - .short 0x081b - .short \s -.endm - -.macro _0807E3E8 - .short 0x041c -.endm - -.macro CheckKinstoneFused s - .short 0x081d - .short \s -.endm - -.macro BuyItem a,b - .short 0x0c1e - .short \a - .short \b -.endm - -.macro _0807E48C s - .short 0x081f - .short \s -.endm - -.macro _0807E4CC w - .short 0x0c20 - .word \w -.endm - -.macro _0807E4EC w - .short 0x0c21 - .word \w -.endm - -.macro _0807E51 s - .short 0x0822 - .short \s -.endm - -.macro CheckPlayerFlags w - .short 0x0c23 - .word \w -.endm - -.macro _0807E564 - .short 0x0424 -.endm - -.macro EntityHasHeight - .short 0x0425 -.endm - -.macro ComparePlayerAction s - .short 0x0826 - .short \s -.endm - -.macro ComparePlayerAnimationState s - .short 0x0827 - .short \s -.endm - -.macro _0807E5F8 w - .short 0x0c28 - .word \w -.endm - -.macro _0807E610 w - .short 0x0c29 - .word \w -.endm - -.macro SetLocalFlag s - .short 0x082a - .short \s -.endm - -.macro SetLocalFlagByOffset a,b - .short 0x0c2b - .short \a - .short \b -.endm - -.macro ClearLocalFlag s - .short 0x082c - .short \s -.endm - -.macro SetGlobalFlag s - .short 0x082d - .short \s -.endm - -.macro ClearGlobalFlag s - .short 0x082e - .short \s -.endm - -.macro SetRoomFlag s - .short 0x082f - .short \s -.endm - -.macro ClearRoomFlag s - .short 0x0830 - .short \s -.endm - -.macro Wait s - .short 0x0831 - .short \s -.endm - -.macro WaitForSomething w - .short 0x0c32 - .word \w -.endm - -.macro WaitForSomething2 w - .short 0x0c33 - .word \w -.endm - -.macro WaitPlayerAction8 - .short 0x0434 -.endm - -.macro WaitForPlayerAction0x17 - .short 0x0435 -.endm - -.macro WaitFor_1 - .short 0x0436 -.endm - -.macro WaitFor_2 - .short 0x0437 -.endm - -.macro _0807E778 s - .short 0x0838 - .short \s -.endm - -.macro _0807E788 w - .short 0x0c39 - .word \w -.endm - -.macro _0807E79C - .short 0x043a -.endm - -.macro ScriptCommandNop2 s - .short 0x083b - .short \s -.endm - -.macro DoFade4 - .short 0x043c -.endm - -.macro DoFade5 - .short 0x043d -.endm - -.macro DoFade6 - .short 0x043e -.endm - -.macro DoFade7 - .short 0x043f -.endm - -.macro _0807E800 w - .short 0x0c40 - .word \w -.endm - -.macro _0807E80C w - .short 0x0c41 - .word \w -.endm - -.macro _0807E858 s - .short 0x0842 - .short \s -.endm - -.macro _0807E864 - .short 0x0443 -.endm - -.macro _0807E878 - .short 0x0444 -.endm - -.macro _0807E888 - .short 0x0445 -.endm - -.macro SetPlayerAction w - .short 0x0c46 - .word \w -.endm - -.macro StartPlayerScript w - .short 0x0c47 - .word \w -.endm - -.macro _0807E8D4 s - .short 0x0848 - .short \s -.endm - -.macro _0807E8E4_0 - .short 0x0449 -.endm - -.macro _0807E8E4_1 - .short 0x044a -.endm - -.macro _0807E8E4_2 - .short 0x044b -.endm - -.macro _0807E8E4_3 - .short 0x044c -.endm - -.macro _0807E908 s - .short 0x084d - .short \s -.endm - -.macro _0807E914 w - .short 0x0c4e - .word \w -.endm - -.macro _0807E924 - .short 0x044f -.endm - -.macro _0807E930 s - .short 0x0850 - .short \s -.endm - -.macro _0807E944 - .short 0x0451 -.endm - -.macro _0807E974 s - .short 0x0852 - .short \s -.endm - -.macro _0807E9D4 - .short 0x0453 -.endm - -.macro _0807E9DC - .short 0x0454 -.endm - -.macro _0807E9E4 s - .short 0x0855 - .short \s -.endm - -.macro _0807E9F0 - .short 0x0456 -.endm - -.macro _0807EA4C - .short 0x0457 -.endm - -.macro _0807EA88 s - .short 0x0858 - .short \s -.endm - -.macro _0807EA94 - .short 0x0459 -.endm - -.macro TextboxNoOverlapFollow s - .short 0x085a - .short \s -.endm - -.macro TextboxNoOverlap s - .short 0x085b - .short \s -.endm - -.macro TextboxNoOverlapFollowPos a,b - .short 0x0c5c - .short \a - .short \b -.endm - -.macro _0807EAF0 w - .short 0x0c5d - .word \w -.endm - -.macro TextboxNoOverlapVar - .short 0x045e -.endm - -.macro _0807EB28 s - .short 0x085f - .short \s -.endm - -.macro _0807EB38 - .short 0x0460 -.endm - -.macro _0807EB44 s - .short 0x0861 - .short \s -.endm - -.macro _0807EB4C a,b - .short 0x0c62 - .short \a - .short \b -.endm - -.macro _0807EB74 - .short 0x0463 -.endm - -.macro _0807EB8C - .short 0x0464 -.endm - -.macro SetEntityDirection s - .short 0x0865 - .short \s -.endm - -.macro SetEntityDirectionWithAnimationState s - .short 0x0866 - .short \s -.endm - -.macro SetEntityNonPlanarMovement s - .short 0x0867 - .short \s -.endm - -.macro SetEntity0x20 w - .short 0x0c68 - .word \w -.endm - -.macro SetEntityPositionRelative w - .short 0x0c69 - .word \w -.endm - -.macro SetEntityPosition a,b - .short 0x0c6a - .short \a - .short \b -.endm - -.macro MoveEntityToPlayer - .short 0x046b -.endm - -.macro ScriptCommandNop3 - .short 0x046c -.endm - -.macro _0807EC1C s - .short 0x086d - .short \s -.endm - -.macro _0807EC64 s - .short 0x086e - .short \s -.endm - -.macro _0807EC94 s - .short 0x086f - .short \s -.endm - -.macro _0807ECC4 s - .short 0x0870 - .short \s -.endm - -.macro _0807ECF4 s - .short 0x0871 - .short \s -.endm - -.macro _0807ED24 a,b,c - .short 0x1072 - .short \a - .short \b - .short \c -.endm - -.macro _0807EDD4 a,b - .short 0x0c73 - .short \a - .short \b -.endm - -.macro _0807EE04 a,b - .short 0x0c74 - .short \a - .short \b -.endm - -.macro _0807EE30 - .short 0x0475 -.endm - -.macro _0807EEB4 - .short 0x0476 -.endm - -.macro _0807EEF4 a,b - .short 0x0c77 - .short \a - .short \b -.endm - -.macro _0807EF3C a,b - .short 0x0c78 - .short \a - .short \b -.endm - -.macro _0807EF80 s - .short 0x0879 - .short \s -.endm - -.macro _0807EF90 s - .short 0x087a - .short \s -.endm - -.macro SoundReq s - .short 0x087b - .short \s -.endm - -.macro SoundReq2 s - .short 0x087c - .short \s -.endm - -.macro SoundReq3 w - .short 0x0c7d - .word \w -.endm - -.macro SoundReq0x80100000 - .short 0x047e -.endm - -.macro ModRupees s - .short 0x087f - .short \s -.endm - -.macro ModHealth s - .short 0x0880 - .short \s -.endm - -.macro IncreaseMaxHealth s - .short 0x0881 - .short \s -.endm - -.macro _0807F034 s - .short 0x0882 - .short \s -.endm - -.macro _0807F050 s - .short 0x0883 - .short \s -.endm - -.macro GetInventoryValue s - .short 0x0884 - .short \s -.endm - -.macro _0807F078 a,b - .short 0x0c85 - .short \a - .short \b -.endm - -.macro _0807F088 s - .short 0x0886 - .short \s -.endm - -.macro CameraTargetEntity - .short 0x0487 -.endm - -.macro CameraTargetPlayer - .short 0x0488 -.endm - -.macro _0807F0B4 s - .short 0x0889 - .short \s -.endm - -.macro _0807F0C8 a,b - .short 0x0c8a - .short \a - .short \b -.endm - - diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 5be0e732..77f497a2 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -9,6 +9,10 @@ .short 0xffff .endm +.macro ScriptCommandNop + .short 0x0400 +.endm + .macro StartScript .short 0x0401 .endm @@ -19,62 +23,62 @@ .macro Jump s .short 0x0803 - .short \s +1: .short \s - 1b .endm .macro JumpIf s .short 0x0804 - .short \s +1: .short \s - 1b .endm .macro JumpIfNot s .short 0x0805 - .short \s +1: .short \s - 1b .endm -.macro _0807E078 a,b +.macro JumpSwitch a,b .short 0x0c06 - .short \a - .short \b +1: .short \a - 1b + .short \b - 1b - 2 .endm -.macro _0807E078_sss a,b,c +.macro JumpSwitch_3 a,b,c .short 0x1006 - .short \a - .short \b - .short \c +1: .short \a - 1b + .short \b - 1b - 2 + .short \c - 1b - 4 .endm -.macro _0807E078_ssss a,b,c,d +.macro JumpSwitch_4 a,b,c,d .short 0x1406 - .short \a - .short \b - .short \c - .short \d +1: .short \a - 1b + .short \b - 1b - 2 + .short \c - 1b - 4 + .short \d - 1b - 6 .endm -.macro _0807E078_sssssss a,b,c,d,e,f,g +.macro JumpSwitch_7 a,b,c,d,e,f,g .short 0x2006 - .short \a - .short \b - .short \c - .short \d - .short \e - .short \f - .short \g +1: .short \a - 1b + .short \b - 1b - 2 + .short \c - 1b - 4 + .short \d - 1b - 6 + .short \e - 1b - 8 + .short \f - 1b - 10 + .short \g - 1b - 12 .endm -.macro _0807E078_sssssssss a,b,c,d,e,f,g,h,i +.macro JumpSwitch_9 a,b,c,d,e,f,g,h,i .short 0x2806 - .short \a - .short \b - .short \c - .short \d - .short \e - .short \f - .short \g - .short \h - .short \i +1: .short \a - 1b + .short \b - 1b - 2 + .short \c - 1b - 4 + .short \d - 1b - 6 + .short \e - 1b - 8 + .short \f - 1b - 10 + .short \g - 1b - 12 + .short \h - 1b - 14 + .short \i - 1b - 16 .endm .macro JumpAbsolute w @@ -92,7 +96,7 @@ .word \w .endm -.macro _0807E0E0 a, b +.macro JumpAbsoluteSwitch a, b .short 0x140a .word \a .word \b @@ -109,7 +113,7 @@ .word \b .endm -.macro CallWithArg_p w +.macro CallWithArg_2 w .short 0x0c0c .word \w .endm @@ -374,7 +378,7 @@ .short \s .endm -.macro _0807E858_ +.macro _0807E858_0 .short 0x0442 .endm @@ -494,7 +498,7 @@ .word \w .endm -.macro TextboxNoOverlapFollowPos_s s +.macro TextboxNoOverlapFollowPos_1 s .short 0x085c .short \s .endm @@ -505,14 +509,14 @@ .short \b .endm -.macro _0807EAF0_sss a,b,c +.macro _0807EAF0_3 a,b,c .short 0x105d .short \a .short \b .short \c .endm -.macro _0807EAF0_ssss a,b,c,d +.macro _0807EAF0_4 a,b,c,d .short 0x145d .short \a .short \b diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 29fac399..72121fe0 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -1,124 +1,129 @@ SCRIPT_START script_08008B5C -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807E930 0x0000 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -_0807E930 0x0004 -Call sub_0807F2D4 -Call sub_0806BBB0 -_0807EA94 -_0807E930 0x0008 -_0807E878 -Jump 0xffe2 -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -_0807E930 0x0004 -Call sub_0807F2D4 -TextboxNoOverlapFollow 0x4912 -_0807EA94 -_0807E930 0x0008 -_0807E878 -Jump 0xffe4 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -SetGlobalFlag 0x0061 -_0807E930 0x0004 -Call sub_0807F2D4 -_0807EA94 -Call sub_0806BA34 -JumpIfNot 0x0066 -_0807EA94 -CallWithArg sub_0806BB1C, 0x00000000 -Call sub_0807F2D4 -CallWithArg sub_0806BB1C, 0x00000001 -Call sub_0806BB7C -JumpIfNot 0x0048 -TextboxNoOverlap 0x490c -_0807EA94 -LoadRoomEntityList gUnk_080D6784 -WaitForSomething 0x00000001 -WaitForSomething 0x00000004 -Wait 0x000f -SoundReq 0x0072 -_0807E930 0x0004 -Call sub_0807F2D4 -TextboxNoOverlap 0x4913 -_0807EA94 -_0807E930 0x0008 -Call sub_0807F2D4 -Jump 0x000a -_0807E930 0x0008 -Wait 0x000f -_0807EA94 -_0807E878 -Jump 0xff70 -StartScript -SetEntityPositionRelative 0x00180068 -_0807EF80 0x000f -_0807EB44 0x0004 -_0807E930 0x0004 -SetEntityNonPlanarMovement 0x0300 -SoundReq 0x0121 -StopScript -WaitForSomething 0x00000002 -TextboxNoOverlap 0x490d -_0807EA94 -_0807EF80 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 -SoundReq 0x007f -Wait 0x000f -_0807EB44 0x0002 -_0807EDD4 0x00ac, 0x0078 -Wait 0x000f -_0807EB44 0x0004 -SoundReq 0x007f -Wait 0x000f -_0807EB44 0x0002 -_0807EDD4 0x00c0, 0x0078 -Wait 0x000f -_0807EB44 0x0004 -SoundReq 0x007f -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 -SoundReq 0x0121 -_0807E5F8 0x00000001 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807E930 0x0000 + _0807EF80 0x000a + StopScript +script_08008B6E: + _0807E944 + _0807E864 + _0807E930 0x0004 + Call sub_0807F2D4 + Call sub_0806BBB0 + _0807EA94 + _0807E930 0x0008 + _0807E878 + Jump script_08008B6E + .short 0x0000 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x000a + _0807E930 0x0000 + StopScript +script_08008BA2: + _0807E944 + _0807E864 + _0807E930 0x0004 + Call sub_0807F2D4 + TextboxNoOverlapFollow 0x4912 + _0807EA94 + _0807E930 0x0008 + _0807E878 + Jump script_08008BA2 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x000a + _0807E930 0x0000 + StopScript +script_08008BD2: + _0807E944 + _0807E864 + SetGlobalFlag 0x0061 + _0807E930 0x0004 + Call sub_0807F2D4 + _0807EA94 + Call sub_0806BA34 + JumpIfNot script_08008C54 + _0807EA94 + CallWithArg sub_0806BB1C, 0x00000000 + Call sub_0807F2D4 + CallWithArg sub_0806BB1C, 0x00000001 + Call sub_0806BB7C + JumpIfNot script_08008C5C + TextboxNoOverlap 0x490c + _0807EA94 + LoadRoomEntityList gUnk_080D6784 + WaitForSomething 0x00000001 + WaitForSomething 0x00000004 + Wait 0x000f + SoundReq 0x0072 + _0807E930 0x0004 + Call sub_0807F2D4 + TextboxNoOverlap 0x4913 + _0807EA94 + _0807E930 0x0008 + Call sub_0807F2D4 + Jump script_08008C5C +script_08008C54: + _0807E930 0x0008 + Wait 0x000f +script_08008C5C: + _0807EA94 + _0807E878 + Jump script_08008BD2 + StartScript + SetEntityPositionRelative 0x00180068 + _0807EF80 0x000f + _0807EB44 0x0004 + _0807E930 0x0004 + SetEntityNonPlanarMovement 0x0300 + SoundReq 0x0121 + StopScript + WaitForSomething 0x00000002 + TextboxNoOverlap 0x490d + _0807EA94 + _0807EF80 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 + SoundReq 0x007f + Wait 0x000f + _0807EB44 0x0002 + _0807EDD4 0x00ac, 0x0078 + Wait 0x000f + _0807EB44 0x0004 + SoundReq 0x007f + Wait 0x000f + _0807EB44 0x0002 + _0807EDD4 0x00c0, 0x0078 + Wait 0x000f + _0807EB44 0x0004 + SoundReq 0x007f + 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 + SoundReq 0x0121 + _0807E5F8 0x00000001 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 66abeeb8..208c1630 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08008D50 -StartScript -SetEntityPositionRelative 0x00680068 -_0807F0B4 0x0004 -CameraTargetEntity -StopScript -Wait 0x001e -_0807E5F8 0x00000002 -WaitForSomething 0x00000001 -Wait 0x000f -_0807F0B4 0x0004 -CameraTargetPlayer -Wait 0x001e -_0807E5F8 0x00000004 -_0807EF80 0x0006 + StartScript + SetEntityPositionRelative 0x00680068 + _0807F0B4 0x0004 + CameraTargetEntity + StopScript + Wait 0x001e + _0807E5F8 0x00000002 + WaitForSomething 0x00000001 + Wait 0x000f + _0807F0B4 0x0004 + CameraTargetPlayer + Wait 0x001e + _0807E5F8 0x00000004 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index c9ee8f7d..8b59708e 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -1,107 +1,110 @@ SCRIPT_START script_08008D8C -StartScript -Call sub_08061FD8 -Call sub_08061E70 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Call sub_080643D8 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -Jump 0xffd2 -StartScript -SetEntityPositionRelative 0x00780088 -StopScript -CheckPlayerInRegion 0x00d8, 0x0098, 0x4020 -JumpIfNot 0xfff6 -_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 -TextboxNoOverlapFollowPos 0x000e1053 -_0807EA94 -_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 -WaitPlayerAction8 -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 -WaitPlayerAction8 -_0807E914 0x00000003 -Call sub_0807F420 -_0807E8E4_0 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807F0B4 0x0004 -CameraTargetPlayer -SetGlobalFlag 0x0015 -Call sub_0806DCC0 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_08061FD8 + Call sub_08061E70 + _0807EF80 0x000a + StopScript +script_08008DA0: + CheckEntityInteractType + JumpIfNot script_08008DA0 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_08008DA0 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08008DD8: + CheckEntityInteractType + JumpIfNot script_08008DD8 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_080643D8 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_08008DD8 + StartScript + SetEntityPositionRelative 0x00780088 + StopScript +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 + TextboxNoOverlapFollowPos 0x000e1053 + _0807EA94 + _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 + WaitPlayerAction8 + 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 + WaitPlayerAction8 + _0807E914 0x00000003 + Call sub_0807F420 + _0807E8E4_0 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000100 + _0807F0B4 0x0004 + CameraTargetPlayer + SetGlobalFlag 0x0015 + Call sub_0806DCC0 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index 7885d2a5..e77c1d10 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -1,19 +1,19 @@ SCRIPT_START script_08008F74 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x00b8, 0x0090 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000040 -_0807EF80 0x0001 -_0807EDD4 0x0088, 0x0078 -_0807EB44 0x0000 -_0807EF80 0x0000 -Wait 0x000f -_0807E5F8 0x00000020 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x00b8, 0x0090 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000040 + _0807EF80 0x0001 + _0807EDD4 0x0088, 0x0078 + _0807EB44 0x0000 + _0807EF80 0x0000 + Wait 0x000f + _0807E5F8 0x00000020 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index 3480d0a2..ec4888e8 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08008FC0 -_0807F078 0x0001, 0x0001 -CallWithArg sub_0807F918, 0x00000001 -SoundReq 0x0109 -CallWithArg sub_0807F238, 0x0000045f -Call sub_0807F304 -TextboxNoOverlapFollowPos 0x000e0501 -_0807EA94 -_0807E5F8 0x00000020 -Call sub_080791BC + _0807F078 0x0001, 0x0001 + CallWithArg sub_0807F918, 0x00000001 + SoundReq 0x0109 + CallWithArg sub_0807F238, 0x0000045f + Call sub_0807F304 + TextboxNoOverlapFollowPos 0x000e0501 + _0807EA94 + _0807E5F8 0x00000020 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08008FFC.inc b/data/scripts/script_08008FFC.inc index 5414ad80..2f52e90e 100644 --- a/data/scripts/script_08008FFC.inc +++ b/data/scripts/script_08008FFC.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08008FFC -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -StopScript -WaitForSomething 0x00000010 -SoundReq 0x011c -_0807E930 0x0001 -Wait 0x0010 -SoundReq 0x011c -_0807EB44 0x0004 -_0807E930 0x0006 -Wait 0x0010 -_0807EF80 0x000f -SetEntityNonPlanarMovement 0x0200 -_0807ECC4 0x1c20 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + StopScript + WaitForSomething 0x00000010 + SoundReq 0x011c + _0807E930 0x0001 + Wait 0x0010 + SoundReq 0x011c + _0807EB44 0x0004 + _0807E930 0x0006 + Wait 0x0010 + _0807EF80 0x000f + SetEntityNonPlanarMovement 0x0200 + _0807ECC4 0x1c20 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 352bd061..dec7d6b5 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -1,193 +1,199 @@ SCRIPT_START script_0800903C -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000004 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -_0807EB44 0x0002 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EB44 0x0004 -_0807E5F8 0x00000008 -StartScript -_0807E9D4 -_0807EF80 0x000a -Jump 0x0202 -.short 0x0000 -StartScript -Call sub_0807F348 -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E9D4 -_0807EF80 0x000a -StopScript -WaitForSomething2 0x00000080 -_0807EB44 0x0004 -_0807ECC4 0x0008 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e1050 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e1052 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EB44 0x0006 -_0807E930 0x0005 -TextboxNoOverlapFollowPos 0x000e1054 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EB44 0x0004 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e1056 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e1057 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e1058 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0004 -TextboxNoOverlapFollowPos 0x000e105c -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806673C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -StartScript -Call sub_0807F348 -_0807EB44 0x0006 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000001 -_0807EB74 -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x0000105b -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EF80 0x0005 -Wait 0x003c -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x00001051 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EF80 0x0004 -Wait 0x003c -_0807EB74 -_0807EB8C -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x00001055 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB74 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0001 -_0807EDD4 0x0098, 0x0078 -_0807EB74 -_0807EF80 0x0000 -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x00001059 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -StartScript -_0807E9D4 -_0807EF80 0x000a -Jump 0x0042 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_080668F0 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08066904 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x105e -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0806672C -_0807EF80 0x000a -StopScript -Jump 0xfe90 -.short 0x0000 -StartScript -_0807EF80 0x000a -Call sub_08066E38 -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x1071 -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 -StartScript -StopScript + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000004 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + _0807EB44 0x0002 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EB44 0x0004 + _0807E5F8 0x00000008 + StartScript + _0807E9D4 + _0807EF80 0x000a + Jump script_0800927E + .short 0x0000 + StartScript + Call sub_0807F348 + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E9D4 + _0807EF80 0x000a + StopScript + WaitForSomething2 0x00000080 + _0807EB44 0x0004 + _0807ECC4 0x0008 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e1050 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e1052 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EB44 0x0006 + _0807E930 0x0005 + TextboxNoOverlapFollowPos 0x000e1054 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EB44 0x0004 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e1056 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e1057 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e1058 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0004 + TextboxNoOverlapFollowPos 0x000e105c + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000100 +script_0800917C: + CheckEntityInteractType + JumpIfNot script_0800917C + _0807E864 + _0807EB74 + Call sub_0806673C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800917C + StartScript + Call sub_0807F348 + _0807EB44 0x0006 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000001 + _0807EB74 + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x0000105b + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EF80 0x0005 + Wait 0x003c + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x00001051 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EF80 0x0004 + Wait 0x003c + _0807EB74 + _0807EB8C + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x00001055 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EB74 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0001 + _0807EDD4 0x0098, 0x0078 + _0807EB74 + _0807EF80 0x0000 + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x00001059 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + StartScript + _0807E9D4 + _0807EF80 0x000a + Jump script_080092B2 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 +script_0800927E: + Call sub_080668F0 + _0807EF80 0x000a + StopScript +script_0800928A: + CheckEntityInteractType + JumpIfNot script_0800928A + _0807E864 + _0807EB74 + Call sub_08066904 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800928A + .short 0x0000 + StartScript + _0807EB44 0x0006 + _0807EF80 0x0000 +script_080092B2: + _0807E9D4 + _0807EF80 0x000a + StopScript +script_080092BA: + CheckEntityInteractType + JumpIfNot script_080092BA + _0807E864 + _0807EB74 + TextboxNoOverlap 0x105e + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_080092BA + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0806672C + _0807EF80 0x000a + StopScript + Jump script_0800917C + .short 0x0000 + StartScript + _0807EF80 0x000a + Call sub_08066E38 + _0807E9D4 + StopScript +script_08009300: + CheckEntityInteractType + JumpIfNot script_08009300 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x1071 + _0807EA94 + _0807E878 + Jump script_08009300 + .short 0x0000 + StartScript + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009320.inc b/data/scripts/script_08009320.inc index 10935b22..f136823f 100644 --- a/data/scripts/script_08009320.inc +++ b/data/scripts/script_08009320.inc @@ -1,9 +1,10 @@ SCRIPT_START script_08009320 -StartScript -Call sub_0806D650 -SetEntityNonPlanarMovement 0x0010 -StopScript -_0807EEF4 0xfff8, 0x0000 -_0807EEF4 0x0008, 0x0000 -Jump 0xfff2 + StartScript + Call sub_0806D650 + SetEntityNonPlanarMovement 0x0010 + StopScript +script_0800932E: + _0807EEF4 0xfff8, 0x0000 + _0807EEF4 0x0008, 0x0000 + Jump script_0800932E SCRIPT_END diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc index 78861283..99204711 100644 --- a/data/scripts/script_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009340 -StartScript -StopScript + StartScript + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009348.inc b/data/scripts/script_08009348.inc index fcfdafd9..ee4e8ac4 100644 --- a/data/scripts/script_08009348.inc +++ b/data/scripts/script_08009348.inc @@ -1,25 +1,27 @@ SCRIPT_START script_08009348 -StartScript -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -Call sub_0806D638 -_0807F0B4 0x0001 -CameraTargetEntity -CheckGlobalFlag 0x0055 -JumpIf 0x002c -TextboxNoOverlap 0x1d01 -_0807EA94 -_0807EA94 -Call sub_0806D640 -_0807F0B4 0x0001 -CameraTargetPlayer -Wait 0x002d -_0807F0B4 0x0004 -_0807E878 -Call sub_0807DF50 -Jump 0xffb8 + StartScript + _0807E9D4 + StopScript +script_0800934E: + CheckEntityInteractType + JumpIfNot script_0800934E + _0807E864 + Call sub_0807DF28 + Call sub_0806D638 + _0807F0B4 0x0001 + CameraTargetEntity + CheckGlobalFlag 0x0055 + JumpIf script_0800939A + TextboxNoOverlap 0x1d01 + _0807EA94 +script_08009376: + _0807EA94 + Call sub_0806D640 + _0807F0B4 0x0001 + CameraTargetPlayer + Wait 0x002d + _0807F0B4 0x0004 + _0807E878 + Call sub_0807DF50 + Jump script_0800934E SCRIPT_END diff --git a/data/scripts/script_0800939A.inc b/data/scripts/script_0800939A.inc index a6880a48..bc773cc5 100644 --- a/data/scripts/script_0800939A.inc +++ b/data/scripts/script_0800939A.inc @@ -1,51 +1,57 @@ SCRIPT_START script_0800939A -CheckLocalFlag 0x00ae -JumpIf 0x009e -CheckInventory1 0x000d -JumpIf 0x0014 -CheckInventory1 0x000e -JumpIf 0x000c -TextboxNoOverlap 0x1d02 -_0807EA94 -Jump 0xffbc -CheckInventory1 0x000e -JumpIfNot 0x0018 -Call sub_0806D788 -TextboxNoOverlap 0x1d03 -_0807EA94 -Call sub_0806D70C -Jump 0xff9e -_0807E914 0x00001d05 -CheckLocalFlag 0x00ad -JumpIf 0x0008 -_0807E914 0x00001d04 -TextboxNoOverlapVar -_0807EA94 -_0807E3E8 -JumpIfNot 0xff80 -Wait 0x001e -TextboxNoOverlap 0x1d08 -_0807EA94 -LoadRoomEntityList gUnk_080F9C38 -Wait 0x0078 -Call sub_0806D6D0 -Wait 0x00b4 -Call sub_0806D70C -Wait 0x0078 -SetLocalFlag 0x00ae -SetLocalFlag 0x00ad -Call sub_0806D5D4 -_0807EB8C -TextboxNoOverlap 0x1d09 -_0807EA94 -Wait 0x000a -Jump 0xff3a -Call sub_0806D600 -JumpIf 0x000c -TextboxNoOverlap 0x1d0a -_0807EA94 -JumpIfNot 0xff26 -TextboxNoOverlap 0x1d0b -_0807EA94 -Call sub_0806D74C -_0807F0C8 0xffff, 0x0000 +script_0800939A: + CheckLocalFlag 0x00ae + JumpIf script_0800943E + CheckInventory1 0x000d + JumpIf script_080093BC + CheckInventory1 0x000e + JumpIf script_080093BC + TextboxNoOverlap 0x1d02 + _0807EA94 + Jump script_08009376 +script_080093BC: + CheckInventory1 0x000e + JumpIfNot script_080093DA + Call sub_0806D788 + TextboxNoOverlap 0x1d03 + _0807EA94 + Call sub_0806D70C + Jump script_08009376 +script_080093DA: + _0807E914 0x00001d05 + CheckLocalFlag 0x00ad + JumpIf script_080093EE + _0807E914 0x00001d04 +script_080093EE: + TextboxNoOverlapVar + _0807EA94 + _0807E3E8 + JumpIfNot script_08009376 + Wait 0x001e + TextboxNoOverlap 0x1d08 + _0807EA94 + LoadRoomEntityList gUnk_080F9C38 + Wait 0x0078 + Call sub_0806D6D0 + Wait 0x00b4 + Call sub_0806D70C + Wait 0x0078 + SetLocalFlag 0x00ae + SetLocalFlag 0x00ad + Call sub_0806D5D4 + _0807EB8C + TextboxNoOverlap 0x1d09 + _0807EA94 + Wait 0x000a + Jump script_08009376 +script_0800943E: + Call sub_0806D600 + JumpIf script_08009452 + TextboxNoOverlap 0x1d0a + _0807EA94 + JumpIfNot script_08009376 +script_08009452: + TextboxNoOverlap 0x1d0b + _0807EA94 + Call sub_0806D74C + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index 727eb0b6..74aaae79 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -1,28 +1,29 @@ SCRIPT_START script_08009464 -Wait 0x003c -_0807F0C8 0x0000, 0x0000 -LoadRoomEntityList gUnk_080F9C58 -Wait 0x003c -Call sub_0806D70C -Wait 0x003c -ClearLocalFlag 0x00ae -Call sub_0806D620 -Wait 0x003c -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlap 0x1d0c -_0807EA94 -Wait 0x000a -Jump 0xfed6 -.short 0x0000 -StartScript -Call sub_0806D7C4 -SetEntityNonPlanarMovement 0x0080 -StopScript -Wait 0x003c -SetEntity0x20 0x00018000 -_0807EE30 -JumpIfNot 0xfffc -Wait 0x003c -_0807EF80 0x0006 + Wait 0x003c + _0807F0C8 0x0000, 0x0000 + LoadRoomEntityList gUnk_080F9C58 + Wait 0x003c + Call sub_0806D70C + Wait 0x003c + ClearLocalFlag 0x00ae + Call sub_0806D620 + Wait 0x003c + WaitPlayerAction8 + _0807EB8C + TextboxNoOverlap 0x1d0c + _0807EA94 + Wait 0x000a + Jump script_08009376 + .short 0x0000 + StartScript + Call sub_0806D7C4 + SetEntityNonPlanarMovement 0x0080 + StopScript + Wait 0x003c + SetEntity0x20 0x00018000 +script_080094BC: + _0807EE30 + JumpIfNot script_080094BC + Wait 0x003c + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index 50758bea..a2d19eb9 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -1,14 +1,15 @@ SCRIPT_START script_080094CC -StartScript -Call sub_0806D804 -SetEntityNonPlanarMovement 0x0180 -StopScript -Wait 0x003c -SetEntity0x20 0x00018000 -Call sub_0806D858 -_0807EE30 -JumpIfNot 0xfffc -Wait 0x001e -_0807EF80 0x0006 + StartScript + Call sub_0806D804 + SetEntityNonPlanarMovement 0x0180 + StopScript + Wait 0x003c + SetEntity0x20 0x00018000 + Call sub_0806D858 +script_080094EA: + _0807EE30 + JumpIfNot script_080094EA + Wait 0x001e + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index 45fe9870..9bf9b1a4 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -1,69 +1,73 @@ SCRIPT_START script_080094FC -StartScript -Call sub_08067100 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EF80 0x0001 -_0807EB74 -Call sub_080670B4 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 -StartScript -Call sub_08067100 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EF80 0x0001 -_0807EB74 -Call sub_080670E4 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 -StartScript -Call sub_08067314 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_080672B0 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807E914 0x00000004 -Call sub_080672B0 -Call sub_080672C8 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_080672B0 -Jump 0xffca -.short 0x0000 -StartScript -Call sub_0806BE3C -_0807EF80 0x000a -_0807EF80 0x0007 -StopScript -Call sub_0806BF44 -JumpIf 0x000c -_0807EF80 0x000b -_0807EF80 0x0006 + StartScript + Call sub_08067100 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08009512: + CheckEntityInteractType + JumpIfNot script_08009512 + _0807E864 + _0807EF80 0x0001 + _0807EB74 + Call sub_080670B4 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0000 + Jump script_08009512 + .short 0x0000 + StartScript + Call sub_08067100 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_0800954E: + CheckEntityInteractType + JumpIfNot script_0800954E + _0807E864 + _0807EF80 0x0001 + _0807EB74 + Call sub_080670E4 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0000 + Jump script_0800954E + .short 0x0000 + StartScript + Call sub_08067314 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E914 0x00000000 + Call sub_080672B0 + StopScript +script_08009592: + CheckEntityInteractType + JumpIfNot script_08009592 + _0807E864 + _0807EB74 + _0807E914 0x00000004 + Call sub_080672B0 + Call sub_080672C8 + _0807EA94 + Wait 0x000f + _0807E878 + _0807EB44 0x0004 + _0807E914 0x00000000 + Call sub_080672B0 + Jump script_08009592 + .short 0x0000 + StartScript + Call sub_0806BE3C + _0807EF80 0x000a + _0807EF80 0x0007 + StopScript +script_080095DE: + Call sub_0806BF44 + JumpIf script_080095F2 + _0807EF80 0x000b + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080095F2.inc b/data/scripts/script_080095F2.inc index 5b177c6f..1cadb7ab 100644 --- a/data/scripts/script_080095F2.inc +++ b/data/scripts/script_080095F2.inc @@ -1,73 +1,82 @@ SCRIPT_START script_080095F2 -CheckEntityInteractType -JumpIfNot 0xffe8 -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806BE84 -_0807EA94 -JumpIfNot 0x0018 -SoundReq 0x0109 -_0807F088 0x003c -TextboxNoOverlapFollow 0x053c -WaitPlayerAction8 -_0807EA94 -_0807F078 0x003c, 0x0001 -_0807E878 -_0807EF80 0x0000 -Jump 0xffb4 -StartScript -_0807EF80 0x000b -_0807EF80 0x0008 -StopScript -StopScript -StartScript -CheckGlobalFlag 0x0020 -JumpIfNot 0xfff6 -StopScript -Call sub_0806BF44 -JumpIf 0xfff8 -StopScript -Call sub_0806BE3C -_0807EF80 0x000a -_0807EF80 0x0007 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806BEC8 -_0807EA94 -JumpIfNot 0x0016 -SoundReq 0x0111 -SoundReq 0x0072 -_0807F078 0x003c, 0x0002 -Call sub_0806BEFC -_0807E878 -_0807EF80 0x0000 -Jump 0xffca -StartScript -_0807EF80 0x0007 -Jump 0x005c -CheckGlobalFlag 0x0020 -JumpIf 0x0054 -StopScript -CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08009704 -WaitForSomething2 0x00000001 -SoundReq 0x0111 -_0807EF80 0x0008 -LoadRoomEntityList gUnk_080D9048 -Wait 0x000f -SoundReq 0x0111 -_0807EF80 0x0007 -CheckGlobalFlag 0x0020 -JumpIfNot 0xfffa -Call sub_0807DF50 -_0807E878 -Call sub_0808692C +script_080095F2: + CheckEntityInteractType + JumpIfNot script_080095DE + _0807E864 + _0807EB74 + _0807EF80 0x0001 + Call sub_0806BE84 + _0807EA94 + JumpIfNot script_08009622 + SoundReq 0x0109 + _0807F088 0x003c + TextboxNoOverlapFollow 0x053c + WaitPlayerAction8 + _0807EA94 + _0807F078 0x003c, 0x0001 +script_08009622: + _0807E878 + _0807EF80 0x0000 + Jump script_080095DE + StartScript + _0807EF80 0x000b + _0807EF80 0x0008 + StopScript +script_08009638: + StopScript + StartScript + CheckGlobalFlag 0x0020 + JumpIfNot script_08009638 + StopScript +script_08009646: + Call sub_0806BF44 + JumpIf script_08009646 + StopScript + Call sub_0806BE3C + _0807EF80 0x000a + _0807EF80 0x0007 +script_08009660: + CheckEntityInteractType + JumpIfNot script_08009660 + _0807E864 + _0807EB74 + _0807EF80 0x0001 + Call sub_0806BEC8 + _0807EA94 + JumpIfNot script_0800968E + SoundReq 0x0111 + SoundReq 0x0072 + _0807F078 0x003c, 0x0002 + Call sub_0806BEFC +script_0800968E: + _0807E878 + _0807EF80 0x0000 + Jump script_08009660 + StartScript + _0807EF80 0x0007 + Jump script_080096FC + CheckGlobalFlag 0x0020 + JumpIf script_080096FC + StopScript +script_080096AC: + CheckPlayerInRegion 0x0188, 0x01c0, 0x1020 + JumpIfNot script_080096AC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_08009704 + WaitForSomething2 0x00000001 + SoundReq 0x0111 + _0807EF80 0x0008 + LoadRoomEntityList gUnk_080D9048 + Wait 0x000f + SoundReq 0x0111 + _0807EF80 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_08009704.inc b/data/scripts/script_08009704.inc index 0738cbac..9c0f3cd2 100644 --- a/data/scripts/script_08009704.inc +++ b/data/scripts/script_08009704.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08009704 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0001 -_0807EDD4 0x01a0, 0x01b0 -_0807EB44 0x0000 -_0807EF80 0x0000 -Wait 0x000a -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EF80 0x000d -SetEntityNonPlanarMovement 0x0100 -_0807ECC4 0x0010 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0001 + _0807EDD4 0x01a0, 0x01b0 + _0807EB44 0x0000 + _0807EF80 0x0000 + Wait 0x000a + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000001 + _0807EF80 0x000d + SetEntityNonPlanarMovement 0x0100 + _0807ECC4 0x0010 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index f443adb3..e921a864 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -1,45 +1,46 @@ SCRIPT_START script_08009740 -StartScript -Call sub_08065D00 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807EF80 0x0007 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -Call sub_08065F64 -_0807EA94 -_0807E878 -Jump 0xffe6 -.short 0x0000 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq 0x01f3 -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 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_08065D00 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807EF80 0x0007 + StopScript +script_0800975A: + CheckEntityInteractType + JumpIfNot script_0800975A + _0807E864 + _0807EB74 + _0807EF80 0x0000 + Call sub_08065F64 + _0807EA94 + _0807E878 + Jump script_0800975A + .short 0x0000 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + SoundReq 0x01f3 + 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 + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080097F0.inc b/data/scripts/script_080097F0.inc index 98e06831..0e6e195b 100644 --- a/data/scripts/script_080097F0.inc +++ b/data/scripts/script_080097F0.inc @@ -1,20 +1,21 @@ SCRIPT_START script_080097F0 -StartScript -_0807E930 0x0003 -_0807EF80 0x0007 -SetEntityNonPlanarMovement 0x0300 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -SoundReq 0x0123 -Call sub_0807F1A0 -StopScript -StartScript -_0807EE30 -JumpIfNot 0xfff8 -StopScript -_0807E5F8 0x00000004 -Call sub_0807FBD4 -SoundReq 0x01f3 -_0807EF80 0x0006 + StartScript + _0807E930 0x0003 + _0807EF80 0x0007 + SetEntityNonPlanarMovement 0x0300 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + SoundReq 0x0123 + Call sub_0807F1A0 +script_08009816: + StopScript + StartScript + _0807EE30 + JumpIfNot script_08009816 + StopScript + _0807E5F8 0x00000004 + Call sub_0807FBD4 + SoundReq 0x01f3 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index 9ff46dfd..54f4a5dc 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08009838 -StartScript -_0807E930 0x0003 -_0807EF80 0x0007 -SetEntityNonPlanarMovement 0x0300 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000008 -Call sub_0809E0A0 -Call sub_0809E0D4 -SoundReq 0x01f3 -Call sub_0807FBD4 -SoundReq 0x01f3 -_0807E5F8 0x00000010 -_0807EF80 0x0006 + StartScript + _0807E930 0x0003 + _0807EF80 0x0007 + SetEntityNonPlanarMovement 0x0300 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000008 + Call sub_0809E0A0 + Call sub_0809E0D4 + SoundReq 0x01f3 + Call sub_0807FBD4 + SoundReq 0x01f3 + _0807E5F8 0x00000010 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc index 92c1e4f4..c25d85ee 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800987C -SoundReq 0x007a -_0807EB44 0x0004 -SoundReq 0x0086 -Call sub_0807F36C -SetEntityNonPlanarMovement 0x0400 -_0807ECF4 0x0004 -Call sub_0807F1E8 -Wait 0x001e -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -SoundReq 0x007c -_0807EB44 0x0004 -Call sub_0807F210 -_0807EF3C 0x0200, 0x0020 -_0807EF80 0x0000 -_0807E5F8 0x00000040 -Call sub_080791BC + SoundReq 0x007a + _0807EB44 0x0004 + SoundReq 0x0086 + Call sub_0807F36C + SetEntityNonPlanarMovement 0x0400 + _0807ECF4 0x0004 + Call sub_0807F1E8 + Wait 0x001e + _0807E5F8 0x00000040 + WaitForSomething2 0x00000020 + SoundReq 0x007c + _0807EB44 0x0004 + Call sub_0807F210 + _0807EF3C 0x0200, 0x0020 + _0807EF80 0x0000 + _0807E5F8 0x00000040 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 0f027694..78e235cc 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -1,20 +1,23 @@ SCRIPT_START script_080098D4 -StartScript -StopScript -CheckGlobalFlag 0x0020 -JumpIfNot 0xfffa -CheckInventory1 0x003c -JumpIfNot 0xfffa -CheckLocalFlag 0x005d -JumpIf 0x0022 -SetLocalFlag 0x005d -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB28 0x280a -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + StopScript +script_080098D8: + CheckGlobalFlag 0x0020 + JumpIfNot script_080098D8 +script_080098E0: + CheckInventory1 0x003c + JumpIfNot script_080098E0 + CheckLocalFlag 0x005d + JumpIf script_08009910 + SetLocalFlag 0x005d + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807EB28 0x280a + _0807EA94 + Call sub_0807DF50 + _0807E878 +script_08009910: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009918.inc b/data/scripts/script_08009918.inc index 1722df97..263a4da6 100644 --- a/data/scripts/script_08009918.inc +++ b/data/scripts/script_08009918.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08009918 -StartScript -Call sub_0807DF28 -_0807E864 -_0807E5F8 0x00000000 -StopScript -WaitFor_2 -Wait 0x0078 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000001 -SetGlobalFlag 0x001c -Call sub_0807DF50 -_0807E878 -Call sub_0807921C + StartScript + Call sub_0807DF28 + _0807E864 + _0807E5F8 0x00000000 + StopScript + 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_08009950.inc b/data/scripts/script_08009950.inc index 3ac1419c..2de6f57f 100644 --- a/data/scripts/script_08009950.inc +++ b/data/scripts/script_08009950.inc @@ -1,37 +1,37 @@ SCRIPT_START script_08009950 -StartScript -Call sub_0807F348 -SetEntityNonPlanarMovement 0x0040 -_0807EB44 0x0004 -_0807E930 0x000c -_0807E908 0x0003 -StopScript -Wait 0x001e -CameraTargetEntity -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -WaitForSomething2 0x00000008 -_0807EF80 0x0004 -Wait 0x001e -_0807E930 0x000b -Wait 0x001e -TextboxNoOverlapFollow 0x1002 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E908 0x0001 -_0807EB44 0x0004 -_0807EDD4 0x00b8, 0x005c -_0807EB44 0x0006 -_0807EF80 0x0001 -TextboxNoOverlapFollow 0x1004 -_0807EA94 -_0807EF80 0x0000 -Wait 0x001e -_0807E778 0x0002 -DoFade5 -WaitFor_2 -Call sub_08053634 + StartScript + Call sub_0807F348 + SetEntityNonPlanarMovement 0x0040 + _0807EB44 0x0004 + _0807E930 0x000c + _0807E908 0x0003 + StopScript + Wait 0x001e + CameraTargetEntity + _0807E778 0x0004 + _0807E800 0x00000000 + WaitFor_2 + WaitForSomething2 0x00000008 + _0807EF80 0x0004 + Wait 0x001e + _0807E930 0x000b + Wait 0x001e + TextboxNoOverlapFollow 0x1002 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E908 0x0001 + _0807EB44 0x0004 + _0807EDD4 0x00b8, 0x005c + _0807EB44 0x0006 + _0807EF80 0x0001 + TextboxNoOverlapFollow 0x1004 + _0807EA94 + _0807EF80 0x0000 + Wait 0x001e + _0807E778 0x0002 + DoFade5 + WaitFor_2 + Call sub_08053634 SCRIPT_END diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index 30916b9d..5682be55 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -1,23 +1,23 @@ SCRIPT_START script_080099DC -StartScript -Call sub_0807F348 -SetEntityNonPlanarMovement 0x00c0 -_0807EB44 0x0002 -_0807EF80 0x0008 -StopScript -WaitForSomething2 0x00000004 -_0807EF80 0x0007 -_0807EDD4 0x0068, 0x0060 -Wait 0x000f -TextboxNoOverlapFollow 0x1001 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0001 -TextboxNoOverlapFollow 0x1003 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000008 + StartScript + Call sub_0807F348 + SetEntityNonPlanarMovement 0x00c0 + _0807EB44 0x0002 + _0807EF80 0x0008 + StopScript + WaitForSomething2 0x00000004 + _0807EF80 0x0007 + _0807EDD4 0x0068, 0x0060 + Wait 0x000f + TextboxNoOverlapFollow 0x1001 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x0001 + TextboxNoOverlapFollow 0x1003 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000008 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009A34.inc b/data/scripts/script_08009A34.inc index cc58658e..f0d821e2 100644 --- a/data/scripts/script_08009A34.inc +++ b/data/scripts/script_08009A34.inc @@ -1,20 +1,21 @@ SCRIPT_START script_08009A34 -Wait 0x003c -Call sub_08066258 -Wait 0x001e -Call sub_08066258 -Wait 0x005a -Jump 0xffea -SetEntityPositionRelative 0x01780240 -CameraTargetEntity -SetEntityNonPlanarMovement 0x0080 -Wait 0x0078 -SoundReq2 0x0036 -_0807E778 0x0002 -DoFade4 -WaitFor_2 -Wait 0x0078 -_0807E5F8 0x00000004 -Call sub_08053648 -_0807EDD4 0x0240, 0x0228 + Wait 0x003c +script_08009A38: + Call sub_08066258 + Wait 0x001e + Call sub_08066258 + Wait 0x005a + Jump script_08009A38 + SetEntityPositionRelative 0x01780240 + CameraTargetEntity + SetEntityNonPlanarMovement 0x0080 + Wait 0x0078 + SoundReq2 0x0036 + _0807E778 0x0002 + DoFade4 + WaitFor_2 + Wait 0x0078 + _0807E5F8 0x00000004 + Call sub_08053648 + _0807EDD4 0x0240, 0x0228 SCRIPT_END diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index f5aabb94..b48e74e6 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08009A84 -StartScript -SetEntityPositionRelative 0x011001e8 -SetEntityNonPlanarMovement 0x00c0 -_0807EF80 0x0008 -StopScript -WaitForSomething2 0x00000004 -_0807EF80 0x0007 -_0807EDD4 0x01e8, 0x0200 -_0807EDD4 0x01f8, 0x0218 -_0807EDD4 0x0220, 0x0228 -_0807EDD4 0x0240, 0x0228 -CameraTargetEntity -_0807EDD4 0x0290, 0x0228 -_0807EDD4 0x0290, 0x01f8 -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x0290, 0x01c8 -SetEntityNonPlanarMovement 0x00c0 -_0807EDD4 0x0290, 0x0198 -Wait 0x001e -_0807E5F8 0x00000010 -_0807EDD4 0x0290, 0x0190 -_0807EF80 0x0008 -_0807EDD4 0x0290, 0x0188 + StartScript + SetEntityPositionRelative 0x011001e8 + SetEntityNonPlanarMovement 0x00c0 + _0807EF80 0x0008 + StopScript + WaitForSomething2 0x00000004 + _0807EF80 0x0007 + _0807EDD4 0x01e8, 0x0200 + _0807EDD4 0x01f8, 0x0218 + _0807EDD4 0x0220, 0x0228 + _0807EDD4 0x0240, 0x0228 + CameraTargetEntity + _0807EDD4 0x0290, 0x0228 + _0807EDD4 0x0290, 0x01f8 + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x0290, 0x01c8 + SetEntityNonPlanarMovement 0x00c0 + _0807EDD4 0x0290, 0x0198 + Wait 0x001e + _0807E5F8 0x00000010 + _0807EDD4 0x0290, 0x0190 + _0807EF80 0x0008 + _0807EDD4 0x0290, 0x0188 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 1c416468..9ba7e216 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08009AF8 -StartScript -StopScript -WaitForSomething2 0x00000010 -SoundReq 0x00f0 -_0807EF80 0x0008 -Wait 0x001e -SoundReq 0x00f1 -_0807EF80 0x0007 -Wait 0x005a -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -Call sub_0805367C + StartScript + StopScript + WaitForSomething2 0x00000010 + SoundReq 0x00f0 + _0807EF80 0x0008 + Wait 0x001e + SoundReq 0x00f1 + _0807EF80 0x0007 + Wait 0x005a + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + Call sub_0805367C SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009B30.inc b/data/scripts/script_08009B30.inc index ec9af874..685f2e66 100644 --- a/data/scripts/script_08009B30.inc +++ b/data/scripts/script_08009B30.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08009B30 -StartScript -Call sub_0807DF28 -_0807E864 -SetLocalFlag 0x0046 -StopScript -WaitFor_2 -Wait 0x001e -TextboxNoOverlapFollow 0x1005 -_0807EA94 -Wait 0x003c -Call sub_0807529C -Wait 0x003c -_0807EF80 0x0014 -Wait 0x001e -Call sub_08053250 -_0807E878 -Call sub_0807DF50 -Call sub_080791D0 + StartScript + Call sub_0807DF28 + _0807E864 + SetLocalFlag 0x0046 + StopScript + WaitFor_2 + Wait 0x001e + TextboxNoOverlapFollow 0x1005 + _0807EA94 + Wait 0x003c + Call sub_0807529C + Wait 0x003c + _0807EF80 0x0014 + Wait 0x001e + Call sub_08053250 + _0807E878 + Call sub_0807DF50 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index a7450ecf..9bd9569a 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -1,61 +1,63 @@ SCRIPT_START script_08009B78 -StartScript -_0807EB44 0x0006 -SetEntityNonPlanarMovement 0x0080 -_0807E9D4 -Call sub_0807F348 -StopScript -CheckGlobalFlag 0x0013 -JumpIf 0x00ba -_0807E888 -Wait 0x000a -_0807E864 -StartPlayerScript script_08009CFC -Call sub_0807DF28 -WaitForSomething2 0x00000008 -_0807EDD4 0x0080, 0x005c -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x000f -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x00001009 -_0807E8E4_1 -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807EB8C -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x0000100b -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000008 -_0807EDD4 0x007c, 0x005c -Wait 0x000f -_0807EF80 0x000d -_0807EDD4 0x0084, 0x005c -_0807EB44 0x0006 -_0807EF80 0x000c -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000008 -Call sub_08053250 -_0807F034 0x0034 -WaitPlayerAction8 -_0807E8E4_1 -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x0000100c -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -_0807EF80 0x000a -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x100e -_0807E878 -Jump 0xffee + StartScript + _0807EB44 0x0006 + SetEntityNonPlanarMovement 0x0080 + _0807E9D4 + Call sub_0807F348 + StopScript + CheckGlobalFlag 0x0013 + JumpIf script_08009C4C + _0807E888 + Wait 0x000a + _0807E864 + StartPlayerScript script_08009CFC + Call sub_0807DF28 + WaitForSomething2 0x00000008 + _0807EDD4 0x0080, 0x005c + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x000f + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x00001009 + _0807E8E4_1 + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807EB8C + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x0000100b + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000008 + _0807EDD4 0x007c, 0x005c + Wait 0x000f + _0807EF80 0x000d + _0807EDD4 0x0084, 0x005c + _0807EB44 0x0006 + _0807EF80 0x000c + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000008 + Call sub_08053250 + _0807F034 0x0034 + WaitPlayerAction8 + _0807E8E4_1 + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x0000100c + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000004 +script_08009C4C: + _0807EF80 0x000a +script_08009C50: + CheckEntityInteractType + JumpIfNot script_08009C50 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x100e + _0807E878 + Jump script_08009C50 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index 4dfe4771..fece2a6f 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -1,39 +1,39 @@ SCRIPT_START script_08009C68 -StartScript -_0807EB44 0x0002 -SetEntityNonPlanarMovement 0x0100 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -_0807EB74 -WaitForSomething2 0x00000004 -_0807EB74 -WaitForSomething2 0x00000004 -_0807EB74 -_0807EB8C -_0807EF80 0x0001 -TextboxNoOverlapFollowPos 0x0000100a -_0807EA94 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EB8C -_0807EF80 0x0001 -_0807EB8C -_0807EB44 0x0002 -TextboxNoOverlapFollowPos 0x0000100d -_0807EA94 -_0807EF80 0x0000 -_0807EDD4 0x0028, 0x0060 -_0807EDD4 0x0000, 0x0060 -Call sub_080536A8 -Wait 0x001e -StartScript -SetGlobalFlag 0x0013 -Call sub_0807DF50 -Call sub_080791D0 -_0807E878 -StopScript + StartScript + _0807EB44 0x0002 + SetEntityNonPlanarMovement 0x0100 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + _0807EB74 + WaitForSomething2 0x00000004 + _0807EB74 + WaitForSomething2 0x00000004 + _0807EB74 + _0807EB8C + _0807EF80 0x0001 + TextboxNoOverlapFollowPos 0x0000100a + _0807EA94 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EB8C + _0807EF80 0x0001 + _0807EB8C + _0807EB44 0x0002 + TextboxNoOverlapFollowPos 0x0000100d + _0807EA94 + _0807EF80 0x0000 + _0807EDD4 0x0028, 0x0060 + _0807EDD4 0x0000, 0x0060 + Call sub_080536A8 + Wait 0x001e + StartScript + SetGlobalFlag 0x0013 + Call sub_0807DF50 + Call sub_080791D0 + _0807E878 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009CFC.inc b/data/scripts/script_08009CFC.inc index e096f627..39e00046 100644 --- a/data/scripts/script_08009CFC.inc +++ b/data/scripts/script_08009CFC.inc @@ -1,27 +1,27 @@ SCRIPT_START script_08009CFC -StartScript -_0807E8E4_1 -SetEntityNonPlanarMovement 0x00c0 -StopScript -_0807E5F8 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807EDD4 0x0040, 0x0060 -_0807EDD4 0x0060, 0x0068 -_0807E5F8 0x00000004 -_0807EF80 0x0000 -_0807E8E4_0 -Wait 0x000f -SoundReq 0x0094 -_0807EF80 0x0000 -Wait 0x001e -_0807E5F8 0x00000008 -WaitForSomething2 0x00000002 -_0807EDD4 0x0070, 0x005c -_0807E8E4_1 -_0807EF80 0x0000 -Wait 0x000f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000002 -_0807E5F8 0x00000008 + StartScript + _0807E8E4_1 + SetEntityNonPlanarMovement 0x00c0 + StopScript + _0807E5F8 0x00000004 + _0807EF80 0x0004 + Wait 0x003c + _0807EDD4 0x0040, 0x0060 + _0807EDD4 0x0060, 0x0068 + _0807E5F8 0x00000004 + _0807EF80 0x0000 + _0807E8E4_0 + Wait 0x000f + SoundReq 0x0094 + _0807EF80 0x0000 + Wait 0x001e + _0807E5F8 0x00000008 + WaitForSomething2 0x00000002 + _0807EDD4 0x0070, 0x005c + _0807E8E4_1 + _0807EF80 0x0000 + Wait 0x000f + _0807E5F8 0x00000008 + WaitForSomething2 0x00000002 + _0807E5F8 0x00000008 SCRIPT_END diff --git a/data/scripts/script_08009D6C.inc b/data/scripts/script_08009D6C.inc index 80d89114..e20bc108 100644 --- a/data/scripts/script_08009D6C.inc +++ b/data/scripts/script_08009D6C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08009D6C -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0006 -StopScript -_0807EDD4 0x0078, 0x0060 -_0807EDD4 0x0078, 0x007c -Wait 0x001e -Call sub_0805368C -Wait 0x0008 -_0807EDD4 0x0078, 0x0098 -_0807EF80 0x0008 -_0807E778 0x0010 -DoFade5 -WaitFor_2 -Call sub_08053634 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0006 + StopScript + _0807EDD4 0x0078, 0x0060 + _0807EDD4 0x0078, 0x007c + Wait 0x001e + Call sub_0805368C + Wait 0x0008 + _0807EDD4 0x0078, 0x0098 + _0807EF80 0x0008 + _0807E778 0x0010 + DoFade5 + WaitFor_2 + Call sub_08053634 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009DB0.inc b/data/scripts/script_08009DB0.inc index 32ec35e1..fe3be26d 100644 --- a/data/scripts/script_08009DB0.inc +++ b/data/scripts/script_08009DB0.inc @@ -1,41 +1,43 @@ SCRIPT_START script_08009DB0 -StartScript -Call sub_0807F348 -Call sub_08066288 -Call sub_08066274 -_0807EF80 0x000a -_0807E930 0x000c -_0807E908 0x0003 -StopScript -_0807E944 -_0807E908 0x0002 -Call sub_0806622C -_0807EA94 -_0807E908 0x0003 -_0807E930 0x000c -Jump 0xffe8 -StartScript -StopScript -CheckPlayerInRegion 0x00a0, 0x0038, 0x1830 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Wait 0x0008 -_0807EB28 0x3207 -_0807E3E8 -JumpIfNot 0x003e -Call sub_0807DF28 -_0807E778 0x0002 -DoFade5 -WaitFor_2 -Call sub_0804E864 -Wait 0x001e -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB28 0x3209 -Wait 0x000f -_0807EA94 -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 + StartScript + Call sub_0807F348 + Call sub_08066288 + Call sub_08066274 + _0807EF80 0x000a + _0807E930 0x000c + _0807E908 0x0003 + StopScript +script_08009DD2: + _0807E944 + _0807E908 0x0002 + Call sub_0806622C + _0807EA94 + _0807E908 0x0003 + _0807E930 0x000c + Jump script_08009DD2 + StartScript + StopScript +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 + _0807EA94 + _0807E878 + Call sub_0807DF50 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 6291b750..41213ed3 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -1,5 +1,6 @@ SCRIPT_START script_08009E4E -_0807E878 -_0807EF80 0x0006 +script_08009E4E: + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009E58.inc b/data/scripts/script_08009E58.inc index 7b6d0607..a6106130 100644 --- a/data/scripts/script_08009E58.inc +++ b/data/scripts/script_08009E58.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08009E58 -StartScript -Call sub_0807DF28 -StopScript -WaitForSomething2 0x00000002 -_0807E778 0x0002 -DoFade4 -WaitFor_2 -_0807EF80 0x0014 -Wait 0x001e -_0807E5F8 0x00000001 + StartScript + Call sub_0807DF28 + StopScript + WaitForSomething2 0x00000002 + _0807E778 0x0002 + DoFade4 + WaitFor_2 + _0807EF80 0x0014 + Wait 0x001e + _0807E5F8 0x00000001 SCRIPT_END diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc index d6fd3b14..66e11e42 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08009E80 -StartScript -StopScript + StartScript + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08009E88.inc b/data/scripts/script_08009E88.inc index 61ff496f..e5cba4a5 100644 --- a/data/scripts/script_08009E88.inc +++ b/data/scripts/script_08009E88.inc @@ -1,19 +1,20 @@ SCRIPT_START script_08009E88 -StartScript -Call sub_0807DF28 -_0807E864 -SetLocalFlag 0x009f -StopScript -Wait 0x003c -_0807E778 0x0004 -DoFade4 -WaitFor_2 -Call sub_0807F0D8 -JumpIfNot 0xfff8 -_0807EF80 0x0014 -Wait 0x000a -Call sub_08053250 -_0807E878 -Call sub_0807DF50 -Call sub_080791D0 + StartScript + Call sub_0807DF28 + _0807E864 + SetLocalFlag 0x009f + StopScript + Wait 0x003c + _0807E778 0x0004 + DoFade4 + WaitFor_2 +script_08009EA4: + Call sub_0807F0D8 + JumpIfNot script_08009EA4 + _0807EF80 0x0014 + Wait 0x000a + Call sub_08053250 + _0807E878 + Call sub_0807DF50 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_08009ECC.inc b/data/scripts/script_08009ECC.inc index 59e47d9a..6a7dd099 100644 --- a/data/scripts/script_08009ECC.inc +++ b/data/scripts/script_08009ECC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009ECC -StartScript -_0807E914 0x00000002 -_0807EF80 0x0001 -StopScript -WaitForSomething2 0x00000004 -StartScript -_0807E914 0x00000003 -_0807EF80 0x0001 -StopScript + StartScript + _0807E914 0x00000002 + _0807EF80 0x0001 + StopScript + WaitForSomething2 0x00000004 + StartScript + _0807E914 0x00000003 + _0807EF80 0x0001 + StopScript SCRIPT_END diff --git a/data/scripts/script_08009EF0.inc b/data/scripts/script_08009EF0.inc index 0800fa63..31f60a6b 100644 --- a/data/scripts/script_08009EF0.inc +++ b/data/scripts/script_08009EF0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08009EF0 -StartScript -_0807E914 0x00000000 -_0807EF80 0x0001 -StopScript -WaitForSomething2 0x00000004 -StartScript -_0807E914 0x00000001 -_0807EF80 0x0001 -StopScript + StartScript + _0807E914 0x00000000 + _0807EF80 0x0001 + StopScript + WaitForSomething2 0x00000004 + StartScript + _0807E914 0x00000001 + _0807EF80 0x0001 + StopScript SCRIPT_END diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 9ec617ac..706d06c5 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -1,108 +1,118 @@ SCRIPT_START script_08009F14 -StartScript -_0807EB44 0x0004 -Call sub_08060090 -_0807EF80 0x000a -CheckKinstoneFused 0x001c -JumpIf 0x00a8 -CheckInventory1 0x0007 -JumpIf 0x0052 -StopScript -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -Call sub_0807DF28 -_0807EF80 0x000b -StartPlayerScript script_0800A088 -WaitForSomething2 0x00000002 -Call sub_0806014C -TextboxNoOverlapFollowPos 0x00001f01 -_0807EA94 -Wait 0x001e -_0807F034 0x0065 -WaitPlayerAction8 -_0807EF80 0x000a -Call sub_0807DF50 -_0807E878 -StopScript -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -Call sub_080602BC -_0807EA94 -CallWithArg sub_0807F970, 0x00001f03 -JumpIf 0x0008 -_0807E878 -Jump 0xffd2 -Wait 0x0008 -SoundReq 0x0103 -CallWithArg sub_0806030C, 0x00000063 -Wait 0x0008 -_0807E878 -Jump 0xffb6 -StopScript -CheckLocalFlag 0x00b0 -JumpIf 0x004a -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -TextboxNoOverlap 0x1f0e -_0807EA94 -_0807E3E8 -JumpIf 0x0008 -_0807E878 -Jump 0xffdc -Wait 0x0008 -_0807F034 0x0008 -Call sub_08060318 -WaitPlayerAction8 -Wait 0x0008 -_0807EB8C -TextboxNoOverlapFollow 0x1f13 -_0807EA94 -SetLocalFlag 0x00b0 -_0807E878 -StopScript -StartScript -Call sub_08060158 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -CheckInventory1 0x0008 -JumpIf 0x0014 -TextboxNoOverlap 0x1f14 -_0807EA94 -_0807E3E8 -JumpIf 0xffb8 -_0807E878 -Jump 0xffd4 -TextboxNoOverlap 0x1f11 -_0807EA94 -_0807E3E8 -JumpIf 0x0008 -_0807E878 -Jump 0xffc2 -Wait 0x0008 -_0807F034 0x0007 -Call sub_08060318 -WaitPlayerAction8 -Wait 0x0008 -_0807EB8C -TextboxNoOverlapFollow 0x1f10 -_0807EA94 -_0807E878 -Jump 0xffa0 -.short 0x0000 + StartScript + _0807EB44 0x0004 + Call sub_08060090 + _0807EF80 0x000a + CheckKinstoneFused 0x001c + JumpIf script_08009FD2 + CheckInventory1 0x0007 + JumpIf script_08009F84 + StopScript +script_08009F36: + StopScript + StartScript + Call sub_08060158 + CheckEntityInteractType + JumpIfNot script_08009F36 + StopScript + _0807E864 + Call sub_0807DF28 + _0807EF80 0x000b + StartPlayerScript script_0800A088 + WaitForSomething2 0x00000002 + Call sub_0806014C + TextboxNoOverlapFollowPos 0x00001f01 + _0807EA94 + Wait 0x001e + _0807F034 0x0065 + WaitPlayerAction8 + _0807EF80 0x000a + Call sub_0807DF50 + _0807E878 +script_08009F84: + StopScript +script_08009F86: + StopScript + StartScript + Call sub_08060158 + CheckEntityInteractType + JumpIfNot script_08009F86 + StopScript + _0807E864 + Call sub_080602BC + _0807EA94 + CallWithArg sub_0807F970, 0x00001f03 + JumpIf script_08009FB6 + _0807E878 + Jump script_08009F86 +script_08009FB6: + Wait 0x0008 + SoundReq 0x0103 + CallWithArg sub_0806030C, 0x00000063 + Wait 0x0008 + _0807E878 + Jump script_08009F86 +script_08009FD2: + StopScript + CheckLocalFlag 0x00b0 + JumpIf script_0800A024 +script_08009FDC: + StopScript + StartScript + Call sub_08060158 + CheckEntityInteractType + JumpIfNot script_08009FDC + StopScript + _0807E864 + TextboxNoOverlap 0x1f0e + _0807EA94 + _0807E3E8 + JumpIf script_0800A002 + _0807E878 + Jump script_08009FDC +script_0800A002: + Wait 0x0008 + _0807F034 0x0008 + Call sub_08060318 + WaitPlayerAction8 + Wait 0x0008 + _0807EB8C + TextboxNoOverlapFollow 0x1f13 + _0807EA94 + SetLocalFlag 0x00b0 + _0807E878 +script_0800A024: + StopScript + StartScript + Call sub_08060158 + CheckEntityInteractType + JumpIfNot script_0800A024 + StopScript + _0807E864 + CheckInventory1 0x0008 + JumpIf script_0800A052 + TextboxNoOverlap 0x1f14 + _0807EA94 + _0807E3E8 + JumpIf script_0800A002 + _0807E878 + Jump script_0800A024 +script_0800A052: + TextboxNoOverlap 0x1f11 + _0807EA94 + _0807E3E8 + JumpIf script_0800A064 + _0807E878 + Jump script_0800A024 +script_0800A064: + Wait 0x0008 + _0807F034 0x0007 + Call sub_08060318 + WaitPlayerAction8 + Wait 0x0008 + _0807EB8C + TextboxNoOverlapFollow 0x1f10 + _0807EA94 + _0807E878 + Jump script_0800A024 + .short 0x0000 diff --git a/data/scripts/script_0800A088.inc b/data/scripts/script_0800A088.inc index f868a306..25189df6 100644 --- a/data/scripts/script_0800A088.inc +++ b/data/scripts/script_0800A088.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A088 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807ECC4 0x0010 -_0807EDD4 0x0078, 0x0060 -_0807EB44 0x0000 -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807ECC4 0x0010 + _0807EDD4 0x0078, 0x0060 + _0807EB44 0x0000 + Wait 0x000f + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800A0B4.inc b/data/scripts/script_0800A0B4.inc index ba47f686..88e85d50 100644 --- a/data/scripts/script_0800A0B4.inc +++ b/data/scripts/script_0800A0B4.inc @@ -1,20 +1,21 @@ SCRIPT_START script_0800A0B4 -StartScript -SetEntityNonPlanarMovement 0x0140 -_0807E864 -Call sub_0807DF28 -StopScript -Wait 0x0078 -SoundReq2 0x0018 -Call sub_080A0464 -_0807EE30 -JumpIfNot 0xfffc -_0807E8E4_0 -Wait 0x0008 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -Wait 0x003c -SetEntityNonPlanarMovement 0x0080 -_0807EC64 0x0030 + StartScript + SetEntityNonPlanarMovement 0x0140 + _0807E864 + Call sub_0807DF28 + StopScript + Wait 0x0078 + SoundReq2 0x0018 + Call sub_080A0464 +script_0800A0D2: + _0807EE30 + JumpIfNot script_0800A0D2 + _0807E8E4_0 + Wait 0x0008 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + Wait 0x003c + SetEntityNonPlanarMovement 0x0080 + _0807EC64 0x0030 SCRIPT_END diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index 6970ec48..d89a6ae7 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -1,24 +1,25 @@ SCRIPT_START script_0800A0FC -StopScript -CheckGlobalFlag 0x0051 -JumpIfNot 0xfffa -StartScript -_0807E864 -Call sub_0807DF28 -SoundReq0x80100000 -Call sub_0807FBFC -SetEntityPositionRelative 0x005800b0 -Call sub_0807F844 -_0807E8E4_3 -CallWithArg sub_0807F75C, 0x00d00060 -CallWithArg sub_08094AE8, 0x0800a160 -SoundReq 0x00f7 -_0807E778 0x0002 -DoFade6 -StopScript -WaitFor_2 -WaitForSomething2 0x00000004 -CallWithArg sub_0806DA1C, 0x00000006 -_0807EF80 0x0006 + StopScript +script_0800A0FE: + CheckGlobalFlag 0x0051 + JumpIfNot script_0800A0FE + StartScript + _0807E864 + Call sub_0807DF28 + SoundReq0x80100000 + Call sub_0807FBFC + SetEntityPositionRelative 0x005800b0 + Call sub_0807F844 + _0807E8E4_3 + CallWithArg sub_0807F75C, 0x00d00060 + CallWithArg sub_08094AE8, 0x0800a160 + SoundReq 0x00f7 + _0807E778 0x0002 + DoFade6 + StopScript + WaitFor_2 + WaitForSomething2 0x00000004 + CallWithArg sub_0806DA1C, 0x00000006 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index 9016c077..60aa3b19 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800A160 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807E930 0x0002 -SetEntityPositionRelative 0x008000b0 -CallWithArg sub_0807F98C, 0xff800000 -CallWithArg sub_080960C4, 0x0800a1b4 -StopScript -SoundReq 0x0142 -_0807EF3C 0xff80, 0x0000 -SoundReq 0x0143 -_0807E930 0x0004 -_0807E5F8 0x00000002 -Wait 0x003c -_0807E5F8 0x00000004 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807E930 0x0002 + SetEntityPositionRelative 0x008000b0 + CallWithArg sub_0807F98C, 0xff800000 + CallWithArg sub_080960C4, 0x0800a1b4 + StopScript + SoundReq 0x0142 + _0807EF3C 0xff80, 0x0000 + SoundReq 0x0143 + _0807E930 0x0004 + _0807E5F8 0x00000002 + Wait 0x003c + _0807E5F8 0x00000004 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index bc7b9f02..6a5b0e52 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A1B4 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 -StopScript -WaitForSomething 0x00000002 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + CallWithArg sub_0807F994, 0x0000fff8 + StopScript + WaitForSomething 0x00000002 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A1D8.inc b/data/scripts/script_0800A1D8.inc index 7b80fe1b..5ee10dbb 100644 --- a/data/scripts/script_0800A1D8.inc +++ b/data/scripts/script_0800A1D8.inc @@ -1,63 +1,63 @@ SCRIPT_START script_0800A1D8 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x00800088 -Call sub_0807F844 -_0807E8E4_3 -CallWithArg sub_0807F75C, 0x00a80088 -StopScript -Wait 0x003c -StartPlayerScript script_0800A310 -WaitForSomething2 0x00000001 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000080 -TextboxNoOverlapFollowPos 0x00001659 -_0807EA94 -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 -TextboxNoOverlapFollowPos 0x000e165a -_0807EA94 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000e165b -_0807EA94 -_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 -TextboxNoOverlapFollowPos 0x000e165c -_0807EA94 -SoundReq0x80100000 -TextboxNoOverlapFollowPos 0x000e165d -_0807EA94 -_0807E5F8 0x00000006 -WaitForSomething2 0x000000c0 -_0807E5F8 0x00000006 -WaitForSomething2 0x00000080 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000100 -SoundReq2 0x0008 -SoundReq 0x00f7 -CallWithArg sub_0806DA1C, 0x00000007 -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x00800088 + Call sub_0807F844 + _0807E8E4_3 + CallWithArg sub_0807F75C, 0x00a80088 + StopScript + Wait 0x003c + StartPlayerScript script_0800A310 + WaitForSomething2 0x00000001 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000080 + TextboxNoOverlapFollowPos 0x00001659 + _0807EA94 + 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 + TextboxNoOverlapFollowPos 0x000e165a + _0807EA94 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000e165b + _0807EA94 + _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 + TextboxNoOverlapFollowPos 0x000e165c + _0807EA94 + SoundReq0x80100000 + TextboxNoOverlapFollowPos 0x000e165d + _0807EA94 + _0807E5F8 0x00000006 + WaitForSomething2 0x000000c0 + _0807E5F8 0x00000006 + WaitForSomething2 0x00000080 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000100 + SoundReq2 0x0008 + SoundReq 0x00f7 + CallWithArg sub_0806DA1C, 0x00000007 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 0e351738..13e28e4c 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -1,43 +1,43 @@ SCRIPT_START script_0800A310 -StopScript -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807E5F8 0x00000001 -Call sub_080791BC -.short 0x0000 -StartScript -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000b -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -WaitForSomething2 0x00000002 -_0807E930 0x000e -_0807EF80 0x0007 -Call sub_0807F2D4 -_0807EF80 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, 0x0800a680 -_0807E5F8 0x00000040 + StopScript + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807E5F8 0x00000001 + Call sub_080791BC + .short 0x0000 + StartScript + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x000b + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + StopScript + WaitForSomething2 0x00000002 + _0807E930 0x000e + _0807EF80 0x0007 + Call sub_0807F2D4 + _0807EF80 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, 0x0800a680 + _0807E5F8 0x00000040 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index ffa148db..13202ee2 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -1,60 +1,60 @@ SCRIPT_START script_0800A3D8 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0002 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000004 -StartScript -_0807EF80 0x0004 -Call sub_0807F3F8 -StopScript -Wait 0x003c -_0807EC94 0x0010 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -_0807EB44 0x0004 -_0807EF80 0x0000 -SoundReq 0x0142 -CallWithArg sub_080960C4, 0x0800a638 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -SoundReq 0x0143 -_0807E5F8 0x00001000 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -Call sub_08066E68 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -SoundReq 0x0142 -CallWithArg sub_080960C4, 0x0800a680 -Wait 0x0078 -SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 -Wait 0x000f -SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 -Wait 0x000f -SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000003 -Wait 0x003c -SoundReq 0x0153 -CallWithArg sub_0807FADC, 0x00000001 -SoundReq 0x0143 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000004 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807EB44 0x0002 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000004 + StartScript + _0807EF80 0x0004 + Call sub_0807F3F8 + StopScript + Wait 0x003c + _0807EC94 0x0010 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + _0807EB44 0x0004 + _0807EF80 0x0000 + SoundReq 0x0142 + CallWithArg sub_080960C4, 0x0800a638 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + SoundReq 0x0143 + _0807E5F8 0x00001000 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + Call sub_08066E68 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + SoundReq 0x0142 + CallWithArg sub_080960C4, 0x0800a680 + Wait 0x0078 + SoundReq 0x0153 + CallWithArg sub_0807FADC, 0x00000003 + Wait 0x000f + SoundReq 0x0153 + CallWithArg sub_0807FADC, 0x00000003 + Wait 0x000f + SoundReq 0x0153 + CallWithArg sub_0807FADC, 0x00000003 + Wait 0x003c + SoundReq 0x0153 + CallWithArg sub_0807FADC, 0x00000001 + SoundReq 0x0143 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000004 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A500.inc b/data/scripts/script_0800A500.inc index 3febb687..9b15189e 100644 --- a/data/scripts/script_0800A500.inc +++ b/data/scripts/script_0800A500.inc @@ -1,30 +1,30 @@ SCRIPT_START script_0800A500 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807E930 0x0005 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000008 -SoundReq 0x0142 -_0807E610 0x00000800 -CallWithArg sub_080960C4, 0x0800a65c -_0807E930 0x0002 -Call sub_08094B0C -_0807EDD4 0x0068, 0x0088 -Call sub_08094B80 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000008 -Call sub_08094B3C -_0807E930 0x0004 -_0807E5F8 0x00000800 -SoundReq 0x0143 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000008 -_0807EF80 0x0008 -Call sub_080961B0 -SoundReq 0x00fa -Wait 0x003c -_0807E5F8 0x00000100 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807E930 0x0005 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000008 + SoundReq 0x0142 + _0807E610 0x00000800 + CallWithArg sub_080960C4, 0x0800a65c + _0807E930 0x0002 + Call sub_08094B0C + _0807EDD4 0x0068, 0x0088 + Call sub_08094B80 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000008 + Call sub_08094B3C + _0807E930 0x0004 + _0807E5F8 0x00000800 + SoundReq 0x0143 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000008 + _0807EF80 0x0008 + Call sub_080961B0 + SoundReq 0x00fa + Wait 0x003c + _0807E5F8 0x00000100 SCRIPT_END diff --git a/data/scripts/script_0800A590.inc b/data/scripts/script_0800A590.inc index dfeeb93c..0e52c71c 100644 --- a/data/scripts/script_0800A590.inc +++ b/data/scripts/script_0800A590.inc @@ -1,35 +1,35 @@ SCRIPT_START script_0800A590 -StartScript -SetEntityNonPlanarMovement 0x0080 -SetEntity0x20 0x00000000 -_0807EF80 0x0008 -_0807EB44 0x0000 -Call sub_0807F714 -MoveEntityToPlayer -CallWithArg sub_0807F98C, 0xfff00000 -StopScript -_0807E930 0x0023 -WaitForSomething2 0x00000010 -CallWithArg sub_0807F6E8, 0x00000008 -_0807EF80 0x0007 -SoundReq 0x0142 -_0807E610 0x00000800 -CallWithArg sub_080960C4, 0x0800a65c -Wait 0x003c -_0807EDD4 0x0088, 0x0068 -Wait 0x0078 -_0807E5F8 0x00000800 -SoundReq 0x0143 -_0807EF3C 0x0000, 0x0020 -_0807E930 0x001f -_0807E5F8 0x00000200 -WaitForSomething2 0x00000010 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000200 -Wait 0x0001 -_0807EF80 0x0008 -WaitForSomething2 0x00000010 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + SetEntity0x20 0x00000000 + _0807EF80 0x0008 + _0807EB44 0x0000 + Call sub_0807F714 + MoveEntityToPlayer + CallWithArg sub_0807F98C, 0xfff00000 + StopScript + _0807E930 0x0023 + WaitForSomething2 0x00000010 + CallWithArg sub_0807F6E8, 0x00000008 + _0807EF80 0x0007 + SoundReq 0x0142 + _0807E610 0x00000800 + CallWithArg sub_080960C4, 0x0800a65c + Wait 0x003c + _0807EDD4 0x0088, 0x0068 + Wait 0x0078 + _0807E5F8 0x00000800 + SoundReq 0x0143 + _0807EF3C 0x0000, 0x0020 + _0807E930 0x001f + _0807E5F8 0x00000200 + WaitForSomething2 0x00000010 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000200 + Wait 0x0001 + _0807EF80 0x0008 + WaitForSomething2 0x00000010 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index b043d489..db394caf 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A638 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 -StopScript -WaitForSomething 0x00001000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + CallWithArg sub_0807F994, 0x0000fff8 + StopScript + WaitForSomething 0x00001000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index 3bce0abf..e1065b79 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A65C -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 -StopScript -WaitForSomething 0x00000800 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + CallWithArg sub_0807F994, 0x0000fff8 + StopScript + WaitForSomething 0x00000800 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index a90d2cc0..2c2211ae 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800A680 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 -StopScript -WaitForSomething 0x00000020 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + CallWithArg sub_0807F994, 0x0000fff8 + StopScript + WaitForSomething 0x00000020 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A6A4.inc b/data/scripts/script_0800A6A4.inc index bf51e73b..82316f18 100644 --- a/data/scripts/script_0800A6A4.inc +++ b/data/scripts/script_0800A6A4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A6A4 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x00680088 -Call sub_0807F844 -StopScript -Wait 0x003c -SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x00000008 -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x00680088 + Call sub_0807F844 + StopScript + Wait 0x003c + SoundReq 0x00f6 + CallWithArg sub_0806DA1C, 0x00000008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A6D4.inc b/data/scripts/script_0800A6D4.inc index 9b92c7aa..f1396ad1 100644 --- a/data/scripts/script_0800A6D4.inc +++ b/data/scripts/script_0800A6D4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A6D4 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x00700088 -Call sub_0807F844 -SoundReq 0x00f7 -StopScript -Wait 0x003c -CallWithArg sub_0806DA1C, 0x00000009 -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x00700088 + Call sub_0807F844 + SoundReq 0x00f7 + StopScript + Wait 0x003c + CallWithArg sub_0806DA1C, 0x00000009 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A704.inc b/data/scripts/script_0800A704.inc index 19f20c8c..34836f30 100644 --- a/data/scripts/script_0800A704.inc +++ b/data/scripts/script_0800A704.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A704 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01c80198 -Call sub_0807F844 -StopScript -Wait 0x003c -SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x0000000a -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01c80198 + Call sub_0807F844 + StopScript + Wait 0x003c + SoundReq 0x00f6 + CallWithArg sub_0806DA1C, 0x0000000a + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A734.inc b/data/scripts/script_0800A734.inc index 17c68b8b..2f5ea451 100644 --- a/data/scripts/script_0800A734.inc +++ b/data/scripts/script_0800A734.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800A734 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01c800d8 -Call sub_0807F844 -SoundReq 0x00f7 -StopScript -Wait 0x003c -CallWithArg sub_0806DA1C, 0x0000000b -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01c800d8 + Call sub_0807F844 + SoundReq 0x00f7 + StopScript + Wait 0x003c + CallWithArg sub_0806DA1C, 0x0000000b + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A764.inc b/data/scripts/script_0800A764.inc index ab94aa38..bc1620b5 100644 --- a/data/scripts/script_0800A764.inc +++ b/data/scripts/script_0800A764.inc @@ -1,31 +1,31 @@ SCRIPT_START script_0800A764 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01b800f8 -Call sub_0807F844 -StopScript -Wait 0x003c -SoundReq 0x00f6 -_0807E778 0x0004 -DoFade7 -WaitFor_2 -_0807E5F8 0x00000001 -SoundReq 0x00f7 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -Wait 0x001e -_0807E5F8 0x00000002 -Wait 0x0014 -_0807E5F8 0x00000004 -Wait 0x000a -_0807E5F8 0x00000008 -Wait 0x0005 -_0807E5F8 0x00000010 -Wait 0x0002 -_0807E5F8 0x00000020 -Wait 0x0078 -CallWithArg sub_0806DA1C, 0x0000000c -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01b800f8 + Call sub_0807F844 + StopScript + Wait 0x003c + SoundReq 0x00f6 + _0807E778 0x0004 + DoFade7 + WaitFor_2 + _0807E5F8 0x00000001 + SoundReq 0x00f7 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + Wait 0x001e + _0807E5F8 0x00000002 + Wait 0x0014 + _0807E5F8 0x00000004 + Wait 0x000a + _0807E5F8 0x00000008 + Wait 0x0005 + _0807E5F8 0x00000010 + Wait 0x0002 + _0807E5F8 0x00000020 + Wait 0x0078 + CallWithArg sub_0806DA1C, 0x0000000c + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A7E4.inc b/data/scripts/script_0800A7E4.inc index be0e9930..9155e29a 100644 --- a/data/scripts/script_0800A7E4.inc +++ b/data/scripts/script_0800A7E4.inc @@ -1,94 +1,99 @@ SCRIPT_START script_0800A7E4 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0010 -StopScript -WaitForSomething 0x00000001 -_0807E930 0x0002 -WaitForSomething2 0x00000002 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0001 -Wait 0x001e -_0807E930 0x0003 -Wait 0x001e -Jump 0xffee -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0010 -StopScript -WaitForSomething 0x00000001 -_0807E930 0x0002 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0001 -Wait 0x0014 -_0807E930 0x0003 -Wait 0x0014 -Jump 0xffee -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0010 -StopScript -WaitForSomething 0x00000001 -_0807E930 0x0002 -WaitForSomething2 0x00000008 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -Jump 0xffee -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0008 -StopScript -WaitForSomething 0x00000001 -_0807EF80 0x0000 -WaitForSomething2 0x00000010 -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0002 -Wait 0x0019 -_0807EB44 0x0006 -Wait 0x0019 -Jump 0xffee -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0008 -StopScript -WaitForSomething 0x00000001 -_0807EF80 0x0000 -WaitForSomething2 0x00000020 -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0002 -Wait 0x000f -_0807EB44 0x0006 -Wait 0x000f -Jump 0xffee -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01780378 -Call sub_0807F844 -StopScript -Wait 0x003c -_0807E5F8 0x00000001 -Wait 0x001e -_0807E5F8 0x00000002 -Wait 0x0014 -_0807E5F8 0x00000004 -Wait 0x000a -_0807E5F8 0x00000008 -Wait 0x003c -CallWithArg sub_0806DA1C, 0x0000000d -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + StopScript + WaitForSomething 0x00000001 + _0807E930 0x0002 + WaitForSomething2 0x00000002 + _0807EF80 0x0004 + Wait 0x003c +script_0800A80C: + _0807E930 0x0001 + Wait 0x001e + _0807E930 0x0003 + Wait 0x001e + Jump script_0800A80C + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + StopScript + WaitForSomething 0x00000001 + _0807E930 0x0002 + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + Wait 0x003c +script_0800A848: + _0807E930 0x0001 + Wait 0x0014 + _0807E930 0x0003 + Wait 0x0014 + Jump script_0800A848 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0010 + StopScript + WaitForSomething 0x00000001 + _0807E930 0x0002 + WaitForSomething2 0x00000008 + _0807EF80 0x0004 + Wait 0x003c +script_0800A884: + _0807E930 0x0001 + Wait 0x000a + _0807E930 0x0003 + Wait 0x000a + Jump script_0800A884 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0008 + StopScript + WaitForSomething 0x00000001 + _0807EF80 0x0000 + WaitForSomething2 0x00000010 + _0807EF80 0x0004 + Wait 0x003c +script_0800A8C0: + _0807EB44 0x0002 + Wait 0x0019 + _0807EB44 0x0006 + Wait 0x0019 + Jump script_0800A8C0 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0008 + StopScript + WaitForSomething 0x00000001 + _0807EF80 0x0000 + WaitForSomething2 0x00000020 + _0807EF80 0x0004 + Wait 0x003c +script_0800A8FC: + _0807EB44 0x0002 + Wait 0x000f + _0807EB44 0x0006 + Wait 0x000f + Jump script_0800A8FC + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01780378 + Call sub_0807F844 + StopScript + Wait 0x003c + _0807E5F8 0x00000001 + Wait 0x001e + _0807E5F8 0x00000002 + Wait 0x0014 + _0807E5F8 0x00000004 + Wait 0x000a + _0807E5F8 0x00000008 + Wait 0x003c + CallWithArg sub_0806DA1C, 0x0000000d + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index f846c8ce..ca526a2c 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A964 -StartScript -_0807EB44 0x0002 -_0807EF80 0x0007 -_0807E930 0x0001 -StopScript -WaitForSomething2 0x00000001 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0002 + _0807EF80 0x0007 + _0807E930 0x0001 + StopScript + WaitForSomething2 0x00000001 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index d3ea7f83..d9cb36b6 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A988 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0007 -_0807E930 0x0002 -StopScript -WaitForSomething2 0x00000002 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0007 + _0807E930 0x0002 + StopScript + WaitForSomething2 0x00000002 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index 6c25b9fb..be230b67 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A9AC -StartScript -_0807EB44 0x0000 -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000004 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0000 + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000004 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index 3377620d..115da3fb 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800A9D0 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0007 -_0807E930 0x0003 -StopScript -WaitForSomething2 0x00000008 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0006 + _0807EF80 0x0007 + _0807E930 0x0003 + StopScript + WaitForSomething2 0x00000008 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800A9F4.inc b/data/scripts/script_0800A9F4.inc index a6864ba4..c2e89b42 100644 --- a/data/scripts/script_0800A9F4.inc +++ b/data/scripts/script_0800A9F4.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0800A9F4 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x00580128 -Call sub_0807F844 -StopScript -Wait 0x003c -_0807E5F8 0x00000001 -Wait 0x000a -_0807E5F8 0x00000002 -Wait 0x0014 -_0807E5F8 0x00000004 -Wait 0x001e -_0807E5F8 0x00000008 -Wait 0x003c -CallWithArg sub_0806DA1C, 0x0000000e -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x00580128 + Call sub_0807F844 + StopScript + Wait 0x003c + _0807E5F8 0x00000001 + Wait 0x000a + _0807E5F8 0x00000002 + Wait 0x0014 + _0807E5F8 0x00000004 + Wait 0x001e + _0807E5F8 0x00000008 + Wait 0x003c + CallWithArg sub_0806DA1C, 0x0000000e + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index 23c9fba2..e7b7408e 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA48 -StartScript -_0807EB44 0x0002 -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000001 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0002 + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000001 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index 99b9ab72..82bcf68a 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA6C -StartScript -_0807EB44 0x0004 -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000002 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000002 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index 061b6c07..975efbf8 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AA90 -StartScript -_0807EB44 0x0000 -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000004 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0000 + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000004 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index ea0202f5..dbd05c71 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AAB4 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000008 -Call CreateDust -_0807EF80 0x0006 + StartScript + _0807EB44 0x0006 + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000008 + Call CreateDust + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AAD8.inc b/data/scripts/script_0800AAD8.inc index b497ebf8..d7f59883 100644 --- a/data/scripts/script_0800AAD8.inc +++ b/data/scripts/script_0800AAD8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800AAD8 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01480088 -Call sub_0807F844 -StopScript -Wait 0x003c -SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x0000000f -_0807EF80 0x0006 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01480088 + Call sub_0807F844 + StopScript + Wait 0x003c + SoundReq 0x00f6 + CallWithArg sub_0806DA1C, 0x0000000f + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AB08.inc b/data/scripts/script_0800AB08.inc index c7bb0b85..0c012046 100644 --- a/data/scripts/script_0800AB08.inc +++ b/data/scripts/script_0800AB08.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800AB08 -StartScript -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x01480088 -Call sub_0807F844 -_0807E8E4_3 -CallWithArg sub_0807F6E8, 0x00000008 -CallWithArg sub_0807F75C, 0x00a80088 -SoundReq 0x00f7 -StopScript -Wait 0x0078 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x00780088 -Call sub_0807F5C0 -TextboxNoOverlapFollowPos 0x00001664 -_0807EA94 -TextboxNoOverlapFollowPos 0x000e165e -_0807EA94 -CallWithArg sub_0805DDEC, 0x00000001 -_0807F0C8 0xffff, 0x0000 + StartScript + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x01480088 + Call sub_0807F844 + _0807E8E4_3 + CallWithArg sub_0807F6E8, 0x00000008 + CallWithArg sub_0807F75C, 0x00a80088 + SoundReq 0x00f7 + StopScript + Wait 0x0078 + _0807F0B4 0x0001 + SetEntityPositionRelative 0x00780088 + Call sub_0807F5C0 + TextboxNoOverlapFollowPos 0x00001664 + _0807EA94 + TextboxNoOverlapFollowPos 0x000e165e + _0807EA94 + CallWithArg sub_0805DDEC, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800AB6E.inc b/data/scripts/script_0800AB6E.inc index 6a996a20..cbab020d 100644 --- a/data/scripts/script_0800AB6E.inc +++ b/data/scripts/script_0800AB6E.inc @@ -1,69 +1,69 @@ SCRIPT_START script_0800AB6E -Call sub_0808D2CC -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E8E4_0 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000080 -SetEntityPosition 0x0000, 0xffe0 -Call sub_0807F5C0 -Wait 0x003c -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x000e165f -_0807EA94 -StartPlayerScript script_0800ACBC -WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos 0x000e1660 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x000e1661 -_0807EA94 -_0807E5F8 0x00000008 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -SetEntityPosition 0x0000, 0x0020 -Call sub_0807F5C0 -WaitForSomething2 0x00000010 -StartPlayerScript script_0800ACE0 -WaitForSomething2 0x00000001 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000e1662 -_0807EA94 -TextboxNoOverlapFollowPos 0x000e1663 -_0807EA94 -SetEntityPosition 0x0000, 0xffe0 -Call sub_0807F5C0 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -StartPlayerScript script_0800AD54 -WaitForSomething2 0x00000001 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000e1665 -_0807EA94 -_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 -_0807EF80 0x0006 + Call sub_0808D2CC + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E8E4_0 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000080 + SetEntityPosition 0x0000, 0xffe0 + Call sub_0807F5C0 + Wait 0x003c + CallWithArg sub_0805DE18, 0x00000001 + _0807F0C8 0x0000, 0x0000 + Wait 0x003c + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x000e165f + _0807EA94 + StartPlayerScript script_0800ACBC + WaitForSomething2 0x00000001 + TextboxNoOverlapFollowPos 0x000e1660 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x000e1661 + _0807EA94 + _0807E5F8 0x00000008 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + SetEntityPosition 0x0000, 0x0020 + Call sub_0807F5C0 + WaitForSomething2 0x00000010 + StartPlayerScript script_0800ACE0 + WaitForSomething2 0x00000001 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000e1662 + _0807EA94 + TextboxNoOverlapFollowPos 0x000e1663 + _0807EA94 + SetEntityPosition 0x0000, 0xffe0 + Call sub_0807F5C0 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + StartPlayerScript script_0800AD54 + WaitForSomething2 0x00000001 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000e1665 + _0807EA94 + _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 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 1926462e..becd20d0 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800ACBC -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0088, 0x0080 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -.short 0x0000 + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0088, 0x0080 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC + .short 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index af37423e..205ba767 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -1,25 +1,25 @@ SCRIPT_START script_0800ACE0 -StartScript -Call sub_08094BE0 -CallWithArg sub_0807F238, 0x0000045b -SoundReq 0x0109 -StopScript -Call sub_0807F304 -Wait 0x005a -_0807E5F8 0x00000008 -StartScript -CallWithArg sub_0807F6F8, 0x00000008 -CallWithArg sub_0807F238, 0x000008e4 -StopScript -Call sub_0807F304 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x003c -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x0004 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -.short 0x0000 + StartScript + Call sub_08094BE0 + CallWithArg sub_0807F238, 0x0000045b + SoundReq 0x0109 + StopScript + Call sub_0807F304 + Wait 0x005a + _0807E5F8 0x00000008 + StartScript + CallWithArg sub_0807F6F8, 0x00000008 + CallWithArg sub_0807F238, 0x000008e4 + StopScript + Call sub_0807F304 + _0807EB44 0x0004 + _0807EF80 0x0000 + Wait 0x003c + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x0004 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC + .short 0x0000 diff --git a/data/scripts/script_0800AD54.inc b/data/scripts/script_0800AD54.inc index 1284344a..f29b0aea 100644 --- a/data/scripts/script_0800AD54.inc +++ b/data/scripts/script_0800AD54.inc @@ -1,65 +1,65 @@ SCRIPT_START script_0800AD54 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EC64 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0004 -Wait 0x001e -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -Wait 0x0006 -_0807EB44 0x0000 -CallWithArg sub_0807F3D8, 0x00000000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -Wait 0x0014 -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807E930 0x000c -Call sub_0807F2D4 -Call sub_08094B94 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807E930 0x000f -Call sub_0807F2D4 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -CallWithArg sub_080960C4, 0x0800af18 -_0807E930 0x0012 -Call sub_0807F2D4 -Wait 0x001e -_0807E5F8 0x00000020 -SoundReq0x80100000 -Call CreateDust -Call sub_0806305C -Call sub_080630A4 -_0807EF3C 0x0000, 0x0020 -Wait 0x001e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xfff0 -Wait 0x003c -_0807EEF4 0x0000, 0xfff0 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EDD4 0x0088, 0x0040 -_0807E5F8 0x00000004 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EC64 0x0020 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0004 + Wait 0x001e + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + Wait 0x0006 + _0807EB44 0x0000 + CallWithArg sub_0807F3D8, 0x00000000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + Wait 0x0014 + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807E930 0x000c + Call sub_0807F2D4 + Call sub_08094B94 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807E930 0x000f + Call sub_0807F2D4 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + CallWithArg sub_080960C4, 0x0800af18 + _0807E930 0x0012 + Call sub_0807F2D4 + Wait 0x001e + _0807E5F8 0x00000020 + SoundReq0x80100000 + Call CreateDust + Call sub_0806305C + Call sub_080630A4 + _0807EF3C 0x0000, 0x0020 + Wait 0x001e + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xfff0 + Wait 0x003c + _0807EEF4 0x0000, 0xfff0 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EDD4 0x0088, 0x0040 + _0807E5F8 0x00000004 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AEA4.inc b/data/scripts/script_0800AEA4.inc index 13a61d5a..43e75217 100644 --- a/data/scripts/script_0800AEA4.inc +++ b/data/scripts/script_0800AEA4.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800AEA4 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0002 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000040 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000080 -WaitForSomething2 0x80000000 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807EB44 0x0002 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000040 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000080 + WaitForSomething2 0x80000000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AEDC.inc b/data/scripts/script_0800AEDC.inc index ea9dca91..b0cb89b6 100644 --- a/data/scripts/script_0800AEDC.inc +++ b/data/scripts/script_0800AEDC.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800AEDC -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EF80 0x000b -_0807E930 0x0000 -StopScript -WaitForSomething2 0x00000008 -Call sub_08094B80 -_0807EF3C 0x0000, 0x0001 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000008 -_0807EF80 0x0008 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EF80 0x000b + _0807E930 0x0000 + StopScript + WaitForSomething2 0x00000008 + Call sub_08094B80 + _0807EF3C 0x0000, 0x0001 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000008 + _0807EF80 0x0008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index f70c8253..f22ee38e 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800AF18 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -CallWithArg sub_0807F994, 0x0000fff8 -SoundReq 0x0142 -StopScript -WaitForSomething 0x00000020 -SoundReq 0x0143 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + CallWithArg sub_0807F994, 0x0000fff8 + SoundReq 0x0142 + StopScript + WaitForSomething 0x00000020 + SoundReq 0x0143 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc index cdd41a9b..6dc7083e 100644 --- a/data/scripts/script_0800AF44.inc +++ b/data/scripts/script_0800AF44.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF44 -_0807E864 -Call sub_0807DF28 -_0807EB28 0x1c01 -_0807EA94 -SetLocalFlagByOffset 0x0100, 0x0001 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 + Call sub_0807DF28 + _0807EB28 0x1c01 + _0807EA94 + SetLocalFlagByOffset 0x0100, 0x0001 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc index ed9ca2e7..0484fab7 100644 --- a/data/scripts/script_0800AF68.inc +++ b/data/scripts/script_0800AF68.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF68 -_0807E864 -Call sub_0807DF28 -_0807EB28 0x1c02 -_0807EA94 -SetLocalFlagByOffset 0x0100, 0x0002 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 + Call sub_0807DF28 + _0807EB28 0x1c02 + _0807EA94 + SetLocalFlagByOffset 0x0100, 0x0002 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc index 3801e06a..a39fc1ed 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/data/scripts/script_0800AF8C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AF8C -_0807E864 -Call sub_0807DF28 -_0807EB28 0x1c03 -_0807EA94 -SetLocalFlagByOffset 0x0100, 0x0003 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 + Call sub_0807DF28 + _0807EB28 0x1c03 + _0807EA94 + SetLocalFlagByOffset 0x0100, 0x0003 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index ff669eb8..255c71f2 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -1,17 +1,18 @@ SCRIPT_START script_0800AFB0 -_0807E864 -StopScript -StartScript -Call sub_0807FBB4 -ComparePlayerAction 0x0001 -JumpIfNot 0xfff0 -StopScript -Call sub_0807DF28 -_0807EB28 0x1c04 -_0807EA94 -SetLocalFlagByOffset 0x0100, 0x0004 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 +script_0800AFB2: + StopScript + StartScript + Call sub_0807FBB4 + ComparePlayerAction 0x0001 + JumpIfNot script_0800AFB2 + StopScript + Call sub_0807DF28 + _0807EB28 0x1c04 + _0807EA94 + SetLocalFlagByOffset 0x0100, 0x0004 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc index 51206f3e..19d420e7 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/data/scripts/script_0800AFE8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800AFE8 -_0807E864 -Call sub_0807DF28 -_0807EB28 0x1c05 -_0807EA94 -SetLocalFlagByOffset 0x0100, 0x0005 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 + Call sub_0807DF28 + _0807EB28 0x1c05 + _0807EA94 + SetLocalFlagByOffset 0x0100, 0x0005 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index 7ff71558..02fad519 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -1,44 +1,48 @@ SCRIPT_START script_0800B00C -StartScript -Call sub_0807F934 -Call sub_080A2124 -_0807EF80 0x000a -_0807EF80 0x0007 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -CheckGlobalFlag 0x0052 -JumpIf 0x004a -CheckGlobalFlag 0x0053 -JumpIf 0x0024 -TextboxNoOverlap 0x3f32 -_0807EA94 -_0807EF80 0x0008 -Call Windcrest_Unlock -Wait 0x003c -_0807EB28 0x0b5c -_0807EA94 -SetGlobalFlag 0x0053 -Jump 0x003a -TextboxNoOverlap 0x3f32 -_0807EA94 -_0807EF80 0x0008 -Call Windcrest_Unlock -Wait 0x003c -_0807EB28 0x0b5d -_0807EA94 -Jump 0x001c -TextboxNoOverlap 0x3f32 -_0807EA94 -_0807EF80 0x0008 -Call Windcrest_Unlock -Wait 0x003c -_0807EB28 0x0b5e -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_0807F934 + Call sub_080A2124 + _0807EF80 0x000a + _0807EF80 0x0007 + StopScript +script_0800B024: + CheckEntityInteractType + JumpIfNot script_0800B024 + _0807E864 + Call sub_0807DF28 + CheckGlobalFlag 0x0052 + JumpIf script_0800B082 + CheckGlobalFlag 0x0053 + JumpIf script_0800B064 + TextboxNoOverlap 0x3f32 + _0807EA94 + _0807EF80 0x0008 + Call Windcrest_Unlock + Wait 0x003c + _0807EB28 0x0b5c + _0807EA94 + SetGlobalFlag 0x0053 + Jump script_0800B09C +script_0800B064: + TextboxNoOverlap 0x3f32 + _0807EA94 + _0807EF80 0x0008 + Call Windcrest_Unlock + Wait 0x003c + _0807EB28 0x0b5d + _0807EA94 + Jump script_0800B09C +script_0800B082: + TextboxNoOverlap 0x3f32 + _0807EA94 + _0807EF80 0x0008 + Call Windcrest_Unlock + Wait 0x003c + _0807EB28 0x0b5e + _0807EA94 +script_0800B09C: + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B0AC.inc b/data/scripts/script_0800B0AC.inc index e6cc09c3..acd761d1 100644 --- a/data/scripts/script_0800B0AC.inc +++ b/data/scripts/script_0800B0AC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B0AC -StopScript -_0807E864 -Call sub_0807FA40 -Call sub_0807DF28 -_0807EB28 0x0b5f -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StopScript + _0807E864 + Call sub_0807FA40 + Call sub_0807DF28 + _0807EB28 0x0b5f + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index 12d9570c..f72fc30e 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -1,52 +1,56 @@ SCRIPT_START script_0800B0D0 -StartScript -Call sub_0806BCD4 -_0807EF80 0x000a -CallWithArg sub_0806BC94, 0x00000000 -StopScript -Call sub_0807F434 -_0807E078_sss 0xfff8, 0x0004, 0x0040 -_0807E864 -Call sub_0807DF28 -Call sub_0807F2D4 -_0807EB74 -CallWithArg sub_0806BC94, 0x00000004 -Call sub_0806BCE8 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Call sub_0806BCB8 -CallWithArg sub_0806BC94, 0x00000000 -Jump 0xffb6 -_0807E864 -Call sub_0807DF28 -Call sub_0807F2D4 -_0807EB74 -CallWithArg sub_0806BC94, 0x00000004 -Call sub_0807F650 -_0807E9F0 -JumpIfNot 0x0008 -Call sub_0806BCC0 -Call sub_0807DF50 -_0807E878 -Call sub_0806BCB8 -CallWithArg sub_0806BC94, 0x00000000 -Jump 0xff6e -StartScript -Call sub_0807DF28 -SetLocalFlag 0x0039 -_0807E864 -StopScript -WaitForPlayerAction0x17 -StartPlayerScript script_0800B1C0 -Wait 0x0018 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetRoomFlag 0x0000 -Wait 0x0010 -SoundReq2 0x002d -_0807EB28 0x2701 -_0807E878 -Call sub_0807DF50 + StartScript + Call sub_0806BCD4 + _0807EF80 0x000a + CallWithArg sub_0806BC94, 0x00000000 + StopScript +script_0800B0E8: + Call sub_0807F434 + JumpSwitch_3 script_0800B0E8, script_0800B0F6, script_0800B134 +script_0800B0F6: + _0807E864 + Call sub_0807DF28 + Call sub_0807F2D4 + _0807EB74 + CallWithArg sub_0806BC94, 0x00000004 + Call sub_0806BCE8 + _0807EA94 + Call sub_0807DF50 + _0807E878 + Call sub_0806BCB8 + CallWithArg sub_0806BC94, 0x00000000 + Jump script_0800B0E8 +script_0800B134: + _0807E864 + Call sub_0807DF28 + Call sub_0807F2D4 + _0807EB74 + CallWithArg sub_0806BC94, 0x00000004 + Call sub_0807F650 + _0807E9F0 + JumpIfNot script_0800B160 + Call sub_0806BCC0 +script_0800B160: + Call sub_0807DF50 + _0807E878 + Call sub_0806BCB8 + CallWithArg sub_0806BC94, 0x00000000 + Jump script_0800B0E8 + StartScript + Call sub_0807DF28 + SetLocalFlag 0x0039 + _0807E864 + StopScript + WaitForPlayerAction0x17 + StartPlayerScript script_0800B1C0 + Wait 0x0018 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + SetRoomFlag 0x0000 + Wait 0x0010 + SoundReq2 0x002d + _0807EB28 0x2701 + _0807E878 + Call sub_0807DF50 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B1C0.inc b/data/scripts/script_0800B1C0.inc index 442229d5..8c2683e9 100644 --- a/data/scripts/script_0800B1C0.inc +++ b/data/scripts/script_0800B1C0.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800B1C0 -StartScript -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x00e0 -_0807EDD4 0x0088, 0x0090 -ClearLocalFlag 0x0039 -_0807EF80 0x0000 -_0807EF80 0x0004 -Wait 0x002c -LoadRoomEntityList gUnk_080DA260 -Wait 0x001e -_0807E5F8 0x00000001 -Call sub_0807921C + StartScript + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x00e0 + _0807EDD4 0x0088, 0x0090 + ClearLocalFlag 0x0039 + _0807EF80 0x0000 + _0807EF80 0x0004 + Wait 0x002c + LoadRoomEntityList gUnk_080DA260 + Wait 0x001e + _0807E5F8 0x00000001 + Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_0800B200.inc b/data/scripts/script_0800B200.inc index f892c31b..a1a25e7d 100644 --- a/data/scripts/script_0800B200.inc +++ b/data/scripts/script_0800B200.inc @@ -1,22 +1,24 @@ SCRIPT_START script_0800B200 -StartScript -_0807E5F8 0x00000000 -CheckLocalFlag 0x001d -JumpIf 0x0044 -SetEntityNonPlanarMovement 0x00c0 -StopScript -WaitForSomething2 0x00000001 -Call sub_0807DF28 -MoveEntityToPlayer -CameraTargetEntity -_0807EDD4 0x0068, 0x0380 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -Call sub_0807DF50 -Wait 0x000c -CameraTargetPlayer -Wait 0x0008 -_0807E878 -CheckLocalFlag 0x001d -JumpIfNot 0xffc6 + StartScript + _0807E5F8 0x00000000 + CheckLocalFlag 0x001d + JumpIf script_0800B252 + SetEntityNonPlanarMovement 0x00c0 + StopScript +script_0800B216: + WaitForSomething2 0x00000001 + Call sub_0807DF28 + MoveEntityToPlayer + CameraTargetEntity + _0807EDD4 0x0068, 0x0380 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + Call sub_0807DF50 + Wait 0x000c + CameraTargetPlayer + Wait 0x0008 + _0807E878 + CheckLocalFlag 0x001d + JumpIfNot script_0800B216 +script_0800B252: SCRIPT_END diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index 9aace125..e6ffe461 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -1,55 +1,60 @@ SCRIPT_START script_0800B254 -StartScript -CheckKinstoneFused 0x0006 -JumpIf 0x00a6 -_0807EA88 0x0006 -_0807EB44 0x0002 -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0006 -JumpIf 0x006e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -.short 0x0000 -StartScript -CheckKinstoneFused 0x0007 -JumpIf 0x0076 -_0807EA88 0x0007 -_0807EB44 0x0002 -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0007 -JumpIf 0x003e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -.short 0x0000 -StartScript -CheckKinstoneFused 0x0008 -JumpIf 0x0046 -_0807EA88 0x0008 -_0807EB44 0x0002 -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0008 -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -_0807EF80 0x0013 -_0807EB44 0x0004 -_0807E9DC -Call sub_080676E0 -Call sub_08067534 -_0807EF80 0x0012 -_0807E5F8 0x00000001 -StopScript + StartScript + CheckKinstoneFused 0x0006 + JumpIf script_0800B302 + _0807EA88 0x0006 + _0807EB44 0x0002 + StopScript +script_0800B268: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0006 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B268 + .short 0x0000 + StartScript + CheckKinstoneFused 0x0007 + JumpIf script_0800B302 + _0807EA88 0x0007 + _0807EB44 0x0002 + StopScript +script_0800B298: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0007 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B298 + .short 0x0000 + StartScript + CheckKinstoneFused 0x0008 + JumpIf script_0800B302 + _0807EA88 0x0008 + _0807EB44 0x0002 + StopScript +script_0800B2C8: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0008 + JumpIf script_0800B2E2 + Call sub_0807DF50 + _0807E878 + Jump script_0800B2C8 +script_0800B2E2: + _0807EF80 0x0013 + _0807EB44 0x0004 + _0807E9DC + Call sub_080676E0 + Call sub_08067534 + _0807EF80 0x0012 + _0807E5F8 0x00000001 +script_0800B302: + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index 33df9d9f..7b0e2e4a 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -1,39 +1,44 @@ SCRIPT_START script_0800B308 -StartScript -CheckLocalFlag 0x001d -JumpIf 0x008c -_0807EF80 0x0001 -SetEntityNonPlanarMovement 0x0040 -SetEntityDirection 0x0010 -CheckKinstoneFused 0x0006 -JumpIfNot 0x0008 -Call sub_080676D8 -CheckKinstoneFused 0x0007 -JumpIfNot 0x0008 -Call sub_080676D8 -CheckKinstoneFused 0x0008 -JumpIfNot 0x0008 -Call sub_080676D8 -StopScript -Call sub_0806757C -StopScript -WaitForSomething2 0x00000002 -SoundReq 0x00fd -Call sub_080676D8 -Call sub_0806757C -Call sub_080675D4 -Wait 0x0014 -StartScript -_0807E5F8 0x00000001 -CheckKinstoneFused 0x0006 -JumpIfNot 0xffd0 -CheckKinstoneFused 0x0007 -JumpIfNot 0xffc8 -CheckKinstoneFused 0x0008 -JumpIfNot 0xffc0 -StopScript -SetLocalFlag 0x001d -SoundReq 0x0072 -_0807EF80 0x0006 + StartScript + CheckLocalFlag 0x001d + JumpIf script_0800B39C + _0807EF80 0x0001 + SetEntityNonPlanarMovement 0x0040 + SetEntityDirection 0x0010 + CheckKinstoneFused 0x0006 + JumpIfNot script_0800B32C + Call sub_080676D8 +script_0800B32C: + CheckKinstoneFused 0x0007 + JumpIfNot script_0800B33A + Call sub_080676D8 +script_0800B33A: + CheckKinstoneFused 0x0008 + JumpIfNot script_0800B348 + Call sub_080676D8 +script_0800B348: + StopScript + Call sub_0806757C +script_0800B350: + StopScript + WaitForSomething2 0x00000002 + SoundReq 0x00fd + Call sub_080676D8 + Call sub_0806757C + Call sub_080675D4 + Wait 0x0014 + StartScript + _0807E5F8 0x00000001 + CheckKinstoneFused 0x0006 + JumpIfNot script_0800B350 + CheckKinstoneFused 0x0007 + JumpIfNot script_0800B350 + CheckKinstoneFused 0x0008 + JumpIfNot script_0800B350 + StopScript + SetLocalFlag 0x001d + SoundReq 0x0072 +script_0800B39C: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B3A4.inc b/data/scripts/script_0800B3A4.inc index ea436ed6..db2c7930 100644 --- a/data/scripts/script_0800B3A4.inc +++ b/data/scripts/script_0800B3A4.inc @@ -1,24 +1,25 @@ SCRIPT_START script_0800B3A4 -StartScript -_0807EF80 0x000a -Call sub_0807F158 -SetEntityNonPlanarMovement 0x0120 -_0807EB44 0x0004 -_0807E908 0x0002 -_0807E914 0x0000200a -StopScript -_0807EDD4 0x0158, 0x0290 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -_0807EDD4 0x0128, 0x0290 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Call sub_08065780 -Jump 0xffaa + StartScript + _0807EF80 0x000a + Call sub_0807F158 + SetEntityNonPlanarMovement 0x0120 + _0807EB44 0x0004 + _0807E908 0x0002 + _0807E914 0x0000200a + StopScript +script_0800B3C4: + _0807EDD4 0x0158, 0x0290 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + _0807EDD4 0x0128, 0x0290 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Call sub_08065780 + Jump script_0800B3C4 diff --git a/data/scripts/script_0800B41C.inc b/data/scripts/script_0800B41C.inc index 30682a8f..d498b4bd 100644 --- a/data/scripts/script_0800B41C.inc +++ b/data/scripts/script_0800B41C.inc @@ -1,36 +1,36 @@ SCRIPT_START script_0800B41C -StartScript -SetEntityNonPlanarMovement 0x00c0 -_0807E908 0x0001 -_0807EF80 0x000b -_0807E864 -Call sub_0807FBC4 -StopScript -Wait 0x000a -_0807EF80 0x0004 -_0807E5F8 0x00000008 -StartPlayerScript script_0800B54C -_0807EDD4 0x0140, 0x0298 -_0807EB74 -WaitForSomething2 0x00000004 -_0807EB74 -Wait 0x003c -SoundReq 0x00cd -_0807F088 0x0037 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlapFollow 0x200c -_0807EA94 -Wait 0x0014 -_0807EDD4 0x0158, 0x0290 -Wait 0x000a -_0807EDD4 0x0158, 0x0288 -Wait 0x0014 -_0807E5F8 0x00000010 -_0807EDD4 0x0158, 0x0280 -Wait 0x000a -_0807EF80 0x0008 -_0807E5F8 0x00000010 -_0807E5F8 0x00000008 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x00c0 + _0807E908 0x0001 + _0807EF80 0x000b + _0807E864 + Call sub_0807FBC4 + StopScript + Wait 0x000a + _0807EF80 0x0004 + _0807E5F8 0x00000008 + StartPlayerScript script_0800B54C + _0807EDD4 0x0140, 0x0298 + _0807EB74 + WaitForSomething2 0x00000004 + _0807EB74 + Wait 0x003c + SoundReq 0x00cd + _0807F088 0x0037 + WaitPlayerAction8 + _0807EB8C + TextboxNoOverlapFollow 0x200c + _0807EA94 + Wait 0x0014 + _0807EDD4 0x0158, 0x0290 + Wait 0x000a + _0807EDD4 0x0158, 0x0288 + Wait 0x0014 + _0807E5F8 0x00000010 + _0807EDD4 0x0158, 0x0280 + Wait 0x000a + _0807EF80 0x0008 + _0807E5F8 0x00000010 + _0807E5F8 0x00000008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B4AC.inc b/data/scripts/script_0800B4AC.inc index 76de2d08..5df7564c 100644 --- a/data/scripts/script_0800B4AC.inc +++ b/data/scripts/script_0800B4AC.inc @@ -1,43 +1,46 @@ SCRIPT_START script_0800B4AC -StartScript -_0807EF80 0x000a -_0807EF80 0x0001 -SetEntityNonPlanarMovement 0x00c0 -_0807E9D4 -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0010 -TestBit 0x00000008 -JumpIf 0x0022 -Jump 0xffea -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlapFollow 0x200b -StopScript -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffce -StopScript -_0807E610 0x00000008 -_0807EDD4 0x0134, 0x0288 -_0807EB44 0x0004 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollow 0x2016 -_0807EA94 -_0807EDD4 0x0158, 0x0288 -_0807EF80 0x0000 -_0807EB44 0x0000 -Wait 0x000a -_0807E5F8 0x00000010 -_0807EF80 0x0008 -Wait 0x001e -_0807E5F8 0x00000010 -SetGlobalFlag 0x001d -Call sub_0807921C -_0807E878 -Call sub_0807FBCC -_0807EF80 0x0006 + StartScript + _0807EF80 0x000a + _0807EF80 0x0001 + SetEntityNonPlanarMovement 0x00c0 + _0807E9D4 +script_0800B4BC: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800B4D4 + TestBit 0x00000008 + JumpIf script_0800B4F0 + Jump script_0800B4BC +script_0800B4D4: + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlapFollow 0x200b + StopScript + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_0800B4BC +script_0800B4F0: + StopScript + _0807E610 0x00000008 + _0807EDD4 0x0134, 0x0288 + _0807EB44 0x0004 + WaitForSomething2 0x00000008 + TextboxNoOverlapFollow 0x2016 + _0807EA94 + _0807EDD4 0x0158, 0x0288 + _0807EF80 0x0000 + _0807EB44 0x0000 + Wait 0x000a + _0807E5F8 0x00000010 + _0807EF80 0x0008 + Wait 0x001e + _0807E5F8 0x00000010 + SetGlobalFlag 0x001d + Call sub_0807921C + _0807E878 + Call sub_0807FBCC + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800B54C.inc b/data/scripts/script_0800B54C.inc index 3b05f7c3..a0934d6f 100644 --- a/data/scripts/script_0800B54C.inc +++ b/data/scripts/script_0800B54C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800B54C -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0128, 0x0298 -Wait 0x000a -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0128, 0x0298 + Wait 0x000a + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 SCRIPT_END diff --git a/data/scripts/script_0800B574.inc b/data/scripts/script_0800B574.inc index 30a3e55d..6181966e 100644 --- a/data/scripts/script_0800B574.inc +++ b/data/scripts/script_0800B574.inc @@ -1,20 +1,21 @@ SCRIPT_START script_0800B574 -StartScript -_0807EF80 0x0007 -CheckGlobalFlag 0x001d -JumpIf 0x003c -StopScript -WaitForSomething2 0x00000010 -_0807EF80 0x0008 -SoundReq 0x0111 -WaitForSomething2 0x00000010 -_0807EF80 0x0007 -SoundReq 0x0111 -WaitForSomething2 0x00000010 -_0807EF80 0x0008 -SoundReq 0x0111 -WaitForSomething2 0x00000010 -_0807EF80 0x0007 -SoundReq 0x0111 -Call sub_0808692C + StartScript + _0807EF80 0x0007 + CheckGlobalFlag 0x001d + JumpIf script_0800B5BC + StopScript + WaitForSomething2 0x00000010 + _0807EF80 0x0008 + SoundReq 0x0111 + WaitForSomething2 0x00000010 + _0807EF80 0x0007 + SoundReq 0x0111 + WaitForSomething2 0x00000010 + _0807EF80 0x0008 + SoundReq 0x0111 + WaitForSomething2 0x00000010 + _0807EF80 0x0007 + SoundReq 0x0111 +script_0800B5BC: + Call sub_0808692C SCRIPT_END diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index e793ed91..b264a34e 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800B5C4 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -StopScript -Wait 0x001e -SoundReq 0x00d1 -_0807EDD4 0x008a, 0x005a -Wait 0x000a -Call sub_08069EE8 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0004 + StopScript + Wait 0x001e + SoundReq 0x00d1 + _0807EDD4 0x008a, 0x005a + Wait 0x000a + Call sub_08069EE8 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B5EC.inc b/data/scripts/script_0800B5EC.inc index 8f54c1ac..22ee139e 100644 --- a/data/scripts/script_0800B5EC.inc +++ b/data/scripts/script_0800B5EC.inc @@ -1,61 +1,67 @@ SCRIPT_START script_0800B5EC -StartScript -_0807EF80 0x000a -_0807EF80 0x0001 -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2009 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -Jump 0xffe8 -StartScript -StopScript -CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 -JumpIfNot 0xfff6 -Call sub_08079184 -_0807E864 -Call sub_0807F9A4 -StartPlayerScript script_0800B7C4 -WaitForSomething2 0x00000004 -SetRoomFlag 0x0000 -WaitForSomething2 0x00000004 -CheckLocalFlag 0x009e -JumpIf 0x0154 -TextboxNoOverlap 0x0583 -_0807EA94 -_0807E3E8 -JumpIfNot 0x002a -Wait 0x000f -TextboxNoOverlap 0x0584 -CallWithArg sub_0807F970, 0x0000058b -JumpIf 0x001e -CallWithArg sub_08087424, 0x00000000 -Wait 0x00b4 -Jump 0x0024 -TextboxNoOverlap 0x057d -_0807EA94 -Jump 0x001a -_0807EA94 -SetLocalFlag 0x009e -_0807F034 0x0066 -WaitPlayerAction8 -_0807EB8C -Wait 0x001e -TextboxNoOverlap 0x057f -_0807EA94 -_0807E778 0x0004 -DoFade7 -WaitFor_2 -Call sub_080873FC -DoFade6 -WaitFor_2 -CameraTargetPlayer -Wait 0x001e -Call sub_0807DF50 -_0807E878 + StartScript + _0807EF80 0x000a + _0807EF80 0x0001 + _0807E9D4 + StopScript +script_0800B5FA: + CheckEntityInteractType + JumpIfNot script_0800B5FA + _0807E864 + _0807EB74 + TextboxNoOverlap 0x2009 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + Jump script_0800B5FA + StartScript + StopScript +script_0800B618: + CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 + JumpIfNot script_0800B618 + Call sub_08079184 + _0807E864 + Call sub_0807F9A4 + StartPlayerScript script_0800B7C4 + WaitForSomething2 0x00000004 + SetRoomFlag 0x0000 + WaitForSomething2 0x00000004 + CheckLocalFlag 0x009e + JumpIf script_0800B7A2 + TextboxNoOverlap 0x0583 + _0807EA94 + _0807E3E8 + JumpIfNot script_0800B684 + Wait 0x000f + TextboxNoOverlap 0x0584 + CallWithArg sub_0807F970, 0x0000058b + JumpIf script_0800B68E + CallWithArg sub_08087424, 0x00000000 + Wait 0x00b4 + Jump script_0800B6A6 +script_0800B684: + TextboxNoOverlap 0x057d + _0807EA94 + Jump script_0800B6A6 +script_0800B68E: + _0807EA94 + SetLocalFlag 0x009e + _0807F034 0x0066 +script_0800B698: + WaitPlayerAction8 + _0807EB8C + Wait 0x001e + TextboxNoOverlap 0x057f + _0807EA94 +script_0800B6A6: + _0807E778 0x0004 + DoFade7 + WaitFor_2 + Call sub_080873FC + DoFade6 + WaitFor_2 + CameraTargetPlayer + Wait 0x001e + Call sub_0807DF50 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index b2cd2eee..44d64afa 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -1,62 +1,67 @@ SCRIPT_START script_0800B6C8 -StartScript -StopScript -HasRupees 0x0001 -JumpIfNot 0xfffa -CheckPlayerInRegion 0x0078, 0x00b8, 0x1060 -JumpIfNot 0xfff6 -Call sub_08079184 -_0807E864 -Call sub_0807F9A4 -StartPlayerScript script_0800B7C4 -WaitForSomething2 0x00000004 -SetRoomFlag 0x0000 -WaitForSomething2 0x00000004 -CheckLocalFlag 0x009f -JumpIf 0x0098 -TextboxNoOverlap 0x057b -_0807EA94 -CallWithArg sub_0807F970, 0x0000057d -JumpIf 0xff88 -_0807EA94 -SetLocalFlag 0x009f -_0807F034 0x0064 -Jump 0xff6c -.short 0x0000 -StartScript -StopScript -Call sub_0808747C -JumpIfNot 0xfff8 -Call sub_08079184 -_0807E864 -Wait 0x000a -Call sub_0807F9A4 -StartPlayerScript script_0800B7C4 -WaitForSomething2 0x00000004 -SetRoomFlag 0x0000 -WaitForSomething2 0x00000004 -CheckLocalFlag 0x00a0 -JumpIf 0x0036 -TextboxNoOverlap 0x0580 -_0807EA94 -CallWithArg sub_0807F970, 0x00000582 -JumpIf 0x0014 -CallWithArg sub_08087424, 0x00000001 -Wait 0x00b4 -Jump 0xff14 -_0807EA94 -SetLocalFlag 0x00a0 -_0807F034 0x0065 -Jump 0xfef8 -TextboxNoOverlap 0x0590 -_0807EA94 -_0807E778 0x0010 -DoFade7 -WaitFor_2 -ModHealth 0x00a0 -DoFade6 -WaitFor_2 -TextboxNoOverlap 0x057f -_0807EA94 -Jump 0xfee6 -.short 0x0000 + StartScript + StopScript +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 + TextboxNoOverlap 0x057b + _0807EA94 + CallWithArg sub_0807F970, 0x0000057d + JumpIf script_0800B6A6 + _0807EA94 + SetLocalFlag 0x009f + _0807F034 0x0064 + Jump script_0800B698 + .short 0x0000 + StartScript + StopScript +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 + TextboxNoOverlap 0x0580 + _0807EA94 + CallWithArg sub_0807F970, 0x00000582 + JumpIf script_0800B794 + CallWithArg sub_08087424, 0x00000001 + Wait 0x00b4 + Jump script_0800B6A6 +script_0800B794: + _0807EA94 + SetLocalFlag 0x00a0 + _0807F034 0x0065 + Jump script_0800B698 +script_0800B7A2: + TextboxNoOverlap 0x0590 + _0807EA94 + _0807E778 0x0010 + DoFade7 + WaitFor_2 + ModHealth 0x00a0 + DoFade6 + WaitFor_2 + TextboxNoOverlap 0x057f + _0807EA94 + Jump script_0800B6A6 + .short 0x0000 diff --git a/data/scripts/script_0800B7C4.inc b/data/scripts/script_0800B7C4.inc index d57fd547..d3f15385 100644 --- a/data/scripts/script_0800B7C4.inc +++ b/data/scripts/script_0800B7C4.inc @@ -1,12 +1,13 @@ SCRIPT_START script_0800B7C4 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -CallWithArg sub_0807F6B4, 0x00000090 -JumpIfNot 0x0024 -CallWithArg sub_0807F464, 0x00000078 -CallWithArg sub_0807F4F8, 0x00000090 -_0807E8E4_0 -_0807EF80 0x0000 -_0807E5F8 0x00000004 + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + CallWithArg sub_0807F6B4, 0x00000090 + JumpIfNot script_0800B7FC + CallWithArg sub_0807F464, 0x00000078 + CallWithArg sub_0807F4F8, 0x00000090 +script_0800B7EE: + _0807E8E4_0 + _0807EF80 0x0000 + _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index c8482b71..900e005e 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -1,11 +1,12 @@ SCRIPT_START script_0800B7FC -CallWithArg sub_0807F4F8, 0x00000090 -CallWithArg sub_0807F464, 0x00000078 -Jump 0xffdc -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript +script_0800B7FC: + CallWithArg sub_0807F4F8, 0x00000090 + CallWithArg sub_0807F464, 0x00000078 + Jump script_0800B7EE + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index 1128e712..7b4b5591 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -1,118 +1,129 @@ SCRIPT_START script_0800B828 -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -Wait 0x003c -Call sub_080646A4 -Jump 0xfff4 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807E930 0x0000 -_0807EF80 0x000a -StopScript -Wait 0x003c -Call sub_0806407C -Jump 0xfff4 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -CallWithArg sub_08064644, 0x0806464d -StopScript -Wait 0x003c -Call sub_080646A4 -Jump 0xfff4 -.short 0x0000 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -CheckLocalFlag 0x005f -JumpIf 0x001c -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x3f19 -_0807EA94 -SetLocalFlag 0x005f -_0807E878 -Jump 0xffe8 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x3f1a -_0807EA94 -_0807E878 -Jump 0xffec -StartScript -_0807EF80 0x000b -_0807EF80 0x0008 -Call sub_0806DAAC -JumpIf 0x0036 -Call sub_0806DAD0 -CallWithArg sub_0806DA04, 0x00000005 -StopScript -_0807EA4C -_0807E9F0 -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffee -Call sub_0806F188 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EB44 0x0000 + _0807EF80 0x000a + StopScript +script_0800B836: + _0807E944 + _0807E864 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800B836 + .short 0x0000 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + StopScript +script_0800B85E: + Wait 0x003c + Call sub_080646A4 + Jump script_0800B85E + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807E930 0x0000 + _0807EF80 0x000a + StopScript +script_0800B87E: + Wait 0x003c + Call sub_0806407C + Jump script_0800B87E + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + StopScript +script_0800B89E: + CheckEntityInteractType + JumpIfNot script_0800B89E + _0807E864 + _0807EB74 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800B89E + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + CallWithArg sub_08064644, 0x0806464d + StopScript +script_0800B8D4: + Wait 0x003c + Call sub_080646A4 + Jump script_0800B8D4 + .short 0x0000 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + StopScript +script_0800B8FC: + CheckEntityInteractType + JumpIfNot script_0800B8FC + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_0800B8FC + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + StopScript + CheckLocalFlag 0x005f + JumpIf script_0800B94E +script_0800B934: + CheckEntityInteractType + JumpIfNot script_0800B934 + _0807E864 + _0807EB74 + TextboxNoOverlapFollow 0x3f19 + _0807EA94 + SetLocalFlag 0x005f + _0807E878 + Jump script_0800B934 +script_0800B94E: + CheckEntityInteractType + JumpIfNot script_0800B94E + _0807E864 + _0807EB74 + TextboxNoOverlapFollow 0x3f1a + _0807EA94 + _0807E878 + Jump script_0800B94E + StartScript + _0807EF80 0x000b + _0807EF80 0x0008 + Call sub_0806DAAC + JumpIf script_0800B9AC + Call sub_0806DAD0 + CallWithArg sub_0806DA04, 0x00000005 + StopScript +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: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800B9B4.inc b/data/scripts/script_0800B9B4.inc index 3714f88c..3211a53b 100644 --- a/data/scripts/script_0800B9B4.inc +++ b/data/scripts/script_0800B9B4.inc @@ -1,75 +1,82 @@ SCRIPT_START script_0800B9B4 -StartScript -_0807E9D4 -Call sub_080694EC -_0807EF80 0x000a -Call sub_080694B0 -StopScript -Call sub_0807F434 -_0807E078_sss 0xfff8, 0x0004, 0x001e -_0807E864 -_0807EB74 -_0807EF80 0x0000 -Call sub_080694D8 -_0807EA94 -Call sub_080694EC -_0807E878 -Jump 0xffd8 -_0807E864 -_0807EB74 -_0807EF80 0x0000 -Call sub_0807F650 -_0807E9F0 -_0807E864 -Call sub_0806948C -JumpIf 0x0016 -_0807EA94 -Call sub_080694EC -Call sub_0807DF50 -_0807E878 -Jump 0xffa8 -_0807EA94 -_0807E9DC -_0807E9D4 -Call sub_080694EC -Call sub_0807DF50 -_0807E878 -Jump 0xff90 -StartScript -Call sub_0807F934 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollow 0x3301 -_0807EA94 -_0807E3E8 -JumpIfNot 0x000e -SoundReq0x80100000 -Call sub_0806E964 -SoundReq2 0xffff -Call sub_0807DF50 -_0807E878 -Jump 0xffd0 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0040 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EDD4 0x02f8, 0x0350 -Wait 0x001e -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0006 -Wait 0x001e -_0807EDD4 0x02f0, 0x0350 -Wait 0x001e -TextboxNoOverlap 0x0e00 -_0807EA94 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807E9D4 + Call sub_080694EC + _0807EF80 0x000a + Call sub_080694B0 + StopScript +script_0800B9CA: + Call sub_0807F434 + JumpSwitch_3 script_0800B9CA, script_0800B9D8, script_0800B9F4 +script_0800B9D8: + _0807E864 + _0807EB74 + _0807EF80 0x0000 + Call sub_080694D8 + _0807EA94 + Call sub_080694EC + _0807E878 + Jump script_0800B9CA +script_0800B9F4: + _0807E864 + _0807EB74 + _0807EF80 0x0000 + Call sub_0807F650 + _0807E9F0 + _0807E864 + Call sub_0806948C + JumpIf script_0800BA24 + _0807EA94 + Call sub_080694EC + Call sub_0807DF50 + _0807E878 + Jump script_0800B9CA +script_0800BA24: + _0807EA94 + _0807E9DC + _0807E9D4 + Call sub_080694EC + Call sub_0807DF50 + _0807E878 + Jump script_0800B9CA + StartScript + Call sub_0807F934 + StopScript +script_0800BA46: + CheckEntityInteractType + JumpIfNot script_0800BA46 + _0807E864 + Call sub_0807DF28 + TextboxNoOverlapFollow 0x3301 + _0807EA94 + _0807E3E8 + JumpIfNot script_0800BA6C + SoundReq0x80100000 + Call sub_0806E964 + SoundReq2 0xffff +script_0800BA6C: + Call sub_0807DF50 + _0807E878 + Jump script_0800BA46 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + SetEntityNonPlanarMovement 0x0040 + Call sub_0807F348 + StopScript +script_0800BA8E: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BA8E + _0807EDD4 0x02f8, 0x0350 + Wait 0x001e + _0807EF80 0x0004 + Wait 0x003c + _0807EB44 0x0006 + Wait 0x001e + _0807EDD4 0x02f0, 0x0350 + Wait 0x001e + TextboxNoOverlap 0x0e00 + _0807EA94 + Wait 0x0078 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BACC.inc b/data/scripts/script_0800BACC.inc index 3c95fe68..5a4d8e56 100644 --- a/data/scripts/script_0800BACC.inc +++ b/data/scripts/script_0800BACC.inc @@ -1,15 +1,16 @@ SCRIPT_START script_0800BACC -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e01 -_0807EA94 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0807F348 + StopScript +script_0800BADE: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BADE + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e01 + _0807EA94 + Wait 0x0078 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index 6032796c..71885490 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -1,15 +1,16 @@ SCRIPT_START script_0800BB00 -StartScript -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e02 -_0807EA94 -Wait 0x003c -_0807EF80 0x000f -Wait 0x00b4 -Call sub_08054968 + StartScript + StopScript +script_0800BB04: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BB04 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e02 + _0807EA94 + Wait 0x003c + _0807EF80 0x000f + Wait 0x00b4 + Call sub_08054968 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800BB30.inc b/data/scripts/script_0800BB30.inc index 0bd31198..22531885 100644 --- a/data/scripts/script_0800BB30.inc +++ b/data/scripts/script_0800BB30.inc @@ -1,15 +1,16 @@ SCRIPT_START script_0800BB30 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e05 -_0807EA94 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0807F348 + StopScript +script_0800BB42: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BB42 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e05 + _0807EA94 + Wait 0x0078 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BB64.inc b/data/scripts/script_0800BB64.inc index 56fc79fd..bd88b9c9 100644 --- a/data/scripts/script_0800BB64.inc +++ b/data/scripts/script_0800BB64.inc @@ -1,17 +1,18 @@ SCRIPT_START script_0800BB64 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0040 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EDD4 0x03a0, 0x00f8 -Wait 0x001e -TextboxNoOverlap 0x0e06 -_0807EA94 -Wait 0x000f -_0807EDD4 0x0380, 0x00f8 -Call sub_08054968 + StartScript + _0807EB44 0x0006 + _0807EF80 0x0000 + SetEntityNonPlanarMovement 0x0040 + Call sub_0807F348 + StopScript +script_0800BB7A: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BB7A + _0807EDD4 0x03a0, 0x00f8 + Wait 0x001e + TextboxNoOverlap 0x0e06 + _0807EA94 + Wait 0x000f + _0807EDD4 0x0380, 0x00f8 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BBA4.inc b/data/scripts/script_0800BBA4.inc index 6e72f1f0..85355bf4 100644 --- a/data/scripts/script_0800BBA4.inc +++ b/data/scripts/script_0800BBA4.inc @@ -1,16 +1,17 @@ SCRIPT_START script_0800BBA4 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0807F348 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e04 -_0807EA94 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0807F348 + StopScript +script_0800BBBA: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BBBA + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e04 + _0807EA94 + Wait 0x0078 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index 3f3ea682..917322b3 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -1,14 +1,15 @@ SCRIPT_START script_0800BBDC -StartScript -_0807E930 0x0000 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e03 -_0807EA94 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807E930 0x0000 + StopScript +script_0800BBE4: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BBE4 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e03 + _0807EA94 + Wait 0x0078 + Call sub_08054968 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800BC08.inc b/data/scripts/script_0800BC08.inc index 181a22c4..67633e0e 100644 --- a/data/scripts/script_0800BC08.inc +++ b/data/scripts/script_0800BC08.inc @@ -1,21 +1,22 @@ SCRIPT_START script_0800BC08 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e07 -_0807EA94 -StartScript -_0807EB44 0x0000 -_0807E930 0x0004 -StopScript -Wait 0x003c -Call sub_08065CCC -Wait 0x0078 -Call sub_08054968 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_0800BC18: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BC18 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e07 + _0807EA94 + StartScript + _0807EB44 0x0000 + _0807E930 0x0004 + StopScript + Wait 0x003c + Call sub_08065CCC + Wait 0x0078 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index 188a1616..1341fcc8 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -1,37 +1,38 @@ SCRIPT_START script_0800BC50 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_08054EB8 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E930 0x0000 -Wait 0x001e -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e08 -_0807EA94 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 -Call sub_08054EFC -_0807EB44 0x0000 -_0807E930 0x0000 -SetEntityNonPlanarMovement 0x0040 -_0807EF80 0x000d -CallWithArg sub_0807F4F8, 0x00000378 -Wait 0x003c -_0807EF80 0x000c -Wait 0x003c -TextboxNoOverlap 0x0e09 -_0807EA94 -Call sub_0807F158 -CallWithArg sub_0807F4F8, 0x0000035c -Wait 0x001e -SoundReq 0x0188 -_0807EF80 0x0008 -Wait 0x0078 -Call sub_08054968 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_08054EB8 + StopScript +script_0800BC62: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BC62 + _0807E930 0x0000 + Wait 0x001e + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e08 + _0807EA94 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00f0 + Call sub_08054EFC + _0807EB44 0x0000 + _0807E930 0x0000 + SetEntityNonPlanarMovement 0x0040 + _0807EF80 0x000d + CallWithArg sub_0807F4F8, 0x00000378 + Wait 0x003c + _0807EF80 0x000c + Wait 0x003c + TextboxNoOverlap 0x0e09 + _0807EA94 + Call sub_0807F158 + CallWithArg sub_0807F4F8, 0x0000035c + Wait 0x001e + SoundReq 0x0188 + _0807EF80 0x0008 + Wait 0x0078 + Call sub_08054968 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800BCE8.inc b/data/scripts/script_0800BCE8.inc index d1e4c324..e19635f9 100644 --- a/data/scripts/script_0800BCE8.inc +++ b/data/scripts/script_0800BCE8.inc @@ -1,36 +1,37 @@ SCRIPT_START script_0800BCE8 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -Wait 0x003c -TextboxNoOverlap 0x0e0a -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e0c -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x0168 -_0807E930 0x0000 -Wait 0x003c -_0807EB44 0x0002 -WaitForSomething2 0x00000004 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + Wait 0x003c + TextboxNoOverlap 0x0e0a + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + _0807E5F8 0x00000001 +script_0800BD1C: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BD1C + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E930 0x0000 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e0c + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x0168 + _0807E930 0x0000 + Wait 0x003c + _0807EB44 0x0002 + WaitForSomething2 0x00000004 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800BD78.inc b/data/scripts/script_0800BD78.inc index 5c08c0b5..6e4bf7ee 100644 --- a/data/scripts/script_0800BD78.inc +++ b/data/scripts/script_0800BD78.inc @@ -1,35 +1,35 @@ SCRIPT_START script_0800BD78 -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x00000270 -Wait 0x001e -TextboxNoOverlap 0x0e0b -_0807EA94 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0088, 0x0228 -Wait 0x000f -_0807E5F8 0x00000004 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000000 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000003 -_0807EB44 0x0004 -_0807E930 0x0000 -Wait 0x003c -_0807EB44 0x0006 -_0807E5F8 0x00000004 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 -Call sub_08054968 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + CallWithArg sub_0807F4F8, 0x00000270 + Wait 0x001e + TextboxNoOverlap 0x0e0b + _0807EA94 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0088, 0x0228 + Wait 0x000f + _0807E5F8 0x00000004 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000000 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000003 + _0807EB44 0x0004 + _0807E930 0x0000 + Wait 0x003c + _0807EB44 0x0006 + _0807E5F8 0x00000004 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 4c4db21b..6b68a09c 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -1,47 +1,49 @@ SCRIPT_START script_0800BE1C -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0002 -Wait 0x003c -TextboxNoOverlap 0x0e0d -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -Jump 0x0038 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e0f -_0807EA94 -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + TextboxNoOverlap 0x0e0d + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + Jump script_0800BE88 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0006 + Wait 0x003c + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + _0807E5F8 0x00000001 +script_0800BE88: + _0807EB44 0x0004 +script_0800BE8C: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BE8C + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807E930 0x0000 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e0f + _0807EA94 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/script_0800BECC.inc b/data/scripts/script_0800BECC.inc index 40e3dcd9..c4559547 100644 --- a/data/scripts/script_0800BECC.inc +++ b/data/scripts/script_0800BECC.inc @@ -1,25 +1,25 @@ SCRIPT_START script_0800BECC -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x000001b8 -Wait 0x001e -TextboxNoOverlap 0x0e0e -_0807EA94 -_0807E5F8 0x0000000c -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0088, 0x0178 -Wait 0x000f -_0807E5F8 0x0000000c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 -Call sub_08054968 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + CallWithArg sub_0807F4F8, 0x000001b8 + Wait 0x001e + TextboxNoOverlap 0x0e0e + _0807EA94 + _0807E5F8 0x0000000c + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0088, 0x0178 + Wait 0x000f + _0807E5F8 0x0000000c + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00f0 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 34693099..f4a9d017 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -1,53 +1,55 @@ SCRIPT_START script_0800BF38 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0002 -Wait 0x003c -TextboxNoOverlap 0x0e10 -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -Jump 0x0038 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e12 -_0807EA94 -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x0168 -_0807EB44 0x0004 -_0807E930 0x0000 -Wait 0x003c -Call sub_08054F64 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + TextboxNoOverlap 0x0e10 + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + Jump script_0800BFA4 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0006 + Wait 0x003c + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + _0807E5F8 0x00000001 +script_0800BFA4: + _0807EB44 0x0004 +script_0800BFA8: + CheckRoomFlag 0x00ff + JumpIfNot script_0800BFA8 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807E930 0x0000 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e12 + _0807EA94 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x0168 + _0807EB44 0x0004 + _0807E930 0x0000 + Wait 0x003c + Call sub_08054F64 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800C004.inc b/data/scripts/script_0800C004.inc index 1e63525f..635b8068 100644 --- a/data/scripts/script_0800C004.inc +++ b/data/scripts/script_0800C004.inc @@ -1,36 +1,36 @@ SCRIPT_START script_0800C004 -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x000001b8 -Wait 0x001e -TextboxNoOverlap 0x0e11 -_0807EA94 -_0807E5F8 0x0000001c -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0088, 0x0188 -_0807EDD4 0x00a8, 0x0188 -_0807EDD4 0x00a8, 0x0178 -Wait 0x000f -_0807E5F8 0x0000001c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000001 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000004 -_0807EB44 0x0004 -_0807E930 0x0000 -Wait 0x003c -_0807E5F8 0x0000001c -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 -Call sub_08054968 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + CallWithArg sub_0807F4F8, 0x000001b8 + Wait 0x001e + TextboxNoOverlap 0x0e11 + _0807EA94 + _0807E5F8 0x0000001c + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0088, 0x0188 + _0807EDD4 0x00a8, 0x0188 + _0807EDD4 0x00a8, 0x0178 + Wait 0x000f + _0807E5F8 0x0000001c + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000001 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000004 + _0807EB44 0x0004 + _0807E930 0x0000 + Wait 0x003c + _0807E5F8 0x0000001c + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index 2e646766..37dfcb17 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -1,47 +1,49 @@ SCRIPT_START script_0800C0B0 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0002 -Wait 0x003c -TextboxNoOverlap 0x0e13 -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -Jump 0x0038 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e15 -_0807EA94 -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + TextboxNoOverlap 0x0e13 + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + Jump script_0800C11C + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0006 + Wait 0x003c + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + _0807E5F8 0x00000001 +script_0800C11C: + _0807EB44 0x0004 +script_0800C120: + CheckRoomFlag 0x00ff + JumpIfNot script_0800C120 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807E930 0x0000 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e15 + _0807EA94 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00f0 SCRIPT_END diff --git a/data/scripts/script_0800C160.inc b/data/scripts/script_0800C160.inc index 67ec144b..58c62453 100644 --- a/data/scripts/script_0800C160.inc +++ b/data/scripts/script_0800C160.inc @@ -1,27 +1,27 @@ SCRIPT_START script_0800C160 -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x00000128 -Wait 0x001e -TextboxNoOverlap 0x0e14 -_0807EA94 -_0807E5F8 0x0000003c -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0098, 0x00e8 -_0807EDD4 0x00a8, 0x00e8 -_0807EDD4 0x00a8, 0x00d8 -Wait 0x000f -_0807E5F8 0x0000003c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00f0 -Call sub_08054968 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + CallWithArg sub_0807F4F8, 0x00000128 + Wait 0x001e + TextboxNoOverlap 0x0e14 + _0807EA94 + _0807E5F8 0x0000003c + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0098, 0x00e8 + _0807EDD4 0x00a8, 0x00e8 + _0807EDD4 0x00a8, 0x00d8 + Wait 0x000f + _0807E5F8 0x0000003c + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00f0 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index 196042c1..9cbeb6f1 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -1,53 +1,55 @@ SCRIPT_START script_0800C1D8 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0002 -Wait 0x003c -TextboxNoOverlap 0x0e16 -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -Jump 0x0038 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0807F348 -StopScript -WaitFor_2 -Wait 0x00f0 -_0807E930 0x0000 -_0807EB44 0x0006 -Wait 0x003c -_0807EA94 -_0807E930 0x0008 -Wait 0x003c -_0807E5F8 0x00000001 -_0807EB44 0x0004 -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807E930 0x0000 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x0e18 -_0807EA94 -_0807E5F8 0x00000002 -Call sub_08054F64 -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x0168 -_0807EB44 0x0004 -_0807E930 0x0000 -Wait 0x003c -Call sub_08054F64 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0002 + Wait 0x003c + TextboxNoOverlap 0x0e16 + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + Jump script_0800C244 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0807F348 + StopScript + WaitFor_2 + Wait 0x00f0 + _0807E930 0x0000 + _0807EB44 0x0006 + Wait 0x003c + _0807EA94 + _0807E930 0x0008 + Wait 0x003c + _0807E5F8 0x00000001 +script_0800C244: + _0807EB44 0x0004 +script_0800C248: + CheckRoomFlag 0x00ff + JumpIfNot script_0800C248 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807E930 0x0000 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x0e18 + _0807EA94 + _0807E5F8 0x00000002 + Call sub_08054F64 + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x0168 + _0807EB44 0x0004 + _0807E930 0x0000 + Wait 0x003c + Call sub_08054F64 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 SCRIPT_END diff --git a/data/scripts/script_0800C2A4.inc b/data/scripts/script_0800C2A4.inc index 04f24c22..4a873345 100644 --- a/data/scripts/script_0800C2A4.inc +++ b/data/scripts/script_0800C2A4.inc @@ -1,36 +1,36 @@ SCRIPT_START script_0800C2A4 -StartScript -_0807EB44 0x0000 -_0807E930 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -Call sub_0807F348 -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -CallWithArg sub_0807F4F8, 0x00000128 -Wait 0x001e -TextboxNoOverlap 0x0e17 -_0807EA94 -_0807E5F8 0x0000007c -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0098, 0x00e8 -_0807EDD4 0x00c8, 0x00e8 -_0807EDD4 0x00c8, 0x00d8 -Wait 0x000f -_0807E5F8 0x0000007c -_0807EF80 0x000f -_0807E930 0x0008 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000002 -Wait 0x00b4 -CallWithArg sub_0804BF38, 0x00000005 -_0807EB44 0x0004 -_0807E930 0x0000 -Wait 0x003c -_0807E5F8 0x0000007c -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xffe0 -Call sub_08054968 + StartScript + _0807EB44 0x0000 + _0807E930 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + Call sub_0807F348 + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + CallWithArg sub_0807F4F8, 0x00000128 + Wait 0x001e + TextboxNoOverlap 0x0e17 + _0807EA94 + _0807E5F8 0x0000007c + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0098, 0x00e8 + _0807EDD4 0x00c8, 0x00e8 + _0807EDD4 0x00c8, 0x00d8 + Wait 0x000f + _0807E5F8 0x0000007c + _0807EF80 0x000f + _0807E930 0x0008 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000002 + Wait 0x00b4 + CallWithArg sub_0804BF38, 0x00000005 + _0807EB44 0x0004 + _0807E930 0x0000 + Wait 0x003c + _0807E5F8 0x0000007c + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xffe0 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C350.inc b/data/scripts/script_0800C350.inc index 5f92a5d0..7d8ef911 100644 --- a/data/scripts/script_0800C350.inc +++ b/data/scripts/script_0800C350.inc @@ -1,8 +1,9 @@ SCRIPT_START script_0800C350 -StartScript -CallWithArg sub_0806D658, 0x00000003 -SetEntityNonPlanarMovement 0x0200 -StopScript -CheckRoomFlag 0x00ff -JumpIfNot 0xfffa -_0807F0C8 0xffff, 0x0000 + StartScript + CallWithArg sub_0806D658, 0x00000003 + SetEntityNonPlanarMovement 0x0200 + StopScript +script_0800C362: + CheckRoomFlag 0x00ff + JumpIfNot script_0800C362 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800C370.inc b/data/scripts/script_0800C370.inc index 07a55018..a19ec82a 100644 --- a/data/scripts/script_0800C370.inc +++ b/data/scripts/script_0800C370.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800C370 -_0807EEF4 0xfff8, 0x0000 -_0807EEF4 0x0010, 0x0000 -_0807EEF4 0xfff0, 0x0000 -_0807EEF4 0x0010, 0x0000 -_0807EEF4 0xfff8, 0x0000 -_0807F0C8 0x0000, 0x0000 -Wait 0x001e -TextboxNoOverlap 0x1d00 -_0807EA94 -_0807E5F8 0x00000006 -WaitForSomething2 0x00000001 -_0807F0C8 0xffff, 0x0000 + _0807EEF4 0xfff8, 0x0000 + _0807EEF4 0x0010, 0x0000 + _0807EEF4 0xfff0, 0x0000 + _0807EEF4 0x0010, 0x0000 + _0807EEF4 0xfff8, 0x0000 + _0807F0C8 0x0000, 0x0000 + Wait 0x001e + TextboxNoOverlap 0x1d00 + _0807EA94 + _0807E5F8 0x00000006 + WaitForSomething2 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800C3B0.inc b/data/scripts/script_0800C3B0.inc index dd68e9b7..95da6f56 100644 --- a/data/scripts/script_0800C3B0.inc +++ b/data/scripts/script_0800C3B0.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800C3B0 -SetEntityNonPlanarMovement 0x0080 -_0807EEF4 0x0000, 0xff30 -_0807F0C8 0x0000, 0x0000 -Wait 0x00b4 -Call sub_08054968 + SetEntityNonPlanarMovement 0x0080 + _0807EEF4 0x0000, 0xff30 + _0807F0C8 0x0000, 0x0000 + Wait 0x00b4 + Call sub_08054968 SCRIPT_END diff --git a/data/scripts/script_0800C3CC.inc b/data/scripts/script_0800C3CC.inc index 407a8d54..7d60617c 100644 --- a/data/scripts/script_0800C3CC.inc +++ b/data/scripts/script_0800C3CC.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800C3CC -StartScript -Call sub_0806D660 -SetEntityNonPlanarMovement 0x0080 -StopScript -WaitForSomething2 0x00000002 -CallWithArg sub_0807F4F8, 0x00000048 -Call sub_0806D66C -Wait 0x000f -CallWithArg sub_0807F4F8, 0x00000068 -Call sub_0806D67C -_0807F0C8 0x001e, 0x0000 -SoundReq 0x010b + StartScript + Call sub_0806D660 + SetEntityNonPlanarMovement 0x0080 + StopScript + WaitForSomething2 0x00000002 + CallWithArg sub_0807F4F8, 0x00000048 + Call sub_0806D66C + Wait 0x000f + CallWithArg sub_0807F4F8, 0x00000068 + Call sub_0806D67C + _0807F0C8 0x001e, 0x0000 + SoundReq 0x010b SCRIPT_END diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index 040b41fc..5db4ce83 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -1,16 +1,16 @@ SCRIPT_START script_0800C410 -StartScript -Call sub_0806D660 -SetEntityNonPlanarMovement 0x0080 -StopScript -WaitForSomething2 0x00000004 -CallWithArg sub_0807F4F8, 0x00000048 -Call sub_0806D66C -Wait 0x000f -CallWithArg sub_0807F4F8, 0x00000068 -Call sub_0806D67C -_0807F0C8 0x001e, 0x0000 -SoundReq 0x010b -_0807E5F8 0x00000001 + StartScript + Call sub_0806D660 + SetEntityNonPlanarMovement 0x0080 + StopScript + WaitForSomething2 0x00000004 + CallWithArg sub_0807F4F8, 0x00000048 + Call sub_0806D66C + Wait 0x000f + CallWithArg sub_0807F4F8, 0x00000068 + Call sub_0806D67C + _0807F0C8 0x001e, 0x0000 + SoundReq 0x010b + _0807E5F8 0x00000001 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index 6fa6a6f0..f13cd822 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -1,17 +1,18 @@ SCRIPT_START script_0800C45C -StartScript -SetEntityNonPlanarMovement 0x0180 -_0807E930 0x0004 -Call sub_080A0B28 -StopScript -Wait 0x000a -_0807EF80 0x0007 -SoundReq 0x0136 -_0807EE30 -JumpIfNot 0xfffc -Wait 0x003c -SetRoomFlag 0x00ff -_0807E930 0x0005 -Wait 0x000f + StartScript + SetEntityNonPlanarMovement 0x0180 + _0807E930 0x0004 + Call sub_080A0B28 + StopScript + Wait 0x000a + _0807EF80 0x0007 + SoundReq 0x0136 +script_0800C47A: + _0807EE30 + JumpIfNot script_0800C47A + Wait 0x003c + SetRoomFlag 0x00ff + _0807E930 0x0005 + Wait 0x000f SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index df3b473b..0c3f544c 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800C494 -StartScript -SetEntityNonPlanarMovement 0x0120 -_0807E930 0x0004 -StopScript -Wait 0x000a -_0807EF80 0x0007 -SoundReq 0x0136 -_0807EEF4 0x0000, 0xff90 -Wait 0x001e -_0807EEF4 0x0000, 0xffb0 -Wait 0x003c -SetRoomFlag 0x00ff -_0807E930 0x0005 -Wait 0x000f + StartScript + SetEntityNonPlanarMovement 0x0120 + _0807E930 0x0004 + StopScript + Wait 0x000a + _0807EF80 0x0007 + SoundReq 0x0136 + _0807EEF4 0x0000, 0xff90 + Wait 0x001e + _0807EEF4 0x0000, 0xffb0 + Wait 0x003c + SetRoomFlag 0x00ff + _0807E930 0x0005 + Wait 0x000f SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 468dc634..fc78cae8 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800C4D0 -StartScript -SetEntityNonPlanarMovement 0x0180 -_0807E930 0x0004 -StopScript -Wait 0x000a -_0807EF80 0x0007 -SoundReq 0x0136 -_0807EEF4 0x00c0, 0x0000 -Wait 0x001e -_0807EEF4 0x0070, 0x0000 -Wait 0x003c -SetRoomFlag 0x00ff -_0807E930 0x0005 -Wait 0x000f + StartScript + SetEntityNonPlanarMovement 0x0180 + _0807E930 0x0004 + StopScript + Wait 0x000a + _0807EF80 0x0007 + SoundReq 0x0136 + _0807EEF4 0x00c0, 0x0000 + Wait 0x001e + _0807EEF4 0x0070, 0x0000 + Wait 0x003c + SetRoomFlag 0x00ff + _0807E930 0x0005 + Wait 0x000f SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800C50C.inc b/data/scripts/script_0800C50C.inc index 583dc207..cb7731f8 100644 --- a/data/scripts/script_0800C50C.inc +++ b/data/scripts/script_0800C50C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_0800C50C -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807E930 0x0004 -_0807EF80 0x0008 -StopScript -WaitForSomething2 0x00000001 -Wait 0x000a -_0807EF80 0x0007 -SoundReq 0x0136 -_0807EEF4 0x0000, 0x0060 -Wait 0x003c -_0807EEF4 0x0000, 0x0060 -Wait 0x001e -SetRoomFlag 0x00ff -_0807E930 0x0005 -Wait 0x000f + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807E930 0x0004 + _0807EF80 0x0008 + StopScript + WaitForSomething2 0x00000001 + Wait 0x000a + _0807EF80 0x0007 + SoundReq 0x0136 + _0807EEF4 0x0000, 0x0060 + Wait 0x003c + _0807EEF4 0x0000, 0x0060 + Wait 0x001e + SetRoomFlag 0x00ff + _0807E930 0x0005 + Wait 0x000f SCRIPT_END diff --git a/data/scripts/script_0800C550.inc b/data/scripts/script_0800C550.inc index 3bef42e8..f4d2ca1c 100644 --- a/data/scripts/script_0800C550.inc +++ b/data/scripts/script_0800C550.inc @@ -1,243 +1,269 @@ SCRIPT_START script_0800C550 -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08060208 -_0807EA94 -_0807E878 -Jump 0xffdc -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -CheckInventory1 0x0067 -JumpIfNot 0x000c -Call sub_08060208 -Jump 0x0006 -TextboxNoOverlap 0x4710 -_0807EA94 -_0807E878 -Jump 0xffcc -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08060270 -_0807EA94 -_0807E878 -Jump 0xffdc -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_0806021C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd8 -StartScript -_0807EF80 0x000a -SetEntityNonPlanarMovement 0x0080 -_0807EB44 0x0004 -CheckLocalFlag 0x0082 -JumpIfNot 0x0008 -SetEntityPosition 0x0010, 0x0000 -StopScript -_0807E944 -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x0082 -JumpIf 0x0022 -CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 -JumpIfNot 0x0006 -_0807EF80 0x000b -StartPlayerScript script_0800C8C8 -WaitForSomething2 0x00000001 -_0807EF80 0x000a -CheckInventory1 0x0040 -JumpIf 0x00a6 -CheckInventory1 0x005b -JumpIf 0x0024 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f16 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -SetLocalFlag 0x0080 -Call sub_0807DF50 -_0807E878 -Jump 0xff9e -CheckLocalFlag 0x0081 -JumpIf 0x0020 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f1b -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xff78 -CheckLocalFlag 0x0082 -JumpIf 0x0030 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f17 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EC94 0x0020 -_0807EB44 0x0004 -Wait 0x000f -SoundReq 0x0072 -SetLocalFlag 0x0082 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f18 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xff24 -CheckLocalFlag 0x0083 -JumpIf 0x0020 -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f19 -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xfefe -_0807EF80 0x0002 -TextboxNoOverlapFollow 0x1f1a -_0807EA94 -_0807EF80 0x0015 -Wait 0x000a -Call sub_0807DF50 -_0807E878 -Jump 0xfee0 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -StopScript -_0807E944 -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_0800C8F0 -WaitForSomething2 0x00000001 -CheckInventory1 0x0040 -JumpIf 0x0088 -CheckInventory1 0x005b -JumpIf 0x001c -_0807E930 0x0008 -TextboxNoOverlapFollow 0x2122 -_0807EA94 -_0807EF80 0x0000 -Call sub_0807DF50 -_0807E878 -Jump 0xffc2 -_0807E930 0x0008 -CheckLocalFlag 0x0081 -JumpIf 0x0040 -TextboxNoOverlapFollow 0x1130 -_0807EA94 -_0807EB28 0x1131 -_0807EA94 -_0807EB8C -TextboxNoOverlapFollow 0x1132 -_0807EA94 -_0807E914 0x00000103 -Call sub_0807F420 -TextboxNoOverlapFollow 0x1133 -_0807EA94 -Wait 0x000a -_0807EF80 0x0000 -SetLocalFlag 0x0081 -Call sub_0807DF50 -_0807E878 -Jump 0xff78 -TextboxNoOverlapFollow 0x1133 -_0807EA94 -Wait 0x000a -_0807E930 0x0000 -Call sub_0807DF50 -_0807E878 -Jump 0xff5e -_0807E930 0x0008 -CheckLocalFlag 0x0083 -JumpIf 0x0080 -TextboxNoOverlapFollow 0x1135 -_0807EA94 -SetEntityNonPlanarMovement 0x0040 -_0807EDD4 0x0038, 0x0044 -_0807EF80 0x0000 -Wait 0x000f -SetLocalFlag 0x0083 -Wait 0x003c -SoundReq 0x0072 -Wait 0x003c -_0807EB74 -_0807EB8C -TextboxNoOverlapFollow 0x1136 -_0807EA94 -_0807EB28 0x1137 -_0807EA94 -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0807DF50 -_0807E878 -_0807E944 -_0807E864 -Call sub_0807DF28 -_0807EB74 -_0807E914 0x00000008 -Call sub_0807F3D8 -TextboxNoOverlapFollow 0x1136 -_0807EA94 -Wait 0x000a -_0807EF80 0x0000 -Call sub_0807DF50 -_0807E878 -Jump 0xffd0 -TextboxNoOverlapFollow 0x1136 -_0807EA94 -Wait 0x000a -_0807EF80 0x0000 -Call sub_0807DF50 -_0807E878 -Jump 0xfeba + StartScript + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800C55E: + StartScript + CheckEntityInteractType + JumpIf script_0800C572 + Call sub_08060158 + StopScript + Jump script_0800C55E +script_0800C572: + StopScript + _0807E864 + Call sub_08060208 + _0807EA94 + _0807E878 + Jump script_0800C55E + StartScript + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800C592: + StartScript + CheckEntityInteractType + JumpIf script_0800C5A6 + Call sub_08060158 + StopScript + Jump script_0800C592 +script_0800C5A6: + StopScript + _0807E864 + CheckInventory1 0x0067 + JumpIfNot script_0800C5BC + Call sub_08060208 + Jump script_0800C5C0 +script_0800C5BC: + TextboxNoOverlap 0x4710 +script_0800C5C0: + _0807EA94 + _0807E878 + Jump script_0800C592 + StartScript + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800C5D6: + StartScript + CheckEntityInteractType + JumpIf script_0800C5EA + Call sub_08060158 + StopScript + Jump script_0800C5D6 +script_0800C5EA: + StopScript + _0807E864 + Call sub_08060270 + _0807EA94 + _0807E878 + Jump script_0800C5D6 + StartScript +script_0800C5FE: + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800C60A: + StartScript + CheckEntityInteractType + JumpIf script_0800C61E + Call sub_08060158 + StopScript + Jump script_0800C60A +script_0800C61E: + StopScript + _0807E864 + Call sub_0806021C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800C60A + StartScript + _0807EF80 0x000a + SetEntityNonPlanarMovement 0x0080 + _0807EB44 0x0004 + CheckLocalFlag 0x0082 + JumpIfNot script_0800C650 + SetEntityPosition 0x0010, 0x0000 +script_0800C650: + StopScript +script_0800C652: + _0807E944 + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x0082 + JumpIf script_0800C684 + CheckPlayerInRegion 0x00e8, 0x0028, 0x1810 + JumpIfNot script_0800C674 + _0807EF80 0x000b +script_0800C674: + StartPlayerScript script_0800C8C8 + WaitForSomething2 0x00000001 + _0807EF80 0x000a +script_0800C684: + CheckInventory1 0x0040 + JumpIf script_0800C730 + CheckInventory1 0x005b + JumpIf script_0800C6B6 + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f16 + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + SetLocalFlag 0x0080 + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C6B6: + CheckLocalFlag 0x0081 + JumpIf script_0800C6DC + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f1b + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C6DC: + CheckLocalFlag 0x0082 + JumpIf script_0800C712 + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f17 + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807EC94 0x0020 + _0807EB44 0x0004 + Wait 0x000f + SoundReq 0x0072 + SetLocalFlag 0x0082 +script_0800C712: + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f18 + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C730: + CheckLocalFlag 0x0083 + JumpIf script_0800C756 + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f19 + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 +script_0800C756: + _0807EF80 0x0002 + TextboxNoOverlapFollow 0x1f1a + _0807EA94 + _0807EF80 0x0015 + Wait 0x000a + Call sub_0807DF50 + _0807E878 + Jump script_0800C652 + StartScript + _0807EF80 0x000a + _0807EB44 0x0004 + StopScript +script_0800C780: + _0807E944 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_0800C8F0 + WaitForSomething2 0x00000001 + CheckInventory1 0x0040 + JumpIf script_0800C824 + CheckInventory1 0x005b + JumpIf script_0800C7C0 + _0807E930 0x0008 + TextboxNoOverlapFollow 0x2122 + _0807EA94 + _0807EF80 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C7C0: + _0807E930 0x0008 + CheckLocalFlag 0x0081 + JumpIf script_0800C80A + TextboxNoOverlapFollow 0x1130 + _0807EA94 + _0807EB28 0x1131 + _0807EA94 + _0807EB8C + TextboxNoOverlapFollow 0x1132 + _0807EA94 + _0807E914 0x00000103 + Call sub_0807F420 + TextboxNoOverlapFollow 0x1133 + _0807EA94 + Wait 0x000a + _0807EF80 0x0000 + SetLocalFlag 0x0081 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C80A: + TextboxNoOverlapFollow 0x1133 + _0807EA94 + Wait 0x000a + _0807E930 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 +script_0800C824: + _0807E930 0x0008 + CheckLocalFlag 0x0083 + JumpIf script_0800C8AE + TextboxNoOverlapFollow 0x1135 + _0807EA94 + SetEntityNonPlanarMovement 0x0040 + _0807EDD4 0x0038, 0x0044 + _0807EF80 0x0000 + Wait 0x000f + SetLocalFlag 0x0083 + Wait 0x003c + SoundReq 0x0072 + Wait 0x003c + _0807EB74 + _0807EB8C + TextboxNoOverlapFollow 0x1136 + _0807EA94 + _0807EB28 0x1137 + _0807EA94 + Wait 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0807DF50 + _0807E878 +script_0800C87C: + _0807E944 + _0807E864 + Call sub_0807DF28 + _0807EB74 + _0807E914 0x00000008 + Call sub_0807F3D8 + TextboxNoOverlapFollow 0x1136 + _0807EA94 + Wait 0x000a + _0807EF80 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C87C +script_0800C8AE: + TextboxNoOverlapFollow 0x1136 + _0807EA94 + Wait 0x000a + _0807EF80 0x0000 + Call sub_0807DF50 + _0807E878 + Jump script_0800C780 diff --git a/data/scripts/script_0800C8C8.inc b/data/scripts/script_0800C8C8.inc index 013c731a..26a6b405 100644 --- a/data/scripts/script_0800C8C8.inc +++ b/data/scripts/script_0800C8C8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800C8C8 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x00e8, 0x0068 -_0807EB44 0x0000 -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x00e8, 0x0068 + _0807EB44 0x0000 + Wait 0x000f + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C8F0.inc b/data/scripts/script_0800C8F0.inc index 6f3b500d..2e809c16 100644 --- a/data/scripts/script_0800C8F0.inc +++ b/data/scripts/script_0800C8F0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800C8F0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807ECC4 0x0010 -_0807EDD4 0x0078, 0x0058 -_0807EB44 0x0000 -Wait 0x000f -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807ECC4 0x0010 + _0807EDD4 0x0078, 0x0058 + _0807EB44 0x0000 + Wait 0x000f + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800C91C.inc b/data/scripts/script_0800C91C.inc index d7d4ab75..aa5b10a9 100644 --- a/data/scripts/script_0800C91C.inc +++ b/data/scripts/script_0800C91C.inc @@ -1,81 +1,82 @@ SCRIPT_START script_0800C91C -StartScript -_0807EB44 0x0004 -SetEntityNonPlanarMovement 0x0300 -StopScript -CheckPlayerInRegion 0x0208, 0x0360, 0x2040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_0800CA8C -WaitForSomething2 0x00000002 -Wait 0x003c -_0807EB28 0x1125 -_0807EA94 -_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 -TextboxNoOverlapFollow 0x1126 -Call sub_0807F40C -_0807EA94 -_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 -TextboxNoOverlapFollow 0x1127 -_0807EA94 -_0807E5F8 0x00002000 -WaitForSomething2 0x00004000 -_0807E8E4_1 -TextboxNoOverlapFollow 0x1128 -_0807EA94 -_0807E5F8 0x00000200 -_0807E5F8 0x00000800 -_0807E5F8 0x00002000 -_0807E5F8 0x00008000 -_0807E5F8 0x00020000 -WaitForSomething2 0x00000400 -WaitForSomething2 0x00001000 -WaitForSomething2 0x00004000 -WaitForSomething2 0x00010000 -WaitForSomething2 0x00040000 -_0807E8E4_0 -_0807EB28 0x1129 -_0807EA94 -SetLocalFlag 0x008d -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + SetEntityNonPlanarMovement 0x0300 + StopScript +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 + _0807EA94 + _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 + TextboxNoOverlapFollow 0x1126 + Call sub_0807F40C + _0807EA94 + _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 + TextboxNoOverlapFollow 0x1127 + _0807EA94 + _0807E5F8 0x00002000 + WaitForSomething2 0x00004000 + _0807E8E4_1 + TextboxNoOverlapFollow 0x1128 + _0807EA94 + _0807E5F8 0x00000200 + _0807E5F8 0x00000800 + _0807E5F8 0x00002000 + _0807E5F8 0x00008000 + _0807E5F8 0x00020000 + WaitForSomething2 0x00000400 + WaitForSomething2 0x00001000 + WaitForSomething2 0x00004000 + WaitForSomething2 0x00010000 + WaitForSomething2 0x00040000 + _0807E8E4_0 + _0807EB28 0x1129 + _0807EA94 + SetLocalFlag 0x008d + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index d0fce5fb..c769676b 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800CA8C -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0208, 0x0358 -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x0208, 0x0340 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0208, 0x0358 + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x0208, 0x0340 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index a837e4ff..55c914fd 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -1,34 +1,34 @@ SCRIPT_START script_0800CABC -StartScript -_0807EF80 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000f -Call sub_0807F338 -StopScript -WaitForSomething2 0x00000200 -_0807EF80 0x0007 -_0807EDD4 0x0208, 0x0308 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000400 -WaitForSomething2 0x00000200 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -_0807E5F8 0x00000400 -WaitForSomething2 0x00000200 -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000f -_0807EDD4 0x0208, 0x0328 -_0807EF80 0x0000 -_0807E5F8 0x00000400 -WaitForSomething2 0x00000200 -SetEntityNonPlanarMovement 0x0300 -_0807EF80 0x000f -_0807EDD4 0x0208, 0x02b0 -_0807E5F8 0x00000400 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000f + Call sub_0807F338 + StopScript + WaitForSomething2 0x00000200 + _0807EF80 0x0007 + _0807EDD4 0x0208, 0x0308 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000400 + WaitForSomething2 0x00000200 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + _0807E5F8 0x00000400 + WaitForSomething2 0x00000200 + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000f + _0807EDD4 0x0208, 0x0328 + _0807EF80 0x0000 + _0807E5F8 0x00000400 + WaitForSomething2 0x00000200 + SetEntityNonPlanarMovement 0x0300 + _0807EF80 0x000f + _0807EDD4 0x0208, 0x02b0 + _0807E5F8 0x00000400 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index 6085dce3..c27c42af 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -1,30 +1,30 @@ SCRIPT_START script_0800CB54 -StartScript -_0807EF80 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000f -Call sub_0807F338 -StopScript -WaitForSomething2 0x00000800 -_0807EF80 0x0007 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EDD4 0x01a8, 0x0330 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000f -_0807EDD4 0x01f8, 0x0348 -_0807EF80 0x0000 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -SetEntityNonPlanarMovement 0x0300 -_0807EF80 0x000f -_0807EDD4 0x0178, 0x0328 -_0807E5F8 0x00001000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000f + Call sub_0807F338 + StopScript + WaitForSomething2 0x00000800 + _0807EF80 0x0007 + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807EDD4 0x01a8, 0x0330 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000f + _0807EDD4 0x01f8, 0x0348 + _0807EF80 0x0000 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + SetEntityNonPlanarMovement 0x0300 + _0807EF80 0x000f + _0807EDD4 0x0178, 0x0328 + _0807E5F8 0x00001000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 0c81901b..474c6c95 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -1,34 +1,34 @@ SCRIPT_START script_0800CBD4 -StartScript -_0807EF80 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000f -Call sub_0807F338 -StopScript -WaitForSomething2 0x00002000 -_0807EF80 0x0007 -_0807EDD4 0x0258, 0x0330 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000f -_0807EDD4 0x0218, 0x0340 -_0807EF80 0x0000 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -SetEntityNonPlanarMovement 0x0300 -_0807EF80 0x000f -_0807EDD4 0x0288, 0x02d8 -_0807E5F8 0x00004000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000f + Call sub_0807F338 + StopScript + WaitForSomething2 0x00002000 + _0807EF80 0x0007 + _0807EDD4 0x0258, 0x0330 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000f + _0807EDD4 0x0218, 0x0340 + _0807EF80 0x0000 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + SetEntityNonPlanarMovement 0x0300 + _0807EF80 0x000f + _0807EDD4 0x0288, 0x02d8 + _0807E5F8 0x00004000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index 86c9feb5..319b7d51 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -1,34 +1,34 @@ SCRIPT_START script_0800CC6C -StartScript -_0807EF80 0x0008 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000f -Call sub_0807F338 -StopScript -WaitForSomething2 0x00008000 -_0807EF80 0x0007 -_0807EDD4 0x01b8, 0x0320 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000f -_0807EDD4 0x01f8, 0x0330 -_0807EF80 0x0000 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -SetEntityNonPlanarMovement 0x0300 -_0807EF80 0x000f -_0807EDD4 0x0188, 0x02d8 -_0807E5F8 0x00010000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EF80 0x0000 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000f + Call sub_0807F338 + StopScript + WaitForSomething2 0x00008000 + _0807EF80 0x0007 + _0807EDD4 0x01b8, 0x0320 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000f + _0807EDD4 0x01f8, 0x0330 + _0807EF80 0x0000 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + SetEntityNonPlanarMovement 0x0300 + _0807EF80 0x000f + _0807EDD4 0x0188, 0x02d8 + _0807E5F8 0x00010000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index 7f1351a9..e5e1a880 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -1,28 +1,28 @@ SCRIPT_START script_0800CD04 -StartScript -_0807EF80 0x0000 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000f -Call sub_0807F338 -StopScript -WaitForSomething2 0x00020000 -_0807EF80 0x0007 -_0807EDD4 0x0268, 0x0338 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000f -_0807EDD4 0x0218, 0x0350 -_0807EF80 0x0000 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -SetEntityNonPlanarMovement 0x0300 -_0807EF80 0x000f -_0807EDD4 0x02a8, 0x0328 -_0807E5F8 0x00040000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0000 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000f + Call sub_0807F338 + StopScript + WaitForSomething2 0x00020000 + _0807EF80 0x0007 + _0807EDD4 0x0268, 0x0338 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000f + _0807EDD4 0x0218, 0x0350 + _0807EF80 0x0000 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + SetEntityNonPlanarMovement 0x0300 + _0807EF80 0x000f + _0807EDD4 0x02a8, 0x0328 + _0807E5F8 0x00040000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index 19923a89..9f05e3e9 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -1,266 +1,293 @@ SCRIPT_START script_0800CD7C -StartScript -CheckInventory1 0x005b -JumpIfNot 0xf87a -Call sub_08060090 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000c -Call sub_08060158 -Jump 0xffee -StopScript -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x009d -JumpIf 0x000e -SetLocalFlag 0x009d -TextboxNoOverlap 0x213d -Jump 0x017e -CheckGlobalFlag 0x003b -JumpIf 0x007c -CheckGlobalFlag 0x0054 -JumpIfNot 0x001a -CheckRoomFlag 0x0000 -JumpIfNot 0x0150 -SetGlobalFlag 0x003b -ClearGlobalFlag 0x0054 -TextboxNoOverlap 0x2141 -Jump 0x0156 -TextboxNoOverlap 0x213e -_0807EA94 -_0807E48C 0x0023 -JumpIfNot 0x001c -TextboxNoOverlap 0x214b -_0807EA94 -_0807E3E8 -JumpIfNot 0x013c -SoundReq 0x00cd -_0807F088 0x0023 -WaitPlayerAction8 -Jump 0x0020 -_0807E48C 0x0022 -JumpIfNot 0x0126 -TextboxNoOverlap 0x214b -_0807EA94 -_0807E3E8 -JumpIfNot 0x011a -SoundReq 0x00cd -_0807F088 0x0022 -WaitPlayerAction8 -_0807EB8C -SetGlobalFlag 0x0054 -Call sub_08060340 -TextboxNoOverlap 0x213f -Jump 0x00be -CheckGlobalFlag 0x003c -JumpIf 0x005a -CheckGlobalFlag 0x0054 -JumpIfNot 0x001a -CheckRoomFlag 0x0000 -JumpIfNot 0x00ce -SetGlobalFlag 0x003c -ClearGlobalFlag 0x0054 -TextboxNoOverlap 0x2145 -Jump 0x00d4 -TextboxNoOverlap 0x2142 -_0807EA94 -_0807E48C 0x0027 -JumpIfNot 0x00c6 -TextboxNoOverlap 0x214c -_0807EA94 -_0807E3E8 -JumpIfNot 0x00ba -SoundReq 0x00cd -_0807F088 0x0027 -WaitPlayerAction8 -_0807EB8C -SetGlobalFlag 0x0054 -Call sub_08060340 -TextboxNoOverlap 0x2143 -Jump 0x005e -CheckGlobalFlag 0x003d -JumpIf 0x0090 -CheckGlobalFlag 0x0054 -JumpIfNot 0x001a -CheckRoomFlag 0x0000 -JumpIfNot 0x006e -SetGlobalFlag 0x003d -ClearGlobalFlag 0x0054 -TextboxNoOverlap 0x2149 -Jump 0x0074 -TextboxNoOverlap 0x2146 -_0807EA94 -_0807E48C 0x0024 -JumpIfNot 0x0066 -TextboxNoOverlap 0x214d -_0807EA94 -_0807E3E8 -JumpIfNot 0x005a -SoundReq 0x00cd -_0807F088 0x0024 -WaitPlayerAction8 -_0807EB8C -SetGlobalFlag 0x0054 -Call sub_08060340 -TextboxNoOverlap 0x2147 -_0807EA94 -Call sub_0807DF50 -_0807E878 -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000c -Call sub_08060158 -Jump 0xffee -StopScript -_0807E864 -Call sub_0807DF28 -TextboxNoOverlap 0x2140 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffd2 -TextboxNoOverlap 0x214a -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xfe46 -.short 0x0000 -StartScript -Call sub_08068104 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806811C -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd8 -StartScript -Call sub_08068104 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffec -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -CheckInventory1 0x0041 -JumpIf 0x000e -CheckLocalFlag 0x007e -JumpIfNot 0x0006 -_0807E930 0x0008 -CheckInventory1 0x0002 -JumpIf 0x0022 -CheckInventory1 0x0041 -JumpIfNot 0x000c -_0807E5F8 0x00000020 -Jump 0x0010 -CheckLocalFlag 0x007e -JumpIfNot 0x0008 -_0807E5F8 0x00000010 -StopScript -StartScript -Call sub_08068910 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -Call sub_0807DF28 -CheckInventory1 0x0002 -JumpIfNot 0x0018 -_0807EB74 -_0807E914 0x00000000 -Call sub_0806C028 -TextboxNoOverlap 0x1219 -Jump 0x014c -CheckInventory1 0x0041 -JumpIfNot 0x0060 -StartPlayerScript script_0800D190 -WaitForSomething2 0x00000008 -_0807EB74 -_0807E914 0x00000000 -Call sub_0806C028 -TextboxNoOverlapFollowPos 0x0002125c -_0807EA94 -StartPlayerScript script_0800D1B4 -WaitForSomething2 0x00000008 -_0807EB44 0x0002 -_0807E914 0x00000000 -Call sub_0806C028 -Wait 0x000f -_0807E5F8 0x00000020 -StartPlayerScript script_0800D1E0 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos 0x0002125d -Jump 0x00e6 -CheckLocalFlag 0x007e -JumpIfNot 0x000a -TextboxNoOverlapFollow 0x123e -Jump 0x00d6 -StartPlayerScript script_0800D190 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000004 -_0807EB74 -_0807E914 0x00000000 -Call sub_0806C028 -TextboxNoOverlapFollowPos 0x0002123d -_0807EA94 -StartPlayerScript script_0800D1B4 -WaitForSomething2 0x00000008 -_0807EB44 0x0002 -_0807E914 0x00000000 -Call sub_0806C028 -SoundReq 0x00cd -Call sub_08068964 -ComparePlayerAction 0x0008 -JumpIf 0xfffa -SoundReq 0x00f8 -_0807E5F8 0x00000010 -SetLocalFlag 0x007e -TextboxNoOverlapFollowPos 0x0002123e -_0807EA94 -Wait 0x000f -_0807E930 0x0009 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Wait 0x001e -TextboxNoOverlapFollowPos 0x0002123f -_0807EA94 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000004 -_0807E930 0x0008 -Wait 0x003c -Call sub_08095164 -_0807EB28 0x1240 -_0807EA94 -Wait 0x000f -_0807E878 -Call sub_0807DF50 -Jump 0xfe6e -.short 0x0000 + StartScript + CheckInventory1 0x005b + JumpIfNot script_0800C5FE + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800CD92: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800CDA6 + Call sub_08060158 + Jump script_0800CD92 +script_0800CDA6: + StopScript + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x009d + JumpIf script_0800CDC4 + SetLocalFlag 0x009d + TextboxNoOverlap 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 + TextboxNoOverlap 0x2141 + Jump script_0800CF40 +script_0800CDEC: + TextboxNoOverlap 0x213e + _0807EA94 + _0807E48C 0x0023 + JumpIfNot script_0800CE14 + TextboxNoOverlap 0x214b + _0807EA94 + _0807E3E8 + JumpIfNot script_0800CF40 + SoundReq 0x00cd + _0807F088 0x0023 + WaitPlayerAction8 + Jump script_0800CE32 +script_0800CE14: + _0807E48C 0x0022 + JumpIfNot script_0800CF40 + TextboxNoOverlap 0x214b + _0807EA94 + _0807E3E8 + JumpIfNot script_0800CF40 + SoundReq 0x00cd + _0807F088 0x0022 + WaitPlayerAction8 +script_0800CE32: + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + TextboxNoOverlap 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 + TextboxNoOverlap 0x2145 + Jump script_0800CF40 +script_0800CE6E: + TextboxNoOverlap 0x2142 + _0807EA94 + _0807E48C 0x0027 + JumpIfNot script_0800CF40 + TextboxNoOverlap 0x214c + _0807EA94 + _0807E3E8 + JumpIfNot script_0800CF40 + SoundReq 0x00cd + _0807F088 0x0027 + WaitPlayerAction8 + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + TextboxNoOverlap 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 + TextboxNoOverlap 0x2149 + Jump script_0800CF40 +script_0800CECE: + TextboxNoOverlap 0x2146 + _0807EA94 + _0807E48C 0x0024 + JumpIfNot script_0800CF40 + TextboxNoOverlap 0x214d + _0807EA94 + _0807E3E8 + JumpIfNot script_0800CF40 + SoundReq 0x00cd + _0807F088 0x0024 + WaitPlayerAction8 + _0807EB8C + SetGlobalFlag 0x0054 + Call sub_08060340 + TextboxNoOverlap 0x2147 +script_0800CF02: + _0807EA94 + Call sub_0807DF50 + _0807E878 +script_0800CF0C: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800CF20 + Call sub_08060158 + Jump script_0800CF0C +script_0800CF20: + StopScript + _0807E864 + Call sub_0807DF28 +script_0800CF2A: + TextboxNoOverlap 0x2140 + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_0800CF0C +script_0800CF3C: + TextboxNoOverlap 0x214a +script_0800CF40: + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_0800CD92 + .short 0x0000 + StartScript + Call sub_08068104 + _0807EF80 0x000a + StopScript +script_0800CF5E: + StartScript + CheckEntityInteractType + JumpIf script_0800CF72 + Call sub_0806811C + StopScript + Jump script_0800CF5E +script_0800CF72: + StopScript + _0807E864 + Call sub_08068190 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800CF5E + StartScript + Call sub_08068104 + _0807EF80 0x000a + StopScript +script_0800CF96: + _0807E944 + _0807E864 + Call sub_08068190 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800CF96 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript + 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: + StopScript + StartScript + Call sub_08068910 + CheckEntityInteractType + JumpIfNot script_0800CFFA + StopScript + _0807E864 + Call sub_0807DF28 + CheckInventory1 0x0002 + JumpIfNot script_0800D032 + _0807EB74 + _0807E914 0x00000000 + Call sub_0806C028 + TextboxNoOverlap 0x1219 + Jump script_0800D17C +script_0800D032: + CheckInventory1 0x0041 + JumpIfNot script_0800D098 + StartPlayerScript script_0800D190 + WaitForSomething2 0x00000008 + _0807EB74 + _0807E914 0x00000000 + Call sub_0806C028 + TextboxNoOverlapFollowPos 0x0002125c + _0807EA94 + StartPlayerScript script_0800D1B4 + WaitForSomething2 0x00000008 + _0807EB44 0x0002 + _0807E914 0x00000000 + Call sub_0806C028 + Wait 0x000f + _0807E5F8 0x00000020 + StartPlayerScript script_0800D1E0 + WaitForSomething2 0x00000008 + TextboxNoOverlapFollowPos 0x0002125d + Jump script_0800D17C +script_0800D098: + CheckLocalFlag 0x007e + JumpIfNot script_0800D0A8 + TextboxNoOverlapFollow 0x123e + Jump script_0800D17C +script_0800D0A8: + StartPlayerScript script_0800D190 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000004 + _0807EB74 + _0807E914 0x00000000 + Call sub_0806C028 + TextboxNoOverlapFollowPos 0x0002123d + _0807EA94 + StartPlayerScript script_0800D1B4 + WaitForSomething2 0x00000008 + _0807EB44 0x0002 + _0807E914 0x00000000 + Call sub_0806C028 + SoundReq 0x00cd + Call sub_08068964 +script_0800D108: + ComparePlayerAction 0x0008 + JumpIf script_0800D108 + SoundReq 0x00f8 + _0807E5F8 0x00000010 + SetLocalFlag 0x007e + TextboxNoOverlapFollowPos 0x0002123e + _0807EA94 + Wait 0x000f + _0807E930 0x0009 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + Wait 0x001e + TextboxNoOverlapFollowPos 0x0002123f + _0807EA94 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000004 + _0807E930 0x0008 + Wait 0x003c + Call sub_08095164 + _0807EB28 0x1240 +script_0800D17C: + _0807EA94 + Wait 0x000f + _0807E878 + Call sub_0807DF50 + Jump script_0800CFFA + .short 0x0000 diff --git a/data/scripts/script_0800D190.inc b/data/scripts/script_0800D190.inc index 0e499a60..5732aec5 100644 --- a/data/scripts/script_0800D190.inc +++ b/data/scripts/script_0800D190.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800D190 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0170, 0x0140 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0170, 0x0140 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 04fcc46d..6cdc8b0a 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800D1B4 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0170, 0x0120 -_0807EDD4 0x01a8, 0x0120 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0170, 0x0120 + _0807EDD4 0x01a8, 0x0120 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D1E0.inc b/data/scripts/script_0800D1E0.inc index 94c352f3..2ff93e40 100644 --- a/data/scripts/script_0800D1E0.inc +++ b/data/scripts/script_0800D1E0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D1E0 -_0807F078 0x0002, 0x0001 -CallWithArg sub_0807F918, 0x00000002 -SoundReq 0x0109 -CallWithArg sub_0807F238, 0x000001e2 -Call sub_0807F304 -TextboxNoOverlap 0x0502 -_0807EA94 -_0807E5F8 0x00000008 -Call sub_080791BC + _0807F078 0x0002, 0x0001 + CallWithArg sub_0807F918, 0x00000002 + SoundReq 0x0109 + CallWithArg sub_0807F238, 0x000001e2 + Call sub_0807F304 + TextboxNoOverlap 0x0502 + _0807EA94 + _0807E5F8 0x00000008 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D218.inc b/data/scripts/script_0800D218.inc index 573f8fc9..eff7f8f0 100644 --- a/data/scripts/script_0800D218.inc +++ b/data/scripts/script_0800D218.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800D218 -StartScript -CheckInventory1 0x0041 -JumpIf 0x002c -CheckLocalFlag 0x007e -JumpIf 0x001a -_0807EF80 0x0008 -StopScript -WaitForSomething2 0x00000010 -_0807EF80 0x0007 -WaitForSomething2 0x00000010 + StartScript + CheckInventory1 0x0041 + JumpIf script_0800D24C + CheckLocalFlag 0x007e + JumpIf script_0800D242 + _0807EF80 0x0008 + StopScript + WaitForSomething2 0x00000010 + _0807EF80 0x0007 + WaitForSomething2 0x00000010 SCRIPT_END diff --git a/data/scripts/script_0800D242.inc b/data/scripts/script_0800D242.inc index 5cede490..6dd2aa01 100644 --- a/data/scripts/script_0800D242.inc +++ b/data/scripts/script_0800D242.inc @@ -1,4 +1,5 @@ SCRIPT_START script_0800D242 -_0807EF80 0x0007 -_0807E930 0x0003 +script_0800D242: + _0807EF80 0x0007 + _0807E930 0x0003 SCRIPT_END diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc index 7a7abd8e..d9304479 100644 --- a/data/scripts/script_0800D24C.inc +++ b/data/scripts/script_0800D24C.inc @@ -1,4 +1,5 @@ SCRIPT_START script_0800D24C -_0807EF80 0x0006 +script_0800D24C: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index 34b1b5ee..a10af6f6 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D254 -StartScript -_0807EF80 0x0008 -StopScript -WaitForSomething2 0x00000020 -_0807EF80 0x0007 -WaitForSomething2 0x00000020 -_0807EF80 0x0008 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + StopScript + WaitForSomething2 0x00000020 + _0807EF80 0x0007 + WaitForSomething2 0x00000020 + _0807EF80 0x0008 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index 17624e5e..d72f4220 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -1,100 +1,111 @@ SCRIPT_START script_0800D278 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckInventory1 0x0041 -JumpIf 0x000a -CheckLocalFlag 0x007e -JumpIf 0x005a -StartScript -TestBit 0x00000001 -JumpIf 0x002a -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806811C -StopScript -Jump 0xffd4 -StopScript -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffbe -StopScript -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807E5F8 0x00000004 -_0807E930 0x000c -WaitForSomething2 0x00000001 -_0807E5F8 0x00000004 -_0807E930 0x000b -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -StartScript -Call sub_08068884 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -StopScript -StartScript -Call sub_08068910 -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -_0807EB74 -_0807E914 0x00000000 -Call sub_0806C028 -TextboxNoOverlapFollow 0x1219 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd0 -StartScript -Call sub_08068104 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806811C -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_08068190 -_0807EA94 -Wait 0x000f -CheckLocalFlag 0x007f -JumpIf 0x005c -CheckLocalFlag 0x007e -JumpIfNot 0x0054 -_0807EF80 0x000b -SetEntityNonPlanarMovement 0x0100 -CheckPlayerInRegion 0x0090, 0x0130, 0x0810 -JumpIfNot 0x000e -StartPlayerScript script_0800D3EC -WaitForSomething2 0x00000001 -_0807EB44 0x0002 -_0807E930 0x0005 -_0807EDD4 0x00a0, 0x0130 -_0807EB44 0x0006 -_0807E930 0x0003 -_0807E914 0x00000004 -Call sub_080681D8 -SoundReq 0x00cd -Wait 0x001e -_0807EF80 0x000a -SetLocalFlag 0x007f -_0807E878 -Jump 0xff76 -.short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + StopScript +script_0800D282: + CheckInventory1 0x0041 + JumpIf script_0800D292 + CheckLocalFlag 0x007e + JumpIf script_0800D2EA +script_0800D292: + StartScript + TestBit 0x00000001 + JumpIf script_0800D2C6 + CheckEntityInteractType + JumpIf script_0800D2B0 + Call sub_0806811C + StopScript + Jump script_0800D282 +script_0800D2B0: + StopScript + _0807E864 + Call sub_08068190 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800D282 +script_0800D2C6: + StopScript + _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 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800D2EE + StartScript + Call sub_08068884 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript +script_0800D31E: + StopScript + StartScript + Call sub_08068910 + CheckEntityInteractType + JumpIfNot script_0800D31E + StopScript + _0807E864 + _0807EB74 + _0807E914 0x00000000 + Call sub_0806C028 + TextboxNoOverlapFollow 0x1219 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800D31E + StartScript + Call sub_08068104 + _0807EF80 0x000a + StopScript +script_0800D35E: + StartScript + CheckEntityInteractType + JumpIf script_0800D372 + Call sub_0806811C + StopScript + Jump script_0800D35E +script_0800D372: + StopScript + _0807E864 + Call sub_08068190 + _0807EA94 + Wait 0x000f + CheckLocalFlag 0x007f + JumpIf script_0800D3E4 + CheckLocalFlag 0x007e + JumpIfNot script_0800D3E4 + _0807EF80 0x000b + SetEntityNonPlanarMovement 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 + _0807E914 0x00000004 + Call sub_080681D8 + SoundReq 0x00cd + Wait 0x001e + _0807EF80 0x000a + SetLocalFlag 0x007f +script_0800D3E4: + _0807E878 + Jump script_0800D35E + .short 0x0000 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index 43bde4e8..4977889d 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800D3EC -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x000d -_0807ECC4 0x0020 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807EF80 0x000d + _0807ECC4 0x0020 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index db5e8a68..00327d2a 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -1,140 +1,161 @@ SCRIPT_START script_0800D414 -StartScript -SetEntityNonPlanarMovement 0x0100 -Call sub_08068104 -_0807EF80 0x000a -StopScript -_0807EB44 0x0002 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0006 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0006 -_0807E914 0x00000004 -Call sub_0806AF60 -_0807EDD4 0x00a8, 0x01e8 -_0807EB44 0x0006 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0004 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0002 -_0807E914 0x00000000 -Call sub_0806AF60 -Wait 0x0014 -_0807EB44 0x0002 -_0807E914 0x00000004 -Call sub_0806AF60 -_0807EDD4 0x0228, 0x01e8 -Jump 0xff5a -.short 0x0000 -StartScript -_0807EF80 0x000a -Call sub_08062A48 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -Call sub_08062698 -Call sub_080626AC -CallWithArg sub_0807F0EC, 0x00000009 -_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052 -_0807EE04 0x0038, 0x0068 -Jump 0x004e -_0807EE04 0x0078, 0x0068 -Jump 0x0044 -_0807EE04 0x00b8, 0x0068 -Jump 0x003a -_0807EE04 0x0038, 0x0090 -Jump 0x0030 -_0807EE04 0x0078, 0x0090 -Jump 0x0026 -_0807EE04 0x00b8, 0x0090 -Jump 0x001c -_0807EE04 0x0038, 0x00b8 -Jump 0x0012 -_0807EE04 0x0078, 0x00b8 -Jump 0x0008 -_0807EE04 0x00b8, 0x00b8 -StopScript -StartScript -Call sub_080626C0 -JumpIf 0xff72 -CheckEntityInteractType -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffe8 -Jump 0xff62 -StopScript -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xff4a -StartScript -_0807EF80 0x000a -Call sub_08062A48 -_0807EF80 0x0000 -StopScript -Call sub_08062698 -Call sub_080626AC -CallWithArg sub_0807F0EC, 0x00000004 -_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x0020 -_0807EE04 0x0038, 0x0098 -Jump 0x001c -_0807EE04 0x0058, 0x0098 -Jump 0x0012 -_0807EE04 0x0038, 0x00c8 -Jump 0x0008 -_0807EE04 0x0058, 0x00c8 -StopScript -StartScript -Call sub_080626C0 -JumpIf 0xffae -_0807EE30 -JumpIfNot 0xffee -Jump 0xffa4 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x000b -_0807EF80 0x0008 -Call sub_0806DAAC -JumpIf 0x008c -Call sub_0806DAD0 -CallWithArg sub_0806DA04, 0x00000002 -StopScript -_0807EA4C -_0807E9F0 -Call sub_0806DAAC -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -_0807E864 -Call sub_0807DF28 -Call sub_0807FBC4 -Call sub_0807FBA0 -SetEntityNonPlanarMovement 0x0700 -_0807F0B4 0x0007 -CameraTargetEntity -_0807EDD4 0x01e8, 0x01b8 -Wait 0x003c -Call sub_0806DAE8 -Wait 0x0078 -Call sub_0806DB44 -JumpIfNot 0x000e -LoadRoomEntityList gUnk_080DD730 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0100 + Call sub_08068104 + _0807EF80 0x000a + StopScript +script_0800D426: + _0807EB44 0x0002 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0004 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0006 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0006 + _0807E914 0x00000004 + Call sub_0806AF60 + _0807EDD4 0x00a8, 0x01e8 + _0807EB44 0x0006 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0004 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0002 + _0807E914 0x00000000 + Call sub_0806AF60 + Wait 0x0014 + _0807EB44 0x0002 + _0807E914 0x00000004 + Call sub_0806AF60 + _0807EDD4 0x0228, 0x01e8 + Jump script_0800D426 + .short 0x0000 + StartScript + _0807EF80 0x000a + Call sub_08062A48 + _0807EB44 0x0004 + _0807EF80 0x0000 +script_0800D4E4: + StopScript + Call sub_08062698 + Call sub_080626AC + CallWithArg sub_0807F0EC, 0x00000009 + JumpSwitch_9 script_0800D510, script_0800D51A, script_0800D524, script_0800D52E, script_0800D538, script_0800D542, script_0800D54C, script_0800D556, script_0800D560 +script_0800D510: + _0807EE04 0x0038, 0x0068 + Jump script_0800D566 +script_0800D51A: + _0807EE04 0x0078, 0x0068 + Jump script_0800D566 +script_0800D524: + _0807EE04 0x00b8, 0x0068 + Jump script_0800D566 +script_0800D52E: + _0807EE04 0x0038, 0x0090 + Jump script_0800D566 +script_0800D538: + _0807EE04 0x0078, 0x0090 + Jump script_0800D566 +script_0800D542: + _0807EE04 0x00b8, 0x0090 + Jump script_0800D566 +script_0800D54C: + _0807EE04 0x0038, 0x00b8 + Jump script_0800D566 +script_0800D556: + _0807EE04 0x0078, 0x00b8 + Jump script_0800D566 +script_0800D560: + _0807EE04 0x00b8, 0x00b8 +script_0800D566: + StopScript + StartScript + Call sub_080626C0 + JumpIf script_0800D4E4 + CheckEntityInteractType + JumpIf script_0800D584 + _0807EE30 + JumpIfNot script_0800D566 + Jump script_0800D4E4 +script_0800D584: + StopScript + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800D4E4 + StartScript + _0807EF80 0x000a + Call sub_08062A48 + _0807EF80 0x0000 +script_0800D5AC: + StopScript + Call sub_08062698 + Call sub_080626AC + CallWithArg sub_0807F0EC, 0x00000004 + JumpSwitch_4 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: + StopScript + StartScript + Call sub_080626C0 + JumpIf script_0800D5AC + _0807EE30 + JumpIfNot script_0800D5F2 + Jump script_0800D5AC + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x000b + _0807EF80 0x0008 + Call sub_0806DAAC + JumpIf script_0800D6AE + Call sub_0806DAD0 + CallWithArg sub_0806DA04, 0x00000002 + StopScript +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 + SetEntityNonPlanarMovement 0x0700 + _0807F0B4 0x0007 + CameraTargetEntity + _0807EDD4 0x01e8, 0x01b8 + Wait 0x003c + Call sub_0806DAE8 + Wait 0x0078 + Call sub_0806DB44 + JumpIfNot script_0800D698 + LoadRoomEntityList gUnk_080DD730 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D698.inc b/data/scripts/script_0800D698.inc index 4164ea12..3326499e 100644 --- a/data/scripts/script_0800D698.inc +++ b/data/scripts/script_0800D698.inc @@ -1,9 +1,11 @@ SCRIPT_START script_0800D698 -_0807EEB4 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807FBCC -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 +script_0800D698: + _0807EEB4 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807FBCC + _0807E878 + Call sub_0807DF50 +script_0800D6AE: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index 3752c921..d34c14ff 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800D6B4 -StartScript -_0807EF80 0x0007 -_0807EF80 0x0011 -Call sub_0807F158 -Call sub_0807F738 -StopScript + StartScript + _0807EF80 0x0007 + _0807EF80 0x0011 + Call sub_0807F158 + Call sub_0807F738 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 59addb72..03706d7b 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -1,11 +1,13 @@ SCRIPT_START script_0800D6D0 -StartScript -CheckLocalFlag 0x00f3 -JumpIf 0x0010 -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x00f3 -JumpIfNot 0xfffa -_0807EF80 0x0007 + StartScript + CheckLocalFlag 0x00f3 + JumpIf script_0800D6E8 + _0807EF80 0x0008 + StopScript +script_0800D6E0: + CheckLocalFlag 0x00f3 + JumpIfNot script_0800D6E0 +script_0800D6E8: + _0807EF80 0x0007 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index a7d79528..796f0c6c 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -1,11 +1,12 @@ SCRIPT_START script_0800D6F0 -StartScript -CheckLocalFlag 0x00f5 -JumpIf 0xfff0 -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x00f5 -JumpIfNot 0xfffa -_0807EF80 0x0007 + StartScript + CheckLocalFlag 0x00f5 + JumpIf script_0800D6E8 + _0807EF80 0x0008 + StopScript +script_0800D700: + CheckLocalFlag 0x00f5 + JumpIfNot script_0800D700 + _0807EF80 0x0007 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index 1340fbcc..657cb9b1 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -1,23 +1,23 @@ SCRIPT_START script_0800D710 -StartScript -Call sub_0807F360 -SetEntityNonPlanarMovement 0x0700 -_0807F0B4 0x0007 -CameraTargetEntity -Call sub_0807FBC4 -StopScript -_0807E5F8 0x00000008 -WaitForSomething2 0x00000010 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E5F8 0x0000000a -WaitForSomething2 0x00000004 -_0807EEB4 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807FBCC -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 + StartScript + Call sub_0807F360 + SetEntityNonPlanarMovement 0x0700 + _0807F0B4 0x0007 + CameraTargetEntity + Call sub_0807FBC4 + StopScript + _0807E5F8 0x00000008 + WaitForSomething2 0x00000010 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E5F8 0x0000000a + WaitForSomething2 0x00000004 + _0807EEB4 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807FBCC + _0807E878 + Call sub_0807DF50 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index d4bb04a7..b7eb9079 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -1,48 +1,50 @@ SCRIPT_START script_0800D76C -StartScript -Call sub_0807F360 -_0807EF80 0x000b -SetEntityNonPlanarMovement 0x0200 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000008 -_0807EF80 0x0004 -Wait 0x003c -SoundReq 0x0123 -CallWithArg sub_0807F464, 0x000001e0 -_0807EDD4 0x01e0, 0x01d8 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000010 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -SoundReq 0x007c -_0807EF3C 0x0180, 0x0030 -_0807EB44 0x0002 -_0807EF80 0x0001 -WaitForSomething2 0x00000008 -Jump 0x0032 -StartScript -Call sub_0807F360 -_0807EF80 0x000b -SetEntityPositionRelative 0x01d80268 -SetEntityNonPlanarMovement 0x0100 -StopScript -WaitForSomething2 0x00000002 -_0807EDD4 0x01f0, 0x01d8 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0xffe0 -_0807EF80 0x000e -Call sub_0806CA5C -SetEntity0x20 0x00040000 -SoundReq 0x00f5 -CallWithArg sub_0807F8D0, 0xffffe000 -Call sub_0807F8BC -JumpIf 0xffee -_0807E5F8 0x00000004 -_0807EF80 0x0006 + StartScript + Call sub_0807F360 + _0807EF80 0x000b + SetEntityNonPlanarMovement 0x0200 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000008 + _0807EF80 0x0004 + Wait 0x003c + SoundReq 0x0123 + CallWithArg sub_0807F464, 0x000001e0 + _0807EDD4 0x01e0, 0x01d8 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000010 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + SoundReq 0x007c + _0807EF3C 0x0180, 0x0030 + _0807EB44 0x0002 + _0807EF80 0x0001 + WaitForSomething2 0x00000008 + Jump script_0800D80C + StartScript + Call sub_0807F360 + _0807EF80 0x000b + SetEntityPositionRelative 0x01d80268 + SetEntityNonPlanarMovement 0x0100 + StopScript + WaitForSomething2 0x00000002 + _0807EDD4 0x01f0, 0x01d8 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 +script_0800D80C: + SetEntityNonPlanarMovement 0x0100 + _0807EEF4 0x0000, 0xffe0 + _0807EF80 0x000e + Call sub_0806CA5C + SetEntity0x20 0x00040000 + SoundReq 0x00f5 +script_0800D82A: + CallWithArg sub_0807F8D0, 0xffffe000 + Call sub_0807F8BC + JumpIf script_0800D82A + _0807E5F8 0x00000004 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index bb06e896..b4f2becc 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -1,13 +1,14 @@ SCRIPT_START script_0800D84C -StartScript -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807DF28 -Wait 0x003c -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + StopScript +script_0800D850: + CheckRoomFlag 0x0000 + JumpIfNot script_0800D850 + _0807E864 + Call sub_0807DF28 + Wait 0x003c + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index e569da45..0de3e444 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -1,49 +1,55 @@ SCRIPT_START script_0800D874 -StartScript -Call sub_0807F934 -_0807EF80 0x0008 -_0807E914 0x00000001 -Call sub_0806DA04 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x0045 -JumpIf 0x000e -StartPlayerScript script_0800D92C -WaitForSomething2 0x00000001 -_0807E8E4_0 -TextboxNoOverlap 0x1324 -_0807EA94 -CheckInventory1 0x0017 -JumpIf 0x0018 -CheckLocalFlag 0x0045 -JumpIf 0x0010 -LoadRoomEntityList gUnk_080E3830 -CheckLocalFlag 0x0045 -JumpIfNot 0xfffa -Call sub_0807DF50 -_0807E878 -Jump 0xffae -.short 0x0000 -StartScript -_0807EF80 0x0008 -CheckInventory1 0x0017 -JumpIf 0x0034 -StopScript -CheckInventory1 0x0017 -JumpIfNot 0xfffa -Call sub_0807DF28 -_0807E864 -WaitPlayerAction8 -_0807EB28 0x1325 -_0807EA94 -SoundReq 0x0113 -_0807E914 0x00000000 -Call sub_0806DA1C -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 + StartScript + Call sub_0807F934 + _0807EF80 0x0008 + _0807E914 0x00000001 + Call sub_0806DA04 + StopScript +script_0800D88E: + CheckEntityInteractType + JumpIfNot script_0800D88E + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x0045 + JumpIf script_0800D8B0 + StartPlayerScript script_0800D92C + WaitForSomething2 0x00000001 +script_0800D8B0: + _0807E8E4_0 + TextboxNoOverlap 0x1324 + _0807EA94 + CheckInventory1 0x0017 + JumpIf script_0800D8D6 + CheckLocalFlag 0x0045 + JumpIf script_0800D8D6 + LoadRoomEntityList gUnk_080E3830 +script_0800D8CE: + CheckLocalFlag 0x0045 + JumpIfNot script_0800D8CE +script_0800D8D6: + Call sub_0807DF50 + _0807E878 + Jump script_0800D88E + .short 0x0000 + StartScript + _0807EF80 0x0008 + CheckInventory1 0x0017 + JumpIf script_0800D924 + StopScript +script_0800D8F4: + CheckInventory1 0x0017 + JumpIfNot script_0800D8F4 + Call sub_0807DF28 + _0807E864 + WaitPlayerAction8 + _0807EB28 0x1325 + _0807EA94 + SoundReq 0x0113 + _0807E914 0x00000000 + Call sub_0806DA1C + _0807E878 + Call sub_0807DF50 +script_0800D924: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800D92C.inc b/data/scripts/script_0800D92C.inc index a806a09f..e87da7d3 100644 --- a/data/scripts/script_0800D92C.inc +++ b/data/scripts/script_0800D92C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800D92C -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x00a0, 0x0078 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x00a0, 0x0078 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index a77a8092..40de08ce 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -1,41 +1,42 @@ SCRIPT_START script_0800D954 -StartScript -_0807EF80 0x0008 -Call sub_0807F180 -StopScript -CheckPlayerInRegion 0x0118, 0x0038, 0x3050 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_0800DA00 -WaitForSomething2 0x00000001 -Wait 0x003c -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x0007 -SoundReq 0x01ce -SetEntity0x20 0xffff8000 -TextboxNoOverlap 0x1701 -_0807EA94 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -TextboxNoOverlap 0x1702 -_0807EA94 -SetEntity0x20 0x00010000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807F050 0x006d -WaitPlayerAction8 -_0807EB28 0x1703 -_0807EA94 -Wait 0x003c -SetLocalFlag 0x0032 -SoundReq 0x0113 -_0807E914 0x00000001 -Call sub_0806DA1C -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + Call sub_0807F180 + StopScript +script_0800D962: + CheckPlayerInRegion 0x0118, 0x0038, 0x3050 + JumpIfNot script_0800D962 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_0800DA00 + WaitForSomething2 0x00000001 + Wait 0x003c + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x0007 + SoundReq 0x01ce + SetEntity0x20 0xffff8000 + TextboxNoOverlap 0x1701 + _0807EA94 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + TextboxNoOverlap 0x1702 + _0807EA94 + SetEntity0x20 0x00010000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807F050 0x006d + WaitPlayerAction8 + _0807EB28 0x1703 + _0807EA94 + Wait 0x003c + SetLocalFlag 0x0032 + SoundReq 0x0113 + _0807E914 0x00000001 + Call sub_0806DA1C + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DA00.inc b/data/scripts/script_0800DA00.inc index 564c1eb7..33601801 100644 --- a/data/scripts/script_0800DA00.inc +++ b/data/scripts/script_0800DA00.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800DA00 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0118, 0x0060 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0118, 0x0060 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DA28.inc b/data/scripts/script_0800DA28.inc index 8fdc555e..8c30c6b2 100644 --- a/data/scripts/script_0800DA28.inc +++ b/data/scripts/script_0800DA28.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DA28 -StartScript -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -StopScript -WaitForSomething2 0x00000004 -_0807EF80 0x0007 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807EDD4 0x0118, 0x0060 -_0807E5F8 0x00000002 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + StopScript + WaitForSomething2 0x00000004 + _0807EF80 0x0007 + Wait 0x003c + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807EDD4 0x0118, 0x0060 + _0807E5F8 0x00000002 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 9fc90d46..7fbe0073 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -1,45 +1,46 @@ SCRIPT_START script_0800DA60 -StartScript -StopScript -CheckPlayerInRegion 0x0078, 0x0148, 0x4040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807E8E4_0 -Call sub_0807F3F8 -Wait 0x003c -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00800078 -CameraTargetEntity -Call sub_0807F5C0 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos 0x0002162d -_0807EA94 -_0807E5F8 0x00000001 -Wait 0x001e -TextboxNoOverlapFollowPos 0x0002162e -_0807EA94 -_0807E8E4_0 -CallWithArg sub_0807F75C, 0x00780138 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807F5C0 -SetRoomFlag 0x0000 -Call sub_0807F40C -Wait 0x001e -_0807E8E4_1 -Wait 0x000a -_0807E8E4_3 -Wait 0x000a -_0807E8E4_2 -Call sub_0807F3F8 -Wait 0x003c -SetRoomFlag 0x0001 -SetLocalFlag 0x0077 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + StopScript +script_0800DA64: + CheckPlayerInRegion 0x0078, 0x0148, 0x4040 + JumpIfNot script_0800DA64 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807E8E4_0 + Call sub_0807F3F8 + Wait 0x003c + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00800078 + CameraTargetEntity + Call sub_0807F5C0 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + TextboxNoOverlapFollowPos 0x0002162d + _0807EA94 + _0807E5F8 0x00000001 + Wait 0x001e + TextboxNoOverlapFollowPos 0x0002162e + _0807EA94 + _0807E8E4_0 + CallWithArg sub_0807F75C, 0x00780138 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807F5C0 + SetRoomFlag 0x0000 + Call sub_0807F40C + Wait 0x001e + _0807E8E4_1 + Wait 0x000a + _0807E8E4_3 + Wait 0x000a + _0807E8E4_2 + Call sub_0807F3F8 + Wait 0x003c + SetRoomFlag 0x0001 + SetLocalFlag 0x0077 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DB18.inc b/data/scripts/script_0800DB18.inc index db878083..28eb65ea 100644 --- a/data/scripts/script_0800DB18.inc +++ b/data/scripts/script_0800DB18.inc @@ -1,6 +1,6 @@ SCRIPT_START script_0800DB18 -StartScript -_0807EF80 0x000a -Call sub_08066E38 -StopScript + StartScript + _0807EF80 0x000a + Call sub_08066E38 + StopScript SCRIPT_END diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index f26054bc..c633b659 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800DB28 -StartScript -_0807EF80 0x0007 -_0807EB44 0x0000 -_0807EF80 0x0014 -StopScript -WaitForSomething2 0x00000001 -Wait 0x003c -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0004 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EF80 0x0000 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0004 -_0807EF80 0x0014 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0000 + _0807EF80 0x0014 + StopScript + WaitForSomething2 0x00000001 + Wait 0x003c + _0807EF80 0x0004 + Wait 0x003c + _0807EB44 0x0004 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EF80 0x0000 + Wait 0x003c + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EB44 0x0004 + _0807EF80 0x0014 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DB78.inc b/data/scripts/script_0800DB78.inc index 64ddbba6..cede39e2 100644 --- a/data/scripts/script_0800DB78.inc +++ b/data/scripts/script_0800DB78.inc @@ -1,44 +1,46 @@ SCRIPT_START script_0800DB78 -StartScript -StopScript -CallWithArg sub_0807F6B4, 0x000000a0 -JumpIf 0xfff4 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x00780078 -CameraTargetEntity -Call sub_0807F5C0 -_0807EB28 0x1648 -_0807EA94 -Call sub_0804D7EC -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0807DF50 -_0807E878 -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0804D810 -Call sub_0807F3F8 -Wait 0x003c -StartPlayerScript script_0800DDD0 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807E5F8 0x00000001 -StartPlayerScript script_0800DE00 -WaitForSomething2 0x00000006 -TextboxNoOverlapFollowPos 0x00021643 -_0807EA94 -_0807EB28 0x1645 -_0807EA94 -Call sub_0807F3F8 -_0807E5F8 0x00000001 -SoundReq0x80100000 -Call sub_08094F98 -CallWithArg sub_0805DDEC, 0x00000001 -_0807F0C8 0xffff, 0x0000 + StartScript + StopScript +script_0800DB7C: + CallWithArg sub_0807F6B4, 0x000000a0 + JumpIf script_0800DB7C + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807F0B4 0x0001 + SetEntityPositionRelative 0x00780078 + CameraTargetEntity + Call sub_0807F5C0 + _0807EB28 0x1648 + _0807EA94 + Call sub_0804D7EC + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + Call sub_0807DF50 + _0807E878 +script_0800DBCA: + CheckRoomFlag 0x0000 + JumpIfNot script_0800DBCA + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0804D810 + Call sub_0807F3F8 + Wait 0x003c + StartPlayerScript script_0800DDD0 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + _0807E5F8 0x00000001 + StartPlayerScript script_0800DE00 + WaitForSomething2 0x00000006 + TextboxNoOverlapFollowPos 0x00021643 + _0807EA94 + _0807EB28 0x1645 + _0807EA94 + Call sub_0807F3F8 + _0807E5F8 0x00000001 + SoundReq0x80100000 + Call sub_08094F98 + CallWithArg sub_0805DDEC, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0800DC4C.inc b/data/scripts/script_0800DC4C.inc index 6f24dffd..8c9ddfc9 100644 --- a/data/scripts/script_0800DC4C.inc +++ b/data/scripts/script_0800DC4C.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800DC4C -Wait 0x003c -SoundReq2 0x0031 -StartPlayerScript script_0800DE50 -WaitForSomething2 0x00000006 -_0807EB28 0x1646 -_0807EA94 -_0807E5F8 0x00000001 -StartPlayerScript script_0800DE2C -CameraTargetPlayer -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -SetLocalFlag 0x0079 -CallWithArg sub_0806DA1C, 0x00000002 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + Wait 0x003c + SoundReq2 0x0031 + StartPlayerScript script_0800DE50 + WaitForSomething2 0x00000006 + _0807EB28 0x1646 + _0807EA94 + _0807E5F8 0x00000001 + StartPlayerScript script_0800DE2C + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + CallWithArg sub_0805DE18, 0x00000001 + _0807F0C8 0x0000, 0x0000 + SetLocalFlag 0x0079 + CallWithArg sub_0806DA1C, 0x00000002 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index 720d8db0..fda1cc9e 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -1,67 +1,68 @@ SCRIPT_START script_0800DCAC -StartScript -_0807EF80 0x000a -Call sub_08066E38 -StopScript -WaitForSomething2 0x00000001 -CallWithArg sub_0807F8E8, 0x00000000 -_0807E5F8 0x00000002 -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807EF80 0x0010 -Wait 0x003c -_0807EF80 0x0010 -SetEntityPositionRelative 0x00680078 -WaitForSomething2 0x00000001 -SoundReq0x80100000 -Call sub_08066E50 -SoundReq 0x01c9 -Call sub_0807F2D4 -SoundReq 0x01ca -Wait 0x003c -_0807EF80 0x0004 -SoundReq2 0x000b -Wait 0x0078 -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x001e -Call sub_08066E80 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EF80 0x0004 -Wait 0x003c -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0100 -_0807EEF4 0x0000, 0x0080 + StartScript + _0807EF80 0x000a + Call sub_08066E38 + StopScript + WaitForSomething2 0x00000001 + CallWithArg sub_0807F8E8, 0x00000000 + _0807E5F8 0x00000002 +script_0800DCD0: + CheckRoomFlag 0x0000 + JumpIfNot script_0800DCD0 + _0807EF80 0x0010 + Wait 0x003c + _0807EF80 0x0010 + SetEntityPositionRelative 0x00680078 + WaitForSomething2 0x00000001 + SoundReq0x80100000 + Call sub_08066E50 + SoundReq 0x01c9 + Call sub_0807F2D4 + SoundReq 0x01ca + Wait 0x003c + _0807EF80 0x0004 + SoundReq2 0x000b + Wait 0x0078 + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + Wait 0x003c + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + SetEntityNonPlanarMovement 0x0100 + _0807EEF4 0x0000, 0x0008 + _0807EB44 0x0004 + _0807EF80 0x0000 + Wait 0x001e + Call sub_08066E80 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EF80 0x0004 + Wait 0x003c + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + SetEntityNonPlanarMovement 0x0100 + _0807EEF4 0x0000, 0x0080 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index e3b9e05e..11cac803 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -1,12 +1,12 @@ SCRIPT_START script_0800DDD0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -CallWithArg sub_0807F4F8, 0x000000a0 -_0807EDD4 0x0078, 0x00a0 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + CallWithArg sub_0807F4F8, 0x000000a0 + _0807EDD4 0x0078, 0x00a0 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index 14fe1a9a..7d76102c 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0800DE00 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EB44 0x0000 -_0807EF80 0x000d -_0807EF80 0x0000 -_0807ECC4 0x0010 -_0807EF80 0x000c -_0807E5F8 0x00000004 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EB44 0x0000 + _0807EF80 0x000d + _0807EF80 0x0000 + _0807ECC4 0x0010 + _0807EF80 0x000c + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DE2C.inc b/data/scripts/script_0800DE2C.inc index eb637dbb..dabfc445 100644 --- a/data/scripts/script_0800DE2C.inc +++ b/data/scripts/script_0800DE2C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800DE2C -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EEF4 0x0000, 0x0080 -_0807E5F8 0x00000004 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EEF4 0x0000, 0x0080 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DE50.inc b/data/scripts/script_0800DE50.inc index 0c1bf300..3ace4f33 100644 --- a/data/scripts/script_0800DE50.inc +++ b/data/scripts/script_0800DE50.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800DE50 -StopScript -_0807EB44 0x0004 -_0807EF80 0x0000 -CallWithArg sub_0807F238, 0x000003c5 -Call sub_0807F304 -_0807E5F8 0x00000004 -Call sub_080791BC + StopScript + _0807EB44 0x0004 + _0807EF80 0x0000 + CallWithArg sub_0807F238, 0x000003c5 + Call sub_0807F304 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DE78.inc b/data/scripts/script_0800DE78.inc index 48175b61..0ecd30e4 100644 --- a/data/scripts/script_0800DE78.inc +++ b/data/scripts/script_0800DE78.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800DE78 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_0800DEB0 -WaitForSomething2 0x00000001 -WaitForSomething2 0x00000002 -_0807EB28 0x1647 -_0807EA94 -SetLocalFlag 0x007a -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_0800DEB0 + WaitForSomething2 0x00000001 + WaitForSomething2 0x00000002 + _0807EB28 0x1647 + _0807EA94 + SetLocalFlag 0x007a + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DEB0.inc b/data/scripts/script_0800DEB0.inc index a1dd6d33..e6184c8a 100644 --- a/data/scripts/script_0800DEB0.inc +++ b/data/scripts/script_0800DEB0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800DEB0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0198, 0x01c8 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0198, 0x01c8 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index f4bcd9eb..657180ad 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -1,21 +1,21 @@ SCRIPT_START script_0800DED4 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x000b -Call sub_08066D04 -StopScript -StartScript -Call sub_08066D14 -SetEntityPositionRelative 0x01480198 -_0807EF80 0x0007 -StopScript -_0807EDD4 0x0198, 0x01a8 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_08066D4C -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x000b + Call sub_08066D04 + StopScript + StartScript + Call sub_08066D14 + SetEntityPositionRelative 0x01480198 + _0807EF80 0x0007 + StopScript + _0807EDD4 0x0198, 0x01a8 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_08066D4C + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800DF24.inc b/data/scripts/script_0800DF24.inc index fefbdbc5..4e8fa449 100644 --- a/data/scripts/script_0800DF24.inc +++ b/data/scripts/script_0800DF24.inc @@ -1,38 +1,38 @@ SCRIPT_START script_0800DF24 -StartScript -_0807EF80 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -_0807E8E4_2 -Wait 0x005a -Call sub_0807F3F8 -Wait 0x003c -_0807E8E4_0 -_0807F0B4 0x0001 -CameraTargetEntity -Call sub_0807F5C0 -Call sub_08066C94 -Wait 0x00e9 -_0807EF80 0x0007 -TextboxNoOverlapFollowPos 0x0002162f -_0807EA94 -SoundReq2 0x002f -_0807EF80 0x0019 -SoundReq 0x0198 -Call sub_0807F2D4 -SetRoomFlag 0x0000 -_0807EF80 0x0008 -Wait 0x0080 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807F5C0 -SetLocalFlag 0x0078 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + SoundReq0x80100000 + _0807E8E4_2 + Wait 0x005a + Call sub_0807F3F8 + Wait 0x003c + _0807E8E4_0 + _0807F0B4 0x0001 + CameraTargetEntity + Call sub_0807F5C0 + Call sub_08066C94 + Wait 0x00e9 + _0807EF80 0x0007 + TextboxNoOverlapFollowPos 0x0002162f + _0807EA94 + SoundReq2 0x002f + _0807EF80 0x0019 + SoundReq 0x0198 + Call sub_0807F2D4 + SetRoomFlag 0x0000 + _0807EF80 0x0008 + Wait 0x0080 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807F5C0 + SetLocalFlag 0x0078 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFB4.inc b/data/scripts/script_0800DFB4.inc index 9544ee48..c253847f 100644 --- a/data/scripts/script_0800DFB4.inc +++ b/data/scripts/script_0800DFB4.inc @@ -1,13 +1,14 @@ SCRIPT_START script_0800DFB4 -StopScript -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -SoundReq0x80100000 -_0807E864 -Call sub_0807DF28 -SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x00000004 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StopScript +script_0800DFB6: + CheckRoomFlag 0x0001 + JumpIfNot script_0800DFB6 + SoundReq0x80100000 + _0807E864 + Call sub_0807DF28 + SoundReq 0x00f6 + CallWithArg sub_0806DA1C, 0x00000004 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index 0f349407..8a0ba9e4 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -1,29 +1,31 @@ SCRIPT_START script_0800DFE4 -StartScript -Call sub_0807DF28 -_0807E864 -StopScript -SoundReq0x80100000 -TextboxNoOverlapFollowPos 0x00021632 -_0807EA94 -SetRoomFlag 0x0003 -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -SoundReq2 0x0030 -Call sub_0807DF50 -_0807E878 -CheckRoomFlag 0x0002 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807DF28 -SetLocalFlag 0x007b -TextboxNoOverlapFollowPos 0x000c1639 -_0807EA94 -Wait 0x0096 -SoundReq 0x00f6 -CallWithArg sub_0806DA1C, 0x00000005 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_0807DF28 + _0807E864 + StopScript + SoundReq0x80100000 + TextboxNoOverlapFollowPos 0x00021632 + _0807EA94 + SetRoomFlag 0x0003 +script_0800DFFE: + CheckRoomFlag 0x0000 + JumpIfNot script_0800DFFE + SoundReq2 0x0030 + Call sub_0807DF50 + _0807E878 +script_0800E012: + CheckRoomFlag 0x0002 + JumpIfNot script_0800E012 + _0807E864 + Call sub_0807DF28 + SetLocalFlag 0x007b + TextboxNoOverlapFollowPos 0x000c1639 + _0807EA94 + Wait 0x0096 + SoundReq 0x00f6 + CallWithArg sub_0806DA1C, 0x00000005 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index fde5b354..1b8c6edb 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -1,20 +1,20 @@ SCRIPT_START script_0800E050 -StartScript -Call sub_0807DF28 -_0807E864 -StopScript -SoundReq0x80100000 -SoundReq0x80100000 -Wait 0x0078 -_0807EB28 0x1638 -_0807EA94 -SetRoomFlag 0x0000 -Wait 0x001e -_0807E5F8 0x00000001 -StartPlayerScript script_0800E094 -WaitForSomething2 0x00000002 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_0807DF28 + _0807E864 + StopScript + SoundReq0x80100000 + SoundReq0x80100000 + Wait 0x0078 + _0807EB28 0x1638 + _0807EA94 + SetRoomFlag 0x0000 + Wait 0x001e + _0807E5F8 0x00000001 + StartPlayerScript script_0800E094 + WaitForSomething2 0x00000002 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index d6e24d18..35daad29 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800E094 -StartScript -SetEntityNonPlanarMovement 0x00c0 -StopScript -WaitForSomething2 0x00000001 -_0807EF80 0x0001 -_0807EDD4 0x00a8, 0x002c -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x00c0 + StopScript + WaitForSomething2 0x00000001 + _0807EF80 0x0001 + _0807EDD4 0x00a8, 0x002c + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 6ee5d073..3770edbc 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -1,298 +1,320 @@ SCRIPT_START script_0800E0BC -StartScript -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0093 -JumpIf 0x0062 -_0807E930 0x0008 -CallWithArg sub_0807F8E8, 0x00000000 -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x0009 -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB8C -_0807EB74 -Wait 0x000a -TextboxNoOverlap 0x2402 -_0807EA94 -SetLocalFlag 0x0093 -Call sub_080668F0 -_0807E878 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2402 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0094 -JumpIf 0x006c -_0807E930 0x0010 -CallWithArg sub_0807F8E8, 0x00000001 -StopScript -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x0015 -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB8C -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Wait 0x000a -TextboxNoOverlap 0x2401 -_0807EA94 -SetLocalFlag 0x0094 -CallWithArg sub_0807F3D8, 0x00000000 -_0807E9D4 -_0807E878 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlap 0x2401 -_0807EA94 -_0807E878 -Jump 0xffe2 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0073 -JumpIfNot 0x001e -_0807E9D4 -SetEntityPositionRelative 0x01680070 -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -Jump 0x00fe -CheckLocalFlag 0x0095 -JumpIf 0x0062 -_0807E930 0x0010 -CallWithArg sub_0807F8E8, 0x00000002 -StopScript -CheckRoomFlag 0x0002 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x0015 -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB8C -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -SetLocalFlag 0x0095 -_0807EF80 0x0000 -CallWithArg sub_0807F3D8, 0x00000000 -_0807E9D4 -_0807E878 -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x005c -CheckLocalFlag 0x0093 -JumpIfNot 0xfff0 -CheckLocalFlag 0x0094 -JumpIfNot 0xffe8 -CheckLocalFlag 0x0095 -JumpIfNot 0xffe0 -_0807E9DC -SetLocalFlag 0x0073 -StopScript -_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 0x001e -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -TextboxNoOverlap 0x2404 -_0807EA94 -_0807E878 -Jump 0xff82 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlap 0x2403 -_0807EA94 -_0807E878 -Jump 0xffe2 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x000a -CheckLocalFlag 0x0071 -JumpIf 0x0088 -CheckLocalFlag 0x0096 -JumpIf 0x0056 -_0807E930 0x000c -CallWithArg sub_0807F8E8, 0x00000000 -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Wait 0x001e -_0807EF80 0x0010 -SoundReq 0x01c9 -_0807E930 0x000d -Wait 0x003c -SoundReq 0x01ca -_0807EF80 0x0010 -Wait 0x001e -SoundReq 0x0072 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x001e -_0807EF80 0x0000 -_0807EB74 -SetLocalFlag 0x0096 -_0807EF80 0x0000 -_0807E9D4 -_0807E878 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x240c -_0807EA94 -Wait 0x000f -_0807F034 0x0053 -WaitPlayerAction8 -SetLocalFlag 0x0071 -_0807E878 -_0807E9D4 -_0807E878 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x240d -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -StartScript -_0807EB44 0x0002 -_0807EF80 0x000a -Call sub_080668F0 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2406 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe8 -StartScript -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlap 0x2405 -_0807EA94 -_0807E878 -Jump 0xffe2 -StartScript -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlap 0x2407 -_0807EA94 -_0807E878 -Jump 0xffe2 -StartScript -Call sub_0807F354 -StopScript -CheckLocalFlag 0x007c -JumpIf 0x0046 -CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 -JumpIfNot 0xfff6 -StartScript -_0807E864 -StopScript -Call sub_0807F3F8 -Wait 0x003c -TextboxNoOverlapFollow 0x160c -_0807EA94 -Wait 0x001e -TextboxNoOverlapFollow 0x160d -_0807EA94 -Wait 0x001e -_0807EB28 0x160e -Wait 0x003c -_0807EA94 -StartScript -SoundReq2 0x0033 -SetLocalFlag 0x007c -_0807E878 -_0807EF80 0x0006 -StopScript + StartScript + _0807EB44 0x0004 + _0807EF80 0x000a + CheckLocalFlag 0x0093 + JumpIf script_0800E12E + _0807E930 0x0008 + CallWithArg sub_0807F8E8, 0x00000000 + StopScript +script_0800E0DE: + CheckRoomFlag 0x0000 + JumpIfNot script_0800E0DE + _0807E864 + Wait 0x001e + _0807EF80 0x0010 + SoundReq 0x01c9 + _0807E930 0x0009 + Wait 0x003c + SoundReq 0x01ca + _0807EF80 0x0010 + Wait 0x001e + SoundReq 0x0072 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x001e + _0807EF80 0x0000 + _0807EB8C + _0807EB74 + Wait 0x000a + TextboxNoOverlap 0x2402 + _0807EA94 + SetLocalFlag 0x0093 +script_0800E12E: + Call sub_080668F0 + _0807E878 + StopScript +script_0800E138: + CheckEntityInteractType + JumpIfNot script_0800E138 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x2402 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E138 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x000a + CheckLocalFlag 0x0094 + JumpIf script_0800E1D0 + _0807E930 0x0010 + CallWithArg sub_0807F8E8, 0x00000001 + StopScript +script_0800E176: + CheckRoomFlag 0x0001 + JumpIfNot script_0800E176 + _0807E864 + Wait 0x001e + _0807EF80 0x0010 + SoundReq 0x01c9 + _0807E930 0x0015 + Wait 0x003c + SoundReq 0x01ca + _0807EF80 0x0010 + Wait 0x001e + SoundReq 0x0072 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x001e + _0807EF80 0x0000 + _0807EB8C + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Wait 0x000a + TextboxNoOverlap 0x2401 + _0807EA94 + SetLocalFlag 0x0094 +script_0800E1D0: + CallWithArg sub_0807F3D8, 0x00000000 + _0807E9D4 + _0807E878 + StopScript +script_0800E1E0: + CheckEntityInteractType + JumpIfNot script_0800E1E0 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlap 0x2401 + _0807EA94 + _0807E878 + Jump script_0800E1E0 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0004 + _0807EF80 0x000a + CheckLocalFlag 0x0073 + JumpIfNot script_0800E232 + _0807E9D4 + SetEntityPositionRelative 0x01680070 + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + StopScript + Jump script_0800E32E +script_0800E232: + CheckLocalFlag 0x0095 + JumpIf script_0800E29A + _0807E930 0x0010 + CallWithArg sub_0807F8E8, 0x00000002 + StopScript +script_0800E24A: + CheckRoomFlag 0x0002 + JumpIfNot script_0800E24A + _0807E864 + Wait 0x001e + _0807EF80 0x0010 + SoundReq 0x01c9 + _0807E930 0x0015 + Wait 0x003c + SoundReq 0x01ca + _0807EF80 0x0010 + Wait 0x001e + SoundReq 0x0072 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x001e + _0807EF80 0x0000 + _0807EB8C + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + SetLocalFlag 0x0095 +script_0800E29A: + _0807EF80 0x0000 + CallWithArg sub_0807F3D8, 0x00000000 + _0807E9D4 + _0807E878 + StopScript +script_0800E2AE: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800E312 + CheckLocalFlag 0x0093 + JumpIfNot script_0800E2AE + CheckLocalFlag 0x0094 + JumpIfNot script_0800E2AE + CheckLocalFlag 0x0095 + JumpIfNot script_0800E2AE + _0807E9DC + SetLocalFlag 0x0073 + StopScript + _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 + StopScript + TextboxNoOverlap 0x2404 + _0807EA94 + _0807E878 + Jump script_0800E2AE +script_0800E32E: + CheckEntityInteractType + JumpIfNot script_0800E32E + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlap 0x2403 + _0807EA94 + _0807E878 + Jump script_0800E32E + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x000a + CheckLocalFlag 0x0071 + JumpIf script_0800E3E8 + CheckLocalFlag 0x0096 + JumpIf script_0800E3BE + _0807E930 0x000c + CallWithArg sub_0807F8E8, 0x00000000 + StopScript +script_0800E37A: + CheckRoomFlag 0x0000 + JumpIfNot script_0800E37A + _0807E864 + Wait 0x001e + _0807EF80 0x0010 + SoundReq 0x01c9 + _0807E930 0x000d + Wait 0x003c + SoundReq 0x01ca + _0807EF80 0x0010 + Wait 0x001e + SoundReq 0x0072 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x001e + _0807EF80 0x0000 + _0807EB74 + SetLocalFlag 0x0096 +script_0800E3BE: + _0807EF80 0x0000 + _0807E9D4 + _0807E878 + StopScript +script_0800E3C8: + CheckEntityInteractType + JumpIfNot script_0800E3C8 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x240c + _0807EA94 + Wait 0x000f + _0807F034 0x0053 + WaitPlayerAction8 + SetLocalFlag 0x0071 + _0807E878 +script_0800E3E8: + _0807E9D4 + _0807E878 + StopScript +script_0800E3EE: + CheckEntityInteractType + JumpIfNot script_0800E3EE + _0807E864 + _0807EB74 + TextboxNoOverlap 0x240d + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E3EE + StartScript + _0807EB44 0x0002 + _0807EF80 0x000a + Call sub_080668F0 + StopScript +script_0800E41A: + CheckEntityInteractType + JumpIfNot script_0800E41A + _0807E864 + _0807EB74 + TextboxNoOverlap 0x2406 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E41A + StartScript + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000000 + _0807EF80 0x000a + _0807E9D4 + StopScript +script_0800E44C: + CheckEntityInteractType + JumpIfNot script_0800E44C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlap 0x2405 + _0807EA94 + _0807E878 + Jump script_0800E44C + StartScript + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000000 + _0807EF80 0x000a + _0807E9D4 + StopScript +script_0800E484: + CheckEntityInteractType + JumpIfNot script_0800E484 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlap 0x2407 + _0807EA94 + _0807E878 + Jump script_0800E484 + StartScript + Call sub_0807F354 + StopScript + CheckLocalFlag 0x007c + JumpIf script_0800E4FA +script_0800E4B6: + CheckPlayerInRegion 0x0088, 0x00f8, 0x0820 + JumpIfNot script_0800E4B6 + StartScript + _0807E864 + StopScript + Call sub_0807F3F8 + Wait 0x003c + TextboxNoOverlapFollow 0x160c + _0807EA94 + Wait 0x001e + TextboxNoOverlapFollow 0x160d + _0807EA94 + Wait 0x001e + _0807EB28 0x160e + Wait 0x003c + _0807EA94 + StartScript + SoundReq2 0x0033 + SetLocalFlag 0x007c +script_0800E4FA: + _0807E878 + _0807EF80 0x0006 + StopScript SCRIPT_END diff --git a/data/scripts/script_0800E504.inc b/data/scripts/script_0800E504.inc index 9d141143..1b63855a 100644 --- a/data/scripts/script_0800E504.inc +++ b/data/scripts/script_0800E504.inc @@ -1,18 +1,20 @@ SCRIPT_START script_0800E504 -StartScript -StopScript -CheckLocalFlag 0x007d -JumpIf 0x002e -CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 -JumpIfNot 0xfff6 -_0807E864 -Wait 0x001e -Call sub_0807F3F8 -Wait 0x003c -SoundReq 0x0105 -Wait 0x001e -_0807EB28 0x1617 -SetLocalFlag 0x007d -_0807E878 -_0807EF80 0x0006 + StartScript + StopScript + CheckLocalFlag 0x007d + JumpIf script_0800E53C +script_0800E510: + CheckPlayerInRegion 0x00a8, 0x0178, 0x1080 + JumpIfNot script_0800E510 + _0807E864 + Wait 0x001e + Call sub_0807F3F8 + Wait 0x003c + SoundReq 0x0105 + Wait 0x001e + _0807EB28 0x1617 + SetLocalFlag 0x007d +script_0800E53C: + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index 8c7adb02..b0a31238 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -1,20 +1,22 @@ SCRIPT_START script_0800E544 -StartScript -StopScript -CheckLocalFlag 0x007e -JumpIf 0x0034 -CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 -JumpIfNot 0xfff6 -_0807E864 -Wait 0x001e -Call sub_0807F3F8 -Wait 0x003c -SoundReq 0x0105 -Wait 0x001e -_0807EB28 0x1622 -Call sub_08053494 -SetLocalFlag 0x007e -_0807E878 -_0807EF80 0x0006 + StartScript + StopScript + CheckLocalFlag 0x007e + JumpIf script_0800E582 +script_0800E550: + CheckPlayerInRegion 0x00a8, 0x00c0, 0x0880 + JumpIfNot script_0800E550 + _0807E864 + Wait 0x001e + Call sub_0807F3F8 + Wait 0x003c + SoundReq 0x0105 + Wait 0x001e + _0807EB28 0x1622 + Call sub_08053494 + SetLocalFlag 0x007e +script_0800E582: + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 836c03c6..8fdde827 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -1,17 +1,17 @@ SCRIPT_START script_0800E58C -StartScript -_0807EF80 0x0007 -_0807EB44 0x0000 -_0807EF80 0x0014 -StopScript -Wait 0x003c -SoundReq 0x0105 -Wait 0x003c -SoundReq 0x009b -Wait 0x001e -TextboxNoOverlap 0x1625 -_0807EA94 -Wait 0x003c -Call sub_08053C84 + StartScript + _0807EF80 0x0007 + _0807EB44 0x0000 + _0807EF80 0x0014 + StopScript + Wait 0x003c + SoundReq 0x0105 + Wait 0x003c + SoundReq 0x009b + Wait 0x001e + TextboxNoOverlap 0x1625 + _0807EA94 + Wait 0x003c + Call sub_08053C84 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E5C4.inc b/data/scripts/script_0800E5C4.inc index 75392878..59366432 100644 --- a/data/scripts/script_0800E5C4.inc +++ b/data/scripts/script_0800E5C4.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800E5C4 -StartScript -CheckLocalFlag 0x0086 -JumpIfNot 0x000a -_0807EF80 0x0006 -StopScript + StartScript + CheckLocalFlag 0x0086 + JumpIfNot script_0800E5D6 + _0807EF80 0x0006 + StopScript SCRIPT_END diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index e09df4d0..f4fb76ae 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -1,13 +1,15 @@ SCRIPT_START script_0800E5D6 -StopScript -CheckLocalFlag 0x0086 -JumpIfNot 0xfffa -_0807E864 -Wait 0x003c -_0807E914 0x00000905 -Call sub_0807F420 -SetRoomFlag 0x0001 -Wait 0x001e -_0807E878 +script_0800E5D6: + StopScript +script_0800E5D8: + CheckLocalFlag 0x0086 + JumpIfNot script_0800E5D8 + _0807E864 + Wait 0x003c + _0807E914 0x00000905 + Call sub_0807F420 + SetRoomFlag 0x0001 + Wait 0x001e + _0807E878 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800E600.inc b/data/scripts/script_0800E600.inc index 7a7d199a..36445e10 100644 --- a/data/scripts/script_0800E600.inc +++ b/data/scripts/script_0800E600.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E600 -StartScript -SetEntityNonPlanarMovement 0x0140 -SetEntityDirection 0x0000 -_0807E864 -Call sub_0807F354 -StopScript -WaitForPlayerAction0x17 -_0807E8E4_0 -_0807EF80 0x0001 -Call sub_080752AC -_0807E878 -Call sub_080791D0 + StartScript + SetEntityNonPlanarMovement 0x0140 + SetEntityDirection 0x0000 + _0807E864 + Call sub_0807F354 + StopScript + WaitForPlayerAction0x17 + _0807E8E4_0 + _0807EF80 0x0001 + Call sub_080752AC + _0807E878 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E62C.inc b/data/scripts/script_0800E62C.inc index 2c383dd8..96b1273e 100644 --- a/data/scripts/script_0800E62C.inc +++ b/data/scripts/script_0800E62C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E62C -StartScript -SetEntityNonPlanarMovement 0x0140 -SetEntityDirection 0x0008 -_0807E864 -Call sub_0807F354 -StopScript -WaitForPlayerAction0x17 -_0807E8E4_1 -_0807EF80 0x0001 -Call sub_080752AC -_0807E878 -Call sub_080791D0 + StartScript + SetEntityNonPlanarMovement 0x0140 + SetEntityDirection 0x0008 + _0807E864 + Call sub_0807F354 + StopScript + WaitForPlayerAction0x17 + _0807E8E4_1 + _0807EF80 0x0001 + Call sub_080752AC + _0807E878 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E658.inc b/data/scripts/script_0800E658.inc index 618409df..54d3c254 100644 --- a/data/scripts/script_0800E658.inc +++ b/data/scripts/script_0800E658.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E658 -StartScript -SetEntityNonPlanarMovement 0x0140 -SetEntityDirection 0x0010 -_0807E864 -Call sub_0807F354 -StopScript -WaitForPlayerAction0x17 -_0807E8E4_2 -_0807EF80 0x0001 -Call sub_080752AC -_0807E878 -Call sub_080791D0 + StartScript + SetEntityNonPlanarMovement 0x0140 + SetEntityDirection 0x0010 + _0807E864 + Call sub_0807F354 + StopScript + WaitForPlayerAction0x17 + _0807E8E4_2 + _0807EF80 0x0001 + Call sub_080752AC + _0807E878 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E684.inc b/data/scripts/script_0800E684.inc index f89e6a52..569e8ad8 100644 --- a/data/scripts/script_0800E684.inc +++ b/data/scripts/script_0800E684.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0800E684 -StartScript -SetEntityNonPlanarMovement 0x0140 -SetEntityDirection 0x0018 -_0807E864 -Call sub_0807F354 -StopScript -WaitForPlayerAction0x17 -_0807E8E4_3 -_0807EF80 0x0001 -Call sub_080752AC -_0807E878 -Call sub_080791D0 + StartScript + SetEntityNonPlanarMovement 0x0140 + SetEntityDirection 0x0018 + _0807E864 + Call sub_0807F354 + StopScript + WaitForPlayerAction0x17 + _0807E8E4_3 + _0807EF80 0x0001 + Call sub_080752AC + _0807E878 + Call sub_080791D0 SCRIPT_END diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index 8dfc9375..c1ff4dcb 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -1,141 +1,156 @@ SCRIPT_START script_0800E6B0 -StartScript -Call sub_08060090 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000e -Call sub_08060158 -StopScript -Jump 0xffee -StopScript -_0807E864 -Call sub_0806025C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd8 -StartScript -Call sub_0806ADFC -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000c -Call sub_0806AEE4 -Jump 0xffee -StopScript -_0807E864 -Call sub_0806AFE8 -JumpIf 0x000e -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd4 -_0807EA94 -_0807F034 0x0057 -WaitPlayerAction8 -_0807EA94 -_0807E878 -Jump 0xffc4 -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0806AF60, 0x00000000 -Call sub_0806AFE8 -_0807EA94 -_0807E878 -Jump 0xffe0 -StartScript -_0807E9D4 -_0807EF80 0x000a -SetEntityNonPlanarMovement 0x0200 -CheckGlobalFlag 0x0029 -JumpIfNot 0x000a -CheckGlobalFlag 0x002a -JumpIfNot 0x000c -SetEntityPositionRelative 0x00980188 -Jump 0xff70 -StopScript -StartScript -CheckGlobalFlag 0x002a -JumpIf 0x002a -CheckEntityInteractType -JumpIf 0x000e -Call sub_0806AEE4 -StopScript -Jump 0xffe6 -StopScript -_0807E864 -Call sub_0806AFE8 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffd0 -_0807EF80 0x000f -_0807EB44 0x0002 -CallWithArg sub_0806AF60, 0x00000004 -Call sub_0806AF70 -_0807EE04 0x0188, 0x0058 -StopScript -StartScript -Call sub_0806AF78 -_0807EE30 -JumpIfNot 0xfff2 -EntityHasHeight -JumpIf 0xffec -StopScript -Jump 0xff02 -StartScript -Call sub_0806C674 -_0807EF80 0x000a -_0807EB44 0x0004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C70C -_0807EA94 -_0807E878 -_0807EB44 0x0004 -Jump 0xffe6 -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB44 0x0004 -StartScript -TextboxNoOverlapFollow 0x4501 -CallWithArg sub_0807F854, 0x00010032 -CallWithArg sub_0807F854, 0x000200c8 -CallWithArg sub_0807F854, 0x00030190 -StopScript -_0807EA94 -_0807EB38 -_0807E078_ssss 0x00a6, 0x006a, 0x0036, 0x0002 -StartScript -TextboxNoOverlapFollow 0x4505 -CallWithArg sub_0807F854, 0x00010190 -StopScript -_0807EA94 -HasRupees 0x0190 -JumpIfNot 0x007c -ModRupees 0xfe70 -SetLocalFlag 0x0091 -TextboxNoOverlapFollow 0x4508 -_0807EA94 -Call sub_0806C578 + StartScript + Call sub_08060090 + _0807EF80 0x000a + StopScript +script_0800E6BE: + StartScript + CheckEntityInteractType + JumpIf script_0800E6D2 + Call sub_08060158 + StopScript + Jump script_0800E6BE +script_0800E6D2: + StopScript + _0807E864 + Call sub_0806025C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E6BE + StartScript + Call sub_0806ADFC + _0807EF80 0x000a +script_0800E6F4: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800E708 + Call sub_0806AEE4 + Jump script_0800E6F4 +script_0800E708: + StopScript + _0807E864 + Call sub_0806AFE8 + JumpIf script_0800E722 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E6F4 +script_0800E722: + _0807EA94 + _0807F034 0x0057 + WaitPlayerAction8 + _0807EA94 + _0807E878 + Jump script_0800E6F4 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + StopScript +script_0800E73E: + CheckEntityInteractType + JumpIfNot script_0800E73E + _0807E864 + _0807EB74 + CallWithArg sub_0806AF60, 0x00000000 + Call sub_0806AFE8 + _0807EA94 + _0807E878 + Jump script_0800E73E + StartScript + _0807E9D4 + _0807EF80 0x000a + SetEntityNonPlanarMovement 0x0200 + CheckGlobalFlag 0x0029 + JumpIfNot script_0800E77C + CheckGlobalFlag 0x002a + JumpIfNot script_0800E786 +script_0800E77C: + SetEntityPositionRelative 0x00980188 + Jump script_0800E6F4 +script_0800E786: + StopScript +script_0800E788: + StartScript + CheckGlobalFlag 0x002a + JumpIf script_0800E7BA + CheckEntityInteractType + JumpIf script_0800E7A4 + Call sub_0806AEE4 + StopScript + Jump script_0800E788 +script_0800E7A4: + StopScript + _0807E864 + Call sub_0806AFE8 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800E788 +script_0800E7BA: + _0807EF80 0x000f + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000004 + Call sub_0806AF70 + _0807EE04 0x0188, 0x0058 +script_0800E7D8: + StopScript + StartScript + Call sub_0806AF78 + _0807EE30 + JumpIfNot script_0800E7D8 + EntityHasHeight + JumpIf script_0800E7D8 + StopScript + Jump script_0800E6F4 + StartScript + Call sub_0806C674 + _0807EF80 0x000a + _0807EB44 0x0004 + StopScript +script_0800E806: + CheckEntityInteractType + JumpIfNot script_0800E806 + _0807E864 + _0807EB74 + Call sub_0806C70C + _0807EA94 + _0807E878 + _0807EB44 0x0004 + Jump script_0800E806 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0000 + StopScript +script_0800E832: + CheckEntityInteractType + JumpIfNot script_0800E832 + _0807E864 + _0807EB44 0x0004 + StartScript + TextboxNoOverlapFollow 0x4501 + CallWithArg sub_0807F854, 0x00010032 + CallWithArg sub_0807F854, 0x000200c8 + CallWithArg sub_0807F854, 0x00030190 + StopScript + _0807EA94 + _0807EB38 + JumpSwitch_4 script_0800E910, script_0800E8D6, script_0800E8A4, script_0800E872 +script_0800E872: + StartScript + TextboxNoOverlapFollow 0x4505 + CallWithArg sub_0807F854, 0x00010190 + StopScript + _0807EA94 + HasRupees 0x0190 + JumpIfNot script_0800E908 + ModRupees 0xfe70 + SetLocalFlag 0x0091 + TextboxNoOverlapFollow 0x4508 + _0807EA94 + Call sub_0806C578 SCRIPT_END diff --git a/data/scripts/script_0800E8A4.inc b/data/scripts/script_0800E8A4.inc index eae4041a..321568d2 100644 --- a/data/scripts/script_0800E8A4.inc +++ b/data/scripts/script_0800E8A4.inc @@ -1,14 +1,15 @@ SCRIPT_START script_0800E8A4 -StartScript -TextboxNoOverlapFollow 0x4504 -CallWithArg sub_0807F854, 0x000100c8 -StopScript -_0807EA94 -HasRupees 0x00c8 -JumpIfNot 0x004a -ModRupees 0xff38 -SetLocalFlag 0x0091 -TextboxNoOverlapFollow 0x4508 -_0807EA94 -Call sub_0806C588 +script_0800E8A4: + StartScript + TextboxNoOverlapFollow 0x4504 + CallWithArg sub_0807F854, 0x000100c8 + StopScript + _0807EA94 + HasRupees 0x00c8 + JumpIfNot script_0800E908 + ModRupees 0xff38 + SetLocalFlag 0x0091 + TextboxNoOverlapFollow 0x4508 + _0807EA94 + Call sub_0806C588 SCRIPT_END diff --git a/data/scripts/script_0800E8D6.inc b/data/scripts/script_0800E8D6.inc index 1c9221a8..77873d81 100644 --- a/data/scripts/script_0800E8D6.inc +++ b/data/scripts/script_0800E8D6.inc @@ -1,14 +1,15 @@ SCRIPT_START script_0800E8D6 -StartScript -TextboxNoOverlapFollow 0x4503 -CallWithArg sub_0807F854, 0x00010032 -StopScript -_0807EA94 -HasRupees 0x0032 -JumpIfNot 0x0018 -ModRupees 0xffce -SetLocalFlag 0x0091 -TextboxNoOverlapFollow 0x4508 -_0807EA94 -Call FUN_0806c598 +script_0800E8D6: + StartScript + TextboxNoOverlapFollow 0x4503 + CallWithArg sub_0807F854, 0x00010032 + StopScript + _0807EA94 + HasRupees 0x0032 + JumpIfNot script_0800E908 + ModRupees 0xffce + SetLocalFlag 0x0091 + TextboxNoOverlapFollow 0x4508 + _0807EA94 + Call FUN_0806c598 SCRIPT_END diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index f1bc6922..ccee015f 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -1,65 +1,72 @@ SCRIPT_START script_0800E908 -TextboxNoOverlapFollow 0x4507 -Jump 0x0006 -TextboxNoOverlapFollow 0x4509 -_0807EA94 -_0807E878 -_0807EB44 0x0000 -Jump 0xff14 -StartScript -Call sub_0806C4F8 -_0807EF80 0x000a -_0807EB44 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB44 0x0004 -_0807E930 0x0004 -Call sub_0806C4A8 -JumpIfNot 0xfff8 -Call sub_0806C4DC -_0807EA94 -_0807E878 -_0807EB44 0x0000 -_0807E930 0x0000 -Jump 0xffd2 -.short 0x0000 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0008 -Call sub_0807F2D4 -_0807E930 0x0009 -Call sub_0806B260 -JumpIfNot 0x0052 -_0807EA94 -_0807EF80 0x000b -StartPlayerScript script_0800E9F4 -WaitForSomething2 0x00000001 -_0807EF80 0x000a -TextboxNoOverlapFollow 0x4a24 -_0807EA94 -_0807E930 0x000a -Wait 0x0014 -TextboxNoOverlapFollow 0x4a25 -_0807EA94 -_0807E930 0x0000 -StartPlayerScript script_0800EA1C -WaitForSomething2 0x00000001 -SetLocalFlag 0x0074 -SoundReq 0x0072 -Wait 0x00f0 -TextboxNoOverlapFollow 0x4a26 -_0807EA94 -SetLocalFlag 0x0075 -_0807EA94 -Wait 0x000f -_0807E878 -_0807E930 0x0000 -Jump 0xff82 +script_0800E908: + TextboxNoOverlapFollow 0x4507 + Jump script_0800E914 +script_0800E910: + TextboxNoOverlapFollow 0x4509 +script_0800E914: + _0807EA94 + _0807E878 + _0807EB44 0x0000 + Jump script_0800E832 + StartScript + Call sub_0806C4F8 + _0807EF80 0x000a + _0807EB44 0x0000 + StopScript +script_0800E932: + CheckEntityInteractType + JumpIfNot script_0800E932 + _0807E864 + _0807EB44 0x0004 + _0807E930 0x0004 +script_0800E942: + Call sub_0806C4A8 + JumpIfNot script_0800E942 + Call sub_0806C4DC + _0807EA94 + _0807E878 + _0807EB44 0x0000 + _0807E930 0x0000 + Jump script_0800E932 + .short 0x0000 + StartScript + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript +script_0800E974: + CheckEntityInteractType + JumpIfNot script_0800E974 + _0807E864 + _0807E930 0x0008 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806B260 + JumpIfNot script_0800E9E4 + _0807EA94 + _0807EF80 0x000b + StartPlayerScript script_0800E9F4 + WaitForSomething2 0x00000001 + _0807EF80 0x000a + TextboxNoOverlapFollow 0x4a24 + _0807EA94 + _0807E930 0x000a + Wait 0x0014 + TextboxNoOverlapFollow 0x4a25 + _0807EA94 + _0807E930 0x0000 + StartPlayerScript script_0800EA1C + WaitForSomething2 0x00000001 + SetLocalFlag 0x0074 + SoundReq 0x0072 + Wait 0x00f0 + TextboxNoOverlapFollow 0x4a26 + _0807EA94 + SetLocalFlag 0x0075 +script_0800E9E4: + _0807EA94 + Wait 0x000f + _0807E878 + _0807E930 0x0000 + Jump script_0800E974 diff --git a/data/scripts/script_0800E9F4.inc b/data/scripts/script_0800E9F4.inc index 4886ddca..f31ca4d3 100644 --- a/data/scripts/script_0800E9F4.inc +++ b/data/scripts/script_0800E9F4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800E9F4 -StartScript -_0807EB44 0x0004 -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0078, 0x0080 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + _0807EB44 0x0004 + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0078, 0x0080 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/script_0800EA1C.inc index 90231e22..294402ba 100644 --- a/data/scripts/script_0800EA1C.inc +++ b/data/scripts/script_0800EA1C.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800EA1C -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x0014 -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x0014 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x0005 -Wait 0x003c -_0807E5F8 0x00000001 -Call sub_080791BC + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x0014 + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x0014 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x0005 + Wait 0x003c + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index aa15a6e9..4177a721 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -1,326 +1,347 @@ SCRIPT_START script_0800EA54 -StartScript -Call sub_0806CE5C -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0008 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -Call sub_0807F2D4 -_0807E930 0x0009 -Call sub_0806CE80 -_0807EA94 -_0807E878 -_0807E930 0x000a -Call sub_0807F2D4 -_0807E930 0x0008 -Jump 0xffc8 -StartScript -_0807E9D4 -Call sub_0806C09C -_0807EF80 0x000a -_0807E930 0x0000 -_0807EB44 0x0004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -StartScript -_0807E864 -_0807EB74 -CallWithArg sub_0806C028, 0x00000004 -StopScript -Call sub_0806C00C -JumpIfNot 0xfff8 -_0807E930 0x0008 -Call sub_0806C038 -_0807EA94 -Wait 0x000f -_0807E878 -_0807E930 0x0000 -Jump 0xffc6 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0006 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -_0807EB44 0x0006 -Call sub_08061FD8 -Jump 0xffda -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0002 -Call sub_08061FD8 -StopScript -Jump 0x0036 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -Jump 0x001a -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0006 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0002 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -_0807EB44 0x0002 -Call sub_08061FD8 -Jump 0xffda -StartScript -Call sub_08061E70 -_0807EF80 0x000a -_0807EB44 0x0004 -Call sub_08061FD8 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FD8 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -_0807E9D4 -CallWithArg sub_08061FB8, 0x00000001 -SetEntityNonPlanarMovement 0x0040 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0002 -StopScript -_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 0xffaa -StartScript -Call sub_080639D0 -_0807EF80 0x000a -StopScript -StartScript -CallWithArg sub_08063850, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_08063850, 0x00000000 -Call sub_08063944 -_0807EA94 -JumpIfNot 0x0008 -_0807F050 0x0070 -WaitPlayerAction8 -_0807E878 -Call sub_08063874 -CallWithArg sub_08063850, 0x00000000 -Jump 0xffc6 -StartScript -Call sub_08064CC0 -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0002 -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -_0807EB74 -Call sub_08064CD8 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0016 -TestBit 0x00000001 -JumpIf 0x0068 -Call sub_0806AEE4 -Jump 0xffe4 -StopScript -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x00ae -JumpIf 0x0078 -Wait 0x000a -_0807E5F8 0x00000001 -TextboxNoOverlapFollow 0x4c07 -_0807EA94 -_0807E5F8 0x00000010 -TextboxNoOverlapFollow 0x4c08 -_0807EA94 -_0807E5F8 0x00000020 -TextboxNoOverlapFollow 0x4c09 -_0807EA94 -_0807E914 0x00000503 -Call sub_0807F420 -_0807E5F8 0x00000040 -Call sub_0807DF50 -_0807E878 -SetLocalFlag 0x00ae -Jump 0xff88 -StopScript -WaitForSomething2 0x00000002 -_0807EB44 0x0002 -CallWithArg sub_0806AF60, 0x00000008 -WaitForSomething2 0x00000004 -Call sub_0806AED8 -WaitForSomething2 0x00000008 -Jump 0xff5c -TextboxNoOverlapFollow 0x4c16 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xff4a -StartScript -_0807E9D4 -_0807EF80 0x000a -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0016 -TestBit 0x00000001 -JumpIf 0x0068 -Call sub_0806AEE4 -Jump 0xffe4 -StopScript -_0807E864 -Call sub_0807DF28 -CheckLocalFlag 0x00ae -JumpIf 0x0078 -Wait 0x000a -_0807E5F8 0x00000001 -TextboxNoOverlapFollow 0x4c07 -_0807EA94 -_0807E5F8 0x00000002 -TextboxNoOverlapFollow 0x4c08 -_0807EA94 -_0807E5F8 0x00000004 -TextboxNoOverlapFollow 0x4c09 -_0807EA94 -_0807E914 0x00000503 -Call sub_0807F420 -_0807E5F8 0x00000008 -Call sub_0807DF50 -_0807E878 -SetLocalFlag 0x00ae -Jump 0xff88 -StopScript -WaitForSomething2 0x00000010 -_0807EB44 0x0006 -CallWithArg sub_0806AF60, 0x00000008 -WaitForSomething2 0x00000020 -Call sub_0806AED8 -WaitForSomething2 0x00000040 -Jump 0xff5c -TextboxNoOverlapFollow 0x4c15 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xff4a -TextboxNoOverlapFollow 0x4c07 -_0807EA94 -_0807E5F8 0x00000012 -Wait 0x000a -TextboxNoOverlapFollow 0x4c08 -_0807EA94 -_0807E5F8 0x00000024 -TextboxNoOverlapFollow 0x4c09 -_0807EA94 -_0807E5F8 0x00000048 -Call sub_080791BC + StartScript + Call sub_0806CE5C + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0008 + StopScript +script_0800EA6A: + CheckEntityInteractType + JumpIfNot script_0800EA6A + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806CE80 + _0807EA94 + _0807E878 + _0807E930 0x000a + Call sub_0807F2D4 + _0807E930 0x0008 + Jump script_0800EA6A + StartScript + _0807E9D4 + Call sub_0806C09C + _0807EF80 0x000a + _0807E930 0x0000 + _0807EB44 0x0004 + StopScript +script_0800EABC: + CheckEntityInteractType + JumpIfNot script_0800EABC + StartScript + _0807E864 + _0807EB74 + CallWithArg sub_0806C028, 0x00000004 + StopScript +script_0800EAD4: + Call sub_0806C00C + JumpIfNot script_0800EAD4 + _0807E930 0x0008 + Call sub_0806C038 + _0807EA94 + Wait 0x000f + _0807E878 + _0807E930 0x0000 + Jump script_0800EABC + StartScript + Call sub_0806C870 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript +script_0800EB0E: + _0807E30C + JumpIfNot script_0800EB0E + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800EB0E + .short 0x0000 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + StopScript +script_0800EB44: + CheckEntityInteractType + JumpIfNot script_0800EB44 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_0800EB44 + .short 0x0000 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0006 + Call sub_08061FD8 + StopScript +script_0800EB7C: + CheckEntityInteractType + JumpIfNot script_0800EB7C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + _0807EB44 0x0006 + Call sub_08061FD8 + Jump script_0800EB7C + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0002 + Call sub_08061FD8 + StopScript + Jump script_0800EBF4 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + StopScript + Jump script_0800EBF4 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0006 + Call sub_08061FD8 + StopScript +script_0800EBF4: + CheckEntityInteractType + JumpIfNot script_0800EBF4 + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_0800EBF4 + .short 0x0000 + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0002 + Call sub_08061FD8 + StopScript +script_0800EC2C: + CheckEntityInteractType + JumpIfNot script_0800EC2C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + _0807EB44 0x0002 + Call sub_08061FD8 + Jump script_0800EC2C + StartScript + Call sub_08061E70 + _0807EF80 0x000a + _0807EB44 0x0004 + Call sub_08061FD8 + StopScript +script_0800EC6C: + CheckEntityInteractType + JumpIfNot script_0800EC6C + _0807E864 + _0807EB74 + Call sub_08061FD8 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_0800EC6C + .short 0x0000 + StartScript + _0807E9D4 + CallWithArg sub_08061FB8, 0x00000001 + SetEntityNonPlanarMovement 0x0040 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0002 + StopScript +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 + StartScript + Call sub_080639D0 + _0807EF80 0x000a + StopScript + StartScript + CallWithArg sub_08063850, 0x00000000 + StopScript +script_0800ED20: + CheckEntityInteractType + JumpIfNot script_0800ED20 + _0807E864 + _0807EB74 + CallWithArg sub_08063850, 0x00000000 + Call sub_08063944 + _0807EA94 + JumpIfNot script_0800ED46 + _0807F050 0x0070 + WaitPlayerAction8 +script_0800ED46: + _0807E878 + Call sub_08063874 + CallWithArg sub_08063850, 0x00000000 + Jump script_0800ED20 + StartScript + Call sub_08064CC0 + _0807EF80 0x000a + _0807EF80 0x0007 + _0807EB44 0x0002 + _0807E930 0x0000 + StopScript +script_0800ED76: + _0807E944 + _0807E864 + _0807EB74 + Call sub_08064CD8 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800ED76 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a +script_0800ED98: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800EDB6 + TestBit 0x00000001 + JumpIf script_0800EE12 + Call sub_0806AEE4 + Jump script_0800ED98 +script_0800EDB6: + StopScript + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x00ae + JumpIf script_0800EE3E + Wait 0x000a + _0807E5F8 0x00000001 + TextboxNoOverlapFollow 0x4c07 + _0807EA94 + _0807E5F8 0x00000010 + TextboxNoOverlapFollow 0x4c08 + _0807EA94 + _0807E5F8 0x00000020 + TextboxNoOverlapFollow 0x4c09 + _0807EA94 + _0807E914 0x00000503 + Call sub_0807F420 + _0807E5F8 0x00000040 + Call sub_0807DF50 + _0807E878 + SetLocalFlag 0x00ae + Jump script_0800ED98 +script_0800EE12: + StopScript + WaitForSomething2 0x00000002 + _0807EB44 0x0002 + CallWithArg sub_0806AF60, 0x00000008 + WaitForSomething2 0x00000004 + Call sub_0806AED8 + WaitForSomething2 0x00000008 + Jump script_0800ED98 +script_0800EE3E: + TextboxNoOverlapFollow 0x4c16 + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_0800ED98 + StartScript + _0807E9D4 + _0807EF80 0x000a +script_0800EE58: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0800EE76 + TestBit 0x00000001 + JumpIf script_0800EED2 + Call sub_0806AEE4 + Jump script_0800EE58 +script_0800EE76: + StopScript + _0807E864 + Call sub_0807DF28 + CheckLocalFlag 0x00ae + JumpIf script_0800EEFE + Wait 0x000a + _0807E5F8 0x00000001 + TextboxNoOverlapFollow 0x4c07 + _0807EA94 + _0807E5F8 0x00000002 + TextboxNoOverlapFollow 0x4c08 + _0807EA94 + _0807E5F8 0x00000004 + TextboxNoOverlapFollow 0x4c09 + _0807EA94 + _0807E914 0x00000503 + Call sub_0807F420 + _0807E5F8 0x00000008 + Call sub_0807DF50 + _0807E878 + SetLocalFlag 0x00ae + Jump script_0800EE58 +script_0800EED2: + StopScript + WaitForSomething2 0x00000010 + _0807EB44 0x0006 + CallWithArg sub_0806AF60, 0x00000008 + WaitForSomething2 0x00000020 + Call sub_0806AED8 + WaitForSomething2 0x00000040 + Jump script_0800EE58 +script_0800EEFE: + TextboxNoOverlapFollow 0x4c15 + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_0800EE58 + TextboxNoOverlapFollow 0x4c07 + _0807EA94 + _0807E5F8 0x00000012 + Wait 0x000a + TextboxNoOverlapFollow 0x4c08 + _0807EA94 + _0807E5F8 0x00000024 + TextboxNoOverlapFollow 0x4c09 + _0807EA94 + _0807E5F8 0x00000048 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index 88068427..ac9171e9 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -1,26 +1,29 @@ SCRIPT_START script_0800EF40 -StartScript -_0807EF80 0x0007 -CheckGlobalFlag 0x001f -JumpIf 0x0046 -StopScript -Call sub_080869A4 -JumpIfNot 0xfff8 -_0807E864 -CheckLocalFlagByOffset 0x0200, 0x006d -JumpIf 0x001e -TextboxNoOverlapFollow 0x4d01 -_0807EA94 -StartPlayerScript script_0800EF9C -WaitForSomething2 0x00000001 -Wait 0x000f -_0807E878 -Jump 0xffd0 -SetGlobalFlag 0x001f -TextboxNoOverlapFollow 0x4d02 -_0807EA94 -Wait 0x000f -_0807E878 -Call sub_0808692C + StartScript + _0807EF80 0x0007 + CheckGlobalFlag 0x001f + JumpIf script_0800EF92 + StopScript +script_0800EF50: + Call sub_080869A4 + JumpIfNot script_0800EF50 + _0807E864 + CheckLocalFlagByOffset 0x0200, 0x006d + JumpIf script_0800EF82 + TextboxNoOverlapFollow 0x4d01 + _0807EA94 + StartPlayerScript script_0800EF9C + WaitForSomething2 0x00000001 + Wait 0x000f + _0807E878 + Jump script_0800EF50 +script_0800EF82: + SetGlobalFlag 0x001f + TextboxNoOverlapFollow 0x4d02 + _0807EA94 + Wait 0x000f + _0807E878 +script_0800EF92: + Call sub_0808692C SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index f595e913..3b34ef6f 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0800EF9C -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807ECC4 0x0008 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807ECC4 0x0008 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index b9f57673..d6e86144 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -1,86 +1,91 @@ SCRIPT_START script_0800EFC0 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807E9D4 -_0807EF80 0x000a -CheckLocalFlag 0x007b -JumpIf 0x00b0 -StopScript -Jump 0x0026 -_0807EB44 0x0006 -CallWithArg sub_0806AF60, 0x00000008 -Wait 0x0004 -_0807EB44 0x0004 -CallWithArg sub_0806AF60, 0x00000008 -Wait 0x0004 -_0807EB44 0x0002 -CallWithArg sub_0806AF60, 0x00000008 -Wait 0x0004 -_0807EB44 0x0002 -CallWithArg sub_0806AF60, 0x00000004 -_0807EDD4 0x0088, 0x0040 -_0807EF80 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 -_0807EF80 0x000a -CheckLocalFlag 0x007b -JumpIf 0x0006 -Jump 0xff5a -StopScript -Call sub_0806AEE4 -Jump 0xfff6 -.short 0x0000 -StartScript -_0807F0B4 0x0001 -CameraTargetPlayer -StopScript -CheckPlayerInRegion 0x01f8, 0x0338, 0x1030 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -LoadRoomEntityList gUnk_080EE8AC -StartPlayerScript script_0800F14C -WaitForSomething2 0x00000001 -_0807E5F8 0x0000001e -WaitForSomething2 0x00000040 -TextboxNoOverlapFollowPos 0x000c1201 -_0807EA94 -WaitForSomething2 0x000003c0 -_0807E8E4_0 -TextboxNoOverlapFollowPos 0x000c1202 -_0807EA94 -_0807F034 0x0067 -WaitPlayerAction8 -_0807E8E4_0 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000040 -TextboxNoOverlapFollowPos 0x000c1203 -_0807EA94 -_0807E5F8 0x00000002 -Call sub_0807DF50 -_0807E878 -WaitForSomething2 0x00000040 -CheckKinstoneFused 0x0032 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807DF28 -_0807E5F8 0x0000001e -Wait 0x003c -_0807E8E4_1 -WaitForSomething2 0x000003c0 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807E9D4 + _0807EF80 0x000a + CheckLocalFlag 0x007b + JumpIf script_0800F082 + StopScript + 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 + _0807EF80 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 + _0807EF80 0x000a + CheckLocalFlag 0x007b + JumpIf script_0800F082 + Jump script_0800EFDA +script_0800F082: + StopScript + Call sub_0806AEE4 + Jump script_0800F082 + .short 0x0000 + StartScript + _0807F0B4 0x0001 + CameraTargetPlayer + StopScript +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 + TextboxNoOverlapFollowPos 0x000c1201 + _0807EA94 + WaitForSomething2 0x000003c0 + _0807E8E4_0 + TextboxNoOverlapFollowPos 0x000c1202 + _0807EA94 + _0807F034 0x0067 + WaitPlayerAction8 + _0807E8E4_0 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000040 + TextboxNoOverlapFollowPos 0x000c1203 + _0807EA94 + _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 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F14C.inc b/data/scripts/script_0800F14C.inc index ef9c6782..caf956b4 100644 --- a/data/scripts/script_0800F14C.inc +++ b/data/scripts/script_0800F14C.inc @@ -1,15 +1,15 @@ SCRIPT_START script_0800F14C -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0000 -_0807EB44 0x0006 -_0807EF80 0x0004 -Wait 0x003c -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0338 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0000 + _0807EB44 0x0006 + _0807EF80 0x0004 + Wait 0x003c + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0338 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800F184.inc b/data/scripts/script_0800F184.inc index d7085d14..0970d0a9 100644 --- a/data/scripts/script_0800F184.inc +++ b/data/scripts/script_0800F184.inc @@ -1,107 +1,113 @@ SCRIPT_START script_0800F184 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0008 -_0807EF80 0x000a -StopScript -Call sub_0807F348 -_0807EB44 0x0002 -WaitForSomething2 0x00000002 -_0807EF80 0x0007 -_0807EDD4 0x01b8, 0x0328 -_0807E5F8 0x00000040 -_0807EDD4 0x01f8, 0x0328 -_0807EB44 0x0004 -_0807E930 0x0008 -_0807E8E4_0 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000002 -Call sub_0806E440 -Wait 0x0078 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000002 -StopScript -StartScript -CallWithArg sub_0807F680, 0x000001c0 -JumpIf 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000c1206 -_0807EA94 -StartPlayerScript script_0800F33C -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xffbe -CallWithArg sub_0807F680, 0x00000230 -JumpIfNot 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000c1206 -_0807EA94 -StartPlayerScript script_0800F354 -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xff7e -CallWithArg sub_0807F6B4, 0x00000310 -JumpIf 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000c1206 -_0807EA94 -StartPlayerScript script_0800F36C -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xff3e -CallWithArg sub_0807F6B4, 0x00000340 -JumpIfNot 0x0034 -StopScript -_0807E864 -Call sub_0807F9A4 -_0807EB74 -_0807E930 0x0008 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000c1206 -_0807EA94 -StartPlayerScript script_0800F384 -WaitForSomething2 0x00000400 -_0807E878 -Jump 0xfefe -StopScript -StartScript -CheckKinstoneFused 0x0032 -JumpIf 0x0020 -CheckEntityInteractType -JumpIfNot 0xfff0 -StopScript -_0807E864 -_0807EB74 -_0807E930 0x0008 -TextboxNoOverlapFollowPos 0x000c1208 -_0807EA94 -_0807E878 -Jump 0xfed4 -StopScript -_0807E5F8 0x00000040 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0002 -_0807EEF4 0x00c0, 0x0000 -_0807E5F8 0x00000040 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0008 + _0807EF80 0x000a + StopScript + Call sub_0807F348 + _0807EB44 0x0002 + WaitForSomething2 0x00000002 + _0807EF80 0x0007 + _0807EDD4 0x01b8, 0x0328 + _0807E5F8 0x00000040 + _0807EDD4 0x01f8, 0x0328 + _0807EB44 0x0004 + _0807E930 0x0008 + _0807E8E4_0 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000002 + Call sub_0806E440 + Wait 0x0078 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000002 +script_0800F1E6: + StopScript + StartScript + CallWithArg sub_0807F680, 0x000001c0 + JumpIf script_0800F22A + StopScript + _0807E864 + Call sub_0807F9A4 + _0807EB74 + _0807E930 0x0008 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000c1206 + _0807EA94 + StartPlayerScript script_0800F33C + WaitForSomething2 0x00000400 + _0807E878 + Jump script_0800F1E6 +script_0800F22A: + CallWithArg sub_0807F680, 0x00000230 + JumpIfNot script_0800F26A + StopScript + _0807E864 + Call sub_0807F9A4 + _0807EB74 + _0807E930 0x0008 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000c1206 + _0807EA94 + StartPlayerScript script_0800F354 + WaitForSomething2 0x00000400 + _0807E878 + Jump script_0800F1E6 +script_0800F26A: + CallWithArg sub_0807F6B4, 0x00000310 + JumpIf script_0800F2AA + StopScript + _0807E864 + Call sub_0807F9A4 + _0807EB74 + _0807E930 0x0008 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000c1206 + _0807EA94 + StartPlayerScript script_0800F36C + WaitForSomething2 0x00000400 + _0807E878 + Jump script_0800F1E6 +script_0800F2AA: + CallWithArg sub_0807F6B4, 0x00000340 + JumpIfNot script_0800F2EA + StopScript + _0807E864 + Call sub_0807F9A4 + _0807EB74 + _0807E930 0x0008 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000c1206 + _0807EA94 + StartPlayerScript script_0800F384 + WaitForSomething2 0x00000400 + _0807E878 + Jump script_0800F1E6 +script_0800F2EA: + StopScript + StartScript + CheckKinstoneFused 0x0032 + JumpIf script_0800F314 + CheckEntityInteractType + JumpIfNot script_0800F2EA + StopScript + _0807E864 + _0807EB74 + _0807E930 0x0008 + TextboxNoOverlapFollowPos 0x000c1208 + _0807EA94 + _0807E878 + Jump script_0800F1E6 +script_0800F314: + StopScript + _0807E5F8 0x00000040 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0002 + _0807EEF4 0x00c0, 0x0000 + _0807E5F8 0x00000040 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc index dc1f6082..7fa6f67e 100644 --- a/data/scripts/script_0800F33C.inc +++ b/data/scripts/script_0800F33C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F33C -SetEntityNonPlanarMovement 0x0100 -_0807EC94 0x0008 -_0807E5F8 0x00000400 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EC94 0x0008 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc index 5c1f73fc..faa7609d 100644 --- a/data/scripts/script_0800F354.inc +++ b/data/scripts/script_0800F354.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F354 -SetEntityNonPlanarMovement 0x0100 -_0807ECF4 0x0008 -_0807E5F8 0x00000400 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807ECF4 0x0008 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc index bbcf2d2d..3f5d8959 100644 --- a/data/scripts/script_0800F36C.inc +++ b/data/scripts/script_0800F36C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F36C -SetEntityNonPlanarMovement 0x0100 -_0807ECC4 0x0008 -_0807E5F8 0x00000400 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807ECC4 0x0008 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc index 73715ca6..349b1715 100644 --- a/data/scripts/script_0800F384.inc +++ b/data/scripts/script_0800F384.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800F384 -SetEntityNonPlanarMovement 0x0100 -_0807EC64 0x0008 -_0807E5F8 0x00000400 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EC64 0x0008 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F39C.inc b/data/scripts/script_0800F39C.inc index c1b6971f..2bd4c895 100644 --- a/data/scripts/script_0800F39C.inc +++ b/data/scripts/script_0800F39C.inc @@ -1,40 +1,42 @@ SCRIPT_START script_0800F39C -StartScript -_0807E9D4 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000b -StopScript -Call sub_0807F348 -WaitForSomething2 0x00000004 -_0807EF80 0x0007 -_0807EDD4 0x01f8, 0x0318 -_0807EDD4 0x0208, 0x0318 -_0807EDD4 0x0208, 0x0338 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E5F8 0x00000080 -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0x0010 -StopScript -_0807E864 -_0807EB74 -TextboxNoOverlap 0x1237 -_0807EA94 -_0807E878 -TestBit 0x00000004 -JumpIfNot 0xffe0 -StopScript -_0807EF80 0x000b -Wait 0x0010 -SetEntityNonPlanarMovement 0x0100 -_0807EC64 0x0010 -_0807EDD4 0x0288, 0x0328 -_0807E5F8 0x00000080 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x000b + StopScript + Call sub_0807F348 + WaitForSomething2 0x00000004 + _0807EF80 0x0007 + _0807EDD4 0x01f8, 0x0318 + _0807EDD4 0x0208, 0x0318 + _0807EDD4 0x0208, 0x0338 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E5F8 0x00000080 +script_0800F3EA: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_0800F402 + StopScript + _0807E864 + _0807EB74 + TextboxNoOverlap 0x1237 + _0807EA94 + _0807E878 +script_0800F402: + TestBit 0x00000004 + JumpIfNot script_0800F3EA + StopScript + _0807EF80 0x000b + Wait 0x0010 + SetEntityNonPlanarMovement 0x0100 + _0807EC64 0x0010 + _0807EDD4 0x0288, 0x0328 + _0807E5F8 0x00000080 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 224af45b..1eb6f57c 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -1,41 +1,43 @@ SCRIPT_START script_0800F430 -StartScript -_0807E9D4 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000b -StopScript -Call sub_0807F348 -WaitForSomething2 0x00000008 -_0807EF80 0x0007 -_0807EDD4 0x01d8, 0x0328 -_0807EDD4 0x01f8, 0x0348 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E5F8 0x00000100 -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0x0010 -StopScript -_0807E864 -_0807EB74 -TextboxNoOverlap 0x1238 -_0807EA94 -_0807E878 -TestBit 0x00000008 -JumpIfNot 0xffe0 -StopScript -_0807EF80 0x000b -Wait 0x0018 -SetEntityNonPlanarMovement 0x0100 -_0807EC94 0x0010 -_0807EC64 0x0020 -_0807EDD4 0x0288, 0x0328 -_0807E5F8 0x00000100 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x000b + StopScript + Call sub_0807F348 + WaitForSomething2 0x00000008 + _0807EF80 0x0007 + _0807EDD4 0x01d8, 0x0328 + _0807EDD4 0x01f8, 0x0348 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E5F8 0x00000100 +script_0800F478: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_0800F490 + StopScript + _0807E864 + _0807EB74 + TextboxNoOverlap 0x1238 + _0807EA94 + _0807E878 +script_0800F490: + TestBit 0x00000008 + JumpIfNot script_0800F478 + StopScript + _0807EF80 0x000b + Wait 0x0018 + SetEntityNonPlanarMovement 0x0100 + _0807EC94 0x0010 + _0807EC64 0x0020 + _0807EDD4 0x0288, 0x0328 + _0807E5F8 0x00000100 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index b8d07b80..f3fe6d92 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -1,40 +1,42 @@ SCRIPT_START script_0800F4C4 -StartScript -_0807E9D4 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000b -StopScript -Call sub_0807F348 -WaitForSomething2 0x00000010 -_0807EF80 0x0007 -_0807EDD4 0x01c8, 0x0328 -_0807EDD4 0x01e8, 0x0338 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E5F8 0x00000200 -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0x0010 -StopScript -_0807E864 -_0807EB74 -TextboxNoOverlap 0x1239 -_0807EA94 -_0807E878 -TestBit 0x00000010 -JumpIfNot 0xffe0 -StopScript -_0807EF80 0x000b -Wait 0x0028 -SetEntityNonPlanarMovement 0x0100 -_0807EC64 0x0010 -_0807EDD4 0x0288, 0x0328 -_0807E5F8 0x00000200 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x000b + StopScript + Call sub_0807F348 + WaitForSomething2 0x00000010 + _0807EF80 0x0007 + _0807EDD4 0x01c8, 0x0328 + _0807EDD4 0x01e8, 0x0338 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E5F8 0x00000200 +script_0800F50C: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_0800F524 + StopScript + _0807E864 + _0807EB74 + TextboxNoOverlap 0x1239 + _0807EA94 + _0807E878 +script_0800F524: + TestBit 0x00000010 + JumpIfNot script_0800F50C + StopScript + _0807EF80 0x000b + Wait 0x0028 + SetEntityNonPlanarMovement 0x0100 + _0807EC64 0x0010 + _0807EDD4 0x0288, 0x0328 + _0807E5F8 0x00000200 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index 3a838c38..e67e84b7 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -1,139 +1,151 @@ SCRIPT_START script_0800F554 -StartScript -Call sub_08061FE4 -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FE4 -Call sub_08061FF4 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -_0807EF80 0x0001 -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -_0807EF80 0x0001 -Jump 0xffe6 -.short 0x0000 -StartScript -_0807EB44 0x0006 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000008 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_08064428 -_0807EA94 -_0807E878 -Jump 0xffe0 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -_0807E9D4 -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -TextboxNoOverlap 0x2511 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffde -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EF80 0x0001 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806B4F0 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -_0807E9D4 -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -CheckLocalFlag 0x00cd -JumpIf 0x000a -TextboxNoOverlap 0x2512 -Jump 0x0006 -TextboxNoOverlap 0x251f -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000000 -Jump 0xffc4 -.short 0x0000 -StartScript -_0807EF80 0x0001 -_0807E9D4 -_0807EF80 0x000a -Call sub_08062788 -StopScript -CheckLocalFlag 0x00cd -JumpIf 0x001e -CheckEntityInteractType -JumpIfNot 0xfff4 -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -_0807EF80 0x0001 -Jump 0xffde -Call sub_080627E8 -_0807EF80 0x0006 + StartScript + Call sub_08061FE4 + _0807E9D4 + _0807EF80 0x000a + StopScript +script_0800F564: + CheckEntityInteractType + JumpIfNot script_0800F564 + _0807E864 + _0807EB74 + Call sub_08061FE4 + Call sub_08061FF4 + _0807EA94 + _0807E878 + Jump script_0800F564 + .short 0x0000 +script_0800F584: + StartScript + _0807EF80 0x0001 + _0807E9D4 + _0807EF80 0x000a + StopScript +script_0800F592: + CheckEntityInteractType + JumpIfNot script_0800F592 + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + _0807E878 + _0807EF80 0x0001 + Jump script_0800F592 + .short 0x0000 + StartScript + _0807EB44 0x0006 + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000008 + StopScript +script_0800F5C8: + CheckEntityInteractType + JumpIfNot script_0800F5C8 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_08064428 + _0807EA94 + _0807E878 + Jump script_0800F5C8 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0000 + _0807E9D4 + _0807EF80 0x000a + Call sub_0807F348 + StopScript +script_0800F604: + CheckEntityInteractType + JumpIfNot script_0800F604 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + TextboxNoOverlap 0x2511 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800F604 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EF80 0x0001 + StopScript +script_0800F636: + _0807E30C + JumpIfNot script_0800F636 + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + _0807E878 + Jump script_0800F636 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E9D4 + StopScript +script_0800F662: + CheckEntityInteractType + JumpIfNot script_0800F662 + _0807E864 + _0807EB74 + _0807EF80 0x0001 + Call sub_0806B4F0 + _0807EA94 + Wait 0x000f + _0807E878 + _0807EF80 0x0000 + Jump script_0800F662 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E930 0x0000 + _0807E9D4 + _0807EF80 0x000a + Call sub_0807F348 + StopScript +script_0800F6A0: + CheckEntityInteractType + JumpIfNot script_0800F6A0 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + CheckLocalFlag 0x00cd + JumpIf script_0800F6C4 + TextboxNoOverlap 0x2512 + Jump script_0800F6C8 +script_0800F6C4: + TextboxNoOverlap 0x251f +script_0800F6C8: + _0807EA94 + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_0800F6A0 + .short 0x0000 + StartScript + _0807EF80 0x0001 + _0807E9D4 + _0807EF80 0x000a + Call sub_08062788 + StopScript +script_0800F6F4: + CheckLocalFlag 0x00cd + JumpIf script_0800F718 + CheckEntityInteractType + JumpIfNot script_0800F6F4 + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + _0807E878 + _0807EF80 0x0001 + Jump script_0800F6F4 +script_0800F718: + Call sub_080627E8 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 45a3d14b..2420d650 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -1,174 +1,176 @@ SCRIPT_START script_0800F724 -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x00cd -JumpIfNot 0xfffa -_0807EF80 0x0007 -Jump 0xfe4a -CheckLocalFlag 0x00cd -JumpIf 0x030a -_0807E864 -Call sub_0807DF28 -SetEntityPositionRelative 0x014800c8 -Call sub_0807F844 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -StartPlayerScript script_0800FA54 -_0807E5F8 0x00000002 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x021800c8 -Call sub_0807F5C0 -Wait 0x0064 -_0807F0B4 0x0002 -SetEntityPositionRelative 0x036800c8 -Call sub_0807F5C0 -WaitForSomething2 0x00000001 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x00002501 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000004 -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_0800FA78 -WaitForSomething2 0x00000001 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x000e2503 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Call sub_0807DF50 -_0807E878 -WaitForSomething2 0x00000004 -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_0800FA9C -WaitForSomething2 0x00000001 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x000e2504 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Call sub_0807DF50 -_0807E878 -WaitForSomething2 0x00000004 -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_0800FAC0 -WaitForSomething2 0x00000001 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -TextboxNoOverlapFollowPos 0x000e2505 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Call sub_0807DF50 -_0807E878 -WaitForSomething2 0x00000004 -_0807E864 -Call sub_0807DF28 -Call sub_08063C5C -SoundReq 0x00e2 -Wait 0x001e -_0807E8E4_0 -Call sub_0807F3F8 -Wait 0x003c -TextboxNoOverlapFollowPos 0x000e1021 -_0807EA94 -StartPlayerScript script_0800FAE4 -SetEntityPositionRelative 0x025800f0 -_0807F0B4 0x0001 -CameraTargetEntity -Wait 0x001e -Call sub_08063C2C -WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos 0x000e1022 -_0807EA94 -_0807E8E4_0 -Call sub_08063C14 -Call sub_08094CDC -Wait 0x001e -TextboxNoOverlapFollowPos 0x000e1023 -_0807EA94 -Call sub_08063C14 -Call sub_08094DD8 -Wait 0x001e -TextboxNoOverlapFollowPos 0x000e1024 -_0807EA94 -Call sub_08063C14 -Call sub_08094D34 -Wait 0x001e -TextboxNoOverlapFollowPos 0x000e1025 -_0807EA94 -Call sub_08063C5C -TextboxNoOverlapFollowPos 0x000e1026 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E8E4_1 -Call sub_08063C2C -TextboxNoOverlapFollowPos 0x00001027 -_0807EA94 -Call sub_08063C74 -Wait 0x003c -Call sub_08063C14 -_0807E8E4_0 -TextboxNoOverlapFollowPos 0x000e1028 -_0807EA94 -_0807E8E4_1 -TextboxNoOverlapFollowPos 0x00001029 -_0807EA94 -_0807E8E4_0 -TextboxNoOverlapFollowPos 0x000e102a -_0807EA94 -Call sub_08063C14 -Call sub_08094D70 -SoundReq 0x0103 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -Call sub_08063C14 -Call sub_08094D10 -Wait 0x001e -Call sub_08094E0C -Wait 0x001e -_0807E8E4_1 -Call sub_0807F3F8 -Wait 0x003c -TextboxNoOverlapFollowPos 0x0000102b -_0807EA94 -_0807F034 0x000d -WaitPlayerAction8 -Call sub_0806DC3C -Call sub_080791BC -CallWithArg sub_0807F244, 0x0000000d -_0807E914 0x000000ff -Call sub_0807F5B0 -CallWithArg sub_0807F29C, 0x080049d6 -Wait 0x00b7 -_0807E914 0x00000000 -Call sub_0807F5B0 -TextboxNoOverlapFollowPos 0x0000102c -_0807EA94 -CallWithArg sub_0807F29C, 0x00000000 -Call sub_0806DC58 -_0807F0B4 0x0004 -CameraTargetPlayer -Wait 0x000a -_0807E5F8 0x00000002 -Call sub_08063C44 -SetLocalFlag 0x00cd -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + StopScript +script_0800F72C: + CheckLocalFlag 0x00cd + JumpIfNot script_0800F72C + _0807EF80 0x0007 + Jump script_0800F584 + CheckLocalFlag 0x00cd + JumpIf script_0800FA4C + _0807E864 + Call sub_0807DF28 + SetEntityPositionRelative 0x014800c8 + Call sub_0807F844 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + StartPlayerScript script_0800FA54 + _0807E5F8 0x00000002 + _0807F0B4 0x0001 + SetEntityPositionRelative 0x021800c8 + Call sub_0807F5C0 + Wait 0x0064 + _0807F0B4 0x0002 + SetEntityPositionRelative 0x036800c8 + Call sub_0807F5C0 + WaitForSomething2 0x00000001 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x00002501 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807DF50 + _0807E878 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000004 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_0800FA78 + WaitForSomething2 0x00000001 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x000e2503 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + Call sub_0807DF50 + _0807E878 + WaitForSomething2 0x00000004 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_0800FA9C + WaitForSomething2 0x00000001 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x000e2504 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + Call sub_0807DF50 + _0807E878 + WaitForSomething2 0x00000004 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_0800FAC0 + WaitForSomething2 0x00000001 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + TextboxNoOverlapFollowPos 0x000e2505 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + Call sub_0807DF50 + _0807E878 + WaitForSomething2 0x00000004 + _0807E864 + Call sub_0807DF28 + Call sub_08063C5C + SoundReq 0x00e2 + Wait 0x001e + _0807E8E4_0 + Call sub_0807F3F8 + Wait 0x003c + TextboxNoOverlapFollowPos 0x000e1021 + _0807EA94 + StartPlayerScript script_0800FAE4 + SetEntityPositionRelative 0x025800f0 + _0807F0B4 0x0001 + CameraTargetEntity + Wait 0x001e + Call sub_08063C2C + WaitForSomething2 0x00000001 + TextboxNoOverlapFollowPos 0x000e1022 + _0807EA94 + _0807E8E4_0 + Call sub_08063C14 + Call sub_08094CDC + Wait 0x001e + TextboxNoOverlapFollowPos 0x000e1023 + _0807EA94 + Call sub_08063C14 + Call sub_08094DD8 + Wait 0x001e + TextboxNoOverlapFollowPos 0x000e1024 + _0807EA94 + Call sub_08063C14 + Call sub_08094D34 + Wait 0x001e + TextboxNoOverlapFollowPos 0x000e1025 + _0807EA94 + Call sub_08063C5C + TextboxNoOverlapFollowPos 0x000e1026 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E8E4_1 + Call sub_08063C2C + TextboxNoOverlapFollowPos 0x00001027 + _0807EA94 + Call sub_08063C74 + Wait 0x003c + Call sub_08063C14 + _0807E8E4_0 + TextboxNoOverlapFollowPos 0x000e1028 + _0807EA94 + _0807E8E4_1 + TextboxNoOverlapFollowPos 0x00001029 + _0807EA94 + _0807E8E4_0 + TextboxNoOverlapFollowPos 0x000e102a + _0807EA94 + Call sub_08063C14 + Call sub_08094D70 + SoundReq 0x0103 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + Call sub_08063C14 + Call sub_08094D10 + Wait 0x001e + Call sub_08094E0C + Wait 0x001e + _0807E8E4_1 + Call sub_0807F3F8 + Wait 0x003c + TextboxNoOverlapFollowPos 0x0000102b + _0807EA94 + _0807F034 0x000d + WaitPlayerAction8 + Call sub_0806DC3C + Call sub_080791BC + CallWithArg sub_0807F244, 0x0000000d + _0807E914 0x000000ff + Call sub_0807F5B0 + CallWithArg sub_0807F29C, 0x080049d6 + Wait 0x00b7 + _0807E914 0x00000000 + Call sub_0807F5B0 + TextboxNoOverlapFollowPos 0x0000102c + _0807EA94 + CallWithArg sub_0807F29C, 0x00000000 + Call sub_0806DC58 + _0807F0B4 0x0004 + CameraTargetPlayer + Wait 0x000a + _0807E5F8 0x00000002 + Call sub_08063C44 + SetLocalFlag 0x00cd + Call sub_0807DF50 + _0807E878 +script_0800FA4C: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800FA54.inc b/data/scripts/script_0800FA54.inc index f6eb72af..f81e8316 100644 --- a/data/scripts/script_0800FA54.inc +++ b/data/scripts/script_0800FA54.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800FA54 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -SetEntityPositionRelative 0x039800d8 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + SetEntityPositionRelative 0x039800d8 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA78.inc b/data/scripts/script_0800FA78.inc index 51fbf2e9..70a38166 100644 --- a/data/scripts/script_0800FA78.inc +++ b/data/scripts/script_0800FA78.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800FA78 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x00a0, 0x0278 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x00a0, 0x0278 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FA9C.inc b/data/scripts/script_0800FA9C.inc index 3e15877a..ae3e58e0 100644 --- a/data/scripts/script_0800FA9C.inc +++ b/data/scripts/script_0800FA9C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800FA9C -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0078, 0x01c0 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0078, 0x01c0 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAC0.inc b/data/scripts/script_0800FAC0.inc index 639b8be9..bfd30c11 100644 --- a/data/scripts/script_0800FAC0.inc +++ b/data/scripts/script_0800FAC0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_0800FAC0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0108, 0x01c8 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0108, 0x01c8 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FAE4.inc b/data/scripts/script_0800FAE4.inc index cd171e2e..6dc86894 100644 --- a/data/scripts/script_0800FAE4.inc +++ b/data/scripts/script_0800FAE4.inc @@ -1,14 +1,17 @@ SCRIPT_START script_0800FAE4 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -Call sub_0807F584 -_0807E078_ssss 0x0012, 0x001a, 0x000e, 0x0002 -CallWithArg sub_0807F4F8, 0x0000027c -CallWithArg sub_0807F464, 0x000000e8 -_0807EDD4 0x00e8, 0x0270 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + Call sub_0807F584 + JumpSwitch_4 script_0800FB06, script_0800FB10, script_0800FB06, script_0800FAFC +script_0800FAFC: + CallWithArg sub_0807F4F8, 0x0000027c +script_0800FB06: + CallWithArg sub_0807F464, 0x000000e8 +script_0800FB10: + _0807EDD4 0x00e8, 0x0270 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/script_0800FB2C.inc index 469f4278..bc358f9f 100644 --- a/data/scripts/script_0800FB2C.inc +++ b/data/scripts/script_0800FB2C.inc @@ -1,7 +1,7 @@ SCRIPT_START script_0800FB2C -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800FB44.inc b/data/scripts/script_0800FB44.inc index 829881ce..b741e922 100644 --- a/data/scripts/script_0800FB44.inc +++ b/data/scripts/script_0800FB44.inc @@ -1,100 +1,105 @@ SCRIPT_START script_0800FB44 -StartScript -_0807EF80 0x0008 -_0807EF80 0x000b -SetEntityNonPlanarMovement 0x0080 -Call sub_08066D04 -StopScript -WaitForSomething2 0x00000002 -Call sub_08066D14 -JumpIf 0x0004 -MoveEntityToPlayer -_0807EF80 0x0007 -SetEntityPositionRelative 0x039800b8 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x00b8, 0x0318 -SetEntityPositionRelative 0x026000a0 -_0807EB44 0x0000 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -_0807E9D4 -_0807E30C -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x00a0, 0x0268 -_0807EDD4 0x0070, 0x0268 -_0807EDD4 0x0070, 0x0208 -SetEntityPositionRelative 0x01a80078 -_0807EB44 0x0000 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -_0807E30C -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x00f8, 0x01a8 -SetEntityPositionRelative 0x01c80118 -_0807EB44 0x0002 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -_0807E30C -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x0200 -_0807EDD4 0x0118, 0x0260 -SetEntityPositionRelative 0x027000f8 -_0807EB44 0x0000 -_0807EF80 0x0001 -_0807E5F8 0x00000004 -_0807EF80 0x000a -CheckEntityInteractType -JumpIfNot 0xfffc -_0807EF80 0x000b -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -_0807EF80 0x0004 -WaitForSomething2 0x00000002 -_0807EF80 0x000d -SetEntityNonPlanarMovement 0x0040 -_0807EC94 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EF80 0x000c -SetEntityNonPlanarMovement 0x0040 -_0807ECF4 0x0020 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -Call sub_08066D4C -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EF80 0x000b + SetEntityNonPlanarMovement 0x0080 + Call sub_08066D04 + StopScript + WaitForSomething2 0x00000002 + Call sub_08066D14 + JumpIf script_0800FB6C + MoveEntityToPlayer +script_0800FB6C: + _0807EF80 0x0007 + SetEntityPositionRelative 0x039800b8 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0200 + _0807EDD4 0x00b8, 0x0318 + SetEntityPositionRelative 0x026000a0 + _0807EB44 0x0000 + _0807EF80 0x0001 + _0807E5F8 0x00000004 + _0807EF80 0x000a + _0807E9D4 +script_0800FBAE: + _0807E30C + JumpIfNot script_0800FBAE + _0807EF80 0x000b + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0200 + _0807EDD4 0x00a0, 0x0268 + _0807EDD4 0x0070, 0x0268 + _0807EDD4 0x0070, 0x0208 + SetEntityPositionRelative 0x01a80078 + _0807EB44 0x0000 + _0807EF80 0x0001 + _0807E5F8 0x00000004 + _0807EF80 0x000a +script_0800FC06: + _0807E30C + JumpIfNot script_0800FC06 + _0807EF80 0x000b + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0200 + _0807EDD4 0x00f8, 0x01a8 + SetEntityPositionRelative 0x01c80118 + _0807EB44 0x0002 + _0807EF80 0x0001 + _0807E5F8 0x00000004 + _0807EF80 0x000a +script_0800FC52: + _0807E30C + JumpIfNot script_0800FC52 + _0807EF80 0x000b + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x0200 + _0807EDD4 0x0118, 0x0260 + SetEntityPositionRelative 0x027000f8 + _0807EB44 0x0000 + _0807EF80 0x0001 + _0807E5F8 0x00000004 + _0807EF80 0x000a +script_0800FC9E: + CheckEntityInteractType + JumpIfNot script_0800FC9E + _0807EF80 0x000b + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + _0807EF80 0x0004 + WaitForSomething2 0x00000002 + _0807EF80 0x000d + SetEntityNonPlanarMovement 0x0040 + _0807EC94 0x0020 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EF80 0x000c + SetEntityNonPlanarMovement 0x0040 + _0807ECF4 0x0020 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + Call sub_08066D4C + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index 301295b4..e3f8b423 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -1,27 +1,30 @@ SCRIPT_START script_0800FD0C -CheckLocalFlag 0x00cd -JumpIf 0x003e -WaitForSomething2 0x00000010 -CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 -JumpIfNot 0xfff6 -CheckLocalFlag 0x00cd -JumpIf 0x0030 -_0807E864 -Call sub_0807F9A4 -TextboxNoOverlapFollowPos 0x00002506 -_0807EA94 -StartPlayerScript script_0800FD80 -WaitForSomething2 0x00000008 -_0807E878 -Jump 0xffcc -CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -TextboxNoOverlapFollowPos 0x0000106c -_0807EA94 -StartPlayerScript script_0800FD80 -WaitForSomething2 0x00000008 -_0807E878 -Jump 0xffd4 -.short 0x0000 + CheckLocalFlag 0x00cd + JumpIf script_0800FD50 + WaitForSomething2 0x00000010 +script_0800FD1A: + CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 + JumpIfNot script_0800FD1A + CheckLocalFlag 0x00cd + JumpIf script_0800FD5C + _0807E864 + Call sub_0807F9A4 + TextboxNoOverlapFollowPos 0x00002506 + _0807EA94 + StartPlayerScript script_0800FD80 + WaitForSomething2 0x00000008 + _0807E878 + Jump script_0800FD1A +script_0800FD50: + CheckPlayerInRegion 0x00c8, 0x03c0, 0x1040 + JumpIfNot script_0800FD50 +script_0800FD5C: + _0807E864 + Call sub_0807F9A4 + TextboxNoOverlapFollowPos 0x0000106c + _0807EA94 + StartPlayerScript script_0800FD80 + WaitForSomething2 0x00000008 + _0807E878 + Jump script_0800FD50 + .short 0x0000 diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc index d78afb7c..d95b4687 100644 --- a/data/scripts/script_0800FD80.inc +++ b/data/scripts/script_0800FD80.inc @@ -1,9 +1,9 @@ SCRIPT_START script_0800FD80 -SetEntityNonPlanarMovement 0x0080 -_0807EC64 0x0020 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0080 + _0807EC64 0x0020 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index 29f45131..fcbc78bd 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -1,105 +1,116 @@ SCRIPT_START script_0800FDA0 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08069888 -_0807EA94 -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -SetEntityNonPlanarMovement 0x0040 -StopScript -Call sub_08069A60 -Call sub_0806991C -StopScript -StartScript -Call sub_08069ACC -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffee -Jump 0xffde -StopScript -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x003c -Call sub_08069A3C -Jump 0xffa8 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -SetEntityNonPlanarMovement 0x0040 -StopScript -Call sub_08069AA8 -Call sub_080699AC -StopScript -StartScript -Call sub_08069ACC -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffee -Jump 0xffde -StopScript -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0002 -_0807EF80 0x0000 -Wait 0x001e -_0807EB44 0x0006 -_0807EF80 0x0000 -Wait 0x003c -Call sub_08069A84 -Jump 0xffa8 -.short 0x0000 -StartScript -CheckInventory1 0x0012 -JumpIf 0x004a -_0807EB44 0x0006 -_0807E9D4 -CallWithArg sub_0807F3D8, 0x00000008 -StopScript -StopScript -StartScript -_0807EF80 0x000b -Call sub_080642B8 -CheckEntityInteractType -JumpIfNot 0xffee -StopScript -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_08064428 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffcc -_0807EF80 0x0008 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E9D4 + StopScript +script_0800FDB2: + CheckEntityInteractType + JumpIfNot script_0800FDB2 + _0807E864 + _0807EB74 + Call sub_08069888 + _0807EA94 + _0807E878 + Jump script_0800FDB2 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E9D4 + SetEntityNonPlanarMovement 0x0040 + StopScript +script_0800FDE2: + Call sub_08069A60 +script_0800FDE8: + Call sub_0806991C +script_0800FDEE: + StopScript + StartScript + Call sub_08069ACC + JumpIf script_0800FE06 + _0807EE30 + JumpIfNot script_0800FDEE + Jump script_0800FDE2 +script_0800FE06: + StopScript + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x003c + Call sub_08069A3C + Jump script_0800FDE8 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E9D4 + SetEntityNonPlanarMovement 0x0040 + StopScript +script_0800FE5A: + Call sub_08069AA8 +script_0800FE60: + Call sub_080699AC +script_0800FE66: + StopScript + StartScript + Call sub_08069ACC + JumpIf script_0800FE7E + _0807EE30 + JumpIfNot script_0800FE66 + Jump script_0800FE5A +script_0800FE7E: + StopScript + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0002 + _0807EF80 0x0000 + Wait 0x001e + _0807EB44 0x0006 + _0807EF80 0x0000 + Wait 0x003c + Call sub_08069A84 + Jump script_0800FE60 + .short 0x0000 + StartScript + CheckInventory1 0x0012 + JumpIf script_0800FF0E + _0807EB44 0x0006 + _0807E9D4 + CallWithArg sub_0807F3D8, 0x00000008 + StopScript +script_0800FED8: + StopScript + StartScript + _0807EF80 0x000b + Call sub_080642B8 + CheckEntityInteractType + JumpIfNot script_0800FED8 + StopScript + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_08064428 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800FED8 +script_0800FF0E: + _0807EF80 0x0008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FF18.inc b/data/scripts/script_0800FF18.inc index eb89f772..2f212a83 100644 --- a/data/scripts/script_0800FF18.inc +++ b/data/scripts/script_0800FF18.inc @@ -1,26 +1,28 @@ SCRIPT_START script_0800FF18 -StartScript -CheckInventory1 0x0012 -JumpIf 0x004a -_0807EB44 0x0006 -_0807E9D4 -CallWithArg sub_0807F3D8, 0x00000008 -StopScript -StopScript -StartScript -_0807EF80 0x000b -Call sub_08064198 -CheckEntityInteractType -JumpIfNot 0xffee -StopScript -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_08064428 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffcc -_0807EF80 0x0008 -_0807EF80 0x0006 + StartScript + CheckInventory1 0x0012 + JumpIf script_0800FF6A + _0807EB44 0x0006 + _0807E9D4 + CallWithArg sub_0807F3D8, 0x00000008 + StopScript +script_0800FF34: + StopScript + StartScript + _0807EF80 0x000b + Call sub_08064198 + CheckEntityInteractType + JumpIfNot script_0800FF34 + StopScript + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_08064428 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0800FF34 +script_0800FF6A: + _0807EF80 0x0008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index f48107eb..58b01a6e 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -1,83 +1,90 @@ SCRIPT_START script_0800FF74 -StartScript -_0807EB44 0x0002 -_0807E9D4 -CallWithArg sub_0807F3D8, 0x00000008 -Call sub_080644A4 -ClearLocalFlag 0x00c7 -StopScript -StopScript -StartScript -_0807EF80 0x000a -CheckLocalFlag 0x00ce -JumpIf 0x002c -_0807EF80 0x000b -Call sub_08064198 -CheckLocalFlag 0x00c7 -JumpIfNot 0x001a -Call sub_08064488 -CheckPlayerInRegion2 0x4040 -JumpIfNot 0x000c -Call sub_08064470 -JumpIf 0x004a -CheckEntityInteractType -JumpIfNot 0xffc2 -StopScript -SetLocalFlag 0x00c7 -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -CheckInventory1 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x3401 -_0807EA94 -Jump 0x006a -CheckLocalFlag 0x00ce -JumpIfNot 0x000c -TextboxNoOverlap 0x340b -_0807EA94 -Jump 0x0058 -TextboxNoOverlap 0x3402 -_0807EA94 -Jump 0x004e -StopScript -_0807E888 -Call sub_0807F594 -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -SoundReq 0x00cd -TextboxNoOverlap 0x340a -_0807EA94 -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x0000000c -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0018, 0x0108 -_0807EB44 0x0002 -CallWithArg sub_0807F3D8, 0x00000008 -SetLocalFlag 0x00ce -Call sub_080644A4 -CallWithArg sub_0807F5B0, 0x0000000a -_0807E878 -Jump 0xff1e -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_080672B0, 0x00000004 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 -Jump 0xffd0 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0002 + _0807E9D4 + CallWithArg sub_0807F3D8, 0x00000008 + Call sub_080644A4 + ClearLocalFlag 0x00c7 + StopScript +script_0800FF92: + StopScript + StartScript + _0807EF80 0x000a + CheckLocalFlag 0x00ce + JumpIf script_0800FFCC + _0807EF80 0x000b + Call sub_08064198 + CheckLocalFlag 0x00c7 + JumpIfNot script_0800FFCC + Call sub_08064488 + CheckPlayerInRegion2 0x4040 + JumpIfNot script_0800FFCC + Call sub_08064470 + JumpIf script_08010014 +script_0800FFCC: + CheckEntityInteractType + JumpIfNot script_0800FF92 + StopScript + SetLocalFlag 0x00c7 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + CheckInventory1 0x0048 + JumpIf script_0800FFF8 + TextboxNoOverlap 0x3401 + _0807EA94 + Jump script_08010060 +script_0800FFF8: + CheckLocalFlag 0x00ce + JumpIfNot script_0801000A + TextboxNoOverlap 0x340b + _0807EA94 + Jump script_08010060 +script_0801000A: + TextboxNoOverlap 0x3402 + _0807EA94 + Jump script_08010060 +script_08010014: + StopScript + _0807E888 + Call sub_0807F594 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + SoundReq 0x00cd + TextboxNoOverlap 0x340a + _0807EA94 + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x0000000c + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0018, 0x0108 + _0807EB44 0x0002 + CallWithArg sub_0807F3D8, 0x00000008 + SetLocalFlag 0x00ce +script_08010060: + Call sub_080644A4 + CallWithArg sub_0807F5B0, 0x0000000a + _0807E878 + Jump script_0800FF92 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + StopScript +script_08010090: + CheckEntityInteractType + JumpIfNot script_08010090 + _0807E864 + _0807EB74 + CallWithArg sub_080672B0, 0x00000004 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + Wait 0x000f + _0807E878 + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + Jump script_08010090 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index ee3ed7d3..462aa194 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -1,111 +1,118 @@ SCRIPT_START script_080100C8 -StartScript -Call sub_08061FE4 -Call sub_08061E70 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08061FE4 -Call sub_08062048 -_0807EA94 -_0807E878 -Jump 0xffe4 -.short 0x0000 -StartScript -Call sub_08061FE4 -Call sub_08061E70 -_0807EF80 0x000a -StopScript -Wait 0x003c -Call sub_08061E90 -Jump 0xfff4 -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x4f22 -_0807EA94 -_0807E878 -Jump 0xffec -StartScript -_0807EF80 0x0001 -Call sub_0806C354 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CheckRoomFlag 0x0001 -JumpIf 0x0034 -TextboxNoOverlapFollowPos 0x00003001 -_0807EA94 -_0807E3E8 -JumpIfNot 0x002e -Call sub_080A1608 -_0807EA94 -_0807E878 -CallWithArg sub_080A1550, 0x080101ac -JumpIfNot 0xffca -SoundReq2 0x0015 -SetRoomFlag 0x0001 -Jump 0xffbe -Call sub_080A1608 -_0807EA94 -_0807E878 -Jump 0xffb0 -StartScript -_0807EF80 0x0008 -Call sub_080A1648 -StopScript -Call sub_080A1270 -_0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x00073004 -_0807EA94 -SoundReq0x80100000 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -CallWithArg sub_0807F75C, 0x03400378 -Call sub_080791BC -Call sub_0807FB74 -_0807E8E4_1 -Call sub_0807F168 -Call sub_080A1388 -Call sub_0806EC38 -StartScript -MoveEntityToPlayer -Call sub_0807F844 -CameraTargetPlayer -StopScript -_0807E778 0x0004 -DoFade4 -WaitFor_2 -SoundReq2 0xffff -Call sub_080A13B4 -_0807EA94 -JumpIfNot 0x0018 -Call sub_080A13E8 -WaitPlayerAction8 -Call sub_080A1460 -_0807EA94 -Call sub_080A14A8 -Call sub_0807DF50 -_0807E878 -CallWithArg sub_0807F5B0, 0x00000000 -ClearRoomFlag 0x0001 -Call sub_080A169C -_0807EF80 0x0006 + StartScript + Call sub_08061FE4 + Call sub_08061E70 + _0807EF80 0x000a + StopScript +script_080100DC: + CheckEntityInteractType + JumpIfNot script_080100DC + _0807E864 + _0807EB74 + Call sub_08061FE4 + Call sub_08062048 + _0807EA94 + _0807E878 + Jump script_080100DC + .short 0x0000 + StartScript + Call sub_08061FE4 + Call sub_08061E70 + _0807EF80 0x000a + StopScript +script_08010110: + Wait 0x003c + Call sub_08061E90 + Jump script_08010110 + .short 0x0000 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + StopScript +script_08010132: + CheckEntityInteractType + JumpIfNot script_08010132 + _0807E864 + _0807EB74 + TextboxNoOverlapFollow 0x4f22 + _0807EA94 + _0807E878 + Jump script_08010132 + StartScript + _0807EF80 0x0001 + Call sub_0806C354 + _0807EF80 0x000a + StopScript +script_0801015A: + CheckEntityInteractType + JumpIfNot script_0801015A + _0807E864 + _0807EB74 + CheckRoomFlag 0x0001 + JumpIf script_0801019E + TextboxNoOverlapFollowPos 0x00003001 + _0807EA94 + _0807E3E8 + JumpIfNot script_080101A6 + Call sub_080A1608 + _0807EA94 + _0807E878 + CallWithArg sub_080A1550, 0x080101ac + JumpIfNot script_0801015A + SoundReq2 0x0015 + SetRoomFlag 0x0001 + Jump script_0801015A +script_0801019E: + Call sub_080A1608 + _0807EA94 +script_080101A6: + _0807E878 + Jump script_0801015A + StartScript + _0807EF80 0x0008 + Call sub_080A1648 + StopScript + Call sub_080A1270 + _0807E864 + Call sub_0807DF28 + TextboxNoOverlapFollowPos 0x00073004 + _0807EA94 + SoundReq0x80100000 + _0807E778 0x0004 + DoFade5 + WaitFor_2 + CallWithArg sub_0807F75C, 0x03400378 + Call sub_080791BC + Call sub_0807FB74 + _0807E8E4_1 + Call sub_0807F168 + Call sub_080A1388 + Call sub_0806EC38 + StartScript + MoveEntityToPlayer + Call sub_0807F844 + CameraTargetPlayer + StopScript + _0807E778 0x0004 + DoFade4 + WaitFor_2 + SoundReq2 0xffff + Call sub_080A13B4 + _0807EA94 + JumpIfNot script_08010240 + Call sub_080A13E8 + WaitPlayerAction8 + Call sub_080A1460 + _0807EA94 + Call sub_080A14A8 +script_08010240: + Call sub_0807DF50 + _0807E878 + CallWithArg sub_0807F5B0, 0x00000000 + ClearRoomFlag 0x0001 + Call sub_080A169C + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 2410a1ba..a2666a68 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -1,479 +1,537 @@ SCRIPT_START script_08010264 -StartScript -_0807EF80 0x0007 -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0006 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08065F64 -_0807EA94 -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CheckRoomFlag 0x0009 -JumpIfNot 0x001a -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -Call sub_08062500 -Jump 0xffdc -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -Jump 0xffca -.short 0x0000 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806265C -_0807EA94 -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807EF80 0x0000 -StopScript -StopScript -Call sub_08062698 -Call sub_080626AC -CallWithArg sub_0807F0EC, 0x00000009 -_0807E078_sssssssss 0x0012, 0x001a, 0x0022, 0x002a, 0x0032, 0x003a, 0x0042, 0x004a, 0x0052 -_0807EE04 0x0358, 0x0078 -Jump 0x004e -_0807EE04 0x0390, 0x0078 -Jump 0x0044 -_0807EE04 0x03c8, 0x0078 -Jump 0x003a -_0807EE04 0x0358, 0x0098 -Jump 0x0030 -_0807EE04 0x0390, 0x0098 -Jump 0x0026 -_0807EE04 0x03c8, 0x0098 -Jump 0x001c -_0807EE04 0x0358, 0x00b8 -Jump 0x0012 -_0807EE04 0x0390, 0x00b8 -Jump 0x0008 -_0807EE04 0x03c8, 0x00b8 -StopScript -StartScript -Call sub_080626C0 -JumpIf 0xff72 -_0807EE30 -JumpIfNot 0xffee -Jump 0xff68 -.short 0x0000 -StartScript -_0807EF80 0x0000 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -Wait 0x001e -Call sub_08062948 -Jump 0xfff4 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000004 -StopScript -Wait 0x003c -Call sub_0806407C -Jump 0xfff4 -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08064428 -_0807EA94 -_0807E878 -Jump 0xffea -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E914 0x08064689 -Call sub_08064644 -StopScript -Wait 0x003c -Call sub_080646A4 -Jump 0xfff4 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -Call sub_080636F4 -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -Call sub_080636D8 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000000 -Jump 0xffd2 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -Call sub_08063CAC -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000004 -Call sub_08063C90 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000000 -Jump 0xffd2 -StartScript -_0807EB44 0x0004 -_0807E930 0x0000 -_0807EF80 0x000a -Call sub_0807F348 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000008 -CheckRoomFlag 0x000e -JumpIf 0x000c -SetRoomFlag 0x000e -TextboxNoOverlap 0x2b10 -_0807EA94 -Call sub_080634E4 -_0807E078_sssssss 0x000e, 0x0020, 0x0036, 0x0034, 0x000e, 0x0024, 0x002e -TextboxNoOverlap 0x2b0d -Jump 0x0096 -CheckGlobalFlag 0x003d -JumpIfNot 0x008a -Jump 0x001a -CheckGlobalFlag 0x003c -JumpIfNot 0x007e -Jump 0x000e -CheckGlobalFlag 0x003b -JumpIfNot 0x0072 -Jump 0x0002 -Call sub_080634EC -CallWithArg sub_0807F78C, 0x00000000 -_0807EA94 -_0807E3E8 -JumpIfNot 0x005a -CallWithArg sub_0807F7C4, 0x00000000 -JumpIfNot 0x0030 -_0807E48C 0x0020 -JumpIfNot 0x0030 -Call sub_08063504 -JumpIf 0x002e -TextboxNoOverlap 0x2b07 -_0807EA94 -CallWithArg sub_0807F800, 0x00000000 -WaitPlayerAction8 -_0807EA94 -TextboxNoOverlap 0x2b0c -Jump 0x001e -TextboxNoOverlap 0x2b09 -Jump 0x0016 -TextboxNoOverlap 0x2b0a -Jump 0x000e -TextboxNoOverlap 0x2b0b -Jump 0x0006 -TextboxNoOverlap 0x2b0e -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xff16 -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -Jump 0xffe8 -StartScript -_0807E930 0x0008 -Call sub_08062A48 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0806265C -_0807EA94 -_0807E878 -Jump 0xffec -StartScript -_0807E930 0x0009 -Jump 0xffd6 -.short 0x0000 -StartScript -_0807E930 0x000b -Jump 0xffca -.short 0x0000 -StartScript -_0807E930 0x000c -Jump 0xffbe -.short 0x0000 -StartScript -_0807E930 0x000d -Jump 0xffb2 -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -HasRoomItemForSale -Call sub_0807F77C -_0807EAF0 0x3c08, 0x3c09 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -Jump 0xffde -.short 0x0000 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0807F2D4 -_0807EF80 0x0000 -HasRoomItemForSale -JumpIf 0x000a -TextboxNoOverlap 0x3c07 -Jump 0x0048 -Call sub_08062EB8 -CallWithArg sub_0807F78C, 0x00000000 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0030 -_0807EA94 -BuyItem 0x0000, 0x0000 -JumpIf 0x000a -TextboxNoOverlap 0x3c04 -Jump 0x001c -WaitPlayerAction8 -ModHealth 0x0008 -Call sub_08062EDC -JumpIf 0x000a -TextboxNoOverlap 0x3c06 -Jump 0x0004 -WaitPlayerAction8 -_0807EA94 -_0807E878 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 -StartScript -_0807EF80 0x0007 -_0807E9D4 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0004 -StartScript -Call sub_08062D18 -JumpIfNot 0x002a -StopScript -_0807EA94 -_0807E3E8 -JumpIfNot 0x0020 -HasRupees 0x00c8 -JumpIf 0x000a -TextboxNoOverlap 0x4008 -Jump 0x0010 -ModRupees 0xff38 -Call sub_08062E14 -TextboxNoOverlap 0x4007 -StopScript -_0807EA94 -_0807E878 -_0807E930 0x0008 -Jump 0xffb4 -StartScript -_0807EF80 0x0007 -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807F2D4 -_0807EF80 0x0001 -Call sub_08062CBC -_0807EA94 -_0807E878 -_0807EF80 0x0000 -Jump 0xffde -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807EF80 0x0007 -_0807E9D4 -Call sub_0807F348 -Call sub_08069684 -StopScript -StopScript -StartScript -CheckPlayerInRegion2 0x3030 -JumpIfNot 0xfff6 -Call sub_080696B0 -StopScript -StartScript -CheckPlayerInRegion2 0x3030 -JumpIfNot 0xffe4 -HasRoomItemForSale -JumpIf 0x004c -CheckEntityInteractType -JumpIfNot 0xffea -StopScript -_0807E864 -Call sub_0807DF28 -_0807EB74 -CheckGlobalFlag 0x0042 -JumpIfNot 0x002a -CheckGlobalFlag 0x0043 -JumpIfNot 0x0022 -CheckGlobalFlag 0x0044 -JumpIfNot 0x001a -CheckGlobalFlag 0x0041 -JumpIfNot 0x000a -TextboxNoOverlap 0x3f39 -Jump 0x006c -TextboxNoOverlap 0x2c1b -Jump 0x0064 -TextboxNoOverlap 0x2c1a -Jump 0x005c -StopScript -_0807E864 -Call sub_0807DF38 -_0807EB74 -Call sub_08069660 -_0807EA94 -_0807E3E8 -JumpIfNot 0x003a -Call sub_08069718 -JumpIfNot 0x0030 -WaitPlayerAction8 -_0807EA94 -_0807EB8C -CheckGlobalFlag 0x0042 -JumpIfNot 0x001a -CheckGlobalFlag 0x0043 -JumpIfNot 0x0012 -CheckGlobalFlag 0x0044 -JumpIfNot 0x000a -TextboxNoOverlap 0x2c21 -Jump 0x000a -SetLocalFlag 0x00fa -TextboxNoOverlap 0x2c20 -_0807EA94 -Call sub_0807F83C -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xff36 -CheckPlayerInRegion2 0x0808 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_080109F0 -WaitForSomething2 0x00000001 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b63 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffc6 -StartScript -_0807EF80 0x0007 -CheckKinstoneFused 0x001b -JumpIf 0xe67a -StopScript -Call sub_080869A4 -JumpIfNot 0xfff8 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b62 -_0807EA94 -StartPlayerScript script_080109F0 -WaitForSomething2 0x00000001 -Call sub_0807DF50 -_0807E878 -Jump 0xffc4 -Call sub_0808692C + StartScript + _0807EF80 0x0007 + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0006 + _0807EF80 0x0000 + StopScript +script_0801027A: + CheckEntityInteractType + JumpIfNot script_0801027A + _0807E864 + _0807EB74 + Call sub_08065F64 + _0807EA94 + _0807E878 + Jump script_0801027A + .short 0x0000 + StartScript + _0807EF80 0x0000 + Call sub_08062A48 + _0807EF80 0x000a + StopScript +script_080102A6: + CheckEntityInteractType + JumpIfNot script_080102A6 + CheckRoomFlag 0x0009 + JumpIfNot script_080102CC + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + _0807E878 + Call sub_08062500 + Jump script_080102A6 +script_080102CC: + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + _0807E878 + Jump script_080102A6 + .short 0x0000 + StartScript + _0807EF80 0x0000 + Call sub_08062A48 + _0807EF80 0x000a + StopScript +script_080102F2: + CheckEntityInteractType + JumpIfNot script_080102F2 + _0807E864 + _0807EB74 + Call sub_0806265C + _0807EA94 + _0807E878 + Jump script_080102F2 + .short 0x0000 + StartScript + _0807EF80 0x0000 + StopScript +script_08010314: + StopScript + Call sub_08062698 + Call sub_080626AC + CallWithArg sub_0807F0EC, 0x00000009 + JumpSwitch_9 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: + StopScript + StartScript + Call sub_080626C0 + JumpIf script_08010314 + _0807EE30 + JumpIfNot script_08010396 + Jump script_08010314 + .short 0x0000 + StartScript + _0807EF80 0x0000 + Call sub_08062A48 + _0807EF80 0x000a + StopScript +script_080103C2: + Wait 0x001e + Call sub_08062948 + Jump script_080103C2 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000004 + StopScript +script_080103E8: + Wait 0x003c + Call sub_0806407C + Jump script_080103E8 + .short 0x0000 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08010410: + CheckEntityInteractType + JumpIfNot script_08010410 + _0807E864 + _0807EB74 + Call sub_08064428 + _0807EA94 + _0807E878 + Jump script_08010410 + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E914 0x08064689 + Call sub_08064644 + StopScript +script_08010446: + Wait 0x003c + Call sub_080646A4 + Jump script_08010446 + StartScript + _0807EB44 0x0004 + _0807E930 0x0000 + Call sub_080636F4 + _0807EF80 0x000a + Call sub_0807F348 + StopScript +script_08010470: + CheckEntityInteractType + JumpIfNot script_08010470 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_080636D8 + _0807EA94 + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_08010470 + StartScript + _0807EB44 0x0004 + _0807E930 0x0000 + Call sub_08063CAC + _0807EF80 0x000a + Call sub_0807F348 + StopScript +script_080104BC: + CheckEntityInteractType + JumpIfNot script_080104BC + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000004 + Call sub_08063C90 + _0807EA94 + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000000 + Jump script_080104BC + StartScript + _0807EB44 0x0004 + _0807E930 0x0000 + _0807EF80 0x000a + Call sub_0807F348 + StopScript +script_08010502: + CheckEntityInteractType + JumpIfNot script_08010502 + _0807E864 + Call sub_0807DF28 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000008 + CheckRoomFlag 0x000e + JumpIf script_0801052E + SetRoomFlag 0x000e + TextboxNoOverlap 0x2b10 + _0807EA94 +script_0801052E: + Call sub_080634E4 + JumpSwitch_7 script_08010544, script_08010558, script_08010570, script_08010570, script_0801054C, script_08010564, script_08010570 +script_08010544: + TextboxNoOverlap 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 + _0807EA94 + _0807E3E8 + JumpIfNot script_080105E0 + CallWithArg sub_0807F7C4, 0x00000000 + JumpIfNot script_080105C4 + _0807E48C 0x0020 + JumpIfNot script_080105CC + Call sub_08063504 + JumpIf script_080105D4 + TextboxNoOverlap 0x2b07 + _0807EA94 + CallWithArg sub_0807F800, 0x00000000 + WaitPlayerAction8 + _0807EA94 + TextboxNoOverlap 0x2b0c + Jump script_080105E0 +script_080105C4: + TextboxNoOverlap 0x2b09 + Jump script_080105E0 +script_080105CC: + TextboxNoOverlap 0x2b0a + Jump script_080105E0 +script_080105D4: + TextboxNoOverlap 0x2b0b + Jump script_080105E0 +script_080105DC: + TextboxNoOverlap 0x2b0e +script_080105E0: + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_08010502 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08010602: + CheckEntityInteractType + JumpIfNot script_08010602 + _0807E864 + _0807EB74 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + Jump script_08010602 + StartScript + _0807E930 0x0008 +script_08010622: + Call sub_08062A48 + _0807EF80 0x000a + StopScript +script_0801062E: + CheckEntityInteractType + JumpIfNot script_0801062E + _0807E864 + Call sub_0806265C + _0807EA94 + _0807E878 + Jump script_0801062E + StartScript + _0807E930 0x0009 + Jump script_08010622 + .short 0x0000 + StartScript + _0807E930 0x000b + Jump script_08010622 + .short 0x0000 + StartScript + _0807E930 0x000c + Jump script_08010622 + .short 0x0000 + StartScript + _0807E930 0x000d + Jump script_08010622 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08010686: + CheckEntityInteractType + JumpIfNot script_08010686 + _0807E864 + _0807EB74 + HasRoomItemForSale + Call sub_0807F77C + _0807EAF0 0x3c08, 0x3c09 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + Jump script_08010686 + .short 0x0000 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_080106BE: + CheckEntityInteractType + JumpIfNot script_080106BE + _0807E864 + _0807EB74 + Call sub_0807F2D4 + _0807EF80 0x0000 + HasRoomItemForSale + JumpIf script_080106E0 + TextboxNoOverlap 0x3c07 + Jump script_08010726 +script_080106E0: + Call sub_08062EB8 + CallWithArg sub_0807F78C, 0x00000000 + _0807EA94 + _0807E3E8 + JumpIfNot script_08010726 + _0807EA94 + BuyItem 0x0000, 0x0000 + JumpIf script_0801070C + TextboxNoOverlap 0x3c04 + Jump script_08010726 +script_0801070C: + WaitPlayerAction8 + ModHealth 0x0008 + Call sub_08062EDC + JumpIf script_08010724 + TextboxNoOverlap 0x3c06 + Jump script_08010726 +script_08010724: + WaitPlayerAction8 +script_08010726: + _0807EA94 + _0807E878 + _0807EF80 0x0001 + Jump script_080106BE + .short 0x0000 + StartScript + _0807EF80 0x0007 + _0807E9D4 + _0807EF80 0x000a + _0807E930 0x0000 + StopScript +script_08010746: + CheckEntityInteractType + JumpIfNot script_08010746 + _0807E864 + _0807E930 0x0004 + StartScript + Call sub_08062D18 + JumpIfNot script_08010786 + StopScript + _0807EA94 + _0807E3E8 + JumpIfNot script_08010786 + HasRupees 0x00c8 + JumpIf script_08010778 + TextboxNoOverlap 0x4008 + Jump script_08010786 +script_08010778: + ModRupees 0xff38 + Call sub_08062E14 + TextboxNoOverlap 0x4007 +script_08010786: + StopScript + _0807EA94 + _0807E878 + _0807E930 0x0008 + Jump script_08010746 + StartScript + _0807EF80 0x0007 + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_080107AA: + CheckEntityInteractType + JumpIfNot script_080107AA + _0807E864 + Call sub_0807F2D4 + _0807EF80 0x0001 + Call sub_08062CBC + _0807EA94 + _0807E878 + _0807EF80 0x0000 + Jump script_080107AA + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807EF80 0x0007 + _0807E9D4 + Call sub_0807F348 + Call sub_08069684 + StopScript +script_080107F2: + StopScript + StartScript + CheckPlayerInRegion2 0x3030 + JumpIfNot script_080107F2 + Call sub_080696B0 +script_08010804: + StopScript + StartScript + CheckPlayerInRegion2 0x3030 + JumpIfNot script_080107F2 + HasRoomItemForSale + JumpIf script_08010860 + CheckEntityInteractType + JumpIfNot script_08010804 + StopScript + _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 + TextboxNoOverlap 0x3f39 + Jump script_080108BA +script_08010850: + TextboxNoOverlap 0x2c1b + Jump script_080108BA +script_08010858: + TextboxNoOverlap 0x2c1a + Jump script_080108BA +script_08010860: + StopScript + _0807E864 + Call sub_0807DF38 + _0807EB74 + Call sub_08069660 + _0807EA94 + _0807E3E8 + JumpIfNot script_080108B2 + Call sub_08069718 + JumpIfNot script_080108B2 + WaitPlayerAction8 + _0807EA94 + _0807EB8C + CheckGlobalFlag 0x0042 + JumpIfNot script_080108AA + CheckGlobalFlag 0x0043 + JumpIfNot script_080108AA + CheckGlobalFlag 0x0044 + JumpIfNot script_080108AA + TextboxNoOverlap 0x2c21 + Jump script_080108B2 +script_080108AA: + SetLocalFlag 0x00fa + TextboxNoOverlap 0x2c20 +script_080108B2: + _0807EA94 + Call sub_0807F83C +script_080108BA: + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0000 + Jump script_08010804 +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 + _0807EA94 +script_08010900: + Call sub_0807DF50 + _0807E878 + Jump script_080108D0 + StartScript + _0807EF80 0x0007 + CheckKinstoneFused 0x001b + JumpIf script_0800EF92 + StopScript +script_0801091C: + Call sub_080869A4 + JumpIfNot script_0801091C + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + CheckRoomFlag 0x0001 + JumpIf script_08010942 + _0807EB28 0x0b62 + _0807EA94 +script_08010942: + StartPlayerScript script_080109F0 + WaitForSomething2 0x00000001 + Call sub_0807DF50 + _0807E878 + Jump script_0801091C + Call sub_0808692C SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010964.inc b/data/scripts/script_08010964.inc index f0b44321..d8a83f03 100644 --- a/data/scripts/script_08010964.inc +++ b/data/scripts/script_08010964.inc @@ -1,36 +1,41 @@ SCRIPT_START script_08010964 -CheckPlayerInRegion2 0x0808 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08010A38 -WaitForSomething2 0x00000001 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b63 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffc6 -StartScript -StopScript -CheckLocalFlag 0x00d1 -JumpIf 0x0040 -CheckPlayerInRegion2 0x0808 -JumpIfNot 0xffee -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08010A38 -WaitForSomething2 0x00000001 -CheckRoomFlag 0x0001 -JumpIf 0x0008 -_0807EB28 0x0b64 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xffb8 -_0807EF80 0x0006 +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 + _0807EA94 +script_08010994: + Call sub_0807DF50 + _0807E878 + Jump script_08010964 +script_080109A0: + StartScript + StopScript + CheckLocalFlag 0x00d1 + JumpIf script_080109EA + CheckPlayerInRegion2 0x0808 + JumpIfNot script_080109A0 + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_08010A38 + WaitForSomething2 0x00000001 + CheckRoomFlag 0x0001 + JumpIf script_080109DE + _0807EB28 0x0b64 + _0807EA94 +script_080109DE: + Call sub_0807DF50 + _0807E878 + Jump script_080109A0 +script_080109EA: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index 160b1c86..9bbf1e4f 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080109F0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807ECC4 0x0010 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807ECC4 0x0010 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index b07950eb..9d650196 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08010A14 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EC64 0x0010 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EC64 0x0010 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index b40dce05..0089c3fa 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08010A38 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EC94 0x0010 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EC94 0x0010 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 66ef1bff..22e1090b 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -1,18 +1,19 @@ SCRIPT_START script_08010A5C -StartScript -Call sub_0807DF28 -_0807E864 -ModHealth 0x00a0 -StopScript -Wait 0x003c -_0807E778 0x0004 -DoFade4 -WaitFor_2 -Call sub_0807F0D8 -JumpIfNot 0xfff8 -_0807EF80 0x0014 -_0807E878 -Call sub_0807DF50 -Call sub_080791D0 + StartScript + Call sub_0807DF28 + _0807E864 + ModHealth 0x00a0 + StopScript + Wait 0x003c + _0807E778 0x0004 + DoFade4 + WaitFor_2 +script_08010A78: + Call sub_0807F0D8 + JumpIfNot script_08010A78 + _0807EF80 0x0014 + _0807E878 + Call sub_0807DF50 + Call sub_080791D0 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010A98.inc b/data/scripts/script_08010A98.inc index f647c1fe..12cf866c 100644 --- a/data/scripts/script_08010A98.inc +++ b/data/scripts/script_08010A98.inc @@ -1,52 +1,60 @@ SCRIPT_START script_08010A98 -StartScript -_0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 -_0807EF80 0x000a -Call sub_08067314 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_080672B0, 0x00000004 -Call sub_08067304 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -CallWithArg sub_080672B0, 0x00000000 -Jump 0xffd2 -StartScript -CheckInventory1 0x0067 -JumpIfNot 0x0076 -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityNonPlanarMovement 0x0180 -CallWithArg_p sub_0807F348 -Call sub_0806075C -StopScript -_0807EA94 -Call sub_080606C0 -StopScript -Call sub_0806076C -_0807EF80 0x0007 -Call sub_08060700 -StopScript -StartScript -_0807E564 -JumpIf 0x0010 -CallWithArg sub_080608E4, 0x00000000 -JumpIf 0x000c -_0807EE30 -JumpIfNot 0xffe4 -Jump 0xffce -StopScript -_0807EF80 0x0000 -StopScript -StartScript -CallWithArg sub_080608E4, 0x00000001 -JumpIf 0xfff0 -StopScript -Jump 0xffbc -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + _0807EF80 0x000a + Call sub_08067314 + StopScript +script_08010AB4: + CheckEntityInteractType + JumpIfNot script_08010AB4 + _0807E864 + _0807EB74 + CallWithArg sub_080672B0, 0x00000004 + Call sub_08067304 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + CallWithArg sub_080672B0, 0x00000000 + Jump script_08010AB4 + StartScript + CheckInventory1 0x0067 + JumpIfNot script_08010B62 + _0807EB44 0x0004 + _0807EF80 0x0000 + SetEntityNonPlanarMovement 0x0180 + CallWithArg_2 sub_0807F348 + Call sub_0806075C + StopScript + _0807EA94 + Call sub_080606C0 +script_08010B10: + StopScript + Call sub_0806076C + _0807EF80 0x0007 +script_08010B1C: + Call sub_08060700 +script_08010B22: + StopScript + StartScript + _0807E564 + JumpIf script_08010B3A + CallWithArg sub_080608E4, 0x00000000 + JumpIf script_08010B44 +script_08010B3A: + _0807EE30 + JumpIfNot script_08010B22 + Jump script_08010B10 +script_08010B44: + StopScript + _0807EF80 0x0000 +script_08010B4A: + StopScript + StartScript + CallWithArg sub_080608E4, 0x00000001 + JumpIf script_08010B4A + StopScript + Jump script_08010B1C +script_08010B62: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 65f424ae..119ca37c 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -1,26 +1,28 @@ SCRIPT_START script_08010B68 -StartScript -_0807E564 -JumpIfNot 0x003e -Call sub_0807F924 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x0007 -_0807EF80 0x000a -StopScript -StopScript -StartScript -_0807E564 -JumpIfNot 0x001c -CheckEntityInteractType -JumpIfNot 0xfff2 -StopScript -_0807E864 -_0807EB74 -Call sub_0806E2DC -_0807EA94 -_0807E878 -Jump 0xffde -_0807EF80 0x0006 + StartScript + _0807E564 + JumpIfNot script_08010BAC + Call sub_0807F924 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x0007 + _0807EF80 0x000a + StopScript +script_08010B88: + StopScript + StartScript + _0807E564 + JumpIfNot script_08010BAC + CheckEntityInteractType + JumpIfNot script_08010B88 + StopScript + _0807E864 + _0807EB74 + Call sub_0806E2DC + _0807EA94 + _0807E878 + Jump script_08010B88 +script_08010BAC: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 7f9f1b99..58da62e2 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -1,137 +1,138 @@ SCRIPT_START script_08010BB4 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0008 -Call sub_0806E440 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -Call sub_0806E418 -_0807EA94 -_0807E878 -_0807E930 0x0008 -Jump 0xffe2 -.short 0x0000 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08011074 -WaitForSomething2 0x00000400 -_0807F078 0x0034, 0x0002 -TextboxNoOverlapFollowPos 0x000c1036 -_0807EA94 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos 0x00021037 -_0807EA94 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -TextboxNoOverlapFollowPos 0x000c1038 -_0807EA94 -SoundReq0x80100000 -_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 0x005001f8 -_0807F0B4 0x0007 -CameraTargetEntity -Wait 0x000a -_0807F0B4 0x0001 -_0807E778 0x0001 -DoFade4 -_0807E5F8 0x0002a800 -WaitForSomething2 0x00055000 -SetEntityPositionRelative 0x007801f8 -Wait 0x003c -_0807E5F8 0x00800000 -WaitForSomething2 0x01000000 -_0807E5F8 0x0002a800 -WaitForSomething2 0x00055000 -_0807E8E4_1 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos 0x000c1039 -_0807EA94 -SoundReq2 0x0001 -_0807E8E4_2 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000010 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000080 -Wait 0x012c -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -TextboxNoOverlapFollowPos 0x000c103a -_0807EA94 -SetEntityPositionRelative 0x01c001f8 -_0807F0B4 0x0004 -Wait 0x0078 -_0807E5F8 0x00280000 -WaitForSomething2 0x00500000 -_0807E5F8 0x00000100 -SetEntityPositionRelative 0x022001f8 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x01f8, 0x0098 -Wait 0x003c -WaitForSomething2 0x00000200 -_0807E5F8 0x00280000 -SoundReq0x80100000 -SoundReq 0x009b -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos 0x00001043 -_0807EA94 -SoundReq2 0x000d -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -_0807E5F8 0x0002a800 -WaitForSomething2 0x00055000 -SoundReq 0x01c7 -SoundReq 0x00e5 -_0807E5F8 0x00000100 -_0807E5F8 0x00002800 -CallWithArg sub_0807FB28, 0x00000003 -WaitForSomething2 0x00000200 -WaitForSomething2 0x00005000 -_0807E5F8 0x00028000 -WaitForSomething2 0x00050000 -TextboxNoOverlapFollowPos 0x00001044 -_0807EA94 -SetEntityPositionRelative 0x009801f8 -SoundReq0x80100000 -Wait 0x003c -SoundReq2 0x002f -_0807E5F8 0x00028000 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -WaitForSomething2 0x00050000 -CallWithArg sub_0807FB28, 0x00000003 -SoundReq 0x00e5 -_0807E5F8 0x00028000 -WaitForSomething2 0x00050000 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -_0807E5F8 0x08000000 -_0807E5F8 0x00800000 -WaitForSomething2 0x01000000 -CallWithArg sub_0805DDEC, 0x00000002 -_0807F0C8 0xffff, 0x0000 + StartScript + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0008 + Call sub_0806E440 + StopScript +script_08010BCA: + CheckEntityInteractType + JumpIfNot script_08010BCA + _0807E864 + _0807EB74 + _0807EF80 0x0000 + Call sub_0806E418 + _0807EA94 + _0807E878 + _0807E930 0x0008 + Jump script_08010BCA + .short 0x0000 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_08011074 + WaitForSomething2 0x00000400 + _0807F078 0x0034, 0x0002 + TextboxNoOverlapFollowPos 0x000c1036 + _0807EA94 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + TextboxNoOverlapFollowPos 0x00021037 + _0807EA94 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + TextboxNoOverlapFollowPos 0x000c1038 + _0807EA94 + SoundReq0x80100000 + _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 0x005001f8 + _0807F0B4 0x0007 + CameraTargetEntity + Wait 0x000a + _0807F0B4 0x0001 + _0807E778 0x0001 + DoFade4 + _0807E5F8 0x0002a800 + WaitForSomething2 0x00055000 + SetEntityPositionRelative 0x007801f8 + Wait 0x003c + _0807E5F8 0x00800000 + WaitForSomething2 0x01000000 + _0807E5F8 0x0002a800 + WaitForSomething2 0x00055000 + _0807E8E4_1 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + TextboxNoOverlapFollowPos 0x000c1039 + _0807EA94 + SoundReq2 0x0001 + _0807E8E4_2 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000010 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000020 + WaitForSomething2 0x00000080 + Wait 0x012c + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + TextboxNoOverlapFollowPos 0x000c103a + _0807EA94 + SetEntityPositionRelative 0x01c001f8 + _0807F0B4 0x0004 + Wait 0x0078 + _0807E5F8 0x00280000 + WaitForSomething2 0x00500000 + _0807E5F8 0x00000100 + SetEntityPositionRelative 0x022001f8 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x01f8, 0x0098 + Wait 0x003c + WaitForSomething2 0x00000200 + _0807E5F8 0x00280000 + SoundReq0x80100000 + SoundReq 0x009b + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + TextboxNoOverlapFollowPos 0x00001043 + _0807EA94 + SoundReq2 0x000d + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + _0807E5F8 0x0002a800 + WaitForSomething2 0x00055000 + SoundReq 0x01c7 + SoundReq 0x00e5 + _0807E5F8 0x00000100 + _0807E5F8 0x00002800 + CallWithArg sub_0807FB28, 0x00000003 + WaitForSomething2 0x00000200 + WaitForSomething2 0x00005000 + _0807E5F8 0x00028000 + WaitForSomething2 0x00050000 + TextboxNoOverlapFollowPos 0x00001044 + _0807EA94 + SetEntityPositionRelative 0x009801f8 + SoundReq0x80100000 + Wait 0x003c + SoundReq2 0x002f + _0807E5F8 0x00028000 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + WaitForSomething2 0x00050000 + CallWithArg sub_0807FB28, 0x00000003 + SoundReq 0x00e5 + _0807E5F8 0x00028000 + WaitForSomething2 0x00050000 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + _0807E5F8 0x08000000 + _0807E5F8 0x00800000 + WaitForSomething2 0x01000000 + CallWithArg sub_0805DDEC, 0x00000002 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010E5A.inc b/data/scripts/script_08010E5A.inc index 2e6e3b36..46021b6a 100644 --- a/data/scripts/script_08010E5A.inc +++ b/data/scripts/script_08010E5A.inc @@ -1,55 +1,55 @@ SCRIPT_START script_08010E5A -Wait 0x001e -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x003c -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x0004 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x001e -SoundReq 0x012c -_0807E5F8 0x00800000 -WaitForSomething2 0x01000000 -_0807E778 0x0004 -DoFade7 -WaitFor_2 -Wait 0x003c -SoundReq 0x00ab -SoundReq 0x01c2 -LoadRoomEntityList gUnk_080F0770 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -CallWithArg sub_0805DE18, 0x00000002 -_0807F0C8 0x0000, 0x0000 -Call sub_0806DC3C -Call sub_080791BC -CallWithArg sub_0807F244, 0x0000000d -CallWithArg sub_0807F29C, 0x080049f6 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x006801f8 -_0807E5F8 0x00000004 -Wait 0x001e -_0807E5F8 0x00000040 -WaitForSomething2 0x00000008 -WaitForSomething2 0x00000080 -SoundReq 0x01c3 -_0807E5F8 0x20000000 -Wait 0x0078 -CallWithArg sub_0807F29C, 0x00000000 -Call sub_0806DC58 -_0807E5F8 0x40000000 -_0807E5F8 0x00000010 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos 0x000c1045 -_0807EA94 -TextboxNoOverlapFollowPos 0x00001046 -_0807EA94 -CallWithArg sub_0805DDEC, 0x00000002 -_0807F0C8 0xffff, 0x0000 + Wait 0x001e + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x003c + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x0004 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x001e + SoundReq 0x012c + _0807E5F8 0x00800000 + WaitForSomething2 0x01000000 + _0807E778 0x0004 + DoFade7 + WaitFor_2 + Wait 0x003c + SoundReq 0x00ab + SoundReq 0x01c2 + LoadRoomEntityList gUnk_080F0770 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + CallWithArg sub_0805DE18, 0x00000002 + _0807F0C8 0x0000, 0x0000 + Call sub_0806DC3C + Call sub_080791BC + CallWithArg sub_0807F244, 0x0000000d + CallWithArg sub_0807F29C, 0x080049f6 + _0807F0B4 0x0001 + SetEntityPositionRelative 0x006801f8 + _0807E5F8 0x00000004 + Wait 0x001e + _0807E5F8 0x00000040 + WaitForSomething2 0x00000008 + WaitForSomething2 0x00000080 + SoundReq 0x01c3 + _0807E5F8 0x20000000 + Wait 0x0078 + CallWithArg sub_0807F29C, 0x00000000 + Call sub_0806DC58 + _0807E5F8 0x40000000 + _0807E5F8 0x00000010 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000020 + WaitForSomething2 0x00000200 + TextboxNoOverlapFollowPos 0x000c1045 + _0807EA94 + TextboxNoOverlapFollowPos 0x00001046 + _0807EA94 + CallWithArg sub_0805DDEC, 0x00000002 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 35b90c64..bb24aa9d 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -1,44 +1,44 @@ SCRIPT_START script_08010F84 -Wait 0x003c -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -StartPlayerScript script_080110BC -WaitForSomething2 0x00000400 -TextboxNoOverlapFollowPos 0x00001047 -_0807EA94 -Call sub_0806DC3C -Call sub_080791BC -CallWithArg sub_0807F244, 0x0000000d -CallWithArg sub_0807F29C, 0x080049f6 -Wait 0x001e -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -CallWithArg sub_0807F29C, 0x00000000 -Call sub_0806DC58 -Wait 0x003c -_0807E5F8 0x08000000 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x000f -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -CallWithArg sub_0805DE18, 0x00000002 -_0807F0C8 0x0000, 0x0000 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -SoundReq0x80100000 -Wait 0x003c -TextboxNoOverlapFollowPos 0x0000104a -_0807EA94 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -TextboxNoOverlapFollowPos 0x00001049 -_0807EA94 -SetEntityPositionRelative 0x009801f8 -Wait 0x0078 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000200 -Call sub_0804BCDC -_0807EF80 0x0006 + Wait 0x003c + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + StartPlayerScript script_080110BC + WaitForSomething2 0x00000400 + TextboxNoOverlapFollowPos 0x00001047 + _0807EA94 + Call sub_0806DC3C + Call sub_080791BC + CallWithArg sub_0807F244, 0x0000000d + CallWithArg sub_0807F29C, 0x080049f6 + Wait 0x001e + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + CallWithArg sub_0807F29C, 0x00000000 + Call sub_0806DC58 + Wait 0x003c + _0807E5F8 0x08000000 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x000f + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + CallWithArg sub_0805DE18, 0x00000002 + _0807F0C8 0x0000, 0x0000 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + SoundReq0x80100000 + Wait 0x003c + TextboxNoOverlapFollowPos 0x0000104a + _0807EA94 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + TextboxNoOverlapFollowPos 0x00001049 + _0807EA94 + SetEntityPositionRelative 0x009801f8 + Wait 0x0078 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000200 + Call sub_0804BCDC + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011074.inc b/data/scripts/script_08011074.inc index 195c75f3..65a2a6f0 100644 --- a/data/scripts/script_08011074.inc +++ b/data/scripts/script_08011074.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011074 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EDD4 0x01e8, 0x0050 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000400 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EDD4 0x01e8, 0x0050 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08011098.inc b/data/scripts/script_08011098.inc index 00f37a96..2a7af781 100644 --- a/data/scripts/script_08011098.inc +++ b/data/scripts/script_08011098.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08011098 -SetEntityPositionRelative 0x005801a8 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000400 -_0807E610 0x00000002 -StopScript -Call sub_080791BC + SetEntityPositionRelative 0x005801a8 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000400 + _0807E610 0x00000002 + StopScript + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110BC.inc b/data/scripts/script_080110BC.inc index e2e590ef..1c93b869 100644 --- a/data/scripts/script_080110BC.inc +++ b/data/scripts/script_080110BC.inc @@ -1,12 +1,12 @@ SCRIPT_START script_080110BC -StartScript -SetEntityNonPlanarMovement 0x0040 -StopScript -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x0001 -_0807EDD4 0x01d8, 0x0068 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000400 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0040 + StopScript + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x0001 + _0807EDD4 0x01d8, 0x0068 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000400 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080110E8.inc b/data/scripts/script_080110E8.inc index 5ecc77d8..16dc59f0 100644 --- a/data/scripts/script_080110E8.inc +++ b/data/scripts/script_080110E8.inc @@ -1,16 +1,16 @@ SCRIPT_START script_080110E8 -SoundReq 0x007a -_0807EB44 0x0004 -_0807EF80 0x000d -SoundReq 0x0086 -Call sub_0807F36C -SetEntityNonPlanarMovement 0x0400 -_0807ECF4 0x0008 -StartScript -Call sub_0807F1E8 -_0807EF80 0x0011 -StopScript -Call sub_0807F2D4 -WaitForSomething 0x80000000 -Call sub_080791BC + SoundReq 0x007a + _0807EB44 0x0004 + _0807EF80 0x000d + SoundReq 0x0086 + Call sub_0807F36C + SetEntityNonPlanarMovement 0x0400 + _0807ECF4 0x0008 + StartScript + Call sub_0807F1E8 + _0807EF80 0x0011 + StopScript + Call sub_0807F2D4 + WaitForSomething 0x80000000 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08011128.inc b/data/scripts/script_08011128.inc index f79ade44..5427f0d9 100644 --- a/data/scripts/script_08011128.inc +++ b/data/scripts/script_08011128.inc @@ -1,36 +1,37 @@ SCRIPT_START script_08011128 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 -JumpIfNot 0xfff6 -LoadRoomEntityList gUnk_080F06B0 -_0807EF80 0x000b -WaitForSomething2 0x00000004 -SetEntityPositionRelative 0x005801b8 -_0807EB44 0x0004 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EB44 0x0006 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EB44 0x0004 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0001 -_0807ECC4 0x0010 -_0807EF80 0x0000 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0010 -Wait 0x001e -_0807EF80 0x0010 -Call sub_0807F3C8 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x001c -_0807EC1C 0x003c -_0807E5F8 0x00000008 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08011134: + CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 + JumpIfNot script_08011134 + LoadRoomEntityList gUnk_080F06B0 + _0807EF80 0x000b + WaitForSomething2 0x00000004 + SetEntityPositionRelative 0x005801b8 + _0807EB44 0x0004 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EB44 0x0006 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EB44 0x0004 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0001 + _0807ECC4 0x0010 + _0807EF80 0x0000 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x0010 + Wait 0x001e + _0807EF80 0x0010 + Call sub_0807F3C8 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x001c + _0807EC1C 0x003c + _0807E5F8 0x00000008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080111CC.inc b/data/scripts/script_080111CC.inc index ccfee28b..1abef76f 100644 --- a/data/scripts/script_080111CC.inc +++ b/data/scripts/script_080111CC.inc @@ -1,53 +1,55 @@ SCRIPT_START script_080111CC -StartScript -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -Call sub_08066D04 -StopScript -Call sub_0807F338 -WaitForSomething2 0x00000010 -Call sub_08066D14 -JumpIf 0x0004 -MoveEntityToPlayer -Call sub_0807F8BC -JumpIf 0x0008 -SetEntityPositionRelative 0x00b801f8 -_0807EF80 0x0007 -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0050 -_0807EB74 -_0807EF80 0x0000 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0020 -_0807EF80 0x0008 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0007 -_0807EF80 0x0001 -SetEntityNonPlanarMovement 0x0040 -_0807EDD4 0x01e8, 0x0040 -_0807EF80 0x0000 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -Call sub_08095810 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0001 -_0807EDD4 0x01d8, 0x0058 -_0807EF80 0x0000 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -SoundReq 0x01c9 -_0807EF80 0x0010 -Wait 0x0014 -Call sub_08066E20 -Wait 0x0014 -_0807EF80 0x0010 -Call sub_0807F2D4 -SoundReq 0x01ca -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + Call sub_08066D04 + StopScript + Call sub_0807F338 + WaitForSomething2 0x00000010 + Call sub_08066D14 + JumpIf script_080111F6 + MoveEntityToPlayer +script_080111F6: + Call sub_0807F8BC + JumpIf script_08011206 + SetEntityPositionRelative 0x00b801f8 +script_08011206: + _0807EF80 0x0007 + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0050 + _0807EB74 + _0807EF80 0x0000 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0020 + _0807EF80 0x0008 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0007 + _0807EF80 0x0001 + SetEntityNonPlanarMovement 0x0040 + _0807EDD4 0x01e8, 0x0040 + _0807EF80 0x0000 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + Call sub_08095810 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0001 + _0807EDD4 0x01d8, 0x0058 + _0807EF80 0x0000 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + SoundReq 0x01c9 + _0807EF80 0x0010 + Wait 0x0014 + Call sub_08066E20 + Wait 0x0014 + _0807EF80 0x0010 + Call sub_0807F2D4 + SoundReq 0x01ca + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080112C4.inc b/data/scripts/script_080112C4.inc index d6ef7fb1..fe2bc3f8 100644 --- a/data/scripts/script_080112C4.inc +++ b/data/scripts/script_080112C4.inc @@ -1,51 +1,52 @@ SCRIPT_START script_080112C4 -StartScript -_0807EF80 0x0008 -SetEntityNonPlanarMovement 0x0100 -Call sub_08095244 -Call sub_0807F338 -StopScript -WaitForSomething 0x0002a800 -_0807EF80 0x0007 -_0807E930 0x0006 -_0807ECC4 0x0010 -Wait 0x003c -_0807ECC4 0x0010 -Wait 0x003c -_0807ECC4 0x0010 -_0807E930 0x0002 -Call sub_08064050 -_0807E078_ssss 0x0008, 0x009e, 0x0134, 0x01f8 -_0807E610 0x00000800 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807E930 0x0007 -_0807EB44 0x0006 -_0807ECF4 0x0010 -_0807EB44 0x0004 -_0807E930 0x0002 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0012 -SoundReq 0x011e -Wait 0x003c -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x01f0, 0x0098 -_0807EDD4 0x01f0, 0x00c8 -_0807E930 0x0013 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EF80 0x0010 -Wait 0x000a -_0807EF80 0x0010 -Call sub_0807F3C8 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x001e -_0807EC1C 0x003c -_0807E5F8 0x00001000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + SetEntityNonPlanarMovement 0x0100 + Call sub_08095244 + Call sub_0807F338 + StopScript + WaitForSomething 0x0002a800 + _0807EF80 0x0007 + _0807E930 0x0006 + _0807ECC4 0x0010 + Wait 0x003c + _0807ECC4 0x0010 + Wait 0x003c + _0807ECC4 0x0010 + _0807E930 0x0002 + Call sub_08064050 + JumpSwitch_4 script_08011312, script_080113AA, script_08011442, script_08011508 +script_08011312: + _0807E610 0x00000800 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + _0807E930 0x0007 + _0807EB44 0x0006 + _0807ECF4 0x0010 + _0807EB44 0x0004 + _0807E930 0x0002 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + _0807EF80 0x0004 + Wait 0x003c + _0807E930 0x0012 + SoundReq 0x011e + Wait 0x003c + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x01f0, 0x0098 + _0807EDD4 0x01f0, 0x00c8 + _0807E930 0x0013 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + _0807EF80 0x0010 + Wait 0x000a + _0807EF80 0x0010 + Call sub_0807F3C8 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x001e + _0807EC1C 0x003c + _0807E5F8 0x00001000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080113AA.inc b/data/scripts/script_080113AA.inc index 0c831ff8..790c8547 100644 --- a/data/scripts/script_080113AA.inc +++ b/data/scripts/script_080113AA.inc @@ -1,34 +1,35 @@ SCRIPT_START script_080113AA -_0807E610 0x00002000 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -_0807E930 0x0005 -_0807EB44 0x0002 -_0807EC94 0x0010 -_0807EB44 0x0004 -_0807E930 0x0002 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0012 -SoundReq 0x011e -Wait 0x003c -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0200, 0x0098 -_0807EDD4 0x0200, 0x00c8 -_0807E930 0x0013 -_0807E5F8 0x00004000 -WaitForSomething2 0x00002000 -_0807EF80 0x0010 -Wait 0x000a -_0807EF80 0x0010 -Call sub_0807F3C8 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x0002 -_0807EC1C 0x003c -_0807E5F8 0x00004000 -_0807EF80 0x0006 +script_080113AA: + _0807E610 0x00002000 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + _0807E930 0x0005 + _0807EB44 0x0002 + _0807EC94 0x0010 + _0807EB44 0x0004 + _0807E930 0x0002 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + _0807EF80 0x0004 + Wait 0x003c + _0807E930 0x0012 + SoundReq 0x011e + Wait 0x003c + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0200, 0x0098 + _0807EDD4 0x0200, 0x00c8 + _0807E930 0x0013 + _0807E5F8 0x00004000 + WaitForSomething2 0x00002000 + _0807EF80 0x0010 + Wait 0x000a + _0807EF80 0x0010 + Call sub_0807F3C8 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x0002 + _0807EC1C 0x003c + _0807E5F8 0x00004000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011442.inc b/data/scripts/script_08011442.inc index 01bbc757..fe2d6936 100644 --- a/data/scripts/script_08011442.inc +++ b/data/scripts/script_08011442.inc @@ -1,43 +1,44 @@ SCRIPT_START script_08011442 -_0807E610 0x00008000 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807E930 0x0007 -_0807EB44 0x0006 -_0807ECF4 0x0020 -_0807EB44 0x0004 -_0807E930 0x0006 -_0807ECC4 0x0010 -_0807E930 0x0002 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0012 -SoundReq 0x011e -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x01e8, 0x0098 -SetEntityNonPlanarMovement 0x0040 -_0807EEF4 0x0000, 0x0010 -_0807E930 0x0013 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EF80 0x000d -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0020 -_0807EEF4 0x0000, 0xfff0 -_0807E930 0x0013 -_0807EF80 0x0010 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -Call sub_0807F3C8 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x001e -_0807EC1C 0x003c -_0807E5F8 0x00010000 -_0807EF80 0x0006 +script_08011442: + _0807E610 0x00008000 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807E930 0x0007 + _0807EB44 0x0006 + _0807ECF4 0x0020 + _0807EB44 0x0004 + _0807E930 0x0006 + _0807ECC4 0x0010 + _0807E930 0x0002 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EF80 0x0004 + Wait 0x003c + _0807E930 0x0012 + SoundReq 0x011e + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x01e8, 0x0098 + SetEntityNonPlanarMovement 0x0040 + _0807EEF4 0x0000, 0x0010 + _0807E930 0x0013 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EF80 0x000d + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0020 + _0807EEF4 0x0000, 0xfff0 + _0807E930 0x0013 + _0807EF80 0x0010 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + Call sub_0807F3C8 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x001e + _0807EC1C 0x003c + _0807E5F8 0x00010000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index cffe3462..c70497c3 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -1,44 +1,45 @@ SCRIPT_START script_08011508 -_0807E610 0x00020000 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -_0807E930 0x0005 -_0807EB44 0x0002 -_0807EC94 0x0020 -_0807EB44 0x0004 -_0807E930 0x0006 -_0807ECC4 0x0010 -_0807E930 0x0002 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0012 -SoundReq 0x011e -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0208, 0x0098 -SetEntityNonPlanarMovement 0x0040 -_0807EEF4 0x0000, 0x0010 -_0807E930 0x0013 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -_0807EF80 0x000d -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0020 -_0807EEF4 0x0000, 0xfff0 -_0807E930 0x0013 -_0807EF80 0x0010 -_0807E5F8 0x00040000 -WaitForSomething2 0x00020000 -Call sub_0807F3C8 -_0807E930 0x0014 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x0002 -_0807EC1C 0x003c -_0807E5F8 0x00040000 -_0807EF80 0x0006 +script_08011508: + _0807E610 0x00020000 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + _0807E930 0x0005 + _0807EB44 0x0002 + _0807EC94 0x0020 + _0807EB44 0x0004 + _0807E930 0x0006 + _0807ECC4 0x0010 + _0807E930 0x0002 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + _0807EF80 0x0004 + Wait 0x003c + _0807E930 0x0012 + SoundReq 0x011e + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0208, 0x0098 + SetEntityNonPlanarMovement 0x0040 + _0807EEF4 0x0000, 0x0010 + _0807E930 0x0013 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + _0807EF80 0x000d + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0020 + _0807EEF4 0x0000, 0xfff0 + _0807E930 0x0013 + _0807EF80 0x0010 + _0807E5F8 0x00040000 + WaitForSomething2 0x00020000 + Call sub_0807F3C8 + _0807E930 0x0014 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x0002 + _0807EC1C 0x003c + _0807E5F8 0x00040000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080115D0.inc b/data/scripts/script_080115D0.inc index 6b01020c..17db073e 100644 --- a/data/scripts/script_080115D0.inc +++ b/data/scripts/script_080115D0.inc @@ -1,15 +1,15 @@ SCRIPT_START script_080115D0 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0002 -_0807E930 0x0001 -StopScript -WaitForSomething2 0x00080000 -_0807E930 0x0005 -SoundReq 0x011c -_0807ECF4 0x0010 -_0807E930 0x0001 -_0807E5F8 0x00100000 -WaitForSomething2 0x00080000 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0002 + _0807E930 0x0001 + StopScript + WaitForSomething2 0x00080000 + _0807E930 0x0005 + SoundReq 0x011c + _0807ECF4 0x0010 + _0807E930 0x0001 + _0807E5F8 0x00100000 + WaitForSomething2 0x00080000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011608.inc b/data/scripts/script_08011608.inc index f3e4d1bf..7c1f94fe 100644 --- a/data/scripts/script_08011608.inc +++ b/data/scripts/script_08011608.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08011608 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0006 -_0807E930 0x0003 -StopScript -WaitForSomething2 0x00200000 -_0807E930 0x0007 -SoundReq 0x011c -_0807EC94 0x0010 -_0807E930 0x0003 -_0807E5F8 0x00400000 -WaitForSomething2 0x00200000 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0006 + _0807E930 0x0003 + StopScript + WaitForSomething2 0x00200000 + _0807E930 0x0007 + SoundReq 0x011c + _0807EC94 0x0010 + _0807E930 0x0003 + _0807E5F8 0x00400000 + WaitForSomething2 0x00200000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08011640.inc b/data/scripts/script_08011640.inc index d2917c75..6a94cb85 100644 --- a/data/scripts/script_08011640.inc +++ b/data/scripts/script_08011640.inc @@ -1,25 +1,25 @@ SCRIPT_START script_08011640 -StartScript -_0807EF80 0x0008 -_0807EB44 0x0004 -SetEntityNonPlanarMovement 0x0100 -StopScript -Call sub_0807F338 -WaitForSomething2 0x00000040 -_0807EF80 0x0007 -_0807EF80 0x0001 -SetEntityNonPlanarMovement 0x0040 -_0807EDD4 0x01f8, 0x0048 -_0807EF80 0x0000 -_0807E5F8 0x00000080 -WaitForSomething2 0x00000040 -_0807EF80 0x0010 -Wait 0x001e -_0807EF80 0x0010 -Call sub_0807F3C8 -SetEntityNonPlanarMovement 0x0400 -SetEntityDirection 0x0008 -_0807EC1C 0x003c -_0807E5F8 0x00000080 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EB44 0x0004 + SetEntityNonPlanarMovement 0x0100 + StopScript + Call sub_0807F338 + WaitForSomething2 0x00000040 + _0807EF80 0x0007 + _0807EF80 0x0001 + SetEntityNonPlanarMovement 0x0040 + _0807EDD4 0x01f8, 0x0048 + _0807EF80 0x0000 + _0807E5F8 0x00000080 + WaitForSomething2 0x00000040 + _0807EF80 0x0010 + Wait 0x001e + _0807EF80 0x0010 + Call sub_0807F3C8 + SetEntityNonPlanarMovement 0x0400 + SetEntityDirection 0x0008 + _0807EC1C 0x003c + _0807E5F8 0x00000080 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index d5f85594..034deb1b 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -1,85 +1,85 @@ SCRIPT_START script_080116A8 -StartScript -_0807EB44 0x0000 -SetEntityNonPlanarMovement 0x0100 -StopScript -Call sub_0807F338 -WaitForSomething2 0x00000100 -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x00d0 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -_0807EB44 0x0004 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -_0807EB44 0x0000 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -_0807EB44 0x0000 -_0807EF80 0x001a -Call sub_0807F2D4 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -_0807EB44 0x0000 -_0807EF80 0x0014 -SoundReq 0x0120 -CallWithArg sub_08095420, 0x08011890 -Wait 0x00f0 -_0807EF80 0x0016 -SoundReq 0x01cb -WaitForSomething2 0x10000000 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0001 -_0807EDD4 0x01d8, 0x00a8 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -_0807EF80 0x0014 -SoundReq 0x01c4 -CallWithArg sub_0809545C, 0x080118d4 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -Wait 0x003c -_0807EF80 0x0016 -SoundReq 0x01c5 -_0807E5F8 0x08000000 -WaitForSomething2 0x10000000 -_0807EF80 0x0000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0098 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x0004 -Wait 0x005a -_0807EB44 0x0004 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -Wait 0x001e -_0807E5F8 0x00000200 -WaitForSomething2 0x00000100 -Call sub_08066CA4 -_0807EF80 0x0008 -Wait 0x0078 -_0807E5F8 0x00000200 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0000 + SetEntityNonPlanarMovement 0x0100 + StopScript + Call sub_0807F338 + WaitForSomething2 0x00000100 + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x00d0 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + _0807EB44 0x0004 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + _0807EB44 0x0000 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + _0807EB44 0x0000 + _0807EF80 0x001a + Call sub_0807F2D4 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + _0807EB44 0x0000 + _0807EF80 0x0014 + SoundReq 0x0120 + CallWithArg sub_08095420, 0x08011890 + Wait 0x00f0 + _0807EF80 0x0016 + SoundReq 0x01cb + WaitForSomething2 0x10000000 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0001 + _0807EDD4 0x01d8, 0x00a8 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + _0807EF80 0x0014 + SoundReq 0x01c4 + CallWithArg sub_0809545C, 0x080118d4 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + Wait 0x003c + _0807EF80 0x0016 + SoundReq 0x01c5 + _0807E5F8 0x08000000 + WaitForSomething2 0x10000000 + _0807EF80 0x0000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0098 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807EF80 0x0004 + Wait 0x005a + _0807EB44 0x0004 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + Wait 0x001e + _0807E5F8 0x00000200 + WaitForSomething2 0x00000100 + Call sub_08066CA4 + _0807EF80 0x0008 + Wait 0x0078 + _0807E5F8 0x00000200 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 55af706a..a3ddcd66 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -1,19 +1,19 @@ SCRIPT_START script_0801183C -StartScript -Call sub_08095330 -StopScript -WaitForSomething2 0x00800000 -_0807EF3C 0x0000, 0x0020 -_0807E5F8 0x01000000 -WaitForSomething2 0x00800000 -Call sub_08095364 -SoundReq 0x0122 -Wait 0x003c -_0807E5F8 0x01000000 -WaitForSomething2 0x00800000 -_0807E930 0x0002 -_0807E5F8 0x01000000 -WaitForSomething2 0x00800000 -_0807EF80 0x0006 + StartScript + Call sub_08095330 + StopScript + WaitForSomething2 0x00800000 + _0807EF3C 0x0000, 0x0020 + _0807E5F8 0x01000000 + WaitForSomething2 0x00800000 + Call sub_08095364 + SoundReq 0x0122 + Wait 0x003c + _0807E5F8 0x01000000 + WaitForSomething2 0x00800000 + _0807E930 0x0002 + _0807E5F8 0x01000000 + WaitForSomething2 0x00800000 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011890.inc b/data/scripts/script_08011890.inc index 11144e47..aa846e13 100644 --- a/data/scripts/script_08011890.inc +++ b/data/scripts/script_08011890.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08011890 -StartScript -_0807E930 0x0000 -SetEntityNonPlanarMovement 0x0200 -Call nullsub_527 -Call sub_08094B80 -StopScript -Wait 0x00f0 -Call sub_08094B6C -_0807EDD4 0x01f8, 0x0088 -Call sub_08094B80 -SoundReq 0x01cc -_0807E5F8 0x10000000 -WaitForSomething2 0x08000000 -_0807EF80 0x0006 + StartScript + _0807E930 0x0000 + SetEntityNonPlanarMovement 0x0200 + Call nullsub_527 + Call sub_08094B80 + StopScript + Wait 0x00f0 + Call sub_08094B6C + _0807EDD4 0x01f8, 0x0088 + Call sub_08094B80 + SoundReq 0x01cc + _0807E5F8 0x10000000 + WaitForSomething2 0x08000000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index dcd95a7b..6c05e051 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -1,21 +1,21 @@ SCRIPT_START script_080118D4 -StartScript -_0807E930 0x0000 -SetEntityNonPlanarMovement 0x0200 -Call nullsub_527 -Call sub_08094B80 -StopScript -WaitForSomething2 0x08000000 -Call sub_08094B6C -_0807EDD4 0x01d8, 0x0078 -StartPlayerScript script_080110E8 -_0807EDD4 0x01d8, 0x0058 -Call sub_08094B80 -SoundReq 0x009a -SoundReq 0x01c6 -_0807E5F8 0x10000000 -WaitForSomething2 0x08000000 -SoundReq 0x011d -_0807EF80 0x0006 + StartScript + _0807E930 0x0000 + SetEntityNonPlanarMovement 0x0200 + Call nullsub_527 + Call sub_08094B80 + StopScript + WaitForSomething2 0x08000000 + Call sub_08094B6C + _0807EDD4 0x01d8, 0x0078 + StartPlayerScript script_080110E8 + _0807EDD4 0x01d8, 0x0058 + Call sub_08094B80 + SoundReq 0x009a + SoundReq 0x01c6 + _0807E5F8 0x10000000 + WaitForSomething2 0x08000000 + SoundReq 0x011d + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011930.inc b/data/scripts/script_08011930.inc index 14e12821..387c954c 100644 --- a/data/scripts/script_08011930.inc +++ b/data/scripts/script_08011930.inc @@ -1,5 +1,5 @@ SCRIPT_START script_08011930 -WaitForSomething 0x20000000 -Call sub_0809567C + WaitForSomething 0x20000000 + Call sub_0809567C SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011940.inc b/data/scripts/script_08011940.inc index 3c327214..faacc51a 100644 --- a/data/scripts/script_08011940.inc +++ b/data/scripts/script_08011940.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08011940 -WaitForSomething 0x40000000 -_0807EF80 0x0006 + WaitForSomething 0x40000000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 6931c790..29618db8 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -1,125 +1,137 @@ SCRIPT_START script_0801194C -StartScript -_0807EB44 0x0002 -Jump 0x0016 -.short 0x0000 -StartScript -_0807EB44 0x0006 -Jump 0x000a -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -CheckGlobalFlag 0x0015 -JumpIf 0x000a -TextboxNoOverlapFollow 0x103d -Jump 0x0006 -TextboxNoOverlapFollow 0x103f -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffce -StartScript -_0807E9D4 -_0807EB44 0x0004 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x0000000c -StopScript -Wait 0x003c -Call sub_0806407C -Jump 0xfff4 -.short 0x0000 -StartScript -_0807EB44 0x0002 -Jump 0x0016 -.short 0x0000 -StartScript -_0807EB44 0x0004 -Jump 0x000a -.short 0x0000 -StartScript -_0807EB44 0x0006 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Call sub_08064428 -_0807EA94 -_0807E878 -Jump 0xffe0 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlapFollow 0x1320 -_0807EA94 -_0807E878 -Jump 0xffe2 -StartScript -_0807EB44 0x0002 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -CallWithArg sub_080644B4, 0x00000006 -JumpIf 0x005e -TextboxNoOverlapFollow 0x1320 -_0807EA94 -_0807E878 -Jump 0xffd4 -.short 0x0000 -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -TextboxNoOverlapFollow 0x1322 -_0807EA94 -_0807E878 -Jump 0xffe2 -CheckRoomFlag 0x000f -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x00071321 -_0807EA94 -SetLocalFlag 0x0010 -CallWithArg sub_0806DA1C, 0x00000003 -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0002 + Jump script_0801196A + .short 0x0000 + StartScript + _0807EB44 0x0006 + Jump script_0801196A + .short 0x0000 + StartScript + _0807EB44 0x0004 +script_0801196A: + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_0801197C: + CheckEntityInteractType + JumpIfNot script_0801197C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + CheckGlobalFlag 0x0015 + JumpIf script_080119A0 + TextboxNoOverlapFollow 0x103d + Jump script_080119A4 +script_080119A0: + TextboxNoOverlapFollow 0x103f +script_080119A4: + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0801197C + StartScript + _0807E9D4 + _0807EB44 0x0004 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x0000000c + StopScript +script_080119C8: + Wait 0x003c + Call sub_0806407C + Jump script_080119C8 + .short 0x0000 + StartScript + _0807EB44 0x0002 + Jump script_080119F6 + .short 0x0000 + StartScript + _0807EB44 0x0004 + Jump script_080119F6 + .short 0x0000 + StartScript + _0807EB44 0x0006 +script_080119F6: + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08011A08: + CheckEntityInteractType + JumpIfNot script_08011A08 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_08064428 + _0807EA94 + _0807E878 + Jump script_08011A08 + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08011A44: + CheckEntityInteractType + JumpIfNot script_08011A44 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlapFollow 0x1320 + _0807EA94 + _0807E878 + Jump script_08011A44 + StartScript + _0807EB44 0x0002 + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08011A7C: + CheckEntityInteractType + JumpIfNot script_08011A7C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + CallWithArg sub_080644B4, 0x00000006 + JumpIf script_08011AFA + TextboxNoOverlapFollow 0x1320 + _0807EA94 + _0807E878 + Jump script_08011A7C + .short 0x0000 + StartScript + _0807EB44 0x0004 + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08011AC4: + CheckEntityInteractType + JumpIfNot script_08011AC4 + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + TextboxNoOverlapFollow 0x1322 + _0807EA94 + _0807E878 + Jump script_08011AC4 +script_08011AE4: + CheckRoomFlag 0x000f + JumpIfNot script_08011AE4 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 +script_08011AFA: + TextboxNoOverlapFollowPos 0x00071321 + _0807EA94 + SetLocalFlag 0x0010 + CallWithArg sub_0806DA1C, 0x00000003 + _0807E878 + Call sub_0807DF50 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 26e034fa..c568336a 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08011B20 -_0807E864 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x000c1320 -_0807EA94 -_0807E878 -Call sub_0807DF50 -_0807EF80 0x0006 + _0807E864 + Call sub_0807DF28 + TextboxNoOverlapFollowPos 0x000c1320 + _0807EA94 + _0807E878 + Call sub_0807DF50 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011B40.inc b/data/scripts/script_08011B40.inc index ed37af0a..bc4f4c26 100644 --- a/data/scripts/script_08011B40.inc +++ b/data/scripts/script_08011B40.inc @@ -1,76 +1,82 @@ SCRIPT_START script_08011B40 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckGlobalFlag 0x0050 -JumpIfNot 0x002c -WaitForSomething2 0x00000004 -_0807EB44 0x0006 -_0807EF80 0x0004 -Wait 0x003c -_0807EB8C -TextboxNoOverlap 0x3d07 -_0807EA94 -_0807EB44 0x0004 -ClearGlobalFlag 0x0050 -Call sub_0807DF50 -_0807E878 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x3d01 -_0807EA94 -_0807E3E8 -JumpIf 0x000c -_0807E878 -_0807EB44 0x0004 -Jump 0xffe2 -HasRupees 0x000a -JumpIf 0x0012 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x3d05 -Jump 0xffe0 -ModRupees 0xfff6 -Wait 0x001e -TextboxNoOverlap 0x3d06 -_0807EA94 -CallWithArg sub_0806C2A0, 0x00000000 -WaitFor_2 -Wait 0x003c -Call sub_0806C224 -Jump 0xffb8 -StartScript -_0807E888 -StopScript -CallWithArg sub_0806C2A0, 0x00000001 -WaitFor_2 -Wait 0x003c -_0807E878 -SetRoomFlag 0x0000 -SoundReq2 0x0033 -CheckRoomFlag 0x0064 -JumpIfNot 0xfffa -SoundReq0x80100000 -_0807E864 -Wait 0x003c -CameraTargetEntity -Wait 0x003c -Call Simon_CreateChest -Wait 0x003c -CameraTargetPlayer -_0807E878 -CheckLocalFlag 0x0001 -JumpIfNot 0xfffa -_0807E888 -WaitPlayerAction8 -Wait 0x001e -CallWithArg sub_0806C2A0, 0x00000000 -WaitFor_2 -Wait 0x003c -Call sub_0806C280 + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + CheckGlobalFlag 0x0050 + JumpIfNot script_08011B84 + WaitForSomething2 0x00000004 + _0807EB44 0x0006 + _0807EF80 0x0004 + Wait 0x003c + _0807EB8C + TextboxNoOverlap 0x3d07 + _0807EA94 + _0807EB44 0x0004 + ClearGlobalFlag 0x0050 + Call sub_0807DF50 + _0807E878 +script_08011B84: + CheckEntityInteractType + JumpIfNot script_08011B84 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x3d01 + _0807EA94 + _0807E3E8 + JumpIf script_08011BA4 +script_08011B9A: + _0807E878 + _0807EB44 0x0004 + Jump script_08011B84 +script_08011BA4: + HasRupees 0x000a + JumpIf script_08011BBC + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x3d05 + Jump script_08011B9A +script_08011BBC: + ModRupees 0xfff6 + Wait 0x001e + TextboxNoOverlap 0x3d06 + _0807EA94 + CallWithArg sub_0806C2A0, 0x00000000 + WaitFor_2 + Wait 0x003c + Call sub_0806C224 + Jump script_08011B9A + StartScript + _0807E888 + StopScript + CallWithArg sub_0806C2A0, 0x00000001 + WaitFor_2 + Wait 0x003c + _0807E878 + SetRoomFlag 0x0000 + SoundReq2 0x0033 +script_08011C04: + CheckRoomFlag 0x0064 + JumpIfNot script_08011C04 + SoundReq0x80100000 + _0807E864 + Wait 0x003c + CameraTargetEntity + Wait 0x003c + Call Simon_CreateChest + Wait 0x003c + CameraTargetPlayer + _0807E878 +script_08011C28: + CheckLocalFlag 0x0001 + JumpIfNot script_08011C28 + _0807E888 + WaitPlayerAction8 + Wait 0x001e + CallWithArg sub_0806C2A0, 0x00000000 + WaitFor_2 + Wait 0x003c + Call sub_0806C280 SCRIPT_END diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index 9bce285e..fb147eb5 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08011C50 -StartScript -_0807E864 -StopScript -Wait 0x003c -CallWithArg sub_0806C2A0, 0x00000001 -WaitFor_2 -Wait 0x003c -_0807EF80 0x0014 -Wait 0x001e -_0807E5F8 0x00000004 + StartScript + _0807E864 + StopScript + Wait 0x003c + CallWithArg sub_0806C2A0, 0x00000001 + WaitFor_2 + Wait 0x003c + _0807EF80 0x0014 + Wait 0x001e + _0807E5F8 0x00000004 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 270d8857..3c70f88d 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -1,525 +1,575 @@ SCRIPT_START script_08011C7C -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -CheckGlobalFlag 0x0047 -JumpIf 0x002c -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0xfff8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4515 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffda -StopScript -StartScript -CheckGlobalFlag 0x002c -JumpIf 0xffce -CheckGlobalFlag 0x002d -JumpIf 0xffc6 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3105 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffc4 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3108 -_0807EA94 -SetGlobalFlag 0x002b -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -.short 0x0000 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -CheckGlobalFlag 0x0047 -JumpIf 0x002c -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0xfff8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4513 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffda -StopScript -StartScript -CheckGlobalFlag 0x002b -JumpIf 0xffce -CheckGlobalFlag 0x002d -JumpIf 0xffc6 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3103 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffc4 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3106 -_0807EA94 -SetGlobalFlag 0x002c -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -.short 0x0000 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -CheckGlobalFlag 0x0047 -JumpIf 0x002c -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIfNot 0xfff8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4514 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffda -StopScript -StartScript -CheckGlobalFlag 0x002b -JumpIf 0xffce -CheckGlobalFlag 0x002c -JumpIf 0xffc6 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3104 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffc4 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3107 -_0807EA94 -SetGlobalFlag 0x002d -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -.short 0x0000 -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002f -JumpIf 0xfdfa -CheckGlobalFlag 0x0030 -JumpIf 0xfdf2 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4524 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x3111 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3114 -_0807EA94 -SetGlobalFlag 0x002e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002e -JumpIf 0xfe1a -CheckGlobalFlag 0x0030 -JumpIf 0xfe12 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4522 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x310f -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3112 -_0807EA94 -SetGlobalFlag 0x002f -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x002e -JumpIf 0xfe3a -CheckGlobalFlag 0x002f -JumpIf 0xfe32 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckGlobalFlag 0x0048 -JumpIf 0x000c -TextboxNoOverlap 0x4523 -_0807EA94 -Jump 0x000e -TextboxNoOverlap 0x3110 -_0807EA94 -_0807E3E8 -JumpIf 0x001e -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffb2 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x3113 -_0807EA94 -SetGlobalFlag 0x0030 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffdc -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0094 -JumpIf 0x0010 -TextboxNoOverlap 0x3122 -_0807EA94 -SetLocalFlag 0x0094 -Jump 0x0042 -_0807E48C 0x0031 -JumpIfNot 0x000c -TextboxNoOverlap 0x3123 -_0807EA94 -Jump 0x0030 -TextboxNoOverlap 0x3124 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0024 -_0807E48C 0x0020 -JumpIfNot 0x0018 -TextboxNoOverlap 0x3125 -_0807EA94 -_0807F034 0x0031 -WaitPlayerAction8 -Call sub_0807FC24 -Jump 0x0006 -TextboxNoOverlap 0x3127 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0095 -JumpIf 0x0010 -TextboxNoOverlap 0x3116 -_0807EA94 -SetLocalFlag 0x0095 -Jump 0x0042 -_0807E48C 0x002f -JumpIfNot 0x000c -TextboxNoOverlap 0x3117 -_0807EA94 -Jump 0x0030 -TextboxNoOverlap 0x3118 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0024 -_0807E48C 0x0020 -JumpIfNot 0x0018 -TextboxNoOverlap 0x3119 -_0807EA94 -_0807F034 0x002f -WaitPlayerAction8 -Call sub_0807FC24 -Jump 0x0006 -TextboxNoOverlap 0x311b -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -CheckLocalFlag 0x0096 -JumpIf 0x0010 -TextboxNoOverlap 0x311c -_0807EA94 -SetLocalFlag 0x0096 -Jump 0x0042 -_0807E48C 0x0030 -JumpIfNot 0x000c -TextboxNoOverlap 0x311d -_0807EA94 -Jump 0x0030 -TextboxNoOverlap 0x311e -_0807EA94 -_0807E3E8 -JumpIfNot 0x0024 -_0807E48C 0x0020 -JumpIfNot 0x0018 -TextboxNoOverlap 0x311f -_0807EA94 -_0807F034 0x0030 -WaitPlayerAction8 -Call sub_0807FC24 -Jump 0x0006 -TextboxNoOverlap 0x3121 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xff8e -.short 0x0000 -StartScript -Call sub_08064828 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4527 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffe0 -StartScript -Call sub_08064928 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4525 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffe0 -StartScript -Call sub_08064A28 -_0807EB44 0x0004 -_0807EF80 0x0001 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x4526 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0001 -Jump 0xffe0 -StartScript -_0807EB44 0x0004 -Call sub_08061FD8 -_0807E9D4 -_0807EF80 0x000a -StopScript -StopScript -StartScript -CheckGlobalFlag 0x001e -JumpIfNot 0x000a -CheckInventory1 0x0015 -JumpIf 0x0024 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -TextboxNoOverlapFollow 0x2302 -_0807EA94 -_0807E878 -SetGlobalFlag 0x001e -Jump 0xffcc -StopScript -StartScript -CheckRoomFlag 0x0000 -JumpIfNot 0x000a -CheckRoomFlag 0x0001 -JumpIf 0x0020 -CheckEntityInteractType -JumpIfNot 0xffe8 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -TextboxNoOverlapFollow 0x2303 -_0807EA94 -_0807E878 -Jump 0xffd0 -StopScript -_0807EB74 -_0807E864 -Call sub_08061FD8 -_0807EF80 0x000b -Call sub_08061FB0 -Call sub_08061F94 -LoadRoomEntityList gUnk_080F2758 -_0807EF80 0x0008 -Wait 0x003c -SoundReq 0x0072 -SetLocalFlag 0x0043 -Wait 0x001e -_0807E878 -_0807EF80 0x0006 + StartScript + Call sub_08064828 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011CC2 + StopScript +script_08011C9A: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_08011C9A + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4515 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011C9A +script_08011CC2: + StopScript + StartScript + CheckGlobalFlag 0x002c + JumpIf script_08011C9A + CheckGlobalFlag 0x002d + JumpIf script_08011C9A + CheckEntityInteractType + JumpIfNot script_08011CC2 + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x3105 + _0807EA94 + _0807E3E8 + JumpIf script_08011D0E + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011CC2 +script_08011D00: + CheckEntityInteractType + JumpIfNot script_08011D00 + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_08011D0E: + TextboxNoOverlap 0x3108 + _0807EA94 + SetGlobalFlag 0x002b + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011D00 + .short 0x0000 + StartScript + Call sub_08064928 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011D6E + StopScript +script_08011D46: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_08011D46 + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4513 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011D46 +script_08011D6E: + StopScript + StartScript + CheckGlobalFlag 0x002b + JumpIf script_08011D46 + CheckGlobalFlag 0x002d + JumpIf script_08011D46 + CheckEntityInteractType + JumpIfNot script_08011D6E + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x3103 + _0807EA94 + _0807E3E8 + JumpIf script_08011DBA + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011D6E +script_08011DAC: + CheckEntityInteractType + JumpIfNot script_08011DAC + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_08011DBA: + TextboxNoOverlap 0x3106 + _0807EA94 + SetGlobalFlag 0x002c + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011DAC + .short 0x0000 + StartScript + Call sub_08064A28 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + CheckGlobalFlag 0x0047 + JumpIf script_08011E1A + StopScript +script_08011DF2: + StopScript + StartScript + CheckEntityInteractType + JumpIfNot script_08011DF2 + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4514 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011DF2 +script_08011E1A: + StopScript + StartScript + CheckGlobalFlag 0x002b + JumpIf script_08011DF2 + CheckGlobalFlag 0x002c + JumpIf script_08011DF2 + CheckEntityInteractType + JumpIfNot script_08011E1A + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x3104 + _0807EA94 + _0807E3E8 + JumpIf script_08011E66 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011E1A +script_08011E58: + CheckEntityInteractType + JumpIfNot script_08011E58 + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_08011E66: + TextboxNoOverlap 0x3107 + _0807EA94 + SetGlobalFlag 0x002d + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011E58 + .short 0x0000 + StartScript + Call sub_08064828 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_08011E96: + StopScript + StartScript + CheckGlobalFlag 0x002f + JumpIf script_08011C9A + CheckGlobalFlag 0x0030 + JumpIf script_08011C9A + CheckEntityInteractType + JumpIfNot script_08011E96 + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011ECC + TextboxNoOverlap 0x4524 + _0807EA94 + Jump script_08011ED8 +script_08011ECC: + TextboxNoOverlap 0x3111 + _0807EA94 + _0807E3E8 + JumpIf script_08011EF4 +script_08011ED8: + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011E96 +script_08011EE6: + CheckEntityInteractType + JumpIfNot script_08011EE6 + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_08011EF4: + TextboxNoOverlap 0x3114 + _0807EA94 + SetGlobalFlag 0x002e + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011EE6 + StartScript + Call sub_08064928 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_08011F22: + StopScript + StartScript + CheckGlobalFlag 0x002e + JumpIf script_08011D46 + CheckGlobalFlag 0x0030 + JumpIf script_08011D46 + CheckEntityInteractType + JumpIfNot script_08011F22 + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011F58 + TextboxNoOverlap 0x4522 + _0807EA94 + Jump script_08011F64 +script_08011F58: + TextboxNoOverlap 0x310f + _0807EA94 + _0807E3E8 + JumpIf script_08011F80 +script_08011F64: + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011F22 +script_08011F72: + CheckEntityInteractType + JumpIfNot script_08011F72 + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_08011F80: + TextboxNoOverlap 0x3112 + _0807EA94 + SetGlobalFlag 0x002f + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011F72 + StartScript + Call sub_08064A28 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_08011FAE: + StopScript + StartScript + CheckGlobalFlag 0x002e + JumpIf script_08011DF2 + CheckGlobalFlag 0x002f + JumpIf script_08011DF2 + CheckEntityInteractType + JumpIfNot script_08011FAE + StopScript + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckGlobalFlag 0x0048 + JumpIf script_08011FE4 + TextboxNoOverlap 0x4523 + _0807EA94 + Jump script_08011FF0 +script_08011FE4: + TextboxNoOverlap 0x3110 + _0807EA94 + _0807E3E8 + JumpIf script_0801200C +script_08011FF0: + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011FAE +script_08011FFE: + CheckEntityInteractType + JumpIfNot script_08011FFE + _0807E864 + _0807EB74 + _0807EF80 0x0000 +script_0801200C: + TextboxNoOverlap 0x3113 + _0807EA94 + SetGlobalFlag 0x0030 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08011FFE + StartScript + Call sub_08064828 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_0801203A: + CheckEntityInteractType + JumpIfNot script_0801203A + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckLocalFlag 0x0094 + JumpIf script_0801205E + TextboxNoOverlap 0x3122 + _0807EA94 + SetLocalFlag 0x0094 + Jump script_0801209E +script_0801205E: + _0807E48C 0x0031 + JumpIfNot script_08012070 + TextboxNoOverlap 0x3123 + _0807EA94 + Jump script_0801209E +script_08012070: + TextboxNoOverlap 0x3124 + _0807EA94 + _0807E3E8 + JumpIfNot script_0801209E + _0807E48C 0x0020 + JumpIfNot script_0801209A + TextboxNoOverlap 0x3125 + _0807EA94 + _0807F034 0x0031 + WaitPlayerAction8 + Call sub_0807FC24 + Jump script_0801209E +script_0801209A: + TextboxNoOverlap 0x3127 +script_0801209E: + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_0801203A + .short 0x0000 + StartScript + Call sub_08064928 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_080120C6: + CheckEntityInteractType + JumpIfNot script_080120C6 + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckLocalFlag 0x0095 + JumpIf script_080120EA + TextboxNoOverlap 0x3116 + _0807EA94 + SetLocalFlag 0x0095 + Jump script_0801212A +script_080120EA: + _0807E48C 0x002f + JumpIfNot script_080120FC + TextboxNoOverlap 0x3117 + _0807EA94 + Jump script_0801212A +script_080120FC: + TextboxNoOverlap 0x3118 + _0807EA94 + _0807E3E8 + JumpIfNot script_0801212A + _0807E48C 0x0020 + JumpIfNot script_08012126 + TextboxNoOverlap 0x3119 + _0807EA94 + _0807F034 0x002f + WaitPlayerAction8 + Call sub_0807FC24 + Jump script_0801212A +script_08012126: + TextboxNoOverlap 0x311b +script_0801212A: + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_080120C6 + .short 0x0000 + StartScript + Call sub_08064A28 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_08012152: + CheckEntityInteractType + JumpIfNot script_08012152 + _0807E864 + _0807EB74 + _0807EF80 0x0000 + CheckLocalFlag 0x0096 + JumpIf script_08012176 + TextboxNoOverlap 0x311c + _0807EA94 + SetLocalFlag 0x0096 + Jump script_080121B6 +script_08012176: + _0807E48C 0x0030 + JumpIfNot script_08012188 + TextboxNoOverlap 0x311d + _0807EA94 + Jump script_080121B6 +script_08012188: + TextboxNoOverlap 0x311e + _0807EA94 + _0807E3E8 + JumpIfNot script_080121B6 + _0807E48C 0x0020 + JumpIfNot script_080121B2 + TextboxNoOverlap 0x311f + _0807EA94 + _0807F034 0x0030 + WaitPlayerAction8 + Call sub_0807FC24 + Jump script_080121B6 +script_080121B2: + TextboxNoOverlap 0x3121 +script_080121B6: + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08012152 + .short 0x0000 + StartScript + Call sub_08064828 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_080121DE: + CheckEntityInteractType + JumpIfNot script_080121DE + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4527 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_080121DE + StartScript + Call sub_08064928 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_08012216: + CheckEntityInteractType + JumpIfNot script_08012216 + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4525 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_08012216 + StartScript + Call sub_08064A28 + _0807EB44 0x0004 + _0807EF80 0x0001 + _0807EF80 0x000a + StopScript +script_0801224E: + CheckEntityInteractType + JumpIfNot script_0801224E + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x4526 + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0001 + Jump script_0801224E + StartScript + _0807EB44 0x0004 + Call sub_08061FD8 + _0807E9D4 + _0807EF80 0x000a + StopScript +script_08012284: + StopScript + StartScript + CheckGlobalFlag 0x001e + JumpIfNot script_08012298 + CheckInventory1 0x0015 + JumpIf script_080122BA +script_08012298: + CheckEntityInteractType + JumpIfNot script_08012284 + StopScript + _0807EB74 + _0807E864 + Call sub_08061FD8 + TextboxNoOverlapFollow 0x2302 + _0807EA94 + _0807E878 + SetGlobalFlag 0x001e + Jump script_08012284 +script_080122BA: + StopScript + StartScript + CheckRoomFlag 0x0000 + JumpIfNot script_080122CE + CheckRoomFlag 0x0001 + JumpIf script_080122EC +script_080122CE: + CheckEntityInteractType + JumpIfNot script_080122BA + StopScript + _0807EB74 + _0807E864 + Call sub_08061FD8 + TextboxNoOverlapFollow 0x2303 + _0807EA94 + _0807E878 + Jump script_080122BA +script_080122EC: + StopScript + _0807EB74 + _0807E864 + Call sub_08061FD8 + _0807EF80 0x000b + Call sub_08061FB0 + Call sub_08061F94 + LoadRoomEntityList gUnk_080F2758 + _0807EF80 0x0008 + Wait 0x003c + SoundReq 0x0072 + SetLocalFlag 0x0043 + Wait 0x001e + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index 5e8aa941..c434f93b 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -1,68 +1,71 @@ SCRIPT_START script_0801232C -StartScript -_0807EB74 -_0807E9D4 -_0807EF80 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807EB74 -_0807E864 -TextboxNoOverlapFollow 0x2304 -_0807EA94 -CheckLocalFlag 0x0042 -JumpIf 0x000c -SetLocalFlag 0x0042 -_0807F034 0x0057 -WaitPlayerAction8 -_0807E878 -Jump 0xffda -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x0004 -JumpIfNot 0xfffa -Call sub_0807DF28 -_0807E864 -SoundReq0x80100000 -StartScript -_0807E778 0x0004 -_0807E788 0x00007fff -DoFade5 -_0807E858 0x0080 -StopScript -WaitFor_2 -SoundReq2 0x002c -_0807EB28 0x1401 -_0807EA94 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x0007 -SoundReq 0x01ce -SetEntity0x20 0xffff8000 -Wait 0x003c -_0807E8E4_0 -StartPlayerScript script_08012410 -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x1402 -_0807EA94 -SoundReq0x80100000 -SetEntity0x20 0x00010000 -Wait 0x003c -StartScript -_0807E778 0x0004 -_0807E788 0xffffffff -DoFade4 -_0807E858 0x0080 -StopScript -WaitFor_2 -SoundReq2 0xffff -_0807EB28 0x1403 -_0807EA94 -_0807E914 0x00000203 -Call sub_0807F420 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EB74 + _0807E9D4 + _0807EF80 0x000a + StopScript +script_08012338: + CheckEntityInteractType + JumpIfNot script_08012338 + _0807EB74 + _0807E864 + TextboxNoOverlapFollow 0x2304 + _0807EA94 + CheckLocalFlag 0x0042 + JumpIf script_0801235A + SetLocalFlag 0x0042 + _0807F034 0x0057 + WaitPlayerAction8 +script_0801235A: + _0807E878 + Jump script_08012338 + StartScript + _0807EF80 0x0008 + StopScript +script_08012368: + CheckLocalFlag 0x0004 + JumpIfNot script_08012368 + Call sub_0807DF28 + _0807E864 + SoundReq0x80100000 + StartScript + _0807E778 0x0004 + _0807E788 0x00007fff + DoFade5 + _0807E858 0x0080 + StopScript + WaitFor_2 + SoundReq2 0x002c + _0807EB28 0x1401 + _0807EA94 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x0007 + SoundReq 0x01ce + SetEntity0x20 0xffff8000 + Wait 0x003c + _0807E8E4_0 + StartPlayerScript script_08012410 + WaitForSomething2 0x00000001 + TextboxNoOverlap 0x1402 + _0807EA94 + SoundReq0x80100000 + SetEntity0x20 0x00010000 + Wait 0x003c + StartScript + _0807E778 0x0004 + _0807E788 0xffffffff + DoFade4 + _0807E858 0x0080 + StopScript + WaitFor_2 + SoundReq2 0xffff + _0807EB28 0x1403 + _0807EA94 + _0807E914 0x00000203 + Call sub_0807F420 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index ee6be58f..ce244ad3 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08012410 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index f3bcc8f2..ed7b71f5 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -1,155 +1,159 @@ SCRIPT_START script_08012430 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0008 -Call sub_0807F2D4 -_0807E930 0x0009 -Call sub_0806B2B4 -_0807EA94 -CheckLocalFlag 0x00b3 -JumpIf 0x0010 -SetLocalFlag 0x00b3 -_0807F034 0x0062 -WaitPlayerAction8 -SetLocalFlag 0x00d0 -_0807E878 -_0807E930 0x0000 -Jump 0xffc4 -.short 0x0000 -StartScript -Call sub_08054564 -StopScript -CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 -JumpIfNot 0xfff6 -SoundReq0x80100000 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08012AB0 -TextboxNoOverlapFollowPos 0x00071101 -_0807EA94 -CameraTargetPlayer -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -_0807E858 0x0000 -Call sub_080791BC -LoadRoomEntityList gUnk_080F4D70 -Call DeleteAllEnemies -SetEntityPositionRelative 0x01680388 -Call sub_0807F844 -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -SoundReq2 0x000e -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -MoveEntityToPlayer -Call sub_0807F844 -CameraTargetPlayer -_0807E788 0xffffffff -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -Call sub_0807DF50 -_0807E878 -SoundReq2 0xffff -CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0806DC7C -SoundReq0x80100000 -StartPlayerScript script_08012AC8 -WaitForSomething2 0x00000001 -SetEntityPositionRelative 0x01680388 -_0807F0B4 0x0001 -CameraTargetEntity -Wait 0x005a -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq2 0x000e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -SoundReq2 0x0033 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000050 -LoadRoomEntityList gUnk_080F51D0 -WaitForSomething2 0x00000008 -_0807E864 -Call sub_0807FA40 -Call sub_0807DF28 -SoundReq 0x0072 -SoundReq0x80100000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -StartPlayerScript script_08012AF0 -WaitForSomething2 0x00000001 -_0807E8E4_0 -SoundReq2 0x000e -Wait 0x001e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -Wait 0x003c -SoundReq2 0xffff -Call sub_0806DCA0 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -SoundReq0x80100000 -Wait 0x003c -SoundReq2 0xffff -Call sub_08054570 -SetGlobalFlag 0x0014 -CallWithArg sub_0807F6F8, 0x00000008 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0000 + StopScript +script_08012440: + CheckEntityInteractType + JumpIfNot script_08012440 + _0807E864 + _0807E930 0x0008 + Call sub_0807F2D4 + _0807E930 0x0009 + Call sub_0806B2B4 + _0807EA94 + CheckLocalFlag 0x00b3 + JumpIf script_08012474 + SetLocalFlag 0x00b3 + _0807F034 0x0062 + WaitPlayerAction8 + SetLocalFlag 0x00d0 +script_08012474: + _0807E878 + _0807E930 0x0000 + Jump script_08012440 + .short 0x0000 + StartScript + Call sub_08054564 + StopScript +script_0801248A: + CheckPlayerInRegion 0x0208, 0x02c8, 0x4020 + JumpIfNot script_0801248A + SoundReq0x80100000 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_08012AB0 + TextboxNoOverlapFollowPos 0x00071101 + _0807EA94 + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + _0807E858 0x0000 + Call sub_080791BC + LoadRoomEntityList gUnk_080F4D70 + Call DeleteAllEnemies + SetEntityPositionRelative 0x01680388 + Call sub_0807F844 + _0807E778 0x0004 + _0807E800 0x00000000 + WaitFor_2 + SoundReq2 0x000e + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + WaitForSomething2 0x00000100 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000080 + WaitForSomething2 0x00000100 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + SoundReq0x80100000 + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + MoveEntityToPlayer + Call sub_0807F844 + CameraTargetPlayer + _0807E788 0xffffffff + _0807E778 0x0004 + _0807E800 0x00000000 + WaitFor_2 + Call sub_0807DF50 + _0807E878 + SoundReq2 0xffff +script_08012566: + CheckPlayerInRegion 0x03a0, 0x01a0, 0x1020 + JumpIfNot script_08012566 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0806DC7C + SoundReq0x80100000 + StartPlayerScript script_08012AC8 + WaitForSomething2 0x00000001 + SetEntityPositionRelative 0x01680388 + _0807F0B4 0x0001 + CameraTargetEntity + Wait 0x005a + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + SoundReq2 0x000e + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000080 + WaitForSomething2 0x00000100 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + WaitForSomething2 0x00000100 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + SoundReq0x80100000 + SoundReq2 0x0033 + Call sub_0807DF50 + _0807E878 + _0807E5F8 0x00000050 + LoadRoomEntityList gUnk_080F51D0 + WaitForSomething2 0x00000008 + _0807E864 + Call sub_0807FA40 + Call sub_0807DF28 + SoundReq 0x0072 + SoundReq0x80100000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + StartPlayerScript script_08012AF0 + WaitForSomething2 0x00000001 + _0807E8E4_0 + SoundReq2 0x000e + Wait 0x001e + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + SoundReq0x80100000 + Wait 0x003c + SoundReq2 0xffff + Call sub_0806DCA0 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807DF50 + _0807E878 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + SoundReq0x80100000 + Wait 0x003c + SoundReq2 0xffff + Call sub_08054570 + SetGlobalFlag 0x0014 + CallWithArg sub_0807F6F8, 0x00000008 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080126FC.inc b/data/scripts/script_080126FC.inc index 06b388b0..c700ebed 100644 --- a/data/scripts/script_080126FC.inc +++ b/data/scripts/script_080126FC.inc @@ -1,231 +1,243 @@ SCRIPT_START script_080126FC -StartScript -SetEntityNonPlanarMovement 0x0040 -_0807EF80 0x0007 -StopScript -_0807E930 0x0020 -WaitForSomething2 0x00000004 -_0807E930 0x0022 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x000c1102 -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0021 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x000c1103 -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0011 -_0807E930 0x001c -TextboxNoOverlapFollowPos 0x000c1105 -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0022 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x000c1106 -_0807EA94 -_0807E930 0x001c -Call sub_0806D96C -TextboxNoOverlapFollowPos 0x000c1107 -_0807EA94 -_0807E930 0x0020 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0021 -Call sub_0807F3C8 -TextboxNoOverlapFollowPos 0x000c1108 -_0807EA94 -_0807E930 0x001c -Call sub_0806D96C -TextboxNoOverlapFollowPos 0x000c1109 -_0807EA94 -_0807E930 0x0020 -_0807EF80 0x000a -_0807E9D4 -_0807E5F8 0x00000008 -StopScript -StartScript -CheckRoomFlag 0x0000 -JumpIf 0x0028 -CheckEntityInteractType -JumpIfNot 0xfff0 -StopScript -_0807E864 -Call sub_0806D944 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c1114 -_0807EA94 -_0807E930 0x0020 -_0807E878 -Jump 0xffd0 -_0807E864 -_0807E9DC -CallWithArg sub_0807F5B0, 0x0000003c -Call sub_080791D0 -StopScript -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x000b -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -Call sub_0806D944 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110a -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110b -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110c -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110d -_0807EA94 -_0807E930 0x001f -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110e -_0807EA94 -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0010 -_0807EF80 0x000a -_0807E9D4 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x000c1115 -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB8C -Call sub_0806D944 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c110f -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0050 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x000c1115 -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB8C -Call sub_0806D944 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c1110 -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D908 -_0807EC1C 0x0050 -_0807E930 0x0018 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -StopScript -StartScript -Call sub_0806D944 -CheckEntityInteractType -JumpIf 0x000e -CheckPlayerInRegion2 0x3030 -JumpIfNot 0x0020 -Jump 0xffe6 -_0807E864 -_0807E930 0x0010 -StopScript -TextboxNoOverlapFollowPos 0x000c1115 -_0807EA94 -_0807E930 0x0018 -_0807E878 -Jump 0xffcc -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -_0807EF80 0x000b -_0807EB8C -Call sub_0806D944 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c1111 -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0080 -Call sub_0806D8A0 -_0807EE30 -JumpIfNot 0xfffc -_0807E930 0x001f -_0807EA94 -StartPlayerScript script_08012B18 -Call sub_0806D9A4 -_0807EF80 0x0008 -Wait 0x0078 -SoundReq2 0x000e -StartScript -_0807E8E4_2 -_0807EB28 0x1112 -StopScript -_0807EA94 -_0807E5F8 0x00000008 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0040 + _0807EF80 0x0007 + StopScript + _0807E930 0x0020 + WaitForSomething2 0x00000004 + _0807E930 0x0022 + Call sub_0807F3C8 + TextboxNoOverlapFollowPos 0x000c1102 + _0807EA94 + _0807E930 0x0020 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0021 + Call sub_0807F3C8 + TextboxNoOverlapFollowPos 0x000c1103 + _0807EA94 + _0807E930 0x0020 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x0011 + _0807E930 0x001c + TextboxNoOverlapFollowPos 0x000c1105 + _0807EA94 + _0807E930 0x0020 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0022 + Call sub_0807F3C8 + TextboxNoOverlapFollowPos 0x000c1106 + _0807EA94 + _0807E930 0x001c + Call sub_0806D96C + TextboxNoOverlapFollowPos 0x000c1107 + _0807EA94 + _0807E930 0x0020 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0021 + Call sub_0807F3C8 + TextboxNoOverlapFollowPos 0x000c1108 + _0807EA94 + _0807E930 0x001c + Call sub_0806D96C + TextboxNoOverlapFollowPos 0x000c1109 + _0807EA94 + _0807E930 0x0020 + _0807EF80 0x000a + _0807E9D4 + _0807E5F8 0x00000008 +script_080127F2: + StopScript + StartScript + CheckRoomFlag 0x0000 + JumpIf script_08012824 + CheckEntityInteractType + JumpIfNot script_080127F2 + StopScript + _0807E864 + Call sub_0806D944 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c1114 + _0807EA94 + _0807E930 0x0020 + _0807E878 + Jump script_080127F2 +script_08012824: + _0807E864 + _0807E9DC + CallWithArg sub_0807F5B0, 0x0000003c + Call sub_080791D0 + StopScript + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x000b + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + Call sub_0806D944 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110a + _0807EA94 + _0807E930 0x001f + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110b + _0807EA94 + _0807E930 0x001f + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + Wait 0x003c + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110c + _0807EA94 + _0807E930 0x001f + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110d + _0807EA94 + _0807E930 0x001f + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110e + _0807EA94 + _0807E930 0x0018 + SetEntityNonPlanarMovement 0x0080 + Call sub_0806D908 + _0807EC1C 0x0010 + _0807EF80 0x000a + _0807E9D4 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 +script_08012904: + StopScript + StartScript + Call sub_0806D944 + CheckEntityInteractType + JumpIf script_08012920 + CheckPlayerInRegion2 0x3030 + JumpIfNot script_0801293A + Jump script_08012904 +script_08012920: + _0807E864 + _0807E930 0x0010 + StopScript + TextboxNoOverlapFollowPos 0x000c1115 + _0807EA94 + _0807E930 0x0018 + _0807E878 + Jump script_08012904 +script_0801293A: + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807EB8C + Call sub_0806D944 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c110f + _0807E930 0x0018 + SetEntityNonPlanarMovement 0x0080 + Call sub_0806D908 + _0807EC1C 0x0050 + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 +script_08012984: + StopScript + StartScript + Call sub_0806D944 + CheckEntityInteractType + JumpIf script_080129A0 + CheckPlayerInRegion2 0x3030 + JumpIfNot script_080129BA + Jump script_08012984 +script_080129A0: + _0807E864 + _0807E930 0x0010 + StopScript + TextboxNoOverlapFollowPos 0x000c1115 + _0807EA94 + _0807E930 0x0018 + _0807E878 + Jump script_08012984 +script_080129BA: + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807EB8C + Call sub_0806D944 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c1110 + _0807E930 0x0018 + SetEntityNonPlanarMovement 0x0080 + Call sub_0806D908 + _0807EC1C 0x0050 + _0807E930 0x0018 + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 +script_08012A08: + StopScript + StartScript + Call sub_0806D944 + CheckEntityInteractType + JumpIf script_08012A24 + CheckPlayerInRegion2 0x3030 + JumpIfNot script_08012A3E + Jump script_08012A08 +script_08012A24: + _0807E864 + _0807E930 0x0010 + StopScript + TextboxNoOverlapFollowPos 0x000c1115 + _0807EA94 + _0807E930 0x0018 + _0807E878 + Jump script_08012A08 +script_08012A3E: + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + SoundReq0x80100000 + _0807EF80 0x000b + _0807EB8C + Call sub_0806D944 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c1111 + _0807E930 0x0018 + SetEntityNonPlanarMovement 0x0080 + Call sub_0806D8A0 +script_08012A74: + _0807EE30 + JumpIfNot script_08012A74 + _0807E930 0x001f + _0807EA94 + StartPlayerScript script_08012B18 + Call sub_0806D9A4 + _0807EF80 0x0008 + Wait 0x0078 + SoundReq2 0x000e + StartScript + _0807E8E4_2 + _0807EB28 0x1112 + StopScript + _0807EA94 + _0807E5F8 0x00000008 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc index b5829c97..8cc59657 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -1,8 +1,9 @@ SCRIPT_START script_08012AB0 -StopScript -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -Jump 0xffee -.short 0x0000 + StopScript +script_08012AB2: + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + Jump script_08012AB2 + .short 0x0000 diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index b3d05417..b50a637d 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08012AC8 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x0004 -Wait 0x003c -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807EF80 0x0004 + Wait 0x003c + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012AF0.inc b/data/scripts/script_08012AF0.inc index e1ad6a1c..0b5cb168 100644 --- a/data/scripts/script_08012AF0.inc +++ b/data/scripts/script_08012AF0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012AF0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0388, 0x0180 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0388, 0x0180 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B18.inc b/data/scripts/script_08012B18.inc index f353c587..4b79a8fe 100644 --- a/data/scripts/script_08012B18.inc +++ b/data/scripts/script_08012B18.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08012B18 -_0807EF80 0x0015 -Call sub_080791BC + _0807EF80 0x0015 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B24.inc b/data/scripts/script_08012B24.inc index fbdacf64..0bdf249c 100644 --- a/data/scripts/script_08012B24.inc +++ b/data/scripts/script_08012B24.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012B24 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0004 -StopScript -_0807EF80 0x0001 -_0807ECC4 0x0008 -_0807E5F8 0x00000002 -CallWithArg sub_0807FB64, 0xffffffe2 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0004 + StopScript + _0807EF80 0x0001 + _0807ECC4 0x0008 + _0807E5F8 0x00000002 + CallWithArg sub_0807FB64, 0xffffffe2 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B50.inc b/data/scripts/script_08012B50.inc index d4f1c6ac..32a9f788 100644 --- a/data/scripts/script_08012B50.inc +++ b/data/scripts/script_08012B50.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012B50 -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0000 -StopScript -_0807EF80 0x0001 -_0807EC64 0x0008 -_0807E5F8 0x00000002 -CallWithArg sub_0807FB64, 0xffffffe2 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0000 + StopScript + _0807EF80 0x0001 + _0807EC64 0x0008 + _0807E5F8 0x00000002 + CallWithArg sub_0807FB64, 0xffffffe2 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012B7C.inc b/data/scripts/script_08012B7C.inc index 1c5aaea2..df1d2ec1 100644 --- a/data/scripts/script_08012B7C.inc +++ b/data/scripts/script_08012B7C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012B7C -StartScript -SetEntityNonPlanarMovement 0x0100 -_0807EB44 0x0002 -StopScript -_0807EF80 0x0001 -_0807EC94 0x0008 -_0807E5F8 0x00000002 -CallWithArg sub_0807FB64, 0xffffffe2 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + _0807EB44 0x0002 + StopScript + _0807EF80 0x0001 + _0807EC94 0x0008 + _0807E5F8 0x00000002 + CallWithArg sub_0807FB64, 0xffffffe2 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012BA8.inc b/data/scripts/script_08012BA8.inc index 56aeb8f1..e87df7ea 100644 --- a/data/scripts/script_08012BA8.inc +++ b/data/scripts/script_08012BA8.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08012BA8 -StartScript -_0807EB44 0x0002 -_0807EF80 0x0007 -_0807E930 0x0001 -StopScript -WaitForSomething2 0x00000040 -_0807E930 0x0005 -Wait 0x001e -_0807E5F8 0x00000080 -_0807E930 0x0001 -WaitForSomething2 0x00000040 -_0807E930 0x0005 -Wait 0x001e -_0807E5F8 0x00000080 -_0807E930 0x0001 -WaitForSomething2 0x00000040 -Wait 0x0001 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0002 + _0807EF80 0x0007 + _0807E930 0x0001 + StopScript + WaitForSomething2 0x00000040 + _0807E930 0x0005 + Wait 0x001e + _0807E5F8 0x00000080 + _0807E930 0x0001 + WaitForSomething2 0x00000040 + _0807E930 0x0005 + Wait 0x001e + _0807E5F8 0x00000080 + _0807E930 0x0001 + WaitForSomething2 0x00000040 + Wait 0x0001 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012BF8.inc b/data/scripts/script_08012BF8.inc index a85c95bf..643c7cdf 100644 --- a/data/scripts/script_08012BF8.inc +++ b/data/scripts/script_08012BF8.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08012BF8 -StartScript -_0807EB44 0x0006 -_0807EF80 0x0007 -_0807E930 0x0003 -StopScript -WaitForSomething2 0x00000010 -_0807E930 0x0007 -Wait 0x001e -_0807E5F8 0x00000020 -_0807E930 0x0003 -WaitForSomething2 0x00000010 -_0807E930 0x0007 -Wait 0x001e -_0807E5F8 0x00000020 -_0807E930 0x0003 -WaitForSomething2 0x00000010 -Wait 0x0001 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0006 + _0807EF80 0x0007 + _0807E930 0x0003 + StopScript + WaitForSomething2 0x00000010 + _0807E930 0x0007 + Wait 0x001e + _0807E5F8 0x00000020 + _0807E930 0x0003 + WaitForSomething2 0x00000010 + _0807E930 0x0007 + Wait 0x001e + _0807E5F8 0x00000020 + _0807E930 0x0003 + WaitForSomething2 0x00000010 + Wait 0x0001 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index ae59b6df..5d7ab8c6 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08012C48 -StartScript -_0807EF80 0x0007 -SetEntityNonPlanarMovement 0x0280 -StopScript -_0807EDD4 0x0388, 0x0168 -_0807E5F8 0x00000100 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + SetEntityNonPlanarMovement 0x0280 + StopScript + _0807EDD4 0x0388, 0x0168 + _0807E5F8 0x00000100 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012C68.inc b/data/scripts/script_08012C68.inc index 302e1196..de28d340 100644 --- a/data/scripts/script_08012C68.inc +++ b/data/scripts/script_08012C68.inc @@ -1,34 +1,38 @@ SCRIPT_START script_08012C68 -StartScript -_0807E9D4 -_0807EF80 0x0008 -_0807E914 0x00000000 -Call sub_0806DA04 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807E8E4_0 -TextboxNoOverlapFollow 0x111d -_0807EA94 -SetGlobalFlag 0x0022 -_0807E878 -Jump 0xffe8 -CheckGlobalFlag 0x0014 -JumpIfNot 0xfffa -StopScript -StartScript -CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 -JumpIfNot 0xfff2 -_0807E564 -JumpIf 0x001e -StopScript -_0807E864 -Call sub_0807DF28 -_0807EB28 0x2202 -_0807EA94 -SetLocalFlag 0x003b -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807E9D4 + _0807EF80 0x0008 + _0807E914 0x00000000 + Call sub_0806DA04 + StopScript +script_08012C7E: + CheckEntityInteractType + JumpIfNot script_08012C7E + _0807E864 + _0807E8E4_0 + TextboxNoOverlapFollow 0x111d + _0807EA94 + SetGlobalFlag 0x0022 + _0807E878 + Jump script_08012C7E +script_08012C98: + CheckGlobalFlag 0x0014 + JumpIfNot script_08012C98 +script_08012CA0: + StopScript + StartScript + CheckPlayerInRegion 0x0398, 0x03b0, 0x2040 + JumpIfNot script_08012CA0 + _0807E564 + JumpIf script_08012CD2 + StopScript + _0807E864 + Call sub_0807DF28 + _0807EB28 0x2202 + _0807EA94 + SetLocalFlag 0x003b + Call sub_0807DF50 + _0807E878 +script_08012CD2: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012CD8.inc b/data/scripts/script_08012CD8.inc index e335e8a5..8d27c8c6 100644 --- a/data/scripts/script_08012CD8.inc +++ b/data/scripts/script_08012CD8.inc @@ -1,19 +1,20 @@ SCRIPT_START script_08012CD8 -StopScript -StartScript -_0807E564 -JumpIfNot 0xfff8 -CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 -JumpIfNot 0xffec -ComparePlayerAction 0x0015 -JumpIf 0xffe4 -_0807E864 -Call sub_0807DF28 -StopScript -_0807EB28 0x2203 -_0807EA94 -SetLocalFlag 0x003e -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 +script_08012CD8: + StopScript + StartScript + _0807E564 + JumpIfNot script_08012CD8 + CheckPlayerInRegion 0x0380, 0x03b0, 0x4040 + JumpIfNot script_08012CD8 + ComparePlayerAction 0x0015 + JumpIf script_08012CD8 + _0807E864 + Call sub_0807DF28 + StopScript + _0807EB28 0x2203 + _0807EA94 + SetLocalFlag 0x003e + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index 78dc4d0f..d3bcc14c 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -1,23 +1,25 @@ SCRIPT_START script_08012D18 -StopScript -StartScript -CheckGlobalFlag 0x0014 -JumpIfNot 0xfff6 -CheckLocalFlagByOffset 0x0200, 0x008d -JumpIf 0x003c -CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 -JumpIfNot 0xffe0 -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB28 0x111a -_0807EA94 -StartPlayerScript script_08010A38 -WaitForSomething2 0x00000001 -Call sub_0807DF50 -_0807E878 -Jump 0xffb2 -_0807EF80 0x0006 +script_08012D18: + StopScript + StartScript + CheckGlobalFlag 0x0014 + JumpIfNot script_08012D18 + CheckLocalFlagByOffset 0x0200, 0x008d + JumpIf script_08012D68 + CheckPlayerInRegion 0x0000, 0x01a8, 0x2010 + JumpIfNot script_08012D18 + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807EB28 0x111a + _0807EA94 + StartPlayerScript script_08010A38 + WaitForSomething2 0x00000001 + Call sub_0807DF50 + _0807E878 + Jump script_08012D18 +script_08012D68: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index 9e9593b6..5aaf0d08 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -1,16 +1,17 @@ SCRIPT_START script_08012D70 -CheckPlayerInRegion 0x0088, 0x0048, 0x3030 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_08012DB0 -WaitForSomething2 0x00000001 -_0807EB28 0x132d -_0807EA94 -SetLocalFlag 0x0014 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 +script_08012D70: + CheckPlayerInRegion 0x0088, 0x0048, 0x3030 + JumpIfNot script_08012D70 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_08012DB0 + WaitForSomething2 0x00000001 + _0807EB28 0x132d + _0807EA94 + SetLocalFlag 0x0014 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012DB0.inc b/data/scripts/script_08012DB0.inc index 9f8eb1fa..11d4783c 100644 --- a/data/scripts/script_08012DB0.inc +++ b/data/scripts/script_08012DB0.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012DB0 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0088, 0x0068 -_0807EB44 0x0000 -_0807EF80 0x0000 -Wait 0x001e -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0088, 0x0068 + _0807EB44 0x0000 + _0807EF80 0x0000 + Wait 0x001e + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc index 4fdc4053..44f9936e 100644 --- a/data/scripts/script_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012DD8 -StartScript -StopScript -_0807E888 -Wait 0x0018 -_0807E864 -StartPlayerScript script_08012DF8 -WaitForSomething2 0x00000001 -_0807E908 0x0002 + StartScript + StopScript + _0807E888 + Wait 0x0018 + _0807E864 + StartPlayerScript script_08012DF8 + WaitForSomething2 0x00000001 + _0807E908 0x0002 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 05b001aa..801db2c3 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08012DF8 -StartScript -_0807EB44 0x0000 -SetEntityNonPlanarMovement 0x0140 -StopScript -_0807EDD4 0x00b8, 0x0094 -Wait 0x0008 -_0807EF80 0x0000 -Wait 0x0008 -_0807E5F8 0x00000001 + StartScript + _0807EB44 0x0000 + SetEntityNonPlanarMovement 0x0140 + StopScript + _0807EDD4 0x00b8, 0x0094 + Wait 0x0008 + _0807EF80 0x0000 + Wait 0x0008 + _0807E5F8 0x00000001 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012E20.inc b/data/scripts/script_08012E20.inc index 667813e0..5c9488c8 100644 --- a/data/scripts/script_08012E20.inc +++ b/data/scripts/script_08012E20.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08012E20 -StartScript -_0807E864 -StopScript -Wait 0x0078 -_0807E908 0x0004 -StartPlayerScript script_08012E44 -WaitForSomething2 0x00000002 -Wait 0x000c -_0807E908 0x0005 + StartScript + _0807E864 + StopScript + Wait 0x0078 + _0807E908 0x0004 + StartPlayerScript script_08012E44 + WaitForSomething2 0x00000002 + Wait 0x000c + _0807E908 0x0005 SCRIPT_END diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index a2efd4be..1ccebdf6 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -1,19 +1,19 @@ SCRIPT_START script_08012E44 -StartScript -SetEntityNonPlanarMovement 0x0140 -StopScript -Wait 0x003c -_0807EB44 0x0004 -Wait 0x000f -_0807EB44 0x0002 -Wait 0x0012 -_0807EB44 0x0006 -Wait 0x000c -_0807EB44 0x0000 -Wait 0x0015 -_0807EB44 0x0004 -Wait 0x0008 -_0807E5F8 0x00000002 -_0807EDD4 0x0088, 0x0158 + StartScript + SetEntityNonPlanarMovement 0x0140 + StopScript + Wait 0x003c + _0807EB44 0x0004 + Wait 0x000f + _0807EB44 0x0002 + Wait 0x0012 + _0807EB44 0x0006 + Wait 0x000c + _0807EB44 0x0000 + Wait 0x0015 + _0807EB44 0x0004 + Wait 0x0008 + _0807E5F8 0x00000002 + _0807EDD4 0x0088, 0x0158 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index 30d0c1c0..a6b10e48 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -1,35 +1,37 @@ SCRIPT_START script_08012E88 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -Call sub_0806B60C -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0001 -Call sub_0806B4F0 -_0807EA94 -_0807E878 -_0807EF80 0x0000 -Jump 0xffe2 -.short 0x0000 -StartScript -_0807EB44 0x0004 -CallWithArg sub_0807F3D8, 0x00000008 -_0807EF80 0x000a -Call sub_0806B60C -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x0000000c -Call sub_0806B4F0 -_0807EA94 -Wait 0x000f -_0807E878 -CallWithArg sub_0807F3D8, 0x00000008 -Jump 0xffd2 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + Call sub_0806B60C + StopScript +script_08012E9E: + CheckEntityInteractType + JumpIfNot script_08012E9E + _0807E864 + _0807EB74 + _0807EF80 0x0001 + Call sub_0806B4F0 + _0807EA94 + _0807E878 + _0807EF80 0x0000 + Jump script_08012E9E + .short 0x0000 + StartScript + _0807EB44 0x0004 + CallWithArg sub_0807F3D8, 0x00000008 + _0807EF80 0x000a + Call sub_0806B60C + StopScript +script_08012EDC: + CheckEntityInteractType + JumpIfNot script_08012EDC + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x0000000c + Call sub_0806B4F0 + _0807EA94 + Wait 0x000f + _0807E878 + CallWithArg sub_0807F3D8, 0x00000008 + Jump script_08012EDC diff --git a/data/scripts/script_08012F0C.inc b/data/scripts/script_08012F0C.inc index a3a5c863..47b3a5cc 100644 --- a/data/scripts/script_08012F0C.inc +++ b/data/scripts/script_08012F0C.inc @@ -1,32 +1,35 @@ SCRIPT_START script_08012F0C -StartScript -CallWithArg sub_0806A93C, 0x12345678 -_0807EB44 0x0004 -_0807E930 0x0002 -CheckInventory1 0x0015 -JumpIf 0x0190 -CheckLocalFlag 0x0060 -JumpIf 0x00a4 -CheckGlobalFlag 0x001e -JumpIf 0x0050 -StopScript -CheckLocalFlag 0x0062 -JumpIfNot 0x0008 -Call sub_0806A9B0 -CheckLocalFlag 0x0061 -JumpIf 0x001e -Call sub_0806A96C -JumpIfNot 0xfff8 -_0807E864 -TextboxNoOverlap 0x4401 -_0807EA94 -SetLocalFlag 0x0061 -_0807E878 -_0807E908 0x0001 -Call sub_0806A96C -JumpIfNot 0xfff8 -TextboxNoOverlap 0x4402 -_0807EA94 -_0807E908 0x0001 -Jump 0xffea + StartScript + CallWithArg sub_0806A93C, 0x12345678 + _0807EB44 0x0004 + _0807E930 0x0002 + CheckInventory1 0x0015 + JumpIf script_080130B6 + CheckLocalFlag 0x0060 + JumpIf script_08012FD2 + CheckGlobalFlag 0x001e + JumpIf script_08012F86 + StopScript + CheckLocalFlag 0x0062 + JumpIfNot script_08012F48 + Call sub_0806A9B0 +script_08012F48: + CheckLocalFlag 0x0061 + JumpIf script_08012F6C +script_08012F50: + Call sub_0806A96C + JumpIfNot script_08012F50 + _0807E864 + TextboxNoOverlap 0x4401 + _0807EA94 + SetLocalFlag 0x0061 + _0807E878 + _0807E908 0x0001 +script_08012F6C: + Call sub_0806A96C + JumpIfNot script_08012F6C + TextboxNoOverlap 0x4402 + _0807EA94 + _0807E908 0x0001 + Jump script_08012F6C SCRIPT_END diff --git a/data/scripts/script_08012F86.inc b/data/scripts/script_08012F86.inc index 820f8c53..4b4ddb49 100644 --- a/data/scripts/script_08012F86.inc +++ b/data/scripts/script_08012F86.inc @@ -1,91 +1,100 @@ SCRIPT_START script_08012F86 -StartScript -CheckLocalFlag 0x0060 -JumpIf 0x0044 -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_080130E4 -SetLocalFlag 0x0060 -ClearLocalFlag 0x0061 -StopScript -WaitForSomething2 0x00000004 -_0807E908 0x0004 -Call sub_0806A958 -CallWithArg sub_0807F93C, 0x0000f2f4 -Call sub_0807DF50 -_0807E878 -SetLocalFlag 0x0062 -Jump 0x002a -StartScript -_0807E930 0x000d -_0807E908 0x0005 -SetLocalFlag 0x0062 -CallWithArg sub_0807F93C, 0x0000f2f4 -Call sub_0806AA10 -StopScript -CheckInventory1 0x0038 -JumpIf 0x000e -_0807E944 -TextboxNoOverlap 0x4403 -_0807EA94 -Jump 0xfff6 -_0807E944 -StartScript -_0807E864 -Call sub_0807DF28 -StopScript -SoundReq 0x00cd -_0807F088 0x0038 -WaitPlayerAction8 -Wait 0x001e -_0807E8E4_0 -Call sub_0806AB9C -_0807E930 0x000b -Wait 0x003c -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x4404 -_0807EA94 -Wait 0x001e -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x440e -_0807EA94 -Wait 0x001e -Call sub_0806A9E8 -_0807E930 0x000f -Wait 0x00f0 -TextboxNoOverlap 0x4405 -_0807EA94 -_0807E5F8 0x00000200 -_0807F034 0x0015 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlap 0x4406 -_0807EA94 -_0807E908 0x0001 -Call sub_0807DF50 -_0807E878 -Call sub_0806A96C -JumpIfNot 0xfff8 -TextboxNoOverlap 0x4407 -_0807EA94 -_0807E908 0x0001 -Call sub_0806A96C -JumpIfNot 0xfff8 -TextboxNoOverlap 0x440d -_0807EA94 -_0807E908 0x0001 -Jump 0xffd6 -CheckLocalFlag 0x0062 -JumpIfNot 0x0008 -Call sub_0806A9B0 -StopScript -Call sub_0806A96C -JumpIfNot 0xfff8 -_0807E864 -Call sub_0806AA18 -_0807EA94 -_0807E878 -_0807E908 0x0001 -Jump 0xffe4 +script_08012F86: + StartScript + CheckLocalFlag 0x0060 + JumpIf script_08012FD2 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_080130E4 + SetLocalFlag 0x0060 + ClearLocalFlag 0x0061 + StopScript + WaitForSomething2 0x00000004 + _0807E908 0x0004 + Call sub_0806A958 + CallWithArg sub_0807F93C, 0x0000f2f4 + Call sub_0807DF50 + _0807E878 + SetLocalFlag 0x0062 + Jump script_08012FFA +script_08012FD2: + StartScript + _0807E930 0x000d + _0807E908 0x0005 + SetLocalFlag 0x0062 + CallWithArg sub_0807F93C, 0x0000f2f4 + Call sub_0806AA10 + StopScript + CheckInventory1 0x0038 + JumpIf script_08013006 +script_08012FFA: + _0807E944 + TextboxNoOverlap 0x4403 + _0807EA94 + Jump script_08012FFA +script_08013006: + _0807E944 + StartScript + _0807E864 + Call sub_0807DF28 + StopScript + SoundReq 0x00cd + _0807F088 0x0038 + WaitPlayerAction8 + Wait 0x001e + _0807E8E4_0 + Call sub_0806AB9C + _0807E930 0x000b + Wait 0x003c + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x4404 + _0807EA94 + Wait 0x001e + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x440e + _0807EA94 + Wait 0x001e + Call sub_0806A9E8 + _0807E930 0x000f + Wait 0x00f0 + TextboxNoOverlap 0x4405 + _0807EA94 + _0807E5F8 0x00000200 + _0807F034 0x0015 + WaitPlayerAction8 + _0807EB8C + TextboxNoOverlap 0x4406 + _0807EA94 + _0807E908 0x0001 + Call sub_0807DF50 + _0807E878 +script_0801308A: + Call sub_0806A96C + JumpIfNot script_0801308A + TextboxNoOverlap 0x4407 + _0807EA94 + _0807E908 0x0001 +script_0801309E: + Call sub_0806A96C + JumpIfNot script_0801309E + TextboxNoOverlap 0x440d + _0807EA94 + _0807E908 0x0001 + Jump script_0801308A +script_080130B6: + CheckLocalFlag 0x0062 + JumpIfNot script_080130C4 + Call sub_0806A9B0 +script_080130C4: + StopScript +script_080130C6: + Call sub_0806A96C + JumpIfNot script_080130C6 + _0807E864 + Call sub_0806AA18 + _0807EA94 + _0807E878 + _0807E908 0x0001 + Jump script_080130C6 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 929de154..434cfb38 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080130E4 -StartScript -_0807EB44 0x0006 -SetEntityNonPlanarMovement 0x0140 -StopScript -_0807EDD4 0x00a8, 0x0060 -Wait 0x0008 -_0807EF80 0x0000 -Wait 0x0008 -_0807EF80 0x0004 -Wait 0x000f -_0807E5F8 0x00000004 + StartScript + _0807EB44 0x0006 + SetEntityNonPlanarMovement 0x0140 + StopScript + _0807EDD4 0x00a8, 0x0060 + Wait 0x0008 + _0807EF80 0x0000 + Wait 0x0008 + _0807EF80 0x0004 + Wait 0x000f + _0807E5F8 0x00000004 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013114.inc b/data/scripts/script_08013114.inc index e7d6aa53..1b916d14 100644 --- a/data/scripts/script_08013114.inc +++ b/data/scripts/script_08013114.inc @@ -1,36 +1,39 @@ SCRIPT_START script_08013114 -StartScript -_0807E9D4 -_0807EF80 0x000a -_0807EF80 0x0012 -Call sub_0807F348 -StopScript -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x000c -Call sub_0806AEE4 -Jump 0xffee -_0807E864 -StopScript -_0807EB74 -Call sub_0806AED8 -CallWithArg sub_0806AA50, 0x00000000 -_0807EA94 -CallWithArg sub_0806AA50, 0x00000001 -_0807EA94 -CallWithArg sub_0806AA50, 0x00000002 -_0807EA94 -JumpIf 0x0008 -_0807E878 -Jump 0xffb4 -_0807E914 0x00000403 -Call sub_0807F420 -_0807E878 -Jump 0xffa2 -StartScript -CheckLocalFlag 0x0062 -JumpIfNot 0x000a -_0807EF80 0x0006 -StopScript + StartScript + _0807E9D4 + _0807EF80 0x000a + _0807EF80 0x0012 + Call sub_0807F348 + StopScript +script_08013128: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_0801313C + Call sub_0806AEE4 + Jump script_08013128 +script_0801313C: + _0807E864 + StopScript + _0807EB74 + Call sub_0806AED8 + CallWithArg sub_0806AA50, 0x00000000 + _0807EA94 + CallWithArg sub_0806AA50, 0x00000001 + _0807EA94 + CallWithArg sub_0806AA50, 0x00000002 + _0807EA94 + JumpIf script_08013176 + _0807E878 + Jump script_08013128 +script_08013176: + _0807E914 0x00000403 + Call sub_0807F420 + _0807E878 + Jump script_08013128 + StartScript + CheckLocalFlag 0x0062 + JumpIfNot script_0801319A + _0807EF80 0x0006 + StopScript SCRIPT_END diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index 7a9e15a2..a73ca71a 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -1,77 +1,79 @@ SCRIPT_START script_0801319A -StopScript -StartScript -CameraTargetEntity -MoveEntityToPlayer -Call sub_0806AB74 -Jump 0xfff0 -CheckPlayerInRegion 0x0098, 0x0038, 0x2060 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -StartPlayerScript script_080132E4 -WaitForSomething2 0x00000002 -_0807EB28 0x1601 -_0807EA94 -StartPlayerScript script_0801330C -WaitForSomething2 0x00000002 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -LoadRoomEntityList gUnk_080F5680 -StartPlayerScript script_08013330 -WaitForSomething2 0x00000002 -MoveEntityToPlayer -SetEntityPosition 0x0000, 0xfff0 -Call sub_0807F844 -CameraTargetEntity -Call sub_080536B8 -_0807E864 -Call sub_0807DF28 -WaitFor_2 -TextboxNoOverlapFollowPos 0x000c1602 -_0807EA94 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000010 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000040 -SoundReq2 0x000d -StartPlayerScript script_0801334C -WaitForSomething2 0x00000002 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000040 -StartPlayerScript script_08013378 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000042 -TextboxNoOverlapFollowPos 0x000c1603 -_0807EA94 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000040 -_0807E788 0xffff7fff -_0807E778 0x0004 -DoFade5 -WaitFor_2 -SoundReq0x80100000 -_0807E858 0x0000 -Wait 0x003c -CameraTargetPlayer -Call sub_0807F5C0 -TextboxNoOverlapFollowPos 0x00071604 -_0807EA94 -_0807E788 0xffffffff -_0807E778 0x0004 -DoFade4 -WaitFor_2 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -_0807EB28 0x1605 -_0807EA94 -SetLocalFlag 0x0078 -SoundReq2 0x0031 -SetGlobalFlag 0x005d -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 +script_0801319A: + StopScript + StartScript + CameraTargetEntity + MoveEntityToPlayer + Call sub_0806AB74 + Jump script_0801319A +script_080131AC: + CheckPlayerInRegion 0x0098, 0x0038, 0x2060 + JumpIfNot script_080131AC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + StartPlayerScript script_080132E4 + WaitForSomething2 0x00000002 + _0807EB28 0x1601 + _0807EA94 + StartPlayerScript script_0801330C + WaitForSomething2 0x00000002 + _0807E778 0x0004 + DoFade5 + WaitFor_2 + LoadRoomEntityList gUnk_080F5680 + StartPlayerScript script_08013330 + WaitForSomething2 0x00000002 + MoveEntityToPlayer + SetEntityPosition 0x0000, 0xfff0 + Call sub_0807F844 + CameraTargetEntity + Call sub_080536B8 + _0807E864 + Call sub_0807DF28 + WaitFor_2 + TextboxNoOverlapFollowPos 0x000c1602 + _0807EA94 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000010 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000040 + SoundReq2 0x000d + StartPlayerScript script_0801334C + WaitForSomething2 0x00000002 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000040 + StartPlayerScript script_08013378 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000042 + TextboxNoOverlapFollowPos 0x000c1603 + _0807EA94 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000040 + _0807E788 0xffff7fff + _0807E778 0x0004 + DoFade5 + WaitFor_2 + SoundReq0x80100000 + _0807E858 0x0000 + Wait 0x003c + CameraTargetPlayer + Call sub_0807F5C0 + TextboxNoOverlapFollowPos 0x00071604 + _0807EA94 + _0807E788 0xffffffff + _0807E778 0x0004 + DoFade4 + WaitFor_2 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + _0807EB28 0x1605 + _0807EA94 + SetLocalFlag 0x0078 + SoundReq2 0x0031 + SetGlobalFlag 0x005d + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080132E4.inc b/data/scripts/script_080132E4.inc index 40720dac..8d723657 100644 --- a/data/scripts/script_080132E4.inc +++ b/data/scripts/script_080132E4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080132E4 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0098, 0x0058 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0098, 0x0058 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 1254ccec..6d58d535 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_0801330C -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EC64 0x0020 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EC64 0x0020 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013330.inc b/data/scripts/script_08013330.inc index 9f51b8c4..74b1c20f 100644 --- a/data/scripts/script_08013330.inc +++ b/data/scripts/script_08013330.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08013330 -StartScript -_0807EB44 0x0000 -SetEntityPositionRelative 0x00700098 -StopScript -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + _0807EB44 0x0000 + SetEntityPositionRelative 0x00700098 + StopScript + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index e17fc35c..5d92b476 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -1,13 +1,13 @@ SCRIPT_START script_0801334C -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x000d -StopScript -_0807EF80 0x0001 -_0807ECC4 0x0020 -_0807EF80 0x0000 -_0807EF80 0x000c -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x000d + StopScript + _0807EF80 0x0001 + _0807ECC4 0x0020 + _0807EF80 0x0000 + _0807EF80 0x000c + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc index 5a767647..2d46d61c 100644 --- a/data/scripts/script_08013378.inc +++ b/data/scripts/script_08013378.inc @@ -1,16 +1,16 @@ SCRIPT_START script_08013378 -Call sub_0807F1C4 -Call sub_0807F2D4 -Call sub_0807F1E8 -Call sub_0807F2D4 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -SoundReq 0x007c -_0807EB44 0x0004 -Call sub_0807F210 -_0807EF3C 0x0200, 0x0020 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + Call sub_0807F1C4 + Call sub_0807F2D4 + Call sub_0807F1E8 + Call sub_0807F2D4 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + SoundReq 0x007c + _0807EB44 0x0004 + Call sub_0807F210 + _0807EF3C 0x0200, 0x0020 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index 223e3a5c..b4dad1da 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -1,14 +1,14 @@ SCRIPT_START script_080133C4 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0007 -_0807EF80 0x000b -Call sub_0807F338 -StopScript -WaitForSomething2 0x00000008 -Call sub_08061F94 -Wait 0x000a -_0807E5F8 0x00000010 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0007 + _0807EF80 0x000b + Call sub_0807F338 + StopScript + WaitForSomething2 0x00000008 + Call sub_08061F94 + Wait 0x000a + _0807E5F8 0x00000010 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index a9730804..b863f4fa 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -1,34 +1,34 @@ SCRIPT_START script_080133F8 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0008 -_0807EF80 0x000b -Call sub_0807F338 -StopScript -WaitForSomething2 0x00000020 -SetEntityPositionRelative 0x00480098 -Call sub_08066C94 -Wait 0x00e9 -_0807EF80 0x0007 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -Wait 0x003c -_0807EF80 0x0014 -SoundReq 0x0120 -CallWithArg sub_08095420, 0x08013494 -Wait 0x005a -_0807EF80 0x0016 -WaitForSomething2 0x00000080 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000040 -WaitForSomething2 0x00000020 -Call sub_08066CA4 -_0807EF80 0x0008 -Wait 0x0078 -_0807E5F8 0x00000040 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0008 + _0807EF80 0x000b + Call sub_0807F338 + StopScript + WaitForSomething2 0x00000020 + SetEntityPositionRelative 0x00480098 + Call sub_08066C94 + Wait 0x00e9 + _0807EF80 0x0007 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000020 + Wait 0x003c + _0807EF80 0x0014 + SoundReq 0x0120 + CallWithArg sub_08095420, 0x08013494 + Wait 0x005a + _0807EF80 0x0016 + WaitForSomething2 0x00000080 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000020 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000040 + WaitForSomething2 0x00000020 + Call sub_08066CA4 + _0807EF80 0x0008 + Wait 0x0078 + _0807E5F8 0x00000040 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013494.inc b/data/scripts/script_08013494.inc index 037082ba..f8b3499b 100644 --- a/data/scripts/script_08013494.inc +++ b/data/scripts/script_08013494.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08013494 -StartScript -_0807E930 0x0000 -SetEntityNonPlanarMovement 0x0200 -Call nullsub_527 -Call sub_08094B80 -StopScript -Wait 0x005a -Call sub_08094B6C -_0807EDD4 0x0098, 0x0080 -StartScript -Call sub_08094B80 -SoundReq 0x01cc -Call sub_0807F36C -_0807E5F8 0x00000080 -StopScript -_0807EF80 0x0006 + StartScript + _0807E930 0x0000 + SetEntityNonPlanarMovement 0x0200 + Call nullsub_527 + Call sub_08094B80 + StopScript + Wait 0x005a + Call sub_08094B6C + _0807EDD4 0x0098, 0x0080 + StartScript + Call sub_08094B80 + SoundReq 0x01cc + Call sub_0807F36C + _0807E5F8 0x00000080 + StopScript + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080134DC.inc b/data/scripts/script_080134DC.inc index af492fa6..08d464a2 100644 --- a/data/scripts/script_080134DC.inc +++ b/data/scripts/script_080134DC.inc @@ -1,72 +1,73 @@ SCRIPT_START script_080134DC -StartScript -_0807EF80 0x0008 -StopScript -StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_080136D8 -WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f04 -SoundReq 0x01cd -Wait 0x005a -StartScript -SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e04 -CallWithArg sub_08095D54, 0x08013e28 -StopScript -WaitForSomething2 0x18000000 -StartScript -SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 -StopScript -Wait 0x001e -StartScript -SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 -StopScript -Wait 0x003c -CallWithArg sub_0805DDEC, 0x00000000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00002000 -SoundReq 0x01d2 -CallWithArg sub_08095D8C, 0x080141dc -CallWithArg sub_08095D8C, 0x08014210 -_0807E5F8 0x00000400 -WaitForSomething2 0x00004000 -Wait 0x0078 -_0807E5F8 0x00000060 -CallWithArg sub_0805DE18, 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 -SoundReq 0x00f6 -WaitFor_2 -Wait 0x003c -_0807E5F8 0x00000010 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -SoundReq 0x0109 -TextboxNoOverlapFollowPos 0x000c0503 -_0807EA94 -_0807E5F8 0x00040000 -CallWithArg sub_0805DDEC, 0x00000001 -_0807F0C8 0xffff, 0x0000 + StartScript + _0807EF80 0x0008 + StopScript + StartScript + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + StopScript +script_080134F8: + CheckEntityInteractType + JumpIfNot script_080134F8 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_080136D8 + WaitForSomething2 0x00000001 + CallWithArg sub_08095A1C, 0x08013f04 + SoundReq 0x01cd + Wait 0x005a + StartScript + SoundReq 0x01ce + CallWithArg sub_08095D54, 0x08013e04 + CallWithArg sub_08095D54, 0x08013e28 + StopScript + WaitForSomething2 0x18000000 + StartScript + SoundReq 0x01cf + CallWithArg sub_08095D8C, 0x08014054 + CallWithArg sub_08095D8C, 0x08014074 + StopScript + Wait 0x001e + StartScript + SoundReq 0x01d0 + CallWithArg sub_08095D8C, 0x080140dc + CallWithArg sub_08095D8C, 0x08014118 + StopScript + Wait 0x003c + CallWithArg sub_0805DDEC, 0x00000000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00002000 + SoundReq 0x01d2 + CallWithArg sub_08095D8C, 0x080141dc + CallWithArg sub_08095D8C, 0x08014210 + _0807E5F8 0x00000400 + WaitForSomething2 0x00004000 + Wait 0x0078 + _0807E5F8 0x00000060 + CallWithArg sub_0805DE18, 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 + SoundReq 0x00f6 + WaitFor_2 + Wait 0x003c + _0807E5F8 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + SoundReq 0x0109 + TextboxNoOverlapFollowPos 0x000c0503 + _0807EA94 + _0807E5F8 0x00040000 + CallWithArg sub_0805DDEC, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013650.inc b/data/scripts/script_08013650.inc index d5ea9a8b..ee3a03ea 100644 --- a/data/scripts/script_08013650.inc +++ b/data/scripts/script_08013650.inc @@ -1,23 +1,23 @@ SCRIPT_START script_08013650 -Call sub_0807F3F8 -Wait 0x003c -_0807F0B4 0x0007 -SetEntityPositionRelative 0x00a800e8 -CameraTargetEntity -Wait 0x003c -_0807E5F8 0x00000004 -Wait 0x0078 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -StartPlayerScript script_080136B4 -WaitForSomething2 0x00000002 -_0807EB28 0x1501 -_0807EA94 -_0807F0B4 0x0004 -CameraTargetPlayer -SetLocalFlag 0x007a -Call sub_08053250 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + Call sub_0807F3F8 + Wait 0x003c + _0807F0B4 0x0007 + SetEntityPositionRelative 0x00a800e8 + CameraTargetEntity + Wait 0x003c + _0807E5F8 0x00000004 + Wait 0x0078 + CallWithArg sub_0805DE18, 0x00000001 + _0807F0C8 0x0000, 0x0000 + StartPlayerScript script_080136B4 + WaitForSomething2 0x00000002 + _0807EB28 0x1501 + _0807EA94 + _0807F0B4 0x0004 + CameraTargetPlayer + SetLocalFlag 0x007a + Call sub_08053250 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080136B4.inc b/data/scripts/script_080136B4.inc index 7fcd5496..45522e05 100644 --- a/data/scripts/script_080136B4.inc +++ b/data/scripts/script_080136B4.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080136B4 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x00e8, 0x00a8 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x00e8, 0x00a8 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080136D8.inc b/data/scripts/script_080136D8.inc index 47b9ea21..a69e0b6e 100644 --- a/data/scripts/script_080136D8.inc +++ b/data/scripts/script_080136D8.inc @@ -1,14 +1,17 @@ SCRIPT_START script_080136D8 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -Call sub_0807F584 -_0807E078_ssss 0x0008, 0x0010, 0x0018, 0x000c -CallWithArg sub_0807F464, 0x000000d0 -CallWithArg sub_0807F4F8, 0x00000124 -_0807EDD4 0x00e8, 0x0124 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + Call sub_0807F584 + JumpSwitch_4 script_080136F0, script_080136FA, script_08013704, script_080136FA +script_080136F0: + CallWithArg sub_0807F464, 0x000000d0 +script_080136FA: + CallWithArg sub_0807F4F8, 0x00000124 +script_08013704: + _0807EDD4 0x00e8, 0x0124 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index c9e78093..bda54165 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -1,80 +1,81 @@ SCRIPT_START script_08013720 -StartScript -_0807EF80 0x0008 -StopScript -StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_080136D8 -WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f34 -SoundReq 0x01cd -Wait 0x005a -StartScript -SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e4c -StopScript -WaitForSomething2 0x20000000 -StartScript -SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 -CallWithArg sub_08095D8C, 0x08014094 -StopScript -Wait 0x001e -StartScript -SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 -CallWithArg sub_08095D8C, 0x08014154 -StopScript -Wait 0x003c -CallWithArg sub_0805DDEC, 0x00000000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00002000 -SoundReq 0x01d2 -CallWithArg sub_08095D8C, 0x080141dc -CallWithArg sub_08095D8C, 0x08014210 -_0807E5F8 0x00000400 -WaitForSomething2 0x00004000 -_0807E5F8 0x00000800 -WaitForSomething2 0x00008000 -Wait 0x0078 -_0807E5F8 0x00000060 -CallWithArg sub_0805DE18, 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 -SoundReq 0x00f6 -WaitFor_2 -Wait 0x003c -_0807E5F8 0x00000010 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -SoundReq 0x0109 -TextboxNoOverlapFollowPos 0x000c0504 -_0807EA94 -_0807E5F8 0x00040000 -SetLocalFlag 0x007b -Call sub_08053250 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + StopScript + StartScript + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + StopScript +script_0801373C: + CheckEntityInteractType + JumpIfNot script_0801373C + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_080136D8 + WaitForSomething2 0x00000001 + CallWithArg sub_08095A1C, 0x08013f34 + SoundReq 0x01cd + Wait 0x005a + StartScript + SoundReq 0x01ce + CallWithArg sub_08095D54, 0x08013e4c + StopScript + WaitForSomething2 0x20000000 + StartScript + SoundReq 0x01cf + CallWithArg sub_08095D8C, 0x08014054 + CallWithArg sub_08095D8C, 0x08014074 + CallWithArg sub_08095D8C, 0x08014094 + StopScript + Wait 0x001e + StartScript + SoundReq 0x01d0 + CallWithArg sub_08095D8C, 0x080140dc + CallWithArg sub_08095D8C, 0x08014118 + CallWithArg sub_08095D8C, 0x08014154 + StopScript + Wait 0x003c + CallWithArg sub_0805DDEC, 0x00000000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00002000 + SoundReq 0x01d2 + CallWithArg sub_08095D8C, 0x080141dc + CallWithArg sub_08095D8C, 0x08014210 + _0807E5F8 0x00000400 + WaitForSomething2 0x00004000 + _0807E5F8 0x00000800 + WaitForSomething2 0x00008000 + Wait 0x0078 + _0807E5F8 0x00000060 + CallWithArg sub_0805DE18, 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 + SoundReq 0x00f6 + WaitFor_2 + Wait 0x003c + _0807E5F8 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + SoundReq 0x0109 + TextboxNoOverlapFollowPos 0x000c0504 + _0807EA94 + _0807E5F8 0x00040000 + SetLocalFlag 0x007b + Call sub_08053250 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080138B4.inc b/data/scripts/script_080138B4.inc index c59dfcdd..101916b3 100644 --- a/data/scripts/script_080138B4.inc +++ b/data/scripts/script_080138B4.inc @@ -1,91 +1,93 @@ SCRIPT_START script_080138B4 -StartScript -_0807EF80 0x0008 -StopScript -StartScript -Call sub_0807F92C -CallWithArg sub_0806DA04, 0x00000003 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -StartPlayerScript script_080136D8 -WaitForSomething2 0x00000001 -CallWithArg sub_08095A1C, 0x08013f64 -SoundReq 0x01cd -Wait 0x005a -StartScript -SoundReq 0x01ce -CallWithArg sub_08095D54, 0x08013e70 -StopScript -WaitForSomething2 0x40000000 -StartScript -SoundReq 0x01cf -CallWithArg sub_08095D8C, 0x08014054 -CallWithArg sub_08095D8C, 0x08014074 -CallWithArg sub_08095D8C, 0x08014094 -CallWithArg sub_08095D8C, 0x080140b8 -StopScript -Wait 0x001e -StartScript -SoundReq 0x01d0 -CallWithArg sub_08095D8C, 0x080140dc -CallWithArg sub_08095D8C, 0x08014118 -CallWithArg sub_08095D8C, 0x08014154 -CallWithArg sub_08095D8C, 0x08014198 -StopScript -Wait 0x003c -CallWithArg sub_0805DDEC, 0x00000000 -_0807E5F8 0x00000200 -WaitForSomething2 0x00002000 -SoundReq 0x01d2 -CallWithArg sub_08095D8C, 0x080141dc -CallWithArg sub_08095D8C, 0x08014210 -_0807E5F8 0x00000400 -WaitForSomething2 0x00004000 -_0807E5F8 0x00000800 -WaitForSomething2 0x00008000 -_0807E5F8 0x00001000 -WaitForSomething2 0x00010000 -Wait 0x0078 -_0807E5F8 0x00000060 -CallWithArg sub_0805DE18, 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 -SoundReq 0x00f6 -WaitFor_2 -Wait 0x003c -_0807E5F8 0x00000010 -_0807E778 0x0002 -DoFade6 -WaitFor_2 -SoundReq 0x0109 -TextboxNoOverlapFollowPos 0x000c0505 -_0807EA94 -_0807E5F8 0x00040000 -_0807F0B4 0x0002 -SetEntityPositionRelative 0x00d800e8 -CameraTargetEntity -Call sub_0806DC3C -CallWithArg sub_0807F244, 0x00010001 -CallWithArg sub_0807F29C, 0x080049fe -Wait 0x00c8 -CallWithArg sub_0807F29C, 0x00000000 -Call sub_0806DC58 -CheckRoomFlag 0x0004 -JumpIfNot 0xfffa -CallWithArg sub_0805DDEC, 0x00000001 -_0807F0C8 0xffff, 0x0000 + StartScript + _0807EF80 0x0008 + StopScript + StartScript + Call sub_0807F92C + CallWithArg sub_0806DA04, 0x00000003 + StopScript +script_080138D0: + CheckEntityInteractType + JumpIfNot script_080138D0 + _0807E864 + Call sub_0807DF28 + StartPlayerScript script_080136D8 + WaitForSomething2 0x00000001 + CallWithArg sub_08095A1C, 0x08013f64 + SoundReq 0x01cd + Wait 0x005a + StartScript + SoundReq 0x01ce + CallWithArg sub_08095D54, 0x08013e70 + StopScript + WaitForSomething2 0x40000000 + StartScript + SoundReq 0x01cf + CallWithArg sub_08095D8C, 0x08014054 + CallWithArg sub_08095D8C, 0x08014074 + CallWithArg sub_08095D8C, 0x08014094 + CallWithArg sub_08095D8C, 0x080140b8 + StopScript + Wait 0x001e + StartScript + SoundReq 0x01d0 + CallWithArg sub_08095D8C, 0x080140dc + CallWithArg sub_08095D8C, 0x08014118 + CallWithArg sub_08095D8C, 0x08014154 + CallWithArg sub_08095D8C, 0x08014198 + StopScript + Wait 0x003c + CallWithArg sub_0805DDEC, 0x00000000 + _0807E5F8 0x00000200 + WaitForSomething2 0x00002000 + SoundReq 0x01d2 + CallWithArg sub_08095D8C, 0x080141dc + CallWithArg sub_08095D8C, 0x08014210 + _0807E5F8 0x00000400 + WaitForSomething2 0x00004000 + _0807E5F8 0x00000800 + WaitForSomething2 0x00008000 + _0807E5F8 0x00001000 + WaitForSomething2 0x00010000 + Wait 0x0078 + _0807E5F8 0x00000060 + CallWithArg sub_0805DE18, 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 + SoundReq 0x00f6 + WaitFor_2 + Wait 0x003c + _0807E5F8 0x00000010 + _0807E778 0x0002 + DoFade6 + WaitFor_2 + SoundReq 0x0109 + TextboxNoOverlapFollowPos 0x000c0505 + _0807EA94 + _0807E5F8 0x00040000 + _0807F0B4 0x0002 + SetEntityPositionRelative 0x00d800e8 + CameraTargetEntity + Call sub_0806DC3C + CallWithArg sub_0807F244, 0x00010001 + CallWithArg sub_0807F29C, 0x080049fe + Wait 0x00c8 + CallWithArg sub_0807F29C, 0x00000000 + Call sub_0806DC58 +script_08013A8E: + CheckRoomFlag 0x0004 + JumpIfNot script_08013A8E + CallWithArg sub_0805DDEC, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08013AA6.inc b/data/scripts/script_08013AA6.inc index 5857c5ee..d078369c 100644 --- a/data/scripts/script_08013AA6.inc +++ b/data/scripts/script_08013AA6.inc @@ -1,28 +1,28 @@ SCRIPT_START script_08013AA6 -Call sub_0807F3F8 -Wait 0x003c -_0807E5F8 0x00000008 -Wait 0x0078 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -Wait 0x003c -_0807F0B4 0x0004 -SetEntityPositionRelative 0x005000e8 -CameraTargetEntity -Wait 0x003c -LoadRoomEntityList gUnk_080F55D8 -Wait 0x0078 -_0807F0B4 0x0007 -MoveEntityToPlayer -CameraTargetEntity -Wait 0x003c -_0807EB28 0x1502 -_0807EA94 -_0807F0B4 0x0004 -CameraTargetPlayer -SetLocalFlag 0x007c -Call sub_08053250 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + Call sub_0807F3F8 + Wait 0x003c + _0807E5F8 0x00000008 + Wait 0x0078 + CallWithArg sub_0805DE18, 0x00000001 + _0807F0C8 0x0000, 0x0000 + Wait 0x003c + _0807F0B4 0x0004 + SetEntityPositionRelative 0x005000e8 + CameraTargetEntity + Wait 0x003c + LoadRoomEntityList gUnk_080F55D8 + Wait 0x0078 + _0807F0B4 0x0007 + MoveEntityToPlayer + CameraTargetEntity + Wait 0x003c + _0807EB28 0x1502 + _0807EA94 + _0807F0B4 0x0004 + CameraTargetPlayer + SetLocalFlag 0x007c + Call sub_08053250 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index 72a7ca19..75643d49 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -1,23 +1,24 @@ SCRIPT_START script_08013B18 -StartScript -_0807EF80 0x0008 -StopScript -StartScript -CallWithArg sub_0807F6B4, 0x000001c8 -JumpIfNot 0xfff0 -CheckInventory1 0x0006 -JumpIfNot 0xffe8 -CheckLocalFlag 0x0078 -JumpIf 0xffe0 -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807EB28 0x1507 -_0807EA94 -StartPlayerScript script_08010A14 -WaitForSomething2 0x00000001 -Call sub_0807DF50 -_0807E878 -Jump 0xffb2 -.short 0x0000 + StartScript + _0807EF80 0x0008 +script_08013B1E: + StopScript + StartScript + CallWithArg sub_0807F6B4, 0x000001c8 + JumpIfNot script_08013B1E + CheckInventory1 0x0006 + JumpIfNot script_08013B1E + CheckLocalFlag 0x0078 + JumpIf script_08013B1E + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807EB28 0x1507 + _0807EA94 + StartPlayerScript script_08010A14 + WaitForSomething2 0x00000001 + Call sub_0807DF50 + _0807E878 + Jump script_08013B1E + .short 0x0000 diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc index aae726f9..485fb1df 100644 --- a/data/scripts/script_08013B70.inc +++ b/data/scripts/script_08013B70.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08013B70 -SoundReq 0x01d3 -CallWithArg sub_0807F238, 0x000008bf -Call sub_08096028 -Wait 0x003c -_0807E5F8 0x00020000 -Call sub_0807F304 -Wait 0x0078 -WaitForSomething2 0x00040000 -Call sub_080791BC + SoundReq 0x01d3 + CallWithArg sub_0807F238, 0x000008bf + Call sub_08096028 + Wait 0x003c + _0807E5F8 0x00020000 + Call sub_0807F304 + Wait 0x0078 + WaitForSomething2 0x00040000 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013BA8.inc b/data/scripts/script_08013BA8.inc index 97c11730..42a8b552 100644 --- a/data/scripts/script_08013BA8.inc +++ b/data/scripts/script_08013BA8.inc @@ -1,12 +1,12 @@ SCRIPT_START script_08013BA8 -CallWithArg sub_08095E7C, 0x08014248 -SoundReq 0x01d3 -CallWithArg sub_0807F238, 0x000008e3 -Call sub_08096028 -Wait 0x0078 -_0807E5F8 0x00020000 -Call sub_0807F304 -Wait 0x0078 -WaitForSomething2 0x00040000 -Call sub_080791BC + CallWithArg sub_08095E7C, 0x08014248 + SoundReq 0x01d3 + 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_08013BE8.inc b/data/scripts/script_08013BE8.inc index 64b87f5c..3208a12e 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -1,51 +1,58 @@ SCRIPT_START script_08013BE8 -StartScript -CheckLocalFlag 0x007a -JumpIf 0x003a -CheckInventory1 0x0003 -JumpIf 0x0032 -CheckInventory1 0x0002 -JumpIfNot 0x0098 -CheckInventory1 0x0040 -JumpIfNot 0x0090 -CheckInventory1 0x0041 -JumpIfNot 0x0088 -StopScript -_0807EF80 0x0008 -WaitForSomething2 0x00000004 -_0807E908 0x0002 -SoundReq 0x0134 -Jump 0x000a -CheckLocalFlag 0x007c -JumpIf 0x0068 -StartScript -_0807EF80 0x0007 -Call sub_0807F934 -_0807EF80 0x000a -CallWithArg sub_080962F8, 0x00000000 -CallWithArg sub_0807F8E8, 0x00000004 -StopScript -StopScript -StartScript -TestBit 0x00000008 -JumpIf 0x002e -CheckEntityInteractType -JumpIfNot 0xffee -StopScript -_0807E864 -_0807EB74 -CheckLocalFlag 0x007d -JumpIf 0x000a -_0807EB28 0x1501 -Jump 0x0006 -_0807EB28 0x1506 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffc8 -StopScript -_0807E908 0x0004 -_0807EF80 0x0008 -_0807EF80 0x0006 + StartScript + CheckLocalFlag 0x007a + JumpIf script_08013C2A + CheckInventory1 0x0003 + JumpIf script_08013C2A + CheckInventory1 0x0002 + JumpIfNot script_08013C98 + CheckInventory1 0x0040 + JumpIfNot script_08013C98 + CheckInventory1 0x0041 + JumpIfNot script_08013C98 + StopScript + _0807EF80 0x0008 + WaitForSomething2 0x00000004 + _0807E908 0x0002 + SoundReq 0x0134 + Jump script_08013C32 +script_08013C2A: + CheckLocalFlag 0x007c + JumpIf script_08013C98 +script_08013C32: + StartScript + _0807EF80 0x0007 + Call sub_0807F934 + _0807EF80 0x000a + CallWithArg sub_080962F8, 0x00000000 + CallWithArg sub_0807F8E8, 0x00000004 + StopScript +script_08013C58: + StopScript + StartScript + TestBit 0x00000008 + JumpIf script_08013C92 + CheckEntityInteractType + JumpIfNot script_08013C58 + StopScript + _0807E864 + _0807EB74 + CheckLocalFlag 0x007d + JumpIf script_08013C82 + _0807EB28 0x1501 + Jump script_08013C86 +script_08013C82: + _0807EB28 0x1506 +script_08013C86: + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08013C58 +script_08013C92: + StopScript + _0807E908 0x0004 +script_08013C98: + _0807EF80 0x0008 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013CA4.inc b/data/scripts/script_08013CA4.inc index d0a809ef..e54c4494 100644 --- a/data/scripts/script_08013CA4.inc +++ b/data/scripts/script_08013CA4.inc @@ -1,24 +1,25 @@ SCRIPT_START script_08013CA4 -StopScript -CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807F3F8 -Wait 0x003c -_0807F0B4 0x0001 -SetEntityPositionRelative 0x013800e8 -CameraTargetEntity -Call sub_0807F5C0 -Wait 0x0078 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807F5C0 -_0807EB28 0x1504 -_0807EA94 -SetLocalFlag 0x0079 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StopScript +script_08013CA6: + CheckPlayerInRegion 0x00e8, 0x01e8, 0x4080 + JumpIfNot script_08013CA6 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0807F3F8 + Wait 0x003c + _0807F0B4 0x0001 + SetEntityPositionRelative 0x013800e8 + CameraTargetEntity + Call sub_0807F5C0 + Wait 0x0078 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807F5C0 + _0807EB28 0x1504 + _0807EA94 + SetLocalFlag 0x0079 + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 15b53482..5bc69e89 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -1,15 +1,16 @@ SCRIPT_START script_08013D04 -StartScript -Call sub_0807F92C -_0807EF80 0x0008 -CallWithArg sub_0806DA04, 0x00000004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CallWithArg sub_08095D54, 0x00000000 -SoundReq 0x01cd -_0807E5F8 0x08000000 -Call sub_080791BC -_0807EF80 0x0006 + StartScript + Call sub_0807F92C + _0807EF80 0x0008 + CallWithArg sub_0806DA04, 0x00000004 + StopScript +script_08013D1C: + CheckEntityInteractType + JumpIfNot script_08013D1C + CallWithArg sub_08095D54, 0x00000000 + SoundReq 0x01cd + _0807E5F8 0x08000000 + Call sub_080791BC + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index ab9c3b08..e662df9c 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -1,15 +1,16 @@ SCRIPT_START script_08013D44 -StartScript -Call sub_0807F92C -_0807EF80 0x0008 -CallWithArg sub_0806DA04, 0x00000004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CallWithArg sub_08095D54, 0x00000001 -SoundReq 0x01cd -_0807E5F8 0x10000000 -Call sub_080791BC -_0807EF80 0x0006 + StartScript + Call sub_0807F92C + _0807EF80 0x0008 + CallWithArg sub_0806DA04, 0x00000004 + StopScript +script_08013D5C: + CheckEntityInteractType + JumpIfNot script_08013D5C + CallWithArg sub_08095D54, 0x00000001 + SoundReq 0x01cd + _0807E5F8 0x10000000 + Call sub_080791BC + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index 019222fc..f4d79746 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -1,15 +1,16 @@ SCRIPT_START script_08013D84 -StartScript -Call sub_0807F92C -_0807EF80 0x0008 -CallWithArg sub_0806DA04, 0x00000004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CallWithArg sub_08095D54, 0x00000002 -SoundReq 0x01cd -_0807E5F8 0x20000000 -Call sub_080791BC -_0807EF80 0x0006 + StartScript + Call sub_0807F92C + _0807EF80 0x0008 + CallWithArg sub_0806DA04, 0x00000004 + StopScript +script_08013D9C: + CheckEntityInteractType + JumpIfNot script_08013D9C + CallWithArg sub_08095D54, 0x00000002 + SoundReq 0x01cd + _0807E5F8 0x20000000 + Call sub_080791BC + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index cf903dce..ed233bf1 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -1,15 +1,16 @@ SCRIPT_START script_08013DC4 -StartScript -Call sub_0807F92C -_0807EF80 0x0008 -CallWithArg sub_0806DA04, 0x00000004 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -CallWithArg sub_08095D54, 0x00000003 -SoundReq 0x01cd -_0807E5F8 0x40000000 -Call sub_080791BC -_0807EF80 0x0006 + StartScript + Call sub_0807F92C + _0807EF80 0x0008 + CallWithArg sub_0806DA04, 0x00000004 + StopScript +script_08013DDC: + CheckEntityInteractType + JumpIfNot script_08013DDC + CallWithArg sub_08095D54, 0x00000003 + SoundReq 0x01cd + _0807E5F8 0x40000000 + Call sub_080791BC + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index 8f2da729..a5ab5e98 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013E04 -StartScript -_0807EF80 0x0007 -_0807E930 0x0000 -StopScript -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x00b0, 0x00f8 -_0807E930 0x0001 -_0807E5F8 0x08000000 + StartScript + _0807EF80 0x0007 + _0807E930 0x0000 + StopScript + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x00b0, 0x00f8 + _0807E930 0x0001 + _0807E5F8 0x08000000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index 1f105f4e..bf0f960f 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013E28 -StartScript -_0807EF80 0x0007 -_0807E930 0x0002 -StopScript -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x0120, 0x00f8 -_0807E930 0x0003 -_0807E5F8 0x10000000 + StartScript + _0807EF80 0x0007 + _0807E930 0x0002 + StopScript + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x0120, 0x00f8 + _0807E930 0x0003 + _0807E5F8 0x10000000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index 2c14b1a5..8b29d123 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013E4C -StartScript -_0807EF80 0x0007 -_0807E930 0x0004 -StopScript -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x0120, 0x0168 -_0807E930 0x0005 -_0807E5F8 0x20000000 + StartScript + _0807EF80 0x0007 + _0807E930 0x0004 + StopScript + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x0120, 0x0168 + _0807E930 0x0005 + _0807E5F8 0x20000000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index 1d9e6247..1f2dee86 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08013E70 -StartScript -_0807EF80 0x0007 -_0807E930 0x0006 -StopScript -SetEntityNonPlanarMovement 0x0080 -_0807EDD4 0x00b0, 0x0168 -_0807E930 0x0007 -_0807E5F8 0x40000000 + StartScript + _0807EF80 0x0007 + _0807E930 0x0006 + StopScript + SetEntityNonPlanarMovement 0x0080 + _0807EDD4 0x00b0, 0x0168 + _0807E930 0x0007 + _0807E5F8 0x40000000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index f943d80e..bbaeb0af 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013E94 -StartScript -_0807EF80 0x0007 -Call sub_0807F180 -SetEntityPositionRelative 0x00f800b0 -_0807E930 0x0001 -StopScript + StartScript + _0807EF80 0x0007 + Call sub_0807F180 + SetEntityPositionRelative 0x00f800b0 + _0807E930 0x0001 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index b39b667d..07e14095 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EB0 -StartScript -_0807EF80 0x0007 -Call sub_0807F180 -SetEntityPositionRelative 0x00f80120 -_0807E930 0x0003 -StopScript + StartScript + _0807EF80 0x0007 + Call sub_0807F180 + SetEntityPositionRelative 0x00f80120 + _0807E930 0x0003 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index eb7de967..6798155b 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013ECC -StartScript -_0807EF80 0x0007 -Call sub_0807F180 -SetEntityPositionRelative 0x01680120 -_0807E930 0x0005 -StopScript + StartScript + _0807EF80 0x0007 + Call sub_0807F180 + SetEntityPositionRelative 0x01680120 + _0807E930 0x0005 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index 2981798d..9f5fe111 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08013EE8 -StartScript -_0807EF80 0x0007 -Call sub_0807F180 -SetEntityPositionRelative 0x016800b0 -_0807E930 0x0007 -StopScript + StartScript + _0807EF80 0x0007 + Call sub_0807F180 + SetEntityPositionRelative 0x016800b0 + _0807E930 0x0007 + StopScript SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 01af27f0..3f4d8395 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08013F04 -StartScript -_0807EF80 0x0007 -_0807E930 0x0008 -StopScript -WaitForSomething2 0x00000080 -_0807E930 0x000b -Call sub_0807F2D4 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0008 + StopScript + WaitForSomething2 0x00000080 + _0807E930 0x000b + Call sub_0807F2D4 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index 18709dd7..2ead57a2 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08013F34 -StartScript -_0807EF80 0x0007 -_0807E930 0x0009 -StopScript -WaitForSomething2 0x00000080 -_0807E930 0x000c -Call sub_0807F2D4 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0009 + StopScript + WaitForSomething2 0x00000080 + _0807E930 0x000c + Call sub_0807F2D4 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index 13e54873..6dded1b5 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08013F64 -StartScript -_0807EF80 0x0007 -_0807E930 0x000a -StopScript -WaitForSomething2 0x00000080 -_0807E930 0x000d -Call sub_0807F2D4 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x000a + StopScript + WaitForSomething2 0x00000080 + _0807E930 0x000d + Call sub_0807F2D4 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index 2d9ef7ca..78f7d4a3 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -1,25 +1,27 @@ SCRIPT_START script_08013F94 -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x007d -JumpIf 0x003e -StopScript -StartScript -CheckInventory1 0x0003 -JumpIfNot 0xfff6 -CheckPlayerFlags 0x00400000 -JumpIfNot 0xffec -StopScript -Call sub_0807FA40 -_0807E888 -Call sub_0807DF38 -Wait 0x0078 -_0807EB28 0x1505 -_0807EA94 -SetLocalFlag 0x007d -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + StopScript + CheckLocalFlag 0x007d + JumpIf script_08013FE0 +script_08013FA4: + StopScript + StartScript + CheckInventory1 0x0003 + JumpIfNot script_08013FA4 + CheckPlayerFlags 0x00400000 + JumpIfNot script_08013FA4 + StopScript + Call sub_0807FA40 + _0807E888 + Call sub_0807DF38 + Wait 0x0078 + _0807EB28 0x1505 + _0807EA94 + SetLocalFlag 0x007d + Call sub_0807DF50 + _0807E878 +script_08013FE0: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index 55c53873..52526efd 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -1,30 +1,32 @@ SCRIPT_START script_08013FE8 -StartScript -_0807EF80 0x0008 -StopScript -StopScript -StartScript -CheckLocalFlag 0x007d -JumpIf 0x0052 -CheckLocalFlag 0x007a -JumpIfNot 0xffee -CheckInventory1 0x0003 -JumpIfNot 0xffe6 -CallWithArg sub_0807F6B4, 0x000000d0 -JumpIfNot 0xffd8 -StopScript -Call sub_0807F9A4 -StartScript -_0807E864 -Call sub_0807DF28 -StopScript -_0807EB28 0x1508 -_0807EA94 -StartPlayerScript script_08010A14 -WaitForSomething2 0x00000001 -Call sub_0807DF50 -_0807E878 -Jump 0xffa6 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + StopScript +script_08013FF0: + StopScript + StartScript + CheckLocalFlag 0x007d + JumpIf script_0801404C + CheckLocalFlag 0x007a + JumpIfNot script_08013FF0 + CheckInventory1 0x0003 + JumpIfNot script_08013FF0 + CallWithArg sub_0807F6B4, 0x000000d0 + JumpIfNot script_08013FF0 + StopScript + Call sub_0807F9A4 + StartScript + _0807E864 + Call sub_0807DF28 + StopScript + _0807EB28 0x1508 + _0807EA94 + StartPlayerScript script_08010A14 + WaitForSomething2 0x00000001 + Call sub_0807DF50 + _0807E878 + Jump script_08013FF0 +script_0801404C: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index e6234ea6..9e5c3776 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014054 -StartScript -_0807EF80 0x0007 -_0807E930 0x0000 -Call sub_0807F738 -StopScript -WaitForSomething 0x00000040 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0000 + Call sub_0807F738 + StopScript + WaitForSomething 0x00000040 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index c9a3a40e..cec22a8a 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014074 -StartScript -_0807EF80 0x0007 -_0807E930 0x0001 -Call sub_0807F738 -StopScript -WaitForSomething 0x00000040 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0001 + Call sub_0807F738 + StopScript + WaitForSomething 0x00000040 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014094.inc b/data/scripts/script_08014094.inc index 68a9d64b..de27e295 100644 --- a/data/scripts/script_08014094.inc +++ b/data/scripts/script_08014094.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014094 -StartScript -_0807EF80 0x0007 -_0807E930 0x0002 -Call sub_0807F738 -SetEntityPosition 0x0000, 0xfff0 -StopScript -WaitForSomething 0x00000040 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0002 + Call sub_0807F738 + SetEntityPosition 0x0000, 0xfff0 + StopScript + WaitForSomething 0x00000040 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140B8.inc b/data/scripts/script_080140B8.inc index a43f3347..9586896b 100644 --- a/data/scripts/script_080140B8.inc +++ b/data/scripts/script_080140B8.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080140B8 -StartScript -_0807EF80 0x0007 -_0807E930 0x0003 -Call sub_0807F738 -SetEntityPosition 0x0000, 0xfff0 -StopScript -WaitForSomething 0x00000040 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0003 + Call sub_0807F738 + SetEntityPosition 0x0000, 0xfff0 + StopScript + WaitForSomething 0x00000040 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080140DC.inc b/data/scripts/script_080140DC.inc index 5f3efa8f..0dcfc894 100644 --- a/data/scripts/script_080140DC.inc +++ b/data/scripts/script_080140DC.inc @@ -1,15 +1,15 @@ SCRIPT_START script_080140DC -StartScript -_0807EF80 0x0007 -_0807E930 0x0004 -StopScript -WaitForSomething2 0x00000200 -_0807E930 0x0008 -Call sub_0807F2D4 -_0807E930 0x000c -_0807E5F8 0x00002000 -WaitForSomething 0x00000020 -_0807E930 0x0010 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0004 + StopScript + WaitForSomething2 0x00000200 + _0807E930 0x0008 + Call sub_0807F2D4 + _0807E930 0x000c + _0807E5F8 0x00002000 + WaitForSomething 0x00000020 + _0807E930 0x0010 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014118.inc b/data/scripts/script_08014118.inc index 72bb7d44..30148b13 100644 --- a/data/scripts/script_08014118.inc +++ b/data/scripts/script_08014118.inc @@ -1,15 +1,15 @@ SCRIPT_START script_08014118 -StartScript -_0807EF80 0x0007 -_0807E930 0x0005 -StopScript -WaitForSomething2 0x00000400 -_0807E930 0x0009 -Call sub_0807F2D4 -_0807E930 0x000d -_0807E5F8 0x00004000 -WaitForSomething 0x00000020 -_0807E930 0x0011 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0005 + StopScript + WaitForSomething2 0x00000400 + _0807E930 0x0009 + Call sub_0807F2D4 + _0807E930 0x000d + _0807E5F8 0x00004000 + WaitForSomething 0x00000020 + _0807E930 0x0011 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index b5cda454..a8845394 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08014154 -StartScript -_0807EF80 0x0007 -_0807E930 0x0006 -SetEntityPosition 0x0000, 0xfff0 -StopScript -WaitForSomething2 0x00000800 -_0807E930 0x000a -Call sub_0807F2D4 -_0807E930 0x000e -_0807E5F8 0x00008000 -WaitForSomething 0x00000020 -_0807E930 0x0012 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0006 + SetEntityPosition 0x0000, 0xfff0 + StopScript + WaitForSomething2 0x00000800 + _0807E930 0x000a + Call sub_0807F2D4 + _0807E930 0x000e + _0807E5F8 0x00008000 + WaitForSomething 0x00000020 + _0807E930 0x0012 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index 210eb704..fcccb52d 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -1,17 +1,17 @@ SCRIPT_START script_08014198 -StartScript -_0807EF80 0x0007 -_0807E930 0x0007 -SetEntityPosition 0x0000, 0xfff0 -StopScript -WaitForSomething2 0x00001000 -_0807E930 0x000b -Call sub_0807F2D4 -_0807E930 0x000f -_0807E5F8 0x00010000 -WaitForSomething 0x00000020 -_0807E930 0x0013 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0007 + SetEntityPosition 0x0000, 0xfff0 + StopScript + WaitForSomething2 0x00001000 + _0807E930 0x000b + Call sub_0807F2D4 + _0807E930 0x000f + _0807E5F8 0x00010000 + WaitForSomething 0x00000020 + _0807E930 0x0013 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index 169fe792..bec09d97 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -1,13 +1,13 @@ SCRIPT_START script_080141DC -StartScript -_0807EF80 0x0007 -_0807E930 0x0014 -Call sub_0807F714 -CallWithArg sub_0807F994, 0x0000fffc -StopScript -WaitForSomething 0x00000020 -Wait 0x0078 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0014 + Call sub_0807F714 + CallWithArg sub_0807F994, 0x0000fffc + StopScript + WaitForSomething 0x00000020 + Wait 0x0078 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014210.inc b/data/scripts/script_08014210.inc index c1f211b5..912c58e2 100644 --- a/data/scripts/script_08014210.inc +++ b/data/scripts/script_08014210.inc @@ -1,13 +1,13 @@ SCRIPT_START script_08014210 -StartScript -_0807EF80 0x0007 -_0807E930 0x0015 -Call sub_0807F714 -Call sub_0807F714 -CallWithArg sub_0807F994, 0x0000fffc -StopScript -WaitForSomething 0x00000020 -Wait 0x0078 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807E930 0x0015 + Call sub_0807F714 + Call sub_0807F714 + CallWithArg sub_0807F994, 0x0000fffc + StopScript + WaitForSomething 0x00000020 + Wait 0x0078 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 9517e0be..ab60a23f 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -1,26 +1,30 @@ SCRIPT_START script_08014248 -TestBit 0x00020000 -JumpIf 0x0014 -Wait 0x0008 -CallWithArg sub_08095EAC, 0x00000000 -Jump 0xffe6 -CallWithArg sub_08095EAC, 0x00000001 -Jump 0xfff4 -.short 0x0000 -StartScript -_0807EF80 0x0008 -StopScript -CheckLocalFlag 0x0078 -JumpIfNot 0xfffa -StartScript -Call sub_0807F934 -CallWithArg sub_0806DA04, 0x00000008 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -TextboxNoOverlapFollowPos 0x000c0647 -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 +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 + .short 0x0000 + StartScript + _0807EF80 0x0008 + StopScript +script_0801427C: + CheckLocalFlag 0x0078 + JumpIfNot script_0801427C + StartScript + Call sub_0807F934 + CallWithArg sub_0806DA04, 0x00000008 + StopScript +script_08014298: + CheckEntityInteractType + JumpIfNot script_08014298 + _0807E864 + TextboxNoOverlapFollowPos 0x000c0647 + _0807EA94 + _0807E878 + Jump script_08014298 + .short 0x0000 diff --git a/data/scripts/script_080142B0.inc b/data/scripts/script_080142B0.inc index c6eaee65..53bd4bf9 100644 --- a/data/scripts/script_080142B0.inc +++ b/data/scripts/script_080142B0.inc @@ -1,60 +1,63 @@ SCRIPT_START script_080142B0 -StartScript -CheckLocalFlag 0x0054 -JumpIf 0x00ca -CheckLocalFlag 0x0053 -JumpIf 0x0070 -StopScript -StopScript -StartScript -_0807E564 -JumpIfNot 0xfff8 -CheckPlayerInRegion 0x0098, 0x0058, 0x1818 -JumpIfNot 0xffec -StopScript -_0807E864 -SetLocalFlag 0x0053 -Wait 0x0014 -_0807E908 0x0004 -Call sub_080654DC -Wait 0x001e -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -_0807E930 0x0001 -Wait 0x000a -_0807E930 0x0003 -Wait 0x000a -_0807E930 0x0002 -Wait 0x001e -TextboxNoOverlap 0x2c12 -_0807EA94 -Wait 0x0014 -_0807E930 0x0004 -_0807E878 -_0807E908 0x0001 -StopScript -StartScript -_0807E564 -JumpIf 0xfff8 -EntityHasHeight -JumpIf 0xfff2 -CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 -JumpIfNot 0xffe6 -StopScript -_0807E864 -SetLocalFlag 0x0054 -Wait 0x005a -_0807E908 0x0004 -Call sub_080654EC -Wait 0x001e -_0807E930 0x0001 -Wait 0x001e -TextboxNoOverlap 0x2c13 -_0807EA94 -Wait 0x0014 -_0807E930 0x0004 -_0807E908 0x0001 -_0807E878 + StartScript + CheckLocalFlag 0x0054 + JumpIf script_08014382 + CheckLocalFlag 0x0053 + JumpIf script_08014330 + StopScript +script_080142C4: + StopScript + StartScript + _0807E564 + JumpIfNot script_080142C4 + CheckPlayerInRegion 0x0098, 0x0058, 0x1818 + JumpIfNot script_080142C4 + StopScript + _0807E864 + SetLocalFlag 0x0053 + Wait 0x0014 + _0807E908 0x0004 + Call sub_080654DC + Wait 0x001e + _0807E930 0x0001 + Wait 0x000a + _0807E930 0x0003 + Wait 0x000a + _0807E930 0x0001 + Wait 0x000a + _0807E930 0x0003 + Wait 0x000a + _0807E930 0x0002 + Wait 0x001e + TextboxNoOverlap 0x2c12 + _0807EA94 + Wait 0x0014 + _0807E930 0x0004 + _0807E878 + _0807E908 0x0001 +script_08014330: + StopScript + StartScript + _0807E564 + JumpIf script_08014330 + EntityHasHeight + JumpIf script_08014330 + CheckPlayerInRegion 0x00c0, 0x0068, 0x1010 + JumpIfNot script_08014330 + StopScript + _0807E864 + SetLocalFlag 0x0054 + Wait 0x005a + _0807E908 0x0004 + Call sub_080654EC + Wait 0x001e + _0807E930 0x0001 + Wait 0x001e + TextboxNoOverlap 0x2c13 + _0807EA94 + Wait 0x0014 + _0807E930 0x0004 + _0807E908 0x0001 + _0807E878 +script_08014382: SCRIPT_END diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index aef41a86..6fb0f6f0 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -1,21 +1,22 @@ SCRIPT_START script_08014384 -StopScript -_0807E864 -_0807EA94 -_0807E3E8 -JumpIfNot 0x001e -Wait 0x001e -Call sub_08065370 -JumpIfNot 0x0010 -Wait 0x003c -_0807EA94 -_0807EB8C -Wait 0x001e -TextboxNoOverlapVar -_0807EA94 -Wait 0x001e -_0807E930 0x0004 -_0807E908 0x0001 -_0807E878 + StopScript + _0807E864 + _0807EA94 + _0807E3E8 + JumpIfNot script_080143AC + Wait 0x001e + Call sub_08065370 + JumpIfNot script_080143AC + Wait 0x003c + _0807EA94 + _0807EB8C + Wait 0x001e + TextboxNoOverlapVar +script_080143AC: + _0807EA94 + Wait 0x001e + _0807E930 0x0004 + _0807E908 0x0001 + _0807E878 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080143C0.inc b/data/scripts/script_080143C0.inc index 1029c85a..0ca9df4c 100644 --- a/data/scripts/script_080143C0.inc +++ b/data/scripts/script_080143C0.inc @@ -1,37 +1,39 @@ SCRIPT_START script_080143C0 -StopScript -_0807E864 -Call sub_0807DF28 -Call sub_080654FC -_0807E930 0x0001 -Call sub_080654EC -Wait 0x003c -TextboxNoOverlap 0x2c16 -_0807EA94 -_0807E3E8 -JumpIf 0x0012 -_0807E914 0x00000002 -Call sub_08065528 -Jump 0x0046 -Call sub_080654EC -Wait 0x001e -TextboxNoOverlap 0x2c18 -_0807EA94 -Wait 0x000a -_0807E914 0x00000000 -Call sub_08065528 -_0807F034 0x0036 -WaitPlayerAction8 -TextboxNoOverlap 0x2c19 -_0807EA94 -_0807E914 0x00000303 -Call sub_0807F420 -Wait 0x001e -_0807EB8C -TextboxNoOverlap 0x2c22 -_0807EA94 -_0807E930 0x0004 -_0807E908 0x0001 -Call sub_0807DF50 -_0807E878 + StopScript + _0807E864 + Call sub_0807DF28 + Call sub_080654FC + _0807E930 0x0001 + Call sub_080654EC + Wait 0x003c + TextboxNoOverlap 0x2c16 + _0807EA94 + _0807E3E8 + JumpIf script_080143FA + _0807E914 0x00000002 + Call sub_08065528 + Jump script_0801443E +script_080143FA: + Call sub_080654EC + Wait 0x001e + TextboxNoOverlap 0x2c18 + _0807EA94 + Wait 0x000a + _0807E914 0x00000000 + Call sub_08065528 + _0807F034 0x0036 + WaitPlayerAction8 + TextboxNoOverlap 0x2c19 + _0807EA94 + _0807E914 0x00000303 + Call sub_0807F420 + Wait 0x001e + _0807EB8C + TextboxNoOverlap 0x2c22 + _0807EA94 +script_0801443E: + _0807E930 0x0004 + _0807E908 0x0001 + Call sub_0807DF50 + _0807E878 SCRIPT_END diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index c0284446..8a8db693 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -1,52 +1,59 @@ SCRIPT_START script_08014450 -StartScript -_0807E9D4 -_0807EB44 0x0000 -SetEntityNonPlanarMovement 0x01c0 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807E930 0x0008 -Wait 0x0020 -_0807E930 0x0002 -TextboxNoOverlapFollow 0x4202 -TextboxNoOverlapFollow 0x4203 -_0807EA94 -_0807E3E8 -JumpIfNot 0x006c -_0807EF80 0x0001 -Wait 0x008c -_0807EF80 0x0000 -HasRupees 0x000a -JumpIf 0x000a -TextboxNoOverlapFollow 0x4204 -Jump 0x005c -Call sub_0806E250 -JumpIfNot 0x000e -TextboxNoOverlapFollow 0x420b -_0807EB38 -_0807E078 0x0004, 0x000a -ClearLocalFlag 0x0093 -Jump 0x000a -SetLocalFlag 0x0093 -SetLocalFlag 0x00d3 -ModRupees 0xfff6 -TextboxNoOverlapFollow 0x420c -SoundReq 0x010c -Wait 0x0018 -SetRoomFlag 0x0000 -SetLocalFlag 0x0092 -_0807EEF4 0x0000, 0xffa0 -Call sub_0807DF38 -Jump 0x000e -_0807E930 0x0009 -Wait 0x003c -_0807E930 0x0002 -_0807E878 -CheckRoomFlag 0x0000 -JumpIfNot 0xff5e -_0807E9DC + StartScript + _0807E9D4 + _0807EB44 0x0000 + SetEntityNonPlanarMovement 0x01c0 + _0807EF80 0x000a + StopScript +script_08014462: + _0807E30C + JumpIfNot script_08014462 + _0807E864 + _0807E930 0x0008 + Wait 0x0020 + _0807E930 0x0002 + TextboxNoOverlapFollow 0x4202 + TextboxNoOverlapFollow 0x4203 + _0807EA94 + _0807E3E8 + JumpIfNot script_080144F0 + _0807EF80 0x0001 + Wait 0x008c + _0807EF80 0x0000 + HasRupees 0x000a + JumpIf script_080144A2 + TextboxNoOverlapFollow 0x4204 + Jump script_080144FC +script_080144A2: + Call sub_0806E250 + JumpIfNot script_080144B8 + TextboxNoOverlapFollow 0x420b + _0807EB38 + JumpSwitch script_080144B8, script_080144C0 +script_080144B8: + ClearLocalFlag 0x0093 + Jump script_080144C8 +script_080144C0: + SetLocalFlag 0x0093 + SetLocalFlag 0x00d3 +script_080144C8: + ModRupees 0xfff6 + TextboxNoOverlapFollow 0x420c + SoundReq 0x010c + Wait 0x0018 + SetRoomFlag 0x0000 + SetLocalFlag 0x0092 + _0807EEF4 0x0000, 0xffa0 + Call sub_0807DF38 + Jump script_080144FC +script_080144F0: + _0807E930 0x0009 + Wait 0x003c + _0807E930 0x0002 +script_080144FC: + _0807E878 + CheckRoomFlag 0x0000 + JumpIfNot script_08014462 + _0807E9DC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 8c771a51..9b0cb2ac 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -1,34 +1,35 @@ SCRIPT_START script_0801450C -StartScript -_0807E9D4 -_0807EB44 0x0000 -SetEntityNonPlanarMovement 0x01c0 -_0807EF80 0x000a -StopScript -_0807E864 -Call sub_0807DF28 -Call sub_0806E20C -_0807EA94 -Call sub_0806E23C -ClearLocalFlag 0x0093 -ClearLocalFlag 0x0092 -Call sub_0807DF50 -Jump 0xffb8 -.short 0x0000 -StartScript -StopScript -CheckPlayerInRegion 0x0078, 0x0088, 0x0810 -JumpIfNot 0xfff6 -CheckRoomFlag 0x0000 -JumpIfNot 0xffee -_0807E864 -_0807EB28 0x4217 -_0807EA94 -StartPlayerScript script_08014588 -Wait 0x0010 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807E878 -Jump 0xffca + StartScript + _0807E9D4 + _0807EB44 0x0000 + SetEntityNonPlanarMovement 0x01c0 + _0807EF80 0x000a + StopScript + _0807E864 + Call sub_0807DF28 + Call sub_0806E20C + _0807EA94 + Call sub_0806E23C + ClearLocalFlag 0x0093 + ClearLocalFlag 0x0092 + Call sub_0807DF50 + Jump script_080144FC + .short 0x0000 + StartScript + StopScript +script_0801454C: + CheckPlayerInRegion 0x0078, 0x0088, 0x0810 + JumpIfNot script_0801454C + CheckRoomFlag 0x0000 + JumpIfNot script_0801454C + _0807E864 + _0807EB28 0x4217 + _0807EA94 + StartPlayerScript script_08014588 + Wait 0x0010 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + _0807E878 + Jump script_0801454C SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014588.inc b/data/scripts/script_08014588.inc index bba76a7e..07ce3e88 100644 --- a/data/scripts/script_08014588.inc +++ b/data/scripts/script_08014588.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014588 -StopScript -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x00e0 -_0807EDD4 0x0078, 0x0078 -_0807EF80 0x0000 -Wait 0x0010 -_0807E5F8 0x00000002 -Call sub_0807921C + StopScript + WaitForSomething2 0x00000001 + SetEntityNonPlanarMovement 0x00e0 + _0807EDD4 0x0078, 0x0078 + _0807EF80 0x0000 + Wait 0x0010 + _0807E5F8 0x00000002 + Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_080145B0.inc b/data/scripts/script_080145B0.inc index aa014d27..3344387e 100644 --- a/data/scripts/script_080145B0.inc +++ b/data/scripts/script_080145B0.inc @@ -1,18 +1,20 @@ SCRIPT_START script_080145B0 -StartScript -SetEntityPositionRelative 0x00e001f8 -CheckLocalFlag 0x005e -JumpIf 0x0026 -StopScript -CheckRoomFlag 0x0005 -JumpIfNot 0xfffa -_0807E864 -ClearRoomFlag 0x0005 -Wait 0x000c -_0807EB8C -TextboxNoOverlapFollowPos 0x000c432e -_0807EA94 -_0807E878 -Jump 0xffe0 -StopScript + StartScript + SetEntityPositionRelative 0x00e001f8 + CheckLocalFlag 0x005e + JumpIf script_080145E4 + StopScript +script_080145C2: + CheckRoomFlag 0x0005 + JumpIfNot script_080145C2 + _0807E864 + ClearRoomFlag 0x0005 + Wait 0x000c + _0807EB8C + TextboxNoOverlapFollowPos 0x000c432e + _0807EA94 + _0807E878 + Jump script_080145C2 +script_080145E4: + StopScript SCRIPT_END diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index c8d49369..0cab3269 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -1,127 +1,146 @@ SCRIPT_START script_080145E8 -StartScript -_0807EF80 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807DF28 -CheckRoomFlag 0x0004 -JumpIf 0xfffa -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -Call sub_0807DF50 -_0807E878 -Jump 0xffd2 -StartScript -_0807E9D4 -_0807EB44 0x0004 -SetEntityDirection 0x0000 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIf 0x0062 -TestBit 0x00000004 -JumpIf 0x0132 -CheckRoomFlag 0x0004 -JumpIf 0x0022 -Call sub_0808861C -JumpIfNot 0xffe0 -CheckLocalFlag 0x005e -JumpIf 0x003e -_0807E864 -_0807EB8C -TextboxNoOverlapFollowPos 0x000c432b -Jump 0x015e -Call sub_08088658 -JumpIfNot 0xffc0 -_0807E864 -_0807EB28 0x431f -_0807EA94 -StartPlayerScript script_080147DC -Wait 0x0010 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807E878 -Jump 0xff9c -_0807E864 -_0807E930 0x0008 -Wait 0x0010 -_0807EB8C -Wait 0x0010 -_0807E930 0x0002 -CheckGlobalFlag 0x0059 -JumpIfNot 0x000c -TextboxNoOverlapFollowPos 0x000c432f -Jump 0x010a -CheckRoomFlag 0x0004 -JumpIf 0x0028 -CheckLocalFlag 0x005e -JumpIfNot 0x002a -CheckRoomFlag 0x0006 -JumpIf 0x0052 -CheckLocalFlag 0x005f -JumpIf 0x003c -Call sub_08088574 -SetRoomFlag 0x0009 -Jump 0x004a -TextboxNoOverlapFollowPos 0x000c431e -Jump 0x00d2 -SetRoomFlag 0x0009 -SetLocalFlag 0x005c -TextboxNoOverlapFollowPos 0x000c4305 -_0807EA94 -_0807E3BC 0x0001 -JumpIfNot 0x00b0 -TextboxNoOverlapFollowPos 0x000c4306 -Jump 0x001e -SetRoomFlag 0x0009 -Call sub_08088504 -Jump 0x0010 -SetRoomFlag 0x0009 -ClearRoomFlag 0x0006 -Call sub_08088544 -_0807E3E8 -JumpIfNot 0x0030 -_0807EA94 -_0807E3BC 0x0001 -JumpIfNot 0x007a -SetRoomFlag 0x0001 -Wait 0x0014 -CheckRoomFlag 0x0003 -JumpIfNot 0xfffa -ClearRoomFlag 0x0003 -_0807EA94 -SetRoomFlag 0x0004 -TextboxNoOverlapFollowPos 0x000c431e -Jump 0x0060 -SetRoomFlag 0x0009 -_0807EA94 -Jump 0x0056 -CheckRoomFlag 0x0008 -JumpIf 0x0034 -CheckRoomFlag 0x0007 -JumpIf 0x001c -Call sub_08088478 -_0807EA94 -Call sub_080885B0 -WaitPlayerAction8 -_0807E5F8 0x00000008 -Jump 0x002c -_0807E930 0x0009 -Wait 0x003c -_0807E930 0x0002 -Jump 0xffd8 -_0807E930 0x000a -Wait 0x008c -_0807E930 0x0002 -Jump 0xffc8 -SetRoomFlag 0x0009 -TextboxNoOverlapFollowPos 0x000c4307 -_0807EA94 -Wait 0x0004 -_0807E878 -Jump 0xfe62 -.short 0x0000 + StartScript + _0807EF80 0x0008 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_080145F8: + 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 + StartScript + _0807E9D4 + _0807EB44 0x0004 + SetEntityDirection 0x0000 + _0807EF80 0x000a + StopScript +script_0801463A: + _0807E30C + JumpIf script_080146A0 + TestBit 0x00000004 + JumpIf script_0801477A + CheckRoomFlag 0x0004 + JumpIf script_08014672 + Call sub_0808861C + JumpIfNot script_0801463A + CheckLocalFlag 0x005e + JumpIf script_080146A0 + _0807E864 + _0807EB8C + TextboxNoOverlapFollowPos 0x000c432b + Jump script_080147CE +script_08014672: + Call sub_08088658 + JumpIfNot script_0801463A + _0807E864 + _0807EB28 0x431f + _0807EA94 + StartPlayerScript script_080147DC + Wait 0x0010 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807E878 + Jump script_0801463A +script_080146A0: + _0807E864 + _0807E930 0x0008 + Wait 0x0010 + _0807EB8C + Wait 0x0010 + _0807E930 0x0002 + CheckGlobalFlag 0x0059 + JumpIfNot script_080146C6 + TextboxNoOverlapFollowPos 0x000c432f + Jump script_080147CE +script_080146C6: + CheckRoomFlag 0x0004 + JumpIf script_080146F4 + CheckLocalFlag 0x005e + JumpIfNot script_080146FE + CheckRoomFlag 0x0006 + JumpIf script_0801472E + CheckLocalFlag 0x005f + JumpIf script_08014720 + Call sub_08088574 + SetRoomFlag 0x0009 + Jump script_0801473C +script_080146F4: + TextboxNoOverlapFollowPos 0x000c431e + Jump script_080147CE +script_080146FE: + SetRoomFlag 0x0009 + SetLocalFlag 0x005c + TextboxNoOverlapFollowPos 0x000c4305 + _0807EA94 + _0807E3BC 0x0001 + JumpIfNot script_080147C4 + TextboxNoOverlapFollowPos 0x000c4306 + Jump script_0801473C +script_08014720: + SetRoomFlag 0x0009 + Call sub_08088504 + Jump script_0801473C +script_0801472E: + SetRoomFlag 0x0009 + ClearRoomFlag 0x0006 + Call sub_08088544 +script_0801473C: + _0807E3E8 + JumpIfNot script_08014770 + _0807EA94 + _0807E3BC 0x0001 + JumpIfNot script_080147C4 + SetRoomFlag 0x0001 + Wait 0x0014 +script_08014754: + CheckRoomFlag 0x0003 + JumpIfNot script_08014754 + ClearRoomFlag 0x0003 + _0807EA94 + SetRoomFlag 0x0004 + TextboxNoOverlapFollowPos 0x000c431e + Jump script_080147CE +script_08014770: + SetRoomFlag 0x0009 + _0807EA94 + Jump script_080147CE +script_0801477A: + CheckRoomFlag 0x0008 + JumpIf script_080147B4 + CheckRoomFlag 0x0007 + JumpIf script_080147A4 +script_0801478A: + Call sub_08088478 + _0807EA94 + Call sub_080885B0 + WaitPlayerAction8 + _0807E5F8 0x00000008 + Jump script_080147CE +script_080147A4: + _0807E930 0x0009 + Wait 0x003c + _0807E930 0x0002 + Jump script_0801478A +script_080147B4: + _0807E930 0x000a + Wait 0x008c + _0807E930 0x0002 + Jump script_0801478A +script_080147C4: + SetRoomFlag 0x0009 + TextboxNoOverlapFollowPos 0x000c4307 +script_080147CE: + _0807EA94 + Wait 0x0004 + _0807E878 + Jump script_0801463A + .short 0x0000 diff --git a/data/scripts/script_080147DC.inc b/data/scripts/script_080147DC.inc index 5bec229e..554da330 100644 --- a/data/scripts/script_080147DC.inc +++ b/data/scripts/script_080147DC.inc @@ -1,10 +1,10 @@ SCRIPT_START script_080147DC -StopScript -WaitForSomething2 0x00000002 -SetEntityNonPlanarMovement 0x00e0 -_0807EDD4 0x0078, 0x0068 -_0807EF80 0x0000 -Wait 0x0010 -_0807E5F8 0x00000001 -Call sub_0807921C + StopScript + WaitForSomething2 0x00000002 + SetEntityNonPlanarMovement 0x00e0 + _0807EDD4 0x0078, 0x0068 + _0807EF80 0x0000 + Wait 0x0010 + _0807E5F8 0x00000001 + Call sub_0807921C SCRIPT_END diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index 38ffe052..605bc6cf 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -1,87 +1,97 @@ SCRIPT_START script_08014804 -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -StopScript -_0807E864 -Call sub_0807DF38 -Wait 0x0010 -CheckLocalFlag 0x0093 -JumpIf 0x0092 -TextboxNoOverlapFollowPos 0x000c4215 -_0807E878 -TestBit 0x00000001 -JumpIf 0x002c -TestBit 0x00000004 -JumpIf 0x0038 -_0807E30C -JumpIfNot 0xffe8 -_0807E864 -_0807E930 0x0008 -Wait 0x0020 -_0807E930 0x0002 -TextboxNoOverlapFollowPos 0x000c4215 -_0807E878 -Jump 0xffce -_0807E930 0x0008 -Wait 0x0020 -_0807E930 0x0002 -_0807E5F8 0x00000002 -Jump 0xffb8 -_0807E930 0x0009 -Wait 0x003c -_0807E930 0x0002 -_0807E5F8 0x00000008 -Jump 0xffa2 -TestBit 0x00000001 -JumpIf 0x002c -TestBit 0x00000004 -JumpIf 0x0038 -_0807E30C -JumpIfNot 0xffe8 -_0807E864 -_0807E930 0x0008 -Wait 0x0020 -_0807E930 0x0002 -TextboxNoOverlapFollowPos 0x000c4216 -_0807E878 -Jump 0xffce -_0807E930 0x0008 -Wait 0x0020 -_0807E930 0x0002 -_0807E5F8 0x00000002 -Jump 0xffb8 -_0807E930 0x0009 -Wait 0x003c -_0807E930 0x0002 -_0807E5F8 0x00000008 -Jump 0xffa2 -.short 0x0000 -StartScript -StopScript -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -ClearRoomFlag 0x0000 -Call sub_0806E140 -JumpIfNot 0x002a -_0807EA94 -_0807E3E8 -JumpIfNot 0x0028 -_0807E864 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0806E1E0 -_0807EA94 -Wait 0x0018 -_0807E878 -Jump 0xffc4 -_0807EA94 -Jump 0x0002 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -Call sub_0806E1FC -Wait 0x001e -Call sub_0807DF50 + StartScript + _0807E9D4 + _0807EB44 0x0000 + _0807EF80 0x000a + StopScript + _0807E864 + Call sub_0807DF38 + Wait 0x0010 + CheckLocalFlag 0x0093 + JumpIf script_080148B6 + TextboxNoOverlapFollowPos 0x000c4215 + _0807E878 +script_0801482E: + TestBit 0x00000001 + JumpIf script_08014862 + TestBit 0x00000004 + JumpIf script_08014878 + _0807E30C + JumpIfNot script_0801482E + _0807E864 + _0807E930 0x0008 + Wait 0x0020 + _0807E930 0x0002 + TextboxNoOverlapFollowPos 0x000c4215 + _0807E878 + Jump script_0801482E +script_08014862: + _0807E930 0x0008 + Wait 0x0020 + _0807E930 0x0002 + _0807E5F8 0x00000002 + Jump script_0801482E +script_08014878: + _0807E930 0x0009 + Wait 0x003c + _0807E930 0x0002 + _0807E5F8 0x00000008 + Jump script_0801482E +script_0801488E: + TestBit 0x00000001 + JumpIf script_080148C2 + TestBit 0x00000004 + JumpIf script_080148D8 + _0807E30C + JumpIfNot script_0801488E + _0807E864 + _0807E930 0x0008 + Wait 0x0020 + _0807E930 0x0002 +script_080148B6: + TextboxNoOverlapFollowPos 0x000c4216 + _0807E878 + Jump script_0801488E +script_080148C2: + _0807E930 0x0008 + Wait 0x0020 + _0807E930 0x0002 + _0807E5F8 0x00000002 + Jump script_0801488E +script_080148D8: + _0807E930 0x0009 + Wait 0x003c + _0807E930 0x0002 + _0807E5F8 0x00000008 + Jump script_0801488E + .short 0x0000 + StartScript + StopScript +script_080148F4: + CheckRoomFlag 0x0000 + JumpIfNot script_080148F4 + ClearRoomFlag 0x0000 + Call sub_0806E140 + JumpIfNot script_08014932 + _0807EA94 + _0807E3E8 + JumpIfNot script_08014938 + _0807E864 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + Call sub_0806E1E0 + _0807EA94 + Wait 0x0018 + _0807E878 + Jump script_080148F4 +script_08014932: + _0807EA94 + Jump script_08014938 +script_08014938: + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + Call sub_0806E1FC + Wait 0x001e + Call sub_0807DF50 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014958.inc b/data/scripts/script_08014958.inc index 78024f4e..e175c1b4 100644 --- a/data/scripts/script_08014958.inc +++ b/data/scripts/script_08014958.inc @@ -1,35 +1,39 @@ SCRIPT_START script_08014958 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -CheckGlobalFlag 0x0058 -JumpIf 0x000c -_0807EB44 0x0004 -SetEntityPositionRelative 0x01280078 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -CheckGlobalFlag 0x0058 -JumpIfNot 0x0020 -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -_0807EF80 0x0006 + StartScript + Call sub_0806C870 + _0807EF80 0x000a + CheckGlobalFlag 0x0058 + JumpIf script_08014976 + _0807EB44 0x0004 + SetEntityPositionRelative 0x01280078 +script_08014976: + StopScript +script_08014978: + _0807E30C + JumpIfNot script_08014978 + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08014978 + StartScript + Call sub_0806C870 + _0807EF80 0x000a + CheckGlobalFlag 0x0058 + JumpIfNot script_080149C6 + StopScript +script_080149AA: + _0807E30C + JumpIfNot script_080149AA + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_080149AA +script_080149C6: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index cbab30aa..7d4d8505 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -1,55 +1,59 @@ SCRIPT_START script_080149CC -StartScript -SetEntityNonPlanarMovement 0x0080 -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -CheckLocalFlag 0x0064 -JumpIfNot 0x002a -CheckLocalFlag 0x00b1 -JumpIf 0x0022 -SetLocalFlag 0x00b1 -_0807EF80 0x000b -_0807EF80 0x0001 -_0807EDD4 0x0068, 0x00f8 -SoundReq 0x0072 -_0807EB74 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E878 -Jump 0xffba -.short 0x0000 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffe6 -.short 0x0000 + StartScript + SetEntityNonPlanarMovement 0x0080 + Call sub_0806C870 + _0807EF80 0x000a + StopScript +script_080149DE: + _0807E30C + JumpIfNot script_080149DE + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + CheckLocalFlag 0x0064 + JumpIfNot script_08014A20 + CheckLocalFlag 0x00b1 + JumpIf script_08014A20 + SetLocalFlag 0x00b1 + _0807EF80 0x000b + _0807EF80 0x0001 + _0807EDD4 0x0068, 0x00f8 + SoundReq 0x0072 + _0807EB74 + _0807EF80 0x0000 + _0807EF80 0x000a +script_08014A20: + _0807E878 + Jump script_080149DE + .short 0x0000 + StartScript + Call sub_0806C870 + _0807EF80 0x000a + StopScript +script_08014A36: + _0807E30C + JumpIfNot script_08014A36 + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08014A36 + .short 0x0000 + StartScript + Call sub_0806C870 + _0807EF80 0x000a + StopScript +script_08014A62: + _0807E30C + JumpIfNot script_08014A62 + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08014A62 + .short 0x0000 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 90ff005f..ff644ca7 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -1,43 +1,47 @@ SCRIPT_START script_08014A80 -StartScript -_0807EF80 0x000a -StopScript -WaitForSomething2 0x00000001 -_0807EB74 -_0807EF80 0x0004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E5F8 0x00000002 -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2f0a -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 -StartScript -Call sub_0806C870 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -StartPlayerScript script_08014B10 -WaitForSomething2 0x00000001 -_0807EB74 -CheckLocalFlag 0x0064 -JumpIf 0x000e -SetLocalFlag 0x0064 -TextboxNoOverlap 0x2f0b -Jump 0x0006 -TextboxNoOverlap 0x2f0c -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffc6 -.short 0x0000 + StartScript + _0807EF80 0x000a + StopScript + WaitForSomething2 0x00000001 + _0807EB74 + _0807EF80 0x0004 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + TextboxNoOverlap 0x2f0a + _0807EA94 + _0807E5F8 0x00000002 +script_08014AAC: + _0807E30C + JumpIfNot script_08014AAC + _0807E864 + _0807EB74 + TextboxNoOverlap 0x2f0a + _0807EA94 + _0807E878 + Jump script_08014AAC + .short 0x0000 + StartScript + Call sub_0806C870 + _0807EF80 0x000a + StopScript +script_08014AD2: + _0807E30C + JumpIfNot script_08014AD2 + _0807E864 + _0807EB74 + StartPlayerScript script_08014B10 + WaitForSomething2 0x00000001 + _0807EB74 + CheckLocalFlag 0x0064 + JumpIf script_08014AFE + SetLocalFlag 0x0064 + TextboxNoOverlap 0x2f0b + Jump script_08014B02 +script_08014AFE: + TextboxNoOverlap 0x2f0c +script_08014B02: + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08014AD2 + .short 0x0000 diff --git a/data/scripts/script_08014B10.inc b/data/scripts/script_08014B10.inc index efa971bf..381bb6fb 100644 --- a/data/scripts/script_08014B10.inc +++ b/data/scripts/script_08014B10.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08014B10 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EDD4 0x0078, 0x0040 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EDD4 0x0078, 0x0040 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index 8d7354c8..974af618 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -1,117 +1,130 @@ SCRIPT_START script_08014B34 -StartScript -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -CheckLocalFlag 0x0063 -JumpIf 0x00a2 -StopScript -StartScript -CheckRoomFlag 0x0000 -JumpIf 0x001e -CheckEntityInteractType -JumpIfNot 0xfff0 -StopScript -_0807E864 -_0807EB74 -TextboxNoOverlap 0x2f01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffda -StopScript -_0807E864 -Call sub_0807DF28 -_0807E5F8 0x00000001 -_0807EF80 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 -SoundReq 0x0072 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0807DF50 -_0807E878 -_0807E930 0x0010 -Call sub_0806CD4C -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -CheckLocalFlag 0x0065 -JumpIf 0x001c -SetLocalFlag 0x0065 -TextboxNoOverlap 0x2f07 -_0807EA94 -_0807E914 0x00000064 -_0807F034 0x003f -WaitPlayerAction8 -Jump 0x0008 -TextboxNoOverlap 0x2f08 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffc8 -StartScript -Call sub_0806CD58 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E930 0x0006 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_0806CCD0 -JumpIfNot 0xfff8 -Call sub_0806CCB4 -JumpIfNot 0xfff8 -CheckLocalFlag 0x0066 -JumpIf 0x0016 -SetLocalFlag 0x0066 -TextboxNoOverlap 0x2f0d -_0807EA94 -_0807F034 0x000a -WaitPlayerAction8 -Jump 0x0008 -TextboxNoOverlap 0x2f09 -_0807EA94 -Wait 0x000f -_0807E878 -_0807EB44 0x0004 -_0807E930 0x0006 -Jump 0xffb0 -StartScript -CheckGlobalFlag 0x0024 -JumpIf 0x0038 -Call sub_0806C870 -_0807EF80 0x000a -_0807EF80 0x0000 -StopScript -StopScript -StartScript -CheckGlobalFlag 0x0024 -JumpIf 0x001c -_0807E30C -JumpIfNot 0xfff0 -StopScript -_0807E864 -_0807EB74 -Call sub_0806C90C -_0807EA94 -_0807E878 -Jump 0xffdc -_0807EF80 0x0006 + StartScript + _0807EF80 0x000a + _0807E930 0x0000 + StopScript + CheckLocalFlag 0x0063 + JumpIf script_08014BE8 +script_08014B48: + StopScript + StartScript + CheckRoomFlag 0x0000 + JumpIf script_08014B70 + CheckEntityInteractType + JumpIfNot script_08014B48 + StopScript + _0807E864 + _0807EB74 + TextboxNoOverlap 0x2f01 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08014B48 +script_08014B70: + StopScript + _0807E864 + Call sub_0807DF28 + _0807E5F8 0x00000001 + _0807EF80 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 + SoundReq 0x0072 + _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 + TextboxNoOverlap 0x2f07 + _0807EA94 + _0807E914 0x00000064 + _0807F034 0x003f + WaitPlayerAction8 + Jump script_08014C22 +script_08014C1C: + TextboxNoOverlap 0x2f08 + _0807EA94 +script_08014C22: + Wait 0x000f + _0807E878 + Jump script_08014BF2 + StartScript + Call sub_0806CD58 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E930 0x0006 + StopScript +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 + TextboxNoOverlap 0x2f0d + _0807EA94 + _0807F034 0x000a + WaitPlayerAction8 + Jump script_08014C82 +script_08014C7C: + TextboxNoOverlap 0x2f09 + _0807EA94 +script_08014C82: + Wait 0x000f + _0807E878 + _0807EB44 0x0004 + _0807E930 0x0006 + Jump script_08014C42 + StartScript + CheckGlobalFlag 0x0024 + JumpIf script_08014CD4 + Call sub_0806C870 + _0807EF80 0x000a + _0807EF80 0x0000 + StopScript +script_08014CAE: + StopScript + StartScript + CheckGlobalFlag 0x0024 + JumpIf script_08014CD4 + _0807E30C + JumpIfNot script_08014CAE + StopScript + _0807E864 + _0807EB74 + Call sub_0806C90C + _0807EA94 + _0807E878 + Jump script_08014CAE +script_08014CD4: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014CDC.inc b/data/scripts/script_08014CDC.inc index dd6d926f..41a3ab83 100644 --- a/data/scripts/script_08014CDC.inc +++ b/data/scripts/script_08014CDC.inc @@ -1,57 +1,60 @@ SCRIPT_START script_08014CDC -StartScript -SetEntityNonPlanarMovement 0x0180 -_0807EF80 0x000a -Call sub_08066D04 -Call sub_08066D14 -SetEntityPositionRelative 0x018001e8 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000001 -Call sub_08066E08 -_0807E864 -TextboxNoOverlapFollowPos 0x000c1010 -_0807EA94 -_0807E5F8 0x00000002 -StopScript -StartScript -CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 -JumpIfNot 0xfff2 -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlap 0x1012 -_0807EA94 -_0807EC64 0x0040 -_0807EB44 0x0004 -Call sub_08066E08 -SetEntityPositionRelative 0x00c801f8 -Call sub_0807DF50 -_0807E878 -CallWithArg sub_0807F6B4, 0x000000e8 -JumpIf 0xfff4 -_0807E864 -Call sub_0807DF28 -TextboxNoOverlap 0x1013 -_0807EA94 -_0807EC64 0x0040 -_0807EB44 0x0004 -_0807EF80 0x0000 -SetEntityPositionRelative 0x002801e8 -Call sub_0807DF50 -_0807E878 -CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlap 0x1014 -_0807EA94 -_0807EC64 0x0018 -SetLocalFlag 0x006d -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0180 + _0807EF80 0x000a + Call sub_08066D04 + Call sub_08066D14 + SetEntityPositionRelative 0x018001e8 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000001 + Call sub_08066E08 + _0807E864 + TextboxNoOverlapFollowPos 0x000c1010 + _0807EA94 + _0807E5F8 0x00000002 +script_08014D1E: + StopScript + StartScript + CheckPlayerInRegion 0x01d8, 0x0160, 0x3050 + JumpIfNot script_08014D1E + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + TextboxNoOverlap 0x1012 + _0807EA94 + _0807EC64 0x0040 + _0807EB44 0x0004 + Call sub_08066E08 + SetEntityPositionRelative 0x00c801f8 + Call sub_0807DF50 + _0807E878 +script_08014D60: + CallWithArg sub_0807F6B4, 0x000000e8 + JumpIf script_08014D60 + _0807E864 + Call sub_0807DF28 + TextboxNoOverlap 0x1013 + _0807EA94 + _0807EC64 0x0040 + _0807EB44 0x0004 + _0807EF80 0x0000 + SetEntityPositionRelative 0x002801e8 + Call sub_0807DF50 + _0807E878 +script_08014D96: + CheckPlayerInRegion 0x01f8, 0x0028, 0x2040 + JumpIfNot script_08014D96 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + TextboxNoOverlap 0x1014 + _0807EA94 + _0807EC64 0x0018 + SetLocalFlag 0x006d + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index 7bdebcf1..a84cdb1b 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08014DCC -StartScript -SetEntityPositionRelative 0x01a80238 -Call sub_0807F844 -Call sub_0807F348 -_0807E864 -Call sub_0807DF28 -StopScript -_0807E778 0x0010 -DoFade6 -WaitFor_2 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + SetEntityPositionRelative 0x01a80238 + Call sub_0807F844 + Call sub_0807F348 + _0807E864 + Call sub_0807DF28 + StopScript + _0807E778 0x0010 + DoFade6 + WaitFor_2 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 4371d2c2..798e9cc8 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -1,262 +1,275 @@ SCRIPT_START script_08014E14 -StartScript -_0807EB44 0x0004 -_0807E9D4 -_0807EF80 0x000a -CallWithArg sub_0807F3D8, 0x00000000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -CallWithArg sub_0807F3D8, 0x00000000 -Call sub_08064428 -_0807EA94 -_0807E878 -Jump 0xffe0 -.short 0x0000 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -CallWithArg sub_0807F78C, 0x00000022 -_0807EA94 -_0807E3E8 -JumpIfNot 0x0038 -CallWithArg sub_0807F7C4, 0x00000022 -JumpIfNot 0x001e -_0807E48C 0x0020 -JumpIfNot 0x001e -CallWithArg sub_0807F800, 0x00000022 -WaitPlayerAction8 -TextboxNoOverlap 0x0a04 -Jump 0x000e -TextboxNoOverlap 0x0a03 -Jump 0x0006 -TextboxNoOverlap 0x0a02 -_0807EA94 -Call sub_0807DF50 -_0807E878 -Jump 0xff9c -.short 0x0000 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -TextboxNoOverlap 0x200d -_0807EA94 -_0807E878 -Jump 0xffec -.short 0x0000 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x000a -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -_0807EF80 0x0000 -TextboxNoOverlap 0x200e -_0807EA94 -_0807E878 -_0807EB44 0x0004 -_0807E930 0x000a -Jump 0xffe0 -.short 0x0000 -StartScript -_0807EF80 0x000a -_0807EF80 0x0007 -_0807EB44 0x0004 -_0807E930 0x000e -StopScript -Call sub_08065914 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -_0807EF80 0x0000 -StartScript -TextboxNoOverlap 0x3b0b -CallWithArg sub_0807F854, 0x00010064 -StopScript -_0807EA94 -_0807E3E8 -JumpIfNot 0x0030 -HasRupees 0x0064 -JumpIfNot 0x001c -_0807E48C 0x0020 -JumpIfNot 0x001c -ModRupees 0xff9c -_0807F034 0x0022 -WaitPlayerAction8 -TextboxNoOverlap 0x3b11 -Jump 0x000e -TextboxNoOverlap 0x3b0e -Jump 0x0006 -TextboxNoOverlap 0x3b0f -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EB44 0x0004 -_0807E930 0x000e -Jump 0xff90 -StartScript -SetEntityPositionRelative 0x00e001f8 -Call sub_08054564 -StopScript -CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -_0807F0B4 0x0001 -CameraTargetEntity -StartPlayerScript script_080152B4 -WaitForSomething2 0x00000001 -TextboxNoOverlapFollowPos 0x00021301 -_0807EA94 -Call sub_0807F3F8 -Wait 0x003c -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -SoundReq2 0x000d -_0807EB28 0x1302 -_0807EA94 -TextboxNoOverlapFollowPos 0x00021303 -_0807EA94 -_0807EB28 0x1304 -_0807EA94 -TextboxNoOverlapFollowPos 0x00021305 -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000004 -_0807EB28 0x1306 -_0807EA94 -SoundReq0x80100000 -StartPlayerScript script_080152DC -CameraTargetEntity -_0807F0B4 0x0003 -SetEntityPositionRelative 0x014801f8 -WaitForSomething2 0x00000001 -Call sub_0804F6A8 -Wait 0x0004 -Call sub_0804F808 -SoundReq 0x010b -StartPlayerScript script_08015304 -Call sub_0804F6C8 -Wait 0x0004 -Call sub_0804F830 -SoundReq 0x010b -Call sub_0804F6E8 -Wait 0x0004 -Call sub_0804F854 -SoundReq 0x010b -Call sub_0804F724 -Wait 0x0004 -Call sub_0804F89C -SoundReq 0x010b -Call sub_0804F760 -Wait 0x0004 -Call sub_0804F8E0 -SoundReq 0x010b -Wait 0x003c -WaitForSomething2 0x00000001 -SoundReq 0x01b0 -Call sub_0804F79C -Wait 0x000a -LoadRoomEntityList gUnk_080F7FC0 -SoundReq2 0x002d -Call sub_0807DF50 -_0807E878 -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -SoundReq0x80100000 -StartPlayerScript script_08015338 -WaitForSomething2 0x00000001 -Wait 0x003c -Call sub_0804F6A8 -Wait 0x0004 -Call sub_0804F928 -SoundReq 0x010b -Call sub_0804F6C8 -Wait 0x0004 -Call sub_0804F944 -SoundReq 0x010b -Call sub_0804F6E8 -Wait 0x0004 -Call sub_0804F960 -SoundReq 0x010b -Call sub_0804F724 -Wait 0x0004 -Call sub_0804F994 -SoundReq 0x010b -Call sub_0804F760 -Wait 0x0004 -Call sub_0804F9C8 -SoundReq 0x010b -Wait 0x003c -SoundReq 0x0072 -_0807F0B4 0x0004 -CameraTargetPlayer -SetLocalFlag 0x008c -_0807EB28 0x130c -_0807EA94 -CameraTargetPlayer -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -Call sub_08053B3C -StartScript -_0807E864 -CallWithArg sub_0807F6E8, 0x00000008 -MoveEntityToPlayer -_0807F0B4 0x0004 -CameraTargetEntity -_0807E778 0x0100 -DoFade4 -_0807E80C 0x00000000 -StopScript -StartPlayerScript script_08015360 -WaitForSomething2 0x00000001 -LoadRoomEntityList gUnk_080F7CB0 -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000010 -StartScript -_0807E8E4_2 -_0807EB28 0x1315 -StopScript -_0807EA94 -_0807F0B4 0x0004 -CameraTargetPlayer -Call sub_08054570 -SoundReq2 0xffff -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807E9D4 + _0807EF80 0x000a + CallWithArg sub_0807F3D8, 0x00000000 + StopScript +script_08014E2C: + CheckEntityInteractType + JumpIfNot script_08014E2C + _0807E864 + _0807EB74 + CallWithArg sub_0807F3D8, 0x00000000 + Call sub_08064428 + _0807EA94 + _0807E878 + Jump script_08014E2C + .short 0x0000 + StartScript + _0807EF80 0x000a + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08014E64: + CheckEntityInteractType + JumpIfNot script_08014E64 + _0807E864 + Call sub_0807DF28 + _0807EB74 + CallWithArg sub_0807F78C, 0x00000022 + _0807EA94 + _0807E3E8 + JumpIfNot script_08014EBC + CallWithArg sub_0807F7C4, 0x00000022 + JumpIfNot script_08014EB0 + _0807E48C 0x0020 + JumpIfNot script_08014EB8 + CallWithArg sub_0807F800, 0x00000022 + WaitPlayerAction8 + TextboxNoOverlap 0x0a04 + Jump script_08014EBC +script_08014EB0: + TextboxNoOverlap 0x0a03 + Jump script_08014EBC +script_08014EB8: + TextboxNoOverlap 0x0a02 +script_08014EBC: + _0807EA94 + Call sub_0807DF50 + _0807E878 + Jump script_08014E64 + .short 0x0000 + StartScript + _0807EF80 0x000a + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +script_08014EE0: + CheckEntityInteractType + JumpIfNot script_08014EE0 + _0807E864 + _0807EB74 + TextboxNoOverlap 0x200d + _0807EA94 + _0807E878 + Jump script_08014EE0 + .short 0x0000 + StartScript + _0807EF80 0x000a + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x000a + StopScript +script_08014F0C: + CheckEntityInteractType + JumpIfNot script_08014F0C + _0807E864 + _0807EB74 + _0807EF80 0x0000 + TextboxNoOverlap 0x200e + _0807EA94 + _0807E878 + _0807EB44 0x0004 + _0807E930 0x000a + Jump script_08014F0C + .short 0x0000 + StartScript + _0807EF80 0x000a + _0807EF80 0x0007 + _0807EB44 0x0004 + _0807E930 0x000e + StopScript + Call sub_08065914 +script_08014F4A: + CheckEntityInteractType + JumpIfNot script_08014F4A + _0807E864 + Call sub_0807DF28 + _0807EB74 + _0807EF80 0x0000 + StartScript + TextboxNoOverlap 0x3b0b + CallWithArg sub_0807F854, 0x00010064 + StopScript + _0807EA94 + _0807E3E8 + JumpIfNot script_08014FA6 + HasRupees 0x0064 + JumpIfNot script_08014F9A + _0807E48C 0x0020 + JumpIfNot script_08014FA2 + ModRupees 0xff9c + _0807F034 0x0022 + WaitPlayerAction8 + TextboxNoOverlap 0x3b11 + Jump script_08014FA6 +script_08014F9A: + TextboxNoOverlap 0x3b0e + Jump script_08014FA6 +script_08014FA2: + TextboxNoOverlap 0x3b0f +script_08014FA6: + _0807EA94 + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + _0807E930 0x000e + Jump script_08014F4A + StartScript + SetEntityPositionRelative 0x00e001f8 + Call sub_08054564 + StopScript +script_08014FCC: + CheckPlayerInRegion 0x01f8, 0x00a0, 0x2040 + JumpIfNot script_08014FCC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + SoundReq0x80100000 + _0807F0B4 0x0001 + CameraTargetEntity + StartPlayerScript script_080152B4 + WaitForSomething2 0x00000001 + TextboxNoOverlapFollowPos 0x00021301 + _0807EA94 + Call sub_0807F3F8 + Wait 0x003c + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + SoundReq2 0x000d + _0807EB28 0x1302 + _0807EA94 + TextboxNoOverlapFollowPos 0x00021303 + _0807EA94 + _0807EB28 0x1304 + _0807EA94 + TextboxNoOverlapFollowPos 0x00021305 + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000004 + _0807EB28 0x1306 + _0807EA94 + SoundReq0x80100000 + StartPlayerScript script_080152DC + CameraTargetEntity + _0807F0B4 0x0003 + SetEntityPositionRelative 0x014801f8 + WaitForSomething2 0x00000001 + Call sub_0804F6A8 + Wait 0x0004 + Call sub_0804F808 + SoundReq 0x010b + StartPlayerScript script_08015304 + Call sub_0804F6C8 + Wait 0x0004 + Call sub_0804F830 + SoundReq 0x010b + Call sub_0804F6E8 + Wait 0x0004 + Call sub_0804F854 + SoundReq 0x010b + Call sub_0804F724 + Wait 0x0004 + Call sub_0804F89C + SoundReq 0x010b + Call sub_0804F760 + Wait 0x0004 + Call sub_0804F8E0 + SoundReq 0x010b + Wait 0x003c + WaitForSomething2 0x00000001 + SoundReq 0x01b0 + Call sub_0804F79C + Wait 0x000a + LoadRoomEntityList gUnk_080F7FC0 + SoundReq2 0x002d + Call sub_0807DF50 + _0807E878 +script_08015104: + CheckRoomFlag 0x0000 + JumpIfNot script_08015104 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + SoundReq0x80100000 + StartPlayerScript script_08015338 + WaitForSomething2 0x00000001 + Wait 0x003c + Call sub_0804F6A8 + Wait 0x0004 + Call sub_0804F928 + SoundReq 0x010b + Call sub_0804F6C8 + Wait 0x0004 + Call sub_0804F944 + SoundReq 0x010b + Call sub_0804F6E8 + Wait 0x0004 + Call sub_0804F960 + SoundReq 0x010b + Call sub_0804F724 + Wait 0x0004 + Call sub_0804F994 + SoundReq 0x010b + Call sub_0804F760 + Wait 0x0004 + Call sub_0804F9C8 + SoundReq 0x010b + Wait 0x003c + SoundReq 0x0072 + _0807F0B4 0x0004 + CameraTargetPlayer + SetLocalFlag 0x008c + _0807EB28 0x130c + _0807EA94 + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + Call sub_08053B3C + StartScript + _0807E864 + CallWithArg sub_0807F6E8, 0x00000008 + MoveEntityToPlayer + _0807F0B4 0x0004 + CameraTargetEntity + _0807E778 0x0100 + DoFade4 + _0807E80C 0x00000000 + StopScript + StartPlayerScript script_08015360 + WaitForSomething2 0x00000001 + LoadRoomEntityList gUnk_080F7CB0 + _0807E778 0x0004 + _0807E800 0x00000000 + WaitFor_2 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000010 + StartScript + _0807E8E4_2 + _0807EB28 0x1315 + StopScript + _0807EA94 + _0807F0B4 0x0004 + CameraTargetPlayer + Call sub_08054570 + SoundReq2 0xffff + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015234.inc b/data/scripts/script_08015234.inc index 7f1a7109..aa9d41d0 100644 --- a/data/scripts/script_08015234.inc +++ b/data/scripts/script_08015234.inc @@ -1,30 +1,30 @@ SCRIPT_START script_08015234 -StartScript -_0807EF80 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -Call sub_0807F354 -StopScript -WaitForSomething2 0x00000002 -Call sub_08066C94 -Wait 0x00e9 -_0807EF80 0x0007 -_0807EF80 0x001e -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -Wait 0x0014 -_0807EB44 0x0000 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -WaitForSomething2 0x00000002 -SoundReq 0x00f5 -_0807EF80 0x001f -SetEntityNonPlanarMovement 0x0200 -_0807EF80 0x000d -_0807EF80 0x0000 -_0807ECC4 0x0030 -_0807E5F8 0x00000004 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EB44 0x0004 + _0807EF80 0x0000 + Call sub_0807F354 + StopScript + WaitForSomething2 0x00000002 + Call sub_08066C94 + Wait 0x00e9 + _0807EF80 0x0007 + _0807EF80 0x001e + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + Wait 0x0014 + _0807EB44 0x0000 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + WaitForSomething2 0x00000002 + SoundReq 0x00f5 + _0807EF80 0x001f + SetEntityNonPlanarMovement 0x0200 + _0807EF80 0x000d + _0807EF80 0x0000 + _0807ECC4 0x0030 + _0807E5F8 0x00000004 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080152B4.inc b/data/scripts/script_080152B4.inc index 9cff9737..0107c8c1 100644 --- a/data/scripts/script_080152B4.inc +++ b/data/scripts/script_080152B4.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080152B4 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x00b8 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x00b8 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_080152DC.inc b/data/scripts/script_080152DC.inc index f675a24c..2f474890 100644 --- a/data/scripts/script_080152DC.inc +++ b/data/scripts/script_080152DC.inc @@ -1,11 +1,11 @@ SCRIPT_START script_080152DC -StartScript -SetEntityNonPlanarMovement 0x0200 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0148 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0200 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0148 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015304.inc b/data/scripts/script_08015304.inc index a5e22bf5..6d8e17e3 100644 --- a/data/scripts/script_08015304.inc +++ b/data/scripts/script_08015304.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08015304 -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0002 -Wait 0x000a -_0807EB44 0x0006 -Wait 0x000a -_0807EB44 0x0004 -_0807E5F8 0x00000001 -Call sub_080791BC + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0002 + Wait 0x000a + _0807EB44 0x0006 + Wait 0x000a + _0807EB44 0x0004 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015338.inc b/data/scripts/script_08015338.inc index a6f16509..0c1407f2 100644 --- a/data/scripts/script_08015338.inc +++ b/data/scripts/script_08015338.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015338 -StartScript -SetEntityNonPlanarMovement 0x0100 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x01f8, 0x0148 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x01f8, 0x0148 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015360.inc b/data/scripts/script_08015360.inc index f3e9bb38..fc63dc99 100644 --- a/data/scripts/script_08015360.inc +++ b/data/scripts/script_08015360.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015360 -StartScript -SetEntityNonPlanarMovement 0x0100 -SetEntityPositionRelative 0x01480208 -StopScript -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0100 + SetEntityPositionRelative 0x01480208 + StopScript + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015384.inc b/data/scripts/script_08015384.inc index 6d9b5581..01e78330 100644 --- a/data/scripts/script_08015384.inc +++ b/data/scripts/script_08015384.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08015384 -_0807EF80 0x0015 -Call sub_080791BC + _0807EF80 0x0015 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015390.inc b/data/scripts/script_08015390.inc index f5e53115..7c9c4b3a 100644 --- a/data/scripts/script_08015390.inc +++ b/data/scripts/script_08015390.inc @@ -1,23 +1,24 @@ SCRIPT_START script_08015390 -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -StopScript -_0807E930 0x001f -Call sub_0806D944 -WaitForSomething2 0x00000008 -_0807E930 0x0010 -TextboxNoOverlapFollowPos 0x000c1314 -_0807EA94 -_0807E930 0x0018 -Call sub_0806D8A0 -_0807EE30 -JumpIfNot 0xfffc -_0807E930 0x001f -StartPlayerScript script_08015384 -Call sub_0806D9A4 -_0807EF80 0x0008 -Wait 0x0078 -_0807E5F8 0x00000010 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + StopScript + _0807E930 0x001f + Call sub_0806D944 + WaitForSomething2 0x00000008 + _0807E930 0x0010 + TextboxNoOverlapFollowPos 0x000c1314 + _0807EA94 + _0807E930 0x0018 + Call sub_0806D8A0 +script_080153C2: + _0807EE30 + JumpIfNot script_080153C2 + _0807E930 0x001f + StartPlayerScript script_08015384 + Call sub_0806D9A4 + _0807EF80 0x0008 + Wait 0x0078 + _0807E5F8 0x00000010 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080153EC.inc b/data/scripts/script_080153EC.inc index dfd7dfc5..56daf055 100644 --- a/data/scripts/script_080153EC.inc +++ b/data/scripts/script_080153EC.inc @@ -1,36 +1,36 @@ SCRIPT_START script_080153EC -StartScript -_0807F0B4 0x0007 -SetEntityPositionRelative 0x00680078 -CameraTargetEntity -StopScript -SoundReq2 0x002a -_0807E778 0x0004 -DoFade4 -WaitFor_2 -Wait 0x003c -_0807E5F8 0x00000080 -WaitForSomething2 0x00000100 -_0807E5F8 0x00000800 -WaitForSomething2 0x00001000 -_0807E5F8 0x00000880 -WaitForSomething2 0x00001100 -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00900078 -TextboxNoOverlapFollowPos 0x00021330 -_0807EA94 -_0807E5F8 0x00008000 -WaitForSomething2 0x00010000 -_0807E5F8 0x00000880 -WaitForSomething2 0x00001000 -Wait 0x003c -TextboxNoOverlapFollowPos 0x0002130d -_0807EA94 -TextboxNoOverlapFollowPos 0x000c130e -_0807EA94 -TextboxNoOverlapFollowPos 0x0002130f -_0807EA94 -TextboxNoOverlapFollowPos 0x000c1310 -_0807EA94 -CallWithArg sub_0805DDEC, 0x00000001 -_0807F0C8 0xffff, 0x0000 + StartScript + _0807F0B4 0x0007 + SetEntityPositionRelative 0x00680078 + CameraTargetEntity + StopScript + SoundReq2 0x002a + _0807E778 0x0004 + DoFade4 + WaitFor_2 + Wait 0x003c + _0807E5F8 0x00000080 + WaitForSomething2 0x00000100 + _0807E5F8 0x00000800 + WaitForSomething2 0x00001000 + _0807E5F8 0x00000880 + WaitForSomething2 0x00001100 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00900078 + TextboxNoOverlapFollowPos 0x00021330 + _0807EA94 + _0807E5F8 0x00008000 + WaitForSomething2 0x00010000 + _0807E5F8 0x00000880 + WaitForSomething2 0x00001000 + Wait 0x003c + TextboxNoOverlapFollowPos 0x0002130d + _0807EA94 + TextboxNoOverlapFollowPos 0x000c130e + _0807EA94 + TextboxNoOverlapFollowPos 0x0002130f + _0807EA94 + TextboxNoOverlapFollowPos 0x000c1310 + _0807EA94 + CallWithArg sub_0805DDEC, 0x00000001 + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_0801548E.inc b/data/scripts/script_0801548E.inc index 6d325462..69938c3a 100644 --- a/data/scripts/script_0801548E.inc +++ b/data/scripts/script_0801548E.inc @@ -1,26 +1,26 @@ SCRIPT_START script_0801548E -_0807E5F8 0x00000800 -WaitForSomething2 0x00001000 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -_0807E5F8 0x00048000 -WaitForSomething2 0x00090000 -TextboxNoOverlapFollowPos 0x00021311 -_0807EA94 -_0807E5F8 0x00008000 -WaitForSomething2 0x00010000 -_0807E5F8 0x00048000 -WaitForSomething2 0x00010000 -CallWithArg sub_0805DE18, 0x00000001 -_0807F0C8 0x0000, 0x0000 -TextboxNoOverlapFollowPos 0x000c1312 -_0807EA94 -_0807E5F8 0x00000800 -WaitForSomething2 0x00001000 -SoundReq0x80100000 -_0807E778 0x0004 -DoFade5 -WaitFor_2 -SetRoomFlag 0x0001 -_0807EF80 0x0006 + _0807E5F8 0x00000800 + WaitForSomething2 0x00001000 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + _0807E5F8 0x00048000 + WaitForSomething2 0x00090000 + TextboxNoOverlapFollowPos 0x00021311 + _0807EA94 + _0807E5F8 0x00008000 + WaitForSomething2 0x00010000 + _0807E5F8 0x00048000 + WaitForSomething2 0x00010000 + CallWithArg sub_0805DE18, 0x00000001 + _0807F0C8 0x0000, 0x0000 + TextboxNoOverlapFollowPos 0x000c1312 + _0807EA94 + _0807E5F8 0x00000800 + WaitForSomething2 0x00001000 + SoundReq0x80100000 + _0807E778 0x0004 + DoFade5 + WaitFor_2 + SetRoomFlag 0x0001 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_0801550C.inc b/data/scripts/script_0801550C.inc index c2bf4230..e7cf2435 100644 --- a/data/scripts/script_0801550C.inc +++ b/data/scripts/script_0801550C.inc @@ -1,44 +1,45 @@ SCRIPT_START script_0801550C -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EF80 0x0007 -_0807EB44 0x0000 -Call sub_0807F338 -StopScript -CallWithArg sub_0806AF60, 0x00000000 -WaitForSomething2 0x00008000 -CallWithArg sub_0806AF60, 0x00000004 -_0807EDD4 0x0078, 0x00b8 -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EF80 0x000d -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000004 -_0807EDD4 0x0078, 0x00c8 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807EB44 0x0000 -CallWithArg sub_0806AF60, 0x00000000 -_0807EF80 0x0010 -Wait 0x0028 -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x000a -SoundReq 0x0125 -CallWithArg sub_0807FB28, 0x00000003 -Wait 0x000a -_0807EF80 0x0010 -_0807E5F8 0x00010000 -WaitForSomething2 0x00008000 -_0807E930 0x000d -Call sub_0807F2D4 -_0807E5F8 0x00010000 -Wait 0x003c -_0807EF80 0x0005 -Wait 0x003c -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EF80 0x0007 + _0807EB44 0x0000 + Call sub_0807F338 + StopScript + CallWithArg sub_0806AF60, 0x00000000 + WaitForSomething2 0x00008000 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0078, 0x00b8 + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000000 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EF80 0x000d + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000004 + _0807EDD4 0x0078, 0x00c8 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807EB44 0x0000 + CallWithArg sub_0806AF60, 0x00000000 + _0807EF80 0x0010 + Wait 0x0028 + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x000a + SoundReq 0x0125 + CallWithArg sub_0807FB28, 0x00000003 + Wait 0x000a + _0807EF80 0x0010 + _0807E5F8 0x00010000 + WaitForSomething2 0x00008000 + _0807E930 0x000d + Call sub_0807F2D4 + _0807E5F8 0x00010000 + Wait 0x003c + _0807EF80 0x0005 + Wait 0x003c +script_080155E6: + CheckRoomFlag 0x0001 + JumpIfNot script_080155E6 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080155F4.inc b/data/scripts/script_080155F4.inc index 727f25de..62f56e9f 100644 --- a/data/scripts/script_080155F4.inc +++ b/data/scripts/script_080155F4.inc @@ -1,10 +1,11 @@ SCRIPT_START script_080155F4 -WaitForSomething2 0x00000020 -_0807E930 0x0000 -Wait 0x0014 -_0807E5F8 0x00000040 -CheckRoomFlag 0x0001 -JumpIfNot 0xfffa -_0807EF80 0x0006 + WaitForSomething2 0x00000020 + _0807E930 0x0000 + Wait 0x0014 + _0807E5F8 0x00000040 +script_08015608: + CheckRoomFlag 0x0001 + JumpIfNot script_08015608 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index cc3d5d59..7338d9e1 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -1,22 +1,22 @@ SCRIPT_START script_08015618 -StartScript -_0807EF80 0x0007 -SetEntityNonPlanarMovement 0x0040 -Call sub_08094B80 -StopScript -WaitForSomething2 0x00000080 -CallWithArg sub_0805DDEC, 0x00000003 -Call sub_08094B0C -_0807EDD4 0x0078, 0x0068 -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807EF3C 0xff80, 0x0000 -CallWithArg sub_0805DE18, 0x00000003 -Wait 0x003c -_0807E5F8 0x00000100 -WaitForSomething2 0x00000080 -_0807E930 0x0001 -Call sub_0807F2D4 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + SetEntityNonPlanarMovement 0x0040 + Call sub_08094B80 + StopScript + WaitForSomething2 0x00000080 + CallWithArg sub_0805DDEC, 0x00000003 + Call sub_08094B0C + _0807EDD4 0x0078, 0x0068 + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807EF3C 0xff80, 0x0000 + CallWithArg sub_0805DE18, 0x00000003 + Wait 0x003c + _0807E5F8 0x00000100 + WaitForSomething2 0x00000080 + _0807E930 0x0001 + Call sub_0807F2D4 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015684.inc b/data/scripts/script_08015684.inc index f56d6035..28a67405 100644 --- a/data/scripts/script_08015684.inc +++ b/data/scripts/script_08015684.inc @@ -1,46 +1,46 @@ SCRIPT_START script_08015684 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000b -_0807EB44 0x0000 -_0807EF80 0x0017 -Call sub_0807F180 -StopScript -WaitForSomething2 0x00000800 -_0807EB44 0x0002 -_0807EF80 0x0017 -Wait 0x000a -_0807EB44 0x0004 -_0807EF80 0x0017 -_0807EB44 0x0004 -_0807EF80 0x001b -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -Wait 0x0078 -_0807EF80 0x0004 -Wait 0x0014 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EF80 0x0018 -Call sub_0807F2D4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -_0807EB44 0x0004 -_0807EF80 0x0014 -CallWithArg sub_0809545C, 0x08015754 -SoundReq 0x01c4 -Wait 0x0078 -_0807EF80 0x0016 -WaitForSomething2 0x00020000 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00001000 -WaitForSomething2 0x00000800 -Call sub_08066CA4 -_0807EF80 0x0008 -Wait 0x0078 -_0807E5F8 0x00001000 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000b + _0807EB44 0x0000 + _0807EF80 0x0017 + Call sub_0807F180 + StopScript + WaitForSomething2 0x00000800 + _0807EB44 0x0002 + _0807EF80 0x0017 + Wait 0x000a + _0807EB44 0x0004 + _0807EF80 0x0017 + _0807EB44 0x0004 + _0807EF80 0x001b + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + Wait 0x0078 + _0807EF80 0x0004 + Wait 0x0014 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + _0807EF80 0x0018 + Call sub_0807F2D4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + _0807EB44 0x0004 + _0807EF80 0x0014 + CallWithArg sub_0809545C, 0x08015754 + SoundReq 0x01c4 + Wait 0x0078 + _0807EF80 0x0016 + WaitForSomething2 0x00020000 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00001000 + WaitForSomething2 0x00000800 + Call sub_08066CA4 + _0807EF80 0x0008 + Wait 0x0078 + _0807E5F8 0x00001000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015754.inc b/data/scripts/script_08015754.inc index caa94f3d..f3b19d0a 100644 --- a/data/scripts/script_08015754.inc +++ b/data/scripts/script_08015754.inc @@ -1,20 +1,20 @@ SCRIPT_START script_08015754 -StartScript -_0807E930 0x0000 -SetEntityNonPlanarMovement 0x0200 -Call sub_08094B80 -StopScript -Wait 0x0078 -SoundReq 0x01c5 -Call sub_08094B6C -_0807EDD4 0x0078, 0x00b8 -SoundReq 0x01c6 -Call sub_08094B80 -_0807E5F8 0x00020000 -SetEntityNonPlanarMovement 0x0080 -WaitForSomething2 0x00040000 -_0807EDD4 0x0078, 0x00c8 -_0807E5F8 0x00080000 -WaitForSomething2 0x00040000 -_0807EF80 0x0006 + StartScript + _0807E930 0x0000 + SetEntityNonPlanarMovement 0x0200 + Call sub_08094B80 + StopScript + Wait 0x0078 + SoundReq 0x01c5 + Call sub_08094B6C + _0807EDD4 0x0078, 0x00b8 + SoundReq 0x01c6 + Call sub_08094B80 + _0807E5F8 0x00020000 + SetEntityNonPlanarMovement 0x0080 + WaitForSomething2 0x00040000 + _0807EDD4 0x0078, 0x00c8 + _0807E5F8 0x00080000 + WaitForSomething2 0x00040000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080157AC.inc b/data/scripts/script_080157AC.inc index 43f48112..a98e09f7 100644 --- a/data/scripts/script_080157AC.inc +++ b/data/scripts/script_080157AC.inc @@ -1,70 +1,74 @@ SCRIPT_START script_080157AC -CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0807DF50 -_0807E878 -CheckPlayerInRegion 0x0250, 0x0230, 0x3040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807F3F8 -Wait 0x003c -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -StartPlayerScript script_080158F8 -_0807F0B4 0x0001 -SetEntityPositionRelative 0x02180248 -CameraTargetEntity -Call sub_0807F5C0 -WaitForSomething2 0x00000010 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000020 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -StartPlayerScript script_08015918 -WaitForSomething2 0x00000010 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -TextboxNoOverlapFollowPos 0x00021066 -_0807EA94 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -Call sub_0807DF50 -_0807E878 -Call sub_08066F94 -_0807E5F8 0x00000008 -CheckRoomFlag 0x0000 -JumpIfNot 0xfffa -_0807EA94 -ComparePlayerAction 0x001c -JumpIf 0xfff8 -_0807E864 -Call sub_0807DF28 -_0807F0B4 0x0002 -SetEntityPositionRelative 0x02080248 -CameraTargetEntity -StartPlayerScript script_08015938 -WaitForSomething2 0x00000010 -TextboxNoOverlapFollowPos 0x000c106a -_0807EA94 -_0807E5F8 0x00000008 -Wait 0x0078 -_0807E8E4_2 -TextboxNoOverlapFollowPos 0x00021068 -_0807EA94 -_0807E5F8 0x00000001 -WaitForSomething2 0x00000002 -SetLocalFlag 0x008b -Call sub_08066FB8 -Call sub_0807DF50 -_0807E878 -_0807F0B4 0x0004 -CameraTargetPlayer -_0807EF80 0x0006 +script_080157AC: + CheckPlayerInRegion 0x01f8, 0x0310, 0x2020 + JumpIfNot script_080157AC + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + Call sub_0807DF50 + _0807E878 +script_080157DA: + CheckPlayerInRegion 0x0250, 0x0230, 0x3040 + JumpIfNot script_080157DA + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0807F3F8 + Wait 0x003c + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + StartPlayerScript script_080158F8 + _0807F0B4 0x0001 + SetEntityPositionRelative 0x02180248 + CameraTargetEntity + Call sub_0807F5C0 + WaitForSomething2 0x00000010 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000020 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + StartPlayerScript script_08015918 + WaitForSomething2 0x00000010 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + TextboxNoOverlapFollowPos 0x00021066 + _0807EA94 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + Call sub_0807DF50 + _0807E878 + Call sub_08066F94 + _0807E5F8 0x00000008 +script_08015880: + CheckRoomFlag 0x0000 + JumpIfNot script_08015880 +script_08015888: + _0807EA94 + ComparePlayerAction 0x001c + JumpIf script_08015888 + _0807E864 + Call sub_0807DF28 + _0807F0B4 0x0002 + SetEntityPositionRelative 0x02080248 + CameraTargetEntity + StartPlayerScript script_08015938 + WaitForSomething2 0x00000010 + TextboxNoOverlapFollowPos 0x000c106a + _0807EA94 + _0807E5F8 0x00000008 + Wait 0x0078 + _0807E8E4_2 + TextboxNoOverlapFollowPos 0x00021068 + _0807EA94 + _0807E5F8 0x00000001 + WaitForSomething2 0x00000002 + SetLocalFlag 0x008b + Call sub_08066FB8 + Call sub_0807DF50 + _0807E878 + _0807F0B4 0x0004 + CameraTargetPlayer + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_080158F8.inc b/data/scripts/script_080158F8.inc index 24219a34..a339eeb9 100644 --- a/data/scripts/script_080158F8.inc +++ b/data/scripts/script_080158F8.inc @@ -1,8 +1,8 @@ SCRIPT_START script_080158F8 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0218, 0x0238 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000010 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0218, 0x0238 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000010 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015918.inc b/data/scripts/script_08015918.inc index a038ba06..c39a541d 100644 --- a/data/scripts/script_08015918.inc +++ b/data/scripts/script_08015918.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015918 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0238, 0x0228 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000010 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0238, 0x0228 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000010 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015938.inc b/data/scripts/script_08015938.inc index ef7c6df3..4a24da0e 100644 --- a/data/scripts/script_08015938.inc +++ b/data/scripts/script_08015938.inc @@ -1,8 +1,8 @@ SCRIPT_START script_08015938 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0248, 0x0208 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000010 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0248, 0x0208 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000010 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index c02f9c7b..72b34caf 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -1,71 +1,73 @@ SCRIPT_START script_08015958 -StartScript -SetEntityNonPlanarMovement 0x0180 -_0807EF80 0x0008 -_0807EF80 0x000b -Call sub_08066D04 -StopScript -WaitForSomething2 0x00000001 -StartScript -Call sub_08066D14 -MoveEntityToPlayer -StopScript -_0807EF80 0x0007 -_0807EB74 -_0807EDD4 0x01f8, 0x02f8 -_0807EB44 0x0004 -_0807EF80 0x0000 -TextboxNoOverlapFollowPos 0x00021011 -_0807EA94 -_0807EDD4 0x01f8, 0x0268 -SetEntityPositionRelative 0x02180248 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -Call sub_0807F3C8 -SoundReq 0x0096 -SetEntityNonPlanarMovement 0x0200 -_0807ECC4 0x0008 -_0807E930 0x0040 -Call sub_0807F2D4 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -_0807EB44 0x0006 -_0807EF80 0x0000 -_0807E5F8 0x00000002 -WaitForSomething2 0x00000001 -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0238, 0x0238 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807EF80 0x000a -_0807E9D4 -_0807E5F8 0x00000002 -StopScript -StartScript -_0807EB74 -CheckRoomFlag 0x0000 -JumpIf 0x0016 -CheckEntityInteractType -JumpIfNot 0xffee -StopScript -TextboxNoOverlapFollowPos 0x00021067 -_0807EA94 -Jump 0xffe0 -StopScript -_0807EF80 0x000b -_0807EB44 0x0000 -_0807EF80 0x0000 -WaitForSomething2 0x00000001 -Call sub_08066D4C -_0807E5F8 0x00000002 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0180 + _0807EF80 0x0008 + _0807EF80 0x000b + Call sub_08066D04 + StopScript + WaitForSomething2 0x00000001 + StartScript + Call sub_08066D14 + MoveEntityToPlayer + StopScript + _0807EF80 0x0007 + _0807EB74 + _0807EDD4 0x01f8, 0x02f8 + _0807EB44 0x0004 + _0807EF80 0x0000 + TextboxNoOverlapFollowPos 0x00021011 + _0807EA94 + _0807EDD4 0x01f8, 0x0268 + SetEntityPositionRelative 0x02180248 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + Call sub_0807F3C8 + SoundReq 0x0096 + SetEntityNonPlanarMovement 0x0200 + _0807ECC4 0x0008 + _0807E930 0x0040 + Call sub_0807F2D4 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + _0807EB44 0x0006 + _0807EF80 0x0000 + _0807E5F8 0x00000002 + WaitForSomething2 0x00000001 + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0238, 0x0238 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807EF80 0x000a + _0807E9D4 + _0807E5F8 0x00000002 +script_08015A32: + StopScript + StartScript + _0807EB74 + CheckRoomFlag 0x0000 + JumpIf script_08015A54 + CheckEntityInteractType + JumpIfNot script_08015A32 + StopScript + TextboxNoOverlapFollowPos 0x00021067 + _0807EA94 + Jump script_08015A32 +script_08015A54: + StopScript + _0807EF80 0x000b + _0807EB44 0x0000 + _0807EF80 0x0000 + WaitForSomething2 0x00000001 + Call sub_08066D4C + _0807E5F8 0x00000002 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc index f475a610..d63cabcf 100644 --- a/data/scripts/script_08015A7C.inc +++ b/data/scripts/script_08015A7C.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015A7C -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0001 -_0807EC64 0x0010 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0001 + _0807EC64 0x0010 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc index b69294ae..33a12392 100644 --- a/data/scripts/script_08015AA0.inc +++ b/data/scripts/script_08015AA0.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015AA0 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0001 -_0807EC94 0x0010 -_0807EB44 0x0002 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0001 + _0807EC94 0x0010 + _0807EB44 0x0002 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index 8577a203..9e69d527 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -1,21 +1,21 @@ SCRIPT_START script_08015AC4 -StartScript -_0807EF80 0x0007 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000008 -_0807E908 0x0007 -WaitForSomething2 0x00000008 -_0807E908 0x0006 -SetRoomFlag 0x0000 -_0807EB44 0x0004 -_0807EF80 0x0000 -WaitForSomething2 0x00000008 -Wait 0x003c -SoundReq 0x0072 -Call sub_08046078 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0007 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000008 + _0807E908 0x0007 + WaitForSomething2 0x00000008 + _0807E908 0x0006 + SetRoomFlag 0x0000 + _0807EB44 0x0004 + _0807EF80 0x0000 + WaitForSomething2 0x00000008 + Wait 0x003c + SoundReq 0x0072 + Call sub_08046078 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index cbf55e0a..911275e2 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015B14 -StartScript -_0807E930 0x0018 -SetEntityNonPlanarMovement 0x0300 -StopScript -_0807EDD4 0x0248, 0x0218 -_0807E5F8 0x00000020 -_0807EF80 0x0006 + StartScript + _0807E930 0x0018 + SetEntityNonPlanarMovement 0x0300 + StopScript + _0807EDD4 0x0248, 0x0218 + _0807E5F8 0x00000020 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015B34.inc b/data/scripts/script_08015B34.inc index 43be14a7..b23d4cc9 100644 --- a/data/scripts/script_08015B34.inc +++ b/data/scripts/script_08015B34.inc @@ -1,20 +1,22 @@ SCRIPT_START script_08015B34 -StopScript -StartScript -CheckLocalFlag 0x008b -JumpIf 0x0040 -CallWithArg sub_0807F6B4, 0x00000318 -JumpIfNot 0xffe8 -StopScript -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -TextboxNoOverlapFollowPos 0x00022506 -_0807EA94 -StartPlayerScript script_08015B84 -WaitForSomething2 0x00000004 -Call sub_0807DF50 -_0807E878 -Jump 0xffb8 -_0807EF80 0x0006 +script_08015B34: + StopScript + StartScript + CheckLocalFlag 0x008b + JumpIf script_08015B7E + CallWithArg sub_0807F6B4, 0x00000318 + JumpIfNot script_08015B34 + StopScript + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + TextboxNoOverlapFollowPos 0x00022506 + _0807EA94 + StartPlayerScript script_08015B84 + WaitForSomething2 0x00000004 + Call sub_0807DF50 + _0807E878 + Jump script_08015B34 +script_08015B7E: + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc index 5dd4496b..b33385e4 100644 --- a/data/scripts/script_08015B84.inc +++ b/data/scripts/script_08015B84.inc @@ -1,10 +1,10 @@ SCRIPT_START script_08015B84 -SetEntityNonPlanarMovement 0x0100 -_0807EF80 0x0001 -_0807EC64 0x0010 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000004 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EF80 0x0001 + _0807EC64 0x0010 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000004 + Call sub_080791BC SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015BA8.inc b/data/scripts/script_08015BA8.inc index adfad7ff..e1984478 100644 --- a/data/scripts/script_08015BA8.inc +++ b/data/scripts/script_08015BA8.inc @@ -1,21 +1,21 @@ SCRIPT_START script_08015BA8 -StartScript -SetLocalFlag 0x008e -_0807E864 -MoveEntityToPlayer -CameraTargetEntity -SetEntityNonPlanarMovement 0x0200 -StopScript -Wait 0x000f -_0807E8E4_2 -Call sub_0807F3F8 -Wait 0x001e -_0807EDD4 0x00b8, 0x0258 -Wait 0x001e -SetRoomFlag 0x0065 -Wait 0x0078 -_0807EEB4 -CameraTargetPlayer -_0807E878 -_0807EF80 0x0006 + StartScript + SetLocalFlag 0x008e + _0807E864 + MoveEntityToPlayer + CameraTargetEntity + SetEntityNonPlanarMovement 0x0200 + StopScript + Wait 0x000f + _0807E8E4_2 + Call sub_0807F3F8 + Wait 0x001e + _0807EDD4 0x00b8, 0x0258 + Wait 0x001e + SetRoomFlag 0x0065 + Wait 0x0078 + _0807EEB4 + CameraTargetPlayer + _0807E878 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index 9f40c115..c601091c 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -1,39 +1,40 @@ SCRIPT_START script_08015BE8 -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -CheckPlayerInRegion 0x0160, 0x0020, 0x3040 -JumpIfNot 0xfff6 -_0807E864 -Call sub_0807F9A4 -Call sub_0807DF28 -Call sub_0807FBC4 -StartPlayerScript script_08015C7C -WaitForSomething2 0x00000100 -CameraTargetPlayer -_0807E778 0x0004 -_0807E80C 0x00000000 -WaitFor_2 -SoundReq0x80100000 -Call sub_08053BE8 -StartScript -_0807E864 -Call sub_0807FBC4 -CameraTargetPlayer -_0807E778 0x0100 -DoFade4 -_0807E80C 0x00000000 -StopScript -_0807E778 0x0004 -_0807E800 0x00000000 -WaitFor_2 -SoundReq2 0xffff -_0807EB28 0x131f -_0807EA94 -SetLocalFlag 0x009c -Call sub_0807FBCC -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript +script_08015BF0: + CheckPlayerInRegion 0x0160, 0x0020, 0x3040 + JumpIfNot script_08015BF0 + _0807E864 + Call sub_0807F9A4 + Call sub_0807DF28 + Call sub_0807FBC4 + StartPlayerScript script_08015C7C + WaitForSomething2 0x00000100 + CameraTargetPlayer + _0807E778 0x0004 + _0807E80C 0x00000000 + WaitFor_2 + SoundReq0x80100000 + Call sub_08053BE8 + StartScript + _0807E864 + Call sub_0807FBC4 + CameraTargetPlayer + _0807E778 0x0100 + DoFade4 + _0807E80C 0x00000000 + StopScript + _0807E778 0x0004 + _0807E800 0x00000000 + WaitFor_2 + SoundReq2 0xffff + _0807EB28 0x131f + _0807EA94 + SetLocalFlag 0x009c + Call sub_0807FBCC + Call sub_0807DF50 + _0807E878 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015C7C.inc b/data/scripts/script_08015C7C.inc index 69c8ec77..d2e59189 100644 --- a/data/scripts/script_08015C7C.inc +++ b/data/scripts/script_08015C7C.inc @@ -1,19 +1,19 @@ SCRIPT_START script_08015C7C -StartScript -SetEntityNonPlanarMovement 0x0080 -StopScript -_0807EF80 0x0001 -_0807EDD4 0x0168, 0x0058 -_0807EB44 0x0004 -_0807EF80 0x0000 -CallWithArg sub_0807F238, 0x000003c5 -Call sub_0807F304 -TextboxNoOverlapFollowPos 0x000c1318 -_0807EA94 -CallWithArg sub_0807F238, 0x000003c9 -Call sub_0807F304 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807E5F8 0x00000100 -Call sub_080791BC + StartScript + SetEntityNonPlanarMovement 0x0080 + StopScript + _0807EF80 0x0001 + _0807EDD4 0x0168, 0x0058 + _0807EB44 0x0004 + _0807EF80 0x0000 + CallWithArg sub_0807F238, 0x000003c5 + Call sub_0807F304 + TextboxNoOverlapFollowPos 0x000c1318 + _0807EA94 + CallWithArg sub_0807F238, 0x000003c9 + Call sub_0807F304 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807E5F8 0x00000100 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_08015CD4.inc b/data/scripts/script_08015CD4.inc index 109adf0a..6ac01e07 100644 --- a/data/scripts/script_08015CD4.inc +++ b/data/scripts/script_08015CD4.inc @@ -1,67 +1,67 @@ SCRIPT_START script_08015CD4 -StartScript -_0807F0B4 0x0007 -SetEntityPositionRelative 0x00680088 -CameraTargetEntity -StopScript -_0807E778 0x0004 -DoFade4 -WaitFor_2 -Wait 0x003c -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00e00088 -CameraTargetEntity -Wait 0x003c -SoundReq2 0x000d -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00700088 -CameraTargetEntity -Wait 0x003c -_0807E5F8 0x00000004 -WaitForSomething2 0x00000008 -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00e00088 -CameraTargetEntity -Wait 0x003c -_0807E5F8 0x00000010 -WaitForSomething2 0x00000020 -_0807F0B4 0x0004 -SetEntityPositionRelative 0x00700088 -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 -SoundReq0x80100000 -Wait 0x0078 -_0807E778 0x0004 -DoFade4 -WaitFor_2 -SoundReq2 0x0034 -_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 -SoundReq0x80100000 -SetRoomFlag 0x0000 -_0807EF80 0x0006 + StartScript + _0807F0B4 0x0007 + SetEntityPositionRelative 0x00680088 + CameraTargetEntity + StopScript + _0807E778 0x0004 + DoFade4 + WaitFor_2 + Wait 0x003c + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00e00088 + CameraTargetEntity + Wait 0x003c + SoundReq2 0x000d + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00700088 + CameraTargetEntity + Wait 0x003c + _0807E5F8 0x00000004 + WaitForSomething2 0x00000008 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00e00088 + CameraTargetEntity + Wait 0x003c + _0807E5F8 0x00000010 + WaitForSomething2 0x00000020 + _0807F0B4 0x0004 + SetEntityPositionRelative 0x00700088 + 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 + SoundReq0x80100000 + Wait 0x0078 + _0807E778 0x0004 + DoFade4 + WaitFor_2 + SoundReq2 0x0034 + _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 + SoundReq0x80100000 + SetRoomFlag 0x0000 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015DF0.inc b/data/scripts/script_08015DF0.inc index 71973282..7be58e36 100644 --- a/data/scripts/script_08015DF0.inc +++ b/data/scripts/script_08015DF0.inc @@ -1,26 +1,26 @@ SCRIPT_START script_08015DF0 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000004 -_0807EF80 0x0004 -Wait 0x003c -TextboxNoOverlap 0x1319 -_0807EA94 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -TextboxNoOverlap 0x131a -_0807EA94 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -TextboxNoOverlap 0x131d -_0807EA94 -_0807E5F8 0x00000008 -WaitForSomething2 0x00000004 -TextboxNoOverlap 0x131e -_0807EA94 -_0807E5F8 0x00000008 -WaitForSomething 0x00000400 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000004 + _0807EF80 0x0004 + Wait 0x003c + TextboxNoOverlap 0x1319 + _0807EA94 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + TextboxNoOverlap 0x131a + _0807EA94 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + TextboxNoOverlap 0x131d + _0807EA94 + _0807E5F8 0x00000008 + WaitForSomething2 0x00000004 + TextboxNoOverlap 0x131e + _0807EA94 + _0807E5F8 0x00000008 + WaitForSomething 0x00000400 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015E58.inc b/data/scripts/script_08015E58.inc index fefb8c78..ee744730 100644 --- a/data/scripts/script_08015E58.inc +++ b/data/scripts/script_08015E58.inc @@ -1,40 +1,40 @@ SCRIPT_START script_08015E58 -StartScript -_0807EF80 0x0008 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x001d -StopScript -WaitForSomething2 0x00000010 -Call sub_08066C94 -Wait 0x00e9 -_0807EF80 0x0007 -_0807EF80 0x001e -Wait 0x0014 -_0807EB44 0x0000 -_0807EF80 0x001c -Call sub_0807F2D4 -_0807EF80 0x0000 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -Call sub_08066CA4 -_0807EF80 0x0008 -Wait 0x00bc -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -SetEntityPositionRelative 0x00680088 -Call sub_08066C94 -Wait 0x00e8 -_0807EF80 0x0007 -_0807EF80 0x001e -Wait 0x0014 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0014 -Wait 0x001e -TextboxNoOverlap 0x131b -_0807EA94 -_0807E5F8 0x00000020 -WaitForSomething2 0x00000010 -_0807EF80 0x0006 + StartScript + _0807EF80 0x0008 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x001d + StopScript + WaitForSomething2 0x00000010 + Call sub_08066C94 + Wait 0x00e9 + _0807EF80 0x0007 + _0807EF80 0x001e + Wait 0x0014 + _0807EB44 0x0000 + _0807EF80 0x001c + Call sub_0807F2D4 + _0807EF80 0x0000 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + Call sub_08066CA4 + _0807EF80 0x0008 + Wait 0x00bc + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + SetEntityPositionRelative 0x00680088 + Call sub_08066C94 + Wait 0x00e8 + _0807EF80 0x0007 + _0807EF80 0x001e + Wait 0x0014 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0014 + Wait 0x001e + TextboxNoOverlap 0x131b + _0807EA94 + _0807E5F8 0x00000020 + WaitForSomething2 0x00000010 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015F08.inc b/data/scripts/script_08015F08.inc index 5a61abc2..fe23f8c9 100644 --- a/data/scripts/script_08015F08.inc +++ b/data/scripts/script_08015F08.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08015F08 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething2 0x00000001 -TextboxNoOverlap 0x131c -_0807EA94 -_0807E5F8 0x00000002 -WaitForSomething 0x00000200 -_0807EF80 0x0005 -WaitForSomething 0x00000400 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething2 0x00000001 + TextboxNoOverlap 0x131c + _0807EA94 + _0807E5F8 0x00000002 + WaitForSomething 0x00000200 + _0807EF80 0x0005 + WaitForSomething 0x00000400 + _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 6c5969c1..9f9553a3 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -1,18 +1,18 @@ SCRIPT_START script_08015F3C -StartScript -SetEntityNonPlanarMovement 0x0080 -_0807EB44 0x0000 -_0807E930 0x0000 -StopScript -WaitForSomething 0x00000040 -_0807E930 0x0004 -_0807EC64 0x00c0 -_0807E930 0x0000 -Wait 0x003c -_0807E5F8 0x00000080 -WaitForSomething 0x00000200 -_0807EF80 0x0005 -WaitForSomething 0x00000400 -_0807EF80 0x0006 + StartScript + SetEntityNonPlanarMovement 0x0080 + _0807EB44 0x0000 + _0807E930 0x0000 + StopScript + WaitForSomething 0x00000040 + _0807E930 0x0004 + _0807EC64 0x00c0 + _0807E930 0x0000 + Wait 0x003c + _0807E5F8 0x00000080 + WaitForSomething 0x00000200 + _0807EF80 0x0005 + WaitForSomething 0x00000400 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index d204d00e..f54a96d6 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -1,11 +1,11 @@ SCRIPT_START script_08015F80 -StartScript -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -WaitForSomething 0x00000200 -_0807EF80 0x0005 -WaitForSomething 0x00000400 -_0807EF80 0x0006 + StartScript + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript + WaitForSomething 0x00000200 + _0807EF80 0x0005 + WaitForSomething 0x00000400 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index ce99508c..169a9df3 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -1,9 +1,9 @@ SCRIPT_START script_08015FA4 -StartScript -_0807EF80 0x000a -Call sub_08066E38 -StopScript -WaitForSomething 0x00000400 -_0807EF80 0x0006 + StartScript + _0807EF80 0x000a + Call sub_08066E38 + StopScript + WaitForSomething 0x00000400 + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08015FC0.inc b/data/scripts/script_08015FC0.inc index 0052b733..fd04d0dd 100644 --- a/data/scripts/script_08015FC0.inc +++ b/data/scripts/script_08015FC0.inc @@ -1,18 +1,20 @@ SCRIPT_START script_08015FC0 -StartScript -Call sub_0806DB84 -CheckKinstoneFused 0x0009 -JumpIf 0x005a -_0807EA88 0x0009 -CallWithArg sub_0806DA04, 0x00000007 -_0807EF80 0x000a -StopScript -_0807EA4C -_0807E9F0 -_0807E864 -CheckKinstoneFused 0x0009 -JumpIf 0x000e -Call sub_0807DF50 -_0807E878 -Jump 0xffe8 -_0807F0C8 0xffff, 0x0000 + StartScript + Call sub_0806DB84 + CheckKinstoneFused 0x0009 + JumpIf script_08016028 + _0807EA88 0x0009 + CallWithArg sub_0806DA04, 0x00000007 + _0807EF80 0x000a + StopScript +script_08015FE4: + _0807EA4C + _0807E9F0 + _0807E864 + CheckKinstoneFused 0x0009 + JumpIf script_08015FFE + Call sub_0807DF50 + _0807E878 + Jump script_08015FE4 +script_08015FFE: + _0807F0C8 0xffff, 0x0000 diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index a1552d3b..dc04c09c 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -1,12 +1,13 @@ SCRIPT_START script_08016004 -_0807E5F8 0x00000003 -WaitForSomething2 0x0000000c -_0807F0C8 0x0000, 0x0000 -SoundReq 0x0072 -_0807EB28 0x0b1f -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EF80 0x0006 + _0807E5F8 0x00000003 + WaitForSomething2 0x0000000c + _0807F0C8 0x0000, 0x0000 + SoundReq 0x0072 + _0807EB28 0x0b1f + _0807EA94 + Call sub_0807DF50 + _0807E878 +script_08016028: + _0807EF80 0x0006 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_08016030.inc b/data/scripts/script_08016030.inc index 7d5ebc10..58668a32 100644 --- a/data/scripts/script_08016030.inc +++ b/data/scripts/script_08016030.inc @@ -1,14 +1,14 @@ SCRIPT_START script_08016030 -StartScript -CheckKinstoneFused 0x0009 -JumpIf 0x002a -StopScript -WaitForSomething2 0x00000001 -_0807EF80 0x0010 -Wait 0x003c -SetEntityNonPlanarMovement 0x0020 -_0807ECF4 0x0080 -Wait 0x001e -_0807EF80 0x0010 -_0807E5F8 0x00000008 + StartScript + CheckKinstoneFused 0x0009 + JumpIf script_08016062 + StopScript + WaitForSomething2 0x00000001 + _0807EF80 0x0010 + Wait 0x003c + SetEntityNonPlanarMovement 0x0020 + _0807ECF4 0x0080 + Wait 0x001e + _0807EF80 0x0010 + _0807E5F8 0x00000008 SCRIPT_END diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc index 05bedd70..54f9b00f 100644 --- a/data/scripts/script_08016062.inc +++ b/data/scripts/script_08016062.inc @@ -1,4 +1,5 @@ SCRIPT_START script_08016062 -SetEntityPosition 0xfff0, 0x0000 +script_08016062: + SetEntityPosition 0xfff0, 0x0000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_0801606C.inc b/data/scripts/script_0801606C.inc index 38573c40..f1af3170 100644 --- a/data/scripts/script_0801606C.inc +++ b/data/scripts/script_0801606C.inc @@ -1,14 +1,14 @@ SCRIPT_START script_0801606C -StartScript -CheckKinstoneFused 0x0009 -JumpIf 0x002a -StopScript -WaitForSomething2 0x00000002 -_0807EF80 0x0010 -Wait 0x003c -SetEntityNonPlanarMovement 0x0020 -_0807EC94 0x0080 -Wait 0x001e -_0807EF80 0x0010 -_0807E5F8 0x00000004 + StartScript + CheckKinstoneFused 0x0009 + JumpIf script_0801609E + StopScript + WaitForSomething2 0x00000002 + _0807EF80 0x0010 + Wait 0x003c + SetEntityNonPlanarMovement 0x0020 + _0807EC94 0x0080 + Wait 0x001e + _0807EF80 0x0010 + _0807E5F8 0x00000004 SCRIPT_END diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc index 24376252..3c481171 100644 --- a/data/scripts/script_0801609E.inc +++ b/data/scripts/script_0801609E.inc @@ -1,4 +1,5 @@ SCRIPT_START script_0801609E -SetEntityPosition 0x0010, 0x0000 +script_0801609E: + SetEntityPosition 0x0010, 0x0000 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 1bab6404..45482726 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -1,182 +1,207 @@ SCRIPT_START script_080160A8 -StartScript -_0807E9D4 -_0807E930 0x0008 -StopScript -StartScript -CheckEntityInteractType -JumpIf 0x0028 -TestBit 0x00000008 -JumpIf 0x0010 -TestBit 0x00000010 -JumpIf 0x0006 -Jump 0xffe0 -StopScript -_0807EB74 -WaitForSomething2 0x00000004 -Jump 0xffd2 -_0807E864 -_0807EB74 -StopScript -HasRoomItemForSale -JumpIfNot 0x0030 -TextboxNoOverlapFollow 0x2d07 -_0807EA94 -_0807E3E8 -JumpIfNot 0x003c -BuyItem 0x0000, 0x0000 -JumpIf 0x000c -TextboxNoOverlapFollow 0x2d0b -_0807EA94 -Jump 0x0028 -WaitPlayerAction8 -_0807EB8C -TextboxNoOverlapFollow 0x2d0d -_0807EA94 -Jump 0x001a -CheckKinstoneFused 0x0014 -JumpIfNot 0x000c -TextboxNoOverlapFollow 0x2d09 -_0807EA94 -Jump 0x0008 -TextboxNoOverlapFollow 0x2d01 -_0807EA94 -_0807E878 -_0807EB44 0x0004 -Jump 0xff76 -StartScript -Call sub_080787B4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -GetInventoryValue 0x0025 -_0807EAF0_ssss 0x2d03, 0x2d02, 0x2d02, 0x2d02 -_0807E3E8 -JumpIfNot 0x002a -_0807E48C 0x0020 -JumpIf 0x000a -TextboxNoOverlapFollow 0x2d0c -Jump 0x001a -BuyItem 0x0025, 0x0000 -JumpIf 0x000a -TextboxNoOverlapFollow 0x2d0b -Jump 0x0008 -WaitPlayerAction8 -TextboxNoOverlapFollow 0x2d06 -_0807E878 -Jump 0xffb8 -StartScript -Call sub_080787B4 -StopScript -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -GetInventoryValue 0x0024 -_0807EAF0_ssss 0x2d05, 0x2d04, 0x2d04, 0x2d04 -_0807E3E8 -JumpIfNot 0x002e -_0807E48C 0x0020 -JumpIf 0x000a -TextboxNoOverlapFollow 0x2d0c -Jump 0x001e -BuyItem 0x0024, 0x0000 -JumpIf 0x000a -TextboxNoOverlapFollow 0x2d0b -Jump 0x000c -WaitPlayerAction8 -_0807EA94 -_0807EB8C -TextboxNoOverlap 0x2d06 -_0807E878 -Jump 0xffb4 -StartScript -Call sub_0807F348 -_0807EF80 0x000a -_0807EB44 0x0004 -_0807EF80 0x0000 -StopScript -Call sub_08068C28 -CheckEntityInteractType -JumpIfNot 0xfffc -_0807E864 -Call sub_0807DF28 -_0807EB74 -Call sub_08068CA0 -JumpIf 0x0122 -Call sub_08068CFC -JumpIfNot 0x010c -Call sub_08068DB8 -_0807EA94 -Call sub_08068DD0 -_0807EA94 -_0807E3E8 -JumpIfNot 0x010a -StartPlayerScript script_0801635C -WaitForSomething2 0x00000001 -_0807EB74 -Call sub_08068C8C -JumpIf 0x000e -Call sub_08068DE8 -_0807EA94 -Wait 0x001e -Call sub_08068E00 -_0807EA94 -_0807EF80 0x0001 -Call sub_0807F2D4 -Call sub_08068E90 -Call sub_08068C8C -JumpIf 0x009a -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 -_0807EA94 -Call sub_08068EB4 -Call sub_0807DF50 -_0807E878 -StopScript -StartScript -Call sub_08068EC4 -JumpIf 0x001e -CheckEntityInteractType -JumpIf 0x0006 -Jump 0xffea -StopScript -_0807E864 -Call sub_08068E78 -_0807EA94 -_0807E878 -Jump 0xffd8 -StopScript -_0807E888 -Call sub_0807F594 -Call sub_0807DF28 -_0807E864 -SoundReq0x80100000 -SoundReq 0x00cd -Wait 0x003c -SoundReq2 0x005e -Call sub_08068F3C -Call sub_08068E30 -_0807EA94 -Call sub_08068C6C -WaitPlayerAction8 -_0807EA94 -Jump 0x0016 -Call sub_08068E60 -_0807EA94 -Jump 0x000a -Call sub_08068E48 -_0807EA94 -Call sub_0807DF50 -_0807E878 -_0807EB44 0x0004 -_0807EF80 0x0000 -Jump 0xfea6 -.short 0x0000 + StartScript + _0807E9D4 + _0807E930 0x0008 +script_080160B0: + StopScript + StartScript + CheckEntityInteractType + JumpIf script_080160E0 + TestBit 0x00000008 + JumpIf script_080160D2 + TestBit 0x00000010 + JumpIf script_080160D2 + Jump script_080160B0 +script_080160D2: + StopScript + _0807EB74 + WaitForSomething2 0x00000004 + Jump script_080160B0 +script_080160E0: + _0807E864 + _0807EB74 + StopScript + HasRoomItemForSale + JumpIfNot script_0801611A + TextboxNoOverlapFollow 0x2d07 + _0807EA94 + _0807E3E8 + JumpIfNot script_08016132 + BuyItem 0x0000, 0x0000 + JumpIf script_0801610C + TextboxNoOverlapFollow 0x2d0b + _0807EA94 + Jump script_08016132 +script_0801610C: + WaitPlayerAction8 + _0807EB8C + TextboxNoOverlapFollow 0x2d0d + _0807EA94 + Jump script_08016132 +script_0801611A: + CheckKinstoneFused 0x0014 + JumpIfNot script_0801612C + TextboxNoOverlapFollow 0x2d09 + _0807EA94 + Jump script_08016132 +script_0801612C: + TextboxNoOverlapFollow 0x2d01 + _0807EA94 +script_08016132: + _0807E878 + _0807EB44 0x0004 + Jump script_080160B0 + StartScript + Call sub_080787B4 + StopScript +script_08016146: + CheckEntityInteractType + JumpIfNot script_08016146 + _0807E864 + GetInventoryValue 0x0025 + _0807EAF0_4 0x2d03, 0x2d02, 0x2d02, 0x2d02 + _0807E3E8 + JumpIfNot script_0801618A + _0807E48C 0x0020 + JumpIf script_08016172 + TextboxNoOverlapFollow 0x2d0c + Jump script_0801618A +script_08016172: + BuyItem 0x0025, 0x0000 + JumpIf script_08016184 + TextboxNoOverlapFollow 0x2d0b + Jump script_0801618A +script_08016184: + WaitPlayerAction8 + TextboxNoOverlapFollow 0x2d06 +script_0801618A: + _0807E878 + Jump script_08016146 + StartScript + Call sub_080787B4 + StopScript +script_0801619A: + CheckEntityInteractType + JumpIfNot script_0801619A + _0807E864 + GetInventoryValue 0x0024 + _0807EAF0_4 0x2d05, 0x2d04, 0x2d04, 0x2d04 + _0807E3E8 + JumpIfNot script_080161E2 + _0807E48C 0x0020 + JumpIf script_080161C6 + TextboxNoOverlapFollow 0x2d0c + Jump script_080161E2 +script_080161C6: + BuyItem 0x0024, 0x0000 + JumpIf script_080161D8 + TextboxNoOverlapFollow 0x2d0b + Jump script_080161E2 +script_080161D8: + WaitPlayerAction8 + _0807EA94 + _0807EB8C + TextboxNoOverlap 0x2d06 +script_080161E2: + _0807E878 + Jump script_0801619A + StartScript + Call sub_0807F348 + _0807EF80 0x000a + _0807EB44 0x0004 + _0807EF80 0x0000 + StopScript +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 + _0807EA94 + Call sub_08068DD0 + _0807EA94 + _0807E3E8 + JumpIfNot script_08016346 + StartPlayerScript script_0801635C + WaitForSomething2 0x00000001 + _0807EB74 + Call sub_08068C8C + JumpIf script_08016262 + Call sub_08068DE8 + _0807EA94 + Wait 0x001e +script_08016262: + Call sub_08068E00 + _0807EA94 + _0807EF80 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 + _0807EA94 + Call sub_08068EB4 + Call sub_0807DF50 + _0807E878 +script_080162CC: + StopScript + StartScript + Call sub_08068EC4 + JumpIf script_080162F6 + CheckEntityInteractType + JumpIf script_080162E4 + Jump script_080162CC +script_080162E4: + StopScript + _0807E864 + Call sub_08068E78 + _0807EA94 + _0807E878 + Jump script_080162CC +script_080162F6: + StopScript + _0807E888 + Call sub_0807F594 + Call sub_0807DF28 + _0807E864 + SoundReq0x80100000 + SoundReq 0x00cd + Wait 0x003c + SoundReq2 0x005e + Call sub_08068F3C +script_0801631C: + Call sub_08068E30 + _0807EA94 + Call sub_08068C6C + WaitPlayerAction8 + _0807EA94 + Jump script_08016346 +script_08016332: + Call sub_08068E60 + _0807EA94 + Jump script_08016346 +script_0801633E: + Call sub_08068E48 + _0807EA94 +script_08016346: + Call sub_0807DF50 + _0807E878 + _0807EB44 0x0004 + _0807EF80 0x0000 + Jump script_080161FE + .short 0x0000 diff --git a/data/scripts/script_0801635C.inc b/data/scripts/script_0801635C.inc index ae7cba03..2f32c7fe 100644 --- a/data/scripts/script_0801635C.inc +++ b/data/scripts/script_0801635C.inc @@ -1,8 +1,8 @@ SCRIPT_START script_0801635C -SetEntityNonPlanarMovement 0x0100 -_0807EDD4 0x0078, 0x0050 -_0807EB44 0x0000 -_0807EF80 0x0000 -_0807E5F8 0x00000001 -Call sub_080791BC + SetEntityNonPlanarMovement 0x0100 + _0807EDD4 0x0078, 0x0050 + _0807EB44 0x0000 + _0807EF80 0x0000 + _0807E5F8 0x00000001 + Call sub_080791BC SCRIPT_END diff --git a/data/scripts/script_0801637C.inc b/data/scripts/script_0801637C.inc index 4f3d7a3b..0f1c6a03 100644 --- a/data/scripts/script_0801637C.inc +++ b/data/scripts/script_0801637C.inc @@ -1,5 +1,5 @@ -SCRIPT_START script_0801637C -.short 0xb500 -.short 0xf08c -.short 0xfb1d -.short 0xbd00 +thumb_func_start script_0801637C +script_0801637C: + push {lr} + bl CreateDust + pop {pc} diff --git a/data/scripts/script_08016384.inc b/data/scripts/script_08016384.inc index 91df7477..98cb9a21 100644 --- a/data/scripts/script_08016384.inc +++ b/data/scripts/script_08016384.inc @@ -1,57 +1,58 @@ SCRIPT_START script_08016384 -StartScript -StopScript -Jump 0xfffa -JumpIf 0xfff6 -JumpIfNot 0xfff2 -_0807E078 0xffee, 0xffec -JumpAbsolute script_08016384 -JumpAbsoluteIf script_08016384 -JumpAbsoluteIfNot script_08016384 -_0807E0E0 script_08016384, script_08016384 -Call script_08016384 -CallWithArg script_08016384, 0x12345678 -LoadRoomEntityList script_08016384 -TestBit 0x00000001 -CheckInventory1 0x0001 -CheckInventory2 0x0001 -HasRoomItemForSale -CheckLocalFlag 0x0067 -CheckLocalFlagByOffset 0x0100, 0x006b -CheckGlobalFlag 0x0013 -CheckRoomFlag 0x0000 -CheckPlayerInRegion 0x0000, 0x0000, 0x0000 -CheckPlayerInRegion2 0x0000 -CheckEntityInteractType -_0807E30C -HasRupees 0x00c8 -_0807E3E8 -CheckKinstoneFused 0x0001 -BuyItem 0x006c, 0x0000 -_0807E48C 0x0020 -_0807E4CC 0x00000000 -_0807E4EC 0x00000000 -_0807E514 0x00000000 -CheckPlayerFlags 0x00000080 -_0807E564 -EntityHasHeight -ComparePlayerAction 0x0001 -ComparePlayerAnimationState 0x0004 -_0807E5F8 0x00000001 -_0807E610 0x00000002 -SetLocalFlag 0x0067 -SetLocalFlagByOffset 0x0100, 0x0001 -ClearLocalFlag 0x0067 -SetGlobalFlag 0x0013 -ClearGlobalFlag 0x0013 -SetRoomFlag 0x0000 -ClearRoomFlag 0x0000 -Wait 0x001e -WaitForSomething 0x00000001 -WaitForSomething2 0x00000002 -WaitPlayerAction8 -WaitForPlayerAction0x17 -WaitFor_1 -WaitFor_2 -_0807E778 0x0004 -_0807E788 0x0000ffff +script_08016384: + StartScript + StopScript + Jump script_08016384 + JumpIf script_08016384 + JumpIfNot script_08016384 + JumpSwitch script_08016384, script_08016384 + JumpAbsolute script_08016384 + JumpAbsoluteIf script_08016384 + JumpAbsoluteIfNot script_08016384 + JumpAbsoluteSwitch script_08016384, script_08016384 + Call script_08016384 + CallWithArg script_08016384, 0x12345678 + LoadRoomEntityList script_08016384 + TestBit 0x00000001 + CheckInventory1 0x0001 + CheckInventory2 0x0001 + HasRoomItemForSale + CheckLocalFlag 0x0067 + CheckLocalFlagByOffset 0x0100, 0x006b + CheckGlobalFlag 0x0013 + CheckRoomFlag 0x0000 + CheckPlayerInRegion 0x0000, 0x0000, 0x0000 + CheckPlayerInRegion2 0x0000 + CheckEntityInteractType + _0807E30C + HasRupees 0x00c8 + _0807E3E8 + CheckKinstoneFused 0x0001 + BuyItem 0x006c, 0x0000 + _0807E48C 0x0020 + _0807E4CC 0x00000000 + _0807E4EC 0x00000000 + _0807E514 0x00000000 + CheckPlayerFlags 0x00000080 + _0807E564 + EntityHasHeight + ComparePlayerAction 0x0001 + ComparePlayerAnimationState 0x0004 + _0807E5F8 0x00000001 + _0807E610 0x00000002 + SetLocalFlag 0x0067 + SetLocalFlagByOffset 0x0100, 0x0001 + ClearLocalFlag 0x0067 + SetGlobalFlag 0x0013 + ClearGlobalFlag 0x0013 + SetRoomFlag 0x0000 + ClearRoomFlag 0x0000 + Wait 0x001e + WaitForSomething 0x00000001 + WaitForSomething2 0x00000002 + WaitPlayerAction8 + WaitForPlayerAction0x17 + WaitFor_1 + WaitFor_2 + _0807E778 0x0004 + _0807E788 0x0000ffff diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 6469cbd2..f983b93c 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -1,80 +1,80 @@ SCRIPT_START script_08016482 -_0807E79C -ScriptCommandNop2 0x0080 -DoFade4 -DoFade5 -DoFade6 -DoFade7 -_0807E800 0x00000000 -_0807E80C 0x00000000 -_0807E858_ -_0807E864 -_0807E878 -_0807E888 -SetPlayerAction 0x00005408 -StartPlayerScript script_08016384 -_0807E8D4 0x03a0 -_0807E8E4_0 -_0807E8E4_1 -_0807E8E4_2 -_0807E8E4_3 -_0807E908 0x0004 -_0807E914 0x00000000 -_0807E924 -_0807E930 0x0000 -_0807E944 -_0807E974 0x0600 -_0807E9D4 -_0807E9DC -_0807E9E4 0x0000 -_0807EA88 0x0001 -_0807EA94 -TextboxNoOverlapFollow 0x0601 -TextboxNoOverlap 0x0601 -TextboxNoOverlapFollowPos_s 0x0601 -_0807EAF0_sss 0x0601, 0x0602, 0x0603 -TextboxNoOverlapVar -_0807EB28 0x0602 -_0807EB38 -_0807EB44 0x0000 -_0807EB4C 0x0000, 0x0000 -_0807EB74 -_0807EB8C -SetEntityDirection 0x0000 -SetEntityDirectionWithAnimationState 0x0000 -SetEntityNonPlanarMovement 0x0100 -SetEntity0x20 0x00018000 -SetEntityPositionRelative 0x00000000 -MoveEntityToPlayer -ScriptCommandNop3 -_0807EC1C 0x0010 -_0807EC64 0x0020 -_0807EC94 0x0030 -_0807ECC4 0x0040 -_0807ECF4 0x0050 -_0807ED24 0x0000, 0x0000, 0x0000 -_0807EDD4 0x0000, 0x0000 -_0807EE04 0x0000, 0x0000 -_0807EE30 -_0807EEB4 -_0807EEF4 0xfff0, 0x0014 -_0807EF80 0x0000 -_0807EF90 0x0001 -SoundReq 0x0074 -SoundReq2 0x001d -SoundReq3 0x00000074 -SoundReq0x80100000 -ModRupees 0xff38 -ModHealth 0x0010 -IncreaseMaxHealth 0x0008 -_0807F050 0x0001 -_0807F034 0x0001 -GetInventoryValue 0x0001 -_0807F078 0x0001, 0x0002 -_0807F088 0x0001 -CameraTargetEntity -CameraTargetPlayer -_0807F0B4 0x0007 -_0807F0C8 0x003c, 0x0003 + _0807E79C + ScriptCommandNop2 0x0080 + DoFade4 + DoFade5 + DoFade6 + DoFade7 + _0807E800 0x00000000 + _0807E80C 0x00000000 + _0807E858_0 + _0807E864 + _0807E878 + _0807E888 + SetPlayerAction 0x00005408 + StartPlayerScript script_08016384 + _0807E8D4 0x03a0 + _0807E8E4_0 + _0807E8E4_1 + _0807E8E4_2 + _0807E8E4_3 + _0807E908 0x0004 + _0807E914 0x00000000 + _0807E924 + _0807E930 0x0000 + _0807E944 + _0807E974 0x0600 + _0807E9D4 + _0807E9DC + _0807E9E4 0x0000 + _0807EA88 0x0001 + _0807EA94 + TextboxNoOverlapFollow 0x0601 + TextboxNoOverlap 0x0601 + TextboxNoOverlapFollowPos_1 0x0601 + _0807EAF0_3 0x0601, 0x0602, 0x0603 + TextboxNoOverlapVar + _0807EB28 0x0602 + _0807EB38 + _0807EB44 0x0000 + _0807EB4C 0x0000, 0x0000 + _0807EB74 + _0807EB8C + SetEntityDirection 0x0000 + SetEntityDirectionWithAnimationState 0x0000 + SetEntityNonPlanarMovement 0x0100 + SetEntity0x20 0x00018000 + SetEntityPositionRelative 0x00000000 + MoveEntityToPlayer + ScriptCommandNop3 + _0807EC1C 0x0010 + _0807EC64 0x0020 + _0807EC94 0x0030 + _0807ECC4 0x0040 + _0807ECF4 0x0050 + _0807ED24 0x0000, 0x0000, 0x0000 + _0807EDD4 0x0000, 0x0000 + _0807EE04 0x0000, 0x0000 + _0807EE30 + _0807EEB4 + _0807EEF4 0xfff0, 0x0014 + _0807EF80 0x0000 + _0807EF90 0x0001 + SoundReq 0x0074 + SoundReq2 0x001d + SoundReq3 0x00000074 + SoundReq0x80100000 + ModRupees 0xff38 + ModHealth 0x0010 + IncreaseMaxHealth 0x0008 + _0807F050 0x0001 + _0807F034 0x0001 + GetInventoryValue 0x0001 + _0807F078 0x0001, 0x0002 + _0807F088 0x0001 + CameraTargetEntity + CameraTargetPlayer + _0807F0B4 0x0007 + _0807F0C8 0x003c, 0x0003 SCRIPT_END -.short 0x0000 + .short 0x0000 diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index 510a3c75..888efad8 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -1,16 +1,18 @@ SCRIPT_START script_080165A4 -StartScript -_0807EF80 0x000a -_0807EB44 0x0004 -_0807E9D4 -StopScript -_0807E974 0x0601 -Jump 0xfffa -.short 0x0000 -Wait 0x001e -CheckPlayerInRegion2 0x2020 -JumpIfNot 0xfff6 -_0807EF80 0x0003 -Call script_0801637C+1 -Jump 0xffe8 -.short 0x0000 + StartScript + _0807EF80 0x000a + _0807EB44 0x0004 + _0807E9D4 + StopScript +script_080165B2: + _0807E974 0x0601 + Jump script_080165B2 + .short 0x0000 +script_080165BC: + Wait 0x001e + CheckPlayerInRegion2 0x2020 + JumpIfNot script_080165BC + _0807EF80 0x0003 + Call script_0801637C+1 + Jump script_080165BC + .short 0x0000 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index 6e52616b..c774fcfa 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -1,239 +1,253 @@ SCRIPT_START script_080165D8 -Wait 0x001e -CheckPlayerInRegion2 0x2020 -JumpAbsoluteIfNot script_080165D8 -_0807EF80 0x0003 -Call script_0801637C+1 -JumpAbsolute script_080165D8 -.short 0x0000 -StartScript -_0807E9D4 -StopScript -_0807E30C -JumpIfNot 0xfffc -TextboxNoOverlapFollow 0x0601 -Jump 0xfff4 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -TextboxNoOverlapFollow 0x0602 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -_0807EB28 0x0603 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffee -.short 0x0000 -SetEntityNonPlanarMovement 0x0100 -_0807ECF4 0x0030 -Wait 0x0008 -_0807ECC4 0x0030 -Wait 0x0008 -_0807EC94 0x0030 -Wait 0x0008 -_0807EC64 0x0030 -Wait 0x0008 -Jump 0xffde -_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 0xffb6 -SetEntityNonPlanarMovement 0x0100 -_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 0xffc2 -SetEntityNonPlanarMovement 0x0100 -_0807EC94 0x0030 -_0807E5F8 0x00000002 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000001 -_0807E610 0x00000001 -_0807EF80 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 -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000006 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Wait 0x003c -Jump 0xff6a -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EC94 0x0030 -_0807E5F8 0x00000004 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 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 -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000002 -_0807E610 0x00000002 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Jump 0xff5a -SetEntityNonPlanarMovement 0x0100 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EC94 0x0030 -Wait 0x000f -_0807EF80 0x0000 -_0807EB44 0x0004 -Wait 0x001e -_0807E5F8 0x00000003 -_0807EF80 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 -_0807EF80 0x0000 -_0807EB44 0x0004 -WaitForSomething 0x00000004 -_0807E610 0x00000004 -_0807EF80 0x0003 -Wait 0x0002 -_0807EB44 0x0006 -Wait 0x0002 -_0807EB44 0x0000 -Wait 0x0002 -_0807EB44 0x0002 -Wait 0x0002 -_0807EB44 0x0004 -Jump 0xff6a -StartScript -_0807E9D4 -StopScript -_0807E944 -_0807E864 -Wait 0x000f -_0807E878 -Jump 0xfff4 -StartScript -Call sub_08064EA4 -_0807EB44 0x0004 -_0807EF80 0x0000 -_0807EF80 0x000a -StopScript -_0807E30C -JumpIfNot 0xfffc -_0807E864 -_0807EB74 -Call sub_08064F28 -_0807EA94 -JumpIfNot 0x0008 -_0807F034 0x003d -WaitPlayerAction8 -_0807E878 -SetGlobalFlag 0x005c -Jump 0xffdc -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -StopScript -_0807E944 -_0807E864 -Wait 0x0018 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 -StartScript -_0807E9D4 -_0807EB44 0x0000 -_0807EF80 0x000a -_0807E930 0x0000 -StopScript -_0807E944 -_0807E864 -Wait 0x0018 -TextboxNoOverlapFollow 0x0a01 -_0807EA94 -Wait 0x000f -_0807E878 -Jump 0xffea -.short 0x0000 + Wait 0x001e + CheckPlayerInRegion2 0x2020 + JumpAbsoluteIfNot script_080165D8 + _0807EF80 0x0003 + Call script_0801637C+1 + JumpAbsolute script_080165D8 + .short 0x0000 + StartScript + _0807E9D4 + StopScript +script_080165FE: + _0807E30C + JumpIfNot script_080165FE + TextboxNoOverlapFollow 0x0601 + Jump script_080165FE + StartScript + _0807E9D4 + StopScript +script_08016612: + _0807E944 + _0807E864 + TextboxNoOverlapFollow 0x0602 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_08016612 + .short 0x0000 + StartScript + _0807E9D4 + StopScript +script_0801662E: + _0807E944 + _0807E864 + _0807EB28 0x0603 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0801662E + .short 0x0000 + SetEntityNonPlanarMovement 0x0100 +script_08016648: + _0807ECF4 0x0030 + Wait 0x0008 + _0807ECC4 0x0030 + Wait 0x0008 + _0807EC94 0x0030 + Wait 0x0008 + _0807EC64 0x0030 + Wait 0x0008 + Jump script_08016648 +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 + SetEntityNonPlanarMovement 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 + SetEntityNonPlanarMovement 0x0100 +script_08016700: + _0807EC94 0x0030 + _0807E5F8 0x00000002 + Wait 0x000f + _0807EF80 0x0000 + _0807EB44 0x0004 + WaitForSomething 0x00000001 + _0807E610 0x00000001 + _0807EF80 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 + _0807EF80 0x0000 + _0807EB44 0x0004 + Wait 0x001e + _0807E5F8 0x00000006 + _0807EF80 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Wait 0x003c + Jump script_08016700 + SetEntityNonPlanarMovement 0x0100 +script_0801679C: + WaitForSomething 0x00000002 + _0807E610 0x00000002 + _0807EC94 0x0030 + _0807E5F8 0x00000004 + Wait 0x000f + _0807EF80 0x0000 + _0807EB44 0x0004 + WaitForSomething 0x00000002 + _0807E610 0x00000002 + _0807EF80 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 + _0807EF80 0x0000 + _0807EB44 0x0004 + WaitForSomething 0x00000002 + _0807E610 0x00000002 + _0807EF80 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Jump script_0801679C + SetEntityNonPlanarMovement 0x0100 +script_08016848: + WaitForSomething 0x00000004 + _0807E610 0x00000004 + _0807EC94 0x0030 + Wait 0x000f + _0807EF80 0x0000 + _0807EB44 0x0004 + Wait 0x001e + _0807E5F8 0x00000003 + _0807EF80 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 + _0807EF80 0x0000 + _0807EB44 0x0004 + WaitForSomething 0x00000004 + _0807E610 0x00000004 + _0807EF80 0x0003 + Wait 0x0002 + _0807EB44 0x0006 + Wait 0x0002 + _0807EB44 0x0000 + Wait 0x0002 + _0807EB44 0x0002 + Wait 0x0002 + _0807EB44 0x0004 + Jump script_08016848 + StartScript + _0807E9D4 + StopScript +script_080168E6: + _0807E944 + _0807E864 + Wait 0x000f + _0807E878 + Jump script_080168E6 + StartScript + Call sub_08064EA4 + _0807EB44 0x0004 + _0807EF80 0x0000 + _0807EF80 0x000a + StopScript +script_0801690A: + _0807E30C + JumpIfNot script_0801690A + _0807E864 + _0807EB74 + Call sub_08064F28 + _0807EA94 + JumpIfNot script_08016926 + _0807F034 0x003d + WaitPlayerAction8 +script_08016926: + _0807E878 + SetGlobalFlag 0x005c + Jump script_0801690A + StartScript + _0807E9D4 + _0807EB44 0x0000 + _0807EF80 0x000a + StopScript +script_0801693E: + _0807E944 + _0807E864 + Wait 0x0018 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0801693E + .short 0x0000 + StartScript + _0807E9D4 + _0807EB44 0x0000 + _0807EF80 0x000a + _0807E930 0x0000 + StopScript +script_0801696A: + _0807E944 + _0807E864 + Wait 0x0018 + TextboxNoOverlapFollow 0x0a01 + _0807EA94 + Wait 0x000f + _0807E878 + Jump script_0801696A + .short 0x0000 diff --git a/src/script.c b/src/script.c index 9ee2d8ca..251359b7 100644 --- a/src/script.c +++ b/src/script.c @@ -18,11 +18,11 @@ void ScriptCommand_StopScript(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_Jump(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_JumpIf(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_JumpAbsolute(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_JumpAbsoluteIf(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* context); -void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context); +void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_Call(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_CallWithArg(Entity* entity, ScriptExecutionContext* context); void ScriptCommand_LoadRoomEntityList(Entity* entity, ScriptExecutionContext* context); @@ -163,11 +163,11 @@ const ScriptCommand gScriptCommands[] = { ScriptCommandNop, ScriptCommand_Jump, ScriptCommand_JumpIf, ScriptCommand_JumpIfNot, - ScriptCommand_0807E078, + ScriptCommand_JumpSwitch, ScriptCommand_JumpAbsolute, ScriptCommand_JumpAbsoluteIf, ScriptCommand_JumpAbsoluteIfNot, - ScriptCommand_0807E0E0, + ScriptCommand_JumpAbsoluteSwitch, ScriptCommand_Call, ScriptCommand_CallWithArg, ScriptCommand_LoadRoomEntityList, @@ -657,7 +657,7 @@ void ScriptCommand_JumpIfNot(Entity* entity, ScriptExecutionContext* context) { } } -void ScriptCommand_0807E078(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_JumpSwitch(Entity* entity, ScriptExecutionContext* context) { if (gActiveScriptInfo.commandSize > context->unk_04) { context->scriptInstructionPointer += context->unk_04; ScriptCommand_Jump(entity, context); @@ -682,7 +682,7 @@ void ScriptCommand_JumpAbsoluteIfNot(Entity* entity, ScriptExecutionContext* con } } -void ScriptCommand_0807E0E0(Entity* entity, ScriptExecutionContext* context) { +void ScriptCommand_JumpAbsoluteSwitch(Entity* entity, ScriptExecutionContext* context) { if (gActiveScriptInfo.commandSize > (context->unk_04 << 1) + 1) { context->scriptInstructionPointer += context->unk_04 << 1; ScriptCommand_JumpAbsolute(entity, context); diff --git a/tools/script_disassembler/.gitignore b/tools/script_disassembler/.gitignore new file mode 100644 index 00000000..9289883f --- /dev/null +++ b/tools/script_disassembler/.gitignore @@ -0,0 +1 @@ +labels.txt \ No newline at end of file diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py new file mode 100644 index 00000000..f12ce493 --- /dev/null +++ b/tools/script_disassembler/definitions.py @@ -0,0 +1,326 @@ +from utils import barray_to_u16_hex, barray_to_u32_hex, barray_to_s16 +import struct + +commands = [ + {'fun': 'ScriptCommandNop', 'params': ''}, + {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'}, + {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'}, + {'fun': 'ScriptCommand_Jump', 'params': 'j', 'name': 'jump by offset'}, + {'fun': 'ScriptCommand_JumpIf', 'params': 'j', 'name': 'jump if'}, + {'fun': 'ScriptCommand_JumpIfNot', 'params': 'j', 'name': 'jump if not'}, + {'fun': 'ScriptCommand_JumpSwitch', 'params': ['jj', 'jjj', 'jjjj', 'jjjjjjj', 'jjjjjjjjj']}, + {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x','name': 'abs jump' }, + {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'}, + {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'}, + {'fun': 'ScriptCommand_JumpAbsoluteSwitch', 'params': 'xx'}, + {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call}, + {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']}, + {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'}, + {'fun': 'ScriptCommand_TestBit', 'params': 'w'}, + {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'}, + {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'}, + {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''}, + {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'}, + {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'}, + {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'}, + {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'}, + {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''}, + {'fun': 'ScriptCommand_0807E30C', 'params': ''}, + {'fun': 'ScriptCommand_HasRupees', 'params': 's'}, + {'fun': 'ScriptCommand_0807E3BC', 'params': 's'}, + {'fun': 'ScriptCommand_0807E3E8', 'params': ''}, + {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'}, + {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807E48C', 'params': 's'}, + {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E514', 'params': 'w'}, + {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'}, + {'fun': 'ScriptCommand_0807E564', 'params': ''}, + {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''}, + {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'}, + {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'}, + {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8}, + {'fun': 'ScriptCommand_0807E610', 'params': 'w'}, + {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'}, + {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'}, + {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'}, + {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'}, + {'fun': 'ScriptCommand_Wait', 'params': 's'}, + {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'}, + {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'}, + {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''}, + {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''}, + {'fun': 'ScriptCommand_WaitFor_1', 'params': ''}, + {'fun': 'ScriptCommand_WaitFor_2', 'params': ''}, + {'fun': 'ScriptCommand_0807E778', 'params': 's'}, + {'fun': 'ScriptCommand_0807E788', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E79C', 'params': ''}, + {'fun': 'ScriptCommandNop2', 'params': 's'}, + {'fun': 'ScriptCommand_DoFade4', 'params': ''}, + {'fun': 'ScriptCommand_DoFade5', 'params': ''}, + {'fun': 'ScriptCommand_DoFade6', 'params': ''}, + {'fun': 'ScriptCommand_DoFade7', 'params': ''}, + {'fun': 'ScriptCommand_0807E800', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E80C', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']}, + {'fun': 'ScriptCommand_0807E864', 'params': ''}, + {'fun': 'ScriptCommand_0807E878', 'params': ''}, + {'fun': 'ScriptCommand_0807E888', 'params': ''}, + {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'}, + {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'}, + {'fun': 'ScriptCommand_0807E8D4', 'params': 's'}, + {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate + {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate + {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate + {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate + {'fun': 'ScriptCommand_0807E908', 'params': 's'}, + {'fun': 'ScriptCommand_0807E914', 'params': 'w'}, + {'fun': 'ScriptCommand_0807E924', 'params': ''}, + {'fun': 'ScriptCommand_0807E930', 'params': 's'}, + {'fun': 'ScriptCommand_0807E944', 'params': ''}, + {'fun': 'ScriptCommand_0807E974', 'params': 's'}, + {'fun': 'ScriptCommand_0807E9D4', 'params': ''}, + {'fun': 'ScriptCommand_0807E9DC', 'params': ''}, + {'fun': 'ScriptCommand_0807E9E4', 'params': 's'}, + {'fun': 'ScriptCommand_0807E9F0', 'params': ''}, + {'fun': 'ScriptCommand_0807EA4C', 'params': ''}, + {'fun': 'ScriptCommand_0807EA88', 'params': 's'}, + {'fun': 'ScriptCommand_0807EA94', 'params': ''}, + {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'}, + {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'}, + {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss? + {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']}, + {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''}, + {'fun': 'ScriptCommand_0807EB28', 'params': 's'}, + {'fun': 'ScriptCommand_0807EB38', 'params': ''}, + {'fun': 'ScriptCommand_0807EB44', 'params': 's'}, + {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807EB74', 'params': ''}, + {'fun': 'ScriptCommand_0807EB8C', 'params': ''}, + {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'}, + {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'}, + {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'}, + {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'}, + {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'}, + {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'}, + {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''}, + {'fun': 'ScriptCommandNop3', 'params': ''}, + {'fun': 'ScriptCommand_0807EC1C', 'params': 's'}, + {'fun': 'ScriptCommand_0807EC64', 'params': 's'}, + {'fun': 'ScriptCommand_0807EC94', 'params': 's'}, + {'fun': 'ScriptCommand_0807ECC4', 'params': 's'}, + {'fun': 'ScriptCommand_0807ECF4', 'params': 's'}, + {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'}, + {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807EE30', 'params': ''}, + {'fun': 'ScriptCommand_0807EEB4', 'params': ''}, + {'fun': 'ScriptCommand_0807EEF4', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807EF3C', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807EF80', 'params': 's'}, + {'fun': 'ScriptCommand_0807EF90', 'params': 's'}, + {'fun': 'ScriptCommand_SoundReq', 'params': 's'}, + {'fun': 'ScriptCommand_SoundReq2', 'params': 's'}, + {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'}, + {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''}, + {'fun': 'ScriptCommand_ModRupees', 'params': 's'}, + {'fun': 'ScriptCommand_ModHealth', 'params': 's'}, + {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'}, + {'fun': 'ScriptCommand_0807F034', 'params': 's'}, + {'fun': 'ScriptCommand_0807F050', 'params': 's'}, + {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'}, + {'fun': 'ScriptCommand_0807F078', 'params': 'ss'}, + {'fun': 'ScriptCommand_0807F088', 'params': 's'}, + {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''}, + {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''}, + {'fun': 'ScriptCommand_0807F0B4', 'params': 's'}, + {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'} +] + + + + +# Functions that have already been renamed +POINTER_MAP = { + 'sub_08095458': 'nullsub_527', + 'sub_0805EBCC': 'DeleteAllEnemies', + 'sub_0806C23C': 'Simon_CreateChest', + 'sub_0801637C': 'script_0801637C+1', + 'sub_08016383': 'script_08016384', + 'sub_0806C598': 'FUN_0806c598', + 'sub_080A2138': 'Windcrest_Unlock', + 'sub_080A29BC': 'CreateDust' +} +# tries to directly reference the function this is pointing to +def get_pointer(barray): + integers = struct.unpack('I', barray) + pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper() + if pointer in POINTER_MAP: + return POINTER_MAP[pointer] + return pointer + +# Data pointers that actually point to a script location +DATA_MAP = { + 'gUnk_08016384': 'script_08016384' +} +def get_data_pointer(barray): + integers = struct.unpack('I', barray) + pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper() + if pointer in DATA_MAP: + return DATA_MAP[pointer] + return pointer + +def get_script_pointer(barray): + integers = struct.unpack('I', barray) + return 'script_' + (struct.pack('>I', integers[0]).hex()).upper() + + +def get_script_label(u32): + return hex(u32).upper().replace('0X', 'script_0') + + +used_labels = set() +def use_script_label(u32): + global used_labels + used_labels.add(u32) + label = get_script_label(u32) + return label + + + + +# definitions for parameter types +parameters = { + '': { + 'length':0, + 'param': '', + 'expr': '', + 'read': lambda ctx: '' + }, + 's': { + 'length': 1, + 'param': 's', + 'expr': ' .short \s', + 'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0] + }, + 'ss': { + 'length': 2, + 'param': 'a,b', + 'expr': ' .short \\a\n .short \\b', + 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])) + }, + 'sss': { + 'length': 3, + 'param': 'a,b,c', + 'expr': ' .short \\a\n .short \\b\n .short \\c', + 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8])) + }, + 'ssss': { + 'length': 4, + 'param': 'a,b,c,d', + 'expr': ' .short \\a\n .short \\b\n .short \\c\n .short \\d', + 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10])) + }, + + 'w': { + 'length': 2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0] + }, + 'ww': { + 'length': 4, + 'param': 'a,b', + 'expr': ' .word \\a\n .word \\b', + 'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10])) + }, + + + 'j': { # Relative jump target + 'length': 1, + 'param': 's', + 'expr': '1: .short \s - 1b', + 'read': lambda ctx: use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4])) + # hex(ctx.script_addr + barray_to_s16(ctx.data[ctx.ptr+2:ctx.ptr+4])).upper().replace('0X', 'script_0') + }, + 'jj': { + 'length': 2, + 'param': 'a,b', + 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2', + 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,2)]) + }, + 'jjj': { + 'length': 3, + 'param': 'a,b,c', + 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4', + 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,3)]) + }, + 'jjjj': { + 'length': 4, + 'param': 'a,b,c,d', + 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6', + 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,4)]) + }, + 'jjjjjjj': { + 'length': 7, + 'param': 'a,b,c,d,e,f,g', + 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6\n .short \\e - 1b - 8\n .short \\f - 1b - 10\n .short \\g - 1b - 12', + 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,7)]) + }, + 'jjjjjjjjj': { + 'length': 9, + 'param': 'a,b,c,d,e,f,g,h,i', + 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6\n .short \\e - 1b - 8\n .short \\f - 1b - 10\n .short \\g - 1b - 12\n .short \\h - 1b - 14\n .short \\i - 1b - 16', + 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr+ctx.ptr+ 2 +barray_to_s16(ctx.data[ctx.ptr+x*2+2:ctx.ptr+x*2+4]) + x*2) for x in range(0,9)]) + }, + 'p': { + 'length': 2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + }, + + 'pw': { + 'length': 4, + 'param': 'a,b', + 'expr': ' .word \\a\n .word \\b', + 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0] + }, + 'd': { # Data pointer + 'length': 2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + }, + 'x': { # Script pointer + 'length': 2, + 'param': 'w', + 'expr': ' .word \w', + 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + }, + 'xx': { + 'length': 4, + 'param': 'a, b', + 'expr': ' .word \\a\n .word \\b', + 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10]) + }, + # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations + # 'v': { + # 'length': -1, + # 'param': '', + # 'expr': '', + # 'read': lambda ctx: '' + # }, + # 'pv': { + # 'length': -2, + # 'param': 'w', + # 'expr': ' .word \w', + # 'read': lambda ctx: '' + # }, +} \ No newline at end of file diff --git a/tools/script_disassembler/incbin_parser.py b/tools/script_disassembler/incbin_parser.py index 0416892e..70fe3da9 100644 --- a/tools/script_disassembler/incbin_parser.py +++ b/tools/script_disassembler/incbin_parser.py @@ -14,8 +14,8 @@ SCRIPTS_END=0x08016984 # Currently done by splitting the script at that point LABEL_BREAKS=[0x0800A088, 0x0800ACE0, 0x0800AD54, 0x0800B41C, 0x0800B7C4, 0x0800C8C8, 0x0800D190, 0x800D3EC, 0x0800E9F4, 0x0800FD80, 0x08012AC8, 0x08012F0C, 0x080130E4, 0x08013B70, 0x080142B0, 0x080147DC, 0x08014A80, 0x08014B10,0x0801635C, 0x08016384, 0x080165D8] -# Generate a version of the script that is annotated with the byte offset to the beginning of the script -GENERATE_REF=False +# Whether to output a label for every line +PRINT_ALL_LABELS=False def read_baserom(): # read baserom data @@ -25,9 +25,8 @@ def read_baserom(): def get_label(addr): return hex(addr).upper().replace('0X', 'script_0') -def main(): - baserom_data = read_baserom() +def disassemble_scripts(baserom_data): script_start = SCRIPTS_START-ROM_OFFSET scripts = ''' .include "asm/macros.inc" @@ -40,11 +39,11 @@ def main(): .text ''' + label_break = 0 while script_start < SCRIPTS_END-ROM_OFFSET: - if len(LABEL_BREAKS) > 0 and script_start+ROM_OFFSET >=LABEL_BREAKS[0]: - print(f'{hex(script_start+ROM_OFFSET)} > {LABEL_BREAKS[0]}') - LABEL_BREAKS.pop(0) + if label_break < len(LABEL_BREAKS) and script_start+ROM_OFFSET >=LABEL_BREAKS[label_break]: + label_break += 1 label = get_label(script_start+ROM_OFFSET) print(f"Disassembling \033[1;34m{label}\033[0m ({script_start} / { SCRIPTS_END-ROM_OFFSET} bytes converted)...") @@ -54,41 +53,62 @@ def main(): if script_end > SCRIPTS_END-ROM_OFFSET: script_end = SCRIPTS_END-ROM_OFFSET - if len(LABEL_BREAKS) > 0 and script_end+ROM_OFFSET > LABEL_BREAKS[0]: - print(f'break at {hex(LABEL_BREAKS[0])} instead of {hex(script_end)}') - script_end = LABEL_BREAKS[0]-ROM_OFFSET + if label_break < len(LABEL_BREAKS) and script_end+ROM_OFFSET > LABEL_BREAKS[label_break]: + #print(f'break at {hex(LABEL_BREAKS[label_break])} instead of {hex(script_end)}') + script_end = LABEL_BREAKS[label_break]-ROM_OFFSET # read data from rom data = baserom_data[script_start:script_end] + scripts += f' .include "data/scripts/{label}.inc"\n' stdout = sys.stdout - with open(f'{TMC_FOLDER}/data/scripts/{label}.ref' if GENERATE_REF else f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out: + with open(f'{TMC_FOLDER}/data/scripts/{label}.inc','w') as out: sys.stdout = out + + if script_start == 0x1637C: # This function is actually assembly + print ('''thumb_func_start script_0801637C +script_0801637C: + push {lr} + bl CreateDust + pop {pc}''') + sys.stdout = stdout + script_start = script_end + continue + print(f'SCRIPT_START {label}') - if GENERATE_REF: - res = disassemble_script(data, True) - else: - res = disassemble_script(data) + res = disassemble_script(data, script_start+ROM_OFFSET, PRINT_ALL_LABELS) if res != 0: # Script ended in the middle, need to create a new file script_end = script_start + res sys.stdout = stdout script_start = script_end + return scripts + +def main(): + baserom_data = read_baserom() + + # Do two passes, in the first pass not all labels that are jumped to are known, so those labels are recorded in the first pass + # This is not necessary when all labels are printed + if not PRINT_ALL_LABELS: + print('Collecting labels...') + disassemble_scripts(baserom_data) + print('Writing scripts with labels...') + scripts = disassemble_scripts(baserom_data) + + print('Writing scripts.s file...') + with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out: + out.write(scripts) + print('Generating asm macros...') + stdout = sys.stdout + with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out: + sys.stdout = out + generate_macros() + sys.stdout = stdout - if not GENERATE_REF: - print('Writing scripts.s file...') - with open(f'{TMC_FOLDER}/data/scripts.s', 'w') as out: - out.write(scripts) - print('Generating asm macros...') - stdout = sys.stdout - with open(f'{TMC_FOLDER}/asm/macros/scripts.inc', 'w') as out: - sys.stdout = out - generate_macros() - sys.stdout = stdout print('\033[1;92mDone\033[0m\n') if __name__ == '__main__': diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index 2cf3524d..fe35bcd1 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -1,5 +1,8 @@ from dataclasses import dataclass import struct +from utils import barray_to_u16_hex, barray_to_u32_hex, u16_to_hex, u32_to_hex +from definitions import get_pointer, get_data_pointer, get_script_pointer, commands, parameters, get_script_label, used_labels + # Disassembler for tmc scripts # Input 'macros' to generate the macros for the script commands @@ -11,302 +14,8 @@ import struct class Context: ptr: int data: bytes + script_addr: int -def u16_to_hex(value): - return '0x' + (struct.pack('>H', value).hex()) - -def barray_to_u16_hex(barray): - count = len(barray)//2 - integers = struct.unpack('H'*count, barray) - return [u16_to_hex(x) for x in integers] - -def u32_to_hex(value): - return '0x' + (struct.pack('>I', value).hex()) - -def barray_to_u32_hex(barray): - count = len(barray)//4 - integers = struct.unpack('I'*count, barray) - return [u32_to_hex(x) for x in integers] - - -# Functions that have already been renamed -POINTER_MAP = { - 'sub_08095458': 'nullsub_527', - 'sub_0805EBCC': 'DeleteAllEnemies', - 'sub_0806C23C': 'Simon_CreateChest', - 'sub_0801637C': 'script_0801637C+1', - 'sub_08016383': 'script_08016384', - 'sub_0806C598': 'FUN_0806c598', - 'sub_080A2138': 'Windcrest_Unlock', - 'sub_080A29BC': 'CreateDust' -} -# tries to directly reference the function this is pointing to -def get_pointer(barray): - integers = struct.unpack('I', barray) - pointer = 'sub_' + (struct.pack('>I', integers[0]-1).hex()).upper() - if pointer in POINTER_MAP: - return POINTER_MAP[pointer] - return pointer - -# Data pointers that actually point to a script location -DATA_MAP = { - 'gUnk_08016384': 'script_08016384' -} -def get_data_pointer(barray): - integers = struct.unpack('I', barray) - pointer = 'gUnk_' + (struct.pack('>I', integers[0]).hex()).upper() - if pointer in DATA_MAP: - return DATA_MAP[pointer] - return pointer - -def get_script_pointer(barray): - integers = struct.unpack('I', barray) - return 'script_' + (struct.pack('>I', integers[0]).hex()).upper() - - -commands = [ - {'fun': 'ScriptCommandNop', 'params': ''}, - {'fun': 'ScriptCommand_StartScript', 'params': '', 'name': 'start executing scripts'}, - {'fun': 'ScriptCommand_StopScript', 'params': '', 'name': 'stop executing scripts'}, - {'fun': 'ScriptCommand_Jump', 'params': 's', 'name': 'jump by offset'}, - {'fun': 'ScriptCommand_JumpIf', 'params': 's', 'name': 'jump if'}, - {'fun': 'ScriptCommand_JumpIfNot', 'params': 's', 'name': 'jump if not'}, - {'fun': 'ScriptCommand_0807E078', 'params': ['ss', 'sss', 'ssss', 'sssssss', 'sssssssss']}, - {'fun': 'ScriptCommand_JumpAbsolute', 'params': 'x','name': 'abs jump' }, - {'fun': 'ScriptCommand_JumpAbsoluteIf', 'params': 'x', 'name': 'abs jump if'}, - {'fun': 'ScriptCommand_JumpAbsoluteIfNot', 'params': 'x', 'name': 'abs jump if not'}, - {'fun': 'ScriptCommand_0807E0E0', 'params': 'xx'}, - {'fun': 'ScriptCommand_Call', 'params':'p', 'name': 'Execute function via pointer'},# 'exec': ScriptCommand_Call}, - {'fun': 'ScriptCommand_CallWithArg', 'params': ['pw', 'p']}, - {'fun': 'ScriptCommand_LoadRoomEntityList', 'params': 'd'}, - {'fun': 'ScriptCommand_TestBit', 'params': 'w'}, - {'fun': 'ScriptCommand_CheckInventory1', 'params': 's'}, - {'fun': 'ScriptCommand_CheckInventory2', 'params': 's'}, - {'fun': 'ScriptCommand_HasRoomItemForSale', 'params': ''}, - {'fun': 'ScriptCommand_CheckLocalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_CheckLocalFlagByOffset', 'params': 'ss'}, - {'fun': 'ScriptCommand_CheckGlobalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_CheckRoomFlag', 'params': 's'}, - {'fun': 'ScriptCommand_CheckPlayerInRegion', 'params': 'sss'}, - {'fun': 'ScriptCommand_CheckPlayerInRegion2', 'params': 's'}, - {'fun': 'ScriptCommand_CheckEntityInteractType', 'params': ''}, - {'fun': 'ScriptCommand_0807E30C', 'params': ''}, - {'fun': 'ScriptCommand_HasRupees', 'params': 's'}, - {'fun': 'ScriptCommand_0807E3BC', 'params': 's'}, - {'fun': 'ScriptCommand_0807E3E8', 'params': ''}, - {'fun': 'ScriptCommand_CheckKinstoneFused', 'params': 's'}, - {'fun': 'ScriptCommand_BuyItem', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807E48C', 'params': 's'}, - {'fun': 'ScriptCommand_0807E4CC', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E4EC', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E514', 'params': 'w'}, - {'fun': 'ScriptCommand_CheckPlayerFlags', 'params':'w'}, - {'fun': 'ScriptCommand_0807E564', 'params': ''}, - {'fun': 'ScriptCommand_EntityHasHeight', 'params': ''}, - {'fun': 'ScriptCommand_ComparePlayerAction', 'params': 's'}, - {'fun': 'ScriptCommand_ComparePlayerAnimationState', 'params': 's'}, - {'fun': 'ScriptCommand_0807E5F8', 'params': 'w'},# 'exec': ScriptCommand_0807E5F8}, - {'fun': 'ScriptCommand_0807E610', 'params': 'w'}, - {'fun': 'ScriptCommand_SetLocalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_SetLocalFlagByOffset', 'params': 'ss'}, - {'fun': 'ScriptCommand_ClearLocalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_SetGlobalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_ClearGlobalFlag', 'params': 's'}, - {'fun': 'ScriptCommand_SetRoomFlag', 'params': 's'}, - {'fun': 'ScriptCommand_ClearRoomFlag', 'params': 's'}, - {'fun': 'ScriptCommand_Wait', 'params': 's'}, - {'fun': 'ScriptCommand_WaitForSomething', 'params': 'w'}, - {'fun': 'ScriptCommand_WaitForSomething2', 'params': 'w'}, - {'fun': 'ScriptCommand_WaitPlayerAction8', 'params': ''}, - {'fun': 'ScriptCommand_WaitForPlayerAction0x17', 'params': ''}, - {'fun': 'ScriptCommand_WaitFor_1', 'params': ''}, - {'fun': 'ScriptCommand_WaitFor_2', 'params': ''}, - {'fun': 'ScriptCommand_0807E778', 'params': 's'}, - {'fun': 'ScriptCommand_0807E788', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E79C', 'params': ''}, - {'fun': 'ScriptCommandNop2', 'params': 's'}, - {'fun': 'ScriptCommand_DoFade4', 'params': ''}, - {'fun': 'ScriptCommand_DoFade5', 'params': ''}, - {'fun': 'ScriptCommand_DoFade6', 'params': ''}, - {'fun': 'ScriptCommand_DoFade7', 'params': ''}, - {'fun': 'ScriptCommand_0807E800', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E80C', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E858', 'params': ['s', '']}, - {'fun': 'ScriptCommand_0807E864', 'params': ''}, - {'fun': 'ScriptCommand_0807E878', 'params': ''}, - {'fun': 'ScriptCommand_0807E888', 'params': ''}, - {'fun': 'ScriptCommand_SetPlayerAction', 'params': 'w'}, - {'fun': 'ScriptCommand_StartPlayerScript', 'params': 'x'}, - {'fun': 'ScriptCommand_0807E8D4', 'params': 's'}, - {'fun': 'ScriptCommand_0807E8E4_0', 'params': ''}, # duplicate - {'fun': 'ScriptCommand_0807E8E4_1', 'params': ''}, # duplicate - {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate - {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate - {'fun': 'ScriptCommand_0807E908', 'params': 's'}, - {'fun': 'ScriptCommand_0807E914', 'params': 'w'}, - {'fun': 'ScriptCommand_0807E924', 'params': ''}, - {'fun': 'ScriptCommand_0807E930', 'params': 's'}, - {'fun': 'ScriptCommand_0807E944', 'params': ''}, - {'fun': 'ScriptCommand_0807E974', 'params': 's'}, - {'fun': 'ScriptCommand_0807E9D4', 'params': ''}, - {'fun': 'ScriptCommand_0807E9DC', 'params': ''}, - {'fun': 'ScriptCommand_0807E9E4', 'params': 's'}, - {'fun': 'ScriptCommand_0807E9F0', 'params': ''}, - {'fun': 'ScriptCommand_0807EA4C', 'params': ''}, - {'fun': 'ScriptCommand_0807EA88', 'params': 's'}, - {'fun': 'ScriptCommand_0807EA94', 'params': ''}, - {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'}, - {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'}, - {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['w', 's']}, # TODO w or ss? - {'fun': 'ScriptCommand_0807EAF0', 'params': ['ss', 'sss', 'ssss']}, - {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''}, - {'fun': 'ScriptCommand_0807EB28', 'params': 's'}, - {'fun': 'ScriptCommand_0807EB38', 'params': ''}, - {'fun': 'ScriptCommand_0807EB44', 'params': 's'}, - {'fun': 'ScriptCommand_0807EB4C', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EB74', 'params': ''}, - {'fun': 'ScriptCommand_0807EB8C', 'params': ''}, - {'fun': 'ScriptCommand_SetEntityDirection', 'params': 's'}, - {'fun': 'ScriptCommand_SetEntityDirectionWithAnimationState', 'params': 's'}, - {'fun': 'ScriptCommand_SetEntityNonPlanarMovement', 'params': 's'}, - {'fun': 'ScriptCommand_SetEntity0x20', 'params': 'w'}, - {'fun': 'ScriptCommand_SetEntityPositionRelative', 'params': 'w'}, - {'fun': 'ScriptCommand_SetEntityPosition', 'params': 'ss'}, - {'fun': 'ScriptCommand_MoveEntityToPlayer', 'params': ''}, - {'fun': 'ScriptCommandNop3', 'params': ''}, - {'fun': 'ScriptCommand_0807EC1C', 'params': 's'}, - {'fun': 'ScriptCommand_0807EC64', 'params': 's'}, - {'fun': 'ScriptCommand_0807EC94', 'params': 's'}, - {'fun': 'ScriptCommand_0807ECC4', 'params': 's'}, - {'fun': 'ScriptCommand_0807ECF4', 'params': 's'}, - {'fun': 'ScriptCommand_0807ED24', 'params': 'sss'}, - {'fun': 'ScriptCommand_0807EDD4', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EE04', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EE30', 'params': ''}, - {'fun': 'ScriptCommand_0807EEB4', 'params': ''}, - {'fun': 'ScriptCommand_0807EEF4', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EF3C', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807EF80', 'params': 's'}, - {'fun': 'ScriptCommand_0807EF90', 'params': 's'}, - {'fun': 'ScriptCommand_SoundReq', 'params': 's'}, - {'fun': 'ScriptCommand_SoundReq2', 'params': 's'}, - {'fun': 'ScriptCommand_SoundReq3', 'params': 'w'}, - {'fun': 'ScriptCommand_SoundReq0x80100000', 'params': ''}, - {'fun': 'ScriptCommand_ModRupees', 'params': 's'}, - {'fun': 'ScriptCommand_ModHealth', 'params': 's'}, - {'fun': 'ScriptCommand_IncreaseMaxHealth', 'params': 's'}, - {'fun': 'ScriptCommand_0807F034', 'params': 's'}, - {'fun': 'ScriptCommand_0807F050', 'params': 's'}, - {'fun': 'ScriptCommand_GetInventoryValue', 'params': 's'}, - {'fun': 'ScriptCommand_0807F078', 'params': 'ss'}, - {'fun': 'ScriptCommand_0807F088', 'params': 's'}, - {'fun': 'ScriptCommand_CameraTargetEntity', 'params': ''}, - {'fun': 'ScriptCommand_CameraTargetPlayer', 'params': ''}, - {'fun': 'ScriptCommand_0807F0B4', 'params': 's'}, - {'fun': 'ScriptCommand_0807F0C8', 'params': 'ss'} -] - -# definitions for parameters -parameters = { - '': { - 'length':0, - 'param': '', - 'expr': '', - 'read': lambda ctx: '' - }, - 's': { - 'length': 1, - 'param': 's', - 'expr': ' .short \s', - 'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+4])[0] - }, - 'w': { - 'length': 2, - 'param': 'w', - 'expr': ' .word \w', - 'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])[0] - }, - 'ss': { - 'length': 2, - 'param': 'a,b', - 'expr': ' .short \\a\n .short \\b', - 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+6])) - }, - 'ww': { - 'length': 4, - 'param': 'a,b', - 'expr': ' .word \\a\n .word \\b', - 'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr+2:ctx.ptr+10])) - }, - 'sss': { - 'length': 3, - 'param': 'a,b,c', - 'expr': ' .short \\a\n .short \\b\n .short \\c', - 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+8])) - }, - 'ssss': { - 'length': 4, - 'param': 'a,b,c,d', - 'expr': ' .short \\a\n .short \\b\n .short \\c\n .short \\d', - 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+10])) - }, - 'sssssss': { - 'length': 7, - 'param': 'a,b,c,d,e,f,g', - 'expr': ' .short \\a\n .short \\b\n .short \\c\n .short \\d\n .short \\e\n .short \\f\n .short \\g', - 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+16])) - }, - 'sssssssss': { - 'length': 9, - 'param': 'a,b,c,d,e,f,g,h,i', - 'expr': ' .short \\a\n .short \\b\n .short \\c\n .short \\d\n .short \\e\n .short \\f\n .short \\g\n .short \\h\n .short \\i', - 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+20])) - }, - 'p': { - 'length': 2, - 'param': 'w', - 'expr': ' .word \w', - 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) - }, - 'd': { # Data pointer - 'length': 2, - 'param': 'w', - 'expr': ' .word \w', - 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) - }, - 'x': { # Script pointer - 'length': 2, - 'param': 'w', - 'expr': ' .word \w', - 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) - }, - - 'pw': { - 'length': 4, - 'param': 'a,b', - 'expr': ' .word \\a\n .word \\b', - 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + barray_to_u32_hex(ctx.data[ctx.ptr+6:ctx.ptr+14])[0] - }, - 'xx': { - 'length': 4, - 'param': 'a, b', - 'expr': ' .word \\a\n .word \\b', - 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr+6:ctx.ptr+10]) - }, - # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations - # 'v': { - # 'length': -1, - # 'param': '', - # 'expr': '', - # 'read': lambda ctx: '' - # }, - # 'pv': { - # 'length': -2, - # 'param': 'w', - # 'expr': ' .word \w', - # 'read': lambda ctx: '' - # }, -} # Remove the ScriptCommand_ prefix for the asm macros def build_script_command(name: str): @@ -318,13 +27,14 @@ def build_script_command(name: str): def print_rest_bytes(ctx): print('\n'.join(['.byte ' + hex(x) for x in ctx.data[ctx.ptr:]])) -def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): - if add_annotations: - print(f'@{ctx.ptr}') # print offsets to debug when manually inserting labels +def disassemble_command(ctx: Context, add_all_annotations=False): + global used_labels + if add_all_annotations or ctx.script_addr + ctx.ptr in used_labels: + print(f'{get_script_label(ctx.script_addr + ctx.ptr)}:') # print offsets to debug when manually inserting labels cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0] if cmd == 0: # this does not need to be the end of the script - print('.short 0x0000') + print('\t.short 0x0000') ctx.ptr += 2 return 1 @@ -334,7 +44,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr+2])[0] if cmd == 0x0000: # This is actually the end of the script - print('.short 0x0000') + print('\t.short 0x0000') ctx.ptr += 2 return 2 return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please @@ -347,7 +57,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): commandId = cmd & 0x3FF if commandId >= len(commands): #print_rest_bytes(ctx) - print(f'.short {u16_to_hex(cmd)}') + print(f'\t.short {u16_to_hex(cmd)}') ctx.ptr += 2 #raise Exception(f'Invalid commandId {commandId} / {len(commands)} {cmd}') # TODO error @@ -377,7 +87,7 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): if candidate['length'] == commandSize -1: params = candidate if i != 0: - suffix = f'_{param}'# We need to add a suffix to distinguish the correct parameter variant + suffix = f'_{params["length"]}'# We need to add a suffix to distinguish the correct parameter variant break if params is None: raise Exception(f'No suitable parameter configuration with length {commandSize-1} found for {command["fun"]}') @@ -389,18 +99,18 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): command_name = f'{command["fun"]}{suffix}' if params['length'] == -1: # variable parameter length - print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters') + print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters') if commandSize > 1: - print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])])) + print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+2:ctx.ptr+commandSize*2])])) print(f'@ End of parameters') ctx.ptr += commandSize*2 return 1 elif params['length'] == -2: # point and var - print(f'.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters') + print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters') - print('.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])) + print('\t.word '+ get_pointer(ctx.data[ctx.ptr+2:ctx.ptr+6])) if commandSize > 3: - print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])])) + print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr+6:ctx.ptr+commandSize*2])])) print(f'@ End of parameters') ctx.ptr += commandSize*2 return 1 @@ -408,28 +118,24 @@ def ExecuteScriptCommandSet(ctx: Context, add_annotations=False): if commandSize-1 != params['length']: raise Exception(f'Call {command_name} with ' + str(commandSize-1) +' length, while length of ' + str(params['length'])+' defined') - print(build_script_command(command_name) + ' ' + params['read'](ctx)) + print(f'\t{build_script_command(command_name)} {params["read"](ctx)}') # Execute script ctx.ptr += commandSize*2 return 1 -# TODO -# JumpAbsolute 0x08016384 -# JumpAbsoluteIf 0x08016384 -# JumpAbsoluteIfNot 0x08016384 -def disassemble_script(input_bytes, add_annotations=False): +def disassemble_script(input_bytes, script_addr, add_all_annotations=False): - ctx = Context(0, input_bytes) + ctx = Context(0, input_bytes, script_addr) foundEnd = False while True: if ctx.ptr >= len(ctx.data) - 1: # End of file (there need to be at least two bytes remaining for the next operation id) break - res = ExecuteScriptCommandSet(ctx, add_annotations) + res = disassemble_command(ctx, add_all_annotations) if res == 0: break elif res == 2: @@ -495,7 +201,7 @@ def generate_macros(): id = ((params['length']+1) << 0xA) + num suffix = '' if i != 0: - suffix = f'_{variant}' + suffix = f'_{params["length"]}' emit_macro(f'{build_script_command(command["fun"])}{suffix}', id, params) else: if not command['params'] in parameters: diff --git a/tools/script_disassembler/utils.py b/tools/script_disassembler/utils.py new file mode 100644 index 00000000..b0501e5a --- /dev/null +++ b/tools/script_disassembler/utils.py @@ -0,0 +1,21 @@ +import struct + +def barray_to_s16(barray): + integers = struct.unpack('h', barray) + return integers[0] + +def u16_to_hex(value): + return '0x' + (struct.pack('>H', value).hex()) + +def barray_to_u16_hex(barray): + count = len(barray)//2 + integers = struct.unpack('H'*count, barray) + return [u16_to_hex(x) for x in integers] + +def u32_to_hex(value): + return '0x' + (struct.pack('>I', value).hex()) + +def barray_to_u32_hex(barray): + count = len(barray)//4 + integers = struct.unpack('I'*count, barray) + return [u32_to_hex(x) for x in integers] \ No newline at end of file