Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-09-11 19:26:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename WaitFrames -> WaitTime, use "frames" as argument name in both macros

Browse Source
This commit is contained in:
RavePossum
2024-06-16 09:30:56 -04:00
parent 5f9cf5eb7b
commit 1dcefcc19c
79 changed files with 257 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/macros/btlcmd.inc
View File

@@ -1207,9 +1207,9 @@
.long (\jump_not_over)-.) / 4 - 1
.endm
.macro WaitTime delay
.macro WaitTime frames
.long 218
.long \delay
.long \frames
.endm
.macro CheckCurMoveIsType type, jump

2
asm/macros/scrcmd.inc
View File

@@ -14,7 +14,7 @@
.short 2
.endm
.macro WaitFrames frames, countdown
.macro WaitTime frames, countdown
.short 3
.short \frames
.short \countdown

6
res/field/scripts/script_0002.s
View File

@@ -119,7 +119,7 @@ _018D:
Call _03C0
Message 23
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0CD 0
Call _041B
Message 24
@@ -161,7 +161,7 @@ _0224:
Call _03C0
Message 26
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CD 0
Call _041B
Message 27
@@ -976,7 +976,7 @@ _0C7C:
Call _0CF0
Message 79
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 30, _0DC8
WaitMovement
ScrCmd_065 30

2
res/field/scripts/script_0013.s
View File

@@ -16,7 +16,7 @@ _0012:
WaitMovement
Message 0
CloseMessage
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
ApplyMovement 0, _004C
WaitMovement
Message 1

12
res/field/scripts/script_0018.s
View File

@@ -56,7 +56,7 @@ _007E:
End
_00E9:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 11, 2, 18, 2, 1
GoToIfEq 0x40CE, 3, _026C
@@ -68,7 +68,7 @@ _00E9:
End
_013A:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 12, 3, 18, 2, 1
GoToIfEq 0x40CE, 2, _026C
@@ -80,7 +80,7 @@ _013A:
End
_018B:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 13, 4, 18, 2, 1
GoToIfEq 0x40CE, 1, _026C
@@ -92,7 +92,7 @@ _018B:
End
_01DC:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 14, 1, 18, 2, 1
GoToIfEq 0x40CE, 0, _026C
@@ -131,7 +131,7 @@ _0261:
_026C:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
Message 4
WaitButtonPress
CloseMessage
@@ -140,7 +140,7 @@ _026C:
_0283:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
Message 1
WaitButtonPress
CloseMessage

2
res/field/scripts/script_0036.s
View File

@@ -279,7 +279,7 @@ _03C8:
CloseMessage
ApplyMovement 12, _0490
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_14D 0x800C
GoToIfEq 0x800C, 0, _045E
GoTo _046A

6
res/field/scripts/script_0044.s
View File

@@ -43,7 +43,7 @@ _0062:
ScrCmd_066 0x8004, 0x8005
ApplyMovement 241, _0340
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0CE 0
ScrCmd_0CD 1
Message 1
@@ -57,7 +57,7 @@ _0062:
CloseMessage
ApplyMovement 4, _035C
WaitMovement
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_0CD 0
Message 4
CloseMessage
@@ -152,7 +152,7 @@ _0184:
WaitFadeScreen
Message 22
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 4, _03B4
WaitMovement
ScrCmd_0CE 0

6
res/field/scripts/script_0047.s
View File

@@ -46,13 +46,13 @@ _0091:
_0093:
LockAll
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 0
CloseMessage
ApplyMovement 0, _0148
ApplyMovement 0xFF, _0130
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CD 0
Message 1
CloseMessage
@@ -70,7 +70,7 @@ _0093:
WaitFadeScreen
FadeScreen 6, 6, 0, 0
WaitFadeScreen
WaitFrames 120, 0x800C
WaitTime 120, 0x800C
ScrCmd_0BE 0x140, 0, 152, 0x115, 1
FadeScreen 6, 6, 1, 0
WaitFadeScreen

4
res/field/scripts/script_0048.s
View File

@@ -116,7 +116,7 @@ _0158:
ScrCmd_04E 0x48E
ScrCmd_04F
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Call _01FC
Message 5
Call _0256
@@ -148,7 +148,7 @@ _01FC:
ScrCmd_04B 0x603
ClearFlag 0x25B
ScrCmd_064 2
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
ApplyMovement 1, _0294
ApplyMovement 0, _0294
ApplyMovement 0xFF, _0294

4
res/field/scripts/script_0071.s
View File

@@ -886,7 +886,7 @@ _0AB6:
WaitMovement
Message 3
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 32, _0CE4
ApplyMovement 241, _0CDC
WaitMovement
@@ -898,7 +898,7 @@ _0AB6:
ApplyMovement 0xFF, _0CAC
WaitMovement
ScrCmd_065 32
WaitFrames 35, 0x800C
WaitTime 35, 0x800C
ApplyMovement 33, _0BD4
ApplyMovement 0xFF, _0CC0
WaitMovement

2
res/field/scripts/script_0079.s
View File

@@ -70,7 +70,7 @@ _006A:
ScrCmd_065 4
SetFlag 113
SetVar 0x411D, 1
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 1
ApplyMovement 5, _0110
WaitMovement

2
res/field/scripts/script_0082.s
View File

@@ -37,7 +37,7 @@ _0022:
ScrCmd_065 0
FadeScreen 6, 1, 1, 0
WaitFadeScreen
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_1BD 0x8004
GoToIfEq 0x8004, 0, _00A4
GoToIfEq 0x8004, 2, _00BE

6
res/field/scripts/script_0083.s
View File

@@ -313,14 +313,14 @@ _0541:
Message 4
PlayFanfare 0x5E6
ScrCmd_04B 0x5E6
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 5
WaitFrames 32, 0x800C
WaitTime 32, 0x800C
ScrCmd_04E 0x483
ScrCmd_0D4 1, 0x8001
Message 6
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0613
End

