diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 69e8b9077c..a9a1226e52 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -189,48 +189,46 @@ .short \arg1 .endm - .macro ScrCmd_022 arg0 + .macro SetFlagFromVar varID .short 34 - .short \arg0 + .short \varID .endm - .macro ScrCmd_023 arg0 + .macro SetTrainerFlag trainerID .short 35 - .short \arg0 + .short \trainerID .endm - .macro ScrCmd_024 arg0 + .macro ClearTrainerFlag trainerID .short 36 - .short \arg0 + .short \trainerID .endm - .macro ScrCmd_025 arg0 + .macro CheckTrainerFlag trainerID .short 37 - .short \arg0 + .short \trainerID .endm - .macro ScrCmd_026 arg0, arg1 + .macro AddVar destVarID, valueOrVarID .short 38 - .short \arg0 - .short \arg1 + .short \destVarID + .short \valueOrVarID .endm - .macro ScrCmd_027 arg0, arg1 + .macro SubVar destVarID, valueOrVarID .short 39 - .short \arg0 - .short \arg1 + .short \destVarID + .short \valueOrVarID .endm - .macro ScrCmd_028 arg0, arg1 - .short 40 - .short \arg0 - .short \arg1 - .endm - - .macro ScrCmd_029 arg0, arg1 - .short 41 - .short \arg0 - .short \arg1 + .macro SetVar destVarID, valueOrVarID + .if \valueOrVarID < 0x4000 + .short 40 // SetVarFromValue + .else + .short 41 // SetVarFromVar + .endif + .short \destVarID + .short \valueOrVarID .endm .macro ScrCmd_02A arg0, arg1 @@ -509,13 +507,13 @@ .short 93 .endm - .macro ScrCmd_05E arg0, arg1 + .macro ApplyMovement localID, movementOffset .short 94 - .short \arg0 - .long \arg1-.-4 + .short \localID + .long \movementOffset-.-4 .endm - .macro ScrCmd_05F + .macro WaitMovement .short 95 .endm @@ -3497,7 +3495,7 @@ .short \arg0 .endm - .macro ScrCmd_289 arg0, arg1, arg2, arg3, arg4, arg5 + .macro ScrCmd_289 arg0, arg1, arg2, arg3, arg4, arg5, arg6 .short 649 .short \arg0 .short \arg1 @@ -3505,6 +3503,7 @@ .short \arg3 .short \arg4 .short \arg5 + .short \arg6 .endm .macro ScrCmd_28A arg0 diff --git a/res/field/scripts/script_0002.s b/res/field/scripts/script_0002.s index f7c519b210..018b2723fb 100644 --- a/res/field/scripts/script_0002.s +++ b/res/field/scripts/script_0002.s @@ -57,11 +57,11 @@ _00C2: Return _00D8: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _00E0: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _00E8: @@ -94,10 +94,10 @@ _0149: ClearFlag 0x17A ScrCmd_064 7 ScrCmd_062 7 - ScrCmd_05E 7, _043C - ScrCmd_05F - ScrCmd_05E 7, _044C - ScrCmd_05F + ApplyMovement 7, _043C + WaitMovement + ApplyMovement 7, _044C + WaitMovement ScrCmd_014 0x7F8 ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -195,11 +195,11 @@ _02B6: Return _02BB: - ScrCmd_05E 7, _0474 - ScrCmd_05E 0xFF, _04F8 - ScrCmd_05F + ApplyMovement 7, _0474 + ApplyMovement 0xFF, _04F8 + WaitMovement ScrCmd_065 7 - ScrCmd_028 0x4077, 1 + SetVar 0x4077, 1 ScrCmd_061 End @@ -215,41 +215,41 @@ _02DB: End _030C: - ScrCmd_05E 7, _0454 - ScrCmd_05E 0xFF, _04B4 - ScrCmd_05F + ApplyMovement 7, _0454 + ApplyMovement 0xFF, _04B4 + WaitMovement Return _0320: - ScrCmd_05E 7, _046C - ScrCmd_05E 0xFF, _04D4 - ScrCmd_05F + ApplyMovement 7, _046C + ApplyMovement 0xFF, _04D4 + WaitMovement Return _0334: - ScrCmd_05E 7, _0460 - ScrCmd_05E 0xFF, _04C4 - ScrCmd_05F + ApplyMovement 7, _0460 + ApplyMovement 0xFF, _04C4 + WaitMovement Return _0348: - ScrCmd_05E 31, _0518 - ScrCmd_05F - ScrCmd_05E 31, _0544 - ScrCmd_05E 7, _047C - ScrCmd_05E 0xFF, _04DC - ScrCmd_05F + ApplyMovement 31, _0518 + WaitMovement + ApplyMovement 31, _0544 + ApplyMovement 7, _047C + ApplyMovement 0xFF, _04DC + WaitMovement Return _036E: - ScrCmd_05E 31, _0550 - ScrCmd_05F + ApplyMovement 31, _0550 + WaitMovement ScrCmd_014 0x807 ScrCmd_02C 12 ScrCmd_02C 13 ScrCmd_034 - ScrCmd_05E 7, _0484 - ScrCmd_05F + ApplyMovement 7, _0484 + WaitMovement Return _0390: @@ -272,33 +272,33 @@ _03BB: _03C0: ScrCmd_02C 20 - ScrCmd_028 0x8004, 0x1D1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1D1 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 21 ScrCmd_034 - ScrCmd_05E 31, _055C - ScrCmd_05F + ApplyMovement 31, _055C + WaitMovement ScrCmd_02C 22 ScrCmd_034 - ScrCmd_05E 7, _04A4 - ScrCmd_05E 0xFF, _0504 - ScrCmd_05E 31, _0574 - ScrCmd_05F + ApplyMovement 7, _04A4 + ApplyMovement 0xFF, _0504 + ApplyMovement 31, _0574 + WaitMovement ScrCmd_187 31, 186, 0, 0x2F4, 1 ScrCmd_186 31, 186, 0x2F4 ScrCmd_014 0x808 Return _041B: - ScrCmd_05E 7, _048C - ScrCmd_05E 0xFF, _04EC - ScrCmd_05F + ApplyMovement 7, _048C + ApplyMovement 0xFF, _04EC + WaitMovement Return _042F: - ScrCmd_05E 7, _0498 - ScrCmd_05F + ApplyMovement 7, _0498 + WaitMovement Return .balign 4, 0 @@ -496,35 +496,35 @@ _05D0: End _0601: - ScrCmd_05E 26, _0680 - ScrCmd_05F + ApplyMovement 26, _0680 + WaitMovement ScrCmd_02C 91 ScrCmd_034 - ScrCmd_05E 26, _06B0 - ScrCmd_05E 0xFF, _06F8 - ScrCmd_05F + ApplyMovement 26, _06B0 + ApplyMovement 0xFF, _06F8 + WaitMovement GoTo _067C End _062A: - ScrCmd_05E 26, _0690 - ScrCmd_05F + ApplyMovement 26, _0690 + WaitMovement ScrCmd_02C 91 ScrCmd_034 - ScrCmd_05E 26, _06C8 - ScrCmd_05E 0xFF, _06F8 - ScrCmd_05F + ApplyMovement 26, _06C8 + ApplyMovement 0xFF, _06F8 + WaitMovement GoTo _067C End _0653: - ScrCmd_05E 26, _06A0 - ScrCmd_05F + ApplyMovement 26, _06A0 + WaitMovement ScrCmd_02C 91 ScrCmd_034 - ScrCmd_05E 26, _06E0 - ScrCmd_05E 0xFF, _06F8 - ScrCmd_05F + ApplyMovement 26, _06E0 + ApplyMovement 0xFF, _06F8 + WaitMovement GoTo _067C End @@ -599,39 +599,39 @@ _0700: End _073E: - ScrCmd_05E 0xFF, _0894 - ScrCmd_05E 31, _08B4 - ScrCmd_05F + ApplyMovement 0xFF, _0894 + ApplyMovement 31, _08B4 + WaitMovement GoTo _07A6 End _0758: - ScrCmd_05E 0xFF, _0894 - ScrCmd_05E 31, _08CC - ScrCmd_05F + ApplyMovement 0xFF, _0894 + ApplyMovement 31, _08CC + WaitMovement GoTo _07A6 End _0772: - ScrCmd_05E 0xFF, _0894 - ScrCmd_05E 31, _08E4 - ScrCmd_05F + ApplyMovement 0xFF, _0894 + ApplyMovement 31, _08E4 + WaitMovement GoTo _07A6 End _078C: - ScrCmd_05E 0xFF, _0894 - ScrCmd_05E 31, _08FC - ScrCmd_05F + ApplyMovement 0xFF, _0894 + ApplyMovement 31, _08FC + WaitMovement GoTo _07A6 End _07A6: Call _07FC ScrCmd_034 - ScrCmd_05E 0xFF, _08AC - ScrCmd_05E 31, _0914 - ScrCmd_05F + ApplyMovement 0xFF, _08AC + ApplyMovement 31, _0914 + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x2F5 GoToIf 1, _0846 @@ -676,26 +676,26 @@ _0841: Return _0846: - ScrCmd_05E 31, _0924 - ScrCmd_05F + ApplyMovement 31, _0924 + WaitMovement GoTo _088E End _0858: - ScrCmd_05E 31, _0930 - ScrCmd_05F + ApplyMovement 31, _0930 + WaitMovement GoTo _088E End _086A: - ScrCmd_05E 31, _093C - ScrCmd_05F + ApplyMovement 31, _093C + WaitMovement GoTo _088E End _087C: - ScrCmd_05E 31, _0948 - ScrCmd_05F + ApplyMovement 31, _0948 + WaitMovement GoTo _088E End @@ -796,8 +796,8 @@ _0954: Call _0821 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 31, _09D4 - ScrCmd_05F + ApplyMovement 31, _09D4 + WaitMovement ScrCmd_061 End @@ -805,8 +805,8 @@ _097F: ScrCmd_02C 35 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 31, _09D4 - ScrCmd_05F + ApplyMovement 31, _09D4 + WaitMovement ScrCmd_061 End @@ -816,16 +816,16 @@ _0994: GoToIf 1, _09BD ScrCmd_02C 36 ScrCmd_034 - ScrCmd_05E 31, _1558 - ScrCmd_05F + ApplyMovement 31, _1558 + WaitMovement ScrCmd_02C 38 Return _09BD: ScrCmd_02C 37 ScrCmd_034 - ScrCmd_05E 31, _1558 - ScrCmd_05F + ApplyMovement 31, _1558 + WaitMovement ScrCmd_02C 38 Return @@ -836,8 +836,8 @@ _09D4: _09DC: ScrCmd_060 - ScrCmd_05E 18, _0E94 - ScrCmd_05F + ApplyMovement 18, _0E94 + WaitMovement ScrCmd_02C 64 ScrCmd_034 ScrCmd_069 0x8000, 0x8001 @@ -850,23 +850,23 @@ _09DC: End _0A1C: - ScrCmd_05E 16, _0EBC - ScrCmd_05E 0xFF, _0DD0 - ScrCmd_05F + ApplyMovement 16, _0EBC + ApplyMovement 0xFF, _0DD0 + WaitMovement GoTo _0A6A End _0A36: - ScrCmd_05E 16, _0EBC - ScrCmd_05E 0xFF, _0DE4 - ScrCmd_05F + ApplyMovement 16, _0EBC + ApplyMovement 0xFF, _0DE4 + WaitMovement GoTo _0A6A End _0A50: - ScrCmd_05E 16, _0EBC - ScrCmd_05E 0xFF, _0DF8 - ScrCmd_05F + ApplyMovement 16, _0EBC + ApplyMovement 0xFF, _0DF8 + WaitMovement GoTo _0A6A End @@ -874,22 +874,22 @@ _0A6A: ScrCmd_0CD 0 ScrCmd_0CF 1 ScrCmd_02C 65 - ScrCmd_05E 18, _0E94 - ScrCmd_05F + ApplyMovement 18, _0E94 + WaitMovement ScrCmd_02C 66 - ScrCmd_05E 16, _0EC8 - ScrCmd_05F + ApplyMovement 16, _0EC8 + WaitMovement ScrCmd_02C 67 - ScrCmd_05E 16, _0ED0 - ScrCmd_05F + ApplyMovement 16, _0ED0 + WaitMovement ScrCmd_02C 68 - ScrCmd_05E 17, _0E9C - ScrCmd_05E 18, _0E9C - ScrCmd_05F + ApplyMovement 17, _0E9C + ApplyMovement 18, _0E9C + WaitMovement ScrCmd_02C 69 ScrCmd_02C 70 - ScrCmd_05E 7, _0E44 - ScrCmd_05F + ApplyMovement 7, _0E44 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0ADC @@ -913,33 +913,33 @@ _0AED: _0AFE: ScrCmd_034 - ScrCmd_05E 16, _0F00 - ScrCmd_05F - ScrCmd_05E 7, _0E4C - ScrCmd_05E 0xFF, _0F30 - ScrCmd_05F + ApplyMovement 16, _0F00 + WaitMovement + ApplyMovement 7, _0E4C + ApplyMovement 0xFF, _0F30 + WaitMovement Call _0BAA ScrCmd_2A0 0x8004, 0x19E, 0x19F ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0DB7 - ScrCmd_05E 18, _0EB4 - ScrCmd_05F + ApplyMovement 18, _0EB4 + WaitMovement ScrCmd_02C 73 ScrCmd_034 - ScrCmd_05E 17, _0EA4 - ScrCmd_05E 18, _0EAC - ScrCmd_05F + ApplyMovement 17, _0EA4 + ApplyMovement 18, _0EAC + WaitMovement ScrCmd_065 17 ScrCmd_065 18 SetFlag 0x19C - ScrCmd_05E 16, _0EF8 - ScrCmd_05E 7, _0E54 - ScrCmd_05F + ApplyMovement 16, _0EF8 + ApplyMovement 7, _0E54 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 74 - ScrCmd_05E 7, _0E60 - ScrCmd_05F + ApplyMovement 7, _0E60 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0C30 @@ -957,24 +957,24 @@ _0BAA: _0BCA: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x268 + SetVar 0x8004, 0x268 CompareVarToValue 0x800C, 0x186 GoToIf 1, _0C2E - ScrCmd_028 0x8004, 0x269 + SetVar 0x8004, 0x269 CompareVarToValue 0x800C, 0x189 GoToIf 1, _0C2E - ScrCmd_028 0x8004, 0x26A + SetVar 0x8004, 0x26A Return _0BFC: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x265 + SetVar 0x8004, 0x265 CompareVarToValue 0x800C, 0x186 GoToIf 1, _0C2E - ScrCmd_028 0x8004, 0x266 + SetVar 0x8004, 0x266 CompareVarToValue 0x800C, 0x189 GoToIf 1, _0C2E - ScrCmd_028 0x8004, 0x267 + SetVar 0x8004, 0x267 Return _0C2E: @@ -998,10 +998,10 @@ _0C52: ScrCmd_0CD 0 ScrCmd_02C 77 ScrCmd_034 - ScrCmd_05E 7, _0E68 - ScrCmd_05E 16, _0ED8 - ScrCmd_05E 0xFF, _0E08 - ScrCmd_05F + ApplyMovement 7, _0E68 + ApplyMovement 16, _0ED8 + ApplyMovement 0xFF, _0E08 + WaitMovement GoTo _0C7C End @@ -1009,9 +1009,9 @@ _0C7C: ScrCmd_065 7 ScrCmd_065 16 ClearFlag 0x198 - ScrCmd_028 0x4077, 4 - ScrCmd_028 0x4076, 2 - ScrCmd_028 0x4079, 3 + SetVar 0x4077, 4 + SetVar 0x4076, 2 + SetVar 0x4079, 3 ScrCmd_065 24 ScrCmd_065 25 ScrCmd_065 27 @@ -1020,22 +1020,22 @@ _0C7C: ClearFlag 0x18B ScrCmd_064 30 ScrCmd_062 30 - ScrCmd_05E 30, _0DC0 - ScrCmd_05F + ApplyMovement 30, _0DC0 + WaitMovement ScrCmd_02C 78 Call _0CF0 ScrCmd_02C 79 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 30, _0DC8 - ScrCmd_05F + ApplyMovement 30, _0DC8 + WaitMovement ScrCmd_065 30 ScrCmd_061 End _0CF0: - ScrCmd_028 0x8004, 0x1B3 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B3 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 242 Call _0D58 @@ -1049,22 +1049,22 @@ _0CF0: Call _0D72 Call _0D72 ScrCmd_1D5 0 - ScrCmd_028 0x4001, 0x270F + SetVar 0x4001, 0x270F Call _0D8C Call _0D8C Return _0D58: ScrCmd_1B7 0x800C, 6 - ScrCmd_028 0x8004, 0 - ScrCmd_026 0x8004, 0x800C + SetVar 0x8004, 0 + AddVar 0x8004, 0x800C ScrCmd_1D2 0x8004, 1 Return _0D72: ScrCmd_1B7 0x800C, 6 - ScrCmd_028 0x8004, 18 - ScrCmd_026 0x8004, 0x800C + SetVar 0x8004, 18 + AddVar 0x8004, 0x800C ScrCmd_1D2 0x8004, 1 Return @@ -1072,9 +1072,9 @@ _0D8C: ScrCmd_1B7 0x800C, 8 CompareVarToVar 0x4001, 0x800C GoToIf 1, _0D8C - ScrCmd_029 0x4001, 0x800C - ScrCmd_028 0x8004, 1 - ScrCmd_026 0x8004, 0x800C + SetVar 0x4001, 0x800C + SetVar 0x8004, 1 + AddVar 0x8004, 0x800C ScrCmd_1D5 0x8004 Return @@ -1364,7 +1364,7 @@ _0F3C: ScrCmd_046 46, 0xFF, 1 ScrCmd_046 47, 0xFF, 2 ScrCmd_047 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0F97 CompareVarToValue 0x8008, 1 @@ -1505,9 +1505,9 @@ _10AD: _10C4: ScrCmd_060 - ScrCmd_05E 23, _1178 - ScrCmd_05E 0xFF, _1170 - ScrCmd_05F + ApplyMovement 23, _1178 + ApplyMovement 0xFF, _1170 + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 172 CallIf 1, _1133 @@ -1520,7 +1520,7 @@ _10C4: CompareVarToValue 0x8004, 176 CallIf 1, _1163 ScrCmd_02C 39 - ScrCmd_028 0x40E7, 2 + SetVar 0x40E7, 2 ScrCmd_02C 40 ScrCmd_031 ScrCmd_034 @@ -1528,28 +1528,28 @@ _10C4: End _1133: - ScrCmd_05E 23, _1184 - ScrCmd_05F + ApplyMovement 23, _1184 + WaitMovement Return _113F: - ScrCmd_05E 23, _1194 - ScrCmd_05F + ApplyMovement 23, _1194 + WaitMovement Return _114B: - ScrCmd_05E 23, _11A4 - ScrCmd_05F + ApplyMovement 23, _11A4 + WaitMovement Return _1157: - ScrCmd_05E 23, _11AC - ScrCmd_05F + ApplyMovement 23, _11AC + WaitMovement Return _1163: - ScrCmd_05E 23, _11BC - ScrCmd_05F + ApplyMovement 23, _11BC + WaitMovement Return .balign 4, 0 @@ -1600,7 +1600,7 @@ _11CC: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Call _11F8 CompareVarToValue 0x8004, 3 GoToIf 1, _1223 @@ -1620,7 +1620,7 @@ _11F8: Return _121B: - ScrCmd_026 0x8004, 1 + AddVar 0x8004, 1 Return _1223: @@ -1629,7 +1629,7 @@ _1223: ScrCmd_07C 0x1CD, 1, 0x800C ScrCmd_07C 0x1CE, 1, 0x800C ScrCmd_131 - ScrCmd_028 0x4077, 2 + SetVar 0x4077, 2 ScrCmd_133 0 ScrCmd_133 1 ScrCmd_133 3 @@ -1652,16 +1652,16 @@ _1223: End _12A1: - ScrCmd_05E 23, _12FC - ScrCmd_05E 0xFF, _1314 - ScrCmd_05F + ApplyMovement 23, _12FC + ApplyMovement 0xFF, _1314 + WaitMovement GoTo _12D5 End _12BB: - ScrCmd_05E 23, _12F0 - ScrCmd_05E 0xFF, _1304 - ScrCmd_05F + ApplyMovement 23, _12F0 + ApplyMovement 0xFF, _1304 + WaitMovement GoTo _12D5 End @@ -1717,8 +1717,8 @@ _1356: ScrCmd_02C 46 ScrCmd_02C 48 ScrCmd_02C 49 - ScrCmd_028 0x8004, 0x1CC - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1CC + SetVar 0x8005, 1 SetFlag 237 ScrCmd_014 0x7E0 ScrCmd_034 @@ -1759,8 +1759,8 @@ _13CD: ScrCmd_02C 52 ScrCmd_02C 54 ScrCmd_02C 55 - ScrCmd_028 0x8004, 0x1CD - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1CD + SetVar 0x8005, 1 SetFlag 238 ScrCmd_014 0x7E0 ScrCmd_034 @@ -1804,8 +1804,8 @@ _1451: ScrCmd_02C 60 ScrCmd_02C 61 ScrCmd_187 23, 174, 1, 0x303, 1 - ScrCmd_028 0x8004, 0x1CE - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1CE + SetVar 0x8005, 1 SetFlag 239 ScrCmd_014 0x7E0 ScrCmd_034 @@ -1862,19 +1862,19 @@ _14CF: ScrCmd_188 31, 17 ClearFlag 0x181 ScrCmd_064 31 - ScrCmd_05E 31, _1538 - ScrCmd_05F + ApplyMovement 31, _1538 + WaitMovement ScrCmd_014 0x807 - ScrCmd_05E 31, _1544 - ScrCmd_05E 0xFF, _08A0 - ScrCmd_05F + ApplyMovement 31, _1544 + ApplyMovement 0xFF, _08A0 + WaitMovement Call _0994 ScrCmd_034 - ScrCmd_05E 31, _154C - ScrCmd_05F + ApplyMovement 31, _154C + WaitMovement ScrCmd_065 31 ScrCmd_014 0x808 - ScrCmd_028 0x4076, 2 + SetVar 0x4076, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0005.s b/res/field/scripts/script_0005.s index dda0e7935b..5e5c0a9a2d 100644 --- a/res/field/scripts/script_0005.s +++ b/res/field/scripts/script_0005.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0008.s b/res/field/scripts/script_0008.s index 571fdacc38..d86690147d 100644 --- a/res/field/scripts/script_0008.s +++ b/res/field/scripts/script_0008.s @@ -73,7 +73,7 @@ _010A: _0121: ScrCmd_02C 2 - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 ScrCmd_014 0x7D9 ScrCmd_02C 3 ScrCmd_031 @@ -83,7 +83,7 @@ _0121: _0139: ScrCmd_02C 5 - ScrCmd_028 0x8004, 12 + SetVar 0x8004, 12 ScrCmd_014 0x7D9 ScrCmd_02C 6 ScrCmd_031 @@ -93,7 +93,7 @@ _0139: _0151: ScrCmd_02C 8 - ScrCmd_028 0x8004, 13 + SetVar 0x8004, 13 ScrCmd_014 0x7D9 ScrCmd_02C 9 ScrCmd_031 @@ -103,7 +103,7 @@ _0151: _0169: ScrCmd_02C 11 - ScrCmd_028 0x8004, 15 + SetVar 0x8004, 15 ScrCmd_014 0x7D9 ScrCmd_02C 12 ScrCmd_031 diff --git a/res/field/scripts/script_0011.s b/res/field/scripts/script_0011.s index a01a5ae020..76676b4eb9 100644 --- a/res/field/scripts/script_0011.s +++ b/res/field/scripts/script_0011.s @@ -101,7 +101,7 @@ _010E: GoTo _011C _011C: - ScrCmd_029 0x8008, 0x8002 + SetVar 0x8008, 0x8002 CompareVarToValue 0x8008, 1 GoToIf 1, _0165 CompareVarToValue 0x8008, 2 @@ -136,7 +136,7 @@ _018B: GoTo _0194 _0194: - ScrCmd_029 0x8008, 0x8002 + SetVar 0x8008, 0x8002 CompareVarToValue 0x8008, 1 GoToIf 1, _01DD CompareVarToValue 0x8008, 2 @@ -150,29 +150,29 @@ _0194: End _01DD: - ScrCmd_028 0x8003, 2 + SetVar 0x8003, 2 GoTo _021B End _01EB: - ScrCmd_028 0x8003, 51 + SetVar 0x8003, 51 GoTo _021B _01F7: - ScrCmd_028 0x8003, 216 + SetVar 0x8003, 216 GoTo _021B _0203: - ScrCmd_028 0x8003, 29 + SetVar 0x8003, 29 GoTo _021B _020F: - ScrCmd_028 0x8003, 1 + SetVar 0x8003, 1 GoTo _021B _021B: - ScrCmd_029 0x8004, 0x8003 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x8003 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0246 @@ -180,7 +180,7 @@ _021B: GoTo _0269 _0246: - ScrCmd_029 0x40F2, 0x8002 + SetVar 0x40F2, 0x8002 ScrCmd_02C 15 ScrCmd_031 ScrCmd_034 @@ -190,11 +190,11 @@ _0246: _0257: ScrCmd_0CD 0 ScrCmd_02C 16 - ScrCmd_029 0x8002, 0x40F2 + SetVar 0x8002, 0x40F2 GoTo _0194 _0269: - ScrCmd_028 0x40F2, 0 + SetVar 0x40F2, 0 SetFlag 0xAB3 ScrCmd_02C 17 ScrCmd_031 diff --git a/res/field/scripts/script_0012.s b/res/field/scripts/script_0012.s index 02778048e8..8d7d602816 100644 --- a/res/field/scripts/script_0012.s +++ b/res/field/scripts/script_0012.s @@ -42,10 +42,10 @@ _0044: CallIf 1, _00BC CompareVarToValue 0x800C, 0x189 CallIf 1, _00C4 - ScrCmd_029 0x410A, 0x8004 + SetVar 0x410A, 0x8004 ScrCmd_343 0, 0x8004 ScrCmd_02C 1 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF SetFlag 0x13D ScrCmd_034 @@ -61,15 +61,15 @@ _00A4: End _00B4: - ScrCmd_028 0x8004, 92 + SetVar 0x8004, 92 Return _00BC: - ScrCmd_028 0x8004, 93 + SetVar 0x8004, 93 Return _00C4: - ScrCmd_028 0x8004, 94 + SetVar 0x8004, 94 Return _00CC: diff --git a/res/field/scripts/script_0013.s b/res/field/scripts/script_0013.s index 0d9ad4217a..dd8cbfef2e 100644 --- a/res/field/scripts/script_0013.s +++ b/res/field/scripts/script_0013.s @@ -12,13 +12,13 @@ _0012: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 0, _0044 - ScrCmd_05F + ApplyMovement 0, _0044 + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_003 8, 0x800C - ScrCmd_05E 0, _004C - ScrCmd_05F + ApplyMovement 0, _004C + WaitMovement ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0015.s b/res/field/scripts/script_0015.s index 6d970831b6..fa363a86fa 100644 --- a/res/field/scripts/script_0015.s +++ b/res/field/scripts/script_0015.s @@ -22,7 +22,7 @@ _003A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 CheckFlag 136 CallIf 0, _006F CompareVarToValue 0x4001, 0 @@ -32,7 +32,7 @@ _003A: End _006F: - ScrCmd_028 0x8007, 1 + SetVar 0x8007, 1 Return _0077: @@ -81,7 +81,7 @@ _00F5: End _0115: - ScrCmd_028 0x4002, 0 + SetVar 0x4002, 0 GoTo _016C _0121: @@ -114,24 +114,24 @@ _016C: End _019E: - ScrCmd_05E 0, _0374 - ScrCmd_05F - ScrCmd_05E 0xFF, _0340 - ScrCmd_05F + ApplyMovement 0, _0374 + WaitMovement + ApplyMovement 0xFF, _0340 + WaitMovement GoTo _01EC _01B8: - ScrCmd_05E 0, _0380 - ScrCmd_05F - ScrCmd_05E 0xFF, _0348 - ScrCmd_05F + ApplyMovement 0, _0380 + WaitMovement + ApplyMovement 0xFF, _0348 + WaitMovement GoTo _01EC _01D2: - ScrCmd_05E 0, _038C - ScrCmd_05F - ScrCmd_05E 0xFF, _0354 - ScrCmd_05F + ApplyMovement 0, _038C + WaitMovement + ApplyMovement 0xFF, _0354 + WaitMovement GoTo _01EC _01EC: @@ -140,8 +140,8 @@ _01EC: ScrCmd_0BD ScrCmd_0A6 0x4002, 0x8005, 0x8007 ScrCmd_0A1 - ScrCmd_05E 0xFF, _0360 - ScrCmd_05F + ApplyMovement 0xFF, _0360 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD CompareVarToValue 0x8006, 0 @@ -153,30 +153,30 @@ _01EC: End _0245: - ScrCmd_05E 0xFF, _0368 - ScrCmd_05F - ScrCmd_05E 0, _0398 - ScrCmd_05F + ApplyMovement 0xFF, _0368 + WaitMovement + ApplyMovement 0, _0398 + WaitMovement GoTo _0293 _025F: - ScrCmd_05E 0xFF, _0368 - ScrCmd_05F - ScrCmd_05E 0, _03A4 - ScrCmd_05F + ApplyMovement 0xFF, _0368 + WaitMovement + ApplyMovement 0, _03A4 + WaitMovement GoTo _0293 _0279: - ScrCmd_05E 0xFF, _0368 - ScrCmd_05F - ScrCmd_05E 0, _03B0 - ScrCmd_05F + ApplyMovement 0xFF, _0368 + WaitMovement + ApplyMovement 0, _03B0 + WaitMovement GoTo _0293 _0293: CompareVarToValue 0x8005, 0 GoToIf 1, _0335 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 ScrCmd_02C 7 ScrCmd_031 ScrCmd_034 @@ -207,13 +207,13 @@ _02C7: ScrCmd_316 ScrCmd_245 0, 0x8004 ScrCmd_02C 8 - ScrCmd_05E 0, _03BC - ScrCmd_05F + ApplyMovement 0, _03BC + WaitMovement ScrCmd_02C 14 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 0, _03C4 - ScrCmd_05F + ApplyMovement 0, _03C4 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0018.s b/res/field/scripts/script_0018.s index e3da4265c1..5c3af9b80d 100644 --- a/res/field/scripts/script_0018.s +++ b/res/field/scripts/script_0018.s @@ -10,7 +10,7 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 0 GoToIf 1, _004E CompareVarToValue 0x8008, 1 @@ -51,7 +51,7 @@ _007E: ScrCmd_042 116, 3 ScrCmd_042 124, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01DC CompareVarToValue 0x8008, 1 @@ -74,7 +74,7 @@ _00E9: CompareVarToValue 0x40CE, 3 CallIf 0, _0238 Call _0243 - ScrCmd_028 0x40CE, 3 + SetVar 0x40CE, 3 GoTo _0261 End @@ -89,7 +89,7 @@ _013A: CompareVarToValue 0x40CE, 2 CallIf 0, _0238 Call _0243 - ScrCmd_028 0x40CE, 2 + SetVar 0x40CE, 2 GoTo _0261 End @@ -104,7 +104,7 @@ _018B: CompareVarToValue 0x40CE, 1 CallIf 0, _0238 Call _0243 - ScrCmd_028 0x40CE, 1 + SetVar 0x40CE, 1 GoTo _0261 End @@ -119,25 +119,25 @@ _01DC: CompareVarToValue 0x40CE, 0 CallIf 0, _0238 Call _0243 - ScrCmd_028 0x40CE, 0 + SetVar 0x40CE, 0 GoTo _0261 End _022D: ScrCmd_02C 2 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Return _0238: ScrCmd_02C 3 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Return _0243: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_034 - ScrCmd_05E 0, _029C - ScrCmd_05F + ApplyMovement 0, _029C + WaitMovement ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 Return @@ -150,7 +150,7 @@ _0261: End _026C: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_02C 4 ScrCmd_031 @@ -159,7 +159,7 @@ _026C: End _0283: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_02C 1 ScrCmd_031 diff --git a/res/field/scripts/script_0024.s b/res/field/scripts/script_0024.s index e27667da73..9093387ed4 100644 --- a/res/field/scripts/script_0024.s +++ b/res/field/scripts/script_0024.s @@ -52,8 +52,8 @@ _0063: GoToIf 1, _00B7 ScrCmd_0D1 0, 217 ScrCmd_02C 3 - ScrCmd_028 0x8004, 217 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 217 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00AD diff --git a/res/field/scripts/script_0027.s b/res/field/scripts/script_0027.s index def86c144e..0c3833f8d0 100644 --- a/res/field/scripts/script_0027.s +++ b/res/field/scripts/script_0027.s @@ -12,8 +12,8 @@ _0006: CheckFlag 126 GoToIf 1, _004B ScrCmd_02C 0 - ScrCmd_028 0x8004, 230 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 230 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0056 diff --git a/res/field/scripts/script_0028.s b/res/field/scripts/script_0028.s index d1333eb10b..e5d46a327a 100644 --- a/res/field/scripts/script_0028.s +++ b/res/field/scripts/script_0028.s @@ -44,15 +44,15 @@ _0077: ScrCmd_168 0, 0, 8, 2, 77 Call _00C5 ScrCmd_1B1 0xFF - ScrCmd_05E 0xFF, _00D8 - ScrCmd_05F + ApplyMovement 0xFF, _00D8 + WaitMovement Call _00CD ScrCmd_168 0, 0, 8, 4, 77 Call _00C5 - ScrCmd_05E 0xFF, _00E8 - ScrCmd_05F + ApplyMovement 0xFF, _00E8 + WaitMovement Call _00CD - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 Return _00C5: @@ -111,7 +111,7 @@ _0127: ScrCmd_042 128, 1 ScrCmd_042 130, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01E9 CompareVarToValue 0x8008, 1 @@ -132,7 +132,7 @@ _017D: ScrCmd_042 132, 1 ScrCmd_042 133, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01C8 CompareVarToValue 0x8008, 1 @@ -173,33 +173,33 @@ _0202: _020D: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _02EA ScrCmd_14E - ScrCmd_028 0x40D5, 6 + SetVar 0x40D5, 6 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0xFF, _0344 - ScrCmd_05F + ApplyMovement 0xFF, _0344 + WaitMovement ScrCmd_168 0, 0, 8, 4, 77 Call _00C5 - ScrCmd_05E 0xFF, _0358 - ScrCmd_05F + ApplyMovement 0xFF, _0358 + WaitMovement Call _00CD ScrCmd_168 0, 0, 8, 2, 77 Call _00C5 - ScrCmd_05E 0xFF, _0350 - ScrCmd_05F + ApplyMovement 0xFF, _0350 + WaitMovement ScrCmd_1B2 0xFF - ScrCmd_05E 0xFF, _0360 - ScrCmd_05F + ApplyMovement 0xFF, _0360 + WaitMovement Call _00CD ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_2B2 ScrCmd_0B3 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0B2 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _02CE @@ -219,7 +219,7 @@ _02CE: End _02EA: - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -363,7 +363,7 @@ _03F9: _040C: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8005, 3 + SetVar 0x8005, 3 GoTo _0420 End @@ -375,7 +375,7 @@ _0420: ScrCmd_042 39, 1 ScrCmd_042 40, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _046A CompareVarToValue 0x8008, 1 @@ -390,7 +390,7 @@ _0464: _046A: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0464 ScrCmd_034 @@ -406,7 +406,7 @@ _048B: _0496: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8005, 4 + SetVar 0x8005, 4 GoTo _04AA End @@ -418,7 +418,7 @@ _04AA: ScrCmd_042 39, 1 ScrCmd_042 40, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _04F4 CompareVarToValue 0x8008, 1 @@ -433,7 +433,7 @@ _04EE: _04F4: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _04EE ScrCmd_034 @@ -473,7 +473,7 @@ _0546: ScrCmd_2B7 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _05A0 - ScrCmd_028 0x8000, 0 + SetVar 0x8000, 0 ScrCmd_198 0x8000, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _05CB @@ -567,7 +567,7 @@ _0652: CheckFlag 207 GoToIf 1, _06F2 ScrCmd_02C 24 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _06A1 End @@ -580,7 +580,7 @@ _06A1: ScrCmd_1D6 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06D3 - ScrCmd_026 0x8004, 1 + AddVar 0x8004, 1 CompareVarToValue 0x8004, 13 GoToIf 3, _06A1 SetFlag 207 @@ -588,7 +588,7 @@ _06A1: End _06D3: - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FD ScrCmd_02C 28 Call _0710 @@ -613,7 +613,7 @@ _0708: End _0710: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _071E End @@ -621,7 +621,7 @@ _071E: ScrCmd_1D6 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _074A - ScrCmd_026 0x8004, 1 + AddVar 0x8004, 1 CompareVarToValue 0x8004, 13 GoToIf 3, _071E SetFlag 207 diff --git a/res/field/scripts/script_0029.s b/res/field/scripts/script_0029.s index 23d9717ee7..5e52f19f18 100644 --- a/res/field/scripts/script_0029.s +++ b/res/field/scripts/script_0029.s @@ -132,7 +132,7 @@ _0107: _0109: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8005, 6 + SetVar 0x8005, 6 GoTo _011D End @@ -144,7 +144,7 @@ _011D: ScrCmd_042 16, 1 ScrCmd_042 17, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0167 CompareVarToValue 0x8008, 1 @@ -159,7 +159,7 @@ _0161: _0167: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0161 ScrCmd_034 @@ -175,7 +175,7 @@ _0188: _0193: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8005, 5 + SetVar 0x8005, 5 GoTo _01A7 End @@ -187,7 +187,7 @@ _01A7: ScrCmd_042 16, 1 ScrCmd_042 17, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01F1 CompareVarToValue 0x8008, 1 @@ -202,7 +202,7 @@ _01EB: _01F1: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _01EB ScrCmd_034 diff --git a/res/field/scripts/script_0030.s b/res/field/scripts/script_0030.s index e45ca09d3b..2ccefe5ecd 100644 --- a/res/field/scripts/script_0030.s +++ b/res/field/scripts/script_0030.s @@ -131,7 +131,7 @@ _0103: _0105: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8005, 2 + SetVar 0x8005, 2 GoTo _0119 End @@ -143,7 +143,7 @@ _0119: ScrCmd_042 14, 1 ScrCmd_042 15, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0163 CompareVarToValue 0x8008, 1 @@ -158,7 +158,7 @@ _015D: _0163: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _015D ScrCmd_034 diff --git a/res/field/scripts/script_0031.s b/res/field/scripts/script_0031.s index 0c2d464b15..6d4de2a6b8 100644 --- a/res/field/scripts/script_0031.s +++ b/res/field/scripts/script_0031.s @@ -31,14 +31,14 @@ _0032: ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x1BA - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1BA + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_0CE 1 ScrCmd_02C 3 ScrCmd_034 ScrCmd_1BD 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _00A4 CompareVarToValue 0x8008, 2 @@ -47,23 +47,23 @@ _0032: End _00A4: - ScrCmd_05E 1, _0114 - ScrCmd_05E 0xFF, _0138 - ScrCmd_05F + ApplyMovement 1, _0114 + ApplyMovement 0xFF, _0138 + WaitMovement GoTo _00F2 End _00BE: - ScrCmd_05E 1, _0124 - ScrCmd_05E 0xFF, _0148 - ScrCmd_05F + ApplyMovement 1, _0124 + ApplyMovement 0xFF, _0148 + WaitMovement GoTo _00F2 End _00D8: - ScrCmd_05E 1, _0124 - ScrCmd_05E 0xFF, _0148 - ScrCmd_05F + ApplyMovement 1, _0124 + ApplyMovement 0xFF, _0148 + WaitMovement GoTo _00F2 End @@ -71,7 +71,7 @@ _00F2: ScrCmd_049 0x603 ScrCmd_065 1 ScrCmd_04B 0x603 - ScrCmd_028 0x40E7, 1 + SetVar 0x40E7, 1 SetFlag 241 ClearFlag 0x1F6 ClearFlag 0x1F5 @@ -217,8 +217,8 @@ _0269: _0274: ScrCmd_02C 13 - ScrCmd_028 0x8004, 17 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 17 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _02B3 @@ -364,7 +364,7 @@ _03EA: ScrCmd_042 4, 4 ScrCmd_042 5, 5 ScrCmd_048 2 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _045F CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0036.s b/res/field/scripts/script_0036.s index 1cab7bd098..7e3f3c3567 100644 --- a/res/field/scripts/script_0036.s +++ b/res/field/scripts/script_0036.s @@ -56,7 +56,7 @@ _0066: End _00F8: - ScrCmd_028 0x40F8, 0 + SetVar 0x40F8, 0 Return _0100: @@ -82,17 +82,17 @@ _0132: Return _0148: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _0150: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0158: SetFlag 0x1B3 SetFlag 0x1B5 - ScrCmd_028 0x4078, 6 + SetVar 0x4078, 6 Return _0168: @@ -111,11 +111,11 @@ _0168: GoToIf 1, _01CA CheckFlag 0x12C GoToIf 0, _01CA - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 Return _01CA: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 Return _01D2: @@ -168,11 +168,11 @@ _028A: ScrCmd_188 11, 17 ClearFlag 0x1B2 ScrCmd_064 11 - ScrCmd_05E 11, _0340 - ScrCmd_05F + ApplyMovement 11, _0340 + WaitMovement ScrCmd_014 0x7FA - ScrCmd_05E 11, _0354 - ScrCmd_05F + ApplyMovement 11, _0354 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 0 @@ -203,10 +203,10 @@ _0303: ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 11, _035C - ScrCmd_05F + ApplyMovement 11, _035C + WaitMovement ScrCmd_065 11 - ScrCmd_028 0x4078, 1 + SetVar 0x4078, 1 ScrCmd_061 End @@ -250,12 +250,12 @@ _0377: ScrCmd_0CD 1 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 11, _03AC - ScrCmd_05E 0xFF, _03BC - ScrCmd_05F + ApplyMovement 11, _03AC + ApplyMovement 0xFF, _03BC + WaitMovement ScrCmd_065 11 - ScrCmd_028 0x4078, 3 - ScrCmd_028 0x40B2, 1 + SetVar 0x4078, 3 + SetVar 0x40B2, 1 ScrCmd_061 End @@ -274,36 +274,36 @@ _03BC: _03C8: ScrCmd_060 - ScrCmd_05E 13, _0498 - ScrCmd_05F + ApplyMovement 13, _0498 + WaitMovement ScrCmd_02C 5 ScrCmd_034 ClearFlag 0x1B4 ScrCmd_064 14 ScrCmd_062 14 - ScrCmd_05E 14, _04AC - ScrCmd_05F + ApplyMovement 14, _04AC + WaitMovement ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 14, _04B8 - ScrCmd_05F + ApplyMovement 14, _04B8 + WaitMovement ScrCmd_065 14 - ScrCmd_05E 11, _04C0 - ScrCmd_05F + ApplyMovement 11, _04C0 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 11, _04C8 - ScrCmd_05F + ApplyMovement 11, _04C8 + WaitMovement ScrCmd_065 11 - ScrCmd_05E 13, _04A0 - ScrCmd_05F + ApplyMovement 13, _04A0 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 8 ScrCmd_034 - ScrCmd_05E 12, _0490 - ScrCmd_05F + ApplyMovement 12, _0490 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -322,7 +322,7 @@ _046A: _0473: ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x4078, 5 + SetVar 0x4078, 5 ClearFlag 0x194 ClearFlag 0x175 ClearFlag 0x293 @@ -652,35 +652,35 @@ _0847: _0852: ScrCmd_02C 28 ScrCmd_034 - ScrCmd_05E 16, _08C0 - ScrCmd_05F + ApplyMovement 16, _08C0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 16, _08CC - ScrCmd_05F + ApplyMovement 16, _08CC + WaitMovement Return _0871: - ScrCmd_05E 0xFF, _08D4 - ScrCmd_05F + ApplyMovement 0xFF, _08D4 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _08CC - ScrCmd_05F + ApplyMovement 0xFF, _08CC + WaitMovement Return _088B: - ScrCmd_05E 0xFF, _08E4 - ScrCmd_05F + ApplyMovement 0xFF, _08E4 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _08CC - ScrCmd_05F + ApplyMovement 0xFF, _08CC + WaitMovement Return _08A5: - ScrCmd_05E 0xFF, _08F0 - ScrCmd_05F + ApplyMovement 0xFF, _08F0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _08CC - ScrCmd_05F + ApplyMovement 0xFF, _08CC + WaitMovement Return .balign 4, 0 @@ -747,18 +747,18 @@ _094E: _0959: ScrCmd_060 - ScrCmd_05E 16, _099C - ScrCmd_05F + ApplyMovement 16, _099C + WaitMovement ScrCmd_02C 35 ScrCmd_034 - ScrCmd_05E 16, _09AC - ScrCmd_05F + ApplyMovement 16, _09AC + WaitMovement ScrCmd_065 16 ScrCmd_186 16, 45, 0x2EE ScrCmd_189 16, 2 ScrCmd_188 16, 16 ScrCmd_064 16 - ScrCmd_028 0x40F8, 4 + SetVar 0x40F8, 4 ScrCmd_061 End @@ -797,13 +797,13 @@ _09FA: ScrCmd_0CE 0 ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 18, _0A38 - ScrCmd_05F + ApplyMovement 18, _0A38 + WaitMovement ScrCmd_168 1, 22, 5, 14, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 18, _0A40 - ScrCmd_05F + ApplyMovement 18, _0A40 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 diff --git a/res/field/scripts/script_0038.s b/res/field/scripts/script_0038.s index bcb2867af8..e055d09d73 100644 --- a/res/field/scripts/script_0038.s +++ b/res/field/scripts/script_0038.s @@ -33,27 +33,27 @@ _0016: ScrCmd_04F ScrCmd_15C 5 ScrCmd_260 23 - ScrCmd_023 232 - ScrCmd_023 0x100 - ScrCmd_023 0x101 - ScrCmd_023 0x117 - ScrCmd_023 0x11B - ScrCmd_023 0x13A - ScrCmd_023 0x16F + SetTrainerFlag 232 + SetTrainerFlag 0x100 + SetTrainerFlag 0x101 + SetTrainerFlag 0x117 + SetTrainerFlag 0x11B + SetTrainerFlag 0x13A + SetTrainerFlag 0x16F ScrCmd_1CD 10, 35, 250, 0, 0 ClearFlag 0x1B2 ClearFlag 0x2CC ClearFlag 0x1B8 ClearFlag 0x1B6 ClearFlag 0x1B7 - ScrCmd_028 0x4078, 2 + SetVar 0x4078, 2 SetFlag 0x198 ScrCmd_02C 3 GoTo _00BF _00BF: - ScrCmd_028 0x8004, 0x1A2 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A2 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00FD diff --git a/res/field/scripts/script_0039.s b/res/field/scripts/script_0039.s index 0f831a1255..25708b39b6 100644 --- a/res/field/scripts/script_0039.s +++ b/res/field/scripts/script_0039.s @@ -10,7 +10,7 @@ .short 0xFD13 _0016: - ScrCmd_028 0x8007, 1 + SetVar 0x8007, 1 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0042.s b/res/field/scripts/script_0042.s index 1547cdb08c..056f348122 100644 --- a/res/field/scripts/script_0042.s +++ b/res/field/scripts/script_0042.s @@ -37,8 +37,8 @@ _003F: ScrCmd_068 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 1, _0078 - ScrCmd_05F + ApplyMovement 1, _0078 + WaitMovement ScrCmd_061 End @@ -129,20 +129,20 @@ _0115: End _0155: - ScrCmd_05E 2, _018C - ScrCmd_05E 0xFF, _01B0 - ScrCmd_05F + ApplyMovement 2, _018C + ApplyMovement 0xFF, _01B0 + WaitMovement Return _0169: - ScrCmd_05E 2, _018C - ScrCmd_05F + ApplyMovement 2, _018C + WaitMovement Return _0175: - ScrCmd_05E 2, _019C - ScrCmd_05E 0xFF, _01BC - ScrCmd_05F + ApplyMovement 2, _019C + ApplyMovement 0xFF, _01BC + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0043.s b/res/field/scripts/script_0043.s index bf71264a73..731f247c7b 100644 --- a/res/field/scripts/script_0043.s +++ b/res/field/scripts/script_0043.s @@ -80,8 +80,8 @@ _00A1: _00B2: ScrCmd_060 - ScrCmd_05E 1, _019C - ScrCmd_05F + ApplyMovement 1, _019C + WaitMovement ScrCmd_02C 5 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -102,8 +102,8 @@ _00E1: _0104: ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 1, _01B4 - ScrCmd_05F + ApplyMovement 1, _01B4 + WaitMovement ScrCmd_02C 8 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -124,19 +124,19 @@ _0136: _0159: ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 1, _01C4 - ScrCmd_05F + ApplyMovement 1, _01C4 + WaitMovement ScrCmd_02C 11 ScrCmd_034 - ScrCmd_05E 1, _01CC - ScrCmd_05F + ApplyMovement 1, _01CC + WaitMovement ScrCmd_02C 12 ScrCmd_034 - ScrCmd_05E 0xFF, _01E0 - ScrCmd_05E 1, _01D4 - ScrCmd_05F + ApplyMovement 0xFF, _01E0 + ApplyMovement 1, _01D4 + WaitMovement ScrCmd_065 1 - ScrCmd_028 0x4056, 3 + SetVar 0x4056, 3 ScrCmd_061 End diff --git a/res/field/scripts/script_0044.s b/res/field/scripts/script_0044.s index 7910cd4dab..d5dddb4c01 100644 --- a/res/field/scripts/script_0044.s +++ b/res/field/scripts/script_0044.s @@ -25,11 +25,11 @@ _0032: End _0052: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _005A: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0062: @@ -38,37 +38,37 @@ _0062: ScrCmd_0CD 1 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 4, _0364 - ScrCmd_05E 0xFF, _0310 - ScrCmd_05F + ApplyMovement 4, _0364 + ApplyMovement 0xFF, _0310 + WaitMovement ScrCmd_069 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 - ScrCmd_05E 241, _0340 - ScrCmd_05F + ApplyMovement 241, _0340 + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 4, _0350 - ScrCmd_05F + ApplyMovement 4, _0350 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_0CE 0 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 4, _035C - ScrCmd_05F + ApplyMovement 4, _035C + WaitMovement ScrCmd_003 10, 0x800C ScrCmd_0CD 0 ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 2, _02C8 - ScrCmd_05F + ApplyMovement 2, _02C8 + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 2, _02D4 - ScrCmd_05F + ApplyMovement 2, _02D4 + WaitMovement ScrCmd_02C 6 ScrCmd_0CE 0 ScrCmd_02C 7 @@ -94,9 +94,9 @@ _0124: _0132: ScrCmd_02C 11 ScrCmd_034 - ScrCmd_05E 2, _02E0 - ScrCmd_05E 3, _03D8 - ScrCmd_05F + ApplyMovement 2, _02E0 + ApplyMovement 3, _03D8 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0162 @@ -119,18 +119,18 @@ _0173: _0184: ScrCmd_034 - ScrCmd_05E 2, _02E8 - ScrCmd_05E 3, _03E0 - ScrCmd_05F + ApplyMovement 2, _02E8 + ApplyMovement 3, _03E0 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 16 ScrCmd_034 - ScrCmd_05E 4, _039C - ScrCmd_05F + ApplyMovement 4, _039C + WaitMovement ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 4, _03A4 - ScrCmd_05F + ApplyMovement 4, _03A4 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 18 ScrCmd_04B 0x5DC @@ -140,9 +140,9 @@ _0184: ScrCmd_0CE 0 ScrCmd_02C 21 ScrCmd_034 - ScrCmd_05E 4, _03AC - ScrCmd_05E 0xFF, _0330 - ScrCmd_05F + ApplyMovement 4, _03AC + ApplyMovement 0xFF, _0330 + WaitMovement ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_067 @@ -150,41 +150,41 @@ _0184: ScrCmd_0A1 ScrCmd_069 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 - ScrCmd_05E 241, _0340 - ScrCmd_05F + ApplyMovement 241, _0340 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_02C 22 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 4, _03B4 - ScrCmd_05F + ApplyMovement 4, _03B4 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 23 - ScrCmd_05E 0xFF, _0338 - ScrCmd_05F + ApplyMovement 0xFF, _0338 + WaitMovement ScrCmd_02C 24 ScrCmd_034 - ScrCmd_05E 3, _03BC - ScrCmd_05E 4, _0388 - ScrCmd_05E 2, _02F0 - ScrCmd_05E 241, _0348 - ScrCmd_05F + ApplyMovement 3, _03BC + ApplyMovement 4, _0388 + ApplyMovement 2, _02F0 + ApplyMovement 241, _0348 + WaitMovement ScrCmd_065 4 ScrCmd_065 3 ScrCmd_067 - ScrCmd_05E 0xFF, _02C0 - ScrCmd_05F + ApplyMovement 0xFF, _02C0 + WaitMovement ScrCmd_02C 25 ScrCmd_034 ScrCmd_04A 0x5DC - ScrCmd_05E 2, _0308 - ScrCmd_05F + ApplyMovement 2, _0308 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 2 ScrCmd_04A 0x603 - ScrCmd_028 0x4078, 4 - ScrCmd_028 0x40B2, 2 + SetVar 0x4078, 4 + SetVar 0x40B2, 2 SetFlag 168 SetFlag 0x1AE ClearFlag 0x1B3 diff --git a/res/field/scripts/script_0045.s b/res/field/scripts/script_0045.s index 1aef0f67bf..1a011b02b7 100644 --- a/res/field/scripts/script_0045.s +++ b/res/field/scripts/script_0045.s @@ -13,8 +13,8 @@ _000A: CheckFlag 201 GoToIf 1, _0051 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x177 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x177 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _005C diff --git a/res/field/scripts/script_0047.s b/res/field/scripts/script_0047.s index 6b7dea6c8e..7ab7d36c6c 100644 --- a/res/field/scripts/script_0047.s +++ b/res/field/scripts/script_0047.s @@ -45,7 +45,7 @@ _0078: CompareVarToValue 0x40F8, 2 GoToIf 4, _0091 ClearFlag 0x241 - ScrCmd_028 0x40F8, 1 + SetVar 0x40F8, 1 End _0091: @@ -56,9 +56,9 @@ _0093: ScrCmd_003 30, 0x800C ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0148 - ScrCmd_05E 0xFF, _0130 - ScrCmd_05F + ApplyMovement 0, _0148 + ApplyMovement 0xFF, _0130 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_0CD 0 ScrCmd_02C 1 @@ -66,7 +66,7 @@ _0093: ScrCmd_049 0x636 SetFlag 0x13C SetFlag 0x241 - ScrCmd_028 0x40F8, 2 + SetVar 0x40F8, 2 ScrCmd_0BC 6, 3, 0, 0 ScrCmd_0BD ScrCmd_0BC 6, 3, 1, 0 @@ -118,11 +118,11 @@ _0160: _0184: CheckFlag 0x158 GoToIf 1, _0197 - ScrCmd_028 0x40F8, 0 + SetVar 0x40F8, 0 Return _0197: - ScrCmd_028 0x40F8, 3 + SetVar 0x40F8, 3 Return .byte 0 diff --git a/res/field/scripts/script_0048.s b/res/field/scripts/script_0048.s index 07797734d3..7943532f67 100644 --- a/res/field/scripts/script_0048.s +++ b/res/field/scripts/script_0048.s @@ -26,12 +26,12 @@ _0037: ScrCmd_22D 2, 0x4000 CompareVarToValue 0x4000, 0 GoToIf 1, _0035 - ScrCmd_028 0x4106, 1 + SetVar 0x4106, 1 Call _007B End _0073: - ScrCmd_028 0x4106, 0 + SetVar 0x4106, 0 Return _007B: @@ -50,7 +50,7 @@ _007B: .byte 0 _00A5: - ScrCmd_029 0x8008, 0x4106 + SetVar 0x8008, 0x4106 CompareVarToValue 0x8008, 1 GoToIf 1, _00E5 CompareVarToValue 0x8008, 2 @@ -123,7 +123,7 @@ _0158: ScrCmd_049 0x5DC ScrCmd_060 SetFlag 0x12C - ScrCmd_028 0x4106, 3 + SetVar 0x4106, 3 ScrCmd_07C 0x1C5, 1, 0x800C ScrCmd_0CD 0 ScrCmd_02C 2 @@ -154,7 +154,7 @@ _01D9: _01EA: SetFlag 0x133 - ScrCmd_028 0x4106, 2 + SetVar 0x4106, 2 GoTo _01D9 End @@ -164,34 +164,34 @@ _01FC: ClearFlag 0x25B ScrCmd_064 2 ScrCmd_003 5, 0x800C - ScrCmd_05E 1, _0294 - ScrCmd_05E 0, _0294 - ScrCmd_05E 0xFF, _0294 - ScrCmd_05F - ScrCmd_05E 2, _02B4 - ScrCmd_05F - ScrCmd_05E 0xFF, _02C0 - ScrCmd_05F - ScrCmd_05E 2, _02D4 - ScrCmd_05F - ScrCmd_05E 0xFF, _029C - ScrCmd_05F + ApplyMovement 1, _0294 + ApplyMovement 0, _0294 + ApplyMovement 0xFF, _0294 + WaitMovement + ApplyMovement 2, _02B4 + WaitMovement + ApplyMovement 0xFF, _02C0 + WaitMovement + ApplyMovement 2, _02D4 + WaitMovement + ApplyMovement 0xFF, _029C + WaitMovement Return _0256: - ScrCmd_05E 2, _02A4 - ScrCmd_05F + ApplyMovement 2, _02A4 + WaitMovement Return _0262: - ScrCmd_05E 2, _02AC - ScrCmd_05F + ApplyMovement 2, _02AC + WaitMovement Return _026E: - ScrCmd_05E 0xFF, _0294 - ScrCmd_05E 2, _02DC - ScrCmd_05F + ApplyMovement 0xFF, _0294 + ApplyMovement 2, _02DC + WaitMovement SetFlag 0x25B ScrCmd_065 2 ScrCmd_049 0x603 diff --git a/res/field/scripts/script_0050.s b/res/field/scripts/script_0050.s index f74201f46d..2092a0de36 100644 --- a/res/field/scripts/script_0050.s +++ b/res/field/scripts/script_0050.s @@ -96,36 +96,36 @@ _00D7: _011E: ScrCmd_186 3, 0x10F, 0x2EC ScrCmd_064 3 - ScrCmd_05E 0xFF, _02A0 - ScrCmd_05E 3, _02B8 - ScrCmd_05F + ApplyMovement 0xFF, _02A0 + ApplyMovement 3, _02B8 + WaitMovement GoTo _01B6 End _0144: ScrCmd_186 3, 0x10F, 0x2ED ScrCmd_064 3 - ScrCmd_05E 0xFF, _02A0 - ScrCmd_05E 3, _02B8 - ScrCmd_05F + ApplyMovement 0xFF, _02A0 + ApplyMovement 3, _02B8 + WaitMovement GoTo _01B6 End _016A: ScrCmd_186 3, 0x10F, 0x2EE ScrCmd_064 3 - ScrCmd_05E 0xFF, _02A0 - ScrCmd_05E 3, _02B8 - ScrCmd_05F + ApplyMovement 0xFF, _02A0 + ApplyMovement 3, _02B8 + WaitMovement GoTo _01B6 End _0190: ScrCmd_186 3, 0x10F, 0x2EF ScrCmd_064 3 - ScrCmd_05E 0xFF, _02A0 - ScrCmd_05E 3, _02B8 - ScrCmd_05F + ApplyMovement 0xFF, _02A0 + ApplyMovement 3, _02B8 + WaitMovement GoTo _01B6 End @@ -138,11 +138,11 @@ _01B6: ScrCmd_0CD 1 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 3, _0340 - ScrCmd_05F + ApplyMovement 3, _0340 + WaitMovement ScrCmd_02C 4 - ScrCmd_05E 3, _0348 - ScrCmd_05F + ApplyMovement 3, _0348 + WaitMovement ScrCmd_02C 5 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -156,30 +156,30 @@ _01B6: End _021F: - ScrCmd_05E 0xFF, _0310 - ScrCmd_05E 3, _02C0 - ScrCmd_05F + ApplyMovement 0xFF, _0310 + ApplyMovement 3, _02C0 + WaitMovement GoTo _0287 End _0239: - ScrCmd_05E 0xFF, _031C - ScrCmd_05E 3, _02D0 - ScrCmd_05F + ApplyMovement 0xFF, _031C + ApplyMovement 3, _02D0 + WaitMovement GoTo _0287 End _0253: - ScrCmd_05E 0xFF, _0328 - ScrCmd_05E 3, _02E8 - ScrCmd_05F + ApplyMovement 0xFF, _0328 + ApplyMovement 3, _02E8 + WaitMovement GoTo _0287 End _026D: - ScrCmd_05E 0xFF, _0334 - ScrCmd_05E 3, _02F8 - ScrCmd_05F + ApplyMovement 0xFF, _0334 + ApplyMovement 3, _02F8 + WaitMovement GoTo _0287 End @@ -187,7 +187,7 @@ _0287: ScrCmd_049 0x603 ScrCmd_065 3 ScrCmd_014 0x7FB - ScrCmd_028 0x4079, 3 + SetVar 0x4079, 3 ScrCmd_061 End @@ -298,8 +298,8 @@ _0376: CheckFlag 0x109 GoToIf 1, _03BD ScrCmd_02C 17 - ScrCmd_028 0x8004, 26 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 26 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _03C8 @@ -354,30 +354,30 @@ _03F8: End _042F: - ScrCmd_05E 0xFF, _055C - ScrCmd_05E 4, _0604 - ScrCmd_05F + ApplyMovement 0xFF, _055C + ApplyMovement 4, _0604 + WaitMovement GoTo _0497 End _0449: - ScrCmd_05E 0xFF, _055C - ScrCmd_05E 4, _0610 - ScrCmd_05F + ApplyMovement 0xFF, _055C + ApplyMovement 4, _0610 + WaitMovement GoTo _0497 End _0463: - ScrCmd_05E 0xFF, _055C - ScrCmd_05E 4, _061C - ScrCmd_05F + ApplyMovement 0xFF, _055C + ApplyMovement 4, _061C + WaitMovement GoTo _0497 End _047D: - ScrCmd_05E 0xFF, _055C - ScrCmd_05E 4, _0628 - ScrCmd_05F + ApplyMovement 0xFF, _055C + ApplyMovement 4, _0628 + WaitMovement GoTo _0497 End @@ -397,30 +397,30 @@ _0497: End _04DC: - ScrCmd_05E 0xFF, _0564 - ScrCmd_05E 4, _05B4 - ScrCmd_05F + ApplyMovement 0xFF, _0564 + ApplyMovement 4, _05B4 + WaitMovement GoTo _0544 End _04F6: - ScrCmd_05E 0xFF, _0578 - ScrCmd_05E 4, _05C8 - ScrCmd_05F + ApplyMovement 0xFF, _0578 + ApplyMovement 4, _05C8 + WaitMovement GoTo _0544 End _0510: - ScrCmd_05E 0xFF, _058C - ScrCmd_05E 4, _05DC - ScrCmd_05F + ApplyMovement 0xFF, _058C + ApplyMovement 4, _05DC + WaitMovement GoTo _0544 End _052A: - ScrCmd_05E 0xFF, _05A0 - ScrCmd_05E 4, _05F0 - ScrCmd_05F + ApplyMovement 0xFF, _05A0 + ApplyMovement 4, _05F0 + WaitMovement GoTo _0544 End @@ -429,7 +429,7 @@ _0544: ScrCmd_031 ScrCmd_034 ScrCmd_014 0x801 - ScrCmd_028 0x4079, 1 + SetVar 0x4079, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0052.s b/res/field/scripts/script_0052.s index 9de0b4ee8e..14d12c9282 100644 --- a/res/field/scripts/script_0052.s +++ b/res/field/scripts/script_0052.s @@ -26,18 +26,18 @@ _000E: ScrCmd_02C 2 ScrCmd_04E 0x489 ScrCmd_04F - ScrCmd_023 244 - ScrCmd_023 245 + SetTrainerFlag 244 + SetTrainerFlag 245 ScrCmd_15C 0 ScrCmd_260 23 - ScrCmd_023 244 - ScrCmd_023 245 + SetTrainerFlag 244 + SetTrainerFlag 245 SetFlag 0x23F - ScrCmd_028 0x40F0, 1 - ScrCmd_028 0x4076, 1 - ScrCmd_028 0x4079, 2 + SetVar 0x40F0, 1 + SetVar 0x4076, 1 + SetVar 0x4079, 2 ScrCmd_1CD 10, 47, 246, 0, 0 - ScrCmd_028 0x4077, 3 + SetVar 0x4077, 3 ClearFlag 0x17A ClearFlag 0x19D ClearFlag 0x19C @@ -47,8 +47,8 @@ _000E: End _00BB: - ScrCmd_028 0x8004, 0x193 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x193 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00F9 diff --git a/res/field/scripts/script_0053.s b/res/field/scripts/script_0053.s index 511c529a3c..ba20173cc1 100644 --- a/res/field/scripts/script_0053.s +++ b/res/field/scripts/script_0053.s @@ -12,7 +12,7 @@ .short 0xFD13 _001E: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 ScrCmd_014 0x7D2 End @@ -60,8 +60,8 @@ _0078: ScrCmd_042 53, 3 ScrCmd_042 43, 4 ScrCmd_043 - ScrCmd_029 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8004, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 4 GoToIf 1, _00E9 CompareVarToValue 0x8008, 0xFFFE diff --git a/res/field/scripts/script_0057.s b/res/field/scripts/script_0057.s index 39959466c3..bbd3408606 100644 --- a/res/field/scripts/script_0057.s +++ b/res/field/scripts/script_0057.s @@ -36,8 +36,8 @@ _0038: GoToIf 1, _008C ScrCmd_0D1 0, 13 ScrCmd_02C 2 - ScrCmd_028 0x8004, 13 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 13 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0082 diff --git a/res/field/scripts/script_0058.s b/res/field/scripts/script_0058.s index 79f4ac1c8f..72261501c6 100644 --- a/res/field/scripts/script_0058.s +++ b/res/field/scripts/script_0058.s @@ -14,8 +14,8 @@ _000A: GoToIf 1, _0054 ScrCmd_0D1 0, 238 ScrCmd_02C 0 - ScrCmd_028 0x8004, 238 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 238 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0064 diff --git a/res/field/scripts/script_0060.s b/res/field/scripts/script_0060.s index 9a629b9566..0363ca442a 100644 --- a/res/field/scripts/script_0060.s +++ b/res/field/scripts/script_0060.s @@ -31,7 +31,7 @@ _003B: CompareVarToValue 0x800C, 0xFF GoToIf 1, _00AC ScrCmd_226 0 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C CompareVarToVar 0x8005, 0x800C diff --git a/res/field/scripts/script_0061.s b/res/field/scripts/script_0061.s index 06518a26bf..7acac5347f 100644 --- a/res/field/scripts/script_0061.s +++ b/res/field/scripts/script_0061.s @@ -37,8 +37,8 @@ _0034: CompareVarToValue 0x800C, 0 GoToIf 1, _0096 ScrCmd_02C 3 - ScrCmd_028 0x8004, 14 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 14 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _008C diff --git a/res/field/scripts/script_0065.s b/res/field/scripts/script_0065.s index d5770c4e9d..d9df83f8f2 100644 --- a/res/field/scripts/script_0065.s +++ b/res/field/scripts/script_0065.s @@ -50,25 +50,25 @@ _0055: GoToIf 1, _03E7 CompareVarToValue 0x8000, 1 GoToIf 1, _03BC - ScrCmd_028 0x8001, 0 + SetVar 0x8001, 0 ScrCmd_07E 103, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 101, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 102, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 99, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 100, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 104, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C ScrCmd_07E 105, 1, 0x800C - ScrCmd_026 0x8001, 0x800C + AddVar 0x8001, 0x800C CompareVarToValue 0x8001, 1 GoToIf 1, _03BC - ScrCmd_028 0x8004, 0 - ScrCmd_028 0x8005, 0 + SetVar 0x8004, 0 + SetVar 0x8005, 0 ScrCmd_040 1, 1, 0, 1, 0x8003 _013E: CompareVarToValue 0x8005, 0 @@ -101,18 +101,18 @@ _013E: CallIf 1, _0374 CompareVarToValue 0x8004, 6 CallIf 1, _037C - ScrCmd_029 0x8006, 0x8005 - ScrCmd_026 0x8006, 156 + SetVar 0x8006, 0x8005 + AddVar 0x8006, 156 ScrCmd_29D 0x8006, 0x8004 GoTo _0225 _0219: - ScrCmd_026 0x8005, 1 + AddVar 0x8005, 1 GoTo _013E _0225: - ScrCmd_026 0x8004, 1 - ScrCmd_026 0x8005, 1 + AddVar 0x8004, 1 + AddVar 0x8005, 1 CompareVarToVar 0x8004, 0x8001 GoToIf 5, _013E ScrCmd_29D 44, 0x8004 @@ -142,94 +142,94 @@ _0225: GoTo _03D8 _02DC: - ScrCmd_028 0x4000, 103 + SetVar 0x4000, 103 ScrCmd_07E 0x4000, 1, 0x800C Return _02EC: - ScrCmd_028 0x4000, 101 + SetVar 0x4000, 101 ScrCmd_07E 0x4000, 1, 0x800C Return _02FC: - ScrCmd_028 0x4000, 102 + SetVar 0x4000, 102 ScrCmd_07E 0x4000, 1, 0x800C Return _030C: - ScrCmd_028 0x4000, 99 + SetVar 0x4000, 99 ScrCmd_07E 0x4000, 1, 0x800C Return _031C: - ScrCmd_028 0x4000, 100 + SetVar 0x4000, 100 ScrCmd_07E 0x4000, 1, 0x800C Return _032C: - ScrCmd_028 0x4000, 104 + SetVar 0x4000, 104 ScrCmd_07E 0x4000, 1, 0x800C Return _033C: - ScrCmd_028 0x4000, 105 + SetVar 0x4000, 105 ScrCmd_07E 0x4000, 1, 0x800C Return _034C: - ScrCmd_029 0x4001, 0x4000 + SetVar 0x4001, 0x4000 Return _0354: - ScrCmd_029 0x4002, 0x4000 + SetVar 0x4002, 0x4000 Return _035C: - ScrCmd_029 0x4003, 0x4000 + SetVar 0x4003, 0x4000 Return _0364: - ScrCmd_029 0x4004, 0x4000 + SetVar 0x4004, 0x4000 Return _036C: - ScrCmd_029 0x4005, 0x4000 + SetVar 0x4005, 0x4000 Return _0374: - ScrCmd_029 0x4006, 0x4000 + SetVar 0x4006, 0x4000 Return _037C: - ScrCmd_029 0x4007, 0x4000 + SetVar 0x4007, 0x4000 Return _0384: - ScrCmd_029 0x8002, 0x4001 + SetVar 0x8002, 0x4001 Return _038C: - ScrCmd_029 0x8002, 0x4002 + SetVar 0x8002, 0x4002 Return _0394: - ScrCmd_029 0x8002, 0x4003 + SetVar 0x8002, 0x4003 Return _039C: - ScrCmd_029 0x8002, 0x4004 + SetVar 0x8002, 0x4004 Return _03A4: - ScrCmd_029 0x8002, 0x4005 + SetVar 0x8002, 0x4005 Return _03AC: - ScrCmd_029 0x8002, 0x4006 + SetVar 0x8002, 0x4006 Return _03B4: - ScrCmd_029 0x8002, 0x4007 + SetVar 0x8002, 0x4007 Return _03BC: @@ -266,7 +266,7 @@ _03F2: ScrCmd_04F ScrCmd_096 0x40B4, 20, 0, 0x800C ScrCmd_1E5 115 - ScrCmd_028 0x40B4, 0 + SetVar 0x40B4, 0 ScrCmd_02C 9 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -278,7 +278,7 @@ _03F2: _0459: ScrCmd_034 ScrCmd_177 0x4000 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BB 0x4000, 0x800C diff --git a/res/field/scripts/script_0068.s b/res/field/scripts/script_0068.s index b5a3385e2a..bca319a9a4 100644 --- a/res/field/scripts/script_0068.s +++ b/res/field/scripts/script_0068.s @@ -25,8 +25,8 @@ _0025: CheckFlag 0x10A GoToIf 1, _006C ScrCmd_02C 1 - ScrCmd_028 0x8004, 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 3 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0077 diff --git a/res/field/scripts/script_0071.s b/res/field/scripts/script_0071.s index a9d3619a15..1e6f76d3ea 100644 --- a/res/field/scripts/script_0071.s +++ b/res/field/scripts/script_0071.s @@ -47,7 +47,7 @@ _0096: End _00AD: - ScrCmd_028 0x4114, 0 + SetVar 0x4114, 0 End _00B5: @@ -228,8 +228,8 @@ _0286: CompareVarToValue 0x8005, 0x20A CallIf 5, _0383 ScrCmd_02C 7 - ScrCmd_028 0x8004, 0x1A4 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A4 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 8 ScrCmd_034 @@ -254,74 +254,74 @@ _0322: End _034B: - ScrCmd_05E 12, _043C - ScrCmd_05F - ScrCmd_05E 0xFF, _04D4 - ScrCmd_05F + ApplyMovement 12, _043C + WaitMovement + ApplyMovement 0xFF, _04D4 + WaitMovement Return _0361: - ScrCmd_05E 12, _0450 - ScrCmd_05F - ScrCmd_05E 0xFF, _04DC - ScrCmd_05F + ApplyMovement 12, _0450 + WaitMovement + ApplyMovement 0xFF, _04DC + WaitMovement Return _0377: - ScrCmd_05E 12, _0460 - ScrCmd_05F + ApplyMovement 12, _0460 + WaitMovement Return _0383: - ScrCmd_05E 12, _0470 - ScrCmd_05F + ApplyMovement 12, _0470 + WaitMovement Return _038F: - ScrCmd_05E 12, _0480 - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05F + ApplyMovement 12, _0480 + ApplyMovement 0xFF, _04E4 + WaitMovement GoTo _042B End _03A9: - ScrCmd_05E 12, _048C - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05F + ApplyMovement 12, _048C + ApplyMovement 0xFF, _04E4 + WaitMovement GoTo _042B End _03C3: - ScrCmd_05E 12, _0498 - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05F + ApplyMovement 12, _0498 + ApplyMovement 0xFF, _04E4 + WaitMovement GoTo _042B End _03DD: - ScrCmd_05E 12, _04A4 - ScrCmd_05E 0xFF, _04F0 - ScrCmd_05F + ApplyMovement 12, _04A4 + ApplyMovement 0xFF, _04F0 + WaitMovement GoTo _042B End _03F7: - ScrCmd_05E 12, _04B4 - ScrCmd_05E 0xFF, _04F0 - ScrCmd_05F + ApplyMovement 12, _04B4 + ApplyMovement 0xFF, _04F0 + WaitMovement GoTo _042B End _0411: - ScrCmd_05E 12, _04C4 - ScrCmd_05E 0xFF, _04F0 - ScrCmd_05F + ApplyMovement 12, _04C4 + ApplyMovement 0xFF, _04F0 + WaitMovement GoTo _042B End _042B: ScrCmd_065 12 - ScrCmd_028 0x407A, 2 + SetVar 0x407A, 2 ScrCmd_061 End @@ -519,8 +519,8 @@ _05B0: CallIf 1, _067B CompareVarToValue 0x8004, 0x133 CallIf 1, _0687 - ScrCmd_05E 0xFF, _0760 - ScrCmd_05F + ApplyMovement 0xFF, _0760 + WaitMovement ScrCmd_02C 30 ScrCmd_034 CompareVarToValue 0x8004, 0x12F @@ -533,57 +533,57 @@ _05B0: CallIf 1, _06AD CompareVarToValue 0x8004, 0x133 CallIf 1, _06B9 - ScrCmd_05E 0xFF, _0768 - ScrCmd_05F + ApplyMovement 0xFF, _0768 + WaitMovement ScrCmd_061 End _0657: - ScrCmd_05E 28, _06C8 - ScrCmd_05F + ApplyMovement 28, _06C8 + WaitMovement Return _0663: - ScrCmd_05E 28, _06D8 - ScrCmd_05F + ApplyMovement 28, _06D8 + WaitMovement Return _066F: - ScrCmd_05E 28, _06EC - ScrCmd_05F + ApplyMovement 28, _06EC + WaitMovement Return _067B: - ScrCmd_05E 28, _0700 - ScrCmd_05F + ApplyMovement 28, _0700 + WaitMovement Return _0687: - ScrCmd_05E 28, _0714 - ScrCmd_05F + ApplyMovement 28, _0714 + WaitMovement Return _0693: Return _0695: - ScrCmd_05E 28, _0730 - ScrCmd_05F + ApplyMovement 28, _0730 + WaitMovement Return _06A1: - ScrCmd_05E 28, _073C - ScrCmd_05F + ApplyMovement 28, _073C + WaitMovement Return _06AD: - ScrCmd_05E 28, _0748 - ScrCmd_05F + ApplyMovement 28, _0748 + WaitMovement Return _06B9: - ScrCmd_05E 28, _0754 - ScrCmd_05F + ApplyMovement 28, _0754 + WaitMovement Return .balign 4, 0 @@ -679,8 +679,8 @@ _0770: ScrCmd_02C 34 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 30, _0898 - ScrCmd_05F + ApplyMovement 30, _0898 + WaitMovement ScrCmd_061 End @@ -688,8 +688,8 @@ _07A5: ScrCmd_02C 35 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 30, _0898 - ScrCmd_05F + ApplyMovement 30, _0898 + WaitMovement ScrCmd_061 End @@ -702,8 +702,8 @@ _07BA: CallIf 1, _082F CompareVarToValue 0x8005, 0x216 CallIf 1, _083B - ScrCmd_05E 0xFF, _0890 - ScrCmd_05F + ApplyMovement 0xFF, _0890 + WaitMovement ScrCmd_02C 33 ScrCmd_034 CompareVarToValue 0x8005, 0x214 @@ -716,36 +716,36 @@ _07BA: End _0823: - ScrCmd_05E 30, _08A0 - ScrCmd_05F + ApplyMovement 30, _08A0 + WaitMovement Return _082F: - ScrCmd_05E 30, _08AC - ScrCmd_05F + ApplyMovement 30, _08AC + WaitMovement Return _083B: - ScrCmd_05E 30, _08BC - ScrCmd_05F + ApplyMovement 30, _08BC + WaitMovement Return _0847: - ScrCmd_05E 30, _08CC - ScrCmd_05E 0xFF, _0884 - ScrCmd_05F + ApplyMovement 30, _08CC + ApplyMovement 0xFF, _0884 + WaitMovement Return _085B: - ScrCmd_05E 30, _08DC - ScrCmd_05E 0xFF, _0884 - ScrCmd_05F + ApplyMovement 30, _08DC + ApplyMovement 0xFF, _0884 + WaitMovement Return _086F: - ScrCmd_05E 30, _08EC - ScrCmd_05E 0xFF, _0884 - ScrCmd_05F + ApplyMovement 30, _08EC + ApplyMovement 0xFF, _0884 + WaitMovement Return .balign 4, 0 @@ -812,13 +812,13 @@ _08FC: ScrCmd_0CE 0 ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 31, _0944 - ScrCmd_05F + ApplyMovement 31, _0944 + WaitMovement ScrCmd_168 9, 17, 24, 18, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 31, _094C - ScrCmd_05F + ApplyMovement 31, _094C + WaitMovement ScrCmd_065 31 ScrCmd_16C 77 ScrCmd_169 77 @@ -854,23 +854,23 @@ _0954: End _099D: - ScrCmd_05E 33, _0B58 - ScrCmd_05E 0xFF, _0BDC - ScrCmd_05F + ApplyMovement 33, _0B58 + ApplyMovement 0xFF, _0BDC + WaitMovement GoTo _09EB End _09B7: - ScrCmd_05E 33, _0B64 - ScrCmd_05E 0xFF, _0BFC - ScrCmd_05F + ApplyMovement 33, _0B64 + ApplyMovement 0xFF, _0BFC + WaitMovement GoTo _09EB End _09D1: - ScrCmd_05E 33, _0B70 - ScrCmd_05E 0xFF, _0C1C - ScrCmd_05F + ApplyMovement 33, _0B70 + ApplyMovement 0xFF, _0C1C + WaitMovement GoTo _09EB End @@ -893,32 +893,32 @@ _09EB: End _0A32: - ScrCmd_05E 33, _0B7C - ScrCmd_05E 0xFF, _0C3C - ScrCmd_05F - ScrCmd_05E 33, _0BB0 - ScrCmd_05E 0xFF, _0C74 - ScrCmd_05F + ApplyMovement 33, _0B7C + ApplyMovement 0xFF, _0C3C + WaitMovement + ApplyMovement 33, _0BB0 + ApplyMovement 0xFF, _0C74 + WaitMovement GoTo _0AB6 End _0A5E: - ScrCmd_05E 33, _0B8C - ScrCmd_05E 0xFF, _0C4C - ScrCmd_05F - ScrCmd_05E 33, _0BB8 - ScrCmd_05E 0xFF, _0C88 - ScrCmd_05F + ApplyMovement 33, _0B8C + ApplyMovement 0xFF, _0C4C + WaitMovement + ApplyMovement 33, _0BB8 + ApplyMovement 0xFF, _0C88 + WaitMovement GoTo _0AB6 End _0A8A: - ScrCmd_05E 33, _0BA0 - ScrCmd_05E 0xFF, _0C64 - ScrCmd_05F - ScrCmd_05E 33, _0BB0 - ScrCmd_05E 0xFF, _0C98 - ScrCmd_05F + ApplyMovement 33, _0BA0 + ApplyMovement 0xFF, _0C64 + WaitMovement + ApplyMovement 33, _0BB0 + ApplyMovement 0xFF, _0C98 + WaitMovement GoTo _0AB6 End @@ -930,34 +930,34 @@ _0AB6: ScrCmd_32E ScrCmd_332 ScrCmd_066 0x143, 0x20C - ScrCmd_05E 241, _0CD4 - ScrCmd_05F + ApplyMovement 241, _0CD4 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 32, _0CE4 - ScrCmd_05E 241, _0CDC - ScrCmd_05F + ApplyMovement 32, _0CE4 + ApplyMovement 241, _0CDC + WaitMovement ScrCmd_067 ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 32, _0CF4 - ScrCmd_05E 33, _0BC0 - ScrCmd_05E 0xFF, _0CAC - ScrCmd_05F + ApplyMovement 32, _0CF4 + ApplyMovement 33, _0BC0 + ApplyMovement 0xFF, _0CAC + WaitMovement ScrCmd_065 32 ScrCmd_003 35, 0x800C - ScrCmd_05E 33, _0BD4 - ScrCmd_05E 0xFF, _0CC0 - ScrCmd_05F + ApplyMovement 33, _0BD4 + ApplyMovement 0xFF, _0CC0 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 33, _0BCC - ScrCmd_05E 0xFF, _0CC8 - ScrCmd_05F + ApplyMovement 33, _0BCC + ApplyMovement 0xFF, _0CC8 + WaitMovement ScrCmd_065 33 - ScrCmd_028 0x407A, 1 + SetVar 0x407A, 1 ScrCmd_061 End @@ -1210,10 +1210,10 @@ _0DE8: Return _0DF6: - ScrCmd_05E 12, _0E88 - ScrCmd_05F - ScrCmd_05E 0xFF, _0EAC - ScrCmd_05F + ApplyMovement 12, _0E88 + WaitMovement + ApplyMovement 0xFF, _0EAC + WaitMovement ScrCmd_02C 9 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 @@ -1222,8 +1222,8 @@ _0DF6: CompareVarToValue 0x800C, 6 GoToIf 4, _0E67 Call _0E4B - ScrCmd_05E 12, _0EA0 - ScrCmd_05F + ApplyMovement 12, _0EA0 + WaitMovement ScrCmd_065 12 GoTo _0E83 End @@ -1235,7 +1235,7 @@ _0E4B: ScrCmd_02C 16 ScrCmd_034 ScrCmd_097 175, 11 - ScrCmd_028 0x407A, 5 + SetVar 0x407A, 5 Return _0E67: @@ -1302,29 +1302,29 @@ _0ECD: End _0F32: - ScrCmd_05E 12, _10BC - ScrCmd_05E 0xFF, _10E0 - ScrCmd_05F + ApplyMovement 12, _10BC + ApplyMovement 0xFF, _10E0 + WaitMovement GoTo _0F92 End _0F4C: - ScrCmd_05E 12, _10BC - ScrCmd_05E 0xFF, _10E0 - ScrCmd_05F + ApplyMovement 12, _10BC + ApplyMovement 0xFF, _10E0 + WaitMovement GoTo _0F92 End _0F66: - ScrCmd_05E 12, _10BC - ScrCmd_05F + ApplyMovement 12, _10BC + WaitMovement GoTo _0F92 End _0F78: - ScrCmd_05E 12, _10C8 - ScrCmd_05E 0xFF, _10EC - ScrCmd_05F + ApplyMovement 12, _10C8 + ApplyMovement 0xFF, _10EC + WaitMovement GoTo _0F92 End @@ -1348,7 +1348,7 @@ _0FBA: End _0FBE: - ScrCmd_028 0x407A, 4 + SetVar 0x407A, 4 ScrCmd_02C 11 ScrCmd_031 ScrCmd_034 @@ -1358,7 +1358,7 @@ _0FCD: ScrCmd_02C 12 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x407A, 4 + SetVar 0x407A, 4 Return _0FDC: @@ -1379,46 +1379,46 @@ _0FDC: End _1034: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _1046: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _1058: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _106A: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _107C: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _108E: - ScrCmd_05E 12, _10B4 - ScrCmd_05F + ApplyMovement 12, _10B4 + WaitMovement GoTo _10A0 End _10A0: ScrCmd_02C 13 ScrCmd_034 - ScrCmd_05E 0xFF, _10D8 - ScrCmd_05F + ApplyMovement 0xFF, _10D8 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0073.s b/res/field/scripts/script_0073.s index 584b8d6aa3..1e382f332a 100644 --- a/res/field/scripts/script_0073.s +++ b/res/field/scripts/script_0073.s @@ -81,10 +81,10 @@ _0094: ScrCmd_04F ScrCmd_15C 1 ScrCmd_260 23 - ScrCmd_023 0x103 - ScrCmd_023 0x104 - ScrCmd_023 0x144 - ScrCmd_023 0x15C + SetTrainerFlag 0x103 + SetTrainerFlag 0x104 + SetTrainerFlag 0x144 + SetTrainerFlag 0x15C ClearFlag 0x1FC ScrCmd_1CD 10, 67, 0x13B, 0, 0 ScrCmd_02C 3 @@ -92,8 +92,8 @@ _0094: End _0119: - ScrCmd_028 0x8004, 0x19D - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x19D + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0157 @@ -123,8 +123,8 @@ _0161: End _0177: - ScrCmd_028 0x8004, 0x19D - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x19D + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01B7 @@ -166,7 +166,7 @@ _01C9: GoToIf 1, _01C3 ScrCmd_02C 7 ScrCmd_031 - ScrCmd_028 0x40AE, 1 + SetVar 0x40AE, 1 ScrCmd_034 ScrCmd_061 ScrCmd_2CA @@ -186,7 +186,7 @@ _021C: CompareVarToValue 0x40AE, 2 GoToIf 4, _0270 ScrCmd_0EA 0x103 - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Call _02DA ScrCmd_02C 8 ScrCmd_034 @@ -196,7 +196,7 @@ _021C: GoToIf 1, _01C3 ScrCmd_02C 9 ScrCmd_031 - ScrCmd_028 0x40AE, 2 + SetVar 0x40AE, 2 ScrCmd_034 ScrCmd_061 ScrCmd_2CA @@ -216,7 +216,7 @@ _027B: CompareVarToValue 0x40AE, 3 GoToIf 4, _02CF ScrCmd_0EA 0x104 - ScrCmd_028 0x8007, 4 + SetVar 0x8007, 4 Call _02DA ScrCmd_02C 10 ScrCmd_034 @@ -226,7 +226,7 @@ _027B: GoToIf 1, _01C3 ScrCmd_02C 11 ScrCmd_031 - ScrCmd_028 0x40AE, 3 + SetVar 0x40AE, 3 ScrCmd_034 ScrCmd_061 ScrCmd_2CA diff --git a/res/field/scripts/script_0075.s b/res/field/scripts/script_0075.s index 699ba426b0..bb10ce1b75 100644 --- a/res/field/scripts/script_0075.s +++ b/res/field/scripts/script_0075.s @@ -10,7 +10,7 @@ .short 0xFD13 _0016: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 ScrCmd_014 0x7D2 End @@ -78,8 +78,8 @@ _007D: _00D9: ScrCmd_02C 4 - ScrCmd_028 0x4002, 1 - ScrCmd_028 0x8004, 5 + SetVar 0x4002, 1 + SetVar 0x8004, 5 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0078.s b/res/field/scripts/script_0078.s index 65a191bb66..d88bc3b447 100644 --- a/res/field/scripts/script_0078.s +++ b/res/field/scripts/script_0078.s @@ -16,11 +16,11 @@ _0016: CheckFlag 130 GoToIf 1, _0052 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1C2 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1C2 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 130 - ScrCmd_028 0x4114, 1 + SetVar 0x4114, 1 ScrCmd_14C 9 GoTo _0052 End diff --git a/res/field/scripts/script_0079.s b/res/field/scripts/script_0079.s index fa185cd5c3..03e0efeb8a 100644 --- a/res/field/scripts/script_0079.s +++ b/res/field/scripts/script_0079.s @@ -55,13 +55,13 @@ _0057: _006A: ScrCmd_060 - ScrCmd_05E 4, _00FC - ScrCmd_05E 0xFF, _00F0 - ScrCmd_05F + ApplyMovement 4, _00FC + ApplyMovement 0xFF, _00F0 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 4, _0110 - ScrCmd_05F + ApplyMovement 4, _0110 + WaitMovement ClearFlag 0x1BB ScrCmd_186 5, 12, 15 ScrCmd_188 5, 16 @@ -69,11 +69,11 @@ _006A: ScrCmd_064 5 ScrCmd_065 4 SetFlag 113 - ScrCmd_028 0x411D, 1 + SetVar 0x411D, 1 ScrCmd_003 30, 0x800C ScrCmd_02C 1 - ScrCmd_05E 5, _0110 - ScrCmd_05F + ApplyMovement 5, _0110 + WaitMovement ClearFlag 0x1C2 ScrCmd_186 4, 12, 15 ScrCmd_188 4, 16 diff --git a/res/field/scripts/script_0082.s b/res/field/scripts/script_0082.s index a8cf18bcb1..51cbc8bd4b 100644 --- a/res/field/scripts/script_0082.s +++ b/res/field/scripts/script_0082.s @@ -23,8 +23,8 @@ _0022: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 2, _013C - ScrCmd_05F + ApplyMovement 2, _013C + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x196, 0 @@ -49,21 +49,21 @@ _0022: End _00A4: - ScrCmd_05E 2, _0144 - ScrCmd_05E 0xFF, _0174 - ScrCmd_05F + ApplyMovement 2, _0144 + ApplyMovement 0xFF, _0174 + WaitMovement GoTo _00E2 End _00BE: - ScrCmd_05E 2, _015C - ScrCmd_05F + ApplyMovement 2, _015C + WaitMovement GoTo _00E2 End _00D0: - ScrCmd_05E 2, _0168 - ScrCmd_05F + ApplyMovement 2, _0168 + WaitMovement GoTo _00E2 End @@ -82,7 +82,7 @@ _00E2: ScrCmd_065 2 ScrCmd_065 1 ScrCmd_065 3 - ScrCmd_028 0x407A, 3 + SetVar 0x407A, 3 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD SetFlag 0x987 diff --git a/res/field/scripts/script_0083.s b/res/field/scripts/script_0083.s index 984ce0c448..8fbe570e96 100644 --- a/res/field/scripts/script_0083.s +++ b/res/field/scripts/script_0083.s @@ -71,35 +71,35 @@ _00E7: _00ED: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _0151 End _0101: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 3 + SetVar 0x8004, 3 GoTo _0151 End _0115: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 GoTo _0151 End _0129: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 4 + SetVar 0x8004, 4 GoTo _0151 End _013D: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 5 + SetVar 0x8004, 5 GoTo _0151 End @@ -156,7 +156,7 @@ _0254: ScrCmd_042 16, 1 ScrCmd_042 14, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01F8 CompareVarToValue 0x8008, 2 @@ -166,7 +166,7 @@ _0254: _0295: ScrCmd_303 0x8003, 0x800C - ScrCmd_029 0x8000, 0x800C + SetVar 0x8000, 0x800C CompareVarToValue 0x8003, 2 GoToIf 4, _037B GoTo _02B6 @@ -309,14 +309,14 @@ _0473: CompareVarToValue 0x800C, 1 GoToIf 1, _04FD ScrCmd_1C8 0x800C, 0x8000 - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C CompareVarToValue 0x800C, 4 GoToIf 1, _051B GoTo _050B End _04FD: - ScrCmd_028 0x8002, 0 + SetVar 0x8002, 0 GoTo _050B End @@ -427,23 +427,23 @@ _0697: Return _069D: - ScrCmd_028 0x8001, 0x13B + SetVar 0x8001, 0x13B Return _06A5: - ScrCmd_028 0x8001, 59 + SetVar 0x8001, 59 Return _06AD: - ScrCmd_028 0x8001, 56 + SetVar 0x8001, 56 Return _06B5: - ScrCmd_028 0x8001, 0x193 + SetVar 0x8001, 0x193 Return _06BD: - ScrCmd_028 0x8001, 0x1B5 + SetVar 0x8001, 0x1B5 Return _06C5: @@ -560,7 +560,7 @@ _07BB: ScrCmd_33A 1 ScrCmd_042 14, 0 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0295 ScrCmd_034 @@ -576,7 +576,7 @@ _0801: _080C: SetFlag 119 - ScrCmd_028 0x411B, 1 + SetVar 0x411B, 1 GoTo _0325 End @@ -586,9 +586,9 @@ _081E: ScrCmd_049 0x603 ScrCmd_064 6 ScrCmd_04B 0x603 - ScrCmd_05E 0xFF, _08AC - ScrCmd_05E 6, _08D4 - ScrCmd_05F + ApplyMovement 0xFF, _08AC + ApplyMovement 6, _08D4 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 35 ScrCmd_034 @@ -597,20 +597,20 @@ _081E: CallIf 4, _08A8 CompareVarToValue 0x8006, 4 CallIf 3, _08AA - ScrCmd_05E 6, _08DC - ScrCmd_05F + ApplyMovement 6, _08DC + WaitMovement ScrCmd_02C 36 ScrCmd_034 - ScrCmd_05E 6, _08F4 - ScrCmd_05F + ApplyMovement 6, _08F4 + WaitMovement ScrCmd_02C 37 ScrCmd_034 - ScrCmd_05E 6, _0900 - ScrCmd_05F + ApplyMovement 6, _0900 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 6 ScrCmd_04B 0x603 - ScrCmd_028 0x411B, 2 + SetVar 0x411B, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0084.s b/res/field/scripts/script_0084.s index 7ec53abc7f..6cf4d7db58 100644 --- a/res/field/scripts/script_0084.s +++ b/res/field/scripts/script_0084.s @@ -31,7 +31,7 @@ _0032: ScrCmd_0BD CompareVarToValue 0x800C, 0xFF GoToIf 1, _00B3 - ScrCmd_029 0x8005, 0x800C + SetVar 0x8005, 0x800C ScrCmd_198 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00BE @@ -72,7 +72,7 @@ _00D9: ScrCmd_02C 3 ScrCmd_030 ScrCmd_034 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BB 0x8005, 0x800C @@ -122,7 +122,7 @@ _0168: CompareVarToValue 0x800C, 0xFF GoToIf 1, _01D9 ScrCmd_226 1 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C CompareVarToVar 0x8005, 0x800C diff --git a/res/field/scripts/script_0085.s b/res/field/scripts/script_0085.s index a8255fcbec..6828579c3a 100644 --- a/res/field/scripts/script_0085.s +++ b/res/field/scripts/script_0085.s @@ -14,8 +14,8 @@ _000E: CheckFlag 194 GoToIf 1, _005D ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x18A - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x18A + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0053 diff --git a/res/field/scripts/script_0087.s b/res/field/scripts/script_0087.s index 2d96387422..a1633a686d 100644 --- a/res/field/scripts/script_0087.s +++ b/res/field/scripts/script_0087.s @@ -12,8 +12,8 @@ _0006: CheckFlag 118 GoToIf 1, _004B ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x14B - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x14B + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0056 diff --git a/res/field/scripts/script_0088.s b/res/field/scripts/script_0088.s index 8d24387b8e..d14b7ca3de 100644 --- a/res/field/scripts/script_0088.s +++ b/res/field/scripts/script_0088.s @@ -14,7 +14,7 @@ _001A: ScrCmd_069 0x4004, 0x4005 CompareVarToValue 0x4005, 12 CallIf 4, _0035 - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 End _0035: @@ -45,18 +45,18 @@ _0061: ScrCmd_0C7 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _0091 - ScrCmd_05E 1, _00A0 - ScrCmd_05F + ApplyMovement 1, _00A0 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _00A8 - ScrCmd_05F + ApplyMovement 0xFF, _00A8 + WaitMovement ScrCmd_061 End _0091: SetFlag 0x996 - ScrCmd_028 0x4002, 1 + SetVar 0x4002, 1 ScrCmd_061 End @@ -73,7 +73,7 @@ _00A8: _00B0: ScrCmd_060 ClearFlag 0x996 - ScrCmd_028 0x4002, 0 + SetVar 0x4002, 0 ScrCmd_061 End @@ -104,8 +104,8 @@ _0102: CompareVarToValue 0x8004, 35 GoToIf 0, _015F ScrCmd_02C 5 - ScrCmd_028 0x8004, 216 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 216 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _014A diff --git a/res/field/scripts/script_0090.s b/res/field/scripts/script_0090.s index 808033ccb6..7a2531f711 100644 --- a/res/field/scripts/script_0090.s +++ b/res/field/scripts/script_0090.s @@ -21,11 +21,11 @@ _0006: ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0158 - ScrCmd_05F + ApplyMovement 0, _0158 + WaitMovement ScrCmd_02C 1 - ScrCmd_028 0x8004, 252 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 252 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0091 @@ -66,17 +66,17 @@ _00B3: End _00E5: - ScrCmd_028 0x405E, 0 + SetVar 0x405E, 0 ScrCmd_21C 3 Return _00F0: - ScrCmd_028 0x405F, 0 + SetVar 0x405F, 0 ScrCmd_21C 4 Return _00FB: - ScrCmd_028 0x4060, 0 + SetVar 0x4060, 0 ScrCmd_21C 5 Return @@ -97,11 +97,11 @@ _0119: GoToIf 5, _0148 CompareVarToValue 0x4060, 1 GoToIf 5, _0148 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0148: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0150: diff --git a/res/field/scripts/script_0092.s b/res/field/scripts/script_0092.s index 87f2d6531f..83b30a8e36 100644 --- a/res/field/scripts/script_0092.s +++ b/res/field/scripts/script_0092.s @@ -21,8 +21,8 @@ _001A: CheckFlag 121 GoToIf 1, _007E ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1AC - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1AC + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 121 ClearFlag 0x111 @@ -181,17 +181,17 @@ _01DF: GoToIf 0, _00BD CheckFlag 0x96E GoToIf 0, _0122 - ScrCmd_028 0x40B6, 1 + SetVar 0x40B6, 1 ClearFlag 0x111 ScrCmd_02C 6 - ScrCmd_028 0x8004, 1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DD - ScrCmd_028 0x8004, 23 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 23 + SetVar 0x8005, 1 ScrCmd_014 0x7DD - ScrCmd_028 0x8004, 28 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 28 + SetVar 0x8005, 1 ScrCmd_014 0x7DD ScrCmd_02C 7 ScrCmd_031 @@ -204,17 +204,17 @@ _023D: GoToIf 0, _00CC CheckFlag 0x96F GoToIf 0, _012D - ScrCmd_028 0x40B6, 2 + SetVar 0x40B6, 2 ClearFlag 0x111 ScrCmd_02C 10 - ScrCmd_028 0x8004, 1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DE - ScrCmd_028 0x8004, 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 3 + SetVar 0x8005, 1 ScrCmd_014 0x7DE - ScrCmd_028 0x8004, 4 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 4 + SetVar 0x8005, 1 ScrCmd_014 0x7DE ScrCmd_02C 11 ScrCmd_031 @@ -227,11 +227,11 @@ _029B: GoToIf 0, _00DB CheckFlag 0x970 GoToIf 0, _0138 - ScrCmd_028 0x40B6, 3 + SetVar 0x40B6, 3 ClearFlag 0x111 ScrCmd_02C 14 - ScrCmd_028 0x8004, 33 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 33 + SetVar 0x8005, 1 ScrCmd_014 0x7DD ScrCmd_02C 15 ScrCmd_031 @@ -244,20 +244,20 @@ _02D9: GoToIf 0, _00EA CheckFlag 0x971 GoToIf 0, _0143 - ScrCmd_028 0x40B6, 4 + SetVar 0x40B6, 4 ClearFlag 0x111 ScrCmd_02C 18 - ScrCmd_028 0x8004, 11 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 11 + SetVar 0x8005, 1 ScrCmd_014 0x7FE - ScrCmd_028 0x8004, 9 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 9 + SetVar 0x8005, 1 ScrCmd_014 0x7FE - ScrCmd_028 0x8004, 17 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 17 + SetVar 0x8005, 1 ScrCmd_014 0x7FE - ScrCmd_028 0x8004, 113 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 113 + SetVar 0x8005, 1 ScrCmd_014 0x7FE ScrCmd_02C 19 ScrCmd_031 @@ -270,7 +270,7 @@ _0347: GoToIf 0, _00F9 CheckFlag 0x972 GoToIf 0, _014E - ScrCmd_028 0x40B6, 5 + SetVar 0x40B6, 5 ClearFlag 0x111 ClearFlag 252 ScrCmd_02C 22 @@ -290,20 +290,20 @@ _037F: GoTo _03C7 _03A3: - ScrCmd_028 0x8004, 101 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 101 + SetVar 0x8005, 1 ScrCmd_014 0x7FE Return _03B5: - ScrCmd_028 0x8004, 102 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 102 + SetVar 0x8005, 1 ScrCmd_014 0x7FE Return _03C7: - ScrCmd_028 0x8004, 103 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 103 + SetVar 0x8005, 1 ScrCmd_014 0x7FE Return @@ -316,13 +316,13 @@ _03D9: CallIf 1, _057A CheckFlag 252 CallIf 0, _0443 - ScrCmd_028 0x8004, 81 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 81 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _056B ScrCmd_014 0x7FE - ScrCmd_028 0x40B6, 6 + SetVar 0x40B6, 6 ClearFlag 0x111 ClearFlag 252 ScrCmd_02C 28 @@ -343,13 +343,13 @@ _0448: CallIf 1, _057A CheckFlag 252 CallIf 0, _04A4 - ScrCmd_028 0x8004, 82 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 82 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _056B ScrCmd_014 0x7DC - ScrCmd_028 0x40B6, 7 + SetVar 0x40B6, 7 ClearFlag 252 ScrCmd_034 ScrCmd_061 @@ -367,13 +367,13 @@ _04A9: CallIf 1, _057A CheckFlag 252 CallIf 0, _0505 - ScrCmd_028 0x8004, 83 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 83 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _056B ScrCmd_014 0x7DC - ScrCmd_028 0x40B6, 8 + SetVar 0x40B6, 8 ClearFlag 252 ScrCmd_034 ScrCmd_061 @@ -391,13 +391,13 @@ _050A: CallIf 1, _057A CheckFlag 252 CallIf 0, _0566 - ScrCmd_028 0x8004, 84 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 84 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _056B ScrCmd_014 0x7DC - ScrCmd_028 0x40B6, 9 + SetVar 0x40B6, 9 ClearFlag 252 ScrCmd_034 ScrCmd_061 @@ -430,23 +430,23 @@ _057F: GoTo _05D6 _05B2: - ScrCmd_05E 2, _05E4 - ScrCmd_05F + ApplyMovement 2, _05E4 + WaitMovement Return _05BE: - ScrCmd_05E 2, _05F8 - ScrCmd_05F + ApplyMovement 2, _05F8 + WaitMovement Return _05CA: - ScrCmd_05E 2, _060C - ScrCmd_05F + ApplyMovement 2, _060C + WaitMovement Return _05D6: - ScrCmd_05E 2, _0620 - ScrCmd_05F + ApplyMovement 2, _0620 + WaitMovement Return .balign 4, 0 @@ -537,7 +537,7 @@ _0696: ScrCmd_042 184, 4 ScrCmd_042 12, 5 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _070A CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0093.s b/res/field/scripts/script_0093.s index a8872b8e1e..c4d6f505c6 100644 --- a/res/field/scripts/script_0093.s +++ b/res/field/scripts/script_0093.s @@ -171,30 +171,30 @@ _01B2: End _01BD: - ScrCmd_05E 0, _0240 - ScrCmd_05E 0xFF, _027C - ScrCmd_05F + ApplyMovement 0, _0240 + ApplyMovement 0xFF, _027C + WaitMovement GoTo _0225 End _01D7: - ScrCmd_05E 0, _0240 - ScrCmd_05E 0xFF, _0294 - ScrCmd_05F + ApplyMovement 0, _0240 + ApplyMovement 0xFF, _0294 + WaitMovement GoTo _0225 End _01F1: - ScrCmd_05E 0, _0240 - ScrCmd_05E 0xFF, _02AC - ScrCmd_05F + ApplyMovement 0, _0240 + ApplyMovement 0xFF, _02AC + WaitMovement GoTo _0225 End _020B: - ScrCmd_05E 0, _0258 - ScrCmd_05E 0xFF, _02C4 - ScrCmd_05F + ApplyMovement 0, _0258 + ApplyMovement 0xFF, _02C4 + WaitMovement GoTo _0225 End @@ -344,8 +344,8 @@ _03AC: CheckFlag 0x98C GoToIf 0, _03F4 ScrCmd_02C 33 - ScrCmd_028 0x8004, 46 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 46 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -362,8 +362,8 @@ _03F4: CompareVarToValue 0x800C, 8 GoToIf 0, _0442 ScrCmd_02C 34 - ScrCmd_028 0x8004, 47 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 47 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -379,8 +379,8 @@ _0442: CheckFlag 0x96A GoToIf 0, _048A ScrCmd_02C 35 - ScrCmd_028 0x8004, 72 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 72 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -396,8 +396,8 @@ _048A: CheckFlag 0x968 GoToIf 0, _04D2 ScrCmd_02C 36 - ScrCmd_028 0x8004, 73 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 73 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -413,8 +413,8 @@ _04D2: CheckFlag 0x969 GoToIf 0, _051A ScrCmd_02C 37 - ScrCmd_028 0x8004, 74 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 74 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -430,8 +430,8 @@ _051A: CheckFlag 0x96C GoToIf 0, _0562 ScrCmd_02C 38 - ScrCmd_028 0x8004, 75 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 75 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -447,8 +447,8 @@ _0562: CheckFlag 0x96B GoToIf 0, _05AA ScrCmd_02C 39 - ScrCmd_028 0x8004, 76 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 76 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -465,8 +465,8 @@ _05AA: CompareVarToValue 0x800C, 100 GoToIf 0, _05F8 ScrCmd_02C 40 - ScrCmd_028 0x8004, 77 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 77 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -483,8 +483,8 @@ _05F8: CompareVarToValue 0x800C, 100 GoToIf 0, _0646 ScrCmd_02C 41 - ScrCmd_028 0x8004, 78 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 78 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -501,8 +501,8 @@ _0646: CompareVarToValue 0x800C, 100 GoToIf 0, _0694 ScrCmd_02C 42 - ScrCmd_028 0x8004, 79 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 79 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -519,8 +519,8 @@ _0694: CompareVarToValue 0x800C, 100 GoToIf 0, _06E2 ScrCmd_02C 43 - ScrCmd_028 0x8004, 80 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 80 + SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06F3 @@ -595,8 +595,8 @@ _0740: _0753: ScrCmd_060 - ScrCmd_05E 0xFF, _087C - ScrCmd_05F + ApplyMovement 0xFF, _087C + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x2D5 GoToIf 1, _07A8 @@ -645,12 +645,12 @@ _0820: ClearFlag 0x23D ScrCmd_064 32 ScrCmd_064 31 - ScrCmd_05E 31, _0884 - ScrCmd_05F + ApplyMovement 31, _0884 + WaitMovement ScrCmd_04C 0x1AB, 0 ScrCmd_04D - ScrCmd_05E 32, _0894 - ScrCmd_05F + ApplyMovement 32, _0894 + WaitMovement ScrCmd_02C 0 ScrCmd_02C 1 ScrCmd_04C 0x1AB, 0 @@ -658,10 +658,10 @@ _0820: ScrCmd_065 31 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 32, _089C - ScrCmd_05F + ApplyMovement 32, _089C + WaitMovement ScrCmd_065 32 - ScrCmd_028 0x40F6, 1 + SetVar 0x40F6, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0095.s b/res/field/scripts/script_0095.s index faddb88c30..fce2384ea9 100644 --- a/res/field/scripts/script_0095.s +++ b/res/field/scripts/script_0095.s @@ -70,13 +70,13 @@ _00A2: _00B6: ScrCmd_060 - ScrCmd_05E 0, _00DC - ScrCmd_05F + ApplyMovement 0, _00DC + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _00F0 - ScrCmd_05F - ScrCmd_028 0x40D1, 1 + ApplyMovement 0, _00F0 + WaitMovement + SetVar 0x40D1, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0096.s b/res/field/scripts/script_0096.s index f6af8c1c11..bd0b905b75 100644 --- a/res/field/scripts/script_0096.s +++ b/res/field/scripts/script_0096.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_171 End diff --git a/res/field/scripts/script_0097.s b/res/field/scripts/script_0097.s index f6af8c1c11..bd0b905b75 100644 --- a/res/field/scripts/script_0097.s +++ b/res/field/scripts/script_0097.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_171 End diff --git a/res/field/scripts/script_0098.s b/res/field/scripts/script_0098.s index 56a902bcbb..5c71b94f75 100644 --- a/res/field/scripts/script_0098.s +++ b/res/field/scripts/script_0098.s @@ -38,23 +38,23 @@ _0039: End _007B: - ScrCmd_05E 0, _01B8 - ScrCmd_05F + ApplyMovement 0, _01B8 + WaitMovement GoTo _00BB _008B: - ScrCmd_05E 0, _01DC - ScrCmd_05F + ApplyMovement 0, _01DC + WaitMovement GoTo _00BB _009B: - ScrCmd_05E 0, _0200 - ScrCmd_05F + ApplyMovement 0, _0200 + WaitMovement GoTo _00BB _00AB: - ScrCmd_05E 0, _0224 - ScrCmd_05F + ApplyMovement 0, _0224 + WaitMovement GoTo _00BB _00BB: @@ -77,24 +77,24 @@ _00BB: ScrCmd_04F ScrCmd_15C 4 ScrCmd_260 23 - ScrCmd_023 0x10A - ScrCmd_023 0x118 - ScrCmd_023 0x11C - ScrCmd_023 0x145 - ScrCmd_023 0x14A - ScrCmd_023 0x154 - ScrCmd_023 0x157 - ScrCmd_023 0x165 + SetTrainerFlag 0x10A + SetTrainerFlag 0x118 + SetTrainerFlag 0x11C + SetTrainerFlag 0x145 + SetTrainerFlag 0x14A + SetTrainerFlag 0x154 + SetTrainerFlag 0x157 + SetTrainerFlag 0x165 ScrCmd_1CD 10, 91, 0x13E, 0, 0 - ScrCmd_028 0x407B, 1 + SetVar 0x407B, 1 SetFlag 0x206 ClearFlag 0x207 ScrCmd_02C 3 GoTo _0158 _0158: - ScrCmd_028 0x8004, 0x188 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x188 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0196 diff --git a/res/field/scripts/script_0101.s b/res/field/scripts/script_0101.s index a61983c6e8..af0e3e314f 100644 --- a/res/field/scripts/script_0101.s +++ b/res/field/scripts/script_0101.s @@ -24,23 +24,23 @@ _0014: End _0056: - ScrCmd_05E 0, _018C - ScrCmd_05F + ApplyMovement 0, _018C + WaitMovement GoTo _0096 _0066: - ScrCmd_05E 0, _01A0 - ScrCmd_05F + ApplyMovement 0, _01A0 + WaitMovement GoTo _0096 _0076: - ScrCmd_05E 0, _01B4 - ScrCmd_05F + ApplyMovement 0, _01B4 + WaitMovement GoTo _0096 _0086: - ScrCmd_05E 0, _01C8 - ScrCmd_05F + ApplyMovement 0, _01C8 + WaitMovement GoTo _0096 _0096: @@ -61,24 +61,24 @@ _0096: ScrCmd_04F ScrCmd_15C 4 ScrCmd_260 23 - ScrCmd_023 0x10A - ScrCmd_023 0x118 - ScrCmd_023 0x11C - ScrCmd_023 0x145 - ScrCmd_023 0x14A - ScrCmd_023 0x154 - ScrCmd_023 0x157 - ScrCmd_023 0x165 + SetTrainerFlag 0x10A + SetTrainerFlag 0x118 + SetTrainerFlag 0x11C + SetTrainerFlag 0x145 + SetTrainerFlag 0x14A + SetTrainerFlag 0x154 + SetTrainerFlag 0x157 + SetTrainerFlag 0x165 ScrCmd_1CD 10, 100, 0x13E, 0, 0 - ScrCmd_028 0x407B, 1 + SetVar 0x407B, 1 SetFlag 0x206 ClearFlag 0x207 ScrCmd_02C 3 GoTo _012B _012B: - ScrCmd_028 0x8004, 0x188 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x188 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0169 diff --git a/res/field/scripts/script_0102.s b/res/field/scripts/script_0102.s index 21b58ffdb9..f2e1af7806 100644 --- a/res/field/scripts/script_0102.s +++ b/res/field/scripts/script_0102.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0106.s b/res/field/scripts/script_0106.s index 5235ce4394..392c1e4038 100644 --- a/res/field/scripts/script_0106.s +++ b/res/field/scripts/script_0106.s @@ -14,8 +14,8 @@ _000A: GoToIf 1, _0054 ScrCmd_0D1 0, 253 ScrCmd_02C 0 - ScrCmd_028 0x8004, 253 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 253 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0064 diff --git a/res/field/scripts/script_0107.s b/res/field/scripts/script_0107.s index 961891f45a..d5751e019f 100644 --- a/res/field/scripts/script_0107.s +++ b/res/field/scripts/script_0107.s @@ -7,10 +7,10 @@ _0006: ScrCmd_060 - ScrCmd_05E 0xFF, _00B8 - ScrCmd_05F + ApplyMovement 0xFF, _00B8 + WaitMovement ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 1 GoToIf 1, _0038 CompareVarToValue 0x8008, 0 @@ -18,7 +18,7 @@ _0006: End _0038: - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -28,7 +28,7 @@ _0038: End _006A: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -40,8 +40,8 @@ _006A: _009C: ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 - ScrCmd_05E 0xFF, _00C4 - ScrCmd_05F + ApplyMovement 0xFF, _00C4 + WaitMovement ScrCmd_049 0x603 Return diff --git a/res/field/scripts/script_0108.s b/res/field/scripts/script_0108.s index 8b6488e5b3..048f64ed4b 100644 --- a/res/field/scripts/script_0108.s +++ b/res/field/scripts/script_0108.s @@ -28,8 +28,8 @@ _0039: CheckFlag 141 GoToIf 1, _0083 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1C1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1C1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _008E diff --git a/res/field/scripts/script_0112.s b/res/field/scripts/script_0112.s index 0eb3cee4e1..21ceb289bb 100644 --- a/res/field/scripts/script_0112.s +++ b/res/field/scripts/script_0112.s @@ -18,8 +18,8 @@ _000A: _001D: ScrCmd_060 - ScrCmd_05E 1, _0264 - ScrCmd_05F + ApplyMovement 1, _0264 + WaitMovement ScrCmd_014 0x7FA ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 5 @@ -81,7 +81,7 @@ _00CF: ScrCmd_049 0x603 ScrCmd_065 1 ScrCmd_04B 0x603 - ScrCmd_028 0x407B, 2 + SetVar 0x407B, 2 ScrCmd_061 End @@ -91,53 +91,53 @@ _0148: End _014E: - ScrCmd_05E 1, _01D4 - ScrCmd_05F + ApplyMovement 1, _01D4 + WaitMovement Return _015A: - ScrCmd_05E 1, _01E4 - ScrCmd_05F + ApplyMovement 1, _01E4 + WaitMovement Return _0166: - ScrCmd_05E 1, _01F4 - ScrCmd_05F + ApplyMovement 1, _01F4 + WaitMovement Return _0172: - ScrCmd_05E 1, _01FC - ScrCmd_05F + ApplyMovement 1, _01FC + WaitMovement Return _017E: - ScrCmd_05E 1, _020C - ScrCmd_05F + ApplyMovement 1, _020C + WaitMovement Return _018A: - ScrCmd_05E 1, _021C - ScrCmd_05F + ApplyMovement 1, _021C + WaitMovement Return _0196: - ScrCmd_05E 1, _022C - ScrCmd_05F + ApplyMovement 1, _022C + WaitMovement Return _01A2: - ScrCmd_05E 1, _023C - ScrCmd_05F + ApplyMovement 1, _023C + WaitMovement Return _01AE: - ScrCmd_05E 1, _0244 - ScrCmd_05F + ApplyMovement 1, _0244 + WaitMovement Return _01BA: - ScrCmd_05E 1, _0254 - ScrCmd_05F + ApplyMovement 1, _0254 + WaitMovement Return .byte 0 diff --git a/res/field/scripts/script_0116.s b/res/field/scripts/script_0116.s index fa15bb2cf2..ba11b21f61 100644 --- a/res/field/scripts/script_0116.s +++ b/res/field/scripts/script_0116.s @@ -7,10 +7,10 @@ _0006: ScrCmd_060 - ScrCmd_05E 0xFF, _00B8 - ScrCmd_05F + ApplyMovement 0xFF, _00B8 + WaitMovement ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 1 GoToIf 1, _0038 CompareVarToValue 0x8008, 0 @@ -18,7 +18,7 @@ _0006: End _0038: - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -28,7 +28,7 @@ _0038: End _006A: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -40,8 +40,8 @@ _006A: _009C: ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 - ScrCmd_05E 0xFF, _00C4 - ScrCmd_05F + ApplyMovement 0xFF, _00C4 + WaitMovement ScrCmd_049 0x603 Return diff --git a/res/field/scripts/script_0117.s b/res/field/scripts/script_0117.s index f4de3f4ff9..73b1c19247 100644 --- a/res/field/scripts/script_0117.s +++ b/res/field/scripts/script_0117.s @@ -52,7 +52,7 @@ _0057: _00A8: ScrCmd_034 ScrCmd_177 0x4000 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BB 0x4000, 0x800C diff --git a/res/field/scripts/script_0119.s b/res/field/scripts/script_0119.s index 66fbf2ab85..5f87589910 100644 --- a/res/field/scripts/script_0119.s +++ b/res/field/scripts/script_0119.s @@ -17,40 +17,40 @@ _002E: ScrCmd_060 - ScrCmd_05E 6, _0140 - ScrCmd_05F + ApplyMovement 6, _0140 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 5, _0174 - ScrCmd_05F + ApplyMovement 5, _0174 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _0138 - ScrCmd_05F - ScrCmd_05E 6, _014C - ScrCmd_05F + ApplyMovement 0xFF, _0138 + WaitMovement + ApplyMovement 6, _014C + WaitMovement ScrCmd_02C 2 ScrCmd_0CD 0 ScrCmd_02C 3 ScrCmd_02C 4 - ScrCmd_028 0x8004, 49 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 49 + SetVar 0x8005, 1 ScrCmd_014 0x7FF ScrCmd_02C 5 - ScrCmd_05E 6, _0158 - ScrCmd_05E 5, _017C - ScrCmd_05F + ApplyMovement 6, _0158 + ApplyMovement 5, _017C + WaitMovement ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 6, _0160 - ScrCmd_05E 0xFF, _01DC - ScrCmd_05F + ApplyMovement 6, _0160 + ApplyMovement 0xFF, _01DC + WaitMovement ScrCmd_065 6 - ScrCmd_028 0x40F7, 1 - ScrCmd_05E 5, _0190 - ScrCmd_05E 0xFF, _01E4 - ScrCmd_05F + SetVar 0x40F7, 1 + ApplyMovement 5, _0190 + ApplyMovement 0xFF, _01E4 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 7 ScrCmd_034 @@ -76,9 +76,9 @@ _0104: ScrCmd_02C 10 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0xFF, _01C8 - ScrCmd_05E 5, _01B0 - ScrCmd_05F + ApplyMovement 0xFF, _01C8 + ApplyMovement 5, _01B0 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 5 ScrCmd_04B 0x603 @@ -375,8 +375,8 @@ _0428: End _0437: - ScrCmd_289 0x800C, 60, 30, 30, 30, 30 - ScrCmd_028 78, 0x486 + ScrCmd_289 0x800C, 60, 30, 30, 30, 30, 40 + ScrCmd_04E 0x486 ScrCmd_0CD 0 ScrCmd_02C 14 ScrCmd_04F @@ -387,13 +387,13 @@ _0458: ScrCmd_1BD 0x800C CompareVarToValue 0x800C, 2 GoToIf 1, _0475 - ScrCmd_05E 9, _0484 - ScrCmd_05F + ApplyMovement 9, _0484 + WaitMovement Return _0475: - ScrCmd_05E 9, _0490 - ScrCmd_05F + ApplyMovement 9, _0490 + WaitMovement Return .balign 4, 0 @@ -441,53 +441,53 @@ _04EC: End _052B: - ScrCmd_05E 10, _0624 - ScrCmd_05F + ApplyMovement 10, _0624 + WaitMovement GoTo _04EC End _053D: - ScrCmd_05E 10, _0638 - ScrCmd_05F + ApplyMovement 10, _0638 + WaitMovement GoTo _04EC End _054F: - ScrCmd_05E 10, _064C - ScrCmd_05F + ApplyMovement 10, _064C + WaitMovement GoTo _04EC End _0561: - ScrCmd_05E 10, _0660 - ScrCmd_05F + ApplyMovement 10, _0660 + WaitMovement GoTo _04EC End _0573: - ScrCmd_05E 10, _05E8 - ScrCmd_05E 0xFF, _0604 - ScrCmd_05F + ApplyMovement 10, _05E8 + ApplyMovement 0xFF, _0604 + WaitMovement GoTo _05D3 End _058D: - ScrCmd_05E 10, _05E8 - ScrCmd_05E 0xFF, _0604 - ScrCmd_05F + ApplyMovement 10, _05E8 + ApplyMovement 0xFF, _0604 + WaitMovement GoTo _05D3 End _05A7: - ScrCmd_05E 10, _05E8 - ScrCmd_05F + ApplyMovement 10, _05E8 + WaitMovement GoTo _05D3 End _05B9: - ScrCmd_05E 10, _05F4 - ScrCmd_05E 0xFF, _0610 - ScrCmd_05F + ApplyMovement 10, _05F4 + ApplyMovement 0xFF, _0610 + WaitMovement GoTo _05D3 End diff --git a/res/field/scripts/script_0123.s b/res/field/scripts/script_0123.s index 3ebf8b2e97..6e9743cee5 100644 --- a/res/field/scripts/script_0123.s +++ b/res/field/scripts/script_0123.s @@ -28,7 +28,7 @@ .short 0xFD13 _005E: - ScrCmd_028 0x40C7, 0 + SetVar 0x40C7, 0 SetFlag 0x17E CompareVarToValue 0x407C, 5 CallIf 1, _074D @@ -121,7 +121,7 @@ _012F: CallIf 1, _01A4 ScrCmd_261 0, 0x8004 ScrCmd_02C 37 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF SetFlag 0x128 ScrCmd_034 @@ -136,15 +136,15 @@ _0189: End _0194: - ScrCmd_028 0x8004, 93 + SetVar 0x8004, 93 Return _019C: - ScrCmd_028 0x8004, 94 + SetVar 0x8004, 94 Return _01A4: - ScrCmd_028 0x8004, 92 + SetVar 0x8004, 92 Return _01AC: @@ -216,33 +216,33 @@ _0220: End _025A: - ScrCmd_028 0x8007, 2 - ScrCmd_05E 21, _0388 - ScrCmd_05E 0xFF, _02EC - ScrCmd_05F + SetVar 0x8007, 2 + ApplyMovement 21, _0388 + ApplyMovement 0xFF, _02EC + WaitMovement GoTo _02D2 End _027A: - ScrCmd_028 0x8007, 3 - ScrCmd_05E 21, _0398 - ScrCmd_05F + SetVar 0x8007, 3 + ApplyMovement 21, _0398 + WaitMovement GoTo _02D2 End _0292: - ScrCmd_028 0x8007, 0 - ScrCmd_05E 21, _0398 - ScrCmd_05E 0xFF, _030C - ScrCmd_05F + SetVar 0x8007, 0 + ApplyMovement 21, _0398 + ApplyMovement 0xFF, _030C + WaitMovement GoTo _02D2 End _02B2: - ScrCmd_028 0x8007, 1 - ScrCmd_05E 21, _0398 - ScrCmd_05E 0xFF, _0304 - ScrCmd_05F + SetVar 0x8007, 1 + ApplyMovement 21, _0398 + ApplyMovement 0xFF, _0304 + WaitMovement GoTo _02D2 End @@ -541,8 +541,8 @@ _0471: ScrCmd_0CE 0 ScrCmd_02C 16 ScrCmd_034 - ScrCmd_05E 26, _04C0 - ScrCmd_05F + ApplyMovement 26, _04C0 + WaitMovement ScrCmd_061 End @@ -579,18 +579,18 @@ _04C8: ScrCmd_188 26, 16 ScrCmd_189 26, 2 ScrCmd_064 26 - ScrCmd_05E 26, _05B0 - ScrCmd_05F + ApplyMovement 26, _05B0 + WaitMovement ScrCmd_014 0x7FA - ScrCmd_05E 26, _05C0 - ScrCmd_05E 0xFF, _05A4 - ScrCmd_05F + ApplyMovement 26, _05C0 + ApplyMovement 0xFF, _05A4 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 26, _05CC - ScrCmd_05F + ApplyMovement 26, _05CC + WaitMovement ScrCmd_0DE 0x800C CompareVarToValue 0x800C, 0x183 GoToIf 1, _054B @@ -618,10 +618,10 @@ _0563: ScrCmd_0CD 1 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 26, _05D4 - ScrCmd_05F + ApplyMovement 26, _05D4 + WaitMovement ScrCmd_065 26 - ScrCmd_028 0x407C, 2 + SetVar 0x407C, 2 ScrCmd_061 End @@ -669,9 +669,9 @@ _05E0: ScrCmd_189 26, 1 ScrCmd_064 26 ScrCmd_062 26 - ScrCmd_05E 26, _0798 - ScrCmd_05E 0xFF, _07CC - ScrCmd_05F + ApplyMovement 26, _0798 + ApplyMovement 0xFF, _07CC + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 7 @@ -679,56 +679,56 @@ _05E0: ScrCmd_168 18, 25, 13, 27, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 0xFF, _07D8 - ScrCmd_05F + ApplyMovement 0xFF, _07D8 + WaitMovement ClearFlag 0x1FB ScrCmd_186 27, 0x24D, 0x33B ScrCmd_189 27, 0 ScrCmd_188 27, 14 ScrCmd_064 27 ScrCmd_062 27 - ScrCmd_05E 27, _0764 - ScrCmd_05F + ApplyMovement 27, _0764 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 SetFlag 0x20F - ScrCmd_05E 27, _076C - ScrCmd_05F + ApplyMovement 27, _076C + WaitMovement ScrCmd_02C 8 ScrCmd_034 - ScrCmd_05E 26, _07A4 - ScrCmd_05F + ApplyMovement 26, _07A4 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 9 - ScrCmd_05E 27, _077C - ScrCmd_05F + ApplyMovement 27, _077C + WaitMovement ScrCmd_02C 10 - ScrCmd_05E 27, _0784 - ScrCmd_05F + ApplyMovement 27, _0784 + WaitMovement ScrCmd_02C 11 ScrCmd_0CE 0 ScrCmd_02C 12 - ScrCmd_05E 27, _077C - ScrCmd_05F + ApplyMovement 27, _077C + WaitMovement ScrCmd_02C 13 ScrCmd_034 - ScrCmd_05E 0xFF, _07EC - ScrCmd_05E 26, _07AC - ScrCmd_05E 27, _078C - ScrCmd_05F + ApplyMovement 0xFF, _07EC + ApplyMovement 26, _07AC + ApplyMovement 27, _078C + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 14 ScrCmd_034 - ScrCmd_05E 26, _07C0 - ScrCmd_05F + ApplyMovement 26, _07C0 + WaitMovement Call _0737 ClearFlag 0x1FB ScrCmd_187 27, 0x263, 0, 0x32A, 0 Call _0721 ClearFlag 0x1A9 ScrCmd_187 26, 0x260, 0, 0x32E, 1 - ScrCmd_028 0x407C, 4 + SetVar 0x407C, 4 ScrCmd_061 End @@ -826,38 +826,38 @@ _07EC: _07F8: ScrCmd_060 Call _086F - ScrCmd_05E 27, _0B6C - ScrCmd_05E 26, _0B08 - ScrCmd_05E 0xFF, _0AAC - ScrCmd_05E 21, _0B44 - ScrCmd_05F + ApplyMovement 27, _0B6C + ApplyMovement 26, _0B08 + ApplyMovement 0xFF, _0AAC + ApplyMovement 21, _0B44 + WaitMovement Call _08D9 - ScrCmd_05E 27, _0B74 - ScrCmd_05E 26, _0B3C - ScrCmd_05E 0xFF, _0AC8 - ScrCmd_05E 21, _0B54 - ScrCmd_05F + ApplyMovement 27, _0B74 + ApplyMovement 26, _0B3C + ApplyMovement 0xFF, _0AC8 + ApplyMovement 21, _0B54 + WaitMovement Call _08FA ScrCmd_02C 23 - ScrCmd_05E 27, _0B80 - ScrCmd_05E 0xFF, _0AD4 - ScrCmd_05F + ApplyMovement 27, _0B80 + ApplyMovement 0xFF, _0AD4 + WaitMovement Call _091C ScrCmd_061 End _086F: - ScrCmd_05E 26, _0AE4 - ScrCmd_05F + ApplyMovement 26, _0AE4 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 0xFF, _0AA4 - ScrCmd_05E 27, _0B5C - ScrCmd_05F + ApplyMovement 0xFF, _0AA4 + ApplyMovement 27, _0B5C + WaitMovement ScrCmd_02C 18 - ScrCmd_05E 26, _0AF0 - ScrCmd_05F + ApplyMovement 26, _0AF0 + WaitMovement ScrCmd_049 0x65B ScrCmd_003 4, 0x800C ScrCmd_02C 19 @@ -874,11 +874,11 @@ _086F: _08D9: ScrCmd_02C 20 - ScrCmd_05E 27, _0B6C - ScrCmd_05F + ApplyMovement 27, _0B6C + WaitMovement ScrCmd_02C 21 - ScrCmd_05E 21, _0B4C - ScrCmd_05F + ApplyMovement 21, _0B4C + WaitMovement ScrCmd_02C 22 ScrCmd_034 Return @@ -895,9 +895,9 @@ _08FA: _091C: ScrCmd_02C 24 ScrCmd_034 - ScrCmd_05E 27, _0B88 - ScrCmd_05E 0xFF, _099C - ScrCmd_05F + ApplyMovement 27, _0B88 + ApplyMovement 0xFF, _099C + WaitMovement ScrCmd_065 27 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 0x261 @@ -907,7 +907,7 @@ _091C: CompareVarToValue 0x8004, 0x264 CallIf 1, _0981 SetFlag 0x20D - ScrCmd_028 0x407C, 5 + SetVar 0x407C, 5 SetFlag 0x102 ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -917,13 +917,13 @@ _091C: Return _0981: - ScrCmd_05E 26, _0B1C - ScrCmd_05F + ApplyMovement 26, _0B1C + WaitMovement Return _098D: - ScrCmd_05E 26, _0B28 - ScrCmd_05F + ApplyMovement 26, _0B28 + WaitMovement Return .balign 4, 0 @@ -943,11 +943,11 @@ _09A8: CompareVarToValue 0x8004, 0x264 CallIf 1, _0A55 Call _08D9 - ScrCmd_05E 0xFF, _0AC8 - ScrCmd_05E 27, _0B74 - ScrCmd_05E 26, _0B3C - ScrCmd_05E 21, _0B54 - ScrCmd_05F + ApplyMovement 0xFF, _0AC8 + ApplyMovement 27, _0B74 + ApplyMovement 26, _0B3C + ApplyMovement 21, _0B54 + WaitMovement Call _08FA ScrCmd_02C 23 ScrCmd_069 0x8004, 0x8005 @@ -960,31 +960,31 @@ _09A8: End _0A31: - ScrCmd_05E 27, _0B6C - ScrCmd_05E 0xFF, _0ABC - ScrCmd_05E 26, _0B10 - ScrCmd_05E 21, _0B44 - ScrCmd_05F + ApplyMovement 27, _0B6C + ApplyMovement 0xFF, _0ABC + ApplyMovement 26, _0B10 + ApplyMovement 21, _0B44 + WaitMovement Return _0A55: - ScrCmd_05E 27, _0B6C - ScrCmd_05E 0xFF, _0ABC - ScrCmd_05E 26, _0B10 - ScrCmd_05E 21, _0B44 - ScrCmd_05F + ApplyMovement 27, _0B6C + ApplyMovement 0xFF, _0ABC + ApplyMovement 26, _0B10 + ApplyMovement 21, _0B44 + WaitMovement Return _0A79: - ScrCmd_05E 27, _0B80 - ScrCmd_05E 0xFF, _0AD4 - ScrCmd_05F + ApplyMovement 27, _0B80 + ApplyMovement 0xFF, _0AD4 + WaitMovement Return _0A8D: - ScrCmd_05E 27, _0B80 - ScrCmd_05E 0xFF, _0ADC - ScrCmd_05F + ApplyMovement 27, _0B80 + ApplyMovement 0xFF, _0ADC + WaitMovement Return .balign 4, 0 @@ -1131,16 +1131,16 @@ _0B88: _0B90: ScrCmd_060 - ScrCmd_05E 0xFF, _0BC8 - ScrCmd_05E 26, _0BD8 - ScrCmd_05F + ApplyMovement 0xFF, _0BC8 + ApplyMovement 26, _0BD8 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 26 ScrCmd_034 - ScrCmd_05E 0xFF, _0BD0 - ScrCmd_05E 26, _0BE0 - ScrCmd_05F + ApplyMovement 0xFF, _0BD0 + ApplyMovement 26, _0BE0 + WaitMovement ScrCmd_061 End @@ -1170,7 +1170,7 @@ _0BF0: ScrCmd_060 CheckFlag 0x156 GoToIf 1, _0C1E - ScrCmd_028 0x40C7, 1 + SetVar 0x40C7, 1 ScrCmd_1B7 0x800C, 100 CompareVarToValue 0x800C, 90 GoToIf 4, _0C22 @@ -1184,14 +1184,14 @@ _0C1E: _0C22: ClearFlag 0x29D ScrCmd_064 28 - ScrCmd_05E 0xFF, _0C78 - ScrCmd_05E 28, _0C64 - ScrCmd_05F + ApplyMovement 0xFF, _0C78 + ApplyMovement 28, _0C64 + WaitMovement ScrCmd_04C 0x1C5, 0 ScrCmd_04D ScrCmd_003 30, 0x800C - ScrCmd_05E 28, _0C70 - ScrCmd_05F + ApplyMovement 28, _0C70 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 28 ScrCmd_04B 0x603 diff --git a/res/field/scripts/script_0125.s b/res/field/scripts/script_0125.s index 341fbba521..8a74b59911 100644 --- a/res/field/scripts/script_0125.s +++ b/res/field/scripts/script_0125.s @@ -12,31 +12,31 @@ .short 0xFD13 _001E: - ScrCmd_028 0x4001, 0 - ScrCmd_028 0x4002, 1 - ScrCmd_028 0x4003, 0 + SetVar 0x4001, 0 + SetVar 0x4002, 1 + SetVar 0x4003, 0 ScrCmd_16F End _0034: ScrCmd_170 - ScrCmd_028 0x4001, 1 - ScrCmd_028 0x4002, 0 - ScrCmd_028 0x4003, 0 + SetVar 0x4001, 1 + SetVar 0x4002, 0 + SetVar 0x4003, 0 End _004A: ScrCmd_170 - ScrCmd_028 0x4001, 0 - ScrCmd_028 0x4002, 1 - ScrCmd_028 0x4003, 0 + SetVar 0x4001, 0 + SetVar 0x4002, 1 + SetVar 0x4003, 0 End _0060: ScrCmd_170 - ScrCmd_028 0x4001, 0 - ScrCmd_028 0x4002, 0 - ScrCmd_028 0x4003, 1 + SetVar 0x4001, 0 + SetVar 0x4002, 0 + SetVar 0x4003, 1 End _0076: @@ -60,13 +60,13 @@ _0076: ScrCmd_04F ScrCmd_15C 3 ScrCmd_260 23 - ScrCmd_023 0x125 - ScrCmd_023 0x153 - ScrCmd_023 0x191 - ScrCmd_023 0x1E3 - ScrCmd_023 0x1F1 - ScrCmd_023 0x1F2 - ScrCmd_028 0x407C, 3 + SetTrainerFlag 0x125 + SetTrainerFlag 0x153 + SetTrainerFlag 0x191 + SetTrainerFlag 0x1E3 + SetTrainerFlag 0x1F1 + SetTrainerFlag 0x1F2 + SetVar 0x407C, 3 SetFlag 0x20C SetFlag 0x156 ScrCmd_1CD 10, 122, 0x13C, 0, 0 @@ -75,8 +75,8 @@ _0076: End _010D: - ScrCmd_028 0x8004, 0x17E - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x17E + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _014B diff --git a/res/field/scripts/script_0126.s b/res/field/scripts/script_0126.s index a99b387960..c1e617d069 100644 --- a/res/field/scripts/script_0126.s +++ b/res/field/scripts/script_0126.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0129.s b/res/field/scripts/script_0129.s index 3ced02c6c4..8a60113399 100644 --- a/res/field/scripts/script_0129.s +++ b/res/field/scripts/script_0129.s @@ -19,8 +19,8 @@ _0020: _0022: ScrCmd_060 - ScrCmd_05E 0xFF, _0194 - ScrCmd_05F + ApplyMovement 0xFF, _0194 + WaitMovement ScrCmd_069 0x4000, 0x4001 CompareVarToValue 0x4000, 5 CallIf 1, _017D @@ -62,17 +62,17 @@ _008C: End _00E2: - ScrCmd_05E 0xFF, _019C - ScrCmd_05F + ApplyMovement 0xFF, _019C + WaitMovement GoTo _0102 _00F2: - ScrCmd_05E 0xFF, _01B4 - ScrCmd_05F + ApplyMovement 0xFF, _01B4 + WaitMovement GoTo _0102 _0102: - ScrCmd_028 0x40DA, 1 + SetVar 0x40DA, 1 ScrCmd_202 0 ScrCmd_11B 125, 2, 5, 2, 1 ScrCmd_049 0x603 @@ -87,16 +87,16 @@ _0141: ScrCmd_02C 6 ScrCmd_034 ScrCmd_073 - ScrCmd_05E 0xFF, _01C4 - ScrCmd_05F + ApplyMovement 0xFF, _01C4 + WaitMovement ScrCmd_061 End _0156: ScrCmd_034 ScrCmd_073 - ScrCmd_05E 0xFF, _01C4 - ScrCmd_05F + ApplyMovement 0xFF, _01C4 + WaitMovement ScrCmd_061 End @@ -104,14 +104,14 @@ _0168: ScrCmd_073 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0xFF, _01C4 - ScrCmd_05F + ApplyMovement 0xFF, _01C4 + WaitMovement ScrCmd_061 End _017D: - ScrCmd_05E 0xFF, _018C - ScrCmd_05F + ApplyMovement 0xFF, _018C + WaitMovement Return .balign 4, 0 @@ -158,9 +158,9 @@ _01CC: _01F1: ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 0xFF, _0280 - ScrCmd_05F - ScrCmd_028 0x40DA, 0 + ApplyMovement 0xFF, _0280 + WaitMovement + SetVar 0x40DA, 0 ScrCmd_202 1 ScrCmd_31B 0x4002 CompareVarToValue 0x4002, 5 @@ -171,10 +171,10 @@ _01F1: _021E: CheckFlag 163 GoToIf 1, _024A - ScrCmd_05E 2, _0334 - ScrCmd_05F + ApplyMovement 2, _0334 + WaitMovement ScrCmd_02C 18 - ScrCmd_028 0x8004, 22 + SetVar 0x8004, 22 ScrCmd_014 0x7D9 SetFlag 163 ScrCmd_034 @@ -187,8 +187,8 @@ _024A: _024E: ScrCmd_034 - ScrCmd_05E 0xFF, _0288 - ScrCmd_05F + ApplyMovement 0xFF, _0288 + WaitMovement ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x1FD, 0, 68, 116, 0 @@ -210,9 +210,9 @@ _0288: _0298: ScrCmd_060 - ScrCmd_05E 0xFF, _0280 - ScrCmd_05F - ScrCmd_028 0x40DA, 0 + ApplyMovement 0xFF, _0280 + WaitMovement + SetVar 0x40DA, 0 ScrCmd_31B 0x4002 CompareVarToValue 0x4002, 5 GoToIf 4, _021E diff --git a/res/field/scripts/script_0131.s b/res/field/scripts/script_0131.s index 2f7546281c..0f5aac3427 100644 --- a/res/field/scripts/script_0131.s +++ b/res/field/scripts/script_0131.s @@ -14,8 +14,8 @@ _000A: GoToIf 1, _0055 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 17 - ScrCmd_026 0x8004, 184 - ScrCmd_028 0x8005, 1 + AddVar 0x8004, 184 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0060 diff --git a/res/field/scripts/script_0132.s b/res/field/scripts/script_0132.s index 2cf0d5e201..48e9fbddd3 100644 --- a/res/field/scripts/script_0132.s +++ b/res/field/scripts/script_0132.s @@ -36,8 +36,8 @@ _004A: CompareVarToValue 0x800C, 1 GoToIf 1, _00A7 ScrCmd_02C 4 - ScrCmd_028 0x8004, 215 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 215 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00B2 diff --git a/res/field/scripts/script_0135.s b/res/field/scripts/script_0135.s index f7c44615ba..ef92b762ea 100644 --- a/res/field/scripts/script_0135.s +++ b/res/field/scripts/script_0135.s @@ -60,8 +60,8 @@ _00CC: End _00D7: - ScrCmd_028 0x8004, 0x104 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x104 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CC @@ -77,8 +77,8 @@ _00D7: End _0118: - ScrCmd_028 0x8004, 0x105 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x105 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CC @@ -94,8 +94,8 @@ _0118: End _0159: - ScrCmd_028 0x8004, 0x106 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x106 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CC @@ -111,8 +111,8 @@ _0159: End _019A: - ScrCmd_028 0x8004, 0x107 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x107 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CC @@ -128,8 +128,8 @@ _019A: End _01DB: - ScrCmd_028 0x8004, 0x108 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x108 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CC @@ -150,11 +150,11 @@ _021C: ScrCmd_281 0x8000, 0, 0x800C CompareVarToValue 0x800C, 200 GoToIf 0, _0244 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0244: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _024C: @@ -163,11 +163,11 @@ _024C: ScrCmd_281 0x8000, 1, 0x800C CompareVarToValue 0x800C, 200 GoToIf 0, _0274 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0274: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _027C: @@ -176,11 +176,11 @@ _027C: ScrCmd_281 0x8000, 2, 0x800C CompareVarToValue 0x800C, 200 GoToIf 0, _02A4 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _02A4: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _02AC: @@ -189,11 +189,11 @@ _02AC: ScrCmd_281 0x8000, 3, 0x800C CompareVarToValue 0x800C, 200 GoToIf 0, _02D4 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _02D4: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _02DC: @@ -202,11 +202,11 @@ _02DC: ScrCmd_281 0x8000, 4, 0x800C CompareVarToValue 0x800C, 200 GoToIf 0, _0304 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0304: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _030C: diff --git a/res/field/scripts/script_0136.s b/res/field/scripts/script_0136.s index 2651845f26..c53bf9d08d 100644 --- a/res/field/scripts/script_0136.s +++ b/res/field/scripts/script_0136.s @@ -55,11 +55,11 @@ _00BA: Return _00D0: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _00D8: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _00E0: @@ -70,8 +70,8 @@ _00E0: _00F6: ScrCmd_060 - ScrCmd_05E 6, _0444 - ScrCmd_05F + ApplyMovement 6, _0444 + WaitMovement ScrCmd_014 0x7F8 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 0x2A9 @@ -94,17 +94,17 @@ _00F6: ScrCmd_169 77 ClearFlag 0x191 ScrCmd_064 25 - ScrCmd_05E 25, _0564 - ScrCmd_05F + ApplyMovement 25, _0564 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_05E 6, _0484 - ScrCmd_05F + ApplyMovement 6, _0484 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 25, _056C - ScrCmd_05F + ApplyMovement 25, _056C + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 0x2A9 CallIf 1, _0311 @@ -144,7 +144,7 @@ _00F6: CompareVarToValue 0x8004, 0x2AC CallIf 1, _042D ScrCmd_065 6 - ScrCmd_028 0x40F5, 1 + SetVar 0x40F5, 1 ScrCmd_061 End @@ -163,8 +163,8 @@ _02A7: ScrCmd_02C 7 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0xFF, _052C - ScrCmd_05F + ApplyMovement 0xFF, _052C + WaitMovement ScrCmd_02C 8 Return @@ -173,109 +173,109 @@ _02C4: ScrCmd_02C 9 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0xFF, _052C - ScrCmd_05F + ApplyMovement 0xFF, _052C + WaitMovement ScrCmd_02C 10 Return _02E1: - ScrCmd_05E 6, _0458 - ScrCmd_05F + ApplyMovement 6, _0458 + WaitMovement Return _02ED: - ScrCmd_05E 6, _0464 - ScrCmd_05F + ApplyMovement 6, _0464 + WaitMovement Return _02F9: - ScrCmd_05E 6, _046C - ScrCmd_05F + ApplyMovement 6, _046C + WaitMovement Return _0305: - ScrCmd_05E 6, _0478 - ScrCmd_05F + ApplyMovement 6, _0478 + WaitMovement Return _0311: - ScrCmd_05E 25, _0574 - ScrCmd_05E 6, _048C - ScrCmd_05E 0xFF, _04EC - ScrCmd_05F + ApplyMovement 25, _0574 + ApplyMovement 6, _048C + ApplyMovement 0xFF, _04EC + WaitMovement Return _032D: - ScrCmd_05E 25, _0580 - ScrCmd_05E 6, _0498 - ScrCmd_05E 0xFF, _04FC - ScrCmd_05F + ApplyMovement 25, _0580 + ApplyMovement 6, _0498 + ApplyMovement 0xFF, _04FC + WaitMovement Return _0349: - ScrCmd_05E 25, _058C - ScrCmd_05E 6, _04A4 - ScrCmd_05E 0xFF, _050C - ScrCmd_05F + ApplyMovement 25, _058C + ApplyMovement 6, _04A4 + ApplyMovement 0xFF, _050C + WaitMovement Return _0365: - ScrCmd_05E 25, _0598 - ScrCmd_05E 6, _04B0 - ScrCmd_05E 0xFF, _051C - ScrCmd_05F + ApplyMovement 25, _0598 + ApplyMovement 6, _04B0 + ApplyMovement 0xFF, _051C + WaitMovement Return _0381: - ScrCmd_05E 25, _05AC - ScrCmd_05E 6, _04D4 - ScrCmd_05E 0xFF, _0554 - ScrCmd_05F + ApplyMovement 25, _05AC + ApplyMovement 6, _04D4 + ApplyMovement 0xFF, _0554 + WaitMovement Return _039D: - ScrCmd_05E 25, _05B4 - ScrCmd_05E 6, _04D4 - ScrCmd_05E 0xFF, _0554 - ScrCmd_05F + ApplyMovement 25, _05B4 + ApplyMovement 6, _04D4 + ApplyMovement 0xFF, _0554 + WaitMovement Return _03B9: - ScrCmd_05E 25, _05BC - ScrCmd_05E 6, _04D4 - ScrCmd_05E 0xFF, _0554 - ScrCmd_05F + ApplyMovement 25, _05BC + ApplyMovement 6, _04D4 + ApplyMovement 0xFF, _0554 + WaitMovement Return _03D5: - ScrCmd_05E 25, _05C4 - ScrCmd_05E 6, _04D4 - ScrCmd_05E 0xFF, _0554 - ScrCmd_05F + ApplyMovement 25, _05C4 + ApplyMovement 6, _04D4 + ApplyMovement 0xFF, _0554 + WaitMovement Return _03F1: - ScrCmd_05E 6, _04BC - ScrCmd_05E 0xFF, _0534 - ScrCmd_05F + ApplyMovement 6, _04BC + ApplyMovement 0xFF, _0534 + WaitMovement Return _0405: - ScrCmd_05E 6, _04BC - ScrCmd_05E 0xFF, _0534 - ScrCmd_05F + ApplyMovement 6, _04BC + ApplyMovement 0xFF, _0534 + WaitMovement Return _0419: - ScrCmd_05E 6, _04C8 - ScrCmd_05E 0xFF, _0544 - ScrCmd_05F + ApplyMovement 6, _04C8 + ApplyMovement 0xFF, _0544 + WaitMovement Return _042D: - ScrCmd_05E 6, _04C8 - ScrCmd_05E 0xFF, _0544 - ScrCmd_05F + ApplyMovement 6, _04C8 + ApplyMovement 0xFF, _0544 + WaitMovement Return .balign 4, 0 @@ -589,13 +589,13 @@ _0656: ScrCmd_186 26, 0x2B4, 0x25E ScrCmd_064 26 ScrCmd_014 0x807 - ScrCmd_05E 26, _0A7C - ScrCmd_05F + ApplyMovement 26, _0A7C + WaitMovement ScrCmd_02C 29 ScrCmd_034 - ScrCmd_05E 6, _0B3C - ScrCmd_05E 0xFF, _0B9C - ScrCmd_05F + ApplyMovement 6, _0B3C + ApplyMovement 0xFF, _0B9C + WaitMovement ScrCmd_14D 0x8004 CompareVarToValue 0x8004, 0 CallIf 1, _0A37 @@ -608,9 +608,9 @@ _0656: CompareVarToValue 0x8004, 1 CallIf 1, _0A46 ScrCmd_034 - ScrCmd_05E 6, _0B44 - ScrCmd_05E 26, _0A88 - ScrCmd_05F + ApplyMovement 6, _0B44 + ApplyMovement 26, _0A88 + WaitMovement ScrCmd_065 6 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x253 @@ -620,16 +620,16 @@ _0656: End _083A: - ScrCmd_05E 0xFF, _0BB0 - ScrCmd_05E 26, _0A94 - ScrCmd_05F + ApplyMovement 0xFF, _0BB0 + ApplyMovement 26, _0A94 + WaitMovement GoTo _086E End _0854: - ScrCmd_05E 0xFF, _0BBC - ScrCmd_05E 26, _0AA0 - ScrCmd_05F + ApplyMovement 0xFF, _0BBC + ApplyMovement 26, _0AA0 + WaitMovement GoTo _086E End @@ -665,16 +665,16 @@ _086E: .byte 0 _08A9: - ScrCmd_05E 26, _0AAC - ScrCmd_05E 0xFF, _0BC8 - ScrCmd_05F + ApplyMovement 26, _0AAC + ApplyMovement 0xFF, _0BC8 + WaitMovement GoTo _08DD End _08C3: - ScrCmd_05E 26, _0AAC - ScrCmd_05E 0xFF, _0BDC - ScrCmd_05F + ApplyMovement 26, _0AAC + ApplyMovement 0xFF, _0BDC + WaitMovement GoTo _08DD End @@ -682,7 +682,7 @@ _08DD: SetFlag 0x1A9 SetFlag 0x28A ClearFlag 0x20D - ScrCmd_028 0x411F, 1 + SetVar 0x411F, 1 ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -701,75 +701,75 @@ _0919: _0939: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x271 + SetVar 0x8004, 0x271 CompareVarToValue 0x800C, 0x186 GoToIf 1, _099D - ScrCmd_028 0x8004, 0x272 + SetVar 0x8004, 0x272 CompareVarToValue 0x800C, 0x189 GoToIf 1, _099D - ScrCmd_028 0x8004, 0x270 + SetVar 0x8004, 0x270 Return _096B: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x26E + SetVar 0x8004, 0x26E CompareVarToValue 0x800C, 0x186 GoToIf 1, _099D - ScrCmd_028 0x8004, 0x26F + SetVar 0x8004, 0x26F CompareVarToValue 0x800C, 0x189 GoToIf 1, _099D - ScrCmd_028 0x8004, 0x26D + SetVar 0x8004, 0x26D Return _099D: Return _099F: - ScrCmd_05E 6, _0ABC - ScrCmd_05E 0xFF, _0B50 - ScrCmd_05F + ApplyMovement 6, _0ABC + ApplyMovement 0xFF, _0B50 + WaitMovement Return _09B3: - ScrCmd_05E 6, _0AC8 - ScrCmd_05E 0xFF, _0B5C - ScrCmd_05F + ApplyMovement 6, _0AC8 + ApplyMovement 0xFF, _0B5C + WaitMovement Return _09C7: - ScrCmd_05E 6, _0AD4 - ScrCmd_05E 0xFF, _0B64 - ScrCmd_05F + ApplyMovement 6, _0AD4 + ApplyMovement 0xFF, _0B64 + WaitMovement Return _09DB: - ScrCmd_05E 20, _0BF0 - ScrCmd_05F + ApplyMovement 20, _0BF0 + WaitMovement Return _09E7: - ScrCmd_05E 7, _0BF0 - ScrCmd_05F + ApplyMovement 7, _0BF0 + WaitMovement Return _09F3: - ScrCmd_05E 7, _0BF8 - ScrCmd_05F + ApplyMovement 7, _0BF8 + WaitMovement Return _09FF: - ScrCmd_05E 7, _0BF8 - ScrCmd_05F + ApplyMovement 7, _0BF8 + WaitMovement Return _0A0B: - ScrCmd_05E 20, _0C08 - ScrCmd_05F + ApplyMovement 20, _0C08 + WaitMovement Return _0A17: - ScrCmd_05E 20, _0C08 - ScrCmd_05F + ApplyMovement 20, _0C08 + WaitMovement Return _0A23: @@ -805,15 +805,15 @@ _0A46: Return _0A4B: - ScrCmd_05E 6, _0B2C - ScrCmd_05E 0xFF, _0B8C - ScrCmd_05F + ApplyMovement 6, _0B2C + ApplyMovement 0xFF, _0B8C + WaitMovement Return _0A5F: - ScrCmd_05E 6, _0B34 - ScrCmd_05E 0xFF, _0B94 - ScrCmd_05F + ApplyMovement 6, _0B34 + ApplyMovement 0xFF, _0B94 + WaitMovement Return _0A73: @@ -1149,8 +1149,8 @@ _0C77: CheckFlag 204 GoToIf 1, _0CBC ScrCmd_02C 50 - ScrCmd_028 0x8004, 0x186 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x186 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0CC7 @@ -1193,14 +1193,14 @@ _0CE4: _0CF7: ScrCmd_060 - ScrCmd_05E 7, _0D30 - ScrCmd_05E 0xFF, _0D28 - ScrCmd_05F + ApplyMovement 7, _0D30 + ApplyMovement 0xFF, _0D28 + WaitMovement ScrCmd_02C 11 ScrCmd_034 - ScrCmd_05E 7, _0D3C - ScrCmd_05E 0xFF, _0D54 - ScrCmd_05F + ApplyMovement 7, _0D3C + ApplyMovement 0xFF, _0D54 + WaitMovement ScrCmd_061 End @@ -1275,8 +1275,8 @@ _0DBE: ScrCmd_02C 36 ScrCmd_034 ScrCmd_068 - ScrCmd_05E 23, _0F1C - ScrCmd_05F + ApplyMovement 23, _0F1C + WaitMovement ScrCmd_02C 37 ScrCmd_034 SetFlag 0x155 @@ -1297,41 +1297,41 @@ _0DBE: End _0E34: - ScrCmd_05E 0xFF, _0F48 - ScrCmd_05E 23, _0F24 - ScrCmd_05F + ApplyMovement 0xFF, _0F48 + ApplyMovement 23, _0F24 + WaitMovement ScrCmd_014 0x807 - ScrCmd_05E 26, _0F80 - ScrCmd_05F + ApplyMovement 26, _0F80 + WaitMovement GoTo _0ECC End _0E5C: - ScrCmd_05E 23, _0F24 - ScrCmd_05F + ApplyMovement 23, _0F24 + WaitMovement ScrCmd_014 0x807 - ScrCmd_05E 26, _0F70 - ScrCmd_05F + ApplyMovement 26, _0F70 + WaitMovement GoTo _0ECC End _0E7C: - ScrCmd_05E 0xFF, _0F58 - ScrCmd_05E 23, _0F24 - ScrCmd_05F + ApplyMovement 0xFF, _0F58 + ApplyMovement 23, _0F24 + WaitMovement ScrCmd_014 0x807 - ScrCmd_05E 26, _0F90 - ScrCmd_05F + ApplyMovement 26, _0F90 + WaitMovement GoTo _0ECC End _0EA4: - ScrCmd_05E 0xFF, _0F64 - ScrCmd_05E 23, _0F38 - ScrCmd_05F + ApplyMovement 0xFF, _0F64 + ApplyMovement 23, _0F38 + WaitMovement ScrCmd_014 0x807 - ScrCmd_05E 26, _0FA0 - ScrCmd_05F + ApplyMovement 26, _0FA0 + WaitMovement GoTo _0ECC End @@ -1349,7 +1349,7 @@ _0ED8: End _0EF4: - ScrCmd_028 0x411F, 3 + SetVar 0x411F, 3 SetFlag 155 ScrCmd_02C 39 ScrCmd_034 @@ -1436,8 +1436,8 @@ _0FB0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 26, _0FE0 - ScrCmd_05F + ApplyMovement 26, _0FE0 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 41 ScrCmd_014 0x807 @@ -1599,21 +1599,21 @@ _1179: _1184: ScrCmd_060 - ScrCmd_05E 6, _11E8 - ScrCmd_05F + ApplyMovement 6, _11E8 + WaitMovement ScrCmd_14D 0x8004 CompareVarToValue 0x8004, 0 CallIf 1, _11D6 CompareVarToValue 0x8004, 1 CallIf 1, _11DE ScrCmd_034 - ScrCmd_05E 6, _11FC - ScrCmd_05F + ApplyMovement 6, _11FC + WaitMovement ScrCmd_065 6 Call _00BA ClearFlag 0x1A8 ScrCmd_064 6 - ScrCmd_028 0x411A, 2 + SetVar 0x411A, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0137.s b/res/field/scripts/script_0137.s index c27c1d4c25..aa11561eab 100644 --- a/res/field/scripts/script_0137.s +++ b/res/field/scripts/script_0137.s @@ -36,22 +36,22 @@ _0022: ScrCmd_04F ScrCmd_15C 2 ScrCmd_260 23 - ScrCmd_023 0x135 - ScrCmd_023 0x136 - ScrCmd_023 0x137 - ScrCmd_023 0x138 + SetTrainerFlag 0x135 + SetTrainerFlag 0x136 + SetTrainerFlag 0x137 + SetTrainerFlag 0x138 ScrCmd_1CD 10, 133, 0x13D, 0, 0 SetFlag 0x1A3 ClearFlag 0x1A8 - ScrCmd_028 0x407D, 1 - ScrCmd_028 0x411A, 1 + SetVar 0x407D, 1 + SetVar 0x411A, 1 ScrCmd_02C 3 GoTo _00B7 End _00B7: - ScrCmd_028 0x8004, 0x183 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x183 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00F5 diff --git a/res/field/scripts/script_0138.s b/res/field/scripts/script_0138.s index 06490a5850..7b16e0e8e2 100644 --- a/res/field/scripts/script_0138.s +++ b/res/field/scripts/script_0138.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0141.s b/res/field/scripts/script_0141.s index 4f469a6e43..8f855b58d2 100644 --- a/res/field/scripts/script_0141.s +++ b/res/field/scripts/script_0141.s @@ -27,51 +27,51 @@ .short 0xFD13 _005A: - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 GoTo _00EA _0066: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _00EA _0072: - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 GoTo _00EA _007E: - ScrCmd_028 0x8004, 3 + SetVar 0x8004, 3 GoTo _00EA _008A: - ScrCmd_028 0x8004, 4 + SetVar 0x8004, 4 GoTo _00EA _0096: - ScrCmd_028 0x8004, 5 + SetVar 0x8004, 5 GoTo _00EA _00A2: - ScrCmd_028 0x8004, 6 + SetVar 0x8004, 6 GoTo _00EA _00AE: - ScrCmd_028 0x8004, 7 + SetVar 0x8004, 7 GoTo _00EA _00BA: - ScrCmd_028 0x8004, 8 + SetVar 0x8004, 8 GoTo _00EA _00C6: - ScrCmd_028 0x8004, 9 + SetVar 0x8004, 9 GoTo _00EA _00D2: - ScrCmd_028 0x8004, 10 + SetVar 0x8004, 10 GoTo _00EA _00DE: - ScrCmd_028 0x8004, 11 + SetVar 0x8004, 11 GoTo _00EA _00EA: @@ -132,7 +132,7 @@ _01A4: ScrCmd_042 126, 1 ScrCmd_042 127, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01E3 CompareVarToValue 0x8008, 1 @@ -209,8 +209,8 @@ _02BB: End _02CA: - ScrCmd_028 0x8004, 0x187 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x187 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0327 diff --git a/res/field/scripts/script_0142.s b/res/field/scripts/script_0142.s index cf0c138ff8..cd950dfaee 100644 --- a/res/field/scripts/script_0142.s +++ b/res/field/scripts/script_0142.s @@ -93,10 +93,10 @@ _00A9: CallIf 1, _0121 CompareVarToValue 0x800C, 0x189 CallIf 1, _0129 - ScrCmd_029 0x4107, 0x8004 + SetVar 0x4107, 0x8004 ScrCmd_343 0, 0x8004 ScrCmd_02C 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF SetFlag 0x129 ScrCmd_034 @@ -112,15 +112,15 @@ _0109: End _0119: - ScrCmd_028 0x8004, 94 + SetVar 0x8004, 94 Return _0121: - ScrCmd_028 0x8004, 92 + SetVar 0x8004, 92 Return _0129: - ScrCmd_028 0x8004, 93 + SetVar 0x8004, 93 Return .byte 0 diff --git a/res/field/scripts/script_0143.s b/res/field/scripts/script_0143.s index 3d41b775f9..303b0621cb 100644 --- a/res/field/scripts/script_0143.s +++ b/res/field/scripts/script_0143.s @@ -123,7 +123,7 @@ _012B: CompareVarToValue 0x800C, 1 GoToIf 1, _017A ScrCmd_02C 11 - ScrCmd_028 0x8004, 10 + SetVar 0x8004, 10 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0146.s b/res/field/scripts/script_0146.s index 39b92881fd..bc452be24e 100644 --- a/res/field/scripts/script_0146.s +++ b/res/field/scripts/script_0146.s @@ -37,8 +37,8 @@ _0040: CheckFlag 0x105 GoToIf 1, _0087 ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x120 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x120 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0092 @@ -93,7 +93,7 @@ _00D5: ScrCmd_042 221, 2 ScrCmd_042 222, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x8000 + SetVar 0x8008, 0x8000 CompareVarToValue 0x8008, 0 GoToIf 1, _0125 CompareVarToValue 0x8008, 1 @@ -104,15 +104,15 @@ _00D5: GoTo _028C _0125: - ScrCmd_028 0x8001, 30 + SetVar 0x8001, 30 GoTo _0191 _0131: - ScrCmd_028 0x8001, 31 + SetVar 0x8001, 31 GoTo _0191 _013D: - ScrCmd_028 0x8001, 32 + SetVar 0x8001, 32 GoTo _0191 _0149: @@ -165,8 +165,8 @@ _0191: ScrCmd_049 0x617 ScrCmd_0D1 0, 0x8001 ScrCmd_02C 7 - ScrCmd_029 0x8004, 0x8001 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x8001 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_1B7 0x800C, 64 CompareVarToValue 0x800C, 0 @@ -177,8 +177,8 @@ _0191: ScrCmd_049 0x617 ScrCmd_0D1 0, 0x8001 ScrCmd_02C 8 - ScrCmd_029 0x8004, 0x8001 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x8001 + SetVar 0x8005, 1 ScrCmd_014 0x7FC GoTo _026E diff --git a/res/field/scripts/script_0147.s b/res/field/scripts/script_0147.s index 837cbfce0f..37c057f615 100644 --- a/res/field/scripts/script_0147.s +++ b/res/field/scripts/script_0147.s @@ -10,7 +10,7 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 0 GoToIf 1, _0068 CompareVarToValue 0x8008, 1 @@ -62,7 +62,7 @@ _00A6: ScrCmd_042 121, 5 ScrCmd_042 124, 6 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _02BC CompareVarToValue 0x8008, 1 @@ -88,7 +88,7 @@ _0131: CompareVarToValue 0x40CE, 5 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 5 + SetVar 0x40CE, 5 GoTo _033F _0180: @@ -102,7 +102,7 @@ _0180: CompareVarToValue 0x40CE, 4 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 4 + SetVar 0x40CE, 4 GoTo _033F _01CF: @@ -116,7 +116,7 @@ _01CF: CompareVarToValue 0x40CE, 3 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 3 + SetVar 0x40CE, 3 GoTo _033F _021E: @@ -130,7 +130,7 @@ _021E: CompareVarToValue 0x40CE, 2 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 2 + SetVar 0x40CE, 2 GoTo _033F _026D: @@ -144,7 +144,7 @@ _026D: CompareVarToValue 0x40CE, 1 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 1 + SetVar 0x40CE, 1 GoTo _033F _02BC: @@ -158,30 +158,30 @@ _02BC: CompareVarToValue 0x40CE, 0 CallIf 0, _0316 Call _0321 - ScrCmd_028 0x40CE, 0 + SetVar 0x40CE, 0 GoTo _033F _030B: ScrCmd_02C 2 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Return _0316: ScrCmd_02C 3 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Return _0321: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_034 - ScrCmd_05E 0, _0410 - ScrCmd_05F + ApplyMovement 0, _0410 + WaitMovement ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 Return _033F: - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 0 GoToIf 1, _0395 CompareVarToValue 0x8008, 1 @@ -233,7 +233,7 @@ _03D7: End _03DF: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_02C 4 ScrCmd_031 @@ -242,7 +242,7 @@ _03DF: End _03F6: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_02C 1 ScrCmd_031 diff --git a/res/field/scripts/script_0148.s b/res/field/scripts/script_0148.s index a24e1ef27c..b93a51ee6e 100644 --- a/res/field/scripts/script_0148.s +++ b/res/field/scripts/script_0148.s @@ -125,7 +125,7 @@ _00FE: ScrCmd_042 15, 1 ScrCmd_042 16, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0150 CompareVarToValue 0x8008, 1 @@ -134,8 +134,8 @@ _00FE: End _0150: - ScrCmd_028 0x8004, 1 - ScrCmd_028 0x8005, 200 + SetVar 0x8004, 1 + SetVar 0x8005, 200 ScrCmd_07D 42, 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01FF @@ -147,8 +147,8 @@ _0150: End _018F: - ScrCmd_028 0x8004, 10 - ScrCmd_028 0x8005, 0x7D0 + SetVar 0x8004, 10 + SetVar 0x8005, 0x7D0 ScrCmd_07D 42, 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01FF @@ -211,7 +211,7 @@ _025B: CompareVarToValue 0x800C, 0 GoToIf 1, _0537 Call _0697 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _031B CompareVarToValue 0x8008, 1 @@ -251,7 +251,7 @@ _031B: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0557 GoTo _04B5 End @@ -260,7 +260,7 @@ _0344: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0577 GoTo _04B5 End @@ -269,7 +269,7 @@ _036D: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0597 GoTo _04B5 End @@ -278,7 +278,7 @@ _0396: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _05B7 GoTo _04B5 End @@ -287,7 +287,7 @@ _03BF: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _05D7 GoTo _04B5 End @@ -296,7 +296,7 @@ _03E8: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _05F7 GoTo _04B5 End @@ -305,7 +305,7 @@ _0411: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0617 GoTo _04B5 End @@ -314,7 +314,7 @@ _043A: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0637 GoTo _04B5 End @@ -323,7 +323,7 @@ _0463: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0657 GoTo _04B5 End @@ -332,7 +332,7 @@ _048C: ScrCmd_071 0x800C, 0x1900 CompareVarToValue 0x800C, 0 GoToIf 1, _052C - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 Call _0677 GoTo _04B5 End @@ -347,11 +347,10 @@ _04B5: _04CE: CompareVarToValue 0x8005, 0 GoToIf 1, _0503 - ScrCmd_289 0x800C, 0x8007, 0x8000, 0x8001, 0x8002, 0x8003 - ScrCmd_014 0x334 - ScrCmd_023 0x1900 + ScrCmd_289 0x800C, 0x8007, 0x8000, 0x8001, 0x8002, 0x8003, 20 + ScrCmd_334 35, 0x1900 ScrCmd_1A3 0x1900 - ScrCmd_027 0x8005, 1 + SubVar 0x8005, 1 GoTo _04CE End @@ -400,83 +399,83 @@ _054D: End _0557: - ScrCmd_028 0x8007, 32 - ScrCmd_028 0x8000, 32 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 32 + SetVar 0x8000, 32 + SetVar 0x8001, 0 + SetVar 0x8002, 0 + SetVar 0x8003, 0 Return _0577: - ScrCmd_028 0x8007, 32 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 32 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 32 + SetVar 0x8000, 0 + SetVar 0x8001, 32 + SetVar 0x8002, 0 + SetVar 0x8003, 0 Return _0597: - ScrCmd_028 0x8007, 32 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 32 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 32 + SetVar 0x8000, 0 + SetVar 0x8001, 0 + SetVar 0x8002, 32 + SetVar 0x8003, 0 Return _05B7: - ScrCmd_028 0x8007, 32 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 32 + SetVar 0x8007, 32 + SetVar 0x8000, 0 + SetVar 0x8001, 0 + SetVar 0x8002, 0 + SetVar 0x8003, 32 Return _05D7: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 32 - ScrCmd_028 0x8001, 32 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 0 + SetVar 0x8000, 32 + SetVar 0x8001, 32 + SetVar 0x8002, 0 + SetVar 0x8003, 0 Return _05F7: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 32 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 32 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 0 + SetVar 0x8000, 32 + SetVar 0x8001, 0 + SetVar 0x8002, 32 + SetVar 0x8003, 0 Return _0617: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 32 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 32 + SetVar 0x8007, 0 + SetVar 0x8000, 32 + SetVar 0x8001, 0 + SetVar 0x8002, 0 + SetVar 0x8003, 32 Return _0637: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 32 - ScrCmd_028 0x8002, 32 - ScrCmd_028 0x8003, 0 + SetVar 0x8007, 0 + SetVar 0x8000, 0 + SetVar 0x8001, 32 + SetVar 0x8002, 32 + SetVar 0x8003, 0 Return _0657: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 32 - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8003, 32 + SetVar 0x8007, 0 + SetVar 0x8000, 0 + SetVar 0x8001, 32 + SetVar 0x8002, 0 + SetVar 0x8003, 32 Return _0677: - ScrCmd_028 0x8007, 0 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 0 - ScrCmd_028 0x8002, 32 - ScrCmd_028 0x8003, 32 + SetVar 0x8007, 0 + SetVar 0x8000, 0 + SetVar 0x8001, 0 + SetVar 0x8002, 32 + SetVar 0x8003, 32 Return _0697: @@ -500,7 +499,7 @@ _06FE: End _0700: - ScrCmd_026 0x4042, 1 + AddVar 0x4042, 1 Return _0708: diff --git a/res/field/scripts/script_0149.s b/res/field/scripts/script_0149.s index 1e2b69c3d0..7305caacd9 100644 --- a/res/field/scripts/script_0149.s +++ b/res/field/scripts/script_0149.s @@ -50,9 +50,9 @@ _0086: ScrCmd_031 ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 2, _00C8 - ScrCmd_05E 3, _00D0 - ScrCmd_05F + ApplyMovement 2, _00C8 + ApplyMovement 3, _00D0 + WaitMovement ScrCmd_065 2 ScrCmd_065 3 ScrCmd_034 @@ -76,21 +76,21 @@ _00D0: _00D8: ScrCmd_060 - ScrCmd_05E 4, _012C - ScrCmd_05F + ApplyMovement 4, _012C + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0xFF, _0168 - ScrCmd_05E 4, _0134 - ScrCmd_05F + ApplyMovement 0xFF, _0168 + ApplyMovement 4, _0134 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _0174 - ScrCmd_05E 4, _015C - ScrCmd_05F - ScrCmd_028 0x407C, 1 - ScrCmd_028 0x411F, 2 + ApplyMovement 0xFF, _0174 + ApplyMovement 4, _015C + WaitMovement + SetVar 0x407C, 1 + SetVar 0x411F, 2 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -158,16 +158,16 @@ _0197: CallIf 1, _026E ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 4, _0308 - ScrCmd_05F + ApplyMovement 4, _0308 + WaitMovement ScrCmd_02C 5 ScrCmd_034 SetFlag 0x10E ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 2, _00C8 - ScrCmd_05E 3, _00D0 - ScrCmd_05F + ApplyMovement 2, _00C8 + ApplyMovement 3, _00D0 + WaitMovement ScrCmd_065 2 ScrCmd_065 3 CompareVarToValue 0x8004, 8 @@ -182,42 +182,42 @@ _0197: CallIf 1, _02AE ScrCmd_065 4 SetFlag 0x28A - ScrCmd_028 0x411F, 4 + SetVar 0x411F, 4 ScrCmd_061 End _025A: - ScrCmd_05E 4, _02E8 - ScrCmd_05E 0xFF, _02C4 - ScrCmd_05F + ApplyMovement 4, _02E8 + ApplyMovement 0xFF, _02C4 + WaitMovement Return _026E: - ScrCmd_05E 4, _02FC - ScrCmd_05E 0xFF, _02D0 - ScrCmd_05F + ApplyMovement 4, _02FC + ApplyMovement 0xFF, _02D0 + WaitMovement Return _0282: - ScrCmd_05E 4, _0318 - ScrCmd_05F + ApplyMovement 4, _0318 + WaitMovement Return _028E: - ScrCmd_05E 4, _0310 - ScrCmd_05F + ApplyMovement 4, _0310 + WaitMovement Return _029A: - ScrCmd_05E 4, _0320 - ScrCmd_05E 0xFF, _02DC - ScrCmd_05F + ApplyMovement 4, _0320 + ApplyMovement 0xFF, _02DC + WaitMovement Return _02AE: - ScrCmd_05E 4, _0338 - ScrCmd_05E 0xFF, _02DC - ScrCmd_05F + ApplyMovement 4, _0338 + ApplyMovement 0xFF, _02DC + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0150.s b/res/field/scripts/script_0150.s index 3d7edf7a72..d93c675979 100644 --- a/res/field/scripts/script_0150.s +++ b/res/field/scripts/script_0150.s @@ -11,11 +11,11 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4001, 19 + SetVar 0x4001, 19 ScrCmd_02C 0 ScrCmd_075 21, 1 - ScrCmd_028 0x8005, 0 - ScrCmd_028 0x8006, 0 + SetVar 0x8005, 0 + SetVar 0x8006, 0 GoTo _0039 End @@ -80,8 +80,8 @@ _010A: Return _0119: - ScrCmd_028 0x8008, 0 - ScrCmd_028 0x8009, 0 + SetVar 0x8008, 0 + SetVar 0x8009, 0 ScrCmd_044 1, 1, 0, 1, 0x800C GoTo _0135 End @@ -91,7 +91,7 @@ _0135: ScrCmd_0D1 0, 0x8000 ScrCmd_280 1, 0x8001, 1, 5 ScrCmd_046 168, 0xFF, 0x8008 - ScrCmd_026 0x8008, 1 + AddVar 0x8008, 1 CompareVarToVar 0x8008, 0x4001 GoToIf 0, _0135 GoTo _016C diff --git a/res/field/scripts/script_0151.s b/res/field/scripts/script_0151.s index 0f5c2c2f9f..1d82e1b41b 100644 --- a/res/field/scripts/script_0151.s +++ b/res/field/scripts/script_0151.s @@ -27,23 +27,23 @@ _000A: End _005F: - ScrCmd_05E 0, _0144 - ScrCmd_05F + ApplyMovement 0, _0144 + WaitMovement GoTo _009F _006F: - ScrCmd_05E 0, _0168 - ScrCmd_05F + ApplyMovement 0, _0168 + WaitMovement GoTo _009F _007F: - ScrCmd_05E 0, _00FC - ScrCmd_05F + ApplyMovement 0, _00FC + WaitMovement GoTo _009F _008F: - ScrCmd_05E 0, _0120 - ScrCmd_05F + ApplyMovement 0, _0120 + WaitMovement GoTo _009F _009F: @@ -56,8 +56,8 @@ _009F: CompareVarToValue 0x800C, 0 GoToIf 1, _00E4 ScrCmd_02C 4 - ScrCmd_028 0x8004, 0x1BC - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1BC + SetVar 0x8005, 1 SetFlag 188 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0153.s b/res/field/scripts/script_0153.s index adfe50cb1a..92b7db6904 100644 --- a/res/field/scripts/script_0153.s +++ b/res/field/scripts/script_0153.s @@ -53,7 +53,7 @@ _005B: _00AC: ScrCmd_034 ScrCmd_177 0x4000 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BB 0x4000, 0x800C diff --git a/res/field/scripts/script_0154.s b/res/field/scripts/script_0154.s index b4962e565d..a5825a2b04 100644 --- a/res/field/scripts/script_0154.s +++ b/res/field/scripts/script_0154.s @@ -47,7 +47,7 @@ _000E: CompareVarToValue 0x8004, 0xFFFF GoToIf 1, _00F6 ScrCmd_02C 7 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FF GoTo _00F6 diff --git a/res/field/scripts/script_0156.s b/res/field/scripts/script_0156.s index 3ff169548f..a4a9c8c911 100644 --- a/res/field/scripts/script_0156.s +++ b/res/field/scripts/script_0156.s @@ -34,7 +34,7 @@ _004E: _0077: SetFlag 0x199 - ScrCmd_028 0x40A6, 4 + SetVar 0x40A6, 4 Return _0083: @@ -45,8 +45,8 @@ _0083: _0099: ScrCmd_060 - ScrCmd_05E 9, _04E8 - ScrCmd_05F + ApplyMovement 9, _04E8 + WaitMovement ClearFlag 0x255 ScrCmd_064 20 ScrCmd_062 20 @@ -64,37 +64,37 @@ _0099: End _00FA: - ScrCmd_05E 20, _0454 - ScrCmd_05E 0xFF, _04F4 - ScrCmd_05F + ApplyMovement 20, _0454 + ApplyMovement 0xFF, _04F4 + WaitMovement GoTo _017C End _0114: - ScrCmd_05E 20, _0464 - ScrCmd_05E 0xFF, _04F4 - ScrCmd_05F + ApplyMovement 20, _0464 + ApplyMovement 0xFF, _04F4 + WaitMovement GoTo _017C End _012E: - ScrCmd_05E 20, _0474 - ScrCmd_05E 0xFF, _0504 - ScrCmd_05F + ApplyMovement 20, _0474 + ApplyMovement 0xFF, _0504 + WaitMovement GoTo _017C End _0148: - ScrCmd_05E 20, _0480 - ScrCmd_05E 0xFF, _050C - ScrCmd_05F + ApplyMovement 20, _0480 + ApplyMovement 0xFF, _050C + WaitMovement GoTo _017C End _0162: - ScrCmd_05E 20, _0490 - ScrCmd_05E 0xFF, _050C - ScrCmd_05F + ApplyMovement 20, _0490 + ApplyMovement 0xFF, _050C + WaitMovement GoTo _017C End @@ -102,8 +102,8 @@ _017C: ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 10 - ScrCmd_05E 20, _04A0 - ScrCmd_05F + ApplyMovement 20, _04A0 + WaitMovement ScrCmd_02C 11 CompareVarToValue 0x8004, 0x355 CallIf 1, _02BE @@ -138,8 +138,8 @@ _017C: CallIf 1, _037A CompareVarToValue 0x8004, 0x359 CallIf 1, _0386 - ScrCmd_05E 0xFF, _0528 - ScrCmd_05F + ApplyMovement 0xFF, _0528 + WaitMovement ScrCmd_02C 13 Call _0577 ScrCmd_034 @@ -153,112 +153,112 @@ _017C: CallIf 1, _03B6 CompareVarToValue 0x8004, 0x359 CallIf 1, _03C2 - ScrCmd_028 0x407E, 3 + SetVar 0x407E, 3 ScrCmd_061 End _02BE: - ScrCmd_05E 20, _04A8 - ScrCmd_05F + ApplyMovement 20, _04A8 + WaitMovement Return _02CA: - ScrCmd_05E 20, _04A8 - ScrCmd_05F + ApplyMovement 20, _04A8 + WaitMovement Return _02D6: - ScrCmd_05E 20, _04B0 - ScrCmd_05F + ApplyMovement 20, _04B0 + WaitMovement Return _02E2: - ScrCmd_05E 20, _04B8 - ScrCmd_05F + ApplyMovement 20, _04B8 + WaitMovement Return _02EE: - ScrCmd_05E 20, _04B8 - ScrCmd_05F + ApplyMovement 20, _04B8 + WaitMovement Return _02FA: - ScrCmd_05E 20, _04C0 - ScrCmd_05E 0xFF, _051C - ScrCmd_05F + ApplyMovement 20, _04C0 + ApplyMovement 0xFF, _051C + WaitMovement Return _030E: - ScrCmd_05E 20, _04C8 - ScrCmd_05E 0xFF, _051C - ScrCmd_05F + ApplyMovement 20, _04C8 + ApplyMovement 0xFF, _051C + WaitMovement Return _0322: - ScrCmd_05E 20, _04D0 - ScrCmd_05F + ApplyMovement 20, _04D0 + WaitMovement Return _032E: - ScrCmd_05E 20, _04D8 - ScrCmd_05E 0xFF, _051C - ScrCmd_05F + ApplyMovement 20, _04D8 + ApplyMovement 0xFF, _051C + WaitMovement Return _0342: - ScrCmd_05E 20, _04E0 - ScrCmd_05E 0xFF, _051C - ScrCmd_05F + ApplyMovement 20, _04E0 + ApplyMovement 0xFF, _051C + WaitMovement Return _0356: - ScrCmd_05E 9, _03D0 - ScrCmd_05F + ApplyMovement 9, _03D0 + WaitMovement Return _0362: - ScrCmd_05E 9, _03DC - ScrCmd_05F + ApplyMovement 9, _03DC + WaitMovement Return _036E: - ScrCmd_05E 9, _03E8 - ScrCmd_05F + ApplyMovement 9, _03E8 + WaitMovement Return _037A: - ScrCmd_05E 9, _03F4 - ScrCmd_05F + ApplyMovement 9, _03F4 + WaitMovement Return _0386: - ScrCmd_05E 9, _0400 - ScrCmd_05F + ApplyMovement 9, _0400 + WaitMovement Return _0392: - ScrCmd_05E 9, _0408 - ScrCmd_05F + ApplyMovement 9, _0408 + WaitMovement Return _039E: - ScrCmd_05E 9, _0418 - ScrCmd_05F + ApplyMovement 9, _0418 + WaitMovement Return _03AA: - ScrCmd_05E 9, _0428 - ScrCmd_05F + ApplyMovement 9, _0428 + WaitMovement Return _03B6: - ScrCmd_05E 9, _0438 - ScrCmd_05F + ApplyMovement 9, _0438 + WaitMovement Return _03C2: - ScrCmd_05E 9, _0448 - ScrCmd_05F + ApplyMovement 9, _0448 + WaitMovement Return .balign 4, 0 @@ -468,8 +468,8 @@ _056C: _0577: ScrCmd_02C 6 - ScrCmd_028 0x8004, 0x1AA - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1AA + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 154 ScrCmd_02C 7 @@ -485,28 +485,28 @@ _0593: End _05B7: - ScrCmd_05E 18, _063C - ScrCmd_05F + ApplyMovement 18, _063C + WaitMovement GoTo _05D7 _05C7: - ScrCmd_05E 18, _0650 - ScrCmd_05F + ApplyMovement 18, _0650 + WaitMovement GoTo _05D7 _05D7: ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 18, _0668 - ScrCmd_05F + ApplyMovement 18, _0668 + WaitMovement ScrCmd_003 15, 0x800C - ScrCmd_05E 18, _0670 - ScrCmd_05F + ApplyMovement 18, _0670 + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 18, _0678 - ScrCmd_05F + ApplyMovement 18, _0678 + WaitMovement ScrCmd_065 18 ScrCmd_003 1, 0x800C ScrCmd_186 18, 0x34D, 0x2EC @@ -514,7 +514,7 @@ _05D7: ScrCmd_189 18, 1 ClearFlag 0x239 ScrCmd_064 18 - ScrCmd_028 0x407E, 1 + SetVar 0x407E, 1 ScrCmd_061 End @@ -673,7 +673,7 @@ _0791: ScrCmd_014 0x7E3 ScrCmd_035 ScrCmd_234 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0806 CompareVarToValue 0x8008, 1 @@ -748,21 +748,21 @@ _086E: End _08A6: - ScrCmd_05E 18, _08F8 - ScrCmd_05E 0xFF, _0914 - ScrCmd_05F + ApplyMovement 18, _08F8 + ApplyMovement 0xFF, _0914 + WaitMovement GoTo _08EE _08BE: - ScrCmd_05E 18, _0908 - ScrCmd_05E 0xFF, _0920 - ScrCmd_05F + ApplyMovement 18, _0908 + ApplyMovement 0xFF, _0920 + WaitMovement GoTo _08EE _08D6: - ScrCmd_05E 18, _0908 - ScrCmd_05E 0xFF, _0914 - ScrCmd_05F + ApplyMovement 18, _0908 + ApplyMovement 0xFF, _0914 + WaitMovement GoTo _08EE _08EE: diff --git a/res/field/scripts/script_0158.s b/res/field/scripts/script_0158.s index c57a1eb636..f1a6879380 100644 --- a/res/field/scripts/script_0158.s +++ b/res/field/scripts/script_0158.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_175 0 End diff --git a/res/field/scripts/script_0159.s b/res/field/scripts/script_0159.s index 75ad2552c5..37972931a7 100644 --- a/res/field/scripts/script_0159.s +++ b/res/field/scripts/script_0159.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_175 1 End diff --git a/res/field/scripts/script_0160.s b/res/field/scripts/script_0160.s index 3942399250..6e0dc8af79 100644 --- a/res/field/scripts/script_0160.s +++ b/res/field/scripts/script_0160.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_175 2 End @@ -42,22 +42,22 @@ _0027: ScrCmd_04F ScrCmd_15C 7 ScrCmd_260 23 - ScrCmd_023 0x119 - ScrCmd_023 0x11D - ScrCmd_023 0x12D - ScrCmd_023 0x12E - ScrCmd_023 0x12F - ScrCmd_023 0x14B - ScrCmd_023 0x155 - ScrCmd_023 0x158 - ScrCmd_028 0x407E, 2 + SetTrainerFlag 0x119 + SetTrainerFlag 0x11D + SetTrainerFlag 0x12D + SetTrainerFlag 0x12E + SetTrainerFlag 0x12F + SetTrainerFlag 0x14B + SetTrainerFlag 0x155 + SetTrainerFlag 0x158 + SetVar 0x407E, 2 ScrCmd_1CD 10, 156, 246, 0, 0 ScrCmd_02C 3 GoTo _00BC _00BC: - ScrCmd_028 0x8004, 0x180 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x180 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00FA diff --git a/res/field/scripts/script_0161.s b/res/field/scripts/script_0161.s index 266ac3ce72..285a46247a 100644 --- a/res/field/scripts/script_0161.s +++ b/res/field/scripts/script_0161.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0164.s b/res/field/scripts/script_0164.s index 9923cf1347..3ac61005c2 100644 --- a/res/field/scripts/script_0164.s +++ b/res/field/scripts/script_0164.s @@ -86,7 +86,7 @@ _00D9: _00E4: ScrCmd_234 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _016F CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0170.s b/res/field/scripts/script_0170.s index 80553bc6fe..c686607a83 100644 --- a/res/field/scripts/script_0170.s +++ b/res/field/scripts/script_0170.s @@ -11,7 +11,7 @@ _0006: ScrCmd_068 CompareVarToValue 0x40B5, 1 GoToIf 4, _002C - ScrCmd_028 0x40B5, 1 + SetVar 0x40B5, 1 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -64,7 +64,7 @@ _00C5: ScrCmd_198 0x8000, 0x8001 ScrCmd_0D0 0, 0x8000 ScrCmd_02C 4 - ScrCmd_028 0x8004, 16 + SetVar 0x8004, 16 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 @@ -75,7 +75,7 @@ _00E5: ScrCmd_198 0x8000, 0x8001 ScrCmd_0D0 0, 0x8000 ScrCmd_02C 5 - ScrCmd_028 0x8004, 17 + SetVar 0x8004, 17 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 @@ -86,7 +86,7 @@ _0105: ScrCmd_198 0x8000, 0x8001 ScrCmd_0D0 0, 0x8000 ScrCmd_02C 6 - ScrCmd_028 0x8004, 18 + SetVar 0x8004, 18 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0171.s b/res/field/scripts/script_0171.s index af2920b10e..ba7a27594d 100644 --- a/res/field/scripts/script_0171.s +++ b/res/field/scripts/script_0171.s @@ -57,28 +57,28 @@ _004C: End _0092: - ScrCmd_05E 2, _0104 - ScrCmd_05E 0xFF, _013C - ScrCmd_05F + ApplyMovement 2, _0104 + ApplyMovement 0xFF, _013C + WaitMovement GoTo _00D2 _00AA: - ScrCmd_05E 2, _0118 - ScrCmd_05E 0xFF, _0148 - ScrCmd_05F + ApplyMovement 2, _0118 + ApplyMovement 0xFF, _0148 + WaitMovement GoTo _00D2 _00C2: - ScrCmd_05E 2, _0118 - ScrCmd_05F + ApplyMovement 2, _0118 + WaitMovement GoTo _00D2 _00D2: ScrCmd_168 0, 0, 6, 9, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 2, _0130 - ScrCmd_05F + ApplyMovement 2, _0130 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 diff --git a/res/field/scripts/script_0172.s b/res/field/scripts/script_0172.s index 7d00e2ceb7..77e90e133f 100644 --- a/res/field/scripts/script_0172.s +++ b/res/field/scripts/script_0172.s @@ -7,10 +7,10 @@ _0006: ScrCmd_060 - ScrCmd_05E 0xFF, _00B8 - ScrCmd_05F + ApplyMovement 0xFF, _00B8 + WaitMovement ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 1 GoToIf 1, _0038 CompareVarToValue 0x8008, 0 @@ -18,7 +18,7 @@ _0006: End _0038: - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -28,7 +28,7 @@ _0038: End _006A: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Call _009C ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -40,8 +40,8 @@ _006A: _009C: ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 - ScrCmd_05E 0xFF, _00C4 - ScrCmd_05F + ApplyMovement 0xFF, _00C4 + WaitMovement ScrCmd_049 0x603 Return diff --git a/res/field/scripts/script_0174.s b/res/field/scripts/script_0174.s index 0453c64632..ae702045b3 100644 --- a/res/field/scripts/script_0174.s +++ b/res/field/scripts/script_0174.s @@ -27,8 +27,8 @@ _0041: _0047: ScrCmd_060 - ScrCmd_05E 6, _009C - ScrCmd_05F + ApplyMovement 6, _009C + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_22D 2, 0x800C @@ -38,9 +38,9 @@ _0047: End _0072: - ScrCmd_05E 6, _00A4 - ScrCmd_05E 0xFF, _00AC - ScrCmd_05F + ApplyMovement 6, _00A4 + ApplyMovement 0xFF, _00AC + WaitMovement ScrCmd_061 End @@ -107,14 +107,14 @@ _011B: ScrCmd_003 30, 0x800C ClearFlag 0x1F3 ScrCmd_064 7 - ScrCmd_05E 7, _016C - ScrCmd_05F + ApplyMovement 7, _016C + WaitMovement ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 0xFF, _0164 - ScrCmd_05E 6, _015C - ScrCmd_05F - ScrCmd_028 0x407F, 1 + ApplyMovement 0xFF, _0164 + ApplyMovement 6, _015C + WaitMovement + SetVar 0x407F, 1 ScrCmd_02C 4 ScrCmd_031 ScrCmd_034 @@ -264,26 +264,26 @@ _02A0: ScrCmd_064 10 ScrCmd_062 10 ScrCmd_034 - ScrCmd_05E 10, _0320 - ScrCmd_05F + ApplyMovement 10, _0320 + WaitMovement ScrCmd_02C 15 - ScrCmd_05E 0xFF, _030C - ScrCmd_05F + ApplyMovement 0xFF, _030C + WaitMovement ScrCmd_034 - ScrCmd_05E 10, _0334 - ScrCmd_05F + ApplyMovement 10, _0334 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 16 ScrCmd_034 - ScrCmd_05E 10, _033C - ScrCmd_05F + ApplyMovement 10, _033C + WaitMovement ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 10, _0348 - ScrCmd_05F + ApplyMovement 10, _0348 + WaitMovement ScrCmd_065 10 - ScrCmd_05E 0xFF, _0318 - ScrCmd_05F + ApplyMovement 0xFF, _0318 + WaitMovement SetFlag 0x157 Return @@ -326,19 +326,19 @@ _0348: EndMovement _035C: - ScrCmd_05E 8, _0390 - ScrCmd_05F + ApplyMovement 8, _0390 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 8, _039C - ScrCmd_05F + ApplyMovement 8, _039C + WaitMovement Return _0376: - ScrCmd_05E 0xFF, _03A4 - ScrCmd_05F + ApplyMovement 0xFF, _03A4 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _039C - ScrCmd_05F + ApplyMovement 0xFF, _039C + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0176.s b/res/field/scripts/script_0176.s index 827d24b934..4b513bf969 100644 --- a/res/field/scripts/script_0176.s +++ b/res/field/scripts/script_0176.s @@ -38,20 +38,20 @@ _0025: ScrCmd_04F ScrCmd_15C 6 ScrCmd_260 23 - ScrCmd_023 0x10C - ScrCmd_023 0x10D - ScrCmd_023 0x33B - ScrCmd_023 0x10E - ScrCmd_023 0x10F - ScrCmd_023 0x33C + SetTrainerFlag 0x10C + SetTrainerFlag 0x10D + SetTrainerFlag 0x33B + SetTrainerFlag 0x10E + SetTrainerFlag 0x10F + SetTrainerFlag 0x33C ScrCmd_1CD 10, 167, 0x13F, 0, 0 SetFlag 0x1BF ScrCmd_02C 3 GoTo _00B0 _00B0: - ScrCmd_028 0x8004, 0x18F - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x18F + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00EE diff --git a/res/field/scripts/script_0177.s b/res/field/scripts/script_0177.s index e9f57f08fc..9454fdbc74 100644 --- a/res/field/scripts/script_0177.s +++ b/res/field/scripts/script_0177.s @@ -10,7 +10,7 @@ .short 0xFD13 _0016: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End @@ -71,18 +71,18 @@ _0067: End _00C8: - ScrCmd_05E 4, _00FC - ScrCmd_05F + ApplyMovement 4, _00FC + WaitMovement Return _00D4: - ScrCmd_05E 4, _0104 - ScrCmd_05F + ApplyMovement 4, _0104 + WaitMovement Return _00E0: - ScrCmd_05E 4, _010C - ScrCmd_05F + ApplyMovement 4, _010C + WaitMovement Return _00EC: diff --git a/res/field/scripts/script_0180.s b/res/field/scripts/script_0180.s index 18af9e8b0d..924c28fffa 100644 --- a/res/field/scripts/script_0180.s +++ b/res/field/scripts/script_0180.s @@ -49,7 +49,7 @@ _0060: CompareVarToValue 0x800C, 0xFF GoToIf 1, _00D1 ScrCmd_226 2 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C CompareVarToVar 0x8005, 0x800C diff --git a/res/field/scripts/script_0181.s b/res/field/scripts/script_0181.s index ce5b52f08b..c2b042b73a 100644 --- a/res/field/scripts/script_0181.s +++ b/res/field/scripts/script_0181.s @@ -83,14 +83,14 @@ _00B0: ScrCmd_0D6 0, 0x8000 ScrCmd_02C 12 ScrCmd_2E6 0x8000, 2, 0x800C - ScrCmd_029 0x8003, 0x800C + SetVar 0x8003, 0x800C CompareVarToValue 0x8003, 0xFFFE GoToIf 1, _0296 ScrCmd_2EA 0x8003, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _02AC ScrCmd_1C8 0x800C, 0x8000 - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C CompareVarToValue 0x800C, 4 GoToIf 1, _0161 GoTo _0256 diff --git a/res/field/scripts/script_0183.s b/res/field/scripts/script_0183.s index 0cfc6c399e..64df128ab6 100644 --- a/res/field/scripts/script_0183.s +++ b/res/field/scripts/script_0183.s @@ -15,7 +15,7 @@ _001A: End _0020: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0186.s b/res/field/scripts/script_0186.s index 98b20ffa8d..95719c381f 100644 --- a/res/field/scripts/script_0186.s +++ b/res/field/scripts/script_0186.s @@ -54,18 +54,18 @@ _006D: End _00B8: - ScrCmd_05E 0, _0104 - ScrCmd_05F + ApplyMovement 0, _0104 + WaitMovement GoTo _00E8 _00C8: - ScrCmd_05E 0, _0110 - ScrCmd_05F + ApplyMovement 0, _0110 + WaitMovement GoTo _00E8 _00D8: - ScrCmd_05E 0, _011C - ScrCmd_05F + ApplyMovement 0, _011C + WaitMovement GoTo _00E8 _00E8: @@ -136,23 +136,23 @@ _0154: End _0191: - ScrCmd_05E 5, _02C0 - ScrCmd_05F + ApplyMovement 5, _02C0 + WaitMovement GoTo _01C1 _01A1: - ScrCmd_05E 5, _02D0 - ScrCmd_05F + ApplyMovement 5, _02D0 + WaitMovement GoTo _01C1 _01B1: - ScrCmd_05E 5, _02D8 - ScrCmd_05F + ApplyMovement 5, _02D8 + WaitMovement GoTo _01C1 _01C1: - ScrCmd_05E 0xFF, _02B8 - ScrCmd_05F + ApplyMovement 0xFF, _02B8 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 0 ScrCmd_034 @@ -193,25 +193,25 @@ _021B: End _0266: - ScrCmd_05E 5, _02E8 - ScrCmd_05F + ApplyMovement 5, _02E8 + WaitMovement GoTo _0296 _0276: - ScrCmd_05E 5, _02F8 - ScrCmd_05F + ApplyMovement 5, _02F8 + WaitMovement GoTo _0296 _0286: - ScrCmd_05E 5, _0300 - ScrCmd_05F + ApplyMovement 5, _0300 + WaitMovement GoTo _0296 _0296: ScrCmd_049 0x603 ScrCmd_065 5 ScrCmd_04B 0x603 - ScrCmd_028 0x40EF, 1 + SetVar 0x40EF, 1 ScrCmd_061 End @@ -285,7 +285,7 @@ _0323: End _0336: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0187.s b/res/field/scripts/script_0187.s index 8ae22fb8f4..356062e3e9 100644 --- a/res/field/scripts/script_0187.s +++ b/res/field/scripts/script_0187.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 CompareVarToValue 0x4001, 0 @@ -16,12 +16,12 @@ _000E: End _0029: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End _0031: ScrCmd_25C - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End .byte 0 diff --git a/res/field/scripts/script_0188.s b/res/field/scripts/script_0188.s index 4a535eed13..9b5728b128 100644 --- a/res/field/scripts/script_0188.s +++ b/res/field/scripts/script_0188.s @@ -65,12 +65,12 @@ _00AC: _00B7: ScrCmd_060 - ScrCmd_05E 0xFF, _00DC - ScrCmd_05F + ApplyMovement 0xFF, _00DC + WaitMovement ScrCmd_049 0x61A ClearFlag 0x282 ScrCmd_064 1 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0189.s b/res/field/scripts/script_0189.s index 8ae22fb8f4..356062e3e9 100644 --- a/res/field/scripts/script_0189.s +++ b/res/field/scripts/script_0189.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 CompareVarToValue 0x4001, 0 @@ -16,12 +16,12 @@ _000E: End _0029: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End _0031: ScrCmd_25C - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End .byte 0 diff --git a/res/field/scripts/script_0190.s b/res/field/scripts/script_0190.s index a1734643ca..229d6d66d8 100644 --- a/res/field/scripts/script_0190.s +++ b/res/field/scripts/script_0190.s @@ -65,12 +65,12 @@ _00AC: _00B7: ScrCmd_060 - ScrCmd_05E 0xFF, _00DC - ScrCmd_05F + ApplyMovement 0xFF, _00DC + WaitMovement ScrCmd_049 0x61A ClearFlag 0x283 ScrCmd_064 1 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0191.s b/res/field/scripts/script_0191.s index 8ae22fb8f4..356062e3e9 100644 --- a/res/field/scripts/script_0191.s +++ b/res/field/scripts/script_0191.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 CompareVarToValue 0x4001, 0 @@ -16,12 +16,12 @@ _000E: End _0029: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End _0031: ScrCmd_25C - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End .byte 0 diff --git a/res/field/scripts/script_0192.s b/res/field/scripts/script_0192.s index 4ecaff2854..dee95034b5 100644 --- a/res/field/scripts/script_0192.s +++ b/res/field/scripts/script_0192.s @@ -75,8 +75,8 @@ _00D2: _00F0: ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0120 - ScrCmd_05F + ApplyMovement 0, _0120 + WaitMovement ScrCmd_02C 1 Return @@ -111,12 +111,12 @@ _0120: _0138: ScrCmd_060 - ScrCmd_05E 0xFF, _015C - ScrCmd_05F + ApplyMovement 0xFF, _015C + WaitMovement ScrCmd_049 0x61A ClearFlag 0x284 ScrCmd_064 2 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0193.s b/res/field/scripts/script_0193.s index 8ae22fb8f4..356062e3e9 100644 --- a/res/field/scripts/script_0193.s +++ b/res/field/scripts/script_0193.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 CompareVarToValue 0x4001, 0 @@ -16,12 +16,12 @@ _000E: End _0029: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End _0031: ScrCmd_25C - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End .byte 0 diff --git a/res/field/scripts/script_0194.s b/res/field/scripts/script_0194.s index 67544cab00..7b337ad2f6 100644 --- a/res/field/scripts/script_0194.s +++ b/res/field/scripts/script_0194.s @@ -65,12 +65,12 @@ _00AC: _00B7: ScrCmd_060 - ScrCmd_05E 0xFF, _00DC - ScrCmd_05F + ApplyMovement 0xFF, _00DC + WaitMovement ScrCmd_049 0x61A ClearFlag 0x285 ScrCmd_064 2 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0195.s b/res/field/scripts/script_0195.s index 8ae22fb8f4..356062e3e9 100644 --- a/res/field/scripts/script_0195.s +++ b/res/field/scripts/script_0195.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 CompareVarToValue 0x4001, 0 @@ -16,12 +16,12 @@ _000E: End _0029: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End _0031: ScrCmd_25C - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 End .byte 0 diff --git a/res/field/scripts/script_0196.s b/res/field/scripts/script_0196.s index 1a80092097..e1bf141229 100644 --- a/res/field/scripts/script_0196.s +++ b/res/field/scripts/script_0196.s @@ -11,8 +11,8 @@ _000A: End _000E: - ScrCmd_05E 0xFF, _012C - ScrCmd_05F + ApplyMovement 0xFF, _012C + WaitMovement ScrCmd_0EA 0x10B CheckFlag 0x964 CallIf 0, _00EB @@ -35,19 +35,19 @@ _000E: CallIf 1, _0113 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0, _0144 - ScrCmd_05F - ScrCmd_05E 0xFF, _0134 - ScrCmd_05F - ScrCmd_05E 0, _0150 - ScrCmd_05F + ApplyMovement 0, _0144 + WaitMovement + ApplyMovement 0xFF, _0134 + WaitMovement + ApplyMovement 0, _0150 + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_25C ScrCmd_003 30, 0x800C SetFlag 0x23A SetFlag 0x23B - ScrCmd_05E 0xFF, _013C - ScrCmd_05F + ApplyMovement 0xFF, _013C + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD diff --git a/res/field/scripts/script_0197.s b/res/field/scripts/script_0197.s index 08ae811708..c6d86b7e5b 100644 --- a/res/field/scripts/script_0197.s +++ b/res/field/scripts/script_0197.s @@ -8,35 +8,35 @@ _000A: ScrCmd_060 - ScrCmd_05E 0xFF, _016C - ScrCmd_05F + ApplyMovement 0xFF, _016C + WaitMovement ScrCmd_186 0, 6, 14 ClearFlag 0x23A ScrCmd_064 0 ScrCmd_062 0 - ScrCmd_05E 0, _0138 - ScrCmd_05E 0xFF, _017C - ScrCmd_05F + ApplyMovement 0, _0138 + ApplyMovement 0xFF, _017C + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_186 1, 4, 14 ClearFlag 0x23B ScrCmd_064 1 ScrCmd_062 1 - ScrCmd_05E 1, _0114 - ScrCmd_05F - ScrCmd_05E 0xFF, _0190 - ScrCmd_05F + ApplyMovement 1, _0114 + WaitMovement + ApplyMovement 0xFF, _0190 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _0144 - ScrCmd_05F + ApplyMovement 0, _0144 + WaitMovement ScrCmd_02C 2 ScrCmd_0CD 0 ScrCmd_02C 3 - ScrCmd_05E 0, _0150 - ScrCmd_05F + ApplyMovement 0, _0150 + WaitMovement ScrCmd_02C 4 ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -58,10 +58,10 @@ _00BD: _00C9: ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0, _0158 - ScrCmd_05E 1, _0120 - ScrCmd_05E 0xFF, _0198 - ScrCmd_05F + ApplyMovement 0, _0158 + ApplyMovement 1, _0120 + ApplyMovement 0xFF, _0198 + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD diff --git a/res/field/scripts/script_0198.s b/res/field/scripts/script_0198.s index f6b4a26e9b..8e0ba3b2da 100644 --- a/res/field/scripts/script_0198.s +++ b/res/field/scripts/script_0198.s @@ -7,19 +7,19 @@ _0006: ScrCmd_060 - ScrCmd_05E 0xFF, _0124 - ScrCmd_05F - ScrCmd_05E 1, _0134 - ScrCmd_05F + ApplyMovement 0xFF, _0124 + WaitMovement + ApplyMovement 1, _0134 + WaitMovement ScrCmd_28F 0x800C CompareVarToValue 0x800C, 0 CallIf 1, _0111 CompareVarToValue 0x800C, 0 CallIf 5, _0119 ScrCmd_034 - ScrCmd_05E 1, _0144 - ScrCmd_05E 0, _015C - ScrCmd_05F + ApplyMovement 1, _0144 + ApplyMovement 0, _015C + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -40,10 +40,10 @@ _0080: _008C: ScrCmd_034 - ScrCmd_05E 0xFF, _012C - ScrCmd_05E 1, _014C - ScrCmd_05E 0, _0164 - ScrCmd_05F + ApplyMovement 0xFF, _012C + ApplyMovement 1, _014C + ApplyMovement 0, _0164 + WaitMovement ScrCmd_02C 6 ScrCmd_034 SetFlag 0x982 @@ -66,7 +66,7 @@ _008C: End _0102: - ScrCmd_028 0x40F4, 1 + SetVar 0x40F4, 1 Return _010A: @@ -162,22 +162,22 @@ _0174: Return _0234: - ScrCmd_028 0x410F, 1 + SetVar 0x410F, 1 Return _023C: - ScrCmd_028 0x40C4, 0 + SetVar 0x40C4, 0 Return _0244: - ScrCmd_028 0x40C5, 0 + SetVar 0x40C5, 0 Return _024C: CheckFlag 0x125 GoToIf 0, _0261 ClearFlag 0x1DD - ScrCmd_028 0x409E, 1 + SetVar 0x409E, 1 _0261: Return @@ -203,24 +203,24 @@ _0287: _028D: ClearFlag 0x1DF - ScrCmd_028 0x4059, 3 + SetVar 0x4059, 3 Return _0299: ClearFlag 0x24F - ScrCmd_028 0x4058, 3 + SetVar 0x4058, 3 Return _02A5: - ScrCmd_028 0x405E, 3 + SetVar 0x405E, 3 Return _02AD: - ScrCmd_028 0x405F, 3 + SetVar 0x405F, 3 Return _02B5: - ScrCmd_028 0x4060, 3 + SetVar 0x4060, 3 Return _02BD: diff --git a/res/field/scripts/script_0201.s b/res/field/scripts/script_0201.s index 12c6d1e36c..f0f78e64ad 100644 --- a/res/field/scripts/script_0201.s +++ b/res/field/scripts/script_0201.s @@ -108,20 +108,20 @@ _0098: _00D8: ScrCmd_060 ScrCmd_32D - ScrCmd_05E 7, _0340 - ScrCmd_05F - ScrCmd_05E 0xFF, _03DC - ScrCmd_05F + ApplyMovement 7, _0340 + WaitMovement + ApplyMovement 0xFF, _03DC + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 0 ScrCmd_034 ScrCmd_014 0x800 - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05E 7, _0354 - ScrCmd_05F + ApplyMovement 0xFF, _03E4 + ApplyMovement 7, _0354 + WaitMovement ScrCmd_014 0x801 - ScrCmd_028 0x4081, 1 + SetVar 0x4081, 1 ScrCmd_32E ScrCmd_02C 1 ScrCmd_03E 0x800C @@ -138,14 +138,14 @@ _014E: ScrCmd_0CE 0 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0xFF, _03F8 - ScrCmd_05E 7, _0370 - ScrCmd_05F - ScrCmd_05E 25, _0448 - ScrCmd_05F + ApplyMovement 0xFF, _03F8 + ApplyMovement 7, _0370 + WaitMovement + ApplyMovement 25, _0448 + WaitMovement ScrCmd_02C 7 - ScrCmd_05E 24, _0458 - ScrCmd_05F + ApplyMovement 24, _0458 + WaitMovement ScrCmd_02C 8 ScrCmd_034 Call _030C @@ -154,12 +154,12 @@ _014E: Return _0198: - ScrCmd_05E 24, _0460 - ScrCmd_05F + ApplyMovement 24, _0460 + WaitMovement ScrCmd_02C 9 ScrCmd_02C 10 - ScrCmd_05E 24, _0468 - ScrCmd_05F + ApplyMovement 24, _0468 + WaitMovement ScrCmd_02C 11 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -173,9 +173,9 @@ _0198: ScrCmd_065 31 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_05E 7, _0378 - ScrCmd_05E 0xFF, _0400 - ScrCmd_05F + ApplyMovement 7, _0378 + ApplyMovement 0xFF, _0400 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 12 ClearFlag 0x1E3 @@ -183,26 +183,26 @@ _0198: ScrCmd_04A 0x5DC ScrCmd_049 0x602 ScrCmd_02B 13 - ScrCmd_05E 26, _03B4 - ScrCmd_05E 7, _0380 - ScrCmd_05E 0xFF, _0408 - ScrCmd_05F - ScrCmd_05E 26, _03BC - ScrCmd_05F + ApplyMovement 26, _03B4 + ApplyMovement 7, _0380 + ApplyMovement 0xFF, _0408 + WaitMovement + ApplyMovement 26, _03BC + WaitMovement ScrCmd_02C 14 ScrCmd_034 ScrCmd_0CE 0 ScrCmd_02C 15 ScrCmd_034 - ScrCmd_05E 7, _039C - ScrCmd_05F + ApplyMovement 7, _039C + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 16 ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 26, _03D4 - ScrCmd_05F + ApplyMovement 26, _03D4 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 26 ScrCmd_04B 0x603 @@ -211,23 +211,23 @@ _0198: ScrCmd_02C 19 ScrCmd_02C 20 ScrCmd_034 - ScrCmd_05E 7, _03A4 - ScrCmd_05E 0xFF, _0428 - ScrCmd_05F + ApplyMovement 7, _03A4 + ApplyMovement 0xFF, _0428 + WaitMovement ScrCmd_065 7 - ScrCmd_05E 8, _0478 - ScrCmd_05E 0xFF, _043C - ScrCmd_05F + ApplyMovement 8, _0478 + ApplyMovement 0xFF, _043C + WaitMovement ScrCmd_02C 22 ScrCmd_034 - ScrCmd_05E 8, _0484 - ScrCmd_05E 0xFF, _041C - ScrCmd_05F + ApplyMovement 8, _0484 + ApplyMovement 0xFF, _041C + WaitMovement ScrCmd_065 8 ScrCmd_22D 2, 0x800C CompareVarToValue 0x800C, 1 CallIf 1, _02E0 - ScrCmd_028 0x4081, 2 + SetVar 0x4081, 2 Return _02E0: @@ -237,8 +237,8 @@ _02E0: Return _02EE: - ScrCmd_05E 7, _03AC - ScrCmd_05F + ApplyMovement 7, _03AC + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 3 ScrCmd_031 @@ -253,13 +253,13 @@ _0306: _030C: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x39D + SetVar 0x8004, 0x39D CompareVarToValue 0x800C, 0x186 GoToIf 1, _033E - ScrCmd_028 0x8004, 0x39C + SetVar 0x8004, 0x39C CompareVarToValue 0x800C, 0x183 GoToIf 1, _033E - ScrCmd_028 0x8004, 0x39B + SetVar 0x8004, 0x39B Return _033E: @@ -552,8 +552,8 @@ _0521: CompareVarToValue 0x800C, 1 GoToIf 1, _056F ScrCmd_02C 43 - ScrCmd_028 0x8004, 0x1BF - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1BF + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 107 ScrCmd_02C 44 @@ -636,35 +636,35 @@ _0606: End _0646: - ScrCmd_05E 18, _06B0 - ScrCmd_05F + ApplyMovement 18, _06B0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 18, _06BC - ScrCmd_05F + ApplyMovement 18, _06BC + WaitMovement Return _0660: - ScrCmd_05E 0xFF, _06C4 - ScrCmd_05F + ApplyMovement 0xFF, _06C4 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _06BC - ScrCmd_05F + ApplyMovement 0xFF, _06BC + WaitMovement Return _067A: - ScrCmd_05E 0xFF, _06D0 - ScrCmd_05F + ApplyMovement 0xFF, _06D0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _06BC - ScrCmd_05F + ApplyMovement 0xFF, _06BC + WaitMovement Return _0694: - ScrCmd_05E 0xFF, _06E0 - ScrCmd_05F + ApplyMovement 0xFF, _06E0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _06BC - ScrCmd_05F + ApplyMovement 0xFF, _06BC + WaitMovement Return .balign 4, 0 @@ -702,8 +702,8 @@ _06F0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 7, _07A0 - ScrCmd_05F + ApplyMovement 7, _07A0 + WaitMovement ScrCmd_1BD 0x8004 CompareVarToValue 0x8004, 3 CallIf 1, _076E @@ -726,23 +726,23 @@ _06F0: End _076E: - ScrCmd_05E 0xFF, _07A8 - ScrCmd_05F + ApplyMovement 0xFF, _07A8 + WaitMovement Return _077A: - ScrCmd_05E 0xFF, _07B0 - ScrCmd_05F + ApplyMovement 0xFF, _07B0 + WaitMovement Return _0786: - ScrCmd_05E 0xFF, _07C0 - ScrCmd_05F + ApplyMovement 0xFF, _07C0 + WaitMovement Return _0792: - ScrCmd_05E 0xFF, _07D0 - ScrCmd_05F + ApplyMovement 0xFF, _07D0 + WaitMovement Return .balign 4, 0 @@ -801,8 +801,8 @@ _0802: ScrCmd_068 ScrCmd_02C 5 ScrCmd_031 - ScrCmd_05E 25, _0450 - ScrCmd_05F + ApplyMovement 25, _0450 + WaitMovement ScrCmd_034 ScrCmd_061 End @@ -813,8 +813,8 @@ _081F: ScrCmd_068 ScrCmd_02C 6 ScrCmd_031 - ScrCmd_05E 24, _0470 - ScrCmd_05F + ApplyMovement 24, _0470 + WaitMovement ScrCmd_034 ScrCmd_061 End @@ -825,8 +825,8 @@ _083C: ScrCmd_068 ScrCmd_02C 21 ScrCmd_031 - ScrCmd_05E 8, _085C - ScrCmd_05F + ApplyMovement 8, _085C + WaitMovement ScrCmd_034 ScrCmd_061 End diff --git a/res/field/scripts/script_0202.s b/res/field/scripts/script_0202.s index 3b126923ce..010eb256dc 100644 --- a/res/field/scripts/script_0202.s +++ b/res/field/scripts/script_0202.s @@ -28,8 +28,8 @@ _002A: CheckFlag 213 GoToIf 1, _0071 ScrCmd_02C 0 - ScrCmd_028 0x8004, 232 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 232 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _007C diff --git a/res/field/scripts/script_0203.s b/res/field/scripts/script_0203.s index aa70b03dbe..d1520ed75e 100644 --- a/res/field/scripts/script_0203.s +++ b/res/field/scripts/script_0203.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_0209.s b/res/field/scripts/script_0209.s index aa721c80ef..1c68e8e8d0 100644 --- a/res/field/scripts/script_0209.s +++ b/res/field/scripts/script_0209.s @@ -62,7 +62,7 @@ _006A: ScrCmd_046 21, 0xFF, 7 ScrCmd_046 22, 0xFF, 8 ScrCmd_047 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0135 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0211.s b/res/field/scripts/script_0211.s index fce91504dd..ea8547ce23 100644 --- a/res/field/scripts/script_0211.s +++ b/res/field/scripts/script_0211.s @@ -75,16 +75,16 @@ _00EE: ScrCmd_2BE 0x800C CompareVarToValue 0x800C, 4 GoToIf 4, _027A - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 ScrCmd_1B6 0x800C ScrCmd_1F9 0x800C - ScrCmd_028 0x8004, 120 + SetVar 0x8004, 120 CompareVarToValue 0x800C, 0 GoToIf 1, _0141 - ScrCmd_028 0x8004, 121 + SetVar 0x8004, 121 CompareVarToValue 0x800C, 1 GoToIf 1, _0141 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 _0141: ScrCmd_02D 0x8004 ScrCmd_03E 0x800C @@ -105,8 +105,8 @@ _0165: _0172: ScrCmd_0CB 0x100 ScrCmd_0CC - ScrCmd_05E 0xFF, _02EC - ScrCmd_05F + ApplyMovement 0xFF, _02EC + WaitMovement ScrCmd_2BE 0x800C CompareVarToValue 0x800C, 4 CallIf 4, _01BC @@ -126,12 +126,12 @@ _01BC: Return _01C1: - ScrCmd_05E 0x8007, _1260 - ScrCmd_05F + ApplyMovement 0x8007, _1260 + WaitMovement ScrCmd_19A 0x8006 ScrCmd_23B 0x8006 - ScrCmd_05E 0x8007, _1278 - ScrCmd_05F + ApplyMovement 0x8007, _1278 + WaitMovement ScrCmd_14E Return @@ -139,12 +139,12 @@ _01E1: CompareVarToValue 0x8004, 1 GoToIf 1, _0218 ScrCmd_02C 2 - ScrCmd_05E 0xFF, _02F4 - ScrCmd_05F + ApplyMovement 0xFF, _02F4 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC - ScrCmd_05E 0x8007, _02E0 - ScrCmd_05F + ApplyMovement 0x8007, _02E0 + WaitMovement ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 @@ -154,12 +154,12 @@ _01E1: _0218: ScrCmd_02C 8 - ScrCmd_05E 0xFF, _02F4 - ScrCmd_05F + ApplyMovement 0xFF, _02F4 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC - ScrCmd_05E 0x8007, _02E0 - ScrCmd_05F + ApplyMovement 0x8007, _02E0 + WaitMovement ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 @@ -175,8 +175,8 @@ _0242: _0259: SetFlag 106 - ScrCmd_05E 0xFF, _02F4 - ScrCmd_05F + ApplyMovement 0xFF, _02F4 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC ScrCmd_02C 10 @@ -217,7 +217,7 @@ _02B0: End _02D4: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _0172 .balign 4, 0 @@ -237,13 +237,13 @@ _02F4: EndMovement _02FC: - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _033A CompareVarToValue 0x8008, 1 GoToIf 1, _0341 ScrCmd_03B 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _0341 ScrCmd_038 2 @@ -269,7 +269,7 @@ _034C: _0356: ScrCmd_080 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 7 GoToIf 1, _03D8 CompareVarToValue 0x8008, 0 @@ -312,7 +312,7 @@ _03DE: _03E8: ScrCmd_060 ScrCmd_177 0x8004 - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 _03F4: ScrCmd_1F7 0x800C, 0x8005 CompareVarToValue 0x800C, 0 @@ -320,7 +320,7 @@ _03F4: ScrCmd_0D6 0, 0x8005 ScrCmd_02C 66 _040F: - ScrCmd_026 0x8005, 1 + AddVar 0x8005, 1 CompareVarToVar 0x8004, 0x8005 GoToIf 5, _03F4 ScrCmd_19B 0x800C, 6 @@ -366,7 +366,7 @@ _048B: _0494: SetFlag 31 Call _04A8 - ScrCmd_029 0x4000, 0x800C + SetVar 0x4000, 0x800C ScrCmd_015 End @@ -391,7 +391,7 @@ _04A8: _04FC: ScrCmd_02C 20 ScrCmd_030 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0509: @@ -442,7 +442,7 @@ _057D: _05A0: ScrCmd_2C2 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _05AA: @@ -918,7 +918,7 @@ _0AD8: ScrCmd_33D 1, 0x8004 _0ADD: ScrCmd_080 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 7 GoToIf 1, _0B64 CompareVarToValue 0x8008, 0 @@ -1050,7 +1050,7 @@ _0C93: ScrCmd_042 61, 3 ScrCmd_042 64, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x8006 + SetVar 0x8008, 0x8006 CompareVarToValue 0x8008, 0 GoToIf 1, _0D16 CompareVarToValue 0x8008, 1 @@ -1064,7 +1064,7 @@ _0C93: _0CDD: ScrCmd_042 64, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x8006 + SetVar 0x8008, 0x8006 CompareVarToValue 0x8008, 0 GoToIf 1, _0D16 CompareVarToValue 0x8008, 1 @@ -1097,7 +1097,7 @@ _0D69: _0D73: ScrCmd_047 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0DC2 CompareVarToValue 0x8008, 1 @@ -1173,7 +1173,7 @@ _0E61: _0E83: ScrCmd_047 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0EAB CompareVarToValue 0x8008, 1 @@ -1277,9 +1277,9 @@ _0FC3: _0FCA: ScrCmd_060 - ScrCmd_05E 0xFF, _1250 - ScrCmd_05E 0, _1258 - ScrCmd_05F + ApplyMovement 0xFF, _1250 + ApplyMovement 0, _1258 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_0CD 0 @@ -1315,8 +1315,8 @@ _103A: ScrCmd_0BD ScrCmd_0CB 0x100 ScrCmd_0CC - ScrCmd_05E 0xFF, _02EC - ScrCmd_05F + ApplyMovement 0xFF, _02EC + WaitMovement ScrCmd_02C 43 Call _10C7 Call _01C1 @@ -1324,12 +1324,12 @@ _103A: CompareVarToValue 0x800C, 1 GoToIf 1, _10A2 ScrCmd_02C 44 - ScrCmd_05E 0xFF, _02F4 - ScrCmd_05F + ApplyMovement 0xFF, _02F4 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC - ScrCmd_05E 0x8007, _02E0 - ScrCmd_05F + ApplyMovement 0x8007, _02E0 + WaitMovement ScrCmd_02C 45 ScrCmd_031 ScrCmd_034 @@ -1337,12 +1337,12 @@ _103A: End _10A2: - ScrCmd_05E 0xFF, _02F4 - ScrCmd_05F + ApplyMovement 0xFF, _02F4 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC - ScrCmd_05E 0x8007, _02E0 - ScrCmd_05F + ApplyMovement 0x8007, _02E0 + WaitMovement ScrCmd_02C 39 ScrCmd_031 ScrCmd_034 @@ -1387,79 +1387,79 @@ _10C7: GoToIf 1, _123D CompareVarToValue 0x8004, 175 GoToIf 1, _1245 - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _11BD: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Return _11C5: - ScrCmd_028 0x8007, 1 + SetVar 0x8007, 1 Return _11CD: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Return _11D5: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Return _11DD: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _11E5: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _11ED: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _11F5: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _11FD: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _1205: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _120D: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _1215: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Return _121D: - ScrCmd_028 0x8007, 2 + SetVar 0x8007, 2 Return _1225: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _122D: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _1235: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _123D: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 Return _1245: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 Return .balign 4, 0 @@ -1637,7 +1637,7 @@ _13BE: End _13C8: - ScrCmd_026 0x4115, 1 + AddVar 0x4115, 1 CompareVarToValue 0x4115, 9 CallIf 4, _1445 CompareVarToValue 0x4115, 1 @@ -1659,7 +1659,7 @@ _13C8: Return _1445: - ScrCmd_028 0x4115, 1 + SetVar 0x4115, 1 Return _144D: @@ -1808,7 +1808,7 @@ _15E7: ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0B3 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_2F6 0x8005, 0x8004, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _1624 @@ -1828,28 +1828,28 @@ _1624: _1636: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 GoTo _1672 End _164A: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _1672 End _165E: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 GoTo _1672 End _1672: ScrCmd_02C 129 ScrCmd_2E6 0xFF, 0x8004, 0x800C - ScrCmd_029 0x8003, 0x800C + SetVar 0x8003, 0x800C CompareVarToValue 0x8003, 0xFFFE GoToIf 1, _16A4 ScrCmd_2EC 21, 1, 0x8003, 0x800C diff --git a/res/field/scripts/script_0212.s b/res/field/scripts/script_0212.s index 49572647b8..652f8cd390 100644 --- a/res/field/scripts/script_0212.s +++ b/res/field/scripts/script_0212.s @@ -19,38 +19,38 @@ _0036: ScrCmd_060 - ScrCmd_028 0x800C, 7 + SetVar 0x800C, 7 Call _0052 ClearFlag 0x966 - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 ScrCmd_061 End _0052: - ScrCmd_05E 0xFF, _0120 - ScrCmd_05F + ApplyMovement 0xFF, _0120 + WaitMovement ScrCmd_168 0, 0, 0x800C, 5, 77 Call _010D - ScrCmd_05E 0xFF, _0128 - ScrCmd_05F + ApplyMovement 0xFF, _0128 + WaitMovement Call _0115 Return _007F: - ScrCmd_05E 0xFF, _013C - ScrCmd_05F + ApplyMovement 0xFF, _013C + WaitMovement Return _008B: - ScrCmd_05E 0xFF, _0130 - ScrCmd_05F + ApplyMovement 0xFF, _0130 + WaitMovement CompareVarToValue 0x8007, 3 CallIf 1, _00C8 CompareVarToValue 0x8007, 5 CallIf 1, _00DF CompareVarToValue 0x8007, 7 CallIf 1, _00F6 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 ScrCmd_03E 0x800C Return @@ -130,7 +130,7 @@ _0166: End _0168: - ScrCmd_028 0x40CC, 0 + SetVar 0x40CC, 0 SetFlag 0x201 SetFlag 0x202 SetFlag 0x203 @@ -186,8 +186,8 @@ _01FC: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x8007, 2 + SetVar 0x4003, 0 + SetVar 0x8007, 2 ScrCmd_02C 3 GoTo _023A End @@ -196,8 +196,8 @@ _021B: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 1 - ScrCmd_028 0x8007, 2 + SetVar 0x4003, 1 + SetVar 0x8007, 2 ScrCmd_02C 7 GoTo _023A End @@ -216,7 +216,7 @@ _0253: ScrCmd_042 9, 1 ScrCmd_042 10, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _02A8 CompareVarToValue 0x8008, 1 @@ -226,7 +226,7 @@ _0253: _0291: ScrCmd_150 - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 ClearFlag 0x966 ScrCmd_02C 11 ScrCmd_031 @@ -244,14 +244,14 @@ _02BD: ScrCmd_14E ClearFlag 0x966 ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 1 GoToIf 1, _02E2 GoTo _0291 End _02E2: - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 GoTo _04A8 End @@ -274,7 +274,7 @@ _0311: ScrCmd_042 98, 2 ScrCmd_042 99, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0360 CompareVarToValue 0x8008, 1 @@ -308,7 +308,7 @@ _0381: ScrCmd_042 39, 3 ScrCmd_042 40, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _03E1 CompareVarToValue 0x8008, 1 @@ -349,7 +349,7 @@ _040D: ScrCmd_042 108, 3 ScrCmd_042 109, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0470 CompareVarToValue 0x8008, 1 @@ -362,22 +362,22 @@ _040D: End _0470: - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 GoTo _04A8 End _047E: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _04A8 End _048C: - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 GoTo _04A8 End _049A: - ScrCmd_028 0x8004, 3 + SetVar 0x8004, 3 GoTo _04A8 End @@ -391,7 +391,7 @@ _04A8: ScrCmd_042 114, 4 ScrCmd_042 115, 5 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _051C CompareVarToValue 0x8008, 1 @@ -406,27 +406,27 @@ _04A8: End _051C: - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 GoTo _0562 End _052A: - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 GoTo _0562 End _0538: - ScrCmd_028 0x8005, 2 + SetVar 0x8005, 2 GoTo _0562 End _0546: - ScrCmd_028 0x8005, 3 + SetVar 0x8005, 3 GoTo _0562 End _0554: - ScrCmd_028 0x8005, 4 + SetVar 0x8005, 4 GoTo _0562 End @@ -440,7 +440,7 @@ _0562: CallIf 1, _0600 CompareVarToValue 0x4003, 1 CallIf 1, _0608 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 _0596: ScrCmd_194 0x800C, 0x8004, 0x8005, 0x4004 ScrCmd_195 0x4002, 0x800C @@ -468,11 +468,11 @@ _05E4: End _0600: - ScrCmd_028 0x4004, 0 + SetVar 0x4004, 0 Return _0608: - ScrCmd_028 0x4004, 1 + SetVar 0x4004, 1 Return _0610: @@ -489,7 +489,7 @@ _0625: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0669 CompareVarToValue 0x8008, 1 @@ -550,7 +550,7 @@ _070D: CompareVarToValue 0x4003, 2 GoToIf 1, _078A ScrCmd_109 0x800C - ScrCmd_026 0x800C, 1 + AddVar 0x800C, 1 ScrCmd_0FF 0x800C, 0 ScrCmd_02F 22 ScrCmd_109 0x800C @@ -571,7 +571,7 @@ _0761: _078A: ScrCmd_109 0x800C - ScrCmd_026 0x800C, 1 + AddVar 0x800C, 1 ScrCmd_0FF 0x800C, 0 ScrCmd_02C 177 ScrCmd_109 0x800C @@ -588,38 +588,38 @@ _07B5: _07BC: ScrCmd_168 0, 0, 19, 5, 77 Call _010D - ScrCmd_05F - ScrCmd_05E 0xFF, _0DA0 - ScrCmd_05E 0, _0E08 - ScrCmd_05F + WaitMovement + ApplyMovement 0xFF, _0DA0 + ApplyMovement 0, _0E08 + WaitMovement Call _0115 - ScrCmd_05F + WaitMovement GoTo _086A End _07F1: SetFlag 0x966 - ScrCmd_028 0x40D5, 5 + SetVar 0x40D5, 5 ScrCmd_168 0, 0, 7, 5, 77 Call _010D - ScrCmd_05F - ScrCmd_05E 0xFF, _0DB0 - ScrCmd_05E 1, _0E18 - ScrCmd_05F + WaitMovement + ApplyMovement 0xFF, _0DB0 + ApplyMovement 1, _0E18 + WaitMovement Call _0115 - ScrCmd_05F + WaitMovement GoTo _086A End _0830: ScrCmd_168 0, 0, 28, 5, 77 Call _010D - ScrCmd_05F - ScrCmd_05E 0xFF, _0DC0 - ScrCmd_05E 2, _0E28 - ScrCmd_05F + WaitMovement + ApplyMovement 0xFF, _0DC0 + ApplyMovement 2, _0E28 + WaitMovement Call _0115 - ScrCmd_05F + WaitMovement ScrCmd_02F 211 ScrCmd_034 GoTo _086A @@ -648,8 +648,8 @@ _08A0: End _08AE: - ScrCmd_05E 0xFF, _0E00 - ScrCmd_05F + ApplyMovement 0xFF, _0E00 + WaitMovement ScrCmd_02F 68 ScrCmd_0F8 26 ScrCmd_0F9 26 @@ -662,7 +662,7 @@ _08CD: ScrCmd_0BD ScrCmd_101 ScrCmd_110 0x8004, 0x8005, 0x8007, 0x4002 - ScrCmd_028 0x40CC, 0 + SetVar 0x40CC, 0 ScrCmd_0BE 117, 0, 28, 3, 1 ScrCmd_060 ScrCmd_0BC 6, 1, 1, 0 @@ -672,7 +672,7 @@ _08CD: ScrCmd_107 0x8004 ScrCmd_118 ScrCmd_0FB 0x4002 - ScrCmd_028 0x800C, 28 + SetVar 0x800C, 28 Call _0052 Call _008B CompareVarToValue 0x800C, 0 @@ -685,7 +685,7 @@ _08CD: _0947: ClearFlag 0x220 - ScrCmd_028 0x40CC, 1 + SetVar 0x40CC, 1 Call _0D20 ScrCmd_049 0x603 ClearFlag 0x201 @@ -704,15 +704,15 @@ _0947: ScrCmd_0F8 3 ScrCmd_0F9 3 ScrCmd_049 0x645 - ScrCmd_05E 0, _0E38 - ScrCmd_05F + ApplyMovement 0, _0E38 + WaitMovement ScrCmd_102 0 ScrCmd_103 1 ScrCmd_02F 69 ScrCmd_0F8 19 ScrCmd_0F9 19 - ScrCmd_05E 0, _0E54 - ScrCmd_05F + ApplyMovement 0, _0E54 + WaitMovement ScrCmd_0FD 0, 0 ScrCmd_02F 70 ScrCmd_10B 0, 0x800C @@ -721,8 +721,8 @@ _0947: ScrCmd_112 ScrCmd_0F8 20 ScrCmd_0F9 20 - ScrCmd_05E 0, _0E5C - ScrCmd_05F + ApplyMovement 0, _0E5C + WaitMovement ScrCmd_0FD 1, 0 ScrCmd_02F 71 ScrCmd_10B 1, 0x800C @@ -740,8 +740,8 @@ _0947: ScrCmd_112 ScrCmd_0F8 22 ScrCmd_0F9 22 - ScrCmd_05E 0, _0E64 - ScrCmd_05F + ApplyMovement 0, _0E64 + WaitMovement ScrCmd_0FD 3, 0 ScrCmd_02F 73 ScrCmd_10B 3, 0x800C @@ -750,8 +750,8 @@ _0947: ScrCmd_112 ScrCmd_0F8 23 ScrCmd_0F9 23 - ScrCmd_05E 0, _0E6C - ScrCmd_05F + ApplyMovement 0, _0E6C + WaitMovement ScrCmd_02F 74 ScrCmd_034 ScrCmd_0F8 4 @@ -792,15 +792,15 @@ _0947: _0B1B: ScrCmd_02F 77 ScrCmd_034 - ScrCmd_05E 0, _0E64 - ScrCmd_05E 5, _0E54 - ScrCmd_05F + ApplyMovement 0, _0E64 + ApplyMovement 5, _0E54 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_04E 0x483 ScrCmd_04F - ScrCmd_05E 0, _0E6C - ScrCmd_05E 5, _0E6C - ScrCmd_05F + ApplyMovement 0, _0E6C + ApplyMovement 5, _0E6C + WaitMovement _0B50: ScrCmd_02F 78 ScrCmd_034 @@ -824,23 +824,23 @@ _0B50: ScrCmd_10F 0x8004 ScrCmd_118 ScrCmd_0FB 0x4002 - ScrCmd_028 0x40CC, 0 + SetVar 0x40CC, 0 CompareVarToValue 0x4003, 0 GoToIf 1, _0BF2 ScrCmd_0BE 117, 0, 7, 3, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x800C, 7 + SetVar 0x800C, 7 Call _0052 ClearFlag 0x966 - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 GoTo _0C45 _0BF2: ScrCmd_0BE 117, 0, 18, 3, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x800C, 19 + SetVar 0x800C, 19 Call _0052 Call _007F CompareVarToValue 0x8004, 0xFFFF @@ -848,7 +848,7 @@ _0BF2: ScrCmd_0CD 0 ScrCmd_261 1, 0x8004 ScrCmd_02C 80 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FF _0C3E: ScrCmd_02C 82 @@ -1088,8 +1088,8 @@ _0E74: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 2 - ScrCmd_028 0x8004, 0 + SetVar 0x4003, 2 + SetVar 0x8004, 0 ScrCmd_02C 111 GoTo _0E93 End @@ -1101,7 +1101,7 @@ _0E93: ScrCmd_042 114, 1 ScrCmd_042 115, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0EE1 CompareVarToValue 0x8008, 1 @@ -1118,7 +1118,7 @@ _0EE1: ScrCmd_042 157, 2 ScrCmd_042 158, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0F30 CompareVarToValue 0x8008, 1 @@ -1129,21 +1129,21 @@ _0EE1: End _0F30: - ScrCmd_028 0x4004, 0 - ScrCmd_028 0x8007, 3 + SetVar 0x4004, 0 + SetVar 0x8007, 3 GoTo _1027 End _0F44: - ScrCmd_028 0x4004, 1 - ScrCmd_028 0x8005, 0 - ScrCmd_028 0x8007, 5 + SetVar 0x4004, 1 + SetVar 0x8005, 0 + SetVar 0x8007, 5 GoTo _1027 End _0F5E: - ScrCmd_028 0x4004, 0 - ScrCmd_028 0x8007, 7 + SetVar 0x4004, 0 + SetVar 0x8007, 7 GoTo _1027 End @@ -1338,7 +1338,7 @@ _103A: ScrCmd_042 165, 4 ScrCmd_042 166, 5 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _10AE CompareVarToValue 0x8008, 1 @@ -1353,27 +1353,27 @@ _103A: End _10AE: - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 GoTo _1101 End _10BC: - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 GoTo _1101 End _10CA: - ScrCmd_028 0x8005, 2 + SetVar 0x8005, 2 GoTo _1101 End _10D8: - ScrCmd_028 0x8005, 3 + SetVar 0x8005, 3 GoTo _1101 End _10E6: - ScrCmd_028 0x8005, 4 + SetVar 0x8005, 4 GoTo _1101 End @@ -1389,7 +1389,7 @@ _1101: ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 _111B: ScrCmd_194 0x800C, 0x8004, 0x8005, 0 ScrCmd_195 0x4002, 0x800C @@ -1418,7 +1418,7 @@ _116C: ScrCmd_042 120, 3 ScrCmd_042 122, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _1375 CompareVarToValue 0x8008, 1 @@ -1439,7 +1439,7 @@ _11CF: ScrCmd_042 127, 2 ScrCmd_042 129, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _121E CompareVarToValue 0x8008, 1 @@ -1478,7 +1478,7 @@ _124A: ScrCmd_042 138, 3 ScrCmd_042 139, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _12AA CompareVarToValue 0x8008, 1 @@ -1524,7 +1524,7 @@ _12E1: ScrCmd_042 148, 3 ScrCmd_042 149, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _1341 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0213.s b/res/field/scripts/script_0213.s index 2e5222adf6..fa18cc1360 100644 --- a/res/field/scripts/script_0213.s +++ b/res/field/scripts/script_0213.s @@ -31,16 +31,16 @@ _0055: Return _005B: - ScrCmd_028 0x4000, 13 - ScrCmd_028 0x4001, 5 - ScrCmd_028 0x4002, 2 + SetVar 0x4000, 13 + SetVar 0x4001, 5 + SetVar 0x4002, 2 GoTo _008F End _0075: - ScrCmd_028 0x4000, 8 - ScrCmd_028 0x4001, 5 - ScrCmd_028 0x4002, 2 + SetVar 0x4000, 8 + SetVar 0x4001, 5 + SetVar 0x4002, 2 GoTo _008F End @@ -49,18 +49,18 @@ _008F: ScrCmd_168 0, 0, 0x4000, 0x4002, 77 Call _050B ScrCmd_1B1 0xFF - ScrCmd_05E 0xFF, _00F0 - ScrCmd_05F + ApplyMovement 0xFF, _00F0 + WaitMovement Call _0513 - ScrCmd_05E 0xFF, _00F8 - ScrCmd_05F + ApplyMovement 0xFF, _00F8 + WaitMovement ScrCmd_168 0, 0, 0x4000, 0x4001, 77 Call _050B - ScrCmd_05E 0xFF, _0100 - ScrCmd_05F + ApplyMovement 0xFF, _0100 + WaitMovement Call _0513 ClearFlag 0x966 - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 ScrCmd_061 End @@ -102,7 +102,7 @@ _012C: ScrCmd_046 10, 0xFF, 4 ScrCmd_046 11, 0xFF, 5 ScrCmd_047 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01DE CompareVarToValue 0x8008, 1 @@ -129,7 +129,7 @@ _01D3: End _01DE: - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 GoTo _026A .byte 22 @@ -142,7 +142,7 @@ _01DE: .byte 0 _01F2: - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 ScrCmd_19A 0x800C CompareVarToValue 0x800C, 2 GoToIf 0, _020F @@ -156,7 +156,7 @@ _020F: End _021A: - ScrCmd_028 0x8004, 3 + SetVar 0x8004, 3 ScrCmd_19A 0x800C CompareVarToValue 0x800C, 3 GoToIf 0, _0237 @@ -170,7 +170,7 @@ _0237: End _0242: - ScrCmd_028 0x8004, 4 + SetVar 0x8004, 4 ScrCmd_19A 0x800C CompareVarToValue 0x800C, 3 GoToIf 0, _025F @@ -193,7 +193,7 @@ _026A: End _0290: - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 GoTo _02E4 .byte 2 @@ -272,7 +272,7 @@ _0290: _02E4: ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 1 GoToIf 1, _0305 GoTo _01D3 @@ -293,7 +293,7 @@ _0305: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0384 CompareVarToValue 0x8008, 1 @@ -384,7 +384,7 @@ _045D: End _046A: - ScrCmd_028 0x40D5, 1 + SetVar 0x40D5, 1 SetFlag 0x966 ScrCmd_02E 52 ScrCmd_190 45 @@ -392,26 +392,26 @@ _046A: ScrCmd_034 ScrCmd_168 0, 0, 13, 5, 77 Call _050B - ScrCmd_05E 0xFF, _0524 - ScrCmd_05F + ApplyMovement 0xFF, _0524 + WaitMovement Call _0513 - ScrCmd_05E 0xFF, _0530 - ScrCmd_05F + ApplyMovement 0xFF, _0530 + WaitMovement ScrCmd_168 0, 0, 13, 2, 77 Call _050B - ScrCmd_05E 0xFF, _0538 - ScrCmd_05F + ApplyMovement 0xFF, _0538 + WaitMovement Call _0513 CompareVarToValue 0x8004, 4 GoToIf 1, _04F3 ScrCmd_207 0x800C - ScrCmd_026 0x800C, 7 + AddVar 0x800C, 7 ScrCmd_203 0x14C, 0, 0x800C, 11, 0 End _04F3: ScrCmd_207 0x800C - ScrCmd_026 0x800C, 6 + AddVar 0x800C, 6 ScrCmd_203 0x14D, 0, 0x800C, 11, 0 End @@ -465,7 +465,7 @@ _0565: ScrCmd_042 42, 1 ScrCmd_042 10, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _05CF CompareVarToValue 0x8008, 1 @@ -484,7 +484,7 @@ _05B3: End _05CF: - ScrCmd_028 0x8004, 9 + SetVar 0x8004, 9 ScrCmd_14E ScrCmd_02C 124 ScrCmd_03E 0x800C @@ -493,32 +493,32 @@ _05CF: ScrCmd_31D 0x800C CompareVarToValue 0x800C, 0xFF GoToIf 1, _068E - ScrCmd_028 0x40D5, 2 + SetVar 0x40D5, 2 SetFlag 0x966 ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 1 GoToIf 1, _062D - ScrCmd_028 0x40D5, 0 + SetVar 0x40D5, 0 ClearFlag 0x966 GoTo _01D3 _062D: - ScrCmd_028 0x40D5, 2 + SetVar 0x40D5, 2 SetFlag 0x966 ScrCmd_02C 63 ScrCmd_034 ScrCmd_168 0, 0, 8, 5, 77 Call _050B - ScrCmd_05E 0xFF, _0524 - ScrCmd_05F + ApplyMovement 0xFF, _0524 + WaitMovement Call _0513 - ScrCmd_05E 0xFF, _0530 - ScrCmd_05F + ApplyMovement 0xFF, _0530 + WaitMovement ScrCmd_168 0, 0, 8, 2, 77 Call _050B - ScrCmd_05E 0xFF, _0538 - ScrCmd_05F + ApplyMovement 0xFF, _0538 + WaitMovement Call _0513 ScrCmd_061 ScrCmd_153 @@ -570,7 +570,7 @@ _06CB: ScrCmd_042 42, 1 ScrCmd_042 10, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0724 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0214.s b/res/field/scripts/script_0214.s index 283a744665..c2ceb507a4 100644 --- a/res/field/scripts/script_0214.s +++ b/res/field/scripts/script_0214.s @@ -50,8 +50,8 @@ _0055: End _0073: - ScrCmd_028 0x8004, 0x12A - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x12A + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0114 @@ -68,27 +68,27 @@ _0073: End _00CC: - ScrCmd_05E 3, _0138 - ScrCmd_05F + ApplyMovement 3, _0138 + WaitMovement GoTo _0102 End _00DE: - ScrCmd_05E 3, _0144 - ScrCmd_05F + ApplyMovement 3, _0144 + WaitMovement GoTo _0102 End _00F0: - ScrCmd_05E 3, _0144 - ScrCmd_05F + ApplyMovement 3, _0144 + WaitMovement GoTo _0102 End _0102: ScrCmd_049 0x603 ScrCmd_065 3 - ScrCmd_028 0x4056, 2 + SetVar 0x4056, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0215.s b/res/field/scripts/script_0215.s index 06d0e2243d..170f9fbc47 100644 --- a/res/field/scripts/script_0215.s +++ b/res/field/scripts/script_0215.s @@ -33,8 +33,8 @@ _0016: .byte 0 _0034: - ScrCmd_05E 0, _00D8 - ScrCmd_05F + ApplyMovement 0, _00D8 + WaitMovement GoTo _0044 _0044: @@ -78,8 +78,8 @@ _0059: .byte 0 _0091: - ScrCmd_05E 0, _00C0 - ScrCmd_05F + ApplyMovement 0, _00C0 + WaitMovement GoTo _00A1 _00A1: diff --git a/res/field/scripts/script_0216.s b/res/field/scripts/script_0216.s index 4e401a62eb..671c12eb20 100644 --- a/res/field/scripts/script_0216.s +++ b/res/field/scripts/script_0216.s @@ -40,7 +40,7 @@ _007C: End _0082: - ScrCmd_028 0x40CF, 3 + SetVar 0x40CF, 3 Return _008A: @@ -78,13 +78,13 @@ _00CF: GoToIf 1, _0133 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _013C - ScrCmd_05F + ApplyMovement 0, _013C + WaitMovement ScrCmd_168 7, 20, 19, 14, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 0, _0144 - ScrCmd_05F + ApplyMovement 0, _0144 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -174,19 +174,19 @@ _01FB: _0201: ScrCmd_060 - ScrCmd_05E 6, _02D8 - ScrCmd_05E 0xFF, _02AC - ScrCmd_05F + ApplyMovement 6, _02D8 + ApplyMovement 0xFF, _02AC + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0xFF, _02BC - ScrCmd_05E 6, _02EC - ScrCmd_05F + ApplyMovement 0xFF, _02BC + ApplyMovement 6, _02EC + WaitMovement ScrCmd_168 7, 20, 19, 14, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 6, _0300 - ScrCmd_05F + ApplyMovement 6, _0300 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -194,20 +194,20 @@ _0201: ScrCmd_168 7, 20, 19, 14, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 6, _0310 - ScrCmd_05F + ApplyMovement 6, _0310 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 - ScrCmd_05E 6, _031C - ScrCmd_05F + ApplyMovement 6, _031C + WaitMovement ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 0xFF, _02C8 - ScrCmd_05E 6, _0324 - ScrCmd_05F + ApplyMovement 0xFF, _02C8 + ApplyMovement 6, _0324 + WaitMovement ScrCmd_065 6 - ScrCmd_028 0x411E, 2 + SetVar 0x411E, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0217.s b/res/field/scripts/script_0217.s index c23e8a2ff9..16464633e9 100644 --- a/res/field/scripts/script_0217.s +++ b/res/field/scripts/script_0217.s @@ -29,15 +29,15 @@ _0035: _005F: ScrCmd_060 - ScrCmd_05E 0, _0090 - ScrCmd_05F + ApplyMovement 0, _0090 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0098 - ScrCmd_05E 0xFF, _00A0 - ScrCmd_05F + ApplyMovement 0, _0098 + ApplyMovement 0xFF, _00A0 + WaitMovement ScrCmd_065 0 - ScrCmd_028 0x40CF, 1 + SetVar 0x40CF, 1 ScrCmd_061 End @@ -77,14 +77,14 @@ _00BF: End _00E3: - ScrCmd_05E 1, _0348 - ScrCmd_05F + ApplyMovement 1, _0348 + WaitMovement GoTo _0107 End _00F5: - ScrCmd_05E 1, _0358 - ScrCmd_05F + ApplyMovement 1, _0358 + WaitMovement GoTo _0107 End @@ -97,15 +97,15 @@ _0107: GoToIf 1, _02B9 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 7, _0374 - ScrCmd_05F + ApplyMovement 7, _0374 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 4 - ScrCmd_05E 1, _0364 - ScrCmd_05F + ApplyMovement 1, _0364 + WaitMovement ScrCmd_02C 5 - ScrCmd_05E 1, _036C - ScrCmd_05F + ApplyMovement 1, _036C + WaitMovement ScrCmd_02C 6 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -117,7 +117,7 @@ _0107: ScrCmd_065 4 SetFlag 0x1A2 ClearFlag 0x17F - ScrCmd_028 0x4089, 2 + SetVar 0x4089, 2 SetFlag 0xAA8 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD @@ -129,14 +129,14 @@ _0107: End _01B7: - ScrCmd_05E 2, _02E8 - ScrCmd_05F + ApplyMovement 2, _02E8 + WaitMovement GoTo _01DB End _01C9: - ScrCmd_05E 2, _02F4 - ScrCmd_05F + ApplyMovement 2, _02F4 + WaitMovement GoTo _01DB End @@ -156,16 +156,16 @@ _01DB: End _0218: - ScrCmd_05E 5, _02C0 - ScrCmd_05E 2, _0300 - ScrCmd_05F + ApplyMovement 5, _02C0 + ApplyMovement 2, _0300 + WaitMovement GoTo _024C End _0232: - ScrCmd_05E 5, _02D4 - ScrCmd_05E 2, _030C - ScrCmd_05F + ApplyMovement 5, _02D4 + ApplyMovement 2, _030C + WaitMovement GoTo _024C End @@ -180,14 +180,14 @@ _024C: End _0273: - ScrCmd_05E 2, _0318 - ScrCmd_05F + ApplyMovement 2, _0318 + WaitMovement GoTo _0297 End _0285: - ScrCmd_05E 2, _0330 - ScrCmd_05F + ApplyMovement 2, _0330 + WaitMovement GoTo _0297 End @@ -196,9 +196,9 @@ _0297: ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x411E, 1 + SetVar 0x411E, 1 ClearFlag 0x1FA - ScrCmd_028 0x40CF, 2 + SetVar 0x40CF, 2 SetFlag 0x988 ScrCmd_061 End diff --git a/res/field/scripts/script_0218.s b/res/field/scripts/script_0218.s index af3be589c8..e5a42791b6 100644 --- a/res/field/scripts/script_0218.s +++ b/res/field/scripts/script_0218.s @@ -18,10 +18,10 @@ _0018: ScrCmd_068 CheckFlag 0x12A GoToIf 1, _004D - ScrCmd_028 0x8004, 95 + SetVar 0x8004, 95 ScrCmd_261 0, 0x8004 ScrCmd_02C 0 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF SetFlag 0x12A ScrCmd_034 diff --git a/res/field/scripts/script_0219.s b/res/field/scripts/script_0219.s index ec6ed7c379..3e51be5f16 100644 --- a/res/field/scripts/script_0219.s +++ b/res/field/scripts/script_0219.s @@ -22,7 +22,7 @@ _0032: End _003F: - ScrCmd_028 0x40B1, 0 + SetVar 0x40B1, 0 End _0047: @@ -36,13 +36,13 @@ _0047: End _006E: - ScrCmd_05E 0, _00E8 - ScrCmd_05F + ApplyMovement 0, _00E8 + WaitMovement GoTo _008E _007E: - ScrCmd_05E 0, _00F4 - ScrCmd_05F + ApplyMovement 0, _00F4 + WaitMovement GoTo _008E _008E: @@ -55,11 +55,11 @@ _008E: ScrCmd_02C 1 ScrCmd_04F SetFlag 139 - ScrCmd_028 0x40B1, 1 + SetVar 0x40B1, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x403F, 0x260 + SetVar 0x403F, 0x260 ScrCmd_161 ScrCmd_06D 0, 48 ScrCmd_06C 0, 1 @@ -95,8 +95,8 @@ _0108: ScrCmd_162 ScrCmd_06D 0, 15 ScrCmd_06C 0, 0 - ScrCmd_05E 0, _0190 - ScrCmd_05F + ApplyMovement 0, _0190 + WaitMovement ScrCmd_02C 4 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -107,17 +107,17 @@ _0108: End _0148: - ScrCmd_05E 0, _0174 - ScrCmd_05F + ApplyMovement 0, _0174 + WaitMovement GoTo _0168 _0158: - ScrCmd_05E 0, _0180 - ScrCmd_05F + ApplyMovement 0, _0180 + WaitMovement GoTo _0168 _0168: - ScrCmd_028 0x40B1, 0 + SetVar 0x40B1, 0 ScrCmd_061 End @@ -141,13 +141,13 @@ _0190: _0198: ScrCmd_060 - ScrCmd_05E 0, _0300 - ScrCmd_05E 0xFF, _0368 - ScrCmd_05F + ApplyMovement 0, _0300 + ApplyMovement 0xFF, _0368 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 5 - ScrCmd_028 0x8004, 218 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 218 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01EA @@ -177,54 +177,54 @@ _01EA: End _023B: - ScrCmd_05E 0, _030C - ScrCmd_05E 0xFF, _0374 - ScrCmd_05F + ApplyMovement 0, _030C + ApplyMovement 0xFF, _0374 + WaitMovement GoTo _02CB _0253: - ScrCmd_05E 0, _0318 - ScrCmd_05E 0xFF, _0388 - ScrCmd_05F + ApplyMovement 0, _0318 + ApplyMovement 0xFF, _0388 + WaitMovement GoTo _02CB _026B: - ScrCmd_05E 0, _0324 - ScrCmd_05E 0xFF, _039C - ScrCmd_05F + ApplyMovement 0, _0324 + ApplyMovement 0xFF, _039C + WaitMovement GoTo _02CB _0283: - ScrCmd_05E 0, _0330 - ScrCmd_05E 0xFF, _03B0 - ScrCmd_05F + ApplyMovement 0, _0330 + ApplyMovement 0xFF, _03B0 + WaitMovement GoTo _02CB _029B: - ScrCmd_05E 0, _033C - ScrCmd_05E 0xFF, _03C4 - ScrCmd_05F + ApplyMovement 0, _033C + ApplyMovement 0xFF, _03C4 + WaitMovement GoTo _02CB _02B3: - ScrCmd_05E 0, _0348 - ScrCmd_05E 0xFF, _03D8 - ScrCmd_05F + ApplyMovement 0, _0348 + ApplyMovement 0xFF, _03D8 + WaitMovement GoTo _02CB _02CB: - ScrCmd_05E 0, _0354 - ScrCmd_05F + ApplyMovement 0, _0354 + WaitMovement ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0, _035C - ScrCmd_05F + ApplyMovement 0, _035C + WaitMovement ScrCmd_049 0x603 ScrCmd_162 ScrCmd_065 0 ScrCmd_04B 0x603 SetFlag 227 - ScrCmd_028 0x40B1, 2 + SetVar 0x40B1, 2 ScrCmd_061 End @@ -363,8 +363,8 @@ _0411: ScrCmd_068 ScrCmd_02C 11 ScrCmd_034 - ScrCmd_05E 24, _04BC - ScrCmd_05F + ApplyMovement 24, _04BC + WaitMovement ScrCmd_02C 12 ScrCmd_068 ScrCmd_02C 13 @@ -381,26 +381,26 @@ _0411: End _046C: - ScrCmd_05E 24, _04D0 - ScrCmd_05F + ApplyMovement 24, _04D0 + WaitMovement GoTo _04B4 End _047E: - ScrCmd_05E 24, _04C4 - ScrCmd_05F + ApplyMovement 24, _04C4 + WaitMovement GoTo _04B4 End _0490: - ScrCmd_05E 24, _04C4 - ScrCmd_05F + ApplyMovement 24, _04C4 + WaitMovement GoTo _04B4 End _04A2: - ScrCmd_05E 24, _04C4 - ScrCmd_05F + ApplyMovement 24, _04C4 + WaitMovement GoTo _04B4 End @@ -454,9 +454,9 @@ _050C: _051D: ScrCmd_060 - ScrCmd_028 0x40CD, 2 - ScrCmd_05E 0, _053C - ScrCmd_05F + SetVar 0x40CD, 2 + ApplyMovement 0, _053C + WaitMovement ScrCmd_02C 8 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0221.s b/res/field/scripts/script_0221.s index f68f588054..1fb84f8427 100644 --- a/res/field/scripts/script_0221.s +++ b/res/field/scripts/script_0221.s @@ -19,8 +19,8 @@ _0010: CheckFlag 0x138 GoToIf 1, _0062 ScrCmd_02C 0 - ScrCmd_028 0x8004, 91 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 91 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01F3 @@ -100,8 +100,8 @@ _014E: ScrCmd_29D 0x117, 1 ScrCmd_29D 11, 2 ScrCmd_043 - ScrCmd_028 0x8007, 10 - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8007, 10 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 0 GoToIf 1, _011A CompareVarToValue 0x8008, 1 @@ -110,7 +110,7 @@ _014E: End _019E: - ScrCmd_027 0x8007, 1 + SubVar 0x8007, 1 ScrCmd_1E5 70 ScrCmd_07B 72, 1, 0x800C ScrCmd_07B 73, 1, 0x800C diff --git a/res/field/scripts/script_0223.s b/res/field/scripts/script_0223.s index 4291bc902e..7de304af37 100644 --- a/res/field/scripts/script_0223.s +++ b/res/field/scripts/script_0223.s @@ -7,24 +7,24 @@ _0006: ScrCmd_060 - ScrCmd_05E 0xFF, _008C - ScrCmd_05E 6, _0064 - ScrCmd_05F + ApplyMovement 0xFF, _008C + ApplyMovement 6, _0064 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 6, _0070 - ScrCmd_05E 0xFF, _009C - ScrCmd_05F + ApplyMovement 6, _0070 + ApplyMovement 0xFF, _009C + WaitMovement ScrCmd_02C 1 - ScrCmd_05E 6, _0078 - ScrCmd_05F + ApplyMovement 6, _0078 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0xFF, _00B0 - ScrCmd_05E 6, _0080 - ScrCmd_05F + ApplyMovement 0xFF, _00B0 + ApplyMovement 6, _0080 + WaitMovement ScrCmd_065 6 - ScrCmd_028 0x4096, 1 + SetVar 0x4096, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0224.s b/res/field/scripts/script_0224.s index e3a904741e..067d08478a 100644 --- a/res/field/scripts/script_0224.s +++ b/res/field/scripts/script_0224.s @@ -30,14 +30,14 @@ _0023: _0036: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - ScrCmd_028 0x40A9, 2 + SetVar 0x40A9, 2 ScrCmd_186 5, 20, 25 ScrCmd_188 5, 16 ScrCmd_189 5, 2 ClearFlag 0x29F ScrCmd_064 5 - ScrCmd_05E 5, _0148 - ScrCmd_05F + ApplyMovement 5, _0148 + WaitMovement ScrCmd_014 0x807 CompareVarToValue 0x8005, 24 CallIf 1, _0109 @@ -46,14 +46,14 @@ _0036: CompareVarToValue 0x8005, 26 CallIf 1, _0131 ScrCmd_02C 0 - ScrCmd_05E 5, _0184 - ScrCmd_05F + ApplyMovement 5, _0184 + WaitMovement ScrCmd_02C 1 - ScrCmd_05E 5, _018C - ScrCmd_05F + ApplyMovement 5, _018C + WaitMovement ScrCmd_02C 2 - ScrCmd_028 0x8004, 68 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 68 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00F2 @@ -83,21 +83,21 @@ _0100: Return _0109: - ScrCmd_05E 5, _015C - ScrCmd_05E 0xFF, _0194 - ScrCmd_05F + ApplyMovement 5, _015C + ApplyMovement 0xFF, _0194 + WaitMovement Return _011D: - ScrCmd_05E 5, _016C - ScrCmd_05E 0xFF, _0194 - ScrCmd_05F + ApplyMovement 5, _016C + ApplyMovement 0xFF, _0194 + WaitMovement Return _0131: - ScrCmd_05E 5, _0174 - ScrCmd_05E 0xFF, _0194 - ScrCmd_05F + ApplyMovement 5, _0174 + ApplyMovement 0xFF, _0194 + WaitMovement Return .balign 4, 0 @@ -157,8 +157,8 @@ _01A0: _01BE: ScrCmd_02C 5 - ScrCmd_028 0x8004, 68 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 68 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01F0 diff --git a/res/field/scripts/script_0232.s b/res/field/scripts/script_0232.s index 01c15edf75..53b1f690c1 100644 --- a/res/field/scripts/script_0232.s +++ b/res/field/scripts/script_0232.s @@ -12,8 +12,8 @@ _0006: ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 16, _0024 - ScrCmd_05F + ApplyMovement 16, _0024 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0233.s b/res/field/scripts/script_0233.s index e67f453f12..9a7b1db1c4 100644 --- a/res/field/scripts/script_0233.s +++ b/res/field/scripts/script_0233.s @@ -18,7 +18,7 @@ _000E: End _003B: - ScrCmd_028 0x406A, 0 + SetVar 0x406A, 0 Return _0043: diff --git a/res/field/scripts/script_0234.s b/res/field/scripts/script_0234.s index e0ba002e5f..f3841ae7d7 100644 --- a/res/field/scripts/script_0234.s +++ b/res/field/scripts/script_0234.s @@ -19,16 +19,16 @@ _000A: _001D: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_05E 16, _0058 - ScrCmd_05F + ApplyMovement 16, _0058 + WaitMovement ScrCmd_02C 1 - ScrCmd_05E 17, _0060 - ScrCmd_05F + ApplyMovement 17, _0060 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 16, _0068 - ScrCmd_05E 17, _0068 - ScrCmd_05F + ApplyMovement 16, _0068 + ApplyMovement 17, _0068 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0236.s b/res/field/scripts/script_0236.s index ba26446143..2c4d2f279d 100644 --- a/res/field/scripts/script_0236.s +++ b/res/field/scripts/script_0236.s @@ -24,11 +24,11 @@ _0022: End _0052: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _005A: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0062: @@ -46,7 +46,7 @@ _0062: GoToIf 1, _00C5 CheckFlag 0x11E GoToIf 1, _00C5 - ScrCmd_028 0x4118, 1 + SetVar 0x4118, 1 GoTo _00C5 End @@ -74,12 +74,12 @@ _0107: _0109: ScrCmd_246 0x800C - ScrCmd_029 0x8004, 0x8005 + SetVar 0x8004, 0x8005 CompareVarToValue 0x800C, 10 GoToIf 1, _0133 CompareVarToValue 0x800C, 12 GoToIf 1, _0133 - ScrCmd_029 0x8004, 0x8006 + SetVar 0x8004, 0x8006 _0133: Return @@ -117,9 +117,9 @@ _0133: _0154: ScrCmd_060 - ScrCmd_05E 0, _01E4 - ScrCmd_05E 3, _01F4 - ScrCmd_05F + ApplyMovement 0, _01E4 + ApplyMovement 3, _01F4 + WaitMovement ScrCmd_0EE 0x800C CompareVarToValue 0x800C, 0 GoToIf 5, _01A6 @@ -129,11 +129,11 @@ _0154: _0181: ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _0204 - ScrCmd_05F - ScrCmd_05E 0, _01EC - ScrCmd_05E 3, _01FC - ScrCmd_05F + ApplyMovement 0xFF, _0204 + WaitMovement + ApplyMovement 0, _01EC + ApplyMovement 3, _01FC + WaitMovement ScrCmd_061 End @@ -141,7 +141,7 @@ _01A6: Call _01CA CompareVarToValue 0x800C, 0 GoToIf 1, _01DB - ScrCmd_028 0x4098, 1 + SetVar 0x4098, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -245,15 +245,15 @@ _0249: ScrCmd_02C 12 ScrCmd_034 ScrCmd_18C 0xFF, 1 - ScrCmd_05E 5, _0500 - ScrCmd_05F + ApplyMovement 5, _0500 + WaitMovement ScrCmd_065 5 - ScrCmd_028 0x4098, 2 + SetVar 0x4098, 2 GoTo _0508 End _02D0: - ScrCmd_028 0x4098, 1 + SetVar 0x4098, 1 ScrCmd_0EB ScrCmd_061 End @@ -261,7 +261,7 @@ _02D0: _02DC: ClearFlag 0x1C5 ScrCmd_069 0x8004, 0x8005 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 30 GoToIf 1, _0315 CompareVarToValue 0x8008, 31 @@ -273,30 +273,30 @@ _02DC: _0315: ScrCmd_186 5, 31, 40 ScrCmd_064 5 - ScrCmd_05E 5, _04F4 - ScrCmd_05F + ApplyMovement 5, _04F4 + WaitMovement ScrCmd_18C 5, 3 Return _0333: ScrCmd_186 5, 30, 40 ScrCmd_064 5 - ScrCmd_05E 5, _04F4 - ScrCmd_05F + ApplyMovement 5, _04F4 + WaitMovement ScrCmd_18C 5, 2 Return _0351: ScrCmd_186 5, 31, 40 ScrCmd_064 5 - ScrCmd_05E 5, _04F4 - ScrCmd_05F + ApplyMovement 5, _04F4 + WaitMovement ScrCmd_18C 5, 2 Return _036F: ScrCmd_069 0x8004, 0x8005 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 30 GoToIf 1, _03A4 CompareVarToValue 0x8008, 31 @@ -307,23 +307,23 @@ _036F: _03A4: ScrCmd_18C 0xFF, 2 - ScrCmd_05E 4, _03F4 - ScrCmd_05E 2, _03FC - ScrCmd_05F + ApplyMovement 4, _03F4 + ApplyMovement 2, _03FC + WaitMovement Return _03BE: ScrCmd_18C 0xFF, 3 - ScrCmd_05E 4, _0404 - ScrCmd_05E 2, _040C - ScrCmd_05F + ApplyMovement 4, _0404 + ApplyMovement 2, _040C + WaitMovement Return _03D8: ScrCmd_18C 0xFF, 3 - ScrCmd_05E 4, _0414 - ScrCmd_05E 2, _041C - ScrCmd_05F + ApplyMovement 4, _0414 + ApplyMovement 2, _041C + WaitMovement Return .balign 4, 0 @@ -358,19 +358,19 @@ _041C: _0424: ScrCmd_0DE 0x800C - ScrCmd_028 0x8004, 0x26C + SetVar 0x8004, 0x26C CompareVarToValue 0x800C, 0x186 GoToIf 1, _0454 - ScrCmd_028 0x8004, 0x26B + SetVar 0x8004, 0x26B CompareVarToValue 0x800C, 0x183 GoToIf 1, _0454 - ScrCmd_028 0x8004, 0x25F + SetVar 0x8004, 0x25F _0454: Return _0456: ScrCmd_069 0x8004, 0x8005 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 30 GoToIf 1, _048B CompareVarToValue 0x8008, 31 @@ -470,14 +470,14 @@ _0500: EndMovement _0508: - ScrCmd_05E 0xFF, _05B8 - ScrCmd_05F + ApplyMovement 0xFF, _05B8 + WaitMovement ScrCmd_069 0x8000, 0x8001 ScrCmd_066 0x8000, 0x8001 Call _05C0 - ScrCmd_05F - ScrCmd_028 0x8005, 13 - ScrCmd_028 0x8006, 68 + WaitMovement + SetVar 0x8005, 13 + SetVar 0x8006, 68 Call _0109 ScrCmd_02D 0x8004 ScrCmd_034 @@ -499,11 +499,11 @@ _0567: SetFlag 0x1C8 SetFlag 0x1C9 SetFlag 0x1CA - ScrCmd_028 0x4098, 3 + SetVar 0x4098, 3 SetFlag 0x981 ClearFlag 0x1C7 SetFlag 0x132 - ScrCmd_028 0x40C3, 1 + SetVar 0x40C3, 1 ScrCmd_31A 0x1E3 ScrCmd_31A 0x1E4 ScrCmd_067 @@ -517,7 +517,7 @@ _05B8: _05C0: ScrCmd_069 0x8004, 0x8005 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 29 GoToIf 1, _060F CompareVarToValue 0x8008, 30 @@ -531,23 +531,23 @@ _05C0: Return _060F: - ScrCmd_05E 241, _0644 + ApplyMovement 241, _0644 Return _0619: - ScrCmd_05E 241, _0654 + ApplyMovement 241, _0654 Return _0623: - ScrCmd_05E 241, _0664 + ApplyMovement 241, _0664 Return _062D: - ScrCmd_05E 241, _0670 + ApplyMovement 241, _0670 Return _0637: - ScrCmd_05E 241, _0680 + ApplyMovement 241, _0680 Return .balign 4, 0 diff --git a/res/field/scripts/script_0237.s b/res/field/scripts/script_0237.s index 8db62b5b96..524e38709f 100644 --- a/res/field/scripts/script_0237.s +++ b/res/field/scripts/script_0237.s @@ -23,13 +23,13 @@ _0022: ClearFlag 0x1CD ScrCmd_064 0 ScrCmd_066 30, 30 - ScrCmd_05E 241, _016C - ScrCmd_05F + ApplyMovement 241, _016C + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40C3, 2 - ScrCmd_05E 0, _0144 - ScrCmd_05F + SetVar 0x40C3, 2 + ApplyMovement 0, _0144 + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_20D 4, 0x800C @@ -39,16 +39,16 @@ _0088: CompareVarToValue 0x800C, 0 GoToIf 1, _0088 ScrCmd_065 1 - ScrCmd_05E 241, _0178 - ScrCmd_05F + ApplyMovement 241, _0178 + WaitMovement ScrCmd_067 - ScrCmd_05E 0xFF, _013C - ScrCmd_05E 0, _014C - ScrCmd_05F + ApplyMovement 0xFF, _013C + ApplyMovement 0, _014C + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 0, _0154 - ScrCmd_05F + ApplyMovement 0, _0154 + WaitMovement ScrCmd_02C 5 SetFlag 0x29E GoTo _00DA diff --git a/res/field/scripts/script_0238.s b/res/field/scripts/script_0238.s index 4b2d9c6fc8..d780ad367d 100644 --- a/res/field/scripts/script_0238.s +++ b/res/field/scripts/script_0238.s @@ -34,7 +34,7 @@ _0048: _0056: ScrCmd_060 - ScrCmd_028 0x4118, 0 + SetVar 0x4118, 0 Call _00E9 Call _0104 ScrCmd_04C 0x1ED, 0 @@ -59,7 +59,7 @@ _0056: End _00C8: - ScrCmd_028 0x4056, 1 + SetVar 0x4056, 1 Return _00D0: @@ -77,8 +77,8 @@ _00DF: End _00E9: - ScrCmd_05E 0xFF, _00F8 - ScrCmd_05F + ApplyMovement 0xFF, _00F8 + WaitMovement Return .balign 4, 0 @@ -89,7 +89,7 @@ _00F8: _0104: ScrCmd_069 0x8004, 0x8005 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 30 GoToIf 1, _0139 CompareVarToValue 0x8008, 31 @@ -100,26 +100,26 @@ _0137: Return _0139: - ScrCmd_05E 0xFF, _017C - ScrCmd_05F + ApplyMovement 0xFF, _017C + WaitMovement GoTo _0137 End _014B: - ScrCmd_05E 0xFF, _018C - ScrCmd_05F + ApplyMovement 0xFF, _018C + WaitMovement GoTo _0137 End _015D: - ScrCmd_05E 0xFF, _0194 - ScrCmd_05F + ApplyMovement 0xFF, _0194 + WaitMovement GoTo _0137 End _016F: - ScrCmd_05E 0xFF, _01A4 - ScrCmd_05F + ApplyMovement 0xFF, _01A4 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0239.s b/res/field/scripts/script_0239.s index 6b8f71fe56..cb61830b89 100644 --- a/res/field/scripts/script_0239.s +++ b/res/field/scripts/script_0239.s @@ -25,7 +25,7 @@ _0012: GoToIf 1, _0075 CheckFlag 0x11E GoToIf 1, _0075 - ScrCmd_028 0x4118, 1 + SetVar 0x4118, 1 GoTo _0075 End @@ -51,7 +51,7 @@ _0077: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00E8 - ScrCmd_028 0x40C4, 1 + SetVar 0x40C4, 1 ScrCmd_2BC 0x800C CompareVarToValue 0x800C, 0 CallIf 1, _00EE diff --git a/res/field/scripts/script_0240.s b/res/field/scripts/script_0240.s index c0090d1505..d05741e00b 100644 --- a/res/field/scripts/script_0240.s +++ b/res/field/scripts/script_0240.s @@ -25,7 +25,7 @@ _0012: GoToIf 1, _0075 CheckFlag 0x11E GoToIf 1, _0075 - ScrCmd_028 0x4118, 1 + SetVar 0x4118, 1 GoTo _0075 End @@ -51,7 +51,7 @@ _0077: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00E8 - ScrCmd_028 0x40C5, 1 + SetVar 0x40C5, 1 ScrCmd_2BC 0x800C CompareVarToValue 0x800C, 0 CallIf 1, _00EE diff --git a/res/field/scripts/script_0248.s b/res/field/scripts/script_0248.s index f04b83dc08..01a39b57e7 100644 --- a/res/field/scripts/script_0248.s +++ b/res/field/scripts/script_0248.s @@ -14,7 +14,7 @@ _000A: GoToIf 1, _00BC ScrCmd_02C 0 ScrCmd_1B7 0x8004, 4 - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 0 GoToIf 1, _005B CompareVarToValue 0x8008, 1 @@ -25,27 +25,27 @@ _000A: End _005B: - ScrCmd_028 0x8004, 72 + SetVar 0x8004, 72 GoTo _0093 End _0069: - ScrCmd_028 0x8004, 73 + SetVar 0x8004, 73 GoTo _0093 End _0077: - ScrCmd_028 0x8004, 74 + SetVar 0x8004, 74 GoTo _0093 End _0085: - ScrCmd_028 0x8004, 75 + SetVar 0x8004, 75 GoTo _0093 End _0093: - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00C7 diff --git a/res/field/scripts/script_0253.s b/res/field/scripts/script_0253.s index 9990cd03dd..5d04f06f27 100644 --- a/res/field/scripts/script_0253.s +++ b/res/field/scripts/script_0253.s @@ -28,8 +28,8 @@ _0044: End _004F: - ScrCmd_05E 0, _00D4 - ScrCmd_05F + ApplyMovement 0, _00D4 + WaitMovement ScrCmd_02C 2 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -40,8 +40,8 @@ _004F: _007C: ScrCmd_02C 3 - ScrCmd_028 0x8004, 75 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 75 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00AE diff --git a/res/field/scripts/script_0270.s b/res/field/scripts/script_0270.s index e08ccdb4a7..0d4b82d1a9 100644 --- a/res/field/scripts/script_0270.s +++ b/res/field/scripts/script_0270.s @@ -14,14 +14,14 @@ _0012: End _001F: - ScrCmd_028 0x4090, 0 + SetVar 0x4090, 0 End _0027: ScrCmd_060 ScrCmd_0C8 0 - ScrCmd_05E 28, _0140 - ScrCmd_05F + ApplyMovement 28, _0140 + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 55 GoToIf 1, _008C @@ -38,33 +38,33 @@ _0027: End _008C: - ScrCmd_05E 28, _014C - ScrCmd_05F + ApplyMovement 28, _014C + WaitMovement GoTo _00EC _009C: - ScrCmd_05E 28, _0158 - ScrCmd_05F + ApplyMovement 28, _0158 + WaitMovement GoTo _00EC _00AC: - ScrCmd_05E 28, _0164 - ScrCmd_05F + ApplyMovement 28, _0164 + WaitMovement GoTo _00EC _00BC: - ScrCmd_05E 28, _0170 - ScrCmd_05F + ApplyMovement 28, _0170 + WaitMovement GoTo _00EC _00CC: - ScrCmd_05E 28, _0178 - ScrCmd_05F + ApplyMovement 28, _0178 + WaitMovement GoTo _00EC _00DC: - ScrCmd_05E 28, _0184 - ScrCmd_05F + ApplyMovement 28, _0184 + WaitMovement GoTo _00EC _00EC: @@ -78,11 +78,11 @@ _00EC: ScrCmd_02C 1 ScrCmd_04F SetFlag 223 - ScrCmd_028 0x4090, 1 + SetVar 0x4090, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x403F, 0x262 + SetVar 0x403F, 0x262 ScrCmd_161 ScrCmd_06D 28, 48 ScrCmd_061 @@ -139,12 +139,12 @@ _0184: _0190: ScrCmd_060 - ScrCmd_05E 0xFF, _0274 - ScrCmd_05E 28, _02DC - ScrCmd_05F + ApplyMovement 0xFF, _0274 + ApplyMovement 28, _02DC + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_028 0x4090, 0 + SetVar 0x4090, 0 ScrCmd_162 ScrCmd_06D 28, 14 ScrCmd_069 0x8004, 0x8005 @@ -163,33 +163,33 @@ _0190: End _020D: - ScrCmd_05E 28, _0284 - ScrCmd_05F + ApplyMovement 28, _0284 + WaitMovement GoTo _026D _021D: - ScrCmd_05E 28, _0294 - ScrCmd_05F + ApplyMovement 28, _0294 + WaitMovement GoTo _026D _022D: - ScrCmd_05E 28, _02A4 - ScrCmd_05F + ApplyMovement 28, _02A4 + WaitMovement GoTo _026D _023D: - ScrCmd_05E 28, _02B4 - ScrCmd_05F + ApplyMovement 28, _02B4 + WaitMovement GoTo _026D _024D: - ScrCmd_05E 28, _02BC - ScrCmd_05F + ApplyMovement 28, _02BC + WaitMovement GoTo _026D _025D: - ScrCmd_05E 28, _02CC - ScrCmd_05F + ApplyMovement 28, _02CC + WaitMovement GoTo _026D _026D: @@ -259,9 +259,9 @@ _02E4: ScrCmd_060 ScrCmd_162 ScrCmd_06D 28, 14 - ScrCmd_05E 0xFF, _03B4 - ScrCmd_05E 28, _03E0 - ScrCmd_05F + ApplyMovement 0xFF, _03B4 + ApplyMovement 28, _03E0 + WaitMovement ScrCmd_02C 5 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -276,33 +276,33 @@ _02E4: End _0341: - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05E 28, _03EC - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + ApplyMovement 28, _03EC + WaitMovement GoTo _03A1 _0359: - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05E 28, _0400 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + ApplyMovement 28, _0400 + WaitMovement GoTo _03A1 _0371: - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05E 28, _0414 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + ApplyMovement 28, _0414 + WaitMovement GoTo _03A1 _0389: - ScrCmd_05E 0xFF, _03D0 - ScrCmd_05E 28, _0428 - ScrCmd_05F + ApplyMovement 0xFF, _03D0 + ApplyMovement 28, _0428 + WaitMovement GoTo _03A1 _03A1: ScrCmd_065 28 SetFlag 230 - ScrCmd_028 0x4090, 2 + SetVar 0x4090, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0273.s b/res/field/scripts/script_0273.s index 33205826b2..416e43ba97 100644 --- a/res/field/scripts/script_0273.s +++ b/res/field/scripts/script_0273.s @@ -32,7 +32,7 @@ _0020: ScrCmd_049 0x643 ScrCmd_003 30, 0x800C ScrCmd_253 0 - ScrCmd_028 0x40F3, 1 + SetVar 0x40F3, 1 SetFlag 0x995 ScrCmd_050 0x42D ScrCmd_034 @@ -69,7 +69,7 @@ _008D: ScrCmd_04F ScrCmd_034 ScrCmd_061 - ScrCmd_028 0x40F3, 1 + SetVar 0x40F3, 1 Call _01C0 End @@ -85,7 +85,7 @@ _00B9: End _00D9: - ScrCmd_028 0x40F3, 2 + SetVar 0x40F3, 2 ScrCmd_061 Call _01C0 End @@ -97,14 +97,14 @@ _00E9: ScrCmd_034 CompareVarToValue 0x800C, 0 GoToIf 1, _0114 - ScrCmd_028 0x40F3, 2 + SetVar 0x40F3, 2 ScrCmd_061 Call _01C0 End _0114: - ScrCmd_05E 0xFF, _0124 - ScrCmd_05F + ApplyMovement 0xFF, _0124 + WaitMovement ScrCmd_061 End @@ -121,14 +121,14 @@ _012C: ScrCmd_034 CompareVarToValue 0x800C, 0 GoToIf 1, _0159 - ScrCmd_028 0x40F3, 2 + SetVar 0x40F3, 2 ScrCmd_061 Call _01C0 End _0159: - ScrCmd_05E 0, _0168 - ScrCmd_05F + ApplyMovement 0, _0168 + WaitMovement ScrCmd_061 End @@ -148,19 +148,19 @@ _0170: ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_031 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _01A5: ScrCmd_0CD 0 ScrCmd_02C 3 ScrCmd_031 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _01B5: ScrCmd_02C 1 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _01C0: diff --git a/res/field/scripts/script_0274.s b/res/field/scripts/script_0274.s index fabd7d13d9..26c9eeda03 100644 --- a/res/field/scripts/script_0274.s +++ b/res/field/scripts/script_0274.s @@ -82,17 +82,17 @@ _011C: _0126: ScrCmd_060 - ScrCmd_028 0x8001, 1 - ScrCmd_05E 0xFF, _03B0 - ScrCmd_05F + SetVar 0x8001, 1 + ApplyMovement 0xFF, _03B0 + WaitMovement GoTo _015A End _0140: ScrCmd_060 - ScrCmd_028 0x8001, 2 - ScrCmd_05E 0xFF, _03B8 - ScrCmd_05F + SetVar 0x8001, 2 + ApplyMovement 0xFF, _03B8 + WaitMovement GoTo _015A End @@ -104,35 +104,35 @@ _015A: End _0174: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 GoTo _0994 End _0182: ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + WaitMovement ScrCmd_061 End _0195: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 GoTo _0ACC End _01A3: ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + WaitMovement ScrCmd_061 End _01B6: - ScrCmd_028 0x400A, 0 + SetVar 0x400A, 0 ScrCmd_177 0x400B - ScrCmd_028 0x400C, 0 + SetVar 0x400C, 0 GoTo _01CE End @@ -154,7 +154,7 @@ _01CE: End _0229: - ScrCmd_026 0x400C, 1 + AddVar 0x400C, 1 ScrCmd_02C 2 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -163,7 +163,7 @@ _0229: End _024B: - ScrCmd_026 0x400C, 1 + AddVar 0x400C, 1 ScrCmd_02C 4 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -172,14 +172,14 @@ _024B: End _026D: - ScrCmd_026 0x400A, 1 - ScrCmd_027 0x400B, 1 + AddVar 0x400A, 1 + SubVar 0x400B, 1 CompareVarToValue 0x400B, 0 GoToIf 5, _01CE ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + WaitMovement ScrCmd_061 End @@ -187,7 +187,7 @@ _0299: ScrCmd_14E ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD - ScrCmd_029 0x409D, 0x400A + SetVar 0x409D, 0x400A ScrCmd_198 0x400A, 0x409A GoTo _0E48 End @@ -205,15 +205,15 @@ _02C9: CallIf 1, _0338 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x4099, 1 + SetVar 0x4099, 1 ScrCmd_215 Call _03DC ScrCmd_27C 0, 0x409D ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 0xFF, _03C8 - ScrCmd_05E 0x8002, _03C8 - ScrCmd_05F + ApplyMovement 0xFF, _03C8 + ApplyMovement 0x8002, _03C8 + WaitMovement ScrCmd_161 ScrCmd_06D 0x8002, 48 ScrCmd_061 @@ -275,11 +275,11 @@ _037D: _0389: ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x4099, 0 + SetVar 0x4099, 0 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + WaitMovement ScrCmd_061 End @@ -327,11 +327,11 @@ _03DC: End _040A: - ScrCmd_028 0x409B, 0 + SetVar 0x409B, 0 Return _0412: - ScrCmd_028 0x409B, 1 + SetVar 0x409B, 1 Return _041A: @@ -356,43 +356,43 @@ _041A: End _0490: - ScrCmd_028 0x409F, 176 + SetVar 0x409F, 176 Return _0498: - ScrCmd_028 0x409F, 175 + SetVar 0x409F, 175 Return _04A0: - ScrCmd_028 0x409F, 177 + SetVar 0x409F, 177 Return _04A8: - ScrCmd_028 0x409F, 178 + SetVar 0x409F, 178 Return _04B0: - ScrCmd_028 0x409F, 179 + SetVar 0x409F, 179 Return _04B8: - ScrCmd_028 0x409F, 180 + SetVar 0x409F, 180 Return _04C0: - ScrCmd_028 0x409F, 181 + SetVar 0x409F, 181 Return _04C8: - ScrCmd_028 0x409F, 182 + SetVar 0x409F, 182 Return _04D0: - ScrCmd_028 0x409F, 183 + SetVar 0x409F, 183 Return _04D8: - ScrCmd_029 0x8000, 0x409B + SetVar 0x8000, 0x409B ScrCmd_215 Call _03DC CompareVarToValue 0x8000, 0 @@ -401,8 +401,8 @@ _04D8: End _04FB: - ScrCmd_029 0x8004, 0x409F - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x409F + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0595 @@ -410,8 +410,8 @@ _04FB: End _0524: - ScrCmd_029 0x8004, 0x409F - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x409F + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _05DD @@ -430,8 +430,8 @@ _054D: End _056C: - ScrCmd_029 0x8004, 0x409C - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x409C + SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0524 @@ -439,8 +439,8 @@ _056C: End _0595: - ScrCmd_029 0x8004, 0x409C - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x409C + SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _05DD @@ -612,12 +612,12 @@ _07E7: End _07F2: - ScrCmd_028 0x400A, 0 + SetVar 0x400A, 0 GoTo _080E End _0800: - ScrCmd_028 0x400A, 1 + SetVar 0x400A, 1 GoTo _080E End @@ -671,16 +671,16 @@ _089D: _08A2: ScrCmd_031 ScrCmd_034 - ScrCmd_05E 0, _08C8 - ScrCmd_05F + ApplyMovement 0, _08C8 + WaitMovement ScrCmd_061 End _08B4: ScrCmd_031 ScrCmd_034 - ScrCmd_05E 1, _08D0 - ScrCmd_05F + ApplyMovement 1, _08D0 + WaitMovement ScrCmd_061 End @@ -933,11 +933,11 @@ _0C50: GoToIf 1, _0D2E CompareVarToValue 0x800C, 0x18B GoToIf 1, _0D2E - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0D2E: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0D36: @@ -982,11 +982,11 @@ _0D36: GoToIf 1, _0D2E CompareVarToValue 0x800C, 0x18B GoToIf 1, _0D2E - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0E48: - ScrCmd_029 0x8008, 0x409A + SetVar 0x8008, 0x409A CompareVarToValue 0x8008, 25 GoToIf 1, _0F5A CompareVarToValue 0x8008, 0xFF @@ -1031,107 +1031,107 @@ _0E48: End _0F5A: - ScrCmd_028 0x4020, 71 + SetVar 0x4020, 71 GoTo _1072 End _0F68: - ScrCmd_028 0x4020, 78 + SetVar 0x4020, 78 GoTo _1072 End _0F76: - ScrCmd_028 0x4020, 72 + SetVar 0x4020, 72 GoTo _1072 End _0F84: - ScrCmd_028 0x4020, 74 + SetVar 0x4020, 74 GoTo _1072 End _0F92: - ScrCmd_028 0x4020, 204 + SetVar 0x4020, 204 GoTo _1072 End _0FA0: - ScrCmd_028 0x4020, 185 + SetVar 0x4020, 185 GoTo _1072 End _0FAE: - ScrCmd_028 0x4020, 206 + SetVar 0x4020, 206 GoTo _1072 End _0FBC: - ScrCmd_028 0x4020, 207 + SetVar 0x4020, 207 GoTo _1072 End _0FCA: - ScrCmd_028 0x4020, 73 + SetVar 0x4020, 73 GoTo _1072 End _0FD8: - ScrCmd_028 0x4020, 79 + SetVar 0x4020, 79 GoTo _1072 End _0FE6: - ScrCmd_028 0x4020, 205 + SetVar 0x4020, 205 GoTo _1072 End _0FF4: - ScrCmd_028 0x4020, 220 + SetVar 0x4020, 220 GoTo _1072 End _1002: - ScrCmd_028 0x4020, 221 + SetVar 0x4020, 221 GoTo _1072 End _1010: - ScrCmd_028 0x4020, 222 + SetVar 0x4020, 222 GoTo _1072 End _101E: - ScrCmd_028 0x4020, 223 + SetVar 0x4020, 223 GoTo _1072 End _102C: - ScrCmd_028 0x4020, 224 + SetVar 0x4020, 224 GoTo _1072 End _103A: - ScrCmd_028 0x4020, 225 + SetVar 0x4020, 225 GoTo _1072 End _1048: - ScrCmd_028 0x4020, 226 + SetVar 0x4020, 226 GoTo _1072 End _1056: - ScrCmd_028 0x4020, 227 + SetVar 0x4020, 227 GoTo _1072 End _1064: - ScrCmd_028 0x4020, 228 + SetVar 0x4020, 228 GoTo _1072 End _1072: - ScrCmd_028 0x8002, 5 + SetVar 0x8002, 5 ClearFlag 0x2A1 GoTo _02C9 End @@ -1167,7 +1167,7 @@ _10E1: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _1161 - ScrCmd_028 0x8005, 5 + SetVar 0x8005, 5 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _1172 @@ -1186,7 +1186,7 @@ _1136: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _1161 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF GoTo _117C End @@ -1220,137 +1220,137 @@ _117C: End _118B: - ScrCmd_028 0x8003, 1 + SetVar 0x8003, 1 GoTo _1305 End _1199: - ScrCmd_028 0x8003, 2 + SetVar 0x8003, 2 GoTo _1305 End _11A7: - ScrCmd_028 0x8003, 3 + SetVar 0x8003, 3 GoTo _1305 End _11B5: - ScrCmd_028 0x8003, 4 + SetVar 0x8003, 4 GoTo _1305 End _11C3: - ScrCmd_028 0x8003, 5 + SetVar 0x8003, 5 GoTo _1305 End _11D1: - ScrCmd_028 0x8003, 6 + SetVar 0x8003, 6 GoTo _1305 End _11DF: - ScrCmd_028 0x8003, 7 + SetVar 0x8003, 7 GoTo _1305 End _11ED: - ScrCmd_028 0x8003, 8 + SetVar 0x8003, 8 GoTo _1305 End _11FB: - ScrCmd_028 0x8003, 9 + SetVar 0x8003, 9 GoTo _1305 End _1209: - ScrCmd_028 0x8003, 10 + SetVar 0x8003, 10 GoTo _1305 End _1217: - ScrCmd_028 0x8003, 11 + SetVar 0x8003, 11 GoTo _1305 End _1225: - ScrCmd_028 0x8003, 12 + SetVar 0x8003, 12 GoTo _1305 End _1233: - ScrCmd_028 0x8003, 13 + SetVar 0x8003, 13 GoTo _1305 End _1241: - ScrCmd_028 0x8003, 14 + SetVar 0x8003, 14 GoTo _1305 End _124F: - ScrCmd_028 0x8003, 15 + SetVar 0x8003, 15 GoTo _1305 End _125D: - ScrCmd_028 0x8003, 16 + SetVar 0x8003, 16 GoTo _1305 End _126B: - ScrCmd_028 0x8003, 17 + SetVar 0x8003, 17 GoTo _1305 End _1279: - ScrCmd_028 0x8003, 18 + SetVar 0x8003, 18 GoTo _1305 End _1287: - ScrCmd_028 0x8003, 19 + SetVar 0x8003, 19 GoTo _1305 End _1295: - ScrCmd_028 0x8003, 20 + SetVar 0x8003, 20 GoTo _1305 End _12A3: - ScrCmd_028 0x8003, 21 + SetVar 0x8003, 21 GoTo _1305 End _12B1: - ScrCmd_028 0x8003, 22 + SetVar 0x8003, 22 GoTo _1305 End _12BF: - ScrCmd_028 0x8003, 23 + SetVar 0x8003, 23 GoTo _1305 End _12CD: - ScrCmd_028 0x8003, 24 + SetVar 0x8003, 24 GoTo _1305 End _12DB: - ScrCmd_028 0x8003, 25 + SetVar 0x8003, 25 GoTo _1305 End _12E9: - ScrCmd_028 0x8003, 26 + SetVar 0x8003, 26 GoTo _1305 End _12F7: - ScrCmd_028 0x8003, 27 + SetVar 0x8003, 27 GoTo _1305 End @@ -1361,8 +1361,8 @@ _1305: ScrCmd_003 1, 0x800C ScrCmd_32D ScrCmd_338 - ScrCmd_05E 5, _1758 - ScrCmd_05F + ApplyMovement 5, _1758 + WaitMovement ScrCmd_049 0x632 CompareVarToValue 0x8003, 1 CallIf 1, _14C2 @@ -1418,185 +1418,185 @@ _1305: CallIf 1, _171A CompareVarToValue 0x8003, 27 CallIf 1, _1732 - ScrCmd_05E 0xFF, _1764 - ScrCmd_05F + ApplyMovement 0xFF, _1764 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_05E 5, _1764 - ScrCmd_05F + ApplyMovement 5, _1764 + WaitMovement ScrCmd_061 - ScrCmd_05E 0xFF, _1770 - ScrCmd_05F + ApplyMovement 0xFF, _1770 + WaitMovement ScrCmd_32E ScrCmd_339 ScrCmd_003 2, 0x800C End _14C2: - ScrCmd_05E 0xFF, _1778 - ScrCmd_05F + ApplyMovement 0xFF, _1778 + WaitMovement ScrCmd_187 5, 35, 2, 15, 1 Return _14DA: - ScrCmd_05E 0xFF, _1780 - ScrCmd_05F + ApplyMovement 0xFF, _1780 + WaitMovement ScrCmd_187 5, 35, 2, 15, 1 Return _14F2: - ScrCmd_05E 0xFF, _178C - ScrCmd_05F + ApplyMovement 0xFF, _178C + WaitMovement ScrCmd_187 5, 35, 2, 15, 1 Return _150A: - ScrCmd_05E 0xFF, _1798 - ScrCmd_05F + ApplyMovement 0xFF, _1798 + WaitMovement ScrCmd_187 5, 17, 2, 16, 1 Return _1522: - ScrCmd_05E 0xFF, _17A4 - ScrCmd_05F + ApplyMovement 0xFF, _17A4 + WaitMovement ScrCmd_187 5, 17, 2, 16, 1 Return _153A: - ScrCmd_05E 0xFF, _17B0 - ScrCmd_05F + ApplyMovement 0xFF, _17B0 + WaitMovement ScrCmd_187 5, 17, 2, 16, 1 Return _1552: - ScrCmd_05E 0xFF, _17BC - ScrCmd_05F + ApplyMovement 0xFF, _17BC + WaitMovement ScrCmd_187 5, 47, 4, 8, 1 Return _156A: - ScrCmd_05E 0xFF, _17C8 - ScrCmd_05F + ApplyMovement 0xFF, _17C8 + WaitMovement ScrCmd_187 5, 33, 5, 7, 1 Return _1582: - ScrCmd_05E 0xFF, _17D4 - ScrCmd_05F + ApplyMovement 0xFF, _17D4 + WaitMovement ScrCmd_187 5, 15, 4, 10, 1 Return _159A: - ScrCmd_05E 0xFF, _17E0 - ScrCmd_05F + ApplyMovement 0xFF, _17E0 + WaitMovement ScrCmd_187 5, 52, 4, 25, 1 Return _15B2: - ScrCmd_05E 0xFF, _17EC - ScrCmd_05F + ApplyMovement 0xFF, _17EC + WaitMovement ScrCmd_187 5, 15, 4, 10, 1 Return _15CA: - ScrCmd_05E 0xFF, _17F8 - ScrCmd_05F + ApplyMovement 0xFF, _17F8 + WaitMovement ScrCmd_187 5, 33, 5, 7, 1 Return _15E2: - ScrCmd_05E 0xFF, _1804 - ScrCmd_05F + ApplyMovement 0xFF, _1804 + WaitMovement ScrCmd_187 5, 52, 4, 25, 1 Return _15FA: - ScrCmd_05E 0xFF, _1810 - ScrCmd_05F + ApplyMovement 0xFF, _1810 + WaitMovement ScrCmd_187 5, 26, 6, 9, 1 Return _1612: - ScrCmd_05E 0xFF, _181C - ScrCmd_05F + ApplyMovement 0xFF, _181C + WaitMovement ScrCmd_187 5, 41, 3, 16, 1 Return _162A: - ScrCmd_05E 0xFF, _1828 - ScrCmd_05F + ApplyMovement 0xFF, _1828 + WaitMovement ScrCmd_187 5, 52, 4, 25, 1 Return _1642: - ScrCmd_05E 0xFF, _1834 - ScrCmd_05F + ApplyMovement 0xFF, _1834 + WaitMovement ScrCmd_187 5, 41, 3, 16, 1 Return _165A: - ScrCmd_05E 0xFF, _1840 - ScrCmd_05F + ApplyMovement 0xFF, _1840 + WaitMovement ScrCmd_187 5, 26, 6, 9, 1 Return _1672: - ScrCmd_05E 0xFF, _184C - ScrCmd_05F + ApplyMovement 0xFF, _184C + WaitMovement ScrCmd_187 5, 47, 4, 8, 1 Return _168A: - ScrCmd_05E 0xFF, _1854 - ScrCmd_05F + ApplyMovement 0xFF, _1854 + WaitMovement ScrCmd_187 5, 47, 2, 34, 1 Return _16A2: - ScrCmd_05E 0xFF, _1860 - ScrCmd_05F + ApplyMovement 0xFF, _1860 + WaitMovement ScrCmd_187 5, 15, 4, 10, 1 Return _16BA: - ScrCmd_05E 0xFF, _186C - ScrCmd_05F + ApplyMovement 0xFF, _186C + WaitMovement ScrCmd_187 5, 47, 4, 8, 1 Return _16D2: - ScrCmd_05E 0xFF, _1878 - ScrCmd_05F + ApplyMovement 0xFF, _1878 + WaitMovement ScrCmd_187 5, 33, 5, 7, 1 Return _16EA: - ScrCmd_05E 0xFF, _1884 - ScrCmd_05F + ApplyMovement 0xFF, _1884 + WaitMovement ScrCmd_187 5, 47, 2, 34, 1 Return _1702: - ScrCmd_05E 0xFF, _1890 - ScrCmd_05F + ApplyMovement 0xFF, _1890 + WaitMovement ScrCmd_187 5, 52, 4, 25, 1 Return _171A: - ScrCmd_05E 0xFF, _189C - ScrCmd_05F + ApplyMovement 0xFF, _189C + WaitMovement ScrCmd_187 5, 15, 4, 10, 1 Return _1732: - ScrCmd_05E 0xFF, _18A8 - ScrCmd_05F + ApplyMovement 0xFF, _18A8 + WaitMovement ScrCmd_187 5, 33, 5, 7, 1 Return _174A: ScrCmd_060 - ScrCmd_028 0x40AC, 0 + SetVar 0x40AC, 0 ScrCmd_061 End diff --git a/res/field/scripts/script_0277.s b/res/field/scripts/script_0277.s index ff56b5653a..7f69557cbd 100644 --- a/res/field/scripts/script_0277.s +++ b/res/field/scripts/script_0277.s @@ -90,21 +90,21 @@ _00B4: _00CC: ScrCmd_02C 0 ScrCmd_02C 1 - ScrCmd_05E 0, _0074 - ScrCmd_05E 1, _0074 - ScrCmd_05F + ApplyMovement 0, _0074 + ApplyMovement 1, _0074 + WaitMovement ScrCmd_02C 2 ScrCmd_02C 3 ScrCmd_034 Return _00EE: - ScrCmd_05E 0, _0080 - ScrCmd_05F + ApplyMovement 0, _0080 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 0, _0088 - ScrCmd_05F + ApplyMovement 0, _0088 + WaitMovement ScrCmd_02C 5 ScrCmd_034 Return @@ -116,7 +116,7 @@ _010E: ScrCmd_0BD ScrCmd_065 0 ScrCmd_065 1 - ScrCmd_028 0x40E9, 1 + SetVar 0x40E9, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ClearFlag 0x19E @@ -128,13 +128,13 @@ _010E: CallIf 1, _01C6 ScrCmd_065 3 ScrCmd_02C 7 - ScrCmd_028 0x8004, 0x1B6 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B6 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 159 ScrCmd_02C 8 - ScrCmd_028 0x8004, 94 - ScrCmd_028 0x8005, 10 + SetVar 0x8004, 94 + SetVar 0x8005, 10 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01AD @@ -151,13 +151,13 @@ _01B0: Return _01BA: - ScrCmd_05E 2, _00A0 - ScrCmd_05F + ApplyMovement 2, _00A0 + WaitMovement Return _01C6: - ScrCmd_05E 2, _00B4 - ScrCmd_05F + ApplyMovement 2, _00B4 + WaitMovement Return .byte 235 @@ -186,7 +186,7 @@ _01F3: ScrCmd_042 16, 1 ScrCmd_042 17, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0241 CompareVarToValue 0x8008, 1 @@ -200,8 +200,8 @@ _0241: ScrCmd_071 0x800C, 100 CompareVarToValue 0x800C, 0 GoToIf 1, _02E2 - ScrCmd_028 0x8005, 1 - ScrCmd_028 0x8006, 100 + SetVar 0x8005, 1 + SetVar 0x8006, 100 GoTo _0293 End @@ -209,13 +209,13 @@ _026A: ScrCmd_071 0x800C, 0x3E8 CompareVarToValue 0x800C, 0 GoToIf 1, _02E2 - ScrCmd_028 0x8005, 10 - ScrCmd_028 0x8006, 0x3E8 + SetVar 0x8005, 10 + SetVar 0x8006, 0x3E8 GoTo _0293 End _0293: - ScrCmd_028 0x8004, 94 + SetVar 0x8004, 94 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _02D5 @@ -265,8 +265,8 @@ _0306: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 0x1B6 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B6 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_034 SetFlag 159 diff --git a/res/field/scripts/script_0279.s b/res/field/scripts/script_0279.s index a6e0125b2d..36273bedce 100644 --- a/res/field/scripts/script_0279.s +++ b/res/field/scripts/script_0279.s @@ -28,8 +28,8 @@ _003A: CheckFlag 147 GoToIf 1, _0064 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1A9 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A9 + SetVar 0x8005, 1 ScrCmd_014 0x7FC Call _006F GoTo _0064 @@ -43,17 +43,17 @@ _0064: _006F: SetFlag 147 - ScrCmd_028 0x4093, 2 + SetVar 0x4093, 2 Return _007B: ScrCmd_060 - ScrCmd_05E 10, _00C0 - ScrCmd_05E 0xFF, _00B4 - ScrCmd_05F + ApplyMovement 10, _00C0 + ApplyMovement 0xFF, _00B4 + WaitMovement ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1A9 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A9 + SetVar 0x8005, 1 ScrCmd_014 0x7FC Call _006F ScrCmd_02C 1 diff --git a/res/field/scripts/script_0281.s b/res/field/scripts/script_0281.s index 0caed6b56e..2264093d38 100644 --- a/res/field/scripts/script_0281.s +++ b/res/field/scripts/script_0281.s @@ -51,35 +51,35 @@ _0098: End _00A3: - ScrCmd_05E 0, _010C - ScrCmd_05F + ApplyMovement 0, _010C + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0, _0118 - ScrCmd_05F + ApplyMovement 0, _0118 + WaitMovement Return _00BD: - ScrCmd_05E 0xFF, _0120 - ScrCmd_05F + ApplyMovement 0xFF, _0120 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _0118 - ScrCmd_05F + ApplyMovement 0xFF, _0118 + WaitMovement Return _00D7: - ScrCmd_05E 0xFF, _0130 - ScrCmd_05F + ApplyMovement 0xFF, _0130 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _0118 - ScrCmd_05F + ApplyMovement 0xFF, _0118 + WaitMovement Return _00F1: - ScrCmd_05E 0xFF, _013C - ScrCmd_05F + ApplyMovement 0xFF, _013C + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _0118 - ScrCmd_05F + ApplyMovement 0xFF, _0118 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0282.s b/res/field/scripts/script_0282.s index 1f9f1f1dcd..1d5820c6aa 100644 --- a/res/field/scripts/script_0282.s +++ b/res/field/scripts/script_0282.s @@ -38,14 +38,14 @@ _000C: End _0074: - ScrCmd_028 0x4058, 0 + SetVar 0x4058, 0 ScrCmd_061 End _007E: ScrCmd_186 1, 16, 14 - ScrCmd_05E 0, _0094 - ScrCmd_05F + ApplyMovement 0, _0094 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0283.s b/res/field/scripts/script_0283.s index 2f5ec4b66d..10ad11bb64 100644 --- a/res/field/scripts/script_0283.s +++ b/res/field/scripts/script_0283.s @@ -22,30 +22,30 @@ _0018: _002F: ScrCmd_060 - ScrCmd_05E 6, _00A4 - ScrCmd_05E 7, _00E0 - ScrCmd_05F + ApplyMovement 6, _00A4 + ApplyMovement 7, _00E0 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 6, _00AC - ScrCmd_05E 7, _00EC - ScrCmd_05F - ScrCmd_05E 7, _0100 - ScrCmd_05F + ApplyMovement 6, _00AC + ApplyMovement 7, _00EC + WaitMovement + ApplyMovement 7, _0100 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 6, _00C4 - ScrCmd_05F + ApplyMovement 6, _00C4 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 6, _00D4 - ScrCmd_05E 7, _0108 - ScrCmd_05F + ApplyMovement 6, _00D4 + ApplyMovement 7, _0108 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 6 ScrCmd_065 7 ScrCmd_04B 0x603 - ScrCmd_028 0x40A0, 1 + SetVar 0x40A0, 1 ScrCmd_061 End @@ -115,31 +115,31 @@ _0118: ScrCmd_034 ScrCmd_003 15, 0x800C ScrCmd_02C 4 - ScrCmd_05E 5, _01F0 - ScrCmd_05F + ApplyMovement 5, _01F0 + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 5, _01F8 - ScrCmd_05F - ScrCmd_05E 4, _01CC - ScrCmd_05F + ApplyMovement 5, _01F8 + WaitMovement + ApplyMovement 4, _01CC + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 6 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 5, _0204 - ScrCmd_05E 4, _01DC - ScrCmd_05F + ApplyMovement 5, _0204 + ApplyMovement 4, _01DC + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 5, _0214 - ScrCmd_05E 0xFF, _0238 - ScrCmd_05F + ApplyMovement 5, _0214 + ApplyMovement 0xFF, _0238 + WaitMovement ScrCmd_065 5 - ScrCmd_05E 4, _01E8 - ScrCmd_05E 0xFF, _0240 - ScrCmd_05F + ApplyMovement 4, _01E8 + ApplyMovement 0xFF, _0240 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 8 ScrCmd_034 @@ -148,7 +148,7 @@ _0118: ScrCmd_065 4 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40A0, 3 + SetVar 0x40A0, 3 ScrCmd_061 End diff --git a/res/field/scripts/script_0284.s b/res/field/scripts/script_0284.s index 0a129e99bf..39ea38a402 100644 --- a/res/field/scripts/script_0284.s +++ b/res/field/scripts/script_0284.s @@ -13,26 +13,26 @@ _000A: _0014: ScrCmd_060 - ScrCmd_05E 0, _0158 - ScrCmd_05F + ApplyMovement 0, _0158 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0160 - ScrCmd_05F + ApplyMovement 0, _0160 + WaitMovement ScrCmd_0E5 0x39E, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0150 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _0168 - ScrCmd_05F - ScrCmd_05E 4, _01BC - ScrCmd_05F + ApplyMovement 0, _0168 + WaitMovement + ApplyMovement 4, _01BC + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 4, _01CC - ScrCmd_05F + ApplyMovement 4, _01CC + WaitMovement ScrCmd_0E5 0x39F, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 @@ -40,47 +40,47 @@ _0014: ScrCmd_02C 3 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0, _0174 - ScrCmd_05E 4, _01F4 - ScrCmd_05F + ApplyMovement 0, _0174 + ApplyMovement 4, _01F4 + WaitMovement ScrCmd_02C 4 - ScrCmd_05E 4, _01D4 - ScrCmd_05F + ApplyMovement 4, _01D4 + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 0, _017C - ScrCmd_05F + ApplyMovement 0, _017C + WaitMovement ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 0, _0190 - ScrCmd_05E 0xFF, _01A4 - ScrCmd_05F + ApplyMovement 0, _0190 + ApplyMovement 0xFF, _01A4 + WaitMovement ScrCmd_049 0x603 ScrCmd_04B 0x603 - ScrCmd_05E 4, _01DC - ScrCmd_05F + ApplyMovement 4, _01DC + WaitMovement ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 4, _01E4 - ScrCmd_05F + ApplyMovement 4, _01E4 + WaitMovement ScrCmd_049 0x603 ScrCmd_04B 0x603 - ScrCmd_05E 14, _0200 - ScrCmd_05E 0xFF, _01B4 - ScrCmd_05F + ApplyMovement 14, _0200 + ApplyMovement 0xFF, _01B4 + WaitMovement ScrCmd_02C 8 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 14, _0208 - ScrCmd_05E 15, _0210 - ScrCmd_05E 16, _021C - ScrCmd_05F + ApplyMovement 14, _0208 + ApplyMovement 15, _0210 + ApplyMovement 16, _021C + WaitMovement ScrCmd_065 14 ScrCmd_065 0 ScrCmd_065 4 ScrCmd_065 15 ScrCmd_065 16 - ScrCmd_028 0x40AD, 1 + SetVar 0x40AD, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0285.s b/res/field/scripts/script_0285.s index 95c266907f..111bba3047 100644 --- a/res/field/scripts/script_0285.s +++ b/res/field/scripts/script_0285.s @@ -16,7 +16,7 @@ _001A: End _0029: - ScrCmd_028 0x4094, 0 + SetVar 0x4094, 0 End _0031: @@ -31,11 +31,11 @@ _0031: ScrCmd_02C 1 ScrCmd_04F SetFlag 221 - ScrCmd_028 0x4094, 1 + SetVar 0x4094, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x403F, 0x263 + SetVar 0x403F, 0x263 ScrCmd_161 ScrCmd_06D 14, 48 ScrCmd_061 @@ -50,10 +50,10 @@ _007D: ScrCmd_188 14, 14 ClearFlag 0x1DA ScrCmd_064 14 - ScrCmd_05E 14, _00DC - ScrCmd_05F - ScrCmd_05E 0xFF, _00EC - ScrCmd_05F + ApplyMovement 14, _00DC + WaitMovement + ApplyMovement 0xFF, _00EC + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 @@ -63,8 +63,8 @@ _00B7: ScrCmd_186 14, 42, 68 ScrCmd_189 14, 0 ScrCmd_188 14, 14 - ScrCmd_05E 14, _0144 - ScrCmd_05F + ApplyMovement 14, _0144 + WaitMovement ScrCmd_02C 3 Return @@ -98,16 +98,16 @@ _00EC: _00FC: ScrCmd_060 - ScrCmd_05E 14, _014C - ScrCmd_05E 0xFF, _0134 - ScrCmd_05F + ApplyMovement 14, _014C + ApplyMovement 0xFF, _0134 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_028 0x4094, 0 + SetVar 0x4094, 0 ScrCmd_162 ScrCmd_06D 14, 15 - ScrCmd_05E 14, _013C - ScrCmd_05F + ApplyMovement 14, _013C + WaitMovement ScrCmd_061 End @@ -142,32 +142,32 @@ _0154: End _0177: - ScrCmd_05E 14, _01F0 - ScrCmd_05E 0xFF, _01E4 - ScrCmd_05F + ApplyMovement 14, _01F0 + ApplyMovement 0xFF, _01E4 + WaitMovement GoTo _01AB End _0191: - ScrCmd_05E 14, _01FC - ScrCmd_05E 0xFF, _01E4 - ScrCmd_05F + ApplyMovement 14, _01FC + ApplyMovement 0xFF, _01E4 + WaitMovement GoTo _01AB End _01AB: - ScrCmd_05E 14, _0204 - ScrCmd_05F + ApplyMovement 14, _0204 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 14, _0214 - ScrCmd_05F + ApplyMovement 14, _0214 + WaitMovement ScrCmd_04B 0x5DC ScrCmd_049 0x603 ScrCmd_065 14 ScrCmd_04B 0x603 - ScrCmd_028 0x4094, 2 + SetVar 0x4094, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0286.s b/res/field/scripts/script_0286.s index b1ed157b08..533195acf9 100644 --- a/res/field/scripts/script_0286.s +++ b/res/field/scripts/script_0286.s @@ -10,7 +10,7 @@ .short 0xFD13 _0016: - ScrCmd_029 0x4000, 0x409E + SetVar 0x4000, 0x409E CompareVarToValue 0x409E, 1 CallIf 4, _0031 Call _0037 @@ -111,7 +111,7 @@ _00E6: ScrCmd_04B 0x5DC CheckFlag 215 CallIf 0, _0174 - ScrCmd_028 0x409E, 2 + SetVar 0x409E, 2 ScrCmd_04C 0x1E5, 0 ScrCmd_02C 15 ScrCmd_034 @@ -143,7 +143,7 @@ _015D: End _0168: - ScrCmd_028 0x409E, 1 + SetVar 0x409E, 1 ScrCmd_0EB ScrCmd_061 End @@ -193,15 +193,15 @@ _019C: ScrCmd_049 0x65C ScrCmd_29F 0 ScrCmd_04A 0x65C - ScrCmd_05E 2, _03A4 - ScrCmd_05E 0xFF, _0388 - ScrCmd_05F - ScrCmd_05E 2, _00B4 - ScrCmd_05F + ApplyMovement 2, _03A4 + ApplyMovement 0xFF, _0388 + WaitMovement + ApplyMovement 2, _00B4 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 5, _03B0 - ScrCmd_05F + ApplyMovement 5, _03B0 + WaitMovement ScrCmd_065 3 ScrCmd_02C 2 ScrCmd_02C 3 @@ -210,12 +210,12 @@ _019C: ScrCmd_034 ClearFlag 0x232 ScrCmd_064 0 - ScrCmd_05E 0, _0490 - ScrCmd_05F - ScrCmd_05E 5, _03C0 - ScrCmd_05E 9, _0434 - ScrCmd_05E 10, _043C - ScrCmd_05F + ApplyMovement 0, _0490 + WaitMovement + ApplyMovement 5, _03C0 + ApplyMovement 9, _0434 + ApplyMovement 10, _043C + WaitMovement ScrCmd_02C 4 ScrCmd_034 ScrCmd_003 15, 0x800C @@ -228,60 +228,60 @@ _019C: ScrCmd_014 0x807 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 4, _04A8 - ScrCmd_05E 9, _0408 - ScrCmd_05E 10, _0418 - ScrCmd_05F + ApplyMovement 4, _04A8 + ApplyMovement 9, _0408 + ApplyMovement 10, _0418 + WaitMovement ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 9, _0444 - ScrCmd_05F + ApplyMovement 9, _0444 + WaitMovement ScrCmd_02C 8 - ScrCmd_05E 10, _044C - ScrCmd_05F + ApplyMovement 10, _044C + WaitMovement ScrCmd_02C 9 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 9, _0454 - ScrCmd_05E 10, _045C - ScrCmd_05F + ApplyMovement 9, _0454 + ApplyMovement 10, _045C + WaitMovement ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 9, _0464 - ScrCmd_05E 10, _047C - ScrCmd_05E 0xFF, _0390 - ScrCmd_05F - ScrCmd_05E 5, _03D8 - ScrCmd_05F + ApplyMovement 9, _0464 + ApplyMovement 10, _047C + ApplyMovement 0xFF, _0390 + WaitMovement + ApplyMovement 5, _03D8 + WaitMovement ScrCmd_02C 11 ScrCmd_02C 12 ScrCmd_034 ClearFlag 0x230 ScrCmd_064 7 - ScrCmd_05E 7, _04C8 - ScrCmd_05F + ApplyMovement 7, _04C8 + WaitMovement ScrCmd_064 8 - ScrCmd_05E 8, _04FC - ScrCmd_05F + ApplyMovement 8, _04FC + WaitMovement ScrCmd_02C 13 ScrCmd_034 - ScrCmd_05E 5, _03E0 - ScrCmd_05E 4, _04B4 - ScrCmd_05F - ScrCmd_05E 5, _03EC - ScrCmd_05E 7, _04E0 - ScrCmd_05E 8, _0510 - ScrCmd_05F + ApplyMovement 5, _03E0 + ApplyMovement 4, _04B4 + WaitMovement + ApplyMovement 5, _03EC + ApplyMovement 7, _04E0 + ApplyMovement 8, _0510 + WaitMovement ScrCmd_065 5 ScrCmd_065 7 ScrCmd_065 8 ScrCmd_0CD 0 ScrCmd_02C 14 ScrCmd_034 - ScrCmd_028 0x40A0, 2 + SetVar 0x40A0, 2 SetFlag 0x1DB SetFlag 0x231 - ScrCmd_028 0x409E, 1 + SetVar 0x409E, 1 SetFlag 214 ClearFlag 0x1A3 ClearFlag 0x1D9 diff --git a/res/field/scripts/script_0288.s b/res/field/scripts/script_0288.s index ff1618f11c..bc8e276561 100644 --- a/res/field/scripts/script_0288.s +++ b/res/field/scripts/script_0288.s @@ -22,20 +22,20 @@ _0021: ScrCmd_2B5 0x10A, 0x2FA, 0x2CA ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _00A0 - ScrCmd_05F - ScrCmd_05E 0xFF, _0098 - ScrCmd_05F + ApplyMovement 0, _00A0 + WaitMovement + ApplyMovement 0xFF, _0098 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _00B8 - ScrCmd_05F + ApplyMovement 0, _00B8 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x40AA, 2 - ScrCmd_028 0x40A6, 2 + SetVar 0x40AA, 2 + SetVar 0x40A6, 2 SetFlag 0x1C7 ClearFlag 0x132 SetFlag 0x28F diff --git a/res/field/scripts/script_0289.s b/res/field/scripts/script_0289.s index deed519731..fd5c26361f 100644 --- a/res/field/scripts/script_0289.s +++ b/res/field/scripts/script_0289.s @@ -13,8 +13,8 @@ _000A: End _001C: - ScrCmd_028 0x410B, 0 - ScrCmd_028 0x410C, 0 + SetVar 0x410B, 0 + SetVar 0x410C, 0 Return _002A: diff --git a/res/field/scripts/script_0290.s b/res/field/scripts/script_0290.s index f0771ec196..341a576ad8 100644 --- a/res/field/scripts/script_0290.s +++ b/res/field/scripts/script_0290.s @@ -12,15 +12,15 @@ _000A: End _0018: - ScrCmd_026 0x410B, 1 - ScrCmd_026 0x410C, 1 + AddVar 0x410B, 1 + AddVar 0x410C, 1 Return _0026: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_029 0x8004, 0x410B - ScrCmd_029 0x8005, 0x410C + SetVar 0x8004, 0x410B + SetVar 0x8005, 0x410C ScrCmd_0D5 0, 0x8004 ScrCmd_0D5 1, 0x8005 ScrCmd_02C 0 diff --git a/res/field/scripts/script_0291.s b/res/field/scripts/script_0291.s index d6876ecc12..7034b625d3 100644 --- a/res/field/scripts/script_0291.s +++ b/res/field/scripts/script_0291.s @@ -69,9 +69,9 @@ _00A5: GoToIf 1, _00F4 CompareVarToValue 0x410C, 15 GoToIf 0, _0100 - ScrCmd_028 0x8004, 90 + SetVar 0x8004, 90 _00CB: - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _010C @@ -82,11 +82,11 @@ _00CB: End _00F4: - ScrCmd_028 0x8004, 0x145 + SetVar 0x8004, 0x145 GoTo _00CB _0100: - ScrCmd_028 0x8004, 106 + SetVar 0x8004, 106 GoTo _00CB _010C: diff --git a/res/field/scripts/script_0292.s b/res/field/scripts/script_0292.s index 0211a02995..4787723615 100644 --- a/res/field/scripts/script_0292.s +++ b/res/field/scripts/script_0292.s @@ -11,5 +11,5 @@ _0006: End _0014: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 Return diff --git a/res/field/scripts/script_0293.s b/res/field/scripts/script_0293.s index 0211a02995..4787723615 100644 --- a/res/field/scripts/script_0293.s +++ b/res/field/scripts/script_0293.s @@ -11,5 +11,5 @@ _0006: End _0014: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 Return diff --git a/res/field/scripts/script_0294.s b/res/field/scripts/script_0294.s index 0211a02995..4787723615 100644 --- a/res/field/scripts/script_0294.s +++ b/res/field/scripts/script_0294.s @@ -11,5 +11,5 @@ _0006: End _0014: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 Return diff --git a/res/field/scripts/script_0295.s b/res/field/scripts/script_0295.s index 21eea1e906..a33fdeeb98 100644 --- a/res/field/scripts/script_0295.s +++ b/res/field/scripts/script_0295.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0296.s b/res/field/scripts/script_0296.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0296.s +++ b/res/field/scripts/script_0296.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0297.s b/res/field/scripts/script_0297.s index 21eea1e906..a33fdeeb98 100644 --- a/res/field/scripts/script_0297.s +++ b/res/field/scripts/script_0297.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0298.s b/res/field/scripts/script_0298.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0298.s +++ b/res/field/scripts/script_0298.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0299.s b/res/field/scripts/script_0299.s index 21eea1e906..a33fdeeb98 100644 --- a/res/field/scripts/script_0299.s +++ b/res/field/scripts/script_0299.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0300.s b/res/field/scripts/script_0300.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0300.s +++ b/res/field/scripts/script_0300.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0301.s b/res/field/scripts/script_0301.s index 21eea1e906..a33fdeeb98 100644 --- a/res/field/scripts/script_0301.s +++ b/res/field/scripts/script_0301.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0302.s b/res/field/scripts/script_0302.s index 21eea1e906..a33fdeeb98 100644 --- a/res/field/scripts/script_0302.s +++ b/res/field/scripts/script_0302.s @@ -6,6 +6,6 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0303.s b/res/field/scripts/script_0303.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0303.s +++ b/res/field/scripts/script_0303.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0304.s b/res/field/scripts/script_0304.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0304.s +++ b/res/field/scripts/script_0304.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0305.s b/res/field/scripts/script_0305.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0305.s +++ b/res/field/scripts/script_0305.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0306.s b/res/field/scripts/script_0306.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0306.s +++ b/res/field/scripts/script_0306.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0307.s b/res/field/scripts/script_0307.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0307.s +++ b/res/field/scripts/script_0307.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0308.s b/res/field/scripts/script_0308.s index 8afa3e7c68..0d954a3a94 100644 --- a/res/field/scripts/script_0308.s +++ b/res/field/scripts/script_0308.s @@ -6,7 +6,7 @@ .short 0xFD13 _0006: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 ScrCmd_285 0x410B, 0x410C End diff --git a/res/field/scripts/script_0309.s b/res/field/scripts/script_0309.s index 0211a02995..4787723615 100644 --- a/res/field/scripts/script_0309.s +++ b/res/field/scripts/script_0309.s @@ -11,5 +11,5 @@ _0006: End _0014: - ScrCmd_026 0x410C, 1 + AddVar 0x410C, 1 Return diff --git a/res/field/scripts/script_0318.s b/res/field/scripts/script_0318.s index eacaccd875..daa72a78ec 100644 --- a/res/field/scripts/script_0318.s +++ b/res/field/scripts/script_0318.s @@ -15,7 +15,7 @@ _0012: End _0023: - ScrCmd_028 0x4091, 0 + SetVar 0x4091, 0 End _002B: @@ -35,11 +35,11 @@ _002B: ScrCmd_02C 1 ScrCmd_04F SetFlag 224 - ScrCmd_028 0x4091, 1 + SetVar 0x4091, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x403F, 0x264 + SetVar 0x403F, 0x264 ScrCmd_161 ScrCmd_06D 4, 48 ScrCmd_061 @@ -75,7 +75,7 @@ _00C4: End _00D2: - ScrCmd_026 0x40E2, 1 + AddVar 0x40E2, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -94,15 +94,15 @@ _00E2: GoTo _011B _0103: - ScrCmd_05E 0xFF, _0194 - ScrCmd_05E 4, _01D8 - ScrCmd_05F + ApplyMovement 0xFF, _0194 + ApplyMovement 4, _01D8 + WaitMovement GoTo _0133 _011B: - ScrCmd_05E 0xFF, _019C - ScrCmd_05E 4, _01E4 - ScrCmd_05F + ApplyMovement 0xFF, _019C + ApplyMovement 4, _01E4 + WaitMovement GoTo _0133 _0133: @@ -115,21 +115,21 @@ _0133: GoTo _016A _0152: - ScrCmd_05E 0xFF, _01A4 - ScrCmd_05E 4, _01F0 - ScrCmd_05F + ApplyMovement 0xFF, _01A4 + ApplyMovement 4, _01F0 + WaitMovement GoTo _0182 _016A: - ScrCmd_05E 0xFF, _01B0 - ScrCmd_05E 4, _0200 - ScrCmd_05F + ApplyMovement 0xFF, _01B0 + ApplyMovement 4, _0200 + WaitMovement GoTo _0182 _0182: ScrCmd_065 4 SetFlag 228 - ScrCmd_028 0x4091, 2 + SetVar 0x4091, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_0324.s b/res/field/scripts/script_0324.s index d4413a1ec5..3151d00faa 100644 --- a/res/field/scripts/script_0324.s +++ b/res/field/scripts/script_0324.s @@ -44,27 +44,27 @@ _0071: End _007C: - ScrCmd_05E 0, _00CC - ScrCmd_05F + ApplyMovement 0, _00CC + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0, _00D8 - ScrCmd_05F + ApplyMovement 0, _00D8 + WaitMovement Return _0096: - ScrCmd_05E 0xFF, _00E0 - ScrCmd_05F + ApplyMovement 0xFF, _00E0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _00D8 - ScrCmd_05F + ApplyMovement 0xFF, _00D8 + WaitMovement Return _00B0: - ScrCmd_05E 0xFF, _00F0 - ScrCmd_05F + ApplyMovement 0xFF, _00F0 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _00D8 - ScrCmd_05F + ApplyMovement 0xFF, _00D8 + WaitMovement Return .balign 4, 0 @@ -97,8 +97,8 @@ _00FC: ScrCmd_068 ScrCmd_0CD 0 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1A7 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A7 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_15B 5, 0x800C CompareVarToValue 0x800C, 0 @@ -118,8 +118,8 @@ _0140: _014B: ScrCmd_034 - ScrCmd_05E 1, _0168 - ScrCmd_05F + ApplyMovement 1, _0168 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 1 ScrCmd_04B 0x603 diff --git a/res/field/scripts/script_0329.s b/res/field/scripts/script_0329.s index 6ef7a34aca..cec2f2891b 100644 --- a/res/field/scripts/script_0329.s +++ b/res/field/scripts/script_0329.s @@ -22,7 +22,7 @@ _0026: _0035: CompareVarToValue 0x4092, 2 GoToIf 1, _004A - ScrCmd_028 0x4092, 0 + SetVar 0x4092, 0 End _004A: @@ -53,24 +53,24 @@ _0064: ScrCmd_02C 1 ScrCmd_04F SetFlag 225 - ScrCmd_028 0x4092, 1 + SetVar 0x4092, 1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x403F, 0x261 + SetVar 0x403F, 0x261 ScrCmd_161 ScrCmd_06D 4, 48 ScrCmd_061 End _00D1: - ScrCmd_05E 4, _0170 - ScrCmd_05F + ApplyMovement 4, _0170 + WaitMovement Return _00DD: - ScrCmd_05E 4, _0184 - ScrCmd_05F + ApplyMovement 4, _0184 + WaitMovement Return _00E9: @@ -83,12 +83,12 @@ _00EE: _00F3: ScrCmd_060 - ScrCmd_05E 0xFF, _0158 - ScrCmd_05E 4, _0160 - ScrCmd_05F + ApplyMovement 0xFF, _0158 + ApplyMovement 4, _0160 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_028 0x4092, 0 + SetVar 0x4092, 0 ScrCmd_162 ScrCmd_06D 4, 16 ScrCmd_069 0x8004, 0x8005 @@ -100,13 +100,13 @@ _00F3: End _013E: - ScrCmd_05E 4, _0190 - ScrCmd_05F + ApplyMovement 4, _0190 + WaitMovement Return _014A: - ScrCmd_05E 4, _01A0 - ScrCmd_05F + ApplyMovement 4, _01A0 + WaitMovement Return .balign 4, 0 @@ -168,16 +168,16 @@ _01AA: CallIf 1, _02A5 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 5, _0384 - ScrCmd_05F + ApplyMovement 5, _0384 + WaitMovement ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 6, _038C - ScrCmd_05F + ApplyMovement 6, _038C + WaitMovement ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 4, _040C - ScrCmd_05F + ApplyMovement 4, _040C + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 8 ScrCmd_034 @@ -187,12 +187,12 @@ _01AA: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _037D - ScrCmd_05E 5, _0394 - ScrCmd_05F + ApplyMovement 5, _0394 + WaitMovement ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 6, _039C - ScrCmd_05F + ApplyMovement 6, _039C + WaitMovement ScrCmd_02C 10 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -212,15 +212,15 @@ _01AA: End _0291: - ScrCmd_05E 4, _03D4 - ScrCmd_05E 0xFF, _0434 - ScrCmd_05F + ApplyMovement 4, _03D4 + ApplyMovement 0xFF, _0434 + WaitMovement Return _02A5: - ScrCmd_05E 4, _03E4 - ScrCmd_05E 0xFF, _044C - ScrCmd_05F + ApplyMovement 4, _03E4 + ApplyMovement 0xFF, _044C + WaitMovement Return .byte 94 @@ -249,15 +249,15 @@ _02A5: .byte 0 _02D1: - ScrCmd_05E 4, _0414 - ScrCmd_05E 0xFF, _0424 - ScrCmd_05F + ApplyMovement 4, _0414 + ApplyMovement 0xFF, _0424 + WaitMovement Return _02E5: - ScrCmd_05E 4, _041C - ScrCmd_05E 0xFF, _042C - ScrCmd_05F + ApplyMovement 4, _041C + ApplyMovement 0xFF, _042C + WaitMovement Return _02F9: @@ -287,7 +287,7 @@ _031C: _0353: SetFlag 226 - ScrCmd_028 0x4092, 2 + SetVar 0x4092, 2 ScrCmd_02C 13 ScrCmd_031 ScrCmd_034 @@ -300,7 +300,7 @@ _0366: _0371: SetFlag 229 - ScrCmd_028 0x4092, 2 + SetVar 0x4092, 2 Return _037D: @@ -509,7 +509,7 @@ _04EB: End _04F6: - ScrCmd_026 0x40E3, 1 + AddVar 0x40E3, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 diff --git a/res/field/scripts/script_0330.s b/res/field/scripts/script_0330.s index edb81cb8cf..e159cc0ec3 100644 --- a/res/field/scripts/script_0330.s +++ b/res/field/scripts/script_0330.s @@ -40,7 +40,7 @@ _0075: End _0079: - ScrCmd_028 0x4069, 0 + SetVar 0x4069, 0 Return _0081: diff --git a/res/field/scripts/script_0331.s b/res/field/scripts/script_0331.s index e213e173e2..d710b0a965 100644 --- a/res/field/scripts/script_0331.s +++ b/res/field/scripts/script_0331.s @@ -27,8 +27,8 @@ _0035: ScrCmd_060 ScrCmd_068 ScrCmd_02C 0 - ScrCmd_028 0x8004, 233 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 233 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00A8 @@ -54,8 +54,8 @@ _00A8: End _00B2: - ScrCmd_05E 0, _00F0 - ScrCmd_05F + ApplyMovement 0, _00F0 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 0 ScrCmd_04B 0x603 @@ -64,8 +64,8 @@ _00B2: End _00D0: - ScrCmd_05E 0, _00FC - ScrCmd_05F + ApplyMovement 0, _00FC + WaitMovement ScrCmd_049 0x603 ScrCmd_065 0 ScrCmd_04B 0x603 diff --git a/res/field/scripts/script_0333.s b/res/field/scripts/script_0333.s index 48b1176c05..014cdbb734 100644 --- a/res/field/scripts/script_0333.s +++ b/res/field/scripts/script_0333.s @@ -15,17 +15,17 @@ _000A: _0022: ClearFlag 0x27B - ScrCmd_028 0x4110, 1 + SetVar 0x4110, 1 End _002E: ScrCmd_060 - ScrCmd_05E 0xFF, _0054 - ScrCmd_05E 0, _0064 - ScrCmd_05F + ApplyMovement 0xFF, _0054 + ApplyMovement 0, _0064 + WaitMovement SetFlag 0x27B ScrCmd_065 0 - ScrCmd_028 0x4110, 0 + SetVar 0x4110, 0 ScrCmd_061 End diff --git a/res/field/scripts/script_0339.s b/res/field/scripts/script_0339.s index 47117010af..e546d81cae 100644 --- a/res/field/scripts/script_0339.s +++ b/res/field/scripts/script_0339.s @@ -15,16 +15,16 @@ _000A: _0022: ClearFlag 0x27C - ScrCmd_028 0x4111, 1 + SetVar 0x4111, 1 End _002E: ScrCmd_060 - ScrCmd_05E 1, _004C - ScrCmd_05F + ApplyMovement 1, _004C + WaitMovement SetFlag 0x27C ScrCmd_065 1 - ScrCmd_028 0x4111, 0 + SetVar 0x4111, 0 ScrCmd_061 End diff --git a/res/field/scripts/script_0341.s b/res/field/scripts/script_0341.s index 57afcc39cd..ed679639b3 100644 --- a/res/field/scripts/script_0341.s +++ b/res/field/scripts/script_0341.s @@ -130,9 +130,9 @@ _012A: ScrCmd_031 ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 5, _0164 - ScrCmd_05E 6, _016C - ScrCmd_05F + ApplyMovement 5, _0164 + ApplyMovement 6, _016C + WaitMovement SetFlag 0x224 ScrCmd_065 5 ScrCmd_065 6 diff --git a/res/field/scripts/script_0343.s b/res/field/scripts/script_0343.s index 2fef6c5c8e..e334c2f322 100644 --- a/res/field/scripts/script_0343.s +++ b/res/field/scripts/script_0343.s @@ -45,9 +45,9 @@ _006C: ScrCmd_031 ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 5, _00A8 - ScrCmd_05E 6, _00B0 - ScrCmd_05F + ApplyMovement 5, _00A8 + ApplyMovement 6, _00B0 + WaitMovement SetFlag 0x225 ScrCmd_065 5 ScrCmd_065 6 diff --git a/res/field/scripts/script_0344.s b/res/field/scripts/script_0344.s index 593257ebcb..15527eadee 100644 --- a/res/field/scripts/script_0344.s +++ b/res/field/scripts/script_0344.s @@ -10,12 +10,12 @@ _0012: ScrCmd_060 - ScrCmd_05E 0, _00E8 - ScrCmd_05F + ApplyMovement 0, _00E8 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _00F0 - ScrCmd_05F + ApplyMovement 0, _00F0 + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -26,13 +26,13 @@ _0012: End _0054: - ScrCmd_05E 0, _00F8 - ScrCmd_05F + ApplyMovement 0, _00F8 + WaitMovement GoTo _0074 _0064: - ScrCmd_05E 0, _0100 - ScrCmd_05F + ApplyMovement 0, _0100 + WaitMovement GoTo _0074 _0074: @@ -41,21 +41,21 @@ _0074: CompareVarToValue 0x800C, 0 GoToIf 1, _00E1 ScrCmd_02C 2 - ScrCmd_028 0x8004, 1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 1 CallIf 1, _00DB ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 0, _0110 - ScrCmd_05F + ApplyMovement 0, _0110 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 0, _0124 - ScrCmd_05F + ApplyMovement 0, _0124 + WaitMovement ScrCmd_065 0 - ScrCmd_028 0x40D6, 1 + SetVar 0x40D6, 1 ScrCmd_061 End @@ -131,9 +131,9 @@ _0177: ScrCmd_031 ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 1, _01B4 - ScrCmd_05E 2, _01BC - ScrCmd_05F + ApplyMovement 1, _01B4 + ApplyMovement 2, _01BC + WaitMovement SetFlag 0x226 ScrCmd_065 1 ScrCmd_065 2 @@ -180,7 +180,7 @@ _01E6: ScrCmd_29D 0x10E, 2 ScrCmd_29D 0x10F, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0240 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0346.s b/res/field/scripts/script_0346.s index 949a51ae56..2568634e02 100644 --- a/res/field/scripts/script_0346.s +++ b/res/field/scripts/script_0346.s @@ -55,9 +55,9 @@ _007F: ScrCmd_031 ScrCmd_04B 0x5DC ScrCmd_049 0x608 - ScrCmd_05E 6, _00BC - ScrCmd_05E 7, _00C4 - ScrCmd_05F + ApplyMovement 6, _00BC + ApplyMovement 7, _00C4 + WaitMovement SetFlag 0x227 ScrCmd_065 6 ScrCmd_065 7 diff --git a/res/field/scripts/script_0347.s b/res/field/scripts/script_0347.s index ce8c8d0d3e..340fd95c6d 100644 --- a/res/field/scripts/script_0347.s +++ b/res/field/scripts/script_0347.s @@ -47,11 +47,11 @@ _0059: CompareVarToValue 0x800C, 0 GoToIf 1, _011F SetFlag 173 - ScrCmd_028 0x410D, 1 + SetVar 0x410D, 1 ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 - ScrCmd_029 0x4002, 0x8004 + SetVar 0x4002, 0x8004 CompareVarToValue 0x8004, 0 GoToIf 1, _00D5 CompareVarToValue 0x8004, 2 @@ -61,18 +61,18 @@ _0059: End _00D5: - ScrCmd_05E 0, _0128 - ScrCmd_05F + ApplyMovement 0, _0128 + WaitMovement GoTo _0105 _00E5: - ScrCmd_05E 0, _0134 - ScrCmd_05F + ApplyMovement 0, _0134 + WaitMovement GoTo _0105 _00F5: - ScrCmd_05E 0, _0140 - ScrCmd_05F + ApplyMovement 0, _0140 + WaitMovement GoTo _0105 _0105: @@ -193,7 +193,7 @@ _01C7: End _01FB: - ScrCmd_028 0x410D, 0 + SetVar 0x410D, 0 ScrCmd_049 0x5E5 ScrCmd_0CD 0 ScrCmd_02C 11 @@ -202,10 +202,10 @@ _01FB: SetFlag 0x97D ScrCmd_25F ScrCmd_003 30, 0x800C - ScrCmd_05E 2, _036C - ScrCmd_05E 1, _0374 - ScrCmd_05E 3, _037C - ScrCmd_05F + ApplyMovement 2, _036C + ApplyMovement 1, _0374 + ApplyMovement 3, _037C + WaitMovement ScrCmd_186 2, 2, 6 ScrCmd_186 1, 14, 6 ScrCmd_186 3, 8, 12 @@ -236,23 +236,23 @@ _0296: Return _02C0: - ScrCmd_05E 0, _0354 - ScrCmd_05E 0xFF, _0384 - ScrCmd_05F + ApplyMovement 0, _0354 + ApplyMovement 0xFF, _0384 + WaitMovement GoTo _030E End _02DA: - ScrCmd_05E 0, _0360 - ScrCmd_05E 0xFF, _038C - ScrCmd_05F + ApplyMovement 0, _0360 + ApplyMovement 0xFF, _038C + WaitMovement GoTo _030E End _02F4: - ScrCmd_05E 0, _0354 - ScrCmd_05E 0xFF, _0384 - ScrCmd_05F + ApplyMovement 0, _0354 + ApplyMovement 0xFF, _0384 + WaitMovement GoTo _030E End @@ -266,7 +266,7 @@ _030E: ScrCmd_0BD SetFlag 0x235 ClearFlag 0x182 - ScrCmd_028 0x40A9, 1 + SetVar 0x40A9, 1 ScrCmd_061 End @@ -321,12 +321,12 @@ _038C: _0394: ScrCmd_060 - ScrCmd_05E 0, _03BC - ScrCmd_05F + ApplyMovement 0, _03BC + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 0xFF, _03B4 - ScrCmd_05F + ApplyMovement 0xFF, _03B4 + WaitMovement ScrCmd_061 End @@ -375,19 +375,19 @@ _03FD: ScrCmd_060 CheckFlag 173 GoToIf 1, _0450 - ScrCmd_05E 4, _0470 - ScrCmd_05F + ApplyMovement 4, _0470 + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 0, _0460 - ScrCmd_05F + ApplyMovement 0, _0460 + WaitMovement ScrCmd_003 20, 0x800C ScrCmd_02C 6 ScrCmd_02C 7 ScrCmd_034 ScrCmd_003 20, 0x800C - ScrCmd_05E 0, _0468 - ScrCmd_05F + ApplyMovement 0, _0468 + WaitMovement ScrCmd_02C 8 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0349.s b/res/field/scripts/script_0349.s index 405987ae6e..bcb5c0d35d 100644 --- a/res/field/scripts/script_0349.s +++ b/res/field/scripts/script_0349.s @@ -8,8 +8,8 @@ _0006: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - ScrCmd_05E 3, _0234 - ScrCmd_05F + ApplyMovement 3, _0234 + WaitMovement ScrCmd_02C 0 ScrCmd_034 CompareVarToValue 0x8005, 12 @@ -18,15 +18,15 @@ _0006: CallIf 1, _01C1 ScrCmd_066 0x8004, 0x8005 ScrCmd_0BC 6, 3, 0, 0 - ScrCmd_05E 241, _01F8 - ScrCmd_05F + ApplyMovement 241, _01F8 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_003 15, 0x800C ClearFlag 0x253 ScrCmd_064 2 - ScrCmd_05E 2, _01D8 - ScrCmd_05F + ApplyMovement 2, _01D8 + WaitMovement ScrCmd_049 0x60F ScrCmd_003 30, 0x800C ScrCmd_02C 1 @@ -44,13 +44,13 @@ _0006: ScrCmd_02C 5 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 2, _01E8 - ScrCmd_05F + ApplyMovement 2, _01E8 + WaitMovement ScrCmd_065 2 ScrCmd_0BC 6, 3, 0, 0 ScrCmd_0BD - ScrCmd_05E 241, _0204 - ScrCmd_05F + ApplyMovement 241, _0204 + WaitMovement ScrCmd_067 ScrCmd_065 0 ScrCmd_065 1 @@ -86,32 +86,32 @@ _0006: ScrCmd_065 33 ScrCmd_065 34 ScrCmd_065 35 - ScrCmd_05E 3, _0248 - ScrCmd_05E 0xFF, _0224 - ScrCmd_05F + ApplyMovement 3, _0248 + ApplyMovement 0xFF, _0224 + WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_003 15, 0x800C ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 3, _0250 - ScrCmd_05E 0xFF, _022C - ScrCmd_05F + ApplyMovement 3, _0250 + ApplyMovement 0xFF, _022C + WaitMovement ScrCmd_065 3 - ScrCmd_028 0x408E, 1 + SetVar 0x408E, 1 ScrCmd_061 End _01AD: - ScrCmd_05E 3, _0240 - ScrCmd_05E 0xFF, _0210 - ScrCmd_05F + ApplyMovement 3, _0240 + ApplyMovement 0xFF, _0210 + WaitMovement Return _01C1: - ScrCmd_05E 3, _0240 - ScrCmd_05E 0xFF, _021C - ScrCmd_05F + ApplyMovement 3, _0240 + ApplyMovement 0xFF, _021C + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0351.s b/res/field/scripts/script_0351.s index 3d2d15406e..ac6af5a909 100644 --- a/res/field/scripts/script_0351.s +++ b/res/field/scripts/script_0351.s @@ -20,11 +20,11 @@ _001E: End _003E: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _0046: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _004E: @@ -43,42 +43,42 @@ _005B: _006F: ScrCmd_060 ScrCmd_162 - ScrCmd_05E 5, _0298 - ScrCmd_05E 0xFF, _0368 - ScrCmd_05F + ApplyMovement 5, _0298 + ApplyMovement 0xFF, _0368 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_066 46, 53 - ScrCmd_05E 241, _01B4 - ScrCmd_05F + ApplyMovement 241, _01B4 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 1 ScrCmd_034 ScrCmd_003 30, 0x800C - ScrCmd_05E 4, _01E0 - ScrCmd_05E 241, _01C0 - ScrCmd_05F + ApplyMovement 4, _01E0 + ApplyMovement 241, _01C0 + WaitMovement ScrCmd_067 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 5, _02A0 - ScrCmd_05E 0xFF, _0370 - ScrCmd_05F - ScrCmd_05E 4, _01F0 - ScrCmd_05F + ApplyMovement 5, _02A0 + ApplyMovement 0xFF, _0370 + WaitMovement + ApplyMovement 4, _01F0 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 4 ScrCmd_003 50, 0x800C - ScrCmd_05E 0xFF, _0378 - ScrCmd_05E 5, _02AC - ScrCmd_05F + ApplyMovement 0xFF, _0378 + ApplyMovement 5, _02AC + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 5, _02B8 - ScrCmd_05E 0xFF, _0380 - ScrCmd_05F + ApplyMovement 5, _02B8 + ApplyMovement 0xFF, _0380 + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_0CD 1 ScrCmd_02C 4 @@ -86,25 +86,25 @@ _006F: ScrCmd_02C 5 ScrCmd_04D ScrCmd_034 - ScrCmd_05E 5, _02C0 - ScrCmd_05E 0xFF, _0388 - ScrCmd_05F + ApplyMovement 5, _02C0 + ApplyMovement 0xFF, _0388 + WaitMovement ScrCmd_003 15, 0x800C - ScrCmd_05E 5, _02F0 - ScrCmd_05F + ApplyMovement 5, _02F0 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 5, _02E8 - ScrCmd_05F + ApplyMovement 5, _02E8 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_0CD 1 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 5, _02F8 - ScrCmd_05E 0xFF, _039C - ScrCmd_05F + ApplyMovement 5, _02F8 + ApplyMovement 0xFF, _039C + WaitMovement SetFlag 0x196 ScrCmd_065 5 ScrCmd_049 0x603 @@ -112,8 +112,8 @@ _006F: End _01A1: - ScrCmd_028 0x4086, 4 - ScrCmd_028 0x4095, 1 + SetVar 0x4086, 4 + SetVar 0x4095, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0352.s b/res/field/scripts/script_0352.s index 4a446689dd..d62a2ad949 100644 --- a/res/field/scripts/script_0352.s +++ b/res/field/scripts/script_0352.s @@ -26,11 +26,11 @@ _001E: End _0061: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _0069: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0071: @@ -63,8 +63,8 @@ _00CB: ScrCmd_060 CheckFlag 186 GoToIf 1, _0128 - ScrCmd_05E 5, _01C8 - ScrCmd_05F + ApplyMovement 5, _01C8 + WaitMovement ScrCmd_02C 2 ScrCmd_068 ScrCmd_14D 0x800C @@ -163,8 +163,8 @@ _01C8: _01D0: ScrCmd_060 - ScrCmd_05E 5, _0220 - ScrCmd_05F + ApplyMovement 5, _0220 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01F5 @@ -184,7 +184,7 @@ _0203: End _0211: - ScrCmd_028 0x4097, 1 + SetVar 0x4097, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -201,8 +201,8 @@ _0230: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 6, _02F4 - ScrCmd_05F + ApplyMovement 6, _02F4 + WaitMovement ScrCmd_02C 9 ScrCmd_034 ScrCmd_0E5 0x195, 0 @@ -222,16 +222,16 @@ _0230: ScrCmd_065 2 ScrCmd_065 3 SetFlag 0x98E - ScrCmd_05E 6, _02FC - ScrCmd_05E 0xFF, _0304 - ScrCmd_05F + ApplyMovement 6, _02FC + ApplyMovement 0xFF, _0304 + WaitMovement ScrCmd_187 5, 53, 1, 39, 3 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD SetFlag 0x29A SetFlag 186 ClearFlag 0x1BA - ScrCmd_028 0x40D3, 1 + SetVar 0x40D3, 1 ScrCmd_0CE 0 ScrCmd_02C 13 ScrCmd_031 diff --git a/res/field/scripts/script_0353.s b/res/field/scripts/script_0353.s index 25ca6623d9..cc76546616 100644 --- a/res/field/scripts/script_0353.s +++ b/res/field/scripts/script_0353.s @@ -80,15 +80,15 @@ _010E: _011E: ClearFlag 0x296 ScrCmd_064 1 - ScrCmd_05E 1, _0190 - ScrCmd_05F - ScrCmd_05E 0xFF, _01B0 - ScrCmd_05F + ApplyMovement 1, _0190 + WaitMovement + ApplyMovement 0xFF, _01B0 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 1, _0198 - ScrCmd_05F + ApplyMovement 1, _0198 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 3 ScrCmd_134 12, 0x800C @@ -97,8 +97,8 @@ _011E: ScrCmd_0CD 0 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 1, _01A8 - ScrCmd_05F + ApplyMovement 1, _01A8 + WaitMovement ScrCmd_065 1 ScrCmd_061 End @@ -108,7 +108,7 @@ _017F: Return _0184: - ScrCmd_028 0x4059, 0 + SetVar 0x4059, 0 ScrCmd_061 End diff --git a/res/field/scripts/script_0357.s b/res/field/scripts/script_0357.s index 2de4cee404..fd5dd5bb2d 100644 --- a/res/field/scripts/script_0357.s +++ b/res/field/scripts/script_0357.s @@ -78,8 +78,8 @@ _00D3: ScrCmd_02C 0 ScrCmd_034 ScrCmd_068 - ScrCmd_05E 1, _013C - ScrCmd_05F + ApplyMovement 1, _013C + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_02C 1 ScrCmd_034 diff --git a/res/field/scripts/script_0360.s b/res/field/scripts/script_0360.s index 1154af3da2..834e8e430d 100644 --- a/res/field/scripts/script_0360.s +++ b/res/field/scripts/script_0360.s @@ -9,16 +9,16 @@ _0006: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 - ScrCmd_05E 241, _0228 - ScrCmd_05F + ApplyMovement 241, _0228 + WaitMovement ScrCmd_003 15, 0x800C - ScrCmd_05E 2, _01C4 - ScrCmd_05F + ApplyMovement 2, _01C4 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 1, _01EC - ScrCmd_05F + ApplyMovement 1, _01EC + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -42,29 +42,29 @@ _0006: CallIf 1, _0180 CompareVarToValue 0x8004, 15 CallIf 1, _018C - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 2, _01D4 - ScrCmd_05F + ApplyMovement 2, _01D4 + WaitMovement ScrCmd_02C 4 ScrCmd_034 ScrCmd_003 30, 0x800C - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 2, _01DC - ScrCmd_05E 0xFF, _01B8 - ScrCmd_05F + ApplyMovement 2, _01DC + ApplyMovement 0xFF, _01B8 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 2 ScrCmd_04B 0x603 SetFlag 0x98F ClearFlag 0x223 - ScrCmd_028 0x40D3, 2 + SetVar 0x40D3, 2 ClearFlag 0x198 SetFlag 0x194 SetFlag 0x175 @@ -75,37 +75,37 @@ _0006: End _0136: - ScrCmd_05E 1, _01F4 - ScrCmd_05E 241, _0230 - ScrCmd_05F - ScrCmd_05E 0xFF, _01B0 - ScrCmd_05F + ApplyMovement 1, _01F4 + ApplyMovement 241, _0230 + WaitMovement + ApplyMovement 0xFF, _01B0 + WaitMovement Return _0154: - ScrCmd_05E 1, _0204 - ScrCmd_05E 241, _0230 - ScrCmd_05F + ApplyMovement 1, _0204 + ApplyMovement 241, _0230 + WaitMovement Return _0168: - ScrCmd_05E 1, _0210 - ScrCmd_05F + ApplyMovement 1, _0210 + WaitMovement Return _0174: - ScrCmd_05E 1, _0218 - ScrCmd_05F + ApplyMovement 1, _0218 + WaitMovement Return _0180: - ScrCmd_05E 0xFF, _0198 - ScrCmd_05F + ApplyMovement 0xFF, _0198 + WaitMovement Return _018C: - ScrCmd_05E 0xFF, _01A4 - ScrCmd_05F + ApplyMovement 0xFF, _01A4 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0362.s b/res/field/scripts/script_0362.s index 4f125d01b4..688843afc8 100644 --- a/res/field/scripts/script_0362.s +++ b/res/field/scripts/script_0362.s @@ -54,35 +54,35 @@ _009D: End _00A8: - ScrCmd_05E 0, _0110 - ScrCmd_05F + ApplyMovement 0, _0110 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0, _011C - ScrCmd_05F + ApplyMovement 0, _011C + WaitMovement Return _00C2: - ScrCmd_05E 0xFF, _0124 - ScrCmd_05F + ApplyMovement 0xFF, _0124 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _011C - ScrCmd_05F + ApplyMovement 0xFF, _011C + WaitMovement Return _00DC: - ScrCmd_05E 0xFF, _0134 - ScrCmd_05F + ApplyMovement 0xFF, _0134 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _011C - ScrCmd_05F + ApplyMovement 0xFF, _011C + WaitMovement Return _00F6: - ScrCmd_05E 0xFF, _0140 - ScrCmd_05F + ApplyMovement 0xFF, _0140 + WaitMovement ScrCmd_049 0x603 - ScrCmd_05E 0xFF, _011C - ScrCmd_05F + ApplyMovement 0xFF, _011C + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0364.s b/res/field/scripts/script_0364.s index 6ffc4a20f1..908952c00b 100644 --- a/res/field/scripts/script_0364.s +++ b/res/field/scripts/script_0364.s @@ -30,23 +30,23 @@ _0032: ClearFlag 0x276 ScrCmd_064 11 ScrCmd_062 11 - ScrCmd_05E 11, _02C8 - ScrCmd_05E 0xFF, _0290 - ScrCmd_05F + ApplyMovement 11, _02C8 + ApplyMovement 0xFF, _0290 + WaitMovement ScrCmd_049 0x602 ScrCmd_0CD 1 ScrCmd_02C 0 ScrCmd_034 ScrCmd_003 30, 0x800C - ScrCmd_05E 11, _02D0 - ScrCmd_05F + ApplyMovement 11, _02D0 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 11, _02E0 - ScrCmd_05F + ApplyMovement 11, _02E0 + WaitMovement ScrCmd_02C 2 - ScrCmd_05E 11, _02E8 - ScrCmd_05F + ApplyMovement 11, _02E8 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -62,9 +62,9 @@ _0032: ClearFlag 0x277 ScrCmd_064 12 ScrCmd_062 12 - ScrCmd_05E 12, _02C8 - ScrCmd_05E 0xFF, _0290 - ScrCmd_05F + ApplyMovement 12, _02C8 + ApplyMovement 0xFF, _0290 + WaitMovement ScrCmd_049 0x602 ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -86,7 +86,7 @@ _0032: CompareVarToValue 0x8004, 26 CallIf 1, _027C ScrCmd_065 12 - ScrCmd_028 0x410E, 1 + SetVar 0x410E, 1 ScrCmd_061 End @@ -119,51 +119,51 @@ _01DE: Return _01F0: - ScrCmd_05E 11, _02F0 - ScrCmd_05E 0xFF, _02A8 - ScrCmd_05F + ApplyMovement 11, _02F0 + ApplyMovement 0xFF, _02A8 + WaitMovement Return _0204: - ScrCmd_05E 11, _02F0 - ScrCmd_05E 0xFF, _02A8 - ScrCmd_05F + ApplyMovement 11, _02F0 + ApplyMovement 0xFF, _02A8 + WaitMovement Return _0218: - ScrCmd_05E 11, _02FC - ScrCmd_05E 0xFF, _02B8 - ScrCmd_05F + ApplyMovement 11, _02FC + ApplyMovement 0xFF, _02B8 + WaitMovement Return _022C: - ScrCmd_05E 11, _02FC - ScrCmd_05E 0xFF, _02B8 - ScrCmd_05F + ApplyMovement 11, _02FC + ApplyMovement 0xFF, _02B8 + WaitMovement Return _0240: - ScrCmd_05E 12, _02F0 - ScrCmd_05E 0xFF, _02A8 - ScrCmd_05F + ApplyMovement 12, _02F0 + ApplyMovement 0xFF, _02A8 + WaitMovement Return _0254: - ScrCmd_05E 12, _02F0 - ScrCmd_05E 0xFF, _02A8 - ScrCmd_05F + ApplyMovement 12, _02F0 + ApplyMovement 0xFF, _02A8 + WaitMovement Return _0268: - ScrCmd_05E 12, _02FC - ScrCmd_05E 0xFF, _02B8 - ScrCmd_05F + ApplyMovement 12, _02FC + ApplyMovement 0xFF, _02B8 + WaitMovement Return _027C: - ScrCmd_05E 12, _02FC - ScrCmd_05E 0xFF, _02B8 - ScrCmd_05F + ApplyMovement 12, _02FC + ApplyMovement 0xFF, _02B8 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0367.s b/res/field/scripts/script_0367.s index 0591588920..128b373dd8 100644 --- a/res/field/scripts/script_0367.s +++ b/res/field/scripts/script_0367.s @@ -104,38 +104,38 @@ _014A: .byte 0 _0158: - ScrCmd_028 0x40D8, 0xFF - ScrCmd_028 0x40DB, 1 - ScrCmd_028 0x40DC, 1 - ScrCmd_028 0x40D9, 1 + SetVar 0x40D8, 0xFF + SetVar 0x40DB, 1 + SetVar 0x40DC, 1 + SetVar 0x40D9, 1 Return _0172: - ScrCmd_028 0x40D8, 0xFF - ScrCmd_028 0x40DB, 3 - ScrCmd_028 0x40DD, 1 - ScrCmd_028 0x40DE, 1 - ScrCmd_028 0x40DF, 1 + SetVar 0x40D8, 0xFF + SetVar 0x40DB, 3 + SetVar 0x40DD, 1 + SetVar 0x40DE, 1 + SetVar 0x40DF, 1 Return _0192: - ScrCmd_028 0x40D8, 0xFF - ScrCmd_028 0x40DB, 1 - ScrCmd_028 0x40DC, 1 - ScrCmd_028 0x40D9, 2 + SetVar 0x40D8, 0xFF + SetVar 0x40DB, 1 + SetVar 0x40DC, 1 + SetVar 0x40D9, 2 Return _01AC: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4001, 0 + SetVar 0x4001, 0 ScrCmd_1DF 0x4002 GoTo _01C6 End _01C6: - ScrCmd_029 0x8008, 0x4002 + SetVar 0x8008, 0x4002 CompareVarToValue 0x8008, 1 GoToIf 1, _0239 CompareVarToValue 0x8008, 2 @@ -168,25 +168,25 @@ _022E: _0239: ScrCmd_0D5 0, 20 - ScrCmd_028 0x8004, 85 + SetVar 0x8004, 85 GoTo _0272 End _024C: ScrCmd_0D5 0, 50 - ScrCmd_028 0x8004, 86 + SetVar 0x8004, 86 GoTo _0272 End _025F: ScrCmd_0D5 0, 100 - ScrCmd_028 0x8004, 87 + SetVar 0x8004, 87 GoTo _0272 End _0272: ScrCmd_02C 88 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FE ScrCmd_02C 15 GoTo _020B @@ -203,7 +203,7 @@ _028A: _029D: ScrCmd_02C 1 Call _02E6 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0301 CompareVarToValue 0x8008, 1 @@ -235,7 +235,7 @@ _0301: ScrCmd_042 7, 1 ScrCmd_042 94, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0352 CompareVarToValue 0x8008, 1 @@ -273,7 +273,7 @@ _03B0: CompareVarToValue 0x800C, 0 GoToIf 1, _0784 ScrCmd_1DD 32, 0, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _04A8 CompareVarToValue 0x8008, 2 @@ -312,7 +312,7 @@ _045C: _049C: ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 Return _04A8: @@ -338,7 +338,7 @@ _04BE: _04EC: ScrCmd_060 - ScrCmd_028 0x40D8, 0 + SetVar 0x40D8, 0 ScrCmd_1DD 4, 0, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0597 @@ -360,18 +360,18 @@ _0548: ScrCmd_1DD 5, 0, 0 Call _0734 ScrCmd_1DD 51, 0, 0x800C - ScrCmd_029 0x4009, 0x800C + SetVar 0x4009, 0x800C ScrCmd_02C 32 ScrCmd_030 GoTo _05EC End _0577: - ScrCmd_028 0x40D8, 0xFF - ScrCmd_028 0x40DB, 2 - ScrCmd_028 0x40DD, 1 - ScrCmd_028 0x40DE, 2 - ScrCmd_028 0x40DF, 0 + SetVar 0x40D8, 0xFF + SetVar 0x40DB, 2 + SetVar 0x40DD, 1 + SetVar 0x40DE, 2 + SetVar 0x40DF, 0 Return _0597: @@ -388,7 +388,7 @@ _05B9: CompareVarToValue 0x800C, 0 GoToIf 1, _077E ScrCmd_1DD 10, 0, 0x800C - ScrCmd_029 0x8000, 0x800C + SetVar 0x8000, 0x800C ScrCmd_0D5 0, 0x8000 ScrCmd_02C 65 GoTo _077E @@ -397,7 +397,7 @@ _05B9: _05EC: ScrCmd_034 ScrCmd_1DD 43, 0, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 4 GoToIf 1, _0652 CompareVarToValue 0x8008, 5 @@ -410,48 +410,48 @@ _05EC: End _0638: - ScrCmd_028 0x4002, 0 - ScrCmd_028 0x4003, 15 + SetVar 0x4002, 0 + SetVar 0x4003, 15 Call _06AE GoTo _0746 End _0652: - ScrCmd_028 0x4002, 2 - ScrCmd_028 0x4003, 19 + SetVar 0x4002, 2 + SetVar 0x4003, 19 Call _06AE GoTo _0746 End _066C: - ScrCmd_028 0x4002, 1 - ScrCmd_028 0x4003, 11 + SetVar 0x4002, 1 + SetVar 0x4003, 11 Call _06AE GoTo _06EE End _0686: - ScrCmd_028 0x4002, 1 - ScrCmd_028 0x4003, 11 + SetVar 0x4002, 1 + SetVar 0x4003, 11 Call _06AE GoTo _06A0 End _06A0: - ScrCmd_028 0x40DB, 2 + SetVar 0x40DB, 2 GoTo _0746 End _06AE: - ScrCmd_05E 0x4002, _1248 - ScrCmd_05E 0xFF, _1260 - ScrCmd_05F + ApplyMovement 0x4002, _1248 + ApplyMovement 0xFF, _1260 + WaitMovement ScrCmd_168 0, 0, 0x4003, 2, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 0x4002, _1254 - ScrCmd_05E 0xFF, _126C - ScrCmd_05F + ApplyMovement 0x4002, _1254 + ApplyMovement 0xFF, _126C + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -523,13 +523,13 @@ _07B5: Return _07B9: - ScrCmd_028 0x40D8, 0 - ScrCmd_028 0x40DB, 0 - ScrCmd_028 0x40DC, 0 - ScrCmd_028 0x40DD, 0 - ScrCmd_028 0x40D9, 0 - ScrCmd_028 0x40DE, 0 - ScrCmd_028 0x40DF, 0 + SetVar 0x40D8, 0 + SetVar 0x40DB, 0 + SetVar 0x40DC, 0 + SetVar 0x40DD, 0 + SetVar 0x40D9, 0 + SetVar 0x40DE, 0 + SetVar 0x40DF, 0 Return _07E5: @@ -557,7 +557,7 @@ _0815: _0832: ScrCmd_02C 37 Call _087D - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0AA7 CompareVarToValue 0x8008, 1 @@ -587,7 +587,7 @@ _089C: _08A7: ScrCmd_02C 37 Call _08FF - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0AA7 CompareVarToValue 0x8008, 1 @@ -633,7 +633,7 @@ _0967: _096F: ScrCmd_034 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 Call _097F Return @@ -642,11 +642,11 @@ _097F: ScrCmd_0BD ScrCmd_0B3 0x4000 ScrCmd_1DD 16, 0x4001, 0x4000 - ScrCmd_029 0x4001, 0x4000 + SetVar 0x4001, 0x4000 ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_029 0x800C, 0x4001 + SetVar 0x800C, 0x4001 Return _09B3: @@ -658,7 +658,7 @@ _09B3: ScrCmd_1DD 5, 0, 0 ScrCmd_14E ScrCmd_034 - ScrCmd_028 0x4001, 0 + SetVar 0x4001, 0 Call _097F CompareVarToValue 0x800C, 0 GoToIf 5, _077E @@ -674,7 +674,7 @@ _09FB: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _09FB - ScrCmd_028 0x40D8, 2 + SetVar 0x40D8, 2 ScrCmd_1DD 39, 0, 0 ScrCmd_1DC ScrCmd_02C 56 @@ -692,7 +692,7 @@ _0A5A: CompareVarToValue 0x800C, 0 GoToIf 1, _0784 ScrCmd_034 - ScrCmd_028 0x4001, 2 + SetVar 0x4001, 2 Call _097F CompareVarToValue 0x800C, 0 GoToIf 5, _0784 @@ -715,8 +715,8 @@ _0AB5: End _0AC3: - ScrCmd_05E 0xFF, _1278 - ScrCmd_05F + ApplyMovement 0xFF, _1278 + WaitMovement Return _0ACF: @@ -730,7 +730,7 @@ _0ACF: _0AE2: ScrCmd_02C 21 Call _02E6 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0B2B CompareVarToValue 0x8008, 1 @@ -763,13 +763,13 @@ _0B50: _0B6C: ScrCmd_1DB 0, 2 - ScrCmd_028 0x4001, 0 + SetVar 0x4001, 0 GoTo _0B94 End _0B80: ScrCmd_1DB 0, 3 - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 GoTo _0B94 End @@ -779,7 +779,7 @@ _0B94: CompareVarToValue 0x800C, 0 GoToIf 1, _0784 ScrCmd_1DD 32, 0, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _04A8 CompareVarToValue 0x8008, 2 @@ -822,7 +822,7 @@ _0C70: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0CB4 CompareVarToValue 0x8008, 1 @@ -888,7 +888,7 @@ _0D72: CompareVarToValue 0x800C, 0 GoToIf 1, _0D72 ScrCmd_1E2 0, 0x4000 - ScrCmd_029 0x8008, 0x4000 + SetVar 0x8008, 0x4000 CompareVarToValue 0x8008, 1 GoToIf 1, _0DE7 CompareVarToValue 0x8008, 2 @@ -981,8 +981,8 @@ _0EBF: _0F05: ScrCmd_02C 53 ScrCmd_1DD 43, 0, 0x800C - ScrCmd_029 0x4000, 0x800C - ScrCmd_029 0x8008, 0x4000 + SetVar 0x4000, 0x800C + SetVar 0x8008, 0x4000 CompareVarToValue 0x8008, 5 GoToIf 1, _0F53 CompareVarToValue 0x8008, 4 @@ -1010,7 +1010,7 @@ _0F73: _0F7E: ScrCmd_1DD 43, 0, 0x800C - ScrCmd_029 0x4000, 0x800C + SetVar 0x4000, 0x800C CompareVarToValue 0x4000, 5 GoToIf 1, _116C CompareVarToValue 0x4000, 0 @@ -1042,7 +1042,7 @@ _0FEA: _100A: ScrCmd_1DD 10, 0, 0x800C - ScrCmd_029 0x4000, 0x800C + SetVar 0x4000, 0x800C ScrCmd_0CD 0 ScrCmd_0D5 1, 0x4000 ScrCmd_02C 55 @@ -1099,8 +1099,8 @@ _10BC: GoToIf 1, _077E ScrCmd_02C 113 ScrCmd_034 - ScrCmd_029 0x4002, 0x800C - ScrCmd_028 0x4001, 1 + SetVar 0x4002, 0x800C + SetVar 0x4001, 1 Call _0AC3 GoTo _01C6 End @@ -1125,7 +1125,7 @@ _1135: ScrCmd_02C 87 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x404F, 2 + SetVar 0x404F, 2 Return _114C: @@ -1134,7 +1134,7 @@ _114C: ScrCmd_02C 86 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x404F, 4 + SetVar 0x404F, 4 ScrCmd_014 0x806 Return @@ -1160,8 +1160,8 @@ _118A: GoToIf 1, _077E ScrCmd_02C 113 ScrCmd_034 - ScrCmd_029 0x4002, 0x800C - ScrCmd_028 0x4001, 1 + SetVar 0x4002, 0x800C + SetVar 0x4001, 1 Call _0AC3 GoTo _01C6 End @@ -1175,7 +1175,7 @@ _11BA: _11D7: ScrCmd_1DD 10, 0, 0x800C - ScrCmd_029 0x8000, 0x800C + SetVar 0x8000, 0x800C ScrCmd_0D5 0, 0x8000 ScrCmd_02C 65 GoTo _11F5 @@ -1237,24 +1237,24 @@ _1278: _1280: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 0 + SetVar 0x8000, 0 + SetVar 0x8001, 0 Call _1304 End _129A: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 1 + SetVar 0x8000, 0 + SetVar 0x8001, 1 Call _1304 End _12B4: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 0 - ScrCmd_028 0x8001, 2 + SetVar 0x8000, 0 + SetVar 0x8001, 2 Call _1304 End @@ -1264,8 +1264,8 @@ _12CE: ScrCmd_1E4 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _12F9 - ScrCmd_028 0x8000, 1 - ScrCmd_028 0x8001, 0 + SetVar 0x8000, 1 + SetVar 0x8001, 0 Call _1304 End @@ -1397,7 +1397,7 @@ _140A: ScrCmd_191 ScrCmd_193 0x800C ScrCmd_0A1 - ScrCmd_029 0x8000, 0x800C + SetVar 0x8000, 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD CompareVarToValue 0x8000, 0xFF diff --git a/res/field/scripts/script_0368.s b/res/field/scripts/script_0368.s index 983746453c..172e285a37 100644 --- a/res/field/scripts/script_0368.s +++ b/res/field/scripts/script_0368.s @@ -34,15 +34,15 @@ _008A: Return _008E: - ScrCmd_028 0x402A, 231 + SetVar 0x402A, 231 Return _0096: - ScrCmd_028 0x402A, 235 + SetVar 0x402A, 235 Return _009E: - ScrCmd_028 0x402A, 232 + SetVar 0x402A, 232 Return _00A6: @@ -85,34 +85,34 @@ _0132: _0146: ScrCmd_060 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 Call _0132 GoTo _00A6 End _015C: ScrCmd_060 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 Call _0132 GoTo _00E9 End _0172: ScrCmd_060 - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 Call _0132 GoTo _010A End _0188: - ScrCmd_05E 0xFF, _01BC - ScrCmd_05F + ApplyMovement 0xFF, _01BC + WaitMovement Return _0194: - ScrCmd_05E 0, _01C8 - ScrCmd_05E 0xFF, _01E4 - ScrCmd_05F + ApplyMovement 0, _01C8 + ApplyMovement 0xFF, _01E4 + WaitMovement Return .byte 12 diff --git a/res/field/scripts/script_0369.s b/res/field/scripts/script_0369.s index eb8f40129a..a8dec8cc91 100644 --- a/res/field/scripts/script_0369.s +++ b/res/field/scripts/script_0369.s @@ -23,7 +23,7 @@ _0025: ScrCmd_060 Call _008E ScrCmd_1B7 0x800C, 4 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _00F0 CompareVarToValue 0x8008, 2 @@ -45,11 +45,11 @@ _008E: ScrCmd_168 0, 0, 2, 2, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 0, _0140 - ScrCmd_05F + ApplyMovement 0, _0140 + WaitMovement ScrCmd_1B1 0xFF - ScrCmd_05E 0xFF, _014C - ScrCmd_05F + ApplyMovement 0xFF, _014C + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -77,30 +77,30 @@ _008E: .byte 0 _00D6: - ScrCmd_05E 0, _0178 - ScrCmd_05E 0xFF, _0188 - ScrCmd_05F + ApplyMovement 0, _0178 + ApplyMovement 0xFF, _0188 + WaitMovement GoTo _0066 End _00F0: - ScrCmd_05E 0, _019C - ScrCmd_05E 0xFF, _01AC - ScrCmd_05F + ApplyMovement 0, _019C + ApplyMovement 0xFF, _01AC + WaitMovement GoTo _0066 End _010A: - ScrCmd_05E 0, _01C0 - ScrCmd_05E 0xFF, _01D0 - ScrCmd_05F + ApplyMovement 0, _01C0 + ApplyMovement 0xFF, _01D0 + WaitMovement GoTo _0066 End _0124: - ScrCmd_05E 0, _01E4 - ScrCmd_05E 0xFF, _01F4 - ScrCmd_05F + ApplyMovement 0, _01E4 + ApplyMovement 0xFF, _01F4 + WaitMovement GoTo _0066 .byte 2 diff --git a/res/field/scripts/script_0370.s b/res/field/scripts/script_0370.s index 5756063c8a..8d58c9137d 100644 --- a/res/field/scripts/script_0370.s +++ b/res/field/scripts/script_0370.s @@ -14,17 +14,17 @@ _000E: CompareVarToValue 0x4000, 1 GoToIf 1, _004A ScrCmd_1DD 55, 0, 0x4000 - ScrCmd_029 0x4020, 0x4000 + SetVar 0x4020, 0x4000 ScrCmd_1DD 55, 1, 0x4000 - ScrCmd_029 0x4021, 0x4000 + SetVar 0x4021, 0x4000 _0048: End _004A: ScrCmd_1DD 55, 0, 0x4000 - ScrCmd_029 0x4021, 0x4000 + SetVar 0x4021, 0x4000 ScrCmd_1DD 55, 1, 0x4000 - ScrCmd_029 0x4020, 0x4000 + SetVar 0x4020, 0x4000 End _0068: @@ -59,14 +59,14 @@ _00C9: ScrCmd_16B 78 ScrCmd_169 77 ScrCmd_169 78 - ScrCmd_05E 0, _0174 - ScrCmd_05E 1, _0174 - ScrCmd_05F + ApplyMovement 0, _0174 + ApplyMovement 1, _0174 + WaitMovement ScrCmd_1B1 2 ScrCmd_1B1 3 - ScrCmd_05E 2, _0180 - ScrCmd_05E 3, _0180 - ScrCmd_05F + ApplyMovement 2, _0180 + ApplyMovement 3, _0180 + WaitMovement ScrCmd_16C 77 ScrCmd_16C 78 ScrCmd_169 77 @@ -76,19 +76,19 @@ _00C9: Return _012B: - ScrCmd_05E 0, _01AC - ScrCmd_05E 2, _0188 - ScrCmd_05E 1, _01CC - ScrCmd_05E 3, _0194 - ScrCmd_05F + ApplyMovement 0, _01AC + ApplyMovement 2, _0188 + ApplyMovement 1, _01CC + ApplyMovement 3, _0194 + WaitMovement Return _014F: - ScrCmd_05E 0, _01EC - ScrCmd_05E 1, _01EC - ScrCmd_05E 2, _01A0 - ScrCmd_05E 3, _01A0 - ScrCmd_05F + ApplyMovement 0, _01EC + ApplyMovement 1, _01EC + ApplyMovement 2, _01A0 + ApplyMovement 3, _01A0 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0371.s b/res/field/scripts/script_0371.s index 830cbec1bf..cae889af54 100644 --- a/res/field/scripts/script_0371.s +++ b/res/field/scripts/script_0371.s @@ -14,7 +14,7 @@ _0016: GoToIf 1, _0035 SetFlag 0x1CB ScrCmd_1DD 55, 0, 0x4000 - ScrCmd_029 0x4020, 0x4000 + SetVar 0x4020, 0x4000 _0035: End @@ -29,7 +29,7 @@ _004A: End _0058: - ScrCmd_028 0x40D9, 0 + SetVar 0x40D9, 0 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -46,9 +46,9 @@ _0070: _007D: ScrCmd_003 30, 0x800C - ScrCmd_028 0x40D8, 1 + SetVar 0x40D8, 1 ScrCmd_1DD 43, 0, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 4 GoToIf 1, _00D9 CompareVarToValue 0x8008, 5 @@ -72,7 +72,7 @@ _00D9: _0101: ScrCmd_060 - ScrCmd_028 0x40D9, 3 + SetVar 0x40D9, 3 ScrCmd_1DD 100, 0, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _007D @@ -82,7 +82,7 @@ _0101: _012C: ScrCmd_060 - ScrCmd_028 0x40D9, 3 + SetVar 0x40D9, 3 ScrCmd_1DD 100, 0, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _007D @@ -100,7 +100,7 @@ _015D: Call _047E ScrCmd_1DD 42, 0, 0 ScrCmd_0EC 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C Return _018C: @@ -114,7 +114,7 @@ _019C: End _01AC: - ScrCmd_028 0x40D8, 2 + SetVar 0x40D8, 2 ScrCmd_1DD 39, 0, 0 ScrCmd_1DC ScrCmd_02C 4 @@ -162,7 +162,7 @@ _0241: ScrCmd_046 148, 0xFF, 2 ScrCmd_047 ScrCmd_034 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _02AD CompareVarToValue 0x8008, 1 @@ -216,7 +216,7 @@ _0336: ScrCmd_046 148, 0xFF, 2 ScrCmd_047 ScrCmd_034 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0395 CompareVarToValue 0x8008, 1 @@ -241,7 +241,7 @@ _03C7: Call _047E ScrCmd_1DD 42, 0, 0 ScrCmd_0EC 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C CompareVarToValue 0x8004, 0 GoToIf 1, _018C ScrCmd_1DD 36, 0, 0x800C @@ -267,56 +267,56 @@ _0429: End _043C: - ScrCmd_05E 2, _0504 - ScrCmd_05F + ApplyMovement 2, _0504 + WaitMovement Return _0448: - ScrCmd_05E 0, _0580 - ScrCmd_05E 2, _05A0 - ScrCmd_05F + ApplyMovement 0, _0580 + ApplyMovement 2, _05A0 + WaitMovement Return _045C: ScrCmd_1DD 41, 0, 0x800C - ScrCmd_029 0x4021, 0x800C + SetVar 0x4021, 0x800C ClearFlag 0x1CB ScrCmd_064 1 - ScrCmd_05E 1, _0524 - ScrCmd_05F + ApplyMovement 1, _0524 + WaitMovement Return _047E: - ScrCmd_05E 2, _0540 - ScrCmd_05E 1, _0548 - ScrCmd_05F + ApplyMovement 2, _0540 + ApplyMovement 1, _0548 + WaitMovement Return _0492: - ScrCmd_05E 1, _0550 - ScrCmd_05F + ApplyMovement 1, _0550 + WaitMovement SetFlag 0x1CB ScrCmd_065 1 Return _04A6: - ScrCmd_05E 2, _0574 - ScrCmd_05E 0, _0580 - ScrCmd_05F + ApplyMovement 2, _0574 + ApplyMovement 0, _0580 + WaitMovement Return _04BA: - ScrCmd_05E 2, _0588 - ScrCmd_05E 0, _0590 - ScrCmd_05F + ApplyMovement 2, _0588 + ApplyMovement 0, _0590 + WaitMovement Return _04CE: - ScrCmd_028 0x4021, 169 + SetVar 0x4021, 169 ClearFlag 0x1CB ScrCmd_064 1 - ScrCmd_05E 1, _05A8 - ScrCmd_05F + ApplyMovement 1, _05A8 + WaitMovement Return .byte 62 diff --git a/res/field/scripts/script_0372.s b/res/field/scripts/script_0372.s index 9703b8e9c7..51088c8138 100644 --- a/res/field/scripts/script_0372.s +++ b/res/field/scripts/script_0372.s @@ -17,17 +17,17 @@ _0012: CompareVarToValue 0x4000, 1 GoToIf 1, _0056 ScrCmd_1DD 55, 0, 0x4000 - ScrCmd_029 0x4020, 0x4000 + SetVar 0x4020, 0x4000 ScrCmd_1DD 55, 1, 0x4000 - ScrCmd_029 0x4021, 0x4000 + SetVar 0x4021, 0x4000 _0054: End _0056: ScrCmd_1DD 55, 0, 0x4000 - ScrCmd_029 0x4021, 0x4000 + SetVar 0x4021, 0x4000 ScrCmd_1DD 55, 1, 0x4000 - ScrCmd_029 0x4020, 0x4000 + SetVar 0x4020, 0x4000 End _0074: @@ -61,7 +61,7 @@ _00CB: CompareVarToValue 0x800C, 3 GoToIf 1, _0114 ScrCmd_003 30, 0x800C - ScrCmd_028 0x40D8, 1 + SetVar 0x40D8, 1 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x146, 0, 7, 6, 0 @@ -72,7 +72,7 @@ _00CB: _0114: ScrCmd_003 30, 0x800C - ScrCmd_028 0x40D8, 1 + SetVar 0x40D8, 1 ScrCmd_136 ScrCmd_135 6 ScrCmd_0BC 6, 1, 0, 0 @@ -88,7 +88,7 @@ _0114: _0156: ScrCmd_060 - ScrCmd_028 0x40DE, 3 + SetVar 0x40DE, 3 Call _048D ScrCmd_1DD 43, 0, 0x800C CompareVarToValue 0x800C, 3 @@ -98,7 +98,7 @@ _0156: _0181: ScrCmd_060 - ScrCmd_028 0x40DE, 3 + SetVar 0x40DE, 3 Call _048D Call _04A1 GoTo _02E8 @@ -118,7 +118,7 @@ _019D: Call _0505 ScrCmd_1DD 42, 0, 0 ScrCmd_0EC 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C Return _01DF: @@ -137,23 +137,23 @@ _01DF: ScrCmd_135 4 ScrCmd_1DD 42, 0, 0 ScrCmd_0EC 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C Return _022F: ScrCmd_1DD 37, 0, 0 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 GoTo _00CB End _0245: ScrCmd_1DD 38, 0, 0 - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 GoTo _00CB End _025B: - ScrCmd_028 0x40D8, 2 + SetVar 0x40D8, 2 ScrCmd_1DD 39, 0, 0 ScrCmd_1DC ScrCmd_02C 0 @@ -198,7 +198,7 @@ _02E8: ScrCmd_046 148, 0xFF, 2 ScrCmd_047 ScrCmd_034 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0354 CompareVarToValue 0x8008, 1 @@ -251,7 +251,7 @@ _03D6: ScrCmd_046 148, 0xFF, 1 ScrCmd_047 ScrCmd_034 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 CompareVarToValue 0x800C, 1 GoToIf 1, _0452 _0418: @@ -261,7 +261,7 @@ _0418: ScrCmd_1E1 2, 0x4000, 0x800C ScrCmd_1E2 2, 0x4000 ScrCmd_034 - ScrCmd_029 0x8008, 0x4000 + SetVar 0x8008, 0x4000 CompareVarToValue 0x8008, 1 GoToIf 1, _0474 Call _0589 @@ -273,7 +273,7 @@ _0452: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _03D6 - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 GoTo _0418 End @@ -287,55 +287,55 @@ _0474: End _048D: - ScrCmd_05E 2, _05B0 - ScrCmd_05E 3, _05C4 - ScrCmd_05F + ApplyMovement 2, _05B0 + ApplyMovement 3, _05C4 + WaitMovement Return _04A1: - ScrCmd_05E 0, _0644 - ScrCmd_05E 1, _0644 - ScrCmd_05E 2, _0664 - ScrCmd_05E 3, _0664 - ScrCmd_05F + ApplyMovement 0, _0644 + ApplyMovement 1, _0644 + ApplyMovement 2, _0664 + ApplyMovement 3, _0664 + WaitMovement Return _04C5: ScrCmd_1DD 41, 0, 0x800C - ScrCmd_029 0x4022, 0x800C + SetVar 0x4022, 0x800C ScrCmd_1DD 41, 1, 0x800C - ScrCmd_029 0x4023, 0x800C + SetVar 0x4023, 0x800C ClearFlag 0x1EA ClearFlag 0x1EB ScrCmd_064 5 ScrCmd_064 4 - ScrCmd_05E 5, _05D8 - ScrCmd_05E 4, _05EC - ScrCmd_05F + ApplyMovement 5, _05D8 + ApplyMovement 4, _05EC + WaitMovement Return _0505: - ScrCmd_05E 2, _0600 - ScrCmd_05E 3, _0600 - ScrCmd_05E 5, _0608 - ScrCmd_05E 4, _0608 - ScrCmd_05F + ApplyMovement 2, _0600 + ApplyMovement 3, _0600 + ApplyMovement 5, _0608 + ApplyMovement 4, _0608 + WaitMovement Return _0529: - ScrCmd_05E 5, _0610 - ScrCmd_05F + ApplyMovement 5, _0610 + WaitMovement Return _0535: - ScrCmd_05E 4, _0610 - ScrCmd_05F + ApplyMovement 4, _0610 + WaitMovement Return _0541: - ScrCmd_05E 5, _0618 - ScrCmd_05E 4, _0628 - ScrCmd_05F + ApplyMovement 5, _0618 + ApplyMovement 4, _0628 + WaitMovement SetFlag 0x1EA SetFlag 0x1EB ScrCmd_065 5 @@ -343,19 +343,19 @@ _0541: Return _0565: - ScrCmd_05E 2, _0638 - ScrCmd_05E 3, _0638 - ScrCmd_05E 0, _0644 - ScrCmd_05E 1, _0644 - ScrCmd_05F + ApplyMovement 2, _0638 + ApplyMovement 3, _0638 + ApplyMovement 0, _0644 + ApplyMovement 1, _0644 + WaitMovement Return _0589: - ScrCmd_05E 2, _064C - ScrCmd_05E 3, _064C - ScrCmd_05E 0, _0654 - ScrCmd_05E 1, _0654 - ScrCmd_05F + ApplyMovement 2, _064C + ApplyMovement 3, _064C + ApplyMovement 0, _0654 + ApplyMovement 1, _0654 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0373.s b/res/field/scripts/script_0373.s index 0d84653422..d7b8c42cf0 100644 --- a/res/field/scripts/script_0373.s +++ b/res/field/scripts/script_0373.s @@ -109,7 +109,7 @@ _017F: _018D: ScrCmd_060 - ScrCmd_028 0x40DF, 0 + SetVar 0x40DF, 0 Call _04A6 ScrCmd_02C 0 ScrCmd_034 @@ -134,7 +134,7 @@ _01AC: _01D4: ScrCmd_034 ScrCmd_061 - ScrCmd_028 0x40D8, 3 + SetVar 0x40D8, 3 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x146, 0, 11, 6, 0 @@ -144,11 +144,11 @@ _01D4: _0204: ScrCmd_060 - ScrCmd_028 0x40DF, 0 + SetVar 0x40DF, 0 ScrCmd_02C 2 ScrCmd_034 Call _04E0 - ScrCmd_028 0x40DB, 2 + SetVar 0x40DB, 2 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x147, 0, 3, 6, 0 @@ -172,7 +172,7 @@ _0275: ScrCmd_068 CompareVarToValue 0x40DF, 2 GoToIf 1, _02D2 - ScrCmd_028 0x4009, 0 + SetVar 0x4009, 0 ScrCmd_1DE 0x4009, 0, 0x8004, 0x8005 ScrCmd_341 0, 0x8004, 0, 0 ScrCmd_0D4 1, 0x8005 @@ -192,7 +192,7 @@ _02D2: _02DD: ScrCmd_1DD 50, 0x4009, 0 - ScrCmd_028 0x40DF, 2 + SetVar 0x40DF, 2 ScrCmd_02C 8 ScrCmd_034 ScrCmd_061 @@ -206,7 +206,7 @@ _02FE: ScrCmd_068 CompareVarToValue 0x40DF, 2 GoToIf 1, _0336 - ScrCmd_028 0x4009, 1 + SetVar 0x4009, 1 Call _0245 ScrCmd_0CD 4 ScrCmd_02C 15 @@ -222,7 +222,7 @@ _0336: _0341: ScrCmd_1DD 50, 0x4009, 0 - ScrCmd_028 0x40DF, 2 + SetVar 0x40DF, 2 ScrCmd_0CD 0 ScrCmd_02C 17 ScrCmd_034 @@ -237,7 +237,7 @@ _0365: ScrCmd_068 CompareVarToValue 0x40DF, 2 GoToIf 1, _039A - ScrCmd_028 0x4009, 2 + SetVar 0x4009, 2 Call _0245 ScrCmd_02C 3 ScrCmd_03E 0x800C @@ -252,7 +252,7 @@ _039A: _03A5: ScrCmd_1DD 50, 0x4009, 0 - ScrCmd_028 0x40DF, 2 + SetVar 0x40DF, 2 ScrCmd_02C 5 ScrCmd_034 ScrCmd_061 @@ -266,7 +266,7 @@ _03C6: ScrCmd_068 CompareVarToValue 0x40DF, 2 GoToIf 1, _03FB - ScrCmd_028 0x4009, 3 + SetVar 0x4009, 3 Call _0245 ScrCmd_02C 12 ScrCmd_03E 0x800C @@ -281,7 +281,7 @@ _03FB: _0406: ScrCmd_1DD 50, 0x4009, 0 - ScrCmd_028 0x40DF, 2 + SetVar 0x40DF, 2 ScrCmd_02C 14 ScrCmd_034 ScrCmd_061 @@ -295,7 +295,7 @@ _0427: ScrCmd_068 CompareVarToValue 0x40DF, 2 GoToIf 1, _045C - ScrCmd_028 0x4009, 4 + SetVar 0x4009, 4 Call _0245 ScrCmd_02C 9 ScrCmd_03E 0x800C @@ -310,7 +310,7 @@ _045C: _0467: ScrCmd_1DD 50, 0x4009, 0 - ScrCmd_028 0x40DF, 2 + SetVar 0x40DF, 2 ScrCmd_02C 11 ScrCmd_034 ScrCmd_061 @@ -332,37 +332,37 @@ _049B: _04A6: Call _0488 - ScrCmd_05E 0, _06C8 - ScrCmd_05F + ApplyMovement 0, _06C8 + WaitMovement ScrCmd_1B1 0xFF - ScrCmd_05E 0xFF, _06B8 - ScrCmd_05F + ApplyMovement 0xFF, _06B8 + WaitMovement Call _049B - ScrCmd_05E 0, _06D8 - ScrCmd_05F - ScrCmd_05E 0xFF, _06C0 - ScrCmd_05F + ApplyMovement 0, _06D8 + WaitMovement + ApplyMovement 0xFF, _06C0 + WaitMovement Return _04E0: Call _0488 - ScrCmd_05E 0, _070C - ScrCmd_05E 0xFF, _0700 - ScrCmd_05F + ApplyMovement 0, _070C + ApplyMovement 0xFF, _0700 + WaitMovement Call _049B Return _0500: - ScrCmd_05E 0x4000, _0718 - ScrCmd_05F - ScrCmd_05E 0, _06E4 - ScrCmd_05F + ApplyMovement 0x4000, _0718 + WaitMovement + ApplyMovement 0, _06E4 + WaitMovement Call _0488 - ScrCmd_05E 0x4000, _0720 - ScrCmd_05F + ApplyMovement 0x4000, _0720 + WaitMovement Call _049B - ScrCmd_05E 0, _06F4 - ScrCmd_05F + ApplyMovement 0, _06F4 + WaitMovement ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x1ED, 0, 8, 4, 0 @@ -372,7 +372,7 @@ _0500: End _055C: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8000, 12 GoToIf 1, _057D @@ -380,19 +380,19 @@ _055C: End _057D: - ScrCmd_05E 1, _072C - ScrCmd_05F + ApplyMovement 1, _072C + WaitMovement GoTo _0500 End _058F: - ScrCmd_05E 1, _0740 - ScrCmd_05F + ApplyMovement 1, _0740 + WaitMovement GoTo _0500 End _05A1: - ScrCmd_028 0x4000, 2 + SetVar 0x4000, 2 ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8000, 4 GoToIf 1, _05C2 @@ -400,19 +400,19 @@ _05A1: End _05C2: - ScrCmd_05E 2, _0758 - ScrCmd_05F + ApplyMovement 2, _0758 + WaitMovement GoTo _0500 End _05D4: - ScrCmd_05E 2, _0768 - ScrCmd_05F + ApplyMovement 2, _0768 + WaitMovement GoTo _0500 End _05E6: - ScrCmd_028 0x4000, 3 + SetVar 0x4000, 3 ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8001, 7 GoToIf 1, _0607 @@ -420,19 +420,19 @@ _05E6: End _0607: - ScrCmd_05E 3, _0774 - ScrCmd_05F + ApplyMovement 3, _0774 + WaitMovement GoTo _0500 End _0619: - ScrCmd_05E 3, _0784 - ScrCmd_05F + ApplyMovement 3, _0784 + WaitMovement GoTo _0500 End _062B: - ScrCmd_028 0x4000, 4 + SetVar 0x4000, 4 ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8001, 9 GoToIf 1, _064C @@ -440,19 +440,19 @@ _062B: End _064C: - ScrCmd_05E 4, _0790 - ScrCmd_05F + ApplyMovement 4, _0790 + WaitMovement GoTo _0500 End _065E: - ScrCmd_05E 4, _07A4 - ScrCmd_05F + ApplyMovement 4, _07A4 + WaitMovement GoTo _0500 End _0670: - ScrCmd_028 0x4000, 5 + SetVar 0x4000, 5 ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8000, 8 GoToIf 1, _0691 @@ -460,14 +460,14 @@ _0670: End _0691: - ScrCmd_05E 5, _07B8 - ScrCmd_05F + ApplyMovement 5, _07B8 + WaitMovement GoTo _0500 End _06A3: - ScrCmd_05E 5, _07C8 - ScrCmd_05F + ApplyMovement 5, _07C8 + WaitMovement GoTo _0500 .byte 2 diff --git a/res/field/scripts/script_0374.s b/res/field/scripts/script_0374.s index 25171e4956..483d86b4b1 100644 --- a/res/field/scripts/script_0374.s +++ b/res/field/scripts/script_0374.s @@ -370,8 +370,8 @@ _034F: _0360: ScrCmd_060 - ScrCmd_05E 0xFF, _0398 - ScrCmd_05F + ApplyMovement 0xFF, _0398 + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -387,8 +387,8 @@ _0398: _03A0: ScrCmd_060 - ScrCmd_05E 0xFF, _03D8 - ScrCmd_05F + ApplyMovement 0xFF, _03D8 + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -404,8 +404,8 @@ _03D8: _03E0: ScrCmd_060 - ScrCmd_05E 0xFF, _0418 - ScrCmd_05F + ApplyMovement 0xFF, _0418 + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -421,8 +421,8 @@ _0418: _0420: ScrCmd_060 - ScrCmd_05E 0xFF, _0458 - ScrCmd_05F + ApplyMovement 0xFF, _0458 + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD diff --git a/res/field/scripts/script_0375.s b/res/field/scripts/script_0375.s index 3258918ee2..3f1d3f896b 100644 --- a/res/field/scripts/script_0375.s +++ b/res/field/scripts/script_0375.s @@ -22,7 +22,7 @@ _0032: _0038: ScrCmd_060 - ScrCmd_028 0x4113, 1 + SetVar 0x4113, 1 SetFlag 0x290 SetFlag 0x291 Call _02C1 @@ -61,7 +61,7 @@ _0095: ScrCmd_042 14, 4 ScrCmd_042 15, 5 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _010E CompareVarToValue 0x8008, 1 @@ -252,24 +252,24 @@ _02B9: End _02C1: - ScrCmd_05E 3, _0334 - ScrCmd_05E 4, _0334 - ScrCmd_05E 5, _0334 - ScrCmd_05E 6, _0334 - ScrCmd_05E 7, _0334 - ScrCmd_05E 8, _0334 - ScrCmd_05F + ApplyMovement 3, _0334 + ApplyMovement 4, _0334 + ApplyMovement 5, _0334 + ApplyMovement 6, _0334 + ApplyMovement 7, _0334 + ApplyMovement 8, _0334 + WaitMovement Return _02F5: - ScrCmd_05E 3, _033C - ScrCmd_05E 4, _033C - ScrCmd_05E 5, _033C - ScrCmd_05E 6, _0344 - ScrCmd_05E 7, _0344 - ScrCmd_05E 8, _0344 - ScrCmd_05E 0xFF, _034C - ScrCmd_05F + ApplyMovement 3, _033C + ApplyMovement 4, _033C + ApplyMovement 5, _033C + ApplyMovement 6, _0344 + ApplyMovement 7, _0344 + ApplyMovement 8, _0344 + ApplyMovement 0xFF, _034C + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0376.s b/res/field/scripts/script_0376.s index 0316505674..d0afb3e566 100644 --- a/res/field/scripts/script_0376.s +++ b/res/field/scripts/script_0376.s @@ -33,8 +33,8 @@ _0059: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 0 + SetVar 0x4003, 0 + SetVar 0x4004, 0 GoTo _0091 End @@ -42,8 +42,8 @@ _0075: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 1 + SetVar 0x4003, 0 + SetVar 0x4004, 1 GoTo _0091 End @@ -88,7 +88,7 @@ _0139: End _0141: - ScrCmd_028 0x40B7, 0 + SetVar 0x40B7, 0 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -96,17 +96,17 @@ _0141: End _0152: - ScrCmd_028 0x40B8, 0 + SetVar 0x40B8, 0 GoTo _017C End _0160: - ScrCmd_028 0x40B8, 1 + SetVar 0x40B8, 1 GoTo _017C End _016E: - ScrCmd_028 0x40B8, 2 + SetVar 0x40B8, 2 GoTo _017C End @@ -126,12 +126,12 @@ _017C: End _01BA: - ScrCmd_028 0x40B9, 0 + SetVar 0x40B9, 0 GoTo _01D6 End _01C8: - ScrCmd_028 0x40B9, 1 + SetVar 0x40B9, 1 GoTo _01D6 End @@ -144,10 +144,10 @@ _01DE: CallIf 1, _0386 CompareVarToValue 0x40B8, 1 CallIf 1, _0386 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0139 CompareVarToValue 0x40B8, 2 @@ -163,7 +163,7 @@ _022C: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0270 CompareVarToValue 0x8008, 1 @@ -248,7 +248,7 @@ _0368: End _0386: - ScrCmd_028 0x40B7, 0xFF + SetVar 0x40B7, 0xFF Return _038E: @@ -291,18 +291,18 @@ _042E: ScrCmd_02C 9 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _04C8 - ScrCmd_05E 0x800D, _04F0 - ScrCmd_05F + ApplyMovement 0xFF, _04C8 + ApplyMovement 0x800D, _04F0 + WaitMovement Return _0449: ScrCmd_02C 9 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _04C8 - ScrCmd_05E 0x800D, _04F0 - ScrCmd_05F + ApplyMovement 0xFF, _04C8 + ApplyMovement 0x800D, _04F0 + WaitMovement Return _0464: @@ -311,27 +311,27 @@ _0464: ScrCmd_136 ScrCmd_135 169 ScrCmd_034 - ScrCmd_05E 0xFF, _04DC - ScrCmd_05E 0x800D, _0504 - ScrCmd_05F + ApplyMovement 0xFF, _04DC + ApplyMovement 0x800D, _0504 + WaitMovement Return _048A: - ScrCmd_05E 0xFF, _0518 - ScrCmd_05E 0x800D, _0548 - ScrCmd_05F + ApplyMovement 0xFF, _0518 + ApplyMovement 0x800D, _0548 + WaitMovement Return _049E: - ScrCmd_05E 0xFF, _0518 - ScrCmd_05E 0x800D, _0548 - ScrCmd_05F + ApplyMovement 0xFF, _0518 + ApplyMovement 0x800D, _0548 + WaitMovement Return _04B2: - ScrCmd_05E 0xFF, _0530 - ScrCmd_05E 0x800D, _055C - ScrCmd_05F + ApplyMovement 0xFF, _0530 + ApplyMovement 0x800D, _055C + WaitMovement Return .balign 4, 0 @@ -433,8 +433,8 @@ _05AB: _05B0: ScrCmd_313 0 - ScrCmd_028 0x4003, 1 - ScrCmd_028 0x40B7, 0 + SetVar 0x4003, 1 + SetVar 0x40B7, 0 ScrCmd_02C 11 Call _0386 Call _05D7 @@ -477,7 +477,7 @@ _063C: ScrCmd_02C 15 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4050, 2 + SetVar 0x4050, 2 Return _0653: @@ -486,7 +486,7 @@ _0653: ScrCmd_02C 14 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4050, 4 + SetVar 0x4050, 4 ScrCmd_014 0x806 Return diff --git a/res/field/scripts/script_0377.s b/res/field/scripts/script_0377.s index cc2e68631a..bb233e4821 100644 --- a/res/field/scripts/script_0377.s +++ b/res/field/scripts/script_0377.s @@ -90,7 +90,7 @@ _0131: End _013F: - ScrCmd_028 0x4063, 0 + SetVar 0x4063, 0 GoTo _014D End @@ -154,39 +154,39 @@ _0215: Return _0235: - ScrCmd_028 0x4021, 97 + SetVar 0x4021, 97 Return _023D: - ScrCmd_028 0x4021, 0 + SetVar 0x4021, 0 Return _0245: - ScrCmd_028 0x4021, 140 + SetVar 0x4021, 140 Return _024D: - ScrCmd_028 0x4021, 166 + SetVar 0x4021, 166 Return _0255: - ScrCmd_028 0x4021, 167 + SetVar 0x4021, 167 Return _025D: - ScrCmd_028 0x4023, 7 + SetVar 0x4023, 7 Return _0265: - ScrCmd_028 0x4023, 4 + SetVar 0x4023, 4 Return _026D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 0 + SetVar 0x4003, 0 + SetVar 0x4004, 0 GoTo _02A5 End @@ -194,8 +194,8 @@ _0289: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 1 + SetVar 0x4003, 0 + SetVar 0x4004, 1 GoTo _02A5 End @@ -240,7 +240,7 @@ _034D: End _0355: - ScrCmd_028 0x40BA, 0 + SetVar 0x40BA, 0 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -248,7 +248,7 @@ _0355: End _0366: - ScrCmd_028 0x40BB, 0 + SetVar 0x40BB, 0 ScrCmd_2CC 0, 1, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _03CF @@ -256,7 +256,7 @@ _0366: End _0389: - ScrCmd_028 0x40BB, 1 + SetVar 0x40BB, 1 ScrCmd_2CC 0, 2, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _03E2 @@ -264,7 +264,7 @@ _0389: End _03AC: - ScrCmd_028 0x40BB, 2 + SetVar 0x40BB, 2 ScrCmd_2CC 0, 1, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _03CF @@ -321,7 +321,7 @@ _04A2: ScrCmd_046 41, 0xFF, 0 ScrCmd_046 42, 0xFF, 1 ScrCmd_327 6 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _04E4 GoTo _034D @@ -341,10 +341,10 @@ _04FC: CallIf 1, _0673 CompareVarToValue 0x40BB, 1 CallIf 1, _0673 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _034D CompareVarToValue 0x40BB, 2 @@ -360,7 +360,7 @@ _054A: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _058E CompareVarToValue 0x8008, 1 @@ -430,7 +430,7 @@ _0636: End _0673: - ScrCmd_028 0x40BA, 0xFF + SetVar 0x40BA, 0xFF Return _067B: @@ -483,18 +483,18 @@ _0730: ScrCmd_02C 9 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _07D4 - ScrCmd_05E 0x800D, _07FC - ScrCmd_05F + ApplyMovement 0xFF, _07D4 + ApplyMovement 0x800D, _07FC + WaitMovement Return _074B: ScrCmd_02C 9 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _07D4 - ScrCmd_05E 0x800D, _07FC - ScrCmd_05F + ApplyMovement 0xFF, _07D4 + ApplyMovement 0x800D, _07FC + WaitMovement Return _0766: @@ -503,31 +503,31 @@ _0766: ScrCmd_136 ScrCmd_135 109 ScrCmd_034 - ScrCmd_05E 0xFF, _07E4 - ScrCmd_05E 0x800D, _080C - ScrCmd_05F + ApplyMovement 0xFF, _07E4 + ApplyMovement 0x800D, _080C + WaitMovement Return _078C: - ScrCmd_05E 0xFF, _0824 - ScrCmd_05E 0x800D, _0854 - ScrCmd_05F + ApplyMovement 0xFF, _0824 + ApplyMovement 0x800D, _0854 + WaitMovement Return _07A0: - ScrCmd_05E 0xFF, _0824 - ScrCmd_05E 0x800D, _0854 - ScrCmd_05F + ApplyMovement 0xFF, _0824 + ApplyMovement 0x800D, _0854 + WaitMovement Return _07B4: - ScrCmd_05E 0xFF, _0838 - ScrCmd_05E 0x800D, _0864 - ScrCmd_05F + ApplyMovement 0xFF, _0838 + ApplyMovement 0x800D, _0864 + WaitMovement Return _07C8: - ScrCmd_028 0x40BA, 0 + SetVar 0x40BA, 0 ScrCmd_014 0x809 End @@ -628,8 +628,8 @@ _08AF: _08B4: ScrCmd_313 0 - ScrCmd_028 0x4003, 1 - ScrCmd_028 0x40BA, 0 + SetVar 0x4003, 1 + SetVar 0x40BA, 0 ScrCmd_02C 11 Call _0673 Call _08DB @@ -672,7 +672,7 @@ _093E: ScrCmd_02C 15 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4051, 2 + SetVar 0x4051, 2 Return _0955: @@ -681,7 +681,7 @@ _0955: ScrCmd_02C 14 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4051, 4 + SetVar 0x4051, 4 ScrCmd_014 0x806 Return @@ -1045,7 +1045,7 @@ _0D14: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - ScrCmd_029 0x4001, 0x4021 + SetVar 0x4001, 0x4021 CompareVarToValue 0x4001, 0 GoToIf 1, _0D68 CompareVarToValue 0x4001, 97 diff --git a/res/field/scripts/script_0378.s b/res/field/scripts/script_0378.s index a6f9ac0e98..159b79ecbe 100644 --- a/res/field/scripts/script_0378.s +++ b/res/field/scripts/script_0378.s @@ -33,8 +33,8 @@ _0059: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 0 + SetVar 0x4003, 0 + SetVar 0x4004, 0 GoTo _0091 End @@ -42,8 +42,8 @@ _0075: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 1 + SetVar 0x4003, 0 + SetVar 0x4004, 1 GoTo _0091 End @@ -88,7 +88,7 @@ _0139: End _0141: - ScrCmd_028 0x40BC, 0 + SetVar 0x40BC, 0 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -96,7 +96,7 @@ _0141: End _0152: - ScrCmd_028 0x40BD, 0 + SetVar 0x40BD, 0 ScrCmd_2D2 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 @@ -106,7 +106,7 @@ _0152: End _017F: - ScrCmd_028 0x40BD, 1 + SetVar 0x40BD, 1 ScrCmd_2D2 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 @@ -116,7 +116,7 @@ _017F: End _01AC: - ScrCmd_028 0x40BD, 2 + SetVar 0x40BD, 2 ScrCmd_2D2 0, 2, 0x800C ScrCmd_0D5 0, 2 ScrCmd_0D5 1, 2 @@ -173,10 +173,10 @@ _0297: CallIf 1, _043C CompareVarToValue 0x40BD, 1 CallIf 1, _043C - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0139 CompareVarToValue 0x40BD, 2 @@ -192,7 +192,7 @@ _02E5: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0329 CompareVarToValue 0x8008, 1 @@ -252,7 +252,7 @@ _03D1: ScrCmd_198 0x4002, 0x8000 ScrCmd_198 0x4005, 0x8001 ScrCmd_2D3 0x8000, 0x8001, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _0444 CompareVarToValue 0x8008, 2 @@ -269,7 +269,7 @@ _03D1: End _043C: - ScrCmd_028 0x40BC, 0xFF + SetVar 0x40BC, 0xFF Return _0444: @@ -344,18 +344,18 @@ _053D: ScrCmd_02C 32 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _05E4 - ScrCmd_05E 0x800D, _0604 - ScrCmd_05F + ApplyMovement 0xFF, _05E4 + ApplyMovement 0x800D, _0604 + WaitMovement Return _0558: ScrCmd_02C 32 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _05E4 - ScrCmd_05E 0x800D, _0604 - ScrCmd_05F + ApplyMovement 0xFF, _05E4 + ApplyMovement 0x800D, _0604 + WaitMovement Return _0573: @@ -364,31 +364,31 @@ _0573: ScrCmd_136 ScrCmd_135 137 ScrCmd_034 - ScrCmd_05E 0xFF, _05F0 - ScrCmd_05E 0x800D, _0610 - ScrCmd_05F + ApplyMovement 0xFF, _05F0 + ApplyMovement 0x800D, _0610 + WaitMovement Return _0599: - ScrCmd_05E 0xFF, _0624 - ScrCmd_05E 0x800D, _0648 - ScrCmd_05F + ApplyMovement 0xFF, _0624 + ApplyMovement 0x800D, _0648 + WaitMovement Return _05AD: - ScrCmd_05E 0xFF, _0624 - ScrCmd_05E 0x800D, _0648 - ScrCmd_05F + ApplyMovement 0xFF, _0624 + ApplyMovement 0x800D, _0648 + WaitMovement Return _05C1: - ScrCmd_05E 0xFF, _0634 - ScrCmd_05E 0x800D, _0654 - ScrCmd_05F + ApplyMovement 0xFF, _0634 + ApplyMovement 0x800D, _0654 + WaitMovement Return _05D5: - ScrCmd_028 0x40BC, 0 + SetVar 0x40BC, 0 ScrCmd_014 0x809 End @@ -481,8 +481,8 @@ _069F: _06A4: ScrCmd_313 0 - ScrCmd_028 0x4003, 1 - ScrCmd_028 0x40BC, 0 + SetVar 0x4003, 1 + SetVar 0x40BC, 0 ScrCmd_02C 33 Call _043C Call _06CB @@ -525,7 +525,7 @@ _072E: ScrCmd_02C 37 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4052, 2 + SetVar 0x4052, 2 Return _0745: @@ -534,7 +534,7 @@ _0745: ScrCmd_02C 36 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4052, 4 + SetVar 0x4052, 4 ScrCmd_014 0x806 Return diff --git a/res/field/scripts/script_0379.s b/res/field/scripts/script_0379.s index 29f3695816..45c38168fa 100644 --- a/res/field/scripts/script_0379.s +++ b/res/field/scripts/script_0379.s @@ -36,8 +36,8 @@ _0065: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 0 + SetVar 0x4003, 0 + SetVar 0x4004, 0 GoTo _009D End @@ -45,8 +45,8 @@ _0081: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x4003, 0 - ScrCmd_028 0x4004, 1 + SetVar 0x4003, 0 + SetVar 0x4004, 1 GoTo _009D End @@ -91,7 +91,7 @@ _0145: End _014D: - ScrCmd_028 0x40BF, 0 + SetVar 0x40BF, 0 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -99,7 +99,7 @@ _014D: End _015E: - ScrCmd_028 0x40BE, 0 + SetVar 0x40BE, 0 ScrCmd_2D9 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 @@ -109,7 +109,7 @@ _015E: End _018B: - ScrCmd_028 0x40BE, 1 + SetVar 0x40BE, 1 ScrCmd_2D9 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 @@ -119,7 +119,7 @@ _018B: End _01B8: - ScrCmd_028 0x40BE, 2 + SetVar 0x40BE, 2 ScrCmd_2D9 0, 2, 0x800C ScrCmd_0D5 0, 2 ScrCmd_0D5 1, 2 @@ -176,10 +176,10 @@ _02A3: CallIf 1, _0448 CompareVarToValue 0x40BE, 1 CallIf 1, _0448 - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0145 CompareVarToValue 0x40BE, 2 @@ -195,7 +195,7 @@ _02F1: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0335 CompareVarToValue 0x8008, 1 @@ -255,7 +255,7 @@ _03DD: ScrCmd_198 0x4002, 0x8000 ScrCmd_198 0x4005, 0x8001 ScrCmd_2DA 0x8000, 0x8001, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _0450 CompareVarToValue 0x8008, 2 @@ -272,7 +272,7 @@ _03DD: End _0448: - ScrCmd_028 0x40BF, 0xFF + SetVar 0x40BF, 0xFF Return _0450: @@ -347,18 +347,18 @@ _0549: ScrCmd_02C 32 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _05F0 - ScrCmd_05E 0x800D, _0610 - ScrCmd_05F + ApplyMovement 0xFF, _05F0 + ApplyMovement 0x800D, _0610 + WaitMovement Return _0564: ScrCmd_02C 32 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _05F0 - ScrCmd_05E 0x800D, _0610 - ScrCmd_05F + ApplyMovement 0xFF, _05F0 + ApplyMovement 0x800D, _0610 + WaitMovement Return _057F: @@ -367,31 +367,31 @@ _057F: ScrCmd_136 ScrCmd_135 155 ScrCmd_034 - ScrCmd_05E 0xFF, _0604 - ScrCmd_05E 0x800D, _0624 - ScrCmd_05F + ApplyMovement 0xFF, _0604 + ApplyMovement 0x800D, _0624 + WaitMovement Return _05A5: - ScrCmd_05E 0xFF, _0630 - ScrCmd_05E 0x800D, _0658 - ScrCmd_05F + ApplyMovement 0xFF, _0630 + ApplyMovement 0x800D, _0658 + WaitMovement Return _05B9: - ScrCmd_05E 0xFF, _0630 - ScrCmd_05E 0x800D, _0658 - ScrCmd_05F + ApplyMovement 0xFF, _0630 + ApplyMovement 0x800D, _0658 + WaitMovement Return _05CD: - ScrCmd_05E 0xFF, _0648 - ScrCmd_05E 0x800D, _066C - ScrCmd_05F + ApplyMovement 0xFF, _0648 + ApplyMovement 0x800D, _066C + WaitMovement Return _05E1: - ScrCmd_028 0x40BF, 0 + SetVar 0x40BF, 0 ScrCmd_014 0x809 End @@ -486,8 +486,8 @@ _06B3: _06B8: ScrCmd_313 0 - ScrCmd_028 0x4003, 1 - ScrCmd_028 0x40BF, 0 + SetVar 0x4003, 1 + SetVar 0x40BF, 0 ScrCmd_02C 33 Call _0448 Call _06DF @@ -530,7 +530,7 @@ _0742: ScrCmd_02C 37 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4053, 2 + SetVar 0x4053, 2 Return _0759: @@ -539,7 +539,7 @@ _0759: ScrCmd_02C 36 ScrCmd_04E 0x486 ScrCmd_04F - ScrCmd_028 0x4053, 4 + SetVar 0x4053, 4 ScrCmd_014 0x806 Return diff --git a/res/field/scripts/script_0380.s b/res/field/scripts/script_0380.s index a15ad3a503..e453c9bbef 100644 --- a/res/field/scripts/script_0380.s +++ b/res/field/scripts/script_0380.s @@ -39,44 +39,44 @@ _003A: _0070: ScrCmd_060 - ScrCmd_05E 0xFF, _0140 - ScrCmd_05F - ScrCmd_05E 0xFF, _014C - ScrCmd_05F + ApplyMovement 0xFF, _0140 + WaitMovement + ApplyMovement 0xFF, _014C + WaitMovement ScrCmd_311 128 - ScrCmd_05E 128, _017C - ScrCmd_05F + ApplyMovement 128, _017C + WaitMovement ScrCmd_02C 0 ScrCmd_035 - ScrCmd_05E 128, _0198 - ScrCmd_05F + ApplyMovement 128, _0198 + WaitMovement ScrCmd_02C 1 ScrCmd_035 - ScrCmd_05E 128, _01A4 - ScrCmd_05F + ApplyMovement 128, _01A4 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0xFF, _0154 - ScrCmd_05E 128, _01AC - ScrCmd_05F + ApplyMovement 0xFF, _0154 + ApplyMovement 128, _01AC + WaitMovement ScrCmd_321 0 - ScrCmd_05E 0xFF, _0160 - ScrCmd_05E 128, _01B4 - ScrCmd_05F + ApplyMovement 0xFF, _0160 + ApplyMovement 128, _01B4 + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_322 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 0xFF, _0174 - ScrCmd_05E 128, _01C4 - ScrCmd_05F + ApplyMovement 0xFF, _0174 + ApplyMovement 128, _01C4 + WaitMovement ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 128, _01CC - ScrCmd_05F + ApplyMovement 128, _01CC + WaitMovement ScrCmd_312 128 - ScrCmd_028 0x4055, 1 + SetVar 0x4055, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0381.s b/res/field/scripts/script_0381.s index b6132a22cd..9666e7f546 100644 --- a/res/field/scripts/script_0381.s +++ b/res/field/scripts/script_0381.s @@ -13,16 +13,16 @@ _000E: _0012: ScrCmd_060 - ScrCmd_05E 0xFF, _0078 - ScrCmd_05E 128, _00A8 - ScrCmd_05F + ApplyMovement 0xFF, _0078 + ApplyMovement 128, _00A8 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 128, _00B4 - ScrCmd_05E 0xFF, _0080 - ScrCmd_05F + ApplyMovement 128, _00B4 + ApplyMovement 0xFF, _0080 + WaitMovement ScrCmd_312 128 - ScrCmd_028 0x4055, 3 + SetVar 0x4055, 3 ScrCmd_061 End @@ -33,9 +33,9 @@ _004B: ScrCmd_034 ScrCmd_04D ScrCmd_311 129 - ScrCmd_05E 0xFF, _0090 - ScrCmd_05E 129, _00D8 - ScrCmd_05F + ApplyMovement 0xFF, _0090 + ApplyMovement 129, _00D8 + WaitMovement ScrCmd_312 129 ScrCmd_061 End diff --git a/res/field/scripts/script_0382.s b/res/field/scripts/script_0382.s index 9f156d44f1..9d95d02935 100644 --- a/res/field/scripts/script_0382.s +++ b/res/field/scripts/script_0382.s @@ -19,24 +19,24 @@ _0012: ScrCmd_317 0x8004, 0x8005, 0x8006 CompareVarToValue 0x8005, 232 GoToIf 1, _0059 - ScrCmd_05E 128, _00DC - ScrCmd_05F + ApplyMovement 128, _00DC + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 128, _00E4 - ScrCmd_05F + ApplyMovement 128, _00E4 + WaitMovement GoTo _007A _0059: - ScrCmd_05E 128, _00F0 - ScrCmd_05F + ApplyMovement 128, _00F0 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 128, _00F8 - ScrCmd_05E 0xFF, _011C - ScrCmd_05F + ApplyMovement 128, _00F8 + ApplyMovement 0xFF, _011C + WaitMovement _007A: - ScrCmd_028 0x4055, 5 + SetVar 0x4055, 5 ScrCmd_061 End @@ -46,18 +46,18 @@ _0084: GoToIf 1, _00B6 CompareVarToValue 0x8005, 232 GoToIf 1, _00C6 - ScrCmd_05E 128, _0104 - ScrCmd_05F + ApplyMovement 128, _0104 + WaitMovement GoTo _00D0 _00B6: - ScrCmd_05E 128, _010C - ScrCmd_05F + ApplyMovement 128, _010C + WaitMovement GoTo _00D0 _00C6: - ScrCmd_05E 128, _0114 - ScrCmd_05F + ApplyMovement 128, _0114 + WaitMovement _00D0: ScrCmd_02C 1 ScrCmd_031 diff --git a/res/field/scripts/script_0383.s b/res/field/scripts/script_0383.s index 0bfd9e0d22..41df3fe801 100644 --- a/res/field/scripts/script_0383.s +++ b/res/field/scripts/script_0383.s @@ -13,8 +13,8 @@ _000A: _000E: ScrCmd_060 ScrCmd_311 128 - ScrCmd_05E 128, _0060 - ScrCmd_05F + ApplyMovement 128, _0060 + WaitMovement ScrCmd_02C 0 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 @@ -28,10 +28,10 @@ _003E: ScrCmd_02C 3 ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 128, _0068 - ScrCmd_05F + ApplyMovement 128, _0068 + WaitMovement ScrCmd_312 128 - ScrCmd_028 0x4055, 6 + SetVar 0x4055, 6 ScrCmd_061 End diff --git a/res/field/scripts/script_0387.s b/res/field/scripts/script_0387.s index f00b65e62b..03f6ed470b 100644 --- a/res/field/scripts/script_0387.s +++ b/res/field/scripts/script_0387.s @@ -37,11 +37,11 @@ _0051: ScrCmd_02C 4 ScrCmd_034 SetFlag 0x977 - ScrCmd_05E 134, _0108 - ScrCmd_05F - ScrCmd_05E 134, _011C - ScrCmd_05F - ScrCmd_028 0x4055, 7 + ApplyMovement 134, _0108 + WaitMovement + ApplyMovement 134, _011C + WaitMovement + SetVar 0x4055, 7 ScrCmd_061 End @@ -61,8 +61,8 @@ _0093: ScrCmd_02C 0 ScrCmd_034 ScrCmd_04D - ScrCmd_05E 131, _0130 - ScrCmd_05F + ApplyMovement 131, _0130 + WaitMovement ScrCmd_312 131 ScrCmd_061 End @@ -73,8 +73,8 @@ _00B4: ScrCmd_02C 1 ScrCmd_034 ScrCmd_04D - ScrCmd_05E 132, _0130 - ScrCmd_05F + ApplyMovement 132, _0130 + WaitMovement ScrCmd_312 132 ScrCmd_061 End @@ -85,8 +85,8 @@ _00D5: ScrCmd_02C 2 ScrCmd_034 ScrCmd_04D - ScrCmd_05E 133, _0130 - ScrCmd_05F + ApplyMovement 133, _0130 + WaitMovement ScrCmd_312 133 ScrCmd_061 End diff --git a/res/field/scripts/script_0388.s b/res/field/scripts/script_0388.s index 1fd2f944d8..bf9469e26c 100644 --- a/res/field/scripts/script_0388.s +++ b/res/field/scripts/script_0388.s @@ -24,23 +24,23 @@ _001E: _0044: ScrCmd_060 - ScrCmd_05E 128, _028C - ScrCmd_05E 0xFF, _0204 - ScrCmd_05F + ApplyMovement 128, _028C + ApplyMovement 0xFF, _0204 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 128, _029C - ScrCmd_05F - ScrCmd_028 0x4055, 8 + ApplyMovement 128, _029C + WaitMovement + SetVar 0x4055, 8 End _006F: ScrCmd_060 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 129, _0308 - ScrCmd_05E 128, _02AC - ScrCmd_05F + ApplyMovement 129, _0308 + ApplyMovement 128, _02AC + WaitMovement ScrCmd_02C 2 ScrCmd_02C 4 ScrCmd_032 @@ -58,73 +58,73 @@ _0096: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _01CE - ScrCmd_028 0x4055, 10 + SetVar 0x4055, 10 ScrCmd_02C 6 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 86 GoToIf 1, _00E6 - ScrCmd_05E 0xFF, _0210 + ApplyMovement 0xFF, _0210 GoTo _00EE _00E6: - ScrCmd_05E 0xFF, _0248 + ApplyMovement 0xFF, _0248 _00EE: - ScrCmd_05E 129, _0314 - ScrCmd_05E 128, _02DC - ScrCmd_05F + ApplyMovement 129, _0314 + ApplyMovement 128, _02DC + WaitMovement ScrCmd_312 129 - ScrCmd_05E 128, _02BC - ScrCmd_05F + ApplyMovement 128, _02BC + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 74 GoToIf 1, _012F - ScrCmd_05E 0xFF, _0254 + ApplyMovement 0xFF, _0254 GoTo _013F _012F: - ScrCmd_05E 128, _02E8 - ScrCmd_05E 0xFF, _0264 + ApplyMovement 128, _02E8 + ApplyMovement 0xFF, _0264 _013F: ScrCmd_02C 7 - ScrCmd_05F + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 74 GoToIf 1, _016D - ScrCmd_05E 128, _02F8 - ScrCmd_05E 0xFF, _0274 + ApplyMovement 128, _02F8 + ApplyMovement 0xFF, _0274 GoTo _017D _016D: - ScrCmd_05E 128, _0300 - ScrCmd_05E 0xFF, _0280 + ApplyMovement 128, _0300 + ApplyMovement 0xFF, _0280 _017D: ScrCmd_0CD 0 ScrCmd_02C 8 ScrCmd_04E 0x48E ScrCmd_04F ScrCmd_14E - ScrCmd_05F + WaitMovement ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 128, _02C8 + ApplyMovement 128, _02C8 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 74 GoToIf 1, _01BB - ScrCmd_05E 0xFF, _0220 + ApplyMovement 0xFF, _0220 GoTo _01C3 _01BB: - ScrCmd_05E 0xFF, _0234 + ApplyMovement 0xFF, _0234 _01C3: - ScrCmd_05F + WaitMovement ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 End _01CE: - ScrCmd_028 0x4055, 9 + SetVar 0x4055, 9 ScrCmd_0EB ScrCmd_061 End diff --git a/res/field/scripts/script_0389.s b/res/field/scripts/script_0389.s index 805cbc9442..15c4146ee6 100644 --- a/res/field/scripts/script_0389.s +++ b/res/field/scripts/script_0389.s @@ -23,7 +23,7 @@ _0026: _0033: ScrCmd_31F - ScrCmd_028 0x4055, 14 + SetVar 0x4055, 14 ScrCmd_065 128 End @@ -43,7 +43,7 @@ _0061: ScrCmd_02C 14 ScrCmd_034 ScrCmd_270 2, 1 - ScrCmd_028 0x40AA, 1 + SetVar 0x40AA, 1 ScrCmd_049 0x5D2 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -84,8 +84,8 @@ _00C4: GoToIf 1, _016E ScrCmd_311 130 ScrCmd_311 129 - ScrCmd_05E 129, _0250 - ScrCmd_05F + ApplyMovement 129, _0250 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_02C 4 @@ -94,8 +94,8 @@ _00C4: _014E: ScrCmd_311 130 ScrCmd_311 129 - ScrCmd_05E 129, _0250 - ScrCmd_05F + ApplyMovement 129, _0250 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_02C 6 @@ -107,8 +107,8 @@ _016E: ClearFlag 0x278 ScrCmd_311 130 ScrCmd_311 129 - ScrCmd_05E 129, _0250 - ScrCmd_05F + ApplyMovement 129, _0250 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_02C 5 @@ -116,25 +116,25 @@ _0194: ScrCmd_034 ScrCmd_069 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 - ScrCmd_05E 241, _0280 - ScrCmd_05E 130, _026C - ScrCmd_05E 129, _0258 - ScrCmd_05E 0xFF, _0244 - ScrCmd_05F + ApplyMovement 241, _0280 + ApplyMovement 130, _026C + ApplyMovement 129, _0258 + ApplyMovement 0xFF, _0244 + WaitMovement ScrCmd_02C 7 ScrCmd_02C 8 ScrCmd_02C 9 ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 130, _0274 - ScrCmd_05F + ApplyMovement 130, _0274 + WaitMovement ScrCmd_312 130 - ScrCmd_05E 241, _0288 - ScrCmd_05F + ApplyMovement 241, _0288 + WaitMovement ScrCmd_067 ScrCmd_02C 11 - ScrCmd_05E 129, _0264 - ScrCmd_05F + ApplyMovement 129, _0264 + WaitMovement ScrCmd_02C 12 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0392.s b/res/field/scripts/script_0392.s index 494da6e14d..7992827ee7 100644 --- a/res/field/scripts/script_0392.s +++ b/res/field/scripts/script_0392.s @@ -19,7 +19,7 @@ _0026: End _0035: - ScrCmd_028 0x4069, 0 + SetVar 0x4069, 0 End _003D: @@ -41,7 +41,7 @@ _003D: GoToIf 0, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x4069, 0x10E + SetVar 0x4069, 0x10E ScrCmd_02C 1 GoTo _0125 End @@ -58,7 +58,7 @@ _00AE: ScrCmd_2BC 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _00F8 - ScrCmd_028 0x4069, 0x122 + SetVar 0x4069, 0x122 ScrCmd_061 End @@ -68,7 +68,7 @@ _00ED: End _00F8: - ScrCmd_028 0x4069, 0x118 + SetVar 0x4069, 0x118 ScrCmd_02C 3 GoTo _0125 End @@ -95,49 +95,49 @@ _0125: End _012D: - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _0148: - ScrCmd_028 0x4002, 1 + SetVar 0x4002, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _0163: - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _017E: - ScrCmd_028 0x4004, 1 + SetVar 0x4004, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _0199: - ScrCmd_028 0x4005, 1 + SetVar 0x4005, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _01B4: - ScrCmd_028 0x4006, 1 + SetVar 0x4006, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA End _01CF: - ScrCmd_028 0x4007, 1 + SetVar 0x4007, 1 CompareVarToValue 0x4069, 0x104 GoToIf 4, _020D GoTo _01EA @@ -160,7 +160,7 @@ _020F: GoToIf 0, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x4069, 0x10E + SetVar 0x4069, 0x10E ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0394.s b/res/field/scripts/script_0394.s index 97ab6dba0d..70551f9549 100644 --- a/res/field/scripts/script_0394.s +++ b/res/field/scripts/script_0394.s @@ -19,7 +19,7 @@ _0026: End _0035: - ScrCmd_028 0x406A, 0 + SetVar 0x406A, 0 End _003D: @@ -41,7 +41,7 @@ _003D: GoToIf 0, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x406A, 0x10E + SetVar 0x406A, 0x10E ScrCmd_02C 1 GoTo _0125 End @@ -58,7 +58,7 @@ _00AE: ScrCmd_2BC 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _00F8 - ScrCmd_028 0x406A, 0x122 + SetVar 0x406A, 0x122 ScrCmd_061 End @@ -68,7 +68,7 @@ _00ED: End _00F8: - ScrCmd_028 0x406A, 0x118 + SetVar 0x406A, 0x118 ScrCmd_02C 3 GoTo _0125 End @@ -95,49 +95,49 @@ _0125: End _012D: - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _0148: - ScrCmd_028 0x4002, 1 + SetVar 0x4002, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _0163: - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _017E: - ScrCmd_028 0x4004, 1 + SetVar 0x4004, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _0199: - ScrCmd_028 0x4005, 1 + SetVar 0x4005, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _01B4: - ScrCmd_028 0x4006, 1 + SetVar 0x4006, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA End _01CF: - ScrCmd_028 0x4007, 1 + SetVar 0x4007, 1 CompareVarToValue 0x406A, 0x104 GoToIf 4, _020D GoTo _01EA @@ -160,7 +160,7 @@ _020F: GoToIf 0, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x406A, 0x10E + SetVar 0x406A, 0x10E ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0396.s b/res/field/scripts/script_0396.s index aae04ced3e..9aa9aa534c 100644 --- a/res/field/scripts/script_0396.s +++ b/res/field/scripts/script_0396.s @@ -19,7 +19,7 @@ _0026: End _0035: - ScrCmd_028 0x406B, 0 + SetVar 0x406B, 0 End _003D: @@ -41,7 +41,7 @@ _003D: GoToIf 0, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x406B, 0x10E + SetVar 0x406B, 0x10E ScrCmd_02C 1 GoTo _0125 End @@ -58,7 +58,7 @@ _00AE: ScrCmd_2BC 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _00F8 - ScrCmd_028 0x406B, 0x122 + SetVar 0x406B, 0x122 ScrCmd_061 End @@ -68,7 +68,7 @@ _00ED: End _00F8: - ScrCmd_028 0x406B, 0x118 + SetVar 0x406B, 0x118 ScrCmd_02C 3 GoTo _0125 End @@ -95,49 +95,49 @@ _0125: End _012D: - ScrCmd_028 0x4001, 1 + SetVar 0x4001, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _0148: - ScrCmd_028 0x4002, 1 + SetVar 0x4002, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _0163: - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _017E: - ScrCmd_028 0x4004, 1 + SetVar 0x4004, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _0199: - ScrCmd_028 0x4005, 1 + SetVar 0x4005, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _01B4: - ScrCmd_028 0x4006, 1 + SetVar 0x4006, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA End _01CF: - ScrCmd_028 0x4007, 1 + SetVar 0x4007, 1 CompareVarToValue 0x406B, 0x104 GoToIf 4, _020D GoTo _01EA @@ -160,7 +160,7 @@ _020F: GoToIf 0, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 - ScrCmd_028 0x406B, 0x10E + SetVar 0x406B, 0x10E ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0397.s b/res/field/scripts/script_0397.s index f2b43265c5..2c6b5ab516 100644 --- a/res/field/scripts/script_0397.s +++ b/res/field/scripts/script_0397.s @@ -14,27 +14,27 @@ _0022: SetFlag 0x1A7 - ScrCmd_028 0x40D0, 1 + SetVar 0x40D0, 1 End _002E: ClearFlag 0x178 ClearFlag 0x179 - ScrCmd_028 0x4095, 1 - ScrCmd_028 0x4082, 2 + SetVar 0x4095, 1 + SetVar 0x4082, 2 ClearFlag 0x195 - ScrCmd_028 0x4086, 2 - ScrCmd_028 0x40A4, 3 + SetVar 0x4086, 2 + SetVar 0x40A4, 3 End _0054: - ScrCmd_028 0x4057, 1 + SetVar 0x4057, 1 End _005C: ClearFlag 0x194 ClearFlag 0x175 - ScrCmd_028 0x4095, 1 + SetVar 0x4095, 1 SetFlag 0x196 SetFlag 0x1AE ClearFlag 0x293 @@ -42,8 +42,8 @@ _005C: _0078: SetFlag 0x23F - ScrCmd_028 0x40F0, 1 - ScrCmd_028 0x40D4, 1 + SetVar 0x40F0, 1 + SetVar 0x40D4, 1 End _008A: @@ -53,7 +53,7 @@ _008C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 GoTo _00B8 End @@ -61,7 +61,7 @@ _00A2: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 GoTo _00B8 End @@ -130,12 +130,12 @@ _0188: End _01C3: - ScrCmd_028 0x8006, 0 + SetVar 0x8006, 0 GoTo _01DF End _01D1: - ScrCmd_028 0x8006, 1 + SetVar 0x8006, 1 GoTo _01DF End @@ -148,9 +148,9 @@ _01DF: End _01FB: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0175 GoTo _0220 diff --git a/res/field/scripts/script_0400.s b/res/field/scripts/script_0400.s index 4af8317f8d..80d62f5f7b 100644 --- a/res/field/scripts/script_0400.s +++ b/res/field/scripts/script_0400.s @@ -162,51 +162,51 @@ _02C5: _0326: ClearFlag 0x183 - ScrCmd_028 0x402A, 35 + SetVar 0x402A, 35 Return _0332: ClearFlag 0x183 ClearFlag 0x184 - ScrCmd_028 0x402A, 22 - ScrCmd_028 0x402B, 23 + SetVar 0x402A, 22 + SetVar 0x402B, 23 Return _0348: ClearFlag 0x183 ClearFlag 0x184 - ScrCmd_028 0x402A, 22 - ScrCmd_028 0x402B, 23 + SetVar 0x402A, 22 + SetVar 0x402B, 23 Return _035E: ClearFlag 0x183 - ScrCmd_028 0x402A, 43 + SetVar 0x402A, 43 Return _036A: ClearFlag 0x183 ClearFlag 0x184 - ScrCmd_028 0x402A, 22 - ScrCmd_028 0x402B, 23 + SetVar 0x402A, 22 + SetVar 0x402B, 23 Return _0380: ClearFlag 0x183 - ScrCmd_028 0x402A, 71 + SetVar 0x402A, 71 Return _038C: ClearFlag 0x183 - ScrCmd_028 0x402A, 10 + SetVar 0x402A, 10 Return _0398: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 0 - ScrCmd_028 0x8006, 0 + SetVar 0x8004, 0 + SetVar 0x8006, 0 CompareVarToValue 0x402A, 35 CallIf 1, _1331 CompareVarToValue 0x402A, 22 @@ -228,8 +228,8 @@ _040F: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 1 - ScrCmd_028 0x8006, 0 + SetVar 0x8004, 1 + SetVar 0x8006, 0 CompareVarToValue 0x402B, 35 CallIf 1, _1331 CompareVarToValue 0x402B, 23 @@ -248,7 +248,7 @@ _040F: End _0486: - ScrCmd_028 0x8000, 1 + SetVar 0x8000, 1 ScrCmd_201 0x4001 CompareVarToValue 0x4001, 69 CallIf 1, _05B9 @@ -1173,7 +1173,7 @@ _105B: Return _1060: - ScrCmd_028 0x8005, 0x173 + SetVar 0x8005, 0x173 CheckFlag 0x97F CallIf 1, _109F CheckFlag 0x980 @@ -1187,27 +1187,27 @@ _1060: Return _109F: - ScrCmd_028 0x8005, 0x370 + SetVar 0x8005, 0x370 Return _10A7: - ScrCmd_028 0x8005, 0x371 + SetVar 0x8005, 0x371 Return _10AF: - ScrCmd_028 0x8005, 0x372 + SetVar 0x8005, 0x372 Return _10B7: - ScrCmd_028 0x8005, 0x38C + SetVar 0x8005, 0x38C Return _10BF: - ScrCmd_028 0x8005, 0x394 + SetVar 0x8005, 0x394 Return _10C7: - ScrCmd_028 0x8005, 0x172 + SetVar 0x8005, 0x172 CheckFlag 0x97F CallIf 1, _1106 CheckFlag 0x980 @@ -1221,27 +1221,27 @@ _10C7: Return _1106: - ScrCmd_028 0x8005, 0x37E + SetVar 0x8005, 0x37E Return _110E: - ScrCmd_028 0x8005, 0x37F + SetVar 0x8005, 0x37F Return _1116: - ScrCmd_028 0x8005, 0x380 + SetVar 0x8005, 0x380 Return _111E: - ScrCmd_028 0x8005, 0x390 + SetVar 0x8005, 0x390 Return _1126: - ScrCmd_028 0x8005, 0x398 + SetVar 0x8005, 0x398 Return _112E: - ScrCmd_028 0x8005, 0x171 + SetVar 0x8005, 0x171 CheckFlag 0x97F CallIf 1, _116D CheckFlag 0x980 @@ -1255,27 +1255,27 @@ _112E: Return _116D: - ScrCmd_028 0x8005, 0x36A + SetVar 0x8005, 0x36A Return _1175: - ScrCmd_028 0x8005, 0x36B + SetVar 0x8005, 0x36B Return _117D: - ScrCmd_028 0x8005, 0x36C + SetVar 0x8005, 0x36C Return _1185: - ScrCmd_028 0x8005, 0x38A + SetVar 0x8005, 0x38A Return _118D: - ScrCmd_028 0x8005, 0x392 + SetVar 0x8005, 0x392 Return _1195: - ScrCmd_028 0x8005, 0x1CC + SetVar 0x8005, 0x1CC CheckFlag 0x97F CallIf 1, _11D4 CheckFlag 0x980 @@ -1289,27 +1289,27 @@ _1195: Return _11D4: - ScrCmd_028 0x8005, 0x376 + SetVar 0x8005, 0x376 Return _11DC: - ScrCmd_028 0x8005, 0x377 + SetVar 0x8005, 0x377 Return _11E4: - ScrCmd_028 0x8005, 0x378 + SetVar 0x8005, 0x378 Return _11EC: - ScrCmd_028 0x8005, 0x38E + SetVar 0x8005, 0x38E Return _11F4: - ScrCmd_028 0x8005, 0x396 + SetVar 0x8005, 0x396 Return _11FC: - ScrCmd_028 0x8005, 0x170 + SetVar 0x8005, 0x170 CheckFlag 0x97F CallIf 1, _123B CheckFlag 0x980 @@ -1323,27 +1323,27 @@ _11FC: Return _123B: - ScrCmd_028 0x8005, 0x373 + SetVar 0x8005, 0x373 Return _1243: - ScrCmd_028 0x8005, 0x374 + SetVar 0x8005, 0x374 Return _124B: - ScrCmd_028 0x8005, 0x375 + SetVar 0x8005, 0x375 Return _1253: - ScrCmd_028 0x8005, 0x38D + SetVar 0x8005, 0x38D Return _125B: - ScrCmd_028 0x8005, 0x395 + SetVar 0x8005, 0x395 Return _1263: - ScrCmd_028 0x8005, 0x1D1 + SetVar 0x8005, 0x1D1 CheckFlag 0x97F CallIf 1, _12A2 CheckFlag 0x980 @@ -1357,27 +1357,27 @@ _1263: Return _12A2: - ScrCmd_028 0x8005, 0x379 + SetVar 0x8005, 0x379 Return _12AA: - ScrCmd_028 0x8005, 0x37A + SetVar 0x8005, 0x37A Return _12B2: - ScrCmd_028 0x8005, 0x37B + SetVar 0x8005, 0x37B Return _12BA: - ScrCmd_028 0x8005, 0x38F + SetVar 0x8005, 0x38F Return _12C2: - ScrCmd_028 0x8005, 0x397 + SetVar 0x8005, 0x397 Return _12CA: - ScrCmd_028 0x8005, 0x1AF + SetVar 0x8005, 0x1AF CheckFlag 0x97F CallIf 1, _1309 CheckFlag 0x980 @@ -1391,23 +1391,23 @@ _12CA: Return _1309: - ScrCmd_028 0x8005, 0x36D + SetVar 0x8005, 0x36D Return _1311: - ScrCmd_028 0x8005, 0x36E + SetVar 0x8005, 0x36E Return _1319: - ScrCmd_028 0x8005, 0x36F + SetVar 0x8005, 0x36F Return _1321: - ScrCmd_028 0x8005, 0x38B + SetVar 0x8005, 0x38B Return _1329: - ScrCmd_028 0x8005, 0x393 + SetVar 0x8005, 0x393 Return _1331: @@ -1469,7 +1469,7 @@ _13EA: Return _13F7: - ScrCmd_028 0x8006, 1 + SetVar 0x8006, 1 Return .byte 0 diff --git a/res/field/scripts/script_0404.s b/res/field/scripts/script_0404.s index 293ac96c93..b8f305e4fe 100644 --- a/res/field/scripts/script_0404.s +++ b/res/field/scripts/script_0404.s @@ -333,1964 +333,1964 @@ .short 0xFD13 _0522: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _0536: - ScrCmd_028 0x8008, 79 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 79 + SetVar 0x8009, 1 GoTo _1EAE End _054A: - ScrCmd_028 0x8008, 4 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 4 + SetVar 0x8009, 1 GoTo _1EAE End _055E: - ScrCmd_028 0x8008, 0x148 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x148 + SetVar 0x8009, 1 GoTo _1EAE End _0572: - ScrCmd_028 0x8008, 0x166 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x166 + SetVar 0x8009, 1 GoTo _1EAE End _0586: - ScrCmd_028 0x8008, 0x18D - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x18D + SetVar 0x8009, 1 GoTo _1EAE End _059A: - ScrCmd_028 0x8008, 0x131 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x131 + SetVar 0x8009, 1 GoTo _1EAE End _05AE: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _05C2: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _05D6: - ScrCmd_028 0x8008, 254 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 254 + SetVar 0x8009, 1 GoTo _1EAE End _05EA: - ScrCmd_028 0x8008, 45 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 45 + SetVar 0x8009, 1 GoTo _1EAE End _05FE: - ScrCmd_028 0x8008, 0x16E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16E + SetVar 0x8009, 1 GoTo _1EAE End _0612: - ScrCmd_028 0x8008, 0x13F - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13F + SetVar 0x8009, 1 GoTo _1EAE End _0626: - ScrCmd_028 0x8008, 0x14A - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x14A + SetVar 0x8009, 1 GoTo _1EAE End _063A: - ScrCmd_028 0x8008, 0x150 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x150 + SetVar 0x8009, 1 GoTo _1EAE End _064E: - ScrCmd_028 0x8008, 0x15F - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x15F + SetVar 0x8009, 1 GoTo _1EAE End _0662: - ScrCmd_028 0x8008, 14 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 14 + SetVar 0x8009, 1 GoTo _1EAE End _0676: - ScrCmd_028 0x8008, 62 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 62 + SetVar 0x8009, 1 GoTo _1EAE End _068A: - ScrCmd_028 0x8008, 18 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 18 + SetVar 0x8009, 1 GoTo _1EAE End _069E: - ScrCmd_028 0x8008, 22 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 22 + SetVar 0x8009, 1 GoTo _1EAE End _06B2: - ScrCmd_028 0x8008, 6 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 6 + SetVar 0x8009, 1 GoTo _1EAE End _06C6: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _06DA: - ScrCmd_028 0x8008, 54 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 54 + SetVar 0x8009, 1 GoTo _1EAE End _06EE: - ScrCmd_028 0x8008, 55 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 55 + SetVar 0x8009, 1 GoTo _1EAE End _0702: - ScrCmd_028 0x8008, 0x175 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x175 + SetVar 0x8009, 1 GoTo _1EAE End _0716: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _072A: - ScrCmd_028 0x8008, 26 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 26 + SetVar 0x8009, 1 GoTo _1EAE End _073E: - ScrCmd_028 0x8008, 0x153 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x153 + SetVar 0x8009, 1 GoTo _1EAE End _0752: - ScrCmd_028 0x8008, 0x199 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x199 + SetVar 0x8009, 1 GoTo _1EAE End _0766: - ScrCmd_028 0x8008, 222 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 222 + SetVar 0x8009, 1 GoTo _1EAE End _077A: - ScrCmd_028 0x8008, 245 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 245 + SetVar 0x8009, 1 GoTo _1EAE End _078E: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _07A2: - ScrCmd_028 0x8008, 76 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 76 + SetVar 0x8009, 1 GoTo _1EAE End _07B6: - ScrCmd_028 0x8008, 19 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 19 + SetVar 0x8009, 1 GoTo _1EAE End _07CA: - ScrCmd_028 0x8008, 0x167 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x167 + SetVar 0x8009, 1 GoTo _1EAE End _07DE: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _07F2: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _0806: - ScrCmd_028 0x8008, 135 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 135 + SetVar 0x8009, 1 GoTo _1EAE End _081A: - ScrCmd_028 0x8008, 0x161 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x161 + SetVar 0x8009, 1 GoTo _1EAE End _082E: - ScrCmd_028 0x8008, 136 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 136 + SetVar 0x8009, 1 GoTo _1EAE End _0842: - ScrCmd_028 0x8008, 39 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 39 + SetVar 0x8009, 1 GoTo _1EAE End _0856: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _086A: - ScrCmd_028 0x8008, 0x11E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x11E + SetVar 0x8009, 1 GoTo _1EAE End _087E: - ScrCmd_028 0x8008, 4 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 4 + SetVar 0x8009, 1 GoTo _1EAE End _0892: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _08A6: - ScrCmd_028 0x8008, 47 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 47 + SetVar 0x8009, 1 GoTo _1EAE End _08BA: - ScrCmd_028 0x8008, 46 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 46 + SetVar 0x8009, 1 GoTo _1EAE End _08CE: - ScrCmd_028 0x8008, 109 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 109 + SetVar 0x8009, 1 GoTo _1EAE End _08E2: - ScrCmd_028 0x8008, 48 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 48 + SetVar 0x8009, 1 GoTo _1EAE End _08F6: - ScrCmd_028 0x8008, 3 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 3 + SetVar 0x8009, 1 GoTo _1EAE End _090A: - ScrCmd_028 0x8008, 38 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 38 + SetVar 0x8009, 1 GoTo _1EAE End _091E: - ScrCmd_028 0x8008, 0x174 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x174 + SetVar 0x8009, 1 GoTo _1EAE End _0932: - ScrCmd_028 0x8008, 0x172 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x172 + SetVar 0x8009, 1 GoTo _1EAE End _0946: - ScrCmd_028 0x8008, 0x136 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x136 + SetVar 0x8009, 1 GoTo _1EAE End _095A: - ScrCmd_028 0x8008, 0x152 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x152 + SetVar 0x8009, 1 GoTo _1EAE End _096E: - ScrCmd_028 0x8008, 0x13E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13E + SetVar 0x8009, 1 GoTo _1EAE End _0982: - ScrCmd_028 0x8008, 40 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 40 + SetVar 0x8009, 1 GoTo _1EAE End _0996: - ScrCmd_028 0x8008, 0x19E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x19E + SetVar 0x8009, 1 GoTo _1EAE End _09AA: - ScrCmd_028 0x8008, 11 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 11 + SetVar 0x8009, 1 GoTo _1EAE End _09BE: - ScrCmd_028 0x8008, 27 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 27 + SetVar 0x8009, 1 GoTo _1EAE End _09D2: - ScrCmd_028 0x8008, 0x19B - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x19B + SetVar 0x8009, 1 GoTo _1EAE End _09E6: - ScrCmd_028 0x8008, 0x185 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x185 + SetVar 0x8009, 1 GoTo _1EAE End _09FA: - ScrCmd_028 0x8008, 52 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 52 + SetVar 0x8009, 1 GoTo _1EAE End _0A0E: - ScrCmd_028 0x8008, 25 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 25 + SetVar 0x8009, 1 GoTo _1EAE End _0A22: - ScrCmd_028 0x8008, 0x14D - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x14D + SetVar 0x8009, 1 GoTo _1EAE End _0A36: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _0A4A: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _0A5E: - ScrCmd_028 0x8008, 4 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 4 + SetVar 0x8009, 1 GoTo _1EAE End _0A72: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _0A86: - ScrCmd_028 0x8008, 4 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 4 + SetVar 0x8009, 1 GoTo _1EAE End _0A9A: - ScrCmd_028 0x8008, 3 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 3 + SetVar 0x8009, 1 GoTo _1EAE End _0AAE: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _0AC2: - ScrCmd_028 0x8008, 3 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 3 + SetVar 0x8009, 1 GoTo _1EAE End _0AD6: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _0AEA: - ScrCmd_028 0x8008, 243 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 243 + SetVar 0x8009, 1 GoTo _1EAE End _0AFE: - ScrCmd_028 0x8008, 0x14C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x14C + SetVar 0x8009, 1 GoTo _1EAE End _0B12: - ScrCmd_028 0x8008, 0x16F - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16F + SetVar 0x8009, 1 GoTo _1EAE End _0B26: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _0B3A: - ScrCmd_028 0x8008, 29 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 29 + SetVar 0x8009, 1 GoTo _1EAE End _0B4E: - ScrCmd_028 0x8008, 84 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 84 + SetVar 0x8009, 1 GoTo _1EAE End _0B62: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _0B76: - ScrCmd_028 0x8008, 46 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 46 + SetVar 0x8009, 1 GoTo _1EAE End _0B8A: - ScrCmd_028 0x8008, 22 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 22 + SetVar 0x8009, 1 GoTo _1EAE End _0B9E: - ScrCmd_028 0x8008, 0x19C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x19C + SetVar 0x8009, 1 GoTo _1EAE End _0BB2: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _0BC6: - ScrCmd_028 0x8008, 38 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 38 + SetVar 0x8009, 1 GoTo _1EAE End _0BDA: - ScrCmd_028 0x8008, 3 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 3 + SetVar 0x8009, 1 GoTo _1EAE End _0BEE: - ScrCmd_028 0x8008, 25 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 25 + SetVar 0x8009, 1 GoTo _1EAE End _0C02: - ScrCmd_028 0x8008, 49 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 49 + SetVar 0x8009, 1 GoTo _1EAE End _0C16: - ScrCmd_028 0x8008, 0x176 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x176 + SetVar 0x8009, 1 GoTo _1EAE End _0C2A: - ScrCmd_028 0x8008, 0x15A - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x15A + SetVar 0x8009, 1 GoTo _1EAE End _0C3E: - ScrCmd_028 0x8008, 110 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 110 + SetVar 0x8009, 1 GoTo _1EAE End _0C52: - ScrCmd_028 0x8008, 0x1C5 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1C5 + SetVar 0x8009, 1 GoTo _1EAE End _0C66: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _0C7A: - ScrCmd_028 0x8008, 0x162 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x162 + SetVar 0x8009, 1 GoTo _1EAE End _0C8E: - ScrCmd_028 0x8008, 0x133 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x133 + SetVar 0x8009, 1 GoTo _1EAE End _0CA2: - ScrCmd_028 0x8008, 0x13A - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13A + SetVar 0x8009, 1 GoTo _1EAE End _0CB6: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End _0CCA: - ScrCmd_028 0x8008, 0x1A8 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1A8 + SetVar 0x8009, 1 GoTo _1EAE End _0CDE: - ScrCmd_028 0x8008, 76 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 76 + SetVar 0x8009, 1 GoTo _1EAE End _0CF2: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _0D06: - ScrCmd_028 0x8008, 0x140 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x140 + SetVar 0x8009, 1 GoTo _1EAE End _0D1A: - ScrCmd_028 0x8008, 8 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 8 + SetVar 0x8009, 1 GoTo _1EAE End _0D2E: - ScrCmd_028 0x8008, 25 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 25 + SetVar 0x8009, 1 GoTo _1EAE End _0D42: - ScrCmd_028 0x8008, 0x12F - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x12F + SetVar 0x8009, 1 GoTo _1EAE End _0D56: - ScrCmd_028 0x8008, 25 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 25 + SetVar 0x8009, 1 GoTo _1EAE End _0D6A: - ScrCmd_028 0x8008, 39 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 39 + SetVar 0x8009, 1 GoTo _1EAE End _0D7E: - ScrCmd_028 0x8008, 27 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 27 + SetVar 0x8009, 1 GoTo _1EAE End _0D92: - ScrCmd_028 0x8008, 0x169 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x169 + SetVar 0x8009, 1 GoTo _1EAE End _0DA6: - ScrCmd_028 0x8008, 0x13C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13C + SetVar 0x8009, 1 GoTo _1EAE End _0DBA: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _0DCE: - ScrCmd_028 0x8008, 108 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 108 + SetVar 0x8009, 1 GoTo _1EAE End _0DE2: - ScrCmd_028 0x8008, 0x128 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x128 + SetVar 0x8009, 1 GoTo _1EAE End _0DF6: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _0E0A: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _0E1E: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _0E32: - ScrCmd_028 0x8008, 0x163 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x163 + SetVar 0x8009, 1 GoTo _1EAE End _0E46: - ScrCmd_028 0x8008, 228 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 228 + SetVar 0x8009, 1 GoTo _1EAE End _0E5A: - ScrCmd_028 0x8008, 0x13D - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13D + SetVar 0x8009, 1 GoTo _1EAE End _0E6E: - ScrCmd_028 0x8008, 0x165 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x165 + SetVar 0x8009, 1 GoTo _1EAE End _0E82: - ScrCmd_028 0x8008, 0x16A - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16A + SetVar 0x8009, 1 GoTo _1EAE End _0E96: - ScrCmd_028 0x8008, 0x13B - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x13B + SetVar 0x8009, 1 GoTo _1EAE End _0EAA: - ScrCmd_028 0x8008, 49 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 49 + SetVar 0x8009, 1 GoTo _1EAE End _0EBE: - ScrCmd_028 0x8008, 82 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 82 + SetVar 0x8009, 1 GoTo _1EAE End _0ED2: - ScrCmd_028 0x8008, 18 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 18 + SetVar 0x8009, 1 GoTo _1EAE End _0EE6: - ScrCmd_028 0x8008, 0x12B - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x12B + SetVar 0x8009, 1 GoTo _1EAE End _0EFA: - ScrCmd_028 0x8008, 79 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 79 + SetVar 0x8009, 1 GoTo _1EAE End _0F0E: - ScrCmd_028 0x8008, 48 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 48 + SetVar 0x8009, 1 GoTo _1EAE End _0F22: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _0F36: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _0F4A: - ScrCmd_028 0x8008, 46 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 46 + SetVar 0x8009, 1 GoTo _1EAE End _0F5E: - ScrCmd_028 0x8008, 0x198 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x198 + SetVar 0x8009, 1 GoTo _1EAE End _0F72: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _0F86: - ScrCmd_028 0x8008, 25 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 25 + SetVar 0x8009, 1 GoTo _1EAE End _0F9A: - ScrCmd_028 0x8008, 0x1A0 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1A0 + SetVar 0x8009, 1 GoTo _1EAE End _0FAE: - ScrCmd_028 0x8008, 0x141 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x141 + SetVar 0x8009, 1 GoTo _1EAE End _0FC2: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _0FD6: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _0FEA: - ScrCmd_028 0x8008, 40 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 40 + SetVar 0x8009, 1 GoTo _1EAE End _0FFE: - ScrCmd_028 0x8008, 0x15E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x15E + SetVar 0x8009, 1 GoTo _1EAE End _1012: - ScrCmd_028 0x8008, 13 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 13 + SetVar 0x8009, 1 GoTo _1EAE End _1026: - ScrCmd_028 0x8008, 24 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 24 + SetVar 0x8009, 1 GoTo _1EAE End _103A: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _104E: - ScrCmd_028 0x8008, 45 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 45 + SetVar 0x8009, 1 GoTo _1EAE End _1062: - ScrCmd_028 0x8008, 107 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 107 + SetVar 0x8009, 1 GoTo _1EAE End _1076: - ScrCmd_028 0x8008, 26 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 26 + SetVar 0x8009, 1 GoTo _1EAE End _108A: - ScrCmd_028 0x8008, 239 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 239 + SetVar 0x8009, 1 GoTo _1EAE End _109E: - ScrCmd_028 0x8008, 0x164 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x164 + SetVar 0x8009, 1 GoTo _1EAE End _10B2: - ScrCmd_028 0x8008, 0x18C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x18C + SetVar 0x8009, 1 GoTo _1EAE End _10C6: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _10DA: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _10EE: - ScrCmd_028 0x8008, 237 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 237 + SetVar 0x8009, 1 GoTo _1EAE End _1102: - ScrCmd_028 0x8008, 0x10D - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x10D + SetVar 0x8009, 1 GoTo _1EAE End _1116: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _112A: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _113E: - ScrCmd_028 0x8008, 41 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 41 + SetVar 0x8009, 1 GoTo _1EAE End _1152: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _1166: - ScrCmd_028 0x8008, 0x154 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x154 + SetVar 0x8009, 1 GoTo _1EAE End _117A: - ScrCmd_028 0x8008, 219 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 219 + SetVar 0x8009, 1 GoTo _1EAE End _118E: - ScrCmd_028 0x8008, 27 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 27 + SetVar 0x8009, 1 GoTo _1EAE End _11A2: - ScrCmd_028 0x8008, 0x14E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x14E + SetVar 0x8009, 1 GoTo _1EAE End _11B6: - ScrCmd_028 0x8008, 0x1AB - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1AB + SetVar 0x8009, 1 GoTo _1EAE End _11CA: - ScrCmd_028 0x8008, 47 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 47 + SetVar 0x8009, 1 GoTo _1EAE End _11DE: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _11F2: - ScrCmd_028 0x8008, 0x16B - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16B + SetVar 0x8009, 1 GoTo _1EAE End _1206: - ScrCmd_028 0x8008, 0x178 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x178 + SetVar 0x8009, 1 GoTo _1EAE End _121A: - ScrCmd_028 0x8008, 0x15C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x15C + SetVar 0x8009, 1 GoTo _1EAE End _122E: - ScrCmd_028 0x8008, 29 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 29 + SetVar 0x8009, 1 GoTo _1EAE End _1242: - ScrCmd_028 0x8008, 41 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 41 + SetVar 0x8009, 1 GoTo _1EAE End _1256: - ScrCmd_028 0x8008, 89 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 89 + SetVar 0x8009, 1 GoTo _1EAE End _126A: - ScrCmd_028 0x8008, 29 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 29 + SetVar 0x8009, 1 GoTo _1EAE End _127E: - ScrCmd_028 0x8008, 0x197 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x197 + SetVar 0x8009, 1 GoTo _1EAE End _1292: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _12A6: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _12BA: - ScrCmd_028 0x8008, 0x149 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x149 + SetVar 0x8009, 1 GoTo _1EAE End _12CE: - ScrCmd_028 0x8008, 48 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 48 + SetVar 0x8009, 1 GoTo _1EAE End _12E2: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _12F6: - ScrCmd_028 0x8008, 83 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 83 + SetVar 0x8009, 1 GoTo _1EAE End _130A: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _131E: - ScrCmd_028 0x8008, 7 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 7 + SetVar 0x8009, 1 GoTo _1EAE End _1332: - ScrCmd_028 0x8008, 0x159 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x159 + SetVar 0x8009, 1 GoTo _1EAE End _1346: - ScrCmd_028 0x8008, 0x170 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x170 + SetVar 0x8009, 1 GoTo _1EAE End _135A: - ScrCmd_028 0x8008, 77 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 77 + SetVar 0x8009, 1 GoTo _1EAE End _136E: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1382: - ScrCmd_028 0x8008, 52 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 52 + SetVar 0x8009, 1 GoTo _1EAE End _1396: - ScrCmd_028 0x8008, 0x146 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x146 + SetVar 0x8009, 1 GoTo _1EAE End _13AA: - ScrCmd_028 0x8008, 41 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 41 + SetVar 0x8009, 1 GoTo _1EAE End _13BE: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _13D2: - ScrCmd_028 0x8008, 0x196 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x196 + SetVar 0x8009, 1 GoTo _1EAE End _13E6: - ScrCmd_028 0x8008, 0x18E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x18E + SetVar 0x8009, 1 GoTo _1EAE End _13FA: - ScrCmd_028 0x8008, 0x182 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x182 + SetVar 0x8009, 1 GoTo _1EAE End _140E: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _1422: - ScrCmd_028 0x8008, 108 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 108 + SetVar 0x8009, 1 GoTo _1EAE End _1436: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End _144A: - ScrCmd_028 0x8008, 0x146 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x146 + SetVar 0x8009, 1 GoTo _1EAE End _145E: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1472: - ScrCmd_028 0x8008, 0x118 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x118 + SetVar 0x8009, 1 GoTo _1EAE End _1486: - ScrCmd_028 0x8008, 234 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 234 + SetVar 0x8009, 1 GoTo _1EAE End _149A: - ScrCmd_028 0x8008, 0x147 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x147 + SetVar 0x8009, 1 GoTo _1EAE End _14AE: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _14C2: - ScrCmd_028 0x8008, 45 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 45 + SetVar 0x8009, 1 GoTo _1EAE End _14D6: - ScrCmd_028 0x8008, 0xFF - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0xFF + SetVar 0x8009, 1 GoTo _1EAE End _14EA: - ScrCmd_028 0x8008, 0x144 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x144 + SetVar 0x8009, 1 GoTo _1EAE End _14FE: - ScrCmd_028 0x8008, 109 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 109 + SetVar 0x8009, 1 GoTo _1EAE End _1512: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _1526: - ScrCmd_028 0x8008, 0x17C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x17C + SetVar 0x8009, 1 GoTo _1EAE End _153A: - ScrCmd_028 0x8008, 0x117 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x117 + SetVar 0x8009, 1 GoTo _1EAE End _154E: - ScrCmd_028 0x8008, 48 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 48 + SetVar 0x8009, 1 GoTo _1EAE End _1562: - ScrCmd_028 0x8008, 249 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 249 + SetVar 0x8009, 1 GoTo _1EAE End _1576: - ScrCmd_028 0x8008, 52 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 52 + SetVar 0x8009, 1 GoTo _1EAE End _158A: - ScrCmd_028 0x8008, 41 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 41 + SetVar 0x8009, 1 GoTo _1EAE End _159E: - ScrCmd_028 0x8008, 0x10E - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x10E + SetVar 0x8009, 1 GoTo _1EAE End _15B2: - ScrCmd_028 0x8008, 27 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 27 + SetVar 0x8009, 1 GoTo _1EAE End _15C6: - ScrCmd_028 0x8008, 78 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 78 + SetVar 0x8009, 1 GoTo _1EAE End _15DA: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _15EE: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _1602: - ScrCmd_028 0x8008, 0x179 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x179 + SetVar 0x8009, 1 GoTo _1EAE End _1616: - ScrCmd_028 0x8008, 0x116 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x116 + SetVar 0x8009, 1 GoTo _1EAE End _162A: - ScrCmd_028 0x8008, 41 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 41 + SetVar 0x8009, 1 GoTo _1EAE End _163E: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End _1652: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1666: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _167A: - ScrCmd_028 0x8008, 29 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 29 + SetVar 0x8009, 1 GoTo _1EAE End _168E: - ScrCmd_028 0x8008, 49 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 49 + SetVar 0x8009, 1 GoTo _1EAE End _16A2: - ScrCmd_028 0x8008, 0x141 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x141 + SetVar 0x8009, 1 GoTo _1EAE End _16B6: - ScrCmd_028 0x8008, 47 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 47 + SetVar 0x8009, 1 GoTo _1EAE End _16CA: - ScrCmd_028 0x8008, 107 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 107 + SetVar 0x8009, 1 GoTo _1EAE End _16DE: - ScrCmd_028 0x8008, 0x127 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x127 + SetVar 0x8009, 1 GoTo _1EAE End _16F2: - ScrCmd_028 0x8008, 0x16C - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16C + SetVar 0x8009, 1 GoTo _1EAE End _1706: - ScrCmd_028 0x8008, 0x145 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x145 + SetVar 0x8009, 1 GoTo _1EAE End _171A: - ScrCmd_028 0x8008, 46 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 46 + SetVar 0x8009, 1 GoTo _1EAE End _172E: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _1742: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End _1756: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _176A: - ScrCmd_028 0x8008, 85 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 85 + SetVar 0x8009, 1 GoTo _1EAE End _177E: - ScrCmd_028 0x8008, 4 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 4 + SetVar 0x8009, 1 GoTo _1EAE End _1792: - ScrCmd_028 0x8008, 0x1A5 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1A5 + SetVar 0x8009, 1 GoTo _1EAE End _17A6: - ScrCmd_028 0x8008, 0x1B8 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1B8 + SetVar 0x8009, 1 GoTo _1EAE End _17BA: - ScrCmd_028 0x8008, 0x1CF - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1CF + SetVar 0x8009, 1 GoTo _1EAE End _17CE: - ScrCmd_028 0x8008, 0x16D - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x16D + SetVar 0x8009, 1 GoTo _1EAE End _17E2: - ScrCmd_028 0x8008, 0x160 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x160 + SetVar 0x8009, 1 GoTo _1EAE End _17F6: - ScrCmd_028 0x8008, 0x155 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x155 + SetVar 0x8009, 1 GoTo _1EAE End _180A: - ScrCmd_028 0x8008, 49 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 49 + SetVar 0x8009, 1 GoTo _1EAE End _181E: - ScrCmd_028 0x8008, 27 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 27 + SetVar 0x8009, 1 GoTo _1EAE End _1832: - ScrCmd_028 0x8008, 52 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 52 + SetVar 0x8009, 1 GoTo _1EAE End _1846: - ScrCmd_028 0x8008, 0x147 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x147 + SetVar 0x8009, 1 GoTo _1EAE End _185A: - ScrCmd_028 0x8008, 45 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 45 + SetVar 0x8009, 1 GoTo _1EAE End _186E: - ScrCmd_028 0x8008, 0x138 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x138 + SetVar 0x8009, 1 GoTo _1EAE End _1882: - ScrCmd_028 0x8008, 0x1A1 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x1A1 + SetVar 0x8009, 1 GoTo _1EAE End _1896: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _18AA: - ScrCmd_028 0x8008, 223 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 223 + SetVar 0x8009, 1 GoTo _1EAE End _18BE: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _18D2: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _18E6: - ScrCmd_028 0x8008, 26 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 26 + SetVar 0x8009, 1 GoTo _1EAE End _18FA: - ScrCmd_028 0x8008, 21 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 21 + SetVar 0x8009, 1 GoTo _1EAE End _190E: - ScrCmd_028 0x8008, 58 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 58 + SetVar 0x8009, 1 GoTo _1EAE End _1922: - ScrCmd_028 0x8008, 60 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 60 + SetVar 0x8009, 1 GoTo _1EAE End _1936: - ScrCmd_028 0x8008, 17 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 17 + SetVar 0x8009, 1 GoTo _1EAE End _194A: - ScrCmd_028 0x8008, 57 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 57 + SetVar 0x8009, 1 GoTo _1EAE End _195E: - ScrCmd_028 0x8008, 56 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 56 + SetVar 0x8009, 1 GoTo _1EAE End _1972: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _1986: - ScrCmd_028 0x8008, 20 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 20 + SetVar 0x8009, 1 GoTo _1EAE End _199A: - ScrCmd_028 0x8008, 59 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 59 + SetVar 0x8009, 1 GoTo _1EAE End _19AE: - ScrCmd_028 0x8008, 61 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 61 + SetVar 0x8009, 1 GoTo _1EAE End _19C2: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _19D6: - ScrCmd_028 0x8008, 252 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 252 + SetVar 0x8009, 1 GoTo _1EAE End _19EA: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _19FE: - ScrCmd_028 0x8008, 89 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 89 + SetVar 0x8009, 1 GoTo _1EAE End _1A12: - ScrCmd_028 0x8008, 38 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 38 + SetVar 0x8009, 1 GoTo _1EAE End _1A26: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _1A3A: - ScrCmd_028 0x8008, 45 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 45 + SetVar 0x8009, 1 GoTo _1EAE End _1A4E: - ScrCmd_028 0x8008, 91 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 91 + SetVar 0x8009, 1 GoTo _1EAE End _1A62: - ScrCmd_028 0x8008, 47 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 47 + SetVar 0x8009, 1 GoTo _1EAE End _1A76: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _1A8A: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _1A9E: - ScrCmd_028 0x8008, 40 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 40 + SetVar 0x8009, 1 GoTo _1EAE End _1AB2: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1AC6: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _1ADA: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _1AEE: - ScrCmd_028 0x8008, 52 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 52 + SetVar 0x8009, 1 GoTo _1EAE End _1B02: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _1B16: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _1B2A: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _1B3E: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _1B52: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _1B66: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1B7A: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _1B8E: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _1BA2: - ScrCmd_028 0x8008, 242 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 242 + SetVar 0x8009, 1 GoTo _1EAE End _1BB6: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _1BCA: - ScrCmd_028 0x8008, 24 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 24 + SetVar 0x8009, 1 GoTo _1EAE End _1BDE: - ScrCmd_028 0x8008, 28 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 28 + SetVar 0x8009, 1 GoTo _1EAE End _1BF2: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _1C06: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _1C1A: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1C2E: - ScrCmd_028 0x8008, 46 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 46 + SetVar 0x8009, 1 GoTo _1EAE End _1C42: - ScrCmd_028 0x8008, 23 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 23 + SetVar 0x8009, 1 GoTo _1EAE End _1C56: - ScrCmd_028 0x8008, 0x144 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x144 + SetVar 0x8009, 1 GoTo _1EAE End _1C6A: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _1C7E: - ScrCmd_028 0x8008, 15 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 15 + SetVar 0x8009, 1 GoTo _1EAE End _1C92: - ScrCmd_028 0x8008, 51 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 51 + SetVar 0x8009, 1 GoTo _1EAE End _1CA6: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1CBA: - ScrCmd_028 0x8008, 252 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 252 + SetVar 0x8009, 1 GoTo _1EAE End _1CCE: - ScrCmd_028 0x8008, 9 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 9 + SetVar 0x8009, 1 GoTo _1EAE End _1CE2: - ScrCmd_028 0x8008, 53 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 53 + SetVar 0x8009, 1 GoTo _1EAE End _1CF6: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _1D0A: - ScrCmd_028 0x8008, 75 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 75 + SetVar 0x8009, 1 GoTo _1EAE End _1D1E: - ScrCmd_028 0x8008, 74 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 74 + SetVar 0x8009, 1 GoTo _1EAE End _1D32: - ScrCmd_028 0x8008, 73 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 73 + SetVar 0x8009, 1 GoTo _1EAE End _1D46: - ScrCmd_028 0x8008, 0x145 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x145 + SetVar 0x8009, 1 GoTo _1EAE End _1D5A: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _1D6E: - ScrCmd_028 0x8008, 72 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 72 + SetVar 0x8009, 1 GoTo _1EAE End _1D82: - ScrCmd_028 0x8008, 2 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 2 + SetVar 0x8009, 1 GoTo _1EAE End _1D96: - ScrCmd_028 0x8008, 49 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 49 + SetVar 0x8009, 1 GoTo _1EAE End _1DAA: - ScrCmd_028 0x8008, 50 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 50 + SetVar 0x8009, 1 GoTo _1EAE End _1DBE: - ScrCmd_028 0x8008, 47 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 47 + SetVar 0x8009, 1 GoTo _1EAE End _1DD2: - ScrCmd_028 0x8008, 48 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 48 + SetVar 0x8009, 1 GoTo _1EAE End _1DE6: - ScrCmd_028 0x8008, 0x143 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x143 + SetVar 0x8009, 1 GoTo _1EAE End _1DFA: - ScrCmd_028 0x8008, 0x142 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 0x142 + SetVar 0x8009, 1 GoTo _1EAE End _1E0E: - ScrCmd_028 0x8008, 250 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 250 + SetVar 0x8009, 1 GoTo _1EAE End _1E22: - ScrCmd_028 0x8008, 10 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 10 + SetVar 0x8009, 1 GoTo _1EAE End _1E36: - ScrCmd_028 0x8008, 112 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 112 + SetVar 0x8009, 1 GoTo _1EAE End _1E4A: - ScrCmd_028 0x8008, 233 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 233 + SetVar 0x8009, 1 GoTo _1EAE End _1E5E: - ScrCmd_028 0x8008, 246 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 246 + SetVar 0x8009, 1 GoTo _1EAE End _1E72: - ScrCmd_028 0x8008, 238 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 238 + SetVar 0x8009, 1 GoTo _1EAE End _1E86: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End _1E9A: - ScrCmd_028 0x8008, 92 - ScrCmd_028 0x8009, 1 + SetVar 0x8008, 92 + SetVar 0x8009, 1 GoTo _1EAE End @@ -2299,8 +2299,8 @@ _1EAE: ScrCmd_060 ScrCmd_068 ScrCmd_04B 0x5DC - ScrCmd_029 0x8004, 0x8008 - ScrCmd_029 0x8005, 0x8009 + SetVar 0x8004, 0x8008 + SetVar 0x8005, 0x8009 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _1EF0 @@ -2335,7 +2335,7 @@ _1F33: ScrCmd_0CD 0 ScrCmd_0D1 1, 0x8004 ScrCmd_080 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 7 GoToIf 1, _1FD9 CompareVarToValue 0x8008, 0 @@ -2406,7 +2406,7 @@ _205E: ScrCmd_1CD 18, 0x8004, 0, 0, 0 ScrCmd_02C 9 ScrCmd_031 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 GoTo _1EEA End @@ -2429,7 +2429,7 @@ _20A8: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 4 ScrCmd_031 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 GoTo _1EEA End diff --git a/res/field/scripts/script_0406.s b/res/field/scripts/script_0406.s index da431fae0f..94b40869d0 100644 --- a/res/field/scripts/script_0406.s +++ b/res/field/scripts/script_0406.s @@ -54,7 +54,7 @@ _00A8: ScrCmd_042 14, 4 ScrCmd_043 _00C2: - ScrCmd_029 0x8008, 0x8004 + SetVar 0x8008, 0x8004 CompareVarToValue 0x8008, 1 GoToIf 1, _01CF CompareVarToValue 0x8008, 2 @@ -98,11 +98,11 @@ _01AA: CompareVarToValue 0x800C, 0 GoToIf 1, _01C7 _01BF: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _01C7: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _01CF: diff --git a/res/field/scripts/script_0407.s b/res/field/scripts/script_0407.s index ce5747f407..ab5015b036 100644 --- a/res/field/scripts/script_0407.s +++ b/res/field/scripts/script_0407.s @@ -29,7 +29,7 @@ _0035: CompareVarToValue 0x800C, 0 GoToIf 1, _00EE ScrCmd_1B6 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _007E CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0408.s b/res/field/scripts/script_0408.s index c3bfcc3820..8a2fab50e5 100644 --- a/res/field/scripts/script_0408.s +++ b/res/field/scripts/script_0408.s @@ -290,9 +290,9 @@ _0472: ScrCmd_04B 0x5DC - ScrCmd_029 0x8004, 0x8000 - ScrCmd_029 0x8005, 0x8001 - ScrCmd_029 0x8006, 0x8002 + SetVar 0x8004, 0x8000 + SetVar 0x8005, 0x8001 + SetVar 0x8006, 0x8002 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _04B0 @@ -323,7 +323,7 @@ _04E2: ScrCmd_0CD 0 ScrCmd_0D1 1, 0x8004 ScrCmd_080 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 7 GoToIf 1, _0588 CompareVarToValue 0x8008, 0 @@ -391,10 +391,10 @@ _05FA: End _060D: - ScrCmd_022 0x8006 + SetFlagFromVar 0x8006 ScrCmd_02C 9 ScrCmd_031 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 GoTo _04AC End @@ -417,7 +417,7 @@ _064F: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 4 ScrCmd_031 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 GoTo _04AC End diff --git a/res/field/scripts/script_0409.s b/res/field/scripts/script_0409.s index 9616cd1152..388fbb0e82 100644 --- a/res/field/scripts/script_0409.s +++ b/res/field/scripts/script_0409.s @@ -50,7 +50,7 @@ _008E: _00AE: ScrCmd_09A 0x800C, 15 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 1 ScrCmd_034 @@ -93,11 +93,11 @@ _014A: Call _017F CompareVarToValue 0x800C, 0 GoToIf 1, _0221 - ScrCmd_028 0x40CD, 1 + SetVar 0x40CD, 1 Return _017F: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 73 GoToIf 1, _01CE @@ -137,7 +137,7 @@ _020A: Return _0219: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0221: @@ -148,7 +148,7 @@ _0223: ScrCmd_060 ScrCmd_068 ScrCmd_09A 0x800C, 249 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C CompareVarToValue 0x800C, 6 GoToIf 1, _0275 ScrCmd_15B 0, 0x800C @@ -235,7 +235,7 @@ _0372: _0381: ScrCmd_1CF 1 ScrCmd_09A 0x800C, 70 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 10 ScrCmd_0C5 0x8004 @@ -308,7 +308,7 @@ _0478: _0487: ScrCmd_09A 0x800C, 0x1AF - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 19 ScrCmd_034 @@ -351,7 +351,7 @@ _0512: _051F: ScrCmd_09A 0x800C, 57 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 13 ScrCmd_034 @@ -397,7 +397,7 @@ _05B4: _05C3: ScrCmd_09A 0x800C, 0x1B0 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 16 ScrCmd_034 @@ -479,7 +479,7 @@ _06C3: _06D2: ScrCmd_09A 0x800C, 127 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0D6 0, 0x800C ScrCmd_02C 23 ScrCmd_034 diff --git a/res/field/scripts/script_0410.s b/res/field/scripts/script_0410.s index 4d69f8b5c0..0b51f34283 100644 --- a/res/field/scripts/script_0410.s +++ b/res/field/scripts/script_0410.s @@ -8,7 +8,7 @@ _0006: ScrCmd_060 ScrCmd_1B7 0x8000, 5 - ScrCmd_029 0x8008, 0x8000 + SetVar 0x8008, 0x8000 CompareVarToValue 0x8008, 0 GoToIf 1, _0057 CompareVarToValue 0x8008, 1 @@ -22,37 +22,37 @@ _0006: End _0057: - ScrCmd_05E 0xFF, _0148 - ScrCmd_05E 0, _01F0 - ScrCmd_05F + ApplyMovement 0xFF, _0148 + ApplyMovement 0, _01F0 + WaitMovement GoTo _00D9 End _0071: - ScrCmd_05E 0xFF, _0154 - ScrCmd_05E 0, _0200 - ScrCmd_05F + ApplyMovement 0xFF, _0154 + ApplyMovement 0, _0200 + WaitMovement GoTo _00D9 End _008B: - ScrCmd_05E 0xFF, _0160 - ScrCmd_05E 0, _0210 - ScrCmd_05F + ApplyMovement 0xFF, _0160 + ApplyMovement 0, _0210 + WaitMovement GoTo _00D9 End _00A5: - ScrCmd_05E 0xFF, _016C - ScrCmd_05E 0, _0220 - ScrCmd_05F + ApplyMovement 0xFF, _016C + ApplyMovement 0, _0220 + WaitMovement GoTo _00D9 End _00BF: - ScrCmd_05E 0xFF, _0178 - ScrCmd_05E 0, _0230 - ScrCmd_05F + ApplyMovement 0xFF, _0178 + ApplyMovement 0, _0230 + WaitMovement GoTo _00D9 End @@ -60,22 +60,22 @@ _00D9: ScrCmd_02C 0 ScrCmd_030 ScrCmd_034 - ScrCmd_05E 0xFF, _0184 - ScrCmd_05E 0, _0240 - ScrCmd_05F + ApplyMovement 0xFF, _0184 + ApplyMovement 0, _0240 + WaitMovement ScrCmd_049 0x64F - ScrCmd_05E 0xFF, _01E8 - ScrCmd_05F + ApplyMovement 0xFF, _01E8 + WaitMovement ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 ScrCmd_0BE 0x405C, 0, 5, 2, 1 ScrCmd_1F8 ScrCmd_0B3 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_2F7 0x8004 ScrCmd_0A1 - ScrCmd_028 0x4080, 1 + SetVar 0x4080, 1 ScrCmd_1B2 0xFF ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD diff --git a/res/field/scripts/script_0412.s b/res/field/scripts/script_0412.s index 186664fa07..17ff536c36 100644 --- a/res/field/scripts/script_0412.s +++ b/res/field/scripts/script_0412.s @@ -22,7 +22,7 @@ _0006: SetFlag 0x1BA SetFlag 0x174 SetFlag 0x1F1 - ScrCmd_028 0x4070, 1 + SetVar 0x4070, 1 SetFlag 0x197 SetFlag 0x2C4 SetFlag 0x22A @@ -51,7 +51,7 @@ _0006: SetFlag 0x186 SetFlag 0x2CC SetFlag 0x19A - ScrCmd_028 0x4093, 1 + SetVar 0x4093, 1 SetFlag 0x180 SetFlag 0x18C SetFlag 0x1FE @@ -110,7 +110,7 @@ _0006: SetFlag 0x252 SetFlag 0x2CA SetFlag 0x452 - ScrCmd_028 0x4040, 9 + SetVar 0x4040, 9 SetFlag 0x278 SetFlag 0x217 SetFlag 0x182 diff --git a/res/field/scripts/script_0413.s b/res/field/scripts/script_0413.s index 894d256d3e..dce283ba66 100644 --- a/res/field/scripts/script_0413.s +++ b/res/field/scripts/script_0413.s @@ -15,7 +15,7 @@ _0012: ScrCmd_17E 0x8000 ScrCmd_181 0x8001 ScrCmd_17D 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _033E CompareVarToValue 0x8008, 1 @@ -96,11 +96,11 @@ _0158: ScrCmd_07E 0x1C0, 1, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0186 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0186: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _018E: @@ -116,11 +116,11 @@ _018E: ScrCmd_07E 98, 1, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _01EA - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _01EA: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _01F2: @@ -251,7 +251,7 @@ _03B4: ScrCmd_042 3, 1 ScrCmd_042 4, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _042D CompareVarToValue 0x8008, 1 @@ -276,7 +276,7 @@ _042D: ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_179 0x8005 - ScrCmd_029 0x8008, 0x8005 + SetVar 0x8008, 0x8005 CompareVarToValue 0x8008, 0 GoToIf 1, _053C CompareVarToValue 0x8008, 95 @@ -371,6 +371,6 @@ _0583: _0598: ScrCmd_060 - ScrCmd_029 0x800C, 0x8000 - ScrCmd_029 0x8005, 0x8000 + SetVar 0x800C, 0x8000 + SetVar 0x8005, 0x8000 GoTo _049D diff --git a/res/field/scripts/script_0414.s b/res/field/scripts/script_0414.s index 8d381d895b..3fee5caa4f 100644 --- a/res/field/scripts/script_0414.s +++ b/res/field/scripts/script_0414.s @@ -34,9 +34,9 @@ _004E: _0066: ScrCmd_060 - ScrCmd_05E 242, _0124 - ScrCmd_05E 0xFF, _0144 - ScrCmd_05F + ApplyMovement 242, _0124 + ApplyMovement 0xFF, _0144 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 0 ScrCmd_034 @@ -56,13 +56,13 @@ _0066: End _00D8: - ScrCmd_05E 0xFF, _0138 - ScrCmd_05E 242, _012C - ScrCmd_05F + ApplyMovement 0xFF, _0138 + ApplyMovement 242, _012C + WaitMovement GoTo _00F0 _00F0: - ScrCmd_028 0x4082, 1 + SetVar 0x4082, 1 ScrCmd_061 ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 diff --git a/res/field/scripts/script_0416.s b/res/field/scripts/script_0416.s index 43e583eb5f..67f16bbed6 100644 --- a/res/field/scripts/script_0416.s +++ b/res/field/scripts/script_0416.s @@ -53,8 +53,8 @@ _009D: GoToIf 1, _013A ScrCmd_02C 0 ScrCmd_068 - ScrCmd_05E 5, _0214 - ScrCmd_05F + ApplyMovement 5, _0214 + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 @@ -65,20 +65,20 @@ _009D: GoTo _010E _00E6: - ScrCmd_05E 5, _021C - ScrCmd_05E 0xFF, _01E0 - ScrCmd_05F + ApplyMovement 5, _021C + ApplyMovement 0xFF, _01E0 + WaitMovement GoTo _0126 _00FE: - ScrCmd_05E 5, _0228 - ScrCmd_05F + ApplyMovement 5, _0228 + WaitMovement GoTo _0126 _010E: - ScrCmd_05E 5, _0228 - ScrCmd_05E 0xFF, _01EC - ScrCmd_05F + ApplyMovement 5, _0228 + ApplyMovement 0xFF, _01EC + WaitMovement GoTo _0126 _0126: @@ -106,20 +106,20 @@ _013A: GoTo _01AD _0185: - ScrCmd_05E 5, _0230 - ScrCmd_05E 0xFF, _01F4 - ScrCmd_05F + ApplyMovement 5, _0230 + ApplyMovement 0xFF, _01F4 + WaitMovement GoTo _01C5 _019D: - ScrCmd_05E 5, _023C - ScrCmd_05F + ApplyMovement 5, _023C + WaitMovement GoTo _01C5 _01AD: - ScrCmd_05E 5, _023C - ScrCmd_05E 0xFF, _0208 - ScrCmd_05F + ApplyMovement 5, _023C + ApplyMovement 0xFF, _0208 + WaitMovement GoTo _01C5 _01C5: @@ -200,8 +200,8 @@ _0248: ScrCmd_189 0, 1 ScrCmd_188 0, 15 ScrCmd_064 0 - ScrCmd_05E 0, _0594 - ScrCmd_05F + ApplyMovement 0, _0594 + WaitMovement ScrCmd_02C 4 ScrCmd_034 CompareVarToValue 0x8000, 0 @@ -228,8 +228,8 @@ _0248: ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 5 - ScrCmd_05E 10, _0574 - ScrCmd_05F + ApplyMovement 10, _0574 + WaitMovement ScrCmd_02C 6 CompareVarToValue 0x8000, 0 CallIf 1, _04BC @@ -241,10 +241,10 @@ _0248: CallIf 1, _04E0 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0, _05A8 - ScrCmd_05E 0xFF, _05E8 - ScrCmd_05E 10, _058C - ScrCmd_05F + ApplyMovement 0, _05A8 + ApplyMovement 0xFF, _05E8 + ApplyMovement 10, _058C + WaitMovement ScrCmd_065 10 ScrCmd_014 0x7FB ScrCmd_02C 8 @@ -282,23 +282,23 @@ _040A: Return _0414: - ScrCmd_05E 0, _05B4 - ScrCmd_05F + ApplyMovement 0, _05B4 + WaitMovement Return _0420: - ScrCmd_05E 0, _05B4 - ScrCmd_05F + ApplyMovement 0, _05B4 + WaitMovement Return _042C: - ScrCmd_05E 0, _05B4 - ScrCmd_05F + ApplyMovement 0, _05B4 + WaitMovement Return _0438: - ScrCmd_05E 0, _05B4 - ScrCmd_05F + ApplyMovement 0, _05B4 + WaitMovement Return _0444: @@ -318,47 +318,47 @@ _0462: Return _046C: - ScrCmd_05E 0xFF, _05D0 - ScrCmd_05E 10, _055C - ScrCmd_05F + ApplyMovement 0xFF, _05D0 + ApplyMovement 10, _055C + WaitMovement Return _0480: - ScrCmd_05E 0xFF, _05D0 - ScrCmd_05E 10, _055C - ScrCmd_05F + ApplyMovement 0xFF, _05D0 + ApplyMovement 10, _055C + WaitMovement Return _0494: - ScrCmd_05E 0xFF, _05DC - ScrCmd_05E 10, _0568 - ScrCmd_05F + ApplyMovement 0xFF, _05DC + ApplyMovement 10, _0568 + WaitMovement Return _04A8: - ScrCmd_05E 0xFF, _05D0 - ScrCmd_05E 10, _055C - ScrCmd_05F + ApplyMovement 0xFF, _05D0 + ApplyMovement 10, _055C + WaitMovement Return _04BC: - ScrCmd_05E 10, _057C - ScrCmd_05F + ApplyMovement 10, _057C + WaitMovement Return _04C8: - ScrCmd_05E 10, _057C - ScrCmd_05F + ApplyMovement 10, _057C + WaitMovement Return _04D4: - ScrCmd_05E 10, _0584 - ScrCmd_05F + ApplyMovement 10, _0584 + WaitMovement Return _04E0: - ScrCmd_05E 10, _057C - ScrCmd_05F + ApplyMovement 10, _057C + WaitMovement Return _04EC: @@ -373,8 +373,8 @@ _04F7: _0502: ScrCmd_02C 12 - ScrCmd_028 0x8004, 0x1D0 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1D0 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 13 ScrCmd_034 @@ -382,18 +382,18 @@ _0502: End _0522: - ScrCmd_05E 0, _05BC - ScrCmd_05E 0xFF, _0600 - ScrCmd_05F + ApplyMovement 0, _05BC + ApplyMovement 0xFF, _0600 + WaitMovement GoTo _053A _053A: ScrCmd_065 0 - ScrCmd_028 0x4083, 2 + SetVar 0x4083, 2 SetFlag 183 SetFlag 0x1A9 ClearFlag 0x20F - ScrCmd_028 0x407C, 6 + SetVar 0x407C, 6 ScrCmd_061 End @@ -540,13 +540,13 @@ _065A: ScrCmd_02C 19 ScrCmd_034 ScrCmd_07C 0x1C3, 1, 0x800C - ScrCmd_05E 8, _06A8 - ScrCmd_05F + ApplyMovement 8, _06A8 + WaitMovement ScrCmd_168 22, 24, 11, 13, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 8, _06B0 - ScrCmd_05F + ApplyMovement 8, _06B0 + WaitMovement ScrCmd_065 8 ScrCmd_16C 77 ScrCmd_169 77 @@ -586,8 +586,8 @@ _06CF: _06E2: ScrCmd_060 - ScrCmd_05E 9, _07A8 - ScrCmd_05F + ApplyMovement 9, _07A8 + WaitMovement ScrCmd_069 0x8000, 0x8001 CompareVarToValue 0x8001, 0x315 CallIf 1, _075D @@ -595,9 +595,9 @@ _06E2: CallIf 1, _0769 CompareVarToValue 0x8001, 0x317 CallIf 1, _0775 - ScrCmd_05E 9, _07FC - ScrCmd_05E 0xFF, _0804 - ScrCmd_05F + ApplyMovement 9, _07FC + ApplyMovement 0xFF, _0804 + WaitMovement ScrCmd_02C 16 ScrCmd_034 CompareVarToValue 0x8001, 0x315 @@ -610,33 +610,33 @@ _06E2: End _075D: - ScrCmd_05E 9, _07B4 - ScrCmd_05F + ApplyMovement 9, _07B4 + WaitMovement Return _0769: - ScrCmd_05E 9, _07C0 - ScrCmd_05F + ApplyMovement 9, _07C0 + WaitMovement Return _0775: - ScrCmd_05E 9, _07CC - ScrCmd_05F + ApplyMovement 9, _07CC + WaitMovement Return _0781: - ScrCmd_05E 9, _07D8 - ScrCmd_05F + ApplyMovement 9, _07D8 + WaitMovement Return _078D: - ScrCmd_05E 9, _07E4 - ScrCmd_05F + ApplyMovement 9, _07E4 + WaitMovement Return _0799: - ScrCmd_05E 9, _07F0 - ScrCmd_05F + ApplyMovement 9, _07F0 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0417.s b/res/field/scripts/script_0417.s index f15dc1f536..a466f772a3 100644 --- a/res/field/scripts/script_0417.s +++ b/res/field/scripts/script_0417.s @@ -47,7 +47,7 @@ _0087: SetFlag 0x24A SetFlag 0x24B SetFlag 0x24C - ScrCmd_028 0x4104, 1 + SetVar 0x4104, 1 End _00B3: @@ -60,28 +60,28 @@ _00B3: SetFlag 0x24A SetFlag 0x24B SetFlag 0x24C - ScrCmd_024 0x218 - ScrCmd_024 0x227 - ScrCmd_024 0x221 - ScrCmd_024 0x222 - ScrCmd_024 0x21E - ScrCmd_024 0x21F - ScrCmd_024 0x21B - ScrCmd_024 0x217 - ScrCmd_024 0x224 - ScrCmd_024 0x21C - ScrCmd_024 0x228 - ScrCmd_024 0x220 - ScrCmd_024 0x21A - ScrCmd_024 0x223 - ScrCmd_024 0x21D - ScrCmd_024 0x226 - ScrCmd_024 0x225 - ScrCmd_024 0x219 - ScrCmd_028 0x4104, 0 + ClearTrainerFlag 0x218 + ClearTrainerFlag 0x227 + ClearTrainerFlag 0x221 + ClearTrainerFlag 0x222 + ClearTrainerFlag 0x21E + ClearTrainerFlag 0x21F + ClearTrainerFlag 0x21B + ClearTrainerFlag 0x217 + ClearTrainerFlag 0x224 + ClearTrainerFlag 0x21C + ClearTrainerFlag 0x228 + ClearTrainerFlag 0x220 + ClearTrainerFlag 0x21A + ClearTrainerFlag 0x223 + ClearTrainerFlag 0x21D + ClearTrainerFlag 0x226 + ClearTrainerFlag 0x225 + ClearTrainerFlag 0x219 + SetVar 0x4104, 0 ScrCmd_1B7 0x4001, 1 - ScrCmd_028 0x4000, 5 - ScrCmd_028 0x400A, 0x2710 + SetVar 0x4000, 5 + SetVar 0x400A, 0x2710 _0137: ScrCmd_1B8 0x4001, 9 CompareVarToValue 0x4001, 0 @@ -102,7 +102,7 @@ _0137: CallIf 1, _02A3 CompareVarToValue 0x4001, 8 CallIf 1, _02C0 - ScrCmd_027 0x400A, 1 + SubVar 0x400A, 1 CompareVarToValue 0x400A, 0 GoToIf 1, _01D2 CompareVarToValue 0x4000, 0 @@ -116,7 +116,7 @@ _01D8: GoToIf 0, _02DD ClearFlag 0x244 ScrCmd_1B8 0x40FB, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _01F5: @@ -124,7 +124,7 @@ _01F5: GoToIf 0, _02DD ClearFlag 0x245 ScrCmd_1B8 0x40FC, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _0212: @@ -132,7 +132,7 @@ _0212: GoToIf 0, _02DD ClearFlag 0x246 ScrCmd_1B8 0x40FD, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _022F: @@ -140,7 +140,7 @@ _022F: GoToIf 0, _02DD ClearFlag 0x247 ScrCmd_1B8 0x40FE, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _024C: @@ -148,7 +148,7 @@ _024C: GoToIf 0, _02DD ClearFlag 0x248 ScrCmd_1B8 0x40FF, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _0269: @@ -156,7 +156,7 @@ _0269: GoToIf 0, _02DD ClearFlag 0x249 ScrCmd_1B8 0x4100, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _0286: @@ -164,7 +164,7 @@ _0286: GoToIf 0, _02DD ClearFlag 0x24A ScrCmd_1B8 0x4101, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _02A3: @@ -172,7 +172,7 @@ _02A3: GoToIf 0, _02DD ClearFlag 0x24B ScrCmd_1B8 0x4102, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _02C0: @@ -180,7 +180,7 @@ _02C0: GoToIf 0, _02DD ClearFlag 0x24C ScrCmd_1B8 0x4103, 3 - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 Return _02DD: @@ -188,8 +188,8 @@ _02DD: _02DF: ScrCmd_060 - ScrCmd_05E 0xFF, _212C - ScrCmd_05F + ApplyMovement 0xFF, _212C + WaitMovement ScrCmd_003 20, 0x800C ScrCmd_02C 1 ScrCmd_034 @@ -214,13 +214,13 @@ _031E: _0331: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x218 - ScrCmd_025 0x218 + CheckTrainerFlag 0x218 + CheckTrainerFlag 0x218 GoToIf 1, _046C ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _04BC - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _038A CompareVarToValue 0x8008, 1 @@ -263,10 +263,10 @@ _03E7: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x218 - ScrCmd_023 0x227 + SetTrainerFlag 0x218 + SetTrainerFlag 0x227 Call _04CF - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _043F CompareVarToValue 0x8008, 1 @@ -304,7 +304,7 @@ _0460: End _046C: - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _049B CompareVarToValue 0x8008, 1 @@ -344,20 +344,20 @@ _04BC: End _04CF: - ScrCmd_05E 6, _212C - ScrCmd_05F + ApplyMovement 6, _212C + WaitMovement Return _04DB: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x227 - ScrCmd_025 0x227 + CheckTrainerFlag 0x227 + CheckTrainerFlag 0x227 GoToIf 1, _0616 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _0666 - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _0534 CompareVarToValue 0x8008, 1 @@ -400,10 +400,10 @@ _0591: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x218 - ScrCmd_023 0x227 + SetTrainerFlag 0x218 + SetTrainerFlag 0x227 Call _0679 - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _05E9 CompareVarToValue 0x8008, 1 @@ -441,7 +441,7 @@ _060A: End _0616: - ScrCmd_029 0x8008, 0x40FB + SetVar 0x8008, 0x40FB CompareVarToValue 0x8008, 0 GoToIf 1, _0645 CompareVarToValue 0x8008, 1 @@ -481,20 +481,20 @@ _0666: End _0679: - ScrCmd_05E 9, _2134 - ScrCmd_05F + ApplyMovement 9, _2134 + WaitMovement Return _0685: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x221 - ScrCmd_025 0x221 + CheckTrainerFlag 0x221 + CheckTrainerFlag 0x221 GoToIf 1, _07C0 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _0810 - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _06DE CompareVarToValue 0x8008, 1 @@ -537,10 +537,10 @@ _073B: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x221 - ScrCmd_023 0x222 + SetTrainerFlag 0x221 + SetTrainerFlag 0x222 Call _0823 - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _0793 CompareVarToValue 0x8008, 1 @@ -578,7 +578,7 @@ _07B4: End _07C0: - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _07EF CompareVarToValue 0x8008, 1 @@ -618,20 +618,20 @@ _0810: End _0823: - ScrCmd_05E 2, _212C - ScrCmd_05F + ApplyMovement 2, _212C + WaitMovement Return _082F: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x222 - ScrCmd_025 0x222 + CheckTrainerFlag 0x222 + CheckTrainerFlag 0x222 GoToIf 1, _096A ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _09BA - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _0888 CompareVarToValue 0x8008, 1 @@ -674,10 +674,10 @@ _08E5: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x221 - ScrCmd_023 0x222 + SetTrainerFlag 0x221 + SetTrainerFlag 0x222 Call _09CD - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _093D CompareVarToValue 0x8008, 1 @@ -715,7 +715,7 @@ _095E: End _096A: - ScrCmd_029 0x8008, 0x40FC + SetVar 0x8008, 0x40FC CompareVarToValue 0x8008, 0 GoToIf 1, _0999 CompareVarToValue 0x8008, 1 @@ -755,20 +755,20 @@ _09BA: End _09CD: - ScrCmd_05E 3, _2134 - ScrCmd_05F + ApplyMovement 3, _2134 + WaitMovement Return _09D9: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21E - ScrCmd_025 0x21E + CheckTrainerFlag 0x21E + CheckTrainerFlag 0x21E GoToIf 1, _0B14 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _0B64 - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0A32 CompareVarToValue 0x8008, 1 @@ -811,10 +811,10 @@ _0A8F: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21E - ScrCmd_023 0x21F + SetTrainerFlag 0x21E + SetTrainerFlag 0x21F Call _0B77 - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0AE7 CompareVarToValue 0x8008, 1 @@ -852,7 +852,7 @@ _0B08: End _0B14: - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0B43 CompareVarToValue 0x8008, 1 @@ -892,20 +892,20 @@ _0B64: End _0B77: - ScrCmd_05E 0, _212C - ScrCmd_05F + ApplyMovement 0, _212C + WaitMovement Return _0B83: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21F - ScrCmd_025 0x21F + CheckTrainerFlag 0x21F + CheckTrainerFlag 0x21F GoToIf 1, _0CBE ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _0D0E - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0BDC CompareVarToValue 0x8008, 1 @@ -948,10 +948,10 @@ _0C39: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21E - ScrCmd_023 0x21F + SetTrainerFlag 0x21E + SetTrainerFlag 0x21F Call _0D21 - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0C91 CompareVarToValue 0x8008, 1 @@ -989,7 +989,7 @@ _0CB2: End _0CBE: - ScrCmd_029 0x8008, 0x40FD + SetVar 0x8008, 0x40FD CompareVarToValue 0x8008, 0 GoToIf 1, _0CED CompareVarToValue 0x8008, 1 @@ -1029,20 +1029,20 @@ _0D0E: End _0D21: - ScrCmd_05E 1, _2134 - ScrCmd_05F + ApplyMovement 1, _2134 + WaitMovement Return _0D2D: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21B - ScrCmd_025 0x21B + CheckTrainerFlag 0x21B + CheckTrainerFlag 0x21B GoToIf 1, _0E68 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _0EB8 - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _0D86 CompareVarToValue 0x8008, 1 @@ -1085,10 +1085,10 @@ _0DE3: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21B - ScrCmd_023 0x217 + SetTrainerFlag 0x21B + SetTrainerFlag 0x217 Call _0ECB - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _0E3B CompareVarToValue 0x8008, 1 @@ -1126,7 +1126,7 @@ _0E5C: End _0E68: - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _0E97 CompareVarToValue 0x8008, 1 @@ -1166,20 +1166,20 @@ _0EB8: End _0ECB: - ScrCmd_05E 17, _212C - ScrCmd_05F + ApplyMovement 17, _212C + WaitMovement Return _0ED7: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x217 - ScrCmd_025 0x217 + CheckTrainerFlag 0x217 + CheckTrainerFlag 0x217 GoToIf 1, _1012 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1062 - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _0F30 CompareVarToValue 0x8008, 1 @@ -1222,10 +1222,10 @@ _0F8D: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21B - ScrCmd_023 0x217 + SetTrainerFlag 0x21B + SetTrainerFlag 0x217 Call _1075 - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _0FE5 CompareVarToValue 0x8008, 1 @@ -1263,7 +1263,7 @@ _1006: End _1012: - ScrCmd_029 0x8008, 0x40FE + SetVar 0x8008, 0x40FE CompareVarToValue 0x8008, 0 GoToIf 1, _1041 CompareVarToValue 0x8008, 1 @@ -1303,20 +1303,20 @@ _1062: End _1075: - ScrCmd_05E 10, _2134 - ScrCmd_05F + ApplyMovement 10, _2134 + WaitMovement Return _1081: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x224 - ScrCmd_025 0x224 + CheckTrainerFlag 0x224 + CheckTrainerFlag 0x224 GoToIf 1, _11BC ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _120C - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _10DA CompareVarToValue 0x8008, 1 @@ -1359,10 +1359,10 @@ _1137: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x224 - ScrCmd_023 0x21C + SetTrainerFlag 0x224 + SetTrainerFlag 0x21C Call _121F - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _118F CompareVarToValue 0x8008, 1 @@ -1400,7 +1400,7 @@ _11B0: End _11BC: - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _11EB CompareVarToValue 0x8008, 1 @@ -1440,20 +1440,20 @@ _120C: End _121F: - ScrCmd_05E 15, _212C - ScrCmd_05F + ApplyMovement 15, _212C + WaitMovement Return _122B: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21C - ScrCmd_025 0x21C + CheckTrainerFlag 0x21C + CheckTrainerFlag 0x21C GoToIf 1, _1366 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _13B6 - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _1284 CompareVarToValue 0x8008, 1 @@ -1496,10 +1496,10 @@ _12E1: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x224 - ScrCmd_023 0x21C + SetTrainerFlag 0x224 + SetTrainerFlag 0x21C Call _13C9 - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _1339 CompareVarToValue 0x8008, 1 @@ -1537,7 +1537,7 @@ _135A: End _1366: - ScrCmd_029 0x8008, 0x40FF + SetVar 0x8008, 0x40FF CompareVarToValue 0x8008, 0 GoToIf 1, _1395 CompareVarToValue 0x8008, 1 @@ -1577,20 +1577,20 @@ _13B6: End _13C9: - ScrCmd_05E 13, _2134 - ScrCmd_05F + ApplyMovement 13, _2134 + WaitMovement Return _13D5: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x228 - ScrCmd_025 0x228 + CheckTrainerFlag 0x228 + CheckTrainerFlag 0x228 GoToIf 1, _1510 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1560 - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _142E CompareVarToValue 0x8008, 1 @@ -1633,10 +1633,10 @@ _148B: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x228 - ScrCmd_023 0x220 + SetTrainerFlag 0x228 + SetTrainerFlag 0x220 Call _1573 - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _14E3 CompareVarToValue 0x8008, 1 @@ -1674,7 +1674,7 @@ _1504: End _1510: - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _153F CompareVarToValue 0x8008, 1 @@ -1714,20 +1714,20 @@ _1560: End _1573: - ScrCmd_05E 11, _212C - ScrCmd_05F + ApplyMovement 11, _212C + WaitMovement Return _157F: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x220 - ScrCmd_025 0x220 + CheckTrainerFlag 0x220 + CheckTrainerFlag 0x220 GoToIf 1, _16BA ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _170A - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _15D8 CompareVarToValue 0x8008, 1 @@ -1770,10 +1770,10 @@ _1635: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x228 - ScrCmd_023 0x220 + SetTrainerFlag 0x228 + SetTrainerFlag 0x220 Call _171D - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _168D CompareVarToValue 0x8008, 1 @@ -1811,7 +1811,7 @@ _16AE: End _16BA: - ScrCmd_029 0x8008, 0x4100 + SetVar 0x8008, 0x4100 CompareVarToValue 0x8008, 0 GoToIf 1, _16E9 CompareVarToValue 0x8008, 1 @@ -1851,20 +1851,20 @@ _170A: End _171D: - ScrCmd_05E 12, _2134 - ScrCmd_05F + ApplyMovement 12, _2134 + WaitMovement Return _1729: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21A - ScrCmd_025 0x21A + CheckTrainerFlag 0x21A + CheckTrainerFlag 0x21A GoToIf 1, _1864 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _18B4 - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _1782 CompareVarToValue 0x8008, 1 @@ -1907,10 +1907,10 @@ _17DF: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21A - ScrCmd_023 0x223 + SetTrainerFlag 0x21A + SetTrainerFlag 0x223 Call _18C7 - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _1837 CompareVarToValue 0x8008, 1 @@ -1948,7 +1948,7 @@ _1858: End _1864: - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _1893 CompareVarToValue 0x8008, 1 @@ -1988,20 +1988,20 @@ _18B4: End _18C7: - ScrCmd_05E 5, _212C - ScrCmd_05F + ApplyMovement 5, _212C + WaitMovement Return _18D3: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x223 - ScrCmd_025 0x223 + CheckTrainerFlag 0x223 + CheckTrainerFlag 0x223 GoToIf 1, _1A0E ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1A5E - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _192C CompareVarToValue 0x8008, 1 @@ -2044,10 +2044,10 @@ _1989: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21A - ScrCmd_023 0x223 + SetTrainerFlag 0x21A + SetTrainerFlag 0x223 Call _1A71 - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _19E1 CompareVarToValue 0x8008, 1 @@ -2085,7 +2085,7 @@ _1A02: End _1A0E: - ScrCmd_029 0x8008, 0x4101 + SetVar 0x8008, 0x4101 CompareVarToValue 0x8008, 0 GoToIf 1, _1A3D CompareVarToValue 0x8008, 1 @@ -2125,20 +2125,20 @@ _1A5E: End _1A71: - ScrCmd_05E 4, _2134 - ScrCmd_05F + ApplyMovement 4, _2134 + WaitMovement Return _1A7D: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x21D - ScrCmd_025 0x21D + CheckTrainerFlag 0x21D + CheckTrainerFlag 0x21D GoToIf 1, _1BB8 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1C08 - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1AD6 CompareVarToValue 0x8008, 1 @@ -2181,10 +2181,10 @@ _1B33: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21D - ScrCmd_023 0x226 + SetTrainerFlag 0x21D + SetTrainerFlag 0x226 Call _1C1B - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1B8B CompareVarToValue 0x8008, 1 @@ -2222,7 +2222,7 @@ _1BAC: End _1BB8: - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1BE7 CompareVarToValue 0x8008, 1 @@ -2262,20 +2262,20 @@ _1C08: End _1C1B: - ScrCmd_05E 7, _212C - ScrCmd_05F + ApplyMovement 7, _212C + WaitMovement Return _1C27: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x226 - ScrCmd_025 0x226 + CheckTrainerFlag 0x226 + CheckTrainerFlag 0x226 GoToIf 1, _1D62 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1DB2 - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1C80 CompareVarToValue 0x8008, 1 @@ -2318,10 +2318,10 @@ _1CDD: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x21D - ScrCmd_023 0x226 + SetTrainerFlag 0x21D + SetTrainerFlag 0x226 Call _1DC5 - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1D35 CompareVarToValue 0x8008, 1 @@ -2359,7 +2359,7 @@ _1D56: End _1D62: - ScrCmd_029 0x8008, 0x4102 + SetVar 0x8008, 0x4102 CompareVarToValue 0x8008, 0 GoToIf 1, _1D91 CompareVarToValue 0x8008, 1 @@ -2399,20 +2399,20 @@ _1DB2: End _1DC5: - ScrCmd_05E 8, _2134 - ScrCmd_05F + ApplyMovement 8, _2134 + WaitMovement Return _1DD1: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x225 - ScrCmd_025 0x225 + CheckTrainerFlag 0x225 + CheckTrainerFlag 0x225 GoToIf 1, _1F0C ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _1F5C - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _1E2A CompareVarToValue 0x8008, 1 @@ -2455,10 +2455,10 @@ _1E87: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x225 - ScrCmd_023 0x219 + SetTrainerFlag 0x225 + SetTrainerFlag 0x219 Call _1F6F - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _1EDF CompareVarToValue 0x8008, 1 @@ -2496,7 +2496,7 @@ _1F00: End _1F0C: - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _1F3B CompareVarToValue 0x8008, 1 @@ -2536,20 +2536,20 @@ _1F5C: End _1F6F: - ScrCmd_05E 14, _212C - ScrCmd_05F + ApplyMovement 14, _212C + WaitMovement Return _1F7B: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_025 0x219 - ScrCmd_025 0x219 + CheckTrainerFlag 0x219 + CheckTrainerFlag 0x219 GoToIf 1, _20B6 ScrCmd_19B 0x800C, 6 CompareVarToValue 0x800C, 1 GoToIf 1, _2106 - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _1FD4 CompareVarToValue 0x8008, 1 @@ -2592,10 +2592,10 @@ _2031: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _2125 - ScrCmd_023 0x225 - ScrCmd_023 0x219 + SetTrainerFlag 0x225 + SetTrainerFlag 0x219 Call _2119 - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _2089 CompareVarToValue 0x8008, 1 @@ -2633,7 +2633,7 @@ _20AA: End _20B6: - ScrCmd_029 0x8008, 0x4103 + SetVar 0x8008, 0x4103 CompareVarToValue 0x8008, 0 GoToIf 1, _20E5 CompareVarToValue 0x8008, 1 @@ -2673,8 +2673,8 @@ _2106: End _2119: - ScrCmd_05E 16, _2134 - ScrCmd_05F + ApplyMovement 16, _2134 + WaitMovement Return _2125: diff --git a/res/field/scripts/script_0418.s b/res/field/scripts/script_0418.s index 85d2150ae0..9c2781e712 100644 --- a/res/field/scripts/script_0418.s +++ b/res/field/scripts/script_0418.s @@ -12,8 +12,8 @@ _0006: CheckFlag 0x13A GoToIf 1, _0055 ScrCmd_02C 0 - ScrCmd_028 0x8004, 69 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 69 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _004B diff --git a/res/field/scripts/script_0420.s b/res/field/scripts/script_0420.s index edcec458fb..327dba003b 100644 --- a/res/field/scripts/script_0420.s +++ b/res/field/scripts/script_0420.s @@ -52,20 +52,20 @@ _009A: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 ScrCmd_066 0x8004, 0x8005 - ScrCmd_05E 241, _00E8 - ScrCmd_05F + ApplyMovement 241, _00E8 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 2, _00F8 - ScrCmd_05F + ApplyMovement 2, _00F8 + WaitMovement ScrCmd_065 2 - ScrCmd_05E 241, _00F0 - ScrCmd_05F + ApplyMovement 241, _00F0 + WaitMovement ScrCmd_067 - ScrCmd_028 0x4084, 1 + SetVar 0x4084, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0422.s b/res/field/scripts/script_0422.s index b27f6d7bba..b597f1c3a3 100644 --- a/res/field/scripts/script_0422.s +++ b/res/field/scripts/script_0422.s @@ -94,7 +94,7 @@ _00DD: End _00ED: - ScrCmd_026 0x40CA, 1 + AddVar 0x40CA, 1 ScrCmd_034 ScrCmd_061 End @@ -126,7 +126,7 @@ _0131: _013C: ScrCmd_031 ScrCmd_034 - ScrCmd_026 0x40CB, 1 + AddVar 0x40CB, 1 ScrCmd_061 End @@ -157,7 +157,7 @@ _0185: End _0193: - ScrCmd_026 0x40E8, 1 + AddVar 0x40E8, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -196,7 +196,7 @@ _01F4: End _01FF: - ScrCmd_026 0x40E1, 1 + AddVar 0x40E1, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -229,7 +229,7 @@ _0248: End _0256: - ScrCmd_026 0x40E2, 1 + AddVar 0x40E2, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -255,7 +255,7 @@ _0289: End _0294: - ScrCmd_026 0x40E4, 1 + AddVar 0x40E4, 1 ScrCmd_031 ScrCmd_034 ScrCmd_061 diff --git a/res/field/scripts/script_0423.s b/res/field/scripts/script_0423.s index d352b8b248..edd3600ebf 100644 --- a/res/field/scripts/script_0423.s +++ b/res/field/scripts/script_0423.s @@ -14,11 +14,11 @@ _001A: ScrCmd_060 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0xFF, _00D8 - ScrCmd_05F + ApplyMovement 0xFF, _00D8 + WaitMovement ScrCmd_02C 1 - ScrCmd_028 0x8004, 0x1B5 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B5 + SetVar 0x8005, 1 ScrCmd_014 0x7FC GoTo _0046 End @@ -30,7 +30,7 @@ _0046: ScrCmd_042 153, 0 ScrCmd_042 154, 1 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0086 CompareVarToValue 0x8008, 1 @@ -45,7 +45,7 @@ _0086: ScrCmd_042 155, 0 ScrCmd_042 154, 1 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0086 CompareVarToValue 0x8008, 1 @@ -54,7 +54,7 @@ _0086: End _00C6: - ScrCmd_028 0x40D4, 1 + SetVar 0x40D4, 1 ScrCmd_02C 4 ScrCmd_031 ScrCmd_034 @@ -96,7 +96,7 @@ _0123: ScrCmd_042 153, 0 ScrCmd_042 154, 1 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0163 CompareVarToValue 0x8008, 1 @@ -111,7 +111,7 @@ _0163: ScrCmd_042 155, 0 ScrCmd_042 154, 1 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0163 CompareVarToValue 0x8008, 1 @@ -137,7 +137,7 @@ _01C4: ScrCmd_042 15, 1 ScrCmd_042 16, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0213 CompareVarToValue 0x8008, 1 @@ -192,7 +192,7 @@ _0277: GoToIf 1, _02A9 ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 1 GoToIf 1, _02AF GoTo _026C @@ -206,23 +206,23 @@ _02AF: ScrCmd_02C 10 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - ScrCmd_05E 0xFF, _03B8 - ScrCmd_05F + ApplyMovement 0xFF, _03B8 + WaitMovement GoTo _02CC End _02CC: ScrCmd_168 0, 0, 9, 5, 77 Call _0320 - ScrCmd_05E 0xFF, _03C4 - ScrCmd_05F + ApplyMovement 0xFF, _03C4 + WaitMovement Call _0328 - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 0xFF, _03CC + WaitMovement ScrCmd_168 0, 0, 9, 2, 77 Call _0320 - ScrCmd_05E 0xFF, _03D4 - ScrCmd_05F + ApplyMovement 0xFF, _03D4 + WaitMovement Call _0328 GoTo _0333 End @@ -256,15 +256,15 @@ _035C: ScrCmd_0BD ScrCmd_168 0, 0, 8, 2, 77 Call _0320 - ScrCmd_05E 0xFF, _03EC - ScrCmd_05F + ApplyMovement 0xFF, _03EC + WaitMovement Call _0328 - ScrCmd_05E 0xFF, _03FC - ScrCmd_05F + ApplyMovement 0xFF, _03FC + WaitMovement ScrCmd_168 0, 0, 8, 5, 77 Call _0320 - ScrCmd_05E 0xFF, _0404 - ScrCmd_05F + ApplyMovement 0xFF, _0404 + WaitMovement Call _0328 End @@ -340,18 +340,18 @@ _0430: _043C: ScrCmd_1F9 0x40B8 - ScrCmd_028 0x40DD, 0 - ScrCmd_028 0x40DE, 0 - ScrCmd_028 0x40B8, 0 - ScrCmd_028 0x40B9, 0 - ScrCmd_028 0x40BD, 0 - ScrCmd_028 0x40BB, 0 - ScrCmd_028 0x40BE, 0 - ScrCmd_028 0x40D8, 0 - ScrCmd_028 0x40B7, 0 - ScrCmd_028 0x40BC, 0 - ScrCmd_028 0x40BA, 0 - ScrCmd_028 0x40BF, 0 + SetVar 0x40DD, 0 + SetVar 0x40DE, 0 + SetVar 0x40B8, 0 + SetVar 0x40B9, 0 + SetVar 0x40BD, 0 + SetVar 0x40BB, 0 + SetVar 0x40BE, 0 + SetVar 0x40D8, 0 + SetVar 0x40B7, 0 + SetVar 0x40BC, 0 + SetVar 0x40BA, 0 + SetVar 0x40BF, 0 ScrCmd_1F9 0x40B8 End @@ -363,7 +363,7 @@ _048E: CompareVarToValue 0x800C, 0 GoToIf 1, _04BC ScrCmd_201 0x405C - ScrCmd_029 0x405D, 0x800D + SetVar 0x405D, 0x800D ScrCmd_02C 17 GoTo _04C7 End @@ -380,7 +380,7 @@ _04C7: ScrCmd_042 23, 1 ScrCmd_042 24, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0526 CompareVarToValue 0x8008, 1 @@ -407,28 +407,28 @@ _051B: _0526: ScrCmd_14E ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 0 GoToIf 1, _0508 ScrCmd_02C 19 ScrCmd_034 - ScrCmd_05E 0xFF, _03B8 - ScrCmd_05F + ApplyMovement 0xFF, _03B8 + WaitMovement ScrCmd_168 0, 0, 5, 5, 77 Call _0320 - ScrCmd_05E 0x800D, _040C - ScrCmd_05E 0xFF, _03C4 - ScrCmd_05F + ApplyMovement 0x800D, _040C + ApplyMovement 0xFF, _03C4 + WaitMovement Call _0328 - ScrCmd_05E 0x800D, _0414 - ScrCmd_05F + ApplyMovement 0x800D, _0414 + WaitMovement ScrCmd_168 0, 0, 5, 2, 77 Call _0320 - ScrCmd_05E 0xFF, _03E0 - ScrCmd_05E 0x800D, _0424 - ScrCmd_05F + ApplyMovement 0xFF, _03E0 + ApplyMovement 0x800D, _0424 + WaitMovement Call _0328 - ScrCmd_028 0x4003, 0 + SetVar 0x4003, 0 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x24A, 0, 20, 11, 0 @@ -563,16 +563,16 @@ _0650: ScrCmd_060 ScrCmd_168 0, 0, 5, 2, 77 Call _0320 - ScrCmd_05E 0xFF, _03EC - ScrCmd_05F + ApplyMovement 0xFF, _03EC + WaitMovement Call _0328 - ScrCmd_05E 0xFF, _03FC - ScrCmd_05F + ApplyMovement 0xFF, _03FC + WaitMovement ScrCmd_168 0, 0, 5, 5, 77 Call _0320 - ScrCmd_05E 0xFF, _0404 - ScrCmd_05F + ApplyMovement 0xFF, _0404 + WaitMovement Call _0328 - ScrCmd_028 0x4080, 0 + SetVar 0x4080, 0 ScrCmd_061 End diff --git a/res/field/scripts/script_0424.s b/res/field/scripts/script_0424.s index bde56da495..75855dcbd8 100644 --- a/res/field/scripts/script_0424.s +++ b/res/field/scripts/script_0424.s @@ -8,7 +8,7 @@ _0006: ScrCmd_060 ScrCmd_003 1, 0x800C - ScrCmd_029 0x8005, 0x8000 + SetVar 0x8005, 0x8000 ScrCmd_28C 0x8000 ScrCmd_059 0x800C CompareVarToValue 0x800C, 1 @@ -29,7 +29,7 @@ _0054: ScrCmd_054 42, 10 ScrCmd_02C 1 ScrCmd_05A 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_003 30, 0x800C ScrCmd_055 10 ScrCmd_003 10, 0x800C diff --git a/res/field/scripts/script_0426.s b/res/field/scripts/script_0426.s index 00e3a14360..4b4de2e982 100644 --- a/res/field/scripts/script_0426.s +++ b/res/field/scripts/script_0426.s @@ -22,7 +22,7 @@ _001B: ScrCmd_042 11, 2 ScrCmd_042 12, 3 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _00D0 CompareVarToValue 0x8008, 1 @@ -104,7 +104,7 @@ _0121: CompareVarToValue 0x800C, 2 GoToIf 1, _00C5 ScrCmd_014 0x7D6 - ScrCmd_029 0x800C, 0x4000 + SetVar 0x800C, 0x4000 CompareVarToValue 0x800C, 1 GoToIf 1, _0173 GoTo _006D @@ -118,7 +118,7 @@ _0173: ScrCmd_042 14, 1 ScrCmd_042 5, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01B7 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0427.s b/res/field/scripts/script_0427.s index 1d3cb19f8c..454a028282 100644 --- a/res/field/scripts/script_0427.s +++ b/res/field/scripts/script_0427.s @@ -29,17 +29,17 @@ _0042: End _0062: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _006A: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0072: ScrCmd_060 - ScrCmd_05E 2, _0664 - ScrCmd_05F + ApplyMovement 2, _0664 + WaitMovement ScrCmd_02C 0 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -54,50 +54,50 @@ _0072: End _00BF: - ScrCmd_05E 2, _0670 - ScrCmd_05F + ApplyMovement 2, _0670 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 2, _06A8 - ScrCmd_05E 0xFF, _0810 - ScrCmd_05F + ApplyMovement 2, _06A8 + ApplyMovement 0xFF, _0810 + WaitMovement GoTo _016F End _00EB: - ScrCmd_05E 2, _0680 - ScrCmd_05F + ApplyMovement 2, _0680 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 2, _06C0 - ScrCmd_05E 0xFF, _0824 - ScrCmd_05F + ApplyMovement 2, _06C0 + ApplyMovement 0xFF, _0824 + WaitMovement GoTo _016F End _0117: - ScrCmd_05E 2, _0690 - ScrCmd_05F + ApplyMovement 2, _0690 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 2, _06D8 - ScrCmd_05E 0xFF, _0838 - ScrCmd_05F + ApplyMovement 2, _06D8 + ApplyMovement 0xFF, _0838 + WaitMovement GoTo _016F End _0143: - ScrCmd_05E 2, _0698 - ScrCmd_05F + ApplyMovement 2, _0698 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 2, _06F0 - ScrCmd_05E 0xFF, _084C - ScrCmd_05F + ApplyMovement 2, _06F0 + ApplyMovement 0xFF, _084C + WaitMovement GoTo _016F End @@ -105,49 +105,49 @@ _016F: ScrCmd_0CE 0 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 2, _0708 - ScrCmd_05E 0xFF, _0860 - ScrCmd_05F + ApplyMovement 2, _0708 + ApplyMovement 0xFF, _0860 + WaitMovement ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 2, _071C - ScrCmd_05E 0xFF, _086C - ScrCmd_05F + ApplyMovement 2, _071C + ApplyMovement 0xFF, _086C + WaitMovement ScrCmd_02C 4 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 2, _0728 - ScrCmd_05E 0xFF, _0878 - ScrCmd_05F + ApplyMovement 2, _0728 + ApplyMovement 0xFF, _0878 + WaitMovement ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 0xFF, _0730 - ScrCmd_05E 2, _0730 - ScrCmd_05F + ApplyMovement 0xFF, _0730 + ApplyMovement 2, _0730 + WaitMovement ScrCmd_050 0x44A ClearFlag 0x178 ScrCmd_064 5 ScrCmd_062 5 - ScrCmd_05E 5, _07C0 - ScrCmd_05F + ApplyMovement 5, _07C0 + WaitMovement ScrCmd_02C 6 ScrCmd_0CE 0 ScrCmd_02C 7 ScrCmd_02C 8 - ScrCmd_05E 2, _0740 - ScrCmd_05F + ApplyMovement 2, _0740 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 2, _0748 - ScrCmd_05E 5, _07C8 - ScrCmd_05F + ApplyMovement 2, _0748 + ApplyMovement 5, _07C8 + WaitMovement ScrCmd_02C 10 ScrCmd_034 ScrCmd_003 20, 0x800C - ScrCmd_05E 5, _07D0 - ScrCmd_05F + ApplyMovement 5, _07D0 + WaitMovement ScrCmd_02C 11 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -157,13 +157,13 @@ _016F: End _0259: - ScrCmd_05E 2, _0750 - ScrCmd_05F + ApplyMovement 2, _0750 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 12 ScrCmd_034 - ScrCmd_05E 2, _0758 - ScrCmd_05F + ApplyMovement 2, _0758 + WaitMovement ScrCmd_02C 13 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -173,8 +173,8 @@ _0259: End _0298: - ScrCmd_05E 2, _0758 - ScrCmd_05F + ApplyMovement 2, _0758 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 14 ScrCmd_02C 15 @@ -182,14 +182,14 @@ _0298: End _02B3: - ScrCmd_05E 2, _0768 - ScrCmd_05F + ApplyMovement 2, _0768 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 16 - ScrCmd_05E 2, _0770 - ScrCmd_05F - ScrCmd_05E 0xFF, _088C - ScrCmd_05F + ApplyMovement 2, _0770 + WaitMovement + ApplyMovement 0xFF, _088C + WaitMovement ScrCmd_0CD 1 ScrCmd_02C 17 ScrCmd_03E 0x800C @@ -207,22 +207,22 @@ _02FD: _030B: ScrCmd_02C 19 - ScrCmd_05E 2, _0768 - ScrCmd_05E 0xFF, _0894 - ScrCmd_05F + ApplyMovement 2, _0768 + ApplyMovement 0xFF, _0894 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 20 ScrCmd_02C 21 ScrCmd_034 - ScrCmd_05E 5, _07D8 - ScrCmd_05F + ApplyMovement 5, _07D8 + WaitMovement ScrCmd_003 25, 0x800C ClearFlag 0x179 ScrCmd_064 6 ScrCmd_062 6 ScrCmd_014 0x7F8 - ScrCmd_05E 6, _08C8 - ScrCmd_05F + ApplyMovement 6, _08C8 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _036E @@ -232,15 +232,15 @@ _030B: _036E: ScrCmd_02C 22 ScrCmd_034 - ScrCmd_05E 5, _07E8 - ScrCmd_05F + ApplyMovement 5, _07E8 + WaitMovement ClearFlag 0x17D ScrCmd_064 12 ScrCmd_003 15, 0x800C ScrCmd_02C 23 ScrCmd_02C 26 - ScrCmd_05E 6, _08D0 - ScrCmd_05F + ApplyMovement 6, _08D0 + WaitMovement ScrCmd_02C 28 GoTo _03DE End @@ -248,15 +248,15 @@ _036E: _03A6: ScrCmd_02C 24 ScrCmd_034 - ScrCmd_05E 5, _07E8 - ScrCmd_05F + ApplyMovement 5, _07E8 + WaitMovement ClearFlag 0x17D ScrCmd_064 12 ScrCmd_003 15, 0x800C ScrCmd_02C 25 ScrCmd_02C 27 - ScrCmd_05E 6, _08D0 - ScrCmd_05F + ApplyMovement 6, _08D0 + WaitMovement ScrCmd_02C 29 GoTo _03DE End @@ -264,23 +264,23 @@ _03A6: _03DE: ScrCmd_02C 30 ScrCmd_034 - ScrCmd_05E 5, _07F0 - ScrCmd_05F + ApplyMovement 5, _07F0 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 31 - ScrCmd_05E 2, _0778 - ScrCmd_05F + ApplyMovement 2, _0778 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 33 - ScrCmd_05E 2, _0780 - ScrCmd_05F + ApplyMovement 2, _0780 + WaitMovement ScrCmd_0CD 1 ScrCmd_02C 34 ScrCmd_031 ScrCmd_034 ScrCmd_014 0x7F9 ScrCmd_188 2, 16 - ScrCmd_028 0x4086, 1 + SetVar 0x4086, 1 ScrCmd_061 End @@ -297,20 +297,20 @@ _042E: ScrCmd_0BD ScrCmd_0DE 0x8000 ScrCmd_096 0x8000, 5, 0, 0x800C - ScrCmd_05E 5, _07F8 - ScrCmd_05E 2, _0760 - ScrCmd_05E 0xFF, _0884 - ScrCmd_05F + ApplyMovement 5, _07F8 + ApplyMovement 2, _0760 + ApplyMovement 0xFF, _0884 + WaitMovement ScrCmd_0CE 0 ScrCmd_0DC 2 ScrCmd_02C 36 ScrCmd_02C 37 ScrCmd_02C 38 ScrCmd_034 - ScrCmd_05E 5, _0800 - ScrCmd_05E 2, _0788 - ScrCmd_05E 0xFF, _089C - ScrCmd_05F + ApplyMovement 5, _0800 + ApplyMovement 2, _0788 + ApplyMovement 0xFF, _089C + WaitMovement SetFlag 0x178 ScrCmd_065 5 ScrCmd_14D 0x800C @@ -322,9 +322,9 @@ _042E: _04CA: ScrCmd_02C 39 ScrCmd_034 - ScrCmd_05E 6, _08D8 - ScrCmd_05E 0xFF, _08A8 - ScrCmd_05F + ApplyMovement 6, _08D8 + ApplyMovement 0xFF, _08A8 + WaitMovement ScrCmd_02C 40 ScrCmd_034 GoTo _0512 @@ -333,27 +333,27 @@ _04CA: _04EE: ScrCmd_02C 41 ScrCmd_034 - ScrCmd_05E 6, _08D8 - ScrCmd_05E 0xFF, _08A8 - ScrCmd_05F + ApplyMovement 6, _08D8 + ApplyMovement 0xFF, _08A8 + WaitMovement ScrCmd_02C 42 ScrCmd_034 GoTo _0512 End _0512: - ScrCmd_05E 0xFF, _08B0 - ScrCmd_05E 6, _08E0 - ScrCmd_05F + ApplyMovement 0xFF, _08B0 + ApplyMovement 6, _08E0 + WaitMovement SetFlag 0x179 ScrCmd_065 6 ScrCmd_0CE 0 ScrCmd_02C 43 ScrCmd_034 ScrCmd_003 40, 0x800C - ScrCmd_05E 2, _07A8 - ScrCmd_05E 0xFF, _08BC - ScrCmd_05F + ApplyMovement 2, _07A8 + ApplyMovement 0xFF, _08BC + WaitMovement GoTo _0554 End @@ -417,8 +417,8 @@ _05F5: _0618: ScrCmd_034 - ScrCmd_028 0x4086, 2 - ScrCmd_028 0x40A4, 3 + SetVar 0x4086, 2 + SetVar 0x40A4, 3 ScrCmd_003 30, 0x800C ScrCmd_0BC 6, 3, 0, 0 ScrCmd_0BD @@ -772,24 +772,24 @@ _08E8: End _0903: - ScrCmd_05E 0xFF, _09D0 - ScrCmd_05E 2, _09B0 - ScrCmd_05F + ApplyMovement 0xFF, _09D0 + ApplyMovement 2, _09B0 + WaitMovement Call _0967 - ScrCmd_05E 0xFF, _09C0 - ScrCmd_05E 2, _0998 - ScrCmd_05F + ApplyMovement 0xFF, _09C0 + ApplyMovement 2, _0998 + WaitMovement GoTo _097C End _0935: - ScrCmd_05E 0xFF, _09D8 - ScrCmd_05E 2, _09B8 - ScrCmd_05F + ApplyMovement 0xFF, _09D8 + ApplyMovement 2, _09B8 + WaitMovement Call _0967 - ScrCmd_05E 0xFF, _09C8 - ScrCmd_05E 2, _09A4 - ScrCmd_05F + ApplyMovement 0xFF, _09C8 + ApplyMovement 2, _09A4 + WaitMovement GoTo _097C End @@ -857,9 +857,9 @@ _09D8: _09E0: ScrCmd_060 - ScrCmd_05E 0xFF, _0A84 - ScrCmd_05E 2, _0A74 - ScrCmd_05F + ApplyMovement 0xFF, _0A84 + ApplyMovement 2, _0A74 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 52 @@ -878,9 +878,9 @@ _09E0: _0A3B: ScrCmd_162 ScrCmd_06D 2, 15 - ScrCmd_05E 0xFF, _0A7C - ScrCmd_05E 2, _0A68 - ScrCmd_05F + ApplyMovement 0xFF, _0A7C + ApplyMovement 2, _0A68 + WaitMovement GoTo _0A5B _0A5B: @@ -911,8 +911,8 @@ _0A84: _0A8C: ScrCmd_060 - ScrCmd_05E 2, _0AE4 - ScrCmd_05F + ApplyMovement 2, _0AE4 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 35 ScrCmd_034 @@ -923,14 +923,14 @@ _0A8C: End _0AB9: - ScrCmd_05E 0xFF, _0AEC - ScrCmd_05F + ApplyMovement 0xFF, _0AEC + WaitMovement GoTo _0ADD End _0ACB: - ScrCmd_05E 0xFF, _0AF4 - ScrCmd_05F + ApplyMovement 0xFF, _0AF4 + WaitMovement GoTo _0ADD End @@ -1006,49 +1006,49 @@ _0B24: End _0B55: - ScrCmd_05E 254, _0DBC - ScrCmd_05E 5, _0D48 - ScrCmd_05F + ApplyMovement 254, _0DBC + ApplyMovement 5, _0D48 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 53 ScrCmd_034 - ScrCmd_05E 5, _0D50 - ScrCmd_05E 6, _0D80 - ScrCmd_05F + ApplyMovement 5, _0D50 + ApplyMovement 6, _0D80 + WaitMovement GoTo _0BF5 End _0B89: - ScrCmd_05E 254, _0DBC - ScrCmd_05E 5, _0D48 - ScrCmd_05F + ApplyMovement 254, _0DBC + ApplyMovement 5, _0D48 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 53 ScrCmd_034 - ScrCmd_05E 5, _0D5C - ScrCmd_05E 6, _0D80 - ScrCmd_05F + ApplyMovement 5, _0D5C + ApplyMovement 6, _0D80 + WaitMovement GoTo _0BF5 _0BBB: - ScrCmd_05E 0xFF, _0DDC - ScrCmd_05E 254, _0DCC - ScrCmd_05E 5, _0D48 - ScrCmd_05F + ApplyMovement 0xFF, _0DDC + ApplyMovement 254, _0DCC + ApplyMovement 5, _0D48 + WaitMovement ScrCmd_0CE 0 ScrCmd_02C 53 ScrCmd_034 - ScrCmd_05E 5, _0D5C - ScrCmd_05E 6, _0D80 - ScrCmd_05F + ApplyMovement 5, _0D5C + ApplyMovement 6, _0D80 + WaitMovement GoTo _0BF5 _0BF5: ScrCmd_0CF 0 ScrCmd_0DB 1 ScrCmd_0DC 2 - ScrCmd_05E 5, _0D70 - ScrCmd_05F + ApplyMovement 5, _0D70 + WaitMovement CompareVarToValue 0x8005, 0x355 GoToIf 1, _0C3E CompareVarToValue 0x8005, 0x356 @@ -1060,21 +1060,21 @@ _0BF5: End _0C3E: - ScrCmd_05E 5, _0D78 - ScrCmd_05E 6, _0D94 - ScrCmd_05F + ApplyMovement 5, _0D78 + ApplyMovement 6, _0D94 + WaitMovement GoTo _0C86 _0C56: - ScrCmd_05E 5, _0D78 - ScrCmd_05E 6, _0DA0 - ScrCmd_05F + ApplyMovement 5, _0D78 + ApplyMovement 6, _0DA0 + WaitMovement GoTo _0C86 _0C6E: - ScrCmd_05E 5, _0D78 - ScrCmd_05E 6, _0DA0 - ScrCmd_05F + ApplyMovement 5, _0D78 + ApplyMovement 6, _0DA0 + WaitMovement GoTo _0C86 _0C86: @@ -1102,19 +1102,19 @@ _0CA9: End _0CE1: - ScrCmd_05E 6, _0DB4 - ScrCmd_05F + ApplyMovement 6, _0DB4 + WaitMovement GoTo _0CF1 _0CF1: ScrCmd_065 6 ScrCmd_065 5 - ScrCmd_028 0x4086, 3 + SetVar 0x4086, 3 ScrCmd_06C 254, 0 ScrCmd_162 SetFlag 0x172 SetFlag 0x195 - ScrCmd_028 0x4082, 4 + SetVar 0x4082, 4 SetFlag 0x196 ScrCmd_003 30, 0x800C ScrCmd_0BC 6, 3, 0, 0 @@ -1257,8 +1257,8 @@ _0E47: CheckFlag 108 GoToIf 1, _0E8C ScrCmd_02C 55 - ScrCmd_028 0x8004, 17 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 17 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0E97 @@ -1293,8 +1293,8 @@ _0EA1: _0EB4: ScrCmd_060 - ScrCmd_05E 2, _0664 - ScrCmd_05F + ApplyMovement 2, _0664 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 50 @@ -1311,26 +1311,26 @@ _0EB4: End _0F07: - ScrCmd_05E 2, _0670 - ScrCmd_05F + ApplyMovement 2, _0670 + WaitMovement GoTo _0F4F End _0F19: - ScrCmd_05E 2, _0680 - ScrCmd_05F + ApplyMovement 2, _0680 + WaitMovement GoTo _0F4F End _0F2B: - ScrCmd_05E 2, _0690 - ScrCmd_05F + ApplyMovement 2, _0690 + WaitMovement GoTo _0F4F End _0F3D: - ScrCmd_05E 2, _0698 - ScrCmd_05F + ApplyMovement 2, _0698 + WaitMovement GoTo _0F4F End @@ -1339,7 +1339,7 @@ _0F4F: ScrCmd_02C 51 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x4086, 3 + SetVar 0x4086, 3 ScrCmd_164 ScrCmd_161 ScrCmd_06D 2, 48 diff --git a/res/field/scripts/script_0428.s b/res/field/scripts/script_0428.s index 448e54ba99..05197a6418 100644 --- a/res/field/scripts/script_0428.s +++ b/res/field/scripts/script_0428.s @@ -22,11 +22,11 @@ _001E: End _004B: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _0053: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _005B: @@ -71,9 +71,9 @@ _00B2: _00C7: ScrCmd_060 - ScrCmd_05E 3, _03C4 - ScrCmd_05E 0xFF, _04A0 - ScrCmd_05F + ApplyMovement 3, _03C4 + ApplyMovement 0xFF, _04A0 + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x339 GoToIf 1, _0124 @@ -88,28 +88,28 @@ _00C7: End _0124: - ScrCmd_05E 3, _03D4 - ScrCmd_05F + ApplyMovement 3, _03D4 + WaitMovement GoTo _0174 _0134: - ScrCmd_05E 3, _03E4 - ScrCmd_05F + ApplyMovement 3, _03E4 + WaitMovement GoTo _0174 _0144: - ScrCmd_05E 3, _03F4 - ScrCmd_05F + ApplyMovement 3, _03F4 + WaitMovement GoTo _0174 _0154: - ScrCmd_05E 3, _0400 - ScrCmd_05F + ApplyMovement 3, _0400 + WaitMovement GoTo _0174 _0164: - ScrCmd_05E 3, _0410 - ScrCmd_05F + ApplyMovement 3, _0410 + WaitMovement GoTo _0174 _0174: @@ -138,12 +138,12 @@ _01B2: _01C5: ScrCmd_034 - ScrCmd_05E 3, _0488 - ScrCmd_05E 0xFF, _04BC - ScrCmd_05F + ApplyMovement 3, _0488 + ApplyMovement 0xFF, _04BC + WaitMovement ScrCmd_126 - ScrCmd_05E 3, _0490 - ScrCmd_05F + ApplyMovement 3, _0490 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0205 @@ -162,8 +162,8 @@ _0211: GoTo _021D _021D: - ScrCmd_028 0x8004, 4 - ScrCmd_028 0x8005, 5 + SetVar 0x8004, 4 + SetVar 0x8005, 5 ScrCmd_014 0x7FC ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -183,10 +183,10 @@ _0259: _0262: ScrCmd_034 - ScrCmd_05E 3, _0498 - ScrCmd_05F + ApplyMovement 3, _0498 + WaitMovement ScrCmd_065 3 - ScrCmd_028 0x4087, 1 + SetVar 0x4087, 1 ScrCmd_061 End @@ -247,38 +247,38 @@ _02F4: End _0339: - ScrCmd_05E 3, _0420 - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 3, _0420 + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _03B1 _0351: - ScrCmd_05E 3, _0434 - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 3, _0434 + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _03B1 _0369: - ScrCmd_05E 3, _0448 - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 3, _0448 + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _03B1 _0381: - ScrCmd_05E 3, _0458 - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 3, _0458 + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _03B1 _0399: - ScrCmd_05E 3, _046C - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 3, _046C + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _03B1 _03B1: - ScrCmd_05E 3, _0480 - ScrCmd_05F + ApplyMovement 3, _0480 + WaitMovement SetFlag 0x115 ScrCmd_061 End @@ -415,12 +415,12 @@ _04C4: ScrCmd_034 ScrCmd_050 0x47E ScrCmd_308 189, 0x332 - ScrCmd_05E 241, _06F8 - ScrCmd_05F + ApplyMovement 241, _06F8 + WaitMovement ScrCmd_309 - ScrCmd_05E 3, _0690 - ScrCmd_05E 0xFF, _06D0 - ScrCmd_05F + ApplyMovement 3, _0690 + ApplyMovement 0xFF, _06D0 + WaitMovement ScrCmd_003 15, 0x800C CompareVarToValue 0x8000, 0 CallIf 1, _065D @@ -454,51 +454,51 @@ _04C4: End _05D1: - ScrCmd_05E 3, _0698 - ScrCmd_05E 0xFF, _06D8 - ScrCmd_05F + ApplyMovement 3, _0698 + ApplyMovement 0xFF, _06D8 + WaitMovement Return _05E5: - ScrCmd_05E 3, _06A0 - ScrCmd_05E 0xFF, _06E0 - ScrCmd_05F + ApplyMovement 3, _06A0 + ApplyMovement 0xFF, _06E0 + WaitMovement Return _05F9: - ScrCmd_05E 0xFF, _06E8 - ScrCmd_05F + ApplyMovement 0xFF, _06E8 + WaitMovement Return _0605: - ScrCmd_05E 3, _06B0 - ScrCmd_05F + ApplyMovement 3, _06B0 + WaitMovement Return _0611: - ScrCmd_05E 3, _0674 - ScrCmd_05F + ApplyMovement 3, _0674 + WaitMovement Return _061D: - ScrCmd_05E 3, _0684 - ScrCmd_05F + ApplyMovement 3, _0684 + WaitMovement Return _0629: - ScrCmd_05E 3, _0684 - ScrCmd_05F + ApplyMovement 3, _0684 + WaitMovement Return _0635: - ScrCmd_05E 3, _0684 - ScrCmd_05F + ApplyMovement 3, _0684 + WaitMovement Return _0641: ScrCmd_065 3 ClearFlag 0x177 - ScrCmd_028 0x4087, 3 + SetVar 0x4087, 3 ScrCmd_061 End diff --git a/res/field/scripts/script_0429.s b/res/field/scripts/script_0429.s index 5544e50157..022422aa9a 100644 --- a/res/field/scripts/script_0429.s +++ b/res/field/scripts/script_0429.s @@ -54,8 +54,8 @@ _0070: _0085: ScrCmd_060 - ScrCmd_05E 5, _0268 - ScrCmd_05F + ApplyMovement 5, _0268 + WaitMovement ScrCmd_014 0x7FA ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x2F5 @@ -69,23 +69,23 @@ _0085: End _00D1: - ScrCmd_05E 5, _0230 - ScrCmd_05F + ApplyMovement 5, _0230 + WaitMovement GoTo _0111 _00E1: - ScrCmd_05E 5, _0238 - ScrCmd_05F + ApplyMovement 5, _0238 + WaitMovement GoTo _0111 _00F1: - ScrCmd_05E 5, _0248 - ScrCmd_05F + ApplyMovement 5, _0248 + WaitMovement GoTo _0111 _0101: - ScrCmd_05E 5, _0258 - ScrCmd_05F + ApplyMovement 5, _0258 + WaitMovement GoTo _0111 _0111: @@ -131,28 +131,28 @@ _0164: End _01B9: - ScrCmd_05E 5, _0210 - ScrCmd_05F + ApplyMovement 5, _0210 + WaitMovement GoTo _01F9 _01C9: - ScrCmd_05E 5, _0218 - ScrCmd_05F + ApplyMovement 5, _0218 + WaitMovement GoTo _01F9 _01D9: - ScrCmd_05E 5, _0220 - ScrCmd_05F + ApplyMovement 5, _0220 + WaitMovement GoTo _01F9 _01E9: - ScrCmd_05E 5, _0228 - ScrCmd_05F + ApplyMovement 5, _0228 + WaitMovement GoTo _01F9 _01F9: ScrCmd_065 5 - ScrCmd_028 0x4088, 1 + SetVar 0x4088, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0431.s b/res/field/scripts/script_0431.s index cef5a69455..7810f6be27 100644 --- a/res/field/scripts/script_0431.s +++ b/res/field/scripts/script_0431.s @@ -24,8 +24,8 @@ _0021: CheckFlag 197 GoToIf 1, _0066 ScrCmd_02C 1 - ScrCmd_028 0x8004, 0x195 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x195 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0071 diff --git a/res/field/scripts/script_0432.s b/res/field/scripts/script_0432.s index cfb99f2e84..42b04aa808 100644 --- a/res/field/scripts/script_0432.s +++ b/res/field/scripts/script_0432.s @@ -21,12 +21,12 @@ _002C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_05E 13, _0060 - ScrCmd_05F + ApplyMovement 13, _0060 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 12, _0068 - ScrCmd_05F + ApplyMovement 12, _0068 + WaitMovement Call _00B6 ScrCmd_02C 4 ScrCmd_031 @@ -46,19 +46,19 @@ _0068: _0070: ScrCmd_060 - ScrCmd_05E 13, _00BC - ScrCmd_05F + ApplyMovement 13, _00BC + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 12, _00C4 - ScrCmd_05F + ApplyMovement 12, _00C4 + WaitMovement ScrCmd_02C 3 ScrCmd_034 - ScrCmd_05E 13, _00CC - ScrCmd_05E 0xFF, _00EC - ScrCmd_05F - ScrCmd_05E 12, _00E4 - ScrCmd_05F + ApplyMovement 13, _00CC + ApplyMovement 0xFF, _00EC + WaitMovement + ApplyMovement 12, _00E4 + WaitMovement Call _00B6 ScrCmd_061 End @@ -140,7 +140,7 @@ _0142: _014D: SetFlag 0x1A1 SetFlag 145 - ScrCmd_028 0x4089, 1 + SetVar 0x4089, 1 Return _015D: @@ -159,34 +159,34 @@ _015D: End _01A8: - ScrCmd_05E 18, _0238 - ScrCmd_05F - ScrCmd_05E 0xFF, _0228 - ScrCmd_05F + ApplyMovement 18, _0238 + WaitMovement + ApplyMovement 0xFF, _0228 + WaitMovement GoTo _0216 _01C2: - ScrCmd_05E 18, _024C - ScrCmd_05F - ScrCmd_05E 0xFF, _0228 - ScrCmd_05F + ApplyMovement 18, _024C + WaitMovement + ApplyMovement 0xFF, _0228 + WaitMovement GoTo _0216 _01DC: GoTo _0216 _01E2: - ScrCmd_05E 18, _025C - ScrCmd_05F - ScrCmd_05E 0xFF, _0230 - ScrCmd_05F + ApplyMovement 18, _025C + WaitMovement + ApplyMovement 0xFF, _0230 + WaitMovement GoTo _0216 _01FC: - ScrCmd_05E 18, _026C - ScrCmd_05F - ScrCmd_05E 0xFF, _0230 - ScrCmd_05F + ApplyMovement 18, _026C + WaitMovement + ApplyMovement 0xFF, _0230 + WaitMovement GoTo _0216 _0216: diff --git a/res/field/scripts/script_0436.s b/res/field/scripts/script_0436.s index 1dc3012da8..90e0a0cee0 100644 --- a/res/field/scripts/script_0436.s +++ b/res/field/scripts/script_0436.s @@ -17,7 +17,7 @@ _001C: ScrCmd_069 0x4004, 0x4005 CompareVarToValue 0x4005, 3 CallIf 3, _0037 - ScrCmd_028 0x4003, 1 + SetVar 0x4003, 1 End _0037: @@ -39,18 +39,18 @@ _0050: ScrCmd_0C7 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _0080 - ScrCmd_05E 0, _0090 - ScrCmd_05F + ApplyMovement 0, _0090 + WaitMovement ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _0098 - ScrCmd_05F + ApplyMovement 0xFF, _0098 + WaitMovement ScrCmd_061 End _0080: SetFlag 0x996 - ScrCmd_028 0x4002, 1 + SetVar 0x4002, 1 ScrCmd_061 End @@ -67,7 +67,7 @@ _0098: _00A0: ScrCmd_060 ClearFlag 0x996 - ScrCmd_028 0x4002, 0 + SetVar 0x4002, 0 ScrCmd_061 End @@ -77,10 +77,10 @@ _00B0: ScrCmd_068 CheckFlag 0x12B GoToIf 1, _00E5 - ScrCmd_028 0x8004, 96 + SetVar 0x8004, 96 ScrCmd_261 0, 0x8004 ScrCmd_02C 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7DF SetFlag 0x12B ScrCmd_034 diff --git a/res/field/scripts/script_0438.s b/res/field/scripts/script_0438.s index 83d384544a..c6864ee594 100644 --- a/res/field/scripts/script_0438.s +++ b/res/field/scripts/script_0438.s @@ -20,11 +20,11 @@ _001E: End _003E: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _0046: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _004E: @@ -32,13 +32,13 @@ _004E: ScrCmd_069 0x8004, 0x8005 ScrCmd_186 18, 0x14B, 0x8005 Call _008E - ScrCmd_05E 18, _0194 - ScrCmd_05F + ApplyMovement 18, _0194 + WaitMovement ScrCmd_014 0x7F8 - ScrCmd_05E 18, _01A0 - ScrCmd_05F - ScrCmd_05E 0xFF, _0174 - ScrCmd_05F + ApplyMovement 18, _01A0 + WaitMovement + ApplyMovement 0xFF, _0174 + WaitMovement GoTo _009C End @@ -86,24 +86,24 @@ _00F1: _012F: SetFlag 0x97F - ScrCmd_028 0x8004, 0x1BB - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1BB + SetVar 0x8005, 1 ScrCmd_014 0x7FC Return _0145: - ScrCmd_028 0x8004, 6 + SetVar 0x8004, 6 ScrCmd_014 0x7D9 ScrCmd_0D7 1, 6 Return _0156: ScrCmd_034 - ScrCmd_05E 18, _01A8 - ScrCmd_05F + ApplyMovement 18, _01A8 + WaitMovement ScrCmd_065 18 ScrCmd_014 0x7F9 - ScrCmd_028 0x408C, 1 + SetVar 0x408C, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0439.s b/res/field/scripts/script_0439.s index 00f0edeef6..6d83d03818 100644 --- a/res/field/scripts/script_0439.s +++ b/res/field/scripts/script_0439.s @@ -48,8 +48,8 @@ _0070: CheckFlag 0x13F GoToIf 1, _00B5 ScrCmd_02C 0 - ScrCmd_028 0x8004, 111 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 111 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00C0 diff --git a/res/field/scripts/script_0440.s b/res/field/scripts/script_0440.s index 89c099ad38..96c7936968 100644 --- a/res/field/scripts/script_0440.s +++ b/res/field/scripts/script_0440.s @@ -21,8 +21,8 @@ _001C: GoToIf 1, _0067 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 26 - ScrCmd_026 0x8004, 149 - ScrCmd_028 0x8005, 1 + AddVar 0x8004, 149 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0072 @@ -64,8 +64,8 @@ _007C: _00C7: ScrCmd_02C 3 - ScrCmd_028 0x4000, 1 - ScrCmd_028 0x8004, 7 + SetVar 0x4000, 1 + SetVar 0x8004, 7 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 @@ -107,8 +107,8 @@ _0108: ScrCmd_042 226, 3 ScrCmd_042 227, 4 ScrCmd_043 - ScrCmd_029 0x8000, 0x800C - ScrCmd_029 0x8008, 0x8000 + SetVar 0x8000, 0x800C + SetVar 0x8008, 0x8000 CompareVarToValue 0x8008, 0 GoToIf 1, _0245 CompareVarToValue 0x8008, 1 @@ -166,19 +166,19 @@ _023C: GoTo _0229 _0245: - ScrCmd_028 0x8001, 95 + SetVar 0x8001, 95 GoTo _0180 _0251: - ScrCmd_028 0x8001, 96 + SetVar 0x8001, 96 GoTo _0180 _025D: - ScrCmd_028 0x8001, 97 + SetVar 0x8001, 97 GoTo _0180 _0269: - ScrCmd_028 0x8001, 98 + SetVar 0x8001, 98 GoTo _0180 _0275: @@ -235,7 +235,7 @@ _02E8: ScrCmd_042 22, 3 ScrCmd_042 23, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _035B CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0441.s b/res/field/scripts/script_0441.s index 2899e41de4..a7ad4e2c0c 100644 --- a/res/field/scripts/script_0441.s +++ b/res/field/scripts/script_0441.s @@ -72,7 +72,7 @@ _00E6: ScrCmd_02C 3 ScrCmd_031 ScrCmd_07C 111, 1, 0x800C - ScrCmd_028 0x408A, 1 + SetVar 0x408A, 1 ScrCmd_034 ScrCmd_061 End @@ -101,7 +101,7 @@ _014D: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _017F - ScrCmd_028 0x408A, 0 + SetVar 0x408A, 0 ScrCmd_26F End @@ -156,7 +156,7 @@ _01C7: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 0x1BE + SetVar 0x8004, 0x1BE ScrCmd_33C 0, 0x8004 ScrCmd_346 0 CheckFlag 162 @@ -203,7 +203,7 @@ _0249: _0254: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 11 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 162 GoTo _020B diff --git a/res/field/scripts/script_0446.s b/res/field/scripts/script_0446.s index 0b2beece23..ab56d83e87 100644 --- a/res/field/scripts/script_0446.s +++ b/res/field/scripts/script_0446.s @@ -15,8 +15,8 @@ _000A: CheckFlag 161 GoToIf 1, _005C ScrCmd_02C 0 - ScrCmd_028 0x8004, 247 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 247 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CF @@ -48,8 +48,8 @@ _0072: CheckFlag 0x116 GoToIf 1, _00C4 ScrCmd_02C 3 - ScrCmd_028 0x8004, 224 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 224 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CF diff --git a/res/field/scripts/script_0447.s b/res/field/scripts/script_0447.s index 77a93a3872..6b6f6c439c 100644 --- a/res/field/scripts/script_0447.s +++ b/res/field/scripts/script_0447.s @@ -69,16 +69,16 @@ _00CA: ScrCmd_034 ScrCmd_04C 54, 0 ScrCmd_04D - ScrCmd_05E 27, _024C - ScrCmd_05E 28, _024C - ScrCmd_05E 26, _024C - ScrCmd_05E 19, _024C - ScrCmd_05F - ScrCmd_05E 27, _0258 - ScrCmd_05E 28, _026C - ScrCmd_05E 26, _0280 - ScrCmd_05E 19, _02B4 - ScrCmd_05F + ApplyMovement 27, _024C + ApplyMovement 28, _024C + ApplyMovement 26, _024C + ApplyMovement 19, _024C + WaitMovement + ApplyMovement 27, _0258 + ApplyMovement 28, _026C + ApplyMovement 26, _0280 + ApplyMovement 19, _02B4 + WaitMovement ScrCmd_065 27 ScrCmd_065 28 ScrCmd_065 26 @@ -105,10 +105,10 @@ _0183: ClearFlag 0x1B1 ScrCmd_064 20 ScrCmd_062 20 - ScrCmd_05E 20, _02C4 - ScrCmd_05F - ScrCmd_05E 0xFF, _02DC - ScrCmd_05F + ApplyMovement 20, _02C4 + WaitMovement + ApplyMovement 0xFF, _02DC + WaitMovement ScrCmd_02C 3 ScrCmd_03E 0x800C CompareVarToValue 0x800C, 0 @@ -127,8 +127,8 @@ _01C6: End _01E9: - ScrCmd_028 0x8004, 0x1B7 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B7 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 4 ScrCmd_034 @@ -140,13 +140,13 @@ _01E9: End _0220: - ScrCmd_05E 20, _02CC - ScrCmd_05F + ApplyMovement 20, _02CC + WaitMovement GoTo _0240 _0230: - ScrCmd_05E 20, _02D4 - ScrCmd_05F + ApplyMovement 20, _02D4 + WaitMovement GoTo _0240 _0240: @@ -278,8 +278,8 @@ _031F: CheckFlag 199 GoToIf 1, _0364 ScrCmd_02C 7 - ScrCmd_028 0x8004, 0x17A - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x17A + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _036F diff --git a/res/field/scripts/script_0448.s b/res/field/scripts/script_0448.s index 8946b0f533..460f6bc0ba 100644 --- a/res/field/scripts/script_0448.s +++ b/res/field/scripts/script_0448.s @@ -38,7 +38,7 @@ _0044: ScrCmd_042 8, 1 ScrCmd_042 9, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0092 CompareVarToValue 0x8008, 1 @@ -52,8 +52,8 @@ _0092: ScrCmd_071 0x800C, 0x1F4 CompareVarToValue 0x800C, 0 GoToIf 1, _0150 - ScrCmd_028 0x8005, 1 - ScrCmd_028 0x8006, 0x1F4 + SetVar 0x8005, 1 + SetVar 0x8006, 0x1F4 GoTo _00E4 End @@ -61,13 +61,13 @@ _00BB: ScrCmd_071 0x800C, 0x1770 CompareVarToValue 0x800C, 0 GoToIf 1, _0150 - ScrCmd_028 0x8005, 12 - ScrCmd_028 0x8006, 0x1770 + SetVar 0x8005, 12 + SetVar 0x8006, 0x1770 GoTo _00E4 End _00E4: - ScrCmd_028 0x8004, 33 + SetVar 0x8004, 33 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0143 diff --git a/res/field/scripts/script_0450.s b/res/field/scripts/script_0450.s index 53021c2ecc..e2056dd363 100644 --- a/res/field/scripts/script_0450.s +++ b/res/field/scripts/script_0450.s @@ -76,7 +76,7 @@ _0097: _00A2: ScrCmd_177 0x4000 _00A6: - ScrCmd_027 0x4000, 1 + SubVar 0x4000, 1 ScrCmd_198 0x4000, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00FC @@ -120,7 +120,7 @@ _010F: ScrCmd_1B9 0x800C, 0x8000 CompareVarToValue 0x800C, 0xFF GoToIf 0, _0097 - ScrCmd_028 0x8003, 0x1B2 + SetVar 0x8003, 0x1B2 GoTo _019B _019B: @@ -145,11 +145,11 @@ _01D7: GoToIf 1, _0201 CompareVarToValue 0x8005, 16 GoToIf 1, _0201 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0201: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return .byte 0 diff --git a/res/field/scripts/script_0452.s b/res/field/scripts/script_0452.s index 24df89a859..137f451fc9 100644 --- a/res/field/scripts/script_0452.s +++ b/res/field/scripts/script_0452.s @@ -16,11 +16,11 @@ _0012: ScrCmd_02C 0 ScrCmd_034 ScrCmd_068 - ScrCmd_05E 0x800D, _0080 - ScrCmd_05F + ApplyMovement 0x800D, _0080 + WaitMovement ScrCmd_02C 1 - ScrCmd_028 0x8004, 0x194 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x194 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0073 diff --git a/res/field/scripts/script_0454.s b/res/field/scripts/script_0454.s index 1a2e259efe..3e85e965d2 100644 --- a/res/field/scripts/script_0454.s +++ b/res/field/scripts/script_0454.s @@ -20,10 +20,10 @@ _001A: _0033: ScrCmd_1B7 0x404C, 5 - ScrCmd_026 0x404C, 5 + AddVar 0x404C, 5 SetFlag 0xAB6 - ScrCmd_024 0x37C - ScrCmd_024 0x37D + ClearTrainerFlag 0x37C + ClearTrainerFlag 0x37D End _004D: @@ -33,8 +33,8 @@ _004D: ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 0, _04A8 - ScrCmd_05F + ApplyMovement 0, _04A8 + WaitMovement ScrCmd_061 End @@ -45,8 +45,8 @@ _006A: ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 1, _04B0 - ScrCmd_05F + ApplyMovement 1, _04B0 + WaitMovement ScrCmd_061 End @@ -54,9 +54,9 @@ _0087: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_025 0x37C + CheckTrainerFlag 0x37C GoToIf 1, _0396 - ScrCmd_025 0x37D + CheckTrainerFlag 0x37D GoToIf 1, _0396 ScrCmd_1BD 0x800C CompareVarToValue 0x800C, 0 @@ -67,16 +67,16 @@ _0087: End _00CB: - ScrCmd_05E 2, _03EC - ScrCmd_05E 0xFF, _042C - ScrCmd_05F + ApplyMovement 2, _03EC + ApplyMovement 0xFF, _042C + WaitMovement GoTo _00FF End _00E5: - ScrCmd_05E 2, _03F4 - ScrCmd_05E 0xFF, _043C - ScrCmd_05F + ApplyMovement 2, _03F4 + ApplyMovement 0xFF, _043C + WaitMovement GoTo _00FF End @@ -89,92 +89,92 @@ _00FF: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _0471 - ScrCmd_023 0x37C - ScrCmd_023 0x37D + SetTrainerFlag 0x37C + SetTrainerFlag 0x37D ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 2, _03FC - ScrCmd_05F - ScrCmd_028 0x404D, 0 - ScrCmd_028 0x8005, 0 + ApplyMovement 2, _03FC + WaitMovement + SetVar 0x404D, 0 + SetVar 0x8005, 0 ClearFlag 0x257 ScrCmd_064 5 - ScrCmd_05E 5, _0420 - ScrCmd_05F + ApplyMovement 5, _0420 + WaitMovement ScrCmd_02C 15 ScrCmd_034 ScrCmd_0E5 0x381, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_026 0x8005, 0x404D + AddVar 0x8005, 0x404D ScrCmd_02C 16 ScrCmd_034 - ScrCmd_05E 5, _0414 - ScrCmd_05F - ScrCmd_05E 5, _0420 - ScrCmd_05F + ApplyMovement 5, _0414 + WaitMovement + ApplyMovement 5, _0420 + WaitMovement ScrCmd_02C 17 ScrCmd_034 ScrCmd_0E5 0x382, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_026 0x8005, 0x404D + AddVar 0x8005, 0x404D ScrCmd_02C 18 ScrCmd_034 - ScrCmd_05E 5, _0414 - ScrCmd_05F - ScrCmd_05E 5, _0420 - ScrCmd_05F + ApplyMovement 5, _0414 + WaitMovement + ApplyMovement 5, _0420 + WaitMovement ScrCmd_02C 19 ScrCmd_034 ScrCmd_0E5 0x383, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_026 0x8005, 0x404D + AddVar 0x8005, 0x404D ScrCmd_02C 20 ScrCmd_034 - ScrCmd_05E 5, _0414 - ScrCmd_05F - ScrCmd_05E 5, _0420 - ScrCmd_05F + ApplyMovement 5, _0414 + WaitMovement + ApplyMovement 5, _0420 + WaitMovement ScrCmd_02C 21 ScrCmd_034 ScrCmd_0E5 0x384, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_026 0x8005, 0x404D + AddVar 0x8005, 0x404D ScrCmd_02C 22 ScrCmd_034 - ScrCmd_05E 5, _0414 - ScrCmd_05F - ScrCmd_05E 2, _0408 - ScrCmd_05F + ApplyMovement 5, _0414 + WaitMovement + ApplyMovement 2, _0408 + WaitMovement ScrCmd_0D5 0, 0x404C ScrCmd_0D5 1, 0x8005 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 2, _03FC - ScrCmd_05F - ScrCmd_05E 5, _0420 - ScrCmd_05F + ApplyMovement 2, _03FC + WaitMovement + ApplyMovement 5, _0420 + WaitMovement ScrCmd_02C 23 ScrCmd_034 ScrCmd_0E5 0x385, 0 ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_026 0x8005, 0x404D + AddVar 0x8005, 0x404D ScrCmd_02C 24 ScrCmd_034 - ScrCmd_05E 5, _0414 - ScrCmd_05F + ApplyMovement 5, _0414 + WaitMovement ScrCmd_065 5 - ScrCmd_05E 2, _0408 - ScrCmd_05F + ApplyMovement 2, _0408 + WaitMovement ScrCmd_0D5 0, 0x404C ScrCmd_0D5 1, 0x8005 ScrCmd_02C 7 @@ -186,12 +186,12 @@ _00FF: CompareVarToValue 0x8006, 1 CallIf 1, _03B7 ScrCmd_034 - ScrCmd_05E 2, _03FC - ScrCmd_05F + ApplyMovement 2, _03FC + WaitMovement ClearFlag 0x258 ScrCmd_064 4 - ScrCmd_05E 4, _0420 - ScrCmd_05F + ApplyMovement 4, _0420 + WaitMovement CompareVarToValue 0x8006, 0 CallIf 1, _03CD CompareVarToValue 0x8006, 1 @@ -201,18 +201,18 @@ _00FF: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0484 - ScrCmd_023 0x37C - ScrCmd_023 0x37D + SetTrainerFlag 0x37C + SetTrainerFlag 0x37D CompareVarToValue 0x8006, 0 CallIf 1, _03D7 CompareVarToValue 0x8006, 1 CallIf 1, _03DC ScrCmd_034 - ScrCmd_05E 4, _0414 - ScrCmd_05F + ApplyMovement 4, _0414 + WaitMovement ScrCmd_065 4 - ScrCmd_05E 2, _0408 - ScrCmd_05F + ApplyMovement 2, _0408 + WaitMovement CompareVarToValue 0x8006, 0 CallIf 1, _03E1 CompareVarToValue 0x8006, 1 @@ -226,15 +226,15 @@ _0396: End _03A1: - ScrCmd_028 0x8007, 0x37C - ScrCmd_028 0x4020, 62 + SetVar 0x8007, 0x37C + SetVar 0x4020, 62 ScrCmd_2F3 2, 0x8007 ScrCmd_02C 8 Return _03B7: - ScrCmd_028 0x8007, 0x37D - ScrCmd_028 0x4020, 63 + SetVar 0x8007, 0x37D + SetVar 0x4020, 63 ScrCmd_2F3 2, 0x8007 ScrCmd_02C 9 Return @@ -351,8 +351,8 @@ _048A: ScrCmd_02C 14 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 3, _04C0 - ScrCmd_05F + ApplyMovement 3, _04C0 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0455.s b/res/field/scripts/script_0455.s index d516ca16a9..639b5ef2bc 100644 --- a/res/field/scripts/script_0455.s +++ b/res/field/scripts/script_0455.s @@ -14,8 +14,8 @@ _000E: CheckFlag 0x139 GoToIf 1, _005D ScrCmd_02C 0 - ScrCmd_028 0x8004, 218 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 218 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0053 diff --git a/res/field/scripts/script_0456.s b/res/field/scripts/script_0456.s index 5aabbb7327..d4f2ae4ef6 100644 --- a/res/field/scripts/script_0456.s +++ b/res/field/scripts/script_0456.s @@ -23,12 +23,12 @@ _001E: _004F: ClearFlag 0x28B - ScrCmd_028 0x4116, 0 + SetVar 0x4116, 0 End _005B: SetFlag 0x28B - ScrCmd_028 0x4116, 1 + SetVar 0x4116, 1 End _0067: @@ -82,18 +82,18 @@ _00FB: ScrCmd_0DA 0, 0x8000, 0, 0 ScrCmd_02C 6 ScrCmd_069 0x8001, 0x8002 - ScrCmd_05E 2, _01D4 - ScrCmd_05F + ApplyMovement 2, _01D4 + WaitMovement ScrCmd_02C 7 - ScrCmd_05E 1, _01E4 - ScrCmd_05F + ApplyMovement 1, _01E4 + WaitMovement ScrCmd_02C 8 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 2, _01F0 - ScrCmd_05F + ApplyMovement 2, _01F0 + WaitMovement ScrCmd_065 2 - ScrCmd_028 0x400B, 1 + SetVar 0x400B, 1 Call _016C SetFlag 0xAA2 GoTo _0155 @@ -117,23 +117,23 @@ _016C: GoTo _01BD _0199: - ScrCmd_05E 1, _0204 - ScrCmd_05F + ApplyMovement 1, _0204 + WaitMovement Return _01A5: - ScrCmd_05E 1, _020C - ScrCmd_05F + ApplyMovement 1, _020C + WaitMovement Return _01B1: - ScrCmd_05E 1, _0214 - ScrCmd_05F + ApplyMovement 1, _0214 + WaitMovement Return _01BD: - ScrCmd_05E 1, _021C - ScrCmd_05F + ApplyMovement 1, _021C + WaitMovement Return .balign 4, 0 @@ -202,8 +202,8 @@ _0257: SetFlag 0x164 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_061 End @@ -220,8 +220,8 @@ _0270: CallIf 1, _02C3 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_061 End @@ -241,8 +241,8 @@ _02C8: CallIf 1, _02FF ScrCmd_031 ScrCmd_034 - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_061 End @@ -260,8 +260,8 @@ _0304: ScrCmd_02C 14 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 2, _01CC - ScrCmd_05F + ApplyMovement 2, _01CC + WaitMovement ScrCmd_061 End @@ -272,8 +272,8 @@ _0325: ScrCmd_02C 16 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 3, _0344 - ScrCmd_05F + ApplyMovement 3, _0344 + WaitMovement ScrCmd_061 End @@ -289,13 +289,13 @@ _034C: _0354: ScrCmd_060 - ScrCmd_05E 3, _034C - ScrCmd_05F + ApplyMovement 3, _034C + WaitMovement ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 0xFF, _037C - ScrCmd_05E 3, _0344 - ScrCmd_05F + ApplyMovement 0xFF, _037C + ApplyMovement 3, _0344 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0458.s b/res/field/scripts/script_0458.s index 12d7673943..5b949a4ed6 100644 --- a/res/field/scripts/script_0458.s +++ b/res/field/scripts/script_0458.s @@ -75,14 +75,14 @@ _007E: ScrCmd_0D6 0, 0x8000 ScrCmd_02C 5 ScrCmd_2E6 0x8000, 0, 0x800C - ScrCmd_029 0x8003, 0x800C + SetVar 0x8003, 0x800C CompareVarToValue 0x8003, 0xFFFE GoToIf 1, _0264 ScrCmd_2EA 0x8003, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _027A ScrCmd_1C8 0x800C, 0x8000 - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C CompareVarToValue 0x800C, 4 GoToIf 1, _012F GoTo _0224 diff --git a/res/field/scripts/script_0459.s b/res/field/scripts/script_0459.s index 93eab8e23e..cf56aa970b 100644 --- a/res/field/scripts/script_0459.s +++ b/res/field/scripts/script_0459.s @@ -48,8 +48,8 @@ _0078: ScrCmd_02C 0 ScrCmd_034 ScrCmd_068 - ScrCmd_05E 30, _0388 - ScrCmd_05F + ApplyMovement 30, _0388 + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 @@ -61,22 +61,22 @@ _0078: End _00C5: - ScrCmd_05E 30, _0390 - ScrCmd_05E 0xFF, _03F0 - ScrCmd_05F + ApplyMovement 30, _0390 + ApplyMovement 0xFF, _03F0 + WaitMovement GoTo _010B End _00DF: - ScrCmd_05E 30, _0390 - ScrCmd_05F + ApplyMovement 30, _0390 + WaitMovement GoTo _010B End _00F1: - ScrCmd_05E 30, _0398 - ScrCmd_05E 0xFF, _03F0 - ScrCmd_05F + ApplyMovement 30, _0398 + ApplyMovement 0xFF, _03F0 + WaitMovement GoTo _010B End @@ -96,8 +96,8 @@ _0133: ScrCmd_02C 2 ScrCmd_034 ScrCmd_068 - ScrCmd_05E 30, _0388 - ScrCmd_05F + ApplyMovement 30, _0388 + WaitMovement ScrCmd_02C 3 ScrCmd_034 ScrCmd_1BD 0x8004 @@ -107,16 +107,16 @@ _0133: End _0166: - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05E 30, _03A4 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + ApplyMovement 30, _03A4 + WaitMovement GoTo _019A End _0180: - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05E 30, _03B4 - ScrCmd_05F + ApplyMovement 0xFF, _03C0 + ApplyMovement 30, _03B4 + WaitMovement GoTo _019A End @@ -138,8 +138,8 @@ _019A: CompareVarToValue 0x8004, 1 CallIf 1, _02A3 ScrCmd_02C 4 - ScrCmd_05E 33, _0348 - ScrCmd_05F + ApplyMovement 33, _0348 + WaitMovement ScrCmd_02C 5 ScrCmd_02C 6 ScrCmd_034 @@ -166,51 +166,51 @@ _0261: Return _0267: - ScrCmd_05E 33, _0318 - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 33, _0318 + ApplyMovement 0xFF, _03CC + WaitMovement Return _027B: - ScrCmd_05E 33, _0308 - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 33, _0308 + ApplyMovement 0xFF, _03CC + WaitMovement Return _028F: - ScrCmd_05E 33, _0338 - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 33, _0338 + ApplyMovement 0xFF, _03CC + WaitMovement Return _02A3: - ScrCmd_05E 33, _0328 - ScrCmd_05E 0xFF, _03D8 - ScrCmd_05F + ApplyMovement 33, _0328 + ApplyMovement 0xFF, _03D8 + WaitMovement Return _02B7: - ScrCmd_05E 33, _035C - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F + ApplyMovement 33, _035C + ApplyMovement 0xFF, _03E4 + WaitMovement Return _02CB: - ScrCmd_05E 33, _0350 - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F + ApplyMovement 33, _0350 + ApplyMovement 0xFF, _03E4 + WaitMovement Return _02DF: - ScrCmd_05E 33, _037C - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F + ApplyMovement 33, _037C + ApplyMovement 0xFF, _03E4 + WaitMovement Return _02F3: - ScrCmd_05E 33, _0368 - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F + ApplyMovement 33, _0368 + ApplyMovement 0xFF, _03E4 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0461.s b/res/field/scripts/script_0461.s index bf487f6ace..bbdba68ce0 100644 --- a/res/field/scripts/script_0461.s +++ b/res/field/scripts/script_0461.s @@ -53,23 +53,23 @@ _008A: GoTo _00E1 _00BD: - ScrCmd_05E 0, _0698 - ScrCmd_05F + ApplyMovement 0, _0698 + WaitMovement Return _00C9: - ScrCmd_05E 0, _06A8 - ScrCmd_05F + ApplyMovement 0, _06A8 + WaitMovement Return _00D5: - ScrCmd_05E 0, _06B8 - ScrCmd_05F + ApplyMovement 0, _06B8 + WaitMovement Return _00E1: - ScrCmd_05E 0, _06C8 - ScrCmd_05F + ApplyMovement 0, _06C8 + WaitMovement Return _00ED: @@ -83,23 +83,23 @@ _00ED: GoTo _0144 _0120: - ScrCmd_05E 0, _06D8 - ScrCmd_05F + ApplyMovement 0, _06D8 + WaitMovement Return _012C: - ScrCmd_05E 0, _06E0 - ScrCmd_05F + ApplyMovement 0, _06E0 + WaitMovement Return _0138: - ScrCmd_05E 0, _06E8 - ScrCmd_05F + ApplyMovement 0, _06E8 + WaitMovement Return _0144: - ScrCmd_05E 0, _06F0 - ScrCmd_05F + ApplyMovement 0, _06F0 + WaitMovement Return _0150: diff --git a/res/field/scripts/script_0462.s b/res/field/scripts/script_0462.s index 069be0308c..93a59eb06f 100644 --- a/res/field/scripts/script_0462.s +++ b/res/field/scripts/script_0462.s @@ -54,8 +54,8 @@ _005F: End _0081: - ScrCmd_05E 2, _009C - ScrCmd_05F + ApplyMovement 2, _009C + WaitMovement ScrCmd_02C 4 ScrCmd_068 ScrCmd_02C 5 diff --git a/res/field/scripts/script_0464.s b/res/field/scripts/script_0464.s index ecfca96e5f..22b7c05484 100644 --- a/res/field/scripts/script_0464.s +++ b/res/field/scripts/script_0464.s @@ -14,8 +14,8 @@ _000E: CheckFlag 202 GoToIf 1, _0053 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x1A3 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A3 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _005E diff --git a/res/field/scripts/script_0465.s b/res/field/scripts/script_0465.s index bc01c46f0e..2ca60112b5 100644 --- a/res/field/scripts/script_0465.s +++ b/res/field/scripts/script_0465.s @@ -14,7 +14,7 @@ _000A: CompareVarToValue 0x800C, 0 GoToIf 5, _003A ScrCmd_02C 0 - ScrCmd_028 0x8004, 14 + SetVar 0x8004, 14 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0468.s b/res/field/scripts/script_0468.s index 8b28df0992..18736aacfd 100644 --- a/res/field/scripts/script_0468.s +++ b/res/field/scripts/script_0468.s @@ -57,8 +57,8 @@ _00A0: CheckFlag 205 GoToIf 1, _00E5 ScrCmd_02C 1 - ScrCmd_028 0x8004, 0x189 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x189 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00F0 diff --git a/res/field/scripts/script_0471.s b/res/field/scripts/script_0471.s index 5096fe1375..91ab717452 100644 --- a/res/field/scripts/script_0471.s +++ b/res/field/scripts/script_0471.s @@ -47,10 +47,10 @@ _004D: ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0xFF, _010C - ScrCmd_05F - ScrCmd_05E 15, _014C - ScrCmd_05F + ApplyMovement 0xFF, _010C + WaitMovement + ApplyMovement 15, _014C + WaitMovement ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -59,31 +59,31 @@ _004D: CompareVarToValue 0x8004, 0x12F CallIf 1, _00F6 ScrCmd_065 15 - ScrCmd_028 0x40A8, 1 + SetVar 0x40A8, 1 SetFlag 0x298 ScrCmd_061 End _00CA: - ScrCmd_05E 15, _0124 - ScrCmd_05F + ApplyMovement 15, _0124 + WaitMovement Return _00D6: - ScrCmd_05E 15, _0138 - ScrCmd_05F + ApplyMovement 15, _0138 + WaitMovement Return _00E2: - ScrCmd_05E 0xFF, _0114 - ScrCmd_05E 15, _0154 - ScrCmd_05F + ApplyMovement 0xFF, _0114 + ApplyMovement 15, _0154 + WaitMovement Return _00F6: - ScrCmd_05E 0xFF, _0114 - ScrCmd_05E 15, _0168 - ScrCmd_05F + ApplyMovement 0xFF, _0114 + ApplyMovement 15, _0168 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0472.s b/res/field/scripts/script_0472.s index 988409871f..0e00d420ac 100644 --- a/res/field/scripts/script_0472.s +++ b/res/field/scripts/script_0472.s @@ -29,8 +29,8 @@ _0039: _0044: ScrCmd_02C 1 - ScrCmd_028 0x8004, 0x12E - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x12E + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0076 diff --git a/res/field/scripts/script_0473.s b/res/field/scripts/script_0473.s index 55c60c42c6..1e9f2b23f1 100644 --- a/res/field/scripts/script_0473.s +++ b/res/field/scripts/script_0473.s @@ -12,8 +12,8 @@ _0006: CheckFlag 0x13B GoToIf 1, _0059 ScrCmd_02C 0 - ScrCmd_028 0x8004, 247 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 247 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _004F diff --git a/res/field/scripts/script_0475.s b/res/field/scripts/script_0475.s index cadfb2da6d..e96e376e2e 100644 --- a/res/field/scripts/script_0475.s +++ b/res/field/scripts/script_0475.s @@ -20,7 +20,7 @@ _001D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x8004, 0x1BD + SetVar 0x8004, 0x1BD ScrCmd_0D1 0, 0x8004 CheckFlag 132 GoToIf 1, _005E @@ -66,7 +66,7 @@ _009C: _00A7: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 2 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 132 GoTo _005E diff --git a/res/field/scripts/script_0476.s b/res/field/scripts/script_0476.s index 0f7704f433..9e35cf7912 100644 --- a/res/field/scripts/script_0476.s +++ b/res/field/scripts/script_0476.s @@ -35,7 +35,7 @@ _0047: ScrCmd_049 0x603 SetFlag 0x21C ScrCmd_065 1 - ScrCmd_028 0x4105, 1 + SetVar 0x4105, 1 ScrCmd_061 End @@ -53,28 +53,28 @@ _006A: End _00AC: - ScrCmd_05E 1, _0168 - ScrCmd_05F + ApplyMovement 1, _0168 + WaitMovement Return _00B8: - ScrCmd_05E 1, _017C - ScrCmd_05F + ApplyMovement 1, _017C + WaitMovement Return _00C4: - ScrCmd_05E 1, _0190 - ScrCmd_05F + ApplyMovement 1, _0190 + WaitMovement Return _00D0: - ScrCmd_05E 1, _019C - ScrCmd_05F + ApplyMovement 1, _019C + WaitMovement Return _00DC: - ScrCmd_05E 1, _01B0 - ScrCmd_05F + ApplyMovement 1, _01B0 + WaitMovement Return _00E8: @@ -91,28 +91,28 @@ _00E8: End _012A: - ScrCmd_05E 1, _01C4 - ScrCmd_05F + ApplyMovement 1, _01C4 + WaitMovement Return _0136: - ScrCmd_05E 1, _01D0 - ScrCmd_05F + ApplyMovement 1, _01D0 + WaitMovement Return _0142: - ScrCmd_05E 1, _01DC - ScrCmd_05F + ApplyMovement 1, _01DC + WaitMovement Return _014E: - ScrCmd_05E 1, _01F0 - ScrCmd_05F + ApplyMovement 1, _01F0 + WaitMovement Return _015A: - ScrCmd_05E 1, _01FC - ScrCmd_05F + ApplyMovement 1, _01FC + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0479.s b/res/field/scripts/script_0479.s index 11b3fef145..55f3cb421d 100644 --- a/res/field/scripts/script_0479.s +++ b/res/field/scripts/script_0479.s @@ -113,11 +113,11 @@ _0172: CompareVarToValue 0x800C, 1 GoToIf 1, _01CB _0186: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_252 0x800C CompareVarToValue 0x800C, 6 GoToIf 0, _02AD - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_254 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0299 @@ -172,10 +172,10 @@ _0245: GoTo _0259 _0259: - ScrCmd_05E 7, _02B8 - ScrCmd_05F - ScrCmd_05E 0xFF, _02CC - ScrCmd_05F + ApplyMovement 7, _02B8 + WaitMovement + ApplyMovement 0xFF, _02CC + WaitMovement ScrCmd_049 0x603 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -219,19 +219,19 @@ _02CC: _02D8: ScrCmd_060 - ScrCmd_028 0x40F3, 0 - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F - ScrCmd_05E 7, _03D8 - ScrCmd_05F + SetVar 0x40F3, 0 + ApplyMovement 0xFF, _03E4 + WaitMovement + ApplyMovement 7, _03D8 + WaitMovement ScrCmd_061 End _02F8: ScrCmd_060 - ScrCmd_028 0x40F3, 0 - ScrCmd_05E 0xFF, _03EC - ScrCmd_05F + SetVar 0x40F3, 0 + ApplyMovement 0xFF, _03EC + WaitMovement ScrCmd_256 0, 0x800C ScrCmd_0D5 0, 0x800C ScrCmd_256 1, 0x800C @@ -280,10 +280,10 @@ _03AB: GoTo _03BD _03BD: - ScrCmd_05E 0xFF, _03F8 - ScrCmd_05F - ScrCmd_05E 7, _03D8 - ScrCmd_05F + ApplyMovement 0xFF, _03F8 + WaitMovement + ApplyMovement 7, _03D8 + WaitMovement ScrCmd_061 End @@ -396,9 +396,9 @@ _049B: _04B4: ScrCmd_060 ClearFlag 0x242 - ScrCmd_028 0x40E0, 0x7D0 - ScrCmd_05E 1, _0548 - ScrCmd_05F + SetVar 0x40E0, 0x7D0 + ApplyMovement 1, _0548 + WaitMovement ScrCmd_14D 0x4000 ScrCmd_0CD 0 CompareVarToValue 0x4000, 0 @@ -416,22 +416,22 @@ _04ED: _04F6: ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 1, _0558 - ScrCmd_05F + ApplyMovement 1, _0558 + WaitMovement ScrCmd_02C 3 - ScrCmd_028 0x8004, 19 + SetVar 0x8004, 19 ScrCmd_014 0x7D9 ScrCmd_02C 4 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0xFF, _0570 - ScrCmd_05F - ScrCmd_05E 1, _0564 - ScrCmd_05F + ApplyMovement 0xFF, _0570 + WaitMovement + ApplyMovement 1, _0564 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 1 ScrCmd_04B 0x603 - ScrCmd_028 0x40C6, 1 + SetVar 0x40C6, 1 ScrCmd_061 End @@ -481,10 +481,10 @@ _057C: CompareVarToValue 0x800C, 0 GoToIf 1, _064C ScrCmd_02C 11 - ScrCmd_028 0x8004, 20 + SetVar 0x8004, 20 ScrCmd_014 0x7D9 ScrCmd_031 - ScrCmd_028 0x400A, 1 + SetVar 0x400A, 1 ScrCmd_034 ScrCmd_061 End @@ -495,10 +495,10 @@ _05FB: CompareVarToValue 0x800C, 0 GoToIf 1, _064C ScrCmd_02C 14 - ScrCmd_028 0x8004, 21 + SetVar 0x8004, 21 ScrCmd_014 0x7D9 ScrCmd_031 - ScrCmd_028 0x400A, 2 + SetVar 0x400A, 2 ScrCmd_034 ScrCmd_061 End @@ -568,8 +568,8 @@ _06CF: End _06DA: - ScrCmd_028 0x8004, 97 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 97 + SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06C4 @@ -578,8 +578,8 @@ _06DA: End _0706: - ScrCmd_028 0x8004, 98 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 98 + SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06C4 @@ -588,7 +588,7 @@ _0706: End _0732: - ScrCmd_028 0x8004, 14 + SetVar 0x8004, 14 ScrCmd_1D6 0x8004, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _06C4 @@ -597,7 +597,7 @@ _0732: End _0756: - ScrCmd_028 0x8004, 15 + SetVar 0x8004, 15 ScrCmd_1D6 0x8004, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _06C4 @@ -606,7 +606,7 @@ _0756: End _077A: - ScrCmd_028 0x8004, 16 + SetVar 0x8004, 16 ScrCmd_1D6 0x8004, 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _06C4 @@ -616,14 +616,14 @@ _077A: _079E: ScrCmd_014 0x7DF - ScrCmd_028 0x4009, 1 + SetVar 0x4009, 1 ScrCmd_034 ScrCmd_061 End _07AE: ScrCmd_014 0x7F4 - ScrCmd_028 0x4009, 1 + SetVar 0x4009, 1 ScrCmd_034 ScrCmd_061 End @@ -716,118 +716,118 @@ _0984: ScrCmd_07D 0x8006, 1, 0x8007 CompareVarToValue 0x8007, 0 CallIf 5, _09A1 - ScrCmd_028 0x800C, 0x2710 + SetVar 0x800C, 0x2710 Return _09A1: ScrCmd_02C 45 - ScrCmd_029 0x8004, 0x8006 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x8006 + SetVar 0x8005, 1 ScrCmd_014 0x7FC Return _09B6: - ScrCmd_028 0x8006, 149 + SetVar 0x8006, 149 Return _09BE: - ScrCmd_028 0x8006, 150 + SetVar 0x8006, 150 Return _09C6: - ScrCmd_028 0x8006, 151 + SetVar 0x8006, 151 Return _09CE: - ScrCmd_028 0x8006, 152 + SetVar 0x8006, 152 Return _09D6: - ScrCmd_028 0x8006, 153 + SetVar 0x8006, 153 Return _09DE: - ScrCmd_028 0x8006, 154 + SetVar 0x8006, 154 Return _09E6: - ScrCmd_028 0x8006, 155 + SetVar 0x8006, 155 Return _09EE: - ScrCmd_028 0x8006, 156 + SetVar 0x8006, 156 Return _09F6: - ScrCmd_028 0x8006, 159 + SetVar 0x8006, 159 Return _09FE: - ScrCmd_028 0x8006, 160 + SetVar 0x8006, 160 Return _0A06: - ScrCmd_028 0x8006, 161 + SetVar 0x8006, 161 Return _0A0E: - ScrCmd_028 0x8006, 162 + SetVar 0x8006, 162 Return _0A16: - ScrCmd_028 0x8006, 163 + SetVar 0x8006, 163 Return _0A1E: - ScrCmd_028 0x8006, 164 + SetVar 0x8006, 164 Return _0A26: - ScrCmd_028 0x8006, 165 + SetVar 0x8006, 165 Return _0A2E: - ScrCmd_028 0x8006, 166 + SetVar 0x8006, 166 Return _0A36: - ScrCmd_028 0x8006, 167 + SetVar 0x8006, 167 Return _0A3E: - ScrCmd_028 0x8006, 168 + SetVar 0x8006, 168 Return _0A46: - ScrCmd_028 0x8006, 157 + SetVar 0x8006, 157 Return _0A4E: - ScrCmd_028 0x8006, 158 + SetVar 0x8006, 158 Return _0A56: - ScrCmd_028 0x8006, 169 + SetVar 0x8006, 169 Return _0A5E: - ScrCmd_028 0x8006, 170 + SetVar 0x8006, 170 Return _0A66: - ScrCmd_028 0x8006, 171 + SetVar 0x8006, 171 Return _0A6E: - ScrCmd_028 0x8006, 172 + SetVar 0x8006, 172 Return _0A76: - ScrCmd_028 0x8006, 173 + SetVar 0x8006, 173 Return _0A7E: - ScrCmd_028 0x8006, 174 + SetVar 0x8006, 174 Return .byte 0 diff --git a/res/field/scripts/script_0480.s b/res/field/scripts/script_0480.s index c78574ac4e..d75b0847c9 100644 --- a/res/field/scripts/script_0480.s +++ b/res/field/scripts/script_0480.s @@ -17,13 +17,13 @@ _000A: ScrCmd_277 0x8000 ScrCmd_0D5 0, 0x8000 ScrCmd_177 0x8002 - ScrCmd_028 0x8003, 0 + SetVar 0x8003, 0 _003B: ScrCmd_278 0x8001, 0x8003 CompareVarToVar 0x8000, 0x8001 GoToIf 1, _006D - ScrCmd_026 0x8003, 1 - ScrCmd_027 0x8002, 1 + AddVar 0x8003, 1 + SubVar 0x8002, 1 CompareVarToValue 0x8002, 0 GoToIf 5, _003B GoTo _0164 @@ -38,7 +38,7 @@ _006D: ScrCmd_0D0 1, 0x8003 ScrCmd_0D1 2, 0x8004 ScrCmd_02C 1 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0105 @@ -48,25 +48,25 @@ _00C2: ScrCmd_014 0x7E0 ClearFlag 0x137 SetFlag 0xAAE - ScrCmd_026 0x4108, 1 + AddVar 0x4108, 1 CompareVarToValue 0x4108, 3 GoToIf 0, _00E7 - ScrCmd_028 0x4108, 0 + SetVar 0x4108, 0 _00E7: ScrCmd_034 ScrCmd_061 End _00ED: - ScrCmd_028 0x8004, 241 + SetVar 0x8004, 241 Return _00F5: - ScrCmd_028 0x8004, 0x10C + SetVar 0x8004, 0x10C Return _00FD: - ScrCmd_028 0x8004, 0x113 + SetVar 0x8004, 0x113 Return _0105: @@ -86,7 +86,7 @@ _0114: CallIf 1, _00FD ScrCmd_0D1 2, 0x8004 ScrCmd_02C 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0105 diff --git a/res/field/scripts/script_0481.s b/res/field/scripts/script_0481.s index a1106608a8..d3cd496aa1 100644 --- a/res/field/scripts/script_0481.s +++ b/res/field/scripts/script_0481.s @@ -43,8 +43,8 @@ _007D: CheckFlag 206 GoToIf 1, _00C2 ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x17F - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x17F + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00CD diff --git a/res/field/scripts/script_0483.s b/res/field/scripts/script_0483.s index 0ea1da97ed..de6b841270 100644 --- a/res/field/scripts/script_0483.s +++ b/res/field/scripts/script_0483.s @@ -38,8 +38,8 @@ _0010: GoToIf 1, _00DA ScrCmd_1C3 0, 1, 0x8002 ScrCmd_02C 2 - ScrCmd_028 0x8004, 6 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 6 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0113 diff --git a/res/field/scripts/script_0485.s b/res/field/scripts/script_0485.s index 2530674116..a0eddaca7c 100644 --- a/res/field/scripts/script_0485.s +++ b/res/field/scripts/script_0485.s @@ -51,8 +51,8 @@ _009C: .byte 0 _00AA: - ScrCmd_028 0x4057, 2 - ScrCmd_028 0x4085, 1 + SetVar 0x4057, 2 + SetVar 0x4085, 1 Return _00B8: @@ -81,7 +81,7 @@ _00E4: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - ScrCmd_028 0x408D, 1 + SetVar 0x408D, 1 ScrCmd_0CD 0 ScrCmd_14D 0x800C CompareVarToValue 0x800C, 1 @@ -131,7 +131,7 @@ _0124: SetFlag 0x12D SetFlag 0x252 SetFlag 0x2CA - ScrCmd_028 0x408D, 0 + SetVar 0x408D, 0 ScrCmd_061 End @@ -142,10 +142,10 @@ _01F0: _01F5: ScrCmd_02C 4 ScrCmd_034 - ScrCmd_05E 21, _05EC - ScrCmd_05F - ScrCmd_05E 0xFF, _0438 - ScrCmd_05F + ApplyMovement 21, _05EC + WaitMovement + ApplyMovement 0xFF, _0438 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 11 Return @@ -171,58 +171,58 @@ _022D: _0240: ScrCmd_069 0x8000, 0x8001 - ScrCmd_029 0x8008, 0x8000 + SetVar 0x8008, 0x8000 CompareVarToValue 0x8008, 0x38D GoToIf 1, _0272 CompareVarToValue 0x8008, 0x38E GoToIf 1, _0286 - ScrCmd_05E 0xFF, _0328 - ScrCmd_05F + ApplyMovement 0xFF, _0328 + WaitMovement Return _0272: - ScrCmd_05E 0xFF, _0338 - ScrCmd_05E 3, _0364 - ScrCmd_05F + ApplyMovement 0xFF, _0338 + ApplyMovement 3, _0364 + WaitMovement Return _0286: - ScrCmd_05E 0xFF, _034C - ScrCmd_05E 3, _0370 - ScrCmd_05F + ApplyMovement 0xFF, _034C + ApplyMovement 3, _0370 + WaitMovement Return _029A: - ScrCmd_05E 0xFF, _0384 - ScrCmd_05E 3, _0384 - ScrCmd_05F + ApplyMovement 0xFF, _0384 + ApplyMovement 3, _0384 + WaitMovement Return _02AE: - ScrCmd_05E 21, _066C + ApplyMovement 21, _066C Return _02B8: - ScrCmd_05E 3, _0404 - ScrCmd_05E 0xFF, _03C8 - ScrCmd_05E 16, _0440 - ScrCmd_05F + ApplyMovement 3, _0404 + ApplyMovement 0xFF, _03C8 + ApplyMovement 16, _0440 + WaitMovement ScrCmd_04C 0x1EC, 0 ScrCmd_04D CompareVarToValue 0x4057, 2 CallIf 1, _02AE - ScrCmd_05E 3, _038C - ScrCmd_05E 16, _03B0 - ScrCmd_05E 0xFF, _039C - ScrCmd_05F - ScrCmd_05E 16, _0448 - ScrCmd_05F + ApplyMovement 3, _038C + ApplyMovement 16, _03B0 + ApplyMovement 0xFF, _039C + WaitMovement + ApplyMovement 16, _0448 + WaitMovement SetFlag 0x25C ScrCmd_065 16 ScrCmd_04C 0x1EC, 0 ScrCmd_04D - ScrCmd_05E 3, _03C0 - ScrCmd_05F + ApplyMovement 3, _03C0 + WaitMovement Return .balign 4, 0 @@ -369,8 +369,8 @@ _048D: ScrCmd_186 21, 0x386, 0x1F8 ScrCmd_064 21 ScrCmd_062 21 - ScrCmd_05E 21, _0598 - ScrCmd_05F + ApplyMovement 21, _0598 + WaitMovement GoTo _04F3 End @@ -378,8 +378,8 @@ _04AF: ScrCmd_186 21, 0x386, 0x1F9 ScrCmd_064 21 ScrCmd_062 21 - ScrCmd_05E 21, _05A4 - ScrCmd_05F + ApplyMovement 21, _05A4 + WaitMovement GoTo _04F3 End @@ -387,14 +387,14 @@ _04D1: ScrCmd_186 21, 0x386, 0x1FA ScrCmd_064 21 ScrCmd_062 21 - ScrCmd_05E 21, _05B0 - ScrCmd_05F + ApplyMovement 21, _05B0 + WaitMovement GoTo _04F3 End _04F3: - ScrCmd_05E 0xFF, _0628 - ScrCmd_05F + ApplyMovement 0xFF, _0628 + WaitMovement ScrCmd_02C 9 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -407,29 +407,29 @@ _04F3: End _0531: - ScrCmd_05E 21, _05BC - ScrCmd_05E 0xFF, _0630 - ScrCmd_05F + ApplyMovement 21, _05BC + ApplyMovement 0xFF, _0630 + WaitMovement GoTo _057F End _054B: - ScrCmd_05E 21, _05CC - ScrCmd_05E 0xFF, _0644 - ScrCmd_05F + ApplyMovement 21, _05CC + ApplyMovement 0xFF, _0644 + WaitMovement GoTo _057F End _0565: - ScrCmd_05E 21, _05DC - ScrCmd_05E 0xFF, _0658 - ScrCmd_05F + ApplyMovement 21, _05DC + ApplyMovement 0xFF, _0658 + WaitMovement GoTo _057F End _057F: - ScrCmd_028 0x4057, 2 - ScrCmd_028 0x4085, 2 + SetVar 0x4057, 2 + SetVar 0x4085, 2 ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 @@ -489,8 +489,8 @@ _05F4: ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 21, _0664 - ScrCmd_05F + ApplyMovement 21, _0664 + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_0487.s b/res/field/scripts/script_0487.s index efa3938b40..205f49f34e 100644 --- a/res/field/scripts/script_0487.s +++ b/res/field/scripts/script_0487.s @@ -12,8 +12,8 @@ _0006: CheckFlag 217 GoToIf 1, _004B ScrCmd_02C 0 - ScrCmd_028 0x8004, 30 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 30 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0056 diff --git a/res/field/scripts/script_0489.s b/res/field/scripts/script_0489.s index 59fc0ea1fc..a88e10b1b9 100644 --- a/res/field/scripts/script_0489.s +++ b/res/field/scripts/script_0489.s @@ -13,53 +13,53 @@ _0012: ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 0x2E3 CallIf 1, _00E7 - ScrCmd_05E 4, _0188 - ScrCmd_05E 3, _0154 - ScrCmd_05E 0xFF, _0100 - ScrCmd_05F + ApplyMovement 4, _0188 + ApplyMovement 3, _0154 + ApplyMovement 0xFF, _0100 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 3, _0160 - ScrCmd_05F + ApplyMovement 3, _0160 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_0CE 1 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 4, _0194 - ScrCmd_05F + ApplyMovement 4, _0194 + WaitMovement ScrCmd_02C 7 ScrCmd_0CE 1 ScrCmd_02C 8 - ScrCmd_05E 4, _019C - ScrCmd_05F + ApplyMovement 4, _019C + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 4, _01B8 - ScrCmd_05E 0xFF, _012C - ScrCmd_05E 3, _0168 - ScrCmd_05F + ApplyMovement 4, _01B8 + ApplyMovement 0xFF, _012C + ApplyMovement 3, _0168 + WaitMovement ScrCmd_065 4 - ScrCmd_05E 3, _0170 - ScrCmd_05E 0xFF, _0108 - ScrCmd_05F + ApplyMovement 3, _0170 + ApplyMovement 0xFF, _0108 + WaitMovement ScrCmd_003 5, 0x800C ScrCmd_0CE 1 ScrCmd_02C 10 ScrCmd_02C 11 ScrCmd_034 - ScrCmd_05E 3, _0178 - ScrCmd_05E 0xFF, _0118 - ScrCmd_05F + ApplyMovement 3, _0178 + ApplyMovement 0xFF, _0118 + WaitMovement ScrCmd_065 3 - ScrCmd_028 0x408B, 1 + SetVar 0x408B, 1 ScrCmd_061 End _00E7: - ScrCmd_05E 0xFF, _00F4 - ScrCmd_05F + ApplyMovement 0xFF, _00F4 + WaitMovement Return .balign 4, 0 @@ -231,9 +231,9 @@ _01E3: _01F6: ScrCmd_060 - ScrCmd_05E 11, _0280 - ScrCmd_05E 0xFF, _026C - ScrCmd_05F + ApplyMovement 11, _0280 + ApplyMovement 0xFF, _026C + WaitMovement GoTo _0212 End @@ -253,14 +253,14 @@ _0238: End _0243: - ScrCmd_05E 11, _0290 - ScrCmd_05F + ApplyMovement 11, _0290 + WaitMovement ScrCmd_02C 1 - ScrCmd_05E 11, _0298 - ScrCmd_05F + ApplyMovement 11, _0298 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_028 0x4119, 1 + SetVar 0x4119, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_0491.s b/res/field/scripts/script_0491.s index 42721d1c4b..3cbca1a934 100644 --- a/res/field/scripts/script_0491.s +++ b/res/field/scripts/script_0491.s @@ -19,7 +19,7 @@ _0012: End _003F: - ScrCmd_028 0x406B, 0 + SetVar 0x406B, 0 Return _0047: diff --git a/res/field/scripts/script_0493.s b/res/field/scripts/script_0493.s index 2286f837f3..f2b567c636 100644 --- a/res/field/scripts/script_0493.s +++ b/res/field/scripts/script_0493.s @@ -44,7 +44,7 @@ _0055: Call _0195 CompareVarToValue 0x800C, 0 GoToIf 1, _029A - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C Call _0251 CompareVarToValue 0x800C, 1 GoToIf 1, _02BB @@ -63,7 +63,7 @@ _00FE: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _028F - ScrCmd_028 0x8003, 0x133 + SetVar 0x8003, 0x133 GoTo _015E _011E: @@ -71,7 +71,7 @@ _011E: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _028F - ScrCmd_028 0x8003, 0x134 + SetVar 0x8003, 0x134 GoTo _015E _013E: @@ -79,7 +79,7 @@ _013E: ScrCmd_03E 0x800C CompareVarToValue 0x800C, 1 GoToIf 1, _028F - ScrCmd_028 0x8003, 0x152 + SetVar 0x8003, 0x152 GoTo _015E _015E: @@ -121,19 +121,19 @@ _0195: GoToIf 1, _0249 CompareVarToValue 0x8001, 0x185 GoToIf 1, _0249 - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _0239: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _0241: - ScrCmd_028 0x800C, 2 + SetVar 0x800C, 2 Return _0249: - ScrCmd_028 0x800C, 3 + SetVar 0x800C, 3 Return _0251: diff --git a/res/field/scripts/script_0495.s b/res/field/scripts/script_0495.s index 55342695c2..e79d954fd4 100644 --- a/res/field/scripts/script_0495.s +++ b/res/field/scripts/script_0495.s @@ -13,15 +13,15 @@ _000A: CheckFlag 218 GoToIf 1, _0079 ScrCmd_02C 0 - ScrCmd_028 0x8004, 92 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 92 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0084 ScrCmd_014 0x7FC SetFlag 218 - ScrCmd_028 0x8004, 92 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 92 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0079 diff --git a/res/field/scripts/script_0497.s b/res/field/scripts/script_0497.s index 65b361cbdf..d14a87751b 100644 --- a/res/field/scripts/script_0497.s +++ b/res/field/scripts/script_0497.s @@ -42,14 +42,14 @@ _0062: ScrCmd_0BE 125, 0, 5, 2, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40DA, 2 + SetVar 0x40DA, 2 ScrCmd_202 1 ScrCmd_061 End _00A0: ScrCmd_060 - ScrCmd_028 0x40DA, 2 + SetVar 0x40DA, 2 ScrCmd_202 1 ScrCmd_061 End @@ -65,7 +65,7 @@ _00AF: ScrCmd_0BE 125, 0, 5, 2, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40DA, 2 + SetVar 0x40DA, 2 ScrCmd_202 1 ScrCmd_061 End @@ -81,7 +81,7 @@ _00ED: ScrCmd_0BE 125, 0, 5, 2, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40DA, 2 + SetVar 0x40DA, 2 ScrCmd_202 1 ScrCmd_061 End @@ -98,7 +98,7 @@ _012B: ScrCmd_0BE 125, 0, 5, 2, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x40DA, 2 + SetVar 0x40DA, 2 ScrCmd_202 1 ScrCmd_061 End @@ -123,7 +123,7 @@ _0178: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 0, 0x8004 - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -163,7 +163,7 @@ _0242: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 0, 0x8004 - ScrCmd_028 0x8005, 0 + SetVar 0x8005, 0 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -203,7 +203,7 @@ _030C: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 1, 0x8004 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -243,7 +243,7 @@ _03D6: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 1, 0x8004 - ScrCmd_028 0x8005, 1 + SetVar 0x8005, 1 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -283,7 +283,7 @@ _04A0: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 2, 0x8004 - ScrCmd_028 0x8005, 2 + SetVar 0x8005, 2 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -323,7 +323,7 @@ _056A: CompareVarToValue 0x800C, 0xFFFE GoToIf 1, _06C2 ScrCmd_210 2, 0x8004 - ScrCmd_028 0x8005, 2 + SetVar 0x8005, 2 CompareVarToValue 0x8004, 6 CallIf 1, _0634 ScrCmd_211 0 @@ -356,17 +356,17 @@ _063C: Return _0644: - ScrCmd_028 0x8006, 0 + SetVar 0x8006, 0 Call _063C Return _0652: - ScrCmd_028 0x8006, 1 + SetVar 0x8006, 1 Call _063C Return _0660: - ScrCmd_028 0x8006, 2 + SetVar 0x8006, 2 Call _063C Return @@ -409,33 +409,33 @@ _06C2: End _06D0: - ScrCmd_05E 0xFF, _0718 - ScrCmd_05F + ApplyMovement 0xFF, _0718 + WaitMovement Return _06DC: - ScrCmd_05E 0xFF, _0724 - ScrCmd_05F + ApplyMovement 0xFF, _0724 + WaitMovement Return _06E8: - ScrCmd_05E 0xFF, _0730 - ScrCmd_05F + ApplyMovement 0xFF, _0730 + WaitMovement Return _06F4: - ScrCmd_05E 0xFF, _073C - ScrCmd_05F + ApplyMovement 0xFF, _073C + WaitMovement Return _0700: - ScrCmd_05E 0xFF, _0748 - ScrCmd_05F + ApplyMovement 0xFF, _0748 + WaitMovement Return _070C: - ScrCmd_05E 0xFF, _0754 - ScrCmd_05F + ApplyMovement 0xFF, _0754 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_0498.s b/res/field/scripts/script_0498.s index 9101ab8748..a522367a0f 100644 --- a/res/field/scripts/script_0498.s +++ b/res/field/scripts/script_0498.s @@ -6,9 +6,9 @@ .short 0xFD13 _0006: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_20A 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0043 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_0499.s b/res/field/scripts/script_0499.s index a345be48a9..ebb9bea66b 100644 --- a/res/field/scripts/script_0499.s +++ b/res/field/scripts/script_0499.s @@ -32,7 +32,7 @@ _0041: ScrCmd_042 3, 1 ScrCmd_042 4, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0085 CompareVarToValue 0x8008, 1 @@ -64,7 +64,7 @@ _0085: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_028 0x8000, 0 + SetVar 0x8000, 0 Call _017A CompareVarToValue 0x8000, 0 GoToIf 1, _01AB @@ -118,7 +118,7 @@ _017A: Return _01A3: - ScrCmd_026 0x8000, 1 + AddVar 0x8000, 1 Return _01AB: diff --git a/res/field/scripts/script_0500.s b/res/field/scripts/script_0500.s index 0aafe8c91e..2b04241002 100644 --- a/res/field/scripts/script_0500.s +++ b/res/field/scripts/script_0500.s @@ -13,14 +13,14 @@ _001A: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 1 + SetVar 0x8000, 1 GoTo _002E End _002E: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE @@ -32,14 +32,14 @@ _002E: _0068: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 1 + SetVar 0x8000, 1 GoTo _007C End _007C: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE @@ -51,14 +51,14 @@ _007C: _00B6: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 2 + SetVar 0x8000, 2 GoTo _00CA End _00CA: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE @@ -70,14 +70,14 @@ _00CA: _0104: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 5 + SetVar 0x8000, 5 GoTo _0118 End _0118: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE @@ -97,9 +97,9 @@ _0174: End _017F: - ScrCmd_028 0x8002, 0 - ScrCmd_028 0x8004, 0 - ScrCmd_028 0x8005, 0 + SetVar 0x8002, 0 + SetVar 0x8004, 0 + SetVar 0x8005, 0 GoTo _0199 End @@ -109,9 +109,9 @@ _0199: GoToIf 1, _0118 CompareVarToValue 0x8002, 0xFFFE GoToIf 1, _0118 - ScrCmd_028 0x8003, 0 - ScrCmd_028 0x8006, 0 - ScrCmd_028 0x8007, 0 + SetVar 0x8003, 0 + SetVar 0x8006, 0 + SetVar 0x8007, 0 GoTo _01D3 End @@ -127,14 +127,14 @@ _01D3: _01FD: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 4 + SetVar 0x8000, 4 GoTo _0211 End _0211: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE @@ -146,14 +146,14 @@ _0211: _024B: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_028 0x8000, 6 + SetVar 0x8000, 6 GoTo _025F End _025F: Call _0299 Call _029E - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 3 GoToIf 1, _031D CompareVarToValue 0x8008, 0xFFFE diff --git a/res/field/scripts/script_0501.s b/res/field/scripts/script_0501.s index c32e1e1b47..cac0cb2e76 100644 --- a/res/field/scripts/script_0501.s +++ b/res/field/scripts/script_0501.s @@ -141,7 +141,7 @@ _017E: ScrCmd_073 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 _01B9: ScrCmd_290 0x800C ScrCmd_291 0x8000, 0x800C @@ -259,7 +259,7 @@ _02F4: _0309: ScrCmd_02C 24 - ScrCmd_028 0x8000, 0 + SetVar 0x8000, 0 Call _02F4 ScrCmd_02C 18 ScrCmd_03E 0x800C @@ -276,7 +276,7 @@ _0346: CompareVarToValue 0x800C, 6 GoToIf 1, _045E ScrCmd_16E 0x800C - ScrCmd_028 0x8001, 0 + SetVar 0x8001, 0 CompareVarToValue 0x800C, 2 GoToIf 1, _03BE ScrCmd_040 1, 1, 0, 1, 0x8001 @@ -286,7 +286,7 @@ _0346: ScrCmd_042 135, 1 ScrCmd_042 136, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x8001 + SetVar 0x8008, 0x8001 CompareVarToValue 0x8008, 0 GoToIf 1, _03BE CompareVarToValue 0x8008, 1 @@ -313,8 +313,8 @@ _03DE: End _03FE: - ScrCmd_05E 0, _046C - ScrCmd_05F + ApplyMovement 0, _046C + WaitMovement ScrCmd_1A4 0x8002, 0x8001 ScrCmd_1A3 0x8004 ScrCmd_074 @@ -363,9 +363,9 @@ _046C: _04A0: ScrCmd_02C 24 - ScrCmd_028 0x8000, 0 + SetVar 0x8000, 0 Call _02F4 - ScrCmd_028 0x8000, 1 + SetVar 0x8000, 1 Call _02F4 ScrCmd_02C 32 ScrCmd_03E 0x800C diff --git a/res/field/scripts/script_1051.s b/res/field/scripts/script_1051.s index ce677bb806..5912d636fc 100644 --- a/res/field/scripts/script_1051.s +++ b/res/field/scripts/script_1051.s @@ -73,7 +73,7 @@ _00F3: CheckFlag 0x146 GoToIf 0, _01F4 ScrCmd_1B7 0x800C, 3 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _01CB CompareVarToValue 0x8008, 1 @@ -149,36 +149,36 @@ _01F4: End _0251: - ScrCmd_05E 4, _0474 - ScrCmd_05E 0xFF, _0488 - ScrCmd_05F + ApplyMovement 4, _0474 + ApplyMovement 0xFF, _0488 + WaitMovement GoTo _02B1 End _026B: - ScrCmd_05E 4, _0474 - ScrCmd_05E 0xFF, _0488 - ScrCmd_05F + ApplyMovement 4, _0474 + ApplyMovement 0xFF, _0488 + WaitMovement GoTo _02B1 End _0285: - ScrCmd_05E 4, _047C - ScrCmd_05E 0xFF, _0494 - ScrCmd_05F + ApplyMovement 4, _047C + ApplyMovement 0xFF, _0494 + WaitMovement GoTo _02B1 End _029F: - ScrCmd_05E 4, _0474 - ScrCmd_05F + ApplyMovement 4, _0474 + WaitMovement GoTo _02B1 End _02B1: ScrCmd_065 4 ClearFlag 0x188 - ScrCmd_028 0x4087, 2 + SetVar 0x4087, 2 ScrCmd_061 End @@ -393,11 +393,11 @@ _04A4: GoToIf 1, _04C6 CompareVarToValue 0x40C5, 1 GoToIf 1, _04C6 - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _04C6: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return .byte 0 diff --git a/res/field/scripts/script_1052.s b/res/field/scripts/script_1052.s index 9a40a6d30d..6f480b4f46 100644 --- a/res/field/scripts/script_1052.s +++ b/res/field/scripts/script_1052.s @@ -23,15 +23,15 @@ _0026: End _004F: - ScrCmd_028 0x40F4, 2 + SetVar 0x40F4, 2 Return _0057: - ScrCmd_028 0x40A4, 7 + SetVar 0x40A4, 7 Return _005F: - ScrCmd_028 0x40A4, 5 + SetVar 0x40A4, 5 Return _0067: @@ -78,8 +78,8 @@ _00BC: _00CD: ScrCmd_060 - ScrCmd_05E 3, _03B0 - ScrCmd_05F + ApplyMovement 3, _03B0 + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8004, 108 GoToIf 1, _0140 @@ -98,51 +98,51 @@ _00CD: GoTo _01E8 _0140: - ScrCmd_05E 0xFF, _02F0 - ScrCmd_05E 3, _03C4 - ScrCmd_05F + ApplyMovement 0xFF, _02F0 + ApplyMovement 3, _03C4 + WaitMovement GoTo _0200 _0158: - ScrCmd_05E 0xFF, _0308 - ScrCmd_05E 3, _03E0 - ScrCmd_05F + ApplyMovement 0xFF, _0308 + ApplyMovement 3, _03E0 + WaitMovement GoTo _0200 _0170: - ScrCmd_05E 0xFF, _0320 - ScrCmd_05E 3, _03F4 - ScrCmd_05F + ApplyMovement 0xFF, _0320 + ApplyMovement 3, _03F4 + WaitMovement GoTo _0200 _0188: - ScrCmd_05E 0xFF, _0338 - ScrCmd_05E 3, _0408 - ScrCmd_05F + ApplyMovement 0xFF, _0338 + ApplyMovement 3, _0408 + WaitMovement GoTo _0200 _01A0: - ScrCmd_05E 0xFF, _0350 - ScrCmd_05E 3, _041C - ScrCmd_05F + ApplyMovement 0xFF, _0350 + ApplyMovement 3, _041C + WaitMovement GoTo _0200 _01B8: - ScrCmd_05E 0xFF, _0368 - ScrCmd_05E 3, _0430 - ScrCmd_05F + ApplyMovement 0xFF, _0368 + ApplyMovement 3, _0430 + WaitMovement GoTo _0200 _01D0: - ScrCmd_05E 0xFF, _0380 - ScrCmd_05E 3, _0444 - ScrCmd_05F + ApplyMovement 0xFF, _0380 + ApplyMovement 3, _0444 + WaitMovement GoTo _0200 _01E8: - ScrCmd_05E 0xFF, _0398 - ScrCmd_05E 3, _0458 - ScrCmd_05F + ApplyMovement 0xFF, _0398 + ApplyMovement 3, _0458 + WaitMovement GoTo _0200 _0200: @@ -167,43 +167,43 @@ _0200: GoTo _02DC _026C: - ScrCmd_05E 3, _046C - ScrCmd_05F + ApplyMovement 3, _046C + WaitMovement GoTo _02EC _027C: - ScrCmd_05E 3, _047C - ScrCmd_05F + ApplyMovement 3, _047C + WaitMovement GoTo _02EC _028C: - ScrCmd_05E 3, _0488 - ScrCmd_05F + ApplyMovement 3, _0488 + WaitMovement GoTo _02EC _029C: - ScrCmd_05E 3, _0494 - ScrCmd_05F + ApplyMovement 3, _0494 + WaitMovement GoTo _02EC _02AC: - ScrCmd_05E 3, _04A0 - ScrCmd_05F + ApplyMovement 3, _04A0 + WaitMovement GoTo _02EC _02BC: - ScrCmd_05E 3, _04AC - ScrCmd_05F + ApplyMovement 3, _04AC + WaitMovement GoTo _02EC _02CC: - ScrCmd_05E 3, _04B8 - ScrCmd_05F + ApplyMovement 3, _04B8 + WaitMovement GoTo _02EC _02DC: - ScrCmd_05E 3, _04C4 - ScrCmd_05F + ApplyMovement 3, _04C4 + WaitMovement GoTo _02EC _02EC: @@ -412,35 +412,35 @@ _04D0: ScrCmd_169 77 ClearFlag 0x174 ScrCmd_064 2 - ScrCmd_05E 2, _05A4 - ScrCmd_05E 0xFF, _0588 - ScrCmd_05F + ApplyMovement 2, _05A4 + ApplyMovement 0xFF, _0588 + WaitMovement ScrCmd_049 0x602 ScrCmd_02C 0 ScrCmd_003 30, 0x800C ScrCmd_014 0x7FA - ScrCmd_05E 2, _059C - ScrCmd_05F + ApplyMovement 2, _059C + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0xFF, _0570 - ScrCmd_05E 2, _05B0 - ScrCmd_05F + ApplyMovement 0xFF, _0570 + ApplyMovement 2, _05B0 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_0CE 0 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 2, _05C8 - ScrCmd_05F + ApplyMovement 2, _05C8 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 ScrCmd_065 2 ScrCmd_014 0x7FB - ScrCmd_028 0x4070, 1 - ScrCmd_028 0x40E6, 1 + SetVar 0x4070, 1 + SetVar 0x40E6, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_1054.s b/res/field/scripts/script_1054.s index 8756bc0bb0..1c21ddf355 100644 --- a/res/field/scripts/script_1054.s +++ b/res/field/scripts/script_1054.s @@ -12,21 +12,21 @@ _000E: ScrCmd_0CE 0 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 0, _0060 - ScrCmd_05F + ApplyMovement 0, _0060 + WaitMovement ScrCmd_014 0x7FA ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _006C - ScrCmd_05E 0xFF, _0080 - ScrCmd_05F + ApplyMovement 0, _006C + ApplyMovement 0xFF, _0080 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 0 ScrCmd_014 0x7FB SetFlag 234 - ScrCmd_028 0x40A3, 1 - ScrCmd_028 0x4070, 2 + SetVar 0x40A3, 1 + SetVar 0x4070, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_1055.s b/res/field/scripts/script_1055.s index 7a6ec3d1bd..561e7f48e9 100644 --- a/res/field/scripts/script_1055.s +++ b/res/field/scripts/script_1055.s @@ -34,18 +34,18 @@ _005E: _0064: ScrCmd_060 - ScrCmd_05E 0xFF, _00A4 - ScrCmd_05E 0, _00B0 - ScrCmd_05F + ApplyMovement 0xFF, _00A4 + ApplyMovement 0, _00B0 + WaitMovement SetFlag 135 ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 0 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0, _00CC - ScrCmd_05F - ScrCmd_028 0x40A4, 1 + ApplyMovement 0, _00CC + WaitMovement + SetVar 0x40A4, 1 ScrCmd_061 End @@ -75,7 +75,7 @@ _00CC: _00E0: ScrCmd_060 - ScrCmd_028 0x410F, 2 + SetVar 0x410F, 2 CheckFlag 0x15C GoToIf 1, _014B CheckFlag 0x15D @@ -84,9 +84,9 @@ _00E0: CompareVarToValue 0x800C, 0 GoToIf 1, _014B _0110: - ScrCmd_05E 0xFF, _0164 - ScrCmd_05E 0, _0170 - ScrCmd_05F + ApplyMovement 0xFF, _0164 + ApplyMovement 0, _0170 + WaitMovement ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_22D 2, 0x800C @@ -125,9 +125,9 @@ _0170: _017C: ScrCmd_060 ScrCmd_003 30, 0x800C - ScrCmd_05E 0, _01D4 - ScrCmd_05E 0xFF, _01F8 - ScrCmd_05F + ApplyMovement 0, _01D4 + ApplyMovement 0xFF, _01F8 + WaitMovement ScrCmd_003 30, 0x800C ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -144,7 +144,7 @@ _017C: ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 - ScrCmd_028 0x40A4, 4 + SetVar 0x40A4, 4 ScrCmd_061 End @@ -288,8 +288,8 @@ _036C: Call _0688 ScrCmd_0CD 0 ScrCmd_02C 15 - ScrCmd_028 0x8004, 0x1B1 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B1 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_1CC ScrCmd_02C 16 @@ -300,14 +300,14 @@ _036C: End _03A6: - ScrCmd_05E 0, _079C - ScrCmd_05F + ApplyMovement 0, _079C + WaitMovement GoTo _03CA End _03B8: - ScrCmd_05E 0, _07A4 - ScrCmd_05F + ApplyMovement 0, _07A4 + WaitMovement GoTo _03CA End @@ -321,17 +321,17 @@ _03CA: ClearFlag 0x1F1 ScrCmd_064 1 ScrCmd_04B 0x605 - ScrCmd_05E 0, _07B4 - ScrCmd_05E 0xFF, _0864 - ScrCmd_05F - ScrCmd_05E 1, _07FC - ScrCmd_05F + ApplyMovement 0, _07B4 + ApplyMovement 0xFF, _0864 + WaitMovement + ApplyMovement 1, _07FC + WaitMovement CompareVarToValue 0x8007, 0 CallIf 1, _0465 ScrCmd_0CE 1 ScrCmd_02C 19 - ScrCmd_05E 0, _07C0 - ScrCmd_05F + ApplyMovement 0, _07C0 + WaitMovement ScrCmd_02C 20 ScrCmd_0CE 1 ScrCmd_02C 21 @@ -348,35 +348,35 @@ _03CA: End _0465: - ScrCmd_05E 0xFF, _086C - ScrCmd_05F + ApplyMovement 0xFF, _086C + WaitMovement Return _0471: - ScrCmd_05E 0, _07C8 - ScrCmd_05E 0xFF, _0874 - ScrCmd_05F + ApplyMovement 0, _07C8 + ApplyMovement 0xFF, _0874 + WaitMovement GoTo _04D9 End _048B: - ScrCmd_05E 0, _07D0 - ScrCmd_05E 0xFF, _087C - ScrCmd_05F + ApplyMovement 0, _07D0 + ApplyMovement 0xFF, _087C + WaitMovement GoTo _04D9 End _04A5: - ScrCmd_05E 0, _07D8 - ScrCmd_05E 0xFF, _0884 - ScrCmd_05F + ApplyMovement 0, _07D8 + ApplyMovement 0xFF, _0884 + WaitMovement GoTo _04D9 End _04BF: - ScrCmd_05E 0, _07E0 - ScrCmd_05E 0xFF, _088C - ScrCmd_05F + ApplyMovement 0, _07E0 + ApplyMovement 0xFF, _088C + WaitMovement GoTo _04D9 End @@ -394,30 +394,30 @@ _04D9: End _0514: - ScrCmd_05E 1, _0808 - ScrCmd_05E 0xFF, _0894 - ScrCmd_05F + ApplyMovement 1, _0808 + ApplyMovement 0xFF, _0894 + WaitMovement GoTo _057C End _052E: - ScrCmd_05E 1, _0810 - ScrCmd_05E 0xFF, _089C - ScrCmd_05F + ApplyMovement 1, _0810 + ApplyMovement 0xFF, _089C + WaitMovement GoTo _057C End _0548: - ScrCmd_05E 1, _081C - ScrCmd_05E 0xFF, _08A8 - ScrCmd_05F + ApplyMovement 1, _081C + ApplyMovement 0xFF, _08A8 + WaitMovement GoTo _057C End _0562: - ScrCmd_05E 1, _0828 - ScrCmd_05E 0xFF, _08B4 - ScrCmd_05F + ApplyMovement 1, _0828 + ApplyMovement 0xFF, _08B4 + WaitMovement GoTo _057C End @@ -441,8 +441,8 @@ _05A6: End _05B1: - ScrCmd_028 0x8004, 0x1CB - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1CB + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 143 ScrCmd_02C 27 @@ -460,38 +460,38 @@ _05B1: End _0606: - ScrCmd_05E 1, _0830 - ScrCmd_05E 0xFF, _08BC - ScrCmd_05F + ApplyMovement 1, _0830 + ApplyMovement 0xFF, _08BC + WaitMovement GoTo _0676 End _0620: - ScrCmd_05E 1, _083C - ScrCmd_05E 0xFF, _08C4 - ScrCmd_05E 0, _07E8 - ScrCmd_05F + ApplyMovement 1, _083C + ApplyMovement 0xFF, _08C4 + ApplyMovement 0, _07E8 + WaitMovement GoTo _0676 End _0642: - ScrCmd_05E 1, _0848 - ScrCmd_05E 0, _07F4 - ScrCmd_05F + ApplyMovement 1, _0848 + ApplyMovement 0, _07F4 + WaitMovement GoTo _0676 End _065C: - ScrCmd_05E 1, _0858 - ScrCmd_05E 0xFF, _08D8 - ScrCmd_05F + ApplyMovement 1, _0858 + ApplyMovement 0xFF, _08D8 + WaitMovement GoTo _0676 End _0676: ScrCmd_049 0x603 ScrCmd_065 1 - ScrCmd_028 0x40A4, 6 + SetVar 0x40A4, 6 ScrCmd_061 End @@ -844,14 +844,14 @@ _08E0: End _08EA: - ScrCmd_05E 0xFF, _0918 - ScrCmd_05E 0, _0930 - ScrCmd_05F + ApplyMovement 0xFF, _0918 + ApplyMovement 0, _0930 + WaitMovement GoTo _0904 End _0904: - ScrCmd_028 0x40A4, 2 + SetVar 0x40A4, 2 ScrCmd_0CD 0 ScrCmd_02C 4 ScrCmd_031 diff --git a/res/field/scripts/script_1056.s b/res/field/scripts/script_1056.s index 349004c150..66ed719b93 100644 --- a/res/field/scripts/script_1056.s +++ b/res/field/scripts/script_1056.s @@ -25,7 +25,7 @@ _0039: _0041: ScrCmd_060 - ScrCmd_028 0x40F9, 1 + SetVar 0x40F9, 1 ScrCmd_02C 0 ScrCmd_04E 0x482 ScrCmd_02C 1 @@ -72,22 +72,22 @@ _0097: End _00A8: - ScrCmd_028 0x4000, 0 + SetVar 0x4000, 0 GoTo _00E0 End _00B6: - ScrCmd_028 0x4000, 1 + SetVar 0x4000, 1 GoTo _00E0 End _00C4: - ScrCmd_028 0x4000, 2 + SetVar 0x4000, 2 GoTo _00E0 End _00D2: - ScrCmd_028 0x4000, 3 + SetVar 0x4000, 3 GoTo _00E0 End @@ -95,8 +95,8 @@ _00E0: ScrCmd_060 ClearFlag 0x173 ScrCmd_064 0 - ScrCmd_05E 0, _0394 - ScrCmd_05F + ApplyMovement 0, _0394 + WaitMovement ScrCmd_014 0x7FA ScrCmd_0CE 0 ScrCmd_02C 6 @@ -112,8 +112,8 @@ _00E0: ScrCmd_0CD 1 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 0, _03E0 - ScrCmd_05F + ApplyMovement 0, _03E0 + WaitMovement CompareVarToValue 0x4000, 0 CallIf 1, _0291 CompareVarToValue 0x4000, 1 @@ -159,119 +159,119 @@ _00E0: ScrCmd_014 0x7FB ScrCmd_04B 0x603 SetFlag 0x173 - ScrCmd_028 0x40A5, 1 + SetVar 0x40A5, 1 ScrCmd_061 End _0249: - ScrCmd_05E 0xFF, _04D4 - ScrCmd_05E 0, _03A4 - ScrCmd_05F + ApplyMovement 0xFF, _04D4 + ApplyMovement 0, _03A4 + WaitMovement Return _025D: - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05E 0, _03B4 - ScrCmd_05F + ApplyMovement 0xFF, _04E4 + ApplyMovement 0, _03B4 + WaitMovement Return _0271: - ScrCmd_05E 0, _03C4 - ScrCmd_05F + ApplyMovement 0, _03C4 + WaitMovement Return _027D: - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05E 0, _03D0 - ScrCmd_05F + ApplyMovement 0xFF, _04E4 + ApplyMovement 0, _03D0 + WaitMovement Return _0291: - ScrCmd_05E 0xFF, _04F0 - ScrCmd_05E 0, _03EC - ScrCmd_05F + ApplyMovement 0xFF, _04F0 + ApplyMovement 0, _03EC + WaitMovement Return _02A5: - ScrCmd_05E 0xFF, _04FC - ScrCmd_05E 0, _03FC - ScrCmd_05F + ApplyMovement 0xFF, _04FC + ApplyMovement 0, _03FC + WaitMovement Return _02B9: - ScrCmd_05E 0xFF, _0508 - ScrCmd_05E 0, _040C - ScrCmd_05F + ApplyMovement 0xFF, _0508 + ApplyMovement 0, _040C + WaitMovement Return _02CD: - ScrCmd_05E 0xFF, _0514 - ScrCmd_05E 0, _041C - ScrCmd_05F + ApplyMovement 0xFF, _0514 + ApplyMovement 0, _041C + WaitMovement Return _02E1: - ScrCmd_05E 0, _042C - ScrCmd_05F + ApplyMovement 0, _042C + WaitMovement Return _02ED: - ScrCmd_05E 0, _0434 - ScrCmd_05F + ApplyMovement 0, _0434 + WaitMovement Return _02F9: - ScrCmd_05E 0, _043C - ScrCmd_05F + ApplyMovement 0, _043C + WaitMovement Return _0305: - ScrCmd_05E 0, _0444 - ScrCmd_05F + ApplyMovement 0, _0444 + WaitMovement Return _0311: - ScrCmd_05E 0, _044C - ScrCmd_05F + ApplyMovement 0, _044C + WaitMovement Return _031D: - ScrCmd_05E 0, _0454 - ScrCmd_05F + ApplyMovement 0, _0454 + WaitMovement Return _0329: - ScrCmd_05E 0, _0464 - ScrCmd_05F + ApplyMovement 0, _0464 + WaitMovement Return _0335: - ScrCmd_05E 0, _0474 - ScrCmd_05F + ApplyMovement 0, _0474 + WaitMovement Return _0341: - ScrCmd_05E 0xFF, _0520 - ScrCmd_05E 0, _0484 - ScrCmd_05F + ApplyMovement 0xFF, _0520 + ApplyMovement 0, _0484 + WaitMovement Return _0355: - ScrCmd_05E 0xFF, _0520 - ScrCmd_05E 0, _0498 - ScrCmd_05F + ApplyMovement 0xFF, _0520 + ApplyMovement 0, _0498 + WaitMovement Return _0369: - ScrCmd_05E 0xFF, _0520 - ScrCmd_05E 0, _04AC - ScrCmd_05F + ApplyMovement 0xFF, _0520 + ApplyMovement 0, _04AC + WaitMovement Return _037D: - ScrCmd_05E 0xFF, _0520 - ScrCmd_05E 0, _04C0 - ScrCmd_05F + ApplyMovement 0xFF, _0520 + ApplyMovement 0, _04C0 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_1059.s b/res/field/scripts/script_1059.s index 21cf3bf9ee..d136668b43 100644 --- a/res/field/scripts/script_1059.s +++ b/res/field/scripts/script_1059.s @@ -33,17 +33,17 @@ _005F: Return _0075: - ScrCmd_028 0x4020, 97 + SetVar 0x4020, 97 End _007D: - ScrCmd_028 0x4020, 0 + SetVar 0x4020, 0 End _0085: ScrCmd_060 - ScrCmd_05E 4, _03AC - ScrCmd_05F + ApplyMovement 4, _03AC + WaitMovement ScrCmd_069 0x8004, 0x8005 CompareVarToValue 0x8005, 0x34B GoToIf 1, _00E7 @@ -60,37 +60,37 @@ _0085: End _00E7: - ScrCmd_05E 4, _03B8 - ScrCmd_05E 0xFF, _047C - ScrCmd_05F + ApplyMovement 4, _03B8 + ApplyMovement 0xFF, _047C + WaitMovement GoTo _0169 _00FF: - ScrCmd_05E 4, _03C4 - ScrCmd_05F + ApplyMovement 4, _03C4 + WaitMovement GoTo _0169 _010F: - ScrCmd_05E 4, _03D4 - ScrCmd_05F + ApplyMovement 4, _03D4 + WaitMovement GoTo _0169 _011F: - ScrCmd_05E 4, _03DC - ScrCmd_05E 0xFF, _04A0 - ScrCmd_05F + ApplyMovement 4, _03DC + ApplyMovement 0xFF, _04A0 + WaitMovement GoTo _0169 _0137: - ScrCmd_05E 4, _03E8 - ScrCmd_05E 0xFF, _04AC - ScrCmd_05F + ApplyMovement 4, _03E8 + ApplyMovement 0xFF, _04AC + WaitMovement GoTo _0169 _014F: - ScrCmd_05E 4, _03F4 - ScrCmd_05E 0xFF, _04B8 - ScrCmd_05F + ApplyMovement 4, _03F4 + ApplyMovement 0xFF, _04B8 + WaitMovement GoTo _0169 End @@ -129,39 +129,39 @@ _01A1: End _01F3: - ScrCmd_05E 4, _0400 - ScrCmd_05E 0xFF, _04C4 - ScrCmd_05F + ApplyMovement 4, _0400 + ApplyMovement 0xFF, _04C4 + WaitMovement GoTo _0283 _020B: - ScrCmd_05E 4, _040C - ScrCmd_05E 0xFF, _04D4 - ScrCmd_05F + ApplyMovement 4, _040C + ApplyMovement 0xFF, _04D4 + WaitMovement GoTo _0283 _0223: - ScrCmd_05E 4, _0418 - ScrCmd_05E 0xFF, _04E4 - ScrCmd_05F + ApplyMovement 4, _0418 + ApplyMovement 0xFF, _04E4 + WaitMovement GoTo _0283 _023B: - ScrCmd_05E 4, _0428 - ScrCmd_05E 0xFF, _04F8 - ScrCmd_05F + ApplyMovement 4, _0428 + ApplyMovement 0xFF, _04F8 + WaitMovement GoTo _0283 _0253: - ScrCmd_05E 4, _043C - ScrCmd_05E 0xFF, _0510 - ScrCmd_05F + ApplyMovement 4, _043C + ApplyMovement 0xFF, _0510 + WaitMovement GoTo _0283 _026B: - ScrCmd_05E 4, _044C - ScrCmd_05E 0xFF, _0520 - ScrCmd_05F + ApplyMovement 4, _044C + ApplyMovement 0xFF, _0520 + WaitMovement GoTo _0283 _0283: @@ -186,23 +186,23 @@ _02B5: ScrCmd_169 77 ClearFlag 0x197 ScrCmd_064 3 - ScrCmd_05E 3, _0554 - ScrCmd_05F - ScrCmd_05E 3, _055C - ScrCmd_05F + ApplyMovement 3, _0554 + WaitMovement + ApplyMovement 3, _055C + WaitMovement ScrCmd_049 0x602 ScrCmd_02C 4 - ScrCmd_05E 3, _0564 - ScrCmd_05F + ApplyMovement 3, _0564 + WaitMovement ScrCmd_014 0x7FA ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 5 ScrCmd_034 - ScrCmd_05E 0xFF, _0548 - ScrCmd_05E 4, _0470 - ScrCmd_05E 3, _056C - ScrCmd_05F + ApplyMovement 0xFF, _0548 + ApplyMovement 4, _0470 + ApplyMovement 3, _056C + WaitMovement ScrCmd_065 3 ScrCmd_014 0x7FB ScrCmd_14D 0x800C @@ -225,14 +225,14 @@ _0352: _035E: ScrCmd_034 - ScrCmd_05E 4, _045C - ScrCmd_05E 0xFF, _0530 - ScrCmd_05F + ApplyMovement 4, _045C + ApplyMovement 0xFF, _0530 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 ScrCmd_065 4 - ScrCmd_028 0x4071, 1 + SetVar 0x4071, 1 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x1A6, 0, 7, 15, 0 @@ -475,22 +475,22 @@ _057C: ScrCmd_169 77 ClearFlag 0x2C4 ScrCmd_064 14 - ScrCmd_05E 14, _0798 - ScrCmd_05F + ApplyMovement 14, _0798 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 8 ScrCmd_034 - ScrCmd_05E 0xFF, _07AC - ScrCmd_05E 4, _07F8 - ScrCmd_05F + ApplyMovement 0xFF, _07AC + ApplyMovement 4, _07F8 + WaitMovement ScrCmd_02C 9 - ScrCmd_028 0x8004, 0x162 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x162 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 14, _07A0 - ScrCmd_05F + ApplyMovement 14, _07A0 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -516,9 +516,9 @@ _061D: End _062A: - ScrCmd_05E 0xFF, _07B8 - ScrCmd_05E 4, _0800 - ScrCmd_05F + ApplyMovement 0xFF, _07B8 + ApplyMovement 4, _0800 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _065C @@ -541,9 +541,9 @@ _066B: _067A: ScrCmd_034 ScrCmd_014 0x800 - ScrCmd_05E 4, _0808 - ScrCmd_05E 0xFF, _07C0 - ScrCmd_05F + ApplyMovement 4, _0808 + ApplyMovement 0xFF, _07C0 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _06B2 @@ -565,9 +565,9 @@ _06C1: _06D0: ScrCmd_034 - ScrCmd_05E 4, _0814 - ScrCmd_05E 0xFF, _07D0 - ScrCmd_05F + ApplyMovement 4, _0814 + ApplyMovement 0xFF, _07D0 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0704 @@ -587,11 +587,11 @@ _0710: _071C: ScrCmd_034 - ScrCmd_05E 4, _0820 - ScrCmd_05E 0xFF, _07DC - ScrCmd_05F - ScrCmd_05E 4, _0828 - ScrCmd_05F + ApplyMovement 4, _0820 + ApplyMovement 0xFF, _07DC + WaitMovement + ApplyMovement 4, _0828 + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _075A @@ -611,12 +611,12 @@ _0766: _0772: ScrCmd_034 - ScrCmd_05E 4, _0830 - ScrCmd_05E 0xFF, _07E4 - ScrCmd_05F + ApplyMovement 4, _0830 + ApplyMovement 0xFF, _07E4 + WaitMovement ScrCmd_014 0x801 ScrCmd_065 4 - ScrCmd_028 0x4071, 2 + SetVar 0x4071, 2 ScrCmd_061 End diff --git a/res/field/scripts/script_1061.s b/res/field/scripts/script_1061.s index dda0e7935b..5e5c0a9a2d 100644 --- a/res/field/scripts/script_1061.s +++ b/res/field/scripts/script_1061.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 3 + SetVar 0x8007, 3 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_1064.s b/res/field/scripts/script_1064.s index b0c1f1aacc..6589cc5fb7 100644 --- a/res/field/scripts/script_1064.s +++ b/res/field/scripts/script_1064.s @@ -48,7 +48,7 @@ _008C: End _00AF: - ScrCmd_028 0x40AA, 3 + SetVar 0x40AA, 3 Return _00B7: @@ -89,8 +89,8 @@ _0114: ScrCmd_0CD 1 ScrCmd_02C 51 ScrCmd_034 - ScrCmd_05E 3, _019C - ScrCmd_05F + ApplyMovement 3, _019C + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _014E @@ -116,11 +116,11 @@ _016A: ScrCmd_031 ScrCmd_034 SetFlag 0x27D - ScrCmd_028 0x4112, 1 + SetVar 0x4112, 1 ClearFlag 0x1DF ClearFlag 0x1E0 ClearFlag 0x1E1 - ScrCmd_028 0x40A6, 3 + SetVar 0x40A6, 3 ScrCmd_061 End @@ -136,19 +136,19 @@ _01AC: _01AE: ScrCmd_060 - ScrCmd_05E 3, _0484 - ScrCmd_05E 0xFF, _04A8 - ScrCmd_05F + ApplyMovement 3, _0484 + ApplyMovement 0xFF, _04A8 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0CB 0x100 ScrCmd_0CC - ScrCmd_05E 0xFF, _04E0 - ScrCmd_05F - ScrCmd_028 0x8004, 0 + ApplyMovement 0xFF, _04E0 + WaitMovement + SetVar 0x8004, 0 ScrCmd_198 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0x183 GoToIf 1, _0219 CompareVarToValue 0x8008, 0x186 @@ -167,8 +167,8 @@ _0222: _022B: ScrCmd_034 - ScrCmd_05E 0xFF, _04E8 - ScrCmd_05F + ApplyMovement 0xFF, _04E8 + WaitMovement ScrCmd_0CB 1 ScrCmd_0CC ScrCmd_0D0 0, 0 @@ -181,12 +181,12 @@ _022B: End _0261: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BB 0, 0x800C - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_02C 5 @@ -207,10 +207,10 @@ _02BC: ScrCmd_0CE 1 ScrCmd_02C 6 ScrCmd_034 - ScrCmd_05E 3, _0498 - ScrCmd_05F - ScrCmd_05E 0xFF, _04BC - ScrCmd_05F + ApplyMovement 3, _0498 + WaitMovement + ApplyMovement 0xFF, _04BC + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -222,8 +222,8 @@ _02FC: ScrCmd_0CF 0 ScrCmd_02C 7 ScrCmd_034 - ScrCmd_05E 3, _04D0 - ScrCmd_05F + ApplyMovement 3, _04D0 + WaitMovement GoTo _0330 End @@ -231,16 +231,16 @@ _0316: ScrCmd_0CF 0 ScrCmd_02C 8 ScrCmd_034 - ScrCmd_05E 3, _04D0 - ScrCmd_05F + ApplyMovement 3, _04D0 + WaitMovement GoTo _0330 End _0330: ScrCmd_054 0, 40 - ScrCmd_05E 0, _047C - ScrCmd_05E 0xFF, _04B4 - ScrCmd_05F + ApplyMovement 0, _047C + ApplyMovement 0xFF, _04B4 + WaitMovement ScrCmd_003 35, 0x800C SetFlag 0x993 ScrCmd_050 0x44A @@ -272,8 +272,8 @@ _0394: ScrCmd_0CD 0 ScrCmd_02C 14 ScrCmd_034 - ScrCmd_05E 3, _04A0 - ScrCmd_05F + ApplyMovement 3, _04A0 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 @@ -297,10 +297,10 @@ _03F6: ScrCmd_0CD 0 ScrCmd_02C 17 ScrCmd_034 - ScrCmd_05E 3, _04A0 - ScrCmd_05F - ScrCmd_05E 0xFF, _04BC - ScrCmd_05F + ApplyMovement 3, _04A0 + WaitMovement + ApplyMovement 0xFF, _04BC + WaitMovement ScrCmd_14D 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _042B @@ -323,12 +323,12 @@ _043C: _044D: ScrCmd_034 - ScrCmd_05E 0xFF, _04C4 - ScrCmd_05E 3, _04D8 - ScrCmd_05F + ApplyMovement 0xFF, _04C4 + ApplyMovement 3, _04D8 + WaitMovement ScrCmd_065 3 ClearFlag 0x177 - ScrCmd_028 0x40A6, 1 + SetVar 0x40A6, 1 ScrCmd_061 End @@ -587,21 +587,21 @@ _0677: CallIf 1, _07E3 ClearFlag 0x22A ScrCmd_064 4 - ScrCmd_05E 0xFF, _0858 - ScrCmd_05E 4, _0884 - ScrCmd_05E 0, _0804 - ScrCmd_05F + ApplyMovement 0xFF, _0858 + ApplyMovement 4, _0884 + ApplyMovement 0, _0804 + WaitMovement ScrCmd_02C 32 ScrCmd_02C 33 ScrCmd_034 - ScrCmd_05E 0, _080C - ScrCmd_05F + ApplyMovement 0, _080C + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 34 ScrCmd_034 - ScrCmd_05E 4, _088C - ScrCmd_05E 0xFF, _086C - ScrCmd_05F + ApplyMovement 4, _088C + ApplyMovement 0xFF, _086C + WaitMovement ScrCmd_02C 35 CheckFlag 0x964 CallIf 1, _07A2 @@ -622,18 +622,18 @@ _0677: CompareVarToValue 0x8004, 1 CallIf 1, _07A9 ScrCmd_034 - ScrCmd_05E 4, _0898 - ScrCmd_05F + ApplyMovement 4, _0898 + WaitMovement ScrCmd_065 4 ScrCmd_02C 42 ScrCmd_034 ScrCmd_003 15, 0x800C - ScrCmd_05E 0xFF, _0878 - ScrCmd_05F + ApplyMovement 0xFF, _0878 + WaitMovement ScrCmd_0CD 0 ScrCmd_02C 43 - ScrCmd_028 0x8004, 0x1AF - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1AF + SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_02C 44 ScrCmd_031 @@ -667,21 +667,21 @@ _07B9: Return _07BB: - ScrCmd_05E 0xFF, _0824 - ScrCmd_05E 0, _07F8 - ScrCmd_05F + ApplyMovement 0xFF, _0824 + ApplyMovement 0, _07F8 + WaitMovement Return _07CF: - ScrCmd_05E 0xFF, _0838 - ScrCmd_05E 0, _07F8 - ScrCmd_05F + ApplyMovement 0xFF, _0838 + ApplyMovement 0, _07F8 + WaitMovement Return _07E3: - ScrCmd_05E 0xFF, _0848 - ScrCmd_05E 0, _07F8 - ScrCmd_05F + ApplyMovement 0xFF, _0848 + ApplyMovement 0, _07F8 + WaitMovement Return .balign 4, 0 @@ -770,7 +770,7 @@ _0898: EndMovement _08A0: - ScrCmd_028 0x8006, 0 + SetVar 0x8006, 0 CompareVarToValue 0x40A6, 3 GoToIf 1, _08B5 Return @@ -781,7 +781,7 @@ _08B5: Return _08C2: - ScrCmd_028 0x8006, 1 + SetVar 0x8006, 1 Return .byte 0 diff --git a/res/field/scripts/script_1068.s b/res/field/scripts/script_1068.s index 4a1fe837b4..6f3eddb6ee 100644 --- a/res/field/scripts/script_1068.s +++ b/res/field/scripts/script_1068.s @@ -21,12 +21,12 @@ _002E: _0030: ScrCmd_049 0x5DC ScrCmd_060 - ScrCmd_05E 7, _005C - ScrCmd_05F + ApplyMovement 7, _005C + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 8, _0064 - ScrCmd_05F + ApplyMovement 8, _0064 + WaitMovement ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 @@ -50,8 +50,8 @@ _006C: CompareVarToValue 0x40CF, 2 GoToIf 4, _0099 ScrCmd_02C 2 - ScrCmd_05E 2, _00A4 - ScrCmd_05F + ApplyMovement 2, _00A4 + WaitMovement ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 @@ -149,8 +149,8 @@ _0141: CompareVarToValue 0x800C, 0 GoToIf 5, _01A8 ScrCmd_02C 9 - ScrCmd_028 0x8004, 0x1D2 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1D2 + SetVar 0x8005, 1 ScrCmd_014 0x7E0 ScrCmd_034 ScrCmd_061 diff --git a/res/field/scripts/script_1070.s b/res/field/scripts/script_1070.s index c80bdf0b3f..51a0f53630 100644 --- a/res/field/scripts/script_1070.s +++ b/res/field/scripts/script_1070.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 2 + SetVar 0x8007, 2 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_1073.s b/res/field/scripts/script_1073.s index ccb737e1db..9903307701 100644 --- a/res/field/scripts/script_1073.s +++ b/res/field/scripts/script_1073.s @@ -15,8 +15,8 @@ _000E: GoToIf 1, _0059 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 5 - ScrCmd_026 0x8004, 149 - ScrCmd_028 0x8005, 1 + AddVar 0x8004, 149 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0064 @@ -46,8 +46,8 @@ _006E: CheckFlag 128 GoToIf 1, _009E ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x1C0 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1C0 + SetVar 0x8005, 1 SetFlag 128 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_1075.s b/res/field/scripts/script_1075.s index 8b14e53f2e..fe0da35c5a 100644 --- a/res/field/scripts/script_1075.s +++ b/res/field/scripts/script_1075.s @@ -40,8 +40,8 @@ _0057: _0062: ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x19F - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x19F + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _009F diff --git a/res/field/scripts/script_1076.s b/res/field/scripts/script_1076.s index 419a723cd0..6d60e2fc39 100644 --- a/res/field/scripts/script_1076.s +++ b/res/field/scripts/script_1076.s @@ -100,7 +100,7 @@ _00CC: CompareVarToValue 0x800C, 50 GoToIf 0, _010D ScrCmd_02C 10 - ScrCmd_028 0x8004, 9 + SetVar 0x8004, 9 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 @@ -147,33 +147,33 @@ _0151: _0168: ScrCmd_060 - ScrCmd_05E 0xFF, _0218 - ScrCmd_05F + ApplyMovement 0xFF, _0218 + WaitMovement ScrCmd_014 0x7FA ScrCmd_069 0x8004, 0x8005 ScrCmd_186 18, 0x8004, 0x295 ClearFlag 0x21E ScrCmd_064 18 ScrCmd_062 18 - ScrCmd_05E 0xFF, _0228 - ScrCmd_05E 18, _01E8 - ScrCmd_05F + ApplyMovement 0xFF, _0228 + ApplyMovement 18, _01E8 + WaitMovement ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 18, _01F0 - ScrCmd_05F + ApplyMovement 18, _01F0 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 1 - ScrCmd_05E 18, _0208 - ScrCmd_05F + ApplyMovement 18, _0208 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 18, _0210 - ScrCmd_05F + ApplyMovement 18, _0210 + WaitMovement ScrCmd_065 18 ScrCmd_014 0x7FB - ScrCmd_028 0x4073, 1 + SetVar 0x4073, 1 ScrCmd_061 End diff --git a/res/field/scripts/script_1078.s b/res/field/scripts/script_1078.s index aa70b03dbe..d1520ed75e 100644 --- a/res/field/scripts/script_1078.s +++ b/res/field/scripts/script_1078.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_1081.s b/res/field/scripts/script_1081.s index 45b5cd1d12..84193d096b 100644 --- a/res/field/scripts/script_1081.s +++ b/res/field/scripts/script_1081.s @@ -24,7 +24,7 @@ _0021: CompareVarToValue 0x800C, 1 GoToIf 1, _0051 ScrCmd_02C 0 - ScrCmd_028 0x8004, 8 + SetVar 0x8004, 8 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1083.s b/res/field/scripts/script_1083.s index 20be23be27..62e926b8f7 100644 --- a/res/field/scripts/script_1083.s +++ b/res/field/scripts/script_1083.s @@ -32,7 +32,7 @@ _0057: _0060: ScrCmd_218 0x800C - ScrCmd_029 0x40E5, 0x800C + SetVar 0x40E5, 0x800C ScrCmd_219 1 ScrCmd_0DA 0, 0x40E5, 0, 0 ScrCmd_02C 2 @@ -79,7 +79,7 @@ _00AE: CallIf 1, _01D9 CompareVarToValue 0x800C, 11 CallIf 1, _01E1 - ScrCmd_028 0x8005, 3 + SetVar 0x8005, 3 ScrCmd_07D 93, 1, 0x800C CompareVarToValue 0x800C, 0 GoToIf 5, _01E9 @@ -89,60 +89,60 @@ _00AE: End _0189: - ScrCmd_028 0x8004, 2 + SetVar 0x8004, 2 Return _0191: - ScrCmd_028 0x8004, 3 + SetVar 0x8004, 3 Return _0199: - ScrCmd_028 0x8004, 4 + SetVar 0x8004, 4 Return _01A1: - ScrCmd_028 0x8004, 6 + SetVar 0x8004, 6 Return _01A9: - ScrCmd_028 0x8004, 7 + SetVar 0x8004, 7 Return _01B1: - ScrCmd_028 0x8004, 8 + SetVar 0x8004, 8 Return _01B9: - ScrCmd_028 0x8004, 9 + SetVar 0x8004, 9 Return _01C1: - ScrCmd_028 0x8004, 10 + SetVar 0x8004, 10 Return _01C9: - ScrCmd_028 0x8004, 11 + SetVar 0x8004, 11 Return _01D1: - ScrCmd_028 0x8004, 13 + SetVar 0x8004, 13 Return _01D9: - ScrCmd_028 0x8004, 14 + SetVar 0x8004, 14 Return _01E1: - ScrCmd_028 0x8004, 15 + SetVar 0x8004, 15 Return _01E9: ScrCmd_014 0x7FC - ScrCmd_028 0x8004, 93 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 93 + SetVar 0x8005, 1 ScrCmd_014 0x7FC ClearFlag 220 - ScrCmd_028 0x40E5, 0 + SetVar 0x40E5, 0 SetFlag 0xAB1 ScrCmd_02C 5 ScrCmd_031 @@ -154,13 +154,13 @@ _0216: ScrCmd_07D 93, 1, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0251 - ScrCmd_029 0x8004, 0x4117 - ScrCmd_028 0x8005, 3 + SetVar 0x8004, 0x4117 + SetVar 0x8005, 3 GoTo _025C End _023F: - ScrCmd_029 0x4117, 0x8004 + SetVar 0x4117, 0x8004 SetFlag 220 GoTo _0251 End @@ -175,10 +175,10 @@ _0251: _025C: ScrCmd_02C 7 ClearFlag 220 - ScrCmd_028 0x40E5, 0 + SetVar 0x40E5, 0 ScrCmd_014 0x7FC - ScrCmd_028 0x8004, 93 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 93 + SetVar 0x8005, 1 ScrCmd_014 0x7E0 ScrCmd_034 ScrCmd_061 @@ -196,7 +196,7 @@ _0283: _029F: ScrCmd_02C 9 - ScrCmd_028 0x40E5, 0 + SetVar 0x40E5, 0 ScrCmd_031 ScrCmd_034 ScrCmd_061 @@ -231,7 +231,7 @@ _02CE: ScrCmd_29D 0x10B, 3 ScrCmd_29D 0x10A, 4 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0344 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_1085.s b/res/field/scripts/script_1085.s index c1048bcef7..0c6399ae2d 100644 --- a/res/field/scripts/script_1085.s +++ b/res/field/scripts/script_1085.s @@ -32,22 +32,22 @@ _0048: GoTo _0067 _0067: - ScrCmd_028 0x8007, 50 - ScrCmd_026 0x8007, 0x8006 + SetVar 0x8007, 50 + AddVar 0x8007, 0x8006 ScrCmd_093 0x8007, 0x800C CompareVarToValue 0x800C, 99 GoToIf 1, _00EB ScrCmd_0D0 0, 0x8004 ScrCmd_02C 1 - ScrCmd_028 0x8000, 10 + SetVar 0x8000, 10 ScrCmd_093 0x8007, 0x800C CompareVarToValue 0x800C, 89 GoToIf 3, _00B3 - ScrCmd_027 0x800C, 89 - ScrCmd_027 0x8000, 0x800C + SubVar 0x800C, 89 + SubVar 0x8000, 0x800C _00B3: ScrCmd_094 0x8007, 0x8000 - ScrCmd_029 0x4000, 0x8006 + SetVar 0x4000, 0x8006 SetFlag 1 CompareVarToValue 0x8000, 1 GoToIf 1, _00DB @@ -71,7 +71,7 @@ _00EB: End _00F6: - ScrCmd_028 0x4000, 0xFFFF + SetVar 0x4000, -1 Return _00FE: @@ -88,8 +88,8 @@ _0109: CheckFlag 0x117 GoToIf 1, _0144 ScrCmd_02C 5 - ScrCmd_028 0x8004, 0x1B2 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1B2 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 0x117 Call _014F @@ -109,19 +109,19 @@ _0144: _014F: ScrCmd_02C 6 ScrCmd_1B7 0x8007, 6 - ScrCmd_026 0x8007, 1 + AddVar 0x8007, 1 ScrCmd_094 0x8007, 1 ScrCmd_1B7 0x8007, 6 - ScrCmd_026 0x8007, 7 + AddVar 0x8007, 7 ScrCmd_094 0x8007, 1 ScrCmd_1B7 0x8007, 6 - ScrCmd_026 0x8007, 7 + AddVar 0x8007, 7 ScrCmd_094 0x8007, 1 ScrCmd_1B7 0x8007, 4 - ScrCmd_026 0x8007, 25 + AddVar 0x8007, 25 ScrCmd_094 0x8007, 1 ScrCmd_1B7 0x8007, 7 - ScrCmd_026 0x8007, 43 + AddVar 0x8007, 43 ScrCmd_094 0x8007, 1 Return diff --git a/res/field/scripts/script_1086.s b/res/field/scripts/script_1086.s index 1e938e4195..2bd0d9e6eb 100644 --- a/res/field/scripts/script_1086.s +++ b/res/field/scripts/script_1086.s @@ -58,31 +58,31 @@ _006E: End _00BC: - ScrCmd_05E 2, _0198 - ScrCmd_05E 0xFF, _01E0 - ScrCmd_05F + ApplyMovement 2, _0198 + ApplyMovement 0xFF, _01E0 + WaitMovement Call _013C - ScrCmd_05E 3, _01B4 - ScrCmd_05E 0xFF, _0204 - ScrCmd_05F + ApplyMovement 3, _01B4 + ApplyMovement 0xFF, _0204 + WaitMovement GoTo _0166 _00EC: - ScrCmd_05E 2, _0198 - ScrCmd_05E 0xFF, _01F0 - ScrCmd_05F + ApplyMovement 2, _0198 + ApplyMovement 0xFF, _01F0 + WaitMovement Call _013C - ScrCmd_05E 3, _01C0 - ScrCmd_05F + ApplyMovement 3, _01C0 + WaitMovement GoTo _0166 _0114: - ScrCmd_05E 2, _01A4 - ScrCmd_05E 0xFF, _01FC - ScrCmd_05F + ApplyMovement 2, _01A4 + ApplyMovement 0xFF, _01FC + WaitMovement Call _013C - ScrCmd_05E 3, _01D0 - ScrCmd_05F + ApplyMovement 3, _01D0 + WaitMovement GoTo _0166 _013C: @@ -201,15 +201,15 @@ _0204: _022C: ScrCmd_060 - ScrCmd_05E 0xFF, _0264 - ScrCmd_05E 3, _025C - ScrCmd_05F + ApplyMovement 0xFF, _0264 + ApplyMovement 3, _025C + WaitMovement Call _024A ScrCmd_061 End _024A: - ScrCmd_028 0x40F1, 1 + SetVar 0x40F1, 1 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -244,17 +244,17 @@ _0289: _0294: ScrCmd_060 - ScrCmd_05E 0xFF, _02E0 - ScrCmd_05E 4, _02E8 - ScrCmd_05F + ApplyMovement 0xFF, _02E0 + ApplyMovement 4, _02E8 + WaitMovement ScrCmd_02C 9 - ScrCmd_05E 4, _02F4 - ScrCmd_05F + ApplyMovement 4, _02F4 + WaitMovement ScrCmd_02C 10 ScrCmd_034 - ScrCmd_05E 4, _02FC - ScrCmd_05F - ScrCmd_028 0x4074, 2 + ApplyMovement 4, _02FC + WaitMovement + SetVar 0x4074, 2 SetFlag 0x299 ScrCmd_003 12, 0x800C ScrCmd_02C 11 diff --git a/res/field/scripts/script_1088.s b/res/field/scripts/script_1088.s index f24e3f32ed..37bb0ec4e8 100644 --- a/res/field/scripts/script_1088.s +++ b/res/field/scripts/script_1088.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End @@ -50,8 +50,8 @@ _0044: _0084: ScrCmd_02C 3 - ScrCmd_028 0x8004, 3 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 3 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _00B6 diff --git a/res/field/scripts/script_1092.s b/res/field/scripts/script_1092.s index dc2cda7447..f42aa8e3b0 100644 --- a/res/field/scripts/script_1092.s +++ b/res/field/scripts/script_1092.s @@ -57,8 +57,8 @@ _0093: CheckFlag 0x134 GoToIf 1, _0153 ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x129 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x129 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0174 @@ -71,8 +71,8 @@ _00D3: CheckFlag 0x135 GoToIf 1, _015E ScrCmd_02C 2 - ScrCmd_028 0x8004, 240 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 240 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0174 @@ -85,8 +85,8 @@ _0113: CheckFlag 0x136 GoToIf 1, _0169 ScrCmd_02C 2 - ScrCmd_028 0x8004, 0x10B - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x10B + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0174 diff --git a/res/field/scripts/script_1094.s b/res/field/scripts/script_1094.s index 97e7efe9d5..25b7002df0 100644 --- a/res/field/scripts/script_1094.s +++ b/res/field/scripts/script_1094.s @@ -14,7 +14,7 @@ _000A: CompareVarToValue 0x800C, 1 GoToIf 1, _003A ScrCmd_02C 0 - ScrCmd_028 0x8004, 11 + SetVar 0x8004, 11 ScrCmd_014 0x7D9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1095.s b/res/field/scripts/script_1095.s index 1672e7d9fa..cf366c541c 100644 --- a/res/field/scripts/script_1095.s +++ b/res/field/scripts/script_1095.s @@ -43,9 +43,9 @@ _0040: ScrCmd_02C 1 ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0, _04B8 - ScrCmd_05E 0xFF, _0424 - ScrCmd_05F + ApplyMovement 0, _04B8 + ApplyMovement 0xFF, _0424 + WaitMovement ScrCmd_02C 3 ScrCmd_034 SetFlag 0x1AC @@ -70,17 +70,17 @@ _0040: End _0110: - ScrCmd_05E 0, _0488 - ScrCmd_05F - ScrCmd_05E 0xFF, _03E4 - ScrCmd_05F + ApplyMovement 0, _0488 + WaitMovement + ApplyMovement 0xFF, _03E4 + WaitMovement Return _0126: - ScrCmd_05E 0, _04A0 - ScrCmd_05F - ScrCmd_05E 0xFF, _03EC - ScrCmd_05F + ApplyMovement 0, _04A0 + WaitMovement + ApplyMovement 0xFF, _03EC + WaitMovement Return _013C: @@ -95,17 +95,17 @@ _013C: End _0165: - ScrCmd_05E 0, _04C0 - ScrCmd_05E 0xFF, _03F4 - ScrCmd_05E 1, _03CC - ScrCmd_05F + ApplyMovement 0, _04C0 + ApplyMovement 0xFF, _03F4 + ApplyMovement 1, _03CC + WaitMovement Return _0181: - ScrCmd_05E 0, _04CC - ScrCmd_05E 0xFF, _040C - ScrCmd_05E 1, _03D8 - ScrCmd_05F + ApplyMovement 0, _04CC + ApplyMovement 0xFF, _040C + ApplyMovement 1, _03D8 + WaitMovement Return _019D: @@ -121,7 +121,7 @@ _019D: _01C3: ClearFlag 0x1BD - ScrCmd_028 0x4074, 1 + SetVar 0x4074, 1 ScrCmd_02C 11 ScrCmd_034 ScrCmd_003 15, 0x800C @@ -140,8 +140,8 @@ _01C3: CompareVarToValue 0x8004, 11 CallIf 1, _0343 ScrCmd_02C 13 - ScrCmd_028 0x8004, 0x1A6 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x1A6 + SetVar 0x8005, 1 ScrCmd_014 0x7FC SetFlag 0x1AC ClearFlag 0x1C3 @@ -159,33 +159,33 @@ _01C3: Return _0285: - ScrCmd_05E 1, _039C - ScrCmd_05F + ApplyMovement 1, _039C + WaitMovement Return _0291: - ScrCmd_05E 1, _03B4 - ScrCmd_05F + ApplyMovement 1, _03B4 + WaitMovement Return _029D: - ScrCmd_05E 0xFF, _042C - ScrCmd_05E 0, _04D8 - ScrCmd_05F + ApplyMovement 0xFF, _042C + ApplyMovement 0, _04D8 + WaitMovement Return _02B1: CompareVarToValue 0x8005, 4 GoToIf 1, _02D2 - ScrCmd_05E 0xFF, _0434 - ScrCmd_05E 0, _04D8 - ScrCmd_05F + ApplyMovement 0xFF, _0434 + ApplyMovement 0, _04D8 + WaitMovement Return _02D2: - ScrCmd_05E 0xFF, _043C - ScrCmd_05E 0, _04D8 - ScrCmd_05F + ApplyMovement 0xFF, _043C + ApplyMovement 0, _04D8 + WaitMovement Return .byte 94 @@ -212,15 +212,15 @@ _02D2: _02FA: CompareVarToValue 0x8005, 4 GoToIf 1, _031B - ScrCmd_05E 0xFF, _0454 - ScrCmd_05E 0, _04E0 - ScrCmd_05F + ApplyMovement 0xFF, _0454 + ApplyMovement 0, _04E0 + WaitMovement Return _031B: - ScrCmd_05E 0xFF, _045C - ScrCmd_05E 0, _04E0 - ScrCmd_05F + ApplyMovement 0xFF, _045C + ApplyMovement 0, _04E0 + WaitMovement Return .byte 94 @@ -245,27 +245,27 @@ _031B: .byte 0 _0343: - ScrCmd_05E 0xFF, _0474 - ScrCmd_05E 0, _04E8 - ScrCmd_05F + ApplyMovement 0xFF, _0474 + ApplyMovement 0, _04E8 + WaitMovement Return _0357: - ScrCmd_05E 0xFF, _047C - ScrCmd_05E 0, _04F0 - ScrCmd_05F + ApplyMovement 0xFF, _047C + ApplyMovement 0, _04F0 + WaitMovement Return _036B: - ScrCmd_05E 0xFF, _047C - ScrCmd_05E 0, _0508 - ScrCmd_05F + ApplyMovement 0xFF, _047C + ApplyMovement 0, _0508 + WaitMovement Return _037F: - ScrCmd_05E 0xFF, _047C - ScrCmd_05E 0, _0520 - ScrCmd_05F + ApplyMovement 0xFF, _047C + ApplyMovement 0, _0520 + WaitMovement Return _0393: @@ -534,9 +534,9 @@ _0596: CompareVarToValue 0x800C, 1 GoToIf 1, _0753 ScrCmd_034 - ScrCmd_05E 2, _07F0 - ScrCmd_05E 0xFF, _0858 - ScrCmd_05F + ApplyMovement 2, _07F0 + ApplyMovement 0xFF, _0858 + WaitMovement ScrCmd_003 15, 0x800C ScrCmd_02C 18 ScrCmd_069 0x8004, 0x8005 @@ -553,9 +553,9 @@ _0596: GoToIf 1, _0753 ScrCmd_02C 19 ScrCmd_034 - ScrCmd_05E 0xFF, _0864 - ScrCmd_05E 2, _07F8 - ScrCmd_05F + ApplyMovement 0xFF, _0864 + ApplyMovement 2, _07F8 + WaitMovement ScrCmd_02C 20 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 @@ -572,49 +572,49 @@ _0596: End _06CF: - ScrCmd_05E 2, _07B0 - ScrCmd_05F - ScrCmd_05E 0xFF, _0848 - ScrCmd_05F + ApplyMovement 2, _07B0 + WaitMovement + ApplyMovement 0xFF, _0848 + WaitMovement Return _06E5: - ScrCmd_05E 2, _07C8 - ScrCmd_05F - ScrCmd_05E 0xFF, _0850 - ScrCmd_05F + ApplyMovement 2, _07C8 + WaitMovement + ApplyMovement 0xFF, _0850 + WaitMovement Return _06FB: - ScrCmd_05E 0xFF, _0848 - ScrCmd_05F + ApplyMovement 0xFF, _0848 + WaitMovement Return _0707: - ScrCmd_05E 0xFF, _0850 - ScrCmd_05F + ApplyMovement 0xFF, _0850 + WaitMovement Return _0713: - ScrCmd_05E 2, _07E0 - ScrCmd_05F + ApplyMovement 2, _07E0 + WaitMovement Return _071F: - ScrCmd_05E 2, _07E8 - ScrCmd_05F + ApplyMovement 2, _07E8 + WaitMovement Return _072B: - ScrCmd_05E 2, _0800 - ScrCmd_05E 0xFF, _0870 - ScrCmd_05F + ApplyMovement 2, _0800 + ApplyMovement 0xFF, _0870 + WaitMovement Return _073F: - ScrCmd_05E 2, _080C - ScrCmd_05E 0xFF, _087C - ScrCmd_05F + ApplyMovement 2, _080C + ApplyMovement 0xFF, _087C + WaitMovement Return _0753: @@ -634,15 +634,15 @@ _075E: End _0788: - ScrCmd_05E 2, _0818 - ScrCmd_05E 0xFF, _0888 - ScrCmd_05F + ApplyMovement 2, _0818 + ApplyMovement 0xFF, _0888 + WaitMovement Return _079C: - ScrCmd_05E 2, _0830 - ScrCmd_05E 0xFF, _0888 - ScrCmd_05F + ApplyMovement 2, _0830 + ApplyMovement 0xFF, _0888 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_1096.s b/res/field/scripts/script_1096.s index b2556895bc..36cb991777 100644 --- a/res/field/scripts/script_1096.s +++ b/res/field/scripts/script_1096.s @@ -97,13 +97,13 @@ _00D5: ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 - ScrCmd_05E 8, _011C - ScrCmd_05F + ApplyMovement 8, _011C + WaitMovement ScrCmd_168 20, 10, 12, 18, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 8, _0124 - ScrCmd_05F + ApplyMovement 8, _0124 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 @@ -142,7 +142,7 @@ _0141: GoToIf 1, _01BE ScrCmd_0CE 0 ScrCmd_0CD 1 - ScrCmd_029 0x8008, 0x40C2 + SetVar 0x8008, 0x40C2 CompareVarToValue 0x8008, 0 GoToIf 1, _0195 CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_1098.s b/res/field/scripts/script_1098.s index c251ee30fe..aed3cce7be 100644 --- a/res/field/scripts/script_1098.s +++ b/res/field/scripts/script_1098.s @@ -9,7 +9,7 @@ .short 0xFD13 _0012: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_1101.s b/res/field/scripts/script_1101.s index 441793a3b1..adf9c7cd2f 100644 --- a/res/field/scripts/script_1101.s +++ b/res/field/scripts/script_1101.s @@ -92,10 +92,10 @@ _0133: Return _0140: - ScrCmd_029 0x4021, 0x4065 - ScrCmd_029 0x4022, 0x4066 - ScrCmd_029 0x4023, 0x4067 - ScrCmd_029 0x4024, 0x4068 + SetVar 0x4021, 0x4065 + SetVar 0x4022, 0x4066 + SetVar 0x4023, 0x4067 + SetVar 0x4024, 0x4068 Return _015A: @@ -139,21 +139,21 @@ _0183: End _01D5: - ScrCmd_05E 0xFF, _0214 - ScrCmd_05E 1, _0240 - ScrCmd_05F + ApplyMovement 0xFF, _0214 + ApplyMovement 1, _0240 + WaitMovement Return _01E9: - ScrCmd_05E 0xFF, _0220 - ScrCmd_05E 1, _0254 - ScrCmd_05F + ApplyMovement 0xFF, _0220 + ApplyMovement 1, _0254 + WaitMovement Return _01FD: - ScrCmd_05E 0xFF, _0234 - ScrCmd_05E 1, _0264 - ScrCmd_05F + ApplyMovement 0xFF, _0234 + ApplyMovement 1, _0264 + WaitMovement Return .balign 4, 0 @@ -201,11 +201,11 @@ _0264: _0278: ScrCmd_060 - ScrCmd_028 0x40C1, 1 - ScrCmd_05E 0, _02A0 - ScrCmd_05F - ScrCmd_05E 0xFF, _02A8 - ScrCmd_05F + SetVar 0x40C1, 1 + ApplyMovement 0, _02A0 + WaitMovement + ApplyMovement 0xFF, _02A8 + WaitMovement ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -228,7 +228,7 @@ _02B4: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - ScrCmd_029 0x4001, 0x4021 + SetVar 0x4001, 0x4021 CheckFlag 5 GoToIf 1, _034D Call _118A @@ -312,7 +312,7 @@ _03CA: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - ScrCmd_029 0x4001, 0x4022 + SetVar 0x4001, 0x4022 CheckFlag 6 GoToIf 1, _034D Call _118A @@ -344,7 +344,7 @@ _0457: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - ScrCmd_029 0x4001, 0x4023 + SetVar 0x4001, 0x4023 CheckFlag 7 GoToIf 1, _034D Call _118A @@ -376,7 +376,7 @@ _04E4: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - ScrCmd_029 0x4001, 0x4024 + SetVar 0x4001, 0x4024 CheckFlag 8 GoToIf 1, _034D Call _118A @@ -404,7 +404,7 @@ _055F: End _0571: - ScrCmd_028 0x8001, 0 + SetVar 0x8001, 0 CompareVarToValue 0x4001, 126 GoToIf 1, _0593 CompareVarToValue 0x4001, 132 @@ -431,7 +431,7 @@ _0593: Return _05FD: - ScrCmd_026 0x8001, 1 + AddVar 0x8001, 1 Return _0605: @@ -464,55 +464,55 @@ _0605: Return _06B0: - ScrCmd_028 0x4005, 0x35A + SetVar 0x4005, 0x35A Return _06B8: - ScrCmd_028 0x4005, 0x359 + SetVar 0x4005, 0x359 Return _06C0: - ScrCmd_028 0x4005, 0x35B + SetVar 0x4005, 0x35B Return _06C8: - ScrCmd_028 0x4005, 0x356 + SetVar 0x4005, 0x356 Return _06D0: - ScrCmd_028 0x4005, 0x35C + SetVar 0x4005, 0x35C Return _06D8: - ScrCmd_028 0x4005, 0x355 + SetVar 0x4005, 0x355 Return _06E0: - ScrCmd_028 0x4005, 0x358 + SetVar 0x4005, 0x358 Return _06E8: - ScrCmd_028 0x4005, 0x357 + SetVar 0x4005, 0x357 Return _06F0: - ScrCmd_028 0x4005, 0x361 + SetVar 0x4005, 0x361 Return _06F8: - ScrCmd_028 0x4005, 0x35D + SetVar 0x4005, 0x35D Return _0700: - ScrCmd_028 0x4005, 0x35F + SetVar 0x4005, 0x35F Return _0708: - ScrCmd_028 0x4005, 0x35E + SetVar 0x4005, 0x35E Return _0710: - ScrCmd_028 0x4005, 0x360 + SetVar 0x4005, 0x360 Return _0718: @@ -1417,7 +1417,7 @@ _1184: Return _118A: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 CompareVarToValue 0x4001, 126 GoToIf 1, _123B CompareVarToValue 0x4001, 127 @@ -1512,5 +1512,5 @@ _12D7: Return _12E4: - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return diff --git a/res/field/scripts/script_1102.s b/res/field/scripts/script_1102.s index 5153412a88..d018867ce0 100644 --- a/res/field/scripts/script_1102.s +++ b/res/field/scripts/script_1102.s @@ -12,8 +12,8 @@ _0006: CheckFlag 203 GoToIf 1, _004B ScrCmd_02C 0 - ScrCmd_028 0x8004, 0x171 - ScrCmd_028 0x8005, 1 + SetVar 0x8004, 0x171 + SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0056 diff --git a/res/field/scripts/script_1103.s b/res/field/scripts/script_1103.s index f13f5e9817..1f8fdc8c94 100644 --- a/res/field/scripts/script_1103.s +++ b/res/field/scripts/script_1103.s @@ -50,14 +50,14 @@ _004C: ScrCmd_0D6 0, 0x8000 ScrCmd_02C 5 ScrCmd_2E6 0x8000, 1, 0x800C - ScrCmd_029 0x8003, 0x800C + SetVar 0x8003, 0x800C CompareVarToValue 0x8003, 0xFFFE GoToIf 1, _0232 ScrCmd_2EA 0x8003, 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0248 ScrCmd_1C8 0x800C, 0x8000 - ScrCmd_029 0x8002, 0x800C + SetVar 0x8002, 0x800C CompareVarToValue 0x800C, 4 GoToIf 1, _00FD GoTo _01F2 diff --git a/res/field/scripts/script_1104.s b/res/field/scripts/script_1104.s index 542af47d68..81badb8abd 100644 --- a/res/field/scripts/script_1104.s +++ b/res/field/scripts/script_1104.s @@ -167,20 +167,20 @@ _0184: CallIf 1, _02A8 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 13, _0388 - ScrCmd_05F + ApplyMovement 13, _0388 + WaitMovement ScrCmd_168 25, 14, 22, 21, 77 ScrCmd_16B 77 ScrCmd_169 77 - ScrCmd_05E 13, _0390 - ScrCmd_05E 0xFF, _03C0 - ScrCmd_05F + ApplyMovement 13, _0390 + ApplyMovement 0xFF, _03C0 + WaitMovement ScrCmd_16C 77 ScrCmd_169 77 ScrCmd_16A 77 ScrCmd_065 13 - ScrCmd_028 0x40C8, 1 - ScrCmd_028 0x404E, 0xFF + SetVar 0x40C8, 1 + SetVar 0x404E, 0xFF ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x1D0, 0, 10, 6, 2 @@ -189,34 +189,34 @@ _0184: End _0266: - ScrCmd_05E 13, _0328 - ScrCmd_05F + ApplyMovement 13, _0328 + WaitMovement Return _0272: Return _0274: - ScrCmd_05E 13, _0334 - ScrCmd_05F + ApplyMovement 13, _0334 + WaitMovement Return _0280: - ScrCmd_05E 13, _0358 - ScrCmd_05E 0xFF, _039C - ScrCmd_05F + ApplyMovement 13, _0358 + ApplyMovement 0xFF, _039C + WaitMovement Return _0294: - ScrCmd_05E 13, _0368 - ScrCmd_05E 0xFF, _03A8 - ScrCmd_05F + ApplyMovement 13, _0368 + ApplyMovement 0xFF, _03A8 + WaitMovement Return _02A8: - ScrCmd_05E 13, _0378 - ScrCmd_05E 0xFF, _03B4 - ScrCmd_05F + ApplyMovement 13, _0378 + ApplyMovement 0xFF, _03B4 + WaitMovement Return _02BC: @@ -233,20 +233,20 @@ _02BC: End _02F2: - ScrCmd_05E 13, _0340 - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 13, _0340 + ApplyMovement 0xFF, _03CC + WaitMovement Return _0306: - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 0xFF, _03CC + WaitMovement Return _0312: - ScrCmd_05E 13, _034C - ScrCmd_05E 0xFF, _03CC - ScrCmd_05F + ApplyMovement 13, _034C + ApplyMovement 0xFF, _03CC + WaitMovement Return .balign 4, 0 @@ -345,7 +345,7 @@ _03D4: ScrCmd_02C 11 ScrCmd_034 SetFlag 0x2AA - ScrCmd_028 0x404E, 2 + SetVar 0x404E, 2 SetFlag 0x9AB ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -376,7 +376,7 @@ _043C: ScrCmd_02C 14 ScrCmd_034 SetFlag 0x2AD - ScrCmd_028 0x404E, 4 + SetVar 0x404E, 4 SetFlag 0x9AB ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -401,7 +401,7 @@ _049C: ScrCmd_02C 17 ScrCmd_034 SetFlag 0x2AF - ScrCmd_028 0x404E, 5 + SetVar 0x404E, 5 SetFlag 0x9AB ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -426,7 +426,7 @@ _04FC: ScrCmd_02C 20 ScrCmd_034 SetFlag 0x2B2 - ScrCmd_028 0x404E, 7 + SetVar 0x404E, 7 SetFlag 0x9AB ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -451,7 +451,7 @@ _055C: ScrCmd_02C 23 ScrCmd_034 SetFlag 0x2B5 - ScrCmd_028 0x404E, 9 + SetVar 0x404E, 9 SetFlag 0x9AB ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD diff --git a/res/field/scripts/script_1106.s b/res/field/scripts/script_1106.s index a99b387960..c1e617d069 100644 --- a/res/field/scripts/script_1106.s +++ b/res/field/scripts/script_1106.s @@ -8,7 +8,7 @@ .short 0xFD13 _000E: - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_014 0x7D2 End diff --git a/res/field/scripts/script_1109.s b/res/field/scripts/script_1109.s index ec51f9539f..1facfe2d01 100644 --- a/res/field/scripts/script_1109.s +++ b/res/field/scripts/script_1109.s @@ -28,13 +28,13 @@ _003F: ScrCmd_22F 0x8004 CompareVarToValue 0x8004, 10 GoToIf 0, _0078 - ScrCmd_028 0x40A7, 1 + SetVar 0x40A7, 1 SetFlag 250 ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_034 - ScrCmd_05E 0, _00AC - ScrCmd_05F + ApplyMovement 0, _00AC + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_1110.s b/res/field/scripts/script_1110.s index 9acf0d32ba..76a59ef1ec 100644 --- a/res/field/scripts/script_1110.s +++ b/res/field/scripts/script_1110.s @@ -110,9 +110,9 @@ _0135: _0146: ScrCmd_04B 0x662 SetFlag 0xAA5 - ScrCmd_028 0x400A, 1 - ScrCmd_05E 1, _02DC - ScrCmd_05F + SetVar 0x400A, 1 + ApplyMovement 1, _02DC + WaitMovement Return _0160: @@ -126,34 +126,34 @@ _0160: GoTo _01DB _0193: - ScrCmd_05E 0xFF, _026C - ScrCmd_05E 2, _0210 - ScrCmd_05F + ApplyMovement 0xFF, _026C + ApplyMovement 2, _0210 + WaitMovement GoTo _01F3 _01AB: - ScrCmd_05E 0xFF, _0280 - ScrCmd_05E 2, _0224 - ScrCmd_05F + ApplyMovement 0xFF, _0280 + ApplyMovement 2, _0224 + WaitMovement GoTo _01F3 _01C3: - ScrCmd_05E 0xFF, _0294 - ScrCmd_05E 2, _023C - ScrCmd_05F + ApplyMovement 0xFF, _0294 + ApplyMovement 2, _023C + WaitMovement GoTo _01F3 _01DB: - ScrCmd_05E 0xFF, _02AC - ScrCmd_05E 2, _0250 - ScrCmd_05F + ApplyMovement 0xFF, _02AC + ApplyMovement 2, _0250 + WaitMovement GoTo _01F3 _01F3: - ScrCmd_05E 0, _02C4 - ScrCmd_05E 1, _02CC - ScrCmd_05E 3, _02D4 - ScrCmd_05F + ApplyMovement 0, _02C4 + ApplyMovement 1, _02CC + ApplyMovement 3, _02D4 + WaitMovement Return .balign 4, 0 diff --git a/res/field/scripts/script_1111.s b/res/field/scripts/script_1111.s index 86b76424c7..f02d6e0689 100644 --- a/res/field/scripts/script_1111.s +++ b/res/field/scripts/script_1111.s @@ -10,7 +10,7 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_11C 0x40CE - ScrCmd_029 0x8008, 0x40CE + SetVar 0x8008, 0x40CE CompareVarToValue 0x8008, 0 GoToIf 1, _0034 CompareVarToValue 0x8008, 1 @@ -33,7 +33,7 @@ _0048: ScrCmd_042 116, 1 ScrCmd_042 124, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _008F CompareVarToValue 0x8008, 1 @@ -46,9 +46,9 @@ _008F: ScrCmd_11B 0x1CE, 0, 18, 2, 1 CompareVarToValue 0x40CE, 0 GoToIf 1, _0164 - ScrCmd_028 0x8004, 0 + SetVar 0x8004, 0 Call _0105 - ScrCmd_028 0x40CE, 0 + SetVar 0x40CE, 0 GoTo _0147 _00CA: @@ -57,20 +57,20 @@ _00CA: ScrCmd_11B 0x1CD, 1, 18, 2, 1 CompareVarToValue 0x40CE, 1 GoToIf 1, _0164 - ScrCmd_028 0x8004, 1 + SetVar 0x8004, 1 Call _0105 - ScrCmd_028 0x40CE, 1 + SetVar 0x40CE, 1 GoTo _0147 _0105: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 CompareVarToValue 0x8004, 1 CallIf 1, _013D CompareVarToValue 0x8004, 0 CallIf 1, _0142 ScrCmd_034 - ScrCmd_05E 0, _017C - ScrCmd_05F + ApplyMovement 0, _017C + WaitMovement ScrCmd_04B 0x5DC ScrCmd_23C 0x8004, 4 Return @@ -91,14 +91,14 @@ _0147: End _0152: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_034 ScrCmd_061 End _0164: - ScrCmd_028 0x40CE, 0xFFFF + SetVar 0x40CE, -1 ScrCmd_003 1, 0x800C ScrCmd_02C 3 ScrCmd_031 diff --git a/res/field/scripts/script_1112.s b/res/field/scripts/script_1112.s index 3df6ffc56a..e4b1643325 100644 --- a/res/field/scripts/script_1112.s +++ b/res/field/scripts/script_1112.s @@ -73,7 +73,7 @@ _00B2: SetFlag 0x2B9 CompareVarToValue 0x404E, 0xFF GoToIf 1, _01FF - ScrCmd_029 0x400F, 0x404E + SetVar 0x400F, 0x404E CompareVarToValue 0x404E, 0 CallIf 1, _0201 CompareVarToValue 0x404E, 1 @@ -110,11 +110,11 @@ _01ED: End _01EF: - ScrCmd_028 0x4021, 97 + SetVar 0x4021, 97 Return _01F7: - ScrCmd_028 0x4021, 0 + SetVar 0x4021, 0 Return _01FF: @@ -738,23 +738,23 @@ _08E2: Return _08E9: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 89 Return _0900: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 90 Return _0917: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 91 Return @@ -833,23 +833,23 @@ _0A04: Return _0A0B: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 89 Return _0A22: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 90 Return _0A39: - ScrCmd_05E 11, _0930 - ScrCmd_05E 13, _093C - ScrCmd_05F + ApplyMovement 11, _0930 + ApplyMovement 13, _093C + WaitMovement ScrCmd_02C 91 Return @@ -857,9 +857,9 @@ _0A50: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_0CD 1 - ScrCmd_05E 10, _0AE0 - ScrCmd_05E 7, _0AD8 - ScrCmd_05F + ApplyMovement 10, _0AE0 + ApplyMovement 7, _0AD8 + WaitMovement CompareVarToValue 0x405A, 0 CallIf 1, _0AB4 CompareVarToValue 0x405A, 1 @@ -921,11 +921,11 @@ _0AF4: ScrCmd_189 6, 0 ScrCmd_064 6 ScrCmd_04B 0x605 - ScrCmd_05E 0xFF, _0B3C - ScrCmd_05E 6, _0B4C - ScrCmd_05F + ApplyMovement 0xFF, _0B3C + ApplyMovement 6, _0B4C + WaitMovement SetFlag 0x9AC - ScrCmd_028 0x400F, 0 + SetVar 0x400F, 0 ScrCmd_061 End @@ -952,11 +952,11 @@ _0B5C: ScrCmd_189 9, 0 ScrCmd_064 9 ScrCmd_04B 0x605 - ScrCmd_05E 0xFF, _0BAC - ScrCmd_05E 9, _0BA4 - ScrCmd_05F + ApplyMovement 0xFF, _0BAC + ApplyMovement 9, _0BA4 + WaitMovement SetFlag 0x9AC - ScrCmd_028 0x400F, 0 + SetVar 0x400F, 0 ScrCmd_061 End @@ -981,11 +981,11 @@ _0BBC: ScrCmd_189 10, 0 ScrCmd_064 10 ScrCmd_04B 0x605 - ScrCmd_05E 0xFF, _0C14 - ScrCmd_05E 10, _0C04 - ScrCmd_05F + ApplyMovement 0xFF, _0C14 + ApplyMovement 10, _0C04 + WaitMovement SetFlag 0x9AC - ScrCmd_028 0x400F, 0 + SetVar 0x400F, 0 ScrCmd_061 End @@ -1012,11 +1012,11 @@ _0C24: ScrCmd_189 12, 0 ScrCmd_064 12 ScrCmd_04B 0x605 - ScrCmd_05E 0xFF, _0C78 - ScrCmd_05E 12, _0C6C - ScrCmd_05F + ApplyMovement 0xFF, _0C78 + ApplyMovement 12, _0C6C + WaitMovement SetFlag 0x9AC - ScrCmd_028 0x400F, 0 + SetVar 0x400F, 0 ScrCmd_061 End @@ -1128,13 +1128,13 @@ _0D63: _0D6E: ScrCmd_2FA 0x8004 ScrCmd_2F8 - ScrCmd_028 0x8007, 0 + SetVar 0x8007, 0 ScrCmd_003 1, 0x800C GoTo _0D88 End _0D88: - ScrCmd_026 0x8007, 1 + AddVar 0x8007, 1 ScrCmd_003 1, 0x800C ScrCmd_1F9 0x8007 ScrCmd_2FC 0x800C @@ -1223,7 +1223,7 @@ _0E5D: _0E65: ScrCmd_060 - ScrCmd_028 0x40A1, 1 + SetVar 0x40A1, 1 ScrCmd_072 21, 1 ScrCmd_02C 0 ScrCmd_045 1, 1, 0, 1, 0x8002 @@ -1450,15 +1450,15 @@ _1263: CompareVarToValue 0x404E, 0 CallIf 5, _12A3 SetFlag 0x9AB - ScrCmd_028 0x404E, 0xFF - ScrCmd_05E 0xFF, _1454 - ScrCmd_05F + SetVar 0x404E, 0xFF + ApplyMovement 0xFF, _1454 + WaitMovement ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 9 ScrCmd_034 - ScrCmd_05E 1, _1468 - ScrCmd_05F + ApplyMovement 1, _1468 + WaitMovement ScrCmd_049 0x603 ScrCmd_065 1 Return @@ -1468,15 +1468,15 @@ _12A3: ScrCmd_064 1 ScrCmd_049 0x605 ScrCmd_04B 0x605 - ScrCmd_05E 1, _145C - ScrCmd_05F + ApplyMovement 1, _145C + WaitMovement Return _12BF: CompareVarToValue 0x404E, 1 CallIf 5, _1316 SetFlag 0x9AB - ScrCmd_028 0x404E, 1 + SetVar 0x404E, 1 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_14D 0x800C @@ -1505,8 +1505,8 @@ _1316: ScrCmd_064 0 ScrCmd_049 0x605 ScrCmd_04B 0x605 - ScrCmd_05E 0, _145C - ScrCmd_05F + ApplyMovement 0, _145C + WaitMovement Return _1332: @@ -1516,7 +1516,7 @@ _1332: CallIf 1, _1367 SetFlag 0x9AB SetFlag 0x2AA - ScrCmd_028 0x404E, 2 + SetVar 0x404E, 2 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 12 @@ -1533,8 +1533,8 @@ _1374: ScrCmd_064 2 ScrCmd_049 0x605 ScrCmd_04B 0x605 - ScrCmd_05E 2, _145C - ScrCmd_05F + ApplyMovement 2, _145C + WaitMovement Return _1390: @@ -1544,7 +1544,7 @@ _1390: CallIf 1, _13C5 SetFlag 0x9AB SetFlag 0x2B2 - ScrCmd_028 0x404E, 5 + SetVar 0x404E, 5 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 13 @@ -1561,8 +1561,8 @@ _13D2: ScrCmd_064 5 ScrCmd_049 0x605 ScrCmd_04B 0x605 - ScrCmd_05E 5, _145C - ScrCmd_05F + ApplyMovement 5, _145C + WaitMovement Return _13EE: @@ -1571,8 +1571,8 @@ _13EE: CompareVarToValue 0x404E, 12 CallIf 1, _1429 SetFlag 0x9AB - ScrCmd_028 0x404E, 12 - ScrCmd_028 0x400F, 0 + SetVar 0x404E, 12 + SetVar 0x400F, 0 SetFlag 0x9AC ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -1590,8 +1590,8 @@ _1436: ScrCmd_064 12 ScrCmd_049 0x605 ScrCmd_04B 0x605 - ScrCmd_05E 12, _145C - ScrCmd_05F + ApplyMovement 12, _145C + WaitMovement Return .balign 4, 0 @@ -1628,9 +1628,9 @@ _1485: ScrCmd_065 15 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - ScrCmd_05E 14, _14FC - ScrCmd_05E 0xFF, _14F0 - ScrCmd_05F + ApplyMovement 14, _14FC + ApplyMovement 0xFF, _14F0 + WaitMovement ScrCmd_02C 4 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -1640,7 +1640,7 @@ _1485: ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD Call _15B0 - ScrCmd_028 0x40A1, 2 + SetVar 0x40A1, 2 Return .balign 4, 0 @@ -1724,12 +1724,12 @@ _15B0: _15F3: ScrCmd_060 - ScrCmd_05E 14, _1614 - ScrCmd_05F + ApplyMovement 14, _1614 + WaitMovement ScrCmd_02C 2 ScrCmd_034 - ScrCmd_05E 0xFF, _161C - ScrCmd_05F + ApplyMovement 0xFF, _161C + WaitMovement ScrCmd_061 End @@ -1767,7 +1767,7 @@ _165C: _1667: Call _0EF6 - ScrCmd_028 0x8003, 1 + SetVar 0x8003, 1 CompareVarToValue 0x8002, 0 CallIf 1, _1EA5 CompareVarToValue 0x8002, 1 @@ -1930,11 +1930,11 @@ _18F8: GoToIf 0, _19DC CheckFlag 0x9AA GoToIf 0, _19DC - ScrCmd_028 0x800C, 1 + SetVar 0x800C, 1 Return _19DC: - ScrCmd_028 0x800C, 0 + SetVar 0x800C, 0 Return _19E4: @@ -2386,7 +2386,7 @@ _1F9C: Return _1FA9: - ScrCmd_028 0x8003, 0 + SetVar 0x8003, 0 Return _1FB1: diff --git a/res/field/scripts/script_1113.s b/res/field/scripts/script_1113.s index 7a482d0159..2845573a23 100644 --- a/res/field/scripts/script_1113.s +++ b/res/field/scripts/script_1113.s @@ -14,8 +14,8 @@ _000E: ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 - ScrCmd_05E 0, _002C - ScrCmd_05F + ApplyMovement 0, _002C + WaitMovement ScrCmd_061 End diff --git a/res/field/scripts/script_1114.s b/res/field/scripts/script_1114.s index 186835d9f0..6608e715d6 100644 --- a/res/field/scripts/script_1114.s +++ b/res/field/scripts/script_1114.s @@ -947,7 +947,7 @@ _0E86: CallIf 1, _0FE7 CompareVarToValue 0x8001, 54 CallIf 1, _0FE7 - ScrCmd_025 0x8004 + CheckTrainerFlag 0x8004 GoToIf 1, _0F40 ScrCmd_0E9 0x800C CompareVarToValue 0x800C, 1 @@ -973,7 +973,7 @@ _0F1D: ScrCmd_0EC 0x800C CompareVarToValue 0x800C, 0 GoToIf 1, _0FC5 - ScrCmd_023 0x8004 + SetTrainerFlag 0x8004 ScrCmd_061 End @@ -994,7 +994,7 @@ _0F5B: End _0F73: - ScrCmd_029 0x8007, 0x800C + SetVar 0x8007, 0x800C ScrCmd_0E9 0x800C CompareVarToValue 0x800C, 1 GoToIf 5, _0FA3 @@ -1009,7 +1009,7 @@ _0FA3: ScrCmd_033 ScrCmd_0E8 0x8000, 0x8001, 0x8002 ScrCmd_0E6 0x8004, 0x8000 - ScrCmd_029 0x8004, 0x8007 + SetVar 0x8004, 0x8007 GoTo _0F1D End @@ -1029,8 +1029,8 @@ _0FCB: End _0FE7: - ScrCmd_05E 0x800D, _104C - ScrCmd_05F + ApplyMovement 0x800D, _104C + WaitMovement ScrCmd_1BD 0x8000 CompareVarToValue 0x8000, 0 CallIf 1, _102B @@ -1076,12 +1076,12 @@ _1054: _1083: ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0EA 0x8004 ScrCmd_0B6 0 Call _10DE ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_033 ScrCmd_0E6 0x8004, 0 ScrCmd_034 @@ -1090,8 +1090,8 @@ _1083: CompareVarToValue 0x800C, 0 GoToIf 1, _0FC5 ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_023 0x8004 + SetVar 0x8004, 0x800C + SetTrainerFlag 0x8004 ScrCmd_061 End @@ -1103,18 +1103,18 @@ _10DE: _10F3: ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0EA 0x8004 ScrCmd_0B6 0 ScrCmd_0B6 1 Call _1178 ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_033 ScrCmd_0E6 0x8004, 3 ScrCmd_034 ScrCmd_0B9 1, 0x800C - ScrCmd_029 0x8005, 0x800C + SetVar 0x8005, 0x800C ScrCmd_033 ScrCmd_0E6 0x8005, 7 ScrCmd_034 @@ -1123,11 +1123,11 @@ _10F3: CompareVarToValue 0x800C, 0 GoToIf 1, _0FC5 ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_023 0x8004 + SetVar 0x8004, 0x800C + SetTrainerFlag 0x8004 ScrCmd_0B9 1, 0x800C - ScrCmd_029 0x8005, 0x800C - ScrCmd_023 0x8005 + SetVar 0x8005, 0x800C + SetTrainerFlag 0x8005 ScrCmd_061 End @@ -1142,22 +1142,22 @@ _1178: _11A0: ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_0EA 0x8004 ScrCmd_0B6 0 Call _123B ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_033 ScrCmd_0E6 0x8004, 0 ScrCmd_034 ScrCmd_0B9 1, 0x800C - ScrCmd_029 0x8005, 0x800C + SetVar 0x8005, 0x800C ScrCmd_0EA 0x8005 ScrCmd_0B6 1 Call _1250 ScrCmd_0B9 1, 0x800C - ScrCmd_029 0x8005, 0x800C + SetVar 0x8005, 0x800C ScrCmd_033 ScrCmd_0E6 0x8005, 0 ScrCmd_034 @@ -1166,11 +1166,11 @@ _11A0: CompareVarToValue 0x800C, 0 GoToIf 1, _0FC5 ScrCmd_0B9 0, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_023 0x8004 + SetVar 0x8004, 0x800C + SetTrainerFlag 0x8004 ScrCmd_0B9 1, 0x800C - ScrCmd_029 0x8005, 0x800C - ScrCmd_023 0x8005 + SetVar 0x8005, 0x800C + SetTrainerFlag 0x8005 ScrCmd_061 End diff --git a/res/field/scripts/script_1115.s b/res/field/scripts/script_1115.s index 49e67f97d8..74244aeedf 100644 --- a/res/field/scripts/script_1115.s +++ b/res/field/scripts/script_1115.s @@ -11,7 +11,7 @@ _0006: ScrCmd_1E5 48 ScrCmd_235 0, 0x800C ScrCmd_1F9 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _005C CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_1116.s b/res/field/scripts/script_1116.s index 396bb462d9..95821382a4 100644 --- a/res/field/scripts/script_1116.s +++ b/res/field/scripts/script_1116.s @@ -24,59 +24,59 @@ .short 0xFD13 _004E: - ScrCmd_028 0x8000, 1 + SetVar 0x8000, 1 GoTo _0159 _005A: - ScrCmd_028 0x8000, 2 + SetVar 0x8000, 2 GoTo _0159 _0066: - ScrCmd_028 0x8000, 3 + SetVar 0x8000, 3 GoTo _0159 _0072: - ScrCmd_028 0x8000, 4 + SetVar 0x8000, 4 GoTo _0159 _007E: - ScrCmd_028 0x8000, 5 + SetVar 0x8000, 5 GoTo _0159 _008A: - ScrCmd_028 0x8000, 6 + SetVar 0x8000, 6 GoTo _0159 _0096: - ScrCmd_028 0x8000, 7 + SetVar 0x8000, 7 GoTo _0159 _00A2: - ScrCmd_028 0x8000, 8 + SetVar 0x8000, 8 GoTo _0159 _00AE: - ScrCmd_028 0x8000, 9 + SetVar 0x8000, 9 GoTo _0159 _00BA: - ScrCmd_028 0x8000, 10 + SetVar 0x8000, 10 GoTo _0159 _00C6: - ScrCmd_028 0x8000, 11 + SetVar 0x8000, 11 GoTo _0159 _00D2: - ScrCmd_028 0x8000, 12 + SetVar 0x8000, 12 GoTo _0159 _00DE: - ScrCmd_028 0x8000, 13 + SetVar 0x8000, 13 GoTo _0159 _00EA: - ScrCmd_028 0x8000, 14 + SetVar 0x8000, 14 GoTo _0159 _00F6: @@ -86,23 +86,23 @@ _00F6: GoToIf 1, _0135 CompareVarToValue 0x4032, 3 GoToIf 1, _0141 - ScrCmd_028 0x8000, 15 + SetVar 0x8000, 15 GoTo _0159 _0129: - ScrCmd_028 0x8000, 16 + SetVar 0x8000, 16 GoTo _0159 _0135: - ScrCmd_028 0x8000, 17 + SetVar 0x8000, 17 GoTo _0159 _0141: - ScrCmd_028 0x8000, 18 + SetVar 0x8000, 18 GoTo _0159 _014D: - ScrCmd_028 0x8000, 19 + SetVar 0x8000, 19 GoTo _0159 _0159: diff --git a/res/field/scripts/script_1117.s b/res/field/scripts/script_1117.s index ca1205ac9c..949cf5fa34 100644 --- a/res/field/scripts/script_1117.s +++ b/res/field/scripts/script_1117.s @@ -41,7 +41,7 @@ _00BE: _00CD: ScrCmd_069 0x4000, 0x4001 - ScrCmd_026 0x4000, 1 + AddVar 0x4000, 1 ScrCmd_187 16, 0x4000, 1, 0x4001, 1 End @@ -52,8 +52,8 @@ _00E7: _00F3: ScrCmd_19E 1, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8004, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0xFFFB GoToIf 1, _0141 CompareVarToValue 0x8008, 0xFFFC @@ -108,8 +108,8 @@ _018F: _019B: ScrCmd_19E 0, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8004, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0xFFFB GoToIf 1, _0201 CompareVarToValue 0x8008, 0xFFFC @@ -154,8 +154,8 @@ _0225: _0231: ScrCmd_19E 2, 0x800C - ScrCmd_029 0x8004, 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8004, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0xFFFC GoToIf 1, _0265 CompareVarToValue 0x8008, 0xFFFF @@ -180,19 +180,19 @@ _027B: End _0289: - ScrCmd_05E 16, _02D4 - ScrCmd_05F + ApplyMovement 16, _02D4 + WaitMovement ScrCmd_152 3 ScrCmd_19F 91 ScrCmd_030 ScrCmd_1A0 - ScrCmd_05E 16, _02E4 - ScrCmd_05F + ApplyMovement 16, _02E4 + WaitMovement ScrCmd_049 0x630 - ScrCmd_05E 16, _02F0 - ScrCmd_05F + ApplyMovement 16, _02F0 + WaitMovement ScrCmd_065 16 - ScrCmd_028 0x40D0, 1 + SetVar 0x40D0, 1 SetFlag 0x992 End diff --git a/res/field/scripts/script_1118.s b/res/field/scripts/script_1118.s index 2bc17d681c..0df06d619b 100644 --- a/res/field/scripts/script_1118.s +++ b/res/field/scripts/script_1118.s @@ -27,7 +27,7 @@ _002A: ScrCmd_060 ScrCmd_068 ScrCmd_140 0x800C - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C CompareVarToValue 0x800C, 5 GoToIf 1, _0497 ScrCmd_13C 0 @@ -43,7 +43,7 @@ _002A: GoToIf 1, _0497 ScrCmd_02C 199 ScrCmd_141 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 3 GoToIf 1, _07BA CompareVarToValue 0x8008, 2 @@ -77,7 +77,7 @@ _00EA: ScrCmd_042 139, 5 ScrCmd_042 23, 99 ScrCmd_2B9 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0182 CompareVarToValue 0x8008, 1 @@ -557,7 +557,7 @@ _07D4: ScrCmd_135 100 ScrCmd_139 11 ScrCmd_145 0x800C - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 1 GoToIf 1, _0853 CompareVarToValue 0x8008, 4 @@ -859,7 +859,7 @@ _0BF3: ScrCmd_042 166, 1 ScrCmd_042 23, 2 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0C72 CompareVarToValue 0x8008, 1 @@ -899,7 +899,7 @@ _0C72: ScrCmd_042 139, 5 ScrCmd_042 12, 6 ScrCmd_043 - ScrCmd_029 0x8008, 0x800C + SetVar 0x8008, 0x800C CompareVarToValue 0x8008, 0 GoToIf 1, _0CFA CompareVarToValue 0x8008, 1 diff --git a/res/field/scripts/script_1122.s b/res/field/scripts/script_1122.s index f701d38516..659e71f280 100644 --- a/res/field/scripts/script_1122.s +++ b/res/field/scripts/script_1122.s @@ -47,7 +47,7 @@ _0060: CompareVarToValue 0x800C, 0xFF GoToIf 1, _00D1 ScrCmd_226 3 - ScrCmd_029 0x8004, 0x800C + SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C CompareVarToVar 0x8005, 0x800C diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c index 51d03dca99..0742b7d4b8 100644 --- a/src/unk_0203F6C4.c +++ b/src/unk_0203F6C4.c @@ -279,14 +279,14 @@ static BOOL ScrCmd_SetFlag(ScriptContext * ctx); static BOOL ScrCmd_ClearFlag(ScriptContext * ctx); static BOOL ScrCmd_CheckFlag(ScriptContext * ctx); static BOOL ScrCmd_021(ScriptContext * param0); -static BOOL ScrCmd_022(ScriptContext * param0); -static BOOL ScrCmd_023(ScriptContext * param0); -static BOOL ScrCmd_024(ScriptContext * param0); -static BOOL ScrCmd_025(ScriptContext * param0); -static BOOL ScrCmd_026(ScriptContext * param0); -static BOOL ScrCmd_027(ScriptContext * param0); -static BOOL ScrCmd_028(ScriptContext * param0); -static BOOL ScrCmd_029(ScriptContext * param0); +static BOOL ScrCmd_SetFlagFromVar(ScriptContext * ctx); +static BOOL ScrCmd_SetTrainerFlag(ScriptContext * ctx); +static BOOL ScrCmd_ClearTrainerFlag(ScriptContext * ctx); +static BOOL ScrCmd_CheckTrainerFlag(ScriptContext * ctx); +static BOOL ScrCmd_AddVar(ScriptContext * ctx); +static BOOL ScrCmd_SubVar(ScriptContext * ctx); +static BOOL ScrCmd_SetVarFromValue(ScriptContext * ctx); +static BOOL ScrCmd_SetVarFromVar(ScriptContext * ctx); static BOOL ScrCmd_02A(ScriptContext * param0); static BOOL ScrCmd_02B(ScriptContext * param0); static BOOL ScrCmd_1FA(ScriptContext * param0); @@ -338,8 +338,8 @@ static BOOL ScrCmd_047(ScriptContext * param0); static BOOL ScrCmd_327(ScriptContext * param0); static BOOL ScrCmd_306(ScriptContext * param0); static BOOL ScrCmd_048(ScriptContext * param0); -static BOOL ScrCmd_05E(ScriptContext * param0); -static BOOL ScrCmd_05F(ScriptContext * param0); +static BOOL ScrCmd_ApplyMovement(ScriptContext * ctx); +static BOOL ScrCmd_WaitMovement(ScriptContext * ctx); static BOOL ScrCmd_060(ScriptContext * param0); static BOOL sub_020410CC(ScriptContext * param0); static BOOL ScrCmd_061(ScriptContext * param0); @@ -806,14 +806,14 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_ClearFlag, ScrCmd_CheckFlag, ScrCmd_021, - ScrCmd_022, - ScrCmd_023, - ScrCmd_024, - ScrCmd_025, - ScrCmd_026, - ScrCmd_027, - ScrCmd_028, - ScrCmd_029, + ScrCmd_SetFlagFromVar, + ScrCmd_SetTrainerFlag, + ScrCmd_ClearTrainerFlag, + ScrCmd_CheckTrainerFlag, + ScrCmd_AddVar, + ScrCmd_SubVar, + ScrCmd_SetVarFromValue, + ScrCmd_SetVarFromVar, ScrCmd_02A, ScrCmd_02B, ScrCmd_02C, @@ -866,8 +866,8 @@ const ScrCmdFunc Unk_020EAC58[] = { ScrCmd_05B, ScrCmd_05C, ScrCmd_05D, - ScrCmd_05E, - ScrCmd_05F, + ScrCmd_ApplyMovement, + ScrCmd_WaitMovement, ScrCmd_060, ScrCmd_061, ScrCmd_062, @@ -2016,83 +2016,65 @@ static BOOL ScrCmd_021 (ScriptContext * param0) return 0; } -static BOOL ScrCmd_022 (ScriptContext * param0) +static BOOL ScrCmd_SetFlagFromVar (ScriptContext * ctx) { - FieldSystem * v0 = param0->fieldSys; - u16 * v1 = ScriptContext_GetVarPointer(param0); - - sub_0203F19C(v0, (*v1)); - return 0; + FieldSystem * fieldSys = ctx->fieldSys; + u16 flagID = *ScriptContext_GetVarPointer(ctx); + sub_0203F19C(fieldSys, flagID); + return FALSE; } -static BOOL ScrCmd_023 (ScriptContext * param0) +static BOOL ScrCmd_SetTrainerFlag (ScriptContext * ctx) { - FieldSystem * v0 = param0->fieldSys; - u16 v1 = ScriptContext_GetVar(param0); - - sub_0203F2BC(v0, v1); - return 0; + FieldSystem * fieldSys = ctx->fieldSys; + u16 trainerID = ScriptContext_GetVar(ctx); + sub_0203F2BC(fieldSys, trainerID); + return FALSE; } -static BOOL ScrCmd_024 (ScriptContext * param0) +static BOOL ScrCmd_ClearTrainerFlag (ScriptContext * ctx) { - FieldSystem * v0 = param0->fieldSys; - u16 v1 = ScriptContext_GetVar(param0); - - sub_0203F2D8(v0, v1); - return 0; + FieldSystem * fieldSys = ctx->fieldSys; + u16 trainerID = ScriptContext_GetVar(ctx); + sub_0203F2D8(fieldSys, trainerID); + return FALSE; } -static BOOL ScrCmd_025 (ScriptContext * param0) +static BOOL ScrCmd_CheckTrainerFlag (ScriptContext * ctx) { - FieldSystem * v0 = param0->fieldSys; - u16 v1 = ScriptContext_GetVar(param0); - - param0->comparisonResult = sub_0203F2A0(v0, v1); - return 0; + FieldSystem * fieldSys = ctx->fieldSys; + u16 trainerID = ScriptContext_GetVar(ctx); + ctx->comparisonResult = sub_0203F2A0(fieldSys, trainerID); + return FALSE; } -static BOOL ScrCmd_026 (ScriptContext * param0) +static BOOL ScrCmd_AddVar (ScriptContext * ctx) { - u16 * v0; - u16 v1; - - v0 = ScriptContext_GetVarPointer(param0); - *v0 += ScriptContext_GetVar(param0); - - return 0; + u16 * destVar = ScriptContext_GetVarPointer(ctx); + *destVar += ScriptContext_GetVar(ctx); + return FALSE; } -static BOOL ScrCmd_027 (ScriptContext * param0) +static BOOL ScrCmd_SubVar (ScriptContext * ctx) { - u16 * v0; - - v0 = ScriptContext_GetVarPointer(param0); - *v0 -= ScriptContext_GetVar(param0); - - return 0; + u16 * destVar = ScriptContext_GetVarPointer(ctx); + *destVar -= ScriptContext_GetVar(ctx); + return FALSE; } -static BOOL ScrCmd_028 (ScriptContext * param0) +static BOOL ScrCmd_SetVarFromValue (ScriptContext * ctx) { - u16 * v0; - - v0 = ScriptContext_GetVarPointer(param0); - *v0 = ScriptContext_ReadHalfWord(param0); - - return 0; + u16 * destVar = ScriptContext_GetVarPointer(ctx); + *destVar = ScriptContext_ReadHalfWord(ctx); + return FALSE; } -static BOOL ScrCmd_029 (ScriptContext * param0) +static BOOL ScrCmd_SetVarFromVar (ScriptContext * ctx) { - u16 * v0; - u16 * v1; - - v0 = ScriptContext_GetVarPointer(param0); - v1 = ScriptContext_GetVarPointer(param0); - *v0 = *v1; - - return 0; + u16 * destVar = ScriptContext_GetVarPointer(ctx); + u16 * srcVar = ScriptContext_GetVarPointer(ctx); + *destVar = *srcVar; + return FALSE; } static BOOL ScrCmd_02A (ScriptContext * param0) @@ -2984,31 +2966,20 @@ static BOOL ScrCmd_33B (ScriptContext * param0) return 1; } -static BOOL ScrCmd_05E (ScriptContext * param0) +static BOOL ScrCmd_ApplyMovement (ScriptContext * ctx) { - u8 * v0; - SysTask * v1; - u8 * v2; - LocalMapObject ** v3; - LocalMapObject * v4; - u16 v5 = ScriptContext_GetVar(param0); - u32 v6 = (s32)ScriptContext_ReadWord(param0); - - v4 = sub_02040ED4(param0->fieldSys, v5); - - if (v4 == NULL) { + u16 localID = ScriptContext_GetVar(ctx); + u32 movementOffset = ScriptContext_ReadWord(ctx); + LocalMapObject * object = sub_02040ED4(ctx->fieldSys, localID); + if (object == NULL) { GF_ASSERT(FALSE); - return 0; + return FALSE; } - - v0 = (u8 *)(param0->scriptPtr + v6); - v1 = sub_02065700(v4, (UnkStruct_ov5_021F8E3C *)v0); - v2 = sub_0203F098(param0->fieldSys, 4); + SysTask * v1 = sub_02065700(object, (UnkStruct_ov5_021F8E3C *)(ctx->scriptPtr + movementOffset)); + u8 * v2 = sub_0203F098(ctx->fieldSys, 4); (*v2)++; - - sub_02040F28(param0->fieldSys, v1, NULL); - - return 0; + sub_02040F28(ctx->fieldSys, v1, NULL); + return FALSE; } static BOOL ScrCmd_2A1 (ScriptContext * param0) @@ -3085,10 +3056,10 @@ static LocalMapObject * sub_02040ED4 (FieldSystem * param0, int param1) return v1; } -static BOOL ScrCmd_05F (ScriptContext * param0) +static BOOL ScrCmd_WaitMovement (ScriptContext * ctx) { - ScriptContext_Pause(param0, sub_02040F0C); - return 1; + ScriptContext_Pause(ctx, sub_02040F0C); + return TRUE; } static BOOL sub_02040F0C (ScriptContext * param0)