From 2d880cc032e021cba451fbd12ed8440555098c1f Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:58:56 +0800 Subject: [PATCH] Use GoToIf[condition] macros --- asm/macros/scrcmd.inc | 52 ++ res/field/scripts/script_0000.s | 6 +- res/field/scripts/script_0002.s | 192 +++---- res/field/scripts/script_0008.s | 36 +- res/field/scripts/script_0010.s | 162 ++---- res/field/scripts/script_0011.s | 54 +- res/field/scripts/script_0012.s | 6 +- res/field/scripts/script_0013.s | 18 +- res/field/scripts/script_0015.s | 93 ++-- res/field/scripts/script_0018.s | 36 +- res/field/scripts/script_0024.s | 6 +- res/field/scripts/script_0027.s | 6 +- res/field/scripts/script_0028.s | 102 ++-- res/field/scripts/script_0029.s | 18 +- res/field/scripts/script_0030.s | 9 +- res/field/scripts/script_0031.s | 81 +-- res/field/scripts/script_0036.s | 111 ++--- res/field/scripts/script_0038.s | 18 +- res/field/scripts/script_0042.s | 6 +- res/field/scripts/script_0043.s | 30 +- res/field/scripts/script_0044.s | 75 +-- res/field/scripts/script_0045.s | 6 +- res/field/scripts/script_0046.s | 27 +- res/field/scripts/script_0047.s | 24 +- res/field/scripts/script_0048.s | 39 +- res/field/scripts/script_0049.s | 3 +- res/field/scripts/script_0050.s | 57 +-- res/field/scripts/script_0052.s | 18 +- res/field/scripts/script_0053.s | 15 +- res/field/scripts/script_0057.s | 6 +- res/field/scripts/script_0058.s | 6 +- res/field/scripts/script_0060.s | 12 +- res/field/scripts/script_0061.s | 9 +- res/field/scripts/script_0065.s | 45 +- res/field/scripts/script_0068.s | 6 +- res/field/scripts/script_0071.s | 144 ++---- res/field/scripts/script_0073.s | 39 +- res/field/scripts/script_0075.s | 15 +- res/field/scripts/script_0078.s | 6 +- res/field/scripts/script_0079.s | 9 +- res/field/scripts/script_0082.s | 15 +- res/field/scripts/script_0083.s | 117 ++--- res/field/scripts/script_0084.s | 33 +- res/field/scripts/script_0085.s | 6 +- res/field/scripts/script_0087.s | 6 +- res/field/scripts/script_0088.s | 15 +- res/field/scripts/script_0090.s | 24 +- res/field/scripts/script_0091.s | 6 +- res/field/scripts/script_0092.s | 132 ++--- res/field/scripts/script_0093.s | 165 +++---- res/field/scripts/script_0095.s | 12 +- res/field/scripts/script_0098.s | 27 +- res/field/scripts/script_0101.s | 24 +- res/field/scripts/script_0106.s | 6 +- res/field/scripts/script_0107.s | 6 +- res/field/scripts/script_0108.s | 27 +- res/field/scripts/script_0109.s | 3 +- res/field/scripts/script_0110.s | 3 +- res/field/scripts/script_0112.s | 9 +- res/field/scripts/script_0116.s | 6 +- res/field/scripts/script_0117.s | 21 +- res/field/scripts/script_0118.s | 6 +- res/field/scripts/script_0119.s | 63 +-- res/field/scripts/script_0123.s | 45 +- res/field/scripts/script_0125.s | 18 +- res/field/scripts/script_0129.s | 45 +- res/field/scripts/script_0130.s | 6 +- res/field/scripts/script_0131.s | 6 +- res/field/scripts/script_0132.s | 15 +- res/field/scripts/script_0133.s | 21 +- res/field/scripts/script_0135.s | 75 +-- res/field/scripts/script_0136.s | 96 ++-- res/field/scripts/script_0137.s | 18 +- res/field/scripts/script_0141.s | 63 +-- res/field/scripts/script_0142.s | 3 +- res/field/scripts/script_0143.s | 24 +- res/field/scripts/script_0144.s | 18 +- res/field/scripts/script_0145.s | 18 +- res/field/scripts/script_0146.s | 27 +- res/field/scripts/script_0147.s | 72 +-- res/field/scripts/script_0148.s | 96 ++-- res/field/scripts/script_0149.s | 9 +- res/field/scripts/script_0150.s | 39 +- res/field/scripts/script_0151.s | 18 +- res/field/scripts/script_0153.s | 18 +- res/field/scripts/script_0154.s | 15 +- res/field/scripts/script_0155.s | 3 +- res/field/scripts/script_0156.s | 63 +-- res/field/scripts/script_0158.s | 9 +- res/field/scripts/script_0160.s | 12 +- res/field/scripts/script_0161.s | 3 +- res/field/scripts/script_0164.s | 42 +- res/field/scripts/script_0165.s | 69 +-- res/field/scripts/script_0170.s | 21 +- res/field/scripts/script_0171.s | 9 +- res/field/scripts/script_0172.s | 6 +- res/field/scripts/script_0174.s | 30 +- res/field/scripts/script_0176.s | 21 +- res/field/scripts/script_0177.s | 3 +- res/field/scripts/script_0180.s | 15 +- res/field/scripts/script_0181.s | 48 +- res/field/scripts/script_0186.s | 42 +- res/field/scripts/script_0187.s | 3 +- res/field/scripts/script_0188.s | 6 +- res/field/scripts/script_0189.s | 3 +- res/field/scripts/script_0190.s | 6 +- res/field/scripts/script_0191.s | 3 +- res/field/scripts/script_0192.s | 6 +- res/field/scripts/script_0193.s | 3 +- res/field/scripts/script_0194.s | 6 +- res/field/scripts/script_0195.s | 3 +- res/field/scripts/script_0196.s | 3 +- res/field/scripts/script_0197.s | 6 +- res/field/scripts/script_0198.s | 12 +- res/field/scripts/script_0201.s | 36 +- res/field/scripts/script_0202.s | 6 +- res/field/scripts/script_0209.s | 24 +- res/field/scripts/script_0211.s | 348 +++++-------- res/field/scripts/script_0212.s | 252 ++++------ res/field/scripts/script_0213.s | 102 ++-- res/field/scripts/script_0214.s | 15 +- res/field/scripts/script_0215.s | 3 +- res/field/scripts/script_0216.s | 24 +- res/field/scripts/script_0217.s | 39 +- res/field/scripts/script_0218.s | 3 +- res/field/scripts/script_0219.s | 45 +- res/field/scripts/script_0221.s | 39 +- res/field/scripts/script_0224.s | 9 +- res/field/scripts/script_0231.s | 42 +- res/field/scripts/script_0233.s | 12 +- res/field/scripts/script_0236.s | 99 ++-- res/field/scripts/script_0237.s | 15 +- res/field/scripts/script_0238.s | 24 +- res/field/scripts/script_0239.s | 27 +- res/field/scripts/script_0240.s | 27 +- res/field/scripts/script_0248.s | 15 +- res/field/scripts/script_0253.s | 18 +- res/field/scripts/script_0267.s | 9 +- res/field/scripts/script_0270.s | 51 +- res/field/scripts/script_0273.s | 15 +- res/field/scripts/script_0274.s | 438 ++++++---------- res/field/scripts/script_0277.s | 27 +- res/field/scripts/script_0279.s | 6 +- res/field/scripts/script_0281.s | 6 +- res/field/scripts/script_0282.s | 3 +- res/field/scripts/script_0284.s | 6 +- res/field/scripts/script_0285.s | 6 +- res/field/scripts/script_0286.s | 24 +- res/field/scripts/script_0288.s | 3 +- res/field/scripts/script_0289.s | 3 +- res/field/scripts/script_0291.s | 21 +- res/field/scripts/script_0310.s | 21 +- res/field/scripts/script_0317.s | 15 +- res/field/scripts/script_0318.s | 18 +- res/field/scripts/script_0320.s | 3 +- res/field/scripts/script_0321.s | 3 +- res/field/scripts/script_0324.s | 6 +- res/field/scripts/script_0329.s | 36 +- res/field/scripts/script_0330.s | 12 +- res/field/scripts/script_0331.s | 18 +- res/field/scripts/script_0333.s | 3 +- res/field/scripts/script_0337.s | 18 +- res/field/scripts/script_0339.s | 3 +- res/field/scripts/script_0341.s | 21 +- res/field/scripts/script_0342.s | 9 +- res/field/scripts/script_0343.s | 9 +- res/field/scripts/script_0344.s | 27 +- res/field/scripts/script_0346.s | 9 +- res/field/scripts/script_0347.s | 51 +- res/field/scripts/script_0351.s | 15 +- res/field/scripts/script_0352.s | 27 +- res/field/scripts/script_0353.s | 15 +- res/field/scripts/script_0357.s | 21 +- res/field/scripts/script_0359.s | 3 +- res/field/scripts/script_0361.s | 9 +- res/field/scripts/script_0362.s | 6 +- res/field/scripts/script_0363.s | 24 +- res/field/scripts/script_0367.s | 342 +++++-------- res/field/scripts/script_0368.s | 6 +- res/field/scripts/script_0369.s | 9 +- res/field/scripts/script_0370.s | 6 +- res/field/scripts/script_0371.s | 66 +-- res/field/scripts/script_0372.s | 51 +- res/field/scripts/script_0373.s | 96 ++-- res/field/scripts/script_0374.s | 3 +- res/field/scripts/script_0375.s | 45 +- res/field/scripts/script_0376.s | 51 +- res/field/scripts/script_0377.s | 192 +++---- res/field/scripts/script_0378.s | 78 +-- res/field/scripts/script_0379.s | 78 +-- res/field/scripts/script_0380.s | 3 +- res/field/scripts/script_0382.s | 12 +- res/field/scripts/script_0383.s | 3 +- res/field/scripts/script_0387.s | 6 +- res/field/scripts/script_0388.s | 18 +- res/field/scripts/script_0389.s | 21 +- res/field/scripts/script_0390.s | 3 +- res/field/scripts/script_0392.s | 54 +- res/field/scripts/script_0394.s | 54 +- res/field/scripts/script_0396.s | 54 +- res/field/scripts/script_0397.s | 18 +- res/field/scripts/script_0400.s | 81 +-- res/field/scripts/script_0404.s | 36 +- res/field/scripts/script_0406.s | 99 ++-- res/field/scripts/script_0407.s | 15 +- res/field/scripts/script_0408.s | 36 +- res/field/scripts/script_0409.s | 117 ++--- res/field/scripts/script_0410.s | 15 +- res/field/scripts/script_0411.s | 15 +- res/field/scripts/script_0413.s | 129 ++--- res/field/scripts/script_0414.s | 30 +- res/field/scripts/script_0416.s | 39 +- res/field/scripts/script_0417.s | 852 +++++++++++--------------------- res/field/scripts/script_0418.s | 6 +- res/field/scripts/script_0419.s | 12 +- res/field/scripts/script_0420.s | 12 +- res/field/scripts/script_0422.s | 48 +- res/field/scripts/script_0423.s | 66 +-- res/field/scripts/script_0424.s | 18 +- res/field/scripts/script_0426.s | 54 +- res/field/scripts/script_0427.s | 132 ++--- res/field/scripts/script_0428.s | 63 +-- res/field/scripts/script_0429.s | 33 +- res/field/scripts/script_0431.s | 6 +- res/field/scripts/script_0432.s | 18 +- res/field/scripts/script_0433.s | 6 +- res/field/scripts/script_0435.s | 21 +- res/field/scripts/script_0436.s | 6 +- res/field/scripts/script_0438.s | 12 +- res/field/scripts/script_0439.s | 6 +- res/field/scripts/script_0440.s | 51 +- res/field/scripts/script_0441.s | 57 +-- res/field/scripts/script_0446.s | 18 +- res/field/scripts/script_0447.s | 54 +- res/field/scripts/script_0448.s | 21 +- res/field/scripts/script_0450.s | 48 +- res/field/scripts/script_0452.s | 6 +- res/field/scripts/script_0453.s | 15 +- res/field/scripts/script_0454.s | 39 +- res/field/scripts/script_0455.s | 9 +- res/field/scripts/script_0456.s | 63 +-- res/field/scripts/script_0457.s | 15 +- res/field/scripts/script_0458.s | 36 +- res/field/scripts/script_0459.s | 21 +- res/field/scripts/script_0460.s | 3 +- res/field/scripts/script_0461.s | 153 ++---- res/field/scripts/script_0462.s | 3 +- res/field/scripts/script_0463.s | 9 +- res/field/scripts/script_0464.s | 36 +- res/field/scripts/script_0465.s | 6 +- res/field/scripts/script_0466.s | 18 +- res/field/scripts/script_0467.s | 15 +- res/field/scripts/script_0468.s | 21 +- res/field/scripts/script_0470.s | 12 +- res/field/scripts/script_0472.s | 9 +- res/field/scripts/script_0473.s | 6 +- res/field/scripts/script_0475.s | 15 +- res/field/scripts/script_0476.s | 27 +- res/field/scripts/script_0478.s | 3 +- res/field/scripts/script_0479.s | 126 ++--- res/field/scripts/script_0480.s | 21 +- res/field/scripts/script_0481.s | 21 +- res/field/scripts/script_0483.s | 18 +- res/field/scripts/script_0485.s | 60 +-- res/field/scripts/script_0487.s | 6 +- res/field/scripts/script_0489.s | 6 +- res/field/scripts/script_0490.s | 12 +- res/field/scripts/script_0491.s | 12 +- res/field/scripts/script_0493.s | 84 ++-- res/field/scripts/script_0494.s | 6 +- res/field/scripts/script_0495.s | 9 +- res/field/scripts/script_0497.s | 39 +- res/field/scripts/script_0498.s | 9 +- res/field/scripts/script_0499.s | 36 +- res/field/scripts/script_0500.s | 48 +- res/field/scripts/script_0501.s | 90 ++-- res/field/scripts/script_1051.s | 72 +-- res/field/scripts/script_1052.s | 57 +-- res/field/scripts/script_1053.s | 18 +- res/field/scripts/script_1055.s | 111 ++--- res/field/scripts/script_1056.s | 3 +- res/field/scripts/script_1057.s | 3 +- res/field/scripts/script_1058.s | 6 +- res/field/scripts/script_1059.s | 90 ++-- res/field/scripts/script_1064.s | 72 +-- res/field/scripts/script_1065.s | 24 +- res/field/scripts/script_1068.s | 12 +- res/field/scripts/script_1070.s | 3 +- res/field/scripts/script_1073.s | 9 +- res/field/scripts/script_1075.s | 12 +- res/field/scripts/script_1076.s | 12 +- res/field/scripts/script_1081.s | 3 +- res/field/scripts/script_1083.s | 39 +- res/field/scripts/script_1085.s | 21 +- res/field/scripts/script_1086.s | 21 +- res/field/scripts/script_1088.s | 12 +- res/field/scripts/script_1091.s | 9 +- res/field/scripts/script_1092.s | 27 +- res/field/scripts/script_1094.s | 3 +- res/field/scripts/script_1095.s | 39 +- res/field/scripts/script_1096.s | 51 +- res/field/scripts/script_1098.s | 3 +- res/field/scripts/script_1101.s | 156 ++---- res/field/scripts/script_1102.s | 6 +- res/field/scripts/script_1103.s | 36 +- res/field/scripts/script_1104.s | 27 +- res/field/scripts/script_1109.s | 39 +- res/field/scripts/script_1110.s | 33 +- res/field/scripts/script_1111.s | 18 +- res/field/scripts/script_1112.s | 282 ++++------- res/field/scripts/script_1113.s | 6 +- res/field/scripts/script_1114.s | 54 +- res/field/scripts/script_1115.s | 15 +- res/field/scripts/script_1116.s | 24 +- res/field/scripts/script_1117.s | 33 +- res/field/scripts/script_1118.s | 228 +++------ res/field/scripts/script_1122.s | 15 +- 317 files changed, 4084 insertions(+), 8064 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index e72f6507ad..4f811d89e1 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4544,3 +4544,55 @@ .byte \arg0 .byte \arg1 .endm + + + + .macro GoToIfLt varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 0, \offset + .endm + + .macro GoToIfEq varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 1, \offset + .endm + + .macro GoToIfGt varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 2, \offset + .endm + + .macro GoToIfLe varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 3, \offset + .endm + + .macro GoToIfGe varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 4, \offset + .endm + + .macro GoToIfNe varID, valueOrVarID, offset + CompareVar \varID, \valueOrVarID + GoToIf 5, \offset + .endm + + .macro GoToIfUnset flagID, offset + CheckFlag \flagID + GoToIf 0, \offset + .endm + + .macro GoToIfSet flagID, offset + CheckFlag \flagID + GoToIf 1, \offset + .endm + + .macro GoToIfNotDefeated trainerID, offset + CheckTrainerFlag \trainerID + GoToIf 0, \offset + .endm + + .macro GoToIfDefeated trainerID, offset + CheckTrainerFlag \trainerID + GoToIf 1, \offset + .endm diff --git a/res/field/scripts/script_0000.s b/res/field/scripts/script_0000.s index edf6cf1ea3..1970ce3b79 100644 --- a/res/field/scripts/script_0000.s +++ b/res/field/scripts/script_0000.s @@ -21,10 +21,8 @@ _0021: ScrCmd_060 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0046 - CompareVar 0x800C, 1 - GoToIf 1, _0059 + GoToIfEq 0x800C, 0, _0046 + GoToIfEq 0x800C, 1, _0059 End _0046: diff --git a/res/field/scripts/script_0002.s b/res/field/scripts/script_0002.s index 7e733f2018..8ec6f257db 100644 --- a/res/field/scripts/script_0002.s +++ b/res/field/scripts/script_0002.s @@ -38,10 +38,8 @@ _0072: CompareVar 0x4077, 3 CallIf 4, _00C2 ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00D8 - CompareVar 0x4000, 1 - GoToIf 1, _00E0 + GoToIfEq 0x4000, 0, _00D8 + GoToIfEq 0x4000, 1, _00E0 End _00AC: @@ -67,12 +65,9 @@ _00E0: _00E8: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 173 - GoToIf 1, _0119 - CompareVar 0x8004, 174 - GoToIf 1, _0129 - CompareVar 0x8004, 175 - GoToIf 1, _0139 + GoToIfEq 0x8004, 173, _0119 + GoToIfEq 0x8004, 174, _0129 + GoToIfEq 0x8004, 175, _0139 End _0119: @@ -100,10 +95,8 @@ _0149: WaitMovement ScrCmd_014 0x7F8 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _018D - CompareVar 0x800C, 1 - GoToIf 1, _0224 + GoToIfEq 0x800C, 0, _018D + GoToIfEq 0x800C, 1, _0224 End _018D: @@ -206,12 +199,9 @@ _02BB: _02DB: ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 173 - GoToIf 1, _030C - CompareVar 0x8004, 174 - GoToIf 1, _0320 - CompareVar 0x8004, 175 - GoToIf 1, _0334 + GoToIfEq 0x8004, 173, _030C + GoToIfEq 0x8004, 174, _0320 + GoToIfEq 0x8004, 175, _0334 End _030C: @@ -256,10 +246,8 @@ _0390: ScrCmd_02C 16 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03B6 - CompareVar 0x800C, 1 - GoToIf 1, _03BB + GoToIfEq 0x800C, 0, _03B6 + GoToIfEq 0x800C, 1, _03BB End _03B6: @@ -459,8 +447,7 @@ _058C: ScrCmd_060 ScrCmd_068 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05B2 + GoToIfEq 0x800C, 1, _05B2 ScrCmd_02C 29 ScrCmd_031 ScrCmd_034 @@ -487,12 +474,9 @@ _05BD: _05D0: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x30B - GoToIf 1, _0601 - CompareVar 0x8005, 0x30C - GoToIf 1, _062A - CompareVar 0x8005, 0x30D - GoToIf 1, _0653 + GoToIfEq 0x8005, 0x30B, _0601 + GoToIfEq 0x8005, 0x30C, _062A + GoToIfEq 0x8005, 0x30D, _0653 End _0601: @@ -588,14 +572,10 @@ _06F8: _0700: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2F5 - GoToIf 1, _073E - CompareVar 0x8005, 0x2F6 - GoToIf 1, _0758 - CompareVar 0x8005, 0x2F7 - GoToIf 1, _0772 - CompareVar 0x8005, 0x2F8 - GoToIf 1, _078C + GoToIfEq 0x8005, 0x2F5, _073E + GoToIfEq 0x8005, 0x2F6, _0758 + GoToIfEq 0x8005, 0x2F7, _0772 + GoToIfEq 0x8005, 0x2F8, _078C End _073E: @@ -633,21 +613,15 @@ _07A6: ApplyMovement 31, _0914 WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2F5 - GoToIf 1, _0846 - CompareVar 0x8005, 0x2F6 - GoToIf 1, _0858 - CompareVar 0x8005, 0x2F7 - GoToIf 1, _086A - CompareVar 0x8005, 0x2F8 - GoToIf 1, _087C + GoToIfEq 0x8005, 0x2F5, _0846 + GoToIfEq 0x8005, 0x2F6, _0858 + GoToIfEq 0x8005, 0x2F7, _086A + GoToIfEq 0x8005, 0x2F8, _087C End _07FC: - CheckFlag 241 - GoToIf 0, _0817 - CheckFlag 243 - GoToIf 0, _081C + GoToIfUnset 241, _0817 + GoToIfUnset 243, _081C ScrCmd_02C 35 Return @@ -660,10 +634,8 @@ _081C: Return _0821: - CheckFlag 241 - GoToIf 0, _083C - CheckFlag 243 - GoToIf 0, _0841 + GoToIfUnset 241, _083C + GoToIfUnset 243, _0841 ScrCmd_02C 35 Return @@ -791,8 +763,7 @@ _0954: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 243 - GoToIf 1, _097F + GoToIfSet 243, _097F Call _0821 ScrCmd_030 ScrCmd_034 @@ -812,8 +783,7 @@ _097F: _0994: ScrCmd_07E 0x1B5, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09BD + GoToIfEq 0x800C, 1, _09BD ScrCmd_02C 36 ScrCmd_034 ApplyMovement 31, _1558 @@ -841,12 +811,9 @@ _09DC: ScrCmd_02C 64 ScrCmd_034 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8000, 173 - GoToIf 1, _0A1C - CompareVar 0x8000, 174 - GoToIf 1, _0A36 - CompareVar 0x8000, 175 - GoToIf 1, _0A50 + GoToIfEq 0x8000, 173, _0A1C + GoToIfEq 0x8000, 174, _0A36 + GoToIfEq 0x8000, 175, _0A50 End _0A1C: @@ -891,10 +858,8 @@ _0A6A: ApplyMovement 7, _0E44 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0ADC - CompareVar 0x800C, 1 - GoToIf 1, _0AED + GoToIfEq 0x800C, 0, _0ADC + GoToIfEq 0x800C, 1, _0AED End _0ADC: @@ -921,8 +886,7 @@ _0AFE: Call _0BAA ScrCmd_2A0 0x8004, 0x19E, 0x19F ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0DB7 + GoToIfEq 0x800C, 0, _0DB7 ApplyMovement 18, _0EB4 WaitMovement ScrCmd_02C 73 @@ -941,39 +905,31 @@ _0AFE: ApplyMovement 7, _0E60 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C30 - CompareVar 0x800C, 1 - GoToIf 1, _0C41 + GoToIfEq 0x800C, 0, _0C30 + GoToIfEq 0x800C, 1, _0C41 End _0BAA: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0BCA - CompareVar 0x800C, 1 - GoToIf 1, _0BFC + GoToIfEq 0x800C, 0, _0BCA + GoToIfEq 0x800C, 1, _0BFC End _0BCA: ScrCmd_0DE 0x800C SetVar 0x8004, 0x268 - CompareVar 0x800C, 0x186 - GoToIf 1, _0C2E + GoToIfEq 0x800C, 0x186, _0C2E SetVar 0x8004, 0x269 - CompareVar 0x800C, 0x189 - GoToIf 1, _0C2E + GoToIfEq 0x800C, 0x189, _0C2E SetVar 0x8004, 0x26A Return _0BFC: ScrCmd_0DE 0x800C SetVar 0x8004, 0x265 - CompareVar 0x800C, 0x186 - GoToIf 1, _0C2E + GoToIfEq 0x800C, 0x186, _0C2E SetVar 0x8004, 0x266 - CompareVar 0x800C, 0x189 - GoToIf 1, _0C2E + GoToIfEq 0x800C, 0x189, _0C2E SetVar 0x8004, 0x267 Return @@ -1070,8 +1026,7 @@ _0D72: _0D8C: ScrCmd_1B7 0x800C, 8 - CompareVar 0x4001, 0x800C - GoToIf 1, _0D8C + GoToIfEq 0x4001, 0x800C, _0D8C SetVar 0x4001, 0x800C SetVar 0x8004, 1 AddVar 0x8004, 0x800C @@ -1365,10 +1320,8 @@ _0F3C: ScrCmd_046 47, 0xFF, 2 ScrCmd_047 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0F97 - CompareVar 0x8008, 1 - GoToIf 1, _0FA2 + GoToIfEq 0x8008, 0, _0F97 + GoToIfEq 0x8008, 1, _0FA2 ScrCmd_02C 83 ScrCmd_031 ScrCmd_034 @@ -1425,10 +1378,8 @@ _0FE6: ScrCmd_068 ScrCmd_02C 88 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1011 - CompareVar 0x800C, 1 - GoToIf 1, _101C + GoToIfEq 0x800C, 0, _1011 + GoToIfEq 0x800C, 1, _101C End _1011: @@ -1602,8 +1553,7 @@ _11CC: ScrCmd_068 SetVar 0x8004, 0 Call _11F8 - CompareVar 0x8004, 3 - GoToIf 1, _1223 + GoToIfEq 0x8004, 3, _1223 ScrCmd_02C 41 ScrCmd_031 ScrCmd_034 @@ -1641,14 +1591,10 @@ _1223: ScrCmd_02C 44 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12A1 - CompareVar 0x800C, 1 - GoToIf 1, _12BB - CompareVar 0x800C, 2 - GoToIf 1, _12A1 - CompareVar 0x800C, 3 - GoToIf 1, _12A1 + GoToIfEq 0x800C, 0, _12A1 + GoToIfEq 0x800C, 1, _12BB + GoToIfEq 0x800C, 2, _12A1 + GoToIfEq 0x800C, 3, _12A1 End _12A1: @@ -1702,14 +1648,11 @@ _1320: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 237 - GoToIf 1, _138C + GoToIfSet 237, _138C ScrCmd_02C 45 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1356 - CompareVar 0x800C, 1 - GoToIf 1, _137D + GoToIfEq 0x800C, 0, _1356 + GoToIfEq 0x800C, 1, _137D End _1356: @@ -1744,14 +1687,11 @@ _1397: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 238 - GoToIf 1, _1403 + GoToIfSet 238, _1403 ScrCmd_02C 51 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _13CD - CompareVar 0x800C, 1 - GoToIf 1, _13F4 + GoToIfEq 0x800C, 0, _13CD + GoToIfEq 0x800C, 1, _13F4 End _13CD: @@ -1786,16 +1726,12 @@ _140E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40E7, 2 - GoToIf 0, _149E - CheckFlag 239 - GoToIf 1, _1493 + GoToIfLt 0x40E7, 2, _149E + GoToIfSet 239, _1493 ScrCmd_02C 57 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1451 - CompareVar 0x800C, 1 - GoToIf 1, _1484 + GoToIfEq 0x800C, 0, _1451 + GoToIfEq 0x800C, 1, _1484 End _1451: diff --git a/res/field/scripts/script_0008.s b/res/field/scripts/script_0008.s index 87aebd8f37..b4c27ed247 100644 --- a/res/field/scripts/script_0008.s +++ b/res/field/scripts/script_0008.s @@ -11,10 +11,8 @@ _0016: ScrCmd_238 6, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _003C - CompareVar 0x4077, 2 - GoToIf 0, _003C + GoToIfEq 0x4000, 0, _003C + GoToIfLt 0x4077, 2, _003C ClearFlag 0x212 End @@ -28,47 +26,37 @@ _0042: ScrCmd_068 ScrCmd_02C 0 ScrCmd_15D 0x8000 - CompareVar 0x8000, 0 - GoToIf 1, _0181 + GoToIfEq 0x8000, 0, _0181 ScrCmd_134 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00C5 + GoToIfEq 0x800C, 0, _00C5 ScrCmd_134 12, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00DC + GoToIfEq 0x800C, 0, _00DC ScrCmd_134 13, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F3 + GoToIfEq 0x800C, 0, _00F3 ScrCmd_134 15, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _010A + GoToIfEq 0x800C, 0, _010A ScrCmd_07E 0x1AF, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01B8 + GoToIfEq 0x800C, 1, _01B8 GoTo _01AD _00C5: ScrCmd_15D 0x800C - CompareVar 0x800C, 1 - GoToIf 4, _0121 + GoToIfGe 0x800C, 1, _0121 GoTo _0181 _00DC: ScrCmd_15D 0x800C - CompareVar 0x800C, 3 - GoToIf 4, _0139 + GoToIfGe 0x800C, 3, _0139 GoTo _018C _00F3: ScrCmd_15D 0x800C - CompareVar 0x800C, 5 - GoToIf 4, _0151 + GoToIfGe 0x800C, 5, _0151 GoTo _0197 _010A: ScrCmd_15D 0x800C - CompareVar 0x800C, 7 - GoToIf 4, _0169 + GoToIfGe 0x800C, 7, _0169 GoTo _01A2 _0121: diff --git a/res/field/scripts/script_0010.s b/res/field/scripts/script_0010.s index ef6d91c249..fe69c8c15a 100644 --- a/res/field/scripts/script_0010.s +++ b/res/field/scripts/script_0010.s @@ -50,8 +50,7 @@ _0062: ScrCmd_02C 4 ScrCmd_040 1, 1, 0, 1, 0x8004 ScrCmd_132 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A2 + GoToIfEq 0x800C, 0, _00A2 Call _00FE Call _0122 Call _0146 @@ -61,26 +60,19 @@ _0062: _00A2: ScrCmd_29D 0x102, 0 ScrCmd_043 - CompareVar 0x8004, 1 - GoToIf 1, _0119 - CompareVar 0x8004, 2 - GoToIf 1, _013D - CompareVar 0x8004, 3 - GoToIf 1, _0161 - CompareVar 0x8004, 4 - GoToIf 1, _0185 - CompareVar 0x8004, 5 - GoToIf 1, _01A9 - CompareVar 0x8004, 6 - GoToIf 1, _01CD + GoToIfEq 0x8004, 1, _0119 + GoToIfEq 0x8004, 2, _013D + GoToIfEq 0x8004, 3, _0161 + GoToIfEq 0x8004, 4, _0185 + GoToIfEq 0x8004, 5, _01A9 + GoToIfEq 0x8004, 6, _01CD ScrCmd_034 ScrCmd_061 End _00FE: ScrCmd_134 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 233, 1 Return @@ -90,8 +82,7 @@ _0119: _0122: ScrCmd_134 11, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 237, 2 Return @@ -101,8 +92,7 @@ _013D: _0146: ScrCmd_134 23, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 234, 3 Return @@ -112,8 +102,7 @@ _0161: _016A: ScrCmd_134 20, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 250, 4 Return @@ -123,8 +112,7 @@ _0185: _018E: ScrCmd_134 24, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 249, 5 Return @@ -134,8 +122,7 @@ _01A9: _01B2: ScrCmd_134 16, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D6 + GoToIfEq 0x800C, 0, _01D6 ScrCmd_29D 254, 6 Return @@ -155,8 +142,7 @@ _01E3: ScrCmd_02C 6 ScrCmd_040 1, 1, 0, 1, 0x8004 ScrCmd_132 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0229 + GoToIfEq 0x800C, 0, _0229 Call _0292 Call _02B6 Call _02DA @@ -167,28 +153,20 @@ _01E3: _0229: ScrCmd_29D 0x102, 0 ScrCmd_043 - CompareVar 0x8004, 1 - GoToIf 1, _02AD - CompareVar 0x8004, 2 - GoToIf 1, _02D1 - CompareVar 0x8004, 3 - GoToIf 1, _02F5 - CompareVar 0x8004, 4 - GoToIf 1, _0319 - CompareVar 0x8004, 5 - GoToIf 1, _033D - CompareVar 0x8004, 6 - GoToIf 1, _0361 - CompareVar 0x8004, 7 - GoToIf 1, _0385 + GoToIfEq 0x8004, 1, _02AD + GoToIfEq 0x8004, 2, _02D1 + GoToIfEq 0x8004, 3, _02F5 + GoToIfEq 0x8004, 4, _0319 + GoToIfEq 0x8004, 5, _033D + GoToIfEq 0x8004, 6, _0361 + GoToIfEq 0x8004, 7, _0385 ScrCmd_034 ScrCmd_061 End _0292: ScrCmd_134 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 235, 1 Return @@ -198,8 +176,7 @@ _02AD: _02B6: ScrCmd_134 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 236, 2 Return @@ -209,8 +186,7 @@ _02D1: _02DA: ScrCmd_134 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 240, 3 Return @@ -220,8 +196,7 @@ _02F5: _02FE: ScrCmd_134 8, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 244, 4 Return @@ -231,8 +206,7 @@ _0319: _0322: ScrCmd_134 22, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 248, 5 Return @@ -242,8 +216,7 @@ _033D: _0346: ScrCmd_134 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 0x101, 6 Return @@ -253,8 +226,7 @@ _0361: _036A: ScrCmd_134 7, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _038E + GoToIfEq 0x800C, 0, _038E ScrCmd_29D 252, 7 Return @@ -274,8 +246,7 @@ _039B: ScrCmd_02C 8 ScrCmd_040 1, 1, 0, 1, 0x8004 ScrCmd_132 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03DB + GoToIfEq 0x800C, 0, _03DB Call _0437 Call _045B Call _047F @@ -285,26 +256,19 @@ _039B: _03DB: ScrCmd_29D 0x102, 0 ScrCmd_043 - CompareVar 0x8004, 1 - GoToIf 1, _0452 - CompareVar 0x8004, 2 - GoToIf 1, _0476 - CompareVar 0x8004, 3 - GoToIf 1, _049A - CompareVar 0x8004, 4 - GoToIf 1, _04BE - CompareVar 0x8004, 5 - GoToIf 1, _04E2 - CompareVar 0x8004, 6 - GoToIf 1, _0506 + GoToIfEq 0x8004, 1, _0452 + GoToIfEq 0x8004, 2, _0476 + GoToIfEq 0x8004, 3, _049A + GoToIfEq 0x8004, 4, _04BE + GoToIfEq 0x8004, 5, _04E2 + GoToIfEq 0x8004, 6, _0506 ScrCmd_034 ScrCmd_061 End _0437: ScrCmd_134 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 239, 1 Return @@ -314,8 +278,7 @@ _0452: _045B: ScrCmd_134 17, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 238, 2 Return @@ -325,8 +288,7 @@ _0476: _047F: ScrCmd_134 14, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 246, 3 Return @@ -336,8 +298,7 @@ _049A: _04A3: ScrCmd_134 18, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 245, 4 Return @@ -347,8 +308,7 @@ _04BE: _04C7: ScrCmd_134 21, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 253, 5 Return @@ -358,8 +318,7 @@ _04E2: _04EB: ScrCmd_134 12, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _050F + GoToIfEq 0x800C, 0, _050F ScrCmd_29D 251, 6 Return @@ -379,8 +338,7 @@ _051C: ScrCmd_02C 10 ScrCmd_040 1, 1, 0, 1, 0x8004 ScrCmd_132 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _055C + GoToIfEq 0x800C, 0, _055C Call _05B8 Call _05DC Call _0600 @@ -390,26 +348,19 @@ _051C: _055C: ScrCmd_29D 0x102, 0 ScrCmd_043 - CompareVar 0x8004, 1 - GoToIf 1, _05D3 - CompareVar 0x8004, 2 - GoToIf 1, _05F7 - CompareVar 0x8004, 3 - GoToIf 1, _061B - CompareVar 0x8004, 4 - GoToIf 1, _063F - CompareVar 0x8004, 5 - GoToIf 1, _0663 - CompareVar 0x8004, 6 - GoToIf 1, _0687 + GoToIfEq 0x8004, 1, _05D3 + GoToIfEq 0x8004, 2, _05F7 + GoToIfEq 0x8004, 3, _061B + GoToIfEq 0x8004, 4, _063F + GoToIfEq 0x8004, 5, _0663 + GoToIfEq 0x8004, 6, _0687 ScrCmd_034 ScrCmd_061 End _05B8: ScrCmd_134 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 243, 1 Return @@ -419,8 +370,7 @@ _05D3: _05DC: ScrCmd_134 10, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 242, 2 Return @@ -430,8 +380,7 @@ _05F7: _0600: ScrCmd_134 19, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 0x100, 3 Return @@ -441,8 +390,7 @@ _061B: _0624: ScrCmd_134 13, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 0xFF, 4 Return @@ -452,8 +400,7 @@ _063F: _0648: ScrCmd_134 15, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 247, 5 Return @@ -463,8 +410,7 @@ _0663: _066C: ScrCmd_134 6, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0690 + GoToIfEq 0x800C, 0, _0690 ScrCmd_29D 241, 6 Return diff --git a/res/field/scripts/script_0011.s b/res/field/scripts/script_0011.s index ccb15c7b67..ee192b3088 100644 --- a/res/field/scripts/script_0011.s +++ b/res/field/scripts/script_0011.s @@ -36,23 +36,18 @@ _003F: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40F2, 0 - GoToIf 5, _0257 - CheckFlag 0xAB3 - GoToIf 1, _00A0 - CheckFlag 0xAA9 - GoToIf 1, _0084 + GoToIfNe 0x40F2, 0, _0257 + GoToIfSet 0xAB3, _00A0 + GoToIfSet 0xAA9, _0084 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B6 + GoToIfEq 0x800C, 0, _00B6 GoTo _00AB _0084: ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B6 + GoToIfEq 0x800C, 0, _00B6 GoTo _00AB End @@ -77,10 +72,8 @@ _00B6: ScrCmd_280 0, 0x8000, 2, 5 ScrCmd_02C 5 ScrCmd_24F 0x8001, 0x8002, 0x8003, 0x8000 - CompareVar 0x8002, 0 - GoToIf 1, _00F5 - CompareVar 0x8003, 0 - GoToIf 1, _0100 + GoToIfEq 0x8002, 0, _00F5 + GoToIfEq 0x8003, 0, _0100 GoTo _010E _00F5: @@ -102,16 +95,11 @@ _010E: _011C: SetVar 0x8008, 0x8002 - CompareVar 0x8008, 1 - GoToIf 1, _0165 - CompareVar 0x8008, 2 - GoToIf 1, _0170 - CompareVar 0x8008, 3 - GoToIf 1, _0179 - CompareVar 0x8008, 4 - GoToIf 1, _0182 - CompareVar 0x8008, 5 - GoToIf 1, _018B + GoToIfEq 0x8008, 1, _0165 + GoToIfEq 0x8008, 2, _0170 + GoToIfEq 0x8008, 3, _0179 + GoToIfEq 0x8008, 4, _0182 + GoToIfEq 0x8008, 5, _018B End _0165: @@ -137,16 +125,11 @@ _018B: _0194: SetVar 0x8008, 0x8002 - CompareVar 0x8008, 1 - GoToIf 1, _01DD - CompareVar 0x8008, 2 - GoToIf 1, _01EB - CompareVar 0x8008, 3 - GoToIf 1, _01F7 - CompareVar 0x8008, 4 - GoToIf 1, _0203 - CompareVar 0x8008, 5 - GoToIf 1, _020F + GoToIfEq 0x8008, 1, _01DD + GoToIfEq 0x8008, 2, _01EB + GoToIfEq 0x8008, 3, _01F7 + GoToIfEq 0x8008, 4, _0203 + GoToIfEq 0x8008, 5, _020F End _01DD: @@ -174,8 +157,7 @@ _021B: SetVar 0x8004, 0x8003 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0246 + GoToIfEq 0x800C, 0, _0246 ScrCmd_014 0x7FC GoTo _0269 diff --git a/res/field/scripts/script_0012.s b/res/field/scripts/script_0012.s index de411597d1..df0ed5bbbd 100644 --- a/res/field/scripts/script_0012.s +++ b/res/field/scripts/script_0012.s @@ -10,8 +10,7 @@ _0012: ScrCmd_238 9, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _002B + GoToIfEq 0x4000, 0, _002B ClearFlag 0x215 End @@ -33,8 +32,7 @@ _0044: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x13D - GoToIf 1, _00A4 + GoToIfSet 0x13D, _00A4 ScrCmd_0DE 0x800C CompareVar 0x800C, 0x183 CallIf 1, _00B4 diff --git a/res/field/scripts/script_0013.s b/res/field/scripts/script_0013.s index c529734ad8..74f673762e 100644 --- a/res/field/scripts/script_0013.s +++ b/res/field/scripts/script_0013.s @@ -61,8 +61,7 @@ _007A: ScrCmd_068 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009C + GoToIfEq 0x800C, 0, _009C GoTo _015B _009C: @@ -73,8 +72,7 @@ _009C: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _015B + GoToIfEq 0x800C, 0, _015B ScrCmd_02C 5 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD @@ -83,19 +81,15 @@ _009C: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _015B + GoToIfEq 0x800C, 0, _015B ScrCmd_249 0x800C, 0x8000, 0x8001, 0x8002, 0x8003 - CompareVar 0x800C, 0xFF - GoToIf 1, _0131 - CompareVar 0x800C, 0 - GoToIf 1, _0131 + GoToIfEq 0x800C, 0xFF, _0131 + GoToIfEq 0x800C, 0, _0131 GoTo _0166 _0131: ScrCmd_2AA 0x800C, 0x8000, 0x8001, 0x8002, 0x8003 - CompareVar 0x800C, 0 - GoToIf 1, _0150 + GoToIfEq 0x800C, 0, _0150 GoTo _0171 _0150: diff --git a/res/field/scripts/script_0015.s b/res/field/scripts/script_0015.s index 8025b18156..551ddad9af 100644 --- a/res/field/scripts/script_0015.s +++ b/res/field/scripts/script_0015.s @@ -25,10 +25,8 @@ _003A: SetVar 0x8007, 0 CheckFlag 136 CallIf 0, _006F - CompareVar 0x4001, 0 - GoToIf 1, _0077 - CompareVar 0x4001, 1 - GoToIf 1, _0080 + GoToIfEq 0x4001, 0, _0077 + GoToIfEq 0x4001, 1, _0080 End _006F: @@ -46,10 +44,8 @@ _0080: _0089: ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AC - CompareVar 0x800C, 1 - GoToIf 1, _00F5 + GoToIfEq 0x800C, 0, _00AC + GoToIfEq 0x800C, 1, _00F5 End _00AC: @@ -58,26 +54,20 @@ _00AC: _00B5: ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0089 - CompareVar 0x800C, 1 - GoToIf 1, _02B3 + GoToIfEq 0x800C, 0, _0089 + GoToIfEq 0x800C, 1, _02B3 End _00D5: ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F5 - CompareVar 0x800C, 1 - GoToIf 1, _02B3 + GoToIfEq 0x800C, 0, _00F5 + GoToIfEq 0x800C, 1, _02B3 End _00F5: ScrCmd_177 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0115 - CompareVar 0x800C, 1 - GoToIf 5, _0121 + GoToIfEq 0x800C, 1, _0115 + GoToIfNe 0x800C, 1, _0121 End _0115: @@ -94,23 +84,18 @@ _0121: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _02B3 + GoToIfEq 0x4002, 0xFF, _02B3 ScrCmd_198 0x4002, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02BE + GoToIfEq 0x800C, 0, _02BE GoTo _016C _016C: ScrCmd_02C 5 ScrCmd_034 ScrCmd_1BD 0x8006 - CompareVar 0x8006, 0 - GoToIf 1, _019E - CompareVar 0x8006, 2 - GoToIf 1, _01B8 - CompareVar 0x8006, 3 - GoToIf 1, _01D2 + GoToIfEq 0x8006, 0, _019E + GoToIfEq 0x8006, 2, _01B8 + GoToIfEq 0x8006, 3, _01D2 End _019E: @@ -144,12 +129,9 @@ _01EC: WaitMovement ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8006, 0 - GoToIf 1, _0245 - CompareVar 0x8006, 2 - GoToIf 1, _025F - CompareVar 0x8006, 3 - GoToIf 1, _0279 + GoToIfEq 0x8006, 0, _0245 + GoToIfEq 0x8006, 2, _025F + GoToIfEq 0x8006, 3, _0279 End _0245: @@ -174,8 +156,7 @@ _0279: GoTo _0293 _0293: - CompareVar 0x8005, 0 - GoToIf 1, _0335 + GoToIfEq 0x8005, 0, _0335 SetVar 0x4001, 1 ScrCmd_02C 7 ScrCmd_031 @@ -200,8 +181,7 @@ _02C7: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _0328 + GoToIfEq 0x800C, 0, _0328 ScrCmd_130 0x8004 ScrCmd_1E5 54 ScrCmd_316 @@ -308,8 +288,7 @@ _03CC: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 0, 0x800C @@ -323,8 +302,7 @@ _0409: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 1, 0x800C @@ -338,8 +316,7 @@ _0446: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 2, 0x800C @@ -353,8 +330,7 @@ _0483: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 3, 0x800C @@ -368,8 +344,7 @@ _04C0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 4, 0x800C @@ -383,8 +358,7 @@ _04FD: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 5, 0x800C @@ -398,8 +372,7 @@ _053A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 6, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 6, 0x800C @@ -413,8 +386,7 @@ _0577: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 7, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 7, 0x800C @@ -428,8 +400,7 @@ _05B4: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 8, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 8, 0x800C @@ -443,8 +414,7 @@ _05F1: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 9, 0x800C @@ -458,8 +428,7 @@ _062E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12E 10, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _066B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A7 10, 0x800C diff --git a/res/field/scripts/script_0018.s b/res/field/scripts/script_0018.s index d0d8593fd8..3cbaabcacf 100644 --- a/res/field/scripts/script_0018.s +++ b/res/field/scripts/script_0018.s @@ -11,14 +11,10 @@ _0006: ScrCmd_068 ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 0 - GoToIf 1, _004E - CompareVar 0x8008, 1 - GoToIf 1, _005A - CompareVar 0x8008, 2 - GoToIf 1, _0066 - CompareVar 0x8008, 3 - GoToIf 1, _0072 + GoToIfEq 0x8008, 0, _004E + GoToIfEq 0x8008, 1, _005A + GoToIfEq 0x8008, 2, _0066 + GoToIfEq 0x8008, 3, _0072 End _004E: @@ -52,14 +48,10 @@ _007E: ScrCmd_042 124, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01DC - CompareVar 0x8008, 1 - GoToIf 1, _018B - CompareVar 0x8008, 2 - GoToIf 1, _013A - CompareVar 0x8008, 3 - GoToIf 1, _00E9 + GoToIfEq 0x8008, 0, _01DC + GoToIfEq 0x8008, 1, _018B + GoToIfEq 0x8008, 2, _013A + GoToIfEq 0x8008, 3, _00E9 GoTo _0283 End @@ -67,8 +59,7 @@ _00E9: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 11, 2, 18, 2, 1 - CompareVar 0x40CE, 3 - GoToIf 1, _026C + GoToIfEq 0x40CE, 3, _026C CompareVar 0x40CE, 3 CallIf 2, _022D CompareVar 0x40CE, 3 @@ -82,8 +73,7 @@ _013A: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 12, 3, 18, 2, 1 - CompareVar 0x40CE, 2 - GoToIf 1, _026C + GoToIfEq 0x40CE, 2, _026C CompareVar 0x40CE, 2 CallIf 2, _022D CompareVar 0x40CE, 2 @@ -97,8 +87,7 @@ _018B: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 13, 4, 18, 2, 1 - CompareVar 0x40CE, 1 - GoToIf 1, _026C + GoToIfEq 0x40CE, 1, _026C CompareVar 0x40CE, 1 CallIf 2, _022D CompareVar 0x40CE, 1 @@ -112,8 +101,7 @@ _01DC: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 14, 1, 18, 2, 1 - CompareVar 0x40CE, 0 - GoToIf 1, _026C + GoToIfEq 0x40CE, 0, _026C CompareVar 0x40CE, 0 CallIf 2, _022D CompareVar 0x40CE, 0 diff --git a/res/field/scripts/script_0024.s b/res/field/scripts/script_0024.s index 7affd5f51c..2338b9f6eb 100644 --- a/res/field/scripts/script_0024.s +++ b/res/field/scripts/script_0024.s @@ -48,15 +48,13 @@ _0063: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 191 - GoToIf 1, _00B7 + GoToIfSet 191, _00B7 ScrCmd_0D1 0, 217 ScrCmd_02C 3 SetVar 0x8004, 217 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AD + GoToIfEq 0x800C, 0, _00AD SetFlag 191 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0027.s b/res/field/scripts/script_0027.s index 74e9610bf4..b32b0b2f3f 100644 --- a/res/field/scripts/script_0027.s +++ b/res/field/scripts/script_0027.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 126 - GoToIf 1, _004B + GoToIfSet 126, _004B ScrCmd_02C 0 SetVar 0x8004, 230 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0056 + GoToIfEq 0x800C, 0, _0056 SetFlag 126 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0028.s b/res/field/scripts/script_0028.s index ee6d5bf27d..3cac2b584d 100644 --- a/res/field/scripts/script_0028.s +++ b/res/field/scripts/script_0028.s @@ -96,10 +96,8 @@ _00F4: ScrCmd_060 ScrCmd_068 ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0368 - CheckFlag 195 - GoToIf 1, _02FB + GoToIfEq 0x800C, 1, _0368 + GoToIfSet 195, _02FB SetFlag 195 ScrCmd_02C 0 GoTo _0127 @@ -112,12 +110,9 @@ _0127: ScrCmd_042 130, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01E9 - CompareVar 0x8008, 1 - GoToIf 1, _0172 - CompareVar 0x8008, 2 - GoToIf 1, _02EA + GoToIfEq 0x8008, 0, _01E9 + GoToIfEq 0x8008, 1, _0172 + GoToIfEq 0x8008, 2, _02EA GoTo _02EA End @@ -133,12 +128,9 @@ _017D: ScrCmd_042 133, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01C8 - CompareVar 0x8008, 1 - GoToIf 1, _01D3 - CompareVar 0x8008, 2 - GoToIf 1, _01DE + GoToIfEq 0x8008, 0, _01C8 + GoToIfEq 0x8008, 1, _01D3 + GoToIfEq 0x8008, 2, _01DE GoTo _01DE End @@ -159,8 +151,7 @@ _01DE: _01E9: ScrCmd_19A 0x800C - CompareVar 0x800C, 2 - GoToIf 0, _0202 + GoToIfLt 0x800C, 2, _0202 GoTo _0306 End @@ -174,8 +165,7 @@ _0202: _020D: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _02EA + GoToIfEq 0x800C, 0, _02EA ScrCmd_14E SetVar 0x40D5, 6 ScrCmd_02C 7 @@ -201,8 +191,7 @@ _020D: ScrCmd_0B3 0x800C SetVar 0x8004, 0x800C ScrCmd_0B2 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02CE + GoToIfEq 0x800C, 0, _02CE ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD @@ -233,15 +222,13 @@ _02FB: _0306: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _031F + GoToIfEq 0x800C, 6, _031F GoTo _020D End _031F: ScrCmd_252 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0338 + GoToIfEq 0x800C, 0, _0338 GoTo _020D End @@ -376,10 +363,8 @@ _0420: ScrCmd_042 40, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _046A - CompareVar 0x8008, 1 - GoToIf 1, _048B + GoToIfEq 0x8008, 0, _046A + GoToIfEq 0x8008, 1, _048B GoTo _0464 End @@ -391,8 +376,7 @@ _0464: _046A: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0464 + GoToIfEq 0x800C, 0, _0464 ScrCmd_034 ScrCmd_014 0x802 ScrCmd_061 @@ -419,10 +403,8 @@ _04AA: ScrCmd_042 40, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _04F4 - CompareVar 0x8008, 1 - GoToIf 1, _0515 + GoToIfEq 0x8008, 0, _04F4 + GoToIfEq 0x8008, 1, _0515 GoTo _04EE End @@ -434,8 +416,7 @@ _04EE: _04F4: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _04EE + GoToIfEq 0x800C, 0, _04EE ScrCmd_034 ScrCmd_014 0x802 ScrCmd_061 @@ -471,19 +452,15 @@ _0546: ScrCmd_060 ScrCmd_068 ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05A0 + GoToIfEq 0x800C, 1, _05A0 SetVar 0x8000, 0 ScrCmd_198 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05CB + GoToIfEq 0x800C, 0, _05CB ScrCmd_0D0 0, 0 ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05AB - CompareVar 0x800C, 1 - GoToIf 1, _05B8 + GoToIfEq 0x800C, 0, _05AB + GoToIfEq 0x800C, 1, _05B8 End _05A0: @@ -511,10 +488,8 @@ _05B8: _05CB: ScrCmd_02C 19 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05AB - CompareVar 0x800C, 1 - GoToIf 1, _05EE + GoToIfEq 0x800C, 0, _05AB + GoToIfEq 0x800C, 1, _05EE End _05EE: @@ -534,14 +509,12 @@ _0601: ScrCmd_068 ScrCmd_02C 29 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0647 + GoToIfEq 0x800C, 1, _0647 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_034 ScrCmd_30E 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _0647 + GoToIfEq 0x8004, 0, _0647 ScrCmd_02C 30 ScrCmd_031 ScrCmd_034 @@ -560,12 +533,9 @@ _0652: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B3, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0696 - CheckFlag 0xAC3 - GoToIf 1, _06FD - CheckFlag 207 - GoToIf 1, _06F2 + GoToIfEq 0x800C, 0, _0696 + GoToIfSet 0xAC3, _06FD + GoToIfSet 207, _06F2 ScrCmd_02C 24 SetVar 0x8004, 1 GoTo _06A1 @@ -578,11 +548,9 @@ _0696: _06A1: ScrCmd_1D6 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06D3 + GoToIfEq 0x800C, 0, _06D3 AddVar 0x8004, 1 - CompareVar 0x8004, 13 - GoToIf 3, _06A1 + GoToIfLe 0x8004, 13, _06A1 SetFlag 207 GoTo _06F2 End @@ -619,11 +587,9 @@ _0710: _071E: ScrCmd_1D6 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _074A + GoToIfEq 0x800C, 0, _074A AddVar 0x8004, 1 - CompareVar 0x8004, 13 - GoToIf 3, _071E + GoToIfLe 0x8004, 13, _071E SetFlag 207 Return diff --git a/res/field/scripts/script_0029.s b/res/field/scripts/script_0029.s index d5b012094a..ce7d26cd50 100644 --- a/res/field/scripts/script_0029.s +++ b/res/field/scripts/script_0029.s @@ -145,10 +145,8 @@ _011D: ScrCmd_042 17, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0167 - CompareVar 0x8008, 1 - GoToIf 1, _0188 + GoToIfEq 0x8008, 0, _0167 + GoToIfEq 0x8008, 1, _0188 GoTo _0161 End @@ -160,8 +158,7 @@ _0161: _0167: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0161 + GoToIfEq 0x800C, 0, _0161 ScrCmd_034 ScrCmd_014 0x802 ScrCmd_061 @@ -188,10 +185,8 @@ _01A7: ScrCmd_042 17, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01F1 - CompareVar 0x8008, 1 - GoToIf 1, _0212 + GoToIfEq 0x8008, 0, _01F1 + GoToIfEq 0x8008, 1, _0212 GoTo _01EB End @@ -203,8 +198,7 @@ _01EB: _01F1: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _01EB + GoToIfEq 0x800C, 0, _01EB ScrCmd_034 ScrCmd_014 0x802 ScrCmd_061 diff --git a/res/field/scripts/script_0030.s b/res/field/scripts/script_0030.s index ad155039d5..78f51490fd 100644 --- a/res/field/scripts/script_0030.s +++ b/res/field/scripts/script_0030.s @@ -144,10 +144,8 @@ _0119: ScrCmd_042 15, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0163 - CompareVar 0x8008, 1 - GoToIf 1, _0184 + GoToIfEq 0x8008, 0, _0163 + GoToIfEq 0x8008, 1, _0184 GoTo _015D End @@ -159,8 +157,7 @@ _015D: _0163: ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _015D + GoToIfEq 0x800C, 0, _015D ScrCmd_034 ScrCmd_014 0x802 ScrCmd_061 diff --git a/res/field/scripts/script_0031.s b/res/field/scripts/script_0031.s index 8208d541b7..639b69c855 100644 --- a/res/field/scripts/script_0031.s +++ b/res/field/scripts/script_0031.s @@ -39,10 +39,8 @@ _0032: ScrCmd_034 ScrCmd_1BD 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _00A4 - CompareVar 0x8008, 2 - GoToIf 1, _00BE + GoToIfEq 0x8008, 0, _00A4 + GoToIfEq 0x8008, 2, _00BE GoTo _00D8 End @@ -159,26 +157,20 @@ _01A6: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x112 - GoToIf 1, _02A8 - CheckFlag 0x10C - GoToIf 1, _02BD + GoToIfSet 0x112, _02A8 + GoToIfSet 0x10C, _02BD ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01E7 - CompareVar 0x800C, 1 - GoToIf 1, _02D3 + GoToIfEq 0x800C, 0, _01E7 + GoToIfEq 0x800C, 1, _02D3 End _01E7: ScrCmd_02C 10 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _0220 - CompareVar 0x800C, 0x186 - GoToIf 1, _022E + GoToIfEq 0x800C, 0x183, _0220 + GoToIfEq 0x800C, 0x186, _022E GoTo _0212 End @@ -199,13 +191,10 @@ _022E: _023C: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02DE + GoToIfEq 0x800C, 0, _02DE SetFlag 0x10C - CheckFlag 0x10D - GoToIf 1, _0274 - CheckFlag 0x10D - GoToIf 0, _0269 + GoToIfSet 0x10D, _0274 + GoToIfUnset 0x10D, _0269 End _0269: @@ -220,8 +209,7 @@ _0274: SetVar 0x8004, 17 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02B3 + GoToIfEq 0x800C, 0, _02B3 ScrCmd_014 0x7FC SetFlag 0x112 GoTo _02A8 @@ -241,8 +229,7 @@ _02B3: End _02BD: - CheckFlag 0x10D - GoToIf 1, _0274 + GoToIfSet 0x10D, _0274 ScrCmd_02C 12 ScrCmd_031 ScrCmd_034 @@ -265,24 +252,19 @@ _02E4: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x10D - GoToIf 1, _039C + GoToIfSet 0x10D, _039C ScrCmd_02C 15 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031A - CompareVar 0x800C, 1 - GoToIf 1, _03A7 + GoToIfEq 0x800C, 0, _031A + GoToIfEq 0x800C, 1, _03A7 End _031A: ScrCmd_02C 16 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _0353 - CompareVar 0x800C, 0x186 - GoToIf 1, _0361 + GoToIfEq 0x800C, 0x183, _0353 + GoToIfEq 0x800C, 0x186, _0361 GoTo _0345 End @@ -303,13 +285,10 @@ _0361: _036F: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03D3 + GoToIfEq 0x800C, 0, _03D3 SetFlag 0x10D - CheckFlag 0x10C - GoToIf 1, _03BD - CheckFlag 0x10C - GoToIf 0, _03B2 + GoToIfSet 0x10C, _03BD + GoToIfUnset 0x10C, _03B2 End _039C: @@ -334,8 +313,7 @@ _03B2: End _03BD: - CheckFlag 0x112 - GoToIf 1, _03B2 + GoToIfSet 0x112, _03B2 ScrCmd_02C 19 ScrCmd_031 ScrCmd_034 @@ -365,16 +343,11 @@ _03EA: ScrCmd_042 5, 5 ScrCmd_048 2 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _045F - CompareVar 0x8008, 1 - GoToIf 1, _046A - CompareVar 0x8008, 2 - GoToIf 1, _0475 - CompareVar 0x8008, 3 - GoToIf 1, _0480 - CompareVar 0x8008, 4 - GoToIf 1, _048B + GoToIfEq 0x8008, 0, _045F + GoToIfEq 0x8008, 1, _046A + GoToIfEq 0x8008, 2, _0475 + GoToIfEq 0x8008, 3, _0480 + GoToIfEq 0x8008, 4, _048B GoTo _0496 End diff --git a/res/field/scripts/script_0036.s b/res/field/scripts/script_0036.s index 21eb0fed93..951a2203aa 100644 --- a/res/field/scripts/script_0036.s +++ b/res/field/scripts/script_0036.s @@ -49,10 +49,8 @@ _0066: CompareVar 0x4078, 5 CallIf 1, _0158 ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0148 - CompareVar 0x4000, 1 - GoToIf 1, _0150 + GoToIfEq 0x4000, 0, _0148 + GoToIfEq 0x4000, 1, _0150 End _00F8: @@ -96,21 +94,15 @@ _0158: Return _0168: - CheckFlag 0x158 - GoToIf 1, _01CA - CheckFlag 0x964 - GoToIf 0, _01CA + GoToIfSet 0x158, _01CA + GoToIfUnset 0x964, _01CA ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01CA + GoToIfEq 0x4000, 0, _01CA ScrCmd_07E 0x1C6, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01CA + GoToIfEq 0x4000, 0, _01CA ScrCmd_28B 0, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01CA - CheckFlag 0x12C - GoToIf 0, _01CA + GoToIfEq 0x4000, 0, _01CA + GoToIfUnset 0x12C, _01CA SetVar 0x4000, 1 Return @@ -132,16 +124,11 @@ _01E7: _01F9: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2D3 - GoToIf 1, _0244 - CompareVar 0x8005, 0x2D4 - GoToIf 1, _0252 - CompareVar 0x8005, 0x2D5 - GoToIf 1, _0260 - CompareVar 0x8005, 0x2D6 - GoToIf 1, _026E - CompareVar 0x8005, 0x2D7 - GoToIf 1, _027C + GoToIfEq 0x8005, 0x2D3, _0244 + GoToIfEq 0x8005, 0x2D4, _0252 + GoToIfEq 0x8005, 0x2D5, _0260 + GoToIfEq 0x8005, 0x2D6, _026E + GoToIfEq 0x8005, 0x2D7, _027C End _0244: @@ -178,10 +165,8 @@ _028A: ScrCmd_02C 0 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _02EB - CompareVar 0x800C, 0x186 - GoToIf 1, _02F7 + GoToIfEq 0x800C, 0x183, _02EB + GoToIfEq 0x800C, 0x186, _02F7 GoTo _02DF _02DF: @@ -198,8 +183,7 @@ _02F7: _0303: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0334 + GoToIfEq 0x800C, 0, _0334 ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 @@ -306,8 +290,7 @@ _03C8: WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _045E + GoToIfEq 0x800C, 0, _045E GoTo _046A _045E: @@ -382,8 +365,7 @@ _04E7: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0506 + GoToIfEq 0x800C, 0, _0506 GoTo _050F _0506: @@ -404,8 +386,7 @@ _0520: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _053C + GoToIfSet 168, _053C ScrCmd_02C 14 GoTo _0545 @@ -423,11 +404,9 @@ _054D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0586 + GoToIfSet 168, _0586 ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0591 + GoToIfEq 0x800C, 1, _0591 GoTo _057B End @@ -442,8 +421,7 @@ _0586: End _0591: - CompareVar 0x4078, 5 - GoToIf 4, _057B + GoToIfGe 0x4078, 5, _057B ScrCmd_02C 18 GoTo _0545 End @@ -452,8 +430,7 @@ _05A9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _05C5 + GoToIfSet 168, _05C5 ScrCmd_02C 19 GoTo _0545 @@ -465,8 +442,7 @@ _05CE: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _05EA + GoToIfSet 168, _05EA ScrCmd_02C 21 GoTo _0545 @@ -478,8 +454,7 @@ _05F3: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0615 + GoToIfSet 168, _0615 ScrCmd_04C 54, 0 ScrCmd_02C 23 GoTo _0545 @@ -493,8 +468,7 @@ _0624: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0640 + GoToIfSet 168, _0640 ScrCmd_02C 25 GoTo _0545 @@ -544,8 +518,7 @@ _06A3: _06BA: Call _0168 - CompareVar 0x4000, 0 - GoToIf 1, _06E2 + GoToIfEq 0x4000, 0, _06E2 ScrCmd_037 3, 0 ScrCmd_038 3 ScrCmd_039 @@ -576,8 +549,7 @@ _0708: ScrCmd_068 ScrCmd_1BD 0x8004 ScrCmd_068 - CompareVar 0x4106, 2 - GoToIf 1, _0900 + GoToIfEq 0x4106, 2, _0900 ScrCmd_02C 27 ScrCmd_040 1, 1, 0, 1, 0x800C ScrCmd_042 213, 0 @@ -587,14 +559,10 @@ _0708: CallIf 1, _078A ScrCmd_042 218, 4 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0796 - CompareVar 0x800C, 1 - GoToIf 1, _07D1 - CompareVar 0x800C, 2 - GoToIf 1, _080C - CompareVar 0x800C, 3 - GoToIf 1, _0847 + GoToIfEq 0x800C, 0, _0796 + GoToIfEq 0x800C, 1, _07D1 + GoToIfEq 0x800C, 2, _080C + GoToIfEq 0x800C, 3, _0847 GoTo _0847 End @@ -716,14 +684,11 @@ _08F0: _0900: ScrCmd_07E 0x1C5, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _094E + GoToIfEq 0x800C, 1, _094E ScrCmd_02C 31 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0938 - CompareVar 0x800C, 1 - GoToIf 1, _0943 + GoToIfEq 0x800C, 0, _0938 + GoToIfEq 0x800C, 1, _0943 End _0938: @@ -781,11 +746,9 @@ _09BC: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1A7, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09FA + GoToIfEq 0x800C, 1, _09FA ScrCmd_09A 0x800C, 70 - CompareVar 0x800C, 6 - GoToIf 5, _09FA + GoToIfNe 0x800C, 6, _09FA ScrCmd_0CE 0 ScrCmd_02C 3 ScrCmd_031 diff --git a/res/field/scripts/script_0038.s b/res/field/scripts/script_0038.s index 965a1db07b..567da9a5a7 100644 --- a/res/field/scripts/script_0038.s +++ b/res/field/scripts/script_0038.s @@ -17,15 +17,13 @@ _0016: ScrCmd_060 ScrCmd_068 ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0107 + GoToIfEq 0x800C, 1, _0107 ScrCmd_1CD 9, 35, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 250, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0120 + GoToIfEq 0x800C, 0, _0120 ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -55,8 +53,7 @@ _00BF: SetVar 0x8004, 0x1A2 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FD + GoToIfEq 0x800C, 0, _00FD ScrCmd_014 0x7FC SetFlag 146 ScrCmd_0D1 0, 0x8004 @@ -74,8 +71,7 @@ _00FD: End _0107: - CheckFlag 146 - GoToIf 0, _00BF + GoToIfUnset 146, _00BF ScrCmd_0CE 1 ScrCmd_02C 5 ScrCmd_031 @@ -93,8 +89,7 @@ _0126: ScrCmd_060 ScrCmd_068 ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _014C + GoToIfEq 0x800C, 1, _014C ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -113,8 +108,7 @@ _015A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0184 + GoToIfEq 0x800C, 1, _0184 ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0042.s b/res/field/scripts/script_0042.s index 42e7e79269..d558f5a9f1 100644 --- a/res/field/scripts/script_0042.s +++ b/res/field/scripts/script_0042.s @@ -13,8 +13,7 @@ _0016: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0034 + GoToIfSet 168, _0034 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -31,8 +30,7 @@ _0034: _003F: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 168 - GoToIf 1, _0068 + GoToIfSet 168, _0068 ScrCmd_02C 2 ScrCmd_068 ScrCmd_02C 3 diff --git a/res/field/scripts/script_0043.s b/res/field/scripts/script_0043.s index b089147af5..afbab20d92 100644 --- a/res/field/scripts/script_0043.s +++ b/res/field/scripts/script_0043.s @@ -24,8 +24,7 @@ _0033: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0051 + GoToIfSet 168, _0051 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -42,8 +41,7 @@ _0051: _005C: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x4056, 3 - GoToIf 4, _0082 + GoToIfGe 0x4056, 3, _0082 ScrCmd_02C 2 GoTo _007A End @@ -84,19 +82,15 @@ _00B2: WaitMovement ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0104 - CompareVar 0x800C, 1 - GoToIf 1, _00E1 + GoToIfEq 0x800C, 0, _0104 + GoToIfEq 0x800C, 1, _00E1 End _00E1: ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0104 - CompareVar 0x800C, 1 - GoToIf 1, _00E1 + GoToIfEq 0x800C, 0, _0104 + GoToIfEq 0x800C, 1, _00E1 End _0104: @@ -106,19 +100,15 @@ _0104: WaitMovement ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0159 - CompareVar 0x800C, 1 - GoToIf 1, _0136 + GoToIfEq 0x800C, 0, _0159 + GoToIfEq 0x800C, 1, _0136 End _0136: ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0159 - CompareVar 0x800C, 1 - GoToIf 1, _0136 + GoToIfEq 0x800C, 0, _0159 + GoToIfEq 0x800C, 1, _0136 End _0159: diff --git a/res/field/scripts/script_0044.s b/res/field/scripts/script_0044.s index 8adf50a7e1..72d40e52ff 100644 --- a/res/field/scripts/script_0044.s +++ b/res/field/scripts/script_0044.s @@ -18,10 +18,8 @@ _0032: ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0052 - CompareVar 0x4000, 1 - GoToIf 1, _005A + GoToIfEq 0x4000, 0, _0052 + GoToIfEq 0x4000, 1, _005A End _0052: @@ -74,8 +72,7 @@ _0062: ScrCmd_02C 7 ScrCmd_02C 8 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0116 + GoToIfEq 0x800C, 0, _0116 GoTo _0124 End @@ -98,8 +95,7 @@ _0132: ApplyMovement 3, _03D8 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0162 + GoToIfEq 0x800C, 0, _0162 GoTo _0173 End @@ -340,8 +336,7 @@ _03E8: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _0406 + GoToIfSet 168, _0406 ScrCmd_02C 26 ScrCmd_031 ScrCmd_034 @@ -359,8 +354,7 @@ _0411: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 168 - GoToIf 1, _042F + GoToIfSet 168, _042F ScrCmd_02C 28 ScrCmd_031 ScrCmd_034 @@ -379,10 +373,8 @@ _043A: ScrCmd_060 ScrCmd_02C 30 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0471 - CompareVar 0x800C, 1 - GoToIf 1, _0463 + GoToIfEq 0x800C, 0, _0471 + GoToIfEq 0x800C, 1, _0463 End _0463: @@ -405,10 +397,8 @@ _047C: ScrCmd_060 ScrCmd_02C 33 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04B3 - CompareVar 0x800C, 1 - GoToIf 1, _04A5 + GoToIfEq 0x800C, 0, _04B3 + GoToIfEq 0x800C, 1, _04A5 End _04A5: @@ -431,10 +421,8 @@ _04BE: ScrCmd_060 ScrCmd_02C 36 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04F5 - CompareVar 0x800C, 1 - GoToIf 1, _04E7 + GoToIfEq 0x800C, 0, _04F5 + GoToIfEq 0x800C, 1, _04E7 End _04E7: @@ -457,10 +445,8 @@ _0500: ScrCmd_060 ScrCmd_02C 39 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0537 - CompareVar 0x800C, 1 - GoToIf 1, _0529 + GoToIfEq 0x800C, 0, _0537 + GoToIfEq 0x800C, 1, _0529 End _0529: @@ -474,12 +460,10 @@ _0529: _0537: ScrCmd_02C 41 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0529 + GoToIfEq 0x800C, 1, _0529 ScrCmd_02C 42 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0529 + GoToIfEq 0x800C, 1, _0529 ScrCmd_02C 43 ScrCmd_031 ScrCmd_034 @@ -491,10 +475,8 @@ _056A: ScrCmd_060 ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05A1 - CompareVar 0x800C, 1 - GoToIf 1, _0593 + GoToIfEq 0x800C, 0, _05A1 + GoToIfEq 0x800C, 1, _0593 End _0593: @@ -508,12 +490,10 @@ _0593: _05A1: ScrCmd_02C 46 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0593 + GoToIfEq 0x800C, 1, _0593 ScrCmd_02C 47 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0593 + GoToIfEq 0x800C, 1, _0593 ScrCmd_02C 48 ScrCmd_031 ScrCmd_034 @@ -525,10 +505,8 @@ _05D4: ScrCmd_060 ScrCmd_02C 49 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _060B - CompareVar 0x800C, 1 - GoToIf 1, _05FD + GoToIfEq 0x800C, 0, _060B + GoToIfEq 0x800C, 1, _05FD End _05FD: @@ -557,12 +535,9 @@ _0616: ScrCmd_29D 0x105, 2 ScrCmd_29D 0x106, 3 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0673 - CompareVar 0x800C, 1 - GoToIf 1, _067E - CompareVar 0x800C, 2 - GoToIf 1, _0689 + GoToIfEq 0x800C, 0, _0673 + GoToIfEq 0x800C, 1, _067E + GoToIfEq 0x800C, 2, _0689 GoTo _0694 End diff --git a/res/field/scripts/script_0045.s b/res/field/scripts/script_0045.s index 4976e883e1..a89df38af6 100644 --- a/res/field/scripts/script_0045.s +++ b/res/field/scripts/script_0045.s @@ -10,14 +10,12 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 201 - GoToIf 1, _0051 + GoToIfSet 201, _0051 ScrCmd_02C 0 SetVar 0x8004, 0x177 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005C + GoToIfEq 0x800C, 0, _005C ScrCmd_014 0x7FC SetFlag 201 GoTo _0051 diff --git a/res/field/scripts/script_0046.s b/res/field/scripts/script_0046.s index 46afac6ebe..68925ba571 100644 --- a/res/field/scripts/script_0046.s +++ b/res/field/scripts/script_0046.s @@ -9,8 +9,7 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 1 - GoToIf 1, _0026 + GoToIfSet 1, _0026 ScrCmd_02C 0 SetFlag 1 GoTo _0026 @@ -18,10 +17,8 @@ _0006: _0026: ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0049 - CompareVar 0x800C, 1 - GoToIf 1, _0130 + GoToIfEq 0x800C, 0, _0049 + GoToIfEq 0x800C, 1, _0130 End _0049: @@ -37,14 +34,11 @@ _0054: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 0xFF - GoToIf 1, _0130 + GoToIfEq 0x8002, 0xFF, _0130 ScrCmd_198 0x8002, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _011A + GoToIfEq 0x8001, 0, _011A ScrCmd_1C8 0x800C, 0x8002 - CompareVar 0x800C, 1 - GoToIf 1, _0125 + GoToIfEq 0x800C, 1, _0125 ScrCmd_02C 6 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -54,15 +48,12 @@ _0054: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8001, 0xFF - GoToIf 1, _0049 + GoToIfEq 0x8001, 0xFF, _0049 ScrCmd_1CB 0, 0x8002, 0x8001 ScrCmd_02C 7 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0105 - CompareVar 0x800C, 1 - GoToIf 1, _0049 + GoToIfEq 0x800C, 0, _0105 + GoToIfEq 0x800C, 1, _0049 End _0105: diff --git a/res/field/scripts/script_0047.s b/res/field/scripts/script_0047.s index 980feb7548..550c4deddc 100644 --- a/res/field/scripts/script_0047.s +++ b/res/field/scripts/script_0047.s @@ -9,41 +9,34 @@ _000E: SetFlag 0x241 - CheckFlag 0x158 - GoToIf 0, _001F + GoToIfUnset 0x158, _001F End _001F: - CheckFlag 0x964 - GoToIf 1, _002C + GoToIfSet 0x964, _002C End _002C: ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0040 + GoToIfEq 0x4000, 1, _0040 End _0040: ScrCmd_07E 0x1C6, 1, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0057 + GoToIfEq 0x4000, 1, _0057 End _0057: ScrCmd_28B 0, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _006B + GoToIfEq 0x4000, 1, _006B End _006B: - CheckFlag 0x12C - GoToIf 1, _0078 + GoToIfSet 0x12C, _0078 End _0078: - CompareVar 0x40F8, 2 - GoToIf 4, _0091 + GoToIfGe 0x40F8, 2, _0091 ClearFlag 0x241 SetVar 0x40F8, 1 End @@ -116,8 +109,7 @@ _0160: End _0184: - CheckFlag 0x158 - GoToIf 1, _0197 + GoToIfSet 0x158, _0197 SetVar 0x40F8, 0 Return diff --git a/res/field/scripts/script_0048.s b/res/field/scripts/script_0048.s index 8bf5a59e05..b72d2700eb 100644 --- a/res/field/scripts/script_0048.s +++ b/res/field/scripts/script_0048.s @@ -8,8 +8,7 @@ .short 0xFD13 _000E: - CompareVar 0x4106, 0 - GoToIf 1, _0037 + GoToIfEq 0x4106, 0, _0037 CompareVar 0x4106, 3 CallIf 1, _0073 CompareVar 0x4106, 1 @@ -18,14 +17,11 @@ _0035: End _0037: - CheckFlag 0x12C - GoToIf 1, _0035 + GoToIfSet 0x12C, _0035 ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0035 + GoToIfEq 0x4000, 0, _0035 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0035 + GoToIfEq 0x4000, 0, _0035 SetVar 0x4106, 1 Call _007B End @@ -51,12 +47,9 @@ _007B: _00A5: SetVar 0x8008, 0x4106 - CompareVar 0x8008, 1 - GoToIf 1, _00E5 - CompareVar 0x8008, 2 - GoToIf 1, _00E5 - CompareVar 0x8008, 3 - GoToIf 1, _00F8 + GoToIfEq 0x8008, 1, _00E5 + GoToIfEq 0x8008, 2, _00E5 + GoToIfEq 0x8008, 3, _00F8 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -87,12 +80,9 @@ _00F8: End _010B: - CompareVar 0x4106, 1 - GoToIf 1, _0158 - CompareVar 0x4106, 2 - GoToIf 1, _0158 - CompareVar 0x4106, 3 - GoToIf 1, _0145 + GoToIfEq 0x4106, 1, _0158 + GoToIfEq 0x4106, 2, _0158 + GoToIfEq 0x4106, 3, _0145 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -113,13 +103,10 @@ _0145: End _0158: - CheckFlag 0x133 - GoToIf 0, _01EA - CheckFlag 0x11F - GoToIf 0, _01D9 + GoToIfUnset 0x133, _01EA + GoToIfUnset 0x11F, _01D9 ScrCmd_07E 0x1C5, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D9 + GoToIfEq 0x800C, 0, _01D9 ScrCmd_049 0x5DC ScrCmd_060 SetFlag 0x12C diff --git a/res/field/scripts/script_0049.s b/res/field/scripts/script_0049.s index 51fb849042..7df72b58d1 100644 --- a/res/field/scripts/script_0049.s +++ b/res/field/scripts/script_0049.s @@ -8,8 +8,7 @@ _000A: ScrCmd_238 10, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0023 + GoToIfEq 0x4000, 0, _0023 ClearFlag 0x216 End diff --git a/res/field/scripts/script_0050.s b/res/field/scripts/script_0050.s index 6377d810cd..51dc3675d7 100644 --- a/res/field/scripts/script_0050.s +++ b/res/field/scripts/script_0050.s @@ -30,8 +30,7 @@ _005A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 138 - GoToIf 1, _0082 + GoToIfSet 138, _0082 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 0 @@ -54,10 +53,8 @@ _0090: ScrCmd_060 ScrCmd_068 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00C1 - CheckFlag 122 - GoToIf 1, _00CC + GoToIfEq 0x800C, 1, _00C1 + GoToIfSet 122, _00CC ScrCmd_02C 8 ScrCmd_031 ScrCmd_034 @@ -84,12 +81,9 @@ _00D7: ScrCmd_188 3, 16 ScrCmd_189 3, 2 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2EC - GoToIf 1, _011E - CompareVar 0x8005, 0x2ED - GoToIf 1, _0144 - CompareVar 0x8005, 0x2EE - GoToIf 1, _016A + GoToIfEq 0x8005, 0x2EC, _011E + GoToIfEq 0x8005, 0x2ED, _0144 + GoToIfEq 0x8005, 0x2EE, _016A GoTo _0190 End @@ -146,12 +140,9 @@ _01B6: ScrCmd_02C 5 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2EC - GoToIf 1, _021F - CompareVar 0x8005, 0x2ED - GoToIf 1, _0239 - CompareVar 0x8005, 0x2EE - GoToIf 1, _0253 + GoToIfEq 0x8005, 0x2EC, _021F + GoToIfEq 0x8005, 0x2ED, _0239 + GoToIfEq 0x8005, 0x2EE, _0253 GoTo _026D End @@ -295,14 +286,12 @@ _0376: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x109 - GoToIf 1, _03BD + GoToIfSet 0x109, _03BD ScrCmd_02C 17 SetVar 0x8004, 26 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03C8 + GoToIfEq 0x800C, 0, _03C8 ScrCmd_014 0x7FC SetFlag 0x109 GoTo _03BD @@ -344,12 +333,9 @@ _03E5: _03F8: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2EC - GoToIf 1, _042F - CompareVar 0x8005, 0x2ED - GoToIf 1, _0449 - CompareVar 0x8005, 0x2EE - GoToIf 1, _0463 + GoToIfEq 0x8005, 0x2EC, _042F + GoToIfEq 0x8005, 0x2ED, _0449 + GoToIfEq 0x8005, 0x2EE, _0463 GoTo _047D End @@ -386,14 +372,10 @@ _0497: ScrCmd_034 ScrCmd_014 0x800 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2EC - GoToIf 1, _04DC - CompareVar 0x8005, 0x2ED - GoToIf 1, _04F6 - CompareVar 0x8005, 0x2EE - GoToIf 1, _0510 - CompareVar 0x8005, 0x2EF - GoToIf 1, _052A + GoToIfEq 0x8005, 0x2EC, _04DC + GoToIfEq 0x8005, 0x2ED, _04F6 + GoToIfEq 0x8005, 0x2EE, _0510 + GoToIfEq 0x8005, 0x2EF, _052A End _04DC: @@ -540,8 +522,7 @@ _0647: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 122 - GoToIf 1, _0665 + GoToIfSet 122, _0665 ScrCmd_02C 11 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0052.s b/res/field/scripts/script_0052.s index de83f19838..e87a846314 100644 --- a/res/field/scripts/script_0052.s +++ b/res/field/scripts/script_0052.s @@ -12,15 +12,13 @@ _000E: ScrCmd_060 ScrCmd_068 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0103 + GoToIfEq 0x800C, 1, _0103 ScrCmd_1CD 9, 47, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 246, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0119 + GoToIfEq 0x800C, 0, _0119 ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -50,8 +48,7 @@ _00BB: SetVar 0x8004, 0x193 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F9 + GoToIfEq 0x800C, 0, _00F9 ScrCmd_014 0x7FC SetFlag 117 ScrCmd_0D1 0, 0x8004 @@ -69,8 +66,7 @@ _00F9: End _0103: - CheckFlag 117 - GoToIf 0, _00BB + GoToIfUnset 117, _00BB ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -87,8 +83,7 @@ _011F: ScrCmd_060 ScrCmd_068 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0145 + GoToIfEq 0x800C, 1, _0145 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -107,8 +102,7 @@ _0153: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _017D + GoToIfEq 0x800C, 1, _017D ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0053.s b/res/field/scripts/script_0053.s index 488f37c558..8fcd41adc0 100644 --- a/res/field/scripts/script_0053.s +++ b/res/field/scripts/script_0053.s @@ -40,8 +40,7 @@ _0050: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 112 - GoToIf 1, _006C + GoToIfSet 112, _006C ScrCmd_02C 2 GoTo _0078 @@ -62,17 +61,14 @@ _0078: ScrCmd_043 SetVar 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 4 - GoToIf 1, _00E9 - CompareVar 0x8008, -2 - GoToIf 1, _00E9 + GoToIfEq 0x8008, 4, _00E9 + GoToIfEq 0x8008, -2, _00E9 ScrCmd_155 0x8004, 0x8005 ScrCmd_344 0, 0x8005 ScrCmd_346 0 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F4 + GoToIfEq 0x800C, 0, _00F4 GoTo _0078 _00E9: @@ -94,8 +90,7 @@ _0110: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x964 - GoToIf 1, _012E + GoToIfSet 0x964, _012E ScrCmd_02C 8 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0057.s b/res/field/scripts/script_0057.s index 8f9d2ca187..4adbcb4249 100644 --- a/res/field/scripts/script_0057.s +++ b/res/field/scripts/script_0057.s @@ -32,15 +32,13 @@ _0038: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 192 - GoToIf 1, _008C + GoToIfSet 192, _008C ScrCmd_0D1 0, 13 ScrCmd_02C 2 SetVar 0x8004, 13 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0082 + GoToIfEq 0x800C, 0, _0082 SetFlag 192 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0058.s b/res/field/scripts/script_0058.s index 90f32887d9..295dbe8908 100644 --- a/res/field/scripts/script_0058.s +++ b/res/field/scripts/script_0058.s @@ -10,15 +10,13 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 124 - GoToIf 1, _0054 + GoToIfSet 124, _0054 ScrCmd_0D1 0, 238 ScrCmd_02C 0 SetVar 0x8004, 238 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0064 + GoToIfEq 0x800C, 0, _0064 SetFlag 124 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0060.s b/res/field/scripts/script_0060.s index b3cf332ee3..63909604d9 100644 --- a/res/field/scripts/script_0060.s +++ b/res/field/scripts/script_0060.s @@ -11,12 +11,10 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 133 - GoToIf 1, _00B7 + GoToIfSet 133, _00B7 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _003B + GoToIfEq 0x800C, 0, _003B GoTo _00AC _003B: @@ -28,14 +26,12 @@ _003B: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _00AC + GoToIfEq 0x800C, 0xFF, _00AC ScrCmd_226 0 SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C - CompareVar 0x8005, 0x800C - GoToIf 5, _009F + GoToIfNe 0x8005, 0x800C, _009F ScrCmd_229 0x8004 ScrCmd_22A SetFlag 133 diff --git a/res/field/scripts/script_0061.s b/res/field/scripts/script_0061.s index 0974968166..d540e9d422 100644 --- a/res/field/scripts/script_0061.s +++ b/res/field/scripts/script_0061.s @@ -31,17 +31,14 @@ _0034: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 193 - GoToIf 1, _00A1 + GoToIfSet 193, _00A1 ScrCmd_1C0 0x800C, 74 - CompareVar 0x800C, 0 - GoToIf 1, _0096 + GoToIfEq 0x800C, 0, _0096 ScrCmd_02C 3 SetVar 0x8004, 14 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _008C + GoToIfEq 0x800C, 0, _008C SetFlag 193 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0065.s b/res/field/scripts/script_0065.s index cfcf47cb2c..8cbc917169 100644 --- a/res/field/scripts/script_0065.s +++ b/res/field/scripts/script_0065.s @@ -34,22 +34,16 @@ _0055: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 1 - GoToIf 1, _03D8 + GoToIfSet 1, _03D8 ScrCmd_02C 1 - CheckFlag 121 - GoToIf 0, _04B6 - CompareVar 0x40B4, 0 - GoToIf 5, _03F2 + GoToIfUnset 121, _04B6 + GoToIfNe 0x40B4, 0, _03F2 ScrCmd_1F1 0x8000 - CompareVar 0x8000, 0 - GoToIf 1, _04AB + GoToIfEq 0x8000, 0, _04AB ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03E7 - CompareVar 0x8000, 1 - GoToIf 1, _03BC + GoToIfEq 0x800C, 1, _03E7 + GoToIfEq 0x8000, 1, _03BC SetVar 0x8001, 0 ScrCmd_07E 103, 1, 0x800C AddVar 0x8001, 0x800C @@ -65,8 +59,7 @@ _0055: AddVar 0x8001, 0x800C ScrCmd_07E 105, 1, 0x800C AddVar 0x8001, 0x800C - CompareVar 0x8001, 1 - GoToIf 1, _03BC + GoToIfEq 0x8001, 1, _03BC SetVar 0x8004, 0 SetVar 0x8005, 0 ScrCmd_040 1, 1, 0, 1, 0x8003 @@ -85,8 +78,7 @@ _013E: CallIf 1, _032C CompareVar 0x8005, 6 CallIf 1, _033C - CompareVar 0x800C, 0 - GoToIf 1, _0219 + GoToIfEq 0x800C, 0, _0219 CompareVar 0x8004, 0 CallIf 1, _034C CompareVar 0x8004, 1 @@ -113,14 +105,11 @@ _0219: _0225: AddVar 0x8004, 1 AddVar 0x8005, 1 - CompareVar 0x8004, 0x8001 - GoToIf 5, _013E + GoToIfNe 0x8004, 0x8001, _013E ScrCmd_29D 44, 0x8004 ScrCmd_043 - CompareVar 0x8003, 0xFF - GoToIf 1, _03E7 - CompareVar 0x8003, 0x4000 - GoToIf 1, _03E7 + GoToIfEq 0x8003, 0xFF, _03E7 + GoToIfEq 0x8003, 0x4000, _03E7 CompareVar 0x8003, 0 CallIf 1, _0384 CompareVar 0x8003, 1 @@ -136,8 +125,7 @@ _0225: CompareVar 0x8003, 6 CallIf 1, _03B4 ScrCmd_1F4 0x40B4, 0x8002 - CompareVar 0x40B4, 0 - GoToIf 1, _03E7 + GoToIfEq 0x40B4, 0, _03E7 ScrCmd_07C 0x8002, 1, 0x800C GoTo _03D8 @@ -257,8 +245,7 @@ _03F2: ScrCmd_0DA 0, 0x40B4, 0, 0 ScrCmd_02C 7 ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _04A0 + GoToIfEq 0x800C, 6, _04A0 ScrCmd_0DA 1, 0x40B4, 0, 0 ScrCmd_0CD 0 ScrCmd_04E 0x486 @@ -269,10 +256,8 @@ _03F2: SetVar 0x40B4, 0 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0459 - CompareVar 0x800C, 1 - GoToIf 1, _049A + GoToIfEq 0x800C, 0, _0459 + GoToIfEq 0x800C, 1, _049A End _0459: diff --git a/res/field/scripts/script_0068.s b/res/field/scripts/script_0068.s index f6f35cca7f..255bc91832 100644 --- a/res/field/scripts/script_0068.s +++ b/res/field/scripts/script_0068.s @@ -22,14 +22,12 @@ _0025: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x10A - GoToIf 1, _006C + GoToIfSet 0x10A, _006C ScrCmd_02C 1 SetVar 0x8004, 3 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0077 + GoToIfEq 0x800C, 0, _0077 ScrCmd_014 0x7FC SetFlag 0x10A GoTo _006C diff --git a/res/field/scripts/script_0071.s b/res/field/scripts/script_0071.s index 23bc04d649..f57443197d 100644 --- a/res/field/scripts/script_0071.s +++ b/res/field/scripts/script_0071.s @@ -36,14 +36,12 @@ _0072: CompareVar 0x407A, 4 CallIf 1, _00B5 ScrCmd_07E 0x1C2, 1, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0096 + GoToIfEq 0x4000, 1, _0096 End _0096: ScrCmd_07E 0x1AC, 1, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _00AD + GoToIfEq 0x4000, 1, _00AD End _00AD: @@ -78,8 +76,7 @@ _00E5: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 129 - GoToIf 1, _0103 + GoToIfSet 129, _0103 ScrCmd_02C 21 ScrCmd_031 ScrCmd_034 @@ -97,8 +94,7 @@ _010E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 129 - GoToIf 1, _012C + GoToIfSet 129, _012C ScrCmd_02C 23 ScrCmd_031 ScrCmd_034 @@ -163,23 +159,16 @@ _01A8: _01BF: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x20A - GoToIf 1, _01FD - CompareVar 0x8005, 0x20B - GoToIf 1, _0256 - CompareVar 0x8005, 0x20C - GoToIf 1, _0266 - CompareVar 0x8005, 0x20D - GoToIf 1, _0276 + GoToIfEq 0x8005, 0x20A, _01FD + GoToIfEq 0x8005, 0x20B, _0256 + GoToIfEq 0x8005, 0x20C, _0266 + GoToIfEq 0x8005, 0x20D, _0276 End _01FD: - CompareVar 0x8004, 0x130 - GoToIf 1, _0226 - CompareVar 0x8004, 0x131 - GoToIf 1, _0236 - CompareVar 0x8004, 0x132 - GoToIf 1, _0246 + GoToIfEq 0x8004, 0x130, _0226 + GoToIfEq 0x8004, 0x131, _0236 + GoToIfEq 0x8004, 0x132, _0246 End _0226: @@ -234,23 +223,16 @@ _0286: ScrCmd_02C 8 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x20A - GoToIf 1, _0322 - CompareVar 0x8005, 0x20B - GoToIf 1, _03DD - CompareVar 0x8005, 0x20C - GoToIf 1, _03F7 - CompareVar 0x8005, 0x20D - GoToIf 1, _0411 + GoToIfEq 0x8005, 0x20A, _0322 + GoToIfEq 0x8005, 0x20B, _03DD + GoToIfEq 0x8005, 0x20C, _03F7 + GoToIfEq 0x8005, 0x20D, _0411 End _0322: - CompareVar 0x8004, 0x130 - GoToIf 1, _038F - CompareVar 0x8004, 0x131 - GoToIf 1, _03A9 - CompareVar 0x8004, 0x132 - GoToIf 1, _03C3 + GoToIfEq 0x8004, 0x130, _038F + GoToIfEq 0x8004, 0x131, _03A9 + GoToIfEq 0x8004, 0x132, _03C3 End _034B: @@ -485,8 +467,7 @@ _056E: End _057F: - CheckFlag 121 - GoToIf 1, _059D + GoToIfSet 121, _059D ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -672,10 +653,8 @@ _0770: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 130 - GoToIf 0, _07A5 - CompareVar 0x408C, 1 - GoToIf 4, _07A5 + GoToIfUnset 130, _07A5 + GoToIfGe 0x408C, 1, _07A5 ScrCmd_02C 34 ScrCmd_031 ScrCmd_034 @@ -845,12 +824,9 @@ _0954: ScrCmd_064 33 ScrCmd_062 33 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x20B - GoToIf 1, _099D - CompareVar 0x8005, 0x20C - GoToIf 1, _09B7 - CompareVar 0x8005, 0x20D - GoToIf 1, _09D1 + GoToIfEq 0x8005, 0x20B, _099D + GoToIfEq 0x8005, 0x20C, _09B7 + GoToIfEq 0x8005, 0x20D, _09D1 End _099D: @@ -884,12 +860,9 @@ _09EB: ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x20B - GoToIf 1, _0A32 - CompareVar 0x8005, 0x20C - GoToIf 1, _0A5E - CompareVar 0x8005, 0x20D - GoToIf 1, _0A8A + GoToIfEq 0x8005, 0x20B, _0A32 + GoToIfEq 0x8005, 0x20C, _0A5E + GoToIfEq 0x8005, 0x20D, _0A8A End _0A32: @@ -1153,18 +1126,12 @@ _0D00: ScrCmd_189 12, 3 ScrCmd_188 12, 17 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x21C - GoToIf 1, _0D64 - CompareVar 0x8005, 0x21D - GoToIf 1, _0D7A - CompareVar 0x8005, 0x21E - GoToIf 1, _0D90 - CompareVar 0x8005, 0x21F - GoToIf 1, _0DA6 - CompareVar 0x8005, 0x220 - GoToIf 1, _0DBC - CompareVar 0x8005, 0x221 - GoToIf 1, _0DD2 + GoToIfEq 0x8005, 0x21C, _0D64 + GoToIfEq 0x8005, 0x21D, _0D7A + GoToIfEq 0x8005, 0x21E, _0D90 + GoToIfEq 0x8005, 0x21F, _0DA6 + GoToIfEq 0x8005, 0x220, _0DBC + GoToIfEq 0x8005, 0x221, _0DD2 End _0D64: @@ -1216,11 +1183,9 @@ _0DF6: WaitMovement ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0E75 + GoToIfEq 0x800C, 1, _0E75 ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 4, _0E67 + GoToIfGe 0x800C, 6, _0E67 Call _0E4B ApplyMovement 12, _0EA0 WaitMovement @@ -1276,29 +1241,22 @@ _0EB4: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x407A, 4 - GoToIf 1, _0ECD + GoToIfEq 0x407A, 4, _0ECD ScrCmd_061 End _0ECD: ScrCmd_02C 14 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0FAC + GoToIfEq 0x800C, 1, _0FAC ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 4, _0F9E + GoToIfGe 0x800C, 6, _0F9E Call _0E4B ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0F32 - CompareVar 0x800C, 1 - GoToIf 1, _0F4C - CompareVar 0x800C, 2 - GoToIf 1, _0F66 - CompareVar 0x800C, 3 - GoToIf 1, _0F78 + GoToIfEq 0x800C, 0, _0F32 + GoToIfEq 0x800C, 1, _0F4C + GoToIfEq 0x800C, 2, _0F66 + GoToIfEq 0x800C, 3, _0F78 End _0F32: @@ -1364,18 +1322,12 @@ _0FCD: _0FDC: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x21C - GoToIf 1, _1034 - CompareVar 0x8005, 0x21D - GoToIf 1, _1046 - CompareVar 0x8005, 0x21E - GoToIf 1, _1058 - CompareVar 0x8005, 0x21F - GoToIf 1, _106A - CompareVar 0x8005, 0x220 - GoToIf 1, _107C - CompareVar 0x8005, 0x221 - GoToIf 1, _108E + GoToIfEq 0x8005, 0x21C, _1034 + GoToIfEq 0x8005, 0x21D, _1046 + GoToIfEq 0x8005, 0x21E, _1058 + GoToIfEq 0x8005, 0x21F, _106A + GoToIfEq 0x8005, 0x220, _107C + GoToIfEq 0x8005, 0x221, _108E End _1034: diff --git a/res/field/scripts/script_0073.s b/res/field/scripts/script_0073.s index 227720e817..e5f775cf72 100644 --- a/res/field/scripts/script_0073.s +++ b/res/field/scripts/script_0073.s @@ -20,8 +20,7 @@ _0022: ScrCmd_060 ScrCmd_068 ScrCmd_15B 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0048 + GoToIfEq 0x800C, 1, _0048 ScrCmd_02C 13 ScrCmd_031 ScrCmd_034 @@ -40,8 +39,7 @@ _0056: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0080 + GoToIfEq 0x800C, 1, _0080 ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 15 @@ -65,15 +63,13 @@ _0094: ScrCmd_060 ScrCmd_068 ScrCmd_15B 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0161 + GoToIfEq 0x800C, 1, _0161 ScrCmd_1CD 9, 67, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x13B, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C3 + GoToIfEq 0x800C, 0, _01C3 ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -95,8 +91,7 @@ _0119: SetVar 0x8004, 0x19D SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0157 + GoToIfEq 0x800C, 0, _0157 ScrCmd_014 0x7FC SetFlag 116 ScrCmd_0D1 0, 0x8004 @@ -114,8 +109,7 @@ _0157: End _0161: - CheckFlag 116 - GoToIf 0, _0119 + GoToIfUnset 116, _0119 ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -126,8 +120,7 @@ _0177: SetVar 0x8004, 0x19D SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01B7 + GoToIfEq 0x800C, 0, _01B7 ScrCmd_014 0x7FC SetFlag 116 ScrCmd_0D1 0, 0x8004 @@ -155,15 +148,13 @@ _01C9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40AE, 1 - GoToIf 4, _0211 + GoToIfGe 0x40AE, 1, _0211 ScrCmd_0EA 0x144 ScrCmd_02C 6 ScrCmd_034 ScrCmd_0E5 0x144, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C3 + GoToIfEq 0x800C, 0, _01C3 ScrCmd_02C 7 ScrCmd_031 SetVar 0x40AE, 1 @@ -183,8 +174,7 @@ _021C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40AE, 2 - GoToIf 4, _0270 + GoToIfGe 0x40AE, 2, _0270 ScrCmd_0EA 0x103 SetVar 0x8007, 3 Call _02DA @@ -192,8 +182,7 @@ _021C: ScrCmd_034 ScrCmd_0E5 0x103, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C3 + GoToIfEq 0x800C, 0, _01C3 ScrCmd_02C 9 ScrCmd_031 SetVar 0x40AE, 2 @@ -213,8 +202,7 @@ _027B: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40AE, 3 - GoToIf 4, _02CF + GoToIfGe 0x40AE, 3, _02CF ScrCmd_0EA 0x104 SetVar 0x8007, 4 Call _02DA @@ -222,8 +210,7 @@ _027B: ScrCmd_034 ScrCmd_0E5 0x104, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C3 + GoToIfEq 0x800C, 0, _01C3 ScrCmd_02C 11 ScrCmd_031 SetVar 0x40AE, 3 diff --git a/res/field/scripts/script_0075.s b/res/field/scripts/script_0075.s index ed3a9d2bf7..667e372530 100644 --- a/res/field/scripts/script_0075.s +++ b/res/field/scripts/script_0075.s @@ -28,8 +28,7 @@ _0035: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 129 - GoToIf 1, _0053 + GoToIfSet 129, _0053 ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 @@ -60,19 +59,15 @@ _007D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4002, 1 - GoToIf 1, _00F4 + GoToIfEq 0x4002, 1, _00F4 ScrCmd_134 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D9 + GoToIfEq 0x800C, 0, _00D9 ScrCmd_247 0x8000 ScrCmd_0D0 0, 0x8000 ScrCmd_02C 6 ScrCmd_1B9 0x800C, 0x8000 - CompareVar 0x800C, 120 - GoToIf 4, _00FF - CompareVar 0x800C, 70 - GoToIf 4, _010A + GoToIfGe 0x800C, 120, _00FF + GoToIfGe 0x800C, 70, _010A GoTo _0115 End diff --git a/res/field/scripts/script_0078.s b/res/field/scripts/script_0078.s index d88bc3b447..ecfeb55da2 100644 --- a/res/field/scripts/script_0078.s +++ b/res/field/scripts/script_0078.s @@ -13,8 +13,7 @@ _0016: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 130 - GoToIf 1, _0052 + GoToIfSet 130, _0052 ScrCmd_02C 0 SetVar 0x8004, 0x1C2 SetVar 0x8005, 1 @@ -49,8 +48,7 @@ _007C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 129 - GoToIf 1, _009A + GoToIfSet 129, _009A ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0079.s b/res/field/scripts/script_0079.s index 99ceaa4991..c2a8df04dd 100644 --- a/res/field/scripts/script_0079.s +++ b/res/field/scripts/script_0079.s @@ -112,13 +112,10 @@ _0110: _0134: ScrCmd_07E 0x1D3, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01AA + GoToIfEq 0x800C, 0, _01AA ScrCmd_28B 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01AA - CheckFlag 129 - GoToIf 0, _01AA + GoToIfEq 0x800C, 0, _01AA + GoToIfUnset 129, _01AA ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 diff --git a/res/field/scripts/script_0082.s b/res/field/scripts/script_0082.s index 10fd52ec8b..64c89d64f0 100644 --- a/res/field/scripts/script_0082.s +++ b/res/field/scripts/script_0082.s @@ -29,8 +29,7 @@ _0022: ScrCmd_034 ScrCmd_0E5 0x196, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0135 + GoToIfEq 0x800C, 0, _0135 ScrCmd_02C 1 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -40,12 +39,9 @@ _0022: ScrCmd_0BD ScrCmd_003 15, 0x800C ScrCmd_1BD 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _00A4 - CompareVar 0x8004, 2 - GoToIf 1, _00BE - CompareVar 0x8004, 3 - GoToIf 1, _00D0 + GoToIfEq 0x8004, 0, _00A4 + GoToIfEq 0x8004, 2, _00BE + GoToIfEq 0x8004, 3, _00D0 End _00A4: @@ -194,8 +190,7 @@ _01D6: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 129 - GoToIf 1, _01F4 + GoToIfSet 129, _01F4 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0083.s b/res/field/scripts/script_0083.s index 20d3f7e24e..905f38eb0e 100644 --- a/res/field/scripts/script_0083.s +++ b/res/field/scripts/script_0083.s @@ -25,8 +25,7 @@ _0030: SetFlag 0x2BE SetFlag 0x2BF ScrCmd_28B 3, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00A5 + GoToIfEq 0x4000, 0, _00A5 ScrCmd_302 0x4000, 0x4001, 0x4002, 0x4003, 0x4004 CompareVar 0x4000, 0 CallIf 1, _00CF @@ -105,14 +104,11 @@ _013D: _0151: ScrCmd_1C0 0x800C, 0x1DF - CompareVar 0x800C, 0 - GoToIf 1, _06DE + GoToIfEq 0x800C, 0, _06DE ScrCmd_07E 0x1D3, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06DE + GoToIfEq 0x800C, 0, _06DE ScrCmd_28B 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06DE + GoToIfEq 0x800C, 0, _06DE CompareVar 0x8004, 1 CallIf 1, _06C5 CompareVar 0x8004, 3 @@ -124,11 +120,9 @@ _0151: CompareVar 0x8004, 5 CallIf 1, _06D9 ScrCmd_303 0x8003, 0x800C - CompareVar 0x8003, 1 - GoToIf 4, _0254 + GoToIfGe 0x8003, 1, _0254 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0740 + GoToIfEq 0x800C, 1, _0740 GoTo _01F8 End @@ -144,8 +138,7 @@ _01F8: CompareVar 0x8004, 5 CallIf 1, _06BD ScrCmd_2CB 0x800C, 0x1DF - CompareVar 0x800C, 1 - GoToIf 1, _03F5 + GoToIfEq 0x800C, 1, _03F5 GoTo _0403 End @@ -157,18 +150,15 @@ _0254: ScrCmd_042 14, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01F8 - CompareVar 0x8008, 2 - GoToIf 1, _0295 + GoToIfEq 0x8008, 0, _01F8 + GoToIfEq 0x8008, 2, _0295 GoTo _0740 End _0295: ScrCmd_303 0x8003, 0x800C SetVar 0x8000, 0x800C - CompareVar 0x8003, 2 - GoToIf 4, _037B + GoToIfGe 0x8003, 2, _037B GoTo _02B6 End @@ -236,16 +226,12 @@ _037B: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _03F3 + GoToIfEq 0x8000, 0xFF, _03F3 ScrCmd_198 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _045D - CompareVar 0x800C, 0x1DF - GoToIf 5, _0468 + GoToIfEq 0x800C, 0, _045D + GoToIfNe 0x800C, 0x1DF, _0468 ScrCmd_305 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03E8 + GoToIfEq 0x800C, 0, _03E8 GoTo _02B6 End @@ -272,13 +258,10 @@ _0403: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0740 + GoToIfEq 0x8000, 0xFF, _0740 ScrCmd_198 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _045D - CompareVar 0x800C, 0x1DF - GoToIf 5, _0468 + GoToIfEq 0x800C, 0, _045D + GoToIfNe 0x800C, 0x1DF, _0468 GoTo _0473 End @@ -294,24 +277,18 @@ _0468: _0473: ScrCmd_099 0x800C, 0x13B, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _04FD + GoToIfEq 0x800C, 1, _04FD ScrCmd_099 0x800C, 59, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _04FD + GoToIfEq 0x800C, 1, _04FD ScrCmd_099 0x800C, 56, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _04FD + GoToIfEq 0x800C, 1, _04FD ScrCmd_099 0x800C, 0x193, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _04FD + GoToIfEq 0x800C, 1, _04FD ScrCmd_099 0x800C, 0x1B5, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _04FD + GoToIfEq 0x800C, 1, _04FD ScrCmd_1C8 0x800C, 0x8000 SetVar 0x8002, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _051B + GoToIfEq 0x800C, 4, _051B GoTo _050B End @@ -331,8 +308,7 @@ _051B: ScrCmd_0D4 1, 0x8001 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05FE + GoToIfEq 0x800C, 1, _05FE GoTo _0541 End @@ -345,14 +321,12 @@ _0541: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 4 - GoToIf 1, _05DD + GoToIfEq 0x8002, 4, _05DD ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05FE + GoToIfEq 0x800C, 1, _05FE ScrCmd_0D6 0, 0x8000 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C @@ -374,8 +348,7 @@ _05DD: ScrCmd_0D4 1, 0x8001 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0541 + GoToIfEq 0x800C, 1, _0541 GoTo _05FE End @@ -401,8 +374,7 @@ _0613: CallIf 1, _068B CompareVar 0x8004, 5 CallIf 1, _0697 - CheckFlag 119 - GoToIf 0, _080C + GoToIfUnset 119, _080C GoTo _0325 End @@ -553,16 +525,14 @@ _07BB: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_303 0x8003, 0x800C - CompareVar 0x8003, 0 - GoToIf 1, _0801 + GoToIfEq 0x8003, 0, _0801 ScrCmd_02C 13 ScrCmd_041 31, 15, 0, 1, 0x800C ScrCmd_33A 1 ScrCmd_042 14, 0 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0295 + GoToIfEq 0x8008, 0, _0295 ScrCmd_034 ScrCmd_061 End @@ -686,40 +656,31 @@ _0908: ScrCmd_068 ScrCmd_02C 38 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 39 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 40 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 41 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 42 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 43 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 45 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 46 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09CF + GoToIfEq 0x800C, 1, _09CF ScrCmd_02C 47 GoTo _09D5 End diff --git a/res/field/scripts/script_0084.s b/res/field/scripts/script_0084.s index 2abf7ce071..8769ee289e 100644 --- a/res/field/scripts/script_0084.s +++ b/res/field/scripts/script_0084.s @@ -13,8 +13,7 @@ _000E: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0032 + GoToIfEq 0x800C, 0, _0032 GoTo _00B3 End @@ -29,20 +28,16 @@ _0032: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _00B3 + GoToIfEq 0x800C, 0xFF, _00B3 SetVar 0x8005, 0x800C ScrCmd_198 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00BE + GoToIfEq 0x800C, 0, _00BE ScrCmd_199 0x8005, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00C9 + GoToIfEq 0x800C, 1, _00C9 ScrCmd_0D6 0, 0x8005 ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D9 + GoToIfEq 0x800C, 0, _00D9 GoTo _00B3 End @@ -78,8 +73,7 @@ _00D9: ScrCmd_0BB 0x8005, 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 1 - GoToIf 1, _0129 + GoToIfEq 0x800C, 1, _0129 ScrCmd_2B8 0x8005 ScrCmd_1E5 49 ScrCmd_0D6 0, 0x8005 @@ -101,12 +95,10 @@ _0139: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 134 - GoToIf 1, _01E4 + GoToIfSet 134, _01E4 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0168 + GoToIfEq 0x800C, 0, _0168 GoTo _01D9 End @@ -119,14 +111,12 @@ _0168: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _01D9 + GoToIfEq 0x800C, 0xFF, _01D9 ScrCmd_226 1 SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C - CompareVar 0x8005, 0x800C - GoToIf 5, _01CC + GoToIfNe 0x8005, 0x800C, _01CC ScrCmd_229 0x8004 ScrCmd_22A SetFlag 134 @@ -163,8 +153,7 @@ _01EF: ScrCmd_060 ScrCmd_068 ScrCmd_1B6 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _021B + GoToIfEq 0x800C, 4, _021B GoTo _0210 End diff --git a/res/field/scripts/script_0085.s b/res/field/scripts/script_0085.s index 3e611a5068..e7e72c5012 100644 --- a/res/field/scripts/script_0085.s +++ b/res/field/scripts/script_0085.s @@ -11,14 +11,12 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 194 - GoToIf 1, _005D + GoToIfSet 194, _005D ScrCmd_02C 0 SetVar 0x8004, 0x18A SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0053 + GoToIfEq 0x800C, 0, _0053 SetFlag 194 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0087.s b/res/field/scripts/script_0087.s index 660428c0df..010f616e33 100644 --- a/res/field/scripts/script_0087.s +++ b/res/field/scripts/script_0087.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 118 - GoToIf 1, _004B + GoToIfSet 118, _004B ScrCmd_02C 0 SetVar 0x8004, 0x14B SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0056 + GoToIfEq 0x800C, 0, _0056 SetFlag 118 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0088.s b/res/field/scripts/script_0088.s index 281a9389bc..70f3f700ce 100644 --- a/res/field/scripts/script_0088.s +++ b/res/field/scripts/script_0088.s @@ -43,8 +43,7 @@ _004E: _0061: ScrCmd_060 ScrCmd_0C7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0091 + GoToIfEq 0x800C, 1, _0091 ApplyMovement 1, _00A0 WaitMovement ScrCmd_02C 1 @@ -81,13 +80,11 @@ _00C0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x10B - GoToIf 1, _0154 + GoToIfSet 0x10B, _0154 ScrCmd_0CD 0 ScrCmd_0CF 1 ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00F0 + GoToIfEq 0x4000, 0, _00F0 GoTo _00F9 _00F0: @@ -101,14 +98,12 @@ _00F9: _0102: ScrCmd_120 0x8004 ScrCmd_0D5 1, 0x8004 - CompareVar 0x8004, 35 - GoToIf 0, _015F + GoToIfLt 0x8004, 35, _015F ScrCmd_02C 5 SetVar 0x8004, 216 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _014A + GoToIfEq 0x800C, 0, _014A SetFlag 0x10B ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0090.s b/res/field/scripts/script_0090.s index a660cf0293..8feb91c183 100644 --- a/res/field/scripts/script_0090.s +++ b/res/field/scripts/script_0090.s @@ -9,15 +9,11 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 152 - GoToIf 1, _0113 + GoToIfSet 152, _0113 Call _0119 - CompareVar 0x800C, 1 - GoToIf 1, _0106 - CheckFlag 153 - GoToIf 1, _00B3 - CheckFlag 0x119 - GoToIf 1, _008B + GoToIfEq 0x800C, 1, _0106 + GoToIfSet 153, _00B3 + GoToIfSet 0x119, _008B ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_034 @@ -27,8 +23,7 @@ _0006: SetVar 0x8004, 252 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0091 + GoToIfEq 0x800C, 0, _0091 ScrCmd_014 0x7FC SetFlag 0x119 ScrCmd_02C 2 @@ -91,12 +86,9 @@ _0113: End _0119: - CompareVar 0x405E, 1 - GoToIf 5, _0148 - CompareVar 0x405F, 1 - GoToIf 5, _0148 - CompareVar 0x4060, 1 - GoToIf 5, _0148 + GoToIfNe 0x405E, 1, _0148 + GoToIfNe 0x405F, 1, _0148 + GoToIfNe 0x4060, 1, _0148 SetVar 0x800C, 1 Return diff --git a/res/field/scripts/script_0091.s b/res/field/scripts/script_0091.s index ac1c23704c..10ec4647b0 100644 --- a/res/field/scripts/script_0091.s +++ b/res/field/scripts/script_0091.s @@ -33,12 +33,10 @@ _0034: ScrCmd_068 ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _006F + GoToIfEq 0x800C, 1, _006F ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _006F + GoToIfEq 0x800C, 1, _006F ScrCmd_02C 4 GoTo _007A End diff --git a/res/field/scripts/script_0092.s b/res/field/scripts/script_0092.s index a78975731b..dc265ef656 100644 --- a/res/field/scripts/script_0092.s +++ b/res/field/scripts/script_0092.s @@ -14,12 +14,9 @@ _001A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40B6, 9 - GoToIf 4, _00B2 - CheckFlag 0x113 - GoToIf 1, _0164 - CheckFlag 121 - GoToIf 1, _007E + GoToIfGe 0x40B6, 9, _00B2 + GoToIfSet 0x113, _0164 + GoToIfSet 121, _007E ScrCmd_02C 0 SetVar 0x8004, 0x1AC SetVar 0x8005, 1 @@ -28,16 +25,14 @@ _001A: ClearFlag 0x111 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _009C + GoToIfEq 0x800C, 1, _009C SetFlag 0x113 GoTo _0164 _007E: ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _009C + GoToIfEq 0x800C, 1, _009C SetFlag 0x113 GoTo _0164 @@ -156,31 +151,20 @@ _0159: End _0164: - CompareVar 0x40B6, 0 - GoToIf 1, _01DF - CompareVar 0x40B6, 1 - GoToIf 1, _023D - CompareVar 0x40B6, 2 - GoToIf 1, _029B - CompareVar 0x40B6, 3 - GoToIf 1, _02D9 - CompareVar 0x40B6, 4 - GoToIf 1, _0347 - CompareVar 0x40B6, 5 - GoToIf 1, _03D9 - CompareVar 0x40B6, 6 - GoToIf 1, _0448 - CompareVar 0x40B6, 7 - GoToIf 1, _04A9 - CompareVar 0x40B6, 8 - GoToIf 1, _050A + GoToIfEq 0x40B6, 0, _01DF + GoToIfEq 0x40B6, 1, _023D + GoToIfEq 0x40B6, 2, _029B + GoToIfEq 0x40B6, 3, _02D9 + GoToIfEq 0x40B6, 4, _0347 + GoToIfEq 0x40B6, 5, _03D9 + GoToIfEq 0x40B6, 6, _0448 + GoToIfEq 0x40B6, 7, _04A9 + GoToIfEq 0x40B6, 8, _050A GoTo _00B2 _01DF: - CheckFlag 0x111 - GoToIf 0, _00BD - CheckFlag 0x96E - GoToIf 0, _0122 + GoToIfUnset 0x111, _00BD + GoToIfUnset 0x96E, _0122 SetVar 0x40B6, 1 ClearFlag 0x111 ScrCmd_02C 6 @@ -200,10 +184,8 @@ _01DF: End _023D: - CheckFlag 0x111 - GoToIf 0, _00CC - CheckFlag 0x96F - GoToIf 0, _012D + GoToIfUnset 0x111, _00CC + GoToIfUnset 0x96F, _012D SetVar 0x40B6, 2 ClearFlag 0x111 ScrCmd_02C 10 @@ -223,10 +205,8 @@ _023D: End _029B: - CheckFlag 0x111 - GoToIf 0, _00DB - CheckFlag 0x970 - GoToIf 0, _0138 + GoToIfUnset 0x111, _00DB + GoToIfUnset 0x970, _0138 SetVar 0x40B6, 3 ClearFlag 0x111 ScrCmd_02C 14 @@ -240,10 +220,8 @@ _029B: End _02D9: - CheckFlag 0x111 - GoToIf 0, _00EA - CheckFlag 0x971 - GoToIf 0, _0143 + GoToIfUnset 0x111, _00EA + GoToIfUnset 0x971, _0143 SetVar 0x40B6, 4 ClearFlag 0x111 ScrCmd_02C 18 @@ -266,10 +244,8 @@ _02D9: End _0347: - CheckFlag 0x111 - GoToIf 0, _00F9 - CheckFlag 0x972 - GoToIf 0, _014E + GoToIfUnset 0x111, _00F9 + GoToIfUnset 0x972, _014E SetVar 0x40B6, 5 ClearFlag 0x111 ClearFlag 252 @@ -283,10 +259,8 @@ _0347: _037F: ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x186 - GoToIf 1, _03A3 - CompareVar 0x800C, 0x183 - GoToIf 1, _03B5 + GoToIfEq 0x800C, 0x186, _03A3 + GoToIfEq 0x800C, 0x183, _03B5 GoTo _03C7 _03A3: @@ -308,10 +282,8 @@ _03C7: Return _03D9: - CheckFlag 0x111 - GoToIf 0, _0108 - CheckFlag 0x973 - GoToIf 0, _0159 + GoToIfUnset 0x111, _0108 + GoToIfUnset 0x973, _0159 CheckFlag 252 CallIf 1, _057A CheckFlag 252 @@ -319,8 +291,7 @@ _03D9: SetVar 0x8004, 81 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _056B + GoToIfEq 0x800C, 0, _056B ScrCmd_014 0x7FE SetVar 0x40B6, 6 ClearFlag 0x111 @@ -337,8 +308,7 @@ _0443: _0448: ScrCmd_24A 0x800C - CompareVar 0x800C, 3 - GoToIf 0, _00A7 + GoToIfLt 0x800C, 3, _00A7 CheckFlag 252 CallIf 1, _057A CheckFlag 252 @@ -346,8 +316,7 @@ _0448: SetVar 0x8004, 82 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _056B + GoToIfEq 0x800C, 0, _056B ScrCmd_014 0x7DC SetVar 0x40B6, 7 ClearFlag 252 @@ -361,8 +330,7 @@ _04A4: _04A9: ScrCmd_24A 0x800C - CompareVar 0x800C, 10 - GoToIf 0, _00A7 + GoToIfLt 0x800C, 10, _00A7 CheckFlag 252 CallIf 1, _057A CheckFlag 252 @@ -370,8 +338,7 @@ _04A9: SetVar 0x8004, 83 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _056B + GoToIfEq 0x800C, 0, _056B ScrCmd_014 0x7DC SetVar 0x40B6, 8 ClearFlag 252 @@ -385,8 +352,7 @@ _0505: _050A: ScrCmd_24A 0x800C - CompareVar 0x800C, 50 - GoToIf 0, _00A7 + GoToIfLt 0x800C, 50, _00A7 CheckFlag 252 CallIf 1, _057A CheckFlag 252 @@ -394,8 +360,7 @@ _050A: SetVar 0x8004, 84 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _056B + GoToIfEq 0x800C, 0, _056B ScrCmd_014 0x7DC SetVar 0x40B6, 9 ClearFlag 252 @@ -421,12 +386,9 @@ _057A: _057F: ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 5 - GoToIf 1, _05B2 - CompareVar 0x8004, 7 - GoToIf 1, _05BE - CompareVar 0x8005, 4 - GoToIf 1, _05CA + GoToIfEq 0x8004, 5, _05B2 + GoToIfEq 0x8004, 7, _05BE + GoToIfEq 0x8005, 4, _05CA GoTo _05D6 _05B2: @@ -495,8 +457,7 @@ _0647: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 189 - GoToIf 1, _0669 + GoToIfSet 189, _0669 SetFlag 189 ScrCmd_02C 38 ScrCmd_031 @@ -538,16 +499,11 @@ _0696: ScrCmd_042 12, 5 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _070A - CompareVar 0x8008, 1 - GoToIf 1, _0715 - CompareVar 0x8008, 2 - GoToIf 1, _0720 - CompareVar 0x8008, 3 - GoToIf 1, _072B - CompareVar 0x8008, 4 - GoToIf 1, _0736 + GoToIfEq 0x8008, 0, _070A + GoToIfEq 0x8008, 1, _0715 + GoToIfEq 0x8008, 2, _0720 + GoToIfEq 0x8008, 3, _072B + GoToIfEq 0x8008, 4, _0736 GoTo _0741 End diff --git a/res/field/scripts/script_0093.s b/res/field/scripts/script_0093.s index 143a769125..1b03a85820 100644 --- a/res/field/scripts/script_0093.s +++ b/res/field/scripts/script_0093.s @@ -136,24 +136,18 @@ _013B: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 1 - GoToIf 1, _01A7 + GoToIfSet 1, _01A7 ScrCmd_02C 14 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01B2 + GoToIfEq 0x800C, 1, _01B2 ScrCmd_02C 15 ScrCmd_034 ScrCmd_003 15, 0x800C ScrCmd_1BD 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _01BD - CompareVar 0x8004, 1 - GoToIf 1, _01D7 - CompareVar 0x8004, 2 - GoToIf 1, _01F1 - CompareVar 0x8004, 3 - GoToIf 1, _020B + GoToIfEq 0x8004, 0, _01BD + GoToIfEq 0x8004, 1, _01D7 + GoToIfEq 0x8004, 2, _01F1 + GoToIfEq 0x8004, 3, _020B End _01A7: @@ -313,42 +307,28 @@ _031B: ScrCmd_068 ScrCmd_02C 24 ScrCmd_02C 25 - CheckFlag 0x14A - GoToIf 0, _03AC - CheckFlag 0x14B - GoToIf 0, _03AC - CheckFlag 0x14C - GoToIf 0, _03AC - CheckFlag 0x14D - GoToIf 0, _03AC - CheckFlag 0x14E - GoToIf 0, _03AC - CheckFlag 0x14F - GoToIf 0, _03AC - CheckFlag 0x150 - GoToIf 0, _03AC - CheckFlag 0x151 - GoToIf 0, _03AC - CheckFlag 0x152 - GoToIf 0, _03AC - CheckFlag 0x153 - GoToIf 0, _03AC - CheckFlag 0x154 - GoToIf 0, _03AC + GoToIfUnset 0x14A, _03AC + GoToIfUnset 0x14B, _03AC + GoToIfUnset 0x14C, _03AC + GoToIfUnset 0x14D, _03AC + GoToIfUnset 0x14E, _03AC + GoToIfUnset 0x14F, _03AC + GoToIfUnset 0x150, _03AC + GoToIfUnset 0x151, _03AC + GoToIfUnset 0x152, _03AC + GoToIfUnset 0x153, _03AC + GoToIfUnset 0x154, _03AC SetFlag 0x15B GoTo _06E8 _03AC: - CheckFlag 0x14A - GoToIf 1, _03F4 - CheckFlag 0x98C - GoToIf 0, _03F4 + GoToIfSet 0x14A, _03F4 + GoToIfUnset 0x98C, _03F4 ScrCmd_02C 33 SetVar 0x8004, 46 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14A ScrCmd_034 @@ -356,17 +336,14 @@ _03AC: End _03F4: - CheckFlag 0x14B - GoToIf 1, _0442 + GoToIfSet 0x14B, _0442 ScrCmd_15D 0x800C - CompareVar 0x800C, 8 - GoToIf 0, _0442 + GoToIfLt 0x800C, 8, _0442 ScrCmd_02C 34 SetVar 0x8004, 47 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14B ScrCmd_034 @@ -374,16 +351,13 @@ _03F4: End _0442: - CheckFlag 0x14C - GoToIf 1, _048A - CheckFlag 0x96A - GoToIf 0, _048A + GoToIfSet 0x14C, _048A + GoToIfUnset 0x96A, _048A ScrCmd_02C 35 SetVar 0x8004, 72 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14C ScrCmd_034 @@ -391,16 +365,13 @@ _0442: End _048A: - CheckFlag 0x14D - GoToIf 1, _04D2 - CheckFlag 0x968 - GoToIf 0, _04D2 + GoToIfSet 0x14D, _04D2 + GoToIfUnset 0x968, _04D2 ScrCmd_02C 36 SetVar 0x8004, 73 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14D ScrCmd_034 @@ -408,16 +379,13 @@ _048A: End _04D2: - CheckFlag 0x14E - GoToIf 1, _051A - CheckFlag 0x969 - GoToIf 0, _051A + GoToIfSet 0x14E, _051A + GoToIfUnset 0x969, _051A ScrCmd_02C 37 SetVar 0x8004, 74 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14E ScrCmd_034 @@ -425,16 +393,13 @@ _04D2: End _051A: - CheckFlag 0x14F - GoToIf 1, _0562 - CheckFlag 0x96C - GoToIf 0, _0562 + GoToIfSet 0x14F, _0562 + GoToIfUnset 0x96C, _0562 ScrCmd_02C 38 SetVar 0x8004, 75 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x14F ScrCmd_034 @@ -442,16 +407,13 @@ _051A: End _0562: - CheckFlag 0x150 - GoToIf 1, _05AA - CheckFlag 0x96B - GoToIf 0, _05AA + GoToIfSet 0x150, _05AA + GoToIfUnset 0x96B, _05AA ScrCmd_02C 39 SetVar 0x8004, 76 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x150 ScrCmd_034 @@ -459,17 +421,14 @@ _0562: End _05AA: - CheckFlag 0x151 - GoToIf 1, _05F8 + GoToIfSet 0x151, _05F8 ScrCmd_293 0x800C - CompareVar 0x800C, 100 - GoToIf 0, _05F8 + GoToIfLt 0x800C, 100, _05F8 ScrCmd_02C 40 SetVar 0x8004, 77 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x151 ScrCmd_034 @@ -477,17 +436,14 @@ _05AA: End _05F8: - CheckFlag 0x152 - GoToIf 1, _0646 + GoToIfSet 0x152, _0646 ScrCmd_286 0x800C - CompareVar 0x800C, 100 - GoToIf 0, _0646 + GoToIfLt 0x800C, 100, _0646 ScrCmd_02C 41 SetVar 0x8004, 78 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x152 ScrCmd_034 @@ -495,17 +451,14 @@ _05F8: End _0646: - CheckFlag 0x153 - GoToIf 1, _0694 + GoToIfSet 0x153, _0694 ScrCmd_287 0x800C - CompareVar 0x800C, 100 - GoToIf 0, _0694 + GoToIfLt 0x800C, 100, _0694 ScrCmd_02C 42 SetVar 0x8004, 79 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x153 ScrCmd_034 @@ -513,17 +466,14 @@ _0646: End _0694: - CheckFlag 0x154 - GoToIf 1, _06E2 + GoToIfSet 0x154, _06E2 ScrCmd_288 0x800C - CompareVar 0x800C, 100 - GoToIf 0, _06E2 + GoToIfLt 0x800C, 100, _06E2 ScrCmd_02C 43 SetVar 0x8004, 80 SetVar 0x8005, 1 ScrCmd_085 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06F3 + GoToIfEq 0x800C, 0, _06F3 ScrCmd_014 0x7DC SetFlag 0x154 ScrCmd_034 @@ -598,16 +548,11 @@ _0753: ApplyMovement 0xFF, _087C WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2D5 - GoToIf 1, _07A8 - CompareVar 0x8005, 0x2D6 - GoToIf 1, _07C0 - CompareVar 0x8005, 0x2D7 - GoToIf 1, _07D8 - CompareVar 0x8005, 0x2D8 - GoToIf 1, _07F0 - CompareVar 0x8005, 0x2D9 - GoToIf 1, _0808 + GoToIfEq 0x8005, 0x2D5, _07A8 + GoToIfEq 0x8005, 0x2D6, _07C0 + GoToIfEq 0x8005, 0x2D7, _07D8 + GoToIfEq 0x8005, 0x2D8, _07F0 + GoToIfEq 0x8005, 0x2D9, _0808 End _07A8: diff --git a/res/field/scripts/script_0095.s b/res/field/scripts/script_0095.s index 9dcac06231..8d98204c0e 100644 --- a/res/field/scripts/script_0095.s +++ b/res/field/scripts/script_0095.s @@ -12,14 +12,11 @@ _000E: ScrCmd_060 ScrCmd_068 ScrCmd_15B 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _006A + GoToIfEq 0x800C, 1, _006A ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _004C - CompareVar 0x800C, 1 - GoToIf 1, _0057 + GoToIfEq 0x800C, 0, _004C + GoToIfEq 0x800C, 1, _0057 End _004C: @@ -48,8 +45,7 @@ _0078: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00A2 + GoToIfEq 0x800C, 1, _00A2 ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 5 diff --git a/res/field/scripts/script_0098.s b/res/field/scripts/script_0098.s index 5827e1cc61..adee42c4bd 100644 --- a/res/field/scripts/script_0098.s +++ b/res/field/scripts/script_0098.s @@ -11,8 +11,7 @@ .short 0xFD13 _001A: - CheckFlag 142 - GoToIf 1, _0027 + GoToIfSet 142, _0027 End _0027: @@ -27,14 +26,10 @@ _0039: ScrCmd_060 ScrCmd_068 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007B - CompareVar 0x800C, 1 - GoToIf 1, _008B - CompareVar 0x800C, 2 - GoToIf 1, _009B - CompareVar 0x800C, 3 - GoToIf 1, _00AB + GoToIfEq 0x800C, 0, _007B + GoToIfEq 0x800C, 1, _008B + GoToIfEq 0x800C, 2, _009B + GoToIfEq 0x800C, 3, _00AB End _007B: @@ -59,8 +54,7 @@ _00AB: _00BB: ScrCmd_15B 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01A0 + GoToIfEq 0x800C, 1, _01A0 ScrCmd_1CD 9, 91, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 @@ -68,8 +62,7 @@ _00BB: ScrCmd_0E5 0x13E, 0 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0248 + GoToIfEq 0x800C, 0, _0248 ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -96,8 +89,7 @@ _0158: SetVar 0x8004, 0x188 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0196 + GoToIfEq 0x800C, 0, _0196 ScrCmd_014 0x7FC SetFlag 125 ScrCmd_0D1 0, 0x8004 @@ -115,8 +107,7 @@ _0196: End _01A0: - CheckFlag 125 - GoToIf 0, _0158 + GoToIfUnset 125, _0158 ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0101.s b/res/field/scripts/script_0101.s index 60c84480b5..4bb3efafd5 100644 --- a/res/field/scripts/script_0101.s +++ b/res/field/scripts/script_0101.s @@ -13,14 +13,10 @@ _0014: ScrCmd_060 ScrCmd_068 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0056 - CompareVar 0x800C, 1 - GoToIf 1, _0066 - CompareVar 0x800C, 2 - GoToIf 1, _0076 - CompareVar 0x800C, 3 - GoToIf 1, _0086 + GoToIfEq 0x800C, 0, _0056 + GoToIfEq 0x800C, 1, _0066 + GoToIfEq 0x800C, 2, _0076 + GoToIfEq 0x800C, 3, _0086 End _0056: @@ -45,15 +41,13 @@ _0086: _0096: ScrCmd_15B 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0173 + GoToIfEq 0x800C, 1, _0173 ScrCmd_1CD 9, 100, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x13E, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01DC + GoToIfEq 0x800C, 0, _01DC ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -80,8 +74,7 @@ _012B: SetVar 0x8004, 0x188 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0169 + GoToIfEq 0x800C, 0, _0169 ScrCmd_014 0x7FC SetFlag 125 ScrCmd_0D1 0, 0x8004 @@ -99,8 +92,7 @@ _0169: End _0173: - CheckFlag 125 - GoToIf 0, _012B + GoToIfUnset 125, _012B ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0106.s b/res/field/scripts/script_0106.s index 2ac11acdae..39b5fe5e79 100644 --- a/res/field/scripts/script_0106.s +++ b/res/field/scripts/script_0106.s @@ -10,15 +10,13 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 140 - GoToIf 1, _0054 + GoToIfSet 140, _0054 ScrCmd_0D1 0, 253 ScrCmd_02C 0 SetVar 0x8004, 253 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0064 + GoToIfEq 0x800C, 0, _0064 SetFlag 140 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0107.s b/res/field/scripts/script_0107.s index 85525bce37..01632755bf 100644 --- a/res/field/scripts/script_0107.s +++ b/res/field/scripts/script_0107.s @@ -11,10 +11,8 @@ _0006: WaitMovement ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 1 - GoToIf 1, _0038 - CompareVar 0x8008, 0 - GoToIf 1, _006A + GoToIfEq 0x8008, 1, _0038 + GoToIfEq 0x8008, 0, _006A End _0038: diff --git a/res/field/scripts/script_0108.s b/res/field/scripts/script_0108.s index 46087cbdfb..7f2627be0a 100644 --- a/res/field/scripts/script_0108.s +++ b/res/field/scripts/script_0108.s @@ -12,8 +12,7 @@ _001A: ScrCmd_238 4, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0033 + GoToIfEq 0x4000, 0, _0033 ClearFlag 0x210 End @@ -25,14 +24,12 @@ _0039: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 141 - GoToIf 1, _0083 + GoToIfSet 141, _0083 ScrCmd_02C 0 SetVar 0x8004, 0x1C1 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _008E + GoToIfEq 0x800C, 0, _008E ScrCmd_014 0x7FC SetFlag 141 ScrCmd_02C 1 @@ -62,18 +59,12 @@ _0098: ScrCmd_0D6 0, 0x8000 ScrCmd_02C 3 ScrCmd_1B9 0x800C, 0x8000 - CompareVar 0x800C, 0xFF - GoToIf 4, _0108 - CompareVar 0x800C, 200 - GoToIf 4, _0113 - CompareVar 0x800C, 150 - GoToIf 4, _011E - CompareVar 0x800C, 100 - GoToIf 4, _0129 - CompareVar 0x800C, 50 - GoToIf 4, _0134 - CompareVar 0x800C, 1 - GoToIf 4, _013F + GoToIfGe 0x800C, 0xFF, _0108 + GoToIfGe 0x800C, 200, _0113 + GoToIfGe 0x800C, 150, _011E + GoToIfGe 0x800C, 100, _0129 + GoToIfGe 0x800C, 50, _0134 + GoToIfGe 0x800C, 1, _013F GoTo _014A End diff --git a/res/field/scripts/script_0109.s b/res/field/scripts/script_0109.s index 0c00102744..691af9a612 100644 --- a/res/field/scripts/script_0109.s +++ b/res/field/scripts/script_0109.s @@ -10,8 +10,7 @@ _0012: ScrCmd_238 13, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _002B + GoToIfEq 0x4000, 0, _002B ClearFlag 0x219 End diff --git a/res/field/scripts/script_0110.s b/res/field/scripts/script_0110.s index 31945f4e81..4a746a1031 100644 --- a/res/field/scripts/script_0110.s +++ b/res/field/scripts/script_0110.s @@ -9,8 +9,7 @@ _000E: ScrCmd_238 13, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0027 + GoToIfEq 0x4000, 0, _0027 ClearFlag 0x219 End diff --git a/res/field/scripts/script_0112.s b/res/field/scripts/script_0112.s index c5a0aa8faf..a1bbc92177 100644 --- a/res/field/scripts/script_0112.s +++ b/res/field/scripts/script_0112.s @@ -37,10 +37,8 @@ _001D: ScrCmd_02C 1 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _00B3 - CompareVar 0x800C, 0x186 - GoToIf 1, _00C1 + GoToIfEq 0x800C, 0x183, _00B3 + GoToIfEq 0x800C, 0x186, _00C1 GoTo _00A5 End @@ -61,8 +59,7 @@ _00C1: _00CF: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0148 + GoToIfEq 0x800C, 0, _0148 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 2 diff --git a/res/field/scripts/script_0116.s b/res/field/scripts/script_0116.s index bbc13a02e0..6c92e44823 100644 --- a/res/field/scripts/script_0116.s +++ b/res/field/scripts/script_0116.s @@ -11,10 +11,8 @@ _0006: WaitMovement ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 1 - GoToIf 1, _0038 - CompareVar 0x8008, 0 - GoToIf 1, _006A + GoToIfEq 0x8008, 1, _0038 + GoToIfEq 0x8008, 0, _006A End _0038: diff --git a/res/field/scripts/script_0117.s b/res/field/scripts/script_0117.s index 864cea7ab5..193486c76a 100644 --- a/res/field/scripts/script_0117.s +++ b/res/field/scripts/script_0117.s @@ -9,10 +9,8 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x131 - GoToIf 1, _0105 - CheckFlag 0x97E - GoToIf 1, _0033 + GoToIfSet 0x131, _0105 + GoToIfSet 0x97E, _0033 SetFlag 0x97E ScrCmd_02C 0 GoTo _003E @@ -25,15 +23,13 @@ _0033: _003E: ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0057 + GoToIfEq 0x800C, 0, _0057 GoTo _00FA End _0057: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _00EF + GoToIfEq 0x800C, 6, _00EF ScrCmd_02C 2 ScrCmd_04E 0x486 ScrCmd_0CD 0 @@ -43,10 +39,8 @@ _0057: SetFlag 0x131 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A8 - CompareVar 0x800C, 1 - GoToIf 1, _00E9 + GoToIfEq 0x800C, 0, _00A8 + GoToIfEq 0x800C, 1, _00E9 End _00A8: @@ -88,8 +82,7 @@ _00FA: _0105: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0122 + GoToIfEq 0x800C, 1, _0122 ScrCmd_02C 7 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0118.s b/res/field/scripts/script_0118.s index ee89775c0a..ca981c1d8a 100644 --- a/res/field/scripts/script_0118.s +++ b/res/field/scripts/script_0118.s @@ -18,8 +18,7 @@ _001A: _002F: ScrCmd_238 11, 0x4000 - CompareVar 0x4000, 0 - GoToIf 5, _0055 + GoToIfNe 0x4000, 0, _0055 CheckFlag 0x217 CallIf 0, _004F End @@ -29,8 +28,7 @@ _004F: Return _0055: - CheckFlag 0x217 - GoToIf 1, _0066 + GoToIfSet 0x217, _0066 ClearFlag 0x217 End diff --git a/res/field/scripts/script_0119.s b/res/field/scripts/script_0119.s index b035a78a3d..85cfd581b8 100644 --- a/res/field/scripts/script_0119.s +++ b/res/field/scripts/script_0119.s @@ -56,8 +56,7 @@ _002E: ScrCmd_034 ScrCmd_04E 0x486 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00EE + GoToIfEq 0x800C, 0, _00EE GoTo _00F9 End @@ -197,8 +196,7 @@ _01EC: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12F 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031D + GoToIfEq 0x800C, 0, _031D ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A8 0, 0x800C @@ -212,8 +210,7 @@ _0229: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12F 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031D + GoToIfEq 0x800C, 0, _031D ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A8 1, 0x800C @@ -227,8 +224,7 @@ _0266: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12F 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031D + GoToIfEq 0x800C, 0, _031D ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A8 2, 0x800C @@ -242,8 +238,7 @@ _02A3: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12F 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031D + GoToIfEq 0x800C, 0, _031D ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A8 3, 0x800C @@ -257,8 +252,7 @@ _02E0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_12F 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031D + GoToIfEq 0x800C, 0, _031D ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0A8 4, 0x800C @@ -309,10 +303,8 @@ _0361: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x159 - GoToIf 0, _03D3 - CheckFlag 0x15A - GoToIf 0, _038A + GoToIfUnset 0x159, _03D3 + GoToIfUnset 0x15A, _038A _037F: ScrCmd_02C 18 ScrCmd_031 @@ -322,12 +314,10 @@ _037F: _038A: ScrCmd_07E 0x1C1, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _037F + GoToIfEq 0x800C, 0, _037F ScrCmd_02C 13 ScrCmd_28A 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03C8 + GoToIfEq 0x800C, 0, _03C8 Call _0437 SetFlag 0x15A ScrCmd_02C 17 @@ -346,12 +336,10 @@ _03C8: _03D3: SetFlag 0x159 ScrCmd_07E 0x1C1, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0428 + GoToIfEq 0x800C, 0, _0428 ScrCmd_02C 13 ScrCmd_28A 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0419 + GoToIfEq 0x800C, 0, _0419 Call _0437 SetFlag 0x15A ScrCmd_02C 16 @@ -385,8 +373,7 @@ _0437: _0458: ScrCmd_1BD 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0475 + GoToIfEq 0x800C, 2, _0475 ApplyMovement 9, _0484 WaitMovement Return @@ -416,28 +403,20 @@ _04A4: ScrCmd_068 ScrCmd_003 30, 0x800C ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _052B - CompareVar 0x800C, 1 - GoToIf 1, _053D - CompareVar 0x800C, 2 - GoToIf 1, _054F - CompareVar 0x800C, 3 - GoToIf 1, _0561 + GoToIfEq 0x800C, 0, _052B + GoToIfEq 0x800C, 1, _053D + GoToIfEq 0x800C, 2, _054F + GoToIfEq 0x800C, 3, _0561 End _04EC: ScrCmd_02C 11 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 1 - GoToIf 1, _0573 - CompareVar 0x8004, 0 - GoToIf 1, _058D - CompareVar 0x8004, 2 - GoToIf 1, _05A7 - CompareVar 0x8004, 3 - GoToIf 1, _05B9 + GoToIfEq 0x8004, 1, _0573 + GoToIfEq 0x8004, 0, _058D + GoToIfEq 0x8004, 2, _05A7 + GoToIfEq 0x8004, 3, _05B9 End _052B: diff --git a/res/field/scripts/script_0123.s b/res/field/scripts/script_0123.s index fa2b7d958b..b2f9de235d 100644 --- a/res/field/scripts/script_0123.s +++ b/res/field/scripts/script_0123.s @@ -36,8 +36,7 @@ _005E: CallIf 1, _0721 CompareVar 0x407C, 4 CallIf 1, _0737 - CheckFlag 0x102 - GoToIf 1, _009C + GoToIfSet 0x102, _009C End _009C: @@ -91,8 +90,7 @@ _00FE: ScrCmd_060 ScrCmd_068 ScrCmd_15B 3, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0124 + GoToIfEq 0x800C, 1, _0124 ScrCmd_02C 33 ScrCmd_031 ScrCmd_034 @@ -110,8 +108,7 @@ _012F: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x128 - GoToIf 1, _0189 + GoToIfSet 0x128, _0189 ScrCmd_0DE 0x800C CompareVar 0x800C, 0x183 CallIf 1, _0194 @@ -193,8 +190,7 @@ _01E5: _0204: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x102 - GoToIf 1, _0220 + GoToIfSet 0x102, _0220 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -206,12 +202,9 @@ _0220: ScrCmd_02C 28 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _025A - CompareVar 0x800C, 3 - GoToIf 1, _027A - CompareVar 0x800C, 0 - GoToIf 1, _0292 + GoToIfEq 0x800C, 2, _025A + GoToIfEq 0x800C, 3, _027A + GoToIfEq 0x800C, 0, _0292 GoTo _02B2 End @@ -524,10 +517,8 @@ _043E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x407C, 5 - GoToIf 4, _04AE - CompareVar 0x407C, 4 - GoToIf 4, _0471 + GoToIfGe 0x407C, 5, _04AE + GoToIfGe 0x407C, 4, _0471 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 4 @@ -536,8 +527,7 @@ _043E: _0471: ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0498 + GoToIfEq 0x800C, 0, _0498 ScrCmd_0CE 0 ScrCmd_02C 16 ScrCmd_034 @@ -592,10 +582,8 @@ _04C8: ApplyMovement 26, _05CC WaitMovement ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _054B - CompareVar 0x800C, 0x186 - GoToIf 1, _0557 + GoToIfEq 0x800C, 0x183, _054B + GoToIfEq 0x800C, 0x186, _0557 GoTo _053F _053F: @@ -612,8 +600,7 @@ _0557: _0563: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0597 + GoToIfEq 0x800C, 0, _0597 ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 6 @@ -1168,12 +1155,10 @@ _0BE0: _0BF0: ScrCmd_060 - CheckFlag 0x156 - GoToIf 1, _0C1E + GoToIfSet 0x156, _0C1E SetVar 0x40C7, 1 ScrCmd_1B7 0x800C, 100 - CompareVar 0x800C, 90 - GoToIf 4, _0C22 + GoToIfGe 0x800C, 90, _0C22 GoTo _0C1E End diff --git a/res/field/scripts/script_0125.s b/res/field/scripts/script_0125.s index 61c98836ec..8b82c52091 100644 --- a/res/field/scripts/script_0125.s +++ b/res/field/scripts/script_0125.s @@ -44,15 +44,13 @@ _0076: ScrCmd_060 ScrCmd_068 ScrCmd_15B 3, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0155 + GoToIfEq 0x800C, 1, _0155 ScrCmd_1CD 9, 122, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x13C, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _016B + GoToIfEq 0x800C, 0, _016B ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -78,8 +76,7 @@ _010D: SetVar 0x8004, 0x17E SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _014B + GoToIfEq 0x800C, 0, _014B ScrCmd_014 0x7FC SetFlag 156 ScrCmd_0D1 0, 0x8004 @@ -97,8 +94,7 @@ _014B: End _0155: - CheckFlag 156 - GoToIf 0, _010D + GoToIfUnset 156, _010D ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -115,8 +111,7 @@ _0171: ScrCmd_060 ScrCmd_068 ScrCmd_15B 3, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0197 + GoToIfEq 0x800C, 1, _0197 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -135,8 +130,7 @@ _01A5: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 3, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01CF + GoToIfEq 0x800C, 1, _01CF ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0129.s b/res/field/scripts/script_0129.s index 048aa4f91d..c401979d02 100644 --- a/res/field/scripts/script_0129.s +++ b/res/field/scripts/script_0129.s @@ -27,24 +27,19 @@ _0022: ScrCmd_072 20, 2 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006A - CompareVar 0x800C, 1 - GoToIf 1, _0156 + GoToIfEq 0x800C, 0, _006A + GoToIfEq 0x800C, 1, _0156 End _006A: ScrCmd_252 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _008C + GoToIfNe 0x800C, 0, _008C ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _0168 + GoToIfEq 0x800C, 6, _0168 _008C: ScrCmd_02C 1 ScrCmd_071 0x800C, 0x1F4 - CompareVar 0x800C, 0 - GoToIf 1, _0141 + GoToIfEq 0x800C, 0, _0141 ScrCmd_049 0x644 ScrCmd_070 0x1F4 ScrCmd_074 @@ -55,10 +50,8 @@ _008C: ScrCmd_034 ScrCmd_073 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 4 - GoToIf 1, _00E2 - CompareVar 0x8004, 5 - GoToIf 1, _00F2 + GoToIfEq 0x8004, 4, _00E2 + GoToIfEq 0x8004, 5, _00F2 End _00E2: @@ -149,10 +142,8 @@ _01CC: ScrCmd_060 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01F1 - CompareVar 0x800C, 1 - GoToIf 1, _024E + GoToIfEq 0x800C, 0, _01F1 + GoToIfEq 0x800C, 1, _024E End _01F1: @@ -163,14 +154,12 @@ _01F1: SetVar 0x40DA, 0 ScrCmd_202 1 ScrCmd_31B 0x4002 - CompareVar 0x4002, 5 - GoToIf 4, _021E + GoToIfGe 0x4002, 5, _021E ScrCmd_061 End _021E: - CheckFlag 163 - GoToIf 1, _024A + GoToIfSet 163, _024A ApplyMovement 2, _0334 WaitMovement ScrCmd_02C 18 @@ -214,8 +203,7 @@ _0298: WaitMovement SetVar 0x40DA, 0 ScrCmd_31B 0x4002 - CompareVar 0x4002, 5 - GoToIf 4, _021E + GoToIfGe 0x4002, 5, _021E ScrCmd_061 End @@ -225,10 +213,8 @@ _02BF: ScrCmd_068 ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02EA - CompareVar 0x800C, 1 - GoToIf 1, _02F5 + GoToIfEq 0x800C, 0, _02EA + GoToIfEq 0x800C, 1, _02F5 End _02EA: @@ -249,8 +235,7 @@ _0300: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 163 - GoToIf 1, _031E + GoToIfSet 163, _031E ScrCmd_02C 15 GoTo _0329 End diff --git a/res/field/scripts/script_0130.s b/res/field/scripts/script_0130.s index 446f493d8a..0113fcb1bd 100644 --- a/res/field/scripts/script_0130.s +++ b/res/field/scripts/script_0130.s @@ -16,16 +16,14 @@ _0016: ScrCmd_02C 0 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _003E + GoToIfEq 0x800C, 0, _003E ScrCmd_073 ScrCmd_061 End _003E: ScrCmd_071 0x800C, 100 - CompareVar 0x800C, 0 - GoToIf 1, _006B + GoToIfEq 0x800C, 0, _006B ScrCmd_070 100 ScrCmd_074 ScrCmd_049 0x644 diff --git a/res/field/scripts/script_0131.s b/res/field/scripts/script_0131.s index 868314befa..2c8948b05e 100644 --- a/res/field/scripts/script_0131.s +++ b/res/field/scripts/script_0131.s @@ -10,15 +10,13 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA3 - GoToIf 1, _0055 + GoToIfSet 0xAA3, _0055 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 17 AddVar 0x8004, 184 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0060 + GoToIfEq 0x800C, 0, _0060 SetFlag 0xAA3 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0132.s b/res/field/scripts/script_0132.s index 3830f06a7f..2301694454 100644 --- a/res/field/scripts/script_0132.s +++ b/res/field/scripts/script_0132.s @@ -20,10 +20,8 @@ _001D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x11C - GoToIf 1, _00BD - CheckFlag 120 - GoToIf 1, _004A + GoToIfSet 0x11C, _00BD + GoToIfSet 120, _004A ScrCmd_02C 1 SetFlag 120 GoTo _00C8 @@ -31,16 +29,13 @@ _001D: _004A: ScrCmd_264 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009C - CompareVar 0x800C, 1 - GoToIf 1, _00A7 + GoToIfEq 0x800C, 0, _009C + GoToIfEq 0x800C, 1, _00A7 ScrCmd_02C 4 SetVar 0x8004, 215 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B2 + GoToIfEq 0x800C, 0, _00B2 SetFlag 0x11C ScrCmd_014 0x7FC GoTo _00BD diff --git a/res/field/scripts/script_0133.s b/res/field/scripts/script_0133.s index 7dab6fe954..91cca3d894 100644 --- a/res/field/scripts/script_0133.s +++ b/res/field/scripts/script_0133.s @@ -11,19 +11,16 @@ _000A: ScrCmd_060 ScrCmd_068 ScrCmd_33C 4, 93 - CheckFlag 233 - GoToIf 0, _003D + GoToIfUnset 233, _003D ScrCmd_07E 93, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005F + GoToIfEq 0x800C, 0, _005F GoTo _006A _003D: SetFlag 233 ScrCmd_02C 0 ScrCmd_07E 93, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005F + GoToIfEq 0x800C, 0, _005F GoTo _006A _005F: @@ -44,14 +41,11 @@ _006A: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8005, 0xFF - GoToIf 1, _005F + GoToIfEq 0x8005, 0xFF, _005F ScrCmd_198 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011A + GoToIfEq 0x800C, 0, _011A ScrCmd_21F 0x800C, 0x8005 - CompareVar 0x800C, 0 - GoToIf 1, _010F + GoToIfEq 0x800C, 0, _010F ScrCmd_02C 4 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -61,8 +55,7 @@ _006A: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _005F + GoToIfEq 0x800C, 0xFF, _005F ScrCmd_07C 93, 1, 0x800C ScrCmd_0CD 3 ScrCmd_02C 16 diff --git a/res/field/scripts/script_0135.s b/res/field/scripts/script_0135.s index 8665c808ab..ba6d8003bf 100644 --- a/res/field/scripts/script_0135.s +++ b/res/field/scripts/script_0135.s @@ -12,16 +12,11 @@ _000E: ScrCmd_060 ScrCmd_068 ScrCmd_247 0x8000 - CheckFlag 0x140 - GoToIf 0, _005C - CheckFlag 0x141 - GoToIf 0, _005C - CheckFlag 0x142 - GoToIf 0, _005C - CheckFlag 0x143 - GoToIf 0, _005C - CheckFlag 0x144 - GoToIf 0, _005C + GoToIfUnset 0x140, _005C + GoToIfUnset 0x141, _005C + GoToIfUnset 0x142, _005C + GoToIfUnset 0x143, _005C + GoToIfUnset 0x144, _005C ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 @@ -32,20 +27,15 @@ _005C: ScrCmd_02C 0 ScrCmd_02C 1 Call _021C - CompareVar 0x800C, 1 - GoToIf 1, _00D7 + GoToIfEq 0x800C, 1, _00D7 Call _024C - CompareVar 0x800C, 1 - GoToIf 1, _0118 + GoToIfEq 0x800C, 1, _0118 Call _027C - CompareVar 0x800C, 1 - GoToIf 1, _0159 + GoToIfEq 0x800C, 1, _0159 Call _02AC - CompareVar 0x800C, 1 - GoToIf 1, _019A + GoToIfEq 0x800C, 1, _019A Call _02DC - CompareVar 0x800C, 1 - GoToIf 1, _01DB + GoToIfEq 0x800C, 1, _01DB ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -63,8 +53,7 @@ _00D7: SetVar 0x8004, 0x104 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC ScrCmd_0D0 0, 0x8000 ScrCmd_0D1 1, 0x104 ScrCmd_02C 4 @@ -80,8 +69,7 @@ _0118: SetVar 0x8004, 0x105 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC ScrCmd_0D0 0, 0x8000 ScrCmd_0D1 1, 0x105 ScrCmd_02C 4 @@ -97,8 +85,7 @@ _0159: SetVar 0x8004, 0x106 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC ScrCmd_0D0 0, 0x8000 ScrCmd_0D1 1, 0x106 ScrCmd_02C 4 @@ -114,8 +101,7 @@ _019A: SetVar 0x8004, 0x107 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC ScrCmd_0D0 0, 0x8000 ScrCmd_0D1 1, 0x107 ScrCmd_02C 4 @@ -131,8 +117,7 @@ _01DB: SetVar 0x8004, 0x108 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC ScrCmd_0D0 0, 0x8000 ScrCmd_0D1 1, 0x108 ScrCmd_02C 4 @@ -145,11 +130,9 @@ _01DB: End _021C: - CheckFlag 0x140 - GoToIf 1, _0244 + GoToIfSet 0x140, _0244 ScrCmd_281 0x8000, 0, 0x800C - CompareVar 0x800C, 200 - GoToIf 0, _0244 + GoToIfLt 0x800C, 200, _0244 SetVar 0x800C, 1 Return @@ -158,11 +141,9 @@ _0244: Return _024C: - CheckFlag 0x141 - GoToIf 1, _0274 + GoToIfSet 0x141, _0274 ScrCmd_281 0x8000, 1, 0x800C - CompareVar 0x800C, 200 - GoToIf 0, _0274 + GoToIfLt 0x800C, 200, _0274 SetVar 0x800C, 1 Return @@ -171,11 +152,9 @@ _0274: Return _027C: - CheckFlag 0x142 - GoToIf 1, _02A4 + GoToIfSet 0x142, _02A4 ScrCmd_281 0x8000, 2, 0x800C - CompareVar 0x800C, 200 - GoToIf 0, _02A4 + GoToIfLt 0x800C, 200, _02A4 SetVar 0x800C, 1 Return @@ -184,11 +163,9 @@ _02A4: Return _02AC: - CheckFlag 0x143 - GoToIf 1, _02D4 + GoToIfSet 0x143, _02D4 ScrCmd_281 0x8000, 3, 0x800C - CompareVar 0x800C, 200 - GoToIf 0, _02D4 + GoToIfLt 0x800C, 200, _02D4 SetVar 0x800C, 1 Return @@ -197,11 +174,9 @@ _02D4: Return _02DC: - CheckFlag 0x144 - GoToIf 1, _0304 + GoToIfSet 0x144, _0304 ScrCmd_281 0x8000, 4, 0x800C - CompareVar 0x800C, 200 - GoToIf 0, _0304 + GoToIfLt 0x800C, 200, _0304 SetVar 0x800C, 1 Return diff --git a/res/field/scripts/script_0136.s b/res/field/scripts/script_0136.s index 1adda7c5e5..e8694b692c 100644 --- a/res/field/scripts/script_0136.s +++ b/res/field/scripts/script_0136.s @@ -42,10 +42,8 @@ _0082: CompareVar 0x411A, 2 CallIf 4, _00BA ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00D0 - CompareVar 0x4000, 1 - GoToIf 1, _00D8 + GoToIfEq 0x4000, 0, _00D0 + GoToIfEq 0x4000, 1, _00D8 End _00BA: @@ -484,18 +482,15 @@ _05CC: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _05F4 - CompareVar 0x8004, 1 - GoToIf 1, _0625 + GoToIfEq 0x8004, 0, _05F4 + GoToIfEq 0x8004, 1, _0625 End _05F4: ScrCmd_0CD 0 ScrCmd_02C 19 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0611 + GoToIfEq 0x800C, 0, _0611 GoTo _061A _0611: @@ -513,8 +508,7 @@ _0625: ScrCmd_0CD 0 ScrCmd_02C 24 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0642 + GoToIfEq 0x800C, 0, _0642 GoTo _064B _0642: @@ -540,8 +534,7 @@ _0656: Call _0919 ScrCmd_2A0 0x8004, 0x350, 0x351 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0A73 + GoToIfEq 0x800C, 0, _0A73 ScrCmd_02C 16 ScrCmd_069 0x8004, 0x8005 CompareVar 0x8005, 0x253 @@ -613,10 +606,8 @@ _0656: WaitMovement ScrCmd_065 6 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x253 - GoToIf 1, _083A - CompareVar 0x8005, 0x255 - GoToIf 1, _0854 + GoToIfEq 0x8005, 0x253, _083A + GoToIfEq 0x8005, 0x255, _0854 End _083A: @@ -637,10 +628,8 @@ _086E: ScrCmd_02C 35 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x253 - GoToIf 1, _08A9 - CompareVar 0x8005, 0x255 - GoToIf 1, _08C3 + GoToIfEq 0x8005, 0x253, _08A9 + GoToIfEq 0x8005, 0x255, _08C3 End .byte 134 @@ -693,31 +682,25 @@ _08DD: _0919: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0939 - CompareVar 0x800C, 1 - GoToIf 1, _096B + GoToIfEq 0x800C, 0, _0939 + GoToIfEq 0x800C, 1, _096B End _0939: ScrCmd_0DE 0x800C SetVar 0x8004, 0x271 - CompareVar 0x800C, 0x186 - GoToIf 1, _099D + GoToIfEq 0x800C, 0x186, _099D SetVar 0x8004, 0x272 - CompareVar 0x800C, 0x189 - GoToIf 1, _099D + GoToIfEq 0x800C, 0x189, _099D SetVar 0x8004, 0x270 Return _096B: ScrCmd_0DE 0x800C SetVar 0x8004, 0x26E - CompareVar 0x800C, 0x186 - GoToIf 1, _099D + GoToIfEq 0x800C, 0x186, _099D SetVar 0x8004, 0x26F - CompareVar 0x800C, 0x189 - GoToIf 1, _099D + GoToIfEq 0x800C, 0x189, _099D SetVar 0x8004, 0x26D Return @@ -1146,14 +1129,12 @@ _0C77: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 204 - GoToIf 1, _0CBC + GoToIfSet 204, _0CBC ScrCmd_02C 50 SetVar 0x8004, 0x186 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0CC7 + GoToIfEq 0x800C, 0, _0CC7 ScrCmd_014 0x7FC SetFlag 204 GoTo _0CBC @@ -1234,8 +1215,7 @@ _0D5C: ScrCmd_060 ScrCmd_068 ScrCmd_15B 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0D82 + GoToIfEq 0x800C, 1, _0D82 ScrCmd_02C 12 ScrCmd_031 ScrCmd_034 @@ -1254,8 +1234,7 @@ _0D8D: ScrCmd_060 ScrCmd_068 ScrCmd_15B 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0DB3 + GoToIfEq 0x800C, 1, _0DB3 ScrCmd_02C 13 ScrCmd_031 ScrCmd_034 @@ -1286,14 +1265,10 @@ _0DBE: ClearFlag 0x28A ScrCmd_064 26 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0E34 - CompareVar 0x800C, 1 - GoToIf 1, _0E5C - CompareVar 0x800C, 2 - GoToIf 1, _0EA4 - CompareVar 0x800C, 3 - GoToIf 1, _0E7C + GoToIfEq 0x800C, 0, _0E34 + GoToIfEq 0x800C, 1, _0E5C + GoToIfEq 0x800C, 2, _0EA4 + GoToIfEq 0x800C, 3, _0E7C End _0E34: @@ -1343,8 +1318,7 @@ _0ECC: _0ED8: ScrCmd_02C 38 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0EF4 + GoToIfEq 0x800C, 0, _0EF4 GoTo _0F0B End @@ -1441,8 +1415,7 @@ _0FB0: ScrCmd_0CD 0 ScrCmd_02C 41 ScrCmd_014 0x807 - CheckFlag 155 - GoToIf 1, _0EF4 + GoToIfSet 155, _0EF4 GoTo _0ED8 .byte 2 @@ -1534,8 +1507,7 @@ _10B9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_262 0x182, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1179 + GoToIfEq 0x800C, 0, _1179 ScrCmd_263 3 ScrCmd_04C 0x182, 0 ScrCmd_02C 57 @@ -1549,8 +1521,7 @@ _10E9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_262 0x182, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1179 + GoToIfEq 0x800C, 0, _1179 ScrCmd_263 2 ScrCmd_04C 0x182, 0 ScrCmd_02C 58 @@ -1564,8 +1535,7 @@ _1119: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_262 0x182, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1179 + GoToIfEq 0x800C, 0, _1179 ScrCmd_263 1 ScrCmd_04C 0x182, 0 ScrCmd_02C 59 @@ -1579,8 +1549,7 @@ _1149: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_262 0x182, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1179 + GoToIfEq 0x800C, 0, _1179 ScrCmd_263 0 ScrCmd_04C 0x182, 0 ScrCmd_02C 60 @@ -1646,8 +1615,7 @@ _1204: ScrCmd_068 ScrCmd_02C 52 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _122B + GoToIfEq 0x800C, 1, _122B ScrCmd_02C 53 GoTo _1236 End diff --git a/res/field/scripts/script_0137.s b/res/field/scripts/script_0137.s index 2b6d58e1ca..6d066e614e 100644 --- a/res/field/scripts/script_0137.s +++ b/res/field/scripts/script_0137.s @@ -20,15 +20,13 @@ _0022: ScrCmd_060 ScrCmd_068 ScrCmd_15B 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00FF + GoToIfEq 0x800C, 1, _00FF ScrCmd_1CD 9, 133, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x13D, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0118 + GoToIfEq 0x800C, 0, _0118 ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -53,8 +51,7 @@ _00B7: SetVar 0x8004, 0x183 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F5 + GoToIfEq 0x800C, 0, _00F5 ScrCmd_014 0x7FC SetFlag 157 ScrCmd_0D1 0, 0x8004 @@ -72,8 +69,7 @@ _00F5: End _00FF: - CheckFlag 157 - GoToIf 0, _00B7 + GoToIfUnset 157, _00B7 ScrCmd_0CD 0 ScrCmd_02C 5 ScrCmd_031 @@ -91,8 +87,7 @@ _011E: ScrCmd_060 ScrCmd_068 ScrCmd_15B 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0144 + GoToIfEq 0x800C, 1, _0144 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -111,8 +106,7 @@ _0152: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _017C + GoToIfEq 0x800C, 1, _017C ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0141.s b/res/field/scripts/script_0141.s index 14c4aa45fc..d33881ba48 100644 --- a/res/field/scripts/script_0141.s +++ b/res/field/scripts/script_0141.s @@ -78,8 +78,7 @@ _00EA: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_07E 0x1BC, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0133 + GoToIfEq 0x800C, 0, _0133 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_1CD 16, 0, 0, 0, 0 @@ -103,15 +102,11 @@ _013E: ScrCmd_068 ScrCmd_02C 0 ScrCmd_07E 0x1BC, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _018D - CheckFlag 0x130 - GoToIf 1, _0198 - CheckFlag 0x165 - GoToIf 1, _02CA + GoToIfEq 0x800C, 0, _018D + GoToIfSet 0x130, _0198 + GoToIfSet 0x165, _02CA ScrCmd_275 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0198 + GoToIfEq 0x800C, 0, _0198 GoTo _02CA End @@ -133,20 +128,16 @@ _01A4: ScrCmd_042 127, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01E3 - CompareVar 0x8008, 1 - GoToIf 1, _0240 + GoToIfEq 0x8008, 0, _01E3 + GoToIfEq 0x8008, 1, _0240 GoTo _02BB _01E3: ScrCmd_071 0x800C, 0x3E8 - CompareVar 0x800C, 0 - GoToIf 1, _029D + GoToIfEq 0x800C, 0, _029D ScrCmd_276 0x800C, 50 Noop - CompareVar 0x800C, 0 - GoToIf 1, _02AC + GoToIfEq 0x800C, 0, _02AC ScrCmd_049 0x644 ScrCmd_334 35, 0x3E8 ScrCmd_070 0x3E8 @@ -162,12 +153,10 @@ _01E3: _0240: ScrCmd_071 0x800C, 0x2710 - CompareVar 0x800C, 0 - GoToIf 1, _029D + GoToIfEq 0x800C, 0, _029D ScrCmd_276 0x800C, 0x1F4 Noop - CompareVar 0x800C, 0 - GoToIf 1, _02AC + GoToIfEq 0x800C, 0, _02AC ScrCmd_049 0x644 ScrCmd_334 35, 0x2710 ScrCmd_070 0x2710 @@ -212,14 +201,12 @@ _02CA: SetVar 0x8004, 0x187 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0327 + GoToIfEq 0x800C, 0, _0327 GoTo _02F3 End _02F3: - CheckFlag 0x165 - GoToIf 1, _0309 + GoToIfSet 0x165, _0309 ScrCmd_02C 7 GoTo _0314 End @@ -258,14 +245,11 @@ _0346: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1BC, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03A1 - CheckFlag 0x12E - GoToIf 1, _03AC + GoToIfEq 0x800C, 0, _03A1 + GoToIfSet 0x12E, _03AC ScrCmd_276 0x800C, 20 Noop - CompareVar 0x800C, 0 - GoToIf 1, _03AC + GoToIfEq 0x800C, 0, _03AC SetFlag 0x12E ScrCmd_0CD 0 ScrCmd_02C 14 @@ -296,14 +280,11 @@ _03B7: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1BC, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0412 - CheckFlag 0x12F - GoToIf 1, _041D + GoToIfEq 0x800C, 0, _0412 + GoToIfSet 0x12F, _041D ScrCmd_276 0x800C, 50 Noop - CompareVar 0x800C, 0 - GoToIf 1, _041D + GoToIfEq 0x800C, 0, _041D SetFlag 0x12F ScrCmd_0CD 0 ScrCmd_02C 17 @@ -370,8 +351,7 @@ _0461: End _0474: - CompareVar 0x4040, 0x3E7 - GoToIf 2, _0497 + GoToIfGt 0x4040, 0x3E7, _0497 ScrCmd_0D5 0, 0x4040 ScrCmd_049 0x5DC ScrCmd_060 @@ -395,8 +375,7 @@ _04AD: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 214 - GoToIf 1, _04CB + GoToIfSet 214, _04CB ScrCmd_02C 23 GoTo _04D6 End diff --git a/res/field/scripts/script_0142.s b/res/field/scripts/script_0142.s index 0eb8bf94d0..0e5e30e2c6 100644 --- a/res/field/scripts/script_0142.s +++ b/res/field/scripts/script_0142.s @@ -84,8 +84,7 @@ _00A9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x129 - GoToIf 1, _0109 + GoToIfSet 0x129, _0109 ScrCmd_0DE 0x800C CompareVar 0x800C, 0x183 CallIf 1, _0119 diff --git a/res/field/scripts/script_0143.s b/res/field/scripts/script_0143.s index 8926096f98..63b841a336 100644 --- a/res/field/scripts/script_0143.s +++ b/res/field/scripts/script_0143.s @@ -17,15 +17,13 @@ _0022: ScrCmd_060 ScrCmd_068 ScrCmd_27E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0063 + GoToIfEq 0x800C, 1, _0063 ScrCmd_02C 0 ScrCmd_040 1, 1, 0, 1, 0x800C ScrCmd_042 229, 1 ScrCmd_042 228, 0 ScrCmd_043 - CompareVar 0x800C, 1 - GoToIf 1, _00C6 + GoToIfEq 0x800C, 1, _00C6 GoTo _00BB _0063: @@ -35,15 +33,11 @@ _0063: ScrCmd_042 229, 0 ScrCmd_042 228, 1 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 5, _00BB + GoToIfNe 0x800C, 0, _00BB ScrCmd_1B7 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _00C6 - CompareVar 0x800C, 1 - GoToIf 1, _00D1 - CompareVar 0x800C, 2 - GoToIf 1, _00DC + GoToIfEq 0x800C, 0, _00C6 + GoToIfEq 0x800C, 1, _00D1 + GoToIfEq 0x800C, 2, _00DC GoTo _00E7 _00BB: @@ -116,12 +110,10 @@ _012B: ScrCmd_060 ScrCmd_068 ScrCmd_134 10, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _016F + GoToIfEq 0x800C, 1, _016F ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _017A + GoToIfEq 0x800C, 1, _017A ScrCmd_02C 11 SetVar 0x8004, 10 ScrCmd_014 0x7D9 diff --git a/res/field/scripts/script_0144.s b/res/field/scripts/script_0144.s index 7d7876aea4..b2d8812d01 100644 --- a/res/field/scripts/script_0144.s +++ b/res/field/scripts/script_0144.s @@ -16,15 +16,13 @@ _001E: ScrCmd_060 ScrCmd_068 ScrCmd_27E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _005F + GoToIfEq 0x800C, 1, _005F ScrCmd_02C 0 ScrCmd_040 1, 1, 0, 1, 0x800C ScrCmd_042 229, 1 ScrCmd_042 228, 0 ScrCmd_043 - CompareVar 0x800C, 1 - GoToIf 1, _00C2 + GoToIfEq 0x800C, 1, _00C2 GoTo _00B7 _005F: @@ -34,15 +32,11 @@ _005F: ScrCmd_042 229, 0 ScrCmd_042 228, 1 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 5, _00B7 + GoToIfNe 0x800C, 0, _00B7 ScrCmd_1B8 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _00C2 - CompareVar 0x800C, 1 - GoToIf 1, _00CD - CompareVar 0x800C, 2 - GoToIf 1, _00D8 + GoToIfEq 0x800C, 0, _00C2 + GoToIfEq 0x800C, 1, _00CD + GoToIfEq 0x800C, 2, _00D8 GoTo _00E3 _00B7: diff --git a/res/field/scripts/script_0145.s b/res/field/scripts/script_0145.s index 64a090dc99..216aa0a756 100644 --- a/res/field/scripts/script_0145.s +++ b/res/field/scripts/script_0145.s @@ -16,15 +16,13 @@ _001E: ScrCmd_060 ScrCmd_068 ScrCmd_27E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _005F + GoToIfEq 0x800C, 1, _005F ScrCmd_02C 0 ScrCmd_040 1, 1, 0, 1, 0x800C ScrCmd_042 229, 1 ScrCmd_042 228, 0 ScrCmd_043 - CompareVar 0x800C, 1 - GoToIf 1, _00C2 + GoToIfEq 0x800C, 1, _00C2 GoTo _00B7 _005F: @@ -34,15 +32,11 @@ _005F: ScrCmd_042 229, 0 ScrCmd_042 228, 1 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 5, _00B7 + GoToIfNe 0x800C, 0, _00B7 ScrCmd_1B7 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _00C2 - CompareVar 0x800C, 1 - GoToIf 1, _00CD - CompareVar 0x800C, 2 - GoToIf 1, _00D8 + GoToIfEq 0x800C, 0, _00C2 + GoToIfEq 0x800C, 1, _00CD + GoToIfEq 0x800C, 2, _00D8 GoTo _00E3 _00B7: diff --git a/res/field/scripts/script_0146.s b/res/field/scripts/script_0146.s index 576ea2dbc0..08b3d18fa2 100644 --- a/res/field/scripts/script_0146.s +++ b/res/field/scripts/script_0146.s @@ -34,14 +34,12 @@ _0040: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x105 - GoToIf 1, _0087 + GoToIfSet 0x105, _0087 ScrCmd_02C 2 SetVar 0x8004, 0x120 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0092 + GoToIfEq 0x800C, 0, _0092 ScrCmd_014 0x7FC SetFlag 0x105 GoTo _0087 @@ -94,12 +92,9 @@ _00D5: ScrCmd_042 222, 3 ScrCmd_043 SetVar 0x8008, 0x8000 - CompareVar 0x8008, 0 - GoToIf 1, _0125 - CompareVar 0x8008, 1 - GoToIf 1, _0131 - CompareVar 0x8008, 2 - GoToIf 1, _013D + GoToIfEq 0x8008, 0, _0125 + GoToIfEq 0x8008, 1, _0131 + GoToIfEq 0x8008, 2, _013D ScrCmd_02C 10 GoTo _028C @@ -149,11 +144,9 @@ _0191: CallIf 1, _0153 CompareVar 0x8000, 2 CallIf 1, _015D - CompareVar 0x800C, 0 - GoToIf 1, _0277 + GoToIfEq 0x800C, 0, _0277 ScrCmd_07D 0x8001, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0280 + GoToIfEq 0x800C, 0, _0280 CompareVar 0x8000, 0 CallIf 1, _0167 CompareVar 0x8000, 1 @@ -169,11 +162,9 @@ _0191: SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_1B7 0x800C, 64 - CompareVar 0x800C, 0 - GoToIf 5, _026E + GoToIfNe 0x800C, 0, _026E ScrCmd_07D 0x8001, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0280 + GoToIfEq 0x800C, 0, _0280 ScrCmd_049 0x617 ScrCmd_0D1 0, 0x8001 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0147.s b/res/field/scripts/script_0147.s index 6258ae6cf0..ca33ebe2cc 100644 --- a/res/field/scripts/script_0147.s +++ b/res/field/scripts/script_0147.s @@ -11,18 +11,12 @@ _0006: ScrCmd_068 ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 0 - GoToIf 1, _0068 - CompareVar 0x8008, 1 - GoToIf 1, _0072 - CompareVar 0x8008, 2 - GoToIf 1, _007C - CompareVar 0x8008, 3 - GoToIf 1, _0086 - CompareVar 0x8008, 4 - GoToIf 1, _0090 - CompareVar 0x8008, 5 - GoToIf 1, _009A + GoToIfEq 0x8008, 0, _0068 + GoToIfEq 0x8008, 1, _0072 + GoToIfEq 0x8008, 2, _007C + GoToIfEq 0x8008, 3, _0086 + GoToIfEq 0x8008, 4, _0090 + GoToIfEq 0x8008, 5, _009A End _0068: @@ -63,26 +57,19 @@ _00A6: ScrCmd_042 124, 6 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _02BC - CompareVar 0x8008, 1 - GoToIf 1, _026D - CompareVar 0x8008, 2 - GoToIf 1, _021E - CompareVar 0x8008, 3 - GoToIf 1, _01CF - CompareVar 0x8008, 4 - GoToIf 1, _0180 - CompareVar 0x8008, 5 - GoToIf 1, _0131 + GoToIfEq 0x8008, 0, _02BC + GoToIfEq 0x8008, 1, _026D + GoToIfEq 0x8008, 2, _021E + GoToIfEq 0x8008, 3, _01CF + GoToIfEq 0x8008, 4, _0180 + GoToIfEq 0x8008, 5, _0131 GoTo _03F6 _0131: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 0x236, 1, 18, 2, 1 - CompareVar 0x40CE, 5 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 5, _03DF CompareVar 0x40CE, 5 CallIf 2, _030B CompareVar 0x40CE, 5 @@ -95,8 +82,7 @@ _0180: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 137, 2, 18, 2, 1 - CompareVar 0x40CE, 4 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 4, _03DF CompareVar 0x40CE, 4 CallIf 2, _030B CompareVar 0x40CE, 4 @@ -109,8 +95,7 @@ _01CF: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 138, 2, 18, 2, 1 - CompareVar 0x40CE, 3 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 3, _03DF CompareVar 0x40CE, 3 CallIf 2, _030B CompareVar 0x40CE, 3 @@ -123,8 +108,7 @@ _021E: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 139, 2, 18, 2, 1 - CompareVar 0x40CE, 2 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 2, _03DF CompareVar 0x40CE, 2 CallIf 2, _030B CompareVar 0x40CE, 2 @@ -137,8 +121,7 @@ _026D: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 140, 2, 18, 2, 1 - CompareVar 0x40CE, 1 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 1, _03DF CompareVar 0x40CE, 1 CallIf 2, _030B CompareVar 0x40CE, 1 @@ -151,8 +134,7 @@ _02BC: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 141, 1, 18, 2, 1 - CompareVar 0x40CE, 0 - GoToIf 1, _03DF + GoToIfEq 0x40CE, 0, _03DF CompareVar 0x40CE, 0 CallIf 2, _030B CompareVar 0x40CE, 0 @@ -182,18 +164,12 @@ _0321: _033F: SetVar 0x8008, 0x40CE - CompareVar 0x8008, 0 - GoToIf 1, _0395 - CompareVar 0x8008, 1 - GoToIf 1, _03A0 - CompareVar 0x8008, 2 - GoToIf 1, _03AB - CompareVar 0x8008, 3 - GoToIf 1, _03B6 - CompareVar 0x8008, 4 - GoToIf 1, _03C1 - CompareVar 0x8008, 5 - GoToIf 1, _03CC + GoToIfEq 0x8008, 0, _0395 + GoToIfEq 0x8008, 1, _03A0 + GoToIfEq 0x8008, 2, _03AB + GoToIfEq 0x8008, 3, _03B6 + GoToIfEq 0x8008, 4, _03C1 + GoToIfEq 0x8008, 5, _03CC End _0395: diff --git a/res/field/scripts/script_0148.s b/res/field/scripts/script_0148.s index b2e5385a09..4881e8e5c6 100644 --- a/res/field/scripts/script_0148.s +++ b/res/field/scripts/script_0148.s @@ -79,8 +79,7 @@ _0091: _00A4: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 185 - GoToIf 1, _00D0 + GoToIfSet 185, _00D0 SetFlag 185 SetFlag 0x185 ScrCmd_02C 0 @@ -126,10 +125,8 @@ _00FE: ScrCmd_042 16, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0150 - CompareVar 0x8008, 1 - GoToIf 1, _018F + GoToIfEq 0x8008, 0, _0150 + GoToIfEq 0x8008, 1, _018F GoTo _0215 End @@ -137,11 +134,9 @@ _0150: SetVar 0x8004, 1 SetVar 0x8005, 200 ScrCmd_07D 42, 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01FF + GoToIfEq 0x800C, 0, _01FF ScrCmd_1AB 0x800C, 200 - CompareVar 0x800C, 0 - GoToIf 1, _020A + GoToIfEq 0x800C, 0, _020A ScrCmd_02C 9 GoTo _01CE End @@ -150,11 +145,9 @@ _018F: SetVar 0x8004, 10 SetVar 0x8005, 0x7D0 ScrCmd_07D 42, 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01FF + GoToIfEq 0x800C, 0, _01FF ScrCmd_1AB 0x800C, 0x7D0 - CompareVar 0x800C, 0 - GoToIf 1, _020A + GoToIfEq 0x800C, 0, _020A ScrCmd_02C 10 GoTo _01CE End @@ -200,38 +193,25 @@ _022A: ScrCmd_072 20, 2 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _025B - CompareVar 0x800C, 1 - GoToIf 1, _0306 + GoToIfEq 0x800C, 0, _025B + GoToIfEq 0x800C, 1, _0306 End _025B: ScrCmd_07E 0x1C1, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0537 + GoToIfEq 0x800C, 0, _0537 Call _0697 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _031B - CompareVar 0x8008, 1 - GoToIf 1, _0344 - CompareVar 0x8008, 2 - GoToIf 1, _036D - CompareVar 0x8008, 3 - GoToIf 1, _0396 - CompareVar 0x8008, 4 - GoToIf 1, _03BF - CompareVar 0x8008, 5 - GoToIf 1, _03E8 - CompareVar 0x8008, 6 - GoToIf 1, _0411 - CompareVar 0x8008, 7 - GoToIf 1, _043A - CompareVar 0x8008, 8 - GoToIf 1, _0463 - CompareVar 0x8008, 9 - GoToIf 1, _048C + GoToIfEq 0x8008, 0, _031B + GoToIfEq 0x8008, 1, _0344 + GoToIfEq 0x8008, 2, _036D + GoToIfEq 0x8008, 3, _0396 + GoToIfEq 0x8008, 4, _03BF + GoToIfEq 0x8008, 5, _03E8 + GoToIfEq 0x8008, 6, _0411 + GoToIfEq 0x8008, 7, _043A + GoToIfEq 0x8008, 8, _0463 + GoToIfEq 0x8008, 9, _048C GoTo _0306 End @@ -249,8 +229,7 @@ _0311: _031B: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0557 GoTo _04B5 @@ -258,8 +237,7 @@ _031B: _0344: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0577 GoTo _04B5 @@ -267,8 +245,7 @@ _0344: _036D: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0597 GoTo _04B5 @@ -276,8 +253,7 @@ _036D: _0396: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _05B7 GoTo _04B5 @@ -285,8 +261,7 @@ _0396: _03BF: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _05D7 GoTo _04B5 @@ -294,8 +269,7 @@ _03BF: _03E8: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _05F7 GoTo _04B5 @@ -303,8 +277,7 @@ _03E8: _0411: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0617 GoTo _04B5 @@ -312,8 +285,7 @@ _0411: _043A: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0637 GoTo _04B5 @@ -321,8 +293,7 @@ _043A: _0463: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0657 GoTo _04B5 @@ -330,8 +301,7 @@ _0463: _048C: ScrCmd_071 0x800C, 0x1900 - CompareVar 0x800C, 0 - GoToIf 1, _052C + GoToIfEq 0x800C, 0, _052C SetVar 0x8005, 1 Call _0677 GoTo _04B5 @@ -339,14 +309,12 @@ _048C: _04B5: ScrCmd_307 0x800C - CompareVar 0x800C, 0x8005 - GoToIf 0, _0521 + GoToIfLt 0x800C, 0x8005, _0521 GoTo _04CE End _04CE: - CompareVar 0x8005, 0 - GoToIf 1, _0503 + GoToIfEq 0x8005, 0, _0503 ScrCmd_289 0x800C, 0x8007, 0x8000, 0x8001, 0x8002, 0x8003, 20 ScrCmd_334 35, 0x1900 ScrCmd_1A3 0x1900 diff --git a/res/field/scripts/script_0149.s b/res/field/scripts/script_0149.s index 4ba4d868ec..00b2ef35b4 100644 --- a/res/field/scripts/script_0149.s +++ b/res/field/scripts/script_0149.s @@ -25,8 +25,7 @@ _003B: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1CF, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0063 + GoToIfEq 0x800C, 1, _0063 ScrCmd_02C 7 ScrCmd_031 ScrCmd_034 @@ -36,10 +35,8 @@ _003B: _0063: ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0086 - CompareVar 0x800C, 1 - GoToIf 1, _00C2 + GoToIfEq 0x800C, 0, _0086 + GoToIfEq 0x800C, 1, _00C2 End _0086: diff --git a/res/field/scripts/script_0150.s b/res/field/scripts/script_0150.s index db6411dce5..c5f337c5a9 100644 --- a/res/field/scripts/script_0150.s +++ b/res/field/scripts/script_0150.s @@ -22,24 +22,19 @@ _000E: _0039: ScrCmd_02C 1 Call _0119 - CompareVar 0x800C, -2 - GoToIf 1, _00D8 - CompareVar 0x800C, 0x4001 - GoToIf 1, _00D8 + GoToIfEq 0x800C, -2, _00D8 + GoToIfEq 0x800C, 0x4001, _00D8 ScrCmd_2A6 0x800C, 0x8000, 0x8001 CompareVar 0x8000, 0x148 CallIf 0, _0100 CompareVar 0x8000, 0x148 CallIf 4, _010A ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0039 + GoToIfEq 0x800C, 1, _0039 ScrCmd_2A9 0x800C, 0x8001 - CompareVar 0x800C, 0 - GoToIf 1, _00F5 + GoToIfEq 0x800C, 0, _00F5 ScrCmd_07D 0x8000, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E5 + GoToIfEq 0x800C, 0, _00E5 ScrCmd_02C 4 ScrCmd_07B 0x8000, 1, 0x800C ScrCmd_2A8 0x8001 @@ -92,8 +87,7 @@ _0135: ScrCmd_280 1, 0x8001, 1, 5 ScrCmd_046 168, 0xFF, 0x8008 AddVar 0x8008, 1 - CompareVar 0x8008, 0x4001 - GoToIf 0, _0135 + GoToIfLt 0x8008, 0x4001, _0135 GoTo _016C End @@ -106,21 +100,18 @@ _017C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 196 - GoToIf 1, _01AF + GoToIfSet 196, _01AF SetFlag 196 ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0250 + GoToIfEq 0x800C, 1, _0250 GoTo _01CB End _01AF: ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0250 + GoToIfEq 0x800C, 1, _0250 GoTo _01CB End @@ -133,17 +124,13 @@ _01CB: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0250 + GoToIfEq 0x8000, 0xFF, _0250 ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _025B + GoToIfEq 0x8001, 0, _025B ScrCmd_2FF 0x8000, 0x8004 - CompareVar 0x8004, -1 - GoToIf 1, _0245 + GoToIfEq 0x8004, -1, _0245 ScrCmd_099 0x800C, 237, 0x8000 - CompareVar 0x800C, 0 - GoToIf 1, _0266 + GoToIfEq 0x800C, 0, _0266 ScrCmd_2FD 0, 0x8004 ScrCmd_02C 11 GoTo _0276 diff --git a/res/field/scripts/script_0151.s b/res/field/scripts/script_0151.s index efa09fb716..59c76b9aee 100644 --- a/res/field/scripts/script_0151.s +++ b/res/field/scripts/script_0151.s @@ -10,20 +10,15 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 188 - GoToIf 1, _00EF + GoToIfSet 188, _00EF ScrCmd_02C 0 ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _005F - CompareVar 0x800C, 0 - GoToIf 1, _006F - CompareVar 0x800C, 3 - GoToIf 1, _007F - CompareVar 0x800C, 1 - GoToIf 1, _008F + GoToIfEq 0x800C, 2, _005F + GoToIfEq 0x800C, 0, _006F + GoToIfEq 0x800C, 3, _007F + GoToIfEq 0x800C, 1, _008F End _005F: @@ -53,8 +48,7 @@ _009F: ScrCmd_042 175, 1 ScrCmd_043 ScrCmd_1B7 0x800C, 2 - CompareVar 0x800C, 0 - GoToIf 1, _00E4 + GoToIfEq 0x800C, 0, _00E4 ScrCmd_02C 4 SetVar 0x8004, 0x1BC SetVar 0x8005, 1 diff --git a/res/field/scripts/script_0153.s b/res/field/scripts/script_0153.s index ec8aa63cfb..27c9610310 100644 --- a/res/field/scripts/script_0153.s +++ b/res/field/scripts/script_0153.s @@ -10,10 +10,8 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 151 - GoToIf 1, _0109 - CheckFlag 181 - GoToIf 1, _0037 + GoToIfSet 151, _0109 + GoToIfSet 181, _0037 SetFlag 181 ScrCmd_02C 0 GoTo _0042 @@ -26,15 +24,13 @@ _0037: _0042: ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005B + GoToIfEq 0x800C, 0, _005B GoTo _00FE End _005B: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _00F3 + GoToIfEq 0x800C, 6, _00F3 ScrCmd_02C 2 ScrCmd_04E 0x486 ScrCmd_0CD 0 @@ -44,10 +40,8 @@ _005B: SetFlag 151 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AC - CompareVar 0x800C, 1 - GoToIf 1, _00ED + GoToIfEq 0x800C, 0, _00AC + GoToIfEq 0x800C, 1, _00ED End _00AC: diff --git a/res/field/scripts/script_0154.s b/res/field/scripts/script_0154.s index 4211ccc70c..3742f58847 100644 --- a/res/field/scripts/script_0154.s +++ b/res/field/scripts/script_0154.s @@ -11,12 +11,10 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAAC - GoToIf 1, _00D5 + GoToIfSet 0xAAC, _00D5 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00EB + GoToIfEq 0x800C, 1, _00EB ScrCmd_02C 1 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -26,11 +24,9 @@ _000E: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4000, 0xFF - GoToIf 1, _00EB + GoToIfEq 0x4000, 0xFF, _00EB ScrCmd_198 0x4000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E0 + GoToIfEq 0x800C, 0, _00E0 ScrCmd_02C 3 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -44,8 +40,7 @@ _000E: SetFlag 0xAAC ScrCmd_1BA 3, 0x4000 ScrCmd_26C 0x8004 - CompareVar 0x8004, -1 - GoToIf 1, _00F6 + GoToIfEq 0x8004, -1, _00F6 ScrCmd_02C 7 SetVar 0x8005, 1 ScrCmd_014 0x7FF diff --git a/res/field/scripts/script_0155.s b/res/field/scripts/script_0155.s index fb55b31136..f1634f5cb7 100644 --- a/res/field/scripts/script_0155.s +++ b/res/field/scripts/script_0155.s @@ -9,8 +9,7 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x107 - GoToIf 1, _0024 + GoToIfSet 0x107, _0024 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0156.s b/res/field/scripts/script_0156.s index 9bd11afe38..7c3ac07f31 100644 --- a/res/field/scripts/script_0156.s +++ b/res/field/scripts/script_0156.s @@ -28,8 +28,7 @@ _004E: CallIf 1, _0077 CompareVar 0x40A6, 3 CallIf 1, _0077 - CompareVar 0x407E, 0 - GoToIf 1, _0083 + GoToIfEq 0x407E, 0, _0083 End _0077: @@ -51,16 +50,11 @@ _0099: ScrCmd_064 20 ScrCmd_062 20 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 0x355 - GoToIf 1, _00FA - CompareVar 0x8004, 0x356 - GoToIf 1, _0114 - CompareVar 0x8004, 0x357 - GoToIf 1, _012E - CompareVar 0x8004, 0x358 - GoToIf 1, _0148 - CompareVar 0x8004, 0x359 - GoToIf 1, _0162 + GoToIfEq 0x8004, 0x355, _00FA + GoToIfEq 0x8004, 0x356, _0114 + GoToIfEq 0x8004, 0x357, _012E + GoToIfEq 0x8004, 0x358, _0148 + GoToIfEq 0x8004, 0x359, _0162 End _00FA: @@ -443,12 +437,10 @@ _0530: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 154 - GoToIf 1, _056C + GoToIfSet 154, _056C ScrCmd_02C 8 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0561 + GoToIfEq 0x800C, 0, _0561 GoTo _056C End @@ -478,10 +470,8 @@ _0577: _0593: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x316 - GoToIf 1, _05B7 - CompareVar 0x8005, 0x317 - GoToIf 1, _05C7 + GoToIfEq 0x8005, 0x316, _05B7 + GoToIfEq 0x8005, 0x317, _05C7 End _05B7: @@ -674,20 +664,13 @@ _0791: ScrCmd_035 ScrCmd_234 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0806 - CompareVar 0x8008, 1 - GoToIf 1, _0810 - CompareVar 0x8008, 2 - GoToIf 1, _081A - CompareVar 0x8008, 3 - GoToIf 1, _0824 - CompareVar 0x8008, 4 - GoToIf 1, _082E - CompareVar 0x8008, 5 - GoToIf 1, _0838 - CompareVar 0x8008, 6 - GoToIf 1, _0842 + GoToIfEq 0x8008, 0, _0806 + GoToIfEq 0x8008, 1, _0810 + GoToIfEq 0x8008, 2, _081A + GoToIfEq 0x8008, 3, _0824 + GoToIfEq 0x8008, 4, _082E + GoToIfEq 0x8008, 5, _0838 + GoToIfEq 0x8008, 6, _0842 End _0806: @@ -726,8 +709,7 @@ _0850: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x162 - GoToIf 1, _086E + GoToIfSet 0x162, _086E ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -739,12 +721,9 @@ _086E: ScrCmd_034 ScrCmd_003 15, 0x800C ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _08A6 - CompareVar 0x800C, 2 - GoToIf 1, _08BE - CompareVar 0x800C, 3 - GoToIf 1, _08D6 + GoToIfEq 0x800C, 0, _08A6 + GoToIfEq 0x800C, 2, _08BE + GoToIfEq 0x800C, 3, _08D6 End _08A6: diff --git a/res/field/scripts/script_0158.s b/res/field/scripts/script_0158.s index 3fc52307f2..74f1b642f6 100644 --- a/res/field/scripts/script_0158.s +++ b/res/field/scripts/script_0158.s @@ -22,8 +22,7 @@ _0022: ScrCmd_060 ScrCmd_068 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0048 + GoToIfEq 0x800C, 1, _0048 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -42,8 +41,7 @@ _0056: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _007A + GoToIfEq 0x800C, 1, _007A ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -51,8 +49,7 @@ _0056: End _007A: - CompareVar 0x40EF, 1 - GoToIf 4, _0098 + GoToIfGe 0x40EF, 1, _0098 ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 3 diff --git a/res/field/scripts/script_0160.s b/res/field/scripts/script_0160.s index 045bb6ceb1..9eee0c7f39 100644 --- a/res/field/scripts/script_0160.s +++ b/res/field/scripts/script_0160.s @@ -26,15 +26,13 @@ _0027: ScrCmd_060 ScrCmd_068 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0104 + GoToIfEq 0x800C, 1, _0104 ScrCmd_1CD 9, 156, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x140, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011A + GoToIfEq 0x800C, 0, _011A ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -59,8 +57,7 @@ _00BC: SetVar 0x8004, 0x180 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FA + GoToIfEq 0x800C, 0, _00FA ScrCmd_014 0x7FC SetFlag 182 ScrCmd_0D1 0, 0x8004 @@ -78,8 +75,7 @@ _00FA: End _0104: - CheckFlag 182 - GoToIf 0, _00BC + GoToIfUnset 182, _00BC ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0161.s b/res/field/scripts/script_0161.s index 100f6efacb..4366adbe27 100644 --- a/res/field/scripts/script_0161.s +++ b/res/field/scripts/script_0161.s @@ -28,8 +28,7 @@ _0031: ScrCmd_060 ScrCmd_068 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0057 + GoToIfEq 0x800C, 1, _0057 ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0164.s b/res/field/scripts/script_0164.s index 8241e7ae3c..0e6352ab19 100644 --- a/res/field/scripts/script_0164.s +++ b/res/field/scripts/script_0164.s @@ -18,13 +18,11 @@ _001A: ScrCmd_068 ScrCmd_247 0x8000 ScrCmd_230 0x800C, 0x8000, 24 - CompareVar 0x800C, 1 - GoToIf 1, _0086 + GoToIfEq 0x800C, 1, _0086 ScrCmd_0D0 0, 0x8000 ScrCmd_02C 0 ScrCmd_233 0x800C, 0x8000 - CompareVar 0x800C, 0x1FE - GoToIf 0, _007B + GoToIfLt 0x800C, 0x1FE, _007B ScrCmd_02C 1 ScrCmd_231 0x8000, 24 ScrCmd_04E 0x483 @@ -68,8 +66,7 @@ _00A9: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B2, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D9 + GoToIfEq 0x800C, 0, _00D9 ScrCmd_02C 7 ScrCmd_014 0x7E3 ScrCmd_035 @@ -87,20 +84,13 @@ _00D9: _00E4: ScrCmd_234 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _016F - CompareVar 0x8008, 1 - GoToIf 1, _014B - CompareVar 0x8008, 2 - GoToIf 1, _0151 - CompareVar 0x8008, 3 - GoToIf 1, _0157 - CompareVar 0x8008, 4 - GoToIf 1, _015D - CompareVar 0x8008, 5 - GoToIf 1, _0163 - CompareVar 0x8008, 6 - GoToIf 1, _0169 + GoToIfEq 0x8008, 0, _016F + GoToIfEq 0x8008, 1, _014B + GoToIfEq 0x8008, 2, _0151 + GoToIfEq 0x8008, 3, _0157 + GoToIfEq 0x8008, 4, _015D + GoToIfEq 0x8008, 5, _0163 + GoToIfEq 0x8008, 6, _0169 End _014B: @@ -137,14 +127,10 @@ _0175: ScrCmd_068 ScrCmd_02C 9 ScrCmd_234 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01BE - CompareVar 0x4000, 1 - GoToIf 1, _01BE - CompareVar 0x4000, 2 - GoToIf 1, _01BE - CompareVar 0x4000, 3 - GoToIf 1, _01BE + GoToIfEq 0x4000, 0, _01BE + GoToIfEq 0x4000, 1, _01BE + GoToIfEq 0x4000, 2, _01BE + GoToIfEq 0x4000, 3, _01BE GoTo _01C9 _01BE: diff --git a/res/field/scripts/script_0165.s b/res/field/scripts/script_0165.s index b1844b8c8f..72c8420931 100644 --- a/res/field/scripts/script_0165.s +++ b/res/field/scripts/script_0165.s @@ -9,16 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA4 - GoToIf 1, _006A - CheckFlag 0xAA7 - GoToIf 1, _005F - CheckFlag 247 - GoToIf 0, _004C + GoToIfSet 0xAA4, _006A + GoToIfSet 0xAA7, _005F + GoToIfUnset 247, _004C ScrCmd_247 0x8002 Call _0070 - CompareVar 0x800C, 1 - GoToIf 1, _0136 + GoToIfEq 0x800C, 1, _0136 GoTo _0146 _004C: @@ -42,18 +38,12 @@ _006A: _0070: ScrCmd_234 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00C8 - CompareVar 0x800C, 1 - GoToIf 1, _00D2 - CompareVar 0x800C, 2 - GoToIf 1, _00DC - CompareVar 0x800C, 3 - GoToIf 1, _00E6 - CompareVar 0x800C, 4 - GoToIf 1, _00F0 - CompareVar 0x800C, 5 - GoToIf 1, _00FA + GoToIfEq 0x800C, 0, _00C8 + GoToIfEq 0x800C, 1, _00D2 + GoToIfEq 0x800C, 2, _00DC + GoToIfEq 0x800C, 3, _00E6 + GoToIfEq 0x800C, 4, _00F0 + GoToIfEq 0x800C, 5, _00FA GoTo _0104 _00C8: @@ -111,18 +101,12 @@ _0136: _0146: ScrCmd_234 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _019E - CompareVar 0x800C, 1 - GoToIf 1, _01F2 - CompareVar 0x800C, 2 - GoToIf 1, _0246 - CompareVar 0x800C, 3 - GoToIf 1, _029A - CompareVar 0x800C, 4 - GoToIf 1, _02EE - CompareVar 0x800C, 5 - GoToIf 1, _0342 + GoToIfEq 0x800C, 0, _019E + GoToIfEq 0x800C, 1, _01F2 + GoToIfEq 0x800C, 2, _0246 + GoToIfEq 0x800C, 3, _029A + GoToIfEq 0x800C, 4, _02EE + GoToIfEq 0x800C, 5, _0342 GoTo _0396 _019E: @@ -135,8 +119,7 @@ _019E: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 21 SetFlag 0xAA4 @@ -154,8 +137,7 @@ _01F2: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 3 SetFlag 0xAA4 @@ -173,8 +155,7 @@ _0246: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 11 SetFlag 0xAA4 @@ -192,8 +173,7 @@ _029A: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 13 SetFlag 0xAA4 @@ -211,8 +191,7 @@ _02EE: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 15 SetFlag 0xAA4 @@ -230,8 +209,7 @@ _0342: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 17 SetFlag 0xAA4 @@ -249,8 +227,7 @@ _0396: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _03EA + GoToIfEq 0x800C, 0, _03EA ScrCmd_245 0, 0x8000 ScrCmd_02C 19 SetFlag 0xAA4 diff --git a/res/field/scripts/script_0170.s b/res/field/scripts/script_0170.s index 02e5017fa3..f8a61d748e 100644 --- a/res/field/scripts/script_0170.s +++ b/res/field/scripts/script_0170.s @@ -9,8 +9,7 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40B5, 1 - GoToIf 4, _002C + GoToIfGe 0x40B5, 1, _002C SetVar 0x40B5, 1 ScrCmd_02C 0 ScrCmd_031 @@ -20,20 +19,16 @@ _0006: _002C: ScrCmd_134 18, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0125 + GoToIfEq 0x800C, 1, _0125 ScrCmd_134 17, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00A7 + GoToIfEq 0x800C, 1, _00A7 ScrCmd_134 16, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0089 + GoToIfEq 0x800C, 1, _0089 GoTo _006B _006B: ScrCmd_213 0x8000, 12 - CompareVar 0x8000, 0xFF - GoToIf 5, _00C5 + GoToIfNe 0x8000, 0xFF, _00C5 ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 @@ -42,8 +37,7 @@ _006B: _0089: ScrCmd_213 0x8000, 14 - CompareVar 0x8000, 0xFF - GoToIf 5, _00E5 + GoToIfNe 0x8000, 0xFF, _00E5 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -52,8 +46,7 @@ _0089: _00A7: ScrCmd_213 0x8000, 24 - CompareVar 0x8000, 0xFF - GoToIf 5, _0105 + GoToIfNe 0x8000, 0xFF, _0105 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0171.s b/res/field/scripts/script_0171.s index 1a1c911ec8..8a09b2b2ba 100644 --- a/res/field/scripts/script_0171.s +++ b/res/field/scripts/script_0171.s @@ -48,12 +48,9 @@ _004C: ScrCmd_034 ScrCmd_003 15, 0x800C ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0092 - CompareVar 0x800C, 2 - GoToIf 1, _00AA - CompareVar 0x800C, 3 - GoToIf 1, _00C2 + GoToIfEq 0x800C, 0, _0092 + GoToIfEq 0x800C, 2, _00AA + GoToIfEq 0x800C, 3, _00C2 End _0092: diff --git a/res/field/scripts/script_0172.s b/res/field/scripts/script_0172.s index 716566752b..9f81d0b916 100644 --- a/res/field/scripts/script_0172.s +++ b/res/field/scripts/script_0172.s @@ -11,10 +11,8 @@ _0006: WaitMovement ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 1 - GoToIf 1, _0038 - CompareVar 0x8008, 0 - GoToIf 1, _006A + GoToIfEq 0x8008, 1, _0038 + GoToIfEq 0x8008, 0, _006A End _0038: diff --git a/res/field/scripts/script_0174.s b/res/field/scripts/script_0174.s index d2e9d74cf5..66cc0c81ad 100644 --- a/res/field/scripts/script_0174.s +++ b/res/field/scripts/script_0174.s @@ -17,8 +17,7 @@ .short 0xFD13 _0032: - CompareVar 0x407F, 1 - GoToIf 4, _0041 + GoToIfGe 0x407F, 1, _0041 End _0041: @@ -32,8 +31,7 @@ _0047: ScrCmd_02C 0 ScrCmd_034 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0088 + GoToIfEq 0x800C, 1, _0088 GoTo _0072 End @@ -45,8 +43,7 @@ _0072: End _0088: - CheckFlag 0x964 - GoToIf 0, _0072 + GoToIfUnset 0x964, _0072 GoTo _0111 .balign 4, 0 @@ -69,8 +66,7 @@ _00B4: ScrCmd_060 ScrCmd_068 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00DF + GoToIfEq 0x800C, 1, _00DF GoTo _00D4 _00D4: @@ -81,10 +77,8 @@ _00D4: End _00DF: - CheckFlag 0x964 - GoToIf 0, _00D4 - CompareVar 0x407F, 0 - GoToIf 1, _0102 + GoToIfUnset 0x964, _00D4 + GoToIfEq 0x407F, 0, _0102 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -179,8 +173,7 @@ _01C0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x407F, 1 - GoToIf 4, _01E0 + GoToIfGe 0x407F, 1, _01E0 ScrCmd_02C 7 ScrCmd_031 ScrCmd_034 @@ -224,14 +217,11 @@ _022A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x964 - GoToIf 0, _0260 + GoToIfUnset 0x964, _0260 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0276 - CompareVar 0x800C, 1 - GoToIf 1, _026B + GoToIfEq 0x800C, 0, _0276 + GoToIfEq 0x800C, 1, _026B End _0260: diff --git a/res/field/scripts/script_0176.s b/res/field/scripts/script_0176.s index cc2b1cbea3..7a686543b9 100644 --- a/res/field/scripts/script_0176.s +++ b/res/field/scripts/script_0176.s @@ -9,8 +9,7 @@ .short 0xFD13 _0012: - CheckFlag 235 - GoToIf 1, _001F + GoToIfSet 235, _001F End _001F: @@ -22,15 +21,13 @@ _0025: ScrCmd_060 ScrCmd_068 ScrCmd_15B 6, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00F8 + GoToIfEq 0x800C, 1, _00F8 ScrCmd_1CD 9, 167, 0, 0, 0 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x13F, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _010E + GoToIfEq 0x800C, 0, _010E ScrCmd_02C 1 ScrCmd_0CD 0 ScrCmd_02C 2 @@ -53,8 +50,7 @@ _00B0: SetVar 0x8004, 0x18F SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00EE + GoToIfEq 0x800C, 0, _00EE ScrCmd_014 0x7FC SetFlag 158 ScrCmd_0D1 0, 0x8004 @@ -72,8 +68,7 @@ _00EE: End _00F8: - CheckFlag 158 - GoToIf 0, _00B0 + GoToIfUnset 158, _00B0 ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -90,8 +85,7 @@ _0114: ScrCmd_060 ScrCmd_068 ScrCmd_15B 6, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _013A + GoToIfEq 0x800C, 1, _013A ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -110,8 +104,7 @@ _0148: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_15B 6, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0172 + GoToIfEq 0x800C, 1, _0172 ScrCmd_0CE 0 ScrCmd_0CE 1 ScrCmd_02C 8 diff --git a/res/field/scripts/script_0177.s b/res/field/scripts/script_0177.s index 3180c6d80e..6f56043e5a 100644 --- a/res/field/scripts/script_0177.s +++ b/res/field/scripts/script_0177.s @@ -52,8 +52,7 @@ _0067: ScrCmd_060 ScrCmd_068 ScrCmd_15B 6, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00EC + GoToIfEq 0x800C, 1, _00EC ScrCmd_1BD 0x8000 CompareVar 0x8000, 0 CallIf 1, _00C8 diff --git a/res/field/scripts/script_0180.s b/res/field/scripts/script_0180.s index 576b9290d8..f95935f4fa 100644 --- a/res/field/scripts/script_0180.s +++ b/res/field/scripts/script_0180.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 244 - GoToIf 1, _0028 + GoToIfSet 244, _0028 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -29,12 +28,10 @@ _0033: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 244 - GoToIf 1, _00DC + GoToIfSet 244, _00DC ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0060 + GoToIfEq 0x800C, 0, _0060 GoTo _00D1 _0060: @@ -46,14 +43,12 @@ _0060: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _00D1 + GoToIfEq 0x800C, 0xFF, _00D1 ScrCmd_226 2 SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C - CompareVar 0x8005, 0x800C - GoToIf 5, _00C4 + GoToIfNe 0x8005, 0x800C, _00C4 ScrCmd_229 0x8004 ScrCmd_22A SetFlag 244 diff --git a/res/field/scripts/script_0181.s b/res/field/scripts/script_0181.s index efd974081f..e0ac5c898f 100644 --- a/res/field/scripts/script_0181.s +++ b/res/field/scripts/script_0181.s @@ -10,18 +10,14 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAAD - GoToIf 1, _0064 + GoToIfSet 0xAAD, _0064 ScrCmd_27F 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _007A + GoToIfEq 0x800C, 1, _007A ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _006F + GoToIfEq 0x800C, 1, _006F ScrCmd_27D 0x800C, 0 - CompareVar 0x800C, -1 - GoToIf 1, _007A + GoToIfEq 0x800C, -1, _007A SetFlag 0xAAD ScrCmd_02C 1 ScrCmd_031 @@ -56,10 +52,8 @@ _0085: ScrCmd_068 ScrCmd_02C 7 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B0 - CompareVar 0x800C, 1 - GoToIf 1, _0296 + GoToIfEq 0x800C, 0, _00B0 + GoToIfEq 0x800C, 1, _0296 End _00B0: @@ -72,27 +66,21 @@ _00B0: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0296 + GoToIfEq 0x8000, 0xFF, _0296 ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _028B + GoToIfEq 0x8001, 0, _028B ScrCmd_2E5 0x8000, 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A1 + GoToIfEq 0x800C, 0, _02A1 ScrCmd_0D6 0, 0x8000 ScrCmd_02C 12 ScrCmd_2E6 0x8000, 2, 0x800C SetVar 0x8003, 0x800C - CompareVar 0x8003, -2 - GoToIf 1, _0296 + GoToIfEq 0x8003, -2, _0296 ScrCmd_2EA 0x8003, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02AC + GoToIfEq 0x800C, 0, _02AC ScrCmd_1C8 0x800C, 0x8000 SetVar 0x8002, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _0161 + GoToIfEq 0x800C, 4, _0161 GoTo _0256 End @@ -101,8 +89,7 @@ _0161: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 16 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _021B + GoToIfEq 0x800C, 1, _021B ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_034 @@ -111,14 +98,12 @@ _0161: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 4 - GoToIf 1, _021B + GoToIfEq 0x8002, 4, _021B ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C ScrCmd_02C 19 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _021B + GoToIfEq 0x800C, 1, _021B ScrCmd_0D6 0, 0x8000 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C @@ -141,8 +126,7 @@ _021B: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0241 + GoToIfEq 0x800C, 0, _0241 GoTo _0161 End diff --git a/res/field/scripts/script_0186.s b/res/field/scripts/script_0186.s index cfff229ae6..3a95b7afcd 100644 --- a/res/field/scripts/script_0186.s +++ b/res/field/scripts/script_0186.s @@ -26,8 +26,7 @@ _0022: ClearFlag 177 ClearFlag 178 ClearFlag 179 - CheckFlag 175 - GoToIf 1, _0063 + GoToIfSet 175, _0063 End _0063: @@ -38,19 +37,15 @@ _006D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 175 - GoToIf 1, _00F7 + GoToIfSet 175, _00F7 ScrCmd_02C 2 ScrCmd_034 ScrCmd_04E 0x489 ScrCmd_04F ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B8 - CompareVar 0x800C, 2 - GoToIf 1, _00C8 - CompareVar 0x800C, 3 - GoToIf 1, _00D8 + GoToIfEq 0x800C, 0, _00B8 + GoToIfEq 0x800C, 2, _00C8 + GoToIfEq 0x800C, 3, _00D8 End _00B8: @@ -127,12 +122,9 @@ _0154: ScrCmd_064 5 ScrCmd_014 0x7FA ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 10 - GoToIf 1, _0191 - CompareVar 0x8004, 11 - GoToIf 1, _01A1 - CompareVar 0x8004, 12 - GoToIf 1, _01B1 + GoToIfEq 0x8004, 10, _0191 + GoToIfEq 0x8004, 11, _01A1 + GoToIfEq 0x8004, 12, _01B1 End _0191: @@ -157,10 +149,8 @@ _01C1: ScrCmd_02C 0 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _0203 - CompareVar 0x800C, 0x186 - GoToIf 1, _020F + GoToIfEq 0x800C, 0x183, _0203 + GoToIfEq 0x800C, 0x186, _020F GoTo _01F7 _01F7: @@ -177,19 +167,15 @@ _020F: _021B: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02AC + GoToIfEq 0x800C, 0, _02AC ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 10 - GoToIf 1, _0266 - CompareVar 0x8004, 11 - GoToIf 1, _0276 - CompareVar 0x8004, 12 - GoToIf 1, _0286 + GoToIfEq 0x8004, 10, _0266 + GoToIfEq 0x8004, 11, _0276 + GoToIfEq 0x8004, 12, _0286 End _0266: diff --git a/res/field/scripts/script_0187.s b/res/field/scripts/script_0187.s index faaba616b6..e6bb107228 100644 --- a/res/field/scripts/script_0187.s +++ b/res/field/scripts/script_0187.s @@ -11,8 +11,7 @@ _000E: SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0029 + GoToIfEq 0x4001, 0, _0029 End _0029: diff --git a/res/field/scripts/script_0188.s b/res/field/scripts/script_0188.s index f55c80e98a..15c54badf9 100644 --- a/res/field/scripts/script_0188.s +++ b/res/field/scripts/script_0188.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 176 - GoToIf 1, _00AC + GoToIfSet 176, _00AC ScrCmd_0EA 0x105 ScrCmd_02C 0 ScrCmd_034 @@ -20,8 +19,7 @@ _000A: CheckFlag 214 CallIf 1, _0082 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A6 + GoToIfEq 0x800C, 0, _00A6 SetFlag 176 ScrCmd_049 0x61A ScrCmd_065 2 diff --git a/res/field/scripts/script_0189.s b/res/field/scripts/script_0189.s index faaba616b6..e6bb107228 100644 --- a/res/field/scripts/script_0189.s +++ b/res/field/scripts/script_0189.s @@ -11,8 +11,7 @@ _000E: SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0029 + GoToIfEq 0x4001, 0, _0029 End _0029: diff --git a/res/field/scripts/script_0190.s b/res/field/scripts/script_0190.s index e052e2b6e9..2b959d7e23 100644 --- a/res/field/scripts/script_0190.s +++ b/res/field/scripts/script_0190.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 177 - GoToIf 1, _00AC + GoToIfSet 177, _00AC ScrCmd_0EA 0x106 ScrCmd_02C 0 ScrCmd_034 @@ -20,8 +19,7 @@ _000A: CheckFlag 214 CallIf 1, _0082 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A6 + GoToIfEq 0x800C, 0, _00A6 SetFlag 177 ScrCmd_049 0x61A ScrCmd_065 2 diff --git a/res/field/scripts/script_0191.s b/res/field/scripts/script_0191.s index faaba616b6..e6bb107228 100644 --- a/res/field/scripts/script_0191.s +++ b/res/field/scripts/script_0191.s @@ -11,8 +11,7 @@ _000E: SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0029 + GoToIfEq 0x4001, 0, _0029 End _0029: diff --git a/res/field/scripts/script_0192.s b/res/field/scripts/script_0192.s index 1ee25c38a9..5e13c9c1e4 100644 --- a/res/field/scripts/script_0192.s +++ b/res/field/scripts/script_0192.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 178 - GoToIf 1, _00D2 + GoToIfSet 178, _00D2 ScrCmd_0EA 0x107 CheckFlag 0x964 CallIf 0, _00F0 @@ -23,8 +22,7 @@ _000A: CheckFlag 214 CallIf 1, _00A8 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CC + GoToIfEq 0x800C, 0, _00CC SetFlag 178 ScrCmd_049 0x61A ScrCmd_065 1 diff --git a/res/field/scripts/script_0193.s b/res/field/scripts/script_0193.s index faaba616b6..e6bb107228 100644 --- a/res/field/scripts/script_0193.s +++ b/res/field/scripts/script_0193.s @@ -11,8 +11,7 @@ _000E: SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0029 + GoToIfEq 0x4001, 0, _0029 End _0029: diff --git a/res/field/scripts/script_0194.s b/res/field/scripts/script_0194.s index be279b48ee..8099bc395a 100644 --- a/res/field/scripts/script_0194.s +++ b/res/field/scripts/script_0194.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 179 - GoToIf 1, _00AC + GoToIfSet 179, _00AC ScrCmd_0EA 0x108 ScrCmd_02C 0 ScrCmd_034 @@ -20,8 +19,7 @@ _000A: CheckFlag 214 CallIf 1, _0082 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A6 + GoToIfEq 0x800C, 0, _00A6 SetFlag 179 ScrCmd_049 0x61A ScrCmd_065 1 diff --git a/res/field/scripts/script_0195.s b/res/field/scripts/script_0195.s index faaba616b6..e6bb107228 100644 --- a/res/field/scripts/script_0195.s +++ b/res/field/scripts/script_0195.s @@ -11,8 +11,7 @@ _000E: SetVar 0x4000, 0 ScrCmd_25B ScrCmd_25D 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0029 + GoToIfEq 0x4001, 0, _0029 End _0029: diff --git a/res/field/scripts/script_0196.s b/res/field/scripts/script_0196.s index a941366368..00a3ab3b4d 100644 --- a/res/field/scripts/script_0196.s +++ b/res/field/scripts/script_0196.s @@ -25,8 +25,7 @@ _000E: CheckFlag 214 CallIf 1, _00FD ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0121 + GoToIfEq 0x800C, 0, _0121 ScrCmd_02C 1 SetFlag 180 CheckFlag 214 diff --git a/res/field/scripts/script_0197.s b/res/field/scripts/script_0197.s index 9337301b27..534b4eed79 100644 --- a/res/field/scripts/script_0197.s +++ b/res/field/scripts/script_0197.s @@ -39,10 +39,8 @@ _000A: WaitMovement ScrCmd_02C 4 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B1 - CompareVar 0x800C, 1 - GoToIf 1, _00BD + GoToIfEq 0x800C, 0, _00B1 + GoToIfEq 0x800C, 1, _00BD End _00B1: diff --git a/res/field/scripts/script_0198.s b/res/field/scripts/script_0198.s index 4dd32747a1..0bed6ee6c0 100644 --- a/res/field/scripts/script_0198.s +++ b/res/field/scripts/script_0198.s @@ -22,10 +22,8 @@ _0006: WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0074 - CompareVar 0x800C, 1 - GoToIf 1, _0080 + GoToIfEq 0x800C, 0, _0074 + GoToIfEq 0x800C, 1, _0080 End _0074: @@ -174,8 +172,7 @@ _0244: Return _024C: - CheckFlag 0x125 - GoToIf 0, _0261 + GoToIfUnset 0x125, _0261 ClearFlag 0x1DD SetVar 0x409E, 1 _0261: @@ -183,8 +180,7 @@ _0261: _0263: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0279 + GoToIfEq 0x800C, 0, _0279 ClearFlag 0x243 _0279: Return diff --git a/res/field/scripts/script_0201.s b/res/field/scripts/script_0201.s index 68bfe785b9..c6c75e68c8 100644 --- a/res/field/scripts/script_0201.s +++ b/res/field/scripts/script_0201.s @@ -30,10 +30,8 @@ .short 0xFD13 _0066: - CompareVar 0x4081, 1 - GoToIf 1, _0082 - CompareVar 0x409E, 1 - GoToIf 4, _0098 + GoToIfEq 0x4081, 1, _0082 + GoToIfGe 0x409E, 1, _0098 End _0082: @@ -125,11 +123,9 @@ _00D8: ScrCmd_32E ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02EE + GoToIfEq 0x800C, 1, _02EE Call _014E - CompareVar 0x800C, 0 - GoToIf 1, _0306 + GoToIfEq 0x800C, 0, _0306 Call _0198 ScrCmd_061 End @@ -254,11 +250,9 @@ _0306: _030C: ScrCmd_0DE 0x800C SetVar 0x8004, 0x39D - CompareVar 0x800C, 0x186 - GoToIf 1, _033E + GoToIfEq 0x800C, 0x186, _033E SetVar 0x8004, 0x39C - CompareVar 0x800C, 0x183 - GoToIf 1, _033E + GoToIfEq 0x800C, 0x183, _033E SetVar 0x8004, 0x39B Return @@ -545,12 +539,10 @@ _0521: ScrCmd_060 ScrCmd_068 ScrCmd_0D1 0, 0x1BF - CheckFlag 107 - GoToIf 1, _057A + GoToIfSet 107, _057A ScrCmd_02C 42 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _056F + GoToIfEq 0x800C, 1, _056F ScrCmd_02C 43 SetVar 0x8004, 0x1BF SetVar 0x8005, 1 @@ -608,10 +600,8 @@ _05CA: ScrCmd_1BD 0x8004 ScrCmd_02C 38 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0606 - CompareVar 0x800C, 1 - GoToIf 1, _05FB + GoToIfEq 0x800C, 0, _0606 + GoToIfEq 0x800C, 1, _05FB End _05FB: @@ -716,11 +706,9 @@ _06F0: ScrCmd_0CE 0 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02EE + GoToIfEq 0x800C, 1, _02EE Call _014E - CompareVar 0x800C, 0 - GoToIf 1, _0306 + GoToIfEq 0x800C, 0, _0306 Call _0198 ScrCmd_061 End diff --git a/res/field/scripts/script_0202.s b/res/field/scripts/script_0202.s index 222124e055..6d2fbad1ce 100644 --- a/res/field/scripts/script_0202.s +++ b/res/field/scripts/script_0202.s @@ -25,14 +25,12 @@ _002A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 213 - GoToIf 1, _0071 + GoToIfSet 213, _0071 ScrCmd_02C 0 SetVar 0x8004, 232 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007C + GoToIfEq 0x800C, 0, _007C ScrCmd_014 0x7FC SetFlag 213 GoTo _0071 diff --git a/res/field/scripts/script_0209.s b/res/field/scripts/script_0209.s index 2366f1f2d0..9a5a108ff9 100644 --- a/res/field/scripts/script_0209.s +++ b/res/field/scripts/script_0209.s @@ -63,22 +63,14 @@ _006A: ScrCmd_046 22, 0xFF, 8 ScrCmd_047 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0135 - CompareVar 0x8008, 1 - GoToIf 1, _0140 - CompareVar 0x8008, 2 - GoToIf 1, _014B - CompareVar 0x8008, 3 - GoToIf 1, _0156 - CompareVar 0x8008, 4 - GoToIf 1, _0161 - CompareVar 0x8008, 5 - GoToIf 1, _016C - CompareVar 0x8008, 6 - GoToIf 1, _0177 - CompareVar 0x8008, 7 - GoToIf 1, _0182 + GoToIfEq 0x8008, 0, _0135 + GoToIfEq 0x8008, 1, _0140 + GoToIfEq 0x8008, 2, _014B + GoToIfEq 0x8008, 3, _0156 + GoToIfEq 0x8008, 4, _0161 + GoToIfEq 0x8008, 5, _016C + GoToIfEq 0x8008, 6, _0177 + GoToIfEq 0x8008, 7, _0182 GoTo _018D End diff --git a/res/field/scripts/script_0211.s b/res/field/scripts/script_0211.s index 40337c4042..484ddfe5b2 100644 --- a/res/field/scripts/script_0211.s +++ b/res/field/scripts/script_0211.s @@ -73,25 +73,20 @@ _00EE: ScrCmd_060 ScrCmd_068 ScrCmd_2BE 0x800C - CompareVar 0x800C, 4 - GoToIf 4, _027A + GoToIfGe 0x800C, 4, _027A SetVar 0x8004, 0 ScrCmd_1B6 0x800C ScrCmd_1F9 0x800C SetVar 0x8004, 120 - CompareVar 0x800C, 0 - GoToIf 1, _0141 + GoToIfEq 0x800C, 0, _0141 SetVar 0x8004, 121 - CompareVar 0x800C, 1 - GoToIf 1, _0141 + GoToIfEq 0x800C, 1, _0141 SetVar 0x8004, 0 _0141: ScrCmd_02D 0x8004 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0172 - CompareVar 0x800C, 1 - GoToIf 1, _0165 + GoToIfEq 0x800C, 0, _0172 + GoToIfEq 0x800C, 1, _0165 End _0165: @@ -113,8 +108,7 @@ _0172: CompareVar 0x800C, 4 CallIf 0, _01B7 Call _01C1 - CheckFlag 106 - GoToIf 0, _0242 + GoToIfUnset 106, _0242 GoTo _01E1 _01B7: @@ -136,8 +130,7 @@ _01C1: Return _01E1: - CompareVar 0x8004, 1 - GoToIf 1, _0218 + GoToIfEq 0x8004, 1, _0218 ScrCmd_02C 2 ApplyMovement 0xFF, _02F4 WaitMovement @@ -169,8 +162,7 @@ _0218: _0242: ScrCmd_119 0x8006 - CompareVar 0x8006, 1 - GoToIf 1, _0259 + GoToIfEq 0x8006, 1, _0259 GoTo _01E1 _0259: @@ -187,15 +179,13 @@ _0259: End _027A: - CheckFlag 105 - GoToIf 1, _02B0 + GoToIfSet 105, _02B0 SetFlag 105 ScrCmd_02C 4 ScrCmd_0CD 0 ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02D4 + GoToIfEq 0x800C, 0, _02D4 ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 @@ -207,8 +197,7 @@ _02B0: ScrCmd_0CD 0 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02D4 + GoToIfEq 0x800C, 0, _02D4 ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 @@ -238,14 +227,11 @@ _02F4: _02FC: SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _033A - CompareVar 0x8008, 1 - GoToIf 1, _0341 + GoToIfEq 0x8008, 0, _033A + GoToIfEq 0x8008, 1, _0341 ScrCmd_03B 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _0341 + GoToIfEq 0x8008, 1, _0341 ScrCmd_038 2 ScrCmd_015 End @@ -270,22 +256,14 @@ _034C: _0356: ScrCmd_080 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 7 - GoToIf 1, _03D8 - CompareVar 0x8008, 0 - GoToIf 1, _03CC - CompareVar 0x8008, 4 - GoToIf 1, _03CC - CompareVar 0x8008, 1 - GoToIf 1, _03CC - CompareVar 0x8008, 2 - GoToIf 1, _03CC - CompareVar 0x8008, 6 - GoToIf 1, _03CC - CompareVar 0x8008, 5 - GoToIf 1, _03DE - CompareVar 0x8008, 3 - GoToIf 1, _03D2 + GoToIfEq 0x8008, 7, _03D8 + GoToIfEq 0x8008, 0, _03CC + GoToIfEq 0x8008, 4, _03CC + GoToIfEq 0x8008, 1, _03CC + GoToIfEq 0x8008, 2, _03CC + GoToIfEq 0x8008, 6, _03CC + GoToIfEq 0x8008, 5, _03DE + GoToIfEq 0x8008, 3, _03D2 End _03CC: @@ -315,17 +293,14 @@ _03E8: SetVar 0x8005, 0 _03F4: ScrCmd_1F7 0x800C, 0x8005 - CompareVar 0x800C, 0 - GoToIf 1, _040F + GoToIfEq 0x800C, 0, _040F ScrCmd_0D6 0, 0x8005 ScrCmd_02C 66 _040F: AddVar 0x8005, 1 - CompareVar 0x8004, 0x8005 - GoToIf 5, _03F4 + GoToIfNe 0x8004, 0x8005, _03F4 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 0 - GoToIf 1, _0457 + GoToIfEq 0x800C, 0, _0457 ScrCmd_034 ScrCmd_061 End @@ -372,20 +347,15 @@ _0494: _04A8: ScrCmd_12C 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04FC + GoToIfEq 0x800C, 0, _04FC ScrCmd_2C1 ScrCmd_02C 13 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05A0 + GoToIfEq 0x800C, 1, _05A0 ScrCmd_12C 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _051D - CompareVar 0x800C, 2 - GoToIf 1, _0509 - CompareVar 0x800C, 3 - GoToIf 1, _0526 + GoToIfEq 0x800C, 1, _051D + GoToIfEq 0x800C, 2, _0509 + GoToIfEq 0x800C, 3, _0526 End _04FC: @@ -397,8 +367,7 @@ _04FC: _0509: ScrCmd_02C 14 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05A0 + GoToIfEq 0x800C, 1, _05A0 _051D: ScrCmd_02C 21 GoTo _0552 @@ -406,12 +375,9 @@ _051D: _0526: ScrCmd_02C 14 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05A0 - CheckFlag 31 - GoToIf 0, _05C6 - CheckFlag 31 - GoToIf 1, _05D1 + GoToIfEq 0x800C, 1, _05A0 + GoToIfUnset 31, _05C6 + GoToIfSet 31, _05D1 End _0552: @@ -430,8 +396,7 @@ _0568: Return _057D: - CompareVar 0x800C, 0 - GoToIf 1, _05AA + GoToIfEq 0x800C, 0, _05AA ScrCmd_0CD 0 ScrCmd_02C 16 ScrCmd_049 0x61B @@ -468,8 +433,7 @@ _05C6: _05D1: ScrCmd_2D7 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05B3 + GoToIfEq 0x800C, 0, _05B3 GoTo _05C6 End @@ -477,25 +441,18 @@ _05EA: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_07E 94, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0632 + GoToIfNe 0x800C, 0, _0632 ScrCmd_128 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _065F - CompareVar 0x800C, 2 - GoToIf 1, _066A - CompareVar 0x800C, 3 - GoToIf 1, _06F4 + GoToIfEq 0x800C, 1, _065F + GoToIfEq 0x800C, 2, _066A + GoToIfEq 0x800C, 3, _06F4 End _0632: ScrCmd_128 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0675 - CompareVar 0x800C, 2 - GoToIf 1, _067E - CompareVar 0x800C, 3 - GoToIf 1, _06F4 + GoToIfEq 0x800C, 1, _0675 + GoToIfEq 0x800C, 2, _067E + GoToIfEq 0x800C, 3, _06F4 End _065F: @@ -550,8 +507,7 @@ _067E: _06A2: ScrCmd_07E 94, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _06BB + GoToIfNe 0x800C, 0, _06BB ScrCmd_061 End @@ -559,8 +515,7 @@ _06BB: ScrCmd_02C 50 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _06D5 + GoToIfEq 0x800C, 0, _06D5 ScrCmd_061 End @@ -579,8 +534,7 @@ _06F4: ScrCmd_1E5 117 ScrCmd_129 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0713 + GoToIfEq 0x800C, 0, _0713 ScrCmd_12A GoTo _06A2 @@ -892,8 +846,7 @@ _0A71: GoTo _0AA8 _0A82: - CompareVar 0x8005, 1 - GoToIf 2, _0A9A + GoToIfGt 0x8005, 1, _0A9A ScrCmd_0D1 0, 0x8004 GoTo _0A9F @@ -909,8 +862,7 @@ _0AA8: CompareVar 0x800C, 1 CallIf 1, _13C8 ScrCmd_0CD 0 - CompareVar 0x8005, 1 - GoToIf 2, _0AD8 + GoToIfGt 0x8005, 1, _0AD8 ScrCmd_0D1 1, 0x8004 GoTo _0ADD @@ -919,22 +871,14 @@ _0AD8: _0ADD: ScrCmd_080 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 7 - GoToIf 1, _0B64 - CompareVar 0x8008, 0 - GoToIf 1, _0B53 - CompareVar 0x8008, 4 - GoToIf 1, _0BA8 - CompareVar 0x8008, 1 - GoToIf 1, _0B97 - CompareVar 0x8008, 2 - GoToIf 1, _0BB9 - CompareVar 0x8008, 6 - GoToIf 1, _0B75 - CompareVar 0x8008, 5 - GoToIf 1, _0B86 - CompareVar 0x8008, 3 - GoToIf 1, _0BCA + GoToIfEq 0x8008, 7, _0B64 + GoToIfEq 0x8008, 0, _0B53 + GoToIfEq 0x8008, 4, _0BA8 + GoToIfEq 0x8008, 1, _0B97 + GoToIfEq 0x8008, 2, _0BB9 + GoToIfEq 0x8008, 6, _0B75 + GoToIfEq 0x8008, 5, _0B86 + GoToIfEq 0x8008, 3, _0BCA End _0B53: @@ -1024,10 +968,8 @@ _0C1C: CallIf 1, _0C87 CompareVar 0x800C, 1 CallIf 1, _0C8D - CheckFlag 0x964 - GoToIf 1, _0C93 - CheckFlag 0x964 - GoToIf 0, _0CDD + GoToIfSet 0x964, _0C93 + GoToIfUnset 0x964, _0CDD End _0C7B: @@ -1051,26 +993,19 @@ _0C93: ScrCmd_042 64, 4 ScrCmd_043 SetVar 0x8008, 0x8006 - CompareVar 0x8008, 0 - GoToIf 1, _0D16 - CompareVar 0x8008, 1 - GoToIf 1, _0E45 - CompareVar 0x8008, 2 - GoToIf 1, _0F62 - CompareVar 0x8008, 3 - GoToIf 1, _0F2C + GoToIfEq 0x8008, 0, _0D16 + GoToIfEq 0x8008, 1, _0E45 + GoToIfEq 0x8008, 2, _0F62 + GoToIfEq 0x8008, 3, _0F2C GoTo _0F70 _0CDD: ScrCmd_042 64, 3 ScrCmd_043 SetVar 0x8008, 0x8006 - CompareVar 0x8008, 0 - GoToIf 1, _0D16 - CompareVar 0x8008, 1 - GoToIf 1, _0E45 - CompareVar 0x8008, 2 - GoToIf 1, _0F62 + GoToIfEq 0x8008, 0, _0D16 + GoToIfEq 0x8008, 1, _0E45 + GoToIfEq 0x8008, 2, _0F62 GoTo _0F70 _0D16: @@ -1098,16 +1033,11 @@ _0D69: _0D73: ScrCmd_047 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0DC2 - CompareVar 0x8008, 1 - GoToIf 1, _0DD5 - CompareVar 0x8008, 2 - GoToIf 1, _0DE8 - CompareVar 0x8008, 3 - GoToIf 1, _0DFB - CompareVar 0x8008, 4 - GoToIf 1, _0E0E + GoToIfEq 0x8008, 0, _0DC2 + GoToIfEq 0x8008, 1, _0DD5 + GoToIfEq 0x8008, 2, _0DE8 + GoToIfEq 0x8008, 3, _0DFB + GoToIfEq 0x8008, 4, _0E0E GoTo _0C1C _0DC2: @@ -1174,17 +1104,14 @@ _0E61: _0E83: ScrCmd_047 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0EAB - CompareVar 0x8008, 1 - GoToIf 1, _0EE0 + GoToIfEq 0x8008, 0, _0EAB + GoToIfEq 0x8008, 1, _0EE0 GoTo _0C1C _0EAB: ScrCmd_034 ScrCmd_1B4 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0EC6 + GoToIfEq 0x800C, 0, _0EC6 ScrCmd_1B3 GoTo _0ECF @@ -1200,8 +1127,7 @@ _0ECF: _0EE0: ScrCmd_2AB 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0F01 + GoToIfEq 0x800C, 0, _0F01 ScrCmd_034 Call _0F94 ScrCmd_0A9 @@ -1223,8 +1149,7 @@ _0F2C: ScrCmd_049 0x60D ScrCmd_034 ScrCmd_336 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0F59 + GoToIfEq 0x800C, 1, _0F59 Call _0F94 ScrCmd_0B1 ScrCmd_0A1 @@ -1321,8 +1246,7 @@ _103A: Call _10C7 Call _01C1 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _10A2 + GoToIfEq 0x800C, 1, _10A2 ScrCmd_02C 44 ApplyMovement 0xFF, _02F4 WaitMovement @@ -1351,42 +1275,24 @@ _10A2: _10C7: ScrCmd_201 0x8004 - CompareVar 0x8004, 6 - GoToIf 1, _11BD - CompareVar 0x8004, 36 - GoToIf 1, _11C5 - CompareVar 0x8004, 48 - GoToIf 1, _11CD - CompareVar 0x8004, 69 - GoToIf 1, _11D5 - CompareVar 0x8004, 101 - GoToIf 1, _11DD - CompareVar 0x8004, 123 - GoToIf 1, _11E5 - CompareVar 0x8004, 134 - GoToIf 1, _11ED - CompareVar 0x8004, 151 - GoToIf 1, _11F5 - CompareVar 0x8004, 168 - GoToIf 1, _11FD - CompareVar 0x8004, 173 - GoToIf 1, _1205 - CompareVar 0x8004, 189 - GoToIf 1, _120D - CompareVar 0x8004, 0x1A4 - GoToIf 1, _1215 - CompareVar 0x8004, 0x1AC - GoToIf 1, _121D - CompareVar 0x8004, 0x1B3 - GoToIf 1, _1225 - CompareVar 0x8004, 0x1BB - GoToIf 1, _122D - CompareVar 0x8004, 0x1C4 - GoToIf 1, _1235 - CompareVar 0x8004, 0x1CB - GoToIf 1, _123D - CompareVar 0x8004, 175 - GoToIf 1, _1245 + GoToIfEq 0x8004, 6, _11BD + GoToIfEq 0x8004, 36, _11C5 + GoToIfEq 0x8004, 48, _11CD + GoToIfEq 0x8004, 69, _11D5 + GoToIfEq 0x8004, 101, _11DD + GoToIfEq 0x8004, 123, _11E5 + GoToIfEq 0x8004, 134, _11ED + GoToIfEq 0x8004, 151, _11F5 + GoToIfEq 0x8004, 168, _11FD + GoToIfEq 0x8004, 173, _1205 + GoToIfEq 0x8004, 189, _120D + GoToIfEq 0x8004, 0x1A4, _1215 + GoToIfEq 0x8004, 0x1AC, _121D + GoToIfEq 0x8004, 0x1B3, _1225 + GoToIfEq 0x8004, 0x1BB, _122D + GoToIfEq 0x8004, 0x1C4, _1235 + GoToIfEq 0x8004, 0x1CB, _123D + GoToIfEq 0x8004, 175, _1245 SetVar 0x8007, 0 Return @@ -1556,17 +1462,14 @@ _12E0: _12F3: ScrCmd_07E 0x1C2, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _135F + GoToIfEq 0x800C, 0, _135F ScrCmd_060 ScrCmd_049 0x5DC ScrCmd_0C7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _133C + GoToIfEq 0x800C, 1, _133C ScrCmd_02C 73 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _1359 + GoToIfEq 0x800C, 1, _1359 ScrCmd_0C8 1 ScrCmd_034 ScrCmd_061 @@ -1575,8 +1478,7 @@ _12F3: _133C: ScrCmd_02C 74 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _1359 + GoToIfEq 0x800C, 1, _1359 ScrCmd_0C8 0 ScrCmd_034 ScrCmd_061 @@ -1700,37 +1602,27 @@ _1475: _1477: ScrCmd_060 ScrCmd_201 0x8004 - CompareVar 0x8004, 220 - GoToIf 1, _14AC - CompareVar 0x8004, 0x248 - GoToIf 1, _14AC - CompareVar 0x8004, 0x249 - GoToIf 1, _14AC + GoToIfEq 0x8004, 220, _14AC + GoToIfEq 0x8004, 0x248, _14AC + GoToIfEq 0x8004, 0x249, _14AC GoTo _1570 End _14AC: ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 31 - GoToIf 5, _1570 - CompareVar 0x8005, 52 - GoToIf 5, _1570 + GoToIfNe 0x8004, 31, _1570 + GoToIfNe 0x8005, 52, _1570 ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _1570 + GoToIfEq 0x4000, 0, _1570 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _1570 + GoToIfEq 0x4000, 0, _1570 ScrCmd_28B 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _1570 - CheckFlag 0x11E - GoToIf 1, _1570 + GoToIfEq 0x4000, 0, _1570 + GoToIfSet 0x11E, _1570 ScrCmd_0CD 0 ScrCmd_02C 122 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _157B + GoToIfEq 0x800C, 1, _157B ScrCmd_0CD 0 ScrCmd_02C 123 ScrCmd_034 @@ -1810,8 +1702,7 @@ _15E7: ScrCmd_0B3 0x800C SetVar 0x8004, 0x800C ScrCmd_2F6 0x8005, 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1624 + GoToIfEq 0x800C, 0, _1624 ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD @@ -1850,8 +1741,7 @@ _1672: ScrCmd_02C 129 ScrCmd_2E6 0xFF, 0x8004, 0x800C SetVar 0x8003, 0x800C - CompareVar 0x8003, -2 - GoToIf 1, _16A4 + GoToIfEq 0x8003, -2, _16A4 ScrCmd_2EC 21, 1, 0x8003, 0x800C ScrCmd_030 ScrCmd_2ED @@ -1864,18 +1754,12 @@ _16A4: End _16AA: - CheckFlag 137 - GoToIf 1, _1706 - CompareVar 0x4050, 4 - GoToIf 5, _1706 - CompareVar 0x4051, 4 - GoToIf 5, _1706 - CompareVar 0x4052, 4 - GoToIf 5, _1706 - CompareVar 0x4053, 4 - GoToIf 5, _1706 - CompareVar 0x404F, 4 - GoToIf 5, _1706 + GoToIfSet 137, _1706 + GoToIfNe 0x4050, 4, _1706 + GoToIfNe 0x4051, 4, _1706 + GoToIfNe 0x4052, 4, _1706 + GoToIfNe 0x4053, 4, _1706 + GoToIfNe 0x404F, 4, _1706 SetFlag 137 ScrCmd_30A 42 GoTo _1706 diff --git a/res/field/scripts/script_0212.s b/res/field/scripts/script_0212.s index fbaede9644..cdab56630e 100644 --- a/res/field/scripts/script_0212.s +++ b/res/field/scripts/script_0212.s @@ -55,8 +55,7 @@ _008B: Return _00C8: - CompareVar 0x8004, 1 - GoToIf 2, _00DA + GoToIfGt 0x8004, 1, _00DA ScrCmd_02C 184 Return @@ -65,8 +64,7 @@ _00DA: Return _00DF: - CompareVar 0x8004, 1 - GoToIf 2, _00F1 + GoToIfGt 0x8004, 1, _00F1 ScrCmd_02C 194 Return @@ -75,8 +73,7 @@ _00F1: Return _00F6: - CompareVar 0x8004, 1 - GoToIf 2, _0108 + GoToIfGt 0x8004, 1, _0108 ScrCmd_02C 204 Return @@ -123,8 +120,7 @@ _0148: _014A: CompareVar 0x40CC, 0 CallIf 1, _0168 - CompareVar 0x40CC, 0 - GoToIf 1, _0166 + GoToIfEq 0x40CC, 0, _0166 ScrCmd_265 _0166: End @@ -143,8 +139,7 @@ _0184: Call _01B1 Call _0168 ScrCmd_238 7, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01AB + GoToIfEq 0x4000, 0, _01AB ClearFlag 0x213 End @@ -153,8 +148,7 @@ _01AB: End _01B1: - CheckFlag 0x159 - GoToIf 1, _01BE + GoToIfSet 0x159, _01BE Return _01BE: @@ -203,8 +197,7 @@ _021B: End _023A: - CompareVar 0x4003, 1 - GoToIf 1, _0250 + GoToIfEq 0x4003, 1, _0250 ScrCmd_02C 4 GoTo _0253 @@ -217,10 +210,8 @@ _0253: ScrCmd_042 10, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _02A8 - CompareVar 0x8008, 1 - GoToIf 1, _02F0 + GoToIfEq 0x8008, 0, _02A8 + GoToIfEq 0x8008, 1, _02F0 GoTo _0291 End @@ -235,8 +226,7 @@ _0291: End _02A8: - CompareVar 0x4003, 1 - GoToIf 1, _02BD + GoToIfEq 0x4003, 1, _02BD GoTo _040D End @@ -245,8 +235,7 @@ _02BD: ClearFlag 0x966 ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 1 - GoToIf 1, _02E2 + GoToIfEq 0x800C, 1, _02E2 GoTo _0291 End @@ -256,8 +245,7 @@ _02E2: End _02F0: - CompareVar 0x4003, 1 - GoToIf 1, _0305 + GoToIfEq 0x4003, 1, _0305 GoTo _030E End @@ -275,12 +263,9 @@ _0311: ScrCmd_042 99, 3 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0360 - CompareVar 0x8008, 1 - GoToIf 1, _0368 - CompareVar 0x8008, 2 - GoToIf 1, _0373 + GoToIfEq 0x8008, 0, _0360 + GoToIfEq 0x8008, 1, _0368 + GoToIfEq 0x8008, 2, _0373 GoTo _023A End @@ -309,14 +294,10 @@ _0381: ScrCmd_042 40, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _03E1 - CompareVar 0x8008, 1 - GoToIf 1, _03EC - CompareVar 0x8008, 2 - GoToIf 1, _03F7 - CompareVar 0x8008, 3 - GoToIf 1, _0402 + GoToIfEq 0x8008, 0, _03E1 + GoToIfEq 0x8008, 1, _03EC + GoToIfEq 0x8008, 2, _03F7 + GoToIfEq 0x8008, 3, _0402 GoTo _0311 End @@ -350,14 +331,10 @@ _040D: ScrCmd_042 109, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0470 - CompareVar 0x8008, 1 - GoToIf 1, _047E - CompareVar 0x8008, 2 - GoToIf 1, _048C - CompareVar 0x8008, 3 - GoToIf 1, _049A + GoToIfEq 0x8008, 0, _0470 + GoToIfEq 0x8008, 1, _047E + GoToIfEq 0x8008, 2, _048C + GoToIfEq 0x8008, 3, _049A GoTo _0291 End @@ -392,16 +369,11 @@ _04A8: ScrCmd_042 115, 5 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _051C - CompareVar 0x8008, 1 - GoToIf 1, _052A - CompareVar 0x8008, 2 - GoToIf 1, _0538 - CompareVar 0x8008, 3 - GoToIf 1, _0546 - CompareVar 0x8008, 4 - GoToIf 1, _0554 + GoToIfEq 0x8008, 0, _051C + GoToIfEq 0x8008, 1, _052A + GoToIfEq 0x8008, 2, _0538 + GoToIfEq 0x8008, 3, _0546 + GoToIfEq 0x8008, 4, _0554 GoTo _0291 End @@ -444,8 +416,7 @@ _0562: _0596: ScrCmd_194 0x800C, 0x8004, 0x8005, 0x4004 ScrCmd_195 0x4002, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05C1 + GoToIfEq 0x800C, 0, _05C1 ScrCmd_196 0x4002 ScrCmd_197 0x800C GoTo _0596 @@ -454,16 +425,14 @@ _05C1: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _05E4 + GoToIfEq 0x4002, 0xFF, _05E4 GoTo _0610 End _05E4: ScrCmd_02C 215 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0291 + GoToIfEq 0x800C, 0, _0291 GoTo _0562 End @@ -476,8 +445,7 @@ _0608: Return _0610: - CompareVar 0x4003, 1 - GoToIf 1, _0625 + GoToIfEq 0x4003, 1, _0625 GoTo _070D End @@ -490,24 +458,19 @@ _0625: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0669 - CompareVar 0x8008, 1 - GoToIf 1, _06BB + GoToIfEq 0x8008, 0, _0669 + GoToIfEq 0x8008, 1, _06BB GoTo _0291 End _0669: ScrCmd_02C 212 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0625 + GoToIfEq 0x800C, 1, _0625 ScrCmd_034 ScrCmd_0F2 8, 0x8005, 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _06AB - CompareVar 0x800C, 3 - GoToIf 1, _06B3 + GoToIfEq 0x800C, 1, _06AB + GoToIfEq 0x800C, 3, _06B3 GoTo _070D End @@ -522,14 +485,11 @@ _06B3: _06BB: ScrCmd_02C 212 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0625 + GoToIfEq 0x800C, 1, _0625 ScrCmd_034 ScrCmd_0F3 8, 0x8005, 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _06FD - CompareVar 0x800C, 3 - GoToIf 1, _0705 + GoToIfEq 0x800C, 1, _06FD + GoToIfEq 0x800C, 3, _0705 GoTo _070D End @@ -547,8 +507,7 @@ _070D: ScrCmd_0FA 0x8004, 0x8005, 0x8007, 0x4002 CompareVar 0x4003, 1 CallIf 1, _07B5 - CompareVar 0x4003, 2 - GoToIf 1, _078A + GoToIfEq 0x4003, 2, _078A ScrCmd_109 0x800C AddVar 0x800C, 1 ScrCmd_0FF 0x800C, 0 @@ -561,12 +520,9 @@ _070D: ScrCmd_0F9 25 ScrCmd_034 _0761: - CompareVar 0x4003, 0 - GoToIf 1, _07BC - CompareVar 0x4003, 1 - GoToIf 1, _07F1 - CompareVar 0x4003, 2 - GoToIf 1, _0830 + GoToIfEq 0x4003, 0, _07BC + GoToIfEq 0x4003, 1, _07F1 + GoToIfEq 0x4003, 2, _0830 End _078A: @@ -626,12 +582,10 @@ _0830: End _086A: - CompareVar 0x4003, 2 - GoToIf 1, _08CD + GoToIfEq 0x4003, 2, _08CD ScrCmd_0C6 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0892 + GoToIfEq 0x800C, 0, _0892 GoTo _08A0 End @@ -675,8 +629,7 @@ _08CD: SetVar 0x800C, 28 Call _0052 Call _008B - CompareVar 0x800C, 0 - GoToIf 1, _070D + GoToIfEq 0x800C, 0, _070D ScrCmd_02C 116 ScrCmd_031 ScrCmd_034 @@ -778,14 +731,12 @@ _0947: ScrCmd_112 ScrCmd_02F 76 ScrCmd_115 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B50 + GoToIfEq 0x800C, 1, _0B50 ScrCmd_104 0 ScrCmd_106 1 ScrCmd_10E 2 ScrCmd_10D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0B1B + GoToIfEq 0x800C, 0, _0B1B ScrCmd_02F 79 GoTo _0B50 @@ -825,8 +776,7 @@ _0B50: ScrCmd_118 ScrCmd_0FB 0x4002 SetVar 0x40CC, 0 - CompareVar 0x4003, 0 - GoToIf 1, _0BF2 + GoToIfEq 0x4003, 0, _0BF2 ScrCmd_0BE 117, 0, 7, 3, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD @@ -843,8 +793,7 @@ _0BF2: SetVar 0x800C, 19 Call _0052 Call _007F - CompareVar 0x8004, -1 - GoToIf 1, _0C3E + GoToIfEq 0x8004, -1, _0C3E ScrCmd_0CD 0 ScrCmd_261 1, 0x8004 ScrCmd_02C 80 @@ -929,14 +878,10 @@ _0D3A: ClearFlag 0x205 ScrCmd_064 5 ScrCmd_108 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0D86 - CompareVar 0x4000, 1 - GoToIf 1, _0D8C - CompareVar 0x4000, 2 - GoToIf 1, _0D92 - CompareVar 0x4000, 3 - GoToIf 1, _0D98 + GoToIfEq 0x4000, 0, _0D86 + GoToIfEq 0x4000, 1, _0D8C + GoToIfEq 0x4000, 2, _0D92 + GoToIfEq 0x4000, 3, _0D98 Return _0D86: @@ -1102,12 +1047,9 @@ _0E93: ScrCmd_042 115, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0EE1 - CompareVar 0x8008, 1 - GoToIf 1, _1169 - CompareVar 0x8008, 2 - GoToIf 1, _138E + GoToIfEq 0x8008, 0, _0EE1 + GoToIfEq 0x8008, 1, _1169 + GoToIfEq 0x8008, 2, _138E GoTo _138E End @@ -1119,12 +1061,9 @@ _0EE1: ScrCmd_042 158, 3 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0F30 - CompareVar 0x8008, 1 - GoToIf 1, _0F44 - CompareVar 0x8008, 2 - GoToIf 1, _0F5E + GoToIfEq 0x8008, 0, _0F30 + GoToIfEq 0x8008, 1, _0F44 + GoToIfEq 0x8008, 2, _0F5E GoTo _0F72 End @@ -1324,8 +1263,7 @@ _0F72: .byte 0 _1027: - CompareVar 0x4004, 1 - GoToIf 1, _1101 + GoToIfEq 0x4004, 1, _1101 GoTo _103A _103A: @@ -1339,16 +1277,11 @@ _103A: ScrCmd_042 166, 5 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _10AE - CompareVar 0x8008, 1 - GoToIf 1, _10BC - CompareVar 0x8008, 2 - GoToIf 1, _10CA - CompareVar 0x8008, 3 - GoToIf 1, _10D8 - CompareVar 0x8008, 4 - GoToIf 1, _10E6 + GoToIfEq 0x8008, 0, _10AE + GoToIfEq 0x8008, 1, _10BC + GoToIfEq 0x8008, 2, _10CA + GoToIfEq 0x8008, 3, _10D8 + GoToIfEq 0x8008, 4, _10E6 GoTo _10F4 End @@ -1393,8 +1326,7 @@ _1101: _111B: ScrCmd_194 0x800C, 0x8004, 0x8005, 0 ScrCmd_195 0x4002, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1146 + GoToIfEq 0x800C, 0, _1146 ScrCmd_196 0x4002 ScrCmd_197 0x800C GoTo _111B @@ -1403,8 +1335,7 @@ _1146: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _10F4 + GoToIfEq 0x4002, 0xFF, _10F4 GoTo _070D End @@ -1419,14 +1350,10 @@ _116C: ScrCmd_042 122, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _1375 - CompareVar 0x8008, 1 - GoToIf 1, _11CF - CompareVar 0x8008, 2 - GoToIf 1, _124A - CompareVar 0x8008, 3 - GoToIf 1, _12E1 + GoToIfEq 0x8008, 0, _1375 + GoToIfEq 0x8008, 1, _11CF + GoToIfEq 0x8008, 2, _124A + GoToIfEq 0x8008, 3, _12E1 GoTo _0E93 End @@ -1440,12 +1367,9 @@ _11CF: ScrCmd_042 129, 3 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _121E - CompareVar 0x8008, 1 - GoToIf 1, _1229 - CompareVar 0x8008, 2 - GoToIf 1, _1234 + GoToIfEq 0x8008, 0, _121E + GoToIfEq 0x8008, 1, _1229 + GoToIfEq 0x8008, 2, _1234 GoTo _123F End @@ -1479,14 +1403,10 @@ _124A: ScrCmd_042 139, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _12AA - CompareVar 0x8008, 1 - GoToIf 1, _12B5 - CompareVar 0x8008, 2 - GoToIf 1, _12C0 - CompareVar 0x8008, 3 - GoToIf 1, _12CB + GoToIfEq 0x8008, 0, _12AA + GoToIfEq 0x8008, 1, _12B5 + GoToIfEq 0x8008, 2, _12C0 + GoToIfEq 0x8008, 3, _12CB GoTo _12D6 End @@ -1525,14 +1445,10 @@ _12E1: ScrCmd_042 149, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _1341 - CompareVar 0x8008, 1 - GoToIf 1, _134C - CompareVar 0x8008, 2 - GoToIf 1, _1357 - CompareVar 0x8008, 3 - GoToIf 1, _1362 + GoToIfEq 0x8008, 0, _1341 + GoToIfEq 0x8008, 1, _134C + GoToIfEq 0x8008, 2, _1357 + GoToIfEq 0x8008, 3, _1362 GoTo _136D End diff --git a/res/field/scripts/script_0213.s b/res/field/scripts/script_0213.s index 83cd5d2f39..8d65ec34b1 100644 --- a/res/field/scripts/script_0213.s +++ b/res/field/scripts/script_0213.s @@ -84,8 +84,7 @@ _0108: ScrCmd_060 ScrCmd_068 ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0755 + GoToIfEq 0x800C, 1, _0755 ScrCmd_02C 0 GoTo _012C End @@ -103,16 +102,11 @@ _012C: ScrCmd_046 11, 0xFF, 5 ScrCmd_047 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01DE - CompareVar 0x8008, 1 - GoToIf 1, _01F2 - CompareVar 0x8008, 2 - GoToIf 1, _021A - CompareVar 0x8008, 3 - GoToIf 1, _0242 - CompareVar 0x8008, 4 - GoToIf 1, _01C8 + GoToIfEq 0x8008, 0, _01DE + GoToIfEq 0x8008, 1, _01F2 + GoToIfEq 0x8008, 2, _021A + GoToIfEq 0x8008, 3, _0242 + GoToIfEq 0x8008, 4, _01C8 GoTo _01D3 End @@ -144,8 +138,7 @@ _01DE: _01F2: SetVar 0x8004, 2 ScrCmd_19A 0x800C - CompareVar 0x800C, 2 - GoToIf 0, _020F + GoToIfLt 0x800C, 2, _020F GoTo _026A _020F: @@ -158,8 +151,7 @@ _020F: _021A: SetVar 0x8004, 3 ScrCmd_19A 0x800C - CompareVar 0x800C, 3 - GoToIf 0, _0237 + GoToIfLt 0x800C, 3, _0237 GoTo _0290 _0237: @@ -172,8 +164,7 @@ _0237: _0242: SetVar 0x8004, 4 ScrCmd_19A 0x800C - CompareVar 0x800C, 3 - GoToIf 0, _025F + GoToIfLt 0x800C, 3, _025F GoTo _0290 _025F: @@ -185,10 +176,8 @@ _025F: _026A: ScrCmd_239 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0290 - CompareVar 0x800C, 3 - GoToIf 1, _0290 + GoToIfEq 0x800C, 1, _0290 + GoToIfEq 0x800C, 3, _0290 GoTo _01D3 End @@ -273,8 +262,7 @@ _02E4: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 1 - GoToIf 1, _0305 + GoToIfEq 0x800C, 1, _0305 GoTo _01D3 End @@ -294,10 +282,8 @@ _0305: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0384 - CompareVar 0x8008, 1 - GoToIf 1, _03F7 + GoToIfEq 0x8008, 0, _0384 + GoToIfEq 0x8008, 1, _03F7 GoTo _01D3 End @@ -312,16 +298,12 @@ _037F: _0384: ScrCmd_02C 124 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0305 + GoToIfEq 0x800C, 1, _0305 ScrCmd_034 ScrCmd_0F2 0x8004, 0x8005, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03D3 - CompareVar 0x800C, 3 - GoToIf 1, _03DD - CompareVar 0x800C, 4 - GoToIf 1, _03EA + GoToIfEq 0x800C, 1, _03D3 + GoToIfEq 0x800C, 3, _03DD + GoToIfEq 0x800C, 4, _03EA GoTo _046A End @@ -349,16 +331,12 @@ _03EA: _03F7: ScrCmd_02C 124 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0305 + GoToIfEq 0x800C, 1, _0305 ScrCmd_034 ScrCmd_0F3 0x8004, 0x8005, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0446 - CompareVar 0x800C, 3 - GoToIf 1, _0450 - CompareVar 0x800C, 4 - GoToIf 1, _045D + GoToIfEq 0x800C, 1, _0446 + GoToIfEq 0x800C, 3, _0450 + GoToIfEq 0x800C, 4, _045D GoTo _046A End @@ -402,8 +380,7 @@ _046A: ApplyMovement 0xFF, _0538 WaitMovement Call _0513 - CompareVar 0x8004, 4 - GoToIf 1, _04F3 + GoToIfEq 0x8004, 4, _04F3 ScrCmd_207 0x800C AddVar 0x800C, 7 ScrCmd_203 0x14C, 0, 0x800C, 11, 0 @@ -453,8 +430,7 @@ _0544: ScrCmd_060 ScrCmd_068 ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0755 + GoToIfEq 0x800C, 1, _0755 GoTo _0565 End @@ -466,20 +442,16 @@ _0565: ScrCmd_042 10, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _05CF - CompareVar 0x8008, 1 - GoToIf 1, _01D3 - CompareVar 0x8008, 2 - GoToIf 1, _05B3 + GoToIfEq 0x8008, 0, _05CF + GoToIfEq 0x8008, 1, _01D3 + GoToIfEq 0x8008, 2, _05B3 GoTo _01D3 End _05B3: ScrCmd_02C 58 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05CF + GoToIfEq 0x800C, 0, _05CF GoTo _01D3 End @@ -488,17 +460,14 @@ _05CF: ScrCmd_14E ScrCmd_02C 124 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01D3 + GoToIfEq 0x800C, 1, _01D3 ScrCmd_31D 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _068E + GoToIfEq 0x800C, 0xFF, _068E SetVar 0x40D5, 2 SetFlag 0x966 ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 1 - GoToIf 1, _062D + GoToIfEq 0x800C, 1, _062D SetVar 0x40D5, 0 ClearFlag 0x966 GoTo _01D3 @@ -571,12 +540,9 @@ _06CB: ScrCmd_042 10, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0724 - CompareVar 0x8008, 1 - GoToIf 1, _074A - CompareVar 0x8008, 2 - GoToIf 1, _0719 + GoToIfEq 0x8008, 0, _0724 + GoToIfEq 0x8008, 1, _074A + GoToIfEq 0x8008, 2, _0719 GoTo _074A End diff --git a/res/field/scripts/script_0214.s b/res/field/scripts/script_0214.s index a0fb4e6247..3f7e4933b9 100644 --- a/res/field/scripts/script_0214.s +++ b/res/field/scripts/script_0214.s @@ -43,8 +43,7 @@ _0055: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 165 - GoToIf 1, _012B + GoToIfSet 165, _012B ScrCmd_02C 2 GoTo _0073 End @@ -53,18 +52,14 @@ _0073: SetVar 0x8004, 0x12A SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0114 + GoToIfEq 0x800C, 0, _0114 ScrCmd_014 0x7FC ScrCmd_02C 5 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 3 - GoToIf 1, _00CC - CompareVar 0x8005, 4 - GoToIf 1, _00DE - CompareVar 0x8005, 5 - GoToIf 1, _00F0 + GoToIfEq 0x8005, 3, _00CC + GoToIfEq 0x8005, 4, _00DE + GoToIfEq 0x8005, 5, _00F0 End _00CC: diff --git a/res/field/scripts/script_0215.s b/res/field/scripts/script_0215.s index d539f63b88..7b55bd02bf 100644 --- a/res/field/scripts/script_0215.s +++ b/res/field/scripts/script_0215.s @@ -45,8 +45,7 @@ _0044: ScrCmd_065 1 _0059: ScrCmd_003 1, 0x800C - CompareVar 0x8005, 0 - GoToIf 1, _0059 + GoToIfEq 0x8005, 0, _0059 ScrCmd_068 ScrCmd_02C 1 ScrCmd_034 diff --git a/res/field/scripts/script_0216.s b/res/field/scripts/script_0216.s index f7b4d37610..7a9435a5ab 100644 --- a/res/field/scripts/script_0216.s +++ b/res/field/scripts/script_0216.s @@ -22,13 +22,10 @@ _0024: CallIf 1, _00BB CheckFlag 0x10F CallIf 0, _00C5 - CompareVar 0x4089, 2 - GoToIf 0, _007C - CheckFlag 0xAA8 - GoToIf 1, _007C + GoToIfLt 0x4089, 2, _007C + GoToIfSet 0xAA8, _007C ScrCmd_234 0x4000 - CompareVar 0x4000, 5 - GoToIf 5, _007C + GoToIfNe 0x4000, 5, _007C GoTo _0076 _0076: @@ -48,8 +45,7 @@ _008A: CallIf 1, _00BB CheckFlag 0x10F CallIf 0, _00C5 - CheckFlag 142 - GoToIf 1, _00AD + GoToIfSet 142, _00AD End _00AD: @@ -74,8 +70,7 @@ _00CF: ScrCmd_034 ScrCmd_0E5 0x34B, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0133 + GoToIfEq 0x800C, 0, _0133 ScrCmd_02C 1 ScrCmd_034 ApplyMovement 0, _013C @@ -113,8 +108,7 @@ _0144: _0150: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 159 - GoToIf 1, _016C + GoToIfSet 159, _016C ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -125,8 +119,7 @@ _016C: ScrCmd_0D1 0, 0x1B6 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01A2 + GoToIfEq 0x800C, 1, _01A2 SetFlag 0x10F Call _00BB ScrCmd_18A 0, 243, 0x28E @@ -161,8 +154,7 @@ _01BF: ScrCmd_2BD 0x1A9, 15 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01FB + GoToIfEq 0x800C, 0, _01FB SetFlag 0xAA8 ScrCmd_061 End diff --git a/res/field/scripts/script_0217.s b/res/field/scripts/script_0217.s index d60791643a..1a8415819e 100644 --- a/res/field/scripts/script_0217.s +++ b/res/field/scripts/script_0217.s @@ -14,8 +14,7 @@ _0022: SetFlag 0x9C3 - CompareVar 0x4089, 2 - GoToIf 4, _0035 + GoToIfGe 0x4089, 2, _0035 End _0035: @@ -70,10 +69,8 @@ _00AC: _00BF: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 6 - GoToIf 1, _00E3 - CompareVar 0x8005, 7 - GoToIf 1, _00F5 + GoToIfEq 0x8005, 6, _00E3 + GoToIfEq 0x8005, 7, _00F5 End _00E3: @@ -93,8 +90,7 @@ _0107: ScrCmd_034 ScrCmd_0E5 0x127, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02B9 + GoToIfEq 0x800C, 0, _02B9 ScrCmd_02C 3 ScrCmd_034 ApplyMovement 7, _0374 @@ -122,10 +118,8 @@ _0107: ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 6 - GoToIf 1, _01B7 - CompareVar 0x8005, 7 - GoToIf 1, _01C9 + GoToIfEq 0x8005, 6, _01B7 + GoToIfEq 0x8005, 7, _01C9 End _01B7: @@ -149,10 +143,8 @@ _01DB: ScrCmd_064 5 ScrCmd_062 5 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 6 - GoToIf 1, _0218 - CompareVar 0x8005, 7 - GoToIf 1, _0232 + GoToIfEq 0x8005, 6, _0218 + GoToIfEq 0x8005, 7, _0232 End _0218: @@ -173,10 +165,8 @@ _024C: ScrCmd_02C 8 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 6 - GoToIf 1, _0273 - CompareVar 0x8005, 7 - GoToIf 1, _0285 + GoToIfEq 0x8005, 6, _0273 + GoToIfEq 0x8005, 7, _0285 End _0273: @@ -298,8 +288,7 @@ _037C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40CF, 3 - GoToIf 4, _039C + GoToIfGe 0x40CF, 3, _039C ScrCmd_02C 11 ScrCmd_031 ScrCmd_034 @@ -317,8 +306,7 @@ _03A7: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40CF, 3 - GoToIf 4, _03C7 + GoToIfGe 0x40CF, 3, _03C7 ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 @@ -343,8 +331,7 @@ _03DA: _03E2: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x40AA, 2 - GoToIf 4, _0400 + GoToIfGe 0x40AA, 2, _0400 ScrCmd_02C 14 GoTo _040B End diff --git a/res/field/scripts/script_0218.s b/res/field/scripts/script_0218.s index e5a42791b6..c7041602c1 100644 --- a/res/field/scripts/script_0218.s +++ b/res/field/scripts/script_0218.s @@ -16,8 +16,7 @@ _0018: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x12A - GoToIf 1, _004D + GoToIfSet 0x12A, _004D SetVar 0x8004, 95 ScrCmd_261 0, 0x8004 ScrCmd_02C 0 diff --git a/res/field/scripts/script_0219.s b/res/field/scripts/script_0219.s index 3437807356..e8a41d3c8d 100644 --- a/res/field/scripts/script_0219.s +++ b/res/field/scripts/script_0219.s @@ -17,8 +17,7 @@ .short 0xFD13 _0032: - CheckFlag 227 - GoToIf 0, _003F + GoToIfUnset 227, _003F End _003F: @@ -29,10 +28,8 @@ _0047: ScrCmd_060 ScrCmd_0C8 0 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 28 - GoToIf 1, _006E - CompareVar 0x8004, 29 - GoToIf 1, _007E + GoToIfEq 0x8004, 28, _006E + GoToIfEq 0x8004, 29, _007E End _006E: @@ -100,10 +97,8 @@ _0108: ScrCmd_02C 4 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 28 - GoToIf 1, _0148 - CompareVar 0x8004, 29 - GoToIf 1, _0158 + GoToIfEq 0x8004, 28, _0148 + GoToIfEq 0x8004, 29, _0158 End _0148: @@ -149,8 +144,7 @@ _0198: SetVar 0x8004, 218 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01EA + GoToIfEq 0x800C, 0, _01EA GoTo _01DB End @@ -163,16 +157,11 @@ _01DB: _01EA: ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 34 - GoToIf 1, _023B - CompareVar 0x8005, 35 - GoToIf 1, _0253 - CompareVar 0x8005, 36 - GoToIf 1, _026B - CompareVar 0x8005, 37 - GoToIf 1, _0283 - CompareVar 0x8005, 38 - GoToIf 1, _029B + GoToIfEq 0x8005, 34, _023B + GoToIfEq 0x8005, 35, _0253 + GoToIfEq 0x8005, 36, _026B + GoToIfEq 0x8005, 37, _0283 + GoToIfEq 0x8005, 38, _029B GoTo _02B3 End @@ -370,14 +359,10 @@ _0411: ScrCmd_02C 13 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _046C - CompareVar 0x800C, 1 - GoToIf 1, _047E - CompareVar 0x800C, 2 - GoToIf 1, _0490 - CompareVar 0x800C, 3 - GoToIf 1, _04A2 + GoToIfEq 0x800C, 0, _046C + GoToIfEq 0x800C, 1, _047E + GoToIfEq 0x800C, 2, _0490 + GoToIfEq 0x800C, 3, _04A2 End _046C: diff --git a/res/field/scripts/script_0221.s b/res/field/scripts/script_0221.s index 7f6b384984..6d2184703c 100644 --- a/res/field/scripts/script_0221.s +++ b/res/field/scripts/script_0221.s @@ -14,16 +14,13 @@ _0010: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 219 - GoToIf 1, _00A9 - CheckFlag 0x138 - GoToIf 1, _0062 + GoToIfSet 219, _00A9 + GoToIfSet 0x138, _0062 ScrCmd_02C 0 SetVar 0x8004, 91 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01F3 + GoToIfEq 0x800C, 0, _01F3 SetFlag 0x138 ScrCmd_014 0x7FC GoTo _0062 @@ -31,8 +28,7 @@ _0010: _0062: ScrCmd_07E 91, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0082 + GoToIfEq 0x800C, 1, _0082 ScrCmd_02C 1 GoTo _00EC End @@ -41,22 +37,17 @@ _0082: SetFlag 219 ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FF - CompareVar 0x800C, 1 - GoToIf 1, _00F4 + GoToIfEq 0x800C, 0, _00FF + GoToIfEq 0x800C, 1, _00F4 End _00A9: ScrCmd_07E 91, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E1 + GoToIfEq 0x800C, 0, _00E1 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FF - CompareVar 0x800C, 1 - GoToIf 1, _00F4 + GoToIfEq 0x800C, 0, _00FF + GoToIfEq 0x800C, 1, _00F4 End _00E1: @@ -77,8 +68,7 @@ _00F4: _00FF: ScrCmd_2FE 91, 0x8000 - CompareVar 0x8000, 10 - GoToIf 4, _014E + GoToIfGe 0x8000, 10, _014E GoTo _011A End @@ -102,10 +92,8 @@ _014E: ScrCmd_043 SetVar 0x8007, 10 SetVar 0x8008, 0x8001 - CompareVar 0x8008, 0 - GoToIf 1, _011A - CompareVar 0x8008, 1 - GoToIf 1, _019E + GoToIfEq 0x8008, 0, _011A + GoToIfEq 0x8008, 1, _019E GoTo _00F4 End @@ -117,8 +105,7 @@ _019E: ScrCmd_07B 74, 1, 0x800C ScrCmd_07B 75, 1, 0x800C ScrCmd_07C 91, 1, 0x800C - CompareVar 0x8007, 0 - GoToIf 1, _01E5 + GoToIfEq 0x8007, 0, _01E5 GoTo _019E End diff --git a/res/field/scripts/script_0224.s b/res/field/scripts/script_0224.s index 8a0cb484d1..23f53aebd8 100644 --- a/res/field/scripts/script_0224.s +++ b/res/field/scripts/script_0224.s @@ -55,8 +55,7 @@ _0036: SetVar 0x8004, 68 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F2 + GoToIfEq 0x800C, 0, _00F2 ScrCmd_014 0x7FC Call _00E5 ScrCmd_014 0x808 @@ -147,8 +146,7 @@ _01A0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x160 - GoToIf 0, _01BE + GoToIfUnset 0x160, _01BE ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 @@ -160,8 +158,7 @@ _01BE: SetVar 0x8004, 68 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01F0 + GoToIfEq 0x800C, 0, _01F0 ScrCmd_014 0x7FC Call _00E5 ScrCmd_061 diff --git a/res/field/scripts/script_0231.s b/res/field/scripts/script_0231.s index ed9c2a6471..6f3bdb9da9 100644 --- a/res/field/scripts/script_0231.s +++ b/res/field/scripts/script_0231.s @@ -7,18 +7,14 @@ .short 0xFD13 _000A: - CheckFlag 0x132 - GoToIf 1, _0040 - CheckFlag 0x132 - GoToIf 0, _004A + GoToIfSet 0x132, _0040 + GoToIfUnset 0x132, _004A End _0022: Call _0118 - CheckFlag 0x132 - GoToIf 1, _0040 - CheckFlag 0x132 - GoToIf 0, _004A + GoToIfSet 0x132, _0040 + GoToIfUnset 0x132, _004A End _0040: @@ -26,8 +22,7 @@ _0040: End _004A: - CompareVar 0x40AA, 2 - GoToIf 4, _0069 + GoToIfGe 0x40AA, 2, _0069 GoTo _005F End @@ -36,32 +31,23 @@ _005F: End _0069: - CheckFlag 0x145 - GoToIf 0, _005F - CheckFlag 208 - GoToIf 1, _00BC - CompareVar 0x40C4, 1 - GoToIf 4, _00BC + GoToIfUnset 0x145, _005F + GoToIfSet 208, _00BC + GoToIfGe 0x40C4, 1, _00BC ScrCmd_07E 135, 1, 0x4001 - CompareVar 0x4001, 1 - GoToIf 1, _0104 + GoToIfEq 0x4001, 1, _0104 ScrCmd_32F 135, 0x4001 - CompareVar 0x4001, 1 - GoToIf 1, _0104 + GoToIfEq 0x4001, 1, _0104 GoTo _00BC End _00BC: - CheckFlag 209 - GoToIf 1, _005F - CompareVar 0x40C5, 1 - GoToIf 4, _005F + GoToIfSet 209, _005F + GoToIfGe 0x40C5, 1, _005F ScrCmd_07E 136, 1, 0x4001 - CompareVar 0x4001, 1 - GoToIf 1, _010E + GoToIfEq 0x4001, 1, _010E ScrCmd_32F 136, 0x4001 - CompareVar 0x4001, 1 - GoToIf 1, _010E + GoToIfEq 0x4001, 1, _010E GoTo _005F End diff --git a/res/field/scripts/script_0233.s b/res/field/scripts/script_0233.s index ed23715ad5..2cee5418a3 100644 --- a/res/field/scripts/script_0233.s +++ b/res/field/scripts/script_0233.s @@ -11,10 +11,8 @@ _000E: CompareVar 0x406A, 0x122 CallIf 5, _003B ScrCmd_32B 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0063 - CompareVar 0x4001, 1 - GoToIf 1, _006D + GoToIfEq 0x4001, 0, _0063 + GoToIfEq 0x4001, 1, _006D End _003B: @@ -23,10 +21,8 @@ _003B: _0043: ScrCmd_32B 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0063 - CompareVar 0x4001, 1 - GoToIf 1, _006D + GoToIfEq 0x4001, 0, _0063 + GoToIfEq 0x4001, 1, _006D End _0063: diff --git a/res/field/scripts/script_0236.s b/res/field/scripts/script_0236.s index e25e19ecba..c9ab32e2ac 100644 --- a/res/field/scripts/script_0236.s +++ b/res/field/scripts/script_0236.s @@ -17,10 +17,8 @@ _0022: Call _00C7 Call _0062 ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0052 - CompareVar 0x4000, 1 - GoToIf 1, _005A + GoToIfEq 0x4000, 0, _0052 + GoToIfEq 0x4000, 1, _005A End _0052: @@ -33,19 +31,14 @@ _005A: _0062: ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00C5 + GoToIfEq 0x4000, 0, _00C5 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00C5 + GoToIfEq 0x4000, 0, _00C5 ScrCmd_07E 0x1C7, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00C5 + GoToIfEq 0x4000, 0, _00C5 ScrCmd_28B 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00C5 - CheckFlag 0x11E - GoToIf 1, _00C5 + GoToIfEq 0x4000, 0, _00C5 + GoToIfSet 0x11E, _00C5 SetVar 0x4118, 1 GoTo _00C5 End @@ -55,14 +48,10 @@ _00C5: _00C7: ScrCmd_1F9 0x4098 - CompareVar 0x4098, 0 - GoToIf 1, _0101 - CompareVar 0x4098, 1 - GoToIf 1, _0101 - CompareVar 0x4098, 2 - GoToIf 1, _0101 - CompareVar 0x4098, 3 - GoToIf 1, _0101 + GoToIfEq 0x4098, 0, _0101 + GoToIfEq 0x4098, 1, _0101 + GoToIfEq 0x4098, 2, _0101 + GoToIfEq 0x4098, 3, _0101 Return _0101: @@ -75,10 +64,8 @@ _0107: _0109: ScrCmd_246 0x800C SetVar 0x8004, 0x8005 - CompareVar 0x800C, 10 - GoToIf 1, _0133 - CompareVar 0x800C, 12 - GoToIf 1, _0133 + GoToIfEq 0x800C, 10, _0133 + GoToIfEq 0x800C, 12, _0133 SetVar 0x8004, 0x8006 _0133: Return @@ -121,8 +108,7 @@ _0154: ApplyMovement 3, _01F4 WaitMovement ScrCmd_0EE 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _01A6 + GoToIfNe 0x800C, 0, _01A6 GoTo _0181 End @@ -139,8 +125,7 @@ _0181: _01A6: Call _01CA - CompareVar 0x800C, 0 - GoToIf 1, _01DB + GoToIfEq 0x800C, 0, _01DB SetVar 0x4098, 1 ScrCmd_02C 2 ScrCmd_031 @@ -232,8 +217,7 @@ _0249: Call _0424 ScrCmd_2A0 0x8004, 0x210, 0x197 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02D0 + GoToIfEq 0x800C, 0, _02D0 Call _0456 ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -262,12 +246,9 @@ _02DC: ClearFlag 0x1C5 ScrCmd_069 0x8004, 0x8005 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 30 - GoToIf 1, _0315 - CompareVar 0x8008, 31 - GoToIf 1, _0333 - CompareVar 0x8008, 32 - GoToIf 1, _0351 + GoToIfEq 0x8008, 30, _0315 + GoToIfEq 0x8008, 31, _0333 + GoToIfEq 0x8008, 32, _0351 Return _0315: @@ -297,12 +278,9 @@ _0351: _036F: ScrCmd_069 0x8004, 0x8005 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 30 - GoToIf 1, _03A4 - CompareVar 0x8008, 31 - GoToIf 1, _03BE - CompareVar 0x8008, 32 - GoToIf 1, _03D8 + GoToIfEq 0x8008, 30, _03A4 + GoToIfEq 0x8008, 31, _03BE + GoToIfEq 0x8008, 32, _03D8 Return _03A4: @@ -359,11 +337,9 @@ _041C: _0424: ScrCmd_0DE 0x800C SetVar 0x8004, 0x26C - CompareVar 0x800C, 0x186 - GoToIf 1, _0454 + GoToIfEq 0x800C, 0x186, _0454 SetVar 0x8004, 0x26B - CompareVar 0x800C, 0x183 - GoToIf 1, _0454 + GoToIfEq 0x800C, 0x183, _0454 SetVar 0x8004, 0x25F _0454: Return @@ -371,12 +347,9 @@ _0454: _0456: ScrCmd_069 0x8004, 0x8005 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 30 - GoToIf 1, _048B - CompareVar 0x8008, 31 - GoToIf 1, _0499 - CompareVar 0x8008, 32 - GoToIf 1, _04A7 + GoToIfEq 0x8008, 30, _048B + GoToIfEq 0x8008, 31, _0499 + GoToIfEq 0x8008, 32, _04A7 Return _048B: @@ -493,8 +466,7 @@ _0508: _0567: ScrCmd_20D 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0567 + GoToIfEq 0x800C, 0, _0567 ScrCmd_2FB SetFlag 0x1C8 SetFlag 0x1C9 @@ -518,16 +490,11 @@ _05B8: _05C0: ScrCmd_069 0x8004, 0x8005 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 29 - GoToIf 1, _060F - CompareVar 0x8008, 30 - GoToIf 1, _0619 - CompareVar 0x8008, 31 - GoToIf 1, _0623 - CompareVar 0x8008, 32 - GoToIf 1, _062D - CompareVar 0x8008, 33 - GoToIf 1, _0637 + GoToIfEq 0x8008, 29, _060F + GoToIfEq 0x8008, 30, _0619 + GoToIfEq 0x8008, 31, _0623 + GoToIfEq 0x8008, 32, _062D + GoToIfEq 0x8008, 33, _0637 Return _060F: diff --git a/res/field/scripts/script_0237.s b/res/field/scripts/script_0237.s index 85824eca14..5bf59b5464 100644 --- a/res/field/scripts/script_0237.s +++ b/res/field/scripts/script_0237.s @@ -36,8 +36,7 @@ _0022: ScrCmd_003 30, 0x800C _0088: ScrCmd_20D 6, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0088 + GoToIfEq 0x800C, 0, _0088 ScrCmd_065 1 ApplyMovement 241, _0178 WaitMovement @@ -57,10 +56,8 @@ _0088: _00DA: ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FD - CompareVar 0x800C, 1 - GoToIf 1, _0130 + GoToIfEq 0x800C, 0, _00FD + GoToIfEq 0x800C, 1, _0130 End _00FD: @@ -125,10 +122,8 @@ _0184: ScrCmd_068 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FD - CompareVar 0x800C, 1 - GoToIf 1, _01AF + GoToIfEq 0x800C, 0, _00FD + GoToIfEq 0x800C, 1, _01AF End _01AF: diff --git a/res/field/scripts/script_0238.s b/res/field/scripts/script_0238.s index 297feed4ae..902e6d7e56 100644 --- a/res/field/scripts/script_0238.s +++ b/res/field/scripts/script_0238.s @@ -10,10 +10,8 @@ _0012: ScrCmd_28B 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0035 - CheckFlag 0x11E - GoToIf 1, _0035 + GoToIfEq 0x4000, 0, _0035 + GoToIfSet 0x11E, _0035 ClearFlag 0x24E End @@ -22,8 +20,7 @@ _0035: End _003B: - CheckFlag 142 - GoToIf 1, _0048 + GoToIfSet 142, _0048 End _0048: @@ -47,11 +44,9 @@ _0056: ScrCmd_2BD 0x1ED, 80 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00DF + GoToIfEq 0x800C, 0, _00DF ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00D0 + GoToIfEq 0x800C, 1, _00D0 CompareVar 0x4056, 0 CallIf 1, _00C8 SetFlag 0x11E @@ -90,12 +85,9 @@ _00F8: _0104: ScrCmd_069 0x8004, 0x8005 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 30 - GoToIf 1, _0139 - CompareVar 0x8008, 31 - GoToIf 1, _014B - CompareVar 0x8008, 32 - GoToIf 1, _015D + GoToIfEq 0x8008, 30, _0139 + GoToIfEq 0x8008, 31, _014B + GoToIfEq 0x8008, 32, _015D _0137: Return diff --git a/res/field/scripts/script_0239.s b/res/field/scripts/script_0239.s index 1583db26c1..97bd7b082e 100644 --- a/res/field/scripts/script_0239.s +++ b/res/field/scripts/script_0239.s @@ -12,19 +12,14 @@ _000A: _0012: ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_07E 0x1C7, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_28B 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 - CheckFlag 0x11E - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 + GoToIfSet 0x11E, _0075 SetVar 0x4118, 1 GoTo _0075 End @@ -35,22 +30,18 @@ _0075: _0077: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x40C4, 1 - GoToIf 4, _00F4 - CheckFlag 208 - GoToIf 1, _00F4 + GoToIfGe 0x40C4, 1, _00F4 + GoToIfSet 208, _00F4 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0101 + GoToIfEq 0x800C, 1, _0101 ScrCmd_04C 0x1E3, 0 ScrCmd_02C 1 ScrCmd_04D ScrCmd_034 ScrCmd_2BD 0x1E3, 70 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E8 + GoToIfEq 0x800C, 0, _00E8 SetVar 0x40C4, 1 ScrCmd_2BC 0x800C CompareVar 0x800C, 0 diff --git a/res/field/scripts/script_0240.s b/res/field/scripts/script_0240.s index d63620428a..e0fa364e94 100644 --- a/res/field/scripts/script_0240.s +++ b/res/field/scripts/script_0240.s @@ -12,19 +12,14 @@ _000A: _0012: ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_07E 0x1C7, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 ScrCmd_28B 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 - CheckFlag 0x11E - GoToIf 1, _0075 + GoToIfEq 0x4000, 0, _0075 + GoToIfSet 0x11E, _0075 SetVar 0x4118, 1 GoTo _0075 End @@ -35,22 +30,18 @@ _0075: _0077: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x40C5, 1 - GoToIf 4, _00F4 - CheckFlag 209 - GoToIf 1, _00F4 + GoToIfGe 0x40C5, 1, _00F4 + GoToIfSet 209, _00F4 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0101 + GoToIfEq 0x800C, 1, _0101 ScrCmd_04C 0x1E4, 0 ScrCmd_02C 1 ScrCmd_04D ScrCmd_034 ScrCmd_2BD 0x1E4, 70 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E8 + GoToIfEq 0x800C, 0, _00E8 SetVar 0x40C5, 1 ScrCmd_2BC 0x800C CompareVar 0x800C, 0 diff --git a/res/field/scripts/script_0248.s b/res/field/scripts/script_0248.s index aa03959a02..658f351e62 100644 --- a/res/field/scripts/script_0248.s +++ b/res/field/scripts/script_0248.s @@ -10,17 +10,13 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAB4 - GoToIf 1, _00BC + GoToIfSet 0xAB4, _00BC ScrCmd_02C 0 ScrCmd_1B7 0x8004, 4 SetVar 0x8008, 0x8004 - CompareVar 0x8008, 0 - GoToIf 1, _005B - CompareVar 0x8008, 1 - GoToIf 1, _0069 - CompareVar 0x8008, 2 - GoToIf 1, _0077 + GoToIfEq 0x8008, 0, _005B + GoToIfEq 0x8008, 1, _0069 + GoToIfEq 0x8008, 2, _0077 GoTo _0085 End @@ -47,8 +43,7 @@ _0085: _0093: SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00C7 + GoToIfEq 0x800C, 0, _00C7 SetFlag 0xAB4 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0253.s b/res/field/scripts/script_0253.s index fea6c40be4..b5fa75e64c 100644 --- a/res/field/scripts/script_0253.s +++ b/res/field/scripts/script_0253.s @@ -9,13 +9,10 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 210 - GoToIf 1, _00C7 - CheckFlag 232 - GoToIf 1, _004F + GoToIfSet 210, _00C7 + GoToIfSet 232, _004F ScrCmd_07E 0x1A8, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0044 + GoToIfEq 0x800C, 1, _0044 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -32,10 +29,8 @@ _004F: WaitMovement ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007C - CompareVar 0x800C, 1 - GoToIf 1, _00B8 + GoToIfEq 0x800C, 0, _007C + GoToIfEq 0x800C, 1, _00B8 End _007C: @@ -43,8 +38,7 @@ _007C: SetVar 0x8004, 75 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AE + GoToIfEq 0x800C, 0, _00AE SetFlag 210 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0267.s b/res/field/scripts/script_0267.s index d3f2997252..70f688f7f5 100644 --- a/res/field/scripts/script_0267.s +++ b/res/field/scripts/script_0267.s @@ -8,11 +8,9 @@ _000A: SetFlag 0x9CA - CheckFlag 0x964 - GoToIf 0, _002F + GoToIfUnset 0x964, _002F ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _002F + GoToIfEq 0x4000, 0, _002F SetFlag 0x27E _002F: End @@ -21,8 +19,7 @@ _0031: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x964 - GoToIf 1, _004F + GoToIfSet 0x964, _004F ScrCmd_02C 0 GoTo _005A End diff --git a/res/field/scripts/script_0270.s b/res/field/scripts/script_0270.s index 9a2f89f3d7..a183804160 100644 --- a/res/field/scripts/script_0270.s +++ b/res/field/scripts/script_0270.s @@ -9,8 +9,7 @@ .short 0xFD13 _0012: - CheckFlag 230 - GoToIf 0, _001F + GoToIfUnset 230, _001F End _001F: @@ -23,18 +22,12 @@ _0027: ApplyMovement 28, _0140 WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 55 - GoToIf 1, _008C - CompareVar 0x8005, 56 - GoToIf 1, _009C - CompareVar 0x8005, 57 - GoToIf 1, _00AC - CompareVar 0x8005, 58 - GoToIf 1, _00BC - CompareVar 0x8005, 59 - GoToIf 1, _00CC - CompareVar 0x8005, 60 - GoToIf 1, _00DC + GoToIfEq 0x8005, 55, _008C + GoToIfEq 0x8005, 56, _009C + GoToIfEq 0x8005, 57, _00AC + GoToIfEq 0x8005, 58, _00BC + GoToIfEq 0x8005, 59, _00CC + GoToIfEq 0x8005, 60, _00DC End _008C: @@ -148,18 +141,12 @@ _0190: ScrCmd_162 ScrCmd_06D 28, 14 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 55 - GoToIf 1, _020D - CompareVar 0x8005, 56 - GoToIf 1, _021D - CompareVar 0x8005, 57 - GoToIf 1, _022D - CompareVar 0x8005, 58 - GoToIf 1, _023D - CompareVar 0x8005, 59 - GoToIf 1, _024D - CompareVar 0x8005, 60 - GoToIf 1, _025D + GoToIfEq 0x8005, 55, _020D + GoToIfEq 0x8005, 56, _021D + GoToIfEq 0x8005, 57, _022D + GoToIfEq 0x8005, 58, _023D + GoToIfEq 0x8005, 59, _024D + GoToIfEq 0x8005, 60, _025D End _020D: @@ -265,14 +252,10 @@ _02E4: ScrCmd_02C 5 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 51 - GoToIf 1, _0341 - CompareVar 0x8004, 52 - GoToIf 1, _0359 - CompareVar 0x8004, 53 - GoToIf 1, _0371 - CompareVar 0x8004, 54 - GoToIf 1, _0389 + GoToIfEq 0x8004, 51, _0341 + GoToIfEq 0x8004, 52, _0359 + GoToIfEq 0x8004, 53, _0371 + GoToIfEq 0x8004, 54, _0389 End _0341: diff --git a/res/field/scripts/script_0273.s b/res/field/scripts/script_0273.s index d8de82b66c..1608c226ec 100644 --- a/res/field/scripts/script_0273.s +++ b/res/field/scripts/script_0273.s @@ -79,8 +79,7 @@ _00B9: ScrCmd_02C 8 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _00D9 + GoToIfEq 0x800C, 0, _00D9 ScrCmd_061 End @@ -95,8 +94,7 @@ _00E9: ScrCmd_060 Call _0170 ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _0114 + GoToIfEq 0x800C, 0, _0114 SetVar 0x40F3, 2 ScrCmd_061 Call _01C0 @@ -119,8 +117,7 @@ _012C: ScrCmd_068 Call _0170 ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _0159 + GoToIfEq 0x800C, 0, _0159 SetVar 0x40F3, 2 ScrCmd_061 Call _01C0 @@ -140,11 +137,9 @@ _0168: _0170: ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01B5 + GoToIfEq 0x800C, 0, _01B5 ScrCmd_14D 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01A5 + GoToIfEq 0x800C, 1, _01A5 ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_031 diff --git a/res/field/scripts/script_0274.s b/res/field/scripts/script_0274.s index 169ad4b33a..22c55449e4 100644 --- a/res/field/scripts/script_0274.s +++ b/res/field/scripts/script_0274.s @@ -54,14 +54,10 @@ _00B6: SetFlag 0x2A1 ScrCmd_2DF 0x40AB ScrCmd_1B7 0x4002, 5 - CompareVar 0x4002, 0 - GoToIf 1, _00FE - CompareVar 0x4002, 1 - GoToIf 1, _0108 - CompareVar 0x4002, 2 - GoToIf 1, _0112 - CompareVar 0x4002, 3 - GoToIf 1, _011C + GoToIfEq 0x4002, 0, _00FE + GoToIfEq 0x4002, 1, _0108 + GoToIfEq 0x4002, 2, _0112 + GoToIfEq 0x4002, 3, _011C End _00FE: @@ -98,8 +94,7 @@ _0140: _015A: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0195 + GoToIfEq 0x800C, 1, _0195 GoTo _0174 End @@ -138,27 +133,22 @@ _01B6: _01CE: ScrCmd_198 0x400A, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _026D + GoToIfEq 0x800C, 0, _026D CompareVar 0x4000, 0 CallIf 1, _0C50 CompareVar 0x4000, 1 CallIf 1, _0D36 - CompareVar 0x800C, 0 - GoToIf 1, _026D + GoToIfEq 0x800C, 0, _026D ScrCmd_0D6 0, 0x400A - CompareVar 0x400C, 0 - GoToIf 1, _0229 - CompareVar 0x400C, 0 - GoToIf 5, _024B + GoToIfEq 0x400C, 0, _0229 + GoToIfNe 0x400C, 0, _024B End _0229: AddVar 0x400C, 1 ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0299 + GoToIfEq 0x800C, 0, _0299 GoTo _026D End @@ -166,16 +156,14 @@ _024B: AddVar 0x400C, 1 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0299 + GoToIfEq 0x800C, 0, _0299 GoTo _026D End _026D: AddVar 0x400A, 1 SubVar 0x400B, 1 - CompareVar 0x400B, 0 - GoToIf 5, _01CE + GoToIfNe 0x400B, 0, _01CE ScrCmd_02C 5 ScrCmd_034 ApplyMovement 0xFF, _03C0 @@ -336,22 +324,14 @@ _0412: _041A: ScrCmd_1B7 0x800C, 100 - CompareVar 0x800C, 20 - GoToIf 0, _0490 - CompareVar 0x800C, 35 - GoToIf 0, _0498 - CompareVar 0x800C, 50 - GoToIf 0, _04A0 - CompareVar 0x800C, 65 - GoToIf 0, _04A8 - CompareVar 0x800C, 72 - GoToIf 0, _04B0 - CompareVar 0x800C, 79 - GoToIf 0, _04B8 - CompareVar 0x800C, 86 - GoToIf 0, _04C0 - CompareVar 0x800C, 93 - GoToIf 0, _04C8 + GoToIfLt 0x800C, 20, _0490 + GoToIfLt 0x800C, 35, _0498 + GoToIfLt 0x800C, 50, _04A0 + GoToIfLt 0x800C, 65, _04A8 + GoToIfLt 0x800C, 72, _04B0 + GoToIfLt 0x800C, 79, _04B8 + GoToIfLt 0x800C, 86, _04C0 + GoToIfLt 0x800C, 93, _04C8 GoTo _04D0 End @@ -395,8 +375,7 @@ _04D8: SetVar 0x8000, 0x409B ScrCmd_215 Call _03DC - CompareVar 0x8000, 0 - GoToIf 1, _04FB + GoToIfEq 0x8000, 0, _04FB GoTo _056C End @@ -404,8 +383,7 @@ _04FB: SetVar 0x8004, 0x409F SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0595 + GoToIfEq 0x800C, 0, _0595 GoTo _054D End @@ -413,8 +391,7 @@ _0524: SetVar 0x8004, 0x409F SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05DD + GoToIfEq 0x800C, 0, _05DD GoTo _054D End @@ -433,8 +410,7 @@ _056C: SetVar 0x8004, 0x409C SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0524 + GoToIfEq 0x800C, 0, _0524 GoTo _05BE End @@ -442,8 +418,7 @@ _0595: SetVar 0x8004, 0x409C SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05DD + GoToIfEq 0x800C, 0, _05DD GoTo _05BE End @@ -461,35 +436,21 @@ _05BE: _05DD: ScrCmd_0D6 0, 0x409D ScrCmd_04C 0x409A, 0 - CompareVar 0x409A, 0x184 - GoToIf 1, _0719 - CompareVar 0x409A, 0x185 - GoToIf 1, _0719 - CompareVar 0x409A, 0x187 - GoToIf 1, _0719 - CompareVar 0x409A, 0x188 - GoToIf 1, _0719 - CompareVar 0x409A, 0x18A - GoToIf 1, _0719 - CompareVar 0x409A, 0x18B - GoToIf 1, _0719 + GoToIfEq 0x409A, 0x184, _0719 + GoToIfEq 0x409A, 0x185, _0719 + GoToIfEq 0x409A, 0x187, _0719 + GoToIfEq 0x409A, 0x188, _0719 + GoToIfEq 0x409A, 0x18A, _0719 + GoToIfEq 0x409A, 0x18B, _0719 ScrCmd_1B7 0x800C, 9 - CompareVar 0x800C, 0 - GoToIf 1, _06AC - CompareVar 0x800C, 1 - GoToIf 1, _06B7 - CompareVar 0x800C, 2 - GoToIf 1, _06C2 - CompareVar 0x800C, 3 - GoToIf 1, _06CD - CompareVar 0x800C, 4 - GoToIf 1, _06D8 - CompareVar 0x800C, 5 - GoToIf 1, _06E3 - CompareVar 0x800C, 6 - GoToIf 1, _06EE - CompareVar 0x800C, 7 - GoToIf 1, _06F9 + GoToIfEq 0x800C, 0, _06AC + GoToIfEq 0x800C, 1, _06B7 + GoToIfEq 0x800C, 2, _06C2 + GoToIfEq 0x800C, 3, _06CD + GoToIfEq 0x800C, 4, _06D8 + GoToIfEq 0x800C, 5, _06E3 + GoToIfEq 0x800C, 6, _06EE + GoToIfEq 0x800C, 7, _06F9 GoTo _0704 End @@ -547,22 +508,14 @@ _070F: _0719: ScrCmd_1B7 0x800C, 9 - CompareVar 0x800C, 0 - GoToIf 1, _078F - CompareVar 0x800C, 1 - GoToIf 1, _079A - CompareVar 0x800C, 2 - GoToIf 1, _07A5 - CompareVar 0x800C, 3 - GoToIf 1, _07B0 - CompareVar 0x800C, 4 - GoToIf 1, _07BB - CompareVar 0x800C, 5 - GoToIf 1, _07C6 - CompareVar 0x800C, 6 - GoToIf 1, _07D1 - CompareVar 0x800C, 7 - GoToIf 1, _07DC + GoToIfEq 0x800C, 0, _078F + GoToIfEq 0x800C, 1, _079A + GoToIfEq 0x800C, 2, _07A5 + GoToIfEq 0x800C, 3, _07B0 + GoToIfEq 0x800C, 4, _07BB + GoToIfEq 0x800C, 5, _07C6 + GoToIfEq 0x800C, 6, _07D1 + GoToIfEq 0x800C, 7, _07DC GoTo _07E7 End @@ -639,8 +592,7 @@ _080E: CallIf 1, _0898 CompareVar 0x800C, 5 CallIf 1, _089D - CompareVar 0x400A, 0 - GoToIf 1, _08A2 + GoToIfEq 0x400A, 0, _08A2 GoTo _08B4 End @@ -785,154 +737,102 @@ _0975: _0994: ScrCmd_1C0 0x800C, 25 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 35 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 54 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1A1 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1A9 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1AB - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1B8 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x183 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x184 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x185 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x186 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x187 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x188 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x189 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x18A - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x18B - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 GoTo _0182 End _0ACC: ScrCmd_1C0 0x800C, 25 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 35 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 54 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1A1 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1A9 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1AB - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x1B8 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 39 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0xFF - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x12C - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x11D - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x183 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x184 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x185 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x186 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x187 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x188 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x189 - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x18A - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 ScrCmd_1C0 0x800C, 0x18B - CompareVar 0x800C, 1 - GoToIf 1, _01B6 + GoToIfEq 0x800C, 1, _01B6 GoTo _01A3 End _0C50: ScrCmd_198 0x400A, 0x800C - CompareVar 0x800C, 25 - GoToIf 1, _0D2E - CompareVar 0x800C, 35 - GoToIf 1, _0D2E - CompareVar 0x800C, 54 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1A1 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1A9 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1AB - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1B8 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x183 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x184 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x185 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x186 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x187 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x188 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x189 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x18A - GoToIf 1, _0D2E - CompareVar 0x800C, 0x18B - GoToIf 1, _0D2E + GoToIfEq 0x800C, 25, _0D2E + GoToIfEq 0x800C, 35, _0D2E + GoToIfEq 0x800C, 54, _0D2E + GoToIfEq 0x800C, 0x1A1, _0D2E + GoToIfEq 0x800C, 0x1A9, _0D2E + GoToIfEq 0x800C, 0x1AB, _0D2E + GoToIfEq 0x800C, 0x1B8, _0D2E + GoToIfEq 0x800C, 0x183, _0D2E + GoToIfEq 0x800C, 0x184, _0D2E + GoToIfEq 0x800C, 0x185, _0D2E + GoToIfEq 0x800C, 0x186, _0D2E + GoToIfEq 0x800C, 0x187, _0D2E + GoToIfEq 0x800C, 0x188, _0D2E + GoToIfEq 0x800C, 0x189, _0D2E + GoToIfEq 0x800C, 0x18A, _0D2E + GoToIfEq 0x800C, 0x18B, _0D2E SetVar 0x800C, 0 Return @@ -942,91 +842,51 @@ _0D2E: _0D36: ScrCmd_198 0x400A, 0x800C - CompareVar 0x800C, 25 - GoToIf 1, _0D2E - CompareVar 0x800C, 35 - GoToIf 1, _0D2E - CompareVar 0x800C, 54 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1A1 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1A9 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1AB - GoToIf 1, _0D2E - CompareVar 0x800C, 0x1B8 - GoToIf 1, _0D2E - CompareVar 0x800C, 39 - GoToIf 1, _0D2E - CompareVar 0x800C, 0xFF - GoToIf 1, _0D2E - CompareVar 0x800C, 0x12C - GoToIf 1, _0D2E - CompareVar 0x800C, 0x11D - GoToIf 1, _0D2E - CompareVar 0x800C, 0x183 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x184 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x185 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x186 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x187 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x188 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x189 - GoToIf 1, _0D2E - CompareVar 0x800C, 0x18A - GoToIf 1, _0D2E - CompareVar 0x800C, 0x18B - GoToIf 1, _0D2E + GoToIfEq 0x800C, 25, _0D2E + GoToIfEq 0x800C, 35, _0D2E + GoToIfEq 0x800C, 54, _0D2E + GoToIfEq 0x800C, 0x1A1, _0D2E + GoToIfEq 0x800C, 0x1A9, _0D2E + GoToIfEq 0x800C, 0x1AB, _0D2E + GoToIfEq 0x800C, 0x1B8, _0D2E + GoToIfEq 0x800C, 39, _0D2E + GoToIfEq 0x800C, 0xFF, _0D2E + GoToIfEq 0x800C, 0x12C, _0D2E + GoToIfEq 0x800C, 0x11D, _0D2E + GoToIfEq 0x800C, 0x183, _0D2E + GoToIfEq 0x800C, 0x184, _0D2E + GoToIfEq 0x800C, 0x185, _0D2E + GoToIfEq 0x800C, 0x186, _0D2E + GoToIfEq 0x800C, 0x187, _0D2E + GoToIfEq 0x800C, 0x188, _0D2E + GoToIfEq 0x800C, 0x189, _0D2E + GoToIfEq 0x800C, 0x18A, _0D2E + GoToIfEq 0x800C, 0x18B, _0D2E SetVar 0x800C, 0 Return _0E48: SetVar 0x8008, 0x409A - CompareVar 0x8008, 25 - GoToIf 1, _0F5A - CompareVar 0x8008, 0xFF - GoToIf 1, _0F68 - CompareVar 0x8008, 35 - GoToIf 1, _0F76 - CompareVar 0x8008, 54 - GoToIf 1, _0F84 - CompareVar 0x8008, 0x1A1 - GoToIf 1, _0F92 - CompareVar 0x8008, 0x1A9 - GoToIf 1, _0FA0 - CompareVar 0x8008, 0x1AB - GoToIf 1, _0FAE - CompareVar 0x8008, 0x1B8 - GoToIf 1, _0FBC - CompareVar 0x8008, 39 - GoToIf 1, _0FCA - CompareVar 0x8008, 0x12C - GoToIf 1, _0FD8 - CompareVar 0x8008, 0x11D - GoToIf 1, _0FE6 - CompareVar 0x8008, 0x183 - GoToIf 1, _0FF4 - CompareVar 0x8008, 0x184 - GoToIf 1, _1002 - CompareVar 0x8008, 0x185 - GoToIf 1, _1010 - CompareVar 0x8008, 0x186 - GoToIf 1, _101E - CompareVar 0x8008, 0x187 - GoToIf 1, _102C - CompareVar 0x8008, 0x188 - GoToIf 1, _103A - CompareVar 0x8008, 0x189 - GoToIf 1, _1048 - CompareVar 0x8008, 0x18A - GoToIf 1, _1056 - CompareVar 0x8008, 0x18B - GoToIf 1, _1064 + GoToIfEq 0x8008, 25, _0F5A + GoToIfEq 0x8008, 0xFF, _0F68 + GoToIfEq 0x8008, 35, _0F76 + GoToIfEq 0x8008, 54, _0F84 + GoToIfEq 0x8008, 0x1A1, _0F92 + GoToIfEq 0x8008, 0x1A9, _0FA0 + GoToIfEq 0x8008, 0x1AB, _0FAE + GoToIfEq 0x8008, 0x1B8, _0FBC + GoToIfEq 0x8008, 39, _0FCA + GoToIfEq 0x8008, 0x12C, _0FD8 + GoToIfEq 0x8008, 0x11D, _0FE6 + GoToIfEq 0x8008, 0x183, _0FF4 + GoToIfEq 0x8008, 0x184, _1002 + GoToIfEq 0x8008, 0x185, _1010 + GoToIfEq 0x8008, 0x186, _101E + GoToIfEq 0x8008, 0x187, _102C + GoToIfEq 0x8008, 0x188, _103A + GoToIfEq 0x8008, 0x189, _1048 + GoToIfEq 0x8008, 0x18A, _1056 + GoToIfEq 0x8008, 0x18B, _1064 GoTo _02BB End @@ -1142,8 +1002,7 @@ _1084: ScrCmd_068 ScrCmd_0D6 0, 0x409D ScrCmd_216 0x800C - CompareVar 0x800C, 200 - GoToIf 4, _04D8 + GoToIfGe 0x800C, 200, _04D8 GoTo _05DD End @@ -1151,13 +1010,11 @@ _10AA: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAB5 - GoToIf 1, _117C + GoToIfSet 0xAB5, _117C ScrCmd_02C 36 ScrCmd_2E1 0x40AB, 0x8004 ScrCmd_2E0 0x40AB, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _10E1 + GoToIfEq 0x800C, 0, _10E1 GoTo _1136 End @@ -1165,12 +1022,10 @@ _10E1: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 37 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _1161 + GoToIfEq 0x800C, 1, _1161 SetVar 0x8005, 5 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1172 + GoToIfEq 0x800C, 0, _1172 ScrCmd_0CD 0 ScrCmd_33D 1, 0x8004 ScrCmd_04E 0x486 @@ -1184,8 +1039,7 @@ _1136: ScrCmd_261 0, 0x8004 ScrCmd_02C 37 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _1161 + GoToIfEq 0x800C, 1, _1161 SetVar 0x8005, 1 ScrCmd_014 0x7DF GoTo _117C diff --git a/res/field/scripts/script_0277.s b/res/field/scripts/script_0277.s index 7955650338..ab148b6384 100644 --- a/res/field/scripts/script_0277.s +++ b/res/field/scripts/script_0277.s @@ -20,13 +20,11 @@ _0024: Call _00CC ScrCmd_0E5 0x128, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006E + GoToIfEq 0x800C, 0, _006E Call _00EE ScrCmd_0E5 0x129, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006E + GoToIfEq 0x800C, 0, _006E Call _010E SetFlag 0x989 ScrCmd_061 @@ -136,8 +134,7 @@ _010E: SetVar 0x8004, 94 SetVar 0x8005, 10 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01AD + GoToIfEq 0x800C, 0, _01AD ScrCmd_014 0x7FC ScrCmd_02C 9 GoTo _01B0 @@ -187,19 +184,15 @@ _01F3: ScrCmd_042 17, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0241 - CompareVar 0x8008, 1 - GoToIf 1, _026A - CompareVar 0x8008, 2 - GoToIf 1, _02C8 + GoToIfEq 0x8008, 0, _0241 + GoToIfEq 0x8008, 1, _026A + GoToIfEq 0x8008, 2, _02C8 GoTo _02C8 End _0241: ScrCmd_071 0x800C, 100 - CompareVar 0x800C, 0 - GoToIf 1, _02E2 + GoToIfEq 0x800C, 0, _02E2 SetVar 0x8005, 1 SetVar 0x8006, 100 GoTo _0293 @@ -207,8 +200,7 @@ _0241: _026A: ScrCmd_071 0x800C, 0x3E8 - CompareVar 0x800C, 0 - GoToIf 1, _02E2 + GoToIfEq 0x800C, 0, _02E2 SetVar 0x8005, 10 SetVar 0x8006, 0x3E8 GoTo _0293 @@ -217,8 +209,7 @@ _026A: _0293: SetVar 0x8004, 94 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02D5 + GoToIfEq 0x800C, 0, _02D5 ScrCmd_1A3 0x8006 ScrCmd_074 ScrCmd_049 0x644 diff --git a/res/field/scripts/script_0279.s b/res/field/scripts/script_0279.s index f3575a78bf..ac43b1d472 100644 --- a/res/field/scripts/script_0279.s +++ b/res/field/scripts/script_0279.s @@ -16,8 +16,7 @@ _0014: ScrCmd_060 ScrCmd_068 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _003A + GoToIfEq 0x800C, 0, _003A ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -25,8 +24,7 @@ _0014: End _003A: - CheckFlag 147 - GoToIf 1, _0064 + GoToIfSet 147, _0064 ScrCmd_02C 0 SetVar 0x8004, 0x1A9 SetVar 0x8005, 1 diff --git a/res/field/scripts/script_0281.s b/res/field/scripts/script_0281.s index 17a4009055..fb2c38240a 100644 --- a/res/field/scripts/script_0281.s +++ b/res/field/scripts/script_0281.s @@ -17,13 +17,11 @@ _0015: ScrCmd_068 ScrCmd_1BD 0x8004 ScrCmd_07E 0x1C5, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0052 + GoToIfEq 0x800C, 1, _0052 ScrCmd_02C 1 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _005D + GoToIfEq 0x800C, 0, _005D GoTo _0098 _0052: diff --git a/res/field/scripts/script_0282.s b/res/field/scripts/script_0282.s index ce458f888b..305bf26fd5 100644 --- a/res/field/scripts/script_0282.s +++ b/res/field/scripts/script_0282.s @@ -26,8 +26,7 @@ _000C: SetFlag 0x24F ScrCmd_065 0 ScrCmd_21C 1 - CompareVar 0x4058, 3 - GoToIf 1, _0074 + GoToIfEq 0x4058, 3, _0074 ClearFlag 0x452 ScrCmd_064 1 SetFlag 0x11F diff --git a/res/field/scripts/script_0284.s b/res/field/scripts/script_0284.s index 5b18c0dd20..23ebe29ccb 100644 --- a/res/field/scripts/script_0284.s +++ b/res/field/scripts/script_0284.s @@ -21,8 +21,7 @@ _0014: WaitMovement ScrCmd_0E5 0x39E, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0150 + GoToIfEq 0x800C, 0, _0150 ScrCmd_02C 1 ScrCmd_034 ApplyMovement 0, _0168 @@ -35,8 +34,7 @@ _0014: WaitMovement ScrCmd_0E5 0x39F, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0150 + GoToIfEq 0x800C, 0, _0150 ScrCmd_02C 3 ScrCmd_034 ScrCmd_003 15, 0x800C diff --git a/res/field/scripts/script_0285.s b/res/field/scripts/script_0285.s index 21d5ba9d9b..fdbfb988ae 100644 --- a/res/field/scripts/script_0285.s +++ b/res/field/scripts/script_0285.s @@ -11,8 +11,7 @@ .short 0xFD13 _001A: - CompareVar 0x4094, 2 - GoToIf 0, _0029 + GoToIfLt 0x4094, 2, _0029 End _0029: @@ -136,8 +135,7 @@ _0154: ScrCmd_162 ScrCmd_06D 14, 15 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0177 + GoToIfEq 0x800C, 0, _0177 GoTo _0191 End diff --git a/res/field/scripts/script_0286.s b/res/field/scripts/script_0286.s index 1344f1ef48..ed8c7a7c1e 100644 --- a/res/field/scripts/script_0286.s +++ b/res/field/scripts/script_0286.s @@ -21,18 +21,13 @@ _0031: Return _0037: - CheckFlag 0x120 - GoToIf 1, _0083 + GoToIfSet 0x120, _0083 ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0083 + GoToIfEq 0x4000, 0, _0083 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0083 - CheckFlag 0x125 - GoToIf 0, _0083 - CompareVar 0x409E, 1 - GoToIf 5, _0083 + GoToIfEq 0x4000, 0, _0083 + GoToIfUnset 0x125, _0083 + GoToIfNe 0x409E, 1, _0083 ClearFlag 0x1DD Return @@ -41,8 +36,7 @@ _0083: Return _0089: - CheckFlag 142 - GoToIf 1, _0096 + GoToIfSet 142, _0096 End _0096: @@ -119,14 +113,12 @@ _00E6: ScrCmd_2BD 0x1E5, 50 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0168 + GoToIfEq 0x800C, 0, _0168 ScrCmd_0ED 0x800C CompareVar 0x800C, 0 CallIf 1, _017A ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _015D + GoToIfEq 0x800C, 1, _015D GoTo _0155 End diff --git a/res/field/scripts/script_0288.s b/res/field/scripts/script_0288.s index a9234b3d38..152e279682 100644 --- a/res/field/scripts/script_0288.s +++ b/res/field/scripts/script_0288.s @@ -71,8 +71,7 @@ _00C0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40AA, 3 - GoToIf 4, _00E0 + GoToIfGe 0x40AA, 3, _00E0 ScrCmd_02C 3 GoTo _00EB End diff --git a/res/field/scripts/script_0289.s b/res/field/scripts/script_0289.s index fd5c26361f..e256f655af 100644 --- a/res/field/scripts/script_0289.s +++ b/res/field/scripts/script_0289.s @@ -18,8 +18,7 @@ _001C: Return _002A: - CheckFlag 0x121 - GoToIf 1, _0046 + GoToIfSet 0x121, _0046 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_02C 0 diff --git a/res/field/scripts/script_0291.s b/res/field/scripts/script_0291.s index ce25c21385..18de928fd6 100644 --- a/res/field/scripts/script_0291.s +++ b/res/field/scripts/script_0291.s @@ -14,8 +14,7 @@ _001A: End _001C: - CheckFlag 142 - GoToIf 1, _0029 + GoToIfSet 142, _0029 End _0029: @@ -35,11 +34,9 @@ _0037: ScrCmd_2BD 0x1E7, 47 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009B + GoToIfEq 0x800C, 0, _009B ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0090 + GoToIfEq 0x800C, 1, _0090 GoTo _0084 End @@ -65,16 +62,13 @@ _009B: _00A5: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x410C, 3 - GoToIf 1, _00F4 - CompareVar 0x410C, 15 - GoToIf 0, _0100 + GoToIfEq 0x410C, 3, _00F4 + GoToIfLt 0x410C, 15, _0100 SetVar 0x8004, 90 _00CB: SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _010C + GoToIfEq 0x800C, 0, _010C ScrCmd_014 0x7E0 ScrCmd_034 ScrCmd_065 1 @@ -109,8 +103,7 @@ _0127: ScrCmd_060 ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0149 + GoToIfEq 0x800C, 0, _0149 GoTo _017F End diff --git a/res/field/scripts/script_0310.s b/res/field/scripts/script_0310.s index f711773a69..dbe72f2a02 100644 --- a/res/field/scripts/script_0310.s +++ b/res/field/scripts/script_0310.s @@ -10,16 +10,12 @@ _000E: SetFlag 0x9D5 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _005C + GoToIfEq 0x4000, 0, _005C ScrCmd_07E 0x1C4, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _005C + GoToIfEq 0x4000, 0, _005C ScrCmd_28B 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _005C - CheckFlag 0x123 - GoToIf 1, _005C + GoToIfEq 0x4000, 0, _005C + GoToIfSet 0x123, _005C ClearFlag 0x251 End @@ -28,8 +24,7 @@ _005C: End _0062: - CheckFlag 142 - GoToIf 1, _006F + GoToIfSet 142, _006F End _006F: @@ -49,11 +44,9 @@ _007D: ScrCmd_318 0x1EC, 30 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D7 + GoToIfEq 0x800C, 0, _00D7 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00C8 + GoToIfEq 0x800C, 1, _00C8 SetFlag 0x123 ScrCmd_061 End diff --git a/res/field/scripts/script_0317.s b/res/field/scripts/script_0317.s index 2842aa0f4a..4fb53ecbf4 100644 --- a/res/field/scripts/script_0317.s +++ b/res/field/scripts/script_0317.s @@ -7,8 +7,7 @@ .short 0xFD13 _000A: - CheckFlag 142 - GoToIf 1, _0017 + GoToIfSet 142, _0017 End _0017: @@ -21,11 +20,9 @@ _0025: ScrCmd_060 ScrCmd_049 0x5DC ScrCmd_04B 0x5DC - CheckFlag 0x11A - GoToIf 1, _0081 + GoToIfSet 0x11A, _0081 ScrCmd_26B 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0073 + GoToIfEq 0x800C, 0, _0073 SetFlag 0x11A ScrCmd_0CD 0 ScrCmd_02C 1 @@ -53,11 +50,9 @@ _0081: ScrCmd_2BD 0x1E6, 1 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D1 + GoToIfEq 0x800C, 0, _00D1 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00C6 + GoToIfEq 0x800C, 1, _00C6 SetFlag 0x11B ScrCmd_061 End diff --git a/res/field/scripts/script_0318.s b/res/field/scripts/script_0318.s index a0a47ba7ec..f082bcc8a4 100644 --- a/res/field/scripts/script_0318.s +++ b/res/field/scripts/script_0318.s @@ -10,8 +10,7 @@ _0012: SetFlag 0x9D7 - CheckFlag 228 - GoToIf 0, _0023 + GoToIfUnset 228, _0023 End _0023: @@ -23,8 +22,7 @@ _002B: ScrCmd_060 ScrCmd_068 ScrCmd_0C8 0 - CompareVar 0x4091, 1 - GoToIf 4, _0095 + GoToIfGe 0x4091, 1, _0095 ScrCmd_0CD 0 CheckFlag 224 CallIf 0, _008B @@ -54,10 +52,8 @@ _0090: Return _0095: - CompareVar 0x40E2, 2 - GoToIf 4, _00C4 - CompareVar 0x40E2, 1 - GoToIf 1, _00BB + GoToIfGe 0x40E2, 2, _00C4 + GoToIfEq 0x40E2, 1, _00BB ScrCmd_0CD 0 ScrCmd_02C 9 GoTo _00D2 @@ -89,8 +85,7 @@ _00E2: ScrCmd_162 ScrCmd_06D 4, 16 ScrCmd_1BD 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0103 + GoToIfEq 0x800C, 2, _0103 GoTo _011B _0103: @@ -110,8 +105,7 @@ _0133: ScrCmd_02C 5 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 3 - GoToIf 1, _0152 + GoToIfEq 0x800C, 3, _0152 GoTo _016A _0152: diff --git a/res/field/scripts/script_0320.s b/res/field/scripts/script_0320.s index de6a9344d7..fd9ceece5c 100644 --- a/res/field/scripts/script_0320.s +++ b/res/field/scripts/script_0320.s @@ -15,8 +15,7 @@ _0010: ScrCmd_060 ScrCmd_068 ScrCmd_284 0x800C - CompareVar 0x800C, 10 - GoToIf 4, _0034 + GoToIfGe 0x800C, 10, _0034 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0321.s b/res/field/scripts/script_0321.s index afc35c6f3e..2f00931f22 100644 --- a/res/field/scripts/script_0321.s +++ b/res/field/scripts/script_0321.s @@ -15,8 +15,7 @@ _0010: ScrCmd_060 ScrCmd_068 ScrCmd_284 0x800C - CompareVar 0x800C, 26 - GoToIf 4, _0034 + GoToIfGe 0x800C, 26, _0034 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0324.s b/res/field/scripts/script_0324.s index 2207c43472..96a032c308 100644 --- a/res/field/scripts/script_0324.s +++ b/res/field/scripts/script_0324.s @@ -20,8 +20,7 @@ _0014: ScrCmd_02C 3 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _003E + GoToIfEq 0x800C, 0, _003E GoTo _0071 _003E: @@ -101,8 +100,7 @@ _00FC: SetVar 0x8005, 1 ScrCmd_014 0x7FC ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0140 + GoToIfEq 0x800C, 0, _0140 GoTo _0135 End diff --git a/res/field/scripts/script_0329.s b/res/field/scripts/script_0329.s index a0f89a14d0..400c6fe3ee 100644 --- a/res/field/scripts/script_0329.s +++ b/res/field/scripts/script_0329.s @@ -15,13 +15,11 @@ _0026: ScrCmd_25B - CheckFlag 229 - GoToIf 0, _0035 + GoToIfUnset 229, _0035 End _0035: - CompareVar 0x4092, 2 - GoToIf 1, _004A + GoToIfEq 0x4092, 2, _004A SetVar 0x4092, 0 End @@ -185,8 +183,7 @@ _01AA: ScrCmd_0E5 0x343, 0x344 ScrCmd_162 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _037D + GoToIfEq 0x800C, 0, _037D ApplyMovement 5, _0394 WaitMovement ScrCmd_02C 9 @@ -263,16 +260,13 @@ _02E5: _02F9: ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _031C - CompareVar 0x800C, 1 - GoToIf 1, _0366 + GoToIfEq 0x800C, 0, _031C + GoToIfEq 0x800C, 1, _0366 End _031C: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _0353 + GoToIfEq 0x800C, 6, _0353 ScrCmd_04E 0x486 ScrCmd_04F ScrCmd_02C 12 @@ -469,18 +463,12 @@ _0468: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 226 - GoToIf 1, _0504 - CompareVar 0x4092, 2 - GoToIf 1, _0513 - CompareVar 0x40E3, 4 - GoToIf 4, _04EB - CompareVar 0x40E3, 3 - GoToIf 1, _04E0 - CompareVar 0x40E3, 2 - GoToIf 1, _04D5 - CompareVar 0x40E3, 1 - GoToIf 1, _04CA + GoToIfSet 226, _0504 + GoToIfEq 0x4092, 2, _0513 + GoToIfGe 0x40E3, 4, _04EB + GoToIfEq 0x40E3, 3, _04E0 + GoToIfEq 0x40E3, 2, _04D5 + GoToIfEq 0x40E3, 1, _04CA ScrCmd_0CD 0 ScrCmd_02C 18 GoTo _04F6 diff --git a/res/field/scripts/script_0330.s b/res/field/scripts/script_0330.s index cb873f7996..2f20cdfa62 100644 --- a/res/field/scripts/script_0330.s +++ b/res/field/scripts/script_0330.s @@ -10,10 +10,8 @@ _0012: ScrCmd_32B 0x4004 - CompareVar 0x4004, 0 - GoToIf 1, _0061 - CompareVar 0x4004, 1 - GoToIf 1, _006B + GoToIfEq 0x4004, 0, _0061 + GoToIfEq 0x4004, 1, _006B End _0032: @@ -21,10 +19,8 @@ _0032: CompareVar 0x4069, 0x122 CallIf 5, _0079 ScrCmd_32B 0x4004 - CompareVar 0x4004, 0 - GoToIf 1, _0061 - CompareVar 0x4004, 1 - GoToIf 1, _006B + GoToIfEq 0x4004, 0, _0061 + GoToIfEq 0x4004, 1, _006B End _0061: diff --git a/res/field/scripts/script_0331.s b/res/field/scripts/script_0331.s index 89fe5efe99..1c1b8f54bf 100644 --- a/res/field/scripts/script_0331.s +++ b/res/field/scripts/script_0331.s @@ -7,8 +7,7 @@ .short 0xFD13 _000A: - CheckFlag 0x11D - GoToIf 1, _0029 + GoToIfSet 0x11D, _0029 ScrCmd_22D 2, 0x4000 CompareVar 0x4000, 1 CallIf 1, _002F @@ -30,21 +29,16 @@ _0035: SetVar 0x8004, 233 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A8 + GoToIfEq 0x800C, 0, _00A8 ScrCmd_014 0x7FC SetFlag 0x11D ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 2 - GoToIf 1, _00B2 - CompareVar 0x8004, 3 - GoToIf 1, _00D0 - CompareVar 0x8004, 0 - GoToIf 1, _00B2 - CompareVar 0x8004, 1 - GoToIf 1, _00D0 + GoToIfEq 0x8004, 2, _00B2 + GoToIfEq 0x8004, 3, _00D0 + GoToIfEq 0x8004, 0, _00B2 + GoToIfEq 0x8004, 1, _00D0 End _00A8: diff --git a/res/field/scripts/script_0333.s b/res/field/scripts/script_0333.s index 4e95ac2e90..966a93c3e3 100644 --- a/res/field/scripts/script_0333.s +++ b/res/field/scripts/script_0333.s @@ -8,8 +8,7 @@ _000A: ScrCmd_292 10, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0022 + GoToIfEq 0x4000, 1, _0022 SetFlag 0x27B End diff --git a/res/field/scripts/script_0337.s b/res/field/scripts/script_0337.s index c86bd4da66..0d2dc528ca 100644 --- a/res/field/scripts/script_0337.s +++ b/res/field/scripts/script_0337.s @@ -8,17 +8,13 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x149 - GoToIf 1, _009C - CheckFlag 0xAB0 - GoToIf 1, _009C + GoToIfSet 0x149, _009C + GoToIfSet 0xAB0, _009C ScrCmd_1B6 0x800C - CompareVar 0x800C, 3 - GoToIf 0, _009C + GoToIfLt 0x800C, 3, _009C ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0096 + GoToIfEq 0x800C, 1, _0096 ScrCmd_0CD 0 ScrCmd_02C 2 ScrCmd_034 @@ -27,11 +23,9 @@ _0006: SetFlag 0xAB0 ScrCmd_124 0x1DF, 20 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A7 + GoToIfEq 0x800C, 0, _00A7 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _008B + GoToIfEq 0x800C, 1, _008B SetFlag 0x149 ScrCmd_061 End diff --git a/res/field/scripts/script_0339.s b/res/field/scripts/script_0339.s index 1fa33282c8..cecd8aca60 100644 --- a/res/field/scripts/script_0339.s +++ b/res/field/scripts/script_0339.s @@ -8,8 +8,7 @@ _000A: ScrCmd_292 25, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0022 + GoToIfEq 0x4000, 1, _0022 SetFlag 0x27C End diff --git a/res/field/scripts/script_0341.s b/res/field/scripts/script_0341.s index ece6a89142..252ee30375 100644 --- a/res/field/scripts/script_0341.s +++ b/res/field/scripts/script_0341.s @@ -20,8 +20,7 @@ _0028: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x15E - GoToIf 1, _0046 + GoToIfSet 0x15E, _0046 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -39,8 +38,7 @@ _0051: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x15E - GoToIf 1, _006F + GoToIfSet 0x15E, _006F ScrCmd_02C 4 ScrCmd_031 ScrCmd_034 @@ -58,8 +56,7 @@ _007A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x15E - GoToIf 1, _0098 + GoToIfSet 0x15E, _0098 ScrCmd_02C 6 ScrCmd_031 ScrCmd_034 @@ -77,8 +74,7 @@ _00A3: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x15E - GoToIf 1, _00C1 + GoToIfSet 0x15E, _00C1 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -107,8 +103,7 @@ _00DF: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B8, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0107 + GoToIfEq 0x800C, 1, _0107 ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 @@ -118,10 +113,8 @@ _00DF: _0107: ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _012A - CompareVar 0x800C, 1 - GoToIf 1, _015E + GoToIfEq 0x800C, 0, _012A + GoToIfEq 0x800C, 1, _015E End _012A: diff --git a/res/field/scripts/script_0342.s b/res/field/scripts/script_0342.s index 38c9ccd58c..ab70d409f5 100644 --- a/res/field/scripts/script_0342.s +++ b/res/field/scripts/script_0342.s @@ -16,8 +16,7 @@ _001E: ScrCmd_060 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _003E + GoToIfEq 0x800C, 0, _003E GoTo _0074 _003E: @@ -94,12 +93,10 @@ _00CF: ScrCmd_068 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _010A + GoToIfEq 0x800C, 1, _010A ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _010A + GoToIfEq 0x800C, 1, _010A ScrCmd_02C 6 GoTo _010A End diff --git a/res/field/scripts/script_0343.s b/res/field/scripts/script_0343.s index 67527797ea..d0226764fb 100644 --- a/res/field/scripts/script_0343.s +++ b/res/field/scripts/script_0343.s @@ -22,8 +22,7 @@ _0021: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B8, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0049 + GoToIfEq 0x800C, 1, _0049 ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 @@ -33,10 +32,8 @@ _0021: _0049: ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006C - CompareVar 0x800C, 1 - GoToIf 1, _00A0 + GoToIfEq 0x800C, 0, _006C + GoToIfEq 0x800C, 1, _00A0 End _006C: diff --git a/res/field/scripts/script_0344.s b/res/field/scripts/script_0344.s index f02bb6e059..82005d4d77 100644 --- a/res/field/scripts/script_0344.s +++ b/res/field/scripts/script_0344.s @@ -19,10 +19,8 @@ _0012: ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 8 - GoToIf 1, _0054 - CompareVar 0x8004, 9 - GoToIf 1, _0064 + GoToIfEq 0x8004, 8, _0054 + GoToIfEq 0x8004, 9, _0064 End _0054: @@ -38,8 +36,7 @@ _0064: _0074: ScrCmd_0E5 0x193, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E1 + GoToIfEq 0x800C, 0, _00E1 ScrCmd_02C 2 SetVar 0x8004, 1 SetVar 0x8005, 1 @@ -108,8 +105,7 @@ _012C: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B8, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0154 + GoToIfEq 0x800C, 1, _0154 ScrCmd_02C 5 ScrCmd_031 ScrCmd_034 @@ -119,10 +115,8 @@ _012C: _0154: ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0177 - CompareVar 0x800C, 1 - GoToIf 1, _01AB + GoToIfEq 0x800C, 0, _0177 + GoToIfEq 0x800C, 1, _01AB End _0177: @@ -181,12 +175,9 @@ _01E6: ScrCmd_29D 0x10F, 3 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0240 - CompareVar 0x8008, 1 - GoToIf 1, _024B - CompareVar 0x8008, 2 - GoToIf 1, _0256 + GoToIfEq 0x8008, 0, _0240 + GoToIfEq 0x8008, 1, _024B + GoToIfEq 0x8008, 2, _0256 GoTo _0261 End diff --git a/res/field/scripts/script_0346.s b/res/field/scripts/script_0346.s index 859ace5157..de855e8c8e 100644 --- a/res/field/scripts/script_0346.s +++ b/res/field/scripts/script_0346.s @@ -32,8 +32,7 @@ _0034: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1B8, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _005C + GoToIfEq 0x800C, 1, _005C ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 @@ -43,10 +42,8 @@ _0034: _005C: ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007F - CompareVar 0x800C, 1 - GoToIf 1, _00B3 + GoToIfEq 0x800C, 0, _007F + GoToIfEq 0x800C, 1, _00B3 End _007F: diff --git a/res/field/scripts/script_0347.s b/res/field/scripts/script_0347.s index f26fd5922e..78bbc6ed8f 100644 --- a/res/field/scripts/script_0347.s +++ b/res/field/scripts/script_0347.s @@ -20,8 +20,7 @@ .short 0xFD13 _003E: - CheckFlag 0x97D - GoToIf 1, _004B + GoToIfSet 0x97D, _004B End _004B: @@ -36,28 +35,22 @@ _0059: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x97D - GoToIf 1, _0109 - CheckFlag 173 - GoToIf 1, _0114 + GoToIfSet 0x97D, _0109 + GoToIfSet 173, _0114 ScrCmd_02C 0 ScrCmd_034 ScrCmd_0E5 0x199, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011F + GoToIfEq 0x800C, 0, _011F SetFlag 173 SetVar 0x410D, 1 ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 SetVar 0x4002, 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _00D5 - CompareVar 0x8004, 2 - GoToIf 1, _00E5 - CompareVar 0x8004, 3 - GoToIf 1, _00F5 + GoToIfEq 0x8004, 0, _00D5 + GoToIfEq 0x8004, 2, _00E5 + GoToIfEq 0x8004, 3, _00F5 End _00D5: @@ -119,8 +112,7 @@ _0140: _014C: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x97D - GoToIf 1, _0168 + GoToIfSet 0x97D, _0168 ScrCmd_02C 13 ScrCmd_031 ScrCmd_034 @@ -137,8 +129,7 @@ _0168: _0173: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x97D - GoToIf 1, _018F + GoToIfSet 0x97D, _018F ScrCmd_02C 14 ScrCmd_031 ScrCmd_034 @@ -155,8 +146,7 @@ _018F: _019A: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x97D - GoToIf 1, _01B6 + GoToIfSet 0x97D, _01B6 ScrCmd_02C 15 ScrCmd_031 ScrCmd_034 @@ -182,14 +172,11 @@ _01C5: _01C7: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x97D - GoToIf 1, _0347 + GoToIfSet 0x97D, _0347 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01FB - CompareVar 0x800C, 1 - GoToIf 1, _0341 + GoToIfEq 0x800C, 0, _01FB + GoToIfEq 0x800C, 1, _0341 End _01FB: @@ -215,12 +202,9 @@ _01FB: ScrCmd_065 2 ScrCmd_065 1 ScrCmd_065 3 - CompareVar 0x4002, 0 - GoToIf 1, _02C0 - CompareVar 0x4002, 2 - GoToIf 1, _02DA - CompareVar 0x4002, 3 - GoToIf 1, _02F4 + GoToIfEq 0x4002, 0, _02C0 + GoToIfEq 0x4002, 2, _02DA + GoToIfEq 0x4002, 3, _02F4 End _0296: @@ -373,8 +357,7 @@ _03EA: _03FD: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 173 - GoToIf 1, _0450 + GoToIfSet 173, _0450 ApplyMovement 4, _0470 WaitMovement ScrCmd_02C 5 diff --git a/res/field/scripts/script_0351.s b/res/field/scripts/script_0351.s index 16321ef5b2..601ddbf9bc 100644 --- a/res/field/scripts/script_0351.s +++ b/res/field/scripts/script_0351.s @@ -13,10 +13,8 @@ _001E: ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _003E - CompareVar 0x4000, 1 - GoToIf 1, _0046 + GoToIfEq 0x4000, 0, _003E + GoToIfEq 0x4000, 1, _0046 End _003E: @@ -28,8 +26,7 @@ _0046: End _004E: - CheckFlag 142 - GoToIf 1, _005B + GoToIfSet 142, _005B End _005B: @@ -632,8 +629,7 @@ _0418: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 184 - GoToIf 1, _043D + GoToIfSet 184, _043D SetFlag 184 ScrCmd_0CD 0 ScrCmd_02C 8 @@ -655,8 +651,7 @@ _044B: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _046A + GoToIfEq 0x800C, 0, _046A GoTo _0476 _046A: diff --git a/res/field/scripts/script_0352.s b/res/field/scripts/script_0352.s index 7293f39c9e..a61f9a807a 100644 --- a/res/field/scripts/script_0352.s +++ b/res/field/scripts/script_0352.s @@ -19,10 +19,8 @@ _001E: CompareVar 0x4097, 0 CallIf 1, _0071 ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0061 - CompareVar 0x4000, 1 - GoToIf 1, _0069 + GoToIfEq 0x4000, 0, _0061 + GoToIfEq 0x4000, 1, _0069 End _0061: @@ -61,15 +59,13 @@ _00C7: _00CB: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 186 - GoToIf 1, _0128 + GoToIfSet 186, _0128 ApplyMovement 5, _01C8 WaitMovement ScrCmd_02C 2 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0104 + GoToIfEq 0x800C, 0, _0104 GoTo _0112 End @@ -105,11 +101,9 @@ _013B: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 186 - GoToIf 1, _018B + GoToIfSet 186, _018B ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0167 + GoToIfEq 0x800C, 0, _0167 GoTo _0175 End @@ -133,8 +127,7 @@ _0183: _018B: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01A4 + GoToIfEq 0x800C, 0, _01A4 GoTo _01B2 End @@ -166,8 +159,7 @@ _01D0: ApplyMovement 5, _0220 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01F5 + GoToIfEq 0x800C, 0, _01F5 GoTo _0203 End @@ -207,8 +199,7 @@ _0230: ScrCmd_034 ScrCmd_0E5 0x195, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02DB + GoToIfEq 0x800C, 0, _02DB ScrCmd_02C 10 ScrCmd_02C 11 ScrCmd_02C 12 diff --git a/res/field/scripts/script_0353.s b/res/field/scripts/script_0353.s index 053f061fe5..0e59ea4ce5 100644 --- a/res/field/scripts/script_0353.s +++ b/res/field/scripts/script_0353.s @@ -43,18 +43,13 @@ _0010: ScrCmd_21C 0 ScrCmd_02C 1 ScrCmd_034 - CompareVar 0x4059, 3 - GoToIf 1, _0184 + GoToIfEq 0x4059, 3, _0184 ScrCmd_003 30, 0x800C ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00DE - CompareVar 0x800C, 1 - GoToIf 1, _00EE - CompareVar 0x800C, 2 - GoToIf 1, _00FE - CompareVar 0x800C, 3 - GoToIf 1, _010E + GoToIfEq 0x800C, 0, _00DE + GoToIfEq 0x800C, 1, _00EE + GoToIfEq 0x800C, 2, _00FE + GoToIfEq 0x800C, 3, _010E End _00DE: diff --git a/res/field/scripts/script_0357.s b/res/field/scripts/script_0357.s index f10b9e2f11..0a673c1262 100644 --- a/res/field/scripts/script_0357.s +++ b/res/field/scripts/script_0357.s @@ -10,10 +10,8 @@ _0012: SetFlag 0x9E1 - CheckFlag 0x15E - GoToIf 0, _002E - CheckFlag 0x15E - GoToIf 1, _0038 + GoToIfUnset 0x15E, _002E + GoToIfSet 0x15E, _0038 End _002E: @@ -28,10 +26,8 @@ _0042: SetFlag 0x9E1 CheckFlag 142 CallIf 1, _0069 - CheckFlag 0x15E - GoToIf 0, _002E - CheckFlag 0x15E - GoToIf 1, _0038 + GoToIfUnset 0x15E, _002E + GoToIfSet 0x15E, _0038 End _0069: @@ -51,11 +47,9 @@ _0077: ScrCmd_2BD 0x1E2, 50 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CD + GoToIfEq 0x800C, 0, _00CD ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00C2 + GoToIfEq 0x800C, 1, _00C2 SetFlag 0x126 ScrCmd_061 End @@ -85,8 +79,7 @@ _00D3: ScrCmd_034 ScrCmd_0E5 0x198, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0144 + GoToIfEq 0x800C, 0, _0144 ScrCmd_02C 2 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 diff --git a/res/field/scripts/script_0359.s b/res/field/scripts/script_0359.s index d57531b40c..1b9851bf21 100644 --- a/res/field/scripts/script_0359.s +++ b/res/field/scripts/script_0359.s @@ -9,8 +9,7 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 169 - GoToIf 1, _002B + GoToIfSet 169, _002B SetFlag 169 ScrCmd_0CE 0 ScrCmd_02C 0 diff --git a/res/field/scripts/script_0361.s b/res/field/scripts/script_0361.s index 1d9dfbc54f..5f5bb215a1 100644 --- a/res/field/scripts/script_0361.s +++ b/res/field/scripts/script_0361.s @@ -12,8 +12,7 @@ _000E: End _0014: - CheckFlag 142 - GoToIf 1, _0021 + GoToIfSet 142, _0021 End _0021: @@ -33,11 +32,9 @@ _002F: ScrCmd_2BD 0x1E0, 50 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0085 + GoToIfEq 0x800C, 0, _0085 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _007A + GoToIfEq 0x800C, 1, _007A SetFlag 0x127 ScrCmd_061 End diff --git a/res/field/scripts/script_0362.s b/res/field/scripts/script_0362.s index 2b62700b9e..c85c2df12f 100644 --- a/res/field/scripts/script_0362.s +++ b/res/field/scripts/script_0362.s @@ -15,8 +15,7 @@ _000A: End _0024: - CompareVar 0x40F8, 2 - GoToIf 5, _0035 + GoToIfNe 0x40F8, 2, _0035 SetFlag 0x279 _0035: Return @@ -28,8 +27,7 @@ _0037: ScrCmd_1BD 0x8004 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005D + GoToIfEq 0x800C, 0, _005D GoTo _009D _005D: diff --git a/res/field/scripts/script_0363.s b/res/field/scripts/script_0363.s index 5af117be68..8fe9f0bfd1 100644 --- a/res/field/scripts/script_0363.s +++ b/res/field/scripts/script_0363.s @@ -9,16 +9,12 @@ _000E: ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0058 + GoToIfEq 0x4000, 0, _0058 ScrCmd_07E 0x1C6, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0058 + GoToIfEq 0x4000, 0, _0058 ScrCmd_28B 0, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0058 - CheckFlag 0x158 - GoToIf 1, _0058 + GoToIfEq 0x4000, 0, _0058 + GoToIfSet 0x158, _0058 ClearFlag 0x240 End @@ -27,8 +23,7 @@ _0058: End _005E: - CheckFlag 142 - GoToIf 1, _006B + GoToIfSet 142, _006B End _006B: @@ -47,16 +42,13 @@ _0079: ScrCmd_2BD 0x1EB, 50 ClearFlag 142 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _014C + GoToIfEq 0x800C, 0, _014C ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00D8 + GoToIfEq 0x800C, 1, _00D8 SetFlag 0x158 _00BC: SetFlag 0x241 - CompareVar 0x40F8, 2 - GoToIf 1, _00E3 + GoToIfEq 0x40F8, 2, _00E3 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0367.s b/res/field/scripts/script_0367.s index 4e80aa9d83..ac0e0818fc 100644 --- a/res/field/scripts/script_0367.s +++ b/res/field/scripts/script_0367.s @@ -41,16 +41,14 @@ _0062: CompareVar 0x4000, 0 CallIf 5, _014A ScrCmd_1E0 0x4000 - CompareVar 0x4000, 0 - GoToIf 5, _00DF + GoToIfNe 0x4000, 0, _00DF SetFlag 0x1E9 GoTo _00C6 End _00C6: ScrCmd_238 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 5, _00EB + GoToIfNe 0x4000, 0, _00EB SetFlag 0x20E End @@ -68,17 +66,12 @@ _00F1: Return _00F5: - CompareVar 0x40D8, 1 - GoToIf 5, _013A + GoToIfNe 0x40D8, 1, _013A ScrCmd_1E0 0x4000 - CompareVar 0x4000, 0 - GoToIf 5, _013C - CompareVar 0x4000, 1 - GoToIf 1, _013C - CompareVar 0x4000, 2 - GoToIf 1, _013C - CompareVar 0x4000, 3 - GoToIf 1, _013C + GoToIfNe 0x4000, 0, _013C + GoToIfEq 0x4000, 1, _013C + GoToIfEq 0x4000, 2, _013C + GoToIfEq 0x4000, 3, _013C _013A: End @@ -136,22 +129,17 @@ _01AC: _01C6: SetVar 0x8008, 0x4002 - CompareVar 0x8008, 1 - GoToIf 1, _0239 - CompareVar 0x8008, 2 - GoToIf 1, _024C - CompareVar 0x8008, 3 - GoToIf 1, _025F - CompareVar 0x8008, 4 - GoToIf 1, _022E + GoToIfEq 0x8008, 1, _0239 + GoToIfEq 0x8008, 2, _024C + GoToIfEq 0x8008, 3, _025F + GoToIfEq 0x8008, 4, _022E ScrCmd_02C 15 GoTo _020B End _020B: ScrCmd_030 - CompareVar 0x4001, 1 - GoToIf 1, _0220 + GoToIfEq 0x4001, 1, _0220 ScrCmd_034 ScrCmd_061 End @@ -204,12 +192,9 @@ _029D: ScrCmd_02C 1 Call _02E6 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0301 - CompareVar 0x8008, 1 - GoToIf 1, _02DB - CompareVar 0x8008, 2 - GoToIf 1, _0784 + GoToIfEq 0x8008, 0, _0301 + GoToIfEq 0x8008, 1, _02DB + GoToIfEq 0x8008, 2, _0784 GoTo _0784 End @@ -236,12 +221,9 @@ _0301: ScrCmd_042 94, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0352 - CompareVar 0x8008, 1 - GoToIf 1, _0385 - CompareVar 0x8008, 2 - GoToIf 1, _0784 + GoToIfEq 0x8008, 0, _0352 + GoToIfEq 0x8008, 1, _0385 + GoToIfEq 0x8008, 2, _0784 GoTo _0784 End @@ -252,8 +234,7 @@ _0352: _0360: ScrCmd_1DD 1, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03B0 + GoToIfEq 0x800C, 1, _03B0 ScrCmd_1FF 91, 3, 0, 0 GoTo _0787 End @@ -261,8 +242,7 @@ _0360: _0385: ScrCmd_1DB 0, 1 ScrCmd_1DD 1, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03B0 + GoToIfEq 0x800C, 1, _03B0 ScrCmd_1FF 91, 4, 0, 0 GoTo _0787 End @@ -270,29 +250,22 @@ _0385: _03B0: ScrCmd_02C 8 Call _04BE - CompareVar 0x800C, 0 - GoToIf 1, _0784 + GoToIfEq 0x800C, 0, _0784 ScrCmd_1DD 32, 0, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _04A8 - CompareVar 0x8008, 2 - GoToIf 1, _04B3 + GoToIfEq 0x8008, 1, _04A8 + GoToIfEq 0x8008, 2, _04B3 ScrCmd_1DD 53, 0, 0x800C ScrCmd_31E 0x800C, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _13CE + GoToIfEq 0x800C, 0xFF, _13CE ScrCmd_1DD 53, 1, 0x800C ScrCmd_31E 0x800C, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _13CE + GoToIfEq 0x800C, 0xFF, _13CE ScrCmd_1DD 53, 2, 0x800C ScrCmd_31E 0x800C, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _13CE + GoToIfEq 0x800C, 0xFF, _13CE ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _09B3 + GoToIfEq 0x800C, 4, _09B3 GoTo _045C End @@ -301,8 +274,7 @@ _045C: ScrCmd_1DD 5, 0, 0 ScrCmd_14E Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E ScrCmd_1DD 57, 0, 0x800C ScrCmd_1DD 52, 0, 0 ScrCmd_02C 11 @@ -340,13 +312,11 @@ _04EC: ScrCmd_060 SetVar 0x40D8, 0 ScrCmd_1DD 4, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0597 + GoToIfEq 0x800C, 0, _0597 ScrCmd_02C 16 ScrCmd_1DB 1, 0xFFFF ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0548 + GoToIfEq 0x800C, 2, _0548 Call _0192 ScrCmd_1DD 5, 0, 0 Call _0734 @@ -378,15 +348,13 @@ _0597: ScrCmd_060 ScrCmd_02C 19 ScrCmd_1DD 14, 0, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _05B9 + GoToIfEq 0x800C, 4, _05B9 GoTo _077E End _05B9: ScrCmd_1DD 9, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E ScrCmd_1DD 10, 0, 0x800C SetVar 0x8000, 0x800C ScrCmd_0D5 0, 0x8000 @@ -398,14 +366,10 @@ _05EC: ScrCmd_034 ScrCmd_1DD 43, 0, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 4 - GoToIf 1, _0652 - CompareVar 0x8008, 5 - GoToIf 1, _0652 - CompareVar 0x8008, 2 - GoToIf 1, _066C - CompareVar 0x8008, 3 - GoToIf 1, _0686 + GoToIfEq 0x8008, 4, _0652 + GoToIfEq 0x8008, 5, _0652 + GoToIfEq 0x8008, 2, _066C + GoToIfEq 0x8008, 3, _0686 GoTo _0638 End @@ -465,8 +429,7 @@ _06F6: ScrCmd_060 Call _0724 ScrCmd_1DD 100, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0784 + GoToIfEq 0x800C, 1, _0784 ScrCmd_02C 56 Call _0734 GoTo _077E @@ -537,8 +500,7 @@ _07E5: ScrCmd_049 0x5DC ScrCmd_1DA ScrCmd_1DD 12, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0922 + GoToIfEq 0x800C, 1, _0922 ScrCmd_02C 36 GoTo _080D End @@ -549,8 +511,7 @@ _080D: _0815: ScrCmd_1DD 15, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _08A7 + GoToIfEq 0x800C, 1, _08A7 GoTo _0832 End @@ -558,14 +519,10 @@ _0832: ScrCmd_02C 37 Call _087D SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0AA7 - CompareVar 0x8008, 1 - GoToIf 1, _0A5A - CompareVar 0x8008, 2 - GoToIf 1, _089C - CompareVar 0x8008, 3 - GoToIf 1, _0784 + GoToIfEq 0x8008, 0, _0AA7 + GoToIfEq 0x8008, 1, _0A5A + GoToIfEq 0x8008, 2, _089C + GoToIfEq 0x8008, 3, _0784 GoTo _0784 End @@ -588,16 +545,11 @@ _08A7: ScrCmd_02C 37 Call _08FF SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0AA7 - CompareVar 0x8008, 1 - GoToIf 1, _0A5A - CompareVar 0x8008, 2 - GoToIf 1, _0AB5 - CompareVar 0x8008, 3 - GoToIf 1, _089C - CompareVar 0x8008, 4 - GoToIf 1, _0784 + GoToIfEq 0x8008, 0, _0AA7 + GoToIfEq 0x8008, 1, _0A5A + GoToIfEq 0x8008, 2, _0AB5 + GoToIfEq 0x8008, 3, _089C + GoToIfEq 0x8008, 4, _0784 GoTo _0784 End @@ -615,14 +567,11 @@ _08FF: _0922: ScrCmd_02C 61 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0967 + GoToIfEq 0x800C, 1, _0967 Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _0784 + GoToIfEq 0x800C, 0, _0784 Call _096F - CompareVar 0x800C, 0 - GoToIf 5, _0784 + GoToIfNe 0x800C, 0, _0784 ScrCmd_02C 60 GoTo _0784 End @@ -652,28 +601,24 @@ _097F: _09B3: ScrCmd_14E Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E Call _0158 ScrCmd_1DD 5, 0, 0 ScrCmd_14E ScrCmd_034 SetVar 0x4001, 0 Call _097F - CompareVar 0x800C, 0 - GoToIf 5, _077E + GoToIfNe 0x800C, 0, _077E GoTo _09FB End _09FB: ScrCmd_02C 47 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05EC + GoToIfEq 0x800C, 0, _05EC ScrCmd_02C 48 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _09FB + GoToIfEq 0x800C, 1, _09FB SetVar 0x40D8, 2 ScrCmd_1DD 39, 0, 0 ScrCmd_1DC @@ -689,13 +634,11 @@ _09FB: _0A5A: Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _0784 + GoToIfEq 0x800C, 0, _0784 ScrCmd_034 SetVar 0x4001, 2 Call _097F - CompareVar 0x800C, 0 - GoToIf 5, _0784 + GoToIfNe 0x800C, 0, _0784 ScrCmd_1E3 0x8004, 0x8005 ScrCmd_0D5 0, 0x8004 ScrCmd_280 1, 0x8005, 2, 3 @@ -731,12 +674,9 @@ _0AE2: ScrCmd_02C 21 Call _02E6 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0B2B - CompareVar 0x8008, 1 - GoToIf 1, _0B20 - CompareVar 0x8008, 2 - GoToIf 1, _0784 + GoToIfEq 0x8008, 0, _0B2B + GoToIfEq 0x8008, 1, _0B20 + GoToIfEq 0x8008, 2, _0784 GoTo _0784 End @@ -747,8 +687,7 @@ _0B20: _0B2B: ScrCmd_1DD 1, 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B50 + GoToIfEq 0x800C, 1, _0B50 ScrCmd_1FF 91, 2, 0, 0 GoTo _0787 End @@ -756,8 +695,7 @@ _0B2B: _0B50: ScrCmd_02C 26 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0B80 + GoToIfEq 0x800C, 0, _0B80 GoTo _0B6C End @@ -776,30 +714,23 @@ _0B80: _0B94: ScrCmd_02C 8 Call _04BE - CompareVar 0x800C, 0 - GoToIf 1, _0784 + GoToIfEq 0x800C, 0, _0784 ScrCmd_1DD 32, 0, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _04A8 - CompareVar 0x8008, 2 - GoToIf 1, _04B3 + GoToIfEq 0x8008, 1, _04A8 + GoToIfEq 0x8008, 2, _04B3 ScrCmd_1DD 53, 0, 0x800C ScrCmd_31E 0x800C, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _13CE + GoToIfEq 0x800C, 0xFF, _13CE ScrCmd_1DD 53, 1, 0x800C ScrCmd_31E 0x800C, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _13CE - CompareVar 0x4001, 1 - GoToIf 1, _0C53 + GoToIfEq 0x800C, 0xFF, _13CE + GoToIfEq 0x4001, 1, _0C53 Call _0172 ScrCmd_1DD 5, 0, 0 ScrCmd_14E Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E ScrCmd_1DD 57, 0, 0x800C ScrCmd_1DD 52, 0, 0 ScrCmd_02C 35 @@ -809,8 +740,7 @@ _0B94: _0C53: ScrCmd_14E Call _049C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E GoTo _0C70 End @@ -823,24 +753,19 @@ _0C70: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0CB4 - CompareVar 0x8008, 1 - GoToIf 1, _0D08 + GoToIfEq 0x8008, 0, _0CB4 + GoToIfEq 0x8008, 1, _0D08 GoTo _077E End _0CB4: ScrCmd_02C 112 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0C70 + GoToIfEq 0x800C, 1, _0C70 ScrCmd_034 ScrCmd_0F2 16, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0CF6 - CompareVar 0x800C, 3 - GoToIf 1, _0CFE + GoToIfEq 0x800C, 1, _0CF6 + GoToIfEq 0x800C, 3, _0CFE GoTo _0D5C End @@ -856,14 +781,11 @@ _0CFE: _0D08: ScrCmd_02C 112 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0C70 + GoToIfEq 0x800C, 1, _0C70 ScrCmd_034 ScrCmd_0F3 16, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0D4A - CompareVar 0x800C, 3 - GoToIf 1, _0D52 + GoToIfEq 0x800C, 1, _0D4A + GoToIfEq 0x800C, 3, _0D52 GoTo _0D5C End @@ -885,22 +807,17 @@ _0D5C: _0D72: ScrCmd_1E1 0, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0D72 + GoToIfEq 0x800C, 0, _0D72 ScrCmd_1E2 0, 0x4000 SetVar 0x8008, 0x4000 - CompareVar 0x8008, 1 - GoToIf 1, _0DE7 - CompareVar 0x8008, 2 - GoToIf 1, _0E05 - CompareVar 0x8008, 3 - GoToIf 1, _0E23 + GoToIfEq 0x8008, 1, _0DE7 + GoToIfEq 0x8008, 2, _0E05 + GoToIfEq 0x8008, 3, _0E23 ScrCmd_136 ScrCmd_135 2 ScrCmd_1DD 57, 0, 0x8004 ScrCmd_207 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0E8A + GoToIfEq 0x800C, 0, _0E8A ScrCmd_1E2 1, 0x4000 GoTo _0E58 End @@ -959,8 +876,7 @@ _0E8A: _0EA2: ScrCmd_1E1 1, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0EA2 + GoToIfEq 0x800C, 0, _0EA2 GoTo _0E58 End @@ -970,11 +886,9 @@ _0EBF: ScrCmd_0BD Call _0724 ScrCmd_1DD 100, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0784 + GoToIfEq 0x800C, 1, _0784 ScrCmd_1DD 35, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0F7E + GoToIfEq 0x800C, 1, _0F7E GoTo _0F05 End @@ -983,10 +897,8 @@ _0F05: ScrCmd_1DD 43, 0, 0x800C SetVar 0x4000, 0x800C SetVar 0x8008, 0x4000 - CompareVar 0x8008, 5 - GoToIf 1, _0F53 - CompareVar 0x8008, 4 - GoToIf 1, _11BA + GoToIfEq 0x8008, 5, _0F53 + GoToIfEq 0x8008, 4, _11BA ScrCmd_1DD 49, 0, 0x800C CompareVar 0x800C, 1 CallIf 1, _0F73 @@ -997,8 +909,7 @@ _0F53: ScrCmd_02C 56 Call _0734 ScrCmd_034 - CompareVar 0x4000, 0 - GoToIf 1, _118A + GoToIfEq 0x4000, 0, _118A GoTo _077E End @@ -1011,15 +922,11 @@ _0F73: _0F7E: ScrCmd_1DD 43, 0, 0x800C SetVar 0x4000, 0x800C - CompareVar 0x4000, 5 - GoToIf 1, _116C - CompareVar 0x4000, 0 - GoToIf 1, _1091 - CompareVar 0x4000, 4 - GoToIf 1, _0FEA + GoToIfEq 0x4000, 5, _116C + GoToIfEq 0x4000, 0, _1091 + GoToIfEq 0x4000, 4, _0FEA ScrCmd_1DD 49, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0FD6 + GoToIfNe 0x800C, 0, _0FD6 Call _1167 GoTo _1177 End @@ -1035,8 +942,7 @@ _0FD6: _0FEA: ScrCmd_02C 12 ScrCmd_1DD 54, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _105E + GoToIfEq 0x800C, 0, _105E GoTo _100A End @@ -1051,8 +957,7 @@ _100A: _102B: ScrCmd_1DD 49, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _11F5 + GoToIfEq 0x800C, 0, _11F5 GoTo _1048 End @@ -1066,8 +971,7 @@ _1048: _105E: ScrCmd_1DD 49, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _11F5 + GoToIfEq 0x800C, 0, _11F5 GoTo _107B End @@ -1081,8 +985,7 @@ _107B: _1091: ScrCmd_1DD 45, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _10AE + GoToIfEq 0x800C, 0, _10AE GoTo _10F5 End @@ -1095,8 +998,7 @@ _10BC: ScrCmd_02C 14 Call _0734 ScrCmd_1DF 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E ScrCmd_02C 113 ScrCmd_034 SetVar 0x4002, 0x800C @@ -1111,8 +1013,7 @@ _10F5: CompareVar 0x404F, 3 CallIf 1, _114C ScrCmd_1DD 48, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _10BC + GoToIfEq 0x800C, 0, _10BC ScrCmd_02C 84 ScrCmd_04E 0x483 ScrCmd_04F @@ -1156,8 +1057,7 @@ _1177: _118A: ScrCmd_1DF 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _077E + GoToIfEq 0x800C, 0, _077E ScrCmd_02C 113 ScrCmd_034 SetVar 0x4002, 0x800C @@ -1168,8 +1068,7 @@ _118A: _11BA: ScrCmd_1DD 9, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _11D7 + GoToIfEq 0x800C, 1, _11D7 GoTo _11F5 End @@ -1192,11 +1091,9 @@ _1205: Call _0734 ScrCmd_02C 57 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0784 + GoToIfEq 0x800C, 1, _0784 Call _096F - CompareVar 0x800C, 0 - GoToIf 5, _0784 + GoToIfNe 0x800C, 0, _0784 ScrCmd_02C 60 GoTo _0784 @@ -1262,8 +1159,7 @@ _12CE: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_1E4 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12F9 + GoToIfEq 0x800C, 0, _12F9 SetVar 0x8000, 1 SetVar 0x8001, 0 Call _1304 @@ -1400,20 +1296,14 @@ _140A: SetVar 0x8000, 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _1549 + GoToIfEq 0x8000, 0xFF, _1549 ScrCmd_198 0x8000, 0x8004 - CompareVar 0x8004, 0 - GoToIf 1, _149C + GoToIfEq 0x8004, 0, _149C ScrCmd_2EE 0x8000, 0x8001, 0x8002, 0x8003 - CompareVar 0x8001, 90 - GoToIf 3, _14E9 - CompareVar 0x8001, 120 - GoToIf 3, _14F4 - CompareVar 0x8001, 150 - GoToIf 3, _14FF - CompareVar 0x8001, 151 - GoToIf 4, _150A + GoToIfLe 0x8001, 90, _14E9 + GoToIfLe 0x8001, 120, _14F4 + GoToIfLe 0x8001, 150, _14FF + GoToIfGe 0x8001, 151, _150A End _1492: @@ -1435,14 +1325,10 @@ _14A7: End _14B3: - CompareVar 0x8003, 15 - GoToIf 3, _1515 - CompareVar 0x8003, 25 - GoToIf 3, _1520 - CompareVar 0x8003, 30 - GoToIf 3, _152B - CompareVar 0x8003, 31 - GoToIf 4, _1536 + GoToIfLe 0x8003, 15, _1515 + GoToIfLe 0x8003, 25, _1520 + GoToIfLe 0x8003, 30, _152B + GoToIfGe 0x8003, 31, _1536 End _14E9: diff --git a/res/field/scripts/script_0368.s b/res/field/scripts/script_0368.s index 2e73386fdb..3023297781 100644 --- a/res/field/scripts/script_0368.s +++ b/res/field/scripts/script_0368.s @@ -49,10 +49,8 @@ _00A6: ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _01F8 - CompareVar 0x800C, 5 - GoToIf 1, _01F8 + GoToIfEq 0x800C, 4, _01F8 + GoToIfEq 0x800C, 5, _01F8 ScrCmd_1F8 ScrCmd_2C4 5 ScrCmd_0A1 diff --git a/res/field/scripts/script_0369.s b/res/field/scripts/script_0369.s index 0abe8c4537..c605ee01a9 100644 --- a/res/field/scripts/script_0369.s +++ b/res/field/scripts/script_0369.s @@ -24,12 +24,9 @@ _0025: Call _008E ScrCmd_1B7 0x800C, 4 SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _00F0 - CompareVar 0x8008, 2 - GoToIf 1, _010A - CompareVar 0x8008, 3 - GoToIf 1, _0124 + GoToIfEq 0x8008, 1, _00F0 + GoToIfEq 0x8008, 2, _010A + GoToIfEq 0x8008, 3, _0124 GoTo _00D6 _0066: diff --git a/res/field/scripts/script_0370.s b/res/field/scripts/script_0370.s index 29631f8d20..33c944465f 100644 --- a/res/field/scripts/script_0370.s +++ b/res/field/scripts/script_0370.s @@ -8,11 +8,9 @@ .short 0xFD13 _000E: - CompareVar 0x40DD, 0 - GoToIf 1, _0048 + GoToIfEq 0x40DD, 0, _0048 ScrCmd_207 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _004A + GoToIfEq 0x4000, 1, _004A ScrCmd_1DD 55, 0, 0x4000 SetVar 0x4020, 0x4000 ScrCmd_1DD 55, 1, 0x4000 diff --git a/res/field/scripts/script_0371.s b/res/field/scripts/script_0371.s index 0f94b52cd1..7a38d746d4 100644 --- a/res/field/scripts/script_0371.s +++ b/res/field/scripts/script_0371.s @@ -10,8 +10,7 @@ .short 0xFD13 _0016: - CompareVar 0x40D9, 0 - GoToIf 1, _0035 + GoToIfEq 0x40D9, 0, _0035 SetFlag 0x1CB ScrCmd_1DD 55, 0, 0x4000 SetVar 0x4020, 0x4000 @@ -20,8 +19,7 @@ _0035: _0037: ScrCmd_1B2 0xFF - CompareVar 0x40D9, 3 - GoToIf 1, _004A + GoToIfEq 0x40D9, 3, _004A End _004A: @@ -49,10 +47,8 @@ _007D: SetVar 0x40D8, 1 ScrCmd_1DD 43, 0, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 4 - GoToIf 1, _00D9 - CompareVar 0x8008, 5 - GoToIf 1, _00D9 + GoToIfEq 0x8008, 4, _00D9 + GoToIfEq 0x8008, 5, _00D9 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 0x146, 0, 11, 6, 0 @@ -74,8 +70,7 @@ _0101: ScrCmd_060 SetVar 0x40D9, 3 ScrCmd_1DD 100, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _007D + GoToIfEq 0x800C, 1, _007D Call _043C GoTo _0201 End @@ -84,8 +79,7 @@ _012C: ScrCmd_060 SetVar 0x40D9, 3 ScrCmd_1DD 100, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _007D + GoToIfEq 0x800C, 1, _007D Call _043C Call _0448 GoTo _02F7 @@ -140,11 +134,9 @@ _01EF: _0201: Call _015D - CompareVar 0x8004, 0 - GoToIf 1, _018C + GoToIfEq 0x8004, 0, _018C Call _01EF - CompareVar 0x800C, 1 - GoToIf 1, _019C + GoToIfEq 0x800C, 1, _019C Call _0492 Call _04A6 Call _0070 @@ -163,12 +155,9 @@ _0241: ScrCmd_047 ScrCmd_034 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _02AD - CompareVar 0x8008, 1 - GoToIf 1, _02BB - CompareVar 0x8008, 2 - GoToIf 1, _02D9 + GoToIfEq 0x8008, 0, _02AD + GoToIfEq 0x8008, 1, _02BB + GoToIfEq 0x8008, 2, _02D9 GoTo _02AD End @@ -181,8 +170,7 @@ _02BB: ScrCmd_02C 2 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _01AC + GoToIfEq 0x800C, 0, _01AC GoTo _0241 End @@ -190,20 +178,16 @@ _02D9: ScrCmd_02C 3 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _01E7 + GoToIfEq 0x800C, 0, _01E7 GoTo _0241 End _02F7: ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0241 + GoToIfNe 0x800C, 0, _0241 ScrCmd_1DD 36, 0, 0x800C - CompareVar 0x800C, 20 - GoToIf 1, _0336 - CompareVar 0x800C, 48 - GoToIf 1, _0336 + GoToIfEq 0x800C, 20, _0336 + GoToIfEq 0x800C, 48, _0336 GoTo _0241 End @@ -217,12 +201,9 @@ _0336: ScrCmd_047 ScrCmd_034 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0395 - CompareVar 0x8008, 1 - GoToIf 1, _02BB - CompareVar 0x8008, 2 - GoToIf 1, _02D9 + GoToIfEq 0x8008, 0, _0395 + GoToIfEq 0x8008, 1, _02BB + GoToIfEq 0x8008, 2, _02D9 GoTo _0395 End @@ -231,8 +212,7 @@ _0395: ScrCmd_1DD 40, 0, 0 Call _04CE ScrCmd_1DD 36, 0, 0x800C - CompareVar 0x800C, 48 - GoToIf 1, _041E + GoToIfEq 0x800C, 48, _041E ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 15 @@ -242,11 +222,9 @@ _03C7: ScrCmd_1DD 42, 0, 0 ScrCmd_0EC 0x800C SetVar 0x8004, 0x800C - CompareVar 0x8004, 0 - GoToIf 1, _018C + GoToIfEq 0x8004, 0, _018C ScrCmd_1DD 36, 0, 0x800C - CompareVar 0x800C, 48 - GoToIf 1, _0429 + GoToIfEq 0x800C, 48, _0429 ScrCmd_02C 17 ScrCmd_1DD 44, 1, 0 _040E: diff --git a/res/field/scripts/script_0372.s b/res/field/scripts/script_0372.s index 2b2514fcca..2745209f18 100644 --- a/res/field/scripts/script_0372.s +++ b/res/field/scripts/script_0372.s @@ -9,13 +9,11 @@ .short 0xFD13 _0012: - CompareVar 0x40DE, 0 - GoToIf 1, _0054 + GoToIfEq 0x40DE, 0, _0054 SetFlag 0x1EA SetFlag 0x1EB ScrCmd_207 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0056 + GoToIfEq 0x4000, 1, _0056 ScrCmd_1DD 55, 0, 0x4000 SetVar 0x4020, 0x4000 ScrCmd_1DD 55, 1, 0x4000 @@ -33,8 +31,7 @@ _0056: _0074: CompareVar 0x40DE, 0 CallIf 5, _0090 - CompareVar 0x40DE, 3 - GoToIf 1, _009E + GoToIfEq 0x40DE, 3, _009E _008E: End @@ -58,8 +55,7 @@ _00BE: _00CB: ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 3 - GoToIf 1, _0114 + GoToIfEq 0x800C, 3, _0114 ScrCmd_003 30, 0x800C SetVar 0x40D8, 1 ScrCmd_0BC 6, 1, 0, 0 @@ -91,8 +87,7 @@ _0156: SetVar 0x40DE, 3 Call _048D ScrCmd_1DD 43, 0, 0x800C - CompareVar 0x800C, 3 - GoToIf 1, _039E + GoToIfEq 0x800C, 3, _039E GoTo _02B0 End @@ -179,11 +174,9 @@ _029E: _02B0: Call _019D - CompareVar 0x8004, 0 - GoToIf 1, _022F + GoToIfEq 0x8004, 0, _022F Call _029E - CompareVar 0x800C, 1 - GoToIf 1, _0245 + GoToIfEq 0x800C, 1, _0245 Call _0541 Call _0565 Call _00BE @@ -199,12 +192,9 @@ _02E8: ScrCmd_047 ScrCmd_034 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0354 - CompareVar 0x8008, 1 - GoToIf 1, _0362 - CompareVar 0x8008, 2 - GoToIf 1, _0380 + GoToIfEq 0x8008, 0, _0354 + GoToIfEq 0x8008, 1, _0362 + GoToIfEq 0x8008, 2, _0380 GoTo _0354 End @@ -217,8 +207,7 @@ _0362: ScrCmd_02C 4 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _025B + GoToIfEq 0x800C, 0, _025B GoTo _02E8 End @@ -226,18 +215,15 @@ _0380: ScrCmd_02C 5 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 1, _0296 + GoToIfEq 0x800C, 0, _0296 GoTo _02E8 End _039E: Call _01DF - CompareVar 0x8004, 0 - GoToIf 1, _022F + GoToIfEq 0x8004, 0, _022F Call _029E - CompareVar 0x800C, 1 - GoToIf 1, _0245 + GoToIfEq 0x800C, 1, _0245 Call _0541 Call _0565 Call _00BE @@ -252,8 +238,7 @@ _03D6: ScrCmd_047 ScrCmd_034 SetVar 0x4000, 0 - CompareVar 0x800C, 1 - GoToIf 1, _0452 + GoToIfEq 0x800C, 1, _0452 _0418: ScrCmd_02C 12 ScrCmd_136 @@ -262,8 +247,7 @@ _0418: ScrCmd_1E2 2, 0x4000 ScrCmd_034 SetVar 0x8008, 0x4000 - CompareVar 0x8008, 1 - GoToIf 1, _0474 + GoToIfEq 0x8008, 1, _0474 Call _0589 GoTo _039E End @@ -271,8 +255,7 @@ _0418: _0452: ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03D6 + GoToIfEq 0x800C, 1, _03D6 SetVar 0x4000, 1 GoTo _0418 End diff --git a/res/field/scripts/script_0373.s b/res/field/scripts/script_0373.s index ac7be7575c..7ddaf0fa08 100644 --- a/res/field/scripts/script_0373.s +++ b/res/field/scripts/script_0373.s @@ -15,53 +15,38 @@ .short 0xFD13 _002A: - CheckFlag 227 - GoToIf 0, _0121 - CompareVar 0x40DF, 2 - GoToIf 5, _0057 + GoToIfUnset 227, _0121 + GoToIfNe 0x40DF, 2, _0057 ScrCmd_1DD 55, 2, 0x4009 - CompareVar 0x4009, 0 - GoToIf 1, _0121 + GoToIfEq 0x4009, 0, _0121 _0057: ClearFlag 0x1EC _005B: - CheckFlag 228 - GoToIf 0, _012D - CompareVar 0x40DF, 2 - GoToIf 5, _0088 + GoToIfUnset 228, _012D + GoToIfNe 0x40DF, 2, _0088 ScrCmd_1DD 55, 2, 0x4009 - CompareVar 0x4009, 1 - GoToIf 1, _012D + GoToIfEq 0x4009, 1, _012D _0088: ClearFlag 0x1ED _008C: - CheckFlag 229 - GoToIf 0, _0139 - CompareVar 0x40DF, 2 - GoToIf 5, _00B9 + GoToIfUnset 229, _0139 + GoToIfNe 0x40DF, 2, _00B9 ScrCmd_1DD 55, 2, 0x4009 - CompareVar 0x4009, 2 - GoToIf 1, _0139 + GoToIfEq 0x4009, 2, _0139 _00B9: ClearFlag 0x1EE _00BD: - CheckFlag 230 - GoToIf 0, _0145 - CompareVar 0x40DF, 2 - GoToIf 5, _00EA + GoToIfUnset 230, _0145 + GoToIfNe 0x40DF, 2, _00EA ScrCmd_1DD 55, 2, 0x4009 - CompareVar 0x4009, 3 - GoToIf 1, _0145 + GoToIfEq 0x4009, 3, _0145 _00EA: ClearFlag 0x1EF _00EE: - CheckFlag 231 - GoToIf 0, _0151 - CompareVar 0x40DF, 2 - GoToIf 5, _011B + GoToIfUnset 231, _0151 + GoToIfNe 0x40DF, 2, _011B ScrCmd_1DD 55, 2, 0x4009 - CompareVar 0x4009, 4 - GoToIf 1, _0151 + GoToIfEq 0x4009, 4, _0151 _011B: ClearFlag 0x1F0 _011F: @@ -95,8 +80,7 @@ _0151: _015D: CompareVar 0x40DF, 1 CallIf 1, _0179 - CompareVar 0x40DF, 2 - GoToIf 1, _017F + GoToIfEq 0x40DF, 2, _017F End _0179: @@ -124,8 +108,7 @@ _01AC: ScrCmd_0CD 0 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D4 + GoToIfEq 0x800C, 0, _01D4 ScrCmd_02C 0 ScrCmd_034 ScrCmd_061 @@ -170,8 +153,7 @@ _0275: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40DF, 2 - GoToIf 1, _02D2 + GoToIfEq 0x40DF, 2, _02D2 SetVar 0x4009, 0 ScrCmd_1DE 0x4009, 0, 0x8004, 0x8005 ScrCmd_341 0, 0x8004, 0, 0 @@ -181,8 +163,7 @@ _0275: ScrCmd_0D4 3, 0x8005 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02DD + GoToIfEq 0x800C, 0, _02DD _02D2: ScrCmd_02C 7 ScrCmd_031 @@ -204,15 +185,13 @@ _02FE: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40DF, 2 - GoToIf 1, _0336 + GoToIfEq 0x40DF, 2, _0336 SetVar 0x4009, 1 Call _0245 ScrCmd_0CD 4 ScrCmd_02C 15 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0341 + GoToIfEq 0x800C, 0, _0341 _0336: ScrCmd_02C 16 ScrCmd_031 @@ -235,14 +214,12 @@ _0365: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40DF, 2 - GoToIf 1, _039A + GoToIfEq 0x40DF, 2, _039A SetVar 0x4009, 2 Call _0245 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03A5 + GoToIfEq 0x800C, 0, _03A5 _039A: ScrCmd_02C 4 ScrCmd_031 @@ -264,14 +241,12 @@ _03C6: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40DF, 2 - GoToIf 1, _03FB + GoToIfEq 0x40DF, 2, _03FB SetVar 0x4009, 3 Call _0245 ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0406 + GoToIfEq 0x800C, 0, _0406 _03FB: ScrCmd_02C 13 ScrCmd_031 @@ -293,14 +268,12 @@ _0427: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40DF, 2 - GoToIf 1, _045C + GoToIfEq 0x40DF, 2, _045C SetVar 0x4009, 4 Call _0245 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0467 + GoToIfEq 0x800C, 0, _0467 _045C: ScrCmd_02C 10 ScrCmd_031 @@ -374,8 +347,7 @@ _0500: _055C: SetVar 0x4000, 1 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8000, 12 - GoToIf 1, _057D + GoToIfEq 0x8000, 12, _057D GoTo _058F End @@ -394,8 +366,7 @@ _058F: _05A1: SetVar 0x4000, 2 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8000, 4 - GoToIf 1, _05C2 + GoToIfEq 0x8000, 4, _05C2 GoTo _05D4 End @@ -414,8 +385,7 @@ _05D4: _05E6: SetVar 0x4000, 3 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8001, 7 - GoToIf 1, _0607 + GoToIfEq 0x8001, 7, _0607 GoTo _0619 End @@ -434,8 +404,7 @@ _0619: _062B: SetVar 0x4000, 4 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8001, 9 - GoToIf 1, _064C + GoToIfEq 0x8001, 9, _064C GoTo _065E End @@ -454,8 +423,7 @@ _065E: _0670: SetVar 0x4000, 5 ScrCmd_069 0x8000, 0x8001 - CompareVar 0x8000, 8 - GoToIf 1, _0691 + GoToIfEq 0x8000, 8, _0691 GoTo _06A3 End diff --git a/res/field/scripts/script_0374.s b/res/field/scripts/script_0374.s index 567c234d12..306ae45ab5 100644 --- a/res/field/scripts/script_0374.s +++ b/res/field/scripts/script_0374.s @@ -45,8 +45,7 @@ _009A: SetFlag 0x2CB ScrCmd_238 19, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _00D5 + GoToIfEq 0x4000, 0, _00D5 ScrCmd_329 0x4001, 0x4002, 0x4003, 0x4004 ScrCmd_186 29, 0x4001, 0x4002 ScrCmd_189 29, 0x4003 diff --git a/res/field/scripts/script_0375.s b/res/field/scripts/script_0375.s index c31b0c4069..f94e955ef6 100644 --- a/res/field/scripts/script_0375.s +++ b/res/field/scripts/script_0375.s @@ -62,16 +62,11 @@ _0095: ScrCmd_042 15, 5 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _010E - CompareVar 0x8008, 1 - GoToIf 1, _0146 - CompareVar 0x8008, 2 - GoToIf 1, _011C - CompareVar 0x8008, 3 - GoToIf 1, _012A - CompareVar 0x8008, 4 - GoToIf 1, _0138 + GoToIfEq 0x8008, 0, _010E + GoToIfEq 0x8008, 1, _0146 + GoToIfEq 0x8008, 2, _011C + GoToIfEq 0x8008, 3, _012A + GoToIfEq 0x8008, 4, _0138 Return _0103: @@ -117,10 +112,8 @@ _0154: ScrCmd_068 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _017F - CompareVar 0x800C, 1 - GoToIf 1, _018A + GoToIfEq 0x800C, 0, _017F + GoToIfEq 0x800C, 1, _018A End _017F: @@ -145,10 +138,8 @@ _019D: ScrCmd_068 ScrCmd_02C 20 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C8 - CompareVar 0x800C, 1 - GoToIf 1, _01D3 + GoToIfEq 0x800C, 0, _01C8 + GoToIfEq 0x800C, 1, _01D3 End _01C8: @@ -173,10 +164,8 @@ _01E6: ScrCmd_068 ScrCmd_02C 23 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0211 - CompareVar 0x800C, 1 - GoToIf 1, _021C + GoToIfEq 0x800C, 0, _0211 + GoToIfEq 0x800C, 1, _021C End _0211: @@ -201,10 +190,8 @@ _022F: ScrCmd_068 ScrCmd_02C 26 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _025A - CompareVar 0x800C, 1 - GoToIf 1, _0265 + GoToIfEq 0x800C, 0, _025A + GoToIfEq 0x800C, 1, _0265 End _025A: @@ -229,10 +216,8 @@ _0278: ScrCmd_068 ScrCmd_02C 29 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A3 - CompareVar 0x800C, 1 - GoToIf 1, _02AE + GoToIfEq 0x800C, 0, _02A3 + GoToIfEq 0x800C, 1, _02AE End _02A3: diff --git a/res/field/scripts/script_0376.s b/res/field/scripts/script_0376.s index 88f8a3b7a9..8b6fd682ac 100644 --- a/res/field/scripts/script_0376.s +++ b/res/field/scripts/script_0376.s @@ -20,8 +20,7 @@ _003A: ScrCmd_238 19, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0053 + GoToIfEq 0x4000, 0, _0053 ClearFlag 0x2C3 End @@ -64,14 +63,10 @@ _00B7: ScrCmd_042 19, 2 ScrCmd_042 20, 3 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0152 - CompareVar 0x800C, 1 - GoToIf 1, _0160 - CompareVar 0x800C, 2 - GoToIf 1, _0117 - CompareVar 0x800C, 4 - GoToIf 1, _016E + GoToIfEq 0x800C, 0, _0152 + GoToIfEq 0x800C, 1, _0160 + GoToIfEq 0x800C, 2, _0117 + GoToIfEq 0x800C, 4, _016E GoTo _0139 End @@ -118,10 +113,8 @@ _017C: ScrCmd_042 22, 1 ScrCmd_042 23, 2 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _01BA - CompareVar 0x800C, 1 - GoToIf 1, _01C8 + GoToIfEq 0x800C, 0, _01BA + GoToIfEq 0x800C, 1, _01C8 GoTo _0139 End @@ -148,10 +141,8 @@ _01DE: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0139 - CompareVar 0x40B8, 2 - GoToIf 1, _022C + GoToIfEq 0x800C, 0, _0139 + GoToIfEq 0x40B8, 2, _022C GoTo _038E End @@ -164,27 +155,22 @@ _022C: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0270 - CompareVar 0x8008, 1 - GoToIf 1, _02EC + GoToIfEq 0x8008, 0, _0270 + GoToIfEq 0x8008, 1, _02EC GoTo _0139 End _0270: ScrCmd_02C 25 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _022C + GoToIfEq 0x800C, 1, _022C ScrCmd_034 CompareVar 0x40B9, 0 CallIf 1, _02C2 CompareVar 0x40B9, 1 CallIf 1, _02CE - CompareVar 0x800C, 1 - GoToIf 1, _02DA - CompareVar 0x800C, 3 - GoToIf 1, _02E2 + GoToIfEq 0x800C, 1, _02DA + GoToIfEq 0x800C, 3, _02E2 GoTo _0368 End @@ -208,17 +194,14 @@ _02E2: _02EC: ScrCmd_02C 25 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _022C + GoToIfEq 0x800C, 1, _022C ScrCmd_034 CompareVar 0x40B9, 0 CallIf 1, _033E CompareVar 0x40B9, 1 CallIf 1, _034A - CompareVar 0x800C, 1 - GoToIf 1, _0356 - CompareVar 0x800C, 3 - GoToIf 1, _035E + GoToIfEq 0x800C, 1, _0356 + GoToIfEq 0x800C, 3, _035E GoTo _0368 End diff --git a/res/field/scripts/script_0377.s b/res/field/scripts/script_0377.s index 97d097eda7..f95416691b 100644 --- a/res/field/scripts/script_0377.s +++ b/res/field/scripts/script_0377.s @@ -45,8 +45,7 @@ _0090: Return _00A6: - CompareVar 0x40BA, 1 - GoToIf 1, _00B5 + GoToIfEq 0x40BA, 1, _00B5 End _00B5: @@ -54,8 +53,7 @@ _00B5: ScrCmd_1B7 0x4007, 100 CheckFlag 0x2CB CallIf 0, _00DB - CompareVar 0x4007, 30 - GoToIf 0, _00E5 + GoToIfLt 0x4007, 30, _00E5 End _00DB: @@ -64,19 +62,15 @@ _00DB: Return _00E5: - CheckFlag 0xAC4 - GoToIf 0, _00F2 + GoToIfUnset 0xAC4, _00F2 End _00F2: SetFlag 0xAC4 ScrCmd_326 0x4008 - CompareVar 0x4008, 0x2710 - GoToIf 4, _0123 - CompareVar 0x4008, 0x3E8 - GoToIf 4, _0131 - CompareVar 0x4008, 0x1F4 - GoToIf 4, _013F + GoToIfGe 0x4008, 0x2710, _0123 + GoToIfGe 0x4008, 0x3E8, _0131 + GoToIfGe 0x4008, 0x1F4, _013F End _0123: @@ -104,11 +98,9 @@ _015D: CheckFlag 0x2C1 CallIf 0, _019C ScrCmd_238 14, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0196 + GoToIfEq 0x4000, 0, _0196 ScrCmd_32A 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0196 + GoToIfEq 0x4000, 0, _0196 ClearFlag 0x2C1 ScrCmd_064 10 Return @@ -147,10 +139,8 @@ _01DF: _0215: ScrCmd_14D 0x4009 - CompareVar 0x4009, 0 - GoToIf 1, _0235 - CompareVar 0x4009, 1 - GoToIf 1, _023D + GoToIfEq 0x4009, 0, _0235 + GoToIfEq 0x4009, 1, _023D Return _0235: @@ -216,14 +206,10 @@ _02CB: ScrCmd_042 19, 2 ScrCmd_042 20, 3 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0366 - CompareVar 0x800C, 1 - GoToIf 1, _0389 - CompareVar 0x800C, 2 - GoToIf 1, _032B - CompareVar 0x800C, 4 - GoToIf 1, _03AC + GoToIfEq 0x800C, 0, _0366 + GoToIfEq 0x800C, 1, _0389 + GoToIfEq 0x800C, 2, _032B + GoToIfEq 0x800C, 4, _03AC GoTo _034D End @@ -250,24 +236,21 @@ _0355: _0366: SetVar 0x40BB, 0 ScrCmd_2CC 0, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03CF + GoToIfEq 0x800C, 0, _03CF GoTo _03F5 End _0389: SetVar 0x40BB, 1 ScrCmd_2CC 0, 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03E2 + GoToIfEq 0x800C, 0, _03E2 GoTo _03F5 End _03AC: SetVar 0x40BB, 2 ScrCmd_2CC 0, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03CF + GoToIfEq 0x800C, 0, _03CF GoTo _03F5 End @@ -293,24 +276,18 @@ _03F5: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _034D + GoToIfEq 0x4002, 0xFF, _034D ScrCmd_31E 0x4002, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _07C8 + GoToIfEq 0x800C, 0xFF, _07C8 ScrCmd_31E 0x4005, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _07C8 + GoToIfEq 0x800C, 0xFF, _07C8 ScrCmd_198 0x4002, 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _034D + GoToIfEq 0x4001, 0, _034D ScrCmd_2CC 1, 0x40BB, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04F4 + GoToIfEq 0x800C, 0, _04F4 ScrCmd_2CC 2, 0x40BB, 0x800C ScrCmd_0DA 0, 0x800C, 0, 0 - CompareVar 0x800C, 0x4001 - GoToIf 1, _04F4 + GoToIfEq 0x800C, 0x4001, _04F4 GoTo _04A2 End @@ -322,8 +299,7 @@ _04A2: ScrCmd_046 42, 0xFF, 1 ScrCmd_327 6 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _04E4 + GoToIfEq 0x8008, 0, _04E4 GoTo _034D End @@ -345,10 +321,8 @@ _04FC: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _034D - CompareVar 0x40BB, 2 - GoToIf 1, _054A + GoToIfEq 0x800C, 0, _034D + GoToIfEq 0x40BB, 2, _054A GoTo _0690 End @@ -361,24 +335,19 @@ _054A: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _058E - CompareVar 0x8008, 1 - GoToIf 1, _05E2 + GoToIfEq 0x8008, 0, _058E + GoToIfEq 0x8008, 1, _05E2 GoTo _034D End _058E: ScrCmd_02C 31 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _054A + GoToIfEq 0x800C, 1, _054A ScrCmd_034 ScrCmd_0F2 30, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05D0 - CompareVar 0x800C, 3 - GoToIf 1, _05D8 + GoToIfEq 0x800C, 1, _05D0 + GoToIfEq 0x800C, 3, _05D8 GoTo _0636 End @@ -394,14 +363,11 @@ _05D8: _05E2: ScrCmd_02C 31 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _054A + GoToIfEq 0x800C, 1, _054A ScrCmd_034 ScrCmd_0F3 30, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0624 - CompareVar 0x800C, 3 - GoToIf 1, _062C + GoToIfEq 0x800C, 1, _0624 + GoToIfEq 0x800C, 3, _062C GoTo _0636 End @@ -418,8 +384,7 @@ _0636: ScrCmd_136 ScrCmd_135 108 ScrCmd_2CF 0x4001, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _067B + GoToIfEq 0x800C, 1, _067B ScrCmd_136 ScrCmd_135 110 ScrCmd_02C 32 @@ -820,15 +785,11 @@ _0A4F: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 190 - GoToIf 0, _0AD7 + GoToIfUnset 190, _0AD7 ScrCmd_324 1, 2, 3, 4, 0x4062, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0AAD - CompareVar 0x800C, 2 - GoToIf 1, _0AB8 - CompareVar 0x800C, 3 - GoToIf 1, _0AC9 + GoToIfEq 0x800C, 0, _0AAD + GoToIfEq 0x800C, 2, _0AB8 + GoToIfEq 0x800C, 3, _0AC9 ScrCmd_0CD 0 ScrCmd_02C 69 ScrCmd_02C 70 @@ -873,32 +834,22 @@ _0AEE: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C22 + GoToIfEq 0x800C, 0, _0C22 GoTo _0B0F End _0B0F: ScrCmd_0CD 0 ScrCmd_325 0x8005 - CompareVar 0x8005, 0x1DB - GoToIf 4, _0B96 - CompareVar 0x8005, 0x15F - GoToIf 4, _0BA1 - CompareVar 0x8005, 251 - GoToIf 4, _0BAC - CompareVar 0x8005, 151 - GoToIf 4, _0BB7 - CompareVar 0x8005, 101 - GoToIf 4, _0BC2 - CompareVar 0x8005, 51 - GoToIf 4, _0BCD - CompareVar 0x8005, 31 - GoToIf 4, _0BD8 - CompareVar 0x8005, 11 - GoToIf 4, _0BE3 - CompareVar 0x8005, 1 - GoToIf 4, _0BEE + GoToIfGe 0x8005, 0x1DB, _0B96 + GoToIfGe 0x8005, 0x15F, _0BA1 + GoToIfGe 0x8005, 251, _0BAC + GoToIfGe 0x8005, 151, _0BB7 + GoToIfGe 0x8005, 101, _0BC2 + GoToIfGe 0x8005, 51, _0BCD + GoToIfGe 0x8005, 31, _0BD8 + GoToIfGe 0x8005, 11, _0BE3 + GoToIfGe 0x8005, 1, _0BEE ScrCmd_02C 75 GoTo _0BF9 End @@ -959,32 +910,22 @@ _0C01: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B0F + GoToIfEq 0x800C, 1, _0B0F GoTo _0C22 End _0C22: ScrCmd_0CD 0 ScrCmd_325 0x8005 - CompareVar 0x8005, 0x1DB - GoToIf 4, _0CA9 - CompareVar 0x8005, 0x15F - GoToIf 4, _0CB4 - CompareVar 0x8005, 251 - GoToIf 4, _0CBF - CompareVar 0x8005, 151 - GoToIf 4, _0CCA - CompareVar 0x8005, 101 - GoToIf 4, _0CD5 - CompareVar 0x8005, 51 - GoToIf 4, _0CE0 - CompareVar 0x8005, 31 - GoToIf 4, _0CEB - CompareVar 0x8005, 11 - GoToIf 4, _0CF6 - CompareVar 0x8005, 1 - GoToIf 4, _0D01 + GoToIfGe 0x8005, 0x1DB, _0CA9 + GoToIfGe 0x8005, 0x15F, _0CB4 + GoToIfGe 0x8005, 251, _0CBF + GoToIfGe 0x8005, 151, _0CCA + GoToIfGe 0x8005, 101, _0CD5 + GoToIfGe 0x8005, 51, _0CE0 + GoToIfGe 0x8005, 31, _0CEB + GoToIfGe 0x8005, 11, _0CF6 + GoToIfGe 0x8005, 1, _0D01 ScrCmd_02C 85 GoTo _0D0C End @@ -1046,16 +987,11 @@ _0D14: ScrCmd_068 ScrCmd_0CD 0 SetVar 0x4001, 0x4021 - CompareVar 0x4001, 0 - GoToIf 1, _0D68 - CompareVar 0x4001, 97 - GoToIf 1, _0D73 - CompareVar 0x4001, 140 - GoToIf 1, _0D7E - CompareVar 0x4001, 166 - GoToIf 1, _0D89 - CompareVar 0x4001, 167 - GoToIf 1, _0D94 + GoToIfEq 0x4001, 0, _0D68 + GoToIfEq 0x4001, 97, _0D73 + GoToIfEq 0x4001, 140, _0D7E + GoToIfEq 0x4001, 166, _0D89 + GoToIfEq 0x4001, 167, _0D94 End _0D68: diff --git a/res/field/scripts/script_0378.s b/res/field/scripts/script_0378.s index 21e6edb82a..63a94587a5 100644 --- a/res/field/scripts/script_0378.s +++ b/res/field/scripts/script_0378.s @@ -20,8 +20,7 @@ _003A: ScrCmd_238 19, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0053 + GoToIfEq 0x4000, 0, _0053 ClearFlag 0x2C3 End @@ -64,14 +63,10 @@ _00B7: ScrCmd_042 41, 2 ScrCmd_042 42, 3 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0152 - CompareVar 0x800C, 1 - GoToIf 1, _017F - CompareVar 0x800C, 2 - GoToIf 1, _0117 - CompareVar 0x800C, 4 - GoToIf 1, _01AC + GoToIfEq 0x800C, 0, _0152 + GoToIfEq 0x800C, 1, _017F + GoToIfEq 0x800C, 2, _0117 + GoToIfEq 0x800C, 4, _01AC GoTo _0139 End @@ -100,8 +95,7 @@ _0152: ScrCmd_2D2 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 - CompareVar 0x800C, 0 - GoToIf 1, _01D9 + GoToIfEq 0x800C, 0, _01D9 GoTo _01FF End @@ -110,8 +104,7 @@ _017F: ScrCmd_2D2 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 - CompareVar 0x800C, 0 - GoToIf 1, _01D9 + GoToIfEq 0x800C, 0, _01D9 GoTo _01FF End @@ -120,8 +113,7 @@ _01AC: ScrCmd_2D2 0, 2, 0x800C ScrCmd_0D5 0, 2 ScrCmd_0D5 1, 2 - CompareVar 0x800C, 0 - GoToIf 1, _01EC + GoToIfEq 0x800C, 0, _01EC GoTo _01FF End @@ -147,20 +139,15 @@ _01FF: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _0139 + GoToIfEq 0x4002, 0xFF, _0139 ScrCmd_31E 0x4002, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05D5 + GoToIfEq 0x800C, 0xFF, _05D5 ScrCmd_31E 0x4005, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05D5 + GoToIfEq 0x800C, 0xFF, _05D5 ScrCmd_31E 0x4006, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05D5 + GoToIfEq 0x800C, 0xFF, _05D5 ScrCmd_198 0x4002, 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0139 + GoToIfEq 0x4001, 0, _0139 GoTo _028F End @@ -177,10 +164,8 @@ _0297: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0139 - CompareVar 0x40BD, 2 - GoToIf 1, _02E5 + GoToIfEq 0x800C, 0, _0139 + GoToIfEq 0x40BD, 2, _02E5 GoTo _049D End @@ -193,24 +178,19 @@ _02E5: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0329 - CompareVar 0x8008, 1 - GoToIf 1, _037D + GoToIfEq 0x8008, 0, _0329 + GoToIfEq 0x8008, 1, _037D GoTo _0139 End _0329: ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02E5 + GoToIfEq 0x800C, 1, _02E5 ScrCmd_034 ScrCmd_0F2 31, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _036B - CompareVar 0x800C, 3 - GoToIf 1, _0373 + GoToIfEq 0x800C, 1, _036B + GoToIfEq 0x800C, 3, _0373 GoTo _03D1 End @@ -226,14 +206,11 @@ _0373: _037D: ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02E5 + GoToIfEq 0x800C, 1, _02E5 ScrCmd_034 ScrCmd_0F3 31, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03BF - CompareVar 0x800C, 3 - GoToIf 1, _03C7 + GoToIfEq 0x800C, 1, _03BF + GoToIfEq 0x800C, 3, _03C7 GoTo _03D1 End @@ -253,12 +230,9 @@ _03D1: ScrCmd_198 0x4005, 0x8001 ScrCmd_2D3 0x8000, 0x8001, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _0444 - CompareVar 0x8008, 2 - GoToIf 1, _045A - CompareVar 0x8008, 3 - GoToIf 1, _0470 + GoToIfEq 0x8008, 1, _0444 + GoToIfEq 0x8008, 2, _045A + GoToIfEq 0x8008, 3, _0470 ScrCmd_136 ScrCmd_135 138 ScrCmd_02C 45 diff --git a/res/field/scripts/script_0379.s b/res/field/scripts/script_0379.s index c3eff21b24..1013698235 100644 --- a/res/field/scripts/script_0379.s +++ b/res/field/scripts/script_0379.s @@ -23,8 +23,7 @@ _0046: ScrCmd_238 19, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _005F + GoToIfEq 0x4000, 0, _005F ClearFlag 0x2C3 End @@ -67,14 +66,10 @@ _00C3: ScrCmd_042 41, 2 ScrCmd_042 42, 3 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _015E - CompareVar 0x800C, 1 - GoToIf 1, _018B - CompareVar 0x800C, 2 - GoToIf 1, _0123 - CompareVar 0x800C, 4 - GoToIf 1, _01B8 + GoToIfEq 0x800C, 0, _015E + GoToIfEq 0x800C, 1, _018B + GoToIfEq 0x800C, 2, _0123 + GoToIfEq 0x800C, 4, _01B8 GoTo _0145 End @@ -103,8 +98,7 @@ _015E: ScrCmd_2D9 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 - CompareVar 0x800C, 0 - GoToIf 1, _01E5 + GoToIfEq 0x800C, 0, _01E5 GoTo _020B End @@ -113,8 +107,7 @@ _018B: ScrCmd_2D9 0, 3, 0x800C ScrCmd_0D5 0, 3 ScrCmd_0D5 1, 3 - CompareVar 0x800C, 0 - GoToIf 1, _01E5 + GoToIfEq 0x800C, 0, _01E5 GoTo _020B End @@ -123,8 +116,7 @@ _01B8: ScrCmd_2D9 0, 2, 0x800C ScrCmd_0D5 0, 2 ScrCmd_0D5 1, 2 - CompareVar 0x800C, 0 - GoToIf 1, _01F8 + GoToIfEq 0x800C, 0, _01F8 GoTo _020B End @@ -150,20 +142,15 @@ _020B: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x4002, 0xFF - GoToIf 1, _0145 + GoToIfEq 0x4002, 0xFF, _0145 ScrCmd_31E 0x4002, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05E1 + GoToIfEq 0x800C, 0xFF, _05E1 ScrCmd_31E 0x4005, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05E1 + GoToIfEq 0x800C, 0xFF, _05E1 ScrCmd_31E 0x4006, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _05E1 + GoToIfEq 0x800C, 0xFF, _05E1 ScrCmd_198 0x4002, 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0145 + GoToIfEq 0x4001, 0, _0145 GoTo _029B End @@ -180,10 +167,8 @@ _02A3: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0145 - CompareVar 0x40BE, 2 - GoToIf 1, _02F1 + GoToIfEq 0x800C, 0, _0145 + GoToIfEq 0x40BE, 2, _02F1 GoTo _04A9 End @@ -196,24 +181,19 @@ _02F1: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0335 - CompareVar 0x8008, 1 - GoToIf 1, _0389 + GoToIfEq 0x8008, 0, _0335 + GoToIfEq 0x8008, 1, _0389 GoTo _0145 End _0335: ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02F1 + GoToIfEq 0x800C, 1, _02F1 ScrCmd_034 ScrCmd_0F2 32, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0377 - CompareVar 0x800C, 3 - GoToIf 1, _037F + GoToIfEq 0x800C, 1, _0377 + GoToIfEq 0x800C, 3, _037F GoTo _03DD End @@ -229,14 +209,11 @@ _037F: _0389: ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02F1 + GoToIfEq 0x800C, 1, _02F1 ScrCmd_034 ScrCmd_0F3 32, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03CB - CompareVar 0x800C, 3 - GoToIf 1, _03D3 + GoToIfEq 0x800C, 1, _03CB + GoToIfEq 0x800C, 3, _03D3 GoTo _03DD End @@ -256,12 +233,9 @@ _03DD: ScrCmd_198 0x4005, 0x8001 ScrCmd_2DA 0x8000, 0x8001, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _0450 - CompareVar 0x8008, 2 - GoToIf 1, _0466 - CompareVar 0x8008, 3 - GoToIf 1, _047C + GoToIfEq 0x8008, 1, _0450 + GoToIfEq 0x8008, 2, _0466 + GoToIfEq 0x8008, 3, _047C ScrCmd_136 ScrCmd_135 156 ScrCmd_02C 45 diff --git a/res/field/scripts/script_0380.s b/res/field/scripts/script_0380.s index 3dc47866f3..d9668dc1c2 100644 --- a/res/field/scripts/script_0380.s +++ b/res/field/scripts/script_0380.s @@ -18,8 +18,7 @@ _001A: ScrCmd_060 ScrCmd_02C 7 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _003A + GoToIfEq 0x800C, 0, _003A ScrCmd_034 ScrCmd_061 End diff --git a/res/field/scripts/script_0382.s b/res/field/scripts/script_0382.s index 7b21b41074..8552e0b84e 100644 --- a/res/field/scripts/script_0382.s +++ b/res/field/scripts/script_0382.s @@ -14,11 +14,9 @@ _000E: _0012: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x4055, 5 - GoToIf 1, _0084 + GoToIfEq 0x4055, 5, _0084 ScrCmd_317 0x8004, 0x8005, 0x8006 - CompareVar 0x8005, 232 - GoToIf 1, _0059 + GoToIfEq 0x8005, 232, _0059 ApplyMovement 128, _00DC WaitMovement ScrCmd_02C 0 @@ -42,10 +40,8 @@ _007A: _0084: ScrCmd_317 0x8004, 0x8005, 0x8006 - CompareVar 0x8005, 231 - GoToIf 1, _00B6 - CompareVar 0x8005, 232 - GoToIf 1, _00C6 + GoToIfEq 0x8005, 231, _00B6 + GoToIfEq 0x8005, 232, _00C6 ApplyMovement 128, _0104 WaitMovement GoTo _00D0 diff --git a/res/field/scripts/script_0383.s b/res/field/scripts/script_0383.s index 419d1413bc..377fc90eee 100644 --- a/res/field/scripts/script_0383.s +++ b/res/field/scripts/script_0383.s @@ -17,8 +17,7 @@ _000E: WaitMovement ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _003B + GoToIfEq 0x800C, 1, _003B ScrCmd_02C 1 GoTo _003E diff --git a/res/field/scripts/script_0387.s b/res/field/scripts/script_0387.s index 1f2a3eb8fc..15aa4f2e31 100644 --- a/res/field/scripts/script_0387.s +++ b/res/field/scripts/script_0387.s @@ -17,10 +17,8 @@ _0022: End _0026: - CompareVar 0x4055, 7 - GoToIf 1, _0080 - CheckFlag 0x9AD - GoToIf 1, _0051 + GoToIfEq 0x4055, 7, _0080 + GoToIfSet 0x9AD, _0051 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 diff --git a/res/field/scripts/script_0388.s b/res/field/scripts/script_0388.s index ec56cd8d4b..a6676bae58 100644 --- a/res/field/scripts/script_0388.s +++ b/res/field/scripts/script_0388.s @@ -56,14 +56,12 @@ _0096: ScrCmd_034 ScrCmd_0E5 0x194, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01CE + GoToIfEq 0x800C, 0, _01CE SetVar 0x4055, 10 ScrCmd_02C 6 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 86 - GoToIf 1, _00E6 + GoToIfEq 0x8004, 86, _00E6 ApplyMovement 0xFF, _0210 GoTo _00EE @@ -77,8 +75,7 @@ _00EE: ApplyMovement 128, _02BC WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 74 - GoToIf 1, _012F + GoToIfEq 0x8005, 74, _012F ApplyMovement 0xFF, _0254 GoTo _013F @@ -89,8 +86,7 @@ _013F: ScrCmd_02C 7 WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 74 - GoToIf 1, _016D + GoToIfEq 0x8005, 74, _016D ApplyMovement 128, _02F8 ApplyMovement 0xFF, _0274 GoTo _017D @@ -109,8 +105,7 @@ _017D: ScrCmd_034 ApplyMovement 128, _02C8 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 74 - GoToIf 1, _01BB + GoToIfEq 0x8005, 74, _01BB ApplyMovement 0xFF, _0220 GoTo _01C3 @@ -132,8 +127,7 @@ _01CE: _01DA: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x4055, 10 - GoToIf 4, _01F8 + GoToIfGe 0x4055, 10, _01F8 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0389.s b/res/field/scripts/script_0389.s index 0b2f65d554..b4df4cc744 100644 --- a/res/field/scripts/script_0389.s +++ b/res/field/scripts/script_0389.s @@ -17,8 +17,7 @@ _0022: End _0026: - CheckFlag 142 - GoToIf 1, _0033 + GoToIfSet 142, _0033 End _0033: @@ -32,8 +31,7 @@ _0041: ScrCmd_060 ScrCmd_02C 13 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0061 + GoToIfEq 0x800C, 0, _0061 ScrCmd_034 ScrCmd_061 End @@ -72,16 +70,11 @@ _00C4: ClearFlag 142 ScrCmd_0EC 0x800C ScrCmd_314 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0204 - CompareVar 0x800C, 3 - GoToIf 1, _0204 - CompareVar 0x800C, 5 - GoToIf 1, _014E - CompareVar 0x800C, 6 - GoToIf 1, _014E - CompareVar 0x800C, 4 - GoToIf 1, _016E + GoToIfEq 0x800C, 2, _0204 + GoToIfEq 0x800C, 3, _0204 + GoToIfEq 0x800C, 5, _014E + GoToIfEq 0x800C, 6, _014E + GoToIfEq 0x800C, 4, _016E ScrCmd_311 130 ScrCmd_311 129 ApplyMovement 129, _0250 diff --git a/res/field/scripts/script_0390.s b/res/field/scripts/script_0390.s index f91744d170..58d2a72af0 100644 --- a/res/field/scripts/script_0390.s +++ b/res/field/scripts/script_0390.s @@ -15,8 +15,7 @@ _000E: ScrCmd_060 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _002E + GoToIfEq 0x800C, 0, _002E ScrCmd_034 ScrCmd_061 End diff --git a/res/field/scripts/script_0392.s b/res/field/scripts/script_0392.s index 2b1f8e0dee..0baf7bcc51 100644 --- a/res/field/scripts/script_0392.s +++ b/res/field/scripts/script_0392.s @@ -14,8 +14,7 @@ .short 0xFD13 _0026: - CompareVar 0x4069, 0x118 - GoToIf 0, _0035 + GoToIfLt 0x4069, 0x118, _0035 End _0035: @@ -26,19 +25,13 @@ _003D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4069, 0x122 - GoToIf 1, _00ED - CompareVar 0x4069, 0x118 - GoToIf 1, _00F8 - CheckFlag 0x964 - GoToIf 0, _010F + GoToIfEq 0x4069, 0x122, _00ED + GoToIfEq 0x4069, 0x118, _00F8 + GoToIfUnset 0x964, _010F ScrCmd_32B 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011A - CompareVar 0x4069, 0x10E - GoToIf 1, _00AE - CompareVar 0x4069, 0x104 - GoToIf 0, _011A + GoToIfEq 0x800C, 0, _011A + GoToIfEq 0x4069, 0x10E, _00AE + GoToIfLt 0x4069, 0x104, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x4069, 0x10E @@ -53,11 +46,9 @@ _00AE: ScrCmd_034 ScrCmd_2BD 0x17B, 30 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0109 + GoToIfEq 0x800C, 0, _0109 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00F8 + GoToIfEq 0x800C, 1, _00F8 SetVar 0x4069, 0x122 ScrCmd_061 End @@ -96,50 +87,43 @@ _0125: _012D: SetVar 0x4001, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _0148: SetVar 0x4002, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _0163: SetVar 0x4003, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _017E: SetVar 0x4004, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _0199: SetVar 0x4005, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _01B4: SetVar 0x4006, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End _01CF: SetVar 0x4007, 1 - CompareVar 0x4069, 0x104 - GoToIf 4, _020D + GoToIfGe 0x4069, 0x104, _020D GoTo _01EA End @@ -147,8 +131,7 @@ _01EA: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 ScrCmd_32C 0x4069, 0x24C, 0x8004, 0x8005 - CompareVar 0x4069, 0x104 - GoToIf 4, _020F + GoToIfGe 0x4069, 0x104, _020F ScrCmd_061 End @@ -156,8 +139,7 @@ _020D: End _020F: - CheckFlag 0x964 - GoToIf 0, _020D + GoToIfUnset 0x964, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x4069, 0x10E diff --git a/res/field/scripts/script_0394.s b/res/field/scripts/script_0394.s index c0790ae6e6..a4f9bf7283 100644 --- a/res/field/scripts/script_0394.s +++ b/res/field/scripts/script_0394.s @@ -14,8 +14,7 @@ .short 0xFD13 _0026: - CompareVar 0x406A, 0x118 - GoToIf 0, _0035 + GoToIfLt 0x406A, 0x118, _0035 End _0035: @@ -26,19 +25,13 @@ _003D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x406A, 0x122 - GoToIf 1, _00ED - CompareVar 0x406A, 0x118 - GoToIf 1, _00F8 - CheckFlag 0x964 - GoToIf 0, _010F + GoToIfEq 0x406A, 0x122, _00ED + GoToIfEq 0x406A, 0x118, _00F8 + GoToIfUnset 0x964, _010F ScrCmd_32B 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011A - CompareVar 0x406A, 0x10E - GoToIf 1, _00AE - CompareVar 0x406A, 0x104 - GoToIf 0, _011A + GoToIfEq 0x800C, 0, _011A + GoToIfEq 0x406A, 0x10E, _00AE + GoToIfLt 0x406A, 0x104, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x406A, 0x10E @@ -53,11 +46,9 @@ _00AE: ScrCmd_034 ScrCmd_2BD 0x17A, 30 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0109 + GoToIfEq 0x800C, 0, _0109 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00F8 + GoToIfEq 0x800C, 1, _00F8 SetVar 0x406A, 0x122 ScrCmd_061 End @@ -96,50 +87,43 @@ _0125: _012D: SetVar 0x4001, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _0148: SetVar 0x4002, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _0163: SetVar 0x4003, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _017E: SetVar 0x4004, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _0199: SetVar 0x4005, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _01B4: SetVar 0x4006, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End _01CF: SetVar 0x4007, 1 - CompareVar 0x406A, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406A, 0x104, _020D GoTo _01EA End @@ -147,8 +131,7 @@ _01EA: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 ScrCmd_32C 0x406A, 0x24E, 0x8004, 0x8005 - CompareVar 0x406A, 0x104 - GoToIf 4, _020F + GoToIfGe 0x406A, 0x104, _020F ScrCmd_061 End @@ -156,8 +139,7 @@ _020D: End _020F: - CheckFlag 0x964 - GoToIf 0, _020D + GoToIfUnset 0x964, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x406A, 0x10E diff --git a/res/field/scripts/script_0396.s b/res/field/scripts/script_0396.s index e6429797e4..3a18f25693 100644 --- a/res/field/scripts/script_0396.s +++ b/res/field/scripts/script_0396.s @@ -14,8 +14,7 @@ .short 0xFD13 _0026: - CompareVar 0x406B, 0x118 - GoToIf 0, _0035 + GoToIfLt 0x406B, 0x118, _0035 End _0035: @@ -26,19 +25,13 @@ _003D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x406B, 0x122 - GoToIf 1, _00ED - CompareVar 0x406B, 0x118 - GoToIf 1, _00F8 - CheckFlag 0x964 - GoToIf 0, _010F + GoToIfEq 0x406B, 0x122, _00ED + GoToIfEq 0x406B, 0x118, _00F8 + GoToIfUnset 0x964, _010F ScrCmd_32B 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _011A - CompareVar 0x406B, 0x10E - GoToIf 1, _00AE - CompareVar 0x406B, 0x104 - GoToIf 0, _011A + GoToIfEq 0x800C, 0, _011A + GoToIfEq 0x406B, 0x10E, _00AE + GoToIfLt 0x406B, 0x104, _011A ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x406B, 0x10E @@ -53,11 +46,9 @@ _00AE: ScrCmd_034 ScrCmd_2BD 0x179, 30 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0109 + GoToIfEq 0x800C, 0, _0109 ScrCmd_2BC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00F8 + GoToIfEq 0x800C, 1, _00F8 SetVar 0x406B, 0x122 ScrCmd_061 End @@ -96,50 +87,43 @@ _0125: _012D: SetVar 0x4001, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _0148: SetVar 0x4002, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _0163: SetVar 0x4003, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _017E: SetVar 0x4004, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _0199: SetVar 0x4005, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _01B4: SetVar 0x4006, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End _01CF: SetVar 0x4007, 1 - CompareVar 0x406B, 0x104 - GoToIf 4, _020D + GoToIfGe 0x406B, 0x104, _020D GoTo _01EA End @@ -147,8 +131,7 @@ _01EA: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 ScrCmd_32C 0x406B, 0x250, 0x8004, 0x8005 - CompareVar 0x406B, 0x104 - GoToIf 4, _020F + GoToIfGe 0x406B, 0x104, _020F ScrCmd_061 End @@ -156,8 +139,7 @@ _020D: End _020F: - CheckFlag 0x964 - GoToIf 0, _020D + GoToIfUnset 0x964, _020D ScrCmd_04B 0x5DC ScrCmd_29F 1 SetVar 0x406B, 0x10E diff --git a/res/field/scripts/script_0397.s b/res/field/scripts/script_0397.s index 4c03f811e4..f2694b9dcf 100644 --- a/res/field/scripts/script_0397.s +++ b/res/field/scripts/script_0397.s @@ -87,10 +87,8 @@ _00E7: ScrCmd_042 15, 1 ScrCmd_042 16, 2 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0188 - CompareVar 0x800C, 1 - GoToIf 1, _0146 + GoToIfEq 0x800C, 0, _0188 + GoToIfEq 0x800C, 1, _0146 GoTo _0175 End @@ -122,10 +120,8 @@ _0188: ScrCmd_042 18, 1 ScrCmd_042 19, 2 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _01C3 - CompareVar 0x800C, 1 - GoToIf 1, _01D1 + GoToIfEq 0x800C, 0, _01C3 + GoToIfEq 0x800C, 1, _01D1 GoTo _0175 End @@ -142,8 +138,7 @@ _01D1: _01DF: ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0175 + GoToIfEq 0x800C, 1, _0175 GoTo _01FB End @@ -151,8 +146,7 @@ _01FB: SetVar 0x4000, 0 ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0175 + GoToIfEq 0x800C, 0, _0175 GoTo _0220 End diff --git a/res/field/scripts/script_0400.s b/res/field/scripts/script_0400.s index 38f2b77994..7bcc79ed68 100644 --- a/res/field/scripts/script_0400.s +++ b/res/field/scripts/script_0400.s @@ -10,8 +10,7 @@ _000E: SetFlag 0x183 SetFlag 0x184 - CheckFlag 0x97F - GoToIf 0, _0029 + GoToIfUnset 0x97F, _0029 Call _002B End @@ -219,8 +218,7 @@ _0398: CallIf 1, _13DD CompareVar 0x402A, 10 CallIf 1, _13EA - CompareVar 0x8006, 1 - GoToIf 1, _06A8 + GoToIfEq 0x8006, 1, _06A8 GoTo _0486 End @@ -242,8 +240,7 @@ _040F: CallIf 1, _13DD CompareVar 0x402B, 10 CallIf 1, _13EA - CompareVar 0x8006, 1 - GoToIf 1, _06A8 + GoToIfEq 0x8006, 1, _06A8 GoTo _0486 End @@ -254,10 +251,8 @@ _0486: CallIf 1, _05B9 CompareVar 0x4001, 134 CallIf 1, _05B9 - CompareVar 0x8000, 0 - GoToIf 1, _0590 - CompareVar 0x8004, 1 - GoToIf 1, _051A + GoToIfEq 0x8000, 0, _0590 + GoToIfEq 0x8004, 1, _051A CompareVar 0x402A, 35 CallIf 1, _0828 CompareVar 0x402A, 22 @@ -291,15 +286,12 @@ _051A: _0570: ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05CE - CompareVar 0x800C, 1 - GoToIf 1, _0761 + GoToIfEq 0x800C, 0, _05CE + GoToIfEq 0x800C, 1, _0761 End _0590: - CompareVar 0x8004, 1 - GoToIf 1, _05AB + GoToIfEq 0x8004, 1, _05AB Call _100C GoTo _081A End @@ -310,8 +302,7 @@ _05AB: End _05B9: - CompareVar 0x402A, 22 - GoToIf 1, _05C8 + GoToIfEq 0x402A, 22, _05C8 Return _05C8: @@ -319,8 +310,7 @@ _05C8: Return _05CE: - CompareVar 0x8004, 1 - GoToIf 1, _0631 + GoToIfEq 0x8004, 1, _0631 CompareVar 0x402A, 35 CallIf 1, _09FE CompareVar 0x402A, 22 @@ -356,14 +346,12 @@ _0687: ScrCmd_034 ScrCmd_0E5 0x8005, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0822 + GoToIfEq 0x800C, 0, _0822 GoTo _06A8 End _06A8: - CompareVar 0x8004, 1 - GoToIf 1, _070B + GoToIfEq 0x8004, 1, _070B CompareVar 0x402A, 35 CallIf 1, _0DFE CompareVar 0x402A, 22 @@ -396,8 +384,7 @@ _070B: End _0761: - CompareVar 0x8004, 1 - GoToIf 1, _07C4 + GoToIfEq 0x8004, 1, _07C4 CompareVar 0x402A, 35 CallIf 1, _0C28 CompareVar 0x402A, 22 @@ -1411,61 +1398,47 @@ _1329: Return _1331: - CheckFlag 0xABC - GoToIf 1, _13F7 + GoToIfSet 0xABC, _13F7 Return _133E: ScrCmd_201 0x4001 - CompareVar 0x4001, 6 - GoToIf 1, _136B - CompareVar 0x4001, 101 - GoToIf 1, _136B - CompareVar 0x4001, 189 - GoToIf 1, _136B + GoToIfEq 0x4001, 6, _136B + GoToIfEq 0x4001, 101, _136B + GoToIfEq 0x4001, 189, _136B Return _136B: - CheckFlag 0xABD - GoToIf 1, _13F7 + GoToIfSet 0xABD, _13F7 Return _1378: ScrCmd_201 0x4001 - CompareVar 0x4001, 69 - GoToIf 1, _13B0 - CompareVar 0x4001, 134 - GoToIf 1, _13B0 - CheckFlag 0xABE - GoToIf 1, _13F7 + GoToIfEq 0x4001, 69, _13B0 + GoToIfEq 0x4001, 134, _13B0 + GoToIfSet 0xABE, _13F7 Return _13A3: - CheckFlag 0xABF - GoToIf 1, _13F7 + GoToIfSet 0xABF, _13F7 Return _13B0: ScrCmd_201 0x4001 - CompareVar 0x4001, 69 - GoToIf 1, _13D0 - CompareVar 0x4001, 134 - GoToIf 1, _13D0 + GoToIfEq 0x4001, 69, _13D0 + GoToIfEq 0x4001, 134, _13D0 Return _13D0: - CheckFlag 0xAC0 - GoToIf 1, _13F7 + GoToIfSet 0xAC0, _13F7 Return _13DD: - CheckFlag 0xAC1 - GoToIf 1, _13F7 + GoToIfSet 0xAC1, _13F7 Return _13EA: - CheckFlag 0xAC2 - GoToIf 1, _13F7 + GoToIfSet 0xAC2, _13F7 Return _13F7: diff --git a/res/field/scripts/script_0404.s b/res/field/scripts/script_0404.s index ffe9ed9800..713fa9a1c1 100644 --- a/res/field/scripts/script_0404.s +++ b/res/field/scripts/script_0404.s @@ -2302,10 +2302,8 @@ _1EAE: SetVar 0x8004, 0x8008 SetVar 0x8005, 0x8009 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _1EF0 - CompareVar 0x800C, 0 - GoToIf 1, _20A8 + GoToIfEq 0x800C, 1, _1EF0 + GoToIfEq 0x800C, 0, _20A8 End _1EEA: @@ -2321,10 +2319,8 @@ _1EF0: CompareVar 0x8004, 0x1CF CallIf 1, _20C0 ScrCmd_07F 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _207D - CompareVar 0x800C, 0 - GoToIf 1, _2095 + GoToIfEq 0x800C, 1, _207D + GoToIfEq 0x800C, 0, _2095 End _1F33: @@ -2336,22 +2332,14 @@ _1F33: ScrCmd_0D1 1, 0x8004 ScrCmd_080 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 7 - GoToIf 1, _1FD9 - CompareVar 0x8008, 0 - GoToIf 1, _1FC6 - CompareVar 0x8008, 4 - GoToIf 1, _2025 - CompareVar 0x8008, 1 - GoToIf 1, _2012 - CompareVar 0x8008, 2 - GoToIf 1, _2038 - CompareVar 0x8008, 6 - GoToIf 1, _204B - CompareVar 0x8008, 5 - GoToIf 1, _1FFF - CompareVar 0x8008, 3 - GoToIf 1, _1FEC + GoToIfEq 0x8008, 7, _1FD9 + GoToIfEq 0x8008, 0, _1FC6 + GoToIfEq 0x8008, 4, _2025 + GoToIfEq 0x8008, 1, _2012 + GoToIfEq 0x8008, 2, _2038 + GoToIfEq 0x8008, 6, _204B + GoToIfEq 0x8008, 5, _1FFF + GoToIfEq 0x8008, 3, _1FEC End _1FC6: diff --git a/res/field/scripts/script_0406.s b/res/field/scripts/script_0406.s index 467f9beebf..83ce563011 100644 --- a/res/field/scripts/script_0406.s +++ b/res/field/scripts/script_0406.s @@ -10,11 +10,9 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_21D 0, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0070 + GoToIfEq 0x800C, 0, _0070 Call _0102 - CompareVar 0x800C, 1 - GoToIf 1, _003C + GoToIfEq 0x800C, 1, _003C GoTo _0055 _003C: @@ -34,8 +32,7 @@ _0070: ScrCmd_02C 2 _0073: Call _0102 - CompareVar 0x800C, 1 - GoToIf 1, _00A8 + GoToIfEq 0x800C, 1, _00A8 GoTo _008C _008C: @@ -55,48 +52,35 @@ _00A8: ScrCmd_043 _00C2: SetVar 0x8008, 0x8004 - CompareVar 0x8008, 1 - GoToIf 1, _01CF - CompareVar 0x8008, 2 - GoToIf 1, _0261 - CompareVar 0x8008, 3 - GoToIf 1, _03DA - CompareVar 0x8008, 4 - GoToIf 1, _03E5 + GoToIfEq 0x8008, 1, _01CF + GoToIfEq 0x8008, 2, _0261 + GoToIfEq 0x8008, 3, _03DA + GoToIfEq 0x8008, 4, _03E5 GoTo _03E5 _0102: ScrCmd_21D 0, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _012C + GoToIfEq 0x800C, 0, _012C ScrCmd_21D 1, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01BF + GoToIfEq 0x800C, 0, _01BF _012C: ScrCmd_21D 0, 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0156 + GoToIfEq 0x800C, 0, _0156 ScrCmd_21D 1, 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01BF + GoToIfEq 0x800C, 0, _01BF _0156: ScrCmd_21D 0, 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0180 + GoToIfEq 0x800C, 0, _0180 ScrCmd_21D 1, 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01BF + GoToIfEq 0x800C, 0, _01BF _0180: ScrCmd_21D 0, 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01AA + GoToIfEq 0x800C, 0, _01AA ScrCmd_21D 1, 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01BF + GoToIfEq 0x800C, 0, _01BF _01AA: ScrCmd_21D 0, 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01C7 + GoToIfEq 0x800C, 0, _01C7 _01BF: SetVar 0x800C, 1 Return @@ -107,12 +91,10 @@ _01C7: _01CF: ScrCmd_21D 0, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01F8 + GoToIfEq 0x800C, 0, _01F8 ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _03E5 + GoToIfNe 0x800C, 0, _03E5 _01F8: ScrCmd_02C 6 ScrCmd_030 @@ -122,10 +104,8 @@ _01F8: ScrCmd_21D 4, 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 1 - GoToIf 1, _03E5 - CompareVar 0x800C, 2 - GoToIf 1, _0256 + GoToIfEq 0x800C, 1, _03E5 + GoToIfEq 0x800C, 2, _0256 ScrCmd_21D 6 ScrCmd_21D 2, 0, 0 ScrCmd_21D 3, 0, 1 @@ -142,62 +122,49 @@ _0261: ScrCmd_02C 3 ScrCmd_041 1, 1, 0, 1, 0x8004 ScrCmd_21D 0, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A2 + GoToIfEq 0x800C, 0, _02A2 ScrCmd_21D 1, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02A2 + GoToIfEq 0x800C, 1, _02A2 ScrCmd_21D 2, 0, 0 ScrCmd_042 15, 0 _02A2: ScrCmd_21D 0, 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02D8 + GoToIfEq 0x800C, 0, _02D8 ScrCmd_21D 1, 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02D8 + GoToIfEq 0x800C, 1, _02D8 ScrCmd_21D 2, 2, 1 ScrCmd_042 16, 2 _02D8: ScrCmd_21D 0, 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _030E + GoToIfEq 0x800C, 0, _030E ScrCmd_21D 1, 3, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _030E + GoToIfEq 0x800C, 1, _030E ScrCmd_21D 2, 3, 2 ScrCmd_042 17, 3 _030E: ScrCmd_21D 0, 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0344 + GoToIfEq 0x800C, 0, _0344 ScrCmd_21D 1, 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0344 + GoToIfEq 0x800C, 1, _0344 ScrCmd_21D 2, 4, 3 ScrCmd_042 18, 4 _0344: ScrCmd_21D 0, 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _037A + GoToIfEq 0x800C, 0, _037A ScrCmd_21D 1, 5, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _037A + GoToIfEq 0x800C, 1, _037A ScrCmd_21D 2, 5, 4 ScrCmd_042 19, 5 _037A: ScrCmd_042 20, 6 ScrCmd_043 - CompareVar 0x8004, 6 - GoToIf 1, _03E5 - CompareVar 0x8004, -2 - GoToIf 1, _03E5 + GoToIfEq 0x8004, 6, _03E5 + GoToIfEq 0x8004, -2, _03E5 ScrCmd_21D 2, 0x8004, 0 ScrCmd_21D 3, 0x8004, 1 ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0261 + GoToIfNe 0x800C, 0, _0261 ScrCmd_21D 5, 0x8004 ScrCmd_0CD 0 ScrCmd_21D 2, 0x8004, 1 diff --git a/res/field/scripts/script_0407.s b/res/field/scripts/script_0407.s index 84ecfd3455..72df742ec2 100644 --- a/res/field/scripts/script_0407.s +++ b/res/field/scripts/script_0407.s @@ -9,8 +9,7 @@ _000A: ScrCmd_23E 0 ScrCmd_23E 1, 0x40ED - CompareVar 0x40ED, 0 - GoToIf 1, _002B + GoToIfEq 0x40ED, 0, _002B ClearFlag 0x20A ScrCmd_23E 7 End @@ -26,14 +25,11 @@ _0035: ScrCmd_060 ScrCmd_068 ScrCmd_23E 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00EE + GoToIfEq 0x800C, 0, _00EE ScrCmd_1B6 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _007E - CompareVar 0x8008, 1 - GoToIf 1, _008A + GoToIfEq 0x8008, 0, _007E + GoToIfEq 0x8008, 1, _008A GoTo _0096 _007E: @@ -53,8 +49,7 @@ _0096: _00A2: ScrCmd_23E 3, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D8 + GoToIfEq 0x800C, 0, _00D8 ScrCmd_04E 0x486 ScrCmd_23E 5, 0x8005, 0x8006 ScrCmd_1FB 0x8005, 0x8006 diff --git a/res/field/scripts/script_0408.s b/res/field/scripts/script_0408.s index 817bd5e97c..8e250f204a 100644 --- a/res/field/scripts/script_0408.s +++ b/res/field/scripts/script_0408.s @@ -294,10 +294,8 @@ _0472: SetVar 0x8005, 0x8001 SetVar 0x8006, 0x8002 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _04B0 - CompareVar 0x800C, 0 - GoToIf 1, _064F + GoToIfEq 0x800C, 1, _04B0 + GoToIfEq 0x800C, 0, _064F End _04AC: @@ -309,10 +307,8 @@ _04B0: ScrCmd_236 0x8004 ScrCmd_07B 0x8004, 0x8005, 0x800C ScrCmd_07F 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0624 - CompareVar 0x800C, 0 - GoToIf 1, _063C + GoToIfEq 0x800C, 1, _0624 + GoToIfEq 0x800C, 0, _063C End _04E2: @@ -324,22 +320,14 @@ _04E2: ScrCmd_0D1 1, 0x8004 ScrCmd_080 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 7 - GoToIf 1, _0588 - CompareVar 0x8008, 0 - GoToIf 1, _0575 - CompareVar 0x8008, 4 - GoToIf 1, _05D4 - CompareVar 0x8008, 1 - GoToIf 1, _05C1 - CompareVar 0x8008, 2 - GoToIf 1, _05E7 - CompareVar 0x8008, 6 - GoToIf 1, _05FA - CompareVar 0x8008, 5 - GoToIf 1, _05AE - CompareVar 0x8008, 3 - GoToIf 1, _059B + GoToIfEq 0x8008, 7, _0588 + GoToIfEq 0x8008, 0, _0575 + GoToIfEq 0x8008, 4, _05D4 + GoToIfEq 0x8008, 1, _05C1 + GoToIfEq 0x8008, 2, _05E7 + GoToIfEq 0x8008, 6, _05FA + GoToIfEq 0x8008, 5, _05AE + GoToIfEq 0x8008, 3, _059B End _0575: diff --git a/res/field/scripts/script_0409.s b/res/field/scripts/script_0409.s index 5c8d453c7f..1a4b41d53b 100644 --- a/res/field/scripts/script_0409.s +++ b/res/field/scripts/script_0409.s @@ -25,15 +25,12 @@ _0042: ScrCmd_060 ScrCmd_068 ScrCmd_09A 0x800C, 15 - CompareVar 0x800C, 6 - GoToIf 1, _008E + GoToIfEq 0x800C, 6, _008E ScrCmd_15B 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _008E + GoToIfEq 0x800C, 0, _008E ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AE + GoToIfEq 0x800C, 0, _00AE ScrCmd_034 GoTo _066D End @@ -62,8 +59,7 @@ _00AE: ScrCmd_1CD 19, 0x8004, 0, 0, 0 _00E8: ScrCmd_003 1, 0x800C - CompareVar 0x8005, 0 - GoToIf 1, _00E8 + GoToIfEq 0x8005, 0, _00E8 GoTo _066D End @@ -80,60 +76,46 @@ _0103: ScrCmd_1CD 19, 0x8004, 0, 0, 0 _0133: ScrCmd_003 1, 0x800C - CompareVar 0x8005, 0 - GoToIf 1, _0133 + GoToIfEq 0x8005, 0, _0133 ScrCmd_061 End _014A: - CompareVar 0x40CD, 0 - GoToIf 5, _0221 - CompareVar 0x40B1, 1 - GoToIf 5, _0221 + GoToIfNe 0x40CD, 0, _0221 + GoToIfNe 0x40B1, 1, _0221 Call _017F - CompareVar 0x800C, 0 - GoToIf 1, _0221 + GoToIfEq 0x800C, 0, _0221 SetVar 0x40CD, 1 Return _017F: SetVar 0x800C, 0 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 73 - GoToIf 1, _01CE - CompareVar 0x8004, 74 - GoToIf 1, _01DD - CompareVar 0x8004, 75 - GoToIf 1, _01EC - CompareVar 0x8004, 76 - GoToIf 1, _01FB - CompareVar 0x8004, 77 - GoToIf 1, _020A + GoToIfEq 0x8004, 73, _01CE + GoToIfEq 0x8004, 74, _01DD + GoToIfEq 0x8004, 75, _01EC + GoToIfEq 0x8004, 76, _01FB + GoToIfEq 0x8004, 77, _020A Return _01CE: - CompareVar 0x8005, 33 - GoToIf 1, _0219 + GoToIfEq 0x8005, 33, _0219 Return _01DD: - CompareVar 0x8005, 34 - GoToIf 1, _0219 + GoToIfEq 0x8005, 34, _0219 Return _01EC: - CompareVar 0x8005, 34 - GoToIf 1, _0219 + GoToIfEq 0x8005, 34, _0219 Return _01FB: - CompareVar 0x8005, 33 - GoToIf 1, _0219 + GoToIfEq 0x8005, 33, _0219 Return _020A: - CompareVar 0x8005, 34 - GoToIf 1, _0219 + GoToIfEq 0x8005, 34, _0219 Return _0219: @@ -149,15 +131,12 @@ _0223: ScrCmd_068 ScrCmd_09A 0x800C, 249 SetVar 0x8004, 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _0275 + GoToIfEq 0x800C, 6, _0275 ScrCmd_15B 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0275 + GoToIfEq 0x800C, 0, _0275 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0284 + GoToIfEq 0x800C, 0, _0284 ScrCmd_034 GoTo _066D End @@ -181,8 +160,7 @@ _0284: ScrCmd_1CD 24, 0x8004, 0, 0, 0 _02B2: ScrCmd_003 1, 0x800C - CompareVar 0x8005, 0 - GoToIf 1, _02B2 + GoToIfEq 0x8005, 0, _02B2 GoTo _066D End @@ -199,8 +177,7 @@ _02CD: ScrCmd_1CD 24, 0x8004, 0, 0, 0 _02FD: ScrCmd_003 1, 0x800C - CompareVar 0x8005, 0 - GoToIf 1, _02FD + GoToIfEq 0x8005, 0, _02FD ScrCmd_061 End @@ -209,18 +186,14 @@ _0314: ScrCmd_060 ScrCmd_068 ScrCmd_1CF 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03BD + GoToIfEq 0x800C, 1, _03BD ScrCmd_09A 0x800C, 70 - CompareVar 0x800C, 6 - GoToIf 1, _0372 + GoToIfEq 0x800C, 6, _0372 ScrCmd_15B 5, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0372 + GoToIfEq 0x800C, 0, _0372 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0381 + GoToIfEq 0x800C, 0, _0381 ScrCmd_034 GoTo _066D End @@ -258,8 +231,7 @@ _03BD: _03CC: ScrCmd_060 ScrCmd_1CF 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03BD + GoToIfEq 0x800C, 1, _03BD ScrCmd_1CF 1 ScrCmd_0D6 0, 0x8000 ScrCmd_02C 10 @@ -276,18 +248,14 @@ _040E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_09A 0x800C, 0x1AF - CompareVar 0x800C, 6 - GoToIf 1, _0469 + GoToIfEq 0x800C, 6, _0469 ScrCmd_15B 6, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0469 + GoToIfEq 0x800C, 0, _0469 ScrCmd_160 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0478 + GoToIfEq 0x800C, 1, _0478 ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0487 + GoToIfEq 0x800C, 0, _0487 ScrCmd_034 GoTo _0671 End @@ -333,12 +301,10 @@ _04DD: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_160 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0512 + GoToIfEq 0x800C, 1, _0512 ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _051F + GoToIfEq 0x800C, 0, _051F ScrCmd_034 GoTo _0671 End @@ -378,12 +344,10 @@ _057D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_09A 0x800C, 0x1B0 - CompareVar 0x800C, 6 - GoToIf 1, _05B4 + GoToIfEq 0x800C, 6, _05B4 ScrCmd_02C 15 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05C3 + GoToIfEq 0x800C, 0, _05C3 ScrCmd_034 GoTo _0671 End @@ -457,15 +421,12 @@ _0679: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_09A 0x800C, 127 - CompareVar 0x800C, 6 - GoToIf 1, _06C3 + GoToIfEq 0x800C, 6, _06C3 ScrCmd_15B 7, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06C3 + GoToIfEq 0x800C, 0, _06C3 ScrCmd_02C 22 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06D2 + GoToIfEq 0x800C, 0, _06D2 ScrCmd_034 GoTo _0671 End diff --git a/res/field/scripts/script_0410.s b/res/field/scripts/script_0410.s index 6c356d30b6..8ba822c5ef 100644 --- a/res/field/scripts/script_0410.s +++ b/res/field/scripts/script_0410.s @@ -9,16 +9,11 @@ _0006: ScrCmd_060 ScrCmd_1B7 0x8000, 5 SetVar 0x8008, 0x8000 - CompareVar 0x8008, 0 - GoToIf 1, _0057 - CompareVar 0x8008, 1 - GoToIf 1, _0071 - CompareVar 0x8008, 2 - GoToIf 1, _008B - CompareVar 0x8008, 3 - GoToIf 1, _00A5 - CompareVar 0x8008, 4 - GoToIf 1, _00BF + GoToIfEq 0x8008, 0, _0057 + GoToIfEq 0x8008, 1, _0071 + GoToIfEq 0x8008, 2, _008B + GoToIfEq 0x8008, 3, _00A5 + GoToIfEq 0x8008, 4, _00BF End _0057: diff --git a/res/field/scripts/script_0411.s b/res/field/scripts/script_0411.s index 6c90701893..aaeac06993 100644 --- a/res/field/scripts/script_0411.s +++ b/res/field/scripts/script_0411.s @@ -12,8 +12,7 @@ _0012: ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0031 + GoToIfEq 0x800C, 1, _0031 GoTo _003E End @@ -40,8 +39,7 @@ _004C: CompareVar 0x800C, 1 CallIf 1, _008B ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0090 + GoToIfEq 0x800C, 1, _0090 GoTo _009D End @@ -75,10 +73,8 @@ _00AB: _00B5: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D6 - CompareVar 0x800C, 1 - GoToIf 1, _00DF + GoToIfEq 0x800C, 0, _00D6 + GoToIfEq 0x800C, 1, _00DF End _00D6: @@ -90,8 +86,7 @@ _00DF: GoTo _0126 _00E8: - CheckFlag 0x9BA - GoToIf 0, _0104 + GoToIfUnset 0x9BA, _0104 ScrCmd_1E8 0x800C CompareVar 0x800C, 1 CallIf 1, _0120 diff --git a/res/field/scripts/script_0413.s b/res/field/scripts/script_0413.s index 7972c869ed..b3847b7125 100644 --- a/res/field/scripts/script_0413.s +++ b/res/field/scripts/script_0413.s @@ -16,25 +16,18 @@ _0012: ScrCmd_181 0x8001 ScrCmd_17D 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _033E - CompareVar 0x8008, 1 - GoToIf 1, _0082 - CompareVar 0x8008, 2 - GoToIf 1, _00B9 - CompareVar 0x8008, 3 - GoToIf 1, _00EE - CompareVar 0x8008, 4 - GoToIf 1, _0123 - CompareVar 0x8008, 5 - GoToIf 1, _021B + GoToIfEq 0x8008, 0, _033E + GoToIfEq 0x8008, 1, _0082 + GoToIfEq 0x8008, 2, _00B9 + GoToIfEq 0x8008, 3, _00EE + GoToIfEq 0x8008, 4, _0123 + GoToIfEq 0x8008, 5, _021B GoTo _033E End _0082: Call _0158 - CompareVar 0x800C, 0 - GoToIf 1, _00A6 + GoToIfEq 0x800C, 0, _00A6 ScrCmd_33C 0, 0x8000 ScrCmd_346 0 ScrCmd_02C 13 @@ -49,8 +42,7 @@ _00A6: _00B9: Call _0158 - CompareVar 0x800C, 0 - GoToIf 1, _00DC + GoToIfEq 0x800C, 0, _00DC ScrCmd_17B 0, 0x8000, 0x8001 ScrCmd_02C 14 GoTo _01F2 @@ -63,8 +55,7 @@ _00DC: _00EE: Call _0158 - CompareVar 0x800C, 0 - GoToIf 1, _0111 + GoToIfEq 0x800C, 0, _0111 ScrCmd_17B 0, 0x8000, 0x8001 ScrCmd_02C 15 GoTo _01F2 @@ -77,8 +68,7 @@ _0111: _0123: Call _0158 - CompareVar 0x800C, 0 - GoToIf 1, _0146 + GoToIfEq 0x800C, 0, _0146 ScrCmd_17B 0, 0x8000, 0x8001 ScrCmd_02C 16 GoTo _01F2 @@ -91,11 +81,9 @@ _0146: _0158: ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0186 + GoToIfNe 0x800C, 0, _0186 ScrCmd_07E 0x1C0, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0186 + GoToIfEq 0x800C, 0, _0186 SetVar 0x800C, 1 Return @@ -105,17 +93,13 @@ _0186: _018E: ScrCmd_07E 95, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01EA + GoToIfEq 0x800C, 1, _01EA ScrCmd_07E 96, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01EA + GoToIfEq 0x800C, 1, _01EA ScrCmd_07E 97, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01EA + GoToIfEq 0x800C, 1, _01EA ScrCmd_07E 98, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01EA + GoToIfEq 0x800C, 1, _01EA SetVar 0x800C, 0 Return @@ -126,8 +110,7 @@ _01EA: _01F2: ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _053A + GoToIfEq 0x800C, 1, _053A ScrCmd_034 ScrCmd_184 0 ScrCmd_02C 20 @@ -137,8 +120,7 @@ _01F2: _021B: ScrCmd_0D5 1, 0x8001 - CompareVar 0x8001, 1 - GoToIf 2, _023B + GoToIfGt 0x8001, 1, _023B ScrCmd_33C 0, 0x8000 ScrCmd_02C 35 GoTo _0243 @@ -148,14 +130,11 @@ _023B: ScrCmd_02C 21 _0243: ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02F7 + GoToIfEq 0x800C, 1, _02F7 ScrCmd_07D 0x8000, 0x8001, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02CF + GoToIfEq 0x800C, 0, _02CF ScrCmd_0D5 1, 0x8001 - CompareVar 0x8001, 1 - GoToIf 2, _0289 + GoToIfGt 0x8001, 1, _0289 ScrCmd_0D1 0, 0x8000 ScrCmd_02C 37 GoTo _0291 @@ -168,8 +147,7 @@ _0291: ScrCmd_04F ScrCmd_185 ScrCmd_0CD 0 - CompareVar 0x8001, 1 - GoToIf 2, _02B4 + GoToIfGt 0x8001, 1, _02B4 ScrCmd_0D1 1, 0x8000 GoTo _02B9 @@ -183,8 +161,7 @@ _02B9: GoTo _053A _02CF: - CompareVar 0x8001, 1 - GoToIf 2, _02E7 + GoToIfGt 0x8001, 1, _02E7 ScrCmd_0D1 0, 0x8000 GoTo _02EC @@ -197,14 +174,12 @@ _02EC: _02F7: Call _0158 - CompareVar 0x800C, 0 - GoToIf 1, _0310 + GoToIfEq 0x800C, 0, _0310 GoTo _01F2 _0310: ScrCmd_0CD 0 - CompareVar 0x8001, 1 - GoToIf 2, _032E + GoToIfGt 0x8001, 1, _032E ScrCmd_0D1 1, 0x8000 ScrCmd_02C 36 GoTo _0336 @@ -218,11 +193,9 @@ _0336: _033E: ScrCmd_17F 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0374 + GoToIfEq 0x800C, 0, _0374 ScrCmd_17A 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _054B + GoToIfEq 0x800C, 0, _054B ScrCmd_17F 0x800C ScrCmd_0D1 0, 0x800C ScrCmd_02C 1 @@ -230,41 +203,33 @@ _033E: _0374: ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0540 + GoToIfNe 0x800C, 0, _0540 Call _018E - CompareVar 0x800C, 1 - GoToIf 1, _03B4 + GoToIfEq 0x800C, 1, _03B4 ScrCmd_17A 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0540 + GoToIfEq 0x800C, 0, _0540 ScrCmd_02C 0 GoTo _04DA _03B4: ScrCmd_02C 0 ScrCmd_17A 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0413 + GoToIfEq 0x800C, 0, _0413 ScrCmd_041 1, 1, 0, 1, 0x800C ScrCmd_042 2, 0 ScrCmd_042 3, 1 ScrCmd_042 4, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _042D - CompareVar 0x8008, 1 - GoToIf 1, _04EE - CompareVar 0x8008, 2 - GoToIf 1, _053A + GoToIfEq 0x8008, 0, _042D + GoToIfEq 0x8008, 1, _04EE + GoToIfEq 0x8008, 2, _053A GoTo _053A _0413: ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _042D + GoToIfEq 0x800C, 0, _042D GoTo _053A _042D: @@ -277,24 +242,18 @@ _042D: ScrCmd_0BD ScrCmd_179 0x8005 SetVar 0x8008, 0x8005 - CompareVar 0x8008, 0 - GoToIf 1, _053C - CompareVar 0x8008, 95 - GoToIf 1, _049D - CompareVar 0x8008, 96 - GoToIf 1, _049D - CompareVar 0x8008, 97 - GoToIf 1, _049D - CompareVar 0x8008, 98 - GoToIf 1, _049D + GoToIfEq 0x8008, 0, _053C + GoToIfEq 0x8008, 95, _049D + GoToIfEq 0x8008, 96, _049D + GoToIfEq 0x8008, 97, _049D + GoToIfEq 0x8008, 98, _049D GoTo _053C _049D: ScrCmd_07C 0x8005, 1, 0x8004 ScrCmd_182 0x8005 ScrCmd_17A 4, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04CA + GoToIfEq 0x800C, 0, _04CA ScrCmd_0D1 0, 0x8005 ScrCmd_02C 11 GoTo _04DA @@ -308,8 +267,7 @@ _04CA: _04DA: ScrCmd_02C 8 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _053A + GoToIfEq 0x800C, 1, _053A _04EE: ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -319,8 +277,7 @@ _04EE: ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD ScrCmd_179 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _053C + GoToIfEq 0x800C, 0, _053C ScrCmd_0D1 0, 0x800C ScrCmd_02C 12 ScrCmd_031 diff --git a/res/field/scripts/script_0414.s b/res/field/scripts/script_0414.s index 11b3484c2c..51de7015ca 100644 --- a/res/field/scripts/script_0414.s +++ b/res/field/scripts/script_0414.s @@ -9,10 +9,8 @@ .short 0xFD13 _0012: - CheckFlag 0x13E - GoToIf 0, _002A - CheckFlag 0x13E - GoToIf 1, _003C + GoToIfUnset 0x13E, _002A + GoToIfSet 0x13E, _003C End _002A: @@ -26,10 +24,8 @@ _003C: End _004E: - CheckFlag 0x13E - GoToIf 0, _002A - CheckFlag 0x13E - GoToIf 1, _003C + GoToIfUnset 0x13E, _002A + GoToIfSet 0x13E, _003C End _0066: @@ -41,18 +37,12 @@ _0066: ScrCmd_02C 0 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 80 - GoToIf 1, _00D8 - CompareVar 0x8004, 81 - GoToIf 1, _00D8 - CompareVar 0x8004, 82 - GoToIf 1, _00D8 - CompareVar 0x8004, 83 - GoToIf 1, _00D8 - CompareVar 0x8004, 84 - GoToIf 1, _00D8 - CompareVar 0x8004, 85 - GoToIf 1, _00D8 + GoToIfEq 0x8004, 80, _00D8 + GoToIfEq 0x8004, 81, _00D8 + GoToIfEq 0x8004, 82, _00D8 + GoToIfEq 0x8004, 83, _00D8 + GoToIfEq 0x8004, 84, _00D8 + GoToIfEq 0x8004, 85, _00D8 End _00D8: diff --git a/res/field/scripts/script_0416.s b/res/field/scripts/script_0416.s index 3ea64e7353..0b67b058b0 100644 --- a/res/field/scripts/script_0416.s +++ b/res/field/scripts/script_0416.s @@ -16,10 +16,8 @@ _0026: CheckFlag 0x106 CallIf 1, _004B - CheckFlag 0x15E - GoToIf 0, _0079 - CheckFlag 0x15E - GoToIf 1, _008B + GoToIfUnset 0x15E, _0079 + GoToIfSet 0x15E, _008B End End @@ -30,10 +28,8 @@ _004B: Return _0061: - CheckFlag 0x15E - GoToIf 0, _0079 - CheckFlag 0x15E - GoToIf 1, _008B + GoToIfUnset 0x15E, _0079 + GoToIfSet 0x15E, _008B End _0079: @@ -49,8 +45,7 @@ _008B: _009D: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x106 - GoToIf 1, _013A + GoToIfSet 0x106, _013A ScrCmd_02C 0 ScrCmd_068 ApplyMovement 5, _0214 @@ -58,10 +53,8 @@ _009D: ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 1 - GoToIf 1, _00E6 - CompareVar 0x8004, 0 - GoToIf 1, _00FE + GoToIfEq 0x8004, 1, _00E6 + GoToIfEq 0x8004, 0, _00FE GoTo _010E _00E6: @@ -94,15 +87,12 @@ _013A: ScrCmd_034 ScrCmd_0E5 0x34F, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01D9 + GoToIfEq 0x800C, 0, _01D9 ScrCmd_02C 3 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 1 - GoToIf 1, _0185 - CompareVar 0x8004, 0 - GoToIf 1, _019D + GoToIfEq 0x8004, 1, _0185 + GoToIfEq 0x8004, 0, _019D GoTo _01AD _0185: @@ -259,10 +249,8 @@ _0248: CallIf 1, _0438 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04EC - CompareVar 0x800C, 1 - GoToIf 1, _04F7 + GoToIfEq 0x800C, 0, _04EC + GoToIfEq 0x800C, 1, _04F7 End _03EC: @@ -528,8 +516,7 @@ _0632: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1C3, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _065A + GoToIfEq 0x800C, 1, _065A ScrCmd_02C 18 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0417.s b/res/field/scripts/script_0417.s index b44c7f92c4..d55a03aabe 100644 --- a/res/field/scripts/script_0417.s +++ b/res/field/scripts/script_0417.s @@ -29,12 +29,9 @@ _0058: SetFlag 0x9EE ScrCmd_268 0x4000 - CompareVar 0x4000, 9 - GoToIf 0, _0087 - CompareVar 0x4000, 23 - GoToIf 4, _0087 - CheckFlag 0xAAB - GoToIf 0, _00B3 + GoToIfLt 0x4000, 9, _0087 + GoToIfGe 0x4000, 23, _0087 + GoToIfUnset 0xAAB, _00B3 End _0087: @@ -103,81 +100,70 @@ _0137: CompareVar 0x4001, 8 CallIf 1, _02C0 SubVar 0x400A, 1 - CompareVar 0x400A, 0 - GoToIf 1, _01D2 - CompareVar 0x4000, 0 - GoToIf 5, _0137 + GoToIfEq 0x400A, 0, _01D2 + GoToIfNe 0x4000, 0, _0137 _01D2: SetFlag 0xAAB End _01D8: - CheckFlag 0x244 - GoToIf 0, _02DD + GoToIfUnset 0x244, _02DD ClearFlag 0x244 ScrCmd_1B8 0x40FB, 3 SubVar 0x4000, 1 Return _01F5: - CheckFlag 0x245 - GoToIf 0, _02DD + GoToIfUnset 0x245, _02DD ClearFlag 0x245 ScrCmd_1B8 0x40FC, 3 SubVar 0x4000, 1 Return _0212: - CheckFlag 0x246 - GoToIf 0, _02DD + GoToIfUnset 0x246, _02DD ClearFlag 0x246 ScrCmd_1B8 0x40FD, 3 SubVar 0x4000, 1 Return _022F: - CheckFlag 0x247 - GoToIf 0, _02DD + GoToIfUnset 0x247, _02DD ClearFlag 0x247 ScrCmd_1B8 0x40FE, 3 SubVar 0x4000, 1 Return _024C: - CheckFlag 0x248 - GoToIf 0, _02DD + GoToIfUnset 0x248, _02DD ClearFlag 0x248 ScrCmd_1B8 0x40FF, 3 SubVar 0x4000, 1 Return _0269: - CheckFlag 0x249 - GoToIf 0, _02DD + GoToIfUnset 0x249, _02DD ClearFlag 0x249 ScrCmd_1B8 0x4100, 3 SubVar 0x4000, 1 Return _0286: - CheckFlag 0x24A - GoToIf 0, _02DD + GoToIfUnset 0x24A, _02DD ClearFlag 0x24A ScrCmd_1B8 0x4101, 3 SubVar 0x4000, 1 Return _02A3: - CheckFlag 0x24B - GoToIf 0, _02DD + GoToIfUnset 0x24B, _02DD ClearFlag 0x24B ScrCmd_1B8 0x4102, 3 SubVar 0x4000, 1 Return _02C0: - CheckFlag 0x24C - GoToIf 0, _02DD + GoToIfUnset 0x24C, _02DD ClearFlag 0x24C ScrCmd_1B8 0x4103, 3 SubVar 0x4000, 1 @@ -215,18 +201,13 @@ _0331: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x218 - CheckTrainerFlag 0x218 - GoToIf 1, _046C + GoToIfDefeated 0x218, _046C ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _04BC + GoToIfEq 0x800C, 1, _04BC SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _038A - CompareVar 0x8008, 1 - GoToIf 1, _03A9 - CompareVar 0x8008, 2 - GoToIf 1, _03C8 + GoToIfEq 0x8008, 0, _038A + GoToIfEq 0x8008, 1, _03A9 + GoToIfEq 0x8008, 2, _03C8 ScrCmd_061 End @@ -235,8 +216,7 @@ _038A: ScrCmd_068 ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03E7 + GoToIfEq 0x800C, 0, _03E7 GoTo _0460 _03A9: @@ -244,8 +224,7 @@ _03A9: ScrCmd_068 ScrCmd_02C 13 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03E7 + GoToIfEq 0x800C, 0, _03E7 GoTo _0460 _03C8: @@ -253,26 +232,21 @@ _03C8: ScrCmd_068 ScrCmd_02C 21 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03E7 + GoToIfEq 0x800C, 0, _03E7 GoTo _0460 _03E7: ScrCmd_034 ScrCmd_0E5 0x218, 0x227 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x218 SetTrainerFlag 0x227 Call _04CF SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _043F - CompareVar 0x8008, 1 - GoToIf 1, _044A - CompareVar 0x8008, 2 - GoToIf 1, _0455 + GoToIfEq 0x8008, 0, _043F + GoToIfEq 0x8008, 1, _044A + GoToIfEq 0x8008, 2, _0455 ScrCmd_061 End @@ -305,12 +279,9 @@ _0460: _046C: SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _049B - CompareVar 0x8008, 1 - GoToIf 1, _04A6 - CompareVar 0x8008, 2 - GoToIf 1, _04B1 + GoToIfEq 0x8008, 0, _049B + GoToIfEq 0x8008, 1, _04A6 + GoToIfEq 0x8008, 2, _04B1 End _049B: @@ -352,18 +323,13 @@ _04DB: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x227 - CheckTrainerFlag 0x227 - GoToIf 1, _0616 + GoToIfDefeated 0x227, _0616 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _0666 + GoToIfEq 0x800C, 1, _0666 SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _0534 - CompareVar 0x8008, 1 - GoToIf 1, _0553 - CompareVar 0x8008, 2 - GoToIf 1, _0572 + GoToIfEq 0x8008, 0, _0534 + GoToIfEq 0x8008, 1, _0553 + GoToIfEq 0x8008, 2, _0572 ScrCmd_061 End @@ -372,8 +338,7 @@ _0534: ScrCmd_068 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0591 + GoToIfEq 0x800C, 0, _0591 GoTo _060A _0553: @@ -381,8 +346,7 @@ _0553: ScrCmd_068 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0591 + GoToIfEq 0x800C, 0, _0591 GoTo _060A _0572: @@ -390,26 +354,21 @@ _0572: ScrCmd_068 ScrCmd_02C 25 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0591 + GoToIfEq 0x800C, 0, _0591 GoTo _060A _0591: ScrCmd_034 ScrCmd_0E5 0x218, 0x227 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x218 SetTrainerFlag 0x227 Call _0679 SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _05E9 - CompareVar 0x8008, 1 - GoToIf 1, _05F4 - CompareVar 0x8008, 2 - GoToIf 1, _05FF + GoToIfEq 0x8008, 0, _05E9 + GoToIfEq 0x8008, 1, _05F4 + GoToIfEq 0x8008, 2, _05FF ScrCmd_061 End @@ -442,12 +401,9 @@ _060A: _0616: SetVar 0x8008, 0x40FB - CompareVar 0x8008, 0 - GoToIf 1, _0645 - CompareVar 0x8008, 1 - GoToIf 1, _0650 - CompareVar 0x8008, 2 - GoToIf 1, _065B + GoToIfEq 0x8008, 0, _0645 + GoToIfEq 0x8008, 1, _0650 + GoToIfEq 0x8008, 2, _065B End _0645: @@ -489,18 +445,13 @@ _0685: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x221 - CheckTrainerFlag 0x221 - GoToIf 1, _07C0 + GoToIfDefeated 0x221, _07C0 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _0810 + GoToIfEq 0x800C, 1, _0810 SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _06DE - CompareVar 0x8008, 1 - GoToIf 1, _06FD - CompareVar 0x8008, 2 - GoToIf 1, _071C + GoToIfEq 0x8008, 0, _06DE + GoToIfEq 0x8008, 1, _06FD + GoToIfEq 0x8008, 2, _071C ScrCmd_061 End @@ -509,8 +460,7 @@ _06DE: ScrCmd_068 ScrCmd_02C 31 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _073B + GoToIfEq 0x800C, 0, _073B GoTo _07B4 _06FD: @@ -518,8 +468,7 @@ _06FD: ScrCmd_068 ScrCmd_02C 39 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _073B + GoToIfEq 0x800C, 0, _073B GoTo _07B4 _071C: @@ -527,26 +476,21 @@ _071C: ScrCmd_068 ScrCmd_02C 47 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _073B + GoToIfEq 0x800C, 0, _073B GoTo _07B4 _073B: ScrCmd_034 ScrCmd_0E5 0x221, 0x222 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x221 SetTrainerFlag 0x222 Call _0823 SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _0793 - CompareVar 0x8008, 1 - GoToIf 1, _079E - CompareVar 0x8008, 2 - GoToIf 1, _07A9 + GoToIfEq 0x8008, 0, _0793 + GoToIfEq 0x8008, 1, _079E + GoToIfEq 0x8008, 2, _07A9 ScrCmd_061 End @@ -579,12 +523,9 @@ _07B4: _07C0: SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _07EF - CompareVar 0x8008, 1 - GoToIf 1, _07FA - CompareVar 0x8008, 2 - GoToIf 1, _0805 + GoToIfEq 0x8008, 0, _07EF + GoToIfEq 0x8008, 1, _07FA + GoToIfEq 0x8008, 2, _0805 End _07EF: @@ -626,18 +567,13 @@ _082F: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x222 - CheckTrainerFlag 0x222 - GoToIf 1, _096A + GoToIfDefeated 0x222, _096A ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _09BA + GoToIfEq 0x800C, 1, _09BA SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _0888 - CompareVar 0x8008, 1 - GoToIf 1, _08A7 - CompareVar 0x8008, 2 - GoToIf 1, _08C6 + GoToIfEq 0x8008, 0, _0888 + GoToIfEq 0x8008, 1, _08A7 + GoToIfEq 0x8008, 2, _08C6 ScrCmd_061 End @@ -646,8 +582,7 @@ _0888: ScrCmd_068 ScrCmd_02C 35 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _08E5 + GoToIfEq 0x800C, 0, _08E5 GoTo _095E _08A7: @@ -655,8 +590,7 @@ _08A7: ScrCmd_068 ScrCmd_02C 43 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _08E5 + GoToIfEq 0x800C, 0, _08E5 GoTo _095E _08C6: @@ -664,26 +598,21 @@ _08C6: ScrCmd_068 ScrCmd_02C 51 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _08E5 + GoToIfEq 0x800C, 0, _08E5 GoTo _095E _08E5: ScrCmd_034 ScrCmd_0E5 0x221, 0x222 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x221 SetTrainerFlag 0x222 Call _09CD SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _093D - CompareVar 0x8008, 1 - GoToIf 1, _0948 - CompareVar 0x8008, 2 - GoToIf 1, _0953 + GoToIfEq 0x8008, 0, _093D + GoToIfEq 0x8008, 1, _0948 + GoToIfEq 0x8008, 2, _0953 ScrCmd_061 End @@ -716,12 +645,9 @@ _095E: _096A: SetVar 0x8008, 0x40FC - CompareVar 0x8008, 0 - GoToIf 1, _0999 - CompareVar 0x8008, 1 - GoToIf 1, _09A4 - CompareVar 0x8008, 2 - GoToIf 1, _09AF + GoToIfEq 0x8008, 0, _0999 + GoToIfEq 0x8008, 1, _09A4 + GoToIfEq 0x8008, 2, _09AF End _0999: @@ -763,18 +689,13 @@ _09D9: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21E - CheckTrainerFlag 0x21E - GoToIf 1, _0B14 + GoToIfDefeated 0x21E, _0B14 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _0B64 + GoToIfEq 0x800C, 1, _0B64 SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0A32 - CompareVar 0x8008, 1 - GoToIf 1, _0A51 - CompareVar 0x8008, 2 - GoToIf 1, _0A70 + GoToIfEq 0x8008, 0, _0A32 + GoToIfEq 0x8008, 1, _0A51 + GoToIfEq 0x8008, 2, _0A70 ScrCmd_061 End @@ -783,8 +704,7 @@ _0A32: ScrCmd_068 ScrCmd_02C 57 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0A8F + GoToIfEq 0x800C, 0, _0A8F GoTo _0B08 _0A51: @@ -792,8 +712,7 @@ _0A51: ScrCmd_068 ScrCmd_02C 65 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0A8F + GoToIfEq 0x800C, 0, _0A8F GoTo _0B08 _0A70: @@ -801,26 +720,21 @@ _0A70: ScrCmd_068 ScrCmd_02C 73 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0A8F + GoToIfEq 0x800C, 0, _0A8F GoTo _0B08 _0A8F: ScrCmd_034 ScrCmd_0E5 0x21E, 0x21F ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21E SetTrainerFlag 0x21F Call _0B77 SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0AE7 - CompareVar 0x8008, 1 - GoToIf 1, _0AF2 - CompareVar 0x8008, 2 - GoToIf 1, _0AFD + GoToIfEq 0x8008, 0, _0AE7 + GoToIfEq 0x8008, 1, _0AF2 + GoToIfEq 0x8008, 2, _0AFD ScrCmd_061 End @@ -853,12 +767,9 @@ _0B08: _0B14: SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0B43 - CompareVar 0x8008, 1 - GoToIf 1, _0B4E - CompareVar 0x8008, 2 - GoToIf 1, _0B59 + GoToIfEq 0x8008, 0, _0B43 + GoToIfEq 0x8008, 1, _0B4E + GoToIfEq 0x8008, 2, _0B59 End _0B43: @@ -900,18 +811,13 @@ _0B83: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21F - CheckTrainerFlag 0x21F - GoToIf 1, _0CBE + GoToIfDefeated 0x21F, _0CBE ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _0D0E + GoToIfEq 0x800C, 1, _0D0E SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0BDC - CompareVar 0x8008, 1 - GoToIf 1, _0BFB - CompareVar 0x8008, 2 - GoToIf 1, _0C1A + GoToIfEq 0x8008, 0, _0BDC + GoToIfEq 0x8008, 1, _0BFB + GoToIfEq 0x8008, 2, _0C1A ScrCmd_061 End @@ -920,8 +826,7 @@ _0BDC: ScrCmd_068 ScrCmd_02C 61 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C39 + GoToIfEq 0x800C, 0, _0C39 GoTo _0CB2 _0BFB: @@ -929,8 +834,7 @@ _0BFB: ScrCmd_068 ScrCmd_02C 69 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C39 + GoToIfEq 0x800C, 0, _0C39 GoTo _0CB2 _0C1A: @@ -938,26 +842,21 @@ _0C1A: ScrCmd_068 ScrCmd_02C 77 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C39 + GoToIfEq 0x800C, 0, _0C39 GoTo _0CB2 _0C39: ScrCmd_034 ScrCmd_0E5 0x21E, 0x21F ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21E SetTrainerFlag 0x21F Call _0D21 SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0C91 - CompareVar 0x8008, 1 - GoToIf 1, _0C9C - CompareVar 0x8008, 2 - GoToIf 1, _0CA7 + GoToIfEq 0x8008, 0, _0C91 + GoToIfEq 0x8008, 1, _0C9C + GoToIfEq 0x8008, 2, _0CA7 ScrCmd_061 End @@ -990,12 +889,9 @@ _0CB2: _0CBE: SetVar 0x8008, 0x40FD - CompareVar 0x8008, 0 - GoToIf 1, _0CED - CompareVar 0x8008, 1 - GoToIf 1, _0CF8 - CompareVar 0x8008, 2 - GoToIf 1, _0D03 + GoToIfEq 0x8008, 0, _0CED + GoToIfEq 0x8008, 1, _0CF8 + GoToIfEq 0x8008, 2, _0D03 End _0CED: @@ -1037,18 +933,13 @@ _0D2D: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21B - CheckTrainerFlag 0x21B - GoToIf 1, _0E68 + GoToIfDefeated 0x21B, _0E68 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _0EB8 + GoToIfEq 0x800C, 1, _0EB8 SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _0D86 - CompareVar 0x8008, 1 - GoToIf 1, _0DA5 - CompareVar 0x8008, 2 - GoToIf 1, _0DC4 + GoToIfEq 0x8008, 0, _0D86 + GoToIfEq 0x8008, 1, _0DA5 + GoToIfEq 0x8008, 2, _0DC4 ScrCmd_061 End @@ -1057,8 +948,7 @@ _0D86: ScrCmd_068 ScrCmd_02C 83 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0DE3 + GoToIfEq 0x800C, 0, _0DE3 GoTo _0E5C _0DA5: @@ -1066,8 +956,7 @@ _0DA5: ScrCmd_068 ScrCmd_02C 91 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0DE3 + GoToIfEq 0x800C, 0, _0DE3 GoTo _0E5C _0DC4: @@ -1075,26 +964,21 @@ _0DC4: ScrCmd_068 ScrCmd_02C 99 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0DE3 + GoToIfEq 0x800C, 0, _0DE3 GoTo _0E5C _0DE3: ScrCmd_034 ScrCmd_0E5 0x21B, 0x217 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21B SetTrainerFlag 0x217 Call _0ECB SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _0E3B - CompareVar 0x8008, 1 - GoToIf 1, _0E46 - CompareVar 0x8008, 2 - GoToIf 1, _0E51 + GoToIfEq 0x8008, 0, _0E3B + GoToIfEq 0x8008, 1, _0E46 + GoToIfEq 0x8008, 2, _0E51 ScrCmd_061 End @@ -1127,12 +1011,9 @@ _0E5C: _0E68: SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _0E97 - CompareVar 0x8008, 1 - GoToIf 1, _0EA2 - CompareVar 0x8008, 2 - GoToIf 1, _0EAD + GoToIfEq 0x8008, 0, _0E97 + GoToIfEq 0x8008, 1, _0EA2 + GoToIfEq 0x8008, 2, _0EAD End _0E97: @@ -1174,18 +1055,13 @@ _0ED7: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x217 - CheckTrainerFlag 0x217 - GoToIf 1, _1012 + GoToIfDefeated 0x217, _1012 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1062 + GoToIfEq 0x800C, 1, _1062 SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _0F30 - CompareVar 0x8008, 1 - GoToIf 1, _0F4F - CompareVar 0x8008, 2 - GoToIf 1, _0F6E + GoToIfEq 0x8008, 0, _0F30 + GoToIfEq 0x8008, 1, _0F4F + GoToIfEq 0x8008, 2, _0F6E ScrCmd_061 End @@ -1194,8 +1070,7 @@ _0F30: ScrCmd_068 ScrCmd_02C 87 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0F8D + GoToIfEq 0x800C, 0, _0F8D GoTo _1006 _0F4F: @@ -1203,8 +1078,7 @@ _0F4F: ScrCmd_068 ScrCmd_02C 95 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0F8D + GoToIfEq 0x800C, 0, _0F8D GoTo _1006 _0F6E: @@ -1212,26 +1086,21 @@ _0F6E: ScrCmd_068 ScrCmd_02C 103 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0F8D + GoToIfEq 0x800C, 0, _0F8D GoTo _1006 _0F8D: ScrCmd_034 ScrCmd_0E5 0x21B, 0x217 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21B SetTrainerFlag 0x217 Call _1075 SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _0FE5 - CompareVar 0x8008, 1 - GoToIf 1, _0FF0 - CompareVar 0x8008, 2 - GoToIf 1, _0FFB + GoToIfEq 0x8008, 0, _0FE5 + GoToIfEq 0x8008, 1, _0FF0 + GoToIfEq 0x8008, 2, _0FFB ScrCmd_061 End @@ -1264,12 +1133,9 @@ _1006: _1012: SetVar 0x8008, 0x40FE - CompareVar 0x8008, 0 - GoToIf 1, _1041 - CompareVar 0x8008, 1 - GoToIf 1, _104C - CompareVar 0x8008, 2 - GoToIf 1, _1057 + GoToIfEq 0x8008, 0, _1041 + GoToIfEq 0x8008, 1, _104C + GoToIfEq 0x8008, 2, _1057 End _1041: @@ -1311,18 +1177,13 @@ _1081: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x224 - CheckTrainerFlag 0x224 - GoToIf 1, _11BC + GoToIfDefeated 0x224, _11BC ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _120C + GoToIfEq 0x800C, 1, _120C SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _10DA - CompareVar 0x8008, 1 - GoToIf 1, _10F9 - CompareVar 0x8008, 2 - GoToIf 1, _1118 + GoToIfEq 0x8008, 0, _10DA + GoToIfEq 0x8008, 1, _10F9 + GoToIfEq 0x8008, 2, _1118 ScrCmd_061 End @@ -1331,8 +1192,7 @@ _10DA: ScrCmd_068 ScrCmd_02C 109 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1137 + GoToIfEq 0x800C, 0, _1137 GoTo _11B0 _10F9: @@ -1340,8 +1200,7 @@ _10F9: ScrCmd_068 ScrCmd_02C 117 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1137 + GoToIfEq 0x800C, 0, _1137 GoTo _11B0 _1118: @@ -1349,26 +1208,21 @@ _1118: ScrCmd_068 ScrCmd_02C 125 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1137 + GoToIfEq 0x800C, 0, _1137 GoTo _11B0 _1137: ScrCmd_034 ScrCmd_0E5 0x224, 0x21C ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x224 SetTrainerFlag 0x21C Call _121F SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _118F - CompareVar 0x8008, 1 - GoToIf 1, _119A - CompareVar 0x8008, 2 - GoToIf 1, _11A5 + GoToIfEq 0x8008, 0, _118F + GoToIfEq 0x8008, 1, _119A + GoToIfEq 0x8008, 2, _11A5 ScrCmd_061 End @@ -1401,12 +1255,9 @@ _11B0: _11BC: SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _11EB - CompareVar 0x8008, 1 - GoToIf 1, _11F6 - CompareVar 0x8008, 2 - GoToIf 1, _1201 + GoToIfEq 0x8008, 0, _11EB + GoToIfEq 0x8008, 1, _11F6 + GoToIfEq 0x8008, 2, _1201 End _11EB: @@ -1448,18 +1299,13 @@ _122B: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21C - CheckTrainerFlag 0x21C - GoToIf 1, _1366 + GoToIfDefeated 0x21C, _1366 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _13B6 + GoToIfEq 0x800C, 1, _13B6 SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _1284 - CompareVar 0x8008, 1 - GoToIf 1, _12A3 - CompareVar 0x8008, 2 - GoToIf 1, _12C2 + GoToIfEq 0x8008, 0, _1284 + GoToIfEq 0x8008, 1, _12A3 + GoToIfEq 0x8008, 2, _12C2 ScrCmd_061 End @@ -1468,8 +1314,7 @@ _1284: ScrCmd_068 ScrCmd_02C 113 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12E1 + GoToIfEq 0x800C, 0, _12E1 GoTo _135A _12A3: @@ -1477,8 +1322,7 @@ _12A3: ScrCmd_068 ScrCmd_02C 121 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12E1 + GoToIfEq 0x800C, 0, _12E1 GoTo _135A _12C2: @@ -1486,26 +1330,21 @@ _12C2: ScrCmd_068 ScrCmd_02C 129 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12E1 + GoToIfEq 0x800C, 0, _12E1 GoTo _135A _12E1: ScrCmd_034 ScrCmd_0E5 0x224, 0x21C ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x224 SetTrainerFlag 0x21C Call _13C9 SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _1339 - CompareVar 0x8008, 1 - GoToIf 1, _1344 - CompareVar 0x8008, 2 - GoToIf 1, _134F + GoToIfEq 0x8008, 0, _1339 + GoToIfEq 0x8008, 1, _1344 + GoToIfEq 0x8008, 2, _134F ScrCmd_061 End @@ -1538,12 +1377,9 @@ _135A: _1366: SetVar 0x8008, 0x40FF - CompareVar 0x8008, 0 - GoToIf 1, _1395 - CompareVar 0x8008, 1 - GoToIf 1, _13A0 - CompareVar 0x8008, 2 - GoToIf 1, _13AB + GoToIfEq 0x8008, 0, _1395 + GoToIfEq 0x8008, 1, _13A0 + GoToIfEq 0x8008, 2, _13AB End _1395: @@ -1585,18 +1421,13 @@ _13D5: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x228 - CheckTrainerFlag 0x228 - GoToIf 1, _1510 + GoToIfDefeated 0x228, _1510 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1560 + GoToIfEq 0x800C, 1, _1560 SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _142E - CompareVar 0x8008, 1 - GoToIf 1, _144D - CompareVar 0x8008, 2 - GoToIf 1, _146C + GoToIfEq 0x8008, 0, _142E + GoToIfEq 0x8008, 1, _144D + GoToIfEq 0x8008, 2, _146C ScrCmd_061 End @@ -1605,8 +1436,7 @@ _142E: ScrCmd_068 ScrCmd_02C 135 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _148B + GoToIfEq 0x800C, 0, _148B GoTo _1504 _144D: @@ -1614,8 +1444,7 @@ _144D: ScrCmd_068 ScrCmd_02C 143 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _148B + GoToIfEq 0x800C, 0, _148B GoTo _1504 _146C: @@ -1623,26 +1452,21 @@ _146C: ScrCmd_068 ScrCmd_02C 151 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _148B + GoToIfEq 0x800C, 0, _148B GoTo _1504 _148B: ScrCmd_034 ScrCmd_0E5 0x228, 0x220 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x228 SetTrainerFlag 0x220 Call _1573 SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _14E3 - CompareVar 0x8008, 1 - GoToIf 1, _14EE - CompareVar 0x8008, 2 - GoToIf 1, _14F9 + GoToIfEq 0x8008, 0, _14E3 + GoToIfEq 0x8008, 1, _14EE + GoToIfEq 0x8008, 2, _14F9 ScrCmd_061 End @@ -1675,12 +1499,9 @@ _1504: _1510: SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _153F - CompareVar 0x8008, 1 - GoToIf 1, _154A - CompareVar 0x8008, 2 - GoToIf 1, _1555 + GoToIfEq 0x8008, 0, _153F + GoToIfEq 0x8008, 1, _154A + GoToIfEq 0x8008, 2, _1555 End _153F: @@ -1722,18 +1543,13 @@ _157F: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x220 - CheckTrainerFlag 0x220 - GoToIf 1, _16BA + GoToIfDefeated 0x220, _16BA ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _170A + GoToIfEq 0x800C, 1, _170A SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _15D8 - CompareVar 0x8008, 1 - GoToIf 1, _15F7 - CompareVar 0x8008, 2 - GoToIf 1, _1616 + GoToIfEq 0x8008, 0, _15D8 + GoToIfEq 0x8008, 1, _15F7 + GoToIfEq 0x8008, 2, _1616 ScrCmd_061 End @@ -1742,8 +1558,7 @@ _15D8: ScrCmd_068 ScrCmd_02C 139 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1635 + GoToIfEq 0x800C, 0, _1635 GoTo _16AE _15F7: @@ -1751,8 +1566,7 @@ _15F7: ScrCmd_068 ScrCmd_02C 147 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1635 + GoToIfEq 0x800C, 0, _1635 GoTo _16AE _1616: @@ -1760,26 +1574,21 @@ _1616: ScrCmd_068 ScrCmd_02C 155 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1635 + GoToIfEq 0x800C, 0, _1635 GoTo _16AE _1635: ScrCmd_034 ScrCmd_0E5 0x228, 0x220 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x228 SetTrainerFlag 0x220 Call _171D SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _168D - CompareVar 0x8008, 1 - GoToIf 1, _1698 - CompareVar 0x8008, 2 - GoToIf 1, _16A3 + GoToIfEq 0x8008, 0, _168D + GoToIfEq 0x8008, 1, _1698 + GoToIfEq 0x8008, 2, _16A3 ScrCmd_061 End @@ -1812,12 +1621,9 @@ _16AE: _16BA: SetVar 0x8008, 0x4100 - CompareVar 0x8008, 0 - GoToIf 1, _16E9 - CompareVar 0x8008, 1 - GoToIf 1, _16F4 - CompareVar 0x8008, 2 - GoToIf 1, _16FF + GoToIfEq 0x8008, 0, _16E9 + GoToIfEq 0x8008, 1, _16F4 + GoToIfEq 0x8008, 2, _16FF End _16E9: @@ -1859,18 +1665,13 @@ _1729: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21A - CheckTrainerFlag 0x21A - GoToIf 1, _1864 + GoToIfDefeated 0x21A, _1864 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _18B4 + GoToIfEq 0x800C, 1, _18B4 SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _1782 - CompareVar 0x8008, 1 - GoToIf 1, _17A1 - CompareVar 0x8008, 2 - GoToIf 1, _17C0 + GoToIfEq 0x8008, 0, _1782 + GoToIfEq 0x8008, 1, _17A1 + GoToIfEq 0x8008, 2, _17C0 ScrCmd_061 End @@ -1879,8 +1680,7 @@ _1782: ScrCmd_068 ScrCmd_02C 161 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _17DF + GoToIfEq 0x800C, 0, _17DF GoTo _1858 _17A1: @@ -1888,8 +1688,7 @@ _17A1: ScrCmd_068 ScrCmd_02C 169 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _17DF + GoToIfEq 0x800C, 0, _17DF GoTo _1858 _17C0: @@ -1897,26 +1696,21 @@ _17C0: ScrCmd_068 ScrCmd_02C 177 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _17DF + GoToIfEq 0x800C, 0, _17DF GoTo _1858 _17DF: ScrCmd_034 ScrCmd_0E5 0x21A, 0x223 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21A SetTrainerFlag 0x223 Call _18C7 SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _1837 - CompareVar 0x8008, 1 - GoToIf 1, _1842 - CompareVar 0x8008, 2 - GoToIf 1, _184D + GoToIfEq 0x8008, 0, _1837 + GoToIfEq 0x8008, 1, _1842 + GoToIfEq 0x8008, 2, _184D ScrCmd_061 End @@ -1949,12 +1743,9 @@ _1858: _1864: SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _1893 - CompareVar 0x8008, 1 - GoToIf 1, _189E - CompareVar 0x8008, 2 - GoToIf 1, _18A9 + GoToIfEq 0x8008, 0, _1893 + GoToIfEq 0x8008, 1, _189E + GoToIfEq 0x8008, 2, _18A9 End _1893: @@ -1996,18 +1787,13 @@ _18D3: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x223 - CheckTrainerFlag 0x223 - GoToIf 1, _1A0E + GoToIfDefeated 0x223, _1A0E ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1A5E + GoToIfEq 0x800C, 1, _1A5E SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _192C - CompareVar 0x8008, 1 - GoToIf 1, _194B - CompareVar 0x8008, 2 - GoToIf 1, _196A + GoToIfEq 0x8008, 0, _192C + GoToIfEq 0x8008, 1, _194B + GoToIfEq 0x8008, 2, _196A ScrCmd_061 End @@ -2016,8 +1802,7 @@ _192C: ScrCmd_068 ScrCmd_02C 165 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1989 + GoToIfEq 0x800C, 0, _1989 GoTo _1A02 _194B: @@ -2025,8 +1810,7 @@ _194B: ScrCmd_068 ScrCmd_02C 173 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1989 + GoToIfEq 0x800C, 0, _1989 GoTo _1A02 _196A: @@ -2034,26 +1818,21 @@ _196A: ScrCmd_068 ScrCmd_02C 181 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1989 + GoToIfEq 0x800C, 0, _1989 GoTo _1A02 _1989: ScrCmd_034 ScrCmd_0E5 0x21A, 0x223 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21A SetTrainerFlag 0x223 Call _1A71 SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _19E1 - CompareVar 0x8008, 1 - GoToIf 1, _19EC - CompareVar 0x8008, 2 - GoToIf 1, _19F7 + GoToIfEq 0x8008, 0, _19E1 + GoToIfEq 0x8008, 1, _19EC + GoToIfEq 0x8008, 2, _19F7 ScrCmd_061 End @@ -2086,12 +1865,9 @@ _1A02: _1A0E: SetVar 0x8008, 0x4101 - CompareVar 0x8008, 0 - GoToIf 1, _1A3D - CompareVar 0x8008, 1 - GoToIf 1, _1A48 - CompareVar 0x8008, 2 - GoToIf 1, _1A53 + GoToIfEq 0x8008, 0, _1A3D + GoToIfEq 0x8008, 1, _1A48 + GoToIfEq 0x8008, 2, _1A53 End _1A3D: @@ -2133,18 +1909,13 @@ _1A7D: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x21D - CheckTrainerFlag 0x21D - GoToIf 1, _1BB8 + GoToIfDefeated 0x21D, _1BB8 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1C08 + GoToIfEq 0x800C, 1, _1C08 SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1AD6 - CompareVar 0x8008, 1 - GoToIf 1, _1AF5 - CompareVar 0x8008, 2 - GoToIf 1, _1B14 + GoToIfEq 0x8008, 0, _1AD6 + GoToIfEq 0x8008, 1, _1AF5 + GoToIfEq 0x8008, 2, _1B14 ScrCmd_061 End @@ -2153,8 +1924,7 @@ _1AD6: ScrCmd_068 ScrCmd_02C 187 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1B33 + GoToIfEq 0x800C, 0, _1B33 GoTo _1BAC _1AF5: @@ -2162,8 +1932,7 @@ _1AF5: ScrCmd_068 ScrCmd_02C 195 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1B33 + GoToIfEq 0x800C, 0, _1B33 GoTo _1BAC _1B14: @@ -2171,26 +1940,21 @@ _1B14: ScrCmd_068 ScrCmd_02C 203 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1B33 + GoToIfEq 0x800C, 0, _1B33 GoTo _1BAC _1B33: ScrCmd_034 ScrCmd_0E5 0x21D, 0x226 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21D SetTrainerFlag 0x226 Call _1C1B SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1B8B - CompareVar 0x8008, 1 - GoToIf 1, _1B96 - CompareVar 0x8008, 2 - GoToIf 1, _1BA1 + GoToIfEq 0x8008, 0, _1B8B + GoToIfEq 0x8008, 1, _1B96 + GoToIfEq 0x8008, 2, _1BA1 ScrCmd_061 End @@ -2223,12 +1987,9 @@ _1BAC: _1BB8: SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1BE7 - CompareVar 0x8008, 1 - GoToIf 1, _1BF2 - CompareVar 0x8008, 2 - GoToIf 1, _1BFD + GoToIfEq 0x8008, 0, _1BE7 + GoToIfEq 0x8008, 1, _1BF2 + GoToIfEq 0x8008, 2, _1BFD End _1BE7: @@ -2270,18 +2031,13 @@ _1C27: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x226 - CheckTrainerFlag 0x226 - GoToIf 1, _1D62 + GoToIfDefeated 0x226, _1D62 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1DB2 + GoToIfEq 0x800C, 1, _1DB2 SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1C80 - CompareVar 0x8008, 1 - GoToIf 1, _1C9F - CompareVar 0x8008, 2 - GoToIf 1, _1CBE + GoToIfEq 0x8008, 0, _1C80 + GoToIfEq 0x8008, 1, _1C9F + GoToIfEq 0x8008, 2, _1CBE ScrCmd_061 End @@ -2290,8 +2046,7 @@ _1C80: ScrCmd_068 ScrCmd_02C 191 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1CDD + GoToIfEq 0x800C, 0, _1CDD GoTo _1D56 _1C9F: @@ -2299,8 +2054,7 @@ _1C9F: ScrCmd_068 ScrCmd_02C 199 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1CDD + GoToIfEq 0x800C, 0, _1CDD GoTo _1D56 _1CBE: @@ -2308,26 +2062,21 @@ _1CBE: ScrCmd_068 ScrCmd_02C 207 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1CDD + GoToIfEq 0x800C, 0, _1CDD GoTo _1D56 _1CDD: ScrCmd_034 ScrCmd_0E5 0x21D, 0x226 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x21D SetTrainerFlag 0x226 Call _1DC5 SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1D35 - CompareVar 0x8008, 1 - GoToIf 1, _1D40 - CompareVar 0x8008, 2 - GoToIf 1, _1D4B + GoToIfEq 0x8008, 0, _1D35 + GoToIfEq 0x8008, 1, _1D40 + GoToIfEq 0x8008, 2, _1D4B ScrCmd_061 End @@ -2360,12 +2109,9 @@ _1D56: _1D62: SetVar 0x8008, 0x4102 - CompareVar 0x8008, 0 - GoToIf 1, _1D91 - CompareVar 0x8008, 1 - GoToIf 1, _1D9C - CompareVar 0x8008, 2 - GoToIf 1, _1DA7 + GoToIfEq 0x8008, 0, _1D91 + GoToIfEq 0x8008, 1, _1D9C + GoToIfEq 0x8008, 2, _1DA7 End _1D91: @@ -2407,18 +2153,13 @@ _1DD1: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x225 - CheckTrainerFlag 0x225 - GoToIf 1, _1F0C + GoToIfDefeated 0x225, _1F0C ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _1F5C + GoToIfEq 0x800C, 1, _1F5C SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _1E2A - CompareVar 0x8008, 1 - GoToIf 1, _1E49 - CompareVar 0x8008, 2 - GoToIf 1, _1E68 + GoToIfEq 0x8008, 0, _1E2A + GoToIfEq 0x8008, 1, _1E49 + GoToIfEq 0x8008, 2, _1E68 ScrCmd_061 End @@ -2427,8 +2168,7 @@ _1E2A: ScrCmd_068 ScrCmd_02C 213 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1E87 + GoToIfEq 0x800C, 0, _1E87 GoTo _1F00 _1E49: @@ -2436,8 +2176,7 @@ _1E49: ScrCmd_068 ScrCmd_02C 221 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1E87 + GoToIfEq 0x800C, 0, _1E87 GoTo _1F00 _1E68: @@ -2445,26 +2184,21 @@ _1E68: ScrCmd_068 ScrCmd_02C 229 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1E87 + GoToIfEq 0x800C, 0, _1E87 GoTo _1F00 _1E87: ScrCmd_034 ScrCmd_0E5 0x225, 0x219 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x225 SetTrainerFlag 0x219 Call _1F6F SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _1EDF - CompareVar 0x8008, 1 - GoToIf 1, _1EEA - CompareVar 0x8008, 2 - GoToIf 1, _1EF5 + GoToIfEq 0x8008, 0, _1EDF + GoToIfEq 0x8008, 1, _1EEA + GoToIfEq 0x8008, 2, _1EF5 ScrCmd_061 End @@ -2497,12 +2231,9 @@ _1F00: _1F0C: SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _1F3B - CompareVar 0x8008, 1 - GoToIf 1, _1F46 - CompareVar 0x8008, 2 - GoToIf 1, _1F51 + GoToIfEq 0x8008, 0, _1F3B + GoToIfEq 0x8008, 1, _1F46 + GoToIfEq 0x8008, 2, _1F51 End _1F3B: @@ -2544,18 +2275,13 @@ _1F7B: ScrCmd_049 0x5DC ScrCmd_060 CheckTrainerFlag 0x219 - CheckTrainerFlag 0x219 - GoToIf 1, _20B6 + GoToIfDefeated 0x219, _20B6 ScrCmd_19B 0x800C, 6 - CompareVar 0x800C, 1 - GoToIf 1, _2106 + GoToIfEq 0x800C, 1, _2106 SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _1FD4 - CompareVar 0x8008, 1 - GoToIf 1, _1FF3 - CompareVar 0x8008, 2 - GoToIf 1, _2012 + GoToIfEq 0x8008, 0, _1FD4 + GoToIfEq 0x8008, 1, _1FF3 + GoToIfEq 0x8008, 2, _2012 ScrCmd_061 End @@ -2564,8 +2290,7 @@ _1FD4: ScrCmd_068 ScrCmd_02C 217 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2031 + GoToIfEq 0x800C, 0, _2031 GoTo _20AA _1FF3: @@ -2573,8 +2298,7 @@ _1FF3: ScrCmd_068 ScrCmd_02C 225 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2031 + GoToIfEq 0x800C, 0, _2031 GoTo _20AA _2012: @@ -2582,26 +2306,21 @@ _2012: ScrCmd_068 ScrCmd_02C 233 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2031 + GoToIfEq 0x800C, 0, _2031 GoTo _20AA _2031: ScrCmd_034 ScrCmd_0E5 0x225, 0x219 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _2125 + GoToIfEq 0x800C, 0, _2125 SetTrainerFlag 0x225 SetTrainerFlag 0x219 Call _2119 SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _2089 - CompareVar 0x8008, 1 - GoToIf 1, _2094 - CompareVar 0x8008, 2 - GoToIf 1, _209F + GoToIfEq 0x8008, 0, _2089 + GoToIfEq 0x8008, 1, _2094 + GoToIfEq 0x8008, 2, _209F ScrCmd_061 End @@ -2634,12 +2353,9 @@ _20AA: _20B6: SetVar 0x8008, 0x4103 - CompareVar 0x8008, 0 - GoToIf 1, _20E5 - CompareVar 0x8008, 1 - GoToIf 1, _20F0 - CompareVar 0x8008, 2 - GoToIf 1, _20FB + GoToIfEq 0x8008, 0, _20E5 + GoToIfEq 0x8008, 1, _20F0 + GoToIfEq 0x8008, 2, _20FB End _20E5: diff --git a/res/field/scripts/script_0418.s b/res/field/scripts/script_0418.s index 2b6c90192b..6844b793b1 100644 --- a/res/field/scripts/script_0418.s +++ b/res/field/scripts/script_0418.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x13A - GoToIf 1, _0055 + GoToIfSet 0x13A, _0055 ScrCmd_02C 0 SetVar 0x8004, 69 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _004B + GoToIfEq 0x800C, 0, _004B SetFlag 0x13A ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0419.s b/res/field/scripts/script_0419.s index da15f670cf..64c2ba90cc 100644 --- a/res/field/scripts/script_0419.s +++ b/res/field/scripts/script_0419.s @@ -9,16 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 1 - GoToIf 1, _00D3 + GoToIfSet 1, _00D3 ScrCmd_1E8 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _004C - CheckFlag 171 - GoToIf 0, _0057 + GoToIfEq 0x800C, 0, _004C + GoToIfUnset 171, _0057 ScrCmd_1E9 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0057 + GoToIfEq 0x800C, 0, _0057 GoTo _0095 _004C: diff --git a/res/field/scripts/script_0420.s b/res/field/scripts/script_0420.s index aba787ba06..c1fd4f477e 100644 --- a/res/field/scripts/script_0420.s +++ b/res/field/scripts/script_0420.s @@ -9,10 +9,8 @@ .short 0xFD13 _0012: - CheckFlag 186 - GoToIf 0, _002A - CheckFlag 186 - GoToIf 1, _003C + GoToIfUnset 186, _002A + GoToIfSet 186, _003C End _002A: @@ -29,10 +27,8 @@ _004E: ScrCmd_15B 6, 0x4000 CompareVar 0x4000, 1 CallIf 1, _0079 - CheckFlag 186 - GoToIf 0, _002A - CheckFlag 186 - GoToIf 1, _003C + GoToIfUnset 186, _002A + GoToIfSet 186, _003C End _0079: diff --git a/res/field/scripts/script_0422.s b/res/field/scripts/script_0422.s index 59aaf354e2..7d72da7c68 100644 --- a/res/field/scripts/script_0422.s +++ b/res/field/scripts/script_0422.s @@ -14,8 +14,7 @@ _001A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4086, 3 - GoToIf 4, _003D + GoToIfGe 0x4086, 3, _003D ScrCmd_0CD 1 ScrCmd_02C 1 ScrCmd_031 @@ -24,16 +23,11 @@ _001A: End _003D: - CompareVar 0x40CA, 5 - GoToIf 4, _009C - CompareVar 0x40CA, 4 - GoToIf 1, _00AA - CompareVar 0x40CA, 3 - GoToIf 1, _00BA - CompareVar 0x40CA, 2 - GoToIf 1, _00CA - CompareVar 0x40CA, 1 - GoToIf 1, _00DD + GoToIfGe 0x40CA, 5, _009C + GoToIfEq 0x40CA, 4, _00AA + GoToIfEq 0x40CA, 3, _00BA + GoToIfEq 0x40CA, 2, _00CA + GoToIfEq 0x40CA, 1, _00DD ScrCmd_0CE 0 ScrCmd_02C 2 ScrCmd_031 @@ -103,10 +97,8 @@ _00F9: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40CB, 2 - GoToIf 4, _0126 - CompareVar 0x40CB, 1 - GoToIf 1, _0131 + GoToIfGe 0x40CB, 2, _0126 + GoToIfEq 0x40CB, 1, _0131 ScrCmd_0CE 0 GoTo _013C End @@ -134,10 +126,8 @@ _014A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40E8, 2 - GoToIf 4, _0185 - CompareVar 0x40E8, 1 - GoToIf 1, _017A + GoToIfGe 0x40E8, 2, _0185 + GoToIfEq 0x40E8, 1, _017A ScrCmd_0CD 0 ScrCmd_02C 12 GoTo _0193 @@ -167,12 +157,9 @@ _01A1: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40E1, 3 - GoToIf 4, _01F4 - CompareVar 0x40E1, 2 - GoToIf 1, _01E9 - CompareVar 0x40E1, 1 - GoToIf 1, _01DE + GoToIfGe 0x40E1, 3, _01F4 + GoToIfEq 0x40E1, 2, _01E9 + GoToIfEq 0x40E1, 1, _01DE ScrCmd_0CD 0 ScrCmd_02C 42 GoTo _01FF @@ -206,10 +193,8 @@ _020D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40E2, 2 - GoToIf 4, _0248 - CompareVar 0x40E2, 1 - GoToIf 1, _023D + GoToIfGe 0x40E2, 2, _0248 + GoToIfEq 0x40E2, 1, _023D ScrCmd_0CD 0 ScrCmd_02C 19 GoTo _0256 @@ -240,8 +225,7 @@ _0266: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40E4, 1 - GoToIf 4, _0289 + GoToIfGe 0x40E4, 1, _0289 ScrCmd_0CD 0 ScrCmd_02C 38 GoTo _0294 diff --git a/res/field/scripts/script_0423.s b/res/field/scripts/script_0423.s index 3e5a10a902..29b81d45fb 100644 --- a/res/field/scripts/script_0423.s +++ b/res/field/scripts/script_0423.s @@ -31,10 +31,8 @@ _0046: ScrCmd_042 154, 1 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0086 - CompareVar 0x8008, 1 - GoToIf 1, _00C6 + GoToIfEq 0x8008, 0, _0086 + GoToIfEq 0x8008, 1, _00C6 GoTo _00C6 End @@ -46,10 +44,8 @@ _0086: ScrCmd_042 154, 1 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0086 - CompareVar 0x8008, 1 - GoToIf 1, _00C6 + GoToIfEq 0x8008, 0, _0086 + GoToIfEq 0x8008, 1, _00C6 GoTo _00C6 End @@ -77,8 +73,7 @@ _00F4: ScrCmd_068 ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0123 + GoToIfEq 0x800C, 0, _0123 GoTo _0118 End @@ -97,10 +92,8 @@ _0123: ScrCmd_042 154, 1 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0163 - CompareVar 0x8008, 1 - GoToIf 1, _0118 + GoToIfEq 0x8008, 0, _0163 + GoToIfEq 0x8008, 1, _0118 GoTo _0118 End @@ -112,10 +105,8 @@ _0163: ScrCmd_042 154, 1 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0163 - CompareVar 0x8008, 1 - GoToIf 1, _0118 + GoToIfEq 0x8008, 0, _0163 + GoToIfEq 0x8008, 1, _0118 GoTo _0118 End @@ -124,8 +115,7 @@ _01A3: ScrCmd_060 ScrCmd_068 ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0430 + GoToIfEq 0x800C, 1, _0430 GoTo _01C4 End @@ -138,10 +128,8 @@ _01C4: ScrCmd_042 16, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0213 - CompareVar 0x8008, 1 - GoToIf 1, _0208 + GoToIfEq 0x8008, 0, _0213 + GoToIfEq 0x8008, 1, _0208 GoTo _026C End @@ -152,23 +140,20 @@ _0208: _0213: ScrCmd_2A4 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _022C + GoToIfEq 0x800C, 0, _022C GoTo _0277 End _022C: ScrCmd_2A3 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0261 + GoToIfEq 0x800C, 1, _0261 GoTo _0245 End _0245: ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0277 + GoToIfEq 0x800C, 0, _0277 GoTo _026C End @@ -188,13 +173,11 @@ _026C: _0277: ScrCmd_31D 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _02A9 + GoToIfEq 0x800C, 0xFF, _02A9 ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 1 - GoToIf 1, _02AF + GoToIfEq 0x800C, 1, _02AF GoTo _026C End @@ -243,8 +226,7 @@ _0333: ScrCmd_0BD ScrCmd_1F8 ScrCmd_2A4 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _035A + GoToIfEq 0x800C, 0, _035A ScrCmd_0A3 GoTo _035C @@ -360,8 +342,7 @@ _048E: ScrCmd_060 ScrCmd_068 ScrCmd_323 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04BC + GoToIfEq 0x800C, 0, _04BC ScrCmd_201 0x405C SetVar 0x405D, 0x800D ScrCmd_02C 17 @@ -381,10 +362,8 @@ _04C7: ScrCmd_042 24, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0526 - CompareVar 0x8008, 1 - GoToIf 1, _051B + GoToIfEq 0x8008, 0, _0526 + GoToIfEq 0x8008, 1, _051B GoTo _0508 End @@ -408,8 +387,7 @@ _0526: ScrCmd_14E ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _0508 + GoToIfEq 0x800C, 0, _0508 ScrCmd_02C 19 ScrCmd_034 ApplyMovement 0xFF, _03B8 diff --git a/res/field/scripts/script_0424.s b/res/field/scripts/script_0424.s index ef6b7ebe7d..bb46b07a98 100644 --- a/res/field/scripts/script_0424.s +++ b/res/field/scripts/script_0424.s @@ -11,18 +11,15 @@ _0006: SetVar 0x8005, 0x8000 ScrCmd_28C 0x8000 ScrCmd_059 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0031 + GoToIfEq 0x800C, 1, _0031 GoTo _0054 End _0031: ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0054 - CompareVar 0x800C, 1 - GoToIf 1, _00B2 + GoToIfEq 0x800C, 0, _0054 + GoToIfEq 0x800C, 1, _00B2 End _0054: @@ -33,8 +30,7 @@ _0054: ScrCmd_003 30, 0x800C ScrCmd_055 10 ScrCmd_003 10, 0x800C - CompareVar 0x8004, 0 - GoToIf 1, _00BA + GoToIfEq 0x8004, 0, _00BA ScrCmd_05B ScrCmd_003 1, 0x800C ScrCmd_05C @@ -59,10 +55,8 @@ _00BA: ScrCmd_02C 3 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0054 - CompareVar 0x800C, 1 - GoToIf 1, _00B2 + GoToIfEq 0x800C, 0, _0054 + GoToIfEq 0x800C, 1, _00B2 End .byte 0 diff --git a/res/field/scripts/script_0426.s b/res/field/scripts/script_0426.s index a8fbd1aabe..ef58dcb677 100644 --- a/res/field/scripts/script_0426.s +++ b/res/field/scripts/script_0426.s @@ -23,12 +23,9 @@ _001B: ScrCmd_042 12, 3 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _00D0 - CompareVar 0x8008, 1 - GoToIf 1, _0121 - CompareVar 0x8008, 2 - GoToIf 1, _0078 + GoToIfEq 0x8008, 0, _00D0 + GoToIfEq 0x8008, 1, _0121 + GoToIfEq 0x8008, 2, _0078 GoTo _006D End @@ -80,13 +77,10 @@ _00C5: _00D0: ScrCmd_07E 0x1C1, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AF + GoToIfEq 0x800C, 0, _00AF ScrCmd_1D8 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00BA - CompareVar 0x800C, 2 - GoToIf 1, _00C5 + GoToIfEq 0x800C, 1, _00BA + GoToIfEq 0x800C, 2, _00C5 ScrCmd_003 30, 0x800C Call _0085 ScrCmd_1D7 0 @@ -96,17 +90,13 @@ _00D0: _0121: ScrCmd_07E 0x1C1, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AF + GoToIfEq 0x800C, 0, _00AF ScrCmd_1D8 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00BA - CompareVar 0x800C, 2 - GoToIf 1, _00C5 + GoToIfEq 0x800C, 1, _00BA + GoToIfEq 0x800C, 2, _00C5 ScrCmd_014 0x7D6 SetVar 0x800C, 0x4000 - CompareVar 0x800C, 1 - GoToIf 1, _0173 + GoToIfEq 0x800C, 1, _0173 GoTo _006D End @@ -119,24 +109,19 @@ _0173: ScrCmd_042 5, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01B7 - CompareVar 0x8008, 1 - GoToIf 1, _020D + GoToIfEq 0x8008, 0, _01B7 + GoToIfEq 0x8008, 1, _020D GoTo _006D End _01B7: ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0173 + GoToIfEq 0x800C, 1, _0173 ScrCmd_034 ScrCmd_0F2 6, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01F9 - CompareVar 0x800C, 3 - GoToIf 1, _0203 + GoToIfEq 0x800C, 1, _01F9 + GoToIfEq 0x800C, 3, _0203 GoTo _0263 End @@ -153,14 +138,11 @@ _0203: _020D: ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0173 + GoToIfEq 0x800C, 1, _0173 ScrCmd_034 ScrCmd_0F3 6, 0, 0, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _024F - CompareVar 0x800C, 3 - GoToIf 1, _0259 + GoToIfEq 0x800C, 1, _024F + GoToIfEq 0x800C, 3, _0259 GoTo _0263 End diff --git a/res/field/scripts/script_0427.s b/res/field/scripts/script_0427.s index 081d001135..0166ba378c 100644 --- a/res/field/scripts/script_0427.s +++ b/res/field/scripts/script_0427.s @@ -22,10 +22,8 @@ _0042: ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0062 - CompareVar 0x4000, 1 - GoToIf 1, _006A + GoToIfEq 0x4000, 0, _0062 + GoToIfEq 0x4000, 1, _006A End _0062: @@ -43,14 +41,10 @@ _0072: ScrCmd_02C 0 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 110 - GoToIf 1, _00BF - CompareVar 0x8004, 111 - GoToIf 1, _00EB - CompareVar 0x8004, 112 - GoToIf 1, _0117 - CompareVar 0x8004, 113 - GoToIf 1, _0143 + GoToIfEq 0x8004, 110, _00BF + GoToIfEq 0x8004, 111, _00EB + GoToIfEq 0x8004, 112, _0117 + GoToIfEq 0x8004, 113, _0143 End _00BF: @@ -150,10 +144,8 @@ _016F: WaitMovement ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0298 - CompareVar 0x800C, 1 - GoToIf 1, _0259 + GoToIfEq 0x800C, 0, _0298 + GoToIfEq 0x800C, 1, _0259 End _0259: @@ -166,10 +158,8 @@ _0259: WaitMovement ScrCmd_02C 13 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0298 - CompareVar 0x800C, 1 - GoToIf 1, _0259 + GoToIfEq 0x800C, 0, _0298 + GoToIfEq 0x800C, 1, _0259 End _0298: @@ -193,10 +183,8 @@ _02B3: ScrCmd_0CD 1 ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _030B - CompareVar 0x800C, 1 - GoToIf 1, _02FD + GoToIfEq 0x800C, 0, _030B + GoToIfEq 0x800C, 1, _02FD End _02FD: @@ -224,8 +212,7 @@ _030B: ApplyMovement 6, _08C8 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _036E + GoToIfEq 0x800C, 0, _036E GoTo _03A6 End @@ -314,8 +301,7 @@ _042E: SetFlag 0x178 ScrCmd_065 5 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _04CA + GoToIfEq 0x800C, 0, _04CA GoTo _04EE End @@ -361,10 +347,8 @@ _0554: ScrCmd_0CD 1 ScrCmd_02C 44 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _057A - CompareVar 0x800C, 1 - GoToIf 1, _0656 + GoToIfEq 0x800C, 0, _057A + GoToIfEq 0x800C, 1, _0656 End _057A: @@ -374,10 +358,8 @@ _057A: ScrCmd_034 ScrCmd_06D 2, 15 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _05BB - CompareVar 0x800C, 0x186 - GoToIf 1, _05C5 + GoToIfEq 0x800C, 0x183, _05BB + GoToIfEq 0x800C, 0x186, _05C5 GoTo _05B1 End @@ -395,8 +377,7 @@ _05C5: _05CF: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _05F5 + GoToIfEq 0x800C, 0, _05F5 ScrCmd_062 2 ScrCmd_0CE 0 ScrCmd_0CD 1 @@ -766,8 +747,7 @@ _08E0: _08E8: ScrCmd_060 ScrCmd_1BD 0x800C - CompareVar 0x800C, 3 - GoToIf 1, _0903 + GoToIfEq 0x800C, 3, _0903 GoTo _0935 End @@ -865,14 +845,10 @@ _09E0: ScrCmd_02C 52 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 110 - GoToIf 1, _0A3B - CompareVar 0x8004, 111 - GoToIf 1, _0A3B - CompareVar 0x8004, 112 - GoToIf 1, _0A3B - CompareVar 0x8004, 113 - GoToIf 1, _0A3B + GoToIfEq 0x8004, 110, _0A3B + GoToIfEq 0x8004, 111, _0A3B + GoToIfEq 0x8004, 112, _0A3B + GoToIfEq 0x8004, 113, _0A3B End _0A3B: @@ -917,8 +893,7 @@ _0A8C: ScrCmd_02C 35 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 3 - GoToIf 1, _0AB9 + GoToIfEq 0x800C, 3, _0AB9 GoTo _0ACB End @@ -997,12 +972,9 @@ _0AF4: _0B24: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x355 - GoToIf 1, _0B55 - CompareVar 0x8005, 0x356 - GoToIf 1, _0B89 - CompareVar 0x8005, 0x357 - GoToIf 1, _0BBB + GoToIfEq 0x8005, 0x355, _0B55 + GoToIfEq 0x8005, 0x356, _0B89 + GoToIfEq 0x8005, 0x357, _0BBB End _0B55: @@ -1049,14 +1021,10 @@ _0BF5: ScrCmd_0DC 2 ApplyMovement 5, _0D70 WaitMovement - CompareVar 0x8005, 0x355 - GoToIf 1, _0C3E - CompareVar 0x8005, 0x356 - GoToIf 1, _0C56 - CompareVar 0x8005, 0x357 - GoToIf 1, _0C6E - CompareVar 0x8005, 0x358 - GoToIf 1, _0C6E + GoToIfEq 0x8005, 0x355, _0C3E + GoToIfEq 0x8005, 0x356, _0C56 + GoToIfEq 0x8005, 0x357, _0C6E + GoToIfEq 0x8005, 0x358, _0C6E End _0C3E: @@ -1079,8 +1047,7 @@ _0C6E: _0C86: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0C9D + GoToIfEq 0x800C, 0, _0C9D GoTo _0CA3 _0C9D: @@ -1091,14 +1058,10 @@ _0CA3: _0CA9: ScrCmd_034 - CompareVar 0x8005, 0x355 - GoToIf 1, _0CE1 - CompareVar 0x8005, 0x356 - GoToIf 1, _0CE1 - CompareVar 0x8005, 0x357 - GoToIf 1, _0CE1 - CompareVar 0x8005, 0x358 - GoToIf 1, _0CE1 + GoToIfEq 0x8005, 0x355, _0CE1 + GoToIfEq 0x8005, 0x356, _0CE1 + GoToIfEq 0x8005, 0x357, _0CE1 + GoToIfEq 0x8005, 0x358, _0CE1 End _0CE1: @@ -1235,8 +1198,7 @@ _0E1A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 144 - GoToIf 1, _0E3E + GoToIfSet 144, _0E3E ScrCmd_02C 58 GoTo _0E36 @@ -1254,14 +1216,12 @@ _0E47: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 108 - GoToIf 1, _0E8C + GoToIfSet 108, _0E8C ScrCmd_02C 55 SetVar 0x8004, 17 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0E97 + GoToIfEq 0x800C, 0, _0E97 SetFlag 108 ScrCmd_014 0x7E0 ScrCmd_034 @@ -1300,14 +1260,10 @@ _0EB4: ScrCmd_02C 50 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 110 - GoToIf 1, _0F07 - CompareVar 0x8004, 111 - GoToIf 1, _0F19 - CompareVar 0x8004, 112 - GoToIf 1, _0F2B - CompareVar 0x8004, 113 - GoToIf 1, _0F3D + GoToIfEq 0x8004, 110, _0F07 + GoToIfEq 0x8004, 111, _0F19 + GoToIfEq 0x8004, 112, _0F2B + GoToIfEq 0x8004, 113, _0F3D End _0F07: diff --git a/res/field/scripts/script_0428.s b/res/field/scripts/script_0428.s index b4141534ee..7a04f3b4e0 100644 --- a/res/field/scripts/script_0428.s +++ b/res/field/scripts/script_0428.s @@ -15,10 +15,8 @@ _001E: CompareVar 0x4087, 2 CallIf 4, _005B ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _004B - CompareVar 0x4000, 1 - GoToIf 1, _0053 + GoToIfEq 0x4000, 0, _004B + GoToIfEq 0x4000, 1, _0053 End _004B: @@ -75,16 +73,11 @@ _00C7: ApplyMovement 0xFF, _04A0 WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x339 - GoToIf 1, _0124 - CompareVar 0x8005, 0x33A - GoToIf 1, _0134 - CompareVar 0x8005, 0x33B - GoToIf 1, _0144 - CompareVar 0x8005, 0x33C - GoToIf 1, _0154 - CompareVar 0x8005, 0x33D - GoToIf 1, _0164 + GoToIfEq 0x8005, 0x339, _0124 + GoToIfEq 0x8005, 0x33A, _0134 + GoToIfEq 0x8005, 0x33B, _0144 + GoToIfEq 0x8005, 0x33C, _0154 + GoToIfEq 0x8005, 0x33D, _0164 End _0124: @@ -113,13 +106,10 @@ _0164: GoTo _0174 _0174: - CheckFlag 143 - GoToIf 0, _027C + GoToIfUnset 143, _027C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _019F - CompareVar 0x800C, 1 - GoToIf 1, _01B2 + GoToIfEq 0x800C, 0, _019F + GoToIfEq 0x800C, 1, _01B2 End _019F: @@ -145,10 +135,8 @@ _01C5: ApplyMovement 3, _0490 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0205 - CompareVar 0x800C, 1 - GoToIf 1, _0211 + GoToIfEq 0x800C, 0, _0205 + GoToIfEq 0x800C, 1, _0211 End _0205: @@ -166,10 +154,8 @@ _021D: SetVar 0x8005, 5 ScrCmd_014 0x7FC ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _024D - CompareVar 0x800C, 1 - GoToIf 1, _0259 + GoToIfEq 0x800C, 0, _024D + GoToIfEq 0x800C, 1, _0259 End _024D: @@ -192,10 +178,8 @@ _0262: _027C: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _029C - CompareVar 0x800C, 1 - GoToIf 1, _02C8 + GoToIfEq 0x800C, 0, _029C + GoToIfEq 0x800C, 1, _02C8 End _029C: @@ -234,16 +218,11 @@ _02EF: _02F4: ScrCmd_034 - CompareVar 0x8005, 0x339 - GoToIf 1, _0339 - CompareVar 0x8005, 0x33A - GoToIf 1, _0351 - CompareVar 0x8005, 0x33B - GoToIf 1, _0369 - CompareVar 0x8005, 0x33C - GoToIf 1, _0381 - CompareVar 0x8005, 0x33D - GoToIf 1, _0399 + GoToIfEq 0x8005, 0x339, _0339 + GoToIfEq 0x8005, 0x33A, _0351 + GoToIfEq 0x8005, 0x33B, _0369 + GoToIfEq 0x8005, 0x33C, _0381 + GoToIfEq 0x8005, 0x33D, _0399 End _0339: diff --git a/res/field/scripts/script_0429.s b/res/field/scripts/script_0429.s index ffc4ac5c5b..5be0f76753 100644 --- a/res/field/scripts/script_0429.s +++ b/res/field/scripts/script_0429.s @@ -58,14 +58,10 @@ _0085: WaitMovement ScrCmd_014 0x7FA ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2F5 - GoToIf 1, _00D1 - CompareVar 0x8005, 0x2F6 - GoToIf 1, _00E1 - CompareVar 0x8005, 0x2F7 - GoToIf 1, _00F1 - CompareVar 0x8005, 0x2F8 - GoToIf 1, _0101 + GoToIfEq 0x8005, 0x2F5, _00D1 + GoToIfEq 0x8005, 0x2F6, _00E1 + GoToIfEq 0x8005, 0x2F7, _00F1 + GoToIfEq 0x8005, 0x2F8, _0101 End _00D1: @@ -94,10 +90,8 @@ _0111: ScrCmd_02C 0 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _014C - CompareVar 0x800C, 0x186 - GoToIf 1, _0158 + GoToIfEq 0x800C, 0x183, _014C + GoToIfEq 0x800C, 0x186, _0158 GoTo _0140 _0140: @@ -114,20 +108,15 @@ _0158: _0164: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0207 + GoToIfEq 0x800C, 0, _0207 ScrCmd_0CE 0 ScrCmd_02C 1 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x2F5 - GoToIf 1, _01B9 - CompareVar 0x8005, 0x2F6 - GoToIf 1, _01C9 - CompareVar 0x8005, 0x2F7 - GoToIf 1, _01D9 - CompareVar 0x8005, 0x2F8 - GoToIf 1, _01E9 + GoToIfEq 0x8005, 0x2F5, _01B9 + GoToIfEq 0x8005, 0x2F6, _01C9 + GoToIfEq 0x8005, 0x2F7, _01D9 + GoToIfEq 0x8005, 0x2F8, _01E9 End _01B9: diff --git a/res/field/scripts/script_0431.s b/res/field/scripts/script_0431.s index 4618941a8b..14df084995 100644 --- a/res/field/scripts/script_0431.s +++ b/res/field/scripts/script_0431.s @@ -21,14 +21,12 @@ _0021: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 197 - GoToIf 1, _0066 + GoToIfSet 197, _0066 ScrCmd_02C 1 SetVar 0x8004, 0x195 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0071 + GoToIfEq 0x800C, 0, _0071 ScrCmd_014 0x7FC SetFlag 197 GoTo _0066 diff --git a/res/field/scripts/script_0432.s b/res/field/scripts/script_0432.s index 7b1cea8929..f7163941cd 100644 --- a/res/field/scripts/script_0432.s +++ b/res/field/scripts/script_0432.s @@ -121,8 +121,7 @@ _011E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 145 - GoToIf 1, _0142 + GoToIfSet 145, _0142 Call _014D ScrCmd_02C 0 ScrCmd_031 @@ -146,16 +145,11 @@ _014D: _015D: ScrCmd_060 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x293 - GoToIf 1, _01A8 - CompareVar 0x8005, 0x294 - GoToIf 1, _01C2 - CompareVar 0x8005, 0x295 - GoToIf 1, _01DC - CompareVar 0x8005, 0x296 - GoToIf 1, _01E2 - CompareVar 0x8005, 0x297 - GoToIf 1, _01FC + GoToIfEq 0x8005, 0x293, _01A8 + GoToIfEq 0x8005, 0x294, _01C2 + GoToIfEq 0x8005, 0x295, _01DC + GoToIfEq 0x8005, 0x296, _01E2 + GoToIfEq 0x8005, 0x297, _01FC End _01A8: diff --git a/res/field/scripts/script_0433.s b/res/field/scripts/script_0433.s index fd55fb7ead..5b3b8f6f7a 100644 --- a/res/field/scripts/script_0433.s +++ b/res/field/scripts/script_0433.s @@ -12,10 +12,8 @@ _000A: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0035 - CompareVar 0x800C, 1 - GoToIf 1, _0062 + GoToIfEq 0x800C, 0, _0035 + GoToIfEq 0x800C, 1, _0062 End _0035: diff --git a/res/field/scripts/script_0435.s b/res/field/scripts/script_0435.s index 97cbbd9be9..b371a192ac 100644 --- a/res/field/scripts/script_0435.s +++ b/res/field/scripts/script_0435.s @@ -17,24 +17,17 @@ _001C: CheckFlag 0x994 CallIf 1, _009F ScrCmd_200 0x4000 - CompareVar 0x4000, 80 - GoToIf 1, _0047 - CompareVar 0x4000, 0x15F - GoToIf 1, _0047 + GoToIfEq 0x4000, 80, _0047 + GoToIfEq 0x4000, 0x15F, _0047 End _0047: - CheckFlag 3 - GoToIf 1, _009D + GoToIfSet 3, _009D ScrCmd_069 0x4000, 0x4001 - CompareVar 0x4000, 0x12B - GoToIf 0, _009D - CompareVar 0x4000, 0x132 - GoToIf 2, _009D - CompareVar 0x4001, 0x240 - GoToIf 1, _008E - CompareVar 0x4001, 0x2A9 - GoToIf 1, _008E + GoToIfLt 0x4000, 0x12B, _009D + GoToIfGt 0x4000, 0x132, _009D + GoToIfEq 0x4001, 0x240, _008E + GoToIfEq 0x4001, 0x2A9, _008E End _008E: diff --git a/res/field/scripts/script_0436.s b/res/field/scripts/script_0436.s index 2a8bb5c56f..beba47849d 100644 --- a/res/field/scripts/script_0436.s +++ b/res/field/scripts/script_0436.s @@ -37,8 +37,7 @@ _003D: _0050: ScrCmd_060 ScrCmd_0C7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0080 + GoToIfEq 0x800C, 1, _0080 ApplyMovement 0, _0090 WaitMovement ScrCmd_02C 1 @@ -75,8 +74,7 @@ _00B0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x12B - GoToIf 1, _00E5 + GoToIfSet 0x12B, _00E5 SetVar 0x8004, 96 ScrCmd_261 0, 0x8004 ScrCmd_02C 3 diff --git a/res/field/scripts/script_0438.s b/res/field/scripts/script_0438.s index d2037bc36a..a899b0cb73 100644 --- a/res/field/scripts/script_0438.s +++ b/res/field/scripts/script_0438.s @@ -13,10 +13,8 @@ _001E: ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _003E - CompareVar 0x4000, 1 - GoToIf 1, _0046 + GoToIfEq 0x4000, 0, _003E + GoToIfEq 0x4000, 1, _0046 End _003E: @@ -50,8 +48,7 @@ _008E: _009C: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B3 + GoToIfEq 0x800C, 0, _00B3 GoTo _00F1 _00B3: @@ -167,8 +164,7 @@ _01C3: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 130 - GoToIf 1, _01E1 + GoToIfSet 130, _01E1 ScrCmd_02C 9 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0439.s b/res/field/scripts/script_0439.s index ca017bbab8..845229f1bd 100644 --- a/res/field/scripts/script_0439.s +++ b/res/field/scripts/script_0439.s @@ -45,14 +45,12 @@ _0070: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x13F - GoToIf 1, _00B5 + GoToIfSet 0x13F, _00B5 ScrCmd_02C 0 SetVar 0x8004, 111 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00C0 + GoToIfEq 0x800C, 0, _00C0 SetFlag 0x13F ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_0440.s b/res/field/scripts/script_0440.s index 203f82ed7a..078ce31357 100644 --- a/res/field/scripts/script_0440.s +++ b/res/field/scripts/script_0440.s @@ -17,15 +17,13 @@ _001C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA0 - GoToIf 1, _0067 + GoToIfSet 0xAA0, _0067 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 26 AddVar 0x8004, 149 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0072 + GoToIfEq 0x800C, 0, _0072 SetFlag 0xAA0 ScrCmd_014 0x7E0 ScrCmd_034 @@ -49,17 +47,13 @@ _007C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4000, 1 - GoToIf 1, _00ED + GoToIfEq 0x4000, 1, _00ED ScrCmd_134 7, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00FD + GoToIfEq 0x800C, 1, _00FD ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00C7 - CompareVar 0x800C, 1 - GoToIf 1, _00E2 + GoToIfEq 0x800C, 0, _00C7 + GoToIfEq 0x800C, 1, _00E2 End _00C7: @@ -109,14 +103,10 @@ _0108: ScrCmd_043 SetVar 0x8000, 0x800C SetVar 0x8008, 0x8000 - CompareVar 0x8008, 0 - GoToIf 1, _0245 - CompareVar 0x8008, 1 - GoToIf 1, _0251 - CompareVar 0x8008, 2 - GoToIf 1, _025D - CompareVar 0x8008, 3 - GoToIf 1, _0269 + GoToIfEq 0x8008, 0, _0245 + GoToIfEq 0x8008, 1, _0251 + GoToIfEq 0x8008, 2, _025D + GoToIfEq 0x8008, 3, _0269 ScrCmd_02C 9 GoTo _0229 @@ -129,11 +119,9 @@ _0180: CallIf 1, _0289 CompareVar 0x8000, 3 CallIf 1, _0293 - CompareVar 0x800C, 0 - GoToIf 1, _023C + GoToIfEq 0x800C, 0, _023C ScrCmd_07D 0x8001, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0233 + GoToIfEq 0x800C, 0, _0233 CompareVar 0x8000, 0 CallIf 1, _029D CompareVar 0x8000, 1 @@ -236,16 +224,11 @@ _02E8: ScrCmd_042 23, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _035B - CompareVar 0x8008, 1 - GoToIf 1, _0366 - CompareVar 0x8008, 2 - GoToIf 1, _0371 - CompareVar 0x8008, 3 - GoToIf 1, _037C - CompareVar 0x8008, 4 - GoToIf 1, _0387 + GoToIfEq 0x8008, 0, _035B + GoToIfEq 0x8008, 1, _0366 + GoToIfEq 0x8008, 2, _0371 + GoToIfEq 0x8008, 3, _037C + GoToIfEq 0x8008, 4, _0387 GoTo _0387 End diff --git a/res/field/scripts/script_0441.s b/res/field/scripts/script_0441.s index cf837191ed..d1512744de 100644 --- a/res/field/scripts/script_0441.s +++ b/res/field/scripts/script_0441.s @@ -15,16 +15,11 @@ _0026: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _006D - CompareVar 0x4000, 1 - GoToIf 1, _007F - CompareVar 0x4000, 2 - GoToIf 1, _007F - CompareVar 0x4000, 3 - GoToIf 1, _007F - CompareVar 0x4000, 4 - GoToIf 1, _007F + GoToIfEq 0x4000, 0, _006D + GoToIfEq 0x4000, 1, _007F + GoToIfEq 0x4000, 2, _007F + GoToIfEq 0x4000, 3, _007F + GoToIfEq 0x4000, 4, _007F End _006D: @@ -54,15 +49,12 @@ _0091: _00A4: ScrCmd_049 0x5DC ScrCmd_060 - CompareVar 0x408A, 1 - GoToIf 1, _0102 + GoToIfEq 0x408A, 1, _0102 ScrCmd_07E 111, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01BC + GoToIfEq 0x800C, 0, _01BC ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00E6 + GoToIfEq 0x800C, 0, _00E6 ScrCmd_034 ScrCmd_061 End @@ -79,16 +71,11 @@ _00E6: _0102: ScrCmd_214 0x800C - CompareVar 0x800C, 32 - GoToIf 4, _014D - CompareVar 0x800C, 29 - GoToIf 4, _01B1 - CompareVar 0x800C, 22 - GoToIf 4, _01A6 - CompareVar 0x800C, 15 - GoToIf 4, _019B - CompareVar 0x800C, 8 - GoToIf 4, _0190 + GoToIfGe 0x800C, 32, _014D + GoToIfGe 0x800C, 29, _01B1 + GoToIfGe 0x800C, 22, _01A6 + GoToIfGe 0x800C, 15, _019B + GoToIfGe 0x800C, 8, _0190 GoTo _0185 _014D: @@ -99,8 +86,7 @@ _014D: ScrCmd_034 ScrCmd_124 0x1BA, 25 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _017F + GoToIfEq 0x800C, 0, _017F SetVar 0x408A, 0 ScrCmd_26F End @@ -159,24 +145,19 @@ _01C7: SetVar 0x8004, 0x1BE ScrCmd_33C 0, 0x8004 ScrCmd_346 0 - CheckFlag 162 - GoToIf 1, _020B + GoToIfSet 162, _020B ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0254 - CompareVar 0x800C, 1 - GoToIf 1, _0249 + GoToIfEq 0x800C, 0, _0254 + GoToIfEq 0x800C, 1, _0249 End _020B: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0233 - CompareVar 0x800C, 1 - GoToIf 1, _023E + GoToIfEq 0x800C, 0, _0233 + GoToIfEq 0x800C, 1, _023E End _0233: diff --git a/res/field/scripts/script_0446.s b/res/field/scripts/script_0446.s index 1e4eec0cdc..1407108a34 100644 --- a/res/field/scripts/script_0446.s +++ b/res/field/scripts/script_0446.s @@ -10,16 +10,13 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 123 - GoToIf 0, _0067 - CheckFlag 161 - GoToIf 1, _005C + GoToIfUnset 123, _0067 + GoToIfSet 161, _005C ScrCmd_02C 0 SetVar 0x8004, 247 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CF + GoToIfEq 0x800C, 0, _00CF ScrCmd_014 0x7FC SetFlag 161 GoTo _005C @@ -43,16 +40,13 @@ _0072: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 123 - GoToIf 0, _00D9 - CheckFlag 0x116 - GoToIf 1, _00C4 + GoToIfUnset 123, _00D9 + GoToIfSet 0x116, _00C4 ScrCmd_02C 3 SetVar 0x8004, 224 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CF + GoToIfEq 0x800C, 0, _00CF ScrCmd_014 0x7FC SetFlag 0x116 GoTo _00C4 diff --git a/res/field/scripts/script_0447.s b/res/field/scripts/script_0447.s index ca8583e93a..603d5fd6bb 100644 --- a/res/field/scripts/script_0447.s +++ b/res/field/scripts/script_0447.s @@ -13,16 +13,11 @@ _001E: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0065 - CompareVar 0x4000, 1 - GoToIf 1, _006F - CompareVar 0x4000, 2 - GoToIf 1, _006F - CompareVar 0x4000, 3 - GoToIf 1, _006F - CompareVar 0x4000, 4 - GoToIf 1, _006F + GoToIfEq 0x4000, 0, _0065 + GoToIfEq 0x4000, 1, _006F + GoToIfEq 0x4000, 2, _006F + GoToIfEq 0x4000, 3, _006F + GoToIfEq 0x4000, 4, _006F End _0065: @@ -40,8 +35,7 @@ _0079: ScrCmd_060 ScrCmd_068 ScrCmd_07E 0x1D0, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00A1 + GoToIfEq 0x800C, 1, _00A1 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -51,10 +45,8 @@ _0079: _00A1: ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CA - CompareVar 0x800C, 1 - GoToIf 1, _00C4 + GoToIfEq 0x800C, 0, _00CA + GoToIfEq 0x800C, 1, _00C4 End _00C4: @@ -85,10 +77,8 @@ _00CA: ScrCmd_065 19 ScrCmd_003 45, 0x800C ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 0x230 - GoToIf 1, _015B - CompareVar 0x8004, 0x231 - GoToIf 1, _016F + GoToIfEq 0x8004, 0x230, _015B + GoToIfEq 0x8004, 0x231, _016F End _015B: @@ -111,19 +101,15 @@ _0183: WaitMovement ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01E9 - CompareVar 0x800C, 1 - GoToIf 1, _01C6 + GoToIfEq 0x800C, 0, _01E9 + GoToIfEq 0x800C, 1, _01C6 End _01C6: ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01E9 - CompareVar 0x800C, 1 - GoToIf 1, _01C6 + GoToIfEq 0x800C, 0, _01E9 + GoToIfEq 0x800C, 1, _01C6 End _01E9: @@ -133,10 +119,8 @@ _01E9: ScrCmd_02C 4 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 0x230 - GoToIf 1, _0220 - CompareVar 0x8004, 0x231 - GoToIf 1, _0230 + GoToIfEq 0x8004, 0x230, _0220 + GoToIfEq 0x8004, 0x231, _0230 End _0220: @@ -275,14 +259,12 @@ _031F: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 199 - GoToIf 1, _0364 + GoToIfSet 199, _0364 ScrCmd_02C 7 SetVar 0x8004, 0x17A SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _036F + GoToIfEq 0x800C, 0, _036F ScrCmd_014 0x7FC SetFlag 199 GoTo _0364 diff --git a/res/field/scripts/script_0448.s b/res/field/scripts/script_0448.s index 6df05f47c7..1c16c2c43b 100644 --- a/res/field/scripts/script_0448.s +++ b/res/field/scripts/script_0448.s @@ -39,19 +39,15 @@ _0044: ScrCmd_042 9, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0092 - CompareVar 0x8008, 1 - GoToIf 1, _00BB - CompareVar 0x8008, 2 - GoToIf 1, _015D + GoToIfEq 0x8008, 0, _0092 + GoToIfEq 0x8008, 1, _00BB + GoToIfEq 0x8008, 2, _015D GoTo _015D End _0092: ScrCmd_071 0x800C, 0x1F4 - CompareVar 0x800C, 0 - GoToIf 1, _0150 + GoToIfEq 0x800C, 0, _0150 SetVar 0x8005, 1 SetVar 0x8006, 0x1F4 GoTo _00E4 @@ -59,8 +55,7 @@ _0092: _00BB: ScrCmd_071 0x800C, 0x1770 - CompareVar 0x800C, 0 - GoToIf 1, _0150 + GoToIfEq 0x800C, 0, _0150 SetVar 0x8005, 12 SetVar 0x8006, 0x1770 GoTo _00E4 @@ -69,8 +64,7 @@ _00BB: _00E4: SetVar 0x8004, 33 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0143 + GoToIfEq 0x800C, 0, _0143 ScrCmd_334 35, 0x8006 ScrCmd_1A3 0x8006 ScrCmd_074 @@ -122,8 +116,7 @@ _016A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x107 - GoToIf 1, _0188 + GoToIfSet 0x107, _0188 ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0450.s b/res/field/scripts/script_0450.s index cf7082c5d0..2885f258ac 100644 --- a/res/field/scripts/script_0450.s +++ b/res/field/scripts/script_0450.s @@ -14,20 +14,17 @@ _0010: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x100 - GoToIf 1, _0041 + GoToIfSet 0x100, _0041 SetFlag 0x100 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _005B + GoToIfEq 0x800C, 1, _005B GoTo _00A2 _0041: ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _005B + GoToIfEq 0x800C, 1, _005B GoTo _00A2 _005B: @@ -78,22 +75,17 @@ _00A2: _00A6: SubVar 0x4000, 1 ScrCmd_198 0x4000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FC + GoToIfEq 0x800C, 0, _00FC ScrCmd_248 0x8004, 0x8005, 0x4000 - CompareVar 0x8004, 16 - GoToIf 1, _00E7 - CompareVar 0x8005, 16 - GoToIf 1, _00E7 + GoToIfEq 0x8004, 16, _00E7 + GoToIfEq 0x8005, 16, _00E7 GoTo _00FC _00E7: ScrCmd_099 0x800C, 0x1B2, 0x4000 - CompareVar 0x800C, 0 - GoToIf 1, _010F + GoToIfEq 0x800C, 0, _010F _00FC: - CompareVar 0x4000, 0 - GoToIf 5, _00A6 + GoToIfNe 0x4000, 0, _00A6 GoTo _0066 _010F: @@ -106,20 +98,15 @@ _010F: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _005B + GoToIfEq 0x8000, 0xFF, _005B ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _007C + GoToIfEq 0x8001, 0, _007C Call _01D7 - CompareVar 0x800C, 0 - GoToIf 1, _0071 + GoToIfEq 0x800C, 0, _0071 ScrCmd_099 0x800C, 0x1B2, 0x8000 - CompareVar 0x800C, 1 - GoToIf 1, _0087 + GoToIfEq 0x800C, 1, _0087 ScrCmd_1B9 0x800C, 0x8000 - CompareVar 0x800C, 0xFF - GoToIf 0, _0097 + GoToIfLt 0x800C, 0xFF, _0097 SetVar 0x8003, 0x1B2 GoTo _019B @@ -131,8 +118,7 @@ _019B: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _005B + GoToIfEq 0x800C, 0xFF, _005B ScrCmd_02C 16 ScrCmd_031 ScrCmd_034 @@ -141,10 +127,8 @@ _019B: _01D7: ScrCmd_248 0x8004, 0x8005, 0x8000 - CompareVar 0x8004, 16 - GoToIf 1, _0201 - CompareVar 0x8005, 16 - GoToIf 1, _0201 + GoToIfEq 0x8004, 16, _0201 + GoToIfEq 0x8005, 16, _0201 SetVar 0x800C, 0 Return diff --git a/res/field/scripts/script_0452.s b/res/field/scripts/script_0452.s index 86884378e2..200bdd537c 100644 --- a/res/field/scripts/script_0452.s +++ b/res/field/scripts/script_0452.s @@ -11,8 +11,7 @@ _0012: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 198 - GoToIf 1, _0066 + GoToIfSet 198, _0066 ScrCmd_02C 0 ScrCmd_034 ScrCmd_068 @@ -22,8 +21,7 @@ _0012: SetVar 0x8004, 0x194 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0073 + GoToIfEq 0x800C, 0, _0073 ScrCmd_014 0x7FC SetFlag 198 GoTo _0066 diff --git a/res/field/scripts/script_0453.s b/res/field/scripts/script_0453.s index f9fabd57b6..a054a323ed 100644 --- a/res/field/scripts/script_0453.s +++ b/res/field/scripts/script_0453.s @@ -16,16 +16,11 @@ _002A: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0071 - CompareVar 0x4000, 1 - GoToIf 1, _0071 - CompareVar 0x4000, 2 - GoToIf 1, _0071 - CompareVar 0x4000, 3 - GoToIf 1, _0093 - CompareVar 0x4000, 4 - GoToIf 1, _0093 + GoToIfEq 0x4000, 0, _0071 + GoToIfEq 0x4000, 1, _0071 + GoToIfEq 0x4000, 2, _0071 + GoToIfEq 0x4000, 3, _0093 + GoToIfEq 0x4000, 4, _0093 End _0071: diff --git a/res/field/scripts/script_0454.s b/res/field/scripts/script_0454.s index 42d6982fee..05ad53cbbd 100644 --- a/res/field/scripts/script_0454.s +++ b/res/field/scripts/script_0454.s @@ -14,8 +14,7 @@ _001A: SetFlag 0x9EB SetFlag 0x257 SetFlag 0x258 - CheckFlag 0xAB6 - GoToIf 0, _0033 + GoToIfUnset 0xAB6, _0033 End _0033: @@ -54,15 +53,11 @@ _0087: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckTrainerFlag 0x37C - GoToIf 1, _0396 - CheckTrainerFlag 0x37D - GoToIf 1, _0396 + GoToIfDefeated 0x37C, _0396 + GoToIfDefeated 0x37D, _0396 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CB - CompareVar 0x800C, 1 - GoToIf 1, _00E5 + GoToIfEq 0x800C, 0, _00CB + GoToIfEq 0x800C, 1, _00E5 GoTo _00FF End @@ -87,8 +82,7 @@ _00FF: CallIf 1, _0467 SetFlag 0x166 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0471 + GoToIfEq 0x800C, 1, _0471 SetTrainerFlag 0x37C SetTrainerFlag 0x37D ScrCmd_02C 5 @@ -105,8 +99,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x381, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 AddVar 0x8005, 0x404D ScrCmd_02C 16 ScrCmd_034 @@ -118,8 +111,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x382, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 AddVar 0x8005, 0x404D ScrCmd_02C 18 ScrCmd_034 @@ -131,8 +123,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x383, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 AddVar 0x8005, 0x404D ScrCmd_02C 20 ScrCmd_034 @@ -144,8 +135,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x384, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 AddVar 0x8005, 0x404D ScrCmd_02C 22 ScrCmd_034 @@ -165,8 +155,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x385, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 AddVar 0x8005, 0x404D ScrCmd_02C 24 ScrCmd_034 @@ -178,8 +167,7 @@ _00FF: ScrCmd_0D5 0, 0x404C ScrCmd_0D5 1, 0x8005 ScrCmd_02C 7 - CompareVar 0x8005, 0x404C - GoToIf 5, _044C + GoToIfNe 0x8005, 0x404C, _044C ScrCmd_1B7 0x8006, 2 CompareVar 0x8006, 0 CallIf 1, _03A1 @@ -199,8 +187,7 @@ _00FF: ScrCmd_034 ScrCmd_0E5 0x8007, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0484 + GoToIfEq 0x800C, 0, _0484 SetTrainerFlag 0x37C SetTrainerFlag 0x37D CompareVar 0x8006, 0 diff --git a/res/field/scripts/script_0455.s b/res/field/scripts/script_0455.s index 85f9d7c672..7a94017464 100644 --- a/res/field/scripts/script_0455.s +++ b/res/field/scripts/script_0455.s @@ -11,14 +11,12 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x139 - GoToIf 1, _005D + GoToIfSet 0x139, _005D ScrCmd_02C 0 SetVar 0x8004, 218 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0053 + GoToIfEq 0x800C, 0, _0053 SetFlag 0x139 ScrCmd_014 0x7E0 ScrCmd_034 @@ -53,8 +51,7 @@ _007B: ScrCmd_060 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009D + GoToIfEq 0x800C, 0, _009D GoTo _00D3 End diff --git a/res/field/scripts/script_0456.s b/res/field/scripts/script_0456.s index 8aea60fcc2..003190fd40 100644 --- a/res/field/scripts/script_0456.s +++ b/res/field/scripts/script_0456.s @@ -13,12 +13,9 @@ _001E: ScrCmd_268 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _004F - CompareVar 0x4000, 1 - GoToIf 1, _004F - CompareVar 0x4000, 5 - GoToIf 3, _005B + GoToIfEq 0x4000, 0, _004F + GoToIfEq 0x4000, 1, _004F + GoToIfLe 0x4000, 5, _005B GoTo _004F _004F: @@ -35,13 +32,10 @@ _0067: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA2 - GoToIf 1, _0155 - CompareVar 0x400B, 1 - GoToIf 1, _0155 + GoToIfSet 0xAA2, _0155 + GoToIfEq 0x400B, 1, _0155 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00AA + GoToIfEq 0x800C, 1, _00AA GoTo _009F _009F: @@ -54,10 +48,8 @@ _009F: _00AA: ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00D8 - CompareVar 0x800C, 1 - GoToIf 1, _00CD + GoToIfEq 0x800C, 0, _00D8 + GoToIfEq 0x800C, 1, _00CD End _00CD: @@ -70,10 +62,8 @@ _00CD: _00D8: ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FB - CompareVar 0x800C, 1 - GoToIf 1, _00CD + GoToIfEq 0x800C, 0, _00FB + GoToIfEq 0x800C, 1, _00CD End _00FB: @@ -108,12 +98,9 @@ _0155: End _016C: - CompareVar 0x8001, 4 - GoToIf 1, _0199 - CompareVar 0x8001, 6 - GoToIf 1, _01A5 - CompareVar 0x8002, 6 - GoToIf 1, _01B1 + GoToIfEq 0x8001, 4, _0199 + GoToIfEq 0x8001, 6, _01A5 + GoToIfEq 0x8002, 6, _01B1 GoTo _01BD _0199: @@ -187,13 +174,11 @@ _0224: ScrCmd_060 ScrCmd_068 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0244 + GoToIfEq 0x800C, 1, _0244 GoTo _0270 _0244: - CheckFlag 0x164 - GoToIf 1, _0270 + GoToIfSet 0x164, _0270 GoTo _0257 End @@ -208,11 +193,9 @@ _0257: End _0270: - CheckFlag 0xAA2 - GoToIf 1, _0304 + GoToIfSet 0xAA2, _0304 ScrCmd_166 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02C8 + GoToIfEq 0x800C, 1, _02C8 ScrCmd_1B7 0x800C, 2 CompareVar 0x800C, 0 CallIf 1, _02BE @@ -319,19 +302,15 @@ _0399: ScrCmd_060 ScrCmd_02C 19 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03C2 - CompareVar 0x800C, 1 - GoToIf 1, _0408 + GoToIfEq 0x800C, 0, _03C2 + GoToIfEq 0x800C, 1, _0408 End _03C2: ScrCmd_02C 20 - CheckFlag 251 - GoToIf 1, _0408 + GoToIfSet 251, _0408 ScrCmd_337 0x1EA, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _03FC + GoToIfEq 0x800C, 1, _03FC ScrCmd_208 0x1EA, 0 ScrCmd_030 ScrCmd_209 diff --git a/res/field/scripts/script_0457.s b/res/field/scripts/script_0457.s index 0c361fe14c..438fa6e22c 100644 --- a/res/field/scripts/script_0457.s +++ b/res/field/scripts/script_0457.s @@ -14,16 +14,11 @@ _0022: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0069 - CompareVar 0x4000, 1 - GoToIf 1, _0069 - CompareVar 0x4000, 2 - GoToIf 1, _0069 - CompareVar 0x4000, 3 - GoToIf 1, _0073 - CompareVar 0x4000, 4 - GoToIf 1, _0073 + GoToIfEq 0x4000, 0, _0069 + GoToIfEq 0x4000, 1, _0069 + GoToIfEq 0x4000, 2, _0069 + GoToIfEq 0x4000, 3, _0073 + GoToIfEq 0x4000, 4, _0073 End _0069: diff --git a/res/field/scripts/script_0458.s b/res/field/scripts/script_0458.s index c4b611f197..889c456b4d 100644 --- a/res/field/scripts/script_0458.s +++ b/res/field/scripts/script_0458.s @@ -48,10 +48,8 @@ _0053: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007E - CompareVar 0x800C, 1 - GoToIf 1, _0264 + GoToIfEq 0x800C, 0, _007E + GoToIfEq 0x800C, 1, _0264 End _007E: @@ -64,27 +62,21 @@ _007E: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0264 + GoToIfEq 0x8000, 0xFF, _0264 ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _0259 + GoToIfEq 0x8001, 0, _0259 ScrCmd_2E5 0x8000, 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _026F + GoToIfEq 0x800C, 0, _026F ScrCmd_0D6 0, 0x8000 ScrCmd_02C 5 ScrCmd_2E6 0x8000, 0, 0x800C SetVar 0x8003, 0x800C - CompareVar 0x8003, -2 - GoToIf 1, _0264 + GoToIfEq 0x8003, -2, _0264 ScrCmd_2EA 0x8003, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _027A + GoToIfEq 0x800C, 0, _027A ScrCmd_1C8 0x800C, 0x8000 SetVar 0x8002, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _012F + GoToIfEq 0x800C, 4, _012F GoTo _0224 End @@ -93,8 +85,7 @@ _012F: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01E9 + GoToIfEq 0x800C, 1, _01E9 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_034 @@ -103,14 +94,12 @@ _012F: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 4 - GoToIf 1, _01E9 + GoToIfEq 0x8002, 4, _01E9 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01E9 + GoToIfEq 0x800C, 1, _01E9 ScrCmd_0D6 0, 0x8000 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C @@ -133,8 +122,7 @@ _01E9: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _020F + GoToIfEq 0x800C, 0, _020F GoTo _012F End diff --git a/res/field/scripts/script_0459.s b/res/field/scripts/script_0459.s index 2ccd87215e..6aeaa235cc 100644 --- a/res/field/scripts/script_0459.s +++ b/res/field/scripts/script_0459.s @@ -13,19 +13,16 @@ .short 0xFD13 _0022: - CheckFlag 0x104 - GoToIf 0, _002F + GoToIfUnset 0x104, _002F End _002F: ScrCmd_15B 3, 0x4000 - CompareVar 0x4000, 1 - GoToIf 1, _0044 + GoToIfEq 0x4000, 1, _0044 End _0044: - CheckFlag 0x103 - GoToIf 1, _0051 + GoToIfSet 0x103, _0051 End _0051: @@ -43,8 +40,7 @@ _0062: _0078: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x118 - GoToIf 1, _0133 + GoToIfSet 0x118, _0133 ScrCmd_02C 0 ScrCmd_034 ScrCmd_068 @@ -53,10 +49,8 @@ _0078: ScrCmd_02C 1 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 2 - GoToIf 1, _00F1 - CompareVar 0x8004, 3 - GoToIf 1, _00DF + GoToIfEq 0x8004, 2, _00F1 + GoToIfEq 0x8004, 3, _00DF GoTo _00C5 End @@ -101,8 +95,7 @@ _0133: ScrCmd_02C 3 ScrCmd_034 ScrCmd_1BD 0x8004 - CompareVar 0x8004, 2 - GoToIf 1, _0180 + GoToIfEq 0x8004, 2, _0180 GoTo _0166 End diff --git a/res/field/scripts/script_0460.s b/res/field/scripts/script_0460.s index 4c0b9ad48c..3d2313a8c2 100644 --- a/res/field/scripts/script_0460.s +++ b/res/field/scripts/script_0460.s @@ -22,8 +22,7 @@ _001D: ScrCmd_068 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0044 + GoToIfEq 0x800C, 1, _0044 ScrCmd_02C 2 GoTo _004F End diff --git a/res/field/scripts/script_0461.s b/res/field/scripts/script_0461.s index f65d0bc3c5..43daa301c1 100644 --- a/res/field/scripts/script_0461.s +++ b/res/field/scripts/script_0461.s @@ -19,8 +19,7 @@ _0010: ScrCmd_0CD 1 ScrCmd_0D6 2, 0x8002 ScrCmd_23A 0x8000, 0x8001, 0x8002 - CheckFlag 249 - GoToIf 1, _004B + GoToIfSet 249, _004B SetFlag 249 ScrCmd_02C 0 ScrCmd_034 @@ -44,12 +43,9 @@ _0056: _008A: ScrCmd_069 0x8005, 0x8006 - CompareVar 0x8005, 4 - GoToIf 1, _00BD - CompareVar 0x8005, 6 - GoToIf 1, _00C9 - CompareVar 0x8006, 5 - GoToIf 1, _00D5 + GoToIfEq 0x8005, 4, _00BD + GoToIfEq 0x8005, 6, _00C9 + GoToIfEq 0x8006, 5, _00D5 GoTo _00E1 _00BD: @@ -74,12 +70,9 @@ _00E1: _00ED: ScrCmd_069 0x8005, 0x8006 - CompareVar 0x8005, 4 - GoToIf 1, _0120 - CompareVar 0x8005, 6 - GoToIf 1, _012C - CompareVar 0x8006, 5 - GoToIf 1, _0138 + GoToIfEq 0x8005, 4, _0120 + GoToIfEq 0x8005, 6, _012C + GoToIfEq 0x8006, 5, _0138 GoTo _0144 _0120: @@ -103,130 +96,90 @@ _0144: Return _0150: - CompareVar 0x8001, 1 - GoToIf 1, _018A - CompareVar 0x8001, 2 - GoToIf 1, _019D - CompareVar 0x8001, 3 - GoToIf 1, _01B0 - CompareVar 0x8001, 4 - GoToIf 1, _01C3 + GoToIfEq 0x8001, 1, _018A + GoToIfEq 0x8001, 2, _019D + GoToIfEq 0x8001, 3, _01B0 + GoToIfEq 0x8001, 4, _01C3 GoTo _0574 _018A: - CompareVar 0x8000, 1 - GoToIf 1, _01D6 + GoToIfEq 0x8000, 1, _01D6 GoTo _0216 _019D: - CompareVar 0x8000, 1 - GoToIf 1, _0256 + GoToIfEq 0x8000, 1, _0256 GoTo _0296 _01B0: - CompareVar 0x8000, 1 - GoToIf 1, _02D6 + GoToIfEq 0x8000, 1, _02D6 GoTo _0316 _01C3: - CompareVar 0x8000, 1 - GoToIf 1, _0356 + GoToIfEq 0x8000, 1, _0356 GoTo _0396 _01D6: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _03FA - CompareVar 0x800C, 200 - GoToIf 4, _03F1 - CompareVar 0x800C, 150 - GoToIf 4, _03E8 - CompareVar 0x800C, 70 - GoToIf 4, _03DF + GoToIfGe 0x800C, 0xFF, _03FA + GoToIfGe 0x800C, 200, _03F1 + GoToIfGe 0x800C, 150, _03E8 + GoToIfGe 0x800C, 70, _03DF GoTo _03D6 _0216: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _0427 - CompareVar 0x800C, 200 - GoToIf 4, _041E - CompareVar 0x800C, 150 - GoToIf 4, _0415 - CompareVar 0x800C, 70 - GoToIf 4, _040C + GoToIfGe 0x800C, 0xFF, _0427 + GoToIfGe 0x800C, 200, _041E + GoToIfGe 0x800C, 150, _0415 + GoToIfGe 0x800C, 70, _040C GoTo _0403 _0256: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _0454 - CompareVar 0x800C, 200 - GoToIf 4, _044B - CompareVar 0x800C, 150 - GoToIf 4, _0442 - CompareVar 0x800C, 70 - GoToIf 4, _0439 + GoToIfGe 0x800C, 0xFF, _0454 + GoToIfGe 0x800C, 200, _044B + GoToIfGe 0x800C, 150, _0442 + GoToIfGe 0x800C, 70, _0439 GoTo _0430 _0296: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _0481 - CompareVar 0x800C, 200 - GoToIf 4, _0478 - CompareVar 0x800C, 150 - GoToIf 4, _046F - CompareVar 0x800C, 70 - GoToIf 4, _0466 + GoToIfGe 0x800C, 0xFF, _0481 + GoToIfGe 0x800C, 200, _0478 + GoToIfGe 0x800C, 150, _046F + GoToIfGe 0x800C, 70, _0466 GoTo _045D _02D6: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _04AE - CompareVar 0x800C, 200 - GoToIf 4, _04A5 - CompareVar 0x800C, 150 - GoToIf 4, _049C - CompareVar 0x800C, 70 - GoToIf 4, _0493 + GoToIfGe 0x800C, 0xFF, _04AE + GoToIfGe 0x800C, 200, _04A5 + GoToIfGe 0x800C, 150, _049C + GoToIfGe 0x800C, 70, _0493 GoTo _048A _0316: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _04DB - CompareVar 0x800C, 200 - GoToIf 4, _04D2 - CompareVar 0x800C, 150 - GoToIf 4, _04C9 - CompareVar 0x800C, 70 - GoToIf 4, _04C0 + GoToIfGe 0x800C, 0xFF, _04DB + GoToIfGe 0x800C, 200, _04D2 + GoToIfGe 0x800C, 150, _04C9 + GoToIfGe 0x800C, 70, _04C0 GoTo _04B7 _0356: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _0508 - CompareVar 0x800C, 200 - GoToIf 4, _04FF - CompareVar 0x800C, 150 - GoToIf 4, _04F6 - CompareVar 0x800C, 70 - GoToIf 4, _04ED + GoToIfGe 0x800C, 0xFF, _0508 + GoToIfGe 0x800C, 200, _04FF + GoToIfGe 0x800C, 150, _04F6 + GoToIfGe 0x800C, 70, _04ED GoTo _04E4 _0396: ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 4, _0535 - CompareVar 0x800C, 200 - GoToIf 4, _052C - CompareVar 0x800C, 150 - GoToIf 4, _0523 - CompareVar 0x800C, 70 - GoToIf 4, _051A + GoToIfGe 0x800C, 0xFF, _0535 + GoToIfGe 0x800C, 200, _052C + GoToIfGe 0x800C, 150, _0523 + GoToIfGe 0x800C, 70, _051A GoTo _0511 _03D6: @@ -391,24 +344,20 @@ _0535: _053E: ScrCmd_230 0x800C, 0x8002, 69 - CompareVar 0x800C, 0 - GoToIf 1, _0602 + GoToIfEq 0x800C, 0, _0602 GoTo _05A5 _0559: ScrCmd_230 0x800C, 0x8002, 69 - CompareVar 0x800C, 0 - GoToIf 1, _0633 + GoToIfEq 0x800C, 0, _0633 GoTo _05C4 _0574: ScrCmd_02C 50 ScrCmd_1B9 0x800C, 0x8002 - CompareVar 0x800C, 0xFF - GoToIf 0, _05E3 + GoToIfLt 0x800C, 0xFF, _05E3 ScrCmd_230 0x800C, 0x8002, 69 - CompareVar 0x800C, 0 - GoToIf 1, _0664 + GoToIfEq 0x800C, 0, _0664 GoTo _05E3 _05A5: diff --git a/res/field/scripts/script_0462.s b/res/field/scripts/script_0462.s index 93a59eb06f..0319f46478 100644 --- a/res/field/scripts/script_0462.s +++ b/res/field/scripts/script_0462.s @@ -43,8 +43,7 @@ _004C: _005F: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 253 - GoToIf 1, _0081 + GoToIfSet 253, _0081 SetFlag 253 ScrCmd_068 ScrCmd_02C 3 diff --git a/res/field/scripts/script_0463.s b/res/field/scripts/script_0463.s index a2d5ed2cdf..c0cad7e005 100644 --- a/res/field/scripts/script_0463.s +++ b/res/field/scripts/script_0463.s @@ -11,12 +11,9 @@ _0006: ScrCmd_068 ScrCmd_02C 0 ScrCmd_1B7 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _0044 - CompareVar 0x800C, 1 - GoToIf 1, _004F - CompareVar 0x800C, 2 - GoToIf 1, _005A + GoToIfEq 0x800C, 0, _0044 + GoToIfEq 0x800C, 1, _004F + GoToIfEq 0x800C, 2, _005A GoTo _0065 _0044: diff --git a/res/field/scripts/script_0464.s b/res/field/scripts/script_0464.s index 592b399674..42f30f047e 100644 --- a/res/field/scripts/script_0464.s +++ b/res/field/scripts/script_0464.s @@ -11,14 +11,12 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 202 - GoToIf 1, _0053 + GoToIfSet 202, _0053 ScrCmd_02C 0 SetVar 0x8004, 0x1A3 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005E + GoToIfEq 0x800C, 0, _005E ScrCmd_014 0x7FC SetFlag 202 GoTo _0053 @@ -40,29 +38,19 @@ _0068: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x161 - GoToIf 1, _012F + GoToIfSet 0x161, _012F SetFlag 0x161 ScrCmd_02C 2 ScrCmd_1B7 0x800C, 10 - CompareVar 0x800C, 0 - GoToIf 1, _0103 - CompareVar 0x800C, 1 - GoToIf 1, _0103 - CompareVar 0x800C, 2 - GoToIf 1, _0103 - CompareVar 0x800C, 3 - GoToIf 1, _0103 - CompareVar 0x800C, 4 - GoToIf 1, _010E - CompareVar 0x800C, 5 - GoToIf 1, _010E - CompareVar 0x800C, 6 - GoToIf 1, _010E - CompareVar 0x800C, 7 - GoToIf 1, _0119 - CompareVar 0x800C, 8 - GoToIf 1, _0119 + GoToIfEq 0x800C, 0, _0103 + GoToIfEq 0x800C, 1, _0103 + GoToIfEq 0x800C, 2, _0103 + GoToIfEq 0x800C, 3, _0103 + GoToIfEq 0x800C, 4, _010E + GoToIfEq 0x800C, 5, _010E + GoToIfEq 0x800C, 6, _010E + GoToIfEq 0x800C, 7, _0119 + GoToIfEq 0x800C, 8, _0119 GoTo _0124 _0103: diff --git a/res/field/scripts/script_0465.s b/res/field/scripts/script_0465.s index b82deecb3d..813f306f25 100644 --- a/res/field/scripts/script_0465.s +++ b/res/field/scripts/script_0465.s @@ -11,8 +11,7 @@ _000A: ScrCmd_060 ScrCmd_068 ScrCmd_134 14, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _003A + GoToIfNe 0x800C, 0, _003A ScrCmd_02C 0 SetVar 0x8004, 14 ScrCmd_014 0x7D9 @@ -33,8 +32,7 @@ _0045: ScrCmd_060 ScrCmd_068 ScrCmd_134 14, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0071 + GoToIfNe 0x800C, 0, _0071 GoTo _0066 _0066: diff --git a/res/field/scripts/script_0466.s b/res/field/scripts/script_0466.s index 846b2a619d..95b8a56309 100644 --- a/res/field/scripts/script_0466.s +++ b/res/field/scripts/script_0466.s @@ -10,12 +10,9 @@ _0012: ScrCmd_284 0x4000 - CompareVar 0x4000, 26 - GoToIf 4, _003F - CompareVar 0x4000, 10 - GoToIf 4, _0051 - CompareVar 0x4000, 10 - GoToIf 0, _0063 + GoToIfGe 0x4000, 26, _003F + GoToIfGe 0x4000, 10, _0051 + GoToIfLt 0x4000, 10, _0063 End _003F: @@ -35,12 +32,9 @@ _0063: _0075: ScrCmd_284 0x4000 - CompareVar 0x4000, 26 - GoToIf 4, _003F - CompareVar 0x4000, 10 - GoToIf 4, _0051 - CompareVar 0x4000, 10 - GoToIf 0, _0063 + GoToIfGe 0x4000, 26, _003F + GoToIfGe 0x4000, 10, _0051 + GoToIfLt 0x4000, 10, _0063 End _00A2: diff --git a/res/field/scripts/script_0467.s b/res/field/scripts/script_0467.s index 9a665fde5f..cd1b3b680b 100644 --- a/res/field/scripts/script_0467.s +++ b/res/field/scripts/script_0467.s @@ -9,17 +9,13 @@ _000A: ScrCmd_1B7 0x4032, 4 ScrCmd_238 15, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0062 + GoToIfEq 0x4000, 0, _0062 ScrCmd_238 16, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0062 + GoToIfEq 0x4000, 0, _0062 ScrCmd_238 17, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0062 + GoToIfEq 0x4000, 0, _0062 ScrCmd_238 18, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0062 + GoToIfEq 0x4000, 0, _0062 ClearFlag 0x2C2 End @@ -32,8 +28,7 @@ _0068: ScrCmd_060 ScrCmd_068 ScrCmd_284 0x4000 - CompareVar 0x4000, 26 - GoToIf 4, _008C + GoToIfGe 0x4000, 26, _008C ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0468.s b/res/field/scripts/script_0468.s index d99e3a3369..5776d79527 100644 --- a/res/field/scripts/script_0468.s +++ b/res/field/scripts/script_0468.s @@ -14,16 +14,11 @@ _0022: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0069 - CompareVar 0x4000, 1 - GoToIf 1, _007B - CompareVar 0x4000, 2 - GoToIf 1, _007B - CompareVar 0x4000, 3 - GoToIf 1, _007B - CompareVar 0x4000, 4 - GoToIf 1, _007B + GoToIfEq 0x4000, 0, _0069 + GoToIfEq 0x4000, 1, _007B + GoToIfEq 0x4000, 2, _007B + GoToIfEq 0x4000, 3, _007B + GoToIfEq 0x4000, 4, _007B End _0069: @@ -54,14 +49,12 @@ _00A0: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 205 - GoToIf 1, _00E5 + GoToIfSet 205, _00E5 ScrCmd_02C 1 SetVar 0x8004, 0x189 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00F0 + GoToIfEq 0x800C, 0, _00F0 ScrCmd_014 0x7FC SetFlag 205 GoTo _00E5 diff --git a/res/field/scripts/script_0470.s b/res/field/scripts/script_0470.s index 4b3bffc044..7fd714da13 100644 --- a/res/field/scripts/script_0470.s +++ b/res/field/scripts/script_0470.s @@ -13,10 +13,8 @@ _000E: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0039 - CompareVar 0x800C, 1 - GoToIf 1, _0066 + GoToIfEq 0x800C, 0, _0039 + GoToIfEq 0x800C, 1, _0066 End _0039: @@ -56,10 +54,8 @@ _0084: ScrCmd_060 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00AD - CompareVar 0x800C, 1 - GoToIf 1, _00E3 + GoToIfEq 0x800C, 0, _00AD + GoToIfEq 0x800C, 1, _00E3 End _00AD: diff --git a/res/field/scripts/script_0472.s b/res/field/scripts/script_0472.s index 919d0f606a..e5ab253034 100644 --- a/res/field/scripts/script_0472.s +++ b/res/field/scripts/script_0472.s @@ -9,11 +9,9 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 222 - GoToIf 1, _0039 + GoToIfSet 222, _0039 ScrCmd_07E 0x1AB, 1, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0044 + GoToIfEq 0x800C, 1, _0044 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -32,8 +30,7 @@ _0044: SetVar 0x8004, 0x12E SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0076 + GoToIfEq 0x800C, 0, _0076 ScrCmd_014 0x7FC SetFlag 222 GoTo _0039 diff --git a/res/field/scripts/script_0473.s b/res/field/scripts/script_0473.s index 2d58b625ec..1ec5e7770e 100644 --- a/res/field/scripts/script_0473.s +++ b/res/field/scripts/script_0473.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x13B - GoToIf 1, _0059 + GoToIfSet 0x13B, _0059 ScrCmd_02C 0 SetVar 0x8004, 247 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _004F + GoToIfEq 0x800C, 0, _004F SetFlag 0x13B SetFlag 0x25F ScrCmd_014 0x7E0 diff --git a/res/field/scripts/script_0475.s b/res/field/scripts/script_0475.s index 1385143bf8..a43bada85d 100644 --- a/res/field/scripts/script_0475.s +++ b/res/field/scripts/script_0475.s @@ -22,24 +22,19 @@ _001D: ScrCmd_068 SetVar 0x8004, 0x1BD ScrCmd_0D1 0, 0x8004 - CheckFlag 132 - GoToIf 1, _005E + GoToIfSet 132, _005E ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00A7 - CompareVar 0x800C, 1 - GoToIf 1, _009C + GoToIfEq 0x800C, 0, _00A7 + GoToIfEq 0x800C, 1, _009C End _005E: ScrCmd_0D1 0, 0x8004 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0086 - CompareVar 0x800C, 1 - GoToIf 1, _0091 + GoToIfEq 0x800C, 0, _0086 + GoToIfEq 0x800C, 1, _0091 End _0086: diff --git a/res/field/scripts/script_0476.s b/res/field/scripts/script_0476.s index f57445d300..2b9d744b24 100644 --- a/res/field/scripts/script_0476.s +++ b/res/field/scripts/script_0476.s @@ -12,8 +12,7 @@ _000A: ScrCmd_0CD 0 ScrCmd_0CF 1 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0031 + GoToIfEq 0x800C, 0, _0031 GoTo _003C End @@ -41,14 +40,10 @@ _0047: _006A: ScrCmd_069 0x8005, 0x8006 - CompareVar 0x8006, 5 - GoToIf 1, _00AC - CompareVar 0x8006, 6 - GoToIf 1, _00B8 - CompareVar 0x8006, 7 - GoToIf 1, _00C4 - CompareVar 0x8006, 8 - GoToIf 1, _00D0 + GoToIfEq 0x8006, 5, _00AC + GoToIfEq 0x8006, 6, _00B8 + GoToIfEq 0x8006, 7, _00C4 + GoToIfEq 0x8006, 8, _00D0 GoTo _00DC End @@ -79,14 +74,10 @@ _00DC: _00E8: ScrCmd_069 0x8005, 0x8006 - CompareVar 0x8006, 5 - GoToIf 1, _012A - CompareVar 0x8006, 6 - GoToIf 1, _0136 - CompareVar 0x8006, 7 - GoToIf 1, _0142 - CompareVar 0x8006, 8 - GoToIf 1, _014E + GoToIfEq 0x8006, 5, _012A + GoToIfEq 0x8006, 6, _0136 + GoToIfEq 0x8006, 7, _0142 + GoToIfEq 0x8006, 8, _014E GoTo _015A End diff --git a/res/field/scripts/script_0478.s b/res/field/scripts/script_0478.s index aa9a958dfa..fb80aa9921 100644 --- a/res/field/scripts/script_0478.s +++ b/res/field/scripts/script_0478.s @@ -10,8 +10,7 @@ _0012: ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _002C + GoToIfEq 0x4000, 0, _002C SetFlag 0x27F SetFlag 0x280 _002C: diff --git a/res/field/scripts/script_0479.s b/res/field/scripts/script_0479.s index 3e352866ba..315624a574 100644 --- a/res/field/scripts/script_0479.s +++ b/res/field/scripts/script_0479.s @@ -20,8 +20,7 @@ _0036: ClearFlag 0x995 SetFlag 0x9F3 - CompareVar 0x40F3, 0 - GoToIf 5, _004D + GoToIfNe 0x40F3, 0, _004D End _004D: @@ -30,8 +29,7 @@ _004D: End _005D: - CompareVar 0x40E0, 0x7D0 - GoToIf 1, _0074 + GoToIfEq 0x40E0, 0x7D0, _0074 ScrCmd_0CD 1 ScrCmd_0D5 2, 0x40E0 Return @@ -46,34 +44,27 @@ _007E: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009D + GoToIfEq 0x800C, 0, _009D GoTo _00D2 _009D: - CheckFlag 211 - GoToIf 1, _01D6 + GoToIfSet 211, _01D6 SetFlag 211 ScrCmd_0CD 0 ScrCmd_02C 21 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0107 - CompareVar 0x800C, 1 - GoToIf 1, _01CB + GoToIfEq 0x800C, 0, _0107 + GoToIfEq 0x800C, 1, _01CB End _00D2: - CheckFlag 211 - GoToIf 1, _01E2 + GoToIfSet 211, _01E2 SetFlag 211 ScrCmd_0CD 0 ScrCmd_02C 22 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0107 - CompareVar 0x800C, 1 - GoToIf 1, _01CB + GoToIfEq 0x800C, 0, _0107 + GoToIfEq 0x800C, 1, _01CB End _0107: @@ -99,31 +90,24 @@ _012B: ScrCmd_042 200, 2 ScrCmd_042 202, 4 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0110 - CompareVar 0x800C, 1 - GoToIf 1, _0119 - CompareVar 0x800C, 2 - GoToIf 1, _0122 + GoToIfEq 0x800C, 0, _0110 + GoToIfEq 0x800C, 1, _0119 + GoToIfEq 0x800C, 2, _0122 GoTo _0172 _0172: ScrCmd_02C 28 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01CB + GoToIfEq 0x800C, 1, _01CB _0186: SetVar 0x800C, 0 ScrCmd_252 0x800C - CompareVar 0x800C, 6 - GoToIf 0, _02AD + GoToIfLt 0x800C, 6, _02AD SetVar 0x800C, 0 ScrCmd_254 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0299 + GoToIfEq 0x800C, 0, _0299 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0231 + GoToIfEq 0x800C, 0, _0231 GoTo _0245 _01CB: @@ -149,12 +133,9 @@ _01EE: ScrCmd_042 204, 1 ScrCmd_042 205, 2 ScrCmd_043 - CompareVar 0x800C, 0 - GoToIf 1, _0186 - CompareVar 0x800C, 1 - GoToIf 1, _02A4 - CompareVar 0x800C, 2 - GoToIf 1, _01CB + GoToIfEq 0x800C, 0, _0186 + GoToIfEq 0x800C, 1, _02A4 + GoToIfEq 0x800C, 2, _01CB GoTo _01CB _0231: @@ -242,8 +223,7 @@ _02F8: ScrCmd_0D5 3, 0x800C ScrCmd_02C 38 ScrCmd_256 3, 0x800C - CompareVar 0x800C, 0x40E0 - GoToIf 2, _035B + GoToIfGt 0x800C, 0x40E0, _035B ScrCmd_02C 40 Call _07BE GoTo _0370 @@ -257,12 +237,10 @@ _035B: _0370: ScrCmd_02C 41 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03AB + GoToIfEq 0x800C, 0, _03AB ScrCmd_02C 46 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _039E + GoToIfEq 0x800C, 0, _039E GoTo _0370 _039E: @@ -324,10 +302,8 @@ _0413: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - CompareVar 0x800C, 2 - GoToIf 1, _0454 - CompareVar 0x800C, 1 - GoToIf 1, _0449 + GoToIfEq 0x800C, 2, _0454 + GoToIfEq 0x800C, 1, _0449 GoTo _043E _043E: @@ -401,8 +377,7 @@ _04B4: WaitMovement ScrCmd_14D 0x4000 ScrCmd_0CD 0 - CompareVar 0x4000, 0 - GoToIf 1, _04E4 + GoToIfEq 0x4000, 0, _04E4 GoTo _04ED _04E4: @@ -464,22 +439,17 @@ _057C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x400A, 1 - GoToIf 1, _062C - CompareVar 0x400A, 2 - GoToIf 1, _063C + GoToIfEq 0x400A, 1, _062C + GoToIfEq 0x400A, 2, _063C ScrCmd_134 21, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0657 + GoToIfEq 0x800C, 1, _0657 ScrCmd_02C 5 ScrCmd_02C 6 ScrCmd_134 20, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05FB + GoToIfEq 0x800C, 1, _05FB ScrCmd_02C 10 ScrCmd_1C0 0x800C, 143 - CompareVar 0x800C, 0 - GoToIf 1, _064C + GoToIfEq 0x800C, 0, _064C ScrCmd_02C 11 SetVar 0x8004, 20 ScrCmd_014 0x7D9 @@ -492,8 +462,7 @@ _057C: _05FB: ScrCmd_02C 13 ScrCmd_1C0 0x800C, 0x160 - CompareVar 0x800C, 0 - GoToIf 1, _064C + GoToIfEq 0x800C, 0, _064C ScrCmd_02C 14 SetVar 0x8004, 21 ScrCmd_014 0x7D9 @@ -537,19 +506,13 @@ _0662: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4009, 1 - GoToIf 1, _06CF + GoToIfEq 0x4009, 1, _06CF ScrCmd_26E 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _06DA - CompareVar 0x800C, 5 - GoToIf 1, _0706 - CompareVar 0x800C, 1 - GoToIf 1, _0732 - CompareVar 0x800C, 2 - GoToIf 1, _0756 - CompareVar 0x800C, 3 - GoToIf 1, _077A + GoToIfEq 0x800C, 4, _06DA + GoToIfEq 0x800C, 5, _0706 + GoToIfEq 0x800C, 1, _0732 + GoToIfEq 0x800C, 2, _0756 + GoToIfEq 0x800C, 3, _077A GoTo _06C4 End @@ -571,8 +534,7 @@ _06DA: SetVar 0x8004, 97 SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06C4 + GoToIfEq 0x800C, 0, _06C4 ScrCmd_02C 67 GoTo _079E End @@ -581,8 +543,7 @@ _0706: SetVar 0x8004, 98 SetVar 0x8005, 1 ScrCmd_1D3 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06C4 + GoToIfEq 0x800C, 0, _06C4 ScrCmd_02C 68 GoTo _079E End @@ -590,8 +551,7 @@ _0706: _0732: SetVar 0x8004, 14 ScrCmd_1D6 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _06C4 + GoToIfEq 0x800C, 1, _06C4 ScrCmd_02C 69 GoTo _07AE End @@ -599,8 +559,7 @@ _0732: _0756: SetVar 0x8004, 15 ScrCmd_1D6 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _06C4 + GoToIfEq 0x800C, 1, _06C4 ScrCmd_02C 70 GoTo _07AE End @@ -608,8 +567,7 @@ _0756: _077A: SetVar 0x8004, 16 ScrCmd_1D6 0x8004, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _06C4 + GoToIfEq 0x800C, 1, _06C4 ScrCmd_02C 71 GoTo _07AE End diff --git a/res/field/scripts/script_0480.s b/res/field/scripts/script_0480.s index 3a2fb98168..0ace87950f 100644 --- a/res/field/scripts/script_0480.s +++ b/res/field/scripts/script_0480.s @@ -10,22 +10,18 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x137 - GoToIf 1, _0114 - CheckFlag 0xAAE - GoToIf 1, _016F + GoToIfSet 0x137, _0114 + GoToIfSet 0xAAE, _016F ScrCmd_277 0x8000 ScrCmd_0D5 0, 0x8000 ScrCmd_177 0x8002 SetVar 0x8003, 0 _003B: ScrCmd_278 0x8001, 0x8003 - CompareVar 0x8000, 0x8001 - GoToIf 1, _006D + GoToIfEq 0x8000, 0x8001, _006D AddVar 0x8003, 1 SubVar 0x8002, 1 - CompareVar 0x8002, 0 - GoToIf 5, _003B + GoToIfNe 0x8002, 0, _003B GoTo _0164 _006D: @@ -40,8 +36,7 @@ _006D: ScrCmd_02C 1 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0105 + GoToIfEq 0x800C, 0, _0105 GoTo _00C2 _00C2: @@ -49,8 +44,7 @@ _00C2: ClearFlag 0x137 SetFlag 0xAAE AddVar 0x4108, 1 - CompareVar 0x4108, 3 - GoToIf 0, _00E7 + GoToIfLt 0x4108, 3, _00E7 SetVar 0x4108, 0 _00E7: ScrCmd_034 @@ -88,8 +82,7 @@ _0114: ScrCmd_02C 3 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0105 + GoToIfEq 0x800C, 0, _0105 GoTo _00C2 _0164: diff --git a/res/field/scripts/script_0481.s b/res/field/scripts/script_0481.s index 287639ffa9..8b09066c17 100644 --- a/res/field/scripts/script_0481.s +++ b/res/field/scripts/script_0481.s @@ -14,16 +14,11 @@ _0022: ScrCmd_1B6 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0069 - CompareVar 0x4000, 1 - GoToIf 1, _0069 - CompareVar 0x4000, 2 - GoToIf 1, _0069 - CompareVar 0x4000, 3 - GoToIf 1, _0073 - CompareVar 0x4000, 4 - GoToIf 1, _0073 + GoToIfEq 0x4000, 0, _0069 + GoToIfEq 0x4000, 1, _0069 + GoToIfEq 0x4000, 2, _0069 + GoToIfEq 0x4000, 3, _0073 + GoToIfEq 0x4000, 4, _0073 End _0069: @@ -40,14 +35,12 @@ _007D: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 206 - GoToIf 1, _00C2 + GoToIfSet 206, _00C2 ScrCmd_02C 0 SetVar 0x8004, 0x17F SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00CD + GoToIfEq 0x800C, 0, _00CD ScrCmd_014 0x7FC SetFlag 206 GoTo _00C2 diff --git a/res/field/scripts/script_0483.s b/res/field/scripts/script_0483.s index 841940807a..4dfdc30d6a 100644 --- a/res/field/scripts/script_0483.s +++ b/res/field/scripts/script_0483.s @@ -15,8 +15,7 @@ _0010: ScrCmd_060 ScrCmd_068 ScrCmd_1C0 0x800C, 223 - CompareVar 0x800C, 0 - GoToIf 1, _00CF + GoToIfEq 0x800C, 0, _00CF ScrCmd_02C 1 ScrCmd_034 ScrCmd_0BC 6, 1, 0, 0 @@ -26,23 +25,18 @@ _0010: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 0xFF - GoToIf 1, _011E + GoToIfEq 0x8002, 0xFF, _011E ScrCmd_198 0x8002, 0x8001 - CompareVar 0x8001, 223 - GoToIf 5, _0108 + GoToIfNe 0x8001, 223, _0108 ScrCmd_1C1 0x800C, 0x8002 - CompareVar 0x800C, 0 - GoToIf 1, _00ED - CompareVar 0x800C, 1 - GoToIf 1, _00DA + GoToIfEq 0x800C, 0, _00ED + GoToIfEq 0x800C, 1, _00DA ScrCmd_1C3 0, 1, 0x8002 ScrCmd_02C 2 SetVar 0x8004, 6 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0113 + GoToIfEq 0x800C, 0, _0113 ScrCmd_014 0x7FC ScrCmd_1C2 0x8002 ScrCmd_02C 3 diff --git a/res/field/scripts/script_0485.s b/res/field/scripts/script_0485.s index 5dcd4d6720..8f8f8d80b7 100644 --- a/res/field/scripts/script_0485.s +++ b/res/field/scripts/script_0485.s @@ -13,27 +13,21 @@ _001A: CompareVar 0x4057, 1 CallIf 1, _00AA - CheckFlag 0x12D - GoToIf 1, _0080 + GoToIfSet 0x12D, _0080 ScrCmd_166 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0080 + GoToIfEq 0x4000, 0, _0080 ScrCmd_22D 2, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0080 + GoToIfEq 0x4000, 0, _0080 ScrCmd_07E 0x1C4, 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0080 + GoToIfEq 0x4000, 0, _0080 ScrCmd_28B 1, 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0080 + GoToIfEq 0x4000, 0, _0080 ClearFlag 0x252 _0080: End _0082: - CheckFlag 0x12D - GoToIf 1, _009A + GoToIfSet 0x12D, _009A CompareVar 0x408D, 1 CallIf 1, _009C _009A: @@ -59,8 +53,7 @@ _00B8: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x12D - GoToIf 1, _00D6 + GoToIfSet 0x12D, _00D6 ScrCmd_02C 7 ScrCmd_031 ScrCmd_034 @@ -76,16 +69,14 @@ _00D6: End _00E4: - CheckFlag 0x12D - GoToIf 1, _022D + GoToIfSet 0x12D, _022D ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 SetVar 0x408D, 1 ScrCmd_0CD 0 ScrCmd_14D 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0219 + GoToIfEq 0x800C, 1, _0219 ScrCmd_02C 0 _0114: ScrCmd_034 @@ -99,15 +90,13 @@ _0124: ScrCmd_271 0x800C ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 1 - GoToIf 1, _0222 + GoToIfEq 0x800C, 1, _0222 ScrCmd_0CD 0 ScrCmd_272 1 ScrCmd_02C 3 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 1 - GoToIf 1, _0124 + GoToIfEq 0x800C, 1, _0124 Call _029A ScrCmd_003 15, 0x800C ScrCmd_054 0, 10 @@ -172,10 +161,8 @@ _022D: _0240: ScrCmd_069 0x8000, 0x8001 SetVar 0x8008, 0x8000 - CompareVar 0x8008, 0x38D - GoToIf 1, _0272 - CompareVar 0x8008, 0x38E - GoToIf 1, _0286 + GoToIfEq 0x8008, 0x38D, _0272 + GoToIfEq 0x8008, 0x38E, _0286 ApplyMovement 0xFF, _0328 WaitMovement Return @@ -357,12 +344,9 @@ _0458: ScrCmd_060 ClearFlag 0x2CA ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x1F0 - GoToIf 1, _048D - CompareVar 0x8005, 0x1F1 - GoToIf 1, _04AF - CompareVar 0x8005, 0x1F2 - GoToIf 1, _04D1 + GoToIfEq 0x8005, 0x1F0, _048D + GoToIfEq 0x8005, 0x1F1, _04AF + GoToIfEq 0x8005, 0x1F2, _04D1 End _048D: @@ -398,12 +382,9 @@ _04F3: ScrCmd_02C 9 ScrCmd_034 ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x1F0 - GoToIf 1, _0531 - CompareVar 0x8005, 0x1F1 - GoToIf 1, _054B - CompareVar 0x8005, 0x1F2 - GoToIf 1, _0565 + GoToIfEq 0x8005, 0x1F0, _0531 + GoToIfEq 0x8005, 0x1F1, _054B + GoToIfEq 0x8005, 0x1F2, _0565 End _0531: @@ -484,8 +465,7 @@ _05F4: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x12D - GoToIf 1, _061C + GoToIfSet 0x12D, _061C ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_0487.s b/res/field/scripts/script_0487.s index 15116ca130..5d7f449dc7 100644 --- a/res/field/scripts/script_0487.s +++ b/res/field/scripts/script_0487.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 217 - GoToIf 1, _004B + GoToIfSet 217, _004B ScrCmd_02C 0 SetVar 0x8004, 30 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0056 + GoToIfEq 0x800C, 0, _0056 ScrCmd_014 0x7FC SetFlag 217 GoTo _004B diff --git a/res/field/scripts/script_0489.s b/res/field/scripts/script_0489.s index ada65a42db..fc36d446a8 100644 --- a/res/field/scripts/script_0489.s +++ b/res/field/scripts/script_0489.s @@ -241,10 +241,8 @@ _0212: ScrCmd_0CD 0 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0243 - CompareVar 0x800C, 1 - GoToIf 1, _0238 + GoToIfEq 0x800C, 0, _0243 + GoToIfEq 0x800C, 1, _0238 End _0238: diff --git a/res/field/scripts/script_0490.s b/res/field/scripts/script_0490.s index a7a3ff6708..1c3326da8a 100644 --- a/res/field/scripts/script_0490.s +++ b/res/field/scripts/script_0490.s @@ -11,10 +11,8 @@ _0006: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0031 - CompareVar 0x800C, 1 - GoToIf 1, _0079 + GoToIfEq 0x800C, 0, _0031 + GoToIfEq 0x800C, 1, _0079 End _0031: @@ -29,10 +27,8 @@ _0031: ScrCmd_0BD ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0031 - CompareVar 0x800C, 1 - GoToIf 1, _0079 + GoToIfEq 0x800C, 0, _0031 + GoToIfEq 0x800C, 1, _0079 End _0079: diff --git a/res/field/scripts/script_0491.s b/res/field/scripts/script_0491.s index 03905bb285..c19cb051bd 100644 --- a/res/field/scripts/script_0491.s +++ b/res/field/scripts/script_0491.s @@ -12,10 +12,8 @@ _0012: CompareVar 0x406B, 0x122 CallIf 5, _003F ScrCmd_32B 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0067 - CompareVar 0x4001, 1 - GoToIf 1, _0071 + GoToIfEq 0x4001, 0, _0067 + GoToIfEq 0x4001, 1, _0071 End _003F: @@ -24,10 +22,8 @@ _003F: _0047: ScrCmd_32B 0x4001 - CompareVar 0x4001, 0 - GoToIf 1, _0067 - CompareVar 0x4001, 1 - GoToIf 1, _0071 + GoToIfEq 0x4001, 0, _0067 + GoToIfEq 0x4001, 1, _0071 End _0067: diff --git a/res/field/scripts/script_0493.s b/res/field/scripts/script_0493.s index 5784e78701..52573dd2cf 100644 --- a/res/field/scripts/script_0493.s +++ b/res/field/scripts/script_0493.s @@ -10,20 +10,17 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x108 - GoToIf 1, _003B + GoToIfSet 0x108, _003B SetFlag 0x108 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0055 + GoToIfEq 0x800C, 0, _0055 GoTo _028F _003B: ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0055 + GoToIfEq 0x800C, 0, _0055 GoTo _028F _0055: @@ -36,49 +33,39 @@ _0055: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _028F + GoToIfEq 0x8000, 0xFF, _028F ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _02A5 + GoToIfEq 0x8001, 0, _02A5 Call _0195 - CompareVar 0x800C, 0 - GoToIf 1, _029A + GoToIfEq 0x800C, 0, _029A SetVar 0x8002, 0x800C Call _0251 - CompareVar 0x800C, 1 - GoToIf 1, _02BB + GoToIfEq 0x800C, 1, _02BB ScrCmd_1B9 0x800C, 0x8000 - CompareVar 0x800C, 0xFF - GoToIf 0, _02B0 + GoToIfLt 0x800C, 0xFF, _02B0 ScrCmd_0D0 0, 0x8000 - CompareVar 0x8002, 1 - GoToIf 1, _00FE - CompareVar 0x8002, 2 - GoToIf 1, _011E + GoToIfEq 0x8002, 1, _00FE + GoToIfEq 0x8002, 2, _011E GoTo _013E _00FE: ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _028F + GoToIfEq 0x800C, 1, _028F SetVar 0x8003, 0x133 GoTo _015E _011E: ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _028F + GoToIfEq 0x800C, 1, _028F SetVar 0x8003, 0x134 GoTo _015E _013E: ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _028F + GoToIfEq 0x800C, 1, _028F SetVar 0x8003, 0x152 GoTo _015E @@ -91,36 +78,23 @@ _015E: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _028F + GoToIfEq 0x800C, 0xFF, _028F ScrCmd_061 End _0195: - CompareVar 0x8001, 6 - GoToIf 1, _0239 - CompareVar 0x8001, 157 - GoToIf 1, _0239 - CompareVar 0x8001, 0x101 - GoToIf 1, _0239 - CompareVar 0x8001, 0x188 - GoToIf 1, _0239 - CompareVar 0x8001, 9 - GoToIf 1, _0241 - CompareVar 0x8001, 160 - GoToIf 1, _0241 - CompareVar 0x8001, 0x104 - GoToIf 1, _0241 - CompareVar 0x8001, 0x18B - GoToIf 1, _0241 - CompareVar 0x8001, 3 - GoToIf 1, _0249 - CompareVar 0x8001, 154 - GoToIf 1, _0249 - CompareVar 0x8001, 254 - GoToIf 1, _0249 - CompareVar 0x8001, 0x185 - GoToIf 1, _0249 + GoToIfEq 0x8001, 6, _0239 + GoToIfEq 0x8001, 157, _0239 + GoToIfEq 0x8001, 0x101, _0239 + GoToIfEq 0x8001, 0x188, _0239 + GoToIfEq 0x8001, 9, _0241 + GoToIfEq 0x8001, 160, _0241 + GoToIfEq 0x8001, 0x104, _0241 + GoToIfEq 0x8001, 0x18B, _0241 + GoToIfEq 0x8001, 3, _0249 + GoToIfEq 0x8001, 154, _0249 + GoToIfEq 0x8001, 254, _0249 + GoToIfEq 0x8001, 0x185, _0249 SetVar 0x800C, 0 Return @@ -137,10 +111,8 @@ _0249: Return _0251: - CompareVar 0x8002, 1 - GoToIf 1, _0271 - CompareVar 0x8002, 2 - GoToIf 1, _027B + GoToIfEq 0x8002, 1, _0271 + GoToIfEq 0x8002, 2, _027B GoTo _0285 _0271: diff --git a/res/field/scripts/script_0494.s b/res/field/scripts/script_0494.s index f5be72efa8..d7d26d2a8d 100644 --- a/res/field/scripts/script_0494.s +++ b/res/field/scripts/script_0494.s @@ -15,10 +15,8 @@ _0016: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0041 - CompareVar 0x800C, 1 - GoToIf 1, _004C + GoToIfEq 0x800C, 0, _0041 + GoToIfEq 0x800C, 1, _004C End _0041: diff --git a/res/field/scripts/script_0495.s b/res/field/scripts/script_0495.s index e5ae0cc637..1ad7dc9812 100644 --- a/res/field/scripts/script_0495.s +++ b/res/field/scripts/script_0495.s @@ -10,21 +10,18 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 218 - GoToIf 1, _0079 + GoToIfSet 218, _0079 ScrCmd_02C 0 SetVar 0x8004, 92 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0084 + GoToIfEq 0x800C, 0, _0084 ScrCmd_014 0x7FC SetFlag 218 SetVar 0x8004, 92 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0079 + GoToIfEq 0x800C, 0, _0079 ScrCmd_02C 1 ScrCmd_014 0x7FC GoTo _0079 diff --git a/res/field/scripts/script_0497.s b/res/field/scripts/script_0497.s index 8ff2e32b39..35acf65441 100644 --- a/res/field/scripts/script_0497.s +++ b/res/field/scripts/script_0497.s @@ -91,8 +91,7 @@ _012B: ScrCmd_02C 5 ScrCmd_03E 0x800C ScrCmd_034 - CompareVar 0x800C, 0 - GoToIf 5, _0174 + GoToIfNe 0x800C, 0, _0174 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_0BE 125, 0, 5, 2, 1 @@ -118,10 +117,8 @@ _0178: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 0, 0x8004 SetVar 0x8005, 0 CompareVar 0x8004, 6 @@ -158,10 +155,8 @@ _0242: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 0, 0x8004 SetVar 0x8005, 0 CompareVar 0x8004, 6 @@ -198,10 +193,8 @@ _030C: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 1, 0x8004 SetVar 0x8005, 1 CompareVar 0x8004, 6 @@ -238,10 +231,8 @@ _03D6: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 1, 0x8004 SetVar 0x8005, 1 CompareVar 0x8004, 6 @@ -278,10 +269,8 @@ _04A0: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 2, 0x8004 SetVar 0x8005, 2 CompareVar 0x8004, 6 @@ -318,10 +307,8 @@ _056A: ScrCmd_042 192, 4 ScrCmd_043 ScrCmd_034 - CompareVar 0x800C, 4 - GoToIf 1, _06C2 - CompareVar 0x800C, -2 - GoToIf 1, _06C2 + GoToIfEq 0x800C, 4, _06C2 + GoToIfEq 0x800C, -2, _06C2 ScrCmd_210 2, 0x8004 SetVar 0x8005, 2 CompareVar 0x8004, 6 diff --git a/res/field/scripts/script_0498.s b/res/field/scripts/script_0498.s index 26f40b1e81..6ca70550b0 100644 --- a/res/field/scripts/script_0498.s +++ b/res/field/scripts/script_0498.s @@ -9,12 +9,9 @@ _0006: SetVar 0x800C, 0 ScrCmd_20A 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0043 - CompareVar 0x8008, 1 - GoToIf 1, _0047 - CompareVar 0x8008, 2 - GoToIf 1, _0050 + GoToIfEq 0x8008, 0, _0043 + GoToIfEq 0x8008, 1, _0047 + GoToIfEq 0x8008, 2, _0050 GoTo _0059 _0043: diff --git a/res/field/scripts/script_0499.s b/res/field/scripts/script_0499.s index 36ddd8b0e3..e03ec0b6bb 100644 --- a/res/field/scripts/script_0499.s +++ b/res/field/scripts/script_0499.s @@ -10,8 +10,7 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_294 21, 1 - CheckFlag 114 - GoToIf 1, _0031 + GoToIfSet 114, _0031 SetFlag 114 ScrCmd_0D5 0, 1 ScrCmd_02C 15 @@ -33,10 +32,8 @@ _0041: ScrCmd_042 4, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0085 - CompareVar 0x8008, 1 - GoToIf 1, _015D + GoToIfEq 0x8008, 0, _0085 + GoToIfEq 0x8008, 1, _015D GoTo _0152 End @@ -44,11 +41,9 @@ _0085: ScrCmd_0D5 2, 1 ScrCmd_02C 7 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0152 + GoToIfEq 0x800C, 1, _0152 ScrCmd_29A 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0147 + GoToIfEq 0x800C, 0, _0147 ScrCmd_299 1 ScrCmd_296 ScrCmd_02C 10 @@ -66,8 +61,7 @@ _0085: ScrCmd_0BD SetVar 0x8000, 0 Call _017A - CompareVar 0x8000, 0 - GoToIf 1, _01AB + GoToIfEq 0x8000, 0, _01AB ScrCmd_0D5 0, 0x8000 ScrCmd_02C 11 CompareVar 0x4001, 0 @@ -127,8 +121,7 @@ _01AB: End _01B6: - CompareVar 0x4001, 1 - GoToIf 2, _01CE + GoToIfGt 0x4001, 1, _01CE ScrCmd_0D1 0, 0x4000 GoTo _01D3 @@ -137,8 +130,7 @@ _01CE: _01D3: ScrCmd_0D5 1, 0x4001 ScrCmd_07D 0x4000, 0x4001, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0294 + GoToIfEq 0x800C, 0, _0294 ScrCmd_04E 0x486 ScrCmd_02C 13 ScrCmd_07B 0x4000, 0x4001, 0x800C @@ -146,8 +138,7 @@ _01D3: Return _0200: - CompareVar 0x4003, 1 - GoToIf 2, _0218 + GoToIfGt 0x4003, 1, _0218 ScrCmd_0D1 0, 0x4002 GoTo _021D @@ -156,8 +147,7 @@ _0218: _021D: ScrCmd_0D5 1, 0x4003 ScrCmd_07D 0x4002, 0x4003, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0294 + GoToIfEq 0x800C, 0, _0294 ScrCmd_04E 0x486 ScrCmd_02C 13 ScrCmd_07B 0x4002, 0x4003, 0x800C @@ -165,8 +155,7 @@ _021D: Return _024A: - CompareVar 0x4005, 1 - GoToIf 2, _0262 + GoToIfGt 0x4005, 1, _0262 ScrCmd_0D1 0, 0x4004 GoTo _0267 @@ -175,8 +164,7 @@ _0262: _0267: ScrCmd_0D5 1, 0x4005 ScrCmd_07D 0x4004, 0x4005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0294 + GoToIfEq 0x800C, 0, _0294 ScrCmd_04E 0x486 ScrCmd_02C 13 ScrCmd_07B 0x4004, 0x4005, 0x800C diff --git a/res/field/scripts/script_0500.s b/res/field/scripts/script_0500.s index 9ea1df903f..795c2ffd9a 100644 --- a/res/field/scripts/script_0500.s +++ b/res/field/scripts/script_0500.s @@ -21,10 +21,8 @@ _002E: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D Call _032B GoTo _002E End @@ -40,10 +38,8 @@ _007C: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D Call _032B GoTo _007C End @@ -59,10 +55,8 @@ _00CA: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D Call _032B GoTo _00CA End @@ -78,13 +72,10 @@ _0118: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D ScrCmd_2CC 1, 0x8001, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0174 + GoToIfEq 0x800C, 0, _0174 ScrCmd_2CC 2, 0x8001, 0x800C ScrCmd_0DA 0, 0x800C, 0, 0 ScrCmd_02C 7 @@ -105,10 +96,8 @@ _017F: _0199: Call _02BD - CompareVar 0x8002, 9 - GoToIf 1, _0118 - CompareVar 0x8002, -2 - GoToIf 1, _0118 + GoToIfEq 0x8002, 9, _0118 + GoToIfEq 0x8002, -2, _0118 SetVar 0x8003, 0 SetVar 0x8006, 0 SetVar 0x8007, 0 @@ -117,8 +106,7 @@ _0199: _01D3: ScrCmd_2DE 0x8001, 0x8002, 0x8003, 0x8006, 0x8007 - CompareVar 0x8003, -2 - GoToIf 1, _0199 + GoToIfEq 0x8003, -2, _0199 Call _032B ScrCmd_02C 6 GoTo _01D3 @@ -135,10 +123,8 @@ _0211: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D Call _032B GoTo _0211 End @@ -154,10 +140,8 @@ _025F: Call _0299 Call _029E SetVar 0x8008, 0x8001 - CompareVar 0x8008, 3 - GoToIf 1, _031D - CompareVar 0x8008, -2 - GoToIf 1, _031D + GoToIfEq 0x8008, 3, _031D + GoToIfEq 0x8008, -2, _031D Call _032B GoTo _025F End diff --git a/res/field/scripts/script_0501.s b/res/field/scripts/script_0501.s index f45ae9a5d4..64189f3c8a 100644 --- a/res/field/scripts/script_0501.s +++ b/res/field/scripts/script_0501.s @@ -12,12 +12,9 @@ _000A: ScrCmd_068 ScrCmd_16D ScrCmd_16E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _004A - CompareVar 0x800C, 2 - GoToIf 1, _00BE - CompareVar 0x800C, 3 - GoToIf 1, _00CB + GoToIfEq 0x800C, 1, _004A + GoToIfEq 0x800C, 2, _00BE + GoToIfEq 0x800C, 3, _00CB ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -27,12 +24,10 @@ _000A: _004A: ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0083 + GoToIfEq 0x800C, 0, _0083 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0083 + GoToIfEq 0x800C, 0, _0083 ScrCmd_02C 3 ScrCmd_031 ScrCmd_034 @@ -43,8 +38,7 @@ _004A: _0083: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 5, _009F + GoToIfNe 0x800C, 6, _009F ScrCmd_02C 4 ScrCmd_031 ScrCmd_034 @@ -112,16 +106,12 @@ _0124: ScrCmd_068 ScrCmd_072 20, 2 ScrCmd_16E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02E2 - CompareVar 0x800C, 2 - GoToIf 1, _0309 - CompareVar 0x800C, 3 - GoToIf 1, _04A0 + GoToIfEq 0x800C, 1, _02E2 + GoToIfEq 0x800C, 2, _0309 + GoToIfEq 0x800C, 3, _04A0 ScrCmd_02C 15 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _017E + GoToIfEq 0x800C, 0, _017E ScrCmd_02C 20 ScrCmd_031 ScrCmd_034 @@ -131,11 +121,9 @@ _0124: _017E: ScrCmd_19A 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02BB + GoToIfEq 0x800C, 1, _02BB ScrCmd_19C 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _02D5 + GoToIfEq 0x800C, 2, _02D5 ScrCmd_02C 16 ScrCmd_034 ScrCmd_073 @@ -145,8 +133,7 @@ _017E: _01B9: ScrCmd_290 0x800C ScrCmd_291 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01DE + GoToIfEq 0x800C, 0, _01DE ScrCmd_196 0x8000 ScrCmd_197 0x800C GoTo _01B9 @@ -156,23 +143,18 @@ _01DE: ScrCmd_072 20, 2 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0292 + GoToIfEq 0x8000, 0xFF, _0292 ScrCmd_31E 0x8000, 0x800C - CompareVar 0x800C, 0xFF - GoToIf 1, _04EF + GoToIfEq 0x800C, 0xFF, _04EF ScrCmd_198 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0285 + GoToIfEq 0x800C, 0, _0285 ScrCmd_19B 0x800C, 0x8000 - CompareVar 0x800C, 0 - GoToIf 1, _02C8 + GoToIfEq 0x800C, 0, _02C8 ScrCmd_1AF 0, 0x8000, 0x8001 ScrCmd_1B0 0x8000 SetFlag 254 ScrCmd_16E 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _025F + GoToIfEq 0x800C, 2, _025F GoTo _0270 _025F: @@ -210,8 +192,7 @@ _0292: _029F: ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _017E + GoToIfEq 0x800C, 0, _017E GoTo _0292 End @@ -263,22 +244,18 @@ _0309: Call _02F4 ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _017E + GoToIfEq 0x800C, 0, _017E ScrCmd_02C 32 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0346 + GoToIfEq 0x800C, 0, _0346 GoTo _0292 _0346: ScrCmd_177 0x800C - CompareVar 0x800C, 6 - GoToIf 1, _045E + GoToIfEq 0x800C, 6, _045E ScrCmd_16E 0x800C SetVar 0x8001, 0 - CompareVar 0x800C, 2 - GoToIf 1, _03BE + GoToIfEq 0x800C, 2, _03BE ScrCmd_040 1, 1, 0, 1, 0x8001 ScrCmd_1BC 0, 1, 2, 0 ScrCmd_042 134, 0 @@ -287,24 +264,20 @@ _0346: ScrCmd_042 136, 2 ScrCmd_043 SetVar 0x8008, 0x8001 - CompareVar 0x8008, 0 - GoToIf 1, _03BE - CompareVar 0x8008, 1 - GoToIf 1, _03BE + GoToIfEq 0x8008, 0, _03BE + GoToIfEq 0x8008, 1, _03BE GoTo _0292 _03BE: ScrCmd_1AA 0x8004, 0x8001 ScrCmd_02C 28 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03DE + GoToIfEq 0x800C, 0, _03DE GoTo _0292 _03DE: ScrCmd_1AB 0x800C, 0x8004 - CompareVar 0x800C, 1 - GoToIf 1, _03FE + GoToIfEq 0x800C, 1, _03FE ScrCmd_02C 21 ScrCmd_031 ScrCmd_034 @@ -326,15 +299,13 @@ _03FE: ScrCmd_02C 30 ScrCmd_04D ScrCmd_16E 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0444 + GoToIfEq 0x800C, 2, _0444 GoTo _0292 _0444: ScrCmd_02C 22 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0346 + GoToIfEq 0x800C, 0, _0346 GoTo _0292 _045E: @@ -369,8 +340,7 @@ _04A0: Call _02F4 ScrCmd_02C 32 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0346 + GoToIfEq 0x800C, 0, _0346 ScrCmd_02C 23 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1051.s b/res/field/scripts/script_1051.s index e23b3cbef4..26638b6ab7 100644 --- a/res/field/scripts/script_1051.s +++ b/res/field/scripts/script_1051.s @@ -10,14 +10,12 @@ _0006: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x8004 - CompareVar 0x40A6, 3 - GoToIf 1, _0027 + GoToIfEq 0x40A6, 3, _0027 GoTo _006C End _0027: - CheckFlag 0x9BE - GoToIf 0, _003A + GoToIfUnset 0x9BE, _003A GoTo _006C End @@ -43,43 +41,31 @@ _0064: _006C: ScrCmd_282 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0133 + GoToIfEq 0x800C, 1, _0133 ScrCmd_1E8 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _00B2 - CheckFlag 0x145 - GoToIf 0, _0332 + GoToIfEq 0x800C, 1, _00B2 + GoToIfUnset 0x145, _0332 Call _04A4 - CompareVar 0x800C, 0 - GoToIf 1, _037C + GoToIfEq 0x800C, 0, _037C GoTo _0357 _00B2: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _030D - CheckFlag 240 - GoToIf 0, _02E8 - CheckFlag 0x131 - GoToIf 0, _02C3 + GoToIfEq 0x800C, 0, _030D + GoToIfUnset 240, _02E8 + GoToIfUnset 0x131, _02C3 ScrCmd_1E9 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0158 + GoToIfEq 0x800C, 1, _0158 GoTo _00F3 End _00F3: - CheckFlag 0x146 - GoToIf 0, _01F4 + GoToIfUnset 0x146, _01F4 ScrCmd_1B7 0x800C, 3 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _01CB - CompareVar 0x8008, 1 - GoToIf 1, _01A2 - CompareVar 0x8008, 2 - GoToIf 1, _017D + GoToIfEq 0x8008, 0, _01CB + GoToIfEq 0x8008, 1, _01A2 + GoToIfEq 0x8008, 2, _017D End _0133: @@ -138,14 +124,10 @@ _01F4: CallIf 1, _0444 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0251 - CompareVar 0x800C, 1 - GoToIf 1, _026B - CompareVar 0x800C, 2 - GoToIf 1, _0285 - CompareVar 0x800C, 3 - GoToIf 1, _029F + GoToIfEq 0x800C, 0, _0251 + GoToIfEq 0x800C, 1, _026B + GoToIfEq 0x800C, 2, _0285 + GoToIfEq 0x800C, 3, _029F End _0251: @@ -245,10 +227,8 @@ _03A1: _03A9: ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03CC - CompareVar 0x800C, 1 - GoToIf 1, _03D1 + GoToIfEq 0x800C, 0, _03CC + GoToIfEq 0x800C, 1, _03D1 End _03CC: @@ -262,10 +242,8 @@ _03D1: _03D6: ScrCmd_02C 24 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03F9 - CompareVar 0x800C, 1 - GoToIf 1, _03FE + GoToIfEq 0x800C, 0, _03F9 + GoToIfEq 0x800C, 1, _03FE End _03F9: @@ -389,10 +367,8 @@ _0494: EndMovement _04A4: - CompareVar 0x40C4, 1 - GoToIf 1, _04C6 - CompareVar 0x40C5, 1 - GoToIf 1, _04C6 + GoToIfEq 0x40C4, 1, _04C6 + GoToIfEq 0x40C5, 1, _04C6 SetVar 0x800C, 1 Return diff --git a/res/field/scripts/script_1052.s b/res/field/scripts/script_1052.s index be2b86fd50..ae44e057e4 100644 --- a/res/field/scripts/script_1052.s +++ b/res/field/scripts/script_1052.s @@ -38,12 +38,9 @@ _0067: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 144 - GoToIf 1, _00A3 - CompareVar 0x4095, 1 - GoToIf 4, _00AE - CheckFlag 234 - GoToIf 1, _00BC + GoToIfSet 144, _00A3 + GoToIfGe 0x4095, 1, _00AE + GoToIfSet 234, _00BC ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_02C 4 @@ -81,20 +78,13 @@ _00CD: ApplyMovement 3, _03B0 WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8004, 108 - GoToIf 1, _0140 - CompareVar 0x8004, 109 - GoToIf 1, _0158 - CompareVar 0x8004, 110 - GoToIf 1, _0170 - CompareVar 0x8004, 111 - GoToIf 1, _0188 - CompareVar 0x8004, 112 - GoToIf 1, _01A0 - CompareVar 0x8004, 113 - GoToIf 1, _01B8 - CompareVar 0x8004, 114 - GoToIf 1, _01D0 + GoToIfEq 0x8004, 108, _0140 + GoToIfEq 0x8004, 109, _0158 + GoToIfEq 0x8004, 110, _0170 + GoToIfEq 0x8004, 111, _0188 + GoToIfEq 0x8004, 112, _01A0 + GoToIfEq 0x8004, 113, _01B8 + GoToIfEq 0x8004, 114, _01D0 GoTo _01E8 _0140: @@ -150,20 +140,13 @@ _0200: ScrCmd_0CE 1 ScrCmd_02C 3 ScrCmd_034 - CompareVar 0x8004, 108 - GoToIf 1, _026C - CompareVar 0x8004, 109 - GoToIf 1, _027C - CompareVar 0x8004, 110 - GoToIf 1, _028C - CompareVar 0x8004, 111 - GoToIf 1, _029C - CompareVar 0x8004, 112 - GoToIf 1, _02AC - CompareVar 0x8004, 113 - GoToIf 1, _02BC - CompareVar 0x8004, 114 - GoToIf 1, _02CC + GoToIfEq 0x8004, 108, _026C + GoToIfEq 0x8004, 109, _027C + GoToIfEq 0x8004, 110, _028C + GoToIfEq 0x8004, 111, _029C + GoToIfEq 0x8004, 112, _02AC + GoToIfEq 0x8004, 113, _02BC + GoToIfEq 0x8004, 114, _02CC GoTo _02DC _026C: @@ -501,10 +484,8 @@ _05E7: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 144 - GoToIf 1, _0612 - CompareVar 0x4095, 1 - GoToIf 4, _061D + GoToIfSet 144, _0612 + GoToIfGe 0x4095, 1, _061D ScrCmd_02C 8 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1053.s b/res/field/scripts/script_1053.s index e9eae753cf..ee688140d5 100644 --- a/res/field/scripts/script_1053.s +++ b/res/field/scripts/script_1053.s @@ -9,19 +9,13 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 144 - GoToIf 1, _00B0 - CompareVar 0x4095, 1 - GoToIf 4, _0082 - CheckFlag 110 - GoToIf 1, _0090 - CheckFlag 234 - GoToIf 1, _009E + GoToIfSet 144, _00B0 + GoToIfGe 0x4095, 1, _0082 + GoToIfSet 110, _0090 + GoToIfSet 234, _009E ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _005C - CompareVar 0x800C, 1 - GoToIf 1, _006B + GoToIfEq 0x800C, 0, _005C + GoToIfEq 0x800C, 1, _006B End _005C: diff --git a/res/field/scripts/script_1055.s b/res/field/scripts/script_1055.s index 81f51f26ed..70de651f1a 100644 --- a/res/field/scripts/script_1055.s +++ b/res/field/scripts/script_1055.s @@ -76,13 +76,10 @@ _00CC: _00E0: ScrCmd_060 SetVar 0x410F, 2 - CheckFlag 0x15C - GoToIf 1, _014B - CheckFlag 0x15D - GoToIf 0, _0110 + GoToIfSet 0x15C, _014B + GoToIfUnset 0x15D, _0110 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _014B + GoToIfEq 0x800C, 0, _014B _0110: ApplyMovement 0xFF, _0164 ApplyMovement 0, _0170 @@ -174,24 +171,15 @@ _0214: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 2 - GoToIf 1, _02AF - CompareVar 0x40A4, 7 - GoToIf 4, _0792 - CompareVar 0x40A4, 6 - GoToIf 1, _035E - CheckFlag 144 - GoToIf 1, _036C - CompareVar 0x40A4, 5 - GoToIf 4, _0788 - CompareVar 0x40A4, 4 - GoToIf 4, _0711 - CheckFlag 248 - GoToIf 1, _075A - CompareVar 0x40A4, 2 - GoToIf 4, _0768 - CheckFlag 135 - GoToIf 1, _077A + GoToIfSet 2, _02AF + GoToIfGe 0x40A4, 7, _0792 + GoToIfEq 0x40A4, 6, _035E + GoToIfSet 144, _036C + GoToIfGe 0x40A4, 5, _0788 + GoToIfGe 0x40A4, 4, _0711 + GoToIfSet 248, _075A + GoToIfGe 0x40A4, 2, _0768 + GoToIfSet 135, _077A SetFlag 135 ScrCmd_0CD 0 ScrCmd_0CE 1 @@ -220,26 +208,20 @@ _0214: .byte 0 _02AF: - CompareVar 0x40B2, 2 - GoToIf 4, _0300 + GoToIfGe 0x40B2, 2, _0300 GoTo _02C4 End _02C4: ScrCmd_1B7 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _031B - CompareVar 0x800C, 1 - GoToIf 1, _0329 - CompareVar 0x800C, 2 - GoToIf 1, _0337 - CompareVar 0x800C, 3 - GoToIf 1, _0345 + GoToIfEq 0x800C, 0, _031B + GoToIfEq 0x800C, 1, _0329 + GoToIfEq 0x800C, 2, _0337 + GoToIfEq 0x800C, 3, _0345 End _0300: - CompareVar 0x40AA, 2 - GoToIf 4, _02C4 + GoToIfGe 0x40AA, 2, _02C4 ScrCmd_0CD 0 ScrCmd_02C 41 GoTo _0356 @@ -294,8 +276,7 @@ _036C: ScrCmd_1CC ScrCmd_02C 16 ScrCmd_1BD 0x8007 - CompareVar 0x8007, 1 - GoToIf 1, _03A6 + GoToIfEq 0x8007, 1, _03A6 GoTo _03B8 End @@ -337,14 +318,10 @@ _03CA: ScrCmd_02C 21 ScrCmd_0CD 0 ScrCmd_02C 22 - CompareVar 0x8007, 0 - GoToIf 1, _0471 - CompareVar 0x8007, 1 - GoToIf 1, _048B - CompareVar 0x8007, 2 - GoToIf 1, _04A5 - CompareVar 0x8007, 3 - GoToIf 1, _04BF + GoToIfEq 0x8007, 0, _0471 + GoToIfEq 0x8007, 1, _048B + GoToIfEq 0x8007, 2, _04A5 + GoToIfEq 0x8007, 3, _04BF End _0465: @@ -383,14 +360,10 @@ _04BF: _04D9: ScrCmd_02C 23 ScrCmd_034 - CompareVar 0x8007, 0 - GoToIf 1, _0514 - CompareVar 0x8007, 1 - GoToIf 1, _052E - CompareVar 0x8007, 2 - GoToIf 1, _0548 - CompareVar 0x8007, 3 - GoToIf 1, _0562 + GoToIfEq 0x8007, 0, _0514 + GoToIfEq 0x8007, 1, _052E + GoToIfEq 0x8007, 2, _0548 + GoToIfEq 0x8007, 3, _0562 End _0514: @@ -425,8 +398,7 @@ _057C: ScrCmd_0CD 0 ScrCmd_0CE 1 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _059B + GoToIfEq 0x800C, 0, _059B GoTo _05A6 End @@ -449,14 +421,10 @@ _05B1: ScrCmd_0CE 1 ScrCmd_02C 26 ScrCmd_034 - CompareVar 0x8007, 0 - GoToIf 1, _0606 - CompareVar 0x8007, 1 - GoToIf 1, _0620 - CompareVar 0x8007, 2 - GoToIf 1, _0642 - CompareVar 0x8007, 3 - GoToIf 1, _065C + GoToIfEq 0x8007, 0, _0606 + GoToIfEq 0x8007, 1, _0620 + GoToIfEq 0x8007, 2, _0642 + GoToIfEq 0x8007, 3, _065C End _0606: @@ -913,16 +881,11 @@ _0948: _095E: ScrCmd_1B6 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _09A5 - CompareVar 0x800C, 1 - GoToIf 1, _09B6 - CompareVar 0x800C, 2 - GoToIf 1, _09B6 - CompareVar 0x800C, 3 - GoToIf 1, _09C7 - CompareVar 0x800C, 4 - GoToIf 1, _09C7 + GoToIfEq 0x800C, 0, _09A5 + GoToIfEq 0x800C, 1, _09B6 + GoToIfEq 0x800C, 2, _09B6 + GoToIfEq 0x800C, 3, _09C7 + GoToIfEq 0x800C, 4, _09C7 End _09A5: diff --git a/res/field/scripts/script_1056.s b/res/field/scripts/script_1056.s index 071d41a930..4323177847 100644 --- a/res/field/scripts/script_1056.s +++ b/res/field/scripts/script_1056.s @@ -15,8 +15,7 @@ .short 0xFD13 _002A: - CompareVar 0x40F9, 0 - GoToIf 1, _0039 + GoToIfEq 0x40F9, 0, _0039 End _0039: diff --git a/res/field/scripts/script_1057.s b/res/field/scripts/script_1057.s index 1efc3480ea..f54e58f3f6 100644 --- a/res/field/scripts/script_1057.s +++ b/res/field/scripts/script_1057.s @@ -9,8 +9,7 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x4095, 1 - GoToIf 4, _002F + GoToIfGe 0x4095, 1, _002F GoTo _0021 _0021: diff --git a/res/field/scripts/script_1058.s b/res/field/scripts/script_1058.s index 85c7350a76..6600d07ddd 100644 --- a/res/field/scripts/script_1058.s +++ b/res/field/scripts/script_1058.s @@ -10,8 +10,7 @@ _000A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 144 - GoToIf 1, _0028 + GoToIfSet 144, _0028 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -30,8 +29,7 @@ _0033: ScrCmd_060 ScrCmd_068 ScrCmd_0CD 0 - CheckFlag 144 - GoToIf 1, _0054 + GoToIfSet 144, _0054 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1059.s b/res/field/scripts/script_1059.s index 0932754b9d..ca3f55beb8 100644 --- a/res/field/scripts/script_1059.s +++ b/res/field/scripts/script_1059.s @@ -20,10 +20,8 @@ _0032: CompareVar 0x4071, 1 CallIf 1, _005F ScrCmd_14D 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _0075 - CompareVar 0x4000, 1 - GoToIf 1, _007D + GoToIfEq 0x4000, 0, _0075 + GoToIfEq 0x4000, 1, _007D End _005F: @@ -45,18 +43,12 @@ _0085: ApplyMovement 4, _03AC WaitMovement ScrCmd_069 0x8004, 0x8005 - CompareVar 0x8005, 0x34B - GoToIf 1, _00E7 - CompareVar 0x8005, 0x34C - GoToIf 1, _00FF - CompareVar 0x8005, 0x34D - GoToIf 1, _010F - CompareVar 0x8005, 0x34E - GoToIf 1, _011F - CompareVar 0x8005, 0x34F - GoToIf 1, _0137 - CompareVar 0x8005, 0x350 - GoToIf 1, _014F + GoToIfEq 0x8005, 0x34B, _00E7 + GoToIfEq 0x8005, 0x34C, _00FF + GoToIfEq 0x8005, 0x34D, _010F + GoToIfEq 0x8005, 0x34E, _011F + GoToIfEq 0x8005, 0x34F, _0137 + GoToIfEq 0x8005, 0x350, _014F End _00E7: @@ -96,10 +88,8 @@ _014F: _0169: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0189 - CompareVar 0x800C, 1 - GoToIf 1, _0195 + GoToIfEq 0x800C, 0, _0189 + GoToIfEq 0x800C, 1, _0195 End _0189: @@ -114,18 +104,12 @@ _0195: _01A1: ScrCmd_034 - CompareVar 0x8005, 0x34B - GoToIf 1, _01F3 - CompareVar 0x8005, 0x34C - GoToIf 1, _020B - CompareVar 0x8005, 0x34D - GoToIf 1, _0223 - CompareVar 0x8005, 0x34E - GoToIf 1, _023B - CompareVar 0x8005, 0x34F - GoToIf 1, _0253 - CompareVar 0x8005, 0x350 - GoToIf 1, _026B + GoToIfEq 0x8005, 0x34B, _01F3 + GoToIfEq 0x8005, 0x34C, _020B + GoToIfEq 0x8005, 0x34D, _0223 + GoToIfEq 0x8005, 0x34E, _023B + GoToIfEq 0x8005, 0x34F, _0253 + GoToIfEq 0x8005, 0x350, _026B End _01F3: @@ -166,10 +150,8 @@ _026B: _0283: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A3 - CompareVar 0x800C, 1 - GoToIf 1, _02AC + GoToIfEq 0x800C, 0, _02A3 + GoToIfEq 0x800C, 1, _02AC End _02A3: @@ -206,10 +188,8 @@ _02B5: ScrCmd_065 3 ScrCmd_014 0x7FB ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0344 - CompareVar 0x800C, 1 - GoToIf 1, _0352 + GoToIfEq 0x800C, 0, _0344 + GoToIfEq 0x800C, 1, _0352 End _0344: @@ -497,10 +477,8 @@ _057C: ScrCmd_065 14 ScrCmd_003 30, 0x800C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0610 - CompareVar 0x800C, 1 - GoToIf 1, _061D + GoToIfEq 0x800C, 0, _0610 + GoToIfEq 0x800C, 1, _061D End _0610: @@ -520,10 +498,8 @@ _062A: ApplyMovement 4, _0800 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _065C - CompareVar 0x800C, 1 - GoToIf 1, _066B + GoToIfEq 0x800C, 0, _065C + GoToIfEq 0x800C, 1, _066B End _065C: @@ -545,10 +521,8 @@ _067A: ApplyMovement 0xFF, _07C0 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _06B2 - CompareVar 0x800C, 1 - GoToIf 1, _06C1 + GoToIfEq 0x800C, 0, _06B2 + GoToIfEq 0x800C, 1, _06C1 End _06B2: @@ -569,10 +543,8 @@ _06D0: ApplyMovement 0xFF, _07D0 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0704 - CompareVar 0x800C, 1 - GoToIf 1, _0710 + GoToIfEq 0x800C, 0, _0704 + GoToIfEq 0x800C, 1, _0710 End _0704: @@ -593,10 +565,8 @@ _071C: ApplyMovement 4, _0828 WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _075A - CompareVar 0x800C, 1 - GoToIf 1, _0766 + GoToIfEq 0x800C, 0, _075A + GoToIfEq 0x800C, 1, _0766 End _075A: diff --git a/res/field/scripts/script_1064.s b/res/field/scripts/script_1064.s index b32446f584..eae898e39e 100644 --- a/res/field/scripts/script_1064.s +++ b/res/field/scripts/script_1064.s @@ -42,8 +42,7 @@ _008C: ScrCmd_060 ScrCmd_068 Call _08A0 - CompareVar 0x8006, 1 - GoToIf 1, _0106 + GoToIfEq 0x8006, 1, _0106 GoTo _00B7 End @@ -53,16 +52,12 @@ _00AF: _00B7: ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _07AE - CheckFlag 0x9BA - GoToIf 0, _00E5 + GoToIfEq 0x800C, 1, _07AE + GoToIfUnset 0x9BA, _00E5 ScrCmd_1E8 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _060E + GoToIfEq 0x800C, 1, _060E _00E5: - CompareVar 0x4071, 2 - GoToIf 4, _0100 + GoToIfGe 0x4071, 2, _0100 ScrCmd_0CD 0 ScrCmd_02C 18 ScrCmd_031 @@ -92,8 +87,7 @@ _0114: ApplyMovement 3, _019C WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _014E + GoToIfEq 0x800C, 0, _014E GoTo _015C End @@ -149,12 +143,9 @@ _01AE: SetVar 0x8004, 0 ScrCmd_198 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0x183 - GoToIf 1, _0219 - CompareVar 0x8008, 0x186 - GoToIf 1, _0219 - CompareVar 0x8008, 0x189 - GoToIf 1, _0219 + GoToIfEq 0x8008, 0x183, _0219 + GoToIfEq 0x8008, 0x186, _0219 + GoToIfEq 0x8008, 0x189, _0219 GoTo _0222 _0219: @@ -175,8 +166,7 @@ _022B: ScrCmd_02C 3 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02BC + GoToIfEq 0x800C, 1, _02BC GoTo _0261 End @@ -191,8 +181,7 @@ _0261: ScrCmd_0BD ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0261 + GoToIfEq 0x800C, 1, _0261 CompareVar 0x8002, 1 CallIf 5, _02B6 GoTo _02BC @@ -213,8 +202,7 @@ _02BC: WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02FC + GoToIfEq 0x800C, 0, _02FC GoTo _0316 End @@ -247,8 +235,7 @@ _0330: ScrCmd_02C 9 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0375 + GoToIfEq 0x800C, 1, _0375 GoTo _0394 End @@ -256,8 +243,7 @@ _0375: ScrCmd_0CD 0 ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0375 + GoToIfEq 0x800C, 1, _0375 GoTo _0394 End @@ -276,8 +262,7 @@ _0394: WaitMovement ScrCmd_003 15, 0x800C ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03DA + GoToIfEq 0x800C, 0, _03DA GoTo _03E8 End @@ -302,8 +287,7 @@ _03F6: ApplyMovement 0xFF, _04BC WaitMovement ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _042B + GoToIfEq 0x800C, 0, _042B GoTo _043C End @@ -412,11 +396,9 @@ _04F0: ScrCmd_060 ScrCmd_068 Call _08A0 - CompareVar 0x8006, 1 - GoToIf 1, _0539 + GoToIfEq 0x8006, 1, _0539 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _052B + GoToIfEq 0x800C, 1, _052B ScrCmd_0CF 0 ScrCmd_02C 21 ScrCmd_031 @@ -444,11 +426,9 @@ _0544: ScrCmd_060 ScrCmd_068 Call _08A0 - CompareVar 0x8006, 1 - GoToIf 1, _0587 + GoToIfEq 0x8006, 1, _0587 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _057C + GoToIfEq 0x800C, 1, _057C ScrCmd_02C 22 ScrCmd_031 ScrCmd_034 @@ -537,8 +517,7 @@ _05FD: End _060E: - CheckFlag 0x110 - GoToIf 1, _0621 + GoToIfSet 0x110, _0621 GoTo _0631 End @@ -553,8 +532,7 @@ _0631: ScrCmd_0CD 0 ScrCmd_02C 27 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0650 + GoToIfEq 0x800C, 1, _0650 GoTo _065B End @@ -771,13 +749,11 @@ _0898: _08A0: SetVar 0x8006, 0 - CompareVar 0x40A6, 3 - GoToIf 1, _08B5 + GoToIfEq 0x40A6, 3, _08B5 Return _08B5: - CheckFlag 0x9BE - GoToIf 0, _08C2 + GoToIfUnset 0x9BE, _08C2 Return _08C2: diff --git a/res/field/scripts/script_1065.s b/res/field/scripts/script_1065.s index c086551744..1c447efb4b 100644 --- a/res/field/scripts/script_1065.s +++ b/res/field/scripts/script_1065.s @@ -11,8 +11,7 @@ _000A: ScrCmd_060 ScrCmd_068 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _002F + GoToIfEq 0x800C, 1, _002F ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -31,16 +30,13 @@ _003A: ScrCmd_060 ScrCmd_068 ScrCmd_22D 2, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _009A + GoToIfEq 0x800C, 1, _009A GoTo _005A _005A: ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _007A - CompareVar 0x800C, 1 - GoToIf 1, _0086 + GoToIfEq 0x800C, 0, _007A + GoToIfEq 0x800C, 1, _0086 End _007A: @@ -60,10 +56,8 @@ _0092: End _009A: - CheckFlag 0x964 - GoToIf 0, _005A - CheckFlag 240 - GoToIf 1, _00C4 + GoToIfUnset 0x964, _005A + GoToIfSet 240, _00C4 SetFlag 240 ScrCmd_21B ScrCmd_0CD 0 @@ -79,10 +73,8 @@ _00C4: ScrCmd_0E2 1, 0x4001 ScrCmd_0DA 2, 0x4000, 0, 1 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00FA - CompareVar 0x800C, 1 - GoToIf 1, _0103 + GoToIfEq 0x800C, 0, _00FA + GoToIfEq 0x800C, 1, _0103 End _00FA: diff --git a/res/field/scripts/script_1068.s b/res/field/scripts/script_1068.s index fbb7de6bd7..22963d2b63 100644 --- a/res/field/scripts/script_1068.s +++ b/res/field/scripts/script_1068.s @@ -47,8 +47,7 @@ _006C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40CF, 2 - GoToIf 4, _0099 + GoToIfGe 0x40CF, 2, _0099 ScrCmd_02C 2 ApplyMovement 2, _00A4 WaitMovement @@ -140,14 +139,11 @@ _0141: ScrCmd_060 ScrCmd_068 ScrCmd_31C 0x800C, 0x1EC - CompareVar 0x800C, 0xFF - GoToIf 1, _019D + GoToIfEq 0x800C, 0xFF, _019D ScrCmd_1C0 0x800C, 0x1EC - CompareVar 0x800C, 0 - GoToIf 1, _019D + GoToIfEq 0x800C, 0, _019D ScrCmd_07E 0x1D2, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _01A8 + GoToIfNe 0x800C, 0, _01A8 ScrCmd_02C 9 SetVar 0x8004, 0x1D2 SetVar 0x8005, 1 diff --git a/res/field/scripts/script_1070.s b/res/field/scripts/script_1070.s index 44cb4b9d54..9a921bcc2d 100644 --- a/res/field/scripts/script_1070.s +++ b/res/field/scripts/script_1070.s @@ -37,8 +37,7 @@ _0044: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CompareVar 0x40CF, 2 - GoToIf 4, _0064 + GoToIfGe 0x40CF, 2, _0064 ScrCmd_02C 2 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1073.s b/res/field/scripts/script_1073.s index de7653d2a8..121fa65dd3 100644 --- a/res/field/scripts/script_1073.s +++ b/res/field/scripts/script_1073.s @@ -11,15 +11,13 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAAA - GoToIf 1, _0059 + GoToIfSet 0xAAA, _0059 ScrCmd_02C 0 ScrCmd_1B7 0x8004, 5 AddVar 0x8004, 149 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0064 + GoToIfEq 0x800C, 0, _0064 SetFlag 0xAAA ScrCmd_014 0x7E0 ScrCmd_034 @@ -43,8 +41,7 @@ _006E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 128 - GoToIf 1, _009E + GoToIfSet 128, _009E ScrCmd_02C 2 SetVar 0x8004, 0x1C0 SetVar 0x8005, 1 diff --git a/res/field/scripts/script_1075.s b/res/field/scripts/script_1075.s index bb66b8df07..5d3f64e0ee 100644 --- a/res/field/scripts/script_1075.s +++ b/res/field/scripts/script_1075.s @@ -21,14 +21,11 @@ _0021: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 131 - GoToIf 1, _0094 + GoToIfSet 131, _0094 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0062 - CompareVar 0x800C, 1 - GoToIf 1, _0057 + GoToIfEq 0x800C, 0, _0062 + GoToIfEq 0x800C, 1, _0057 End _0057: @@ -43,8 +40,7 @@ _0062: SetVar 0x8004, 0x19F SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _009F + GoToIfEq 0x800C, 0, _009F SetFlag 131 ScrCmd_014 0x7E0 ScrCmd_034 diff --git a/res/field/scripts/script_1076.s b/res/field/scripts/script_1076.s index 9982392ea7..e63259e751 100644 --- a/res/field/scripts/script_1076.s +++ b/res/field/scripts/script_1076.s @@ -21,8 +21,7 @@ _0032: _0034: ScrCmd_1BF 0x4000 - CompareVar 0x4000, 0 - GoToIf 5, _0047 + GoToIfNe 0x4000, 0, _0047 End _0047: @@ -44,8 +43,7 @@ _0062: ScrCmd_060 ScrCmd_068 ScrCmd_15B 4, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0088 + GoToIfEq 0x800C, 1, _0088 ScrCmd_02C 4 ScrCmd_031 ScrCmd_034 @@ -94,11 +92,9 @@ _00CC: ScrCmd_060 ScrCmd_068 ScrCmd_134 9, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0118 + GoToIfEq 0x800C, 1, _0118 ScrCmd_11E 0x800C - CompareVar 0x800C, 50 - GoToIf 0, _010D + GoToIfLt 0x800C, 50, _010D ScrCmd_02C 10 SetVar 0x8004, 9 ScrCmd_014 0x7D9 diff --git a/res/field/scripts/script_1081.s b/res/field/scripts/script_1081.s index 776440faf3..24990ae2a3 100644 --- a/res/field/scripts/script_1081.s +++ b/res/field/scripts/script_1081.s @@ -21,8 +21,7 @@ _0021: ScrCmd_060 ScrCmd_068 ScrCmd_134 8, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0051 + GoToIfEq 0x800C, 1, _0051 ScrCmd_02C 0 SetVar 0x8004, 8 ScrCmd_014 0x7D9 diff --git a/res/field/scripts/script_1083.s b/res/field/scripts/script_1083.s index f43c2194a8..9b29d1419a 100644 --- a/res/field/scripts/script_1083.s +++ b/res/field/scripts/script_1083.s @@ -11,14 +11,10 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 220 - GoToIf 1, _0216 - CheckFlag 0xAB1 - GoToIf 1, _02B0 - CheckFlag 216 - GoToIf 0, _004A - CompareVar 0x40E5, 0 - GoToIf 1, _0057 + GoToIfSet 220, _0216 + GoToIfSet 0xAB1, _02B0 + GoToIfUnset 216, _004A + GoToIfEq 0x40E5, 0, _0057 GoTo _0081 _004A: @@ -44,11 +40,9 @@ _0060: _0081: ScrCmd_02C 3 ScrCmd_21A 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _029F + GoToIfEq 0x800C, 0, _029F ScrCmd_1C0 0x800C, 0x40E5 - CompareVar 0x800C, 0 - GoToIf 1, _0283 + GoToIfEq 0x800C, 0, _0283 GoTo _00AE _00AE: @@ -81,11 +75,9 @@ _00AE: CallIf 1, _01E1 SetVar 0x8005, 3 ScrCmd_07D 93, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _01E9 + GoToIfNe 0x800C, 0, _01E9 SetFlag 0xAB1 - CompareVar 0x800C, 0 - GoToIf 1, _023F + GoToIfEq 0x800C, 0, _023F End _0189: @@ -152,8 +144,7 @@ _01E9: _0216: ScrCmd_07D 93, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0251 + GoToIfEq 0x800C, 0, _0251 SetVar 0x8004, 0x4117 SetVar 0x8005, 3 GoTo _025C @@ -232,14 +223,10 @@ _02CE: ScrCmd_29D 0x10A, 4 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0344 - CompareVar 0x8008, 1 - GoToIf 1, _034F - CompareVar 0x8008, 2 - GoToIf 1, _035A - CompareVar 0x8008, 3 - GoToIf 1, _0365 + GoToIfEq 0x8008, 0, _0344 + GoToIfEq 0x8008, 1, _034F + GoToIfEq 0x8008, 2, _035A + GoToIfEq 0x8008, 3, _0365 GoTo _0370 End diff --git a/res/field/scripts/script_1085.s b/res/field/scripts/script_1085.s index 6d9699e2b1..01a044f019 100644 --- a/res/field/scripts/script_1085.s +++ b/res/field/scripts/script_1085.s @@ -11,13 +11,11 @@ _000C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x117 - GoToIf 0, _00FE + GoToIfUnset 0x117, _00FE CheckFlag 1 CallIf 0, _00F6 ScrCmd_1C0 0x800C, 201 - CompareVar 0x800C, 1 - GoToIf 1, _0048 + GoToIfEq 0x800C, 1, _0048 ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 @@ -27,30 +25,26 @@ _000C: _0048: ScrCmd_2DD 0x8004, 201 ScrCmd_095 0x8004, 0x8006 - CompareVar 0x4000, 0x8006 - GoToIf 1, _00EB + GoToIfEq 0x4000, 0x8006, _00EB GoTo _0067 _0067: SetVar 0x8007, 50 AddVar 0x8007, 0x8006 ScrCmd_093 0x8007, 0x800C - CompareVar 0x800C, 99 - GoToIf 1, _00EB + GoToIfEq 0x800C, 99, _00EB ScrCmd_0D0 0, 0x8004 ScrCmd_02C 1 SetVar 0x8000, 10 ScrCmd_093 0x8007, 0x800C - CompareVar 0x800C, 89 - GoToIf 3, _00B3 + GoToIfLe 0x800C, 89, _00B3 SubVar 0x800C, 89 SubVar 0x8000, 0x800C _00B3: ScrCmd_094 0x8007, 0x8000 SetVar 0x4000, 0x8006 SetFlag 1 - CompareVar 0x8000, 1 - GoToIf 1, _00DB + GoToIfEq 0x8000, 1, _00DB ScrCmd_345 0, 0x8007 GoTo _00E0 @@ -85,8 +79,7 @@ _0109: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x117 - GoToIf 1, _0144 + GoToIfSet 0x117, _0144 ScrCmd_02C 5 SetVar 0x8004, 0x1B2 SetVar 0x8005, 1 diff --git a/res/field/scripts/script_1086.s b/res/field/scripts/script_1086.s index 044d53a65f..2c86fb1687 100644 --- a/res/field/scripts/script_1086.s +++ b/res/field/scripts/script_1086.s @@ -26,10 +26,8 @@ _0038: ScrCmd_068 ScrCmd_02C 1 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006E - CompareVar 0x800C, 1 - GoToIf 1, _0063 + GoToIfEq 0x800C, 0, _006E + GoToIfEq 0x800C, 1, _0063 End _0063: @@ -44,17 +42,13 @@ _006E: ScrCmd_034 ScrCmd_0E5 0x1A0, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0191 + GoToIfEq 0x800C, 0, _0191 ScrCmd_02C 4 ScrCmd_034 ScrCmd_1BD 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00BC - CompareVar 0x800C, 2 - GoToIf 1, _00EC - CompareVar 0x800C, 3 - GoToIf 1, _0114 + GoToIfEq 0x800C, 0, _00BC + GoToIfEq 0x800C, 2, _00EC + GoToIfEq 0x800C, 3, _0114 End _00BC: @@ -229,8 +223,7 @@ _026C: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 166 - GoToIf 1, _0289 + GoToIfSet 166, _0289 Call _024A ScrCmd_061 End diff --git a/res/field/scripts/script_1088.s b/res/field/scripts/script_1088.s index 48fe81d0ab..b70e8ef181 100644 --- a/res/field/scripts/script_1088.s +++ b/res/field/scripts/script_1088.s @@ -37,15 +37,12 @@ _0044: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA1 - GoToIf 1, _00C0 + GoToIfSet 0xAA1, _00C0 ScrCmd_02C 2 ScrCmd_247 0x8000 ScrCmd_1B9 0x800C, 0x8000 - CompareVar 0x800C, 150 - GoToIf 4, _0084 - CompareVar 0x800C, 50 - GoToIf 4, _00CB + GoToIfGe 0x800C, 150, _0084 + GoToIfGe 0x800C, 50, _00CB GoTo _00D6 _0084: @@ -53,8 +50,7 @@ _0084: SetVar 0x8004, 3 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _00B6 + GoToIfEq 0x800C, 0, _00B6 ScrCmd_014 0x7FC SetFlag 0xAA1 GoTo _00C0 diff --git a/res/field/scripts/script_1091.s b/res/field/scripts/script_1091.s index 21092fd3c4..4b7e447765 100644 --- a/res/field/scripts/script_1091.s +++ b/res/field/scripts/script_1091.s @@ -19,8 +19,7 @@ _001C: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0043 + GoToIfEq 0x800C, 1, _0043 ScrCmd_02C 1 GoTo _004E End @@ -40,10 +39,8 @@ _0056: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0x964 - GoToIf 1, _007F - CheckFlag 0x9B8 - GoToIf 1, _008E + GoToIfSet 0x964, _007F + GoToIfSet 0x9B8, _008E ScrCmd_02C 3 GoTo _0099 End diff --git a/res/field/scripts/script_1092.s b/res/field/scripts/script_1092.s index 9a54fcde24..60a70b5290 100644 --- a/res/field/scripts/script_1092.s +++ b/res/field/scripts/script_1092.s @@ -45,51 +45,42 @@ _0057: ScrCmd_068 ScrCmd_02C 1 ScrCmd_268 0x800C - CompareVar 0x800C, 4 - GoToIf 0, _0113 - CompareVar 0x800C, 10 - GoToIf 0, _0093 - CompareVar 0x800C, 20 - GoToIf 0, _00D3 + GoToIfLt 0x800C, 4, _0113 + GoToIfLt 0x800C, 10, _0093 + GoToIfLt 0x800C, 20, _00D3 GoTo _0113 _0093: - CheckFlag 0x134 - GoToIf 1, _0153 + GoToIfSet 0x134, _0153 ScrCmd_02C 2 SetVar 0x8004, 0x129 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0174 + GoToIfEq 0x800C, 0, _0174 ScrCmd_014 0x7FC SetFlag 0x134 ScrCmd_02C 3 GoTo _0153 _00D3: - CheckFlag 0x135 - GoToIf 1, _015E + GoToIfSet 0x135, _015E ScrCmd_02C 2 SetVar 0x8004, 240 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0174 + GoToIfEq 0x800C, 0, _0174 ScrCmd_014 0x7FC SetFlag 0x135 ScrCmd_02C 4 GoTo _015E _0113: - CheckFlag 0x136 - GoToIf 1, _0169 + GoToIfSet 0x136, _0169 ScrCmd_02C 2 SetVar 0x8004, 0x10B SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0174 + GoToIfEq 0x800C, 0, _0174 ScrCmd_014 0x7FC SetFlag 0x136 ScrCmd_02C 5 diff --git a/res/field/scripts/script_1094.s b/res/field/scripts/script_1094.s index 7818d34f5f..c16335641d 100644 --- a/res/field/scripts/script_1094.s +++ b/res/field/scripts/script_1094.s @@ -11,8 +11,7 @@ _000A: ScrCmd_060 ScrCmd_068 ScrCmd_134 11, 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _003A + GoToIfEq 0x800C, 1, _003A ScrCmd_02C 0 SetVar 0x8004, 11 ScrCmd_014 0x7D9 diff --git a/res/field/scripts/script_1095.s b/res/field/scripts/script_1095.s index 2eeed6543e..8c59eb0c8c 100644 --- a/res/field/scripts/script_1095.s +++ b/res/field/scripts/script_1095.s @@ -10,14 +10,12 @@ _000E: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 214 - GoToIf 1, _0596 + GoToIfSet 214, _0596 GoTo _0027 End _0027: - CheckFlag 167 - GoToIf 0, _0040 + GoToIfUnset 167, _0040 ScrCmd_0CD 0 ScrCmd_02C 15 ScrCmd_031 @@ -63,10 +61,8 @@ _0040: ScrCmd_02C 5 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _019D - CompareVar 0x800C, 1 - GoToIf 1, _013C + GoToIfEq 0x800C, 0, _019D + GoToIfEq 0x800C, 1, _013C End _0110: @@ -113,8 +109,7 @@ _019D: ScrCmd_034 ScrCmd_0E5 0x391, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0393 + GoToIfEq 0x800C, 0, _0393 Call _01C3 ScrCmd_061 End @@ -175,8 +170,7 @@ _029D: Return _02B1: - CompareVar 0x8005, 4 - GoToIf 1, _02D2 + GoToIfEq 0x8005, 4, _02D2 ApplyMovement 0xFF, _0434 ApplyMovement 0, _04D8 WaitMovement @@ -210,8 +204,7 @@ _02D2: .byte 0 _02FA: - CompareVar 0x8005, 4 - GoToIf 1, _031B + GoToIfEq 0x8005, 4, _031B ApplyMovement 0xFF, _0454 ApplyMovement 0, _04E0 WaitMovement @@ -483,14 +476,12 @@ _0538: ScrCmd_068 ScrCmd_02C 7 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _057A + GoToIfEq 0x800C, 1, _057A ScrCmd_02C 8 ScrCmd_034 ScrCmd_0E5 0x391, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0393 + GoToIfEq 0x800C, 0, _0393 Call _01C3 ScrCmd_061 End @@ -512,8 +503,7 @@ _0585: End _0596: - CheckFlag 0x124 - GoToIf 1, _0027 + GoToIfSet 0x124, _0027 SetFlag 0x124 ClearFlag 0x1A6 ScrCmd_186 2, 4, 11 @@ -531,8 +521,7 @@ _0596: CallIf 1, _071F ScrCmd_02C 17 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0753 + GoToIfEq 0x800C, 1, _0753 ScrCmd_034 ApplyMovement 2, _07F0 ApplyMovement 0xFF, _0858 @@ -549,8 +538,7 @@ _0596: CompareVar 0x8004, 10 CallIf 1, _0707 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0753 + GoToIfEq 0x800C, 1, _0753 ScrCmd_02C 19 ScrCmd_034 ApplyMovement 0xFF, _0864 @@ -565,8 +553,7 @@ _0596: CallIf 1, _073F ScrCmd_02C 21 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0753 + GoToIfEq 0x800C, 1, _0753 ScrCmd_02C 22 GoTo _075E End diff --git a/res/field/scripts/script_1096.s b/res/field/scripts/script_1096.s index ef65af46e6..ae884aea19 100644 --- a/res/field/scripts/script_1096.s +++ b/res/field/scripts/script_1096.s @@ -20,13 +20,11 @@ _002A: _0032: ScrCmd_1B7 0x40C2, 3 - CheckFlag 214 - GoToIf 0, _0052 + GoToIfUnset 214, _0052 End _0045: - CheckFlag 214 - GoToIf 0, _0052 + GoToIfUnset 214, _0052 End _0052: @@ -67,8 +65,7 @@ _0095: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 215 - GoToIf 1, _00B3 + GoToIfSet 215, _00B3 ScrCmd_02C 10 ScrCmd_031 ScrCmd_034 @@ -136,17 +133,13 @@ _0141: ScrCmd_060 ScrCmd_068 ScrCmd_234 0x4000 - CompareVar 0x4000, 0 - GoToIf 1, _01BE - CompareVar 0x4000, 6 - GoToIf 1, _01BE + GoToIfEq 0x4000, 0, _01BE + GoToIfEq 0x4000, 6, _01BE ScrCmd_0CE 0 ScrCmd_0CD 1 SetVar 0x8008, 0x40C2 - CompareVar 0x8008, 0 - GoToIf 1, _0195 - CompareVar 0x8008, 1 - GoToIf 1, _01A0 + GoToIfEq 0x8008, 0, _0195 + GoToIfEq 0x8008, 1, _01A0 GoTo _01AB End @@ -172,26 +165,21 @@ _01B6: End _01BE: - CheckFlag 0xAB2 - GoToIf 1, _02CB + GoToIfSet 0xAB2, _02CB ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_02C 2 ScrCmd_034 ScrCmd_0DE 0x800C - CompareVar 0x800C, 0x183 - GoToIf 1, _0236 - CompareVar 0x800C, 0x186 - GoToIf 1, _0272 + GoToIfEq 0x800C, 0x183, _0236 + GoToIfEq 0x800C, 0x186, _0272 GoTo _01FA End _01FA: ScrCmd_28F 0x800C - CompareVar 0x800C, 20 - GoToIf 0, _021A - CompareVar 0x800C, 20 - GoToIf 4, _0228 + GoToIfLt 0x800C, 20, _021A + GoToIfGe 0x800C, 20, _0228 End _021A: @@ -206,10 +194,8 @@ _0228: _0236: ScrCmd_28F 0x800C - CompareVar 0x800C, 20 - GoToIf 0, _0256 - CompareVar 0x800C, 20 - GoToIf 4, _0264 + GoToIfLt 0x800C, 20, _0256 + GoToIfGe 0x800C, 20, _0264 End _0256: @@ -224,10 +210,8 @@ _0264: _0272: ScrCmd_28F 0x800C - CompareVar 0x800C, 20 - GoToIf 0, _0292 - CompareVar 0x800C, 20 - GoToIf 4, _02A0 + GoToIfLt 0x800C, 20, _0292 + GoToIfGe 0x800C, 20, _02A0 End _0292: @@ -242,8 +226,7 @@ _02A0: _02AE: ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02DC + GoToIfEq 0x800C, 0, _02DC SetFlag 0xAB2 GoTo _02CB End diff --git a/res/field/scripts/script_1098.s b/res/field/scripts/script_1098.s index aed3cce7be..efabbd9a13 100644 --- a/res/field/scripts/script_1098.s +++ b/res/field/scripts/script_1098.s @@ -17,8 +17,7 @@ _001E: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 200 - GoToIf 1, _003C + GoToIfSet 200, _003C ScrCmd_02C 0 ScrCmd_031 ScrCmd_034 diff --git a/res/field/scripts/script_1101.s b/res/field/scripts/script_1101.s index 8ffcbee4d2..5505ea6f9e 100644 --- a/res/field/scripts/script_1101.s +++ b/res/field/scripts/script_1101.s @@ -14,8 +14,7 @@ _0022: SetFlag 200 - CheckFlag 0xAB7 - GoToIf 0, _0039 + GoToIfUnset 0xAB7, _0039 Call _0140 End @@ -102,8 +101,7 @@ _015A: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 215 - GoToIf 1, _0178 + GoToIfSet 215, _0178 ScrCmd_02C 1 ScrCmd_031 ScrCmd_034 @@ -229,21 +227,17 @@ _02B4: ScrCmd_068 ScrCmd_0CD 0 SetVar 0x4001, 0x4021 - CheckFlag 5 - GoToIf 1, _034D + GoToIfSet 5, _034D Call _118A - CompareVar 0x800C, 1 - GoToIf 1, _034D + GoToIfEq 0x800C, 1, _034D CheckFlag 1 CallIf 0, _036E CheckFlag 1 CallIf 1, _0376 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0386 + GoToIfEq 0x800C, 1, _0386 Call _032F - CompareVar 0x8000, 0 - GoToIf 1, _0398 + GoToIfEq 0x8000, 0, _0398 SetFlag 5 Call _1091 GoTo _034D @@ -260,8 +254,7 @@ _032F: _034D: Call _0571 - CompareVar 0x8001, 2 - GoToIf 1, _039E + GoToIfEq 0x8001, 2, _039E Call _0AFC GoTo _037E End @@ -313,21 +306,17 @@ _03CA: ScrCmd_068 ScrCmd_0CD 0 SetVar 0x4001, 0x4022 - CheckFlag 6 - GoToIf 1, _034D + GoToIfSet 6, _034D Call _118A - CompareVar 0x800C, 1 - GoToIf 1, _034D + GoToIfEq 0x800C, 1, _034D CheckFlag 2 CallIf 0, _036E CheckFlag 2 CallIf 1, _0376 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0445 + GoToIfEq 0x800C, 1, _0445 Call _032F - CompareVar 0x8000, 0 - GoToIf 1, _0398 + GoToIfEq 0x8000, 0, _0398 SetFlag 6 Call _1091 GoTo _034D @@ -345,21 +334,17 @@ _0457: ScrCmd_068 ScrCmd_0CD 0 SetVar 0x4001, 0x4023 - CheckFlag 7 - GoToIf 1, _034D + GoToIfSet 7, _034D Call _118A - CompareVar 0x800C, 1 - GoToIf 1, _034D + GoToIfEq 0x800C, 1, _034D CheckFlag 3 CallIf 0, _036E CheckFlag 3 CallIf 1, _0376 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _04D2 + GoToIfEq 0x800C, 1, _04D2 Call _032F - CompareVar 0x8000, 0 - GoToIf 1, _0398 + GoToIfEq 0x8000, 0, _0398 SetFlag 7 Call _1091 GoTo _034D @@ -377,21 +362,17 @@ _04E4: ScrCmd_068 ScrCmd_0CD 0 SetVar 0x4001, 0x4024 - CheckFlag 8 - GoToIf 1, _034D + GoToIfSet 8, _034D Call _118A - CompareVar 0x800C, 1 - GoToIf 1, _034D + GoToIfEq 0x800C, 1, _034D CheckFlag 4 CallIf 0, _036E CheckFlag 4 CallIf 1, _0376 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _055F + GoToIfEq 0x800C, 1, _055F Call _032F - CompareVar 0x8000, 0 - GoToIf 1, _0398 + GoToIfEq 0x8000, 0, _0398 SetFlag 8 Call _1091 GoTo _034D @@ -405,10 +386,8 @@ _055F: _0571: SetVar 0x8001, 0 - CompareVar 0x4001, 126 - GoToIf 1, _0593 - CompareVar 0x4001, 132 - GoToIf 1, _0593 + GoToIfEq 0x4001, 126, _0593 + GoToIfEq 0x4001, 132, _0593 Return _0593: @@ -516,8 +495,7 @@ _0710: Return _0718: - CompareVar 0x4061, 1 - GoToIf 1, _0BF5 + GoToIfEq 0x4061, 1, _0BF5 CompareVar 0x4001, 126 CallIf 1, _07D0 CompareVar 0x4001, 127 @@ -599,8 +577,7 @@ _080C: Return _0811: - CompareVar 0x4061, 1 - GoToIf 1, _0CE1 + GoToIfEq 0x4061, 1, _0CE1 CompareVar 0x4001, 126 CallIf 1, _08C9 CompareVar 0x4001, 127 @@ -682,8 +659,7 @@ _0905: Return _090A: - CompareVar 0x4061, 1 - GoToIf 1, _0DCD + GoToIfEq 0x4061, 1, _0DCD CompareVar 0x4001, 126 CallIf 1, _09C2 CompareVar 0x4001, 127 @@ -765,8 +741,7 @@ _09FE: Return _0A03: - CompareVar 0x4061, 1 - GoToIf 1, _0EB9 + GoToIfEq 0x4061, 1, _0EB9 CompareVar 0x4001, 126 CallIf 1, _0ABB CompareVar 0x4001, 127 @@ -848,8 +823,7 @@ _0AF7: Return _0AFC: - CompareVar 0x4061, 1 - GoToIf 1, _0FA5 + GoToIfEq 0x4061, 1, _0FA5 CompareVar 0x4001, 126 CallIf 1, _0BB4 CompareVar 0x4001, 127 @@ -1418,97 +1392,71 @@ _1184: _118A: SetVar 0x800C, 0 - CompareVar 0x4001, 126 - GoToIf 1, _123B - CompareVar 0x4001, 127 - GoToIf 1, _1248 - CompareVar 0x4001, 128 - GoToIf 1, _1255 - CompareVar 0x4001, 129 - GoToIf 1, _1262 - CompareVar 0x4001, 130 - GoToIf 1, _126F - CompareVar 0x4001, 131 - GoToIf 1, _127C - CompareVar 0x4001, 132 - GoToIf 1, _1289 - CompareVar 0x4001, 133 - GoToIf 1, _1296 - CompareVar 0x4001, 141 - GoToIf 1, _12A3 - CompareVar 0x4001, 142 - GoToIf 1, _12B0 - CompareVar 0x4001, 143 - GoToIf 1, _12BD - CompareVar 0x4001, 144 - GoToIf 1, _12CA - CompareVar 0x4001, 145 - GoToIf 1, _12D7 + GoToIfEq 0x4001, 126, _123B + GoToIfEq 0x4001, 127, _1248 + GoToIfEq 0x4001, 128, _1255 + GoToIfEq 0x4001, 129, _1262 + GoToIfEq 0x4001, 130, _126F + GoToIfEq 0x4001, 131, _127C + GoToIfEq 0x4001, 132, _1289 + GoToIfEq 0x4001, 133, _1296 + GoToIfEq 0x4001, 141, _12A3 + GoToIfEq 0x4001, 142, _12B0 + GoToIfEq 0x4001, 143, _12BD + GoToIfEq 0x4001, 144, _12CA + GoToIfEq 0x4001, 145, _12D7 Return _123B: - CheckFlag 0xAB8 - GoToIf 1, _12E4 + GoToIfSet 0xAB8, _12E4 Return _1248: - CheckFlag 0xAB9 - GoToIf 1, _12E4 + GoToIfSet 0xAB9, _12E4 Return _1255: - CheckFlag 0xABA - GoToIf 1, _12E4 + GoToIfSet 0xABA, _12E4 Return _1262: - CheckFlag 0xABB - GoToIf 1, _12E4 + GoToIfSet 0xABB, _12E4 Return _126F: - CheckFlag 0xAC5 - GoToIf 1, _12E4 + GoToIfSet 0xAC5, _12E4 Return _127C: - CheckFlag 0xAC6 - GoToIf 1, _12E4 + GoToIfSet 0xAC6, _12E4 Return _1289: - CheckFlag 0xAC7 - GoToIf 1, _12E4 + GoToIfSet 0xAC7, _12E4 Return _1296: - CheckFlag 0xAC8 - GoToIf 1, _12E4 + GoToIfSet 0xAC8, _12E4 Return _12A3: - CheckFlag 0xAC9 - GoToIf 1, _12E4 + GoToIfSet 0xAC9, _12E4 Return _12B0: - CheckFlag 0xACA - GoToIf 1, _12E4 + GoToIfSet 0xACA, _12E4 Return _12BD: - CheckFlag 0xACB - GoToIf 1, _12E4 + GoToIfSet 0xACB, _12E4 Return _12CA: - CheckFlag 0xACC - GoToIf 1, _12E4 + GoToIfSet 0xACC, _12E4 Return _12D7: - CheckFlag 0xACD - GoToIf 1, _12E4 + GoToIfSet 0xACD, _12E4 Return _12E4: diff --git a/res/field/scripts/script_1102.s b/res/field/scripts/script_1102.s index 36b85f146e..4851198b70 100644 --- a/res/field/scripts/script_1102.s +++ b/res/field/scripts/script_1102.s @@ -9,14 +9,12 @@ _0006: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 203 - GoToIf 1, _004B + GoToIfSet 203, _004B ScrCmd_02C 0 SetVar 0x8004, 0x171 SetVar 0x8005, 1 ScrCmd_07D 0x8004, 0x8005, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0056 + GoToIfEq 0x800C, 0, _0056 ScrCmd_014 0x7FC SetFlag 203 GoTo _004B diff --git a/res/field/scripts/script_1103.s b/res/field/scripts/script_1103.s index 527b2b0878..fcdd1ac7fc 100644 --- a/res/field/scripts/script_1103.s +++ b/res/field/scripts/script_1103.s @@ -23,10 +23,8 @@ _0021: ScrCmd_068 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _004C - CompareVar 0x800C, 1 - GoToIf 1, _0232 + GoToIfEq 0x800C, 0, _004C + GoToIfEq 0x800C, 1, _0232 End _004C: @@ -39,27 +37,21 @@ _004C: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8000, 0xFF - GoToIf 1, _0232 + GoToIfEq 0x8000, 0xFF, _0232 ScrCmd_198 0x8000, 0x8001 - CompareVar 0x8001, 0 - GoToIf 1, _0227 + GoToIfEq 0x8001, 0, _0227 ScrCmd_2E5 0x8000, 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _023D + GoToIfEq 0x800C, 0, _023D ScrCmd_0D6 0, 0x8000 ScrCmd_02C 5 ScrCmd_2E6 0x8000, 1, 0x800C SetVar 0x8003, 0x800C - CompareVar 0x8003, -2 - GoToIf 1, _0232 + GoToIfEq 0x8003, -2, _0232 ScrCmd_2EA 0x8003, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0248 + GoToIfEq 0x800C, 0, _0248 ScrCmd_1C8 0x800C, 0x8000 SetVar 0x8002, 0x800C - CompareVar 0x800C, 4 - GoToIf 1, _00FD + GoToIfEq 0x800C, 4, _00FD GoTo _01F2 End @@ -68,8 +60,7 @@ _00FD: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 9 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01B7 + GoToIfEq 0x800C, 1, _01B7 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_034 @@ -78,14 +69,12 @@ _00FD: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 4 - GoToIf 1, _01B7 + GoToIfEq 0x8002, 4, _01B7 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C ScrCmd_02C 12 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _01B7 + GoToIfEq 0x800C, 1, _01B7 ScrCmd_0D6 0, 0x8000 ScrCmd_1CA 0x800C, 0x8000, 0x8002 ScrCmd_0D4 1, 0x800C @@ -108,8 +97,7 @@ _01B7: ScrCmd_0D4 1, 0x8003 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _01DD + GoToIfEq 0x800C, 0, _01DD GoTo _00FD End diff --git a/res/field/scripts/script_1104.s b/res/field/scripts/script_1104.s index f19c5e8323..63a34b328b 100644 --- a/res/field/scripts/script_1104.s +++ b/res/field/scripts/script_1104.s @@ -25,12 +25,9 @@ _003E: SetFlag 0x2AF SetFlag 0x2B2 SetFlag 0x2B5 - CompareVar 0x404E, 0xFF - GoToIf 1, _00BA - CompareVar 0x40C8, 0 - GoToIf 1, _00BA - CheckFlag 0x9AB - GoToIf 1, _00BA + GoToIfEq 0x404E, 0xFF, _00BA + GoToIfEq 0x40C8, 0, _00BA + GoToIfSet 0x9AB, _00BA CompareVar 0x404E, 2 CallIf 1, _00BC CompareVar 0x404E, 4 @@ -154,8 +151,7 @@ _0184: CallIf 1, _0274 ScrCmd_02C 6 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _02BC + GoToIfEq 0x800C, 1, _02BC ScrCmd_30C ScrCmd_02C 7 ScrCmd_034 @@ -340,8 +336,7 @@ _03D4: ScrCmd_068 ScrCmd_02C 10 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0429 + GoToIfEq 0x800C, 1, _0429 ScrCmd_02C 11 ScrCmd_034 SetFlag 0x2AA @@ -371,8 +366,7 @@ _043C: ScrCmd_068 ScrCmd_02C 13 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0491 + GoToIfEq 0x800C, 1, _0491 ScrCmd_02C 14 ScrCmd_034 SetFlag 0x2AD @@ -396,8 +390,7 @@ _049C: ScrCmd_068 ScrCmd_02C 16 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _04F1 + GoToIfEq 0x800C, 1, _04F1 ScrCmd_02C 17 ScrCmd_034 SetFlag 0x2AF @@ -421,8 +414,7 @@ _04FC: ScrCmd_068 ScrCmd_02C 19 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0551 + GoToIfEq 0x800C, 1, _0551 ScrCmd_02C 20 ScrCmd_034 SetFlag 0x2B2 @@ -446,8 +438,7 @@ _055C: ScrCmd_068 ScrCmd_02C 22 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _05B1 + GoToIfEq 0x800C, 1, _05B1 ScrCmd_02C 23 ScrCmd_034 SetFlag 0x2B5 diff --git a/res/field/scripts/script_1109.s b/res/field/scripts/script_1109.s index 02ef463920..a337a2e87c 100644 --- a/res/field/scripts/script_1109.s +++ b/res/field/scripts/script_1109.s @@ -13,8 +13,7 @@ .short 0xFD13 _0022: - CheckFlag 250 - GoToIf 1, _002F + GoToIfSet 250, _002F End _002F: @@ -26,8 +25,7 @@ _003F: ScrCmd_060 ScrCmd_003 20, 0x800C ScrCmd_22F 0x8004 - CompareVar 0x8004, 10 - GoToIf 0, _0078 + GoToIfLt 0x8004, 10, _0078 SetVar 0x40A7, 1 SetFlag 250 ScrCmd_0CD 0 @@ -77,25 +75,20 @@ _00D6: ScrCmd_0CD 0 ScrCmd_0D0 2, 0x8000 ScrCmd_230 0x800C, 0x8000, 68 - CompareVar 0x800C, 1 - GoToIf 1, _0244 + GoToIfEq 0x800C, 1, _0244 ScrCmd_230 0x800C, 0x8000, 67 - CompareVar 0x800C, 1 - GoToIf 1, _01E7 + GoToIfEq 0x800C, 1, _01E7 ScrCmd_230 0x800C, 0x8000, 66 - CompareVar 0x800C, 1 - GoToIf 1, _018A + GoToIfEq 0x800C, 1, _018A GoTo _012F _012F: ScrCmd_072 20, 2 ScrCmd_02C 3 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _025C + GoToIfEq 0x800C, 1, _025C ScrCmd_071 0x800C, 0x2710 - CompareVar 0x800C, 0 - GoToIf 1, _024F + GoToIfEq 0x800C, 0, _024F ScrCmd_334 35, 0x2710 ScrCmd_070 0x2710 ScrCmd_074 @@ -114,11 +107,9 @@ _018A: ScrCmd_072 20, 2 ScrCmd_02C 4 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _025C + GoToIfEq 0x800C, 1, _025C ScrCmd_071 0x800C, 0x186A0 - CompareVar 0x800C, 0 - GoToIf 1, _024F + GoToIfEq 0x800C, 0, _024F ScrCmd_335 35, 0x186A0 ScrCmd_070 0x186A0 ScrCmd_074 @@ -137,11 +128,9 @@ _01E7: ScrCmd_072 20, 2 ScrCmd_02C 5 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _025C + GoToIfEq 0x800C, 1, _025C ScrCmd_071 0x800C, 0xF423F - CompareVar 0x800C, 0 - GoToIf 1, _024F + GoToIfEq 0x800C, 0, _024F ScrCmd_335 35, 0xF423F ScrCmd_070 0xF423F ScrCmd_074 @@ -194,10 +183,8 @@ _027C: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A4 - CompareVar 0x800C, 1 - GoToIf 1, _02AF + GoToIfEq 0x800C, 0, _02A4 + GoToIfEq 0x800C, 1, _02AF End _02A4: diff --git a/res/field/scripts/script_1110.s b/res/field/scripts/script_1110.s index ec799ed672..66b35f0192 100644 --- a/res/field/scripts/script_1110.s +++ b/res/field/scripts/script_1110.s @@ -12,17 +12,14 @@ _0012: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 0xAA5 - GoToIf 1, _00E2 - CompareVar 0x400A, 1 - GoToIf 1, _00E2 + GoToIfSet 0xAA5, _00E2 + GoToIfEq 0x400A, 1, _00E2 ScrCmd_247 0x4000 ScrCmd_0CD 0 ScrCmd_0D6 1, 0x4000 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0058 + GoToIfEq 0x800C, 1, _0058 GoTo _0063 _0058: @@ -41,12 +38,9 @@ _0063: _0074: ScrCmd_02C 3 ScrCmd_1B7 0x800C, 4 - CompareVar 0x800C, 0 - GoToIf 1, _00AA - CompareVar 0x800C, 1 - GoToIf 1, _00B3 - CompareVar 0x800C, 2 - GoToIf 1, _00BC + GoToIfEq 0x800C, 0, _00AA + GoToIfEq 0x800C, 1, _00B3 + GoToIfEq 0x800C, 2, _00BC GoTo _00C5 _00AA: @@ -83,10 +77,8 @@ _00E2: _00ED: ScrCmd_1B7 0x800C, 100 - CompareVar 0x800C, 5 - GoToIf 0, _0113 - CompareVar 0x800C, 30 - GoToIf 0, _0124 + GoToIfLt 0x800C, 5, _0113 + GoToIfLt 0x800C, 30, _0124 GoTo _0135 _0113: @@ -117,12 +109,9 @@ _0146: _0160: ScrCmd_069 0x8005, 0x8006 - CompareVar 0x8005, 11 - GoToIf 1, _0193 - CompareVar 0x8005, 13 - GoToIf 1, _01AB - CompareVar 0x8006, 4 - GoToIf 1, _01C3 + GoToIfEq 0x8005, 11, _0193 + GoToIfEq 0x8005, 13, _01AB + GoToIfEq 0x8006, 4, _01C3 GoTo _01DB _0193: diff --git a/res/field/scripts/script_1111.s b/res/field/scripts/script_1111.s index 4d16fad94e..f0a0f0c628 100644 --- a/res/field/scripts/script_1111.s +++ b/res/field/scripts/script_1111.s @@ -11,10 +11,8 @@ _0006: ScrCmd_068 ScrCmd_11C 0x40CE SetVar 0x8008, 0x40CE - CompareVar 0x8008, 0 - GoToIf 1, _0034 - CompareVar 0x8008, 1 - GoToIf 1, _003E + GoToIfEq 0x8008, 0, _0034 + GoToIfEq 0x8008, 1, _003E End _0034: @@ -34,18 +32,15 @@ _0048: ScrCmd_042 124, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _008F - CompareVar 0x8008, 1 - GoToIf 1, _00CA + GoToIfEq 0x8008, 0, _008F + GoToIfEq 0x8008, 1, _00CA GoTo _0152 _008F: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 0x1CE, 0, 18, 2, 1 - CompareVar 0x40CE, 0 - GoToIf 1, _0164 + GoToIfEq 0x40CE, 0, _0164 SetVar 0x8004, 0 Call _0105 SetVar 0x40CE, 0 @@ -55,8 +50,7 @@ _00CA: ScrCmd_003 1, 0x800C ScrCmd_11C 0x40CE ScrCmd_11B 0x1CD, 1, 18, 2, 1 - CompareVar 0x40CE, 1 - GoToIf 1, _0164 + GoToIfEq 0x40CE, 1, _0164 SetVar 0x8004, 1 Call _0105 SetVar 0x40CE, 1 diff --git a/res/field/scripts/script_1112.s b/res/field/scripts/script_1112.s index 79f062e276..6c61cc7711 100644 --- a/res/field/scripts/script_1112.s +++ b/res/field/scripts/script_1112.s @@ -55,8 +55,7 @@ _00B2: CallIf 1, _01EF CompareVar 0x4000, 1 CallIf 1, _01F7 - CheckFlag 0x9AC - GoToIf 1, _01ED + GoToIfSet 0x9AC, _01ED SetFlag 0x2A7 SetFlag 0x2A8 SetFlag 0x2A9 @@ -71,8 +70,7 @@ _00B2: SetFlag 0x2B7 SetFlag 0x2B8 SetFlag 0x2B9 - CompareVar 0x404E, 0xFF - GoToIf 1, _01FF + GoToIfEq 0x404E, 0xFF, _01FF SetVar 0x400F, 0x404E CompareVar 0x404E, 0 CallIf 1, _0201 @@ -129,8 +127,7 @@ _0207: Return _020D: - CheckFlag 0x9AB - GoToIf 0, _029A + GoToIfUnset 0x9AB, _029A ClearFlag 0x2A9 Return @@ -139,14 +136,12 @@ _021E: Return _0224: - CheckFlag 0x9AB - GoToIf 0, _029A + GoToIfUnset 0x9AB, _029A ClearFlag 0x2AC Return _0235: - CheckFlag 0x9AB - GoToIf 0, _029A + GoToIfUnset 0x9AB, _029A ClearFlag 0x2AE Return @@ -154,8 +149,7 @@ _0246: Return _0248: - CheckFlag 0x9AB - GoToIf 0, _029A + GoToIfUnset 0x9AB, _029A ClearFlag 0x2B1 Return @@ -163,8 +157,7 @@ _0259: Return _025B: - CheckFlag 0x9AB - GoToIf 0, _029A + GoToIfUnset 0x9AB, _029A ClearFlag 0x2B4 Return @@ -518,8 +511,7 @@ _0645: Return _064A: - CompareVar 0x404E, 14 - GoToIf 1, _0A50 + GoToIfEq 0x404E, 14, _0A50 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -634,8 +626,7 @@ _0799: Return _079E: - CompareVar 0x404E, 14 - GoToIf 1, _0A50 + GoToIfEq 0x404E, 14, _0A50 ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -673,8 +664,7 @@ _0810: Return _0815: - CompareVar 0x404E, 13 - GoToIf 1, _088C + GoToIfEq 0x404E, 13, _088C ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 @@ -890,8 +880,7 @@ _0AC3: Return _0AC8: - CheckFlag 0x9A9 - GoToIf 0, _0AB4 + GoToIfUnset 0x9A9, _0AB4 ScrCmd_02C 96 Return @@ -1093,8 +1082,7 @@ _0D03: _0D14: ScrCmd_049 0x5DC ScrCmd_060 - CheckFlag 0x9A2 - GoToIf 1, _0D63 + GoToIfSet 0x9A2, _0D63 ScrCmd_02C 107 GoTo _0E5D End @@ -1138,11 +1126,9 @@ _0D88: ScrCmd_003 1, 0x800C ScrCmd_1F9 0x8007 ScrCmd_2FC 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0DC2 + GoToIfEq 0x800C, 1, _0DC2 ScrCmd_1F9 0x8007 - CompareVar 0x8007, 0x258 - GoToIf 1, _0DC2 + GoToIfEq 0x8007, 0x258, _0DC2 GoTo _0D88 End @@ -1229,8 +1215,7 @@ _0E65: ScrCmd_045 1, 1, 0, 1, 0x8002 ScrCmd_046 189, 0xFF, 0 ScrCmd_047 - CompareVar 0x8002, 0 - GoToIf 5, _0EA7 + GoToIfNe 0x8002, 0, _0EA7 Call _0F7C ScrCmd_034 Call _1092 @@ -1254,8 +1239,7 @@ _0EB4: ScrCmd_045 1, 1, 0, 1, 0x8002 ScrCmd_046 189, 0xFF, 0 ScrCmd_047 - CompareVar 0x8002, 0 - GoToIf 5, _1478 + GoToIfNe 0x8002, 0, _1478 Call _0F7C ScrCmd_034 Call _1092 @@ -1343,16 +1327,13 @@ _1092: ScrCmd_0BE 0x1D0, 0, 10, 6, 1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x8002, 0 - GoToIf 1, _1485 - CompareVar 0x8002, 0 - GoToIf 5, _1514 + GoToIfEq 0x8002, 0, _1485 + GoToIfNe 0x8002, 0, _1514 End _10DA: Call _2209 - CompareVar 0x404E, 0 - GoToIf 1, _1103 + GoToIfEq 0x404E, 0, _1103 ScrCmd_186 1, 11, 11 ScrCmd_188 1, 14 ScrCmd_189 1, 0 @@ -1368,8 +1349,7 @@ _1103: _1121: Call _2209 - CompareVar 0x404E, 1 - GoToIf 1, _114A + GoToIfEq 0x404E, 1, _114A ScrCmd_186 0, 11, 11 ScrCmd_188 0, 14 ScrCmd_189 0, 0 @@ -1385,8 +1365,7 @@ _114A: _1168: Call _2209 - CompareVar 0x404E, 2 - GoToIf 1, _1199 + GoToIfEq 0x404E, 2, _1199 GoTo _1183 End @@ -1397,8 +1376,7 @@ _1183: Return _1199: - CheckFlag 0x9AB - GoToIf 0, _1183 + GoToIfUnset 0x9AB, _1183 ScrCmd_186 2, 10, 8 ScrCmd_188 2, 14 ScrCmd_189 2, 0 @@ -1408,8 +1386,7 @@ _1199: _11C2: Call _2209 - CompareVar 0x404E, 5 - GoToIf 1, _11F3 + GoToIfEq 0x404E, 5, _11F3 GoTo _11DD End @@ -1420,8 +1397,7 @@ _11DD: Return _11F3: - CheckFlag 0x9AB - GoToIf 0, _11DD + GoToIfUnset 0x9AB, _11DD ScrCmd_186 5, 10, 8 ScrCmd_188 5, 14 ScrCmd_189 5, 0 @@ -1431,8 +1407,7 @@ _11F3: _121C: Call _2209 - CompareVar 0x404E, 12 - GoToIf 1, _1245 + GoToIfEq 0x404E, 12, _1245 ScrCmd_186 12, 11, 11 ScrCmd_188 12, 14 ScrCmd_189 12, 0 @@ -1480,10 +1455,8 @@ _12BF: ScrCmd_0CE 0 ScrCmd_0CD 1 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _12FC - CompareVar 0x800C, 1 - GoToIf 1, _1307 + GoToIfEq 0x800C, 0, _12FC + GoToIfEq 0x800C, 1, _1307 End _12FC: @@ -1524,8 +1497,7 @@ _1332: Return _1367: - CheckFlag 0x9AB - GoToIf 0, _1374 + GoToIfUnset 0x9AB, _1374 Return _1374: @@ -1552,8 +1524,7 @@ _1390: Return _13C5: - CheckFlag 0x9AB - GoToIf 0, _13D2 + GoToIfUnset 0x9AB, _13D2 Return _13D2: @@ -1581,8 +1552,7 @@ _13EE: Return _1429: - CheckFlag 0x9AC - GoToIf 0, _1436 + GoToIfUnset 0x9AC, _1436 Return _1436: @@ -1673,8 +1643,7 @@ _14FC: _1514: Call _18F8 - CompareVar 0x800C, 1 - GoToIf 1, _155E + GoToIfEq 0x800C, 1, _155E ScrCmd_02C 7 GoTo _1532 End @@ -1750,8 +1719,7 @@ _1624: ScrCmd_0CD 1 ScrCmd_02C 119 Call _18F8 - CompareVar 0x800C, 1 - GoToIf 1, _1651 + GoToIfEq 0x800C, 1, _1651 GoTo _165C End @@ -1808,14 +1776,11 @@ _1667: CallIf 1, _1F8F CompareVar 0x8002, 19 CallIf 1, _1F9C - CompareVar 0x8002, -2 - GoToIf 1, _18DE - CompareVar 0x8003, 0 - GoToIf 1, _18C8 + GoToIfEq 0x8002, -2, _18DE + GoToIfEq 0x8003, 0, _18C8 ScrCmd_02C 121 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _18DE + GoToIfEq 0x800C, 1, _18DE CompareVar 0x8002, 0 CallIf 1, _1FB1 CompareVar 0x8002, 1 @@ -1856,8 +1821,7 @@ _1667: CallIf 1, _2065 CompareVar 0x8002, 19 CallIf 1, _206F - CompareVar 0x8003, 0 - GoToIf 1, _18D3 + GoToIfEq 0x8003, 0, _18D3 Call _0F7C ScrCmd_034 Call _1092 @@ -1890,46 +1854,26 @@ _18F0: End _18F8: - CheckFlag 0x997 - GoToIf 0, _19DC - CheckFlag 0x998 - GoToIf 0, _19DC - CheckFlag 0x999 - GoToIf 0, _19DC - CheckFlag 0x99A - GoToIf 0, _19DC - CheckFlag 0x99B - GoToIf 0, _19DC - CheckFlag 0x99C - GoToIf 0, _19DC - CheckFlag 0x99D - GoToIf 0, _19DC - CheckFlag 0x99E - GoToIf 0, _19DC - CheckFlag 0x99F - GoToIf 0, _19DC - CheckFlag 0x9A0 - GoToIf 0, _19DC - CheckFlag 0x9A1 - GoToIf 0, _19DC - CheckFlag 0x9A2 - GoToIf 0, _19DC - CheckFlag 0x9A3 - GoToIf 0, _19DC - CheckFlag 0x9A4 - GoToIf 0, _19DC - CheckFlag 0x9A5 - GoToIf 0, _19DC - CheckFlag 0x9A6 - GoToIf 0, _19DC - CheckFlag 0x9A7 - GoToIf 0, _19DC - CheckFlag 0x9A8 - GoToIf 0, _19DC - CheckFlag 0x9A9 - GoToIf 0, _19DC - CheckFlag 0x9AA - GoToIf 0, _19DC + GoToIfUnset 0x997, _19DC + GoToIfUnset 0x998, _19DC + GoToIfUnset 0x999, _19DC + GoToIfUnset 0x99A, _19DC + GoToIfUnset 0x99B, _19DC + GoToIfUnset 0x99C, _19DC + GoToIfUnset 0x99D, _19DC + GoToIfUnset 0x99E, _19DC + GoToIfUnset 0x99F, _19DC + GoToIfUnset 0x9A0, _19DC + GoToIfUnset 0x9A1, _19DC + GoToIfUnset 0x9A2, _19DC + GoToIfUnset 0x9A3, _19DC + GoToIfUnset 0x9A4, _19DC + GoToIfUnset 0x9A5, _19DC + GoToIfUnset 0x9A6, _19DC + GoToIfUnset 0x9A7, _19DC + GoToIfUnset 0x9A8, _19DC + GoToIfUnset 0x9A9, _19DC + GoToIfUnset 0x9AA, _19DC SetVar 0x800C, 1 Return @@ -2026,8 +1970,7 @@ _1B2E: Return _1B4F: - CheckFlag 0x99F - GoToIf 0, _1D13 + GoToIfUnset 0x99F, _1D13 ScrCmd_2F5 0, 0x62D4, 1, 6 CheckFlag 0x9A2 CallIf 0, _1DF1 @@ -2037,8 +1980,7 @@ _1B4F: _1B7B: ScrCmd_30F 13, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x249F0, 1, 6 CheckFlag 0x9A3 CallIf 0, _1E05 @@ -2048,8 +1990,7 @@ _1B7B: _1BAF: ScrCmd_30F 14, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x249F0, 1, 6 CheckFlag 0x9A4 CallIf 0, _1E19 @@ -2059,8 +2000,7 @@ _1BAF: _1BE3: ScrCmd_30F 15, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x23D0C, 1, 6 CheckFlag 0x9A5 CallIf 0, _1E2D @@ -2070,8 +2010,7 @@ _1BE3: _1C17: ScrCmd_30F 16, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x32C80, 1, 6 CheckFlag 0x9A6 CallIf 0, _1E41 @@ -2081,8 +2020,7 @@ _1C17: _1C4B: ScrCmd_30F 17, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0xCB20, 1, 6 CheckFlag 0x9A7 CallIf 0, _1E55 @@ -2092,8 +2030,7 @@ _1C4B: _1C7F: ScrCmd_30F 18, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x222E0, 1, 6 CheckFlag 0x9A8 CallIf 0, _1E69 @@ -2102,8 +2039,7 @@ _1C7F: Return _1CB3: - CheckFlag 0x9A6 - GoToIf 0, _1D13 + GoToIfUnset 0x9A6, _1D13 ScrCmd_2F5 0, 0x1A5E0, 1, 6 CheckFlag 0x9A9 CallIf 0, _1E7D @@ -2113,8 +2049,7 @@ _1CB3: _1CDF: ScrCmd_30F 20, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1D13 + GoToIfEq 0x800C, 0, _1D13 ScrCmd_2F5 0, 0x1D4C0, 1, 6 CheckFlag 0x9AA CallIf 0, _1E91 @@ -2286,103 +2221,83 @@ _1E9B: Return _1EA5: - CheckFlag 0x997 - GoToIf 1, _1FA9 + GoToIfSet 0x997, _1FA9 Return _1EB2: - CheckFlag 0x998 - GoToIf 1, _1FA9 + GoToIfSet 0x998, _1FA9 Return _1EBF: - CheckFlag 0x999 - GoToIf 1, _1FA9 + GoToIfSet 0x999, _1FA9 Return _1ECC: - CheckFlag 0x99A - GoToIf 1, _1FA9 + GoToIfSet 0x99A, _1FA9 Return _1ED9: - CheckFlag 0x99B - GoToIf 1, _1FA9 + GoToIfSet 0x99B, _1FA9 Return _1EE6: - CheckFlag 0x99C - GoToIf 1, _1FA9 + GoToIfSet 0x99C, _1FA9 Return _1EF3: - CheckFlag 0x99D - GoToIf 1, _1FA9 + GoToIfSet 0x99D, _1FA9 Return _1F00: - CheckFlag 0x99E - GoToIf 1, _1FA9 + GoToIfSet 0x99E, _1FA9 Return _1F0D: - CheckFlag 0x99F - GoToIf 1, _1FA9 + GoToIfSet 0x99F, _1FA9 Return _1F1A: - CheckFlag 0x9A0 - GoToIf 1, _1FA9 + GoToIfSet 0x9A0, _1FA9 Return _1F27: - CheckFlag 0x9A1 - GoToIf 1, _1FA9 + GoToIfSet 0x9A1, _1FA9 Return _1F34: - CheckFlag 0x9A2 - GoToIf 1, _1FA9 + GoToIfSet 0x9A2, _1FA9 Return _1F41: - CheckFlag 0x9A3 - GoToIf 1, _1FA9 + GoToIfSet 0x9A3, _1FA9 Return _1F4E: - CheckFlag 0x9A4 - GoToIf 1, _1FA9 + GoToIfSet 0x9A4, _1FA9 Return _1F5B: - CheckFlag 0x9A5 - GoToIf 1, _1FA9 + GoToIfSet 0x9A5, _1FA9 Return _1F68: - CheckFlag 0x9A6 - GoToIf 1, _1FA9 + GoToIfSet 0x9A6, _1FA9 Return _1F75: - CheckFlag 0x9A7 - GoToIf 1, _1FA9 + GoToIfSet 0x9A7, _1FA9 Return _1F82: - CheckFlag 0x9A8 - GoToIf 1, _1FA9 + GoToIfSet 0x9A8, _1FA9 Return _1F8F: - CheckFlag 0x9A9 - GoToIf 1, _1FA9 + GoToIfSet 0x9A9, _1FA9 Return _1F9C: - CheckFlag 0x9AA - GoToIf 1, _1FA9 + GoToIfSet 0x9AA, _1FA9 Return _1FA9: @@ -2631,8 +2546,7 @@ _22D4: Return _22DA: - CheckFlag 0x9AB - GoToIf 0, _2395 + GoToIfUnset 0x9AB, _2395 ScrCmd_065 2 Return @@ -2641,44 +2555,37 @@ _22EB: Return _22F1: - CheckFlag 0x9AB - GoToIf 0, _2395 + GoToIfUnset 0x9AB, _2395 ScrCmd_065 4 Return _2302: - CheckFlag 0x9AB - GoToIf 0, _2395 + GoToIfUnset 0x9AB, _2395 ScrCmd_065 5 Return _2313: - CheckFlag 0x9AC - GoToIf 0, _2393 + GoToIfUnset 0x9AC, _2393 ScrCmd_065 6 Return _2324: - CheckFlag 0x9AB - GoToIf 0, _2395 + GoToIfUnset 0x9AB, _2395 ScrCmd_065 7 Return _2335: - CheckFlag 0x9AC - GoToIf 0, _2393 + GoToIfUnset 0x9AC, _2393 ScrCmd_065 9 Return _2346: - CheckFlag 0x9AB - GoToIf 0, _2395 + GoToIfUnset 0x9AB, _2395 ScrCmd_065 8 Return _2357: - CheckFlag 0x9AC - GoToIf 0, _2393 + GoToIfUnset 0x9AC, _2393 ScrCmd_065 10 Return @@ -2687,8 +2594,7 @@ _2368: Return _236E: - CheckFlag 0x9AC - GoToIf 0, _2393 + GoToIfUnset 0x9AC, _2393 ScrCmd_065 12 Return diff --git a/res/field/scripts/script_1113.s b/res/field/scripts/script_1113.s index d6f6725135..94b3520cc3 100644 --- a/res/field/scripts/script_1113.s +++ b/res/field/scripts/script_1113.s @@ -39,10 +39,8 @@ _0047: ScrCmd_060 ScrCmd_068 ScrCmd_14D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _006F - CompareVar 0x800C, 1 - GoToIf 1, _007A + GoToIfEq 0x800C, 0, _006F + GoToIfEq 0x800C, 1, _007A End _006F: diff --git a/res/field/scripts/script_1114.s b/res/field/scripts/script_1114.s index 38e6ab5577..43f27bd990 100644 --- a/res/field/scripts/script_1114.s +++ b/res/field/scripts/script_1114.s @@ -947,14 +947,11 @@ _0E86: CallIf 1, _0FE7 CompareVar 0x8001, 54 CallIf 1, _0FE7 - CheckTrainerFlag 0x8004 - GoToIf 1, _0F40 + GoToIfDefeated 0x8004, _0F40 ScrCmd_0E9 0x800C - CompareVar 0x800C, 1 - GoToIf 5, _0F01 + GoToIfNe 0x800C, 1, _0F01 ScrCmd_0EE 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FCB + GoToIfEq 0x800C, 0, _0FCB GoTo _0F01 End @@ -971,16 +968,14 @@ _0F1D: ScrCmd_20B ScrCmd_0E5 0x8004, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FC5 + GoToIfEq 0x800C, 0, _0FC5 SetTrainerFlag 0x8004 ScrCmd_061 End _0F40: ScrCmd_09B 0x8004, 0x800C - CompareVar 0x800C, 0 - GoToIf 5, _0F73 + GoToIfNe 0x800C, 0, _0F73 GoTo _0F5B End @@ -996,11 +991,9 @@ _0F5B: _0F73: SetVar 0x8007, 0x800C ScrCmd_0E9 0x800C - CompareVar 0x800C, 1 - GoToIf 5, _0FA3 + GoToIfNe 0x800C, 1, _0FA3 ScrCmd_0EE 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FCB + GoToIfEq 0x800C, 0, _0FCB GoTo _0FA3 End @@ -1066,12 +1059,9 @@ _104C: _1054: ScrCmd_060 ScrCmd_0B8 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1083 - CompareVar 0x800C, 1 - GoToIf 1, _10F3 - CompareVar 0x800C, 2 - GoToIf 1, _11A0 + GoToIfEq 0x800C, 0, _1083 + GoToIfEq 0x800C, 1, _10F3 + GoToIfEq 0x800C, 2, _11A0 End _1083: @@ -1087,8 +1077,7 @@ _1083: ScrCmd_034 ScrCmd_0E5 0x8004, 0 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FC5 + GoToIfEq 0x800C, 0, _0FC5 ScrCmd_0B9 0, 0x800C SetVar 0x8004, 0x800C SetTrainerFlag 0x8004 @@ -1097,8 +1086,7 @@ _1083: _10DE: ScrCmd_0B7 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _10DE + GoToIfEq 0x800C, 0, _10DE Return _10F3: @@ -1120,8 +1108,7 @@ _10F3: ScrCmd_034 ScrCmd_0E5 0x8004, 0x8005 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FC5 + GoToIfEq 0x800C, 0, _0FC5 ScrCmd_0B9 0, 0x800C SetVar 0x8004, 0x800C SetTrainerFlag 0x8004 @@ -1133,11 +1120,9 @@ _10F3: _1178: ScrCmd_0B7 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1178 + GoToIfEq 0x800C, 0, _1178 ScrCmd_0B7 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1178 + GoToIfEq 0x800C, 0, _1178 Return _11A0: @@ -1163,8 +1148,7 @@ _11A0: ScrCmd_034 ScrCmd_0E5 0x8004, 0x8005 ScrCmd_0EC 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0FC5 + GoToIfEq 0x800C, 0, _0FC5 ScrCmd_0B9 0, 0x800C SetVar 0x8004, 0x800C SetTrainerFlag 0x8004 @@ -1176,14 +1160,12 @@ _11A0: _123B: ScrCmd_0B7 0, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _123B + GoToIfEq 0x800C, 0, _123B Return _1250: ScrCmd_0B7 1, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _1250 + GoToIfEq 0x800C, 0, _1250 Return .byte 0 diff --git a/res/field/scripts/script_1115.s b/res/field/scripts/script_1115.s index 2a12c126c2..3d1df12e21 100644 --- a/res/field/scripts/script_1115.s +++ b/res/field/scripts/script_1115.s @@ -12,14 +12,10 @@ _0006: ScrCmd_235 0, 0x800C ScrCmd_1F9 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _005C - CompareVar 0x8008, 1 - GoToIf 1, _0074 - CompareVar 0x8008, 2 - GoToIf 1, _0092 - CompareVar 0x8008, 3 - GoToIf 1, _00AA + GoToIfEq 0x8008, 0, _005C + GoToIfEq 0x8008, 1, _0074 + GoToIfEq 0x8008, 2, _0092 + GoToIfEq 0x8008, 3, _00AA GoTo _005C End @@ -46,8 +42,7 @@ _0092: _00AA: ScrCmd_235 6, 0x8006 - CompareVar 0x8006, 0 - GoToIf 5, _00EB + GoToIfNe 0x8006, 0, _00EB GoTo _00C5 End diff --git a/res/field/scripts/script_1116.s b/res/field/scripts/script_1116.s index c6a5a8115b..7daf992553 100644 --- a/res/field/scripts/script_1116.s +++ b/res/field/scripts/script_1116.s @@ -80,12 +80,9 @@ _00EA: GoTo _0159 _00F6: - CompareVar 0x4032, 1 - GoToIf 1, _0129 - CompareVar 0x4032, 2 - GoToIf 1, _0135 - CompareVar 0x4032, 3 - GoToIf 1, _0141 + GoToIfEq 0x4032, 1, _0129 + GoToIfEq 0x4032, 2, _0135 + GoToIfEq 0x4032, 3, _0141 SetVar 0x8000, 15 GoTo _0159 @@ -110,20 +107,17 @@ _0159: ScrCmd_060 ScrCmd_068 ScrCmd_238 0x8000, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A1 + GoToIfEq 0x800C, 0, _02A1 ScrCmd_02C 0 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0190 + GoToIfEq 0x800C, 0, _0190 GoTo _02AE End _0190: ScrCmd_237 0, 0x8000, 0x8004, 0x8005 ScrCmd_1FB 0x8004, 0x8005 - CompareVar 0x8000, 10 - GoToIf 1, _01F0 + GoToIfEq 0x8000, 10, _01F0 ScrCmd_0BC 6, 1, 0, 0 ScrCmd_0BD ScrCmd_034 @@ -131,8 +125,7 @@ _0190: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0 - GoToIf 1, _02AE + GoToIfEq 0x800C, 0, _02AE ScrCmd_237 1, 0x8000, 0x8004, 0x8005 GoTo _02A1 End @@ -157,8 +150,7 @@ _01F0: ScrCmd_046 37, 0xFF, 16 ScrCmd_046 38, 0xFF, 17 ScrCmd_047 - CompareVar 0x8004, -2 - GoToIf 1, _02AE + GoToIfEq 0x8004, -2, _02AE ScrCmd_237 1, 0x8000, 0x8004, 0x8005 GoTo _02A1 End diff --git a/res/field/scripts/script_1117.s b/res/field/scripts/script_1117.s index a8f0fcfb6e..1e8cb6b395 100644 --- a/res/field/scripts/script_1117.s +++ b/res/field/scripts/script_1117.s @@ -35,8 +35,7 @@ _001A: End _00BE: - CompareVar 0x40D0, 0 - GoToIf 1, _00CD + GoToIfEq 0x40D0, 0, _00CD End _00CD: @@ -54,14 +53,10 @@ _00F3: ScrCmd_19E 1, 0x800C SetVar 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, -5 - GoToIf 1, _0141 - CompareVar 0x8008, -4 - GoToIf 1, _014D - CompareVar 0x8008, -3 - GoToIf 1, _0159 - CompareVar 0x8008, -1 - GoToIf 1, _0165 + GoToIfEq 0x8008, -5, _0141 + GoToIfEq 0x8008, -4, _014D + GoToIfEq 0x8008, -3, _0159 + GoToIfEq 0x8008, -1, _0165 GoTo _017F End @@ -110,14 +105,10 @@ _019B: ScrCmd_19E 0, 0x800C SetVar 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, -5 - GoToIf 1, _0201 - CompareVar 0x8008, -4 - GoToIf 1, _01E9 - CompareVar 0x8008, -3 - GoToIf 1, _01F5 - CompareVar 0x8008, -1 - GoToIf 1, _0165 + GoToIfEq 0x8008, -5, _0201 + GoToIfEq 0x8008, -4, _01E9 + GoToIfEq 0x8008, -3, _01F5 + GoToIfEq 0x8008, -1, _0165 GoTo _020D End @@ -156,10 +147,8 @@ _0231: ScrCmd_19E 2, 0x800C SetVar 0x8004, 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, -4 - GoToIf 1, _0265 - CompareVar 0x8008, -1 - GoToIf 1, _0165 + GoToIfEq 0x8008, -4, _0265 + GoToIfEq 0x8008, -1, _0165 GoTo _0271 End diff --git a/res/field/scripts/script_1118.s b/res/field/scripts/script_1118.s index 91911253da..dbe5b1c416 100644 --- a/res/field/scripts/script_1118.s +++ b/res/field/scripts/script_1118.s @@ -28,26 +28,19 @@ _002A: ScrCmd_068 ScrCmd_140 0x800C SetVar 0x8004, 0x800C - CompareVar 0x800C, 5 - GoToIf 1, _0497 + GoToIfEq 0x800C, 5, _0497 ScrCmd_13C 0 - CompareVar 0x800C, 2 - GoToIf 1, _04AD - CompareVar 0x800C, 3 - GoToIf 1, _053A - CompareVar 0x800C, 4 - GoToIf 1, _05AF + GoToIfEq 0x800C, 2, _04AD + GoToIfEq 0x800C, 3, _053A + GoToIfEq 0x800C, 4, _05AF ScrCmd_146 0x8004, 0x800C ScrCmd_140 0x800C - CompareVar 0x800C, 5 - GoToIf 1, _0497 + GoToIfEq 0x800C, 5, _0497 ScrCmd_02C 199 ScrCmd_141 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 3 - GoToIf 1, _07BA - CompareVar 0x8008, 2 - GoToIf 1, _0486 + GoToIfEq 0x8008, 3, _07BA + GoToIfEq 0x8008, 2, _0486 GoTo _00BA End @@ -78,20 +71,13 @@ _00EA: ScrCmd_042 23, 99 ScrCmd_2B9 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0182 - CompareVar 0x8008, 1 - GoToIf 1, _0334 - CompareVar 0x8008, 2 - GoToIf 1, _0274 - CompareVar 0x8008, 3 - GoToIf 1, _01EB - CompareVar 0x8008, 4 - GoToIf 1, _0394 - CompareVar 0x8008, 5 - GoToIf 1, _03F4 - CompareVar 0x8008, 7 - GoToIf 1, _0792 + GoToIfEq 0x8008, 0, _0182 + GoToIfEq 0x8008, 1, _0334 + GoToIfEq 0x8008, 2, _0274 + GoToIfEq 0x8008, 3, _01EB + GoToIfEq 0x8008, 4, _0394 + GoToIfEq 0x8008, 5, _03F4 + GoToIfEq 0x8008, 7, _0792 ScrCmd_143 0, 7 GoTo _0776 End @@ -99,13 +85,11 @@ _00EA: _0182: ScrCmd_143 0, 1 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _019F + GoToIfEq 0x800C, 0, _019F ScrCmd_02D 0x800C _019F: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _06A0 + GoToIfEq 0x800C, 7, _06A0 ScrCmd_139 5 ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C @@ -123,17 +107,14 @@ _019F: _01EB: ScrCmd_19A 0x800C - CompareVar 0x800C, 2 - GoToIf 0, _0262 + GoToIfLt 0x800C, 2, _0262 ScrCmd_143 0, 3 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0219 + GoToIfEq 0x800C, 0, _0219 ScrCmd_02D 0x800C _0219: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _06E8 + GoToIfEq 0x800C, 7, _06E8 ScrCmd_139 7 ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C @@ -156,17 +137,14 @@ _0262: _0274: ScrCmd_1F6 0x800C, 30 - CompareVar 0x800C, 2 - GoToIf 0, _0322 + GoToIfLt 0x800C, 2, _0322 ScrCmd_143 0, 2 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _02A4 + GoToIfEq 0x800C, 0, _02A4 ScrCmd_02D 0x800C _02A4: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _06D0 + GoToIfEq 0x800C, 7, _06D0 ScrCmd_139 6 ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C @@ -183,10 +161,8 @@ _02A4: ScrCmd_135 102 ScrCmd_034 ScrCmd_2BA 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B63 - CompareVar 0x800C, 2 - GoToIf 1, _0B63 + GoToIfEq 0x800C, 1, _0B63 + GoToIfEq 0x800C, 2, _0B63 ScrCmd_0F6 Call _0BB2 GoTo _00D0 @@ -201,13 +177,11 @@ _0322: _0334: ScrCmd_143 0, 4 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0351 + GoToIfEq 0x800C, 0, _0351 ScrCmd_02D 0x800C _0351: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _06B8 + GoToIfEq 0x800C, 7, _06B8 ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C ScrCmd_190 30 @@ -224,13 +198,11 @@ _0351: _0394: ScrCmd_143 0, 5 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _03B1 + GoToIfEq 0x800C, 0, _03B1 ScrCmd_02D 0x800C _03B1: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0718 + GoToIfEq 0x800C, 7, _0718 ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C ScrCmd_190 30 @@ -246,20 +218,16 @@ _03B1: _03F4: ScrCmd_19D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0741 + GoToIfEq 0x800C, 0, _0741 ScrCmd_2C7 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0753 + GoToIfEq 0x800C, 0, _0753 ScrCmd_143 0, 6 ScrCmd_13F 9, 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0433 + GoToIfEq 0x800C, 0, _0433 ScrCmd_02D 0x800C _0433: ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _075E + GoToIfEq 0x800C, 7, _075E ScrCmd_13F 1, 0x800C ScrCmd_02D 0x800C ScrCmd_190 30 @@ -313,14 +281,11 @@ _04AD: ScrCmd_13F 10, 0x800C ScrCmd_02D 0x800C ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0522 + GoToIfEq 0x800C, 1, _0522 ScrCmd_146 0x8004, 0x800C - CompareVar 0x800C, 5 - GoToIf 1, _0486 + GoToIfEq 0x800C, 5, _0486 ScrCmd_141 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0486 + GoToIfEq 0x800C, 2, _0486 ScrCmd_13F 13, 0x800C ScrCmd_02D 0x800C ScrCmd_003 30, 0x800C @@ -347,14 +312,11 @@ _053A: ScrCmd_13F 11, 0x800C ScrCmd_02D 0x800C ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0646 + GoToIfEq 0x800C, 1, _0646 ScrCmd_146 0x8004, 0x800C - CompareVar 0x800C, 5 - GoToIf 1, _0486 + GoToIfEq 0x800C, 5, _0486 ScrCmd_141 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0486 + GoToIfEq 0x800C, 2, _0486 ScrCmd_13F 14, 0x800C ScrCmd_02D 0x800C ScrCmd_003 30, 0x800C @@ -372,20 +334,15 @@ _05AF: ScrCmd_13F 12, 0x800C ScrCmd_02D 0x800C ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _065E + GoToIfEq 0x800C, 1, _065E ScrCmd_19D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _068A + GoToIfEq 0x800C, 0, _068A ScrCmd_2B7 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0674 + GoToIfEq 0x800C, 1, _0674 ScrCmd_146 0x8004, 0x800C - CompareVar 0x800C, 5 - GoToIf 1, _0486 + GoToIfEq 0x800C, 5, _0486 ScrCmd_141 0x800C - CompareVar 0x800C, 2 - GoToIf 1, _0486 + GoToIfEq 0x800C, 2, _0486 ScrCmd_13F 15, 0x800C ScrCmd_02D 0x800C ScrCmd_003 30, 0x800C @@ -558,34 +515,24 @@ _07D4: ScrCmd_139 11 ScrCmd_145 0x800C SetVar 0x8008, 0x800C - CompareVar 0x8008, 1 - GoToIf 1, _0853 - CompareVar 0x8008, 4 - GoToIf 1, _0AED - CompareVar 0x8008, 2 - GoToIf 1, _095C - CompareVar 0x8008, 3 - GoToIf 1, _08C7 - CompareVar 0x8008, 5 - GoToIf 1, _0A28 - CompareVar 0x8008, 6 - GoToIf 1, _0A82 - CompareVar 0x8008, 7 - GoToIf 1, _0B78 - CompareVar 0x8008, 8 - GoToIf 1, _0B89 + GoToIfEq 0x8008, 1, _0853 + GoToIfEq 0x8008, 4, _0AED + GoToIfEq 0x8008, 2, _095C + GoToIfEq 0x8008, 3, _08C7 + GoToIfEq 0x8008, 5, _0A28 + GoToIfEq 0x8008, 6, _0A82 + GoToIfEq 0x8008, 7, _0B78 + GoToIfEq 0x8008, 8, _0B89 End _0853: ScrCmd_02C 11 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _08B6 + GoToIfEq 0x800C, 1, _08B6 ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B58 + GoToIfEq 0x800C, 7, _0B58 ScrCmd_2AF 0x800C ScrCmd_02D 0x800C ScrCmd_003 30, 0x800C @@ -609,16 +556,13 @@ _08B6: _08C7: ScrCmd_02C 26 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _093A + GoToIfEq 0x800C, 1, _093A ScrCmd_19A 0x800C - CompareVar 0x800C, 2 - GoToIf 0, _094B + GoToIfLt 0x800C, 2, _094B ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B78 + GoToIfEq 0x800C, 7, _0B78 ScrCmd_02C 27 ScrCmd_003 30, 0x800C ScrCmd_135 3 @@ -648,16 +592,13 @@ _094B: _095C: ScrCmd_02C 21 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0A06 + GoToIfEq 0x800C, 1, _0A06 ScrCmd_1F6 0x800C, 30 - CompareVar 0x800C, 2 - GoToIf 0, _0A17 + GoToIfLt 0x800C, 2, _0A17 ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B78 + GoToIfEq 0x800C, 7, _0B78 ScrCmd_02C 22 ScrCmd_003 30, 0x800C ScrCmd_135 2 @@ -673,10 +614,8 @@ _095C: ScrCmd_135 102 ScrCmd_034 ScrCmd_2BA 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B63 - CompareVar 0x800C, 2 - GoToIf 1, _0B63 + GoToIfEq 0x800C, 1, _0B63 + GoToIfEq 0x800C, 2, _0B63 ScrCmd_0F6 ScrCmd_139 11 Call _0BB2 @@ -698,13 +637,11 @@ _0A17: _0A28: ScrCmd_02C 30 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0A06 + GoToIfEq 0x800C, 1, _0A06 ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B78 + GoToIfEq 0x800C, 7, _0B78 ScrCmd_02C 31 ScrCmd_003 30, 0x800C ScrCmd_135 5 @@ -721,16 +658,13 @@ _0A28: _0A82: ScrCmd_02C 33 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0A06 + GoToIfEq 0x800C, 1, _0A06 ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_19D 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0730 + GoToIfEq 0x800C, 0, _0730 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B78 + GoToIfEq 0x800C, 7, _0B78 ScrCmd_02C 34 ScrCmd_003 30, 0x800C ScrCmd_135 6 @@ -747,13 +681,11 @@ _0A82: _0AED: ScrCmd_02C 18 ScrCmd_03E 0x800C - CompareVar 0x800C, 1 - GoToIf 1, _0B47 + GoToIfEq 0x800C, 1, _0B47 ScrCmd_143 1, 0 ScrCmd_034 ScrCmd_144 0x800C - CompareVar 0x800C, 7 - GoToIf 1, _0B78 + GoToIfEq 0x800C, 7, _0B78 ScrCmd_02C 19 ScrCmd_003 30, 0x800C ScrCmd_135 4 @@ -860,10 +792,8 @@ _0BF3: ScrCmd_042 23, 2 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0C72 - CompareVar 0x8008, 1 - GoToIf 1, _0C5A + GoToIfEq 0x8008, 0, _0C72 + GoToIfEq 0x8008, 1, _0C5A GoTo _0C6A End @@ -900,18 +830,12 @@ _0C72: ScrCmd_042 12, 6 ScrCmd_043 SetVar 0x8008, 0x800C - CompareVar 0x8008, 0 - GoToIf 1, _0CFA - CompareVar 0x8008, 1 - GoToIf 1, _0D05 - CompareVar 0x8008, 2 - GoToIf 1, _0D10 - CompareVar 0x8008, 3 - GoToIf 1, _0D1B - CompareVar 0x8008, 4 - GoToIf 1, _0D26 - CompareVar 0x8008, 5 - GoToIf 1, _0D31 + GoToIfEq 0x8008, 0, _0CFA + GoToIfEq 0x8008, 1, _0D05 + GoToIfEq 0x8008, 2, _0D10 + GoToIfEq 0x8008, 3, _0D1B + GoToIfEq 0x8008, 4, _0D26 + GoToIfEq 0x8008, 5, _0D31 GoTo _0BF3 End diff --git a/res/field/scripts/script_1122.s b/res/field/scripts/script_1122.s index c279ec5c71..d3931e39cb 100644 --- a/res/field/scripts/script_1122.s +++ b/res/field/scripts/script_1122.s @@ -15,10 +15,8 @@ _0014: ScrCmd_049 0x5DC ScrCmd_060 ScrCmd_068 - CheckFlag 245 - GoToIf 1, _00DC - CheckFlag 246 - GoToIf 1, _0046 + GoToIfSet 245, _00DC + GoToIfSet 246, _0046 ScrCmd_02C 0 ScrCmd_22B SetFlag 246 @@ -31,8 +29,7 @@ _0014: _0046: ScrCmd_02C 2 ScrCmd_03E 0x800C - CompareVar 0x800C, 0 - GoToIf 1, _0060 + GoToIfEq 0x800C, 0, _0060 GoTo _00D1 _0060: @@ -44,14 +41,12 @@ _0060: ScrCmd_0A1 ScrCmd_0BC 6, 1, 1, 0 ScrCmd_0BD - CompareVar 0x800C, 0xFF - GoToIf 1, _00D1 + GoToIfEq 0x800C, 0xFF, _00D1 ScrCmd_226 3 SetVar 0x8004, 0x800C ScrCmd_198 0x8004, 0x8005 ScrCmd_228 0x800C - CompareVar 0x8005, 0x800C - GoToIf 5, _00C4 + GoToIfNe 0x8005, 0x800C, _00C4 ScrCmd_229 0x8004 ScrCmd_22A SetFlag 245