2
res/field/scripts/script_0093.s
View File

@@ -142,7 +142,7 @@ _013B:
GoToIfEq 0x800C, 1, _01B2
Message 15
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_1BD 0x8004
GoToIfEq 0x8004, 0, _01BD
GoToIfEq 0x8004, 1, _01D7

4
res/field/scripts/script_0119.s
View File

@@ -74,7 +74,7 @@ _0104:
ScrCmd_04F
Message 10
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0xFF, _01C8
ApplyMovement 5, _01B0
WaitMovement
@@ -401,7 +401,7 @@ _04A4:
PlayFanfare 0x5DC
LockAll
FacePlayer
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_1BD 0x800C
GoToIfEq 0x800C, 0, _052B
GoToIfEq 0x800C, 1, _053D

4
res/field/scripts/script_0123.s
View File

@@ -840,7 +840,7 @@ _086F:
ApplyMovement 26, _0AF0
WaitMovement
PlayFanfare 0x65B
WaitFrames 4, 0x800C
WaitTime 4, 0x800C
Message 19
ScrCmd_04B 0x5DC
ScrCmd_29F 1
@@ -1161,7 +1161,7 @@ _0C22:
WaitMovement
ScrCmd_04C 0x1C5, 0
ScrCmd_04D
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 28, _0C70
WaitMovement
PlayFanfare 0x603

12
res/field/scripts/script_0136.s
View File

@@ -109,7 +109,7 @@ _00F6:
CallIfEq 0x8004, 0x2AB, _03B9
CallIfEq 0x8004, 0x2AC, _03D5
ScrCmd_065 25
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ScrCmd_14D 0x8004
CallIfEq 0x8004, 0, _02A7
CallIfEq 0x8004, 1, _02C4
@@ -138,7 +138,7 @@ _02A7:
ScrCmd_0CD 0
Message 7
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0xFF, _052C
WaitMovement
Message 8
@@ -148,7 +148,7 @@ _02C4:
ScrCmd_0CD 0
Message 9
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0xFF, _052C
WaitMovement
Message 10
@@ -516,7 +516,7 @@ _0656:
CallIfEq 0x8005, 0x255, _09E7
Message 17
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_069 0x8004, 0x8005
CallIfEq 0x8005, 0x253, _09F3
CallIfEq 0x8005, 0x255, _09FF
@@ -534,13 +534,13 @@ _0656:
ScrCmd_069 0x8004, 0x8005
CallIfEq 0x8005, 0x253, _0A4B
CallIfEq 0x8005, 0x255, _0A5F
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_0CD 0
ScrCmd_14D 0x8004
CallIfEq 0x8004, 0, _0A2D
CallIfEq 0x8004, 1, _0A32
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ClearFlag 0x28A
ScrCmd_186 26, 0x2B4, 0x25E
ScrCmd_064 26

4
res/field/scripts/script_0141.s
View File

@@ -148,7 +148,7 @@ _01E3:
ScrCmd_077
ScrCmd_04B 0x5D5
Message 3
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _01A4
_0240:
@@ -167,7 +167,7 @@ _0240:
ScrCmd_077
ScrCmd_04B 0x5D5
Message 3
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _01A4
_029D:

16
res/field/scripts/script_0147.s
View File

@@ -66,7 +66,7 @@ _00A6:
GoTo _03F6
_0131:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 0x236, 1, 18, 2, 1
GoToIfEq 0x40CE, 5, _03DF
@@ -77,7 +77,7 @@ _0131:
GoTo _033F
_0180:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 137, 2, 18, 2, 1
GoToIfEq 0x40CE, 4, _03DF
@@ -88,7 +88,7 @@ _0180:
GoTo _033F
_01CF:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 138, 2, 18, 2, 1
GoToIfEq 0x40CE, 3, _03DF
@@ -99,7 +99,7 @@ _01CF:
GoTo _033F
_021E:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 139, 2, 18, 2, 1
GoToIfEq 0x40CE, 2, _03DF
@@ -110,7 +110,7 @@ _021E:
GoTo _033F
_026D:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 140, 2, 18, 2, 1
GoToIfEq 0x40CE, 1, _03DF
@@ -121,7 +121,7 @@ _026D:
GoTo _033F
_02BC:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 141, 1, 18, 2, 1
GoToIfEq 0x40CE, 0, _03DF
@@ -198,7 +198,7 @@ _03D7:
_03DF:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
Message 4
WaitButtonPress
CloseMessage
@@ -207,7 +207,7 @@ _03DF:
_03F6:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
Message 1
WaitButtonPress
CloseMessage

8
res/field/scripts/script_0156.s
View File

@@ -467,16 +467,16 @@ _05D7:
CloseMessage
ApplyMovement 18, _0668
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 18, _0670
WaitMovement
Message 1
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 18, _0678
WaitMovement
ScrCmd_065 18
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_186 18, 0x34D, 0x2EC
ScrCmd_188 18, 15
ScrCmd_189 18, 1
@@ -697,7 +697,7 @@ _0850:
_086E:
Message 3
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_1BD 0x800C
GoToIfEq 0x800C, 0, _08A6
GoToIfEq 0x800C, 2, _08BE

2
res/field/scripts/script_0171.s
View File

@@ -46,7 +46,7 @@ _004C:
Message 1
Message 2
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_1BD 0x800C
GoToIfEq 0x800C, 0, _0092
GoToIfEq 0x800C, 2, _00AA

4
res/field/scripts/script_0174.s
View File

@@ -98,7 +98,7 @@ _0111:
End
_011B:
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ClearFlag 0x1F3
ScrCmd_064 7
ApplyMovement 7, _016C
@@ -261,7 +261,7 @@ _02A0:
CloseMessage
ApplyMovement 10, _0334
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 16
CloseMessage
ApplyMovement 10, _033C

8
res/field/scripts/script_0181.s
View File

@@ -110,14 +110,14 @@ _0161:
Message 20
PlayFanfare 0x5E6
ScrCmd_04B 0x5E6
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 21
WaitFrames 32, 0x800C
WaitTime 32, 0x800C
ScrCmd_04E 0x483
ScrCmd_0D4 1, 0x8003
Message 22
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0277
End
@@ -143,7 +143,7 @@ _0256:
Message 15
ScrCmd_04E 0x483
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0277
End

4
res/field/scripts/script_0196.s
View File

@@ -34,9 +34,9 @@ _000E:
WaitMovement
ApplyMovement 0, _0150
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_25C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
SetFlag 0x23A
SetFlag 0x23B
ApplyMovement 0xFF, _013C

2
res/field/scripts/script_0198.s
View File

@@ -18,7 +18,7 @@ _0006:
ApplyMovement 1, _0144
ApplyMovement 0, _015C
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_14D 0x800C
GoToIfEq 0x800C, 0, _0074
GoToIfEq 0x800C, 1, _0080

8
res/field/scripts/script_0211.s
View File

@@ -380,7 +380,7 @@ _0526:
_0552:
ScrCmd_258
WaitFrames 2, 0x800C
WaitTime 2, 0x800C
Call _0568
ScrCmd_259
GoTo _057D
@@ -520,7 +520,7 @@ _06D5:
ScrCmd_07C 94, 1, 0x800C
ScrCmd_260 1
ScrCmd_127
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 51
WaitButtonPress
CloseMessage
@@ -1577,9 +1577,9 @@ _14AC:
ScrCmd_0CD 0
Message 123
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_050 0x447
WaitFrames 0x21C, 0x800C
WaitTime 0x21C, 0x800C
ScrCmd_069 0x8004, 0x8005
FadeScreen 6, 6, 0, 0x7FFF
WaitFadeScreen

26
res/field/scripts/script_0212.s
View File

@@ -676,7 +676,7 @@ _0947:
ScrCmd_112
ScrCmd_0F8 21
ScrCmd_0F9 21
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
ScrCmd_0FD 2, 0
ScrCmd_02F 72
ScrCmd_10B 2, 0x800C
@@ -702,7 +702,7 @@ _0947:
ScrCmd_0F8 4
ScrCmd_0F9 4
PlayFanfare 0x645
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_113
FadeScreen 6, 1, 20, 0
WaitFadeScreen
@@ -738,7 +738,7 @@ _0B1B:
ApplyMovement 0, _0E64
ApplyMovement 5, _0E54
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_04E 0x483
ScrCmd_04F
ApplyMovement 0, _0E6C
@@ -753,11 +753,11 @@ _0B50:
ScrCmd_10B 0x800C, 0x800C
Call _0C47
ScrCmd_112
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0F8 24
ScrCmd_0F9 24
ScrCmd_2BB
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_2B1
ScrCmd_113
FadeScreen 6, 1, 20, 0
@@ -814,7 +814,7 @@ _0C8E:
_0C98:
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
ScrCmd_04B 0x646
Return
@@ -823,31 +823,31 @@ _0CAC:
PlayFanfare 0x646
ScrCmd_04B 0x646
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
ScrCmd_04B 0x646
Return
_0CC8:
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
ScrCmd_04B 0x646
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
ScrCmd_04B 0x646
Return
_0CEE:
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
PlayFanfare 0x646
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
PlayFanfare 0x646
ScrCmd_04B 0x646
Return

4
res/field/scripts/script_0215.s
View File

@@ -41,10 +41,10 @@ _0044:
Message 0
CloseMessage
ScrCmd_29E 2, 0x8005
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_065 1
_0059:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoToIfEq 0x8005, 0, _0059
FacePlayer
Message 1

2
res/field/scripts/script_0216.s
View File

@@ -177,7 +177,7 @@ _0201:
ScrCmd_16C 77
ScrCmd_169 77
ScrCmd_16A 77
WaitFrames 120, 0x800C
WaitTime 120, 0x800C
ScrCmd_168 7, 20, 19, 14, 77
ScrCmd_16B 77
ScrCmd_169 77

2
res/field/scripts/script_0217.s
View File

@@ -95,7 +95,7 @@ _0107:
CloseMessage
ApplyMovement 7, _0374
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 4
ApplyMovement 1, _0364
WaitMovement

4
res/field/scripts/script_0236.s
View File

@@ -456,9 +456,9 @@ _0508:
CloseMessage
ScrCmd_054 0, 30
ScrCmd_20D 0, 0x800C
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
PlayFanfare 0x5C8
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ScrCmd_050 0x478
ScrCmd_05D
GoTo _0567

2
res/field/scripts/script_0237.s
View File

@@ -33,7 +33,7 @@ _0022:
Message 0
CloseMessage
ScrCmd_20D 4, 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
_0088:
ScrCmd_20D 6, 0x800C
GoToIfEq 0x800C, 0, _0088

10
res/field/scripts/script_0273.s
View File

@@ -18,19 +18,19 @@ _0020:
PlayFanfare 0x5DC
LockAll
ScrCmd_02B 9
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_02B 10
PlayFanfare 0x5DD
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_02B 11
PlayFanfare 0x5DD
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_02B 12
PlayFanfare 0x5DD
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_02B 13
PlayFanfare 0x643
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_253 0
SetVar 0x40F3, 1
SetFlag 0x995

4
res/field/scripts/script_0274.s
View File

@@ -1200,7 +1200,7 @@ _1305:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
LockAll
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_32D
ScrCmd_338
ApplyMovement 5, _1758
@@ -1244,7 +1244,7 @@ _1305:
WaitMovement
ScrCmd_32E
ScrCmd_339
WaitFrames 2, 0x800C
WaitTime 2, 0x800C
End
_14C2:

