From 660228c9f6325b66bd2117ad6a80d713a7baf761 Mon Sep 17 00:00:00 2001 From: cbt6 <91667135+cbt6@users.noreply.github.com> Date: Sun, 17 Mar 2024 13:30:22 +0800 Subject: [PATCH] Use macros for movements in field scripts --- asm/macros/movement.inc | 776 ++++++++++++++++++++++++++++++++ asm/macros/scrcmd.inc | 2 + consts/meson.build | 1 + consts/movement.json | 172 +++++++ res/field/scripts/script_0002.s | 548 +++++++++++----------- res/field/scripts/script_0013.s | 8 +- res/field/scripts/script_0015.s | 70 +-- res/field/scripts/script_0018.s | 4 +- res/field/scripts/script_0028.s | 26 +- res/field/scripts/script_0031.s | 32 +- res/field/scripts/script_0036.s | 124 ++--- res/field/scripts/script_0042.s | 36 +- res/field/scripts/script_0043.s | 40 +- res/field/scripts/script_0044.s | 148 +++--- res/field/scripts/script_0047.s | 24 +- res/field/scripts/script_0048.s | 42 +- res/field/scripts/script_0050.s | 196 ++++---- res/field/scripts/script_0071.s | 514 ++++++++++----------- res/field/scripts/script_0079.s | 34 +- res/field/scripts/script_0082.s | 26 +- res/field/scripts/script_0083.s | 32 +- res/field/scripts/script_0088.s | 8 +- res/field/scripts/script_0090.s | 4 +- res/field/scripts/script_0092.s | 40 +- res/field/scripts/script_0093.s | 98 ++-- res/field/scripts/script_0095.s | 18 +- res/field/scripts/script_0098.s | 72 +-- res/field/scripts/script_0101.s | 40 +- res/field/scripts/script_0107.s | 12 +- res/field/scripts/script_0112.s | 80 ++-- res/field/scripts/script_0116.s | 12 +- res/field/scripts/script_0119.s | 160 +++---- res/field/scripts/script_0123.s | 282 ++++++------ res/field/scripts/script_0129.s | 50 +- res/field/scripts/script_0136.s | 458 +++++++++---------- res/field/scripts/script_0147.s | 4 +- res/field/scripts/script_0149.s | 122 ++--- res/field/scripts/script_0151.s | 72 +-- res/field/scripts/script_0156.s | 238 +++++----- res/field/scripts/script_0171.s | 44 +- res/field/scripts/script_0172.s | 12 +- res/field/scripts/script_0174.s | 80 ++-- res/field/scripts/script_0177.s | 12 +- res/field/scripts/script_0186.s | 62 +-- res/field/scripts/script_0188.s | 4 +- res/field/scripts/script_0190.s | 4 +- res/field/scripts/script_0192.s | 16 +- res/field/scripts/script_0194.s | 4 +- res/field/scripts/script_0196.s | 22 +- res/field/scripts/script_0197.s | 72 +-- res/field/scripts/script_0198.s | 40 +- res/field/scripts/script_0201.s | 218 ++++----- res/field/scripts/script_0211.s | 30 +- res/field/scripts/script_0212.s | 100 ++-- res/field/scripts/script_0213.s | 28 +- res/field/scripts/script_0214.s | 10 +- res/field/scripts/script_0215.s | 12 +- res/field/scripts/script_0216.s | 80 ++-- res/field/scripts/script_0217.s | 108 ++--- res/field/scripts/script_0219.s | 174 +++---- res/field/scripts/script_0223.s | 48 +- res/field/scripts/script_0224.s | 44 +- res/field/scripts/script_0232.s | 4 +- res/field/scripts/script_0234.s | 12 +- res/field/scripts/script_0236.s | 98 ++-- res/field/scripts/script_0237.s | 36 +- res/field/scripts/script_0238.s | 30 +- res/field/scripts/script_0253.s | 4 +- res/field/scripts/script_0270.s | 160 +++---- res/field/scripts/script_0273.s | 8 +- res/field/scripts/script_0274.s | 198 ++++---- res/field/scripts/script_0277.s | 36 +- res/field/scripts/script_0279.s | 14 +- res/field/scripts/script_0281.s | 32 +- res/field/scripts/script_0282.s | 8 +- res/field/scripts/script_0283.s | 116 ++--- res/field/scripts/script_0284.s | 106 ++--- res/field/scripts/script_0285.s | 52 +-- res/field/scripts/script_0286.s | 212 ++++----- res/field/scripts/script_0288.s | 20 +- res/field/scripts/script_0318.s | 48 +- res/field/scripts/script_0324.s | 28 +- res/field/scripts/script_0329.s | 112 ++--- res/field/scripts/script_0331.s | 14 +- res/field/scripts/script_0333.s | 24 +- res/field/scripts/script_0339.s | 16 +- res/field/scripts/script_0341.s | 8 +- res/field/scripts/script_0343.s | 8 +- res/field/scripts/script_0344.s | 42 +- res/field/scripts/script_0346.s | 8 +- res/field/scripts/script_0347.s | 70 +-- res/field/scripts/script_0349.s | 78 ++-- res/field/scripts/script_0351.s | 106 ++--- res/field/scripts/script_0352.s | 24 +- res/field/scripts/script_0353.s | 20 +- res/field/scripts/script_0357.s | 4 +- res/field/scripts/script_0360.s | 80 ++-- res/field/scripts/script_0362.s | 32 +- res/field/scripts/script_0364.s | 60 +-- res/field/scripts/script_0367.s | 28 +- res/field/scripts/script_0368.s | 30 +- res/field/scripts/script_0369.s | 82 ++-- res/field/scripts/script_0370.s | 66 +-- res/field/scripts/script_0371.s | 96 ++-- res/field/scripts/script_0372.s | 94 ++-- res/field/scripts/script_0373.s | 144 +++--- res/field/scripts/script_0374.s | 16 +- res/field/scripts/script_0375.s | 18 +- res/field/scripts/script_0376.s | 84 ++-- res/field/scripts/script_0377.s | 80 ++-- res/field/scripts/script_0378.s | 64 +-- res/field/scripts/script_0379.s | 68 +-- res/field/scripts/script_0380.s | 82 ++-- res/field/scripts/script_0381.s | 60 +-- res/field/scripts/script_0382.s | 38 +- res/field/scripts/script_0383.s | 8 +- res/field/scripts/script_0387.s | 24 +- res/field/scripts/script_0388.s | 144 +++--- res/field/scripts/script_0389.s | 38 +- res/field/scripts/script_0410.s | 128 +++--- res/field/scripts/script_0414.s | 20 +- res/field/scripts/script_0416.s | 190 ++++---- res/field/scripts/script_0417.s | 8 +- res/field/scripts/script_0420.s | 16 +- res/field/scripts/script_0423.s | 74 +-- res/field/scripts/script_0427.s | 460 +++++++++---------- res/field/scripts/script_0428.s | 178 ++++---- res/field/scripts/script_0429.s | 52 +-- res/field/scripts/script_0432.s | 82 ++-- res/field/scripts/script_0436.s | 8 +- res/field/scripts/script_0438.s | 18 +- res/field/scripts/script_0447.s | 76 ++-- res/field/scripts/script_0452.s | 4 +- res/field/scripts/script_0454.s | 60 +-- res/field/scripts/script_0456.s | 58 +-- res/field/scripts/script_0459.s | 122 ++--- res/field/scripts/script_0461.s | 48 +- res/field/scripts/script_0462.s | 4 +- res/field/scripts/script_0471.s | 56 +-- res/field/scripts/script_0476.s | 80 ++-- res/field/scripts/script_0479.s | 62 +-- res/field/scripts/script_0485.s | 234 +++++----- res/field/scripts/script_0489.s | 96 ++-- res/field/scripts/script_0497.s | 36 +- res/field/scripts/script_0501.s | 26 +- res/field/scripts/script_0502.s | 2 +- res/field/scripts/script_0508.s | 2 +- res/field/scripts/script_0511.s | 2 +- res/field/scripts/script_0512.s | 2 +- res/field/scripts/script_0528.s | 2 +- res/field/scripts/script_0536.s | 4 +- res/field/scripts/script_0538.s | 2 +- res/field/scripts/script_0543.s | 2 +- res/field/scripts/script_0544.s | 2 +- res/field/scripts/script_0547.s | 2 +- res/field/scripts/script_0548.s | 2 +- res/field/scripts/script_0549.s | 2 +- res/field/scripts/script_0571.s | 2 +- res/field/scripts/script_0573.s | 2 +- res/field/scripts/script_0574.s | 4 +- res/field/scripts/script_0579.s | 2 +- res/field/scripts/script_0582.s | 2 +- res/field/scripts/script_0583.s | 4 +- res/field/scripts/script_0588.s | 2 +- res/field/scripts/script_0593.s | 2 +- res/field/scripts/script_0596.s | 2 +- res/field/scripts/script_0597.s | 2 +- res/field/scripts/script_0598.s | 2 +- res/field/scripts/script_0599.s | 2 +- res/field/scripts/script_0600.s | 2 +- res/field/scripts/script_0608.s | 2 +- res/field/scripts/script_0609.s | 2 +- res/field/scripts/script_0610.s | 2 +- res/field/scripts/script_0618.s | 4 +- res/field/scripts/script_0623.s | 2 +- res/field/scripts/script_0625.s | 2 +- res/field/scripts/script_0629.s | 2 +- res/field/scripts/script_0636.s | 2 +- res/field/scripts/script_0637.s | 2 +- res/field/scripts/script_0649.s | 2 +- res/field/scripts/script_0656.s | 2 +- res/field/scripts/script_0658.s | 2 +- res/field/scripts/script_0659.s | 2 +- res/field/scripts/script_0660.s | 2 +- res/field/scripts/script_0664.s | 2 +- res/field/scripts/script_0674.s | 2 +- res/field/scripts/script_0676.s | 2 +- res/field/scripts/script_0683.s | 2 +- res/field/scripts/script_0686.s | 2 +- res/field/scripts/script_0687.s | 2 +- res/field/scripts/script_0689.s | 2 +- res/field/scripts/script_0691.s | 2 +- res/field/scripts/script_0693.s | 2 +- res/field/scripts/script_0695.s | 2 +- res/field/scripts/script_0696.s | 2 +- res/field/scripts/script_0701.s | 2 +- res/field/scripts/script_0711.s | 2 +- res/field/scripts/script_0713.s | 6 +- res/field/scripts/script_0714.s | 2 +- res/field/scripts/script_0715.s | 2 +- res/field/scripts/script_0716.s | 2 +- res/field/scripts/script_0718.s | 2 +- res/field/scripts/script_0719.s | 2 +- res/field/scripts/script_0728.s | 4 +- res/field/scripts/script_0730.s | 4 +- res/field/scripts/script_0733.s | 4 +- res/field/scripts/script_0735.s | 4 +- res/field/scripts/script_0736.s | 2 +- res/field/scripts/script_0737.s | 2 +- res/field/scripts/script_0738.s | 2 +- res/field/scripts/script_0747.s | 2 +- res/field/scripts/script_0764.s | 2 +- res/field/scripts/script_0767.s | 2 +- res/field/scripts/script_0770.s | 2 +- res/field/scripts/script_0771.s | 2 +- res/field/scripts/script_0772.s | 2 +- res/field/scripts/script_0774.s | 2 +- res/field/scripts/script_0776.s | 2 +- res/field/scripts/script_0778.s | 2 +- res/field/scripts/script_0780.s | 2 +- res/field/scripts/script_0781.s | 2 +- res/field/scripts/script_0782.s | 2 +- res/field/scripts/script_0783.s | 4 +- res/field/scripts/script_0784.s | 2 +- res/field/scripts/script_0785.s | 2 +- res/field/scripts/script_0786.s | 2 +- res/field/scripts/script_0787.s | 2 +- res/field/scripts/script_0788.s | 4 +- res/field/scripts/script_0789.s | 2 +- res/field/scripts/script_0790.s | 2 +- res/field/scripts/script_0791.s | 2 +- res/field/scripts/script_0792.s | 2 +- res/field/scripts/script_0793.s | 2 +- res/field/scripts/script_0794.s | 2 +- res/field/scripts/script_0795.s | 2 +- res/field/scripts/script_0796.s | 2 +- res/field/scripts/script_0797.s | 2 +- res/field/scripts/script_0798.s | 2 +- res/field/scripts/script_0799.s | 2 +- res/field/scripts/script_0800.s | 2 +- res/field/scripts/script_0801.s | 2 +- res/field/scripts/script_0802.s | 2 +- res/field/scripts/script_0803.s | 2 +- res/field/scripts/script_0804.s | 2 +- res/field/scripts/script_0805.s | 2 +- res/field/scripts/script_0806.s | 2 +- res/field/scripts/script_0807.s | 4 +- res/field/scripts/script_0809.s | 2 +- res/field/scripts/script_0814.s | 2 +- res/field/scripts/script_0815.s | 2 +- res/field/scripts/script_0817.s | 2 +- res/field/scripts/script_0818.s | 2 +- res/field/scripts/script_0819.s | 2 +- res/field/scripts/script_0820.s | 2 +- res/field/scripts/script_0821.s | 2 +- res/field/scripts/script_0822.s | 2 +- res/field/scripts/script_0824.s | 2 +- res/field/scripts/script_0826.s | 2 +- res/field/scripts/script_0827.s | 4 +- res/field/scripts/script_0828.s | 2 +- res/field/scripts/script_0829.s | 2 +- res/field/scripts/script_0830.s | 2 +- res/field/scripts/script_0836.s | 2 +- res/field/scripts/script_0838.s | 2 +- res/field/scripts/script_0844.s | 4 +- res/field/scripts/script_0847.s | 2 +- res/field/scripts/script_0848.s | 4 +- res/field/scripts/script_0849.s | 4 +- res/field/scripts/script_0850.s | 2 +- res/field/scripts/script_0851.s | 2 +- res/field/scripts/script_0854.s | 4 +- res/field/scripts/script_0855.s | 2 +- res/field/scripts/script_0858.s | 4 +- res/field/scripts/script_0859.s | 2 +- res/field/scripts/script_0860.s | 4 +- res/field/scripts/script_0864.s | 4 +- res/field/scripts/script_0865.s | 2 +- res/field/scripts/script_0866.s | 4 +- res/field/scripts/script_0867.s | 4 +- res/field/scripts/script_0868.s | 4 +- res/field/scripts/script_0869.s | 4 +- res/field/scripts/script_0870.s | 4 +- res/field/scripts/script_0871.s | 2 +- res/field/scripts/script_0872.s | 2 +- res/field/scripts/script_0873.s | 2 +- res/field/scripts/script_0874.s | 6 +- res/field/scripts/script_0875.s | 2 +- res/field/scripts/script_0876.s | 2 +- res/field/scripts/script_0877.s | 2 +- res/field/scripts/script_0878.s | 2 +- res/field/scripts/script_0879.s | 2 +- res/field/scripts/script_0880.s | 2 +- res/field/scripts/script_0881.s | 2 +- res/field/scripts/script_0882.s | 2 +- res/field/scripts/script_0883.s | 2 +- res/field/scripts/script_0884.s | 2 +- res/field/scripts/script_0885.s | 2 +- res/field/scripts/script_0886.s | 4 +- res/field/scripts/script_0887.s | 2 +- res/field/scripts/script_0889.s | 2 +- res/field/scripts/script_0891.s | 2 +- res/field/scripts/script_0893.s | 2 +- res/field/scripts/script_0894.s | 2 +- res/field/scripts/script_0895.s | 2 +- res/field/scripts/script_0901.s | 4 +- res/field/scripts/script_0903.s | 4 +- res/field/scripts/script_0904.s | 2 +- res/field/scripts/script_0907.s | 4 +- res/field/scripts/script_0909.s | 2 +- res/field/scripts/script_0910.s | 2 +- res/field/scripts/script_0914.s | 2 +- res/field/scripts/script_0917.s | 4 +- res/field/scripts/script_0918.s | 2 +- res/field/scripts/script_0920.s | 2 +- res/field/scripts/script_0922.s | 2 +- res/field/scripts/script_0923.s | 2 +- res/field/scripts/script_0924.s | 2 +- res/field/scripts/script_0929.s | 2 +- res/field/scripts/script_0930.s | 2 +- res/field/scripts/script_0932.s | 2 +- res/field/scripts/script_0935.s | 2 +- res/field/scripts/script_0936.s | 2 +- res/field/scripts/script_0938.s | 2 +- res/field/scripts/script_0939.s | 2 +- res/field/scripts/script_0940.s | 2 +- res/field/scripts/script_0941.s | 2 +- res/field/scripts/script_0943.s | 2 +- res/field/scripts/script_0944.s | 2 +- res/field/scripts/script_0948.s | 4 +- res/field/scripts/script_0949.s | 2 +- res/field/scripts/script_0950.s | 2 +- res/field/scripts/script_0960.s | 2 +- res/field/scripts/script_0961.s | 2 +- res/field/scripts/script_0963.s | 2 +- res/field/scripts/script_0964.s | 2 +- res/field/scripts/script_0965.s | 2 +- res/field/scripts/script_0967.s | 4 +- res/field/scripts/script_0973.s | 4 +- res/field/scripts/script_0982.s | 2 +- res/field/scripts/script_0985.s | 2 +- res/field/scripts/script_0986.s | 2 +- res/field/scripts/script_0989.s | 2 +- res/field/scripts/script_0994.s | 2 +- res/field/scripts/script_0998.s | 2 +- res/field/scripts/script_1006.s | 4 +- res/field/scripts/script_1011.s | 2 +- res/field/scripts/script_1016.s | 2 +- res/field/scripts/script_1021.s | 2 +- res/field/scripts/script_1026.s | 4 +- res/field/scripts/script_1031.s | 2 +- res/field/scripts/script_1034.s | 2 +- res/field/scripts/script_1039.s | 2 +- res/field/scripts/script_1042.s | 2 +- res/field/scripts/script_1044.s | 4 +- res/field/scripts/script_1045.s | 6 +- res/field/scripts/script_1049.s | 2 +- res/field/scripts/script_1051.s | 24 +- res/field/scripts/script_1052.s | 290 ++++++------ res/field/scripts/script_1054.s | 24 +- res/field/scripts/script_1055.s | 236 +++++----- res/field/scripts/script_1056.s | 204 ++++----- res/field/scripts/script_1059.s | 304 ++++++------- res/field/scripts/script_1064.s | 146 +++--- res/field/scripts/script_1068.s | 14 +- res/field/scripts/script_1076.s | 36 +- res/field/scripts/script_1086.s | 88 ++-- res/field/scripts/script_1095.s | 308 ++++++------- res/field/scripts/script_1096.s | 10 +- res/field/scripts/script_1101.s | 60 +-- res/field/scripts/script_1104.s | 86 ++-- res/field/scripts/script_1109.s | 10 +- res/field/scripts/script_1110.s | 108 ++--- res/field/scripts/script_1111.s | 4 +- res/field/scripts/script_1112.s | 114 ++--- res/field/scripts/script_1113.s | 4 +- res/field/scripts/script_1114.s | 4 +- res/field/scripts/script_1117.s | 50 +- 377 files changed, 7408 insertions(+), 6457 deletions(-) create mode 100644 asm/macros/movement.inc create mode 100644 consts/movement.json diff --git a/asm/macros/movement.inc b/asm/macros/movement.inc new file mode 100644 index 0000000000..0ae6a4cd0a --- /dev/null +++ b/asm/macros/movement.inc @@ -0,0 +1,776 @@ + .include "consts/generated/asm/movement.inc" + + .macro MoveAction_000 length=1 + .short MOVEMENT_ACTION_0 + .short \length + .endm + + .macro MoveAction_001 length=1 + .short MOVEMENT_ACTION_1 + .short \length + .endm + + .macro MoveAction_002 length=1 + .short MOVEMENT_ACTION_2 + .short \length + .endm + + .macro MoveAction_003 length=1 + .short MOVEMENT_ACTION_3 + .short \length + .endm + + .macro MoveAction_004 length=1 + .short MOVEMENT_ACTION_4 + .short \length + .endm + + .macro MoveAction_005 length=1 + .short MOVEMENT_ACTION_5 + .short \length + .endm + + .macro MoveAction_006 length=1 + .short MOVEMENT_ACTION_6 + .short \length + .endm + + .macro MoveAction_007 length=1 + .short MOVEMENT_ACTION_7 + .short \length + .endm + + .macro MoveAction_008 length=1 + .short MOVEMENT_ACTION_8 + .short \length + .endm + + .macro MoveAction_009 length=1 + .short MOVEMENT_ACTION_9 + .short \length + .endm + + .macro MoveAction_00A length=1 + .short MOVEMENT_ACTION_A + .short \length + .endm + + .macro MoveAction_00B length=1 + .short MOVEMENT_ACTION_B + .short \length + .endm + + .macro MoveAction_00C length=1 + .short MOVEMENT_ACTION_C + .short \length + .endm + + .macro MoveAction_00D length=1 + .short MOVEMENT_ACTION_D + .short \length + .endm + + .macro MoveAction_00E length=1 + .short MOVEMENT_ACTION_E + .short \length + .endm + + .macro MoveAction_00F length=1 + .short MOVEMENT_ACTION_F + .short \length + .endm + + .macro MoveAction_010 length=1 + .short MOVEMENT_ACTION_10 + .short \length + .endm + + .macro MoveAction_011 length=1 + .short MOVEMENT_ACTION_11 + .short \length + .endm + + .macro MoveAction_012 length=1 + .short MOVEMENT_ACTION_12 + .short \length + .endm + + .macro MoveAction_013 length=1 + .short MOVEMENT_ACTION_13 + .short \length + .endm + + .macro MoveAction_014 length=1 + .short MOVEMENT_ACTION_14 + .short \length + .endm + + .macro MoveAction_015 length=1 + .short MOVEMENT_ACTION_15 + .short \length + .endm + + .macro MoveAction_016 length=1 + .short MOVEMENT_ACTION_16 + .short \length + .endm + + .macro MoveAction_017 length=1 + .short MOVEMENT_ACTION_17 + .short \length + .endm + + .macro MoveAction_018 length=1 + .short MOVEMENT_ACTION_18 + .short \length + .endm + + .macro MoveAction_019 length=1 + .short MOVEMENT_ACTION_19 + .short \length + .endm + + .macro MoveAction_01A length=1 + .short MOVEMENT_ACTION_1A + .short \length + .endm + + .macro MoveAction_01B length=1 + .short MOVEMENT_ACTION_1B + .short \length + .endm + + .macro MoveAction_01C length=1 + .short MOVEMENT_ACTION_1C + .short \length + .endm + + .macro MoveAction_01D length=1 + .short MOVEMENT_ACTION_1D + .short \length + .endm + + .macro MoveAction_01E length=1 + .short MOVEMENT_ACTION_1E + .short \length + .endm + + .macro MoveAction_01F length=1 + .short MOVEMENT_ACTION_1F + .short \length + .endm + + .macro MoveAction_020 length=1 + .short MOVEMENT_ACTION_20 + .short \length + .endm + + .macro MoveAction_021 length=1 + .short MOVEMENT_ACTION_21 + .short \length + .endm + + .macro MoveAction_022 length=1 + .short MOVEMENT_ACTION_22 + .short \length + .endm + + .macro MoveAction_023 length=1 + .short MOVEMENT_ACTION_23 + .short \length + .endm + + .macro MoveAction_024 length=1 + .short MOVEMENT_ACTION_24 + .short \length + .endm + + .macro MoveAction_025 length=1 + .short MOVEMENT_ACTION_25 + .short \length + .endm + + .macro MoveAction_026 length=1 + .short MOVEMENT_ACTION_26 + .short \length + .endm + + .macro MoveAction_027 length=1 + .short MOVEMENT_ACTION_27 + .short \length + .endm + + .macro MoveAction_028 length=1 + .short MOVEMENT_ACTION_28 + .short \length + .endm + + .macro MoveAction_029 length=1 + .short MOVEMENT_ACTION_29 + .short \length + .endm + + .macro MoveAction_02A length=1 + .short MOVEMENT_ACTION_2A + .short \length + .endm + + .macro MoveAction_02B length=1 + .short MOVEMENT_ACTION_2B + .short \length + .endm + + .macro MoveAction_02C length=1 + .short MOVEMENT_ACTION_2C + .short \length + .endm + + .macro MoveAction_02D length=1 + .short MOVEMENT_ACTION_2D + .short \length + .endm + + .macro MoveAction_02E length=1 + .short MOVEMENT_ACTION_2E + .short \length + .endm + + .macro MoveAction_02F length=1 + .short MOVEMENT_ACTION_2F + .short \length + .endm + + .macro MoveAction_030 length=1 + .short MOVEMENT_ACTION_30 + .short \length + .endm + + .macro MoveAction_031 length=1 + .short MOVEMENT_ACTION_31 + .short \length + .endm + + .macro MoveAction_032 length=1 + .short MOVEMENT_ACTION_32 + .short \length + .endm + + .macro MoveAction_033 length=1 + .short MOVEMENT_ACTION_33 + .short \length + .endm + + .macro MoveAction_034 length=1 + .short MOVEMENT_ACTION_34 + .short \length + .endm + + .macro MoveAction_035 length=1 + .short MOVEMENT_ACTION_35 + .short \length + .endm + + .macro MoveAction_036 length=1 + .short MOVEMENT_ACTION_36 + .short \length + .endm + + .macro MoveAction_037 length=1 + .short MOVEMENT_ACTION_37 + .short \length + .endm + + .macro MoveAction_038 length=1 + .short MOVEMENT_ACTION_38 + .short \length + .endm + + .macro MoveAction_039 length=1 + .short MOVEMENT_ACTION_39 + .short \length + .endm + + .macro MoveAction_03A length=1 + .short MOVEMENT_ACTION_3A + .short \length + .endm + + .macro MoveAction_03B length=1 + .short MOVEMENT_ACTION_3B + .short \length + .endm + + .macro MoveAction_03C length=1 + .short MOVEMENT_ACTION_3C + .short \length + .endm + + .macro MoveAction_03D length=1 + .short MOVEMENT_ACTION_3D + .short \length + .endm + + .macro MoveAction_03E length=1 + .short MOVEMENT_ACTION_3E + .short \length + .endm + + .macro MoveAction_03F length=1 + .short MOVEMENT_ACTION_3F + .short \length + .endm + + .macro MoveAction_040 length=1 + .short MOVEMENT_ACTION_40 + .short \length + .endm + + .macro MoveAction_041 length=1 + .short MOVEMENT_ACTION_41 + .short \length + .endm + + .macro MoveAction_042 length=1 + .short MOVEMENT_ACTION_42 + .short \length + .endm + + .macro MoveAction_043 length=1 + .short MOVEMENT_ACTION_43 + .short \length + .endm + + .macro MoveAction_044 length=1 + .short MOVEMENT_ACTION_44 + .short \length + .endm + + .macro MoveAction_045 length=1 + .short MOVEMENT_ACTION_45 + .short \length + .endm + + .macro MoveAction_046 length=1 + .short MOVEMENT_ACTION_46 + .short \length + .endm + + .macro MoveAction_047 length=1 + .short MOVEMENT_ACTION_47 + .short \length + .endm + + .macro MoveAction_048 length=1 + .short MOVEMENT_ACTION_48 + .short \length + .endm + + .macro MoveAction_049 length=1 + .short MOVEMENT_ACTION_49 + .short \length + .endm + + .macro MoveAction_04A length=1 + .short MOVEMENT_ACTION_4A + .short \length + .endm + + .macro MoveAction_04B length=1 + .short MOVEMENT_ACTION_4B + .short \length + .endm + + .macro MoveAction_04C length=1 + .short MOVEMENT_ACTION_4C + .short \length + .endm + + .macro MoveAction_04D length=1 + .short MOVEMENT_ACTION_4D + .short \length + .endm + + .macro MoveAction_04E length=1 + .short MOVEMENT_ACTION_4E + .short \length + .endm + + .macro MoveAction_04F length=1 + .short MOVEMENT_ACTION_4F + .short \length + .endm + + .macro MoveAction_050 length=1 + .short MOVEMENT_ACTION_50 + .short \length + .endm + + .macro MoveAction_051 length=1 + .short MOVEMENT_ACTION_51 + .short \length + .endm + + .macro MoveAction_052 length=1 + .short MOVEMENT_ACTION_52 + .short \length + .endm + + .macro MoveAction_053 length=1 + .short MOVEMENT_ACTION_53 + .short \length + .endm + + .macro MoveAction_054 length=1 + .short MOVEMENT_ACTION_54 + .short \length + .endm + + .macro MoveAction_055 length=1 + .short MOVEMENT_ACTION_55 + .short \length + .endm + + .macro MoveAction_056 length=1 + .short MOVEMENT_ACTION_56 + .short \length + .endm + + .macro MoveAction_057 length=1 + .short MOVEMENT_ACTION_57 + .short \length + .endm + + .macro MoveAction_058 length=1 + .short MOVEMENT_ACTION_58 + .short \length + .endm + + .macro MoveAction_059 length=1 + .short MOVEMENT_ACTION_59 + .short \length + .endm + + .macro MoveAction_05A length=1 + .short MOVEMENT_ACTION_5A + .short \length + .endm + + .macro MoveAction_05B length=1 + .short MOVEMENT_ACTION_5B + .short \length + .endm + + .macro MoveAction_05C length=1 + .short MOVEMENT_ACTION_5C + .short \length + .endm + + .macro MoveAction_05D length=1 + .short MOVEMENT_ACTION_5D + .short \length + .endm + + .macro MoveAction_05E length=1 + .short MOVEMENT_ACTION_5E + .short \length + .endm + + .macro MoveAction_05F length=1 + .short MOVEMENT_ACTION_5F + .short \length + .endm + + .macro MoveAction_060 length=1 + .short MOVEMENT_ACTION_60 + .short \length + .endm + + .macro MoveAction_061 length=1 + .short MOVEMENT_ACTION_61 + .short \length + .endm + + .macro MoveAction_062 length=1 + .short MOVEMENT_ACTION_62 + .short \length + .endm + + .macro MoveAction_063 length=1 + .short MOVEMENT_ACTION_63 + .short \length + .endm + + .macro MoveAction_064 length=1 + .short MOVEMENT_ACTION_64 + .short \length + .endm + + .macro MoveAction_065 length=1 + .short MOVEMENT_ACTION_65 + .short \length + .endm + + .macro MoveAction_066 length=1 + .short MOVEMENT_ACTION_66 + .short \length + .endm + + .macro MoveAction_067 length=1 + .short MOVEMENT_ACTION_67 + .short \length + .endm + + .macro MoveAction_068 length=1 + .short MOVEMENT_ACTION_68 + .short \length + .endm + + .macro MoveAction_069 length=1 + .short MOVEMENT_ACTION_69 + .short \length + .endm + + .macro MoveAction_06A length=1 + .short MOVEMENT_ACTION_6A + .short \length + .endm + + .macro MoveAction_06B length=1 + .short MOVEMENT_ACTION_6B + .short \length + .endm + + .macro MoveAction_06C length=1 + .short MOVEMENT_ACTION_6C + .short \length + .endm + + .macro MoveAction_06D length=1 + .short MOVEMENT_ACTION_6D + .short \length + .endm + + .macro MoveAction_06E length=1 + .short MOVEMENT_ACTION_6E + .short \length + .endm + + .macro MoveAction_06F length=1 + .short MOVEMENT_ACTION_6F + .short \length + .endm + + .macro MoveAction_070 length=1 + .short MOVEMENT_ACTION_70 + .short \length + .endm + + .macro MoveAction_071 length=1 + .short MOVEMENT_ACTION_71 + .short \length + .endm + + .macro MoveAction_072 length=1 + .short MOVEMENT_ACTION_72 + .short \length + .endm + + .macro MoveAction_073 length=1 + .short MOVEMENT_ACTION_73 + .short \length + .endm + + .macro MoveAction_074 length=1 + .short MOVEMENT_ACTION_74 + .short \length + .endm + + .macro MoveAction_075 length=1 + .short MOVEMENT_ACTION_75 + .short \length + .endm + + .macro MoveAction_076 length=1 + .short MOVEMENT_ACTION_76 + .short \length + .endm + + .macro MoveAction_077 length=1 + .short MOVEMENT_ACTION_77 + .short \length + .endm + + .macro MoveAction_078 length=1 + .short MOVEMENT_ACTION_78 + .short \length + .endm + + .macro MoveAction_079 length=1 + .short MOVEMENT_ACTION_79 + .short \length + .endm + + .macro MoveAction_07A length=1 + .short MOVEMENT_ACTION_7A + .short \length + .endm + + .macro MoveAction_07B length=1 + .short MOVEMENT_ACTION_7B + .short \length + .endm + + .macro MoveAction_07C length=1 + .short MOVEMENT_ACTION_7C + .short \length + .endm + + .macro MoveAction_07D length=1 + .short MOVEMENT_ACTION_7D + .short \length + .endm + + .macro MoveAction_07E length=1 + .short MOVEMENT_ACTION_7E + .short \length + .endm + + .macro MoveAction_07F length=1 + .short MOVEMENT_ACTION_7F + .short \length + .endm + + .macro MoveAction_080 length=1 + .short MOVEMENT_ACTION_80 + .short \length + .endm + + .macro MoveAction_081 length=1 + .short MOVEMENT_ACTION_81 + .short \length + .endm + + .macro MoveAction_082 length=1 + .short MOVEMENT_ACTION_82 + .short \length + .endm + + .macro MoveAction_083 length=1 + .short MOVEMENT_ACTION_83 + .short \length + .endm + + .macro MoveAction_084 length=1 + .short MOVEMENT_ACTION_84 + .short \length + .endm + + .macro MoveAction_085 length=1 + .short MOVEMENT_ACTION_85 + .short \length + .endm + + .macro MoveAction_086 length=1 + .short MOVEMENT_ACTION_86 + .short \length + .endm + + .macro MoveAction_087 length=1 + .short MOVEMENT_ACTION_87 + .short \length + .endm + + .macro MoveAction_088 length=1 + .short MOVEMENT_ACTION_88 + .short \length + .endm + + .macro MoveAction_089 length=1 + .short MOVEMENT_ACTION_89 + .short \length + .endm + + .macro MoveAction_08A length=1 + .short MOVEMENT_ACTION_8A + .short \length + .endm + + .macro MoveAction_08B length=1 + .short MOVEMENT_ACTION_8B + .short \length + .endm + + .macro MoveAction_08C length=1 + .short MOVEMENT_ACTION_8C + .short \length + .endm + + .macro MoveAction_08D length=1 + .short MOVEMENT_ACTION_8D + .short \length + .endm + + .macro MoveAction_08E length=1 + .short MOVEMENT_ACTION_8E + .short \length + .endm + + .macro MoveAction_08F length=1 + .short MOVEMENT_ACTION_8F + .short \length + .endm + + .macro MoveAction_090 length=1 + .short MOVEMENT_ACTION_90 + .short \length + .endm + + .macro MoveAction_091 length=1 + .short MOVEMENT_ACTION_91 + .short \length + .endm + + .macro MoveAction_092 length=1 + .short MOVEMENT_ACTION_92 + .short \length + .endm + + .macro MoveAction_093 length=1 + .short MOVEMENT_ACTION_93 + .short \length + .endm + + .macro MoveAction_094 length=1 + .short MOVEMENT_ACTION_94 + .short \length + .endm + + .macro MoveAction_095 length=1 + .short MOVEMENT_ACTION_95 + .short \length + .endm + + .macro MoveAction_096 length=1 + .short MOVEMENT_ACTION_96 + .short \length + .endm + + .macro MoveAction_097 length=1 + .short MOVEMENT_ACTION_97 + .short \length + .endm + + .macro MoveAction_098 length=1 + .short MOVEMENT_ACTION_98 + .short \length + .endm + + .macro MoveAction_099 length=1 + .short MOVEMENT_ACTION_99 + .short \length + .endm + + .macro EndMovement + .short MOVEMENT_ACTION_END + .short 0 + .endm diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index b0ee581c4d..c5bfe4b4e0 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -1,3 +1,5 @@ + .include "macros/movement.inc" + .option alignment off .macro ScrCmd_000 diff --git a/consts/meson.build b/consts/meson.build index f230bf7e5e..dabef36599 100644 --- a/consts/meson.build +++ b/consts/meson.build @@ -4,6 +4,7 @@ consts_manifests = files( 'narc_files.json', 'trainer.json', 'sprites.json', + 'movement.json', ) gen_consts_root = meson.current_build_dir() / 'generated' diff --git a/consts/movement.json b/consts/movement.json new file mode 100644 index 0000000000..7cf9bf81e3 --- /dev/null +++ b/consts/movement.json @@ -0,0 +1,172 @@ +{ + "targets": { + "movement": [ + "@MovementAction" + ] + }, + "definitions": { + "@MovementAction": { + "type": "enum", + "values": [ + "MOVEMENT_ACTION_0", + "MOVEMENT_ACTION_1", + "MOVEMENT_ACTION_2", + "MOVEMENT_ACTION_3", + "MOVEMENT_ACTION_4", + "MOVEMENT_ACTION_5", + "MOVEMENT_ACTION_6", + "MOVEMENT_ACTION_7", + "MOVEMENT_ACTION_8", + "MOVEMENT_ACTION_9", + "MOVEMENT_ACTION_A", + "MOVEMENT_ACTION_B", + "MOVEMENT_ACTION_C", + "MOVEMENT_ACTION_D", + "MOVEMENT_ACTION_E", + "MOVEMENT_ACTION_F", + "MOVEMENT_ACTION_10", + "MOVEMENT_ACTION_11", + "MOVEMENT_ACTION_12", + "MOVEMENT_ACTION_13", + "MOVEMENT_ACTION_14", + "MOVEMENT_ACTION_15", + "MOVEMENT_ACTION_16", + "MOVEMENT_ACTION_17", + "MOVEMENT_ACTION_18", + "MOVEMENT_ACTION_19", + "MOVEMENT_ACTION_1A", + "MOVEMENT_ACTION_1B", + "MOVEMENT_ACTION_1C", + "MOVEMENT_ACTION_1D", + "MOVEMENT_ACTION_1E", + "MOVEMENT_ACTION_1F", + "MOVEMENT_ACTION_20", + "MOVEMENT_ACTION_21", + "MOVEMENT_ACTION_22", + "MOVEMENT_ACTION_23", + "MOVEMENT_ACTION_24", + "MOVEMENT_ACTION_25", + "MOVEMENT_ACTION_26", + "MOVEMENT_ACTION_27", + "MOVEMENT_ACTION_28", + "MOVEMENT_ACTION_29", + "MOVEMENT_ACTION_2A", + "MOVEMENT_ACTION_2B", + "MOVEMENT_ACTION_2C", + "MOVEMENT_ACTION_2D", + "MOVEMENT_ACTION_2E", + "MOVEMENT_ACTION_2F", + "MOVEMENT_ACTION_30", + "MOVEMENT_ACTION_31", + "MOVEMENT_ACTION_32", + "MOVEMENT_ACTION_33", + "MOVEMENT_ACTION_34", + "MOVEMENT_ACTION_35", + "MOVEMENT_ACTION_36", + "MOVEMENT_ACTION_37", + "MOVEMENT_ACTION_38", + "MOVEMENT_ACTION_39", + "MOVEMENT_ACTION_3A", + "MOVEMENT_ACTION_3B", + "MOVEMENT_ACTION_3C", + "MOVEMENT_ACTION_3D", + "MOVEMENT_ACTION_3E", + "MOVEMENT_ACTION_3F", + "MOVEMENT_ACTION_40", + "MOVEMENT_ACTION_41", + "MOVEMENT_ACTION_42", + "MOVEMENT_ACTION_43", + "MOVEMENT_ACTION_44", + "MOVEMENT_ACTION_45", + "MOVEMENT_ACTION_46", + "MOVEMENT_ACTION_47", + "MOVEMENT_ACTION_48", + "MOVEMENT_ACTION_49", + "MOVEMENT_ACTION_4A", + "MOVEMENT_ACTION_4B", + "MOVEMENT_ACTION_4C", + "MOVEMENT_ACTION_4D", + "MOVEMENT_ACTION_4E", + "MOVEMENT_ACTION_4F", + "MOVEMENT_ACTION_50", + "MOVEMENT_ACTION_51", + "MOVEMENT_ACTION_52", + "MOVEMENT_ACTION_53", + "MOVEMENT_ACTION_54", + "MOVEMENT_ACTION_55", + "MOVEMENT_ACTION_56", + "MOVEMENT_ACTION_57", + "MOVEMENT_ACTION_58", + "MOVEMENT_ACTION_59", + "MOVEMENT_ACTION_5A", + "MOVEMENT_ACTION_5B", + "MOVEMENT_ACTION_5C", + "MOVEMENT_ACTION_5D", + "MOVEMENT_ACTION_5E", + "MOVEMENT_ACTION_5F", + "MOVEMENT_ACTION_60", + "MOVEMENT_ACTION_61", + "MOVEMENT_ACTION_62", + "MOVEMENT_ACTION_63", + "MOVEMENT_ACTION_64", + "MOVEMENT_ACTION_65", + "MOVEMENT_ACTION_66", + "MOVEMENT_ACTION_67", + "MOVEMENT_ACTION_68", + "MOVEMENT_ACTION_69", + "MOVEMENT_ACTION_6A", + "MOVEMENT_ACTION_6B", + "MOVEMENT_ACTION_6C", + "MOVEMENT_ACTION_6D", + "MOVEMENT_ACTION_6E", + "MOVEMENT_ACTION_6F", + "MOVEMENT_ACTION_70", + "MOVEMENT_ACTION_71", + "MOVEMENT_ACTION_72", + "MOVEMENT_ACTION_73", + "MOVEMENT_ACTION_74", + "MOVEMENT_ACTION_75", + "MOVEMENT_ACTION_76", + "MOVEMENT_ACTION_77", + "MOVEMENT_ACTION_78", + "MOVEMENT_ACTION_79", + "MOVEMENT_ACTION_7A", + "MOVEMENT_ACTION_7B", + "MOVEMENT_ACTION_7C", + "MOVEMENT_ACTION_7D", + "MOVEMENT_ACTION_7E", + "MOVEMENT_ACTION_7F", + "MOVEMENT_ACTION_80", + "MOVEMENT_ACTION_81", + "MOVEMENT_ACTION_82", + "MOVEMENT_ACTION_83", + "MOVEMENT_ACTION_84", + "MOVEMENT_ACTION_85", + "MOVEMENT_ACTION_86", + "MOVEMENT_ACTION_87", + "MOVEMENT_ACTION_88", + "MOVEMENT_ACTION_89", + "MOVEMENT_ACTION_8A", + "MOVEMENT_ACTION_8B", + "MOVEMENT_ACTION_8C", + "MOVEMENT_ACTION_8D", + "MOVEMENT_ACTION_8E", + "MOVEMENT_ACTION_8F", + "MOVEMENT_ACTION_90", + "MOVEMENT_ACTION_91", + "MOVEMENT_ACTION_92", + "MOVEMENT_ACTION_93", + "MOVEMENT_ACTION_94", + "MOVEMENT_ACTION_95", + "MOVEMENT_ACTION_96", + "MOVEMENT_ACTION_97", + "MOVEMENT_ACTION_98", + "MOVEMENT_ACTION_99", + "MOVEMENT_ACTION_END" + ], + "overrides": { + "MOVEMENT_ACTION_END": 254 + } + } + } +} diff --git a/res/field/scripts/script_0002.s b/res/field/scripts/script_0002.s index 17b0d5d78c..dc651dc7c3 100644 --- a/res/field/scripts/script_0002.s +++ b/res/field/scripts/script_0002.s @@ -303,156 +303,156 @@ _042F: .balign 4, 0 _043C: - .short 13, 4 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _044C: - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_00D 3 + EndMovement .balign 4, 0 _0454: - .short 15, 1 - .short 12, 18 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 18 + EndMovement .balign 4, 0 _0460: - .short 14, 1 - .short 12, 18 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 18 + EndMovement .balign 4, 0 _046C: - .short 12, 18 - .short 0xFE, 0x00 + MoveAction_00C 18 + EndMovement .balign 4, 0 _0474: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .balign 4, 0 _047C: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0484: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _048C: - .short 13, 1 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 2 + EndMovement .balign 4, 0 _0498: - .short 12, 1 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 2 + EndMovement .balign 4, 0 _04A4: - .short 35, 1 - .short 63, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03F 4 + MoveAction_020 + EndMovement .balign 4, 0 _04B4: - .short 12, 1 - .short 15, 1 - .short 12, 17 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_00C 17 + EndMovement .balign 4, 0 _04C4: - .short 12, 1 - .short 14, 1 - .short 12, 17 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E + MoveAction_00C 17 + EndMovement .balign 4, 0 _04D4: - .short 12, 18 - .short 0xFE, 0x00 + MoveAction_00C 18 + EndMovement .balign 4, 0 _04DC: - .short 12, 2 - .short 15, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C + EndMovement .balign 4, 0 _04EC: - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _04F8: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0504: - .short 63, 1 - .short 35, 1 - .short 63, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_03F 3 + MoveAction_020 + EndMovement .balign 4, 0 _0518: - .short 38, 1 - .short 63, 2 - .short 37, 1 - .short 63, 1 - .short 10, 1 - .short 18, 5 - .short 39, 1 - .short 63, 1 - .short 36, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_03F 2 + MoveAction_025 + MoveAction_03F + MoveAction_00A + MoveAction_012 5 + MoveAction_027 + MoveAction_03F + MoveAction_024 + MoveAction_03F + EndMovement .balign 4, 0 _0544: - .short 11, 1 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_00B + MoveAction_013 2 + EndMovement .balign 4, 0 _0550: - .short 37, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_025 + MoveAction_04B + EndMovement .balign 4, 0 _055C: - .short 38, 1 - .short 63, 1 - .short 39, 1 - .short 63, 2 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_03F + MoveAction_027 + MoveAction_03F 2 + MoveAction_025 + EndMovement .balign 4, 0 _0574: - .short 19, 3 - .short 38, 1 - .short 63, 1 - .short 8, 1 - .short 16, 7 - .short 0xFE, 0x00 + MoveAction_013 3 + MoveAction_026 + MoveAction_03F + MoveAction_008 + MoveAction_010 7 + EndMovement _058C: ScrCmd_049 0x5DC @@ -534,56 +534,56 @@ _067C: .balign 4, 0 _0680: - .short 75, 1 - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _0690: - .short 75, 1 - .short 13, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00D 2 + MoveAction_023 + EndMovement .balign 4, 0 _06A0: - .short 75, 1 - .short 13, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00D 3 + MoveAction_023 + EndMovement .balign 4, 0 _06B0: - .short 15, 1 - .short 63, 2 - .short 14, 1 - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_03F 2 + MoveAction_00E + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _06C8: - .short 15, 1 - .short 63, 2 - .short 14, 1 - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_03F 2 + MoveAction_00E + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _06E0: - .short 15, 1 - .short 63, 2 - .short 14, 1 - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_03F 2 + MoveAction_00E + MoveAction_00C 3 + MoveAction_021 + EndMovement .balign 4, 0 _06F8: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement _0700: ScrCmd_060 @@ -705,87 +705,87 @@ _088E: .balign 4, 0 _0894: - .short 63, 5 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 5 + MoveAction_022 + EndMovement .balign 4, 0 _08A0: - .short 63, 5 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03F 5 + MoveAction_002 + EndMovement .balign 4, 0 _08AC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _08B4: - .short 1, 1 - .short 75, 1 - .short 65, 1 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_041 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _08CC: - .short 1, 1 - .short 75, 1 - .short 65, 1 - .short 13, 2 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_041 + MoveAction_00D 2 + MoveAction_00F + EndMovement .balign 4, 0 _08E4: - .short 1, 1 - .short 75, 1 - .short 65, 1 - .short 13, 3 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_041 + MoveAction_00D 3 + MoveAction_00F + EndMovement .balign 4, 0 _08FC: - .short 1, 1 - .short 75, 1 - .short 65, 1 - .short 13, 4 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_041 + MoveAction_00D 4 + MoveAction_00F + EndMovement .balign 4, 0 _0914: - .short 71, 1 - .short 14, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00E + MoveAction_048 + EndMovement .balign 4, 0 _0924: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _0930: - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _093C: - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_021 + EndMovement .balign 4, 0 _0948: - .short 12, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_021 + EndMovement _0954: ScrCmd_049 0x5DC @@ -831,8 +831,8 @@ _09BD: .balign 4, 0 _09D4: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement _09DC: ScrCmd_060 @@ -1085,44 +1085,44 @@ _0DB7: .balign 4, 0 _0DC0: - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C 8 + EndMovement .balign 4, 0 _0DC8: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement .balign 4, 0 _0DD0: - .short 63, 2 - .short 12, 1 - .short 15, 2 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C + MoveAction_00F 2 + MoveAction_00C + EndMovement .balign 4, 0 _0DE4: - .short 63, 2 - .short 12, 1 - .short 15, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C + MoveAction_00F + MoveAction_00C + EndMovement .balign 4, 0 _0DF8: - .short 63, 2 - .short 12, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C 2 + MoveAction_020 + EndMovement .balign 4, 0 _0E08: - .short 63, 1 - .short 35, 1 - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_03F + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -1167,30 +1167,30 @@ _0E08: .balign 4, 0 _0E44: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0E4C: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0E54: - .short 14, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + EndMovement .balign 4, 0 _0E60: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0E68: - .short 15, 1 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 9 + EndMovement .byte 15 .byte 0 @@ -1227,49 +1227,49 @@ _0E68: .balign 4, 0 _0E94: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0E9C: - .short 39, 2 - .short 0xFE, 0x00 + MoveAction_027 2 + EndMovement .balign 4, 0 _0EA4: - .short 16, 9 - .short 0xFE, 0x00 + MoveAction_010 9 + EndMovement .balign 4, 0 _0EAC: - .short 16, 10 - .short 0xFE, 0x00 + MoveAction_010 10 + EndMovement .balign 4, 0 _0EB4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0EBC: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0EC8: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0ED0: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0ED8: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .byte 13 .byte 0 @@ -1298,13 +1298,13 @@ _0ED8: .balign 4, 0 _0EF8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0F00: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .byte 34 .byte 0 @@ -1349,9 +1349,9 @@ _0F00: .balign 4, 0 _0F30: - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_020 + EndMovement _0F3C: ScrCmd_049 0x5DC @@ -1554,47 +1554,47 @@ _1163: .balign 4, 0 _1170: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _1178: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _1184: - .short 13, 2 - .short 14, 2 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E 2 + MoveAction_00D 2 + EndMovement .balign 4, 0 _1194: - .short 13, 2 - .short 14, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E + MoveAction_00D 2 + EndMovement .balign 4, 0 _11A4: - .short 13, 4 - .short 0xFE, 0x00 + MoveAction_00D 4 + EndMovement .balign 4, 0 _11AC: - .short 13, 2 - .short 15, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F + MoveAction_00D 2 + EndMovement .balign 4, 0 _11BC: - .short 13, 2 - .short 15, 2 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 2 + MoveAction_00D 2 + EndMovement _11CC: ScrCmd_049 0x5DC @@ -1676,27 +1676,27 @@ _12D5: .balign 4, 0 _12F0: - .short 14, 1 - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 9 + EndMovement .balign 4, 0 _12FC: - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_00C 9 + EndMovement .balign 4, 0 _1304: - .short 63, 1 - .short 34, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_020 + EndMovement .balign 4, 0 _1314: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement _1320: ScrCmd_049 0x5DC @@ -1880,24 +1880,24 @@ _14CF: .balign 4, 0 _1538: - .short 11, 2 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_00B 2 + MoveAction_04B + EndMovement .balign 4, 0 _1544: - .short 19, 6 - .short 0xFE, 0x00 + MoveAction_013 6 + EndMovement .balign 4, 0 _154C: - .short 10, 1 - .short 18, 8 - .short 0xFE, 0x00 + MoveAction_00A + MoveAction_012 8 + EndMovement .balign 4, 0 _1558: - .short 34, 1 - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_023 + EndMovement diff --git a/res/field/scripts/script_0013.s b/res/field/scripts/script_0013.s index d37c3e1517..3ff19bea0a 100644 --- a/res/field/scripts/script_0013.s +++ b/res/field/scripts/script_0013.s @@ -27,13 +27,13 @@ _0012: .balign 4, 0 _0044: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _004C: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _0054: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0015.s b/res/field/scripts/script_0015.s index 856ef593ba..fbd8baa296 100644 --- a/res/field/scripts/script_0015.s +++ b/res/field/scripts/script_0015.s @@ -232,77 +232,77 @@ _0335: .balign 4, 0 _0340: - .short 8, 2 - .short 0xFE, 0x00 + MoveAction_008 2 + EndMovement .balign 4, 0 _0348: - .short 10, 1 - .short 8, 1 - .short 0xFE, 0x00 + MoveAction_00A + MoveAction_008 + EndMovement .balign 4, 0 _0354: - .short 11, 1 - .short 8, 1 - .short 0xFE, 0x00 + MoveAction_00B + MoveAction_008 + EndMovement .balign 4, 0 _0360: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _0368: - .short 9, 2 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_009 2 + MoveAction_000 + EndMovement .balign 4, 0 _0374: - .short 14, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_003 + EndMovement .balign 4, 0 _0380: - .short 14, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_003 + EndMovement .balign 4, 0 _038C: - .short 15, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_002 + EndMovement .balign 4, 0 _0398: - .short 15, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_001 + EndMovement .balign 4, 0 _03A4: - .short 15, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_001 + EndMovement .balign 4, 0 _03B0: - .short 14, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_001 + EndMovement .balign 4, 0 _03BC: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _03C4: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement _03CC: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0018.s b/res/field/scripts/script_0018.s index 64a3528319..0bf52766da 100644 --- a/res/field/scripts/script_0018.s +++ b/res/field/scripts/script_0018.s @@ -169,5 +169,5 @@ _0283: .balign 4, 0 _029C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0028.s b/res/field/scripts/script_0028.s index 775b114c27..f992a25608 100644 --- a/res/field/scripts/script_0028.s +++ b/res/field/scripts/script_0028.s @@ -68,8 +68,8 @@ _00CD: .balign 4, 0 _00D8: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .byte 13 .byte 0 @@ -82,8 +82,8 @@ _00D8: .balign 4, 0 _00E8: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement _00F0: ScrCmd_002 @@ -254,24 +254,24 @@ _0338: .balign 4, 0 _0344: - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0350: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0358: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0360: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement _0368: ScrCmd_014 0x2338 diff --git a/res/field/scripts/script_0031.s b/res/field/scripts/script_0031.s index 37cd95b82d..ade92752fe 100644 --- a/res/field/scripts/script_0031.s +++ b/res/field/scripts/script_0031.s @@ -80,31 +80,31 @@ _00F2: .balign 4, 0 _0114: - .short 19, 1 - .short 17, 8 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_011 8 + MoveAction_025 + EndMovement .balign 4, 0 _0124: - .short 17, 4 - .short 19, 1 - .short 17, 4 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_011 4 + MoveAction_013 + MoveAction_011 4 + MoveAction_025 + EndMovement .balign 4, 0 _0138: - .short 63, 1 - .short 35, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_021 + EndMovement .balign 4, 0 _0148: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement _0154: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0036.s b/res/field/scripts/script_0036.s index 4c814b84b0..a994a6de71 100644 --- a/res/field/scripts/script_0036.s +++ b/res/field/scripts/script_0036.s @@ -218,21 +218,21 @@ _0334: .balign 4, 0 _0340: - .short 19, 4 - .short 63, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_03F + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _0354: - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_013 4 + EndMovement .balign 4, 0 _035C: - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 9 + EndMovement _0364: ScrCmd_049 0x5DC @@ -261,16 +261,16 @@ _0377: .balign 4, 0 _03AC: - .short 17, 1 - .short 18, 5 - .short 16, 10 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 5 + MoveAction_010 10 + EndMovement .balign 4, 0 _03BC: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement _03C8: ScrCmd_060 @@ -331,41 +331,41 @@ _0473: .balign 4, 0 _0490: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0498: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _04A0: - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _04AC: - .short 18, 5 - .short 16, 2 - .short 0xFE, 0x00 + MoveAction_012 5 + MoveAction_010 2 + EndMovement .balign 4, 0 _04B8: - .short 17, 6 - .short 0xFE, 0x00 + MoveAction_011 6 + EndMovement .balign 4, 0 _04C0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _04C8: - .short 17, 3 - .short 19, 9 - .short 0xFE, 0x00 + MoveAction_011 3 + MoveAction_013 9 + EndMovement _04D4: ScrCmd_049 0x5DC @@ -685,34 +685,34 @@ _08A5: .balign 4, 0 _08C0: - .short 3, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_040 + EndMovement .balign 4, 0 _08CC: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _08D4: - .short 13, 1 - .short 3, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_003 + MoveAction_040 + EndMovement .balign 4, 0 _08E4: - .short 15, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_040 + EndMovement .balign 4, 0 _08F0: - .short 12, 1 - .short 3, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_003 + MoveAction_040 + EndMovement _0900: ScrCmd_07E 0x1C5, 1, 0x800C @@ -764,17 +764,17 @@ _0959: .balign 4, 0 _099C: - .short 75, 1 - .short 15, 3 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F 3 + MoveAction_00C + EndMovement .balign 4, 0 _09AC: - .short 13, 1 - .short 14, 3 - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 3 + MoveAction_00D 8 + EndMovement _09BC: ScrCmd_049 0x5DC @@ -813,11 +813,11 @@ _09FA: .balign 4, 0 _0A38: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0A40: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0042.s b/res/field/scripts/script_0042.s index 3905219474..f3ab06c8ee 100644 --- a/res/field/scripts/script_0042.s +++ b/res/field/scripts/script_0042.s @@ -52,8 +52,8 @@ _0068: .balign 4, 0 _0078: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement _0080: ScrCmd_049 0x5DC @@ -147,28 +147,28 @@ _0175: .balign 4, 0 _018C: - .short 14, 5 - .short 13, 6 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_00D 6 + MoveAction_03E + EndMovement .balign 4, 0 _019C: - .short 13, 1 - .short 14, 5 - .short 13, 5 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + MoveAction_00D 5 + MoveAction_03E + EndMovement .balign 4, 0 _01B0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _01BC: - .short 63, 2 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_022 + EndMovement diff --git a/res/field/scripts/script_0043.s b/res/field/scripts/script_0043.s index 2970f6efa5..aa10497d91 100644 --- a/res/field/scripts/script_0043.s +++ b/res/field/scripts/script_0043.s @@ -142,38 +142,38 @@ _0159: .balign 4, 0 _019C: - .short 35, 1 - .short 75, 1 - .short 15, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_04B + MoveAction_00F + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _01B4: - .short 33, 1 - .short 32, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_020 + MoveAction_023 + EndMovement .balign 4, 0 _01C4: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _01CC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01D4: - .short 63, 2 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00F 2 + EndMovement .balign 4, 0 _01E0: - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0044.s b/res/field/scripts/script_0044.s index aa99f7948a..48569c0eae 100644 --- a/res/field/scripts/script_0044.s +++ b/res/field/scripts/script_0044.s @@ -195,146 +195,146 @@ _0184: .balign 4, 0 _02C0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _02C8: - .short 11, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00B + MoveAction_021 + EndMovement .balign 4, 0 _02D4: - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_020 + EndMovement .balign 4, 0 _02E0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _02E8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _02F0: - .short 15, 1 - .short 12, 4 - .short 14, 5 - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 4 + MoveAction_00E 5 + MoveAction_00C 3 + MoveAction_021 + EndMovement .balign 4, 0 _0308: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _0310: - .short 63, 3 - .short 33, 1 - .short 13, 2 - .short 15, 1 - .short 13, 1 - .short 15, 2 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_021 + MoveAction_00D 2 + MoveAction_00F + MoveAction_00D + MoveAction_00F 2 + MoveAction_00D + EndMovement .balign 4, 0 _0330: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0338: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0340: - .short 11, 3 - .short 0xFE, 0x00 + MoveAction_00B 3 + EndMovement .balign 4, 0 _0348: - .short 10, 3 - .short 0xFE, 0x00 + MoveAction_00A 3 + EndMovement .balign 4, 0 _0350: - .short 16, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_021 + EndMovement .balign 4, 0 _035C: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0364: - .short 13, 1 - .short 15, 2 - .short 32, 1 - .short 13, 1 - .short 15, 1 - .short 13, 1 - .short 15, 3 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 2 + MoveAction_020 + MoveAction_00D + MoveAction_00F + MoveAction_00D + MoveAction_00F 3 + MoveAction_00D + EndMovement .balign 4, 0 _0388: - .short 18, 4 - .short 16, 3 - .short 19, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_010 3 + MoveAction_013 + MoveAction_045 + EndMovement .balign 4, 0 _039C: - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_027 + EndMovement .balign 4, 0 _03A4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _03AC: - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_010 + EndMovement .balign 4, 0 _03B4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _03BC: - .short 14, 1 - .short 12, 5 - .short 14, 2 - .short 12, 2 - .short 15, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 5 + MoveAction_00E 2 + MoveAction_00C 2 + MoveAction_00F + MoveAction_045 + EndMovement .balign 4, 0 _03D8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03E0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement _03E8: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0047.s b/res/field/scripts/script_0047.s index 686e127a36..9d6cb45cd7 100644 --- a/res/field/scripts/script_0047.s +++ b/res/field/scripts/script_0047.s @@ -86,21 +86,21 @@ _0093: .balign 4, 0 _0130: - .short 12, 1 - .short 15, 3 - .short 12, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 3 + MoveAction_00C + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0148: - .short 15, 3 - .short 12, 2 - .short 33, 1 - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_00C 2 + MoveAction_021 + MoveAction_03F 2 + MoveAction_023 + EndMovement _0160: ScrCmd_060 diff --git a/res/field/scripts/script_0048.s b/res/field/scripts/script_0048.s index 8caba11a89..cf83ef9a6d 100644 --- a/res/field/scripts/script_0048.s +++ b/res/field/scripts/script_0048.s @@ -200,45 +200,45 @@ _026E: .balign 4, 0 _0294: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _029C: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _02A4: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _02AC: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _02B4: - .short 12, 2 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 2 + EndMovement .balign 4, 0 _02C0: - .short 0, 1 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_047 + MoveAction_00D + MoveAction_048 + EndMovement .balign 4, 0 _02D4: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _02DC: - .short 14, 3 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 2 + EndMovement diff --git a/res/field/scripts/script_0050.s b/res/field/scripts/script_0050.s index 2f6a3e9868..123cd8eb4c 100644 --- a/res/field/scripts/script_0050.s +++ b/res/field/scripts/script_0050.s @@ -193,83 +193,83 @@ _0287: .balign 4, 0 _02A0: - .short 62, 7 - .short 71, 1 - .short 18, 1 - .short 72, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_03E 7 + MoveAction_047 + MoveAction_012 + MoveAction_048 + MoveAction_003 + EndMovement .balign 4, 0 _02B8: - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 9 + EndMovement .balign 4, 0 _02C0: - .short 17, 1 - .short 18, 4 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 4 + MoveAction_026 + EndMovement .balign 4, 0 _02D0: - .short 17, 1 - .short 18, 3 - .short 16, 1 - .short 18, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 3 + MoveAction_010 + MoveAction_012 + MoveAction_026 + EndMovement .balign 4, 0 _02E8: - .short 16, 1 - .short 18, 4 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_012 4 + MoveAction_026 + EndMovement .balign 4, 0 _02F8: - .short 16, 1 - .short 18, 3 - .short 16, 1 - .short 18, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_012 3 + MoveAction_010 + MoveAction_012 + MoveAction_026 + EndMovement .balign 4, 0 _0310: - .short 33, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_022 + EndMovement .balign 4, 0 _031C: - .short 33, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_022 + EndMovement .balign 4, 0 _0328: - .short 32, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_022 + EndMovement .balign 4, 0 _0334: - .short 32, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_022 + EndMovement .balign 4, 0 _0340: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0348: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0350: ScrCmd_049 0x5DC @@ -435,96 +435,96 @@ _0544: .balign 4, 0 _055C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0564: - .short 13, 1 - .short 15, 1 - .short 13, 10 - .short 15, 12 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D 10 + MoveAction_00F 12 + EndMovement .balign 4, 0 _0578: - .short 13, 1 - .short 15, 1 - .short 13, 9 - .short 15, 12 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D 9 + MoveAction_00F 12 + EndMovement .balign 4, 0 _058C: - .short 13, 1 - .short 15, 1 - .short 13, 8 - .short 15, 12 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D 8 + MoveAction_00F 12 + EndMovement .balign 4, 0 _05A0: - .short 13, 1 - .short 15, 1 - .short 13, 7 - .short 15, 12 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D 7 + MoveAction_00F 12 + EndMovement .balign 4, 0 _05B4: - .short 15, 1 - .short 13, 10 - .short 15, 13 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 10 + MoveAction_00F 13 + MoveAction_022 + EndMovement .balign 4, 0 _05C8: - .short 15, 1 - .short 13, 9 - .short 15, 13 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 9 + MoveAction_00F 13 + MoveAction_022 + EndMovement .balign 4, 0 _05DC: - .short 15, 1 - .short 13, 8 - .short 15, 13 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 8 + MoveAction_00F 13 + MoveAction_022 + EndMovement .balign 4, 0 _05F0: - .short 15, 1 - .short 13, 7 - .short 15, 13 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 7 + MoveAction_00F 13 + MoveAction_022 + EndMovement .balign 4, 0 _0604: - .short 75, 1 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00C 3 + EndMovement .balign 4, 0 _0610: - .short 75, 1 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00C 2 + EndMovement .balign 4, 0 _061C: - .short 75, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00C + EndMovement .balign 4, 0 _0628: - .short 75, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_020 + EndMovement _0634: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0071.s b/res/field/scripts/script_0071.s index e5b1dc56cd..987ec0646a 100644 --- a/res/field/scripts/script_0071.s +++ b/res/field/scripts/script_0071.s @@ -327,93 +327,93 @@ _042B: .balign 4, 0 _043C: - .short 14, 4 - .short 75, 1 - .short 14, 5 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_04B + MoveAction_00E 5 + MoveAction_00C + EndMovement .balign 4, 0 _0450: - .short 14, 4 - .short 75, 1 - .short 14, 4 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_04B + MoveAction_00E 4 + EndMovement .balign 4, 0 _0460: - .short 35, 1 - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _0470: - .short 35, 1 - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0480: - .short 14, 5 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_00D 10 + EndMovement .balign 4, 0 _048C: - .short 14, 6 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00E 6 + MoveAction_00D 10 + EndMovement .balign 4, 0 _0498: - .short 14, 7 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00E 7 + MoveAction_00D 10 + EndMovement .balign 4, 0 _04A4: - .short 13, 1 - .short 14, 6 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 6 + MoveAction_00D 10 + EndMovement .balign 4, 0 _04B4: - .short 13, 1 - .short 14, 6 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 6 + MoveAction_00D 10 + EndMovement .balign 4, 0 _04C4: - .short 12, 1 - .short 14, 6 - .short 13, 11 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 6 + MoveAction_00D 11 + EndMovement .balign 4, 0 _04D4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _04DC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _04E4: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _04F0: - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + EndMovement _04FC: ScrCmd_049 0x5DC @@ -588,42 +588,42 @@ _06B9: .balign 4, 0 _06C8: - .short 39, 1 - .short 75, 1 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + MoveAction_03E + EndMovement .balign 4, 0 _06D8: - .short 39, 1 - .short 75, 1 - .short 62, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + MoveAction_03E + MoveAction_00F + EndMovement .balign 4, 0 _06EC: - .short 39, 1 - .short 75, 1 - .short 62, 1 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + MoveAction_03E + MoveAction_00F 2 + EndMovement .balign 4, 0 _0700: - .short 39, 1 - .short 75, 1 - .short 62, 1 - .short 15, 3 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + MoveAction_03E + MoveAction_00F 3 + EndMovement .balign 4, 0 _0714: - .short 39, 1 - .short 75, 1 - .short 62, 1 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + MoveAction_03E + MoveAction_00F 4 + EndMovement .byte 39 .byte 0 @@ -636,37 +636,37 @@ _0714: .balign 4, 0 _0730: - .short 14, 1 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_027 + EndMovement .balign 4, 0 _073C: - .short 14, 2 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_027 + EndMovement .balign 4, 0 _0748: - .short 14, 3 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_027 + EndMovement .balign 4, 0 _0754: - .short 14, 4 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_027 + EndMovement .balign 4, 0 _0760: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0768: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _0770: ScrCmd_049 0x5DC @@ -750,60 +750,60 @@ _086F: .balign 4, 0 _0884: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _0890: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _0898: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _08A0: - .short 1, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + EndMovement .balign 4, 0 _08AC: - .short 1, 1 - .short 75, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_00D + EndMovement .balign 4, 0 _08BC: - .short 1, 1 - .short 75, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_04B + MoveAction_00D 2 + EndMovement .balign 4, 0 _08CC: - .short 13, 1 - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _08DC: - .short 13, 1 - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _08EC: - .short 13, 1 - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00C 3 + MoveAction_021 + EndMovement _08FC: ScrCmd_049 0x5DC @@ -828,13 +828,13 @@ _08FC: .balign 4, 0 _0944: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _094C: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _0954: ScrCmd_060 @@ -963,190 +963,190 @@ _0AB6: .balign 4, 0 _0B58: - .short 16, 10 - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_010 10 + MoveAction_013 4 + EndMovement .balign 4, 0 _0B64: - .short 16, 9 - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_010 9 + MoveAction_013 4 + EndMovement .balign 4, 0 _0B70: - .short 16, 8 - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_010 8 + MoveAction_013 4 + EndMovement .balign 4, 0 _0B7C: - .short 13, 1 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0B8C: - .short 13, 1 - .short 15, 2 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 2 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0BA0: - .short 12, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0BB0: - .short 15, 19 - .short 0xFE, 0x00 + MoveAction_00F 19 + EndMovement .balign 4, 0 _0BB8: - .short 15, 18 - .short 0xFE, 0x00 + MoveAction_00F 18 + EndMovement .balign 4, 0 _0BC0: - .short 63, 3 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_026 + EndMovement .balign 4, 0 _0BCC: - .short 18, 12 - .short 0xFE, 0x00 + MoveAction_012 12 + EndMovement .balign 4, 0 _0BD4: - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_011 + EndMovement .balign 4, 0 _0BDC: - .short 62, 10 - .short 61, 1 - .short 60, 1 - .short 71, 1 - .short 19, 1 - .short 72, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03E 10 + MoveAction_03D + MoveAction_03C + MoveAction_047 + MoveAction_013 + MoveAction_048 + MoveAction_002 + EndMovement .balign 4, 0 _0BFC: - .short 62, 9 - .short 61, 1 - .short 60, 1 - .short 71, 1 - .short 19, 1 - .short 72, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03E 9 + MoveAction_03D + MoveAction_03C + MoveAction_047 + MoveAction_013 + MoveAction_048 + MoveAction_002 + EndMovement .balign 4, 0 _0C1C: - .short 62, 8 - .short 61, 1 - .short 60, 1 - .short 71, 1 - .short 19, 1 - .short 72, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03E 8 + MoveAction_03D + MoveAction_03C + MoveAction_047 + MoveAction_013 + MoveAction_048 + MoveAction_002 + EndMovement .balign 4, 0 _0C3C: - .short 63, 1 - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_021 + EndMovement .balign 4, 0 _0C4C: - .short 63, 1 - .short 62, 1 - .short 33, 1 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_021 + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _0C64: - .short 63, 1 - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _0C74: - .short 13, 1 - .short 15, 18 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 18 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _0C88: - .short 15, 18 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 18 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _0C98: - .short 12, 1 - .short 15, 18 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 18 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _0CAC: - .short 13, 1 - .short 35, 1 - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0CC0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0CC8: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0CD4: - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00F 4 + EndMovement .balign 4, 0 _0CDC: - .short 14, 4 - .short 0xFE, 0x00 + MoveAction_00E 4 + EndMovement .balign 4, 0 _0CE4: - .short 14, 3 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0CF4: - .short 63, 2 - .short 14, 14 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00E 14 + EndMovement _0D00: ScrCmd_060 @@ -1254,23 +1254,23 @@ _0E83: .balign 4, 0 _0E88: - .short 12, 3 - .short 75, 1 - .short 12, 5 - .short 15, 2 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_04B + MoveAction_00C 5 + MoveAction_00F 2 + MoveAction_00F + EndMovement .balign 4, 0 _0EA0: - .short 14, 3 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 9 + EndMovement .balign 4, 0 _0EAC: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0EB4: ScrCmd_049 0x5DC @@ -1424,36 +1424,36 @@ _10A0: .balign 4, 0 _10B4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _10BC: - .short 14, 3 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 9 + EndMovement .balign 4, 0 _10C8: - .short 13, 1 - .short 14, 3 - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 3 + MoveAction_00D 8 + EndMovement .balign 4, 0 _10D8: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _10E0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _10EC: - .short 63, 2 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_022 + EndMovement diff --git a/res/field/scripts/script_0079.s b/res/field/scripts/script_0079.s index dfe51d6b06..c404d0b9fa 100644 --- a/res/field/scripts/script_0079.s +++ b/res/field/scripts/script_0079.s @@ -86,29 +86,29 @@ _006A: .balign 4, 0 _00F0: - .short 63, 9 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 9 + MoveAction_023 + EndMovement .balign 4, 0 _00FC: - .short 38, 1 - .short 75, 1 - .short 63, 2 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_04B + MoveAction_03F 2 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0110: - .short 1, 1 - .short 61, 1 - .short 3, 1 - .short 62, 1 - .short 0, 1 - .short 62, 1 - .short 2, 1 - .short 61, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_03D + MoveAction_003 + MoveAction_03E + MoveAction_000 + MoveAction_03E + MoveAction_002 + MoveAction_03D + EndMovement _0134: ScrCmd_07E 0x1D3, 1, 0x800C diff --git a/res/field/scripts/script_0082.s b/res/field/scripts/script_0082.s index 3ccc8a9a23..62ae0fd6f9 100644 --- a/res/field/scripts/script_0082.s +++ b/res/field/scripts/script_0082.s @@ -96,13 +96,13 @@ _0135: .balign 4, 0 _013C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0144: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .byte 63 .byte 0 @@ -123,21 +123,21 @@ _0144: .balign 4, 0 _015C: - .short 12, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_023 + EndMovement .balign 4, 0 _0168: - .short 12, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_022 + EndMovement .balign 4, 0 _0174: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .byte 34 .byte 0 diff --git a/res/field/scripts/script_0083.s b/res/field/scripts/script_0083.s index 857fef6967..f37770aeb4 100644 --- a/res/field/scripts/script_0083.s +++ b/res/field/scripts/script_0083.s @@ -622,9 +622,9 @@ _08AA: .balign 4, 0 _08AC: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .byte 34 .byte 0 @@ -657,28 +657,28 @@ _08AC: .balign 4, 0 _08D4: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _08DC: - .short 14, 2 - .short 32, 1 - .short 63, 2 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_020 + MoveAction_03F 2 + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _08F4: - .short 14, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_020 + EndMovement .balign 4, 0 _0900: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement _0908: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0088.s b/res/field/scripts/script_0088.s index c2ea352c52..837b5d1421 100644 --- a/res/field/scripts/script_0088.s +++ b/res/field/scripts/script_0088.s @@ -62,13 +62,13 @@ _0091: .balign 4, 0 _00A0: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _00A8: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _00B0: ScrCmd_060 diff --git a/res/field/scripts/script_0090.s b/res/field/scripts/script_0090.s index e4de2acd0b..39753d108a 100644 --- a/res/field/scripts/script_0090.s +++ b/res/field/scripts/script_0090.s @@ -112,5 +112,5 @@ _0150: .balign 4, 0 _0158: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement diff --git a/res/field/scripts/script_0092.s b/res/field/scripts/script_0092.s index 632aba9959..d9ded63c01 100644 --- a/res/field/scripts/script_0092.s +++ b/res/field/scripts/script_0092.s @@ -451,35 +451,35 @@ _05D6: .balign 4, 0 _05E4: - .short 8, 1 - .short 9, 2 - .short 8, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_008 + MoveAction_009 2 + MoveAction_008 + MoveAction_026 + EndMovement .balign 4, 0 _05F8: - .short 8, 1 - .short 9, 2 - .short 8, 1 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_008 + MoveAction_009 2 + MoveAction_008 + MoveAction_027 + EndMovement .balign 4, 0 _060C: - .short 10, 1 - .short 11, 2 - .short 10, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_00A + MoveAction_00B 2 + MoveAction_00A + MoveAction_024 + EndMovement .balign 4, 0 _0620: - .short 10, 1 - .short 11, 2 - .short 10, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_00A + MoveAction_00B 2 + MoveAction_00A + MoveAction_025 + EndMovement _0634: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0093.s b/res/field/scripts/script_0093.s index e75f264ed1..16345cb2f6 100644 --- a/res/field/scripts/script_0093.s +++ b/res/field/scripts/script_0093.s @@ -221,62 +221,62 @@ _0225: .balign 4, 0 _0240: - .short 14, 20 - .short 12, 13 - .short 15, 12 - .short 12, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E 20 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 4 + MoveAction_021 + EndMovement .balign 4, 0 _0258: - .short 12, 1 - .short 14, 2 - .short 13, 1 - .short 14, 18 - .short 12, 13 - .short 15, 12 - .short 12, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 2 + MoveAction_00D + MoveAction_00E 18 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 4 + MoveAction_021 + EndMovement .balign 4, 0 _027C: - .short 12, 1 - .short 14, 20 - .short 12, 13 - .short 15, 12 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 20 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 3 + EndMovement .balign 4, 0 _0294: - .short 13, 1 - .short 14, 20 - .short 12, 13 - .short 15, 12 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 20 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 3 + EndMovement .balign 4, 0 _02AC: - .short 14, 1 - .short 14, 20 - .short 12, 13 - .short 15, 12 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00E 20 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 3 + EndMovement .balign 4, 0 _02C4: - .short 63, 2 - .short 62, 1 - .short 34, 1 - .short 14, 19 - .short 12, 13 - .short 15, 12 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_022 + MoveAction_00E 19 + MoveAction_00C 13 + MoveAction_00F 12 + MoveAction_00C 3 + EndMovement _02E4: ScrCmd_049 0x5DC @@ -667,13 +667,13 @@ _0820: .balign 4, 0 _087C: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0884: - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 9 + EndMovement .byte 19 .byte 0 @@ -686,13 +686,13 @@ _0884: .balign 4, 0 _0894: - .short 18, 8 - .short 0xFE, 0x00 + MoveAction_012 8 + EndMovement .balign 4, 0 _089C: - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00F 8 + EndMovement _08A4: ScrCmd_036 52, 0, 0, 0x800C diff --git a/res/field/scripts/script_0095.s b/res/field/scripts/script_0095.s index ff388534dc..5cd0652d36 100644 --- a/res/field/scripts/script_0095.s +++ b/res/field/scripts/script_0095.s @@ -82,15 +82,15 @@ _00B6: .balign 4, 0 _00DC: - .short 75, 1 - .short 63, 1 - .short 14, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F + MoveAction_00E + MoveAction_00D + EndMovement .balign 4, 0 _00F0: - .short 12, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0098.s b/res/field/scripts/script_0098.s index 79bdeaca75..d3b3035cc5 100644 --- a/res/field/scripts/script_0098.s +++ b/res/field/scripts/script_0098.s @@ -125,51 +125,51 @@ _01A0: .balign 4, 0 _01B8: - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 0xFE, 0x00 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + EndMovement .balign 4, 0 _01DC: - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 0xFE, 0x00 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + EndMovement .balign 4, 0 _0200: - .short 0, 4 - .short 2, 4 - .short 1, 4 - .short 3, 4 - .short 0, 4 - .short 2, 4 - .short 1, 4 - .short 3, 4 - .short 0xFE, 0x00 + MoveAction_000 4 + MoveAction_002 4 + MoveAction_001 4 + MoveAction_003 4 + MoveAction_000 4 + MoveAction_002 4 + MoveAction_001 4 + MoveAction_003 4 + EndMovement .balign 4, 0 _0224: - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0xFE, 0x00 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + EndMovement _0248: ScrCmd_01F 0x29C diff --git a/res/field/scripts/script_0101.s b/res/field/scripts/script_0101.s index c25025d57e..d199eeeaf0 100644 --- a/res/field/scripts/script_0101.s +++ b/res/field/scripts/script_0101.s @@ -109,35 +109,35 @@ _0173: .balign 4, 0 _018C: - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 0xFE, 0x00 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + EndMovement .balign 4, 0 _01A0: - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 0xFE, 0x00 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + EndMovement .balign 4, 0 _01B4: - .short 0, 4 - .short 2, 4 - .short 1, 4 - .short 3, 4 - .short 0xFE, 0x00 + MoveAction_000 4 + MoveAction_002 4 + MoveAction_001 4 + MoveAction_003 4 + EndMovement .balign 4, 0 _01C8: - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0xFE, 0x00 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + EndMovement _01DC: ScrCmd_0EB diff --git a/res/field/scripts/script_0107.s b/res/field/scripts/script_0107.s index e4435afdf4..0bd29f2196 100644 --- a/res/field/scripts/script_0107.s +++ b/res/field/scripts/script_0107.s @@ -47,12 +47,12 @@ _009C: .balign 4, 0 _00B8: - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _00C4: - .short 13, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0112.s b/res/field/scripts/script_0112.s index ffa31a27d3..69983d769d 100644 --- a/res/field/scripts/script_0112.s +++ b/res/field/scripts/script_0112.s @@ -157,73 +157,73 @@ _01BA: .balign 4, 0 _01D4: - .short 18, 2 - .short 16, 2 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_010 2 + MoveAction_026 + EndMovement .balign 4, 0 _01E4: - .short 18, 2 - .short 16, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_010 + MoveAction_026 + EndMovement .balign 4, 0 _01F4: - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 2 + EndMovement .balign 4, 0 _01FC: - .short 18, 2 - .short 17, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_011 + MoveAction_026 + EndMovement .balign 4, 0 _020C: - .short 18, 2 - .short 17, 2 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_011 2 + MoveAction_026 + EndMovement .balign 4, 0 _021C: - .short 19, 2 - .short 17, 2 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_011 2 + MoveAction_013 2 + EndMovement .balign 4, 0 _022C: - .short 19, 2 - .short 17, 1 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_011 + MoveAction_013 2 + EndMovement .balign 4, 0 _023C: - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_013 4 + EndMovement .balign 4, 0 _0244: - .short 19, 2 - .short 16, 1 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_010 + MoveAction_013 2 + EndMovement .balign 4, 0 _0254: - .short 19, 2 - .short 16, 2 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_010 2 + MoveAction_013 2 + EndMovement .balign 4, 0 _0264: - .short 63, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_04B + MoveAction_03F + EndMovement diff --git a/res/field/scripts/script_0116.s b/res/field/scripts/script_0116.s index ef171a8a3d..d592878583 100644 --- a/res/field/scripts/script_0116.s +++ b/res/field/scripts/script_0116.s @@ -47,12 +47,12 @@ _009C: .balign 4, 0 _00B8: - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _00C4: - .short 13, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0119.s b/res/field/scripts/script_0119.s index aeeb8a170e..941bd37426 100644 --- a/res/field/scripts/script_0119.s +++ b/res/field/scripts/script_0119.s @@ -88,44 +88,44 @@ _0104: .balign 4, 0 _0138: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0140: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _014C: - .short 38, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_021 + EndMovement .balign 4, 0 _0158: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0160: - .short 15, 3 - .short 12, 3 - .short 15, 3 - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_00C 3 + MoveAction_00F 3 + MoveAction_00C 6 + EndMovement .balign 4, 0 _0174: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _017C: - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_023 + EndMovement .byte 35 .byte 0 @@ -138,8 +138,8 @@ _017C: .balign 4, 0 _0190: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 14 .byte 0 @@ -168,30 +168,30 @@ _0190: .balign 4, 0 _01B0: - .short 14, 1 - .short 13, 2 - .short 15, 1 - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + MoveAction_00F + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _01C8: - .short 62, 1 - .short 34, 1 - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_022 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _01DC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01E4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement _01EC: ScrCmd_049 0x5DC @@ -398,17 +398,17 @@ _0475: .balign 4, 0 _0484: - .short 15, 8 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_00F 8 + MoveAction_025 + EndMovement .balign 4, 0 _0490: - .short 13, 1 - .short 15, 8 - .short 12, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 8 + MoveAction_00C + MoveAction_025 + EndMovement _04A4: ScrCmd_049 0x5DC @@ -501,59 +501,59 @@ _05D3: .balign 4, 0 _05E8: - .short 14, 6 - .short 13, 4 - .short 0xFE, 0x00 + MoveAction_00E 6 + MoveAction_00D 4 + EndMovement .balign 4, 0 _05F4: - .short 12, 1 - .short 14, 6 - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 6 + MoveAction_00D 5 + EndMovement .balign 4, 0 _0604: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0610: - .short 63, 2 - .short 32, 1 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _0624: - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 0xFE, 0x00 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + EndMovement .balign 4, 0 _0638: - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 0xFE, 0x00 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + EndMovement .balign 4, 0 _064C: - .short 1, 4 - .short 2, 4 - .short 0, 4 - .short 3, 4 - .short 0xFE, 0x00 + MoveAction_001 4 + MoveAction_002 4 + MoveAction_000 4 + MoveAction_003 4 + EndMovement .balign 4, 0 _0660: - .short 0, 4 - .short 3, 4 - .short 1, 4 - .short 2, 4 - .short 0xFE, 0x00 + MoveAction_000 4 + MoveAction_003 4 + MoveAction_001 4 + MoveAction_002 4 + EndMovement diff --git a/res/field/scripts/script_0123.s b/res/field/scripts/script_0123.s index 553aff95f0..39912d95fe 100644 --- a/res/field/scripts/script_0123.s +++ b/res/field/scripts/script_0123.s @@ -266,9 +266,9 @@ _02D2: .balign 4, 0 _02EC: - .short 33, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_023 + EndMovement .byte 32 .byte 0 @@ -285,13 +285,13 @@ _02EC: .balign 4, 0 _0304: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _030C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .byte 33 .byte 0 @@ -412,16 +412,16 @@ _030C: .balign 4, 0 _0388: - .short 17, 1 - .short 19, 2 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 2 + MoveAction_027 + EndMovement .balign 4, 0 _0398: - .short 19, 2 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_027 + EndMovement .byte 17 .byte 0 @@ -569,8 +569,8 @@ _04AE: .balign 4, 0 _04C0: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _04C8: ScrCmd_060 @@ -633,33 +633,33 @@ _0597: .balign 4, 0 _05A4: - .short 62, 13 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E 13 + MoveAction_023 + EndMovement .balign 4, 0 _05B0: - .short 17, 9 - .short 38, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_011 9 + MoveAction_026 + MoveAction_04B + EndMovement .balign 4, 0 _05C0: - .short 18, 4 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_026 + EndMovement .balign 4, 0 _05CC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _05D4: - .short 19, 5 - .short 16, 9 - .short 0xFE, 0x00 + MoveAction_013 5 + MoveAction_010 9 + EndMovement _05E0: ScrCmd_060 @@ -752,76 +752,76 @@ _074D: .balign 4, 0 _0764: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _076C: - .short 35, 1 - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _077C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0784: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _078C: - .short 19, 6 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_013 6 + MoveAction_010 8 + EndMovement .balign 4, 0 _0798: - .short 17, 9 - .short 18, 5 - .short 0xFE, 0x00 + MoveAction_011 9 + MoveAction_012 5 + EndMovement .balign 4, 0 _07A4: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _07AC: - .short 71, 1 - .short 17, 1 - .short 72, 1 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_011 + MoveAction_048 + MoveAction_027 + EndMovement .balign 4, 0 _07C0: - .short 19, 5 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_013 5 + MoveAction_010 8 + EndMovement .balign 4, 0 _07CC: - .short 62, 11 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E 11 + MoveAction_023 + EndMovement .balign 4, 0 _07D8: - .short 32, 1 - .short 63, 2 - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 2 + MoveAction_00D + MoveAction_020 + EndMovement .balign 4, 0 _07EC: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement _07F8: ScrCmd_060 @@ -928,9 +928,9 @@ _098D: .balign 4, 0 _099C: - .short 63, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_000 + EndMovement _09A8: ScrCmd_049 0x5DC @@ -989,48 +989,48 @@ _0A8D: .balign 4, 0 _0AA4: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _0AAC: - .short 17, 1 - .short 19, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 + MoveAction_025 + EndMovement .balign 4, 0 _0ABC: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0AC8: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0AD4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0ADC: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0AE4: - .short 16, 3 - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 + EndMovement .balign 4, 0 _0AF0: - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_024 + EndMovement .byte 17 .byte 0 @@ -1051,53 +1051,53 @@ _0AF0: .balign 4, 0 _0B08: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0B10: - .short 63, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_025 + EndMovement .balign 4, 0 _0B1C: - .short 19, 2 - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_010 + EndMovement .balign 4, 0 _0B28: - .short 19, 1 - .short 16, 1 - .short 19, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_010 + MoveAction_013 + MoveAction_024 + EndMovement .balign 4, 0 _0B3C: - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_027 + EndMovement .balign 4, 0 _0B44: - .short 17, 4 - .short 0xFE, 0x00 + MoveAction_011 4 + EndMovement .balign 4, 0 _0B4C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0B54: - .short 19, 12 - .short 0xFE, 0x00 + MoveAction_013 12 + EndMovement .balign 4, 0 _0B5C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .byte 33 .byte 0 @@ -1110,24 +1110,24 @@ _0B5C: .balign 4, 0 _0B6C: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0B74: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0B80: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0B88: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement _0B90: ScrCmd_060 @@ -1146,25 +1146,25 @@ _0B90: .balign 4, 0 _0BC8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0BD0: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0BD8: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0BE0: - .short 14, 1 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00F + MoveAction_020 + EndMovement _0BF0: ScrCmd_060 @@ -1200,16 +1200,16 @@ _0C22: .balign 4, 0 _0C64: - .short 12, 7 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_022 + EndMovement .balign 4, 0 _0C70: - .short 12, 5 - .short 0xFE, 0x00 + MoveAction_00C 5 + EndMovement .balign 4, 0 _0C78: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0129.s b/res/field/scripts/script_0129.s index f07cb4b699..f99b185eb4 100644 --- a/res/field/scripts/script_0129.s +++ b/res/field/scripts/script_0129.s @@ -116,34 +116,34 @@ _017D: .balign 4, 0 _018C: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0194: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _019C: - .short 32, 1 - .short 12, 3 - .short 15, 1 - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_00C 3 + MoveAction_00F + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _01B4: - .short 32, 1 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _01C4: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement _01CC: ScrCmd_060 @@ -198,15 +198,15 @@ _024E: .balign 4, 0 _0280: - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00D 5 + EndMovement .balign 4, 0 _0288: - .short 0, 1 - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_00C + MoveAction_045 + EndMovement _0298: ScrCmd_060 @@ -268,9 +268,9 @@ _0329: .balign 4, 0 _0334: - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_020 + EndMovement .byte 14 .byte 0 diff --git a/res/field/scripts/script_0136.s b/res/field/scripts/script_0136.s index 6534041235..ccfd2ff0df 100644 --- a/res/field/scripts/script_0136.s +++ b/res/field/scripts/script_0136.s @@ -280,81 +280,81 @@ _042D: .balign 4, 0 _0444: - .short 63, 1 - .short 33, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _0458: - .short 14, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + EndMovement .balign 4, 0 _0464: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _046C: - .short 15, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D + EndMovement .balign 4, 0 _0478: - .short 15, 2 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D + EndMovement .balign 4, 0 _0484: - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_024 + EndMovement .balign 4, 0 _048C: - .short 63, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_023 + EndMovement .balign 4, 0 _0498: - .short 63, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_023 + EndMovement .balign 4, 0 _04A4: - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + EndMovement .balign 4, 0 _04B0: - .short 63, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_022 + EndMovement .balign 4, 0 _04BC: - .short 15, 1 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 9 + EndMovement .balign 4, 0 _04C8: - .short 14, 1 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 9 + EndMovement .balign 4, 0 _04D4: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -371,113 +371,113 @@ _04D4: .balign 4, 0 _04EC: - .short 63, 4 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _04FC: - .short 63, 3 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _050C: - .short 63, 2 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _051C: - .short 63, 4 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _052C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0534: - .short 63, 2 - .short 35, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + MoveAction_021 + EndMovement .balign 4, 0 _0544: - .short 63, 2 - .short 34, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + MoveAction_021 + EndMovement .balign 4, 0 _0554: - .short 63, 1 - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_021 + EndMovement .balign 4, 0 _0564: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _056C: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0574: - .short 13, 4 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0580: - .short 13, 4 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_00E + EndMovement .balign 4, 0 _058C: - .short 13, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_022 + EndMovement .balign 4, 0 _0598: - .short 13, 1 - .short 14, 1 - .short 13, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E + MoveAction_00D 3 + MoveAction_023 + EndMovement .balign 4, 0 _05AC: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement .balign 4, 0 _05B4: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement .balign 4, 0 _05BC: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement .balign 4, 0 _05C4: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement _05CC: ScrCmd_049 0x5DC @@ -823,52 +823,52 @@ _0A73: .balign 4, 0 _0A7C: - .short 16, 10 - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_010 10 + MoveAction_013 3 + EndMovement .balign 4, 0 _0A88: - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0A94: - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0AA0: - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0AAC: - .short 15, 5 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 5 + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _0ABC: - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _0AC8: - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _0AD4: - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_023 + EndMovement .byte 62 .byte 0 @@ -949,40 +949,40 @@ _0AD4: .balign 4, 0 _0B2C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0B34: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0B3C: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0B44: - .short 14, 3 - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 10 + EndMovement .balign 4, 0 _0B50: - .short 12, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + EndMovement .balign 4, 0 _0B5C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0B64: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .byte 63 .byte 0 @@ -1019,18 +1019,18 @@ _0B64: .balign 4, 0 _0B8C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0B94: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0B9C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .byte 63 .byte 0 @@ -1047,50 +1047,50 @@ _0B9C: .balign 4, 0 _0BB0: - .short 63, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_001 + EndMovement .balign 4, 0 _0BBC: - .short 63, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_000 + EndMovement .balign 4, 0 _0BC8: - .short 13, 1 - .short 15, 5 - .short 12, 5 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 5 + MoveAction_00C 5 + MoveAction_045 + EndMovement .balign 4, 0 _0BDC: - .short 12, 1 - .short 15, 5 - .short 12, 5 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 5 + MoveAction_00C 5 + MoveAction_045 + EndMovement .balign 4, 0 _0BF0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0BF8: - .short 19, 4 - .short 16, 4 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_010 4 + MoveAction_024 + EndMovement .balign 4, 0 _0C08: - .short 19, 4 - .short 16, 6 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_010 6 + MoveAction_024 + EndMovement _0C18: ScrCmd_049 0x5DC @@ -1206,28 +1206,28 @@ _0CF7: .balign 4, 0 _0D28: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0D30: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0D3C: - .short 17, 1 - .short 34, 1 - .short 63, 2 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_022 + MoveAction_03F 2 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0D54: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement _0D5C: ScrCmd_049 0x5DC @@ -1367,70 +1367,70 @@ _0F0B: .balign 4, 0 _0F1C: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0F24: - .short 19, 1 - .short 17, 2 - .short 19, 1 - .short 17, 9 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_011 2 + MoveAction_013 + MoveAction_011 9 + EndMovement .balign 4, 0 _0F38: - .short 17, 2 - .short 19, 2 - .short 17, 9 - .short 0xFE, 0x00 + MoveAction_011 2 + MoveAction_013 2 + MoveAction_011 9 + EndMovement .balign 4, 0 _0F48: - .short 63, 1 - .short 35, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_021 + EndMovement .balign 4, 0 _0F58: - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _0F64: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0F70: - .short 12, 6 - .short 14, 2 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 2 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0F80: - .short 12, 6 - .short 14, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 2 + MoveAction_020 + EndMovement .balign 4, 0 _0F90: - .short 12, 6 - .short 14, 3 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 3 + MoveAction_00C + EndMovement .balign 4, 0 _0FA0: - .short 12, 6 - .short 14, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E + MoveAction_00C + EndMovement _0FB0: ScrCmd_049 0x5DC @@ -1451,10 +1451,10 @@ _0FB0: .balign 4, 0 _0FE0: - .short 63, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_04B + MoveAction_03F + EndMovement _0FF0: ScrCmd_049 0x5DC @@ -1629,16 +1629,16 @@ _11DE: .balign 4, 0 _11E8: - .short 32, 1 - .short 75, 1 - .short 15, 2 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + MoveAction_00F 2 + MoveAction_00C + EndMovement .balign 4, 0 _11FC: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement _1204: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0147.s b/res/field/scripts/script_0147.s index 71a39ff04a..11c1c01370 100644 --- a/res/field/scripts/script_0147.s +++ b/res/field/scripts/script_0147.s @@ -252,5 +252,5 @@ _03F6: .balign 4, 0 _0410: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0149.s b/res/field/scripts/script_0149.s index 23c4474cbe..3285114944 100644 --- a/res/field/scripts/script_0149.s +++ b/res/field/scripts/script_0149.s @@ -66,13 +66,13 @@ _00C2: .balign 4, 0 _00C8: - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_012 + EndMovement .balign 4, 0 _00D0: - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + EndMovement _00D8: ScrCmd_060 @@ -99,40 +99,40 @@ _00D8: .balign 4, 0 _012C: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0134: - .short 13, 2 - .short 34, 1 - .short 63, 2 - .short 35, 1 - .short 63, 2 - .short 15, 5 - .short 32, 1 - .short 75, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_022 + MoveAction_03F 2 + MoveAction_023 + MoveAction_03F 2 + MoveAction_00F 5 + MoveAction_020 + MoveAction_04B + MoveAction_022 + EndMovement .balign 4, 0 _015C: - .short 14, 5 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_021 + EndMovement .balign 4, 0 _0168: - .short 63, 9 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 9 + MoveAction_023 + EndMovement .balign 4, 0 _0174: - .short 63, 4 - .short 61, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_03D + MoveAction_020 + EndMovement _0184: ScrCmd_049 0x5DC @@ -222,65 +222,65 @@ _02AE: .balign 4, 0 _02C4: - .short 63, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_023 + EndMovement .balign 4, 0 _02D0: - .short 63, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_022 + EndMovement .balign 4, 0 _02DC: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _02E8: - .short 12, 2 - .short 15, 1 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _02FC: - .short 12, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_023 + EndMovement .balign 4, 0 _0308: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0310: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0318: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0320: - .short 12, 5 - .short 38, 1 - .short 39, 1 - .short 63, 2 - .short 19, 6 - .short 0xFE, 0x00 + MoveAction_00C 5 + MoveAction_026 + MoveAction_027 + MoveAction_03F 2 + MoveAction_013 6 + EndMovement .balign 4, 0 _0338: - .short 12, 5 - .short 38, 1 - .short 39, 1 - .short 63, 2 - .short 19, 7 - .short 0xFE, 0x00 + MoveAction_00C 5 + MoveAction_026 + MoveAction_027 + MoveAction_03F 2 + MoveAction_013 7 + EndMovement diff --git a/res/field/scripts/script_0151.s b/res/field/scripts/script_0151.s index 06e9a04014..71cae6bfa7 100644 --- a/res/field/scripts/script_0151.s +++ b/res/field/scripts/script_0151.s @@ -80,51 +80,51 @@ _00EF: .balign 4, 0 _00FC: - .short 0, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_03D + MoveAction_003 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_002 + MoveAction_03D + EndMovement .balign 4, 0 _0120: - .short 3, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_002 + MoveAction_03D + MoveAction_000 + MoveAction_03D + EndMovement .balign 4, 0 _0144: - .short 1, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_03D + MoveAction_002 + MoveAction_03D + MoveAction_000 + MoveAction_03D + MoveAction_003 + MoveAction_03D + EndMovement .balign 4, 0 _0168: - .short 2, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_03D + MoveAction_000 + MoveAction_03D + MoveAction_003 + MoveAction_03D + MoveAction_001 + MoveAction_03D + EndMovement _018C: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0156.s b/res/field/scripts/script_0156.s index 88efbf8656..041f4a0fe6 100644 --- a/res/field/scripts/script_0156.s +++ b/res/field/scripts/script_0156.s @@ -263,181 +263,181 @@ _03C2: .balign 4, 0 _03D0: - .short 14, 4 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D + EndMovement .balign 4, 0 _03DC: - .short 14, 3 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D + EndMovement .balign 4, 0 _03E8: - .short 14, 2 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00D + EndMovement .balign 4, 0 _03F4: - .short 14, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + EndMovement .balign 4, 0 _0400: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0408: - .short 12, 1 - .short 15, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + MoveAction_021 + EndMovement .balign 4, 0 _0418: - .short 12, 1 - .short 15, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 3 + MoveAction_021 + EndMovement .balign 4, 0 _0428: - .short 12, 1 - .short 15, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 2 + MoveAction_021 + EndMovement .balign 4, 0 _0438: - .short 12, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0448: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _0454: - .short 63, 1 - .short 16, 4 - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_010 4 + MoveAction_012 + EndMovement .balign 4, 0 _0464: - .short 63, 1 - .short 16, 4 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_010 4 + MoveAction_026 + EndMovement .balign 4, 0 _0474: - .short 63, 1 - .short 16, 3 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_010 3 + EndMovement .balign 4, 0 _0480: - .short 63, 1 - .short 16, 4 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_010 4 + MoveAction_027 + EndMovement .balign 4, 0 _0490: - .short 63, 1 - .short 16, 4 - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_010 4 + MoveAction_013 + EndMovement .balign 4, 0 _04A0: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _04A8: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _04B0: - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_024 + EndMovement .balign 4, 0 _04B8: - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_027 + EndMovement .balign 4, 0 _04C0: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _04C8: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _04D0: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _04D8: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _04E0: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _04E8: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _04F4: - .short 33, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0504: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _050C: - .short 33, 1 - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _051C: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0528: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement _0530: ScrCmd_049 0x5DC @@ -520,35 +520,35 @@ _05D7: .balign 4, 0 _063C: - .short 14, 3 - .short 34, 1 - .short 75, 1 - .short 14, 5 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_022 + MoveAction_04B + MoveAction_00E 5 + EndMovement .balign 4, 0 _0650: - .short 13, 1 - .short 14, 3 - .short 34, 1 - .short 75, 1 - .short 14, 5 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 3 + MoveAction_022 + MoveAction_04B + MoveAction_00E 5 + EndMovement .balign 4, 0 _0668: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0670: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0678: - .short 15, 9 - .short 0xFE, 0x00 + MoveAction_00F 9 + EndMovement _0680: ScrCmd_049 0x5DC @@ -772,26 +772,26 @@ _08EE: .balign 4, 0 _08F8: - .short 15, 1 - .short 13, 2 - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 2 + MoveAction_00F 8 + EndMovement .balign 4, 0 _0908: - .short 13, 2 - .short 15, 9 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 9 + EndMovement .balign 4, 0 _0914: - .short 63, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_003 + EndMovement .balign 4, 0 _0920: - .short 63, 1 - .short 33, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_023 + EndMovement diff --git a/res/field/scripts/script_0171.s b/res/field/scripts/script_0171.s index bd7daf65a7..3b321d1c73 100644 --- a/res/field/scripts/script_0171.s +++ b/res/field/scripts/script_0171.s @@ -89,37 +89,37 @@ _00D2: .balign 4, 0 _0104: - .short 15, 3 - .short 13, 6 - .short 14, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_00D 6 + MoveAction_00E 3 + MoveAction_020 + EndMovement .balign 4, 0 _0118: - .short 13, 1 - .short 15, 3 - .short 13, 5 - .short 14, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 3 + MoveAction_00D 5 + MoveAction_00E 3 + MoveAction_020 + EndMovement .balign 4, 0 _0130: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _013C: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0148: - .short 63, 1 - .short 33, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03F + MoveAction_023 + EndMovement diff --git a/res/field/scripts/script_0172.s b/res/field/scripts/script_0172.s index c4915e71e9..e09dc6b233 100644 --- a/res/field/scripts/script_0172.s +++ b/res/field/scripts/script_0172.s @@ -47,12 +47,12 @@ _009C: .balign 4, 0 _00B8: - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _00C4: - .short 13, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0174.s b/res/field/scripts/script_0174.s index 01a3020645..3f8f6c0c75 100644 --- a/res/field/scripts/script_0174.s +++ b/res/field/scripts/script_0174.s @@ -51,18 +51,18 @@ _0088: .balign 4, 0 _009C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _00A4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _00AC: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement _00B4: ScrCmd_049 0x5DC @@ -122,18 +122,18 @@ _011B: .balign 4, 0 _015C: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _0164: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _016C: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement _0174: ScrCmd_049 0x5DC @@ -289,41 +289,41 @@ _02A0: .balign 4, 0 _030C: - .short 75, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_020 + EndMovement .balign 4, 0 _0318: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0320: - .short 14, 4 - .short 13, 2 - .short 14, 6 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D 2 + MoveAction_00E 6 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0334: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _033C: - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _0348: - .short 12, 2 - .short 15, 3 - .short 12, 2 - .short 15, 7 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 3 + MoveAction_00C 2 + MoveAction_00F 7 + EndMovement _035C: ScrCmd_05E 8, _0390 @@ -343,17 +343,17 @@ _0376: .balign 4, 0 _0390: - .short 1, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_040 + EndMovement .balign 4, 0 _039C: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _03A4: - .short 13, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_040 + EndMovement diff --git a/res/field/scripts/script_0177.s b/res/field/scripts/script_0177.s index 2f8ecc56ba..c69825e149 100644 --- a/res/field/scripts/script_0177.s +++ b/res/field/scripts/script_0177.s @@ -95,15 +95,15 @@ _00EC: .balign 4, 0 _00FC: - .short 41, 2 - .short 0xFE, 0x00 + MoveAction_029 2 + EndMovement .balign 4, 0 _0104: - .short 43, 2 - .short 0xFE, 0x00 + MoveAction_02B 2 + EndMovement .balign 4, 0 _010C: - .short 42, 2 - .short 0xFE, 0x00 + MoveAction_02A 2 + EndMovement diff --git a/res/field/scripts/script_0186.s b/res/field/scripts/script_0186.s index d535dd923e..b8573319dd 100644 --- a/res/field/scripts/script_0186.s +++ b/res/field/scripts/script_0186.s @@ -85,21 +85,21 @@ _00F7: .balign 4, 0 _0104: - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0110: - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _011C: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement _0128: ScrCmd_049 0x5DC @@ -223,46 +223,46 @@ _02AC: .balign 4, 0 _02B8: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _02C0: - .short 16, 3 - .short 18, 1 - .short 16, 3 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_012 + MoveAction_010 3 + EndMovement .balign 4, 0 _02D0: - .short 16, 6 - .short 0xFE, 0x00 + MoveAction_010 6 + EndMovement .balign 4, 0 _02D8: - .short 16, 3 - .short 19, 1 - .short 16, 3 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 + MoveAction_010 3 + EndMovement .balign 4, 0 _02E8: - .short 17, 3 - .short 19, 1 - .short 17, 3 - .short 0xFE, 0x00 + MoveAction_011 3 + MoveAction_013 + MoveAction_011 3 + EndMovement .balign 4, 0 _02F8: - .short 17, 6 - .short 0xFE, 0x00 + MoveAction_011 6 + EndMovement .balign 4, 0 _0300: - .short 17, 3 - .short 18, 1 - .short 17, 3 - .short 0xFE, 0x00 + MoveAction_011 3 + MoveAction_012 + MoveAction_011 3 + EndMovement _0310: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0188.s b/res/field/scripts/script_0188.s index e79a6a51b4..0d713da677 100644 --- a/res/field/scripts/script_0188.s +++ b/res/field/scripts/script_0188.s @@ -76,5 +76,5 @@ _00B7: .balign 4, 0 _00DC: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement diff --git a/res/field/scripts/script_0190.s b/res/field/scripts/script_0190.s index de02dd7ef0..e15a78f695 100644 --- a/res/field/scripts/script_0190.s +++ b/res/field/scripts/script_0190.s @@ -76,5 +76,5 @@ _00B7: .balign 4, 0 _00DC: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement diff --git a/res/field/scripts/script_0192.s b/res/field/scripts/script_0192.s index f13e0045aa..a7a9a4b1a5 100644 --- a/res/field/scripts/script_0192.s +++ b/res/field/scripts/script_0192.s @@ -102,12 +102,12 @@ _0118: .balign 4, 0 _0120: - .short 71, 1 - .short 33, 3 - .short 37, 4 - .short 41, 2 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_021 3 + MoveAction_025 4 + MoveAction_029 2 + MoveAction_048 + EndMovement _0138: ScrCmd_060 @@ -122,5 +122,5 @@ _0138: .balign 4, 0 _015C: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement diff --git a/res/field/scripts/script_0194.s b/res/field/scripts/script_0194.s index 8ec455b1b3..eef38fe010 100644 --- a/res/field/scripts/script_0194.s +++ b/res/field/scripts/script_0194.s @@ -76,5 +76,5 @@ _00B7: .balign 4, 0 _00DC: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement diff --git a/res/field/scripts/script_0196.s b/res/field/scripts/script_0196.s index 3952e55d82..c0c6b7fe39 100644 --- a/res/field/scripts/script_0196.s +++ b/res/field/scripts/script_0196.s @@ -89,26 +89,26 @@ _0121: .balign 4, 0 _012C: - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00C 4 + EndMovement .balign 4, 0 _0134: - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00C 6 + EndMovement .balign 4, 0 _013C: - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00C 6 + EndMovement .balign 4, 0 _0144: - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _0150: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0197.s b/res/field/scripts/script_0197.s index cc2f2e9d1c..e78448f422 100644 --- a/res/field/scripts/script_0197.s +++ b/res/field/scripts/script_0197.s @@ -73,56 +73,56 @@ _00C9: .balign 4, 0 _0114: - .short 12, 8 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_023 + EndMovement .balign 4, 0 _0120: - .short 63, 3 - .short 12, 2 - .short 15, 1 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0138: - .short 12, 8 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_022 + EndMovement .balign 4, 0 _0144: - .short 34, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + EndMovement .balign 4, 0 _0150: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0158: - .short 12, 2 - .short 14, 1 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00E + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _016C: - .short 12, 17 - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 17 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _017C: - .short 63, 6 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 6 + MoveAction_023 + EndMovement .byte 35 .byte 0 @@ -135,13 +135,13 @@ _017C: .balign 4, 0 _0190: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0198: - .short 63, 1 - .short 32, 1 - .short 63, 6 - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + MoveAction_03F 6 + MoveAction_00C 4 + EndMovement diff --git a/res/field/scripts/script_0198.s b/res/field/scripts/script_0198.s index d7aef697ad..285e08ff1c 100644 --- a/res/field/scripts/script_0198.s +++ b/res/field/scripts/script_0198.s @@ -85,44 +85,44 @@ _0119: .balign 4, 0 _0124: - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C 8 + EndMovement .balign 4, 0 _012C: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0134: - .short 32, 1 - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 2 + MoveAction_023 + EndMovement .balign 4, 0 _0144: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _014C: - .short 63, 1 - .short 35, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_020 + EndMovement .balign 4, 0 _015C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0164: - .short 63, 1 - .short 34, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_020 + EndMovement _0174: ScrCmd_01F 0x1D1 diff --git a/res/field/scripts/script_0201.s b/res/field/scripts/script_0201.s index 5867a11d66..3c2637ac28 100644 --- a/res/field/scripts/script_0201.s +++ b/res/field/scripts/script_0201.s @@ -267,9 +267,9 @@ _033E: .balign 4, 0 _0340: - .short 34, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + EndMovement .byte 14 .byte 0 @@ -282,31 +282,31 @@ _0340: .balign 4, 0 _0354: - .short 15, 17 - .short 12, 2 - .short 15, 9 - .short 12, 6 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 17 + MoveAction_00C 2 + MoveAction_00F 9 + MoveAction_00C 6 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0370: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0378: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0380: - .short 0, 1 - .short 71, 1 - .short 17, 2 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_047 + MoveAction_011 2 + MoveAction_048 + EndMovement .byte 75 .byte 0 @@ -319,79 +319,79 @@ _0380: .balign 4, 0 _039C: - .short 16, 2 - .short 0xFE, 0x00 + MoveAction_010 2 + EndMovement .balign 4, 0 _03A4: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement .balign 4, 0 _03AC: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _03B4: - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_011 + EndMovement .balign 4, 0 _03BC: - .short 34, 1 - .short 63, 1 - .short 35, 1 - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F + MoveAction_023 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _03D4: - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_010 + EndMovement .balign 4, 0 _03DC: - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00F 4 + EndMovement .balign 4, 0 _03E4: - .short 15, 18 - .short 12, 2 - .short 15, 9 - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00F 18 + MoveAction_00C 2 + MoveAction_00F 9 + MoveAction_00C 6 + EndMovement .balign 4, 0 _03F8: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0400: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0408: - .short 63, 1 - .short 37, 1 - .short 62, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_025 + MoveAction_03E + MoveAction_024 + EndMovement .balign 4, 0 _041C: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0428: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -408,50 +408,50 @@ _0428: .balign 4, 0 _043C: - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + EndMovement .balign 4, 0 _0448: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0450: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _0458: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0460: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0468: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0470: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _0478: - .short 12, 1 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 2 + EndMovement .balign 4, 0 _0484: - .short 13, 8 - .short 0xFE, 0x00 + MoveAction_00D 8 + EndMovement .byte 34 .byte 0 @@ -669,34 +669,34 @@ _0694: .balign 4, 0 _06B0: - .short 1, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_040 + EndMovement .balign 4, 0 _06BC: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _06C4: - .short 13, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_040 + EndMovement .balign 4, 0 _06D0: - .short 15, 1 - .short 1, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_001 + MoveAction_040 + EndMovement .balign 4, 0 _06E0: - .short 14, 1 - .short 1, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_001 + MoveAction_040 + EndMovement _06F0: ScrCmd_049 0x5DC @@ -747,33 +747,33 @@ _0792: .balign 4, 0 _07A0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _07A8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _07B0: - .short 13, 1 - .short 14, 2 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 2 + MoveAction_00C + EndMovement .balign 4, 0 _07C0: - .short 14, 1 - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + MoveAction_020 + EndMovement .balign 4, 0 _07D0: - .short 14, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C + EndMovement _07DC: ScrCmd_049 0x5DC @@ -833,8 +833,8 @@ _083C: .balign 4, 0 _085C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0864: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0211.s b/res/field/scripts/script_0211.s index fd4595cb95..b2a665a5dd 100644 --- a/res/field/scripts/script_0211.s +++ b/res/field/scripts/script_0211.s @@ -222,19 +222,19 @@ _02D4: .balign 4, 0 _02E0: - .short 100, 1 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_064 + MoveAction_03E + EndMovement .balign 4, 0 _02EC: - .short 102, 1 - .short 0xFE, 0x00 + MoveAction_066 + EndMovement .balign 4, 0 _02F4: - .short 104, 1 - .short 0xFE, 0x00 + MoveAction_068 + EndMovement _02FC: ScrCmd_029 0x8008, 0x800C @@ -1464,18 +1464,18 @@ _1245: .balign 4, 0 _1250: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _1258: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _1260: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .byte 0 .byte 0 @@ -1496,8 +1496,8 @@ _1260: .balign 4, 0 _1278: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement _1280: ScrCmd_002 diff --git a/res/field/scripts/script_0212.s b/res/field/scripts/script_0212.s index 63ad0d6ad0..0fc22e7ac4 100644 --- a/res/field/scripts/script_0212.s +++ b/res/field/scripts/script_0212.s @@ -97,25 +97,25 @@ _0115: .balign 4, 0 _0120: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0128: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0130: - .short 14, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_024 + EndMovement .balign 4, 0 _013C: - .short 14, 2 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_024 + EndMovement _0148: ScrCmd_002 @@ -957,23 +957,23 @@ _0D98: .balign 4, 0 _0DA0: - .short 15, 2 - .short 12, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00C 3 + MoveAction_022 + EndMovement .balign 4, 0 _0DB0: - .short 15, 2 - .short 12, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00C 3 + MoveAction_022 + EndMovement .balign 4, 0 _0DC0: - .short 15, 1 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 3 + EndMovement .byte 62 .byte 0 @@ -1030,59 +1030,59 @@ _0DC0: .balign 4, 0 _0E00: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0E08: - .short 63, 2 - .short 12, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C + MoveAction_00F + EndMovement .balign 4, 0 _0E18: - .short 63, 2 - .short 12, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C + MoveAction_00F + EndMovement .balign 4, 0 _0E28: - .short 63, 2 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0E38: - .short 63, 2 - .short 34, 1 - .short 63, 1 - .short 35, 1 - .short 63, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + MoveAction_03F + MoveAction_023 + MoveAction_03F + MoveAction_025 + EndMovement .balign 4, 0 _0E54: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0E5C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0E64: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0E6C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0E74: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0213.s b/res/field/scripts/script_0213.s index 44085d9a71..b53000e422 100644 --- a/res/field/scripts/script_0213.s +++ b/res/field/scripts/script_0213.s @@ -66,18 +66,18 @@ _008F: .balign 4, 0 _00F0: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _00F8: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0100: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement _0108: ScrCmd_049 0x5DC @@ -433,20 +433,20 @@ _051E: .balign 4, 0 _0524: - .short 15, 1 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 2 + EndMovement .balign 4, 0 _0530: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0538: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement _0544: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0214.s b/res/field/scripts/script_0214.s index 43ac9daaa6..b171e5999c 100644 --- a/res/field/scripts/script_0214.s +++ b/res/field/scripts/script_0214.s @@ -115,11 +115,11 @@ _012B: .balign 4, 0 _0138: - .short 14, 1 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 3 + EndMovement .balign 4, 0 _0144: - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C 3 + EndMovement diff --git a/res/field/scripts/script_0215.s b/res/field/scripts/script_0215.s index 9a3badefca..f99e34e95e 100644 --- a/res/field/scripts/script_0215.s +++ b/res/field/scripts/script_0215.s @@ -107,8 +107,8 @@ _00A1: .balign 4, 0 _00C0: - .short 15, 10 - .short 0xFE, 0x00 + MoveAction_00F 10 + EndMovement .byte 63 .byte 0 @@ -129,10 +129,10 @@ _00C0: .balign 4, 0 _00D8: - .short 63, 2 - .short 35, 1 - .short 63, 4 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + MoveAction_03F 4 + EndMovement .byte 63 .byte 0 diff --git a/res/field/scripts/script_0216.s b/res/field/scripts/script_0216.s index b6ba8604d8..6cc336274b 100644 --- a/res/field/scripts/script_0216.s +++ b/res/field/scripts/script_0216.s @@ -101,14 +101,14 @@ _0133: .balign 4, 0 _013C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0144: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement _0150: ScrCmd_049 0x5DC @@ -213,62 +213,62 @@ _0201: .balign 4, 0 _02AC: - .short 63, 5 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 5 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _02BC: - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_020 + EndMovement .balign 4, 0 _02C8: - .short 63, 1 - .short 34, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_021 + EndMovement .balign 4, 0 _02D8: - .short 75, 1 - .short 63, 1 - .short 16, 4 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F + MoveAction_010 4 + MoveAction_027 + EndMovement .balign 4, 0 _02EC: - .short 63, 1 - .short 62, 1 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0300: - .short 12, 1 - .short 69, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + MoveAction_001 + EndMovement .balign 4, 0 _0310: - .short 70, 1 - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_046 + MoveAction_011 + EndMovement .balign 4, 0 _031C: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0324: - .short 18, 1 - .short 17, 1 - .short 17, 6 - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_011 + MoveAction_011 6 + MoveAction_012 9 + EndMovement diff --git a/res/field/scripts/script_0217.s b/res/field/scripts/script_0217.s index f925798ae7..027a83f014 100644 --- a/res/field/scripts/script_0217.s +++ b/res/field/scripts/script_0217.s @@ -43,19 +43,19 @@ _005F: .balign 4, 0 _0090: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0098: - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 9 + EndMovement .balign 4, 0 _00A0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement _00AC: ScrCmd_049 0x5DC @@ -210,89 +210,89 @@ _02B9: .balign 4, 0 _02C0: - .short 19, 4 - .short 16, 1 - .short 19, 6 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_010 + MoveAction_013 6 + MoveAction_024 + EndMovement .balign 4, 0 _02D4: - .short 19, 4 - .short 16, 2 - .short 19, 6 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_010 2 + MoveAction_013 6 + MoveAction_025 + EndMovement .balign 4, 0 _02E8: - .short 13, 3 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_00E + EndMovement .balign 4, 0 _02F4: - .short 13, 4 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_00E + EndMovement .balign 4, 0 _0300: - .short 63, 6 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 6 + MoveAction_021 + EndMovement .balign 4, 0 _030C: - .short 63, 6 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 6 + MoveAction_020 + EndMovement .balign 4, 0 _0318: - .short 3, 1 - .short 63, 2 - .short 2, 1 - .short 63, 2 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_03F 2 + MoveAction_002 + MoveAction_03F 2 + MoveAction_001 + EndMovement .balign 4, 0 _0330: - .short 3, 1 - .short 63, 2 - .short 2, 1 - .short 63, 2 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_03F 2 + MoveAction_002 + MoveAction_03F 2 + MoveAction_000 + EndMovement .balign 4, 0 _0348: - .short 75, 1 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0358: - .short 75, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_022 + EndMovement .balign 4, 0 _0364: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _036C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0374: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _037C: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0219.s b/res/field/scripts/script_0219.s index eb649014aa..61f74b4def 100644 --- a/res/field/scripts/script_0219.s +++ b/res/field/scripts/script_0219.s @@ -78,17 +78,17 @@ _00E0: .balign 4, 0 _00E8: - .short 153, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_099 + MoveAction_00D + EndMovement .balign 4, 0 _00F4: - .short 153, 1 - .short 13, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_099 + MoveAction_00D + MoveAction_00F + MoveAction_021 + EndMovement _0108: ScrCmd_060 @@ -123,21 +123,21 @@ _0168: .balign 4, 0 _0174: - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _0180: - .short 12, 2 - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _0190: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0198: ScrCmd_060 @@ -230,110 +230,110 @@ _02CB: .balign 4, 0 _0300: - .short 35, 1 - .short 153, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_099 + EndMovement .balign 4, 0 _030C: - .short 13, 2 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 5 + EndMovement .balign 4, 0 _0318: - .short 13, 1 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 5 + EndMovement .balign 4, 0 _0324: - .short 13, 1 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 5 + EndMovement .balign 4, 0 _0330: - .short 12, 1 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 5 + EndMovement .balign 4, 0 _033C: - .short 12, 1 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 5 + EndMovement .balign 4, 0 _0348: - .short 12, 2 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 5 + EndMovement .balign 4, 0 _0354: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _035C: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0368: - .short 63, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_022 + EndMovement .balign 4, 0 _0374: - .short 63, 2 - .short 33, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_021 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0388: - .short 63, 1 - .short 33, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _039C: - .short 63, 1 - .short 33, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _03B0: - .short 63, 1 - .short 32, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _03C4: - .short 63, 1 - .short 32, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _03D8: - .short 63, 2 - .short 32, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + MoveAction_03F + MoveAction_023 + EndMovement _03EC: ScrCmd_060 @@ -411,21 +411,21 @@ _04B4: .balign 4, 0 _04BC: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _04C4: - .short 13, 2 - .short 15, 9 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 9 + EndMovement .balign 4, 0 _04D0: - .short 14, 1 - .short 13, 2 - .short 15, 10 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + MoveAction_00F 10 + EndMovement _04E0: ScrCmd_036 14, 2, 0, 0x800C @@ -465,5 +465,5 @@ _051D: .balign 4, 0 _053C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0223.s b/res/field/scripts/script_0223.s index 1ea347a21d..d5fd24cc2f 100644 --- a/res/field/scripts/script_0223.s +++ b/res/field/scripts/script_0223.s @@ -30,45 +30,45 @@ _0006: .balign 4, 0 _0064: - .short 13, 6 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D 6 + MoveAction_022 + EndMovement .balign 4, 0 _0070: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0078: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0080: - .short 63, 3 - .short 14, 10 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_00E 10 + EndMovement .balign 4, 0 _008C: - .short 32, 1 - .short 63, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 4 + MoveAction_023 + EndMovement .balign 4, 0 _009C: - .short 63, 3 - .short 32, 1 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_020 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _00B0: - .short 13, 1 - .short 32, 1 - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_020 + MoveAction_03F 2 + MoveAction_022 + EndMovement diff --git a/res/field/scripts/script_0224.s b/res/field/scripts/script_0224.s index a5d5436813..fae7dd305a 100644 --- a/res/field/scripts/script_0224.s +++ b/res/field/scripts/script_0224.s @@ -102,46 +102,46 @@ _0131: .balign 4, 0 _0148: - .short 18, 4 - .short 63, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_03F + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _015C: - .short 18, 4 - .short 16, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_010 + MoveAction_026 + EndMovement .balign 4, 0 _016C: - .short 18, 4 - .short 0xFE, 0x00 + MoveAction_012 4 + EndMovement .balign 4, 0 _0174: - .short 18, 4 - .short 17, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_011 + MoveAction_026 + EndMovement .balign 4, 0 _0184: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _018C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0194: - .short 63, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_023 + EndMovement _01A0: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0232.s b/res/field/scripts/script_0232.s index 8c8f02571d..8110b33099 100644 --- a/res/field/scripts/script_0232.s +++ b/res/field/scripts/script_0232.s @@ -19,5 +19,5 @@ _0006: .balign 4, 0 _0024: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement diff --git a/res/field/scripts/script_0234.s b/res/field/scripts/script_0234.s index 014ecfc7d3..05b20a8269 100644 --- a/res/field/scripts/script_0234.s +++ b/res/field/scripts/script_0234.s @@ -34,15 +34,15 @@ _001D: .balign 4, 0 _0058: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0060: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0068: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement diff --git a/res/field/scripts/script_0236.s b/res/field/scripts/script_0236.s index 28ca53b1a0..31a7755d8a 100644 --- a/res/field/scripts/script_0236.s +++ b/res/field/scripts/script_0236.s @@ -162,29 +162,29 @@ _01DB: .balign 4, 0 _01E4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01EC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _01F4: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _01FC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0204: - .short 62, 5 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_03E 5 + MoveAction_00D + EndMovement _0210: ScrCmd_049 0x5DC @@ -328,33 +328,33 @@ _03D8: .balign 4, 0 _03F4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03FC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0404: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _040C: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0414: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _041C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0424: ScrCmd_0DE 0x800C @@ -460,14 +460,14 @@ _04A7: .balign 4, 0 _04F4: - .short 62, 2 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_03E 2 + MoveAction_010 8 + EndMovement .balign 4, 0 _0500: - .short 17, 8 - .short 0xFE, 0x00 + MoveAction_011 8 + EndMovement _0508: ScrCmd_05E 0xFF, _05B8 @@ -512,8 +512,8 @@ _0567: .balign 4, 0 _05B8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement _05C0: ScrCmd_069 0x8004, 0x8005 @@ -552,34 +552,34 @@ _0637: .balign 4, 0 _0644: - .short 63, 1 - .short 12, 6 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 6 + MoveAction_00F 2 + EndMovement .balign 4, 0 _0654: - .short 63, 1 - .short 12, 6 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 6 + MoveAction_00F + EndMovement .balign 4, 0 _0664: - .short 63, 1 - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 6 + EndMovement .balign 4, 0 _0670: - .short 63, 1 - .short 12, 6 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 6 + MoveAction_00E + EndMovement .balign 4, 0 _0680: - .short 63, 1 - .short 12, 6 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 6 + MoveAction_00E 2 + EndMovement diff --git a/res/field/scripts/script_0237.s b/res/field/scripts/script_0237.s index 5c6883f82b..01e6837095 100644 --- a/res/field/scripts/script_0237.s +++ b/res/field/scripts/script_0237.s @@ -85,39 +85,39 @@ _0130: .balign 4, 0 _013C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0144: - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00C 4 + EndMovement .balign 4, 0 _014C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0154: - .short 35, 1 - .short 63, 2 - .short 33, 1 - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03F 2 + MoveAction_021 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _016C: - .short 15, 1 - .short 12, 5 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 5 + EndMovement .balign 4, 0 _0178: - .short 13, 5 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D 5 + MoveAction_00E + EndMovement _0184: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0238.s b/res/field/scripts/script_0238.s index c0df7286f1..34a9bea361 100644 --- a/res/field/scripts/script_0238.s +++ b/res/field/scripts/script_0238.s @@ -83,9 +83,9 @@ _00E9: .balign 4, 0 _00F8: - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_041 + EndMovement _0104: ScrCmd_069 0x8004, 0x8005 @@ -124,24 +124,24 @@ _016F: .balign 4, 0 _017C: - .short 12, 4 - .short 15, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_00F + MoveAction_000 + EndMovement .balign 4, 0 _018C: - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00C 4 + EndMovement .balign 4, 0 _0194: - .short 12, 4 - .short 14, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_00E + MoveAction_000 + EndMovement .balign 4, 0 _01A4: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement diff --git a/res/field/scripts/script_0253.s b/res/field/scripts/script_0253.s index c9c84ea793..66872d6153 100644 --- a/res/field/scripts/script_0253.s +++ b/res/field/scripts/script_0253.s @@ -74,5 +74,5 @@ _00C7: .balign 4, 0 _00D4: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement diff --git a/res/field/scripts/script_0270.s b/res/field/scripts/script_0270.s index 17253a3d37..5e43ea221f 100644 --- a/res/field/scripts/script_0270.s +++ b/res/field/scripts/script_0270.s @@ -98,44 +98,44 @@ _0139: .balign 4, 0 _0140: - .short 34, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + EndMovement .balign 4, 0 _014C: - .short 12, 3 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00E + EndMovement .balign 4, 0 _0158: - .short 12, 2 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00E + EndMovement .balign 4, 0 _0164: - .short 12, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E + EndMovement .balign 4, 0 _0170: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0178: - .short 13, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E + EndMovement .balign 4, 0 _0184: - .short 13, 2 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E + EndMovement _0190: ScrCmd_060 @@ -198,8 +198,8 @@ _026D: .balign 4, 0 _0274: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .byte 12 .byte 0 @@ -212,48 +212,48 @@ _0274: .balign 4, 0 _0284: - .short 15, 2 - .short 13, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D 3 + MoveAction_023 + EndMovement .balign 4, 0 _0294: - .short 15, 2 - .short 13, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D 2 + MoveAction_023 + EndMovement .balign 4, 0 _02A4: - .short 15, 2 - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _02B4: - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_00F 2 + EndMovement .balign 4, 0 _02BC: - .short 15, 2 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _02CC: - .short 15, 2 - .short 12, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00C 2 + MoveAction_023 + EndMovement .balign 4, 0 _02DC: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _02E4: ScrCmd_060 @@ -308,58 +308,58 @@ _03A1: .balign 4, 0 _03B4: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _03C0: - .short 63, 1 - .short 35, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_020 + EndMovement .balign 4, 0 _03D0: - .short 63, 1 - .short 34, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_020 + EndMovement .balign 4, 0 _03E0: - .short 32, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + EndMovement .balign 4, 0 _03EC: - .short 15, 1 - .short 12, 7 - .short 15, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 7 + MoveAction_00F 4 + MoveAction_023 + EndMovement .balign 4, 0 _0400: - .short 15, 1 - .short 12, 7 - .short 15, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 7 + MoveAction_00F 3 + MoveAction_023 + EndMovement .balign 4, 0 _0414: - .short 15, 1 - .short 12, 7 - .short 15, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 7 + MoveAction_00F 2 + MoveAction_023 + EndMovement .balign 4, 0 _0428: - .short 14, 1 - .short 12, 7 - .short 15, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 7 + MoveAction_00F 3 + MoveAction_023 + EndMovement diff --git a/res/field/scripts/script_0273.s b/res/field/scripts/script_0273.s index 95483243cb..92430aed44 100644 --- a/res/field/scripts/script_0273.s +++ b/res/field/scripts/script_0273.s @@ -110,8 +110,8 @@ _0114: .balign 4, 0 _0124: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _012C: ScrCmd_049 0x5DC @@ -134,8 +134,8 @@ _0159: .balign 4, 0 _0168: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0170: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0274.s b/res/field/scripts/script_0274.s index 4deb8f2d23..98f3a82012 100644 --- a/res/field/scripts/script_0274.s +++ b/res/field/scripts/script_0274.s @@ -285,23 +285,23 @@ _0389: .balign 4, 0 _03B0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _03B8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03C0: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _03C8: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .byte 85 .byte 0 @@ -686,13 +686,13 @@ _08B4: .balign 4, 0 _08C8: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _08D0: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _08D8: ScrCmd_049 0x5DC @@ -1602,177 +1602,177 @@ _174A: .balign 4, 0 _1758: - .short 1, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_045 + EndMovement .balign 4, 0 _1764: - .short 1, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_046 + EndMovement .balign 4, 0 _1770: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _1778: - .short 23, 18 - .short 0xFE, 0x00 + MoveAction_017 18 + EndMovement .balign 4, 0 _1780: - .short 23, 19 - .short 20, 1 - .short 0xFE, 0x00 + MoveAction_017 19 + MoveAction_014 + EndMovement .balign 4, 0 _178C: - .short 23, 17 - .short 20, 1 - .short 0xFE, 0x00 + MoveAction_017 17 + MoveAction_014 + EndMovement .balign 4, 0 _1798: - .short 22, 18 - .short 21, 2 - .short 0xFE, 0x00 + MoveAction_016 18 + MoveAction_015 2 + EndMovement .balign 4, 0 _17A4: - .short 22, 17 - .short 21, 1 - .short 0xFE, 0x00 + MoveAction_016 17 + MoveAction_015 + EndMovement .balign 4, 0 _17B0: - .short 22, 19 - .short 21, 1 - .short 0xFE, 0x00 + MoveAction_016 19 + MoveAction_015 + EndMovement .balign 4, 0 _17BC: - .short 22, 5 - .short 20, 16 - .short 0xFE, 0x00 + MoveAction_016 5 + MoveAction_014 16 + EndMovement .balign 4, 0 _17C8: - .short 22, 18 - .short 20, 18 - .short 0xFE, 0x00 + MoveAction_016 18 + MoveAction_014 18 + EndMovement .balign 4, 0 _17D4: - .short 22, 38 - .short 20, 15 - .short 0xFE, 0x00 + MoveAction_016 38 + MoveAction_014 15 + EndMovement .balign 4, 0 _17E0: - .short 23, 5 - .short 21, 18 - .short 0xFE, 0x00 + MoveAction_017 5 + MoveAction_015 18 + EndMovement .balign 4, 0 _17EC: - .short 22, 31 - .short 21, 2 - .short 0xFE, 0x00 + MoveAction_016 31 + MoveAction_015 2 + EndMovement .balign 4, 0 _17F8: - .short 22, 15 - .short 20, 1 - .short 0xFE, 0x00 + MoveAction_016 15 + MoveAction_014 + EndMovement .balign 4, 0 _1804: - .short 23, 37 - .short 21, 16 - .short 0xFE, 0x00 + MoveAction_017 37 + MoveAction_015 16 + EndMovement .balign 4, 0 _1810: - .short 23, 12 - .short 20, 1 - .short 0xFE, 0x00 + MoveAction_017 12 + MoveAction_014 + EndMovement .balign 4, 0 _181C: - .short 23, 25 - .short 21, 6 - .short 0xFE, 0x00 + MoveAction_017 25 + MoveAction_015 6 + EndMovement .balign 4, 0 _1828: - .short 23, 19 - .short 21, 19 - .short 0xFE, 0x00 + MoveAction_017 19 + MoveAction_015 19 + EndMovement .balign 4, 0 _1834: - .short 23, 9 - .short 21, 9 - .short 0xFE, 0x00 + MoveAction_017 9 + MoveAction_015 9 + EndMovement .balign 4, 0 _1840: - .short 22, 8 - .short 21, 2 - .short 0xFE, 0x00 + MoveAction_016 8 + MoveAction_015 2 + EndMovement .balign 4, 0 _184C: - .short 23, 21 - .short 0xFE, 0x00 + MoveAction_017 21 + EndMovement .balign 4, 0 _1854: - .short 23, 22 - .short 21, 25 - .short 0xFE, 0x00 + MoveAction_017 22 + MoveAction_015 25 + EndMovement .balign 4, 0 _1860: - .short 22, 12 - .short 21, 1 - .short 0xFE, 0x00 + MoveAction_016 12 + MoveAction_015 + EndMovement .balign 4, 0 _186C: - .short 23, 6 - .short 20, 7 - .short 0xFE, 0x00 + MoveAction_017 6 + MoveAction_014 7 + EndMovement .balign 4, 0 _1878: - .short 22, 7 - .short 20, 9 - .short 0xFE, 0x00 + MoveAction_016 7 + MoveAction_014 9 + EndMovement .balign 4, 0 _1884: - .short 23, 5 - .short 21, 18 - .short 0xFE, 0x00 + MoveAction_017 5 + MoveAction_015 18 + EndMovement .balign 4, 0 _1890: - .short 23, 5 - .short 20, 8 - .short 0xFE, 0x00 + MoveAction_017 5 + MoveAction_014 8 + EndMovement .balign 4, 0 _189C: - .short 22, 31 - .short 20, 24 - .short 0xFE, 0x00 + MoveAction_016 31 + MoveAction_014 24 + EndMovement .balign 4, 0 _18A8: - .short 22, 15 - .short 20, 27 - .short 0xFE, 0x00 + MoveAction_016 15 + MoveAction_014 27 + EndMovement diff --git a/res/field/scripts/script_0277.s b/res/field/scripts/script_0277.s index a3513850e9..8d499e216f 100644 --- a/res/field/scripts/script_0277.s +++ b/res/field/scripts/script_0277.s @@ -39,19 +39,19 @@ _006E: .balign 4, 0 _0074: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0080: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0088: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 12 .byte 0 @@ -72,20 +72,20 @@ _0088: .balign 4, 0 _00A0: - .short 13, 1 - .short 35, 1 - .short 63, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + MoveAction_03F 3 + MoveAction_021 + EndMovement .balign 4, 0 _00B4: - .short 13, 1 - .short 35, 1 - .short 63, 3 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + MoveAction_03F 3 + MoveAction_00F + MoveAction_021 + EndMovement _00CC: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0279.s b/res/field/scripts/script_0279.s index 5c2ca19fe8..eebbae13ba 100644 --- a/res/field/scripts/script_0279.s +++ b/res/field/scripts/script_0279.s @@ -64,13 +64,13 @@ _007B: .balign 4, 0 _00B4: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _00C0: - .short 33, 1 - .short 75, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + MoveAction_00D + EndMovement diff --git a/res/field/scripts/script_0281.s b/res/field/scripts/script_0281.s index 6b4fa70eea..60fbf332c2 100644 --- a/res/field/scripts/script_0281.s +++ b/res/field/scripts/script_0281.s @@ -84,31 +84,31 @@ _00F1: .balign 4, 0 _010C: - .short 15, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_040 + EndMovement .balign 4, 0 _0118: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _0120: - .short 13, 1 - .short 15, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 2 + MoveAction_040 + EndMovement .balign 4, 0 _0130: - .short 15, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_040 + EndMovement .balign 4, 0 _013C: - .short 12, 1 - .short 15, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 2 + MoveAction_040 + EndMovement diff --git a/res/field/scripts/script_0282.s b/res/field/scripts/script_0282.s index b1a21d7ea1..1688b06514 100644 --- a/res/field/scripts/script_0282.s +++ b/res/field/scripts/script_0282.s @@ -50,7 +50,7 @@ _007E: .balign 4, 0 _0094: - .short 71, 1 - .short 12, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00C + MoveAction_048 + EndMovement diff --git a/res/field/scripts/script_0283.s b/res/field/scripts/script_0283.s index e97a4d3333..ab77c09f21 100644 --- a/res/field/scripts/script_0283.s +++ b/res/field/scripts/script_0283.s @@ -51,15 +51,15 @@ _002F: .balign 4, 0 _00A4: - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00F 4 + EndMovement .balign 4, 0 _00AC: - .short 13, 2 - .short 15, 4 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 4 + MoveAction_00C + EndMovement .byte 34 .byte 0 @@ -72,42 +72,42 @@ _00AC: .balign 4, 0 _00C4: - .short 34, 1 - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _00D4: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _00E0: - .short 12, 1 - .short 15, 3 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 3 + EndMovement .balign 4, 0 _00EC: - .short 15, 1 - .short 13, 2 - .short 15, 3 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 2 + MoveAction_00F 3 + MoveAction_00C + EndMovement .balign 4, 0 _0100: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0108: - .short 15, 1 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 2 + MoveAction_045 + EndMovement _0118: ScrCmd_060 @@ -154,58 +154,58 @@ _0118: .balign 4, 0 _01CC: - .short 34, 1 - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _01DC: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _01E8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _01F0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01F8: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0204: - .short 70, 1 - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_046 + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _0214: - .short 13, 2 - .short 14, 5 - .short 12, 2 - .short 14, 3 - .short 21, 9 - .short 23, 10 - .short 12, 6 - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E 5 + MoveAction_00C 2 + MoveAction_00E 3 + MoveAction_015 9 + MoveAction_017 10 + MoveAction_00C 6 + MoveAction_00F 8 + EndMovement .balign 4, 0 _0238: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0240: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0284.s b/res/field/scripts/script_0284.s index ff95b4ad51..1cd988952d 100644 --- a/res/field/scripts/script_0284.s +++ b/res/field/scripts/script_0284.s @@ -91,107 +91,107 @@ _0150: .balign 4, 0 _0158: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0160: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0168: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _0174: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _017C: - .short 32, 1 - .short 63, 2 - .short 33, 1 - .short 63, 2 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 2 + MoveAction_021 + MoveAction_03F 2 + EndMovement .balign 4, 0 _0190: - .short 13, 2 - .short 63, 1 - .short 13, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_03F + MoveAction_00D + MoveAction_045 + EndMovement .balign 4, 0 _01A4: - .short 63, 2 - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _01B4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01BC: - .short 34, 1 - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _01CC: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _01D4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01DC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01E4: - .short 14, 1 - .short 13, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + MoveAction_045 + EndMovement .balign 4, 0 _01F4: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _0200: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0208: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement .balign 4, 0 _0210: - .short 15, 1 - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 7 + EndMovement .balign 4, 0 _021C: - .short 63, 1 - .short 14, 1 - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00E + MoveAction_00C 7 + EndMovement diff --git a/res/field/scripts/script_0285.s b/res/field/scripts/script_0285.s index 7d993cadeb..ea880ac309 100644 --- a/res/field/scripts/script_0285.s +++ b/res/field/scripts/script_0285.s @@ -70,8 +70,8 @@ _00B7: .balign 4, 0 _00DC: - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C 8 + EndMovement .byte 12 .byte 0 @@ -84,8 +84,8 @@ _00DC: .balign 4, 0 _00EC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 12 .byte 0 @@ -113,23 +113,23 @@ _00FC: .balign 4, 0 _0134: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _013C: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0144: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _014C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0154: ScrCmd_060 @@ -173,32 +173,32 @@ _01AB: .balign 4, 0 _01E4: - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _01F0: - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _01FC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0204: - .short 32, 1 - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0214: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _021C: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0286.s b/res/field/scripts/script_0286.s index 4929bbbe06..f4aeba7ac0 100644 --- a/res/field/scripts/script_0286.s +++ b/res/field/scripts/script_0286.s @@ -70,8 +70,8 @@ _0096: .balign 4, 0 _00B4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .byte 32 .byte 0 @@ -298,179 +298,179 @@ _019C: .balign 4, 0 _0388: - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C 3 + EndMovement .balign 4, 0 _0390: - .short 63, 2 - .short 35, 1 - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _03A4: - .short 63, 1 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 2 + EndMovement .balign 4, 0 _03B0: - .short 12, 2 - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _03C0: - .short 38, 1 - .short 63, 1 - .short 39, 1 - .short 63, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_03F + MoveAction_027 + MoveAction_03F + MoveAction_025 + EndMovement .balign 4, 0 _03D8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _03E0: - .short 63, 2 - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00D 3 + EndMovement .balign 4, 0 _03EC: - .short 13, 1 - .short 15, 1 - .short 13, 3 - .short 14, 1 - .short 13, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D 3 + MoveAction_00E + MoveAction_00D + MoveAction_045 + EndMovement .balign 4, 0 _0408: - .short 63, 3 - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _0418: - .short 63, 1 - .short 33, 1 - .short 63, 1 - .short 34, 1 - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03F + MoveAction_022 + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _0434: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _043C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0444: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _044C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0454: - .short 39, 3 - .short 0xFE, 0x00 + MoveAction_027 3 + EndMovement .balign 4, 0 _045C: - .short 38, 3 - .short 0xFE, 0x00 + MoveAction_026 3 + EndMovement .balign 4, 0 _0464: - .short 19, 2 - .short 17, 5 - .short 18, 1 - .short 17, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_011 5 + MoveAction_012 + MoveAction_011 + MoveAction_045 + EndMovement .balign 4, 0 _047C: - .short 17, 5 - .short 18, 1 - .short 17, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_011 5 + MoveAction_012 + MoveAction_011 + MoveAction_045 + EndMovement .balign 4, 0 _0490: - .short 18, 2 - .short 16, 3 - .short 32, 1 - .short 17, 3 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_010 3 + MoveAction_020 + MoveAction_011 3 + MoveAction_013 2 + EndMovement .balign 4, 0 _04A8: - .short 14, 3 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00C 3 + EndMovement .balign 4, 0 _04B4: - .short 14, 1 - .short 12, 1 - .short 15, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C + MoveAction_00F + MoveAction_00D 2 + EndMovement .balign 4, 0 _04C8: - .short 12, 2 - .short 15, 1 - .short 12, 3 - .short 14, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C 3 + MoveAction_00E 2 + MoveAction_020 + EndMovement .balign 4, 0 _04E0: - .short 15, 1 - .short 13, 1 - .short 15, 1 - .short 13, 3 - .short 14, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D + MoveAction_00F + MoveAction_00D 3 + MoveAction_00E + MoveAction_00D 2 + EndMovement .balign 4, 0 _04FC: - .short 15, 1 - .short 12, 4 - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 4 + MoveAction_00E + MoveAction_020 + EndMovement .balign 4, 0 _0510: - .short 15, 1 - .short 13, 3 - .short 14, 1 - .short 13, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 3 + MoveAction_00E + MoveAction_00D 2 + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0288.s b/res/field/scripts/script_0288.s index abe1971adb..4ea6b56a07 100644 --- a/res/field/scripts/script_0288.s +++ b/res/field/scripts/script_0288.s @@ -50,22 +50,22 @@ _0021: .balign 4, 0 _0098: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _00A0: - .short 38, 1 - .short 63, 1 - .short 39, 1 - .short 63, 2 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_03F + MoveAction_027 + MoveAction_03F 2 + MoveAction_024 + EndMovement .balign 4, 0 _00B8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement _00C0: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0318.s b/res/field/scripts/script_0318.s index 9f1a7bdf14..86f9eaa968 100644 --- a/res/field/scripts/script_0318.s +++ b/res/field/scripts/script_0318.s @@ -135,25 +135,25 @@ _0182: .balign 4, 0 _0194: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _019C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01A4: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _01B0: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement .byte 63 .byte 0 @@ -186,26 +186,26 @@ _01B0: .balign 4, 0 _01D8: - .short 34, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + EndMovement .balign 4, 0 _01E4: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _01F0: - .short 63, 3 - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _0200: - .short 63, 3 - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_00D + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0324.s b/res/field/scripts/script_0324.s index e372125dc2..d7f0a3165a 100644 --- a/res/field/scripts/script_0324.s +++ b/res/field/scripts/script_0324.s @@ -69,27 +69,27 @@ _00B0: .balign 4, 0 _00CC: - .short 2, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_040 + EndMovement .balign 4, 0 _00D8: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _00E0: - .short 13, 1 - .short 2, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_002 + MoveAction_040 + EndMovement .balign 4, 0 _00F0: - .short 14, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_040 + EndMovement _00FC: ScrCmd_049 0x5DC @@ -128,5 +128,5 @@ _014B: .balign 4, 0 _0168: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0329.s b/res/field/scripts/script_0329.s index a17b2823f4..9a40cd4f03 100644 --- a/res/field/scripts/script_0329.s +++ b/res/field/scripts/script_0329.s @@ -111,13 +111,13 @@ _014A: .balign 4, 0 _0158: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0160: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .byte 14 .byte 0 @@ -130,29 +130,29 @@ _0160: .balign 4, 0 _0170: - .short 35, 1 - .short 75, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_04B + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0184: - .short 35, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_04B + EndMovement .balign 4, 0 _0190: - .short 14, 1 - .short 13, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + MoveAction_022 + EndMovement .balign 4, 0 _01A0: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement _01A8: ScrCmd_002 @@ -310,23 +310,23 @@ _037D: .balign 4, 0 _0384: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _038C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0394: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _039C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .byte 14 .byte 0 @@ -379,17 +379,17 @@ _039C: .balign 4, 0 _03D4: - .short 34, 1 - .short 13, 1 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_00D + MoveAction_00E 2 + EndMovement .balign 4, 0 _03E4: - .short 34, 1 - .short 12, 1 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_00C + MoveAction_00E 2 + EndMovement .byte 13 .byte 0 @@ -418,46 +418,46 @@ _03E4: .balign 4, 0 _040C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0414: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _041C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0424: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _042C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0434: - .short 63, 2 - .short 33, 1 - .short 63, 1 - .short 61, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_021 + MoveAction_03F + MoveAction_03D + MoveAction_00E + EndMovement .balign 4, 0 _044C: - .short 63, 2 - .short 32, 1 - .short 63, 1 - .short 61, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + MoveAction_03F + MoveAction_03D + MoveAction_00E + EndMovement _0464: ScrCmd_002 diff --git a/res/field/scripts/script_0331.s b/res/field/scripts/script_0331.s index cc91a9e317..40939c7ca2 100644 --- a/res/field/scripts/script_0331.s +++ b/res/field/scripts/script_0331.s @@ -75,13 +75,13 @@ _00D0: .balign 4, 0 _00F0: - .short 14, 1 - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 3 + EndMovement .balign 4, 0 _00FC: - .short 13, 2 - .short 14, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E + MoveAction_00D + EndMovement diff --git a/res/field/scripts/script_0333.s b/res/field/scripts/script_0333.s index 22ece4580d..65f15dbe12 100644 --- a/res/field/scripts/script_0333.s +++ b/res/field/scripts/script_0333.s @@ -31,18 +31,18 @@ _002E: .balign 4, 0 _0054: - .short 12, 1 - .short 66, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_042 + MoveAction_002 + EndMovement .balign 4, 0 _0064: - .short 63, 1 - .short 2, 1 - .short 65, 1 - .short 73, 1 - .short 14, 10 - .short 74, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_002 + MoveAction_041 + MoveAction_049 + MoveAction_00E 10 + MoveAction_04A + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0339.s b/res/field/scripts/script_0339.s index f329f4015e..9b1cf9cd6a 100644 --- a/res/field/scripts/script_0339.s +++ b/res/field/scripts/script_0339.s @@ -30,11 +30,11 @@ _002E: .balign 4, 0 _004C: - .short 65, 1 - .short 1, 1 - .short 65, 1 - .short 73, 1 - .short 13, 2 - .short 74, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_001 + MoveAction_041 + MoveAction_049 + MoveAction_00D 2 + MoveAction_04A + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0341.s b/res/field/scripts/script_0341.s index 9c3d77f05f..632d2946e9 100644 --- a/res/field/scripts/script_0341.s +++ b/res/field/scripts/script_0341.s @@ -147,13 +147,13 @@ _015E: .balign 4, 0 _0164: - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_012 + EndMovement .balign 4, 0 _016C: - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + EndMovement _0174: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0343.s b/res/field/scripts/script_0343.s index ae9a7973d2..6dfc8d474b 100644 --- a/res/field/scripts/script_0343.s +++ b/res/field/scripts/script_0343.s @@ -62,13 +62,13 @@ _00A0: .balign 4, 0 _00A8: - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_012 + EndMovement .balign 4, 0 _00B0: - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + EndMovement _00B8: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0344.s b/res/field/scripts/script_0344.s index 7120c64fa3..e081d2bc0e 100644 --- a/res/field/scripts/script_0344.s +++ b/res/field/scripts/script_0344.s @@ -70,38 +70,38 @@ _00E1: .balign 4, 0 _00E8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _00F0: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _00F8: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0100: - .short 13, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0110: - .short 12, 1 - .short 15, 4 - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + MoveAction_00C 3 + MoveAction_021 + EndMovement .balign 4, 0 _0124: - .short 15, 7 - .short 0xFE, 0x00 + MoveAction_00F 7 + EndMovement _012C: ScrCmd_049 0x5DC @@ -148,13 +148,13 @@ _01AB: .balign 4, 0 _01B4: - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_012 + EndMovement .balign 4, 0 _01BC: - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + EndMovement _01C4: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0346.s b/res/field/scripts/script_0346.s index 34da453a0a..20f80ac645 100644 --- a/res/field/scripts/script_0346.s +++ b/res/field/scripts/script_0346.s @@ -72,10 +72,10 @@ _00B3: .balign 4, 0 _00BC: - .short 18, 1 - .short 0xFE, 0x00 + MoveAction_012 + EndMovement .balign 4, 0 _00C4: - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + EndMovement diff --git a/res/field/scripts/script_0347.s b/res/field/scripts/script_0347.s index e00459ffcd..1a52e5c583 100644 --- a/res/field/scripts/script_0347.s +++ b/res/field/scripts/script_0347.s @@ -100,21 +100,21 @@ _011F: .balign 4, 0 _0128: - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _0134: - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_020 + EndMovement .balign 4, 0 _0140: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement _014C: ScrCmd_049 0x5DC @@ -284,40 +284,40 @@ _0347: .balign 4, 0 _0354: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0360: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _036C: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0374: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _037C: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0384: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _038C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0394: ScrCmd_060 @@ -332,13 +332,13 @@ _0394: .balign 4, 0 _03B4: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _03BC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _03C4: ScrCmd_049 0x5DC @@ -404,15 +404,15 @@ _0450: .balign 4, 0 _0460: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0468: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0470: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0349.s b/res/field/scripts/script_0349.s index a4e2dd71b3..bae6d07bbd 100644 --- a/res/field/scripts/script_0349.s +++ b/res/field/scripts/script_0349.s @@ -116,75 +116,75 @@ _01C1: .balign 4, 0 _01D8: - .short 13, 3 - .short 14, 4 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_00E 4 + MoveAction_00D + EndMovement .balign 4, 0 _01E8: - .short 12, 1 - .short 15, 4 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + MoveAction_00C 3 + EndMovement .balign 4, 0 _01F8: - .short 14, 6 - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00E 6 + MoveAction_00C 6 + EndMovement .balign 4, 0 _0204: - .short 13, 6 - .short 15, 6 - .short 0xFE, 0x00 + MoveAction_00D 6 + MoveAction_00F 6 + EndMovement .balign 4, 0 _0210: - .short 13, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E + EndMovement .balign 4, 0 _021C: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0224: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _022C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0234: - .short 39, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_027 + MoveAction_04B + EndMovement .balign 4, 0 _0240: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0248: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0250: - .short 18, 1 - .short 36, 1 - .short 63, 1 - .short 37, 1 - .short 62, 1 - .short 38, 1 - .short 63, 1 - .short 18, 9 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_024 + MoveAction_03F + MoveAction_025 + MoveAction_03E + MoveAction_026 + MoveAction_03F + MoveAction_012 9 + EndMovement diff --git a/res/field/scripts/script_0351.s b/res/field/scripts/script_0351.s index 15e61f4ae8..92669d1b9a 100644 --- a/res/field/scripts/script_0351.s +++ b/res/field/scripts/script_0351.s @@ -119,14 +119,14 @@ _01A1: .balign 4, 0 _01B4: - .short 63, 1 - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_00C 9 + EndMovement .balign 4, 0 _01C0: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .byte 35 .byte 0 @@ -155,16 +155,16 @@ _01C0: .balign 4, 0 _01E0: - .short 13, 5 - .short 14, 1 - .short 13, 4 - .short 0xFE, 0x00 + MoveAction_00D 5 + MoveAction_00E + MoveAction_00D 4 + EndMovement .balign 4, 0 _01F0: - .short 13, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_045 + EndMovement .byte 63 .byte 0 @@ -325,53 +325,53 @@ _01F0: .balign 4, 0 _0298: - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_010 + EndMovement .balign 4, 0 _02A0: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _02AC: - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _02B8: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _02C0: - .short 75, 1 - .short 16, 3 - .short 63, 3 - .short 38, 1 - .short 63, 1 - .short 36, 1 - .short 63, 2 - .short 17, 3 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_010 3 + MoveAction_03F 3 + MoveAction_026 + MoveAction_03F + MoveAction_024 + MoveAction_03F 2 + MoveAction_011 3 + MoveAction_026 + EndMovement .balign 4, 0 _02E8: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _02F0: - .short 38, 4 - .short 0xFE, 0x00 + MoveAction_026 4 + EndMovement .balign 4, 0 _02F8: - .short 17, 2 - .short 0xFE, 0x00 + MoveAction_011 2 + EndMovement .byte 35 .byte 0 @@ -480,36 +480,36 @@ _02F8: .balign 4, 0 _0368: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0370: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0378: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0380: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0388: - .short 63, 4 - .short 32, 1 - .short 63, 9 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_020 + MoveAction_03F 9 + MoveAction_023 + EndMovement .balign 4, 0 _039C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 33 .byte 0 diff --git a/res/field/scripts/script_0352.s b/res/field/scripts/script_0352.s index 5bd59133c3..1d73db1ef4 100644 --- a/res/field/scripts/script_0352.s +++ b/res/field/scripts/script_0352.s @@ -158,8 +158,8 @@ _01C0: .balign 4, 0 _01C8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement _01D0: ScrCmd_060 @@ -192,10 +192,10 @@ _0211: .balign 4, 0 _0220: - .short 33, 1 - .short 75, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + MoveAction_00D + EndMovement _0230: ScrCmd_049 0x5DC @@ -266,18 +266,18 @@ _02DB: .balign 4, 0 _02F4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _02FC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0304: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _030C: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0353.s b/res/field/scripts/script_0353.s index 1b7bbc3c67..e17ff77044 100644 --- a/res/field/scripts/script_0353.s +++ b/res/field/scripts/script_0353.s @@ -114,22 +114,22 @@ _0184: .balign 4, 0 _0190: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement .balign 4, 0 _0198: - .short 33, 1 - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _01A8: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .balign 4, 0 _01B0: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement diff --git a/res/field/scripts/script_0357.s b/res/field/scripts/script_0357.s index a6de5e48cb..3008f54207 100644 --- a/res/field/scripts/script_0357.s +++ b/res/field/scripts/script_0357.s @@ -101,8 +101,8 @@ _00D3: .balign 4, 0 _013C: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement _0144: ScrCmd_0EB diff --git a/res/field/scripts/script_0360.s b/res/field/scripts/script_0360.s index ad008873c3..4f322b3b65 100644 --- a/res/field/scripts/script_0360.s +++ b/res/field/scripts/script_0360.s @@ -110,85 +110,85 @@ _018C: .balign 4, 0 _0198: - .short 12, 5 - .short 15, 2 - .short 0xFE, 0x00 + MoveAction_00C 5 + MoveAction_00F 2 + EndMovement .balign 4, 0 _01A4: - .short 12, 5 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00C 5 + MoveAction_00F + EndMovement .balign 4, 0 _01B0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _01B8: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _01C4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01CC: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _01D4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01DC: - .short 13, 2 - .short 14, 2 - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E 2 + MoveAction_00D 3 + EndMovement .balign 4, 0 _01EC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _01F4: - .short 14, 2 - .short 13, 6 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00D 6 + MoveAction_022 + EndMovement .balign 4, 0 _0204: - .short 14, 2 - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00D 5 + EndMovement .balign 4, 0 _0210: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0218: - .short 14, 1 - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _0228: - .short 12, 5 - .short 0xFE, 0x00 + MoveAction_00C 5 + EndMovement .balign 4, 0 _0230: - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00D 5 + EndMovement diff --git a/res/field/scripts/script_0362.s b/res/field/scripts/script_0362.s index ee2c527821..b532df7001 100644 --- a/res/field/scripts/script_0362.s +++ b/res/field/scripts/script_0362.s @@ -87,31 +87,31 @@ _00F6: .balign 4, 0 _0110: - .short 14, 1 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_040 + EndMovement .balign 4, 0 _011C: - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_045 + EndMovement .balign 4, 0 _0124: - .short 13, 1 - .short 14, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 2 + MoveAction_040 + EndMovement .balign 4, 0 _0134: - .short 14, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_040 + EndMovement .balign 4, 0 _0140: - .short 12, 1 - .short 14, 2 - .short 64, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 2 + MoveAction_040 + EndMovement diff --git a/res/field/scripts/script_0364.s b/res/field/scripts/script_0364.s index d34d1481a9..afbb11a48f 100644 --- a/res/field/scripts/script_0364.s +++ b/res/field/scripts/script_0364.s @@ -168,60 +168,60 @@ _027C: .balign 4, 0 _0290: - .short 62, 7 - .short 37, 1 - .short 71, 1 - .short 16, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_03E 7 + MoveAction_025 + MoveAction_047 + MoveAction_010 + MoveAction_048 + EndMovement .balign 4, 0 _02A8: - .short 63, 1 - .short 35, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_020 + EndMovement .balign 4, 0 _02B8: - .short 63, 1 - .short 34, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_020 + EndMovement .balign 4, 0 _02C8: - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_010 8 + EndMovement .balign 4, 0 _02D0: - .short 34, 1 - .short 35, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_023 + MoveAction_021 + EndMovement .balign 4, 0 _02E0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _02E8: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _02F0: - .short 19, 1 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_010 8 + EndMovement .balign 4, 0 _02FC: - .short 18, 1 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_010 8 + EndMovement _0308: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0367.s b/res/field/scripts/script_0367.s index 2f9dd92ec5..3646c6ff65 100644 --- a/res/field/scripts/script_0367.s +++ b/res/field/scripts/script_0367.s @@ -1207,32 +1207,32 @@ _1205: .balign 4, 0 _1248: - .short 62, 1 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_00C 2 + EndMovement .balign 4, 0 _1254: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _1260: - .short 62, 1 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_00C 2 + EndMovement .balign 4, 0 _126C: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _1278: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement _1280: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0368.s b/res/field/scripts/script_0368.s index c9fc100888..a903d51e36 100644 --- a/res/field/scripts/script_0368.s +++ b/res/field/scripts/script_0368.s @@ -138,27 +138,27 @@ _0194: .balign 4, 0 _01BC: - .short 12, 2 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_001 + EndMovement .balign 4, 0 _01C8: - .short 13, 1 - .short 2, 1 - .short 14, 1 - .short 1, 1 - .short 13, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_002 + MoveAction_00E + MoveAction_001 + MoveAction_00D + MoveAction_045 + EndMovement .balign 4, 0 _01E4: - .short 63, 2 - .short 61, 1 - .short 13, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03D + MoveAction_00D 2 + MoveAction_045 + EndMovement _01F8: ScrCmd_1F8 diff --git a/res/field/scripts/script_0369.s b/res/field/scripts/script_0369.s index b428939020..1d1d4d25b0 100644 --- a/res/field/scripts/script_0369.s +++ b/res/field/scripts/script_0369.s @@ -110,14 +110,14 @@ _0124: .balign 4, 0 _0140: - .short 13, 3 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_000 + EndMovement .balign 4, 0 _014C: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .byte 0 .byte 0 @@ -158,60 +158,60 @@ _014C: .balign 4, 0 _0178: - .short 15, 4 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0188: - .short 13, 1 - .short 15, 4 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 4 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _019C: - .short 15, 8 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 8 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01AC: - .short 13, 1 - .short 15, 8 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 8 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01C0: - .short 15, 12 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 12 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01D0: - .short 13, 1 - .short 15, 12 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 12 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01E4: - .short 15, 16 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 16 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01F4: - .short 13, 1 - .short 15, 16 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 16 + MoveAction_00C 2 + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0370.s b/res/field/scripts/script_0370.s index 9402d34106..d4ba3ee377 100644 --- a/res/field/scripts/script_0370.s +++ b/res/field/scripts/script_0370.s @@ -93,57 +93,57 @@ _014F: .balign 4, 0 _0174: - .short 13, 3 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_000 + EndMovement .balign 4, 0 _0180: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0188: - .short 13, 1 - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 5 + EndMovement .balign 4, 0 _0194: - .short 13, 1 - .short 14, 5 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + EndMovement .balign 4, 0 _01A0: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _01AC: - .short 15, 5 - .short 12, 1 - .short 63, 1 - .short 3, 1 - .short 62, 1 - .short 0, 1 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_00F 5 + MoveAction_00C + MoveAction_03F + MoveAction_003 + MoveAction_03E + MoveAction_000 + MoveAction_03E + EndMovement .balign 4, 0 _01CC: - .short 14, 5 - .short 12, 1 - .short 63, 1 - .short 2, 1 - .short 62, 1 - .short 0, 1 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_00C + MoveAction_03F + MoveAction_002 + MoveAction_03E + MoveAction_000 + MoveAction_03E + EndMovement .balign 4, 0 _01EC: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement diff --git a/res/field/scripts/script_0371.s b/res/field/scripts/script_0371.s index 78f5b8a3c4..3967a228b0 100644 --- a/res/field/scripts/script_0371.s +++ b/res/field/scripts/script_0371.s @@ -350,81 +350,81 @@ _04CE: .balign 4, 0 _0504: - .short 62, 1 - .short 12, 1 - .short 2, 1 - .short 14, 3 - .short 0, 1 - .short 12, 3 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_00C + MoveAction_002 + MoveAction_00E 3 + MoveAction_000 + MoveAction_00C 3 + MoveAction_003 + EndMovement .balign 4, 0 _0524: - .short 13, 1 - .short 3, 1 - .short 15, 3 - .short 1, 1 - .short 13, 3 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_003 + MoveAction_00F 3 + MoveAction_001 + MoveAction_00D 3 + MoveAction_002 + EndMovement .balign 4, 0 _0540: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _0548: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0550: - .short 3, 1 - .short 15, 1 - .short 0, 1 - .short 12, 3 - .short 2, 1 - .short 14, 3 - .short 0, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_00F + MoveAction_000 + MoveAction_00C 3 + MoveAction_002 + MoveAction_00E 3 + MoveAction_000 + MoveAction_00C + EndMovement .balign 4, 0 _0574: - .short 14, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_002 + EndMovement .balign 4, 0 _0580: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _0588: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _0590: - .short 2, 1 - .short 14, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_00E + MoveAction_003 + EndMovement .balign 4, 0 _05A0: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _05A8: - .short 9, 1 - .short 3, 1 - .short 11, 3 - .short 1, 1 - .short 9, 3 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_009 + MoveAction_003 + MoveAction_00B 3 + MoveAction_001 + MoveAction_009 3 + MoveAction_002 + EndMovement diff --git a/res/field/scripts/script_0372.s b/res/field/scripts/script_0372.s index 38b883d41b..a7d3e57886 100644 --- a/res/field/scripts/script_0372.s +++ b/res/field/scripts/script_0372.s @@ -360,89 +360,89 @@ _0589: .balign 4, 0 _05B0: - .short 12, 1 - .short 14, 3 - .short 12, 3 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 3 + MoveAction_00C 3 + MoveAction_003 + EndMovement .balign 4, 0 _05C4: - .short 12, 1 - .short 14, 4 - .short 12, 2 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E 4 + MoveAction_00C 2 + MoveAction_003 + EndMovement .balign 4, 0 _05D8: - .short 13, 1 - .short 15, 3 - .short 13, 3 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 3 + MoveAction_00D 3 + MoveAction_002 + EndMovement .balign 4, 0 _05EC: - .short 13, 1 - .short 15, 4 - .short 13, 2 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 4 + MoveAction_00D 2 + MoveAction_002 + EndMovement .balign 4, 0 _0600: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _0608: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0610: - .short 30, 1 - .short 0xFE, 0x00 + MoveAction_01E + EndMovement .balign 4, 0 _0618: - .short 12, 3 - .short 14, 2 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00E 2 + MoveAction_00C + EndMovement .balign 4, 0 _0628: - .short 12, 2 - .short 14, 3 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00E 3 + MoveAction_00C + EndMovement .balign 4, 0 _0638: - .short 14, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_002 + EndMovement .balign 4, 0 _0644: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _064C: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _0654: - .short 2, 1 - .short 14, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_00E + MoveAction_003 + EndMovement .balign 4, 0 _0664: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement diff --git a/res/field/scripts/script_0373.s b/res/field/scripts/script_0373.s index 7fc51038cf..33cbddeab1 100644 --- a/res/field/scripts/script_0373.s +++ b/res/field/scripts/script_0373.s @@ -478,132 +478,132 @@ _06A3: .balign 4, 0 _06B8: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _06C0: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _06C8: - .short 13, 2 - .short 14, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E + MoveAction_003 + EndMovement .balign 4, 0 _06D8: - .short 15, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_001 + EndMovement .balign 4, 0 _06E4: - .short 1, 1 - .short 18, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_012 + MoveAction_003 + EndMovement .balign 4, 0 _06F4: - .short 19, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_001 + EndMovement .balign 4, 0 _0700: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _070C: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _0718: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _0720: - .short 16, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_010 2 + MoveAction_045 + EndMovement .balign 4, 0 _072C: - .short 17, 1 - .short 18, 3 - .short 16, 7 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 3 + MoveAction_010 7 + MoveAction_012 2 + EndMovement .balign 4, 0 _0740: - .short 18, 1 - .short 16, 1 - .short 18, 2 - .short 16, 5 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_010 + MoveAction_012 2 + MoveAction_010 5 + MoveAction_012 2 + EndMovement .balign 4, 0 _0758: - .short 19, 1 - .short 16, 2 - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_010 2 + MoveAction_013 3 + EndMovement .balign 4, 0 _0768: - .short 16, 2 - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_010 2 + MoveAction_013 4 + EndMovement .balign 4, 0 _0774: - .short 18, 1 - .short 16, 4 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_010 4 + MoveAction_012 2 + EndMovement .balign 4, 0 _0784: - .short 16, 4 - .short 18, 3 - .short 0xFE, 0x00 + MoveAction_010 4 + MoveAction_012 3 + EndMovement .balign 4, 0 _0790: - .short 17, 1 - .short 19, 4 - .short 16, 7 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 4 + MoveAction_010 7 + MoveAction_013 2 + EndMovement .balign 4, 0 _07A4: - .short 16, 1 - .short 19, 4 - .short 16, 5 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 4 + MoveAction_010 5 + MoveAction_013 2 + EndMovement .balign 4, 0 _07B8: - .short 18, 1 - .short 16, 5 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_010 5 + MoveAction_013 2 + EndMovement .balign 4, 0 _07C8: - .short 19, 3 - .short 16, 5 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_013 3 + MoveAction_010 5 + MoveAction_012 2 + EndMovement diff --git a/res/field/scripts/script_0374.s b/res/field/scripts/script_0374.s index 8404fbd8cc..6b4307dc46 100644 --- a/res/field/scripts/script_0374.s +++ b/res/field/scripts/script_0374.s @@ -382,8 +382,8 @@ _0360: .balign 4, 0 _0398: - .short 18, 5 - .short 0xFE, 0x00 + MoveAction_012 5 + EndMovement _03A0: ScrCmd_060 @@ -399,8 +399,8 @@ _03A0: .balign 4, 0 _03D8: - .short 18, 6 - .short 0xFE, 0x00 + MoveAction_012 6 + EndMovement _03E0: ScrCmd_060 @@ -416,8 +416,8 @@ _03E0: .balign 4, 0 _0418: - .short 19, 5 - .short 0xFE, 0x00 + MoveAction_013 5 + EndMovement _0420: ScrCmd_060 @@ -433,8 +433,8 @@ _0420: .balign 4, 0 _0458: - .short 19, 6 - .short 0xFE, 0x00 + MoveAction_013 6 + EndMovement _0460: ScrCmd_002 diff --git a/res/field/scripts/script_0375.s b/res/field/scripts/script_0375.s index 7bd2aa71d1..95a178f6b4 100644 --- a/res/field/scripts/script_0375.s +++ b/res/field/scripts/script_0375.s @@ -274,24 +274,24 @@ _02F5: .balign 4, 0 _0334: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _033C: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _0344: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _034C: - .short 12, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_022 + EndMovement _0358: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0376.s b/res/field/scripts/script_0376.s index 196f87843b..6fc40ce7a3 100644 --- a/res/field/scripts/script_0376.s +++ b/res/field/scripts/script_0376.s @@ -336,69 +336,69 @@ _04B2: .balign 4, 0 _04C8: - .short 12, 3 - .short 15, 1 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00F + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _04DC: - .short 12, 3 - .short 14, 1 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00E + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _04F0: - .short 12, 2 - .short 15, 1 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _0504: - .short 12, 2 - .short 14, 1 - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00E + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _0518: - .short 21, 3 - .short 22, 1 - .short 21, 4 - .short 0, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 3 + MoveAction_016 + MoveAction_015 4 + MoveAction_000 + MoveAction_046 + EndMovement .balign 4, 0 _0530: - .short 21, 3 - .short 23, 1 - .short 21, 4 - .short 0, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 3 + MoveAction_017 + MoveAction_015 4 + MoveAction_000 + MoveAction_046 + EndMovement .balign 4, 0 _0548: - .short 21, 2 - .short 22, 1 - .short 21, 4 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 2 + MoveAction_016 + MoveAction_015 4 + MoveAction_046 + EndMovement .balign 4, 0 _055C: - .short 21, 2 - .short 23, 1 - .short 21, 4 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 2 + MoveAction_017 + MoveAction_015 4 + MoveAction_046 + EndMovement _0570: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0377.s b/res/field/scripts/script_0377.s index c996f76b69..b0fd7b8a10 100644 --- a/res/field/scripts/script_0377.s +++ b/res/field/scripts/script_0377.s @@ -533,67 +533,67 @@ _07C8: .balign 4, 0 _07D4: - .short 14, 4 - .short 13, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D 3 + MoveAction_045 + EndMovement .balign 4, 0 _07E4: - .short 14, 2 - .short 12, 1 - .short 14, 2 - .short 13, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00C + MoveAction_00E 2 + MoveAction_00D 3 + MoveAction_045 + EndMovement .balign 4, 0 _07FC: - .short 14, 3 - .short 13, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 3 + MoveAction_045 + EndMovement .balign 4, 0 _080C: - .short 14, 1 - .short 12, 1 - .short 14, 2 - .short 13, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C + MoveAction_00E 2 + MoveAction_00D 3 + MoveAction_045 + EndMovement .balign 4, 0 _0824: - .short 23, 4 - .short 20, 3 - .short 2, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_017 4 + MoveAction_014 3 + MoveAction_002 + MoveAction_046 + EndMovement .balign 4, 0 _0838: - .short 23, 2 - .short 21, 1 - .short 23, 2 - .short 20, 3 - .short 2, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_017 2 + MoveAction_015 + MoveAction_017 2 + MoveAction_014 3 + MoveAction_002 + MoveAction_046 + EndMovement .balign 4, 0 _0854: - .short 20, 3 - .short 23, 3 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_014 3 + MoveAction_017 3 + MoveAction_046 + EndMovement .balign 4, 0 _0864: - .short 20, 2 - .short 23, 3 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_014 2 + MoveAction_017 3 + MoveAction_046 + EndMovement _0874: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0378.s b/res/field/scripts/script_0378.s index 95de4961d7..ca645bbf5c 100644 --- a/res/field/scripts/script_0378.s +++ b/res/field/scripts/script_0378.s @@ -394,59 +394,59 @@ _05D5: .balign 4, 0 _05E4: - .short 14, 6 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 6 + MoveAction_045 + EndMovement .balign 4, 0 _05F0: - .short 14, 3 - .short 12, 1 - .short 14, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00C + MoveAction_00E 3 + MoveAction_045 + EndMovement .balign 4, 0 _0604: - .short 14, 5 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_045 + EndMovement .balign 4, 0 _0610: - .short 14, 2 - .short 12, 1 - .short 14, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00C + MoveAction_00E 3 + MoveAction_045 + EndMovement .balign 4, 0 _0624: - .short 23, 6 - .short 70, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_017 6 + MoveAction_046 + MoveAction_002 + EndMovement .balign 4, 0 _0634: - .short 23, 6 - .short 21, 1 - .short 70, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_017 6 + MoveAction_015 + MoveAction_046 + MoveAction_002 + EndMovement .balign 4, 0 _0648: - .short 23, 5 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_017 5 + MoveAction_046 + EndMovement .balign 4, 0 _0654: - .short 21, 1 - .short 23, 5 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 + MoveAction_017 5 + MoveAction_046 + EndMovement _0664: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0379.s b/res/field/scripts/script_0379.s index cfb4534ccd..021c618e14 100644 --- a/res/field/scripts/script_0379.s +++ b/res/field/scripts/script_0379.s @@ -397,61 +397,61 @@ _05E1: .balign 4, 0 _05F0: - .short 12, 2 - .short 15, 1 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0604: - .short 12, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_045 + EndMovement .balign 4, 0 _0610: - .short 12, 1 - .short 15, 1 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0624: - .short 12, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_045 + EndMovement .balign 4, 0 _0630: - .short 21, 2 - .short 22, 1 - .short 21, 2 - .short 0, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 2 + MoveAction_016 + MoveAction_015 2 + MoveAction_000 + MoveAction_046 + EndMovement .balign 4, 0 _0648: - .short 21, 4 - .short 0, 1 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 4 + MoveAction_000 + MoveAction_046 + EndMovement .balign 4, 0 _0658: - .short 21, 1 - .short 22, 1 - .short 21, 2 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 + MoveAction_016 + MoveAction_015 2 + MoveAction_046 + EndMovement .balign 4, 0 _066C: - .short 21, 3 - .short 70, 1 - .short 0xFE, 0x00 + MoveAction_015 3 + MoveAction_046 + EndMovement _0678: ScrCmd_02C 0 diff --git a/res/field/scripts/script_0380.s b/res/field/scripts/script_0380.s index 7305c8b70a..079b0f26b2 100644 --- a/res/field/scripts/script_0380.s +++ b/res/field/scripts/script_0380.s @@ -100,77 +100,77 @@ _012A: .balign 4, 0 _0140: - .short 14, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_03F + EndMovement .balign 4, 0 _014C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0154: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0160: - .short 62, 1 - .short 2, 1 - .short 75, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_002 + MoveAction_04B + MoveAction_003 + EndMovement .balign 4, 0 _0174: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _017C: - .short 33, 1 - .short 65, 2 - .short 35, 1 - .short 63, 1 - .short 32, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_041 2 + MoveAction_023 + MoveAction_03F + MoveAction_020 + MoveAction_03F + EndMovement .balign 4, 0 _0198: - .short 33, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F + EndMovement .balign 4, 0 _01A4: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _01AC: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _01B4: - .short 2, 1 - .short 75, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_04B + MoveAction_003 + EndMovement .balign 4, 0 _01C4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01CC: - .short 14, 3 - .short 13, 3 - .short 14, 2 - .short 13, 1 - .short 14, 6 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 3 + MoveAction_00E 2 + MoveAction_00D + MoveAction_00E 6 + EndMovement diff --git a/res/field/scripts/script_0381.s b/res/field/scripts/script_0381.s index 6285534e6a..a75a39c84e 100644 --- a/res/field/scripts/script_0381.s +++ b/res/field/scripts/script_0381.s @@ -42,48 +42,48 @@ _004B: .balign 4, 0 _0078: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0080: - .short 65, 1 - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0090: - .short 2, 1 - .short 60, 8 - .short 66, 1 - .short 65, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_03C 8 + MoveAction_042 + MoveAction_041 + MoveAction_020 + EndMovement .balign 4, 0 _00A8: - .short 65, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_041 3 + MoveAction_021 + EndMovement .balign 4, 0 _00B4: - .short 14, 1 - .short 13, 2 - .short 34, 1 - .short 65, 1 - .short 119, 2 - .short 118, 1 - .short 119, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + MoveAction_022 + MoveAction_041 + MoveAction_077 2 + MoveAction_076 + MoveAction_077 + MoveAction_041 + EndMovement .balign 4, 0 _00D8: - .short 65, 3 - .short 8, 1 - .short 12, 1 - .short 16, 1 - .short 20, 8 - .short 0xFE, 0x00 + MoveAction_041 3 + MoveAction_008 + MoveAction_00C + MoveAction_010 + MoveAction_014 8 + EndMovement diff --git a/res/field/scripts/script_0382.s b/res/field/scripts/script_0382.s index e1c0aa7c12..ff1fd5938f 100644 --- a/res/field/scripts/script_0382.s +++ b/res/field/scripts/script_0382.s @@ -67,43 +67,43 @@ _00D0: .balign 4, 0 _00DC: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _00E4: - .short 106, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_06A + MoveAction_002 + EndMovement .balign 4, 0 _00F0: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _00F8: - .short 106, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_06A + MoveAction_002 + EndMovement .balign 4, 0 _0104: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _010C: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _0114: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _011C: - .short 107, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_06B + MoveAction_000 + EndMovement diff --git a/res/field/scripts/script_0383.s b/res/field/scripts/script_0383.s index 9a588b38d2..1427ba3e87 100644 --- a/res/field/scripts/script_0383.s +++ b/res/field/scripts/script_0383.s @@ -37,10 +37,10 @@ _003E: .balign 4, 0 _0060: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement .balign 4, 0 _0068: - .short 13, 7 - .short 0xFE, 0x00 + MoveAction_00D 7 + EndMovement diff --git a/res/field/scripts/script_0387.s b/res/field/scripts/script_0387.s index 249c321b8a..bcb391236f 100644 --- a/res/field/scripts/script_0387.s +++ b/res/field/scripts/script_0387.s @@ -102,21 +102,21 @@ _00F6: .balign 4, 0 _0108: - .short 66, 1 - .short 33, 1 - .short 75, 1 - .short 66, 1 - .short 0xFE, 0x00 + MoveAction_042 + MoveAction_021 + MoveAction_04B + MoveAction_042 + EndMovement .balign 4, 0 _011C: - .short 13, 1 - .short 118, 1 - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_076 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _0130: - .short 67, 1 - .short 0xFE, 0x00 + MoveAction_043 + EndMovement diff --git a/res/field/scripts/script_0388.s b/res/field/scripts/script_0388.s index 50cd365c37..9fd2009a78 100644 --- a/res/field/scripts/script_0388.s +++ b/res/field/scripts/script_0388.s @@ -149,132 +149,132 @@ _01F8: .balign 4, 0 _0204: - .short 65, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_041 2 + MoveAction_020 + EndMovement .balign 4, 0 _0210: - .short 15, 1 - .short 34, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + MoveAction_021 + EndMovement .balign 4, 0 _0220: - .short 14, 1 - .short 12, 7 - .short 15, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 7 + MoveAction_00F 4 + MoveAction_021 + EndMovement .balign 4, 0 _0234: - .short 14, 1 - .short 12, 6 - .short 15, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 6 + MoveAction_00F 4 + MoveAction_021 + EndMovement .balign 4, 0 _0248: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0254: - .short 66, 2 - .short 65, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_042 2 + MoveAction_041 + MoveAction_020 + EndMovement .balign 4, 0 _0264: - .short 66, 2 - .short 65, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_042 2 + MoveAction_041 + MoveAction_022 + EndMovement .balign 4, 0 _0274: - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _0280: - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _028C: - .short 65, 2 - .short 32, 1 - .short 65, 2 - .short 0xFE, 0x00 + MoveAction_041 2 + MoveAction_020 + MoveAction_041 2 + EndMovement .balign 4, 0 _029C: - .short 15, 1 - .short 117, 1 - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_075 + MoveAction_00C 7 + EndMovement .balign 4, 0 _02AC: - .short 63, 3 - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _02BC: - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _02C8: - .short 12, 6 - .short 15, 4 - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F 4 + MoveAction_00D + MoveAction_020 + EndMovement .balign 4, 0 _02DC: - .short 65, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_021 + EndMovement .balign 4, 0 _02E8: - .short 66, 2 - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_042 2 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _02F8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0300: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0308: - .short 13, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_022 + EndMovement .balign 4, 0 _0314: - .short 13, 7 - .short 118, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_00D 7 + MoveAction_076 + MoveAction_041 + EndMovement diff --git a/res/field/scripts/script_0389.s b/res/field/scripts/script_0389.s index 9673753cf7..425aaf53aa 100644 --- a/res/field/scripts/script_0389.s +++ b/res/field/scripts/script_0389.s @@ -177,43 +177,43 @@ _0232: .balign 4, 0 _0244: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0250: - .short 117, 2 - .short 0xFE, 0x00 + MoveAction_075 2 + EndMovement .balign 4, 0 _0258: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0264: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _026C: - .short 117, 1 - .short 0xFE, 0x00 + MoveAction_075 + EndMovement .balign 4, 0 _0274: - .short 118, 1 - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_076 + MoveAction_00D 5 + EndMovement .balign 4, 0 _0280: - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00D 5 + EndMovement .balign 4, 0 _0288: - .short 12, 5 - .short 0xFE, 0x00 + MoveAction_00C 5 + EndMovement diff --git a/res/field/scripts/script_0410.s b/res/field/scripts/script_0410.s index 3c80801e5b..85da0e69d7 100644 --- a/res/field/scripts/script_0410.s +++ b/res/field/scripts/script_0410.s @@ -83,103 +83,103 @@ _00D9: .balign 4, 0 _0148: - .short 12, 7 - .short 14, 11 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_00E 11 + EndMovement .balign 4, 0 _0154: - .short 12, 7 - .short 14, 9 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_00E 9 + EndMovement .balign 4, 0 _0160: - .short 12, 7 - .short 14, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_00E 7 + EndMovement .balign 4, 0 _016C: - .short 12, 7 - .short 14, 5 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_00E 5 + EndMovement .balign 4, 0 _0178: - .short 12, 7 - .short 14, 3 - .short 0xFE, 0x00 + MoveAction_00C 7 + MoveAction_00E 3 + EndMovement .balign 4, 0 _0184: - .short 12, 1 - .short 2, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 3, 1 - .short 61, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_002 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_003 + MoveAction_03D + MoveAction_000 + MoveAction_03D + MoveAction_002 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_003 + MoveAction_03D + MoveAction_000 + MoveAction_03D + MoveAction_002 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_003 + MoveAction_03D + MoveAction_000 + EndMovement .balign 4, 0 _01E8: - .short 67, 1 - .short 0xFE, 0x00 + MoveAction_043 + EndMovement .balign 4, 0 _01F0: - .short 12, 6 - .short 14, 12 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 12 + MoveAction_023 + EndMovement .balign 4, 0 _0200: - .short 12, 6 - .short 14, 10 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 10 + MoveAction_023 + EndMovement .balign 4, 0 _0210: - .short 12, 6 - .short 14, 8 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 8 + MoveAction_023 + EndMovement .balign 4, 0 _0220: - .short 12, 6 - .short 14, 6 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 6 + MoveAction_023 + EndMovement .balign 4, 0 _0230: - .short 12, 6 - .short 14, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00E 4 + MoveAction_023 + EndMovement .balign 4, 0 _0240: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement diff --git a/res/field/scripts/script_0414.s b/res/field/scripts/script_0414.s index 850079ca67..e35a4f79c5 100644 --- a/res/field/scripts/script_0414.s +++ b/res/field/scripts/script_0414.s @@ -74,25 +74,25 @@ _00F0: .balign 4, 0 _0124: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _012C: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0138: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _0144: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _014C: ScrCmd_037 3, 0 diff --git a/res/field/scripts/script_0416.s b/res/field/scripts/script_0416.s index 1936aba882..ef292174d3 100644 --- a/res/field/scripts/script_0416.s +++ b/res/field/scripts/script_0416.s @@ -136,56 +136,56 @@ _01D9: .balign 4, 0 _01E0: - .short 35, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_020 + EndMovement .balign 4, 0 _01EC: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _01F4: - .short 63, 1 - .short 35, 1 - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _0208: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _0214: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _021C: - .short 19, 1 - .short 16, 11 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_010 11 + EndMovement .balign 4, 0 _0228: - .short 16, 10 - .short 0xFE, 0x00 + MoveAction_010 10 + EndMovement .balign 4, 0 _0230: - .short 15, 1 - .short 8, 9 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_008 9 + EndMovement .balign 4, 0 _023C: - .short 12, 1 - .short 8, 9 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_008 9 + EndMovement _0248: ScrCmd_011 0x8000, 0 @@ -399,59 +399,59 @@ _053A: .balign 4, 0 _055C: - .short 16, 10 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_010 10 + MoveAction_026 + EndMovement .balign 4, 0 _0568: - .short 16, 10 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_010 10 + MoveAction_027 + EndMovement .balign 4, 0 _0574: - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_024 + EndMovement .balign 4, 0 _057C: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0584: - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_027 + EndMovement .balign 4, 0 _058C: - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_010 8 + EndMovement .balign 4, 0 _0594: - .short 13, 4 - .short 32, 1 - .short 63, 2 - .short 13, 4 - .short 0xFE, 0x00 + MoveAction_00D 4 + MoveAction_020 + MoveAction_03F 2 + MoveAction_00D 4 + EndMovement .balign 4, 0 _05A8: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _05B4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _05BC: - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_00C 9 + EndMovement .byte 63 .byte 0 @@ -468,21 +468,21 @@ _05BC: .balign 4, 0 _05D0: - .short 63, 4 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_023 + EndMovement .balign 4, 0 _05DC: - .short 63, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_022 + EndMovement .balign 4, 0 _05E8: - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + EndMovement .byte 63 .byte 0 @@ -499,9 +499,9 @@ _05E8: .balign 4, 0 _0600: - .short 63, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_000 + EndMovement _060C: ScrCmd_049 0x5DC @@ -558,13 +558,13 @@ _065A: .balign 4, 0 _06A8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _06B0: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _06B8: ScrCmd_036 20, 2, 0, 0x800C @@ -641,54 +641,54 @@ _0799: .balign 4, 0 _07A8: - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _07B4: - .short 15, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D + EndMovement .balign 4, 0 _07C0: - .short 15, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 2 + EndMovement .balign 4, 0 _07CC: - .short 15, 1 - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 3 + EndMovement .balign 4, 0 _07D8: - .short 12, 1 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_001 + EndMovement .balign 4, 0 _07E4: - .short 12, 2 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_001 + EndMovement .balign 4, 0 _07F0: - .short 12, 3 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_001 + EndMovement .balign 4, 0 _07FC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0804: - .short 71, 1 - .short 14, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00E + MoveAction_048 + EndMovement diff --git a/res/field/scripts/script_0417.s b/res/field/scripts/script_0417.s index 4d9281dd71..ee9ca69f5c 100644 --- a/res/field/scripts/script_0417.s +++ b/res/field/scripts/script_0417.s @@ -2684,10 +2684,10 @@ _2125: .balign 4, 0 _212C: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _2134: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement diff --git a/res/field/scripts/script_0420.s b/res/field/scripts/script_0420.s index 6af07def67..e24f97f9dc 100644 --- a/res/field/scripts/script_0420.s +++ b/res/field/scripts/script_0420.s @@ -71,17 +71,17 @@ _009A: .balign 4, 0 _00E8: - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00C 6 + EndMovement .balign 4, 0 _00F0: - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D 6 + EndMovement .balign 4, 0 _00F8: - .short 12, 3 - .short 14, 1 - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00E + MoveAction_00C 4 + EndMovement diff --git a/res/field/scripts/script_0423.s b/res/field/scripts/script_0423.s index d610dfa207..9b3691b940 100644 --- a/res/field/scripts/script_0423.s +++ b/res/field/scripts/script_0423.s @@ -63,13 +63,13 @@ _00C6: .balign 4, 0 _00D8: - .short 32, 1 - .short 63, 2 - .short 12, 4 - .short 14, 1 - .short 0, 1 - .short 63, 2 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_03F 2 + MoveAction_00C 4 + MoveAction_00E + MoveAction_000 + MoveAction_03F 2 + EndMovement _00F4: ScrCmd_049 0x5DC @@ -270,66 +270,66 @@ _035C: .balign 4, 0 _03B8: - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _03C4: - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00C 2 + EndMovement .balign 4, 0 _03CC: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _03D4: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _03E0: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _03EC: - .short 1, 1 - .short 70, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_046 + MoveAction_00D + EndMovement .balign 4, 0 _03FC: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0404: - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D 2 + EndMovement .balign 4, 0 _040C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0414: - .short 12, 1 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0424: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement _0430: ScrCmd_014 0x2338 diff --git a/res/field/scripts/script_0427.s b/res/field/scripts/script_0427.s index 8af02e8918..01b32159eb 100644 --- a/res/field/scripts/script_0427.s +++ b/res/field/scripts/script_0427.s @@ -437,77 +437,77 @@ _0656: .balign 4, 0 _0664: - .short 37, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_025 + MoveAction_04B + EndMovement .balign 4, 0 _0670: - .short 17, 1 - .short 18, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 2 + MoveAction_021 + EndMovement .balign 4, 0 _0680: - .short 17, 1 - .short 18, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 + MoveAction_021 + EndMovement .balign 4, 0 _0690: - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_011 + EndMovement .balign 4, 0 _0698: - .short 17, 1 - .short 19, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 + MoveAction_021 + EndMovement .balign 4, 0 _06A8: - .short 12, 1 - .short 15, 4 - .short 12, 2 - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + MoveAction_00C 2 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _06C0: - .short 12, 1 - .short 15, 3 - .short 12, 2 - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 3 + MoveAction_00C 2 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _06D8: - .short 12, 1 - .short 15, 2 - .short 12, 2 - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 2 + MoveAction_00C 2 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _06F0: - .short 12, 1 - .short 15, 1 - .short 12, 2 - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F + MoveAction_00C 2 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _0708: - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_021 + EndMovement .byte 15 .byte 0 @@ -520,74 +520,74 @@ _0708: .balign 4, 0 _071C: - .short 14, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_023 + EndMovement .balign 4, 0 _0728: - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_013 3 + EndMovement .balign 4, 0 _0730: - .short 75, 1 - .short 65, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_041 + MoveAction_022 + EndMovement .balign 4, 0 _0740: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0748: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0750: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0758: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0760: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _0768: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0770: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0778: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _0780: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0788: - .short 12, 1 - .short 33, 1 - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + MoveAction_03F 2 + MoveAction_023 + EndMovement .byte 63 .byte 0 @@ -604,164 +604,164 @@ _0788: .balign 4, 0 _07A8: - .short 33, 1 - .short 63, 3 - .short 37, 8 - .short 18, 1 - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 3 + MoveAction_025 8 + MoveAction_012 + MoveAction_011 + EndMovement .balign 4, 0 _07C0: - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00F 8 + EndMovement .balign 4, 0 _07C8: - .short 14, 3 - .short 0xFE, 0x00 + MoveAction_00E 3 + EndMovement .balign 4, 0 _07D0: - .short 15, 3 - .short 0xFE, 0x00 + MoveAction_00F 3 + EndMovement .balign 4, 0 _07D8: - .short 34, 1 - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_023 + EndMovement .balign 4, 0 _07E8: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _07F0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _07F8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0800: - .short 63, 2 - .short 62, 1 - .short 15, 9 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_00F 9 + EndMovement .balign 4, 0 _0810: - .short 12, 2 - .short 15, 4 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 4 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0824: - .short 12, 2 - .short 15, 3 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 3 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0838: - .short 12, 2 - .short 15, 2 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 2 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _084C: - .short 12, 2 - .short 15, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0860: - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _086C: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0878: - .short 63, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_024 + EndMovement .balign 4, 0 _0884: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _088C: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _0894: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _089C: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _08A8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _08B0: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _08BC: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _08C8: - .short 15, 7 - .short 0xFE, 0x00 + MoveAction_00F 7 + EndMovement .balign 4, 0 _08D0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _08D8: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _08E0: - .short 15, 9 - .short 0xFE, 0x00 + MoveAction_00F 9 + EndMovement _08E8: ScrCmd_060 @@ -815,45 +815,45 @@ _0986: .balign 4, 0 _0998: - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _09A4: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _09B0: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _09B8: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _09C0: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _09C8: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _09D0: - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_026 + EndMovement .balign 4, 0 _09D8: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement _09E0: ScrCmd_060 @@ -890,24 +890,24 @@ _0A5B: .balign 4, 0 _0A68: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _0A74: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0A7C: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0A84: - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_024 + EndMovement _0A8C: ScrCmd_060 @@ -940,18 +940,18 @@ _0ADD: .balign 4, 0 _0AE4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0AEC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _0AF4: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .byte 12 .byte 0 @@ -1127,38 +1127,38 @@ _0CF1: .balign 4, 0 _0D48: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0D50: - .short 63, 4 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0D5C: - .short 63, 4 - .short 14, 1 - .short 13, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_00E + MoveAction_00D + MoveAction_00E + EndMovement .balign 4, 0 _0D70: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0D78: - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00F 8 + EndMovement .balign 4, 0 _0D80: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .byte 34 .byte 0 @@ -1171,45 +1171,45 @@ _0D80: .balign 4, 0 _0D94: - .short 63, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_023 + EndMovement .balign 4, 0 _0DA0: - .short 62, 1 - .short 12, 1 - .short 33, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_00C + MoveAction_021 + MoveAction_023 + EndMovement .balign 4, 0 _0DB4: - .short 19, 8 - .short 0xFE, 0x00 + MoveAction_013 8 + EndMovement .balign 4, 0 _0DBC: - .short 35, 1 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _0DCC: - .short 12, 1 - .short 35, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_023 + MoveAction_04B + EndMovement .balign 4, 0 _0DDC: - .short 63, 1 - .short 34, 1 - .short 63, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + MoveAction_03F + MoveAction_00C + MoveAction_023 + EndMovement _0DF4: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0428.s b/res/field/scripts/script_0428.s index d66be5e8f4..94edcda86d 100644 --- a/res/field/scripts/script_0428.s +++ b/res/field/scripts/script_0428.s @@ -285,121 +285,121 @@ _03B1: .balign 4, 0 _03C4: - .short 35, 1 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _03D4: - .short 15, 4 - .short 12, 2 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00C 2 + MoveAction_00F + EndMovement .balign 4, 0 _03E4: - .short 15, 4 - .short 12, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00C + MoveAction_00F + EndMovement .balign 4, 0 _03F4: - .short 15, 4 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00F + EndMovement .balign 4, 0 _0400: - .short 15, 4 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _0410: - .short 15, 4 - .short 13, 2 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_00D 2 + MoveAction_00F + EndMovement .balign 4, 0 _0420: - .short 15, 1 - .short 14, 4 - .short 14, 2 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00E 4 + MoveAction_00E 2 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0434: - .short 15, 1 - .short 14, 4 - .short 14, 2 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00E 4 + MoveAction_00E 2 + MoveAction_00D + EndMovement .balign 4, 0 _0448: - .short 15, 1 - .short 14, 4 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00E 4 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0458: - .short 15, 1 - .short 14, 4 - .short 14, 2 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00E 4 + MoveAction_00E 2 + MoveAction_00C + EndMovement .balign 4, 0 _046C: - .short 15, 1 - .short 14, 4 - .short 14, 2 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00E 4 + MoveAction_00E 2 + MoveAction_00C 2 + EndMovement .balign 4, 0 _0480: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0488: - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0490: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0498: - .short 14, 12 - .short 0xFE, 0x00 + MoveAction_00E 12 + EndMovement .balign 4, 0 _04A0: - .short 63, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_002 + EndMovement .balign 4, 0 _04AC: - .short 71, 1 - .short 15, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00F + MoveAction_048 + EndMovement .balign 4, 0 _04BC: - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00E 2 + EndMovement _04C4: ScrCmd_049 0x5DC @@ -528,31 +528,31 @@ _066C: .balign 4, 0 _0674: - .short 14, 1 - .short 13, 3 - .short 14, 10 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 3 + MoveAction_00E 10 + EndMovement .balign 4, 0 _0684: - .short 13, 3 - .short 14, 10 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_00E 10 + EndMovement .balign 4, 0 _0690: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _0698: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _06A0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .byte 35 .byte 0 @@ -565,8 +565,8 @@ _06A0: .balign 4, 0 _06B0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .byte 63 .byte 0 @@ -595,23 +595,23 @@ _06B0: .balign 4, 0 _06D0: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement .balign 4, 0 _06D8: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _06E0: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _06E8: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .byte 35 .byte 0 @@ -624,5 +624,5 @@ _06E8: .balign 4, 0 _06F8: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement diff --git a/res/field/scripts/script_0429.s b/res/field/scripts/script_0429.s index a151dba3fb..0d11441cb3 100644 --- a/res/field/scripts/script_0429.s +++ b/res/field/scripts/script_0429.s @@ -163,53 +163,53 @@ _0207: .balign 4, 0 _0210: - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_013 10 + EndMovement .balign 4, 0 _0218: - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_013 10 + EndMovement .balign 4, 0 _0220: - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_013 10 + EndMovement .balign 4, 0 _0228: - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_013 10 + EndMovement .balign 4, 0 _0230: - .short 18, 4 - .short 0xFE, 0x00 + MoveAction_012 4 + EndMovement .balign 4, 0 _0238: - .short 18, 2 - .short 17, 1 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_011 + MoveAction_012 2 + EndMovement .balign 4, 0 _0248: - .short 18, 2 - .short 17, 2 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_011 2 + MoveAction_012 2 + EndMovement .balign 4, 0 _0258: - .short 18, 2 - .short 17, 3 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_011 3 + MoveAction_012 2 + EndMovement .balign 4, 0 _0268: - .short 63, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_04B + MoveAction_03F + EndMovement diff --git a/res/field/scripts/script_0432.s b/res/field/scripts/script_0432.s index 9c9b43a7a4..426ea779fb 100644 --- a/res/field/scripts/script_0432.s +++ b/res/field/scripts/script_0432.s @@ -36,13 +36,13 @@ _002C: .balign 4, 0 _0060: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0068: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0070: ScrCmd_060 @@ -69,33 +69,33 @@ _00B6: .balign 4, 0 _00BC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _00C4: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _00CC: - .short 19, 1 - .short 37, 1 - .short 63, 2 - .short 14, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_025 + MoveAction_03F 2 + MoveAction_00E + MoveAction_021 + EndMovement .balign 4, 0 _00E4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _00EC: - .short 13, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_024 + EndMovement _00F8: ScrCmd_049 0x5DC @@ -199,43 +199,43 @@ _0216: .balign 4, 0 _0228: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0230: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0238: - .short 32, 1 - .short 75, 1 - .short 63, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + MoveAction_03F + MoveAction_00C + EndMovement .balign 4, 0 _024C: - .short 32, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _025C: - .short 33, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _026C: - .short 33, 1 - .short 75, 1 - .short 63, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + MoveAction_03F + MoveAction_00D + EndMovement _0280: ScrCmd_036 7, 1, 0, 0x800C diff --git a/res/field/scripts/script_0436.s b/res/field/scripts/script_0436.s index e2347de897..c575126c0e 100644 --- a/res/field/scripts/script_0436.s +++ b/res/field/scripts/script_0436.s @@ -56,13 +56,13 @@ _0080: .balign 4, 0 _0090: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0098: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement _00A0: ScrCmd_060 diff --git a/res/field/scripts/script_0438.s b/res/field/scripts/script_0438.s index cf6745d6cd..29fdc3715d 100644 --- a/res/field/scripts/script_0438.s +++ b/res/field/scripts/script_0438.s @@ -109,8 +109,8 @@ _0156: .balign 4, 0 _0174: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .byte 63 .byte 0 @@ -139,19 +139,19 @@ _0174: .balign 4, 0 _0194: - .short 15, 3 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_04B + EndMovement .balign 4, 0 _01A0: - .short 15, 5 - .short 0xFE, 0x00 + MoveAction_00F 5 + EndMovement .balign 4, 0 _01A8: - .short 14, 8 - .short 0xFE, 0x00 + MoveAction_00E 8 + EndMovement _01B0: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0447.s b/res/field/scripts/script_0447.s index 349c51d735..26228deb82 100644 --- a/res/field/scripts/script_0447.s +++ b/res/field/scripts/script_0447.s @@ -157,68 +157,68 @@ _0240: .balign 4, 0 _024C: - .short 75, 1 - .short 63, 4 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F 4 + EndMovement .balign 4, 0 _0258: - .short 12, 1 - .short 33, 1 - .short 63, 8 - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + MoveAction_03F 8 + MoveAction_00C 8 + EndMovement .balign 4, 0 _026C: - .short 12, 2 - .short 33, 2 - .short 63, 6 - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_021 2 + MoveAction_03F 6 + MoveAction_00C 8 + EndMovement .balign 4, 0 _0280: - .short 35, 1 - .short 34, 1 - .short 35, 1 - .short 63, 2 - .short 32, 1 - .short 16, 2 - .short 63, 2 - .short 14, 3 - .short 35, 1 - .short 75, 1 - .short 19, 3 - .short 16, 8 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_022 + MoveAction_023 + MoveAction_03F 2 + MoveAction_020 + MoveAction_010 2 + MoveAction_03F 2 + MoveAction_00E 3 + MoveAction_023 + MoveAction_04B + MoveAction_013 3 + MoveAction_010 8 + EndMovement .balign 4, 0 _02B4: - .short 12, 2 - .short 63, 8 - .short 12, 8 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_03F 8 + MoveAction_00C 8 + EndMovement .balign 4, 0 _02C4: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement .balign 4, 0 _02CC: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .balign 4, 0 _02D4: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement .balign 4, 0 _02DC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 63 .byte 0 diff --git a/res/field/scripts/script_0452.s b/res/field/scripts/script_0452.s index d1f5473d42..0731557914 100644 --- a/res/field/scripts/script_0452.s +++ b/res/field/scripts/script_0452.s @@ -44,8 +44,8 @@ _0073: .balign 4, 0 _0080: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement _0088: ScrCmd_036 3, 1, 0, 0x800C diff --git a/res/field/scripts/script_0454.s b/res/field/scripts/script_0454.s index 32ea1a9df9..1487e87f0f 100644 --- a/res/field/scripts/script_0454.s +++ b/res/field/scripts/script_0454.s @@ -265,51 +265,51 @@ _03E6: .balign 4, 0 _03EC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03F4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03FC: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement .balign 4, 0 _0408: - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _0414: - .short 34, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_045 + EndMovement .balign 4, 0 _0420: - .short 70, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_046 + MoveAction_023 + EndMovement .balign 4, 0 _042C: - .short 15, 1 - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _043C: - .short 15, 1 - .short 13, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D + MoveAction_022 + EndMovement _044C: ScrCmd_02C 12 @@ -358,13 +358,13 @@ _048A: .balign 4, 0 _04A8: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _04B0: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .byte 3 .byte 0 @@ -377,8 +377,8 @@ _04B0: .balign 4, 0 _04C0: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _04C8: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0456.s b/res/field/scripts/script_0456.s index d1e4240d82..1063f8404f 100644 --- a/res/field/scripts/script_0456.s +++ b/res/field/scripts/script_0456.s @@ -138,49 +138,49 @@ _01BD: .balign 4, 0 _01CC: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _01D4: - .short 75, 1 - .short 65, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_041 + MoveAction_003 + EndMovement .balign 4, 0 _01E4: - .short 75, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_022 + EndMovement .balign 4, 0 _01F0: - .short 13, 2 - .short 15, 1 - .short 1, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F + MoveAction_001 + MoveAction_045 + EndMovement .balign 4, 0 _0204: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _020C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0214: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _021C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _0224: ScrCmd_049 0x5DC @@ -279,13 +279,13 @@ _0325: .balign 4, 0 _0344: - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_001 + EndMovement .balign 4, 0 _034C: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _0354: ScrCmd_060 @@ -301,9 +301,9 @@ _0354: .balign 4, 0 _037C: - .short 13, 1 - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_000 + EndMovement _0388: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0459.s b/res/field/scripts/script_0459.s index db80997011..2f9b3243da 100644 --- a/res/field/scripts/script_0459.s +++ b/res/field/scripts/script_0459.s @@ -215,121 +215,121 @@ _02F3: .balign 4, 0 _0308: - .short 19, 10 - .short 16, 2 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_013 10 + MoveAction_010 2 + MoveAction_027 + EndMovement .balign 4, 0 _0318: - .short 19, 10 - .short 16, 2 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 10 + MoveAction_010 2 + MoveAction_013 2 + EndMovement .balign 4, 0 _0328: - .short 19, 10 - .short 16, 3 - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 10 + MoveAction_010 3 + MoveAction_013 + EndMovement .balign 4, 0 _0338: - .short 19, 10 - .short 16, 1 - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 10 + MoveAction_010 + MoveAction_013 + EndMovement .balign 4, 0 _0348: - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_025 + EndMovement .balign 4, 0 _0350: - .short 16, 1 - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 10 + EndMovement .balign 4, 0 _035C: - .short 16, 1 - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 10 + EndMovement .balign 4, 0 _0368: - .short 17, 1 - .short 19, 4 - .short 16, 1 - .short 19, 6 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 4 + MoveAction_010 + MoveAction_013 6 + EndMovement .balign 4, 0 _037C: - .short 16, 2 - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_010 2 + MoveAction_013 10 + EndMovement .balign 4, 0 _0388: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0390: - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_013 10 + EndMovement .balign 4, 0 _0398: - .short 17, 2 - .short 19, 9 - .short 0xFE, 0x00 + MoveAction_011 2 + MoveAction_013 9 + EndMovement .balign 4, 0 _03A4: - .short 19, 4 - .short 16, 1 - .short 19, 6 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_010 + MoveAction_013 6 + EndMovement .balign 4, 0 _03B4: - .short 16, 1 - .short 19, 10 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 10 + EndMovement .balign 4, 0 _03C0: - .short 63, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_003 + EndMovement .balign 4, 0 _03CC: - .short 62, 10 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03E 10 + MoveAction_022 + EndMovement .balign 4, 0 _03D8: - .short 62, 11 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03E 11 + MoveAction_022 + EndMovement .balign 4, 0 _03E4: - .short 62, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E 3 + MoveAction_023 + EndMovement .balign 4, 0 _03F0: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement _03FC: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0461.s b/res/field/scripts/script_0461.s index 537685af5e..9990e40143 100644 --- a/res/field/scripts/script_0461.s +++ b/res/field/scripts/script_0461.s @@ -494,48 +494,48 @@ _0664: .balign 4, 0 _0698: - .short 71, 1 - .short 15, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00F + MoveAction_048 + EndMovement .balign 4, 0 _06A8: - .short 71, 1 - .short 14, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00E + MoveAction_048 + EndMovement .balign 4, 0 _06B8: - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00D + MoveAction_048 + EndMovement .balign 4, 0 _06C8: - .short 71, 1 - .short 12, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_047 + MoveAction_00C + MoveAction_048 + EndMovement .balign 4, 0 _06D8: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _06E0: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _06E8: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _06F0: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement diff --git a/res/field/scripts/script_0462.s b/res/field/scripts/script_0462.s index c5727cf877..fed2eb8734 100644 --- a/res/field/scripts/script_0462.s +++ b/res/field/scripts/script_0462.s @@ -66,5 +66,5 @@ _0081: .balign 4, 0 _009C: - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_003 + EndMovement diff --git a/res/field/scripts/script_0471.s b/res/field/scripts/script_0471.s index 6ed3251574..494679ee89 100644 --- a/res/field/scripts/script_0471.s +++ b/res/field/scripts/script_0471.s @@ -88,49 +88,49 @@ _00F6: .balign 4, 0 _010C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0114: - .short 63, 2 - .short 62, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_03E + MoveAction_020 + EndMovement .balign 4, 0 _0124: - .short 12, 4 - .short 14, 3 - .short 12, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_00E 3 + MoveAction_00C + MoveAction_04B + EndMovement .balign 4, 0 _0138: - .short 12, 4 - .short 14, 2 - .short 12, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_00E 2 + MoveAction_00C + MoveAction_04B + EndMovement .balign 4, 0 _014C: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0154: - .short 15, 1 - .short 12, 3 - .short 15, 2 - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C 3 + MoveAction_00F 2 + MoveAction_00C 9 + EndMovement .balign 4, 0 _0168: - .short 14, 1 - .short 12, 3 - .short 15, 3 - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 3 + MoveAction_00F 3 + MoveAction_00C 9 + EndMovement diff --git a/res/field/scripts/script_0476.s b/res/field/scripts/script_0476.s index a20b1fcfd3..7f2fa6c264 100644 --- a/res/field/scripts/script_0476.s +++ b/res/field/scripts/script_0476.s @@ -117,73 +117,73 @@ _015A: .balign 4, 0 _0168: - .short 75, 1 - .short 15, 1 - .short 12, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F + MoveAction_00C 2 + MoveAction_023 + EndMovement .balign 4, 0 _017C: - .short 75, 1 - .short 15, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0190: - .short 75, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F + EndMovement .balign 4, 0 _019C: - .short 75, 1 - .short 15, 1 - .short 13, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F + MoveAction_00D + MoveAction_023 + EndMovement .balign 4, 0 _01B0: - .short 75, 1 - .short 15, 1 - .short 13, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00F + MoveAction_00D 2 + MoveAction_023 + EndMovement .balign 4, 0 _01C4: - .short 13, 2 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00F 4 + EndMovement .balign 4, 0 _01D0: - .short 13, 1 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 4 + EndMovement .balign 4, 0 _01DC: - .short 12, 1 - .short 15, 3 - .short 13, 1 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 3 + MoveAction_00D + MoveAction_00F + EndMovement .balign 4, 0 _01F0: - .short 12, 1 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + EndMovement .balign 4, 0 _01FC: - .short 12, 2 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 4 + EndMovement _0208: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0479.s b/res/field/scripts/script_0479.s index cb5853c1ab..27025b5ae5 100644 --- a/res/field/scripts/script_0479.s +++ b/res/field/scripts/script_0479.s @@ -205,17 +205,17 @@ _02AD: .balign 4, 0 _02B8: - .short 36, 1 - .short 12, 2 - .short 15, 1 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_024 + MoveAction_00C 2 + MoveAction_00F + MoveAction_026 + EndMovement .balign 4, 0 _02CC: - .short 12, 5 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 5 + MoveAction_045 + EndMovement _02D8: ScrCmd_060 @@ -289,25 +289,25 @@ _03BD: .balign 4, 0 _03D8: - .short 14, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + EndMovement .balign 4, 0 _03E4: - .short 13, 5 - .short 0xFE, 0x00 + MoveAction_00D 5 + EndMovement .balign 4, 0 _03EC: - .short 13, 2 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_027 + EndMovement .balign 4, 0 _03F8: - .short 13, 4 - .short 0xFE, 0x00 + MoveAction_00D 4 + EndMovement _0400: ScrCmd_049 0x5DC @@ -437,28 +437,28 @@ _04F6: .balign 4, 0 _0548: - .short 75, 1 - .short 63, 1 - .short 13, 3 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F + MoveAction_00D 3 + EndMovement .balign 4, 0 _0558: - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _0564: - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _0570: - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_022 + EndMovement _057C: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_0485.s b/res/field/scripts/script_0485.s index cb1bbbae4f..a212126cb5 100644 --- a/res/field/scripts/script_0485.s +++ b/res/field/scripts/script_0485.s @@ -227,105 +227,105 @@ _02B8: .balign 4, 0 _0328: - .short 0, 1 - .short 65, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_041 + MoveAction_003 + EndMovement .balign 4, 0 _0338: - .short 14, 1 - .short 12, 1 - .short 65, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C + MoveAction_041 + MoveAction_003 + EndMovement .balign 4, 0 _034C: - .short 13, 1 - .short 14, 2 - .short 12, 1 - .short 65, 1 - .short 3, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 2 + MoveAction_00C + MoveAction_041 + MoveAction_003 + EndMovement .balign 4, 0 _0364: - .short 63, 1 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_002 + EndMovement .balign 4, 0 _0370: - .short 63, 1 - .short 1, 1 - .short 63, 2 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_001 + MoveAction_03F 2 + MoveAction_002 + EndMovement .balign 4, 0 _0384: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _038C: - .short 3, 1 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _039C: - .short 65, 1 - .short 3, 1 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_003 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _03B0: - .short 2, 1 - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _03C0: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement .balign 4, 0 _03C8: - .short 2, 1 - .short 65, 1 - .short 1, 1 - .short 65, 1 - .short 3, 1 - .short 65, 1 - .short 1, 1 - .short 65, 1 - .short 2, 1 - .short 65, 1 - .short 0, 1 - .short 65, 1 - .short 1, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_041 + MoveAction_001 + MoveAction_041 + MoveAction_003 + MoveAction_041 + MoveAction_001 + MoveAction_041 + MoveAction_002 + MoveAction_041 + MoveAction_000 + MoveAction_041 + MoveAction_001 + MoveAction_041 + EndMovement .balign 4, 0 _0404: - .short 1, 1 - .short 65, 1 - .short 3, 1 - .short 65, 1 - .short 1, 1 - .short 65, 1 - .short 2, 1 - .short 65, 1 - .short 0, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_001 + MoveAction_041 + MoveAction_003 + MoveAction_041 + MoveAction_001 + MoveAction_041 + MoveAction_002 + MoveAction_041 + MoveAction_000 + MoveAction_041 + EndMovement .byte 33 .byte 0 @@ -338,20 +338,20 @@ _0404: .balign 4, 0 _0438: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0440: - .short 13, 12 - .short 0xFE, 0x00 + MoveAction_00D 12 + EndMovement .balign 4, 0 _0448: - .short 0, 1 - .short 65, 1 - .short 76, 12 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_041 + MoveAction_04C 12 + EndMovement _0458: ScrCmd_060 @@ -438,47 +438,47 @@ _057F: .balign 4, 0 _0598: - .short 12, 8 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_023 + EndMovement .balign 4, 0 _05A4: - .short 12, 8 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_023 + EndMovement .balign 4, 0 _05B0: - .short 12, 8 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_023 + EndMovement .balign 4, 0 _05BC: - .short 13, 1 - .short 15, 5 - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 5 + MoveAction_00C 4 + EndMovement .balign 4, 0 _05CC: - .short 12, 1 - .short 15, 5 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 5 + MoveAction_00C 3 + EndMovement .balign 4, 0 _05DC: - .short 12, 2 - .short 15, 5 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 5 + MoveAction_00C 3 + EndMovement .balign 4, 0 _05EC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement _05F4: ScrCmd_049 0x5DC @@ -503,38 +503,38 @@ _061C: .balign 4, 0 _0628: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0630: - .short 63, 2 - .short 35, 1 - .short 63, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + MoveAction_03F 4 + MoveAction_020 + EndMovement .balign 4, 0 _0644: - .short 63, 2 - .short 35, 1 - .short 63, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + MoveAction_03F 3 + MoveAction_020 + EndMovement .balign 4, 0 _0658: - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + EndMovement .balign 4, 0 _0664: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _066C: - .short 3, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_04B + EndMovement diff --git a/res/field/scripts/script_0489.s b/res/field/scripts/script_0489.s index cd343c3820..f106a26f2a 100644 --- a/res/field/scripts/script_0489.s +++ b/res/field/scripts/script_0489.s @@ -64,27 +64,27 @@ _00E7: .balign 4, 0 _00F4: - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_020 + EndMovement .balign 4, 0 _0100: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .balign 4, 0 _0108: - .short 15, 1 - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0118: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .byte 32 .byte 0 @@ -97,11 +97,11 @@ _0118: .balign 4, 0 _012C: - .short 14, 1 - .short 35, 1 - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_023 + MoveAction_03E + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -126,29 +126,29 @@ _012C: .balign 4, 0 _0154: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0160: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0168: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0170: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0178: - .short 17, 9 - .short 0xFE, 0x00 + MoveAction_011 9 + EndMovement .byte 17 .byte 0 @@ -161,19 +161,19 @@ _0178: .balign 4, 0 _0188: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _0194: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _019C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -198,9 +198,9 @@ _019C: .balign 4, 0 _01B8: - .short 63, 2 - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00D 9 + EndMovement .byte 13 .byte 0 @@ -266,8 +266,8 @@ _0243: .balign 4, 0 _026C: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement .byte 63 .byte 0 @@ -284,17 +284,17 @@ _026C: .balign 4, 0 _0280: - .short 33, 1 - .short 75, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + MoveAction_00D + EndMovement .balign 4, 0 _0290: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0298: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_0497.s b/res/field/scripts/script_0497.s index c9d80bc045..e7532ab031 100644 --- a/res/field/scripts/script_0497.s +++ b/res/field/scripts/script_0497.s @@ -440,36 +440,36 @@ _070C: .balign 4, 0 _0718: - .short 15, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_045 + EndMovement .balign 4, 0 _0724: - .short 15, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_045 + EndMovement .balign 4, 0 _0730: - .short 14, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_045 + EndMovement .balign 4, 0 _073C: - .short 14, 4 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_045 + EndMovement .balign 4, 0 _0748: - .short 70, 1 - .short 15, 3 - .short 0xFE, 0x00 + MoveAction_046 + MoveAction_00F 3 + EndMovement .balign 4, 0 _0754: - .short 70, 1 - .short 14, 3 - .short 0xFE, 0x00 + MoveAction_046 + MoveAction_00E 3 + EndMovement diff --git a/res/field/scripts/script_0501.s b/res/field/scripts/script_0501.s index 5873b4290f..cac236c43b 100644 --- a/res/field/scripts/script_0501.s +++ b/res/field/scripts/script_0501.s @@ -347,19 +347,19 @@ _045E: .balign 4, 0 _046C: - .short 62, 3 - .short 2, 1 - .short 62, 3 - .short 3, 1 - .short 62, 3 - .short 0, 1 - .short 12, 2 - .short 69, 1 - .short 63, 3 - .short 1, 1 - .short 70, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_03E 3 + MoveAction_002 + MoveAction_03E 3 + MoveAction_003 + MoveAction_03E 3 + MoveAction_000 + MoveAction_00C 2 + MoveAction_045 + MoveAction_03F 3 + MoveAction_001 + MoveAction_046 + MoveAction_00D 2 + EndMovement _04A0: ScrCmd_02C 24 diff --git a/res/field/scripts/script_0502.s b/res/field/scripts/script_0502.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0502.s +++ b/res/field/scripts/script_0502.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0508.s b/res/field/scripts/script_0508.s index e457f9e161..224d01ce60 100644 --- a/res/field/scripts/script_0508.s +++ b/res/field/scripts/script_0508.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0511.s b/res/field/scripts/script_0511.s index e58dafb9cc..9bd729c0a1 100644 --- a/res/field/scripts/script_0511.s +++ b/res/field/scripts/script_0511.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 8, 0 + MoveAction_008 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0512.s b/res/field/scripts/script_0512.s index 2b1bbd715c..829610be54 100644 --- a/res/field/scripts/script_0512.s +++ b/res/field/scripts/script_0512.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0528.s b/res/field/scripts/script_0528.s index ff50831566..05b47377cf 100644 --- a/res/field/scripts/script_0528.s +++ b/res/field/scripts/script_0528.s @@ -3,7 +3,7 @@ .data .byte 3 - .short 13, 0 + MoveAction_00D 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0536.s b/res/field/scripts/script_0536.s index 67325ca394..4a993ca3d0 100644 --- a/res/field/scripts/script_0536.s +++ b/res/field/scripts/script_0536.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 24, 0 + MoveAction_018 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0538.s b/res/field/scripts/script_0538.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0538.s +++ b/res/field/scripts/script_0538.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0543.s b/res/field/scripts/script_0543.s index 9ae91d88a6..402a604bf6 100644 --- a/res/field/scripts/script_0543.s +++ b/res/field/scripts/script_0543.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0544.s b/res/field/scripts/script_0544.s index 97dbb08a60..943679c3fa 100644 --- a/res/field/scripts/script_0544.s +++ b/res/field/scripts/script_0544.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0547.s b/res/field/scripts/script_0547.s index ac8d047e05..b2d0bb0aaa 100644 --- a/res/field/scripts/script_0547.s +++ b/res/field/scripts/script_0547.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0548.s b/res/field/scripts/script_0548.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0548.s +++ b/res/field/scripts/script_0548.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0549.s b/res/field/scripts/script_0549.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0549.s +++ b/res/field/scripts/script_0549.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0571.s b/res/field/scripts/script_0571.s index a71529f73a..0c81637f41 100644 --- a/res/field/scripts/script_0571.s +++ b/res/field/scripts/script_0571.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 21, 0 + MoveAction_015 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0573.s b/res/field/scripts/script_0573.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0573.s +++ b/res/field/scripts/script_0573.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0574.s b/res/field/scripts/script_0574.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0574.s +++ b/res/field/scripts/script_0574.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0579.s b/res/field/scripts/script_0579.s index 0461870d08..c49b550503 100644 --- a/res/field/scripts/script_0579.s +++ b/res/field/scripts/script_0579.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0582.s b/res/field/scripts/script_0582.s index 82e3ace123..dae1891661 100644 --- a/res/field/scripts/script_0582.s +++ b/res/field/scripts/script_0582.s @@ -3,7 +3,7 @@ .data .byte 4 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0583.s b/res/field/scripts/script_0583.s index 131525b36b..f80bed968b 100644 --- a/res/field/scripts/script_0583.s +++ b/res/field/scripts/script_0583.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 3 - .short 8, 0 + MoveAction_008 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0588.s b/res/field/scripts/script_0588.s index 7a943829a6..1cd4ad5a02 100644 --- a/res/field/scripts/script_0588.s +++ b/res/field/scripts/script_0588.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0593.s b/res/field/scripts/script_0593.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0593.s +++ b/res/field/scripts/script_0593.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0596.s b/res/field/scripts/script_0596.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0596.s +++ b/res/field/scripts/script_0596.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0597.s b/res/field/scripts/script_0597.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0597.s +++ b/res/field/scripts/script_0597.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0598.s b/res/field/scripts/script_0598.s index af86b8caff..27d48f6fa0 100644 --- a/res/field/scripts/script_0598.s +++ b/res/field/scripts/script_0598.s @@ -3,7 +3,7 @@ .data .byte 4 - .short 6, 0 + MoveAction_006 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0599.s b/res/field/scripts/script_0599.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0599.s +++ b/res/field/scripts/script_0599.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0600.s b/res/field/scripts/script_0600.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0600.s +++ b/res/field/scripts/script_0600.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0608.s b/res/field/scripts/script_0608.s index 1debde4cfe..084f73d180 100644 --- a/res/field/scripts/script_0608.s +++ b/res/field/scripts/script_0608.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 6, 0 + MoveAction_006 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0609.s b/res/field/scripts/script_0609.s index 2b1bbd715c..829610be54 100644 --- a/res/field/scripts/script_0609.s +++ b/res/field/scripts/script_0609.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0610.s b/res/field/scripts/script_0610.s index 3de22e2ca9..538b48bdfd 100644 --- a/res/field/scripts/script_0610.s +++ b/res/field/scripts/script_0610.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 3, 0 + MoveAction_003 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0618.s b/res/field/scripts/script_0618.s index 7995d7aae3..8d7b7059ca 100644 --- a/res/field/scripts/script_0618.s +++ b/res/field/scripts/script_0618.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 6, 0 + MoveAction_006 0 .byte 3 - .short 5, 0 + MoveAction_005 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0623.s b/res/field/scripts/script_0623.s index d46960c7b1..03c4f5ae40 100644 --- a/res/field/scripts/script_0623.s +++ b/res/field/scripts/script_0623.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0625.s b/res/field/scripts/script_0625.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0625.s +++ b/res/field/scripts/script_0625.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0629.s b/res/field/scripts/script_0629.s index f75b19b4f4..c4e0974ea0 100644 --- a/res/field/scripts/script_0629.s +++ b/res/field/scripts/script_0629.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0636.s b/res/field/scripts/script_0636.s index aee4499de0..5f05f64641 100644 --- a/res/field/scripts/script_0636.s +++ b/res/field/scripts/script_0636.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0637.s b/res/field/scripts/script_0637.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0637.s +++ b/res/field/scripts/script_0637.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0649.s b/res/field/scripts/script_0649.s index 149fd4a22d..8ad97f0d8b 100644 --- a/res/field/scripts/script_0649.s +++ b/res/field/scripts/script_0649.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0656.s b/res/field/scripts/script_0656.s index 9f0ba04617..812212c89c 100644 --- a/res/field/scripts/script_0656.s +++ b/res/field/scripts/script_0656.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 19, 0 + MoveAction_013 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0658.s b/res/field/scripts/script_0658.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0658.s +++ b/res/field/scripts/script_0658.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0659.s b/res/field/scripts/script_0659.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0659.s +++ b/res/field/scripts/script_0659.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0660.s b/res/field/scripts/script_0660.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0660.s +++ b/res/field/scripts/script_0660.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0664.s b/res/field/scripts/script_0664.s index e457f9e161..224d01ce60 100644 --- a/res/field/scripts/script_0664.s +++ b/res/field/scripts/script_0664.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0674.s b/res/field/scripts/script_0674.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0674.s +++ b/res/field/scripts/script_0674.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0676.s b/res/field/scripts/script_0676.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0676.s +++ b/res/field/scripts/script_0676.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0683.s b/res/field/scripts/script_0683.s index 2b1bbd715c..829610be54 100644 --- a/res/field/scripts/script_0683.s +++ b/res/field/scripts/script_0683.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0686.s b/res/field/scripts/script_0686.s index e457f9e161..224d01ce60 100644 --- a/res/field/scripts/script_0686.s +++ b/res/field/scripts/script_0686.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0687.s b/res/field/scripts/script_0687.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0687.s +++ b/res/field/scripts/script_0687.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0689.s b/res/field/scripts/script_0689.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0689.s +++ b/res/field/scripts/script_0689.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0691.s b/res/field/scripts/script_0691.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0691.s +++ b/res/field/scripts/script_0691.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0693.s b/res/field/scripts/script_0693.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0693.s +++ b/res/field/scripts/script_0693.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0695.s b/res/field/scripts/script_0695.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0695.s +++ b/res/field/scripts/script_0695.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0696.s b/res/field/scripts/script_0696.s index a705d52347..0ae2f9320e 100644 --- a/res/field/scripts/script_0696.s +++ b/res/field/scripts/script_0696.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0701.s b/res/field/scripts/script_0701.s index 3412fc905e..816a1803a4 100644 --- a/res/field/scripts/script_0701.s +++ b/res/field/scripts/script_0701.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 15, 0 + MoveAction_00F 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0711.s b/res/field/scripts/script_0711.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0711.s +++ b/res/field/scripts/script_0711.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0713.s b/res/field/scripts/script_0713.s index 7422d64d68..e9a2bb28f1 100644 --- a/res/field/scripts/script_0713.s +++ b/res/field/scripts/script_0713.s @@ -3,11 +3,11 @@ .data .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 7, 0 + MoveAction_007 0 .byte 1 .long _0015-.-4 .byte 0 diff --git a/res/field/scripts/script_0714.s b/res/field/scripts/script_0714.s index c3a51ef63b..716a49358c 100644 --- a/res/field/scripts/script_0714.s +++ b/res/field/scripts/script_0714.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0715.s b/res/field/scripts/script_0715.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0715.s +++ b/res/field/scripts/script_0715.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0716.s b/res/field/scripts/script_0716.s index ec353f1a85..e41417b369 100644 --- a/res/field/scripts/script_0716.s +++ b/res/field/scripts/script_0716.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 11, 0 + MoveAction_00B 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0718.s b/res/field/scripts/script_0718.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0718.s +++ b/res/field/scripts/script_0718.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0719.s b/res/field/scripts/script_0719.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0719.s +++ b/res/field/scripts/script_0719.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0728.s b/res/field/scripts/script_0728.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0728.s +++ b/res/field/scripts/script_0728.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0730.s b/res/field/scripts/script_0730.s index 9816127610..309fc08406 100644 --- a/res/field/scripts/script_0730.s +++ b/res/field/scripts/script_0730.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 4 - .short 3, 0 + MoveAction_003 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0733.s b/res/field/scripts/script_0733.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0733.s +++ b/res/field/scripts/script_0733.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0735.s b/res/field/scripts/script_0735.s index bf454d8683..8258527bfa 100644 --- a/res/field/scripts/script_0735.s +++ b/res/field/scripts/script_0735.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 3, 0 + MoveAction_003 0 .byte 4 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0736.s b/res/field/scripts/script_0736.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0736.s +++ b/res/field/scripts/script_0736.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0737.s b/res/field/scripts/script_0737.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0737.s +++ b/res/field/scripts/script_0737.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0738.s b/res/field/scripts/script_0738.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0738.s +++ b/res/field/scripts/script_0738.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0747.s b/res/field/scripts/script_0747.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0747.s +++ b/res/field/scripts/script_0747.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0764.s b/res/field/scripts/script_0764.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0764.s +++ b/res/field/scripts/script_0764.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0767.s b/res/field/scripts/script_0767.s index 2b1bbd715c..829610be54 100644 --- a/res/field/scripts/script_0767.s +++ b/res/field/scripts/script_0767.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0770.s b/res/field/scripts/script_0770.s index 238c0f7f6b..a880c1b536 100644 --- a/res/field/scripts/script_0770.s +++ b/res/field/scripts/script_0770.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0771.s b/res/field/scripts/script_0771.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0771.s +++ b/res/field/scripts/script_0771.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0772.s b/res/field/scripts/script_0772.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0772.s +++ b/res/field/scripts/script_0772.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0774.s b/res/field/scripts/script_0774.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0774.s +++ b/res/field/scripts/script_0774.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0776.s b/res/field/scripts/script_0776.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0776.s +++ b/res/field/scripts/script_0776.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0778.s b/res/field/scripts/script_0778.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0778.s +++ b/res/field/scripts/script_0778.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0780.s b/res/field/scripts/script_0780.s index ad667e0c7d..307bdf070d 100644 --- a/res/field/scripts/script_0780.s +++ b/res/field/scripts/script_0780.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0781.s b/res/field/scripts/script_0781.s index 5b961a011c..450936815f 100644 --- a/res/field/scripts/script_0781.s +++ b/res/field/scripts/script_0781.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0782.s b/res/field/scripts/script_0782.s index 1debde4cfe..084f73d180 100644 --- a/res/field/scripts/script_0782.s +++ b/res/field/scripts/script_0782.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 6, 0 + MoveAction_006 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0783.s b/res/field/scripts/script_0783.s index 1c0c28e8cf..a9020646ed 100644 --- a/res/field/scripts/script_0783.s +++ b/res/field/scripts/script_0783.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0784.s b/res/field/scripts/script_0784.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0784.s +++ b/res/field/scripts/script_0784.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0785.s b/res/field/scripts/script_0785.s index e71345d8e6..900b9b65c2 100644 --- a/res/field/scripts/script_0785.s +++ b/res/field/scripts/script_0785.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 3, 0 + MoveAction_003 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0786.s b/res/field/scripts/script_0786.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0786.s +++ b/res/field/scripts/script_0786.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0787.s b/res/field/scripts/script_0787.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0787.s +++ b/res/field/scripts/script_0787.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0788.s b/res/field/scripts/script_0788.s index 5f5da6fc45..33553a17c5 100644 --- a/res/field/scripts/script_0788.s +++ b/res/field/scripts/script_0788.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 4 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0789.s b/res/field/scripts/script_0789.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0789.s +++ b/res/field/scripts/script_0789.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0790.s b/res/field/scripts/script_0790.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0790.s +++ b/res/field/scripts/script_0790.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0791.s b/res/field/scripts/script_0791.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0791.s +++ b/res/field/scripts/script_0791.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0792.s b/res/field/scripts/script_0792.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0792.s +++ b/res/field/scripts/script_0792.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0793.s b/res/field/scripts/script_0793.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0793.s +++ b/res/field/scripts/script_0793.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0794.s b/res/field/scripts/script_0794.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0794.s +++ b/res/field/scripts/script_0794.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0795.s b/res/field/scripts/script_0795.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0795.s +++ b/res/field/scripts/script_0795.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0796.s b/res/field/scripts/script_0796.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0796.s +++ b/res/field/scripts/script_0796.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0797.s b/res/field/scripts/script_0797.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0797.s +++ b/res/field/scripts/script_0797.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0798.s b/res/field/scripts/script_0798.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0798.s +++ b/res/field/scripts/script_0798.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0799.s b/res/field/scripts/script_0799.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0799.s +++ b/res/field/scripts/script_0799.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0800.s b/res/field/scripts/script_0800.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0800.s +++ b/res/field/scripts/script_0800.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0801.s b/res/field/scripts/script_0801.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0801.s +++ b/res/field/scripts/script_0801.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0802.s b/res/field/scripts/script_0802.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0802.s +++ b/res/field/scripts/script_0802.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0803.s b/res/field/scripts/script_0803.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0803.s +++ b/res/field/scripts/script_0803.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0804.s b/res/field/scripts/script_0804.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0804.s +++ b/res/field/scripts/script_0804.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0805.s b/res/field/scripts/script_0805.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0805.s +++ b/res/field/scripts/script_0805.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0806.s b/res/field/scripts/script_0806.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0806.s +++ b/res/field/scripts/script_0806.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0807.s b/res/field/scripts/script_0807.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0807.s +++ b/res/field/scripts/script_0807.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0809.s b/res/field/scripts/script_0809.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0809.s +++ b/res/field/scripts/script_0809.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0814.s b/res/field/scripts/script_0814.s index 82e3ace123..dae1891661 100644 --- a/res/field/scripts/script_0814.s +++ b/res/field/scripts/script_0814.s @@ -3,7 +3,7 @@ .data .byte 4 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0815.s b/res/field/scripts/script_0815.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0815.s +++ b/res/field/scripts/script_0815.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0817.s b/res/field/scripts/script_0817.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0817.s +++ b/res/field/scripts/script_0817.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0818.s b/res/field/scripts/script_0818.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0818.s +++ b/res/field/scripts/script_0818.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0819.s b/res/field/scripts/script_0819.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0819.s +++ b/res/field/scripts/script_0819.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0820.s b/res/field/scripts/script_0820.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0820.s +++ b/res/field/scripts/script_0820.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0821.s b/res/field/scripts/script_0821.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0821.s +++ b/res/field/scripts/script_0821.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0822.s b/res/field/scripts/script_0822.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0822.s +++ b/res/field/scripts/script_0822.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0824.s b/res/field/scripts/script_0824.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0824.s +++ b/res/field/scripts/script_0824.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0826.s b/res/field/scripts/script_0826.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0826.s +++ b/res/field/scripts/script_0826.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0827.s b/res/field/scripts/script_0827.s index 6251f6d252..64cbdcca4c 100644 --- a/res/field/scripts/script_0827.s +++ b/res/field/scripts/script_0827.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0828.s b/res/field/scripts/script_0828.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0828.s +++ b/res/field/scripts/script_0828.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0829.s b/res/field/scripts/script_0829.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0829.s +++ b/res/field/scripts/script_0829.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0830.s b/res/field/scripts/script_0830.s index c989eba242..6a86784918 100644 --- a/res/field/scripts/script_0830.s +++ b/res/field/scripts/script_0830.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0836.s b/res/field/scripts/script_0836.s index a773e1adef..8ed75f399b 100644 --- a/res/field/scripts/script_0836.s +++ b/res/field/scripts/script_0836.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0838.s b/res/field/scripts/script_0838.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0838.s +++ b/res/field/scripts/script_0838.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0844.s b/res/field/scripts/script_0844.s index ce33ceb5f1..55a84507e6 100644 --- a/res/field/scripts/script_0844.s +++ b/res/field/scripts/script_0844.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0847.s b/res/field/scripts/script_0847.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0847.s +++ b/res/field/scripts/script_0847.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0848.s b/res/field/scripts/script_0848.s index 016542ef24..3bcf2dff38 100644 --- a/res/field/scripts/script_0848.s +++ b/res/field/scripts/script_0848.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0849.s b/res/field/scripts/script_0849.s index c5ef78db5c..df0a6a91a6 100644 --- a/res/field/scripts/script_0849.s +++ b/res/field/scripts/script_0849.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0850.s b/res/field/scripts/script_0850.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0850.s +++ b/res/field/scripts/script_0850.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0851.s b/res/field/scripts/script_0851.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0851.s +++ b/res/field/scripts/script_0851.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0854.s b/res/field/scripts/script_0854.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0854.s +++ b/res/field/scripts/script_0854.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0855.s b/res/field/scripts/script_0855.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0855.s +++ b/res/field/scripts/script_0855.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0858.s b/res/field/scripts/script_0858.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0858.s +++ b/res/field/scripts/script_0858.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0859.s b/res/field/scripts/script_0859.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0859.s +++ b/res/field/scripts/script_0859.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0860.s b/res/field/scripts/script_0860.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0860.s +++ b/res/field/scripts/script_0860.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0864.s b/res/field/scripts/script_0864.s index 3bc23fd2fb..6478ad495f 100644 --- a/res/field/scripts/script_0864.s +++ b/res/field/scripts/script_0864.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 22, 0 + MoveAction_016 0 .byte 3 - .short 23, 0 + MoveAction_017 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0865.s b/res/field/scripts/script_0865.s index 5b01f5c2ac..5e5bf560ae 100644 --- a/res/field/scripts/script_0865.s +++ b/res/field/scripts/script_0865.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0866.s b/res/field/scripts/script_0866.s index cf4ec2b73a..0e7ecd38fc 100644 --- a/res/field/scripts/script_0866.s +++ b/res/field/scripts/script_0866.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0867.s b/res/field/scripts/script_0867.s index d123fc8d58..a3784a6aff 100644 --- a/res/field/scripts/script_0867.s +++ b/res/field/scripts/script_0867.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0868.s b/res/field/scripts/script_0868.s index 7a4e4a98de..717699bdf9 100644 --- a/res/field/scripts/script_0868.s +++ b/res/field/scripts/script_0868.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 5, 0 + MoveAction_005 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0869.s b/res/field/scripts/script_0869.s index 493b397177..ad68572ef7 100644 --- a/res/field/scripts/script_0869.s +++ b/res/field/scripts/script_0869.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0870.s b/res/field/scripts/script_0870.s index a4361bc996..f4b015f22b 100644 --- a/res/field/scripts/script_0870.s +++ b/res/field/scripts/script_0870.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 3 - .short 8, 0 + MoveAction_008 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_0871.s b/res/field/scripts/script_0871.s index 4329a77a5f..143e96d257 100644 --- a/res/field/scripts/script_0871.s +++ b/res/field/scripts/script_0871.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 38, 0 + MoveAction_026 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0872.s b/res/field/scripts/script_0872.s index db3bcbda84..f01434fb43 100644 --- a/res/field/scripts/script_0872.s +++ b/res/field/scripts/script_0872.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 12, 0 + MoveAction_00C 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0873.s b/res/field/scripts/script_0873.s index a3c80bc8fd..53be63427c 100644 --- a/res/field/scripts/script_0873.s +++ b/res/field/scripts/script_0873.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 14, 0 + MoveAction_00E 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0874.s b/res/field/scripts/script_0874.s index 5998658686..d386aa3548 100644 --- a/res/field/scripts/script_0874.s +++ b/res/field/scripts/script_0874.s @@ -3,11 +3,11 @@ .data .byte 4 - .short 21, 0 + MoveAction_015 0 .byte 2 - .short 16, 0 + MoveAction_010 0 .byte 3 - .short 22, 0 + MoveAction_016 0 .byte 1 .long _0015-.-4 .byte 0 diff --git a/res/field/scripts/script_0875.s b/res/field/scripts/script_0875.s index 4795020104..8c24f6b898 100644 --- a/res/field/scripts/script_0875.s +++ b/res/field/scripts/script_0875.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 14, 0 + MoveAction_00E 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0876.s b/res/field/scripts/script_0876.s index a9209ac76b..d3d380ba55 100644 --- a/res/field/scripts/script_0876.s +++ b/res/field/scripts/script_0876.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 15, 0 + MoveAction_00F 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0877.s b/res/field/scripts/script_0877.s index 2ea2f31908..b8253b9a12 100644 --- a/res/field/scripts/script_0877.s +++ b/res/field/scripts/script_0877.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0878.s b/res/field/scripts/script_0878.s index bb51508a4e..9c955579d4 100644 --- a/res/field/scripts/script_0878.s +++ b/res/field/scripts/script_0878.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0879.s b/res/field/scripts/script_0879.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0879.s +++ b/res/field/scripts/script_0879.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0880.s b/res/field/scripts/script_0880.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0880.s +++ b/res/field/scripts/script_0880.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0881.s b/res/field/scripts/script_0881.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0881.s +++ b/res/field/scripts/script_0881.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0882.s b/res/field/scripts/script_0882.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0882.s +++ b/res/field/scripts/script_0882.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0883.s b/res/field/scripts/script_0883.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0883.s +++ b/res/field/scripts/script_0883.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0884.s b/res/field/scripts/script_0884.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0884.s +++ b/res/field/scripts/script_0884.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0885.s b/res/field/scripts/script_0885.s index 954d049a92..b47284e059 100644 --- a/res/field/scripts/script_0885.s +++ b/res/field/scripts/script_0885.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0886.s b/res/field/scripts/script_0886.s index a1afd7dde8..3161008c48 100644 --- a/res/field/scripts/script_0886.s +++ b/res/field/scripts/script_0886.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0887.s b/res/field/scripts/script_0887.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0887.s +++ b/res/field/scripts/script_0887.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0889.s b/res/field/scripts/script_0889.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0889.s +++ b/res/field/scripts/script_0889.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0891.s b/res/field/scripts/script_0891.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0891.s +++ b/res/field/scripts/script_0891.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0893.s b/res/field/scripts/script_0893.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0893.s +++ b/res/field/scripts/script_0893.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0894.s b/res/field/scripts/script_0894.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0894.s +++ b/res/field/scripts/script_0894.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0895.s b/res/field/scripts/script_0895.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0895.s +++ b/res/field/scripts/script_0895.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0901.s b/res/field/scripts/script_0901.s index c5710964e5..30a1ff21b7 100644 --- a/res/field/scripts/script_0901.s +++ b/res/field/scripts/script_0901.s @@ -3,9 +3,9 @@ .data .byte 4 - .short 1, 0 + MoveAction_001 0 .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0903.s b/res/field/scripts/script_0903.s index 5cc00ab060..7d41bc679a 100644 --- a/res/field/scripts/script_0903.s +++ b/res/field/scripts/script_0903.s @@ -3,9 +3,9 @@ .data .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0904.s b/res/field/scripts/script_0904.s index d446cb9876..5a949b35f8 100644 --- a/res/field/scripts/script_0904.s +++ b/res/field/scripts/script_0904.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0907.s b/res/field/scripts/script_0907.s index 5cc00ab060..7d41bc679a 100644 --- a/res/field/scripts/script_0907.s +++ b/res/field/scripts/script_0907.s @@ -3,9 +3,9 @@ .data .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0909.s b/res/field/scripts/script_0909.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0909.s +++ b/res/field/scripts/script_0909.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0910.s b/res/field/scripts/script_0910.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0910.s +++ b/res/field/scripts/script_0910.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0914.s b/res/field/scripts/script_0914.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0914.s +++ b/res/field/scripts/script_0914.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0917.s b/res/field/scripts/script_0917.s index 36dd9b343a..4abec5f4eb 100644 --- a/res/field/scripts/script_0917.s +++ b/res/field/scripts/script_0917.s @@ -3,9 +3,9 @@ .data .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0918.s b/res/field/scripts/script_0918.s index 7a943829a6..1cd4ad5a02 100644 --- a/res/field/scripts/script_0918.s +++ b/res/field/scripts/script_0918.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0920.s b/res/field/scripts/script_0920.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0920.s +++ b/res/field/scripts/script_0920.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0922.s b/res/field/scripts/script_0922.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0922.s +++ b/res/field/scripts/script_0922.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0923.s b/res/field/scripts/script_0923.s index e58dafb9cc..9bd729c0a1 100644 --- a/res/field/scripts/script_0923.s +++ b/res/field/scripts/script_0923.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 8, 0 + MoveAction_008 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0924.s b/res/field/scripts/script_0924.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0924.s +++ b/res/field/scripts/script_0924.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0929.s b/res/field/scripts/script_0929.s index 283aabfed9..6f72412a0a 100644 --- a/res/field/scripts/script_0929.s +++ b/res/field/scripts/script_0929.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0930.s b/res/field/scripts/script_0930.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0930.s +++ b/res/field/scripts/script_0930.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0932.s b/res/field/scripts/script_0932.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0932.s +++ b/res/field/scripts/script_0932.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0935.s b/res/field/scripts/script_0935.s index 270ef3995c..edad63a2a8 100644 --- a/res/field/scripts/script_0935.s +++ b/res/field/scripts/script_0935.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 10, 0 + MoveAction_00A 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0936.s b/res/field/scripts/script_0936.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0936.s +++ b/res/field/scripts/script_0936.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0938.s b/res/field/scripts/script_0938.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0938.s +++ b/res/field/scripts/script_0938.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0939.s b/res/field/scripts/script_0939.s index 283aabfed9..6f72412a0a 100644 --- a/res/field/scripts/script_0939.s +++ b/res/field/scripts/script_0939.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0940.s b/res/field/scripts/script_0940.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0940.s +++ b/res/field/scripts/script_0940.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0941.s b/res/field/scripts/script_0941.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0941.s +++ b/res/field/scripts/script_0941.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0943.s b/res/field/scripts/script_0943.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0943.s +++ b/res/field/scripts/script_0943.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0944.s b/res/field/scripts/script_0944.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0944.s +++ b/res/field/scripts/script_0944.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0948.s b/res/field/scripts/script_0948.s index ecb0befe06..76c54f8f77 100644 --- a/res/field/scripts/script_0948.s +++ b/res/field/scripts/script_0948.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 3, 0 + MoveAction_003 0 .byte 4 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0949.s b/res/field/scripts/script_0949.s index 30ac476d09..5cd8055d62 100644 --- a/res/field/scripts/script_0949.s +++ b/res/field/scripts/script_0949.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0950.s b/res/field/scripts/script_0950.s index 283aabfed9..6f72412a0a 100644 --- a/res/field/scripts/script_0950.s +++ b/res/field/scripts/script_0950.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 7, 0 + MoveAction_007 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0960.s b/res/field/scripts/script_0960.s index 2b1bbd715c..829610be54 100644 --- a/res/field/scripts/script_0960.s +++ b/res/field/scripts/script_0960.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0961.s b/res/field/scripts/script_0961.s index c412909410..9b03dea53a 100644 --- a/res/field/scripts/script_0961.s +++ b/res/field/scripts/script_0961.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0963.s b/res/field/scripts/script_0963.s index e58dafb9cc..9bd729c0a1 100644 --- a/res/field/scripts/script_0963.s +++ b/res/field/scripts/script_0963.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 8, 0 + MoveAction_008 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0964.s b/res/field/scripts/script_0964.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0964.s +++ b/res/field/scripts/script_0964.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0965.s b/res/field/scripts/script_0965.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0965.s +++ b/res/field/scripts/script_0965.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0967.s b/res/field/scripts/script_0967.s index ce33ceb5f1..55a84507e6 100644 --- a/res/field/scripts/script_0967.s +++ b/res/field/scripts/script_0967.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0973.s b/res/field/scripts/script_0973.s index ecb0befe06..76c54f8f77 100644 --- a/res/field/scripts/script_0973.s +++ b/res/field/scripts/script_0973.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 3, 0 + MoveAction_003 0 .byte 4 - .short 4, 0 + MoveAction_004 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0982.s b/res/field/scripts/script_0982.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0982.s +++ b/res/field/scripts/script_0982.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_0985.s b/res/field/scripts/script_0985.s index e90dbf2f0e..a7a45d03c5 100644 --- a/res/field/scripts/script_0985.s +++ b/res/field/scripts/script_0985.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0986.s b/res/field/scripts/script_0986.s index d92bdb1086..d72721cf31 100644 --- a/res/field/scripts/script_0986.s +++ b/res/field/scripts/script_0986.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0989.s b/res/field/scripts/script_0989.s index 21302fdc69..3ebb0df4bf 100644 --- a/res/field/scripts/script_0989.s +++ b/res/field/scripts/script_0989.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0994.s b/res/field/scripts/script_0994.s index 4bc25c33fd..1a1c5f92c8 100644 --- a/res/field/scripts/script_0994.s +++ b/res/field/scripts/script_0994.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_0998.s b/res/field/scripts/script_0998.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_0998.s +++ b/res/field/scripts/script_0998.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1006.s b/res/field/scripts/script_1006.s index ad73c55873..8f0b39820c 100644 --- a/res/field/scripts/script_1006.s +++ b/res/field/scripts/script_1006.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 10, 0 + MoveAction_00A 0 .byte 3 - .short 11, 0 + MoveAction_00B 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1011.s b/res/field/scripts/script_1011.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_1011.s +++ b/res/field/scripts/script_1011.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1016.s b/res/field/scripts/script_1016.s index 130edb91d5..7581346eb9 100644 --- a/res/field/scripts/script_1016.s +++ b/res/field/scripts/script_1016.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1021.s b/res/field/scripts/script_1021.s index e457f9e161..224d01ce60 100644 --- a/res/field/scripts/script_1021.s +++ b/res/field/scripts/script_1021.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 5, 0 + MoveAction_005 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1026.s b/res/field/scripts/script_1026.s index 75cc8932e7..c155082b22 100644 --- a/res/field/scripts/script_1026.s +++ b/res/field/scripts/script_1026.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 8, 0 + MoveAction_008 0 .byte 4 - .short 9, 0 + MoveAction_009 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1031.s b/res/field/scripts/script_1031.s index d2abfadf1a..2f3de3069e 100644 --- a/res/field/scripts/script_1031.s +++ b/res/field/scripts/script_1031.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 4, 0 + MoveAction_004 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1034.s b/res/field/scripts/script_1034.s index 17a4f8d3b0..d7bf57e370 100644 --- a/res/field/scripts/script_1034.s +++ b/res/field/scripts/script_1034.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 14, 0 + MoveAction_00E 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1039.s b/res/field/scripts/script_1039.s index dab8c9fc3e..db03be5d79 100644 --- a/res/field/scripts/script_1039.s +++ b/res/field/scripts/script_1039.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 8, 0 + MoveAction_008 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1042.s b/res/field/scripts/script_1042.s index 3387003593..c77876fc53 100644 --- a/res/field/scripts/script_1042.s +++ b/res/field/scripts/script_1042.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 1 .long _000B-.-4 .byte 0 diff --git a/res/field/scripts/script_1044.s b/res/field/scripts/script_1044.s index 386872d9a9..16e1c5e8aa 100644 --- a/res/field/scripts/script_1044.s +++ b/res/field/scripts/script_1044.s @@ -3,9 +3,9 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 3 - .short 2, 0 + MoveAction_002 0 .byte 1 .long _0010-.-4 .byte 0 diff --git a/res/field/scripts/script_1045.s b/res/field/scripts/script_1045.s index fda7595d82..1e8a0a5a58 100644 --- a/res/field/scripts/script_1045.s +++ b/res/field/scripts/script_1045.s @@ -3,11 +3,11 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 4 - .short 2, 0 + MoveAction_002 0 .byte 3 - .short 3, 0 + MoveAction_003 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1049.s b/res/field/scripts/script_1049.s index eb11fe2637..33f5a87789 100644 --- a/res/field/scripts/script_1049.s +++ b/res/field/scripts/script_1049.s @@ -3,7 +3,7 @@ .data .byte 2 - .short 1, 0 + MoveAction_001 0 .byte 0 .balign 4, 0 diff --git a/res/field/scripts/script_1051.s b/res/field/scripts/script_1051.s index f6378791e5..ee6d9542ab 100644 --- a/res/field/scripts/script_1051.s +++ b/res/field/scripts/script_1051.s @@ -366,27 +366,27 @@ _046C: .balign 4, 0 _0474: - .short 15, 10 - .short 0xFE, 0x00 + MoveAction_00F 10 + EndMovement .balign 4, 0 _047C: - .short 12, 1 - .short 15, 10 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 10 + EndMovement .balign 4, 0 _0488: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0494: - .short 63, 1 - .short 32, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + MoveAction_023 + EndMovement _04A4: ScrCmd_011 0x40C4, 1 diff --git a/res/field/scripts/script_1052.s b/res/field/scripts/script_1052.s index 041f6ce275..2e93ceeb4c 100644 --- a/res/field/scripts/script_1052.s +++ b/res/field/scripts/script_1052.s @@ -212,198 +212,198 @@ _02EC: .balign 4, 0 _02F0: - .short 62, 6 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 6 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0308: - .short 62, 5 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 5 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0320: - .short 62, 6 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 6 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0338: - .short 62, 7 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 7 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0350: - .short 62, 8 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 8 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0368: - .short 62, 9 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 9 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0380: - .short 62, 10 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 10 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _0398: - .short 62, 11 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_03E 11 + MoveAction_047 + MoveAction_00D + MoveAction_048 + MoveAction_024 + EndMovement .balign 4, 0 _03B0: - .short 36, 1 - .short 75, 1 - .short 63, 1 - .short 62, 1 - .short 0xFE, 0x00 + MoveAction_024 + MoveAction_04B + MoveAction_03F + MoveAction_03E + EndMovement .balign 4, 0 _03C4: - .short 16, 1 - .short 19, 1 - .short 16, 2 - .short 18, 1 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 + MoveAction_010 2 + MoveAction_012 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _03E0: - .short 16, 3 - .short 19, 1 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _03F4: - .short 16, 3 - .short 19, 2 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 2 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _0408: - .short 16, 3 - .short 19, 3 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 3 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _041C: - .short 16, 3 - .short 19, 4 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 4 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _0430: - .short 16, 3 - .short 19, 5 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 5 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _0444: - .short 16, 3 - .short 19, 6 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 6 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _0458: - .short 16, 3 - .short 19, 7 - .short 37, 1 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_010 3 + MoveAction_013 7 + MoveAction_025 + MoveAction_00D + EndMovement .balign 4, 0 _046C: - .short 15, 1 - .short 13, 2 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D 2 + MoveAction_00E + EndMovement .balign 4, 0 _047C: - .short 14, 1 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + EndMovement .balign 4, 0 _0488: - .short 14, 2 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0494: - .short 14, 3 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 3 + MoveAction_00D 2 + EndMovement .balign 4, 0 _04A0: - .short 14, 4 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D 2 + EndMovement .balign 4, 0 _04AC: - .short 14, 5 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 5 + MoveAction_00D 2 + EndMovement .balign 4, 0 _04B8: - .short 14, 6 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 6 + MoveAction_00D 2 + EndMovement .balign 4, 0 _04C4: - .short 14, 7 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 7 + MoveAction_00D 2 + EndMovement _04D0: ScrCmd_060 @@ -446,46 +446,46 @@ _04D0: .balign 4, 0 _0570: - .short 63, 1 - .short 62, 1 - .short 35, 1 - .short 63, 5 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_023 + MoveAction_03F 5 + MoveAction_020 + EndMovement .balign 4, 0 _0588: - .short 0, 1 - .short 71, 1 - .short 13, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_047 + MoveAction_00D + MoveAction_048 + EndMovement .balign 4, 0 _059C: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _05A4: - .short 17, 1 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_024 + EndMovement .balign 4, 0 _05B0: - .short 19, 4 - .short 75, 1 - .short 63, 1 - .short 18, 4 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_013 4 + MoveAction_04B + MoveAction_03F + MoveAction_012 4 + MoveAction_025 + EndMovement .balign 4, 0 _05C8: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement _05D4: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1054.s b/res/field/scripts/script_1054.s index 789a36f626..515ecfb9a2 100644 --- a/res/field/scripts/script_1054.s +++ b/res/field/scripts/script_1054.s @@ -32,24 +32,24 @@ _000E: .balign 4, 0 _0060: - .short 34, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + EndMovement .balign 4, 0 _006C: - .short 18, 4 - .short 16, 1 - .short 18, 3 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_012 4 + MoveAction_010 + MoveAction_012 3 + MoveAction_045 + EndMovement .balign 4, 0 _0080: - .short 63, 2 - .short 13, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00D + MoveAction_020 + EndMovement _0090: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1055.s b/res/field/scripts/script_1055.s index b8e1a457ad..896eb894f5 100644 --- a/res/field/scripts/script_1055.s +++ b/res/field/scripts/script_1055.s @@ -51,27 +51,27 @@ _0064: .balign 4, 0 _00A4: - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_021 + EndMovement .balign 4, 0 _00B0: - .short 32, 1 - .short 75, 1 - .short 63, 1 - .short 12, 1 - .short 15, 3 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + MoveAction_03F + MoveAction_00C + MoveAction_00F 3 + MoveAction_00C 3 + EndMovement .balign 4, 0 _00CC: - .short 13, 2 - .short 14, 3 - .short 13, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D 2 + MoveAction_00E 3 + MoveAction_00D 2 + MoveAction_020 + EndMovement _00E0: ScrCmd_060 @@ -112,15 +112,15 @@ _0158: .balign 4, 0 _0164: - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_021 + EndMovement .balign 4, 0 _0170: - .short 32, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_04B + EndMovement _017C: ScrCmd_060 @@ -150,25 +150,25 @@ _017C: .balign 4, 0 _01D4: - .short 14, 1 - .short 0, 1 - .short 63, 2 - .short 15, 3 - .short 13, 2 - .short 15, 3 - .short 13, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_000 + MoveAction_03F 2 + MoveAction_00F 3 + MoveAction_00D 2 + MoveAction_00F 3 + MoveAction_00D 2 + MoveAction_022 + EndMovement .balign 4, 0 _01F8: - .short 63, 4 - .short 35, 1 - .short 63, 4 - .short 15, 3 - .short 13, 2 - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_03F 4 + MoveAction_023 + MoveAction_03F 4 + MoveAction_00F 3 + MoveAction_00D 2 + MoveAction_00F + EndMovement _0214: ScrCmd_049 0x5DC @@ -646,13 +646,13 @@ _0792: .balign 4, 0 _079C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07A4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .byte 34 .byte 0 @@ -665,160 +665,160 @@ _07A4: .balign 4, 0 _07B4: - .short 33, 1 - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_04B + EndMovement .balign 4, 0 _07C0: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07C8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07D0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _07D8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _07E0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _07E8: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _07F4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07FC: - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0808: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0810: - .short 12, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_023 + EndMovement .balign 4, 0 _081C: - .short 15, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_020 + EndMovement .balign 4, 0 _0828: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0830: - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _083C: - .short 13, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_021 + EndMovement .balign 4, 0 _0848: - .short 14, 2 - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _0858: - .short 13, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_021 + EndMovement .balign 4, 0 _0864: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _086C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0874: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _087C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0884: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _088C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0894: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _089C: - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _08A8: - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_021 + EndMovement .balign 4, 0 _08B4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _08BC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _08C4: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 63 .byte 0 @@ -835,8 +835,8 @@ _08C4: .balign 4, 0 _08D8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement _08E0: ScrCmd_060 @@ -861,9 +861,9 @@ _0904: .balign 4, 0 _0918: - .short 63, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_020 + EndMovement .byte 62 .byte 0 @@ -880,8 +880,8 @@ _0918: .balign 4, 0 _0930: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .byte 33 .byte 0 diff --git a/res/field/scripts/script_1056.s b/res/field/scripts/script_1056.s index 6bd137ba88..4c8b8ba0f8 100644 --- a/res/field/scripts/script_1056.s +++ b/res/field/scripts/script_1056.s @@ -276,189 +276,189 @@ _037D: .balign 4, 0 _0394: - .short 18, 2 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_012 2 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _03A4: - .short 18, 1 - .short 17, 1 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_011 + MoveAction_012 2 + EndMovement .balign 4, 0 _03B4: - .short 18, 1 - .short 17, 2 - .short 18, 3 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_011 2 + MoveAction_012 3 + EndMovement .balign 4, 0 _03C4: - .short 17, 2 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_011 2 + MoveAction_012 2 + EndMovement .balign 4, 0 _03D0: - .short 18, 1 - .short 17, 3 - .short 18, 2 - .short 0xFE, 0x00 + MoveAction_012 + MoveAction_011 3 + MoveAction_012 2 + EndMovement .balign 4, 0 _03E0: - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _03EC: - .short 17, 1 - .short 18, 4 - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_012 4 + MoveAction_010 + EndMovement .balign 4, 0 _03FC: - .short 16, 1 - .short 18, 3 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_012 3 + MoveAction_024 + EndMovement .balign 4, 0 _040C: - .short 16, 1 - .short 18, 5 - .short 36, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_012 5 + MoveAction_024 + EndMovement .balign 4, 0 _041C: - .short 16, 1 - .short 18, 4 - .short 16, 1 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_012 4 + MoveAction_010 + EndMovement .balign 4, 0 _042C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0434: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _043C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0444: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _044C: - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 2 + EndMovement .balign 4, 0 _0454: - .short 19, 1 - .short 17, 1 - .short 39, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_011 + MoveAction_027 + EndMovement .balign 4, 0 _0464: - .short 19, 1 - .short 17, 1 - .short 19, 2 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_011 + MoveAction_013 2 + EndMovement .balign 4, 0 _0474: - .short 19, 1 - .short 17, 2 - .short 19, 1 - .short 0xFE, 0x00 + MoveAction_013 + MoveAction_011 2 + MoveAction_013 + EndMovement .balign 4, 0 _0484: - .short 17, 1 - .short 19, 3 - .short 16, 2 - .short 19, 4 - .short 0xFE, 0x00 + MoveAction_011 + MoveAction_013 3 + MoveAction_010 2 + MoveAction_013 4 + EndMovement .balign 4, 0 _0498: - .short 16, 1 - .short 19, 4 - .short 16, 1 - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 4 + MoveAction_010 + MoveAction_013 3 + EndMovement .balign 4, 0 _04AC: - .short 16, 1 - .short 19, 2 - .short 16, 1 - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 2 + MoveAction_010 + MoveAction_013 3 + EndMovement .balign 4, 0 _04C0: - .short 16, 1 - .short 19, 3 - .short 16, 2 - .short 19, 3 - .short 0xFE, 0x00 + MoveAction_010 + MoveAction_013 3 + MoveAction_010 2 + MoveAction_013 3 + EndMovement .balign 4, 0 _04D4: - .short 63, 1 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _04E4: - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + EndMovement .balign 4, 0 _04F0: - .short 63, 2 - .short 38, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_026 + EndMovement .balign 4, 0 _04FC: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0508: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0514: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0520: - .short 63, 2 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_023 + EndMovement diff --git a/res/field/scripts/script_1059.s b/res/field/scripts/script_1059.s index 63c6454a34..6039c6469e 100644 --- a/res/field/scripts/script_1059.s +++ b/res/field/scripts/script_1059.s @@ -242,106 +242,106 @@ _035E: .balign 4, 0 _03AC: - .short 75, 1 - .short 65, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_041 + EndMovement .balign 4, 0 _03B8: - .short 14, 4 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00C + EndMovement .balign 4, 0 _03C4: - .short 14, 2 - .short 12, 1 - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00C + MoveAction_00E + EndMovement .balign 4, 0 _03D4: - .short 14, 3 - .short 0xFE, 0x00 + MoveAction_00E 3 + EndMovement .balign 4, 0 _03DC: - .short 14, 4 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_001 + EndMovement .balign 4, 0 _03E8: - .short 14, 4 - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D + EndMovement .balign 4, 0 _03F4: - .short 14, 4 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E 4 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0400: - .short 15, 5 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 5 + MoveAction_020 + EndMovement .balign 4, 0 _040C: - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _0418: - .short 12, 1 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _0428: - .short 15, 2 - .short 12, 1 - .short 15, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00C + MoveAction_00F 3 + MoveAction_020 + EndMovement .balign 4, 0 _043C: - .short 12, 2 - .short 15, 5 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 5 + MoveAction_020 + EndMovement .balign 4, 0 _044C: - .short 12, 2 - .short 15, 5 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 5 + MoveAction_020 + EndMovement .balign 4, 0 _045C: - .short 12, 1 - .short 14, 1 - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00E + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _0470: - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03E + MoveAction_023 + EndMovement .balign 4, 0 _047C: - .short 63, 3 - .short 1, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_001 + EndMovement .byte 63 .byte 0 @@ -370,103 +370,103 @@ _047C: .balign 4, 0 _04A0: - .short 63, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_020 + EndMovement .balign 4, 0 _04AC: - .short 63, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_020 + EndMovement .balign 4, 0 _04B8: - .short 63, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_020 + EndMovement .balign 4, 0 _04C4: - .short 13, 1 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _04D4: - .short 15, 2 - .short 15, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00F 2 + MoveAction_020 + EndMovement .balign 4, 0 _04E4: - .short 15, 1 - .short 12, 1 - .short 15, 3 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C + MoveAction_00F 3 + MoveAction_020 + EndMovement .balign 4, 0 _04F8: - .short 12, 1 - .short 15, 2 - .short 12, 1 - .short 15, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_00F 2 + MoveAction_00C + MoveAction_00F 2 + MoveAction_020 + EndMovement .balign 4, 0 _0510: - .short 12, 3 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 3 + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _0520: - .short 12, 4 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 4 + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _0530: - .short 63, 1 - .short 32, 1 - .short 63, 2 - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + MoveAction_03F 2 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _0548: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _0554: - .short 17, 1 - .short 0xFE, 0x00 + MoveAction_011 + EndMovement .balign 4, 0 _055C: - .short 37, 2 - .short 0xFE, 0x00 + MoveAction_025 2 + EndMovement .balign 4, 0 _0564: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _056C: - .short 19, 2 - .short 17, 1 - .short 19, 7 - .short 0xFE, 0x00 + MoveAction_013 2 + MoveAction_011 + MoveAction_013 7 + EndMovement _057C: ScrCmd_060 @@ -622,90 +622,90 @@ _0772: .balign 4, 0 _0798: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07A0: - .short 32, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_020 + MoveAction_045 + EndMovement .balign 4, 0 _07AC: - .short 75, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_020 + EndMovement .balign 4, 0 _07B8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _07C0: - .short 13, 1 - .short 15, 9 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 9 + MoveAction_020 + EndMovement .balign 4, 0 _07D0: - .short 15, 10 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 10 + MoveAction_020 + EndMovement .balign 4, 0 _07DC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _07E4: - .short 63, 1 - .short 33, 1 - .short 62, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03E + MoveAction_022 + EndMovement .balign 4, 0 _07F8: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0800: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement .balign 4, 0 _0808: - .short 15, 10 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 10 + MoveAction_020 + EndMovement .balign 4, 0 _0814: - .short 15, 10 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F 10 + MoveAction_020 + EndMovement .balign 4, 0 _0820: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0828: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0830: - .short 13, 1 - .short 14, 5 - .short 12, 10 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + MoveAction_00C 10 + EndMovement _0840: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1064.s b/res/field/scripts/script_1064.s index ebc610f834..7d58e2df9e 100644 --- a/res/field/scripts/script_1064.s +++ b/res/field/scripts/script_1064.s @@ -126,10 +126,10 @@ _016A: .balign 4, 0 _019C: - .short 35, 1 - .short 62, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_023 + MoveAction_03E + MoveAction_021 + EndMovement _01AC: ScrCmd_002 @@ -344,68 +344,68 @@ _044D: .balign 4, 0 _047C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0484: - .short 65, 1 - .short 12, 8 - .short 15, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_00C 8 + MoveAction_00F + MoveAction_022 + EndMovement .balign 4, 0 _0498: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _04A0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _04A8: - .short 65, 1 - .short 12, 9 - .short 0xFE, 0x00 + MoveAction_041 + MoveAction_00C 9 + EndMovement .balign 4, 0 _04B4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _04BC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _04C4: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _04D0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _04D8: - .short 13, 10 - .short 0xFE, 0x00 + MoveAction_00D 10 + EndMovement .balign 4, 0 _04E0: - .short 102, 1 - .short 0xFE, 0x00 + MoveAction_066 + EndMovement .balign 4, 0 _04E8: - .short 104, 1 - .short 0xFE, 0x00 + MoveAction_068 + EndMovement _04F0: ScrCmd_049 0x5DC @@ -686,21 +686,21 @@ _07E3: .balign 4, 0 _07F8: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0804: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _080C: - .short 34, 1 - .short 63, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F 2 + MoveAction_021 + EndMovement .byte 34 .byte 0 @@ -713,61 +713,61 @@ _080C: .balign 4, 0 _0824: - .short 14, 1 - .short 13, 2 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D 2 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0838: - .short 13, 1 - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E + MoveAction_020 + EndMovement .balign 4, 0 _0848: - .short 13, 1 - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0858: - .short 33, 1 - .short 63, 5 - .short 14, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 5 + MoveAction_00E + MoveAction_023 + EndMovement .balign 4, 0 _086C: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0878: - .short 15, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_020 + EndMovement .balign 4, 0 _0884: - .short 12, 7 - .short 0xFE, 0x00 + MoveAction_00C 7 + EndMovement .balign 4, 0 _088C: - .short 14, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_020 + EndMovement .balign 4, 0 _0898: - .short 13, 9 - .short 0xFE, 0x00 + MoveAction_00D 9 + EndMovement _08A0: ScrCmd_028 0x8006, 0 diff --git a/res/field/scripts/script_1068.s b/res/field/scripts/script_1068.s index e2166f1246..2815df7d45 100644 --- a/res/field/scripts/script_1068.s +++ b/res/field/scripts/script_1068.s @@ -35,13 +35,13 @@ _0030: .balign 4, 0 _005C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0064: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _006C: ScrCmd_049 0x5DC @@ -67,9 +67,9 @@ _0099: .balign 4, 0 _00A4: - .short 0, 1 - .short 63, 3 - .short 0xFE, 0x00 + MoveAction_000 + MoveAction_03F 3 + EndMovement _00B0: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1076.s b/res/field/scripts/script_1076.s index 9ec94d237f..a9c5348370 100644 --- a/res/field/scripts/script_1076.s +++ b/res/field/scripts/script_1076.s @@ -179,36 +179,36 @@ _0168: .balign 4, 0 _01E8: - .short 17, 7 - .short 0xFE, 0x00 + MoveAction_011 7 + EndMovement .balign 4, 0 _01F0: - .short 38, 1 - .short 63, 1 - .short 39, 1 - .short 63, 1 - .short 37, 1 - .short 0xFE, 0x00 + MoveAction_026 + MoveAction_03F + MoveAction_027 + MoveAction_03F + MoveAction_025 + EndMovement .balign 4, 0 _0208: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _0210: - .short 16, 7 - .short 0xFE, 0x00 + MoveAction_010 7 + EndMovement .balign 4, 0 _0218: - .short 63, 1 - .short 75, 1 - .short 63, 3 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_04B + MoveAction_03F 3 + EndMovement .balign 4, 0 _0228: - .short 0, 1 - .short 0xFE, 0x00 + MoveAction_000 + EndMovement diff --git a/res/field/scripts/script_1086.s b/res/field/scripts/script_1086.s index 0f0ff717af..62b5db9d5b 100644 --- a/res/field/scripts/script_1086.s +++ b/res/field/scripts/script_1086.s @@ -118,61 +118,61 @@ _0191: .balign 4, 0 _0198: - .short 18, 3 - .short 17, 9 - .short 0xFE, 0x00 + MoveAction_012 3 + MoveAction_011 9 + EndMovement .balign 4, 0 _01A4: - .short 17, 2 - .short 18, 3 - .short 17, 7 - .short 0xFE, 0x00 + MoveAction_011 2 + MoveAction_012 3 + MoveAction_011 7 + EndMovement .balign 4, 0 _01B4: - .short 12, 8 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_00E 2 + EndMovement .balign 4, 0 _01C0: - .short 12, 8 - .short 14, 2 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_00E 2 + MoveAction_020 + EndMovement .balign 4, 0 _01D0: - .short 12, 8 - .short 14, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 8 + MoveAction_00E 4 + MoveAction_020 + EndMovement .balign 4, 0 _01E0: - .short 34, 1 - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _01F0: - .short 63, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 3 + MoveAction_021 + EndMovement .balign 4, 0 _01FC: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _0204: - .short 63, 8 - .short 62, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F 8 + MoveAction_03E + MoveAction_023 + EndMovement .byte 63 .byte 0 @@ -217,13 +217,13 @@ _024A: .balign 4, 0 _025C: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0264: - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_002 + EndMovement _026C: ScrCmd_049 0x5DC @@ -265,24 +265,24 @@ _0294: .balign 4, 0 _02E0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _02E8: - .short 75, 1 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_04B + MoveAction_00E 2 + EndMovement .balign 4, 0 _02F4: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _02FC: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0304: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1095.s b/res/field/scripts/script_1095.s index 4f4df72d0a..ba880a959b 100644 --- a/res/field/scripts/script_1095.s +++ b/res/field/scripts/script_1095.s @@ -275,82 +275,82 @@ _0393: .balign 4, 0 _039C: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 5 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 5 + MoveAction_020 + EndMovement .balign 4, 0 _03B4: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 4 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 4 + MoveAction_020 + EndMovement .balign 4, 0 _03CC: - .short 14, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C + EndMovement .balign 4, 0 _03D8: - .short 15, 1 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00C + EndMovement .balign 4, 0 _03E4: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _03EC: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _03F4: - .short 63, 1 - .short 3, 1 - .short 71, 1 - .short 18, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_003 + MoveAction_047 + MoveAction_012 + MoveAction_048 + EndMovement .balign 4, 0 _040C: - .short 63, 1 - .short 2, 1 - .short 71, 1 - .short 19, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_002 + MoveAction_047 + MoveAction_013 + MoveAction_048 + EndMovement .balign 4, 0 _0424: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _042C: - .short 15, 1 - .short 0xFE, 0x00 + MoveAction_00F + EndMovement .balign 4, 0 _0434: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _043C: - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_023 + EndMovement .byte 12 .byte 0 @@ -367,14 +367,14 @@ _043C: .balign 4, 0 _0454: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _045C: - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_022 + EndMovement .byte 12 .byte 0 @@ -391,91 +391,91 @@ _045C: .balign 4, 0 _0474: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement .balign 4, 0 _047C: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0488: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 5 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 5 + MoveAction_00C + EndMovement .balign 4, 0 _04A0: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 4 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 4 + MoveAction_00C + EndMovement .balign 4, 0 _04B8: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _04C0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _04CC: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _04D8: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _04E0: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _04E8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _04F0: - .short 13, 1 - .short 14, 5 - .short 13, 1 - .short 14, 1 - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + MoveAction_00D + MoveAction_00E + MoveAction_00D 6 + EndMovement .balign 4, 0 _0508: - .short 13, 1 - .short 14, 4 - .short 13, 1 - .short 14, 1 - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 4 + MoveAction_00D + MoveAction_00E + MoveAction_00D 6 + EndMovement .balign 4, 0 _0520: - .short 13, 1 - .short 14, 5 - .short 13, 1 - .short 14, 1 - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + MoveAction_00D + MoveAction_00E + MoveAction_00D 6 + EndMovement _0538: ScrCmd_049 0x5DC @@ -647,108 +647,108 @@ _079C: .balign 4, 0 _07B0: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 5 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 5 + MoveAction_00C + EndMovement .balign 4, 0 _07C8: - .short 12, 6 - .short 15, 1 - .short 12, 1 - .short 15, 4 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C 6 + MoveAction_00F + MoveAction_00C + MoveAction_00F 4 + MoveAction_00C + EndMovement .balign 4, 0 _07E0: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _07E8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _07F0: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _07F8: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _0800: - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _080C: - .short 12, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_023 + EndMovement .balign 4, 0 _0818: - .short 13, 1 - .short 14, 5 - .short 13, 1 - .short 14, 1 - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 5 + MoveAction_00D + MoveAction_00E + MoveAction_00D 6 + EndMovement .balign 4, 0 _0830: - .short 13, 1 - .short 14, 4 - .short 13, 1 - .short 14, 1 - .short 13, 6 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 4 + MoveAction_00D + MoveAction_00E + MoveAction_00D 6 + EndMovement .balign 4, 0 _0848: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0850: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement .balign 4, 0 _0858: - .short 63, 1 - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_020 + EndMovement .balign 4, 0 _0864: - .short 63, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + EndMovement .balign 4, 0 _0870: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _087C: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0888: - .short 63, 2 - .short 2, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_002 + EndMovement diff --git a/res/field/scripts/script_1096.s b/res/field/scripts/script_1096.s index a6b83372a4..a44ec98a52 100644 --- a/res/field/scripts/script_1096.s +++ b/res/field/scripts/script_1096.s @@ -113,14 +113,14 @@ _00D5: .balign 4, 0 _011C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0124: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement _0130: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1101.s b/res/field/scripts/script_1101.s index c925a7d061..eb85bfac8e 100644 --- a/res/field/scripts/script_1101.s +++ b/res/field/scripts/script_1101.s @@ -158,46 +158,46 @@ _01FD: .balign 4, 0 _0214: - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0220: - .short 63, 1 - .short 33, 1 - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_021 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _0234: - .short 63, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_022 + EndMovement .balign 4, 0 _0240: - .short 14, 1 - .short 13, 1 - .short 14, 3 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + MoveAction_00E 3 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0254: - .short 13, 1 - .short 14, 4 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00E 4 + MoveAction_00D 2 + EndMovement .balign 4, 0 _0264: - .short 14, 1 - .short 13, 1 - .short 14, 3 - .short 13, 2 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00D + MoveAction_00E 3 + MoveAction_00D 2 + EndMovement _0278: ScrCmd_060 @@ -214,14 +214,14 @@ _0278: .balign 4, 0 _02A0: - .short 75, 1 - .short 0xFE, 0x00 + MoveAction_04B + EndMovement .balign 4, 0 _02A8: - .short 12, 2 - .short 15, 4 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_00F 4 + EndMovement _02B4: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1104.s b/res/field/scripts/script_1104.s index 6a70cdb558..f5e23ad462 100644 --- a/res/field/scripts/script_1104.s +++ b/res/field/scripts/script_1104.s @@ -251,88 +251,88 @@ _0312: .balign 4, 0 _0328: - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0334: - .short 13, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_022 + EndMovement .balign 4, 0 _0340: - .short 13, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_022 + EndMovement .balign 4, 0 _034C: - .short 12, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_022 + EndMovement .balign 4, 0 _0358: - .short 15, 6 - .short 12, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F 6 + MoveAction_00C 2 + MoveAction_021 + EndMovement .balign 4, 0 _0368: - .short 15, 6 - .short 12, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F 6 + MoveAction_00C 3 + MoveAction_021 + EndMovement .balign 4, 0 _0378: - .short 15, 6 - .short 12, 4 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F 6 + MoveAction_00C 4 + MoveAction_021 + EndMovement .balign 4, 0 _0388: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement .balign 4, 0 _0390: - .short 12, 1 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_045 + EndMovement .balign 4, 0 _039C: - .short 15, 7 - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00F 7 + MoveAction_00C + EndMovement .balign 4, 0 _03A8: - .short 15, 7 - .short 12, 2 - .short 0xFE, 0x00 + MoveAction_00F 7 + MoveAction_00C 2 + EndMovement .balign 4, 0 _03B4: - .short 15, 7 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00F 7 + MoveAction_00C 3 + EndMovement .balign 4, 0 _03C0: - .short 12, 2 - .short 69, 1 - .short 0xFE, 0x00 + MoveAction_00C 2 + MoveAction_045 + EndMovement .balign 4, 0 _03CC: - .short 14, 1 - .short 0xFE, 0x00 + MoveAction_00E + EndMovement _03D4: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1109.s b/res/field/scripts/script_1109.s index f6c374a518..eedc219cb8 100644 --- a/res/field/scripts/script_1109.s +++ b/res/field/scripts/script_1109.s @@ -52,11 +52,11 @@ _0078: .balign 4, 0 _00AC: - .short 2, 1 - .short 71, 1 - .short 15, 1 - .short 72, 1 - .short 0xFE, 0x00 + MoveAction_002 + MoveAction_047 + MoveAction_00F + MoveAction_048 + EndMovement _00C0: ScrCmd_0CD 0 diff --git a/res/field/scripts/script_1110.s b/res/field/scripts/script_1110.s index 5aa5a47ca6..4d3ceb77c1 100644 --- a/res/field/scripts/script_1110.s +++ b/res/field/scripts/script_1110.s @@ -158,93 +158,93 @@ _01F3: .balign 4, 0 _0210: - .short 15, 2 - .short 13, 2 - .short 15, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D 2 + MoveAction_00F 3 + MoveAction_022 + EndMovement .balign 4, 0 _0224: - .short 13, 1 - .short 15, 1 - .short 13, 1 - .short 15, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F + MoveAction_00D + MoveAction_00F 4 + MoveAction_022 + EndMovement .balign 4, 0 _023C: - .short 15, 2 - .short 13, 2 - .short 15, 3 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F 2 + MoveAction_00D 2 + MoveAction_00F 3 + MoveAction_022 + EndMovement .balign 4, 0 _0250: - .short 15, 1 - .short 13, 1 - .short 15, 2 - .short 13, 1 - .short 15, 2 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_00F + MoveAction_00D + MoveAction_00F 2 + MoveAction_00D + MoveAction_00F 2 + MoveAction_022 + EndMovement .balign 4, 0 _026C: - .short 15, 3 - .short 13, 2 - .short 15, 2 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00F 3 + MoveAction_00D 2 + MoveAction_00F 2 + MoveAction_021 + EndMovement .balign 4, 0 _0280: - .short 63, 2 - .short 13, 2 - .short 15, 3 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00D 2 + MoveAction_00F 3 + MoveAction_021 + EndMovement .balign 4, 0 _0294: - .short 13, 1 - .short 15, 3 - .short 13, 2 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D + MoveAction_00F 3 + MoveAction_00D 2 + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _02AC: - .short 63, 2 - .short 15, 3 - .short 13, 1 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_03F 2 + MoveAction_00F 3 + MoveAction_00D + MoveAction_00F + MoveAction_021 + EndMovement .balign 4, 0 _02C4: - .short 13, 1 - .short 0xFE, 0x00 + MoveAction_00D + EndMovement .balign 4, 0 _02CC: - .short 15, 3 - .short 0xFE, 0x00 + MoveAction_00F 3 + EndMovement .balign 4, 0 _02D4: - .short 12, 4 - .short 0xFE, 0x00 + MoveAction_00C 4 + EndMovement .balign 4, 0 _02DC: - .short 12, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00C + MoveAction_021 + EndMovement _02E8: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1111.s b/res/field/scripts/script_1111.s index 8acea85cc9..48c2a6fc77 100644 --- a/res/field/scripts/script_1111.s +++ b/res/field/scripts/script_1111.s @@ -108,5 +108,5 @@ _0164: .balign 4, 0 _017C: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement diff --git a/res/field/scripts/script_1112.s b/res/field/scripts/script_1112.s index b0efa53343..7574b0f317 100644 --- a/res/field/scripts/script_1112.s +++ b/res/field/scripts/script_1112.s @@ -760,14 +760,14 @@ _0917: .balign 4, 0 _0930: - .short 63, 1 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_023 + EndMovement .balign 4, 0 _093C: - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_022 + EndMovement _0944: ScrCmd_049 0x5DC @@ -897,14 +897,14 @@ _0AC8: .balign 4, 0 _0AD8: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .balign 4, 0 _0AE0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement _0AEC: ScrCmd_031 @@ -931,17 +931,17 @@ _0AF4: .balign 4, 0 _0B3C: - .short 33, 1 - .short 63, 5 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 5 + MoveAction_022 + EndMovement .balign 4, 0 _0B4C: - .short 14, 2 - .short 12, 5 - .short 14, 3 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00C 5 + MoveAction_00E 3 + EndMovement _0B5C: ScrCmd_060 @@ -962,15 +962,15 @@ _0B5C: .balign 4, 0 _0BA4: - .short 15, 8 - .short 0xFE, 0x00 + MoveAction_00F 8 + EndMovement .balign 4, 0 _0BAC: - .short 33, 1 - .short 63, 3 - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 3 + MoveAction_023 + EndMovement _0BBC: ScrCmd_060 @@ -991,17 +991,17 @@ _0BBC: .balign 4, 0 _0C04: - .short 14, 2 - .short 12, 3 - .short 14, 2 - .short 0xFE, 0x00 + MoveAction_00E 2 + MoveAction_00C 3 + MoveAction_00E 2 + EndMovement .balign 4, 0 _0C14: - .short 33, 1 - .short 63, 4 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 4 + MoveAction_022 + EndMovement _0C24: ScrCmd_060 @@ -1022,16 +1022,16 @@ _0C24: .balign 4, 0 _0C6C: - .short 14, 8 - .short 12, 6 - .short 0xFE, 0x00 + MoveAction_00E 8 + MoveAction_00C 6 + EndMovement .balign 4, 0 _0C78: - .short 33, 1 - .short 63, 5 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 5 + MoveAction_022 + EndMovement _0C88: ScrCmd_049 0x5DC @@ -1596,21 +1596,21 @@ _1436: .balign 4, 0 _1454: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _145C: - .short 14, 1 - .short 12, 3 - .short 0xFE, 0x00 + MoveAction_00E + MoveAction_00C 3 + EndMovement .balign 4, 0 _1468: - .short 13, 3 - .short 15, 1 - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_00D 3 + MoveAction_00F + MoveAction_021 + EndMovement _1478: ScrCmd_02C 1 @@ -1645,14 +1645,14 @@ _1485: .balign 4, 0 _14F0: - .short 63, 1 - .short 34, 1 - .short 0xFE, 0x00 + MoveAction_03F + MoveAction_022 + EndMovement .balign 4, 0 _14FC: - .short 35, 1 - .short 0xFE, 0x00 + MoveAction_023 + EndMovement .byte 13 .byte 0 @@ -1735,13 +1735,13 @@ _15F3: .balign 4, 0 _1614: - .short 33, 1 - .short 0xFE, 0x00 + MoveAction_021 + EndMovement .balign 4, 0 _161C: - .short 12, 1 - .short 0xFE, 0x00 + MoveAction_00C + EndMovement _1624: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1113.s b/res/field/scripts/script_1113.s index 9f3ed406df..f81ceb9631 100644 --- a/res/field/scripts/script_1113.s +++ b/res/field/scripts/script_1113.s @@ -21,8 +21,8 @@ _000E: .balign 4, 0 _002C: - .short 32, 1 - .short 0xFE, 0x00 + MoveAction_020 + EndMovement _0034: ScrCmd_049 0x5DC diff --git a/res/field/scripts/script_1114.s b/res/field/scripts/script_1114.s index 8737cbdd4e..f33ae824ea 100644 --- a/res/field/scripts/script_1114.s +++ b/res/field/scripts/script_1114.s @@ -1060,8 +1060,8 @@ _1043: .balign 4, 0 _104C: - .short 101, 1 - .short 0xFE, 0x00 + MoveAction_065 + EndMovement _1054: ScrCmd_060 diff --git a/res/field/scripts/script_1117.s b/res/field/scripts/script_1117.s index af182e2802..f6ed5496fd 100644 --- a/res/field/scripts/script_1117.s +++ b/res/field/scripts/script_1117.s @@ -212,34 +212,34 @@ _0289: .balign 4, 0 _02D4: - .short 34, 1 - .short 75, 1 - .short 63, 1 - .short 0xFE, 0x00 + MoveAction_022 + MoveAction_04B + MoveAction_03F + EndMovement .balign 4, 0 _02E4: - .short 33, 1 - .short 63, 2 - .short 0xFE, 0x00 + MoveAction_021 + MoveAction_03F 2 + EndMovement .balign 4, 0 _02F0: - .short 3, 1 - .short 61, 1 - .short 0, 1 - .short 61, 1 - .short 2, 1 - .short 61, 1 - .short 1, 1 - .short 61, 1 - .short 3, 1 - .short 60, 1 - .short 0, 1 - .short 60, 1 - .short 2, 1 - .short 60, 1 - .short 1, 1 - .short 67, 1 - .short 63, 2 - .short 0xFE, 0x00 + MoveAction_003 + MoveAction_03D + MoveAction_000 + MoveAction_03D + MoveAction_002 + MoveAction_03D + MoveAction_001 + MoveAction_03D + MoveAction_003 + MoveAction_03C + MoveAction_000 + MoveAction_03C + MoveAction_002 + MoveAction_03C + MoveAction_001 + MoveAction_043 + MoveAction_03F 2 + EndMovement