diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 01:59:56 +0100 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2021-03-06 14:53:33 +0100 |
| commit | 7730ea20976178708762b7c882d0bae303c550ca (patch) | |
| tree | dfe03adba2a7b1284ffcb230e3b8d0115bca3336 /data/scripts | |
| parent | b65f5e1bd0910580d9748b7ba7badf3a21189565 (diff) | |
Add labels for room entity lists referenced in scripts
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/gUnk_08008B5C.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_0800939A.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08009464.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_080095F2.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_0800B1C0.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_0800D414.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_0800D874.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_0800EFC0.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08010BB4.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08010E5A.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08011128.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08011C7C.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08012430.inc | 4 | ||||
| -rw-r--r-- | data/scripts/gUnk_0801319A.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08013AA6.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08014E14.inc | 4 | ||||
| -rw-r--r-- | data/scripts/gUnk_08015CD4.inc | 2 | ||||
| -rw-r--r-- | data/scripts/gUnk_08016384.inc | 2 |
18 files changed, 20 insertions, 20 deletions
diff --git a/data/scripts/gUnk_08008B5C.inc b/data/scripts/gUnk_08008B5C.inc index 256d6033..e03faf0b 100644 --- a/data/scripts/gUnk_08008B5C.inc +++ b/data/scripts/gUnk_08008B5C.inc @@ -60,7 +60,7 @@ Call sub_0806BB7C JumpIfNot 0x0048 TextboxNoOverlap 0x490c _0807EA94 -LoadRoomEntityList 0x080d6784 +LoadRoomEntityList gUnk_080D6784 WaitForSomething 0x00000001 WaitForSomething 0x00000004 Wait 0x000f diff --git a/data/scripts/gUnk_0800939A.inc b/data/scripts/gUnk_0800939A.inc index ac7a4ad8..42562c04 100644 --- a/data/scripts/gUnk_0800939A.inc +++ b/data/scripts/gUnk_0800939A.inc @@ -26,7 +26,7 @@ JumpIfNot 0xff80 Wait 0x001e TextboxNoOverlap 0x1d08 _0807EA94 -LoadRoomEntityList 0x080f9c38 +LoadRoomEntityList gUnk_080F9C38 Wait 0x0078 Call sub_0806D6D0 Wait 0x00b4 diff --git a/data/scripts/gUnk_08009464.inc b/data/scripts/gUnk_08009464.inc index bf533b64..bf0ba878 100644 --- a/data/scripts/gUnk_08009464.inc +++ b/data/scripts/gUnk_08009464.inc @@ -1,7 +1,7 @@ SCRIPT_START gUnk_08009464 Wait 0x003c _0807F0C8 0x0000, 0x0000 -LoadRoomEntityList 0x080f9c58 +LoadRoomEntityList gUnk_080F9C58 Wait 0x003c Call sub_0806D70C Wait 0x003c diff --git a/data/scripts/gUnk_080095F2.inc b/data/scripts/gUnk_080095F2.inc index c7fb01e5..2e76a019 100644 --- a/data/scripts/gUnk_080095F2.inc +++ b/data/scripts/gUnk_080095F2.inc @@ -61,7 +61,7 @@ StartPlayerScript gUnk_08009704 WaitForSomething2 0x00000001 SoundReq 0x0111 _0807EF80 0x0008 -LoadRoomEntityList 0x080d9048 +LoadRoomEntityList gUnk_080D9048 Wait 0x000f SoundReq 0x0111 _0807EF80 0x0007 diff --git a/data/scripts/gUnk_0800B1C0.inc b/data/scripts/gUnk_0800B1C0.inc index e5ef8a57..3e39444b 100644 --- a/data/scripts/gUnk_0800B1C0.inc +++ b/data/scripts/gUnk_0800B1C0.inc @@ -9,7 +9,7 @@ ClearLocalFlag 0x0039 _0807EF80 0x0000 _0807EF80 0x0004 Wait 0x002c -LoadRoomEntityList 0x080da260 +LoadRoomEntityList gUnk_080DA260 Wait 0x001e _0807E5F8 0x00000001 Call sub_0807921C diff --git a/data/scripts/gUnk_0800D414.inc b/data/scripts/gUnk_0800D414.inc index d531a974..51a6d2cd 100644 --- a/data/scripts/gUnk_0800D414.inc +++ b/data/scripts/gUnk_0800D414.inc @@ -162,6 +162,6 @@ Call sub_0806DAE8 Wait 0x0078 Call sub_0806DB44 JumpIfNot 0x000e -LoadRoomEntityList 0x080dd730 +LoadRoomEntityList gUnk_080DD730 _0807EF80 0x0006 SCRIPT_END diff --git a/data/scripts/gUnk_0800D874.inc b/data/scripts/gUnk_0800D874.inc index 0daba44b..c9361960 100644 --- a/data/scripts/gUnk_0800D874.inc +++ b/data/scripts/gUnk_0800D874.inc @@ -20,7 +20,7 @@ CheckInventory1 0x0017 JumpIf 0x0018 CheckLocalFlag 0x0045 JumpIf 0x0010 -LoadRoomEntityList 0x080e3830 +LoadRoomEntityList gUnk_080E3830 CheckLocalFlag 0x0045 JumpIfNot 0xfffa Call sub_0807DF50 diff --git a/data/scripts/gUnk_0800EFC0.inc b/data/scripts/gUnk_0800EFC0.inc index 70a1432d..91729462 100644 --- a/data/scripts/gUnk_0800EFC0.inc +++ b/data/scripts/gUnk_0800EFC0.inc @@ -81,7 +81,7 @@ JumpIfNot 0xfff6 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 -LoadRoomEntityList 0x080ee8ac +LoadRoomEntityList gUnk_080EE8AC StartPlayerScript gUnk_0800F14C WaitForSomething2 0x00000001 _0807E5F8 0x0000001e diff --git a/data/scripts/gUnk_08010BB4.inc b/data/scripts/gUnk_08010BB4.inc index 7ed5fa31..9132cb25 100644 --- a/data/scripts/gUnk_08010BB4.inc +++ b/data/scripts/gUnk_08010BB4.inc @@ -53,7 +53,7 @@ Call sub_08064180 Call sub_08064180 Call sub_08064180 Call sub_08064180 -LoadRoomEntityList 0x080f06e0 +LoadRoomEntityList gUnk_080F06E0 _0807E5F8 0x00000004 WaitForSomething2 0x00000008 StartPlayerScript gUnk_08011098 diff --git a/data/scripts/gUnk_08010E5A.inc b/data/scripts/gUnk_08010E5A.inc index d38d26d0..091372b0 100644 --- a/data/scripts/gUnk_08010E5A.inc +++ b/data/scripts/gUnk_08010E5A.inc @@ -30,7 +30,7 @@ WaitFor_2 Wait 0x003c SoundReq 0x00ab SoundReq 0x01c2 -LoadRoomEntityList 0x080f0770 +LoadRoomEntityList gUnk_080F0770 _0807E5F8 0x00000010 WaitForSomething2 0x00000020 _0807E778 0x0002 diff --git a/data/scripts/gUnk_08011128.inc b/data/scripts/gUnk_08011128.inc index 9ff7e44a..6dd62f48 100644 --- a/data/scripts/gUnk_08011128.inc +++ b/data/scripts/gUnk_08011128.inc @@ -5,7 +5,7 @@ _0807EF80 0x0000 StopScript CheckPlayerInRegion 0x01f8, 0x0048, 0x1040 JumpIfNot 0xfff6 -LoadRoomEntityList 0x080f06b0 +LoadRoomEntityList gUnk_080F06B0 _0807EF80 0x000b WaitForSomething2 0x00000004 SetEntityPositionRelative 0x005801b8 diff --git a/data/scripts/gUnk_08011C7C.inc b/data/scripts/gUnk_08011C7C.inc index d1d98f08..2ea6c740 100644 --- a/data/scripts/gUnk_08011C7C.inc +++ b/data/scripts/gUnk_08011C7C.inc @@ -513,7 +513,7 @@ Call sub_08061FD8 _0807EF80 0x000b Call sub_08061FB0 Call sub_08061F94 -LoadRoomEntityList 0x080f2758 +LoadRoomEntityList gUnk_080F2758 _0807EF80 0x0008 Wait 0x003c SoundReq 0x0072 diff --git a/data/scripts/gUnk_08012430.inc b/data/scripts/gUnk_08012430.inc index ed93e9bb..5b134e84 100644 --- a/data/scripts/gUnk_08012430.inc +++ b/data/scripts/gUnk_08012430.inc @@ -45,7 +45,7 @@ WaitFor_2 .short 0x0000 @ End of parameters Call sub_080791BC -LoadRoomEntityList 0x080f4d70 +LoadRoomEntityList gUnk_080F4D70 Call DeleteAllEnemies SetEntityPositionRelative 0x01680388 Call sub_0807F844 @@ -110,7 +110,7 @@ SoundReq2 0x0033 Call sub_0807DF50 _0807E878 _0807E5F8 0x00000050 -LoadRoomEntityList 0x080f51d0 +LoadRoomEntityList gUnk_080F51D0 WaitForSomething2 0x00000008 _0807E864 Call sub_0807FA40 diff --git a/data/scripts/gUnk_0801319A.inc b/data/scripts/gUnk_0801319A.inc index 1e129504..6112595c 100644 --- a/data/scripts/gUnk_0801319A.inc +++ b/data/scripts/gUnk_0801319A.inc @@ -19,7 +19,7 @@ WaitForSomething2 0x00000002 _0807E778 0x0004 DoFade5 WaitFor_2 -LoadRoomEntityList 0x080f5680 +LoadRoomEntityList gUnk_080F5680 StartPlayerScript gUnk_08013330 WaitForSomething2 0x00000002 MoveEntityToPlayer diff --git a/data/scripts/gUnk_08013AA6.inc b/data/scripts/gUnk_08013AA6.inc index 650f465a..d41b1fa9 100644 --- a/data/scripts/gUnk_08013AA6.inc +++ b/data/scripts/gUnk_08013AA6.inc @@ -14,7 +14,7 @@ _0807F0B4 0x0004 SetEntityPositionRelative 0x005000e8 CameraTargetEntity Wait 0x003c -LoadRoomEntityList 0x080f55d8 +LoadRoomEntityList gUnk_080F55D8 Wait 0x0078 _0807F0B4 0x0007 MoveEntityToPlayer diff --git a/data/scripts/gUnk_08014E14.inc b/data/scripts/gUnk_08014E14.inc index 20aa9ea3..42e337d5 100644 --- a/data/scripts/gUnk_08014E14.inc +++ b/data/scripts/gUnk_08014E14.inc @@ -217,7 +217,7 @@ WaitForSomething2 0x00000001 SoundReq 0x01b0 Call sub_0804F79C Wait 0x000a -LoadRoomEntityList 0x080f7fc0 +LoadRoomEntityList gUnk_080F7FC0 SoundReq2 0x002d Call sub_0807DF50 _0807E878 @@ -278,7 +278,7 @@ _0807E80C 0x00000000 StopScript StartPlayerScript gUnk_08015360 WaitForSomething2 0x00000001 -LoadRoomEntityList 0x080f7cb0 +LoadRoomEntityList gUnk_080F7CB0 _0807E778 0x0004 _0807E800 0x00000000 WaitFor_2 diff --git a/data/scripts/gUnk_08015CD4.inc b/data/scripts/gUnk_08015CD4.inc index 05f61e2a..093fb138 100644 --- a/data/scripts/gUnk_08015CD4.inc +++ b/data/scripts/gUnk_08015CD4.inc @@ -41,7 +41,7 @@ _0807E778 0x0004 DoFade5 WaitFor_2 _0807E5F8 0x00000010 -LoadRoomEntityList 0x080fce30 +LoadRoomEntityList gUnk_080FCE30 SoundReq0x80100000 Wait 0x0078 _0807E778 0x0004 diff --git a/data/scripts/gUnk_08016384.inc b/data/scripts/gUnk_08016384.inc index eeb26942..542c57f6 100644 --- a/data/scripts/gUnk_08016384.inc +++ b/data/scripts/gUnk_08016384.inc @@ -18,7 +18,7 @@ Call 0x08016384 .short 0x5678 .short 0x1234 @ End of parameters -LoadRoomEntityList 0x08016384 +LoadRoomEntityList gUnk_08016384 TestBit 0x00000001 CheckInventory1 0x0001 CheckInventory2 0x0001 |