4
res/field/scripts/script_0283.s
View File

@@ -113,7 +113,7 @@ _0118:
LockAll
Message 3
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 4
ApplyMovement 5, _01F0
WaitMovement
@@ -126,7 +126,7 @@ _0118:
ScrCmd_0CD 0
Message 6
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 5, _0204
ApplyMovement 4, _01DC
WaitMovement

2
res/field/scripts/script_0284.s
View File

@@ -37,7 +37,7 @@ _0014:
GoToIfEq 0x800C, 0, _0150
Message 3
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0, _0174
ApplyMovement 4, _01F4
WaitMovement

4
res/field/scripts/script_0286.s
View File

@@ -207,7 +207,7 @@ _019C:
WaitMovement
Message 4
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 5
CloseMessage
ScrCmd_065 0
@@ -230,7 +230,7 @@ _019C:
WaitMovement
Message 9
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 9, _0454
ApplyMovement 10, _045C
WaitMovement

10
res/field/scripts/script_0347.s
View File

@@ -188,7 +188,7 @@ _01FB:
ClearFlag 0x295
SetFlag 0x97D
ScrCmd_25F
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 2, _036C
ApplyMovement 1, _0374
ApplyMovement 3, _037C
@@ -211,12 +211,12 @@ _0296:
ScrCmd_065 2
ScrCmd_065 1
ScrCmd_065 3
WaitFrames 2, 0x800C
WaitTime 2, 0x800C
ClearFlag 0x236
ScrCmd_064 2
ScrCmd_064 1
ScrCmd_064 3
WaitFrames 2, 0x800C
WaitTime 2, 0x800C
Return
_02C0:
@@ -364,11 +364,11 @@ _03FD:
CloseMessage
ApplyMovement 0, _0460
WaitMovement
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Message 6
Message 7
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ApplyMovement 0, _0468
WaitMovement
Message 8

14
res/field/scripts/script_0349.s
View File

@@ -20,28 +20,28 @@ _0006:
WaitMovement
FadeScreen 6, 1, 1, 0
WaitFadeScreen
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ClearFlag 0x253
ScrCmd_064 2
ApplyMovement 2, _01D8
WaitMovement
PlayFanfare 0x60F
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 1
CloseMessage
PlayFanfare 0x60F
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 2
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 3
CloseMessage
PlayFanfare 0x60F
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 4
Message 5
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 2, _01E8
WaitMovement
ScrCmd_065 2
@@ -89,7 +89,7 @@ _0006:
WaitMovement
FadeScreen 6, 1, 1, 0
WaitFadeScreen
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 6
CloseMessage
ApplyMovement 3, _0250

12
res/field/scripts/script_0351.s
View File

@@ -49,10 +49,10 @@ _006F:
ScrCmd_066 46, 53
ApplyMovement 241, _01B4
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 1
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 4, _01E0
ApplyMovement 241, _01C0
WaitMovement
@@ -66,7 +66,7 @@ _006F:
WaitMovement
PlayFanfare 0x603
ScrCmd_065 4
WaitFrames 50, 0x800C
WaitTime 50, 0x800C
ApplyMovement 0xFF, _0378
ApplyMovement 5, _02AC
WaitMovement
@@ -76,7 +76,7 @@ _006F:
ApplyMovement 5, _02B8
ApplyMovement 0xFF, _0380
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0CD 1
Message 4
ScrCmd_04C 0x1E1, 0
@@ -86,7 +86,7 @@ _006F:
ApplyMovement 5, _02C0
ApplyMovement 0xFF, _0388
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 5, _02F0
WaitMovement
ScrCmd_0CE 0
@@ -95,7 +95,7 @@ _006F:
CloseMessage
ApplyMovement 5, _02E8
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CD 1
Message 7
CloseMessage

14
res/field/scripts/script_0353.s
View File

@@ -22,29 +22,29 @@ _0010:
CloseMessage
SetFlag 0x1DF
ScrCmd_065 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
ClearFlag 0x1DF
ScrCmd_064 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
SetFlag 0x1DF
ScrCmd_065 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
ClearFlag 0x1DF
ScrCmd_064 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
SetFlag 0x1DF
ScrCmd_065 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
ClearFlag 0x1DF
ScrCmd_064 0
WaitFrames 8, 0x800C
WaitTime 8, 0x800C
SetFlag 0x1DF
ScrCmd_065 0
ScrCmd_21C 0
Message 1
CloseMessage
GoToIfEq 0x4059, 3, _0184
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_1BD 0x800C
GoToIfEq 0x800C, 0, _00DE
GoToIfEq 0x800C, 1, _00EE

2
res/field/scripts/script_0357.s
View File

@@ -73,7 +73,7 @@ _00D3:
FacePlayer
ApplyMovement 1, _013C
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 1
CloseMessage
ScrCmd_0E5 0x198, 0

4
res/field/scripts/script_0360.s
View File

@@ -11,7 +11,7 @@ _0006:
ScrCmd_066 0x8004, 0x8005
ApplyMovement 241, _0228
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 2, _01C4
WaitMovement
ScrCmd_0CE 0
@@ -45,7 +45,7 @@ _0006:
WaitMovement
Message 4
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 2, _01CC
WaitMovement
Message 5

4
res/field/scripts/script_0363.s
View File

@@ -63,7 +63,7 @@ _00D8:
_00E3:
Message 2
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
FadeScreen 6, 3, 0, 0
WaitFadeScreen
FadeScreen 6, 3, 1, 0
@@ -74,7 +74,7 @@ _00E3:
WaitFadeScreen
FadeScreen 6, 6, 0, 0
WaitFadeScreen
WaitFrames 120, 0x800C
WaitTime 120, 0x800C
ScrCmd_0BE 43, 0, 8, 6, 1
FadeScreen 6, 6, 1, 0
WaitFadeScreen

4
res/field/scripts/script_0364.s
View File

@@ -33,7 +33,7 @@ _0032:
ScrCmd_0CD 1
Message 0
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 11, _02D0
WaitMovement
Message 1
@@ -62,7 +62,7 @@ _0032:
ScrCmd_0CD 1
Message 4
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CallIfLt 0x409E, 1, _019E
CallIfGe 0x409E, 1, _01A3
CloseMessage

2
res/field/scripts/script_0367.s
View File

@@ -857,7 +857,7 @@ _0E58:
Call _0734
ScrCmd_330
Message 32
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_136
ScrCmd_135 3
GoTo _05EC

2
res/field/scripts/script_0371.s
View File

@@ -43,7 +43,7 @@ _0070:
Return
_007D:
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
SetVar 0x40D8, 1
ScrCmd_1DD 43, 0, 0x800C
SetVar 0x8008, 0x800C

10
res/field/scripts/script_0372.s
View File

@@ -55,7 +55,7 @@ _00BE:
_00CB:
ScrCmd_1DD 43, 0, 0x800C
GoToIfEq 0x800C, 3, _0114
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
SetVar 0x40D8, 1
FadeScreen 6, 1, 0, 0
WaitFadeScreen
@@ -66,7 +66,7 @@ _00CB:
End
_0114:
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
SetVar 0x40D8, 1
ScrCmd_136
ScrCmd_135 6
@@ -120,11 +120,11 @@ _01DF:
Call _04C5
Call _0529
ScrCmd_1FE 0
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
Call _0535
ScrCmd_1FE 1
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
Call _0505
ScrCmd_136
@@ -261,7 +261,7 @@ _0452:
_0474:
Message 11
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_136
ScrCmd_135 7
CloseMessage

2
res/field/scripts/script_0376.s
View File

@@ -270,7 +270,7 @@ _0449:
_0464:
ScrCmd_02E 9
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_136
ScrCmd_135 169
CloseMessage

2
res/field/scripts/script_0377.s
View File

@@ -437,7 +437,7 @@ _074B:
_0766:
ScrCmd_02E 9
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_136
ScrCmd_135 109
CloseMessage

2
res/field/scripts/script_0378.s
View File

@@ -318,7 +318,7 @@ _0558:
_0573:
ScrCmd_02E 32
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_136
ScrCmd_135 137
CloseMessage

2
res/field/scripts/script_0379.s
View File

@@ -321,7 +321,7 @@ _0564:
_057F:
ScrCmd_02E 32
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_136
ScrCmd_135 155
CloseMessage

2
res/field/scripts/script_0380.s
View File

@@ -62,7 +62,7 @@ _0070:
ApplyMovement 0xFF, _0160
ApplyMovement 128, _01B4
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_322
Message 3
WaitButtonPress

18
res/field/scripts/script_0409.s
View File

@@ -52,12 +52,12 @@ _00AE:
CloseMessage
ScrCmd_0C5 0x8004
ScrCmd_29E 0, 0x8005
WaitFrames 7, 0x800C
WaitTime 7, 0x800C
ScrCmd_065 0x800D
ScrCmd_201 0x8004
ScrCmd_1CD 19, 0x8004, 0, 0, 0
_00E8:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoToIfEq 0x8005, 0, _00E8
GoTo _066D
End
@@ -69,12 +69,12 @@ _0103:
CloseMessage
ScrCmd_0C5 0x8000
ScrCmd_29E 0, 0x8005
WaitFrames 7, 0x800C
WaitTime 7, 0x800C
ScrCmd_065 0x800D
ScrCmd_201 0x8004
ScrCmd_1CD 19, 0x8004, 0, 0, 0
_0133:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoToIfEq 0x8005, 0, _0133
ReleaseAll
End
@@ -153,12 +153,12 @@ _0284:
CloseMessage
ScrCmd_0C5 0x8004
ScrCmd_29E 1, 0x8005
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_065 0x800D
ScrCmd_201 0x8004
ScrCmd_1CD 24, 0x8004, 0, 0, 0
_02B2:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoToIfEq 0x8005, 0, _02B2
GoTo _066D
End
@@ -170,12 +170,12 @@ _02CD:
CloseMessage
ScrCmd_0C5 0x8000
ScrCmd_29E 1, 0x8005
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
ScrCmd_065 0x800D
ScrCmd_201 0x8004
ScrCmd_1CD 24, 0x8004, 0, 0, 0
_02FD:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoToIfEq 0x8005, 0, _02FD
ReleaseAll
End
@@ -399,7 +399,7 @@ _064C:
ScrCmd_0C5 0x8000
ScrCmd_1D0 1
ScrCmd_0C3
WaitFrames 42, 0x800C
WaitTime 42, 0x800C
GoTo _0675
_066D:

2
res/field/scripts/script_0417.s
View File

@@ -167,7 +167,7 @@ _02DF:
LockAll
ApplyMovement 0xFF, _212C
WaitMovement
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Message 1
CloseMessage
ReleaseAll

2
res/field/scripts/script_0420.s
View File

@@ -49,7 +49,7 @@ _009A:
ScrCmd_066 0x8004, 0x8005
ApplyMovement 241, _00E8
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CE 0
ScrCmd_0CD 1
Message 0

10
res/field/scripts/script_0424.s
View File

@@ -7,7 +7,7 @@
_0006:
LockAll
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
SetVar 0x8005, 0x8000
ScrCmd_28C 0x8000
ScrCmd_059 0x800C
@@ -27,14 +27,14 @@ _0054:
Message 1
ScrCmd_05A 0x800C
SetVar 0x8004, 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_055 10
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
GoToIfEq 0x8004, 0, _00BA
ScrCmd_05B
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_05C
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_28D
ScrCmd_0D6 0, 0x8005
Message 2

2
res/field/scripts/script_0426.s
View File

@@ -81,7 +81,7 @@ _00D0:
ScrCmd_1D8 0x800C
GoToIfEq 0x800C, 1, _00BA
GoToIfEq 0x800C, 2, _00C5
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Call _0085
ScrCmd_1D7 0
Call _0097

18
res/field/scripts/script_0427.s
View File

@@ -109,7 +109,7 @@ _016F:
WaitMovement
Message 4
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 2, _0728
ApplyMovement 0xFF, _0878
WaitMovement
@@ -139,7 +139,7 @@ _016F:
WaitMovement
Message 10
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ApplyMovement 5, _07D0
WaitMovement
Message 11
@@ -204,7 +204,7 @@ _030B:
CloseMessage
ApplyMovement 5, _07D8
WaitMovement
WaitFrames 25, 0x800C
WaitTime 25, 0x800C
ClearFlag 0x179
ScrCmd_064 6
ScrCmd_062 6
@@ -223,7 +223,7 @@ _036E:
WaitMovement
ClearFlag 0x17D
ScrCmd_064 12
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 23
Message 26
ApplyMovement 6, _08D0
@@ -239,7 +239,7 @@ _03A6:
WaitMovement
ClearFlag 0x17D
ScrCmd_064 12
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 25
Message 27
ApplyMovement 6, _08D0
@@ -253,7 +253,7 @@ _03DE:
CloseMessage
ApplyMovement 5, _07F0
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 31
ApplyMovement 2, _0778
WaitMovement
@@ -336,7 +336,7 @@ _0512:
ScrCmd_0CE 0
Message 43
CloseMessage
WaitFrames 40, 0x800C
WaitTime 40, 0x800C
ApplyMovement 2, _07A8
ApplyMovement 0xFF, _08BC
WaitMovement
@@ -400,7 +400,7 @@ _0618:
CloseMessage
SetVar 0x4086, 2
SetVar 0x40A4, 3
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
FadeScreen 6, 3, 0, 0
WaitFadeScreen
ScrCmd_14E
@@ -1079,7 +1079,7 @@ _0CF1:
SetFlag 0x195
SetVar 0x4082, 4
SetFlag 0x196
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
FadeScreen 6, 3, 0, 0
WaitFadeScreen
ScrCmd_0BE 0x19E, 0, 2, 6, 0

4
res/field/scripts/script_0428.s
View File

@@ -393,11 +393,11 @@ _04C4:
ApplyMovement 3, _0690
ApplyMovement 0xFF, _06D0
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
CallIfEq 0x8000, 0, _065D
CallIfEq 0x8000, 1, _0662
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_052
CallIfEq 0x8002, 0, _05D1
CallIfEq 0x8002, 1, _05E5

2
res/field/scripts/script_0447.s
View File

@@ -75,7 +75,7 @@ _00CA:
ScrCmd_065 28
ScrCmd_065 26
ScrCmd_065 19
WaitFrames 45, 0x800C
WaitTime 45, 0x800C
ScrCmd_069 0x8004, 0x8005
GoToIfEq 0x8004, 0x230, _015B
GoToIfEq 0x8004, 0x231, _016F

8
res/field/scripts/script_0458.s
View File

@@ -106,14 +106,14 @@ _012F:
Message 13
PlayFanfare 0x5E6
ScrCmd_04B 0x5E6
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 14
WaitFrames 32, 0x800C
WaitTime 32, 0x800C
ScrCmd_04E 0x483
ScrCmd_0D4 1, 0x8003
Message 15
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0245
End
@@ -139,7 +139,7 @@ _0224:
Message 8
ScrCmd_04E 0x483
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0245
End

28
res/field/scripts/script_0461.s
View File

@@ -33,11 +33,11 @@ _004B:
_0056:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
WaitFrames 40, 0x800C
WaitTime 40, 0x800C
FadeScreen 6, 1, 1, 0
WaitFadeScreen
Call _008A
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ScrCmd_1E5 116
GoTo _0150
@@ -362,9 +362,9 @@ _0574:
_05A5:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 2
WaitButtonPress
CloseMessage
@@ -373,9 +373,9 @@ _05A5:
_05C4:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 3
WaitButtonPress
CloseMessage
@@ -384,9 +384,9 @@ _05C4:
_05E3:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 4
WaitButtonPress
CloseMessage
@@ -395,9 +395,9 @@ _05E3:
_0602:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 5
ScrCmd_04E 0x483
Message 8
@@ -411,9 +411,9 @@ _0602:
_0633:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 6
ScrCmd_04E 0x483
Message 8
@@ -427,9 +427,9 @@ _0633:
_0664:
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
Call _00ED
WaitFrames 10, 0x800C
WaitTime 10, 0x800C
Message 7
ScrCmd_04E 0x483
Message 8

2
res/field/scripts/script_0479.s
View File

@@ -398,7 +398,7 @@ _04F6:
ScrCmd_014 0x7D9
Message 4
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0xFF, _0570
WaitMovement
ApplyMovement 1, _0564

6
res/field/scripts/script_0485.s
View File

@@ -96,14 +96,14 @@ _0124:
CloseMessage
GoToIfEq 0x800C, 1, _0124
Call _029A
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_054 0, 10
FadeScreen 6, 6, 0, 0x7FFF
WaitFadeScreen
ScrCmd_270 3, 1
ScrCmd_333 0
ScrCmd_0BE 0x18F, 0, 0x38C, 0x1EC, 0
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
FadeScreen 6, 6, 1, 0x7FFF
WaitFadeScreen
Call _02B8
@@ -131,7 +131,7 @@ _01F5:
WaitMovement
ApplyMovement 0xFF, _0438
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 11
Return

4
res/field/scripts/script_0489.s
View File

@@ -21,7 +21,7 @@ _0012:
CloseMessage
ApplyMovement 3, _0160
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CE 1
Message 6
CloseMessage
@@ -43,7 +43,7 @@ _0012:
ApplyMovement 3, _0170
ApplyMovement 0xFF, _0108
WaitMovement
WaitFrames 5, 0x800C
WaitTime 5, 0x800C
ScrCmd_0CE 1
Message 10
Message 11

2
res/field/scripts/script_0498.s
View File

@@ -27,7 +27,7 @@ _0050:
GoTo _0068
_0059:
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 2
GoTo _0068

4
res/field/scripts/script_1052.s
View File

@@ -397,7 +397,7 @@ _04D0:
WaitMovement
PlayFanfare 0x602
Message 0
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_014 0x7FA
ApplyMovement 2, _059C
WaitMovement
@@ -408,7 +408,7 @@ _04D0:
ApplyMovement 0xFF, _0570
ApplyMovement 2, _05B0
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_0CE 0
Message 2
CloseMessage

8
res/field/scripts/script_1055.s
View File

@@ -40,7 +40,7 @@ _0064:
ScrCmd_0CE 1
Message 0
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0, _00CC
WaitMovement
SetVar 0x40A4, 1
@@ -117,16 +117,16 @@ _0170:
_017C:
LockAll
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ApplyMovement 0, _01D4
ApplyMovement 0xFF, _01F8
WaitMovement
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0CE 0
ScrCmd_0CD 1
Message 6
CloseMessage
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_0CD 0
Message 7
ScrCmd_15A

2
res/field/scripts/script_1059.s
View File

@@ -474,7 +474,7 @@ _057C:
ScrCmd_169 77
ScrCmd_16A 77
ScrCmd_065 14
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_14D 0x800C
GoToIfEq 0x800C, 0, _0610
GoToIfEq 0x800C, 1, _061D

10
res/field/scripts/script_1064.s
View File

@@ -196,7 +196,7 @@ _02BC:
WaitMovement
ApplyMovement 0xFF, _04BC
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_14D 0x800C
GoToIfEq 0x800C, 0, _02FC
GoTo _0316
@@ -225,7 +225,7 @@ _0330:
ApplyMovement 0, _047C
ApplyMovement 0xFF, _04B4
WaitMovement
WaitFrames 35, 0x800C
WaitTime 35, 0x800C
SetFlag 0x993
ScrCmd_050 0x44A
Message 9
@@ -256,7 +256,7 @@ _0394:
CloseMessage
ApplyMovement 3, _04A0
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ScrCmd_14D 0x800C
GoToIfEq 0x800C, 0, _03DA
GoTo _03E8
@@ -566,7 +566,7 @@ _0677:
CloseMessage
ApplyMovement 0, _080C
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 34
CloseMessage
ApplyMovement 4, _088C
@@ -593,7 +593,7 @@ _0677:
ScrCmd_065 4
Message 42
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
ApplyMovement 0xFF, _0878
WaitMovement
ScrCmd_0CD 0

2
res/field/scripts/script_1086.s
View File

@@ -249,7 +249,7 @@ _0294:
WaitMovement
SetVar 0x4074, 2
SetFlag 0x299
WaitFrames 12, 0x800C
WaitTime 12, 0x800C
Message 11
WaitButtonPress
CloseMessage

4
res/field/scripts/script_1095.s
View File

@@ -113,7 +113,7 @@ _01C3:
SetVar 0x4074, 1
Message 11
CloseMessage
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_065 1
@@ -509,7 +509,7 @@ _0596:
ApplyMovement 2, _07F0
ApplyMovement 0xFF, _0858
WaitMovement
WaitFrames 15, 0x800C
WaitTime 15, 0x800C
Message 18
ScrCmd_069 0x8004, 0x8005
CallIfEq 0x8004, 9, _0713

8
res/field/scripts/script_1103.s
View File

@@ -81,14 +81,14 @@ _00FD:
Message 13
PlayFanfare 0x5E6
ScrCmd_04B 0x5E6
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
Message 14
WaitFrames 32, 0x800C
WaitTime 32, 0x800C
ScrCmd_04E 0x483
ScrCmd_0D4 1, 0x8003
Message 15
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0213
End
@@ -114,7 +114,7 @@ _01F2:
Message 8
ScrCmd_04E 0x483
ScrCmd_04F
WaitFrames 16, 0x800C
WaitTime 16, 0x800C
GoTo _0213
End

4
res/field/scripts/script_1109.s
View File

@@ -23,7 +23,7 @@ _002F:
_003F:
LockAll
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
ScrCmd_22F 0x8004
GoToIfLt 0x8004, 10, _0078
SetVar 0x40A7, 1
@@ -39,7 +39,7 @@ _003F:
_0078:
Message 0
CloseMessage
WaitFrames 20, 0x800C
WaitTime 20, 0x800C
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_0BE 0x1C9, 0, 0x338, 0x1C6, 1

8
res/field/scripts/script_1111.s
View File

@@ -37,7 +37,7 @@ _0048:
GoTo _0152
_008F:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 0x1CE, 0, 18, 2, 1
GoToIfEq 0x40CE, 0, _0164
@@ -47,7 +47,7 @@ _008F:
GoTo _0147
_00CA:
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
ScrCmd_11C 0x40CE
ScrCmd_11B 0x1CD, 1, 18, 2, 1
GoToIfEq 0x40CE, 1, _0164
@@ -84,14 +84,14 @@ _0147:
_0152:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
CloseMessage
ReleaseAll
End
_0164:
SetVar 0x40CE, -1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
Message 3
WaitButtonPress
CloseMessage

4
res/field/scripts/script_1112.s
View File

@@ -1010,13 +1010,13 @@ _0D6E:
ScrCmd_2FA 0x8004
ScrCmd_2F8
SetVar 0x8007, 0
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
GoTo _0D88
End
_0D88:
AddVar 0x8007, 1
WaitFrames 1, 0x800C
WaitTime 1, 0x800C
DebugWatch 0x8007
ScrCmd_2FC 0x800C
GoToIfEq 0x800C, 1, _0DC2

58
res/field/scripts/script_1118.s
View File

@@ -93,7 +93,7 @@ _019F:
ScrCmd_139 5
ScrCmd_13F 1, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 1
CloseMessage
FadeScreen 6, 1, 0, 0
@@ -118,7 +118,7 @@ _0219:
ScrCmd_139 7
ScrCmd_13F 1, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 3
CloseMessage
FadeScreen 6, 1, 0, 0
@@ -148,7 +148,7 @@ _02A4:
ScrCmd_139 6
ScrCmd_13F 1, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 2
CloseMessage
FadeScreen 6, 1, 0, 0
@@ -260,7 +260,7 @@ _0476:
_0486:
Message 38
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
ScrCmd_13B
ReleaseAll
@@ -288,7 +288,7 @@ _04AD:
GoToIfEq 0x800C, 2, _0486
ScrCmd_13F 13, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
@@ -301,7 +301,7 @@ _04AD:
_0522:
ScrCmd_13F 16, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_13B
CloseMessage
ReleaseAll
@@ -319,7 +319,7 @@ _053A:
GoToIfEq 0x800C, 2, _0486
ScrCmd_13F 14, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
@@ -345,7 +345,7 @@ _05AF:
GoToIfEq 0x800C, 2, _0486
ScrCmd_13F 15, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
@@ -358,7 +358,7 @@ _05AF:
_0646:
ScrCmd_13F 17, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
ScrCmd_13B
ReleaseAll
@@ -367,7 +367,7 @@ _0646:
_065E:
ScrCmd_13F 18, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
ReleaseAll
End
@@ -375,7 +375,7 @@ _065E:
_0674:
ScrCmd_13F 26, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
ReleaseAll
End
@@ -383,7 +383,7 @@ _0674:
_068A:
ScrCmd_13F 21, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
CloseMessage
ReleaseAll
End
@@ -391,28 +391,28 @@ _068A:
_06A0:
ScrCmd_13F 3, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
End
_06B8:
ScrCmd_13F 4, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
End
_06D0:
ScrCmd_13F 5, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
End
_06E8:
ScrCmd_13F 6, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
.byte 2
@@ -445,7 +445,7 @@ _06E8:
_0718:
ScrCmd_13F 8, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
End
@@ -469,14 +469,14 @@ _0753:
_075E:
ScrCmd_13F 8, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _07AE
End
_0776:
ScrCmd_13F 23, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 101
CloseMessage
ScrCmd_13E
@@ -486,7 +486,7 @@ _0776:
_0792:
ScrCmd_13F 24, 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 101
CloseMessage
ScrCmd_13E
@@ -535,7 +535,7 @@ _0853:
GoToIfEq 0x800C, 7, _0B58
ScrCmd_2AF 0x800C
MessageVar 0x800C
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 1
CloseMessage
ScrCmd_139 5
@@ -564,7 +564,7 @@ _08C7:
ScrCmd_144 0x800C
GoToIfEq 0x800C, 7, _0B78
Message 27
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 3
CloseMessage
ScrCmd_139 7
@@ -600,7 +600,7 @@ _095C:
ScrCmd_144 0x800C
GoToIfEq 0x800C, 7, _0B78
Message 22
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 2
CloseMessage
ScrCmd_139 6
@@ -643,7 +643,7 @@ _0A28:
ScrCmd_144 0x800C
GoToIfEq 0x800C, 7, _0B78
Message 31
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 5
CloseMessage
ScrCmd_139 2
@@ -666,7 +666,7 @@ _0A82:
ScrCmd_144 0x800C
GoToIfEq 0x800C, 7, _0B78
Message 34
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 6
CloseMessage
ScrCmd_139 13
@@ -687,7 +687,7 @@ _0AED:
ScrCmd_144 0x800C
GoToIfEq 0x800C, 7, _0B78
Message 19
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
ScrCmd_135 4
CloseMessage
ScrCmd_139 1
@@ -713,19 +713,19 @@ _0B58:
_0B63:
ScrCmd_139 11
Message 25
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _0B9A
End
_0B78:
Message 8
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _0B9A
End
_0B89:
Message 10
WaitFrames 30, 0x800C
WaitTime 30, 0x800C
GoTo _0B9A
End

6
src/unk_0203F6C4.c
View File

@@ -245,7 +245,7 @@ typedef struct {
static BOOL ScrCmd_Noop(ScriptContext * ctx);
static BOOL ScrCmd_Dummy(ScriptContext * ctx);
static BOOL ScrCmd_End(ScriptContext * ctx);
static BOOL ScrCmd_WaitFrames(ScriptContext * ctx);
static BOOL ScrCmd_WaitTime(ScriptContext * ctx);
static BOOL ScriptContext_DecrementTimer(ScriptContext * ctx);
static BOOL ScrCmd_004(ScriptContext * ctx);
static BOOL ScrCmd_005(ScriptContext * ctx);
@@ -776,7 +776,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_Noop,
ScrCmd_Dummy,
ScrCmd_End,
ScrCmd_WaitFrames,
ScrCmd_WaitTime,
ScrCmd_004,
ScrCmd_005,
ScrCmd_006,
@@ -1633,7 +1633,7 @@ static BOOL ScrCmd_End (ScriptContext * ctx)
return FALSE;
}
static BOOL ScrCmd_WaitFrames (ScriptContext * ctx)
static BOOL ScrCmd_WaitTime (ScriptContext * ctx)
{
FieldSystem *fieldSystem = ctx->fieldSystem;
u16 frames = ScriptContext_ReadHalfWord(ctx);