From 86021bdfc2df6ca9facf8ddf1a2d37fea2c337e9 Mon Sep 17 00:00:00 2001
From: Rachel <lhearachel@proton.me>
Date: Sat, 6 Apr 2024 09:47:38 -0700
Subject: [PATCH] Flip y and z nomenclature in events structure

---
 res/field/events/events_0001.json |  84 ++++----
 res/field/events/events_0002.json | 236 +++++++++++-----------
 res/field/events/events_0003.json |  26 +--
 res/field/events/events_0004.json |   2 +-
 res/field/events/events_0005.json |  34 ++--
 res/field/events/events_0006.json |  16 +-
 res/field/events/events_0007.json |  26 +--
 res/field/events/events_0008.json |  20 +-
 res/field/events/events_0009.json |  30 +--
 res/field/events/events_0010.json |  26 +--
 res/field/events/events_0011.json |  24 +--
 res/field/events/events_0012.json |  26 +--
 res/field/events/events_0013.json |  16 +-
 res/field/events/events_0014.json |  58 +++---
 res/field/events/events_0015.json |  30 +--
 res/field/events/events_0016.json |  26 +--
 res/field/events/events_0017.json |  10 +-
 res/field/events/events_0018.json |  16 +-
 res/field/events/events_0019.json |  16 +-
 res/field/events/events_0020.json |   8 +-
 res/field/events/events_0021.json |   2 +-
 res/field/events/events_0022.json |   2 +-
 res/field/events/events_0023.json |  20 +-
 res/field/events/events_0024.json |  12 +-
 res/field/events/events_0025.json |  12 +-
 res/field/events/events_0026.json |   6 +-
 res/field/events/events_0027.json | 106 +++++-----
 res/field/events/events_0028.json |  46 ++---
 res/field/events/events_0029.json |  16 +-
 res/field/events/events_0030.json |   2 +-
 res/field/events/events_0031.json |   2 +-
 res/field/events/events_0032.json | 118 +++++------
 res/field/events/events_0033.json |  22 +-
 res/field/events/events_0034.json |  74 ++++---
 res/field/events/events_0035.json |  34 ++--
 res/field/events/events_0036.json |  16 +-
 res/field/events/events_0037.json | 100 +++++-----
 res/field/events/events_0038.json | 152 +++++++-------
 res/field/events/events_0039.json | 110 +++++-----
 res/field/events/events_0040.json |  10 +-
 res/field/events/events_0041.json |   6 +-
 res/field/events/events_0042.json |   6 +-
 res/field/events/events_0043.json |  14 +-
 res/field/events/events_0044.json | 184 ++++++++---------
 res/field/events/events_0045.json |  22 +-
 res/field/events/events_0046.json |  34 ++--
 res/field/events/events_0047.json |  42 ++--
 res/field/events/events_0048.json |  16 +-
 res/field/events/events_0049.json |  16 +-
 res/field/events/events_0050.json |  20 +-
 res/field/events/events_0051.json |  12 +-
 res/field/events/events_0052.json |  14 +-
 res/field/events/events_0053.json |  16 +-
 res/field/events/events_0054.json |  16 +-
 res/field/events/events_0055.json |  16 +-
 res/field/events/events_0056.json |   6 +-
 res/field/events/events_0057.json |  10 +-
 res/field/events/events_0058.json | 162 +++++++--------
 res/field/events/events_0059.json |  14 +-
 res/field/events/events_0060.json |  16 +-
 res/field/events/events_0061.json |  16 +-
 res/field/events/events_0062.json |  10 +-
 res/field/events/events_0063.json |   6 +-
 res/field/events/events_0064.json | 272 +++++++++++++------------
 res/field/events/events_0065.json |  22 +-
 res/field/events/events_0066.json |  32 +--
 res/field/events/events_0067.json |   2 +-
 res/field/events/events_0068.json |  34 ++--
 res/field/events/events_0069.json |  20 +-
 res/field/events/events_0070.json |  30 +--
 res/field/events/events_0071.json |  48 +++--
 res/field/events/events_0072.json |  32 +--
 res/field/events/events_0073.json |  36 ++--
 res/field/events/events_0074.json |  36 ++--
 res/field/events/events_0075.json |  16 +-
 res/field/events/events_0076.json |  16 +-
 res/field/events/events_0077.json |  20 +-
 res/field/events/events_0078.json |   6 +-
 res/field/events/events_0079.json |  40 ++--
 res/field/events/events_0080.json |  14 +-
 res/field/events/events_0081.json |   6 +-
 res/field/events/events_0082.json |  14 +-
 res/field/events/events_0083.json |  26 +--
 res/field/events/events_0085.json | 208 +++++++++----------
 res/field/events/events_0086.json |  22 +-
 res/field/events/events_0087.json |  22 +-
 res/field/events/events_0088.json |  24 ++-
 res/field/events/events_0089.json |  44 ++--
 res/field/events/events_0090.json |  22 +-
 res/field/events/events_0091.json |  10 +-
 res/field/events/events_0092.json |  24 +--
 res/field/events/events_0093.json |  10 +-
 res/field/events/events_0094.json |  24 +--
 res/field/events/events_0095.json |  10 +-
 res/field/events/events_0096.json |  10 +-
 res/field/events/events_0097.json |  10 +-
 res/field/events/events_0098.json |  10 +-
 res/field/events/events_0099.json |   6 +-
 res/field/events/events_0100.json |  30 +--
 res/field/events/events_0101.json |  16 +-
 res/field/events/events_0102.json |  20 +-
 res/field/events/events_0103.json |  10 +-
 res/field/events/events_0104.json |   6 +-
 res/field/events/events_0105.json |  26 +--
 res/field/events/events_0106.json |  20 +-
 res/field/events/events_0107.json |  16 +-
 res/field/events/events_0108.json |  16 +-
 res/field/events/events_0109.json |  20 +-
 res/field/events/events_0110.json |  20 +-
 res/field/events/events_0111.json |  36 ++--
 res/field/events/events_0112.json |  18 +-
 res/field/events/events_0113.json |   6 +-
 res/field/events/events_0114.json |   6 +-
 res/field/events/events_0115.json |  26 +--
 res/field/events/events_0116.json |  72 +++----
 res/field/events/events_0117.json | 124 ++++++------
 res/field/events/events_0118.json |  38 ++--
 res/field/events/events_0119.json | 200 ++++++++++---------
 res/field/events/events_0120.json |  26 +--
 res/field/events/events_0121.json | 138 +++++++------
 res/field/events/events_0122.json |  26 +--
 res/field/events/events_0123.json |  20 +-
 res/field/events/events_0124.json |  26 +--
 res/field/events/events_0125.json |  30 +--
 res/field/events/events_0126.json |  10 +-
 res/field/events/events_0127.json |  10 +-
 res/field/events/events_0128.json |  10 +-
 res/field/events/events_0129.json |  14 +-
 res/field/events/events_0130.json |  14 +-
 res/field/events/events_0131.json | 230 +++++++++++----------
 res/field/events/events_0132.json |  62 +++---
 res/field/events/events_0133.json |  26 +--
 res/field/events/events_0134.json |  16 +-
 res/field/events/events_0135.json |  90 ++++-----
 res/field/events/events_0136.json |  40 ++--
 res/field/events/events_0137.json |  38 ++--
 res/field/events/events_0138.json |  34 ++--
 res/field/events/events_0139.json |  34 ++--
 res/field/events/events_0140.json |  32 +--
 res/field/events/events_0141.json |   6 +-
 res/field/events/events_0142.json |  32 +--
 res/field/events/events_0143.json |  14 +-
 res/field/events/events_0144.json |  10 +-
 res/field/events/events_0145.json |  14 +-
 res/field/events/events_0146.json |  10 +-
 res/field/events/events_0147.json |  14 +-
 res/field/events/events_0148.json |   8 +-
 res/field/events/events_0149.json | 132 ++++++------
 res/field/events/events_0150.json |  30 +--
 res/field/events/events_0151.json |  16 +-
 res/field/events/events_0152.json |  22 +-
 res/field/events/events_0153.json |  40 ++--
 res/field/events/events_0154.json |  52 ++---
 res/field/events/events_0155.json |  70 ++++---
 res/field/events/events_0156.json |  22 +-
 res/field/events/events_0157.json |   6 +-
 res/field/events/events_0158.json |  30 +--
 res/field/events/events_0159.json |  10 +-
 res/field/events/events_0160.json |  10 +-
 res/field/events/events_0161.json |  10 +-
 res/field/events/events_0162.json |   6 +-
 res/field/events/events_0163.json |  18 +-
 res/field/events/events_0164.json |  78 ++++----
 res/field/events/events_0165.json |  22 +-
 res/field/events/events_0166.json | 142 +++++++------
 res/field/events/events_0167.json |  34 ++--
 res/field/events/events_0168.json |  16 +-
 res/field/events/events_0169.json |  10 +-
 res/field/events/events_0170.json |  14 +-
 res/field/events/events_0171.json |  64 +++---
 res/field/events/events_0172.json |  18 +-
 res/field/events/events_0173.json |  16 +-
 res/field/events/events_0174.json |  44 ++--
 res/field/events/events_0175.json |  12 +-
 res/field/events/events_0176.json |  16 +-
 res/field/events/events_0177.json |  12 +-
 res/field/events/events_0178.json |  16 +-
 res/field/events/events_0179.json |  12 +-
 res/field/events/events_0180.json |  16 +-
 res/field/events/events_0181.json |  12 +-
 res/field/events/events_0182.json |  16 +-
 res/field/events/events_0183.json |  12 +-
 res/field/events/events_0184.json |   8 +-
 res/field/events/events_0185.json |  12 +-
 res/field/events/events_0186.json |  10 +-
 res/field/events/events_0187.json | 172 ++++++++--------
 res/field/events/events_0188.json |  30 +--
 res/field/events/events_0189.json |  16 +-
 res/field/events/events_0190.json |  18 +-
 res/field/events/events_0191.json |  26 +--
 res/field/events/events_0192.json |  12 +-
 res/field/events/events_0193.json |  14 +-
 res/field/events/events_0194.json |  18 +-
 res/field/events/events_0196.json |  28 +--
 res/field/events/events_0197.json |  46 ++---
 res/field/events/events_0198.json |  58 +++---
 res/field/events/events_0199.json |  58 +++---
 res/field/events/events_0200.json |  60 +++---
 res/field/events/events_0201.json | 170 +++++++++-------
 res/field/events/events_0202.json |  50 +++--
 res/field/events/events_0203.json |  70 ++++---
 res/field/events/events_0204.json |  54 ++---
 res/field/events/events_0205.json |  64 +++---
 res/field/events/events_0206.json |  26 ++-
 res/field/events/events_0207.json |  62 +++---
 res/field/events/events_0208.json |  62 +++---
 res/field/events/events_0209.json |  91 +++++----
 res/field/events/events_0210.json |   8 +-
 res/field/events/events_0211.json |  28 +--
 res/field/events/events_0212.json |  18 +-
 res/field/events/events_0213.json | 109 +++++-----
 res/field/events/events_0214.json |  12 +-
 res/field/events/events_0215.json | 104 +++++-----
 res/field/events/events_0216.json | 116 +++++------
 res/field/events/events_0217.json |  50 ++---
 res/field/events/events_0218.json |  34 ++--
 res/field/events/events_0220.json |  16 +-
 res/field/events/events_0221.json |  20 +-
 res/field/events/events_0222.json |   2 +-
 res/field/events/events_0223.json |   6 +-
 res/field/events/events_0224.json |  12 +-
 res/field/events/events_0225.json |   2 +-
 res/field/events/events_0226.json |  16 +-
 res/field/events/events_0227.json |   2 +-
 res/field/events/events_0228.json |   2 +-
 res/field/events/events_0229.json |   2 +-
 res/field/events/events_0230.json |   2 +-
 res/field/events/events_0231.json |   6 +-
 res/field/events/events_0232.json |   6 +-
 res/field/events/events_0233.json |   8 +-
 res/field/events/events_0234.json |   8 +-
 res/field/events/events_0235.json |  30 +--
 res/field/events/events_0236.json |   2 +-
 res/field/events/events_0237.json |   2 +-
 res/field/events/events_0238.json | 110 +++++-----
 res/field/events/events_0239.json | 162 ++++++++-------
 res/field/events/events_0240.json |  66 +++---
 res/field/events/events_0241.json | 220 +++++++++++---------
 res/field/events/events_0242.json |   4 +-
 res/field/events/events_0243.json |   4 +-
 res/field/events/events_0245.json |  16 +-
 res/field/events/events_0246.json | 320 +++++++++++++++---------------
 res/field/events/events_0247.json | 128 ++++++------
 res/field/events/events_0249.json |  94 ++++-----
 res/field/events/events_0250.json |  10 +-
 res/field/events/events_0251.json |  66 +++---
 res/field/events/events_0252.json |  74 +++----
 res/field/events/events_0253.json |  20 +-
 res/field/events/events_0254.json |  12 +-
 res/field/events/events_0255.json |  46 +++--
 res/field/events/events_0256.json |  76 +++----
 res/field/events/events_0257.json | 244 +++++++++++++----------
 res/field/events/events_0258.json |  46 ++---
 res/field/events/events_0259.json |  10 +-
 res/field/events/events_0260.json |  22 +-
 res/field/events/events_0261.json |  20 +-
 res/field/events/events_0262.json |  32 +--
 res/field/events/events_0263.json |  52 ++---
 res/field/events/events_0264.json |  52 ++---
 res/field/events/events_0265.json |  60 +++---
 res/field/events/events_0266.json |   4 +-
 res/field/events/events_0267.json |  16 +-
 res/field/events/events_0268.json |   8 +-
 res/field/events/events_0269.json |  12 +-
 res/field/events/events_0270.json |   8 +-
 res/field/events/events_0271.json |  12 +-
 res/field/events/events_0272.json |   6 +-
 res/field/events/events_0273.json | 184 +++++++++--------
 res/field/events/events_0274.json |  24 +--
 res/field/events/events_0275.json |  10 +-
 res/field/events/events_0276.json |   4 +-
 res/field/events/events_0277.json |  18 +-
 res/field/events/events_0278.json |   6 +-
 res/field/events/events_0279.json |  18 +-
 res/field/events/events_0280.json |  38 ++--
 res/field/events/events_0281.json |  30 +--
 res/field/events/events_0282.json | 148 ++++++++------
 res/field/events/events_0283.json |  20 +-
 res/field/events/events_0284.json |  14 +-
 res/field/events/events_0285.json |  18 +-
 res/field/events/events_0286.json |  12 +-
 res/field/events/events_0287.json |  12 +-
 res/field/events/events_0288.json |   6 +-
 res/field/events/events_0289.json |  14 +-
 res/field/events/events_0290.json |   2 +-
 res/field/events/events_0291.json |  10 +-
 res/field/events/events_0292.json |   6 +-
 res/field/events/events_0293.json |  90 +++++----
 res/field/events/events_0294.json | 122 ++++++------
 res/field/events/events_0295.json |  91 +++++----
 res/field/events/events_0296.json |  48 ++---
 res/field/events/events_0297.json |   8 +-
 res/field/events/events_0298.json |  50 ++---
 res/field/events/events_0299.json |  32 +--
 res/field/events/events_0300.json |  58 +++---
 res/field/events/events_0301.json |  10 +-
 res/field/events/events_0302.json | 142 ++++++-------
 res/field/events/events_0303.json |  14 +-
 res/field/events/events_0304.json |  12 +-
 res/field/events/events_0305.json |  12 +-
 res/field/events/events_0306.json |  22 +-
 res/field/events/events_0307.json |   6 +-
 res/field/events/events_0308.json |  20 +-
 res/field/events/events_0309.json |   8 +-
 res/field/events/events_0310.json |  72 +++----
 res/field/events/events_0311.json |  40 ++--
 res/field/events/events_0312.json |  78 ++++----
 res/field/events/events_0313.json |   4 +-
 res/field/events/events_0314.json |   4 +-
 res/field/events/events_0315.json |  16 +-
 res/field/events/events_0316.json |  12 +-
 res/field/events/events_0317.json |  24 +--
 res/field/events/events_0318.json |  12 +-
 res/field/events/events_0319.json |  12 +-
 res/field/events/events_0320.json |  28 +--
 res/field/events/events_0322.json |  86 ++++----
 res/field/events/events_0323.json |  78 ++++----
 res/field/events/events_0324.json |   6 +-
 res/field/events/events_0325.json |   6 +-
 res/field/events/events_0326.json |  36 ++--
 res/field/events/events_0327.json |   4 +-
 res/field/events/events_0328.json | 108 +++++-----
 res/field/events/events_0329.json |  68 ++++---
 res/field/events/events_0330.json | 102 ++++++----
 res/field/events/events_0331.json |  58 +++---
 res/field/events/events_0332.json |  70 ++++---
 res/field/events/events_0333.json | 214 +++++++++++---------
 res/field/events/events_0334.json |  10 +-
 res/field/events/events_0335.json |  84 ++++----
 res/field/events/events_0336.json | 192 ++++++++++--------
 res/field/events/events_0337.json |  40 ++--
 res/field/events/events_0338.json |   4 +-
 res/field/events/events_0339.json | 196 ++++++++++--------
 res/field/events/events_0340.json | 160 ++++++++-------
 res/field/events/events_0341.json |  18 +-
 res/field/events/events_0342.json | 242 ++++++++++++----------
 res/field/events/events_0343.json |  12 +-
 res/field/events/events_0344.json |  20 +-
 res/field/events/events_0345.json |  24 ++-
 res/field/events/events_0346.json |  52 +++--
 res/field/events/events_0347.json |  10 +-
 res/field/events/events_0348.json | 238 +++++++++++++---------
 res/field/events/events_0349.json | 175 +++++++++-------
 res/field/events/events_0350.json |   6 +-
 res/field/events/events_0351.json |  66 +++---
 res/field/events/events_0352.json | 134 +++++++------
 res/field/events/events_0353.json | 204 +++++++++++--------
 res/field/events/events_0354.json |  40 ++--
 res/field/events/events_0355.json |  46 ++---
 res/field/events/events_0356.json |  34 ++--
 res/field/events/events_0357.json | 270 ++++++++++++++-----------
 res/field/events/events_0358.json |  22 +-
 res/field/events/events_0359.json | 253 ++++++++++++-----------
 res/field/events/events_0360.json |  12 +-
 res/field/events/events_0361.json |   6 +-
 res/field/events/events_0362.json |  16 +-
 res/field/events/events_0363.json |   6 +-
 res/field/events/events_0364.json |  14 +-
 res/field/events/events_0365.json |  14 +-
 res/field/events/events_0366.json | 196 ++++++++++--------
 res/field/events/events_0367.json |  12 +-
 res/field/events/events_0368.json | 196 ++++++++++--------
 res/field/events/events_0369.json | 116 ++++++-----
 res/field/events/events_0370.json |  18 +-
 res/field/events/events_0371.json | 168 +++++++++-------
 res/field/events/events_0372.json |   6 +-
 res/field/events/events_0373.json |   6 +-
 res/field/events/events_0374.json | 124 +++++++-----
 res/field/events/events_0375.json |  12 +-
 res/field/events/events_0376.json |  20 +-
 res/field/events/events_0377.json |  32 +--
 res/field/events/events_0378.json | 130 ++++++------
 res/field/events/events_0379.json |  40 ++--
 res/field/events/events_0380.json |  10 +-
 res/field/events/events_0381.json | 226 ++++++++++++---------
 res/field/events/events_0382.json |  30 +--
 res/field/events/events_0383.json |   6 +-
 res/field/events/events_0384.json |  12 +-
 res/field/events/events_0385.json | 178 ++++++++++-------
 res/field/events/events_0386.json | 207 +++++++++++--------
 res/field/events/events_0387.json | 102 +++++-----
 res/field/events/events_0388.json | 200 +++++++++++--------
 res/field/events/events_0389.json | 120 ++++++-----
 res/field/events/events_0390.json |  68 ++++---
 res/field/events/events_0391.json |   8 +-
 res/field/events/events_0392.json |  14 +-
 res/field/events/events_0393.json |  52 ++---
 res/field/events/events_0394.json |  58 +++---
 res/field/events/events_0395.json |   6 +-
 res/field/events/events_0396.json |  10 +-
 res/field/events/events_0397.json |  94 +++++----
 res/field/events/events_0398.json |  18 +-
 res/field/events/events_0399.json |  26 +--
 res/field/events/events_0400.json |  20 +-
 res/field/events/events_0401.json |  46 ++---
 res/field/events/events_0402.json |  12 +-
 res/field/events/events_0403.json |   6 +-
 res/field/events/events_0404.json |  10 +-
 res/field/events/events_0405.json |  82 ++++----
 res/field/events/events_0406.json |  26 +--
 res/field/events/events_0407.json |  30 +--
 res/field/events/events_0408.json |  16 +-
 res/field/events/events_0409.json |  14 +-
 res/field/events/events_0410.json |  10 +-
 res/field/events/events_0411.json |  14 +-
 res/field/events/events_0412.json | 138 +++++++------
 res/field/events/events_0413.json |  22 +-
 res/field/events/events_0414.json |  30 +--
 res/field/events/events_0415.json |  16 +-
 res/field/events/events_0416.json |  14 +-
 res/field/events/events_0417.json |  10 +-
 res/field/events/events_0418.json |  14 +-
 res/field/events/events_0419.json |  10 +-
 res/field/events/events_0420.json |  10 +-
 res/field/events/events_0421.json | 108 +++++-----
 res/field/events/events_0422.json |  30 +--
 res/field/events/events_0423.json |  16 +-
 res/field/events/events_0424.json |  22 +-
 res/field/events/events_0425.json |  14 +-
 res/field/events/events_0426.json |  10 +-
 res/field/events/events_0427.json |  10 +-
 res/field/events/events_0428.json |  22 +-
 res/field/events/events_0429.json |  74 +++----
 res/field/events/events_0430.json |  18 +-
 res/field/events/events_0431.json |  22 +-
 res/field/events/events_0432.json |  16 +-
 res/field/events/events_0433.json |  26 +--
 res/field/events/events_0434.json |   6 +-
 res/field/events/events_0435.json |  18 +-
 res/field/events/events_0436.json | 120 ++++++-----
 res/field/events/events_0437.json |   6 +-
 res/field/events/events_0438.json |  26 +--
 res/field/events/events_0439.json |  16 +-
 res/field/events/events_0440.json |  28 +--
 res/field/events/events_0441.json |  18 +-
 res/field/events/events_0442.json |   6 +-
 res/field/events/events_0443.json | 122 ++++++------
 res/field/events/events_0444.json |  14 +-
 res/field/events/events_0445.json | 206 +++++++++----------
 res/field/events/events_0446.json |  77 ++++---
 res/field/events/events_0447.json | 133 ++++++++-----
 res/field/events/events_0448.json | 138 +++++++------
 res/field/events/events_0449.json | 129 +++++++-----
 res/field/events/events_0451.json |  14 +-
 res/field/events/events_0452.json |  14 +-
 res/field/events/events_0453.json |  18 +-
 res/field/events/events_0454.json |  14 +-
 res/field/events/events_0455.json |  14 +-
 res/field/events/events_0456.json |  14 +-
 res/field/events/events_0457.json |  18 +-
 res/field/events/events_0458.json |  14 +-
 res/field/events/events_0459.json |  14 +-
 res/field/events/events_0460.json |  14 +-
 res/field/events/events_0461.json |  14 +-
 res/field/events/events_0462.json |  14 +-
 res/field/events/events_0463.json |  14 +-
 res/field/events/events_0464.json |  14 +-
 res/field/events/events_0465.json |  14 +-
 res/field/events/events_0466.json |  14 +-
 res/field/events/events_0467.json |  14 +-
 res/field/events/events_0468.json |   6 +-
 res/field/events/events_0469.json |  26 +--
 res/field/events/events_0470.json |  24 +--
 res/field/events/events_0471.json |  46 ++---
 res/field/events/events_0472.json |  16 +-
 res/field/events/events_0473.json |  14 +-
 res/field/events/events_0474.json |  56 +++---
 res/field/events/events_0475.json |   6 +-
 res/field/events/events_0476.json |  10 +-
 res/field/events/events_0477.json |   6 +-
 res/field/events/events_0478.json |  12 +-
 res/field/events/events_0479.json |  10 +-
 res/field/events/events_0480.json |  22 +-
 res/field/events/events_0481.json |  28 +--
 res/field/events/events_0482.json |  24 +--
 res/field/events/events_0483.json |  28 +--
 res/field/events/events_0484.json |  28 +--
 res/field/events/events_0485.json |  24 +--
 res/field/events/events_0486.json |  36 ++--
 res/field/events/events_0487.json |  14 +-
 res/field/events/events_0488.json |  10 +-
 res/field/events/events_0489.json |  12 +-
 res/field/events/events_0490.json |   6 +-
 res/field/events/events_0491.json |   6 +-
 res/field/events/events_0492.json |   2 +-
 res/field/events/events_0493.json |  18 +-
 res/field/events/events_0494.json |  60 +++---
 res/field/events/events_0495.json |  60 +++---
 res/field/events/events_0496.json |  60 +++---
 res/field/events/events_0497.json | 128 ++++++------
 res/field/events/events_0498.json | 124 ++++++------
 res/field/events/events_0499.json | 124 ++++++------
 res/field/events/events_0500.json | 124 ++++++------
 res/field/events/events_0501.json | 128 ++++++------
 res/field/events/events_0502.json | 128 ++++++------
 res/field/events/events_0503.json | 128 ++++++------
 res/field/events/events_0504.json | 124 ++++++------
 res/field/events/events_0505.json | 128 ++++++------
 res/field/events/events_0506.json | 128 ++++++------
 res/field/events/events_0507.json | 128 ++++++------
 res/field/events/events_0508.json | 128 ++++++------
 res/field/events/events_0512.json |  18 +-
 res/field/events/events_0513.json | 264 ++++++++++++------------
 res/field/events/events_0514.json |  52 ++---
 res/field/events/events_0515.json |  46 ++---
 res/field/events/events_0516.json |  70 +++----
 res/field/events/events_0517.json |  46 ++---
 res/field/events/events_0518.json |  58 +++---
 res/field/events/events_0519.json |  48 ++---
 res/field/events/events_0520.json |  80 ++++----
 res/field/events/events_0521.json |  64 +++---
 res/field/events/events_0522.json | 158 +++++++--------
 res/field/events/events_0523.json |  54 ++---
 res/field/events/events_0524.json |   6 +-
 res/field/events/events_0525.json |  18 +-
 res/field/events/events_0526.json |  18 +-
 res/field/events/events_0527.json |   4 +-
 res/field/events/events_0528.json |  10 +-
 res/field/events/events_0529.json |  70 +++----
 res/field/events/events_0530.json |  10 +-
 res/field/events/events_0531.json |  70 +++----
 res/field/events/events_0532.json |  10 +-
 res/field/events/events_0533.json |  70 +++----
 tools/json2bin/events.py          |  12 +-
 524 files changed, 12381 insertions(+), 11080 deletions(-)

diff --git a/res/field/events/events_0001.json b/res/field/events/events_0001.json
index 52920adb82..2f54d51186 100644
--- a/res/field/events/events_0001.json
+++ b/res/field/events/events_0001.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 311,
-            "y": 358,
-            "z": 0
+            "z": 358,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 392,
-            "y": 121,
-            "z": 0
+            "z": 121,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 133,
-            "z": 0
+            "z": 133,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 343,
-            "y": 151,
-            "z": 0
+            "z": 151,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 200,
-            "y": 185,
-            "z": 0
+            "z": 185,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 167,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 437,
-            "y": 400,
-            "z": 0
+            "z": 400,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 119,
-            "y": 422,
-            "z": 0
+            "z": 422,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 247,
-            "y": 249,
-            "z": 0
+            "z": 249,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 264,
-            "z": 0
+            "z": 264,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 360,
-            "y": 279,
-            "z": 0
+            "z": 279,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 264,
-            "y": 294,
-            "z": 0
+            "z": 294,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 247,
-            "y": 264,
-            "z": 0
+            "z": 264,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 279,
-            "y": 456,
-            "z": 0
+            "z": 456,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 232,
-            "y": 87,
-            "z": 0
+            "z": 87,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 264,
-            "y": 279,
-            "z": 0
+            "z": 279,
+            "y": 0
         },
         {
             "graphics_id": 126,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0002.json b/res/field/events/events_0002.json
index 9a1d985714..7d0ff92a82 100644
--- a/res/field/events/events_0002.json
+++ b/res/field/events/events_0002.json
@@ -4,8 +4,8 @@
             "script": 8161,
             "type": 2,
             "x": 168,
-            "y": 795,
-            "z": 0,
+            "z": 795,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 145,
-            "y": 761,
-            "z": 0
+            "z": 761,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 174,
-            "y": 757,
-            "z": 1
+            "z": 757,
+            "y": 1
         },
         {
             "graphics_id": 3,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 145,
-            "y": 791,
-            "z": 1
+            "z": 791,
+            "y": 1
         },
         {
             "graphics_id": 2,
@@ -63,8 +63,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 161,
-            "y": 754,
-            "z": 1
+            "z": 754,
+            "y": 1
         },
         {
             "graphics_id": 17,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 172,
-            "y": 780,
-            "z": 1
+            "z": 780,
+            "y": 1
         },
         {
             "graphics_id": 3,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 179,
-            "y": 770,
-            "z": 1
+            "z": 770,
+            "y": 1
         },
         {
             "graphics_id": 17,
@@ -105,8 +105,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 169,
-            "y": 766,
-            "z": 1
+            "z": 766,
+            "y": 1
         },
         {
             "graphics_id": 101,
@@ -119,8 +119,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 174,
-            "y": 788,
-            "z": 1
+            "z": 788,
+            "y": 1
         },
         {
             "graphics_id": 91,
@@ -129,12 +129,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 176,
-            "y": 744,
-            "z": 0
+            "z": 744,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -143,12 +145,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 187,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -157,12 +161,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 132,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -171,12 +177,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 170,
-            "y": 791,
-            "z": 0
+            "z": 791,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -189,8 +197,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 177,
-            "y": 755,
-            "z": 0
+            "z": 755,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -203,8 +211,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 141,
-            "y": 755,
-            "z": 0
+            "z": 755,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -217,8 +225,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 167,
-            "y": 755,
-            "z": 0
+            "z": 755,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -231,8 +239,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 164,
-            "y": 776,
-            "z": 0
+            "z": 776,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -245,8 +253,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 175,
-            "y": 740,
-            "z": 1
+            "z": 740,
+            "y": 1
         },
         {
             "graphics_id": 124,
@@ -259,8 +267,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 174,
-            "y": 739,
-            "z": 1
+            "z": 739,
+            "y": 1
         },
         {
             "graphics_id": 124,
@@ -273,8 +281,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 174,
-            "y": 740,
-            "z": 1
+            "z": 740,
+            "y": 1
         },
         {
             "local_id": 5,
@@ -284,12 +292,14 @@
             "flag": 343,
             "script": 65535,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 176,
-            "y": 804,
-            "z": 0
+            "z": 804,
+            "y": 0
         },
         {
             "local_id": 6,
@@ -299,12 +309,14 @@
             "flag": 344,
             "script": 65535,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 198,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -317,8 +329,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 164,
-            "y": 761,
-            "z": 1
+            "z": 761,
+            "y": 1
         },
         {
             "graphics_id": 93,
@@ -331,8 +343,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 147,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -345,8 +357,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 174,
-            "y": 771,
-            "z": 1
+            "z": 771,
+            "y": 1
         },
         {
             "graphics_id": 43,
@@ -359,8 +371,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 183,
-            "y": 769,
-            "z": 1
+            "z": 769,
+            "y": 1
         },
         {
             "graphics_id": 43,
@@ -373,8 +385,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 143,
-            "y": 754,
-            "z": 1
+            "z": 754,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -387,8 +399,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 154,
-            "y": 778,
-            "z": 1
+            "z": 778,
+            "y": 1
         },
         {
             "graphics_id": 43,
@@ -401,8 +413,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 164,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 194,
@@ -415,8 +427,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 180,
-            "y": 782,
-            "z": 0
+            "z": 782,
+            "y": 0
         },
         {
             "graphics_id": 194,
@@ -429,8 +441,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 182,
-            "y": 782,
-            "z": 0
+            "z": 782,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -443,8 +455,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 173,
-            "y": 753,
-            "z": 0
+            "z": 753,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -457,8 +469,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 186,
-            "y": 756,
-            "z": 1
+            "z": 756,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -471,92 +483,92 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 142,
-            "y": 766,
-            "z": 0
+            "z": 766,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 180,
-            "y": 755,
+            "z": 755,
             "dest_header_id": 24,
             "dest_warp_id": 0
         },
         {
             "x": 149,
-            "y": 778,
+            "z": 778,
             "dest_header_id": 28,
             "dest_warp_id": 0
         },
         {
             "x": 180,
-            "y": 776,
+            "z": 776,
             "dest_header_id": 6,
             "dest_warp_id": 0
         },
         {
             "x": 164,
-            "y": 751,
+            "z": 751,
             "dest_header_id": 11,
             "dest_warp_id": 0
         },
         {
             "x": 167,
-            "y": 788,
+            "z": 788,
             "dest_header_id": 19,
             "dest_warp_id": 0
         },
         {
             "x": 145,
-            "y": 751,
+            "z": 751,
             "dest_header_id": 8,
             "dest_warp_id": 1
         },
         {
             "x": 179,
-            "y": 766,
+            "z": 766,
             "dest_header_id": 4,
             "dest_warp_id": 0
         },
         {
             "x": 168,
-            "y": 776,
+            "z": 776,
             "dest_header_id": 29,
             "dest_warp_id": 0
         },
         {
             "x": 141,
-            "y": 751,
+            "z": 751,
             "dest_header_id": 8,
             "dest_warp_id": 0
         },
         {
             "x": 140,
-            "y": 788,
+            "z": 788,
             "dest_header_id": 30,
             "dest_warp_id": 0
         },
         {
             "x": 129,
-            "y": 736,
+            "z": 736,
             "dest_header_id": 31,
             "dest_warp_id": 0
         },
         {
             "x": 128,
-            "y": 736,
+            "z": 736,
             "dest_header_id": 32,
             "dest_warp_id": 0
         },
         {
             "x": 128,
-            "y": 758,
+            "z": 758,
             "dest_header_id": 389,
             "dest_warp_id": 1
         },
         {
             "x": 128,
-            "y": 759,
+            "z": 759,
             "dest_header_id": 389,
             "dest_warp_id": 1
         }
@@ -565,62 +577,62 @@
         {
             "script": 2,
             "x": 173,
-            "y": 796,
+            "z": 796,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16503
+            "var": 16503,
+            "value": 0
         },
         {
             "script": 4,
             "x": 173,
-            "y": 743,
+            "z": 743,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 3,
-            "var": 16503
+            "var": 16503,
+            "value": 3
         },
         {
             "script": 3,
             "x": 188,
-            "y": 757,
+            "z": 757,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 1,
-            "var": 16503
+            "var": 16503,
+            "value": 1
         },
         {
             "script": 19,
             "x": 155,
-            "y": 779,
+            "z": 779,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 0,
-            "var": 16624
+            "var": 16624,
+            "value": 0
         },
         {
             "script": 17,
             "x": 172,
-            "y": 776,
+            "z": 776,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16615
+            "var": 16615,
+            "value": 1
         },
         {
             "script": 28,
             "x": 188,
-            "y": 757,
+            "z": 757,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 1,
-            "var": 16502
+            "var": 16502,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0003.json b/res/field/events/events_0003.json
index 4fc081ec23..c1a5ffdc9e 100644
--- a/res/field/events/events_0003.json
+++ b/res/field/events/events_0003.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 3,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0004.json b/res/field/events/events_0004.json
index 0c614905e7..992dd239f7 100644
--- a/res/field/events/events_0004.json
+++ b/res/field/events/events_0004.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 3,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0005.json b/res/field/events/events_0005.json
index 86299d6444..f00e553800 100644
--- a/res/field/events/events_0005.json
+++ b/res/field/events/events_0005.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -96,26 +96,26 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 2
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 7,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 474,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0006.json b/res/field/events/events_0006.json
index b44d87bfa9..398485457d 100644
--- a/res/field/events/events_0006.json
+++ b/res/field/events/events_0006.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 6,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0007.json b/res/field/events/events_0007.json
index 3b80de6e64..306e76c58a 100644
--- a/res/field/events/events_0007.json
+++ b/res/field/events/events_0007.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -68,26 +68,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 8
         },
         {
             "x": 16,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 5
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 9,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0008.json b/res/field/events/events_0008.json
index 76959575eb..aa93a348aa 100644
--- a/res/field/events/events_0008.json
+++ b/res/field/events/events_0008.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 12,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 204,
@@ -54,20 +54,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 8,
             "dest_warp_id": 2
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 10,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0009.json b/res/field/events/events_0009.json
index a0928a91d8..3f5ed33afb 100644
--- a/res/field/events/events_0009.json
+++ b/res/field/events/events_0009.json
@@ -4,32 +4,32 @@
             "script": 4,
             "type": 0,
             "x": 1,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 9,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 15,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 2
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -73,14 +73,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 9,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0010.json b/res/field/events/events_0010.json
index 9926e14706..19604f4b0e 100644
--- a/res/field/events/events_0010.json
+++ b/res/field/events/events_0010.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -68,26 +68,26 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 9,
-            "y": 18,
+            "z": 18,
             "dest_header_id": 3,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 12,
             "dest_warp_id": 0
         },
         {
             "x": 18,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 18,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0011.json b/res/field/events/events_0011.json
index 7e5218bac1..d7e67724b3 100644
--- a/res/field/events/events_0011.json
+++ b/res/field/events/events_0011.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 11,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 12,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -54,32 +54,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 11,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 13,
             "dest_warp_id": 0
         },
         {
             "x": 3,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 15,
             "dest_warp_id": 0
         },
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 18,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0012.json b/res/field/events/events_0012.json
index adf16a7033..faf8161950 100644
--- a/res/field/events/events_0012.json
+++ b/res/field/events/events_0012.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 11,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 16,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -54,38 +54,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 12,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 14,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 17,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 16,
             "dest_warp_id": 0
         },
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 18,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0013.json b/res/field/events/events_0013.json
index e8bf42e14f..cfad6d760f 100644
--- a/res/field/events/events_0013.json
+++ b/res/field/events/events_0013.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 13,
             "dest_warp_id": 1
         },
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 18,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0014.json b/res/field/events/events_0014.json
index a1a8fee80d..2390ee49fc 100644
--- a/res/field/events/events_0014.json
+++ b/res/field/events/events_0014.json
@@ -4,88 +4,88 @@
             "script": 2,
             "type": 0,
             "x": 5,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 9,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 11,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 15,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 17,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 10,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 12,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 10,
             "type": 0,
             "x": 14,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 16,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 18,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -101,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -115,8 +115,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -129,14 +129,14 @@
             "movement_range_x": 10,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 12,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0015.json b/res/field/events/events_0015.json
index 06f6330875..f52ee8aa95 100644
--- a/res/field/events/events_0015.json
+++ b/res/field/events/events_0015.json
@@ -4,24 +4,24 @@
             "script": 1,
             "type": 0,
             "x": 8,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 3,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 13,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -79,14 +79,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 13,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0016.json b/res/field/events/events_0016.json
index e0099cd7b2..e67cb252bb 100644
--- a/res/field/events/events_0016.json
+++ b/res/field/events/events_0016.json
@@ -4,24 +4,24 @@
             "script": 1,
             "type": 0,
             "x": 8,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 3,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 13,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -51,8 +51,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 14,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -65,14 +65,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 13,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0017.json b/res/field/events/events_0017.json
index f287f2af59..c917ff7090 100644
--- a/res/field/events/events_0017.json
+++ b/res/field/events/events_0017.json
@@ -4,8 +4,8 @@
             "script": 1,
             "type": 0,
             "x": 1,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0018.json b/res/field/events/events_0018.json
index ea8c9ce9f6..543e1883ba 100644
--- a/res/field/events/events_0018.json
+++ b/res/field/events/events_0018.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 204,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 4
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 20,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0019.json b/res/field/events/events_0019.json
index 0bf5d18571..59018c13f9 100644
--- a/res/field/events/events_0019.json
+++ b/res/field/events/events_0019.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 13,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 12,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 19,
             "dest_warp_id": 1
         },
         {
             "x": 0,
-            "y": 0,
+            "z": 0,
             "dest_header_id": 21,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0020.json b/res/field/events/events_0020.json
index 0ff33ecfa0..5c143abbf9 100644
--- a/res/field/events/events_0020.json
+++ b/res/field/events/events_0020.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 20,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 22,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0021.json b/res/field/events/events_0021.json
index ec1fba6c04..36855f9058 100644
--- a/res/field/events/events_0021.json
+++ b/res/field/events/events_0021.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 21,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0022.json b/res/field/events/events_0022.json
index 3bb254cec2..6c5eaa6106 100644
--- a/res/field/events/events_0022.json
+++ b/res/field/events/events_0022.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 9,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 3,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0023.json b/res/field/events/events_0023.json
index 508a7dab78..7c08a86c47 100644
--- a/res/field/events/events_0023.json
+++ b/res/field/events/events_0023.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 204,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 9,
-            "y": 6,
-            "z": 1
+            "z": 6,
+            "y": 1
         },
         {
             "graphics_id": 71,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 6,
-            "z": 1
+            "z": 6,
+            "y": 1
         },
         {
             "graphics_id": 13,
@@ -54,20 +54,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 1
+            "z": 6,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 25,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0024.json b/res/field/events/events_0024.json
index 59361fd168..0fcf74f6d6 100644
--- a/res/field/events/events_0024.json
+++ b/res/field/events/events_0024.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 9,
@@ -26,20 +26,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 24,
             "dest_warp_id": 1
         },
         {
             "x": 0,
-            "y": 0,
+            "z": 0,
             "dest_header_id": 26,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0025.json b/res/field/events/events_0025.json
index f0fac7288d..f53bca495b 100644
--- a/res/field/events/events_0025.json
+++ b/res/field/events/events_0025.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 12,
-            "z": 1
+            "z": 12,
+            "y": 1
         },
         {
             "graphics_id": 19,
@@ -26,20 +26,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 12,
-            "z": 1
+            "z": 12,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 25,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 27,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0026.json b/res/field/events/events_0026.json
index e02dc52a6c..080844022b 100644
--- a/res/field/events/events_0026.json
+++ b/res/field/events/events_0026.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 26,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0027.json b/res/field/events/events_0027.json
index 54a443c953..0fcb35425f 100644
--- a/res/field/events/events_0027.json
+++ b/res/field/events/events_0027.json
@@ -4,88 +4,88 @@
             "script": 2025,
             "type": 0,
             "x": 9,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2025,
             "type": 0,
             "x": 10,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 14,
             "type": 0,
             "x": 18,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 18,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 15,
             "type": 0,
             "x": 18,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 15,
             "type": 0,
             "x": 18,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 21,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 21,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 15,
             "type": 0,
             "x": 21,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 15,
             "type": 0,
             "x": 21,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 21,
             "type": 0,
             "x": 18,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -101,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -115,8 +115,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -129,8 +129,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -143,8 +143,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 3,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -157,8 +157,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 24,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -171,8 +171,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -185,8 +185,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 12,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -199,8 +199,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -213,8 +213,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -227,8 +227,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -241,8 +241,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -255,8 +255,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -269,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -283,26 +283,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 13,
-            "y": 18,
+            "z": 18,
             "dest_header_id": 3,
             "dest_warp_id": 1
         },
         {
             "x": 16,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 567,
             "dest_warp_id": 0
         },
         {
             "x": 20,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 568,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0028.json b/res/field/events/events_0028.json
index e6b3709123..198b0f671d 100644
--- a/res/field/events/events_0028.json
+++ b/res/field/events/events_0028.json
@@ -4,16 +4,16 @@
             "script": 11,
             "type": 0,
             "x": 5,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 6,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -99,8 +99,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -113,8 +113,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -127,8 +127,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -141,14 +141,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 3,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0029.json b/res/field/events/events_0029.json
index 0754a69884..f3d085cf6e 100644
--- a/res/field/events/events_0029.json
+++ b/res/field/events/events_0029.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -40,20 +40,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 16,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 3,
             "dest_warp_id": 9
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 517,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0030.json b/res/field/events/events_0030.json
index 008e2ea35b..13ced2ac7b 100644
--- a/res/field/events/events_0030.json
+++ b/res/field/events/events_0030.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 3,
             "dest_warp_id": 10
         }
diff --git a/res/field/events/events_0031.json b/res/field/events/events_0031.json
index 78512ed0e8..c781b1d3ac 100644
--- a/res/field/events/events_0031.json
+++ b/res/field/events/events_0031.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 3,
             "dest_warp_id": 11
         }
diff --git a/res/field/events/events_0032.json b/res/field/events/events_0032.json
index 474725be31..9b2ac22434 100644
--- a/res/field/events/events_0032.json
+++ b/res/field/events/events_0032.json
@@ -4,16 +4,16 @@
             "script": 21,
             "type": 0,
             "x": 59,
-            "y": 712,
-            "z": 0,
+            "z": 712,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8218,
             "type": 2,
             "x": 36,
-            "y": 753,
-            "z": 0,
+            "z": 753,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 58,
-            "y": 749,
-            "z": 1
+            "z": 749,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -43,8 +43,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 52,
-            "y": 717,
-            "z": 1
+            "z": 717,
+            "y": 1
         },
         {
             "graphics_id": 9,
@@ -57,8 +57,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 59,
-            "y": 728,
-            "z": 1
+            "z": 728,
+            "y": 1
         },
         {
             "graphics_id": 14,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 33,
-            "y": 730,
-            "z": 1
+            "z": 730,
+            "y": 1
         },
         {
             "graphics_id": 93,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 722,
-            "z": 0
+            "z": 722,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -99,8 +99,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 732,
-            "z": 0
+            "z": 732,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -113,8 +113,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -123,12 +123,14 @@
             "flag": 0,
             "script": 14,
             "initial_dir": 0,
-            "data": [9],
+            "data": [
+                9
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 54,
-            "y": 754,
-            "z": 0
+            "z": 754,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -141,8 +143,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 37,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -155,8 +157,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 52,
-            "y": 718,
-            "z": 1
+            "z": 718,
+            "y": 1
         },
         {
             "graphics_id": 164,
@@ -169,8 +171,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 41,
-            "y": 735,
-            "z": 1
+            "z": 735,
+            "y": 1
         },
         {
             "graphics_id": 148,
@@ -183,8 +185,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 37,
-            "y": 723,
-            "z": 1
+            "z": 723,
+            "y": 1
         },
         {
             "graphics_id": 101,
@@ -197,8 +199,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 39,
-            "y": 720,
-            "z": 1
+            "z": 720,
+            "y": 1
         },
         {
             "graphics_id": 99,
@@ -211,8 +213,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 38,
-            "y": 720,
-            "z": 1
+            "z": 720,
+            "y": 1
         },
         {
             "graphics_id": 56,
@@ -225,8 +227,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 43,
-            "y": 725,
-            "z": 1
+            "z": 725,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -239,8 +241,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 762,
-            "z": 0
+            "z": 762,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -253,8 +255,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 45,
-            "y": 750,
-            "z": 1
+            "z": 750,
+            "y": 1
         },
         {
             "graphics_id": 93,
@@ -267,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 56,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -281,74 +283,74 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 37,
-            "y": 719,
-            "z": 1
+            "z": 719,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 39,
-            "y": 731,
+            "z": 731,
             "dest_header_id": 35,
             "dest_warp_id": 0
         },
         {
             "x": 58,
-            "y": 722,
+            "z": 722,
             "dest_header_id": 36,
             "dest_warp_id": 0
         },
         {
             "x": 53,
-            "y": 740,
+            "z": 740,
             "dest_header_id": 34,
             "dest_warp_id": 0
         },
         {
             "x": 37,
-            "y": 718,
+            "z": 718,
             "dest_header_id": 38,
             "dest_warp_id": 0
         },
         {
             "x": 54,
-            "y": 748,
+            "z": 748,
             "dest_header_id": 41,
             "dest_warp_id": 0
         },
         {
             "x": 58,
-            "y": 713,
+            "z": 713,
             "dest_header_id": 43,
             "dest_warp_id": 0
         },
         {
             "x": 39,
-            "y": 748,
+            "z": 748,
             "dest_header_id": 44,
             "dest_warp_id": 0
         },
         {
             "x": 63,
-            "y": 754,
+            "z": 754,
             "dest_header_id": 390,
             "dest_warp_id": 0
         },
         {
             "x": 63,
-            "y": 755,
+            "z": 755,
             "dest_header_id": 390,
             "dest_warp_id": 0
         },
         {
             "x": 53,
-            "y": 732,
+            "z": 732,
             "dest_header_id": 42,
             "dest_warp_id": 0
         },
         {
             "x": 38,
-            "y": 740,
+            "z": 740,
             "dest_header_id": 491,
             "dest_warp_id": 0
         }
@@ -357,12 +359,12 @@
         {
             "script": 2,
             "x": 47,
-            "y": 723,
+            "z": 723,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 0,
-            "var": 16504
+            "var": 16504,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0033.json b/res/field/events/events_0033.json
index eada1ed716..e3bfc52ad6 100644
--- a/res/field/events/events_0033.json
+++ b/res/field/events/events_0033.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 33,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0034.json b/res/field/events/events_0034.json
index 70086668f8..846d9170da 100644
--- a/res/field/events/events_0034.json
+++ b/res/field/events/events_0034.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 14,
-            "y": 25,
-            "z": 0,
+            "z": 25,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 18,
-            "y": 25,
-            "z": 0,
+            "z": 25,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3231,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 3,
-            "z": 20
+            "z": 3,
+            "y": 20
         },
         {
             "graphics_id": 168,
@@ -43,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -53,12 +55,14 @@
             "flag": 0,
             "script": 3255,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 3,
-            "z": 10
+            "z": 3,
+            "y": 10
         },
         {
             "graphics_id": 40,
@@ -67,12 +71,14 @@
             "flag": 0,
             "script": 3256,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 132,
@@ -85,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 3,
-            "z": 30
+            "z": 3,
+            "y": 30
         },
         {
             "graphics_id": 51,
@@ -95,12 +101,14 @@
             "flag": 0,
             "script": 3313,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -109,12 +117,14 @@
             "flag": 0,
             "script": 3278,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -123,12 +133,14 @@
             "flag": 0,
             "script": 3366,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 20
+            "z": 3,
+            "y": 20
         },
         {
             "graphics_id": 14,
@@ -137,18 +149,20 @@
             "flag": 0,
             "script": 3282,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 5,
-            "z": 10
+            "z": 5,
+            "y": 10
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 27,
+            "z": 27,
             "dest_header_id": 33,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0035.json b/res/field/events/events_0035.json
index ea9d6fef74..351d3e4333 100644
--- a/res/field/events/events_0035.json
+++ b/res/field/events/events_0035.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -96,26 +96,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 33,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 37,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 475,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0036.json b/res/field/events/events_0036.json
index c28332f094..58ed5f96b7 100644
--- a/res/field/events/events_0036.json
+++ b/res/field/events/events_0036.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 36,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0037.json b/res/field/events/events_0037.json
index 2687d99351..360acdbd2c 100644
--- a/res/field/events/events_0037.json
+++ b/res/field/events/events_0037.json
@@ -4,168 +4,168 @@
             "script": 3,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 3,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 2,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 3,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 5,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 6,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 2,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 1,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 4,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 15,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 16,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 17,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 18,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 19,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 20,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 4,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 4,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 1,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 2,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 3,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -181,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 14,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -195,8 +195,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 137,
@@ -209,20 +209,20 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 16,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 33,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 39,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0038.json b/res/field/events/events_0038.json
index 68caa70349..211fa673af 100644
--- a/res/field/events/events_0038.json
+++ b/res/field/events/events_0038.json
@@ -4,280 +4,280 @@
             "script": 2,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 2,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 1,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 2,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 3,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 13,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 14,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 15,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 16,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 17,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 18,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 19,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 20,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 15,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 16,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 17,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 18,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 19,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 20,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 13,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 3,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 2,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 1,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 13,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 13,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 14,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 15,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 16,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 17,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 18,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 19,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 20,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -293,8 +293,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -307,20 +307,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 38,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 40,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0039.json b/res/field/events/events_0039.json
index 93a464c708..8f6e5ceef1 100644
--- a/res/field/events/events_0039.json
+++ b/res/field/events/events_0039.json
@@ -4,176 +4,176 @@
             "script": 5,
             "type": 0,
             "x": 9,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 10,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 11,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 12,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 7,
             "type": 0,
             "x": 17,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 7,
             "type": 0,
             "x": 18,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 19,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 20,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 15,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 16,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 10,
             "type": 0,
             "x": 17,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 10,
             "type": 0,
             "x": 18,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 19,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 20,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 14,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 15,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 15,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 16,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 17,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 18,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 19,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 20,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -189,8 +189,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -203,8 +203,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -217,8 +217,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -231,8 +231,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -245,14 +245,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 39,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0040.json b/res/field/events/events_0040.json
index 1b18753d91..0da13a2fc7 100644
--- a/res/field/events/events_0040.json
+++ b/res/field/events/events_0040.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 33,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0041.json b/res/field/events/events_0041.json
index 6895a0ef20..bc98950d45 100644
--- a/res/field/events/events_0041.json
+++ b/res/field/events/events_0041.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 33,
             "dest_warp_id": 9
         }
diff --git a/res/field/events/events_0042.json b/res/field/events/events_0042.json
index 299dc1cb20..bf86140908 100644
--- a/res/field/events/events_0042.json
+++ b/res/field/events/events_0042.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 33,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0043.json b/res/field/events/events_0043.json
index f5021d9113..6724eb4d38 100644
--- a/res/field/events/events_0043.json
+++ b/res/field/events/events_0043.json
@@ -12,8 +12,8 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 33,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0044.json b/res/field/events/events_0044.json
index 219942be11..263eb15f20 100644
--- a/res/field/events/events_0044.json
+++ b/res/field/events/events_0044.json
@@ -4,32 +4,32 @@
             "script": 3,
             "type": 0,
             "x": 267,
-            "y": 808,
-            "z": 0,
+            "z": 808,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 45,
             "type": 0,
             "x": 256,
-            "y": 808,
-            "z": 0,
+            "z": 808,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8087,
             "type": 2,
             "x": 291,
-            "y": 772,
-            "z": 0,
+            "z": 772,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8257,
             "type": 2,
             "x": 294,
-            "y": 773,
-            "z": 0,
+            "z": 773,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 303,
-            "y": 762,
-            "z": 3
+            "z": 762,
+            "y": 3
         },
         {
             "graphics_id": 8,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 288,
-            "y": 754,
-            "z": 5
+            "z": 754,
+            "y": 5
         },
         {
             "graphics_id": 16,
@@ -73,8 +73,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 301,
-            "y": 774,
-            "z": 3
+            "z": 774,
+            "y": 3
         },
         {
             "graphics_id": 148,
@@ -87,8 +87,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 282,
-            "y": 757,
-            "z": 3
+            "z": 757,
+            "y": 3
         },
         {
             "graphics_id": 4,
@@ -101,8 +101,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 266,
-            "y": 752,
-            "z": 3
+            "z": 752,
+            "y": 3
         },
         {
             "graphics_id": 91,
@@ -111,12 +111,14 @@
             "flag": 0,
             "script": 15,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 260,
-            "y": 747,
-            "z": 0
+            "z": 747,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -129,8 +131,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 278,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -143,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 301,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -157,8 +159,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 301,
-            "y": 792,
-            "z": 0
+            "z": 792,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -167,12 +169,14 @@
             "flag": 0,
             "script": 15,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 300,
-            "y": 737,
-            "z": 0
+            "z": 737,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -185,8 +189,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 267,
-            "y": 762,
-            "z": 0
+            "z": 762,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -199,8 +203,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 265,
-            "y": 762,
-            "z": 0
+            "z": 762,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -213,8 +217,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 269,
-            "y": 762,
-            "z": 0
+            "z": 762,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -227,8 +231,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 316,
-            "y": 789,
-            "z": 0
+            "z": 789,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -241,8 +245,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 316,
-            "y": 788,
-            "z": 0
+            "z": 788,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -255,8 +259,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 267,
-            "y": 761,
-            "z": 3
+            "z": 761,
+            "y": 3
         },
         {
             "graphics_id": 40,
@@ -269,8 +273,8 @@
             "movement_range_x": 1,
             "movement_range_y": 3,
             "x": 312,
-            "y": 793,
-            "z": 3
+            "z": 793,
+            "y": 3
         },
         {
             "graphics_id": 52,
@@ -283,8 +287,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 292,
-            "y": 755,
-            "z": 5
+            "z": 755,
+            "y": 5
         },
         {
             "graphics_id": 40,
@@ -297,8 +301,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 293,
-            "y": 775,
-            "z": 3
+            "z": 775,
+            "y": 3
         },
         {
             "graphics_id": 40,
@@ -311,8 +315,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 306,
-            "y": 777,
-            "z": 3
+            "z": 777,
+            "y": 3
         },
         {
             "graphics_id": 10,
@@ -325,8 +329,8 @@
             "movement_range_x": 1,
             "movement_range_y": 3,
             "x": 279,
-            "y": 749,
-            "z": 3
+            "z": 749,
+            "y": 3
         },
         {
             "graphics_id": 7,
@@ -339,8 +343,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 292,
-            "y": 759,
-            "z": 5
+            "z": 759,
+            "y": 5
         },
         {
             "graphics_id": 208,
@@ -353,8 +357,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 311,
-            "y": 792,
-            "z": 1
+            "z": 792,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -367,8 +371,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 295,
-            "y": 774,
-            "z": 0
+            "z": 774,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -381,8 +385,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 291,
-            "y": 773,
-            "z": 0
+            "z": 773,
+            "y": 0
         },
         {
             "graphics_id": 208,
@@ -395,8 +399,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 312,
-            "y": 782,
-            "z": 1
+            "z": 782,
+            "y": 1
         },
         {
             "graphics_id": 208,
@@ -409,8 +413,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 291,
-            "y": 781,
-            "z": 1
+            "z": 781,
+            "y": 1
         },
         {
             "graphics_id": 7,
@@ -423,104 +427,104 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 307,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 282,
-            "y": 756,
+            "z": 756,
             "dest_header_id": 47,
             "dest_warp_id": 0
         },
         {
             "x": 303,
-            "y": 756,
+            "z": 756,
             "dest_header_id": 48,
             "dest_warp_id": 0
         },
         {
             "x": 285,
-            "y": 746,
+            "z": 746,
             "dest_header_id": 46,
             "dest_warp_id": 0
         },
         {
             "x": 271,
-            "y": 746,
+            "z": 746,
             "dest_header_id": 50,
             "dest_warp_id": 0
         },
         {
             "x": 273,
-            "y": 756,
+            "z": 756,
             "dest_header_id": 60,
             "dest_warp_id": 0
         },
         {
             "x": 293,
-            "y": 752,
+            "z": 752,
             "dest_header_id": 58,
             "dest_warp_id": 0
         },
         {
             "x": 305,
-            "y": 747,
+            "z": 747,
             "dest_header_id": 59,
             "dest_warp_id": 0
         },
         {
             "x": 312,
-            "y": 764,
+            "z": 764,
             "dest_header_id": 61,
             "dest_warp_id": 0
         },
         {
             "x": 278,
-            "y": 746,
+            "z": 746,
             "dest_header_id": 54,
             "dest_warp_id": 0
         },
         {
             "x": 307,
-            "y": 772,
+            "z": 772,
             "dest_header_id": 64,
             "dest_warp_id": 0
         },
         {
             "x": 258,
-            "y": 749,
+            "z": 749,
             "dest_header_id": 258,
             "dest_warp_id": 1
         },
         {
             "x": 300,
-            "y": 795,
+            "z": 795,
             "dest_header_id": 198,
             "dest_warp_id": 0
         },
         {
             "x": 301,
-            "y": 795,
+            "z": 795,
             "dest_header_id": 198,
             "dest_warp_id": 0
         },
         {
             "x": 302,
-            "y": 795,
+            "z": 795,
             "dest_header_id": 198,
             "dest_warp_id": 1
         },
         {
             "x": 303,
-            "y": 795,
+            "z": 795,
             "dest_header_id": 198,
             "dest_warp_id": 2
         },
         {
             "x": 304,
-            "y": 795,
+            "z": 795,
             "dest_header_id": 198,
             "dest_warp_id": 2
         }
@@ -529,22 +533,22 @@
         {
             "script": 3,
             "x": 266,
-            "y": 748,
+            "z": 748,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 0,
-            "var": 16505
+            "var": 16505,
+            "value": 0
         },
         {
             "script": 4,
             "x": 262,
-            "y": 748,
+            "z": 748,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 2,
-            "var": 16505
+            "var": 16505,
+            "value": 2
         }
     ]
 }
diff --git a/res/field/events/events_0045.json b/res/field/events/events_0045.json
index ed31a60dc0..8208c0d325 100644
--- a/res/field/events/events_0045.json
+++ b/res/field/events/events_0045.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 45,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0046.json b/res/field/events/events_0046.json
index 51b2356ca1..4bc02dabec 100644
--- a/res/field/events/events_0046.json
+++ b/res/field/events/events_0046.json
@@ -4,16 +4,16 @@
             "script": 3,
             "type": 0,
             "x": 3,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 7,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -53,12 +53,14 @@
             "flag": 0,
             "script": 3243,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -67,18 +69,20 @@
             "flag": 0,
             "script": 3244,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 24,
+            "z": 24,
             "dest_header_id": 45,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0047.json b/res/field/events/events_0047.json
index b90224a2d0..1eba49d852 100644
--- a/res/field/events/events_0047.json
+++ b/res/field/events/events_0047.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 12,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 194,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 194,
@@ -124,26 +124,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 45,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 49,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 476,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0048.json b/res/field/events/events_0048.json
index 8d70ca63cb..0e34379589 100644
--- a/res/field/events/events_0048.json
+++ b/res/field/events/events_0048.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 48,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0049.json b/res/field/events/events_0049.json
index 9b4f3f0657..2c0fcf6500 100644
--- a/res/field/events/events_0049.json
+++ b/res/field/events/events_0049.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 14,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 45,
             "dest_warp_id": 3
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 51,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0050.json b/res/field/events/events_0050.json
index bda3185a48..975ec48085 100644
--- a/res/field/events/events_0050.json
+++ b/res/field/events/events_0050.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 8,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 1
+            "z": 5,
+            "y": 1
         },
         {
             "graphics_id": 74,
@@ -54,20 +54,20 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 50,
             "dest_warp_id": 1
         },
         {
             "x": 1,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 52,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0051.json b/res/field/events/events_0051.json
index 2ab8b46f41..95f60311d9 100644
--- a/res/field/events/events_0051.json
+++ b/res/field/events/events_0051.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -26,20 +26,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 12,
-            "z": 1
+            "z": 12,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 51,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 53,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0052.json b/res/field/events/events_0052.json
index 77c7f18e8d..e22d2f8f27 100644
--- a/res/field/events/events_0052.json
+++ b/res/field/events/events_0052.json
@@ -12,8 +12,8 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 13,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 13,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         },
         {
             "graphics_id": 16,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 52,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0053.json b/res/field/events/events_0053.json
index 27c6ecb343..29084099c8 100644
--- a/res/field/events/events_0053.json
+++ b/res/field/events/events_0053.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 45,
             "dest_warp_id": 8
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 55,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0054.json b/res/field/events/events_0054.json
index 897059c12e..7a730a4504 100644
--- a/res/field/events/events_0054.json
+++ b/res/field/events/events_0054.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 54,
             "dest_warp_id": 1
         },
         {
             "x": 1,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 56,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0055.json b/res/field/events/events_0055.json
index 4f7d8718a7..7e0d268b7b 100644
--- a/res/field/events/events_0055.json
+++ b/res/field/events/events_0055.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 13,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 2,
@@ -40,20 +40,20 @@
             "movement_range_x": 3,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 1
+            "z": 5,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 55,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 57,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0056.json b/res/field/events/events_0056.json
index 2417166abd..b8038ae0d7 100644
--- a/res/field/events/events_0056.json
+++ b/res/field/events/events_0056.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 56,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0057.json b/res/field/events/events_0057.json
index 32782e43c4..5778f8d5c3 100644
--- a/res/field/events/events_0057.json
+++ b/res/field/events/events_0057.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 45,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0058.json b/res/field/events/events_0058.json
index 5f035172eb..c8f89b880f 100644
--- a/res/field/events/events_0058.json
+++ b/res/field/events/events_0058.json
@@ -4,256 +4,256 @@
             "script": 6,
             "type": 0,
             "x": 10,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 11,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 12,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 13,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 14,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 15,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 14,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 15,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 14,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 15,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 18,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 19,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 20,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 18,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 19,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 20,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 18,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 19,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 20,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 14,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 15,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 18,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 19,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 11,
             "type": 0,
             "x": 20,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 18,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 19,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 12,
             "type": 0,
             "x": 20,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 18,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 19,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 20,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 14,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 15,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -269,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -283,8 +283,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -297,8 +297,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -311,8 +311,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -325,8 +325,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -339,8 +339,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -353,8 +353,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -367,14 +367,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 45,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0059.json b/res/field/events/events_0059.json
index f0af06edff..437895edb5 100644
--- a/res/field/events/events_0059.json
+++ b/res/field/events/events_0059.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 45,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0060.json b/res/field/events/events_0060.json
index b55e7d1084..e9214227d6 100644
--- a/res/field/events/events_0060.json
+++ b/res/field/events/events_0060.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 16,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         },
         {
             "graphics_id": 20,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 14,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -40,20 +40,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 45,
             "dest_warp_id": 7
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 62,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0061.json b/res/field/events/events_0061.json
index 6f2127f0ef..5361b20da6 100644
--- a/res/field/events/events_0061.json
+++ b/res/field/events/events_0061.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 36,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 29,
@@ -40,20 +40,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 16,
-            "y": 5,
-            "z": 1
+            "z": 5,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 61,
             "dest_warp_id": 1
         },
         {
             "x": 1,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 63,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0062.json b/res/field/events/events_0062.json
index 754c8245e5..fe46162bbf 100644
--- a/res/field/events/events_0062.json
+++ b/res/field/events/events_0062.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 4,
-            "z": 1
+            "z": 4,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 62,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0063.json b/res/field/events/events_0063.json
index 2733e188b7..b08fe7a57b 100644
--- a/res/field/events/events_0063.json
+++ b/res/field/events/events_0063.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 45,
             "dest_warp_id": 9
         }
diff --git a/res/field/events/events_0064.json b/res/field/events/events_0064.json
index bdc1c27381..053819c825 100644
--- a/res/field/events/events_0064.json
+++ b/res/field/events/events_0064.json
@@ -4,40 +4,40 @@
             "script": 8002,
             "type": 2,
             "x": 327,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8150,
             "type": 2,
             "x": 285,
-            "y": 520,
-            "z": 0,
+            "z": 520,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 18,
             "type": 0,
             "x": 327,
-            "y": 525,
-            "z": 0,
+            "z": 525,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8003,
             "type": 2,
             "x": 355,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8228,
             "type": 2,
             "x": 347,
-            "y": 517,
-            "z": 0,
+            "z": 517,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -53,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 303,
-            "y": 561,
-            "z": 7
+            "z": 561,
+            "y": 7
         },
         {
             "graphics_id": 17,
@@ -67,8 +67,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 300,
-            "y": 550,
-            "z": 7
+            "z": 550,
+            "y": 7
         },
         {
             "graphics_id": 1,
@@ -81,8 +81,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 330,
-            "y": 527,
-            "z": 7
+            "z": 527,
+            "y": 7
         },
         {
             "graphics_id": 124,
@@ -95,8 +95,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 331,
-            "y": 539,
-            "z": 7
+            "z": 539,
+            "y": 7
         },
         {
             "graphics_id": 124,
@@ -109,8 +109,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 301,
-            "y": 529,
-            "z": 7
+            "z": 529,
+            "y": 7
         },
         {
             "graphics_id": 95,
@@ -119,12 +119,14 @@
             "flag": 0,
             "script": 13,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 308,
-            "y": 562,
-            "z": 0
+            "z": 562,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -133,12 +135,14 @@
             "flag": 0,
             "script": 14,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 307,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -147,12 +151,14 @@
             "flag": 0,
             "script": 12,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 293,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -161,12 +167,14 @@
             "flag": 0,
             "script": 15,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 303,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -175,12 +183,14 @@
             "flag": 0,
             "script": 12,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 344,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -193,8 +203,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 312,
-            "y": 552,
-            "z": 7
+            "z": 552,
+            "y": 7
         },
         {
             "graphics_id": 14,
@@ -207,8 +217,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 308,
-            "y": 552,
-            "z": 7
+            "z": 552,
+            "y": 7
         },
         {
             "graphics_id": 138,
@@ -221,8 +231,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 311,
-            "y": 523,
-            "z": 7
+            "z": 523,
+            "y": 7
         },
         {
             "local_id": 4,
@@ -232,12 +242,14 @@
             "flag": 349,
             "script": 65535,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 281,
-            "y": 532,
-            "z": 0
+            "z": 532,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -250,8 +262,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 304,
-            "y": 521,
-            "z": 0
+            "z": 521,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -264,8 +276,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 521,
-            "z": 0
+            "z": 521,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -278,8 +290,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 306,
-            "y": 521,
-            "z": 0
+            "z": 521,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -292,8 +304,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 515,
-            "z": 0
+            "z": 515,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -306,8 +318,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 339,
-            "y": 523,
-            "z": 0
+            "z": 523,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -320,8 +332,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 319,
-            "y": 538,
-            "z": 0
+            "z": 538,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -334,8 +346,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 319,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -348,8 +360,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 327,
-            "y": 516,
-            "z": 0
+            "z": 516,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -362,8 +374,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 317,
-            "y": 558,
-            "z": 0
+            "z": 558,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -376,8 +388,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 315,
-            "y": 535,
-            "z": 7
+            "z": 535,
+            "y": 7
         },
         {
             "graphics_id": 5,
@@ -390,8 +402,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 302,
-            "y": 538,
-            "z": 7
+            "z": 538,
+            "y": 7
         },
         {
             "local_id": 7,
@@ -401,12 +413,14 @@
             "flag": 365,
             "script": 65535,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 353,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -415,12 +429,14 @@
             "flag": 0,
             "script": 16,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -429,12 +445,14 @@
             "flag": 0,
             "script": 17,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 549,
-            "z": 0
+            "z": 549,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -447,8 +465,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 302,
-            "y": 565,
-            "z": 7
+            "z": 565,
+            "y": 7
         },
         {
             "graphics_id": 182,
@@ -461,8 +479,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 339,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -475,8 +493,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 297,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         },
         {
             "graphics_id": 127,
@@ -489,8 +507,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 312,
-            "y": 563,
-            "z": 7
+            "z": 563,
+            "y": 7
         },
         {
             "graphics_id": 120,
@@ -503,8 +521,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 327,
-            "y": 526,
-            "z": 7
+            "z": 526,
+            "y": 7
         },
         {
             "graphics_id": 148,
@@ -517,80 +535,80 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 299,
-            "y": 531,
-            "z": 7
+            "z": 531,
+            "y": 7
         }
     ],
     "warp_events": [
         {
             "x": 305,
-            "y": 530,
+            "z": 530,
             "dest_header_id": 69,
             "dest_warp_id": 0
         },
         {
             "x": 309,
-            "y": 548,
+            "z": 548,
             "dest_header_id": 66,
             "dest_warp_id": 0
         },
         {
             "x": 310,
-            "y": 539,
+            "z": 539,
             "dest_header_id": 71,
             "dest_warp_id": 0
         },
         {
             "x": 305,
-            "y": 519,
+            "z": 519,
             "dest_header_id": 72,
             "dest_warp_id": 0
         },
         {
             "x": 315,
-            "y": 548,
+            "z": 548,
             "dest_header_id": 76,
             "dest_warp_id": 0
         },
         {
             "x": 298,
-            "y": 562,
+            "z": 562,
             "dest_header_id": 82,
             "dest_warp_id": 0
         },
         {
             "x": 327,
-            "y": 537,
+            "z": 537,
             "dest_header_id": 83,
             "dest_warp_id": 0
         },
         {
             "x": 316,
-            "y": 521,
+            "z": 521,
             "dest_header_id": 81,
             "dest_warp_id": 0
         },
         {
             "x": 304,
-            "y": 569,
+            "z": 569,
             "dest_header_id": 80,
             "dest_warp_id": 0
         },
         {
             "x": 305,
-            "y": 569,
+            "z": 569,
             "dest_header_id": 80,
             "dest_warp_id": 0
         },
         {
             "x": 312,
-            "y": 562,
+            "z": 562,
             "dest_header_id": 67,
             "dest_warp_id": 0
         },
         {
             "x": 310,
-            "y": 530,
+            "z": 530,
             "dest_header_id": 84,
             "dest_warp_id": 0
         }
@@ -599,72 +617,72 @@
         {
             "script": 25,
             "x": 303,
-            "y": 523,
+            "z": 523,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 0,
-            "var": 16506
+            "var": 16506,
+            "value": 0
         },
         {
             "script": 20,
             "x": 303,
-            "y": 565,
+            "z": 565,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16660
+            "var": 16660,
+            "value": 1
         },
         {
             "script": 23,
             "x": 297,
-            "y": 532,
+            "z": 532,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 1,
-            "var": 16660
+            "var": 16660,
+            "value": 1
         },
         {
             "script": 1,
             "x": 304,
-            "y": 522,
+            "z": 522,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16506
+            "var": 16506,
+            "value": 1
         },
         {
             "script": 26,
             "x": 308,
-            "y": 541,
+            "z": 541,
+            "y": 0,
             "width": 1,
             "length": 5,
-            "z": 0,
-            "value": 3,
-            "var": 16506
+            "var": 16506,
+            "value": 3
         },
         {
             "script": 27,
             "x": 309,
-            "y": 540,
+            "z": 540,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 4,
-            "var": 16506
+            "var": 16506,
+            "value": 4
         },
         {
             "script": 1,
             "x": 304,
-            "y": 523,
+            "z": 523,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 1,
-            "var": 16506
+            "var": 16506,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0065.json b/res/field/events/events_0065.json
index 0d510b3eea..7870baf347 100644
--- a/res/field/events/events_0065.json
+++ b/res/field/events/events_0065.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 65,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0066.json b/res/field/events/events_0066.json
index bc4656e0bd..223d927f43 100644
--- a/res/field/events/events_0066.json
+++ b/res/field/events/events_0066.json
@@ -4,16 +4,16 @@
             "script": 3,
             "type": 0,
             "x": 8,
-            "y": 25,
-            "z": 0,
+            "z": 25,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 14,
-            "y": 25,
-            "z": 0,
+            "z": 25,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 127,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -85,20 +85,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 27,
+            "z": 27,
             "dest_header_id": 65,
             "dest_warp_id": 10
         },
         {
             "x": 11,
-            "y": 0,
+            "z": 0,
             "dest_header_id": 68,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0067.json b/res/field/events/events_0067.json
index 3b6e53bd34..faa8111a1e 100644
--- a/res/field/events/events_0067.json
+++ b/res/field/events/events_0067.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 16,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 67,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0068.json b/res/field/events/events_0068.json
index 34dc769b23..3be81551f5 100644
--- a/res/field/events/events_0068.json
+++ b/res/field/events/events_0068.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 10,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -96,26 +96,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 65,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 70,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 477,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0069.json b/res/field/events/events_0069.json
index d2eb5f3101..d6fe8ec2b3 100644
--- a/res/field/events/events_0069.json
+++ b/res/field/events/events_0069.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -54,20 +54,20 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 10,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 69,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0070.json b/res/field/events/events_0070.json
index ace8e9359d..811882b43d 100644
--- a/res/field/events/events_0070.json
+++ b/res/field/events/events_0070.json
@@ -4,32 +4,32 @@
             "script": 4,
             "type": 0,
             "x": 10,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 11,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 12,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 13,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -73,14 +73,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 65,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0071.json b/res/field/events/events_0071.json
index 2f56e6bef9..6a58870cdf 100644
--- a/res/field/events/events_0071.json
+++ b/res/field/events/events_0071.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 22,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -45,12 +45,14 @@
             "flag": 509,
             "script": 3409,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -59,12 +61,14 @@
             "flag": 509,
             "script": 3420,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -77,8 +81,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 14,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -91,8 +95,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 14,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 262,
@@ -105,32 +109,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 65,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 73,
             "dest_warp_id": 0
         },
         {
             "x": 20,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 73,
             "dest_warp_id": 2
         },
         {
             "x": 2,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 571,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0072.json b/res/field/events/events_0072.json
index 6ecb70c2b6..1d1b393bf6 100644
--- a/res/field/events/events_0072.json
+++ b/res/field/events/events_0072.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 16,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -77,32 +77,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 72,
             "dest_warp_id": 1
         },
         {
             "x": 20,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 74,
             "dest_warp_id": 0
         },
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 72,
             "dest_warp_id": 2
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 74,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0073.json b/res/field/events/events_0073.json
index 8ae892cb93..e3407fac7c 100644
--- a/res/field/events/events_0073.json
+++ b/res/field/events/events_0073.json
@@ -4,8 +4,8 @@
             "script": 2,
             "type": 0,
             "x": 16,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -31,12 +31,14 @@
             "flag": 509,
             "script": 3422,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -45,12 +47,14 @@
             "flag": 509,
             "script": 3830,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -63,32 +67,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 73,
             "dest_warp_id": 1
         },
         {
             "x": 20,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 75,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 73,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 75,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0074.json b/res/field/events/events_0074.json
index 29324487d8..2c1e173e25 100644
--- a/res/field/events/events_0074.json
+++ b/res/field/events/events_0074.json
@@ -4,8 +4,8 @@
             "script": 6,
             "type": 0,
             "x": 16,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -105,20 +105,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 74,
             "dest_warp_id": 1
         },
         {
             "x": 3,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 74,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0075.json b/res/field/events/events_0075.json
index 3f8beda55f..db02dd2f9b 100644
--- a/res/field/events/events_0075.json
+++ b/res/field/events/events_0075.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 65,
             "dest_warp_id": 4
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 77,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0076.json b/res/field/events/events_0076.json
index 323d4925c3..907502545d 100644
--- a/res/field/events/events_0076.json
+++ b/res/field/events/events_0076.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 76,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 78,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0077.json b/res/field/events/events_0077.json
index 71dacc12d9..7b0c23ac0d 100644
--- a/res/field/events/events_0077.json
+++ b/res/field/events/events_0077.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 16,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 5,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 1,
@@ -54,20 +54,20 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 13,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 77,
             "dest_warp_id": 1
         },
         {
             "x": 1,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 79,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0078.json b/res/field/events/events_0078.json
index dbc12cf531..9a35ce137e 100644
--- a/res/field/events/events_0078.json
+++ b/res/field/events/events_0078.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 78,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0079.json b/res/field/events/events_0079.json
index 7278334cd3..f4f91c0650 100644
--- a/res/field/events/events_0079.json
+++ b/res/field/events/events_0079.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -40,44 +40,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 65,
             "dest_warp_id": 8
         },
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 4
         },
         {
             "x": 6,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 4
         },
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 4
         },
         {
             "x": 6,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 65,
             "dest_warp_id": 8
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 65,
             "dest_warp_id": 8
         }
@@ -86,22 +86,22 @@
         {
             "script": 3,
             "x": 5,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 4,
             "x": 5,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16386
+            "var": 16386,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0080.json b/res/field/events/events_0080.json
index f64b32dd45..25c529b261 100644
--- a/res/field/events/events_0080.json
+++ b/res/field/events/events_0080.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 65,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0081.json b/res/field/events/events_0081.json
index 137634feac..c39f992448 100644
--- a/res/field/events/events_0081.json
+++ b/res/field/events/events_0081.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 65,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0082.json b/res/field/events/events_0082.json
index 5e765f7b09..e2b20d5643 100644
--- a/res/field/events/events_0082.json
+++ b/res/field/events/events_0082.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 65,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0083.json b/res/field/events/events_0083.json
index 6fee6c7265..f14f852959 100644
--- a/res/field/events/events_0083.json
+++ b/res/field/events/events_0083.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 5,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 5,
             "type": 1,
             "x": 1,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -43,8 +43,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -57,8 +57,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -71,14 +71,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 65,
             "dest_warp_id": 11
         }
diff --git a/res/field/events/events_0085.json b/res/field/events/events_0085.json
index bb10e1fef0..edd15e0e25 100644
--- a/res/field/events/events_0085.json
+++ b/res/field/events/events_0085.json
@@ -4,8 +4,8 @@
             "script": 8016,
             "type": 2,
             "x": 470,
-            "y": 681,
-            "z": 0,
+            "z": 681,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 487,
-            "y": 714,
-            "z": 7
+            "z": 714,
+            "y": 7
         },
         {
             "graphics_id": 15,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 477,
-            "y": 723,
-            "z": 7
+            "z": 723,
+            "y": 7
         },
         {
             "graphics_id": 12,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 499,
-            "y": 710,
-            "z": 7
+            "z": 710,
+            "y": 7
         },
         {
             "graphics_id": 81,
@@ -63,8 +63,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 500,
-            "y": 710,
-            "z": 7
+            "z": 710,
+            "y": 7
         },
         {
             "graphics_id": 9,
@@ -77,8 +77,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 491,
-            "y": 694,
-            "z": 7
+            "z": 694,
+            "y": 7
         },
         {
             "graphics_id": 16,
@@ -91,8 +91,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 491,
-            "y": 704,
-            "z": 7
+            "z": 704,
+            "y": 7
         },
         {
             "graphics_id": 44,
@@ -105,8 +105,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 470,
-            "y": 705,
-            "z": 7
+            "z": 705,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -119,8 +119,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 476,
-            "y": 704,
-            "z": 7
+            "z": 704,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -133,8 +133,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 463,
-            "y": 714,
-            "z": 7
+            "z": 714,
+            "y": 7
         },
         {
             "graphics_id": 20,
@@ -147,8 +147,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 458,
-            "y": 694,
-            "z": 7
+            "z": 694,
+            "y": 7
         },
         {
             "graphics_id": 204,
@@ -161,8 +161,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 458,
-            "y": 695,
-            "z": 7
+            "z": 695,
+            "y": 7
         },
         {
             "graphics_id": 94,
@@ -171,12 +171,14 @@
             "flag": 0,
             "script": 26,
             "initial_dir": 0,
-            "data": [16],
+            "data": [
+                16
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 461,
-            "y": 724,
-            "z": 0
+            "z": 724,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -185,12 +187,14 @@
             "flag": 0,
             "script": 27,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 498,
-            "y": 725,
-            "z": 0
+            "z": 725,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -203,8 +207,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 461,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -217,8 +221,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 476,
-            "y": 693,
-            "z": 0
+            "z": 693,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -231,8 +235,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 498,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -245,8 +249,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 486,
-            "y": 710,
-            "z": 0
+            "z": 710,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -259,8 +263,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 495,
-            "y": 697,
-            "z": 0
+            "z": 697,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -269,12 +273,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [12],
+            "data": [
+                12
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 481,
-            "y": 723,
-            "z": 0
+            "z": 723,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -287,8 +293,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 505,
-            "y": 726,
-            "z": 7
+            "z": 726,
+            "y": 7
         },
         {
             "graphics_id": 20,
@@ -301,8 +307,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 505,
-            "y": 727,
-            "z": 7
+            "z": 727,
+            "y": 7
         },
         {
             "graphics_id": 20,
@@ -315,8 +321,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 501,
-            "y": 725,
-            "z": 7
+            "z": 725,
+            "y": 7
         },
         {
             "graphics_id": 192,
@@ -329,8 +335,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 472,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -343,8 +349,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 473,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -357,8 +363,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 485,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -371,8 +377,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 486,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -385,8 +391,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 463,
-            "y": 701,
-            "z": 0
+            "z": 701,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -399,8 +405,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 472,
-            "y": 689,
-            "z": 0
+            "z": 689,
+            "y": 0
         },
         {
             "graphics_id": 81,
@@ -413,8 +419,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 473,
-            "y": 715,
-            "z": 7
+            "z": 715,
+            "y": 7
         },
         {
             "graphics_id": 9,
@@ -427,8 +433,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 474,
-            "y": 715,
-            "z": 7
+            "z": 715,
+            "y": 7
         },
         {
             "graphics_id": 93,
@@ -441,8 +447,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 470,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -455,8 +461,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 470,
-            "y": 725,
-            "z": 7
+            "z": 725,
+            "y": 7
         },
         {
             "graphics_id": 35,
@@ -469,8 +475,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 470,
-            "y": 725,
-            "z": 7
+            "z": 725,
+            "y": 7
         },
         {
             "graphics_id": 168,
@@ -483,8 +489,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 499,
-            "y": 698,
-            "z": 0
+            "z": 698,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -497,8 +503,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 483,
-            "y": 708,
-            "z": 7
+            "z": 708,
+            "y": 7
         },
         {
             "graphics_id": 51,
@@ -511,128 +517,128 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 502,
-            "y": 699,
-            "z": 0
+            "z": 699,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 458,
-            "y": 683,
+            "z": 683,
             "dest_header_id": 107,
             "dest_warp_id": 0
         },
         {
             "x": 459,
-            "y": 683,
+            "z": 683,
             "dest_header_id": 107,
             "dest_warp_id": 0
         },
         {
             "x": 479,
-            "y": 691,
+            "z": 691,
             "dest_header_id": 117,
             "dest_warp_id": 0
         },
         {
             "x": 500,
-            "y": 683,
+            "z": 683,
             "dest_header_id": 108,
             "dest_warp_id": 0
         },
         {
             "x": 501,
-            "y": 683,
+            "z": 683,
             "dest_header_id": 108,
             "dest_warp_id": 0
         },
         {
             "x": 465,
-            "y": 697,
+            "z": 697,
             "dest_header_id": 101,
             "dest_warp_id": 0
         },
         {
             "x": 470,
-            "y": 697,
+            "z": 697,
             "dest_header_id": 115,
             "dest_warp_id": 0
         },
         {
             "x": 494,
-            "y": 710,
+            "z": 710,
             "dest_header_id": 103,
             "dest_warp_id": 0
         },
         {
             "x": 499,
-            "y": 697,
+            "z": 697,
             "dest_header_id": 88,
             "dest_warp_id": 3
         },
         {
             "x": 460,
-            "y": 709,
+            "z": 709,
             "dest_header_id": 119,
             "dest_warp_id": 0
         },
         {
             "x": 472,
-            "y": 710,
+            "z": 710,
             "dest_header_id": 116,
             "dest_warp_id": 0
         },
         {
             "x": 477,
-            "y": 710,
+            "z": 710,
             "dest_header_id": 87,
             "dest_warp_id": 0
         },
         {
             "x": 488,
-            "y": 710,
+            "z": 710,
             "dest_header_id": 106,
             "dest_warp_id": 0
         },
         {
             "x": 486,
-            "y": 697,
+            "z": 697,
             "dest_header_id": 112,
             "dest_warp_id": 0
         },
         {
             "x": 454,
-            "y": 726,
+            "z": 726,
             "dest_header_id": 109,
             "dest_warp_id": 0
         },
         {
             "x": 458,
-            "y": 729,
+            "z": 729,
             "dest_header_id": 111,
             "dest_warp_id": 0
         },
         {
             "x": 459,
-            "y": 729,
+            "z": 729,
             "dest_header_id": 111,
             "dest_warp_id": 0
         },
         {
             "x": 505,
-            "y": 727,
+            "z": 727,
             "dest_header_id": 110,
             "dest_warp_id": 0
         },
         {
             "x": 454,
-            "y": 727,
+            "z": 727,
             "dest_header_id": 109,
             "dest_warp_id": 0
         },
         {
             "x": 505,
-            "y": 726,
+            "z": 726,
             "dest_header_id": 110,
             "dest_warp_id": 0
         }
@@ -641,12 +647,12 @@
         {
             "script": 21,
             "x": 461,
-            "y": 725,
+            "z": 725,
+            "y": 0,
             "width": 1,
             "length": 5,
-            "z": 0,
-            "value": 0,
-            "var": 16630
+            "var": 16630,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0086.json b/res/field/events/events_0086.json
index 84808e3dc3..dd22129841 100644
--- a/res/field/events/events_0086.json
+++ b/res/field/events/events_0086.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 86,
             "dest_warp_id": 11
         }
diff --git a/res/field/events/events_0087.json b/res/field/events/events_0087.json
index 9a5536bf09..def70a3cc8 100644
--- a/res/field/events/events_0087.json
+++ b/res/field/events/events_0087.json
@@ -4,16 +4,16 @@
             "script": 2,
             "type": 0,
             "x": 2,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,38 +29,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 90,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 89,
             "dest_warp_id": 0
         },
         {
             "x": 12,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 91,
             "dest_warp_id": 3
         },
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 86,
             "dest_warp_id": 8
         },
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 91,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0088.json b/res/field/events/events_0088.json
index 811549af1c..aa338c03ef 100644
--- a/res/field/events/events_0088.json
+++ b/res/field/events/events_0088.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3356,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 12,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -22,36 +24,38 @@
             "flag": 0,
             "script": 3324,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 88,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 90,
             "dest_warp_id": 0
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 90,
             "dest_warp_id": 0
         },
         {
             "x": 12,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 90,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0089.json b/res/field/events/events_0089.json
index ee29cc0bdc..741a3b8f97 100644
--- a/res/field/events/events_0089.json
+++ b/res/field/events/events_0089.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3342,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 4,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3279,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 18,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 3339,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 21,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -50,48 +56,50 @@
             "flag": 0,
             "script": 3283,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 88,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 91,
             "dest_warp_id": 3
         },
         {
             "x": 9,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 91,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 91,
             "dest_warp_id": 3
         },
         {
             "x": 19,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 91,
             "dest_warp_id": 3
         },
         {
             "x": 24,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 91,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0090.json b/res/field/events/events_0090.json
index f5b3dd07ef..639d5737ca 100644
--- a/res/field/events/events_0090.json
+++ b/res/field/events/events_0090.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -40,38 +40,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 93,
             "dest_warp_id": 3
         },
         {
             "x": 1,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 92,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 94,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 88,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 88,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0091.json b/res/field/events/events_0091.json
index e91d90a33e..0d15720dab 100644
--- a/res/field/events/events_0091.json
+++ b/res/field/events/events_0091.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3265,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 91,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0092.json b/res/field/events/events_0092.json
index dd631bb483..28b500d62c 100644
--- a/res/field/events/events_0092.json
+++ b/res/field/events/events_0092.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 9,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 9,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,25 +21,25 @@
     "warp_events": [
         {
             "x": 9,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 96,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 95,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 97,
             "dest_warp_id": 0
         },
         {
             "x": 9,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 91,
             "dest_warp_id": 0
         }
@@ -48,12 +48,12 @@
         {
             "script": 2,
             "x": 9,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0093.json b/res/field/events/events_0093.json
index 516922cbe9..adfba51eda 100644
--- a/res/field/events/events_0093.json
+++ b/res/field/events/events_0093.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3329,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 91,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0094.json b/res/field/events/events_0094.json
index 2f0166cfcf..9d1691ceb7 100644
--- a/res/field/events/events_0094.json
+++ b/res/field/events/events_0094.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 9,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 9,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,25 +21,25 @@
     "warp_events": [
         {
             "x": 9,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 99,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 98,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 100,
             "dest_warp_id": 0
         },
         {
             "x": 9,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 93,
             "dest_warp_id": 1
         }
@@ -48,12 +48,12 @@
         {
             "script": 2,
             "x": 9,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0095.json b/res/field/events/events_0095.json
index 95139acdbf..7a6bac3c14 100644
--- a/res/field/events/events_0095.json
+++ b/res/field/events/events_0095.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3339,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 93,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0096.json b/res/field/events/events_0096.json
index 4fe9723176..aa2df18d50 100644
--- a/res/field/events/events_0096.json
+++ b/res/field/events/events_0096.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3342,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 93,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0097.json b/res/field/events/events_0097.json
index 6698b7568f..785915c106 100644
--- a/res/field/events/events_0097.json
+++ b/res/field/events/events_0097.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3279,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 95,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0098.json b/res/field/events/events_0098.json
index ae041fa100..c455d5d767 100644
--- a/res/field/events/events_0098.json
+++ b/res/field/events/events_0098.json
@@ -8,18 +8,20 @@
             "flag": 0,
             "script": 3283,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 95,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0099.json b/res/field/events/events_0099.json
index 2e3383ae39..2f13d75379 100644
--- a/res/field/events/events_0099.json
+++ b/res/field/events/events_0099.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 9,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 95,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0100.json b/res/field/events/events_0100.json
index bca12f0653..6137d480d6 100644
--- a/res/field/events/events_0100.json
+++ b/res/field/events/events_0100.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -82,26 +82,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 86,
             "dest_warp_id": 5
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 102,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 478,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0101.json b/res/field/events/events_0101.json
index c237d91c97..7414b7d681 100644
--- a/res/field/events/events_0101.json
+++ b/res/field/events/events_0101.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 101,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0102.json b/res/field/events/events_0102.json
index 75cb4d08ea..b5fc85df11 100644
--- a/res/field/events/events_0102.json
+++ b/res/field/events/events_0102.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 12,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 205,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -54,20 +54,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 86,
             "dest_warp_id": 7
         },
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 105,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0103.json b/res/field/events/events_0103.json
index e2fae8d9d9..e337ff544a 100644
--- a/res/field/events/events_0103.json
+++ b/res/field/events/events_0103.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 105,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0104.json b/res/field/events/events_0104.json
index bf642472aa..88ae972856 100644
--- a/res/field/events/events_0104.json
+++ b/res/field/events/events_0104.json
@@ -4,8 +4,8 @@
             "script": 1,
             "type": 0,
             "x": 1,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0105.json b/res/field/events/events_0105.json
index 4220258bb9..46432a1efe 100644
--- a/res/field/events/events_0105.json
+++ b/res/field/events/events_0105.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 86,
             "dest_warp_id": 12
         }
diff --git a/res/field/events/events_0106.json b/res/field/events/events_0106.json
index 7619ca6ee8..0a5efcafd5 100644
--- a/res/field/events/events_0106.json
+++ b/res/field/events/events_0106.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -54,20 +54,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 86,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 253,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0107.json b/res/field/events/events_0107.json
index e93fb43495..33b06b39db 100644
--- a/res/field/events/events_0107.json
+++ b/res/field/events/events_0107.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 3,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 86,
             "dest_warp_id": 3
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 253,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0108.json b/res/field/events/events_0108.json
index 293fd5aaca..2e9320f5b5 100644
--- a/res/field/events/events_0108.json
+++ b/res/field/events/events_0108.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 83,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 86,
             "dest_warp_id": 14
         },
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 354,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0109.json b/res/field/events/events_0109.json
index e1516ea087..a692073f9b 100644
--- a/res/field/events/events_0109.json
+++ b/res/field/events/events_0109.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 86,
             "dest_warp_id": 19
         },
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 356,
             "dest_warp_id": 0
         }
@@ -48,12 +48,12 @@
         {
             "script": 2,
             "x": 5,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 5,
-            "z": 0,
-            "value": 1,
-            "var": 16507
+            "var": 16507,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0110.json b/res/field/events/events_0110.json
index e3b4b3dbc1..d42344bbb7 100644
--- a/res/field/events/events_0110.json
+++ b/res/field/events/events_0110.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 23,
@@ -54,20 +54,20 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 4,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 86,
             "dest_warp_id": 15
         },
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 367,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0111.json b/res/field/events/events_0111.json
index ca24aa29e7..cc55b59101 100644
--- a/res/field/events/events_0111.json
+++ b/res/field/events/events_0111.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 81,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -54,8 +54,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 12,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -96,8 +96,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -110,20 +110,20 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 86,
             "dest_warp_id": 13
         },
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 114,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0112.json b/res/field/events/events_0112.json
index cbda285fca..5e825d503a 100644
--- a/res/field/events/events_0112.json
+++ b/res/field/events/events_0112.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -40,8 +40,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -54,14 +54,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 18,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 114,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0113.json b/res/field/events/events_0113.json
index bf642472aa..88ae972856 100644
--- a/res/field/events/events_0113.json
+++ b/res/field/events/events_0113.json
@@ -4,8 +4,8 @@
             "script": 1,
             "type": 0,
             "x": 1,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0114.json b/res/field/events/events_0114.json
index 408ad14629..3ed16ad3f6 100644
--- a/res/field/events/events_0114.json
+++ b/res/field/events/events_0114.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 86,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0115.json b/res/field/events/events_0115.json
index 7fd0d37384..c4d26e79cb 100644
--- a/res/field/events/events_0115.json
+++ b/res/field/events/events_0115.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 86,
             "dest_warp_id": 10
         }
diff --git a/res/field/events/events_0116.json b/res/field/events/events_0116.json
index e70093b153..68eee43cbb 100644
--- a/res/field/events/events_0116.json
+++ b/res/field/events/events_0116.json
@@ -4,48 +4,48 @@
             "script": 9812,
             "type": 0,
             "x": 9,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 2,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 6,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 8,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 10,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -75,8 +75,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -89,8 +89,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -103,8 +103,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 28,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 43,
@@ -117,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 140,
@@ -131,8 +131,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -145,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -159,8 +159,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -173,8 +173,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 4,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -187,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 16,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 130,
@@ -201,20 +201,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 86,
             "dest_warp_id": 2
         },
         {
             "x": 23,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 558,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0117.json b/res/field/events/events_0117.json
index 259f2f1704..b90a75d2b6 100644
--- a/res/field/events/events_0117.json
+++ b/res/field/events/events_0117.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 103,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 104,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 105,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -418,8 +418,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -432,8 +432,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0118.json b/res/field/events/events_0118.json
index 2a70882f72..f49feb8005 100644
--- a/res/field/events/events_0118.json
+++ b/res/field/events/events_0118.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -124,14 +124,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 86,
             "dest_warp_id": 9
         }
diff --git a/res/field/events/events_0119.json b/res/field/events/events_0119.json
index 3b9f789b61..392cb52deb 100644
--- a/res/field/events/events_0119.json
+++ b/res/field/events/events_0119.json
@@ -4,8 +4,8 @@
             "script": 8027,
             "type": 2,
             "x": 583,
-            "y": 857,
-            "z": 0,
+            "z": 857,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 592,
-            "y": 819,
-            "z": 0
+            "z": 819,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 592,
-            "y": 816,
-            "z": 0
+            "z": 816,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 603,
-            "y": 824,
-            "z": 0
+            "z": 824,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 603,
-            "y": 822,
-            "z": 0
+            "z": 822,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -73,12 +73,14 @@
             "flag": 0,
             "script": 13,
             "initial_dir": 0,
-            "data": [13],
+            "data": [
+                13
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 604,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -91,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 593,
-            "y": 827,
-            "z": 0
+            "z": 827,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -105,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 613,
-            "y": 810,
-            "z": 0
+            "z": 810,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -119,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 625,
-            "y": 829,
-            "z": 0
+            "z": 829,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -133,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 609,
-            "y": 841,
-            "z": 0
+            "z": 841,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -147,8 +149,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 607,
-            "y": 818,
-            "z": 0
+            "z": 818,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -161,8 +163,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 599,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -175,8 +177,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 597,
-            "y": 840,
-            "z": 0
+            "z": 840,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -189,8 +191,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 596,
-            "y": 840,
-            "z": 0
+            "z": 840,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -199,12 +201,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [58],
+            "data": [
+                58
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 608,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -213,12 +217,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [59],
+            "data": [
+                59
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -227,12 +233,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [60],
+            "data": [
+                60
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 609,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -241,12 +249,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [61],
+            "data": [
+                61
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 610,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -259,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 613,
-            "y": 836,
-            "z": 0
+            "z": 836,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -273,8 +283,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 595,
-            "y": 847,
-            "z": 0
+            "z": 847,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -287,8 +297,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 623,
-            "y": 814,
-            "z": 0
+            "z": 814,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -298,12 +308,14 @@
             "flag": 371,
             "script": 65535,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 845,
-            "z": 0
+            "z": 845,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -316,8 +328,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 614,
-            "y": 810,
-            "z": 0
+            "z": 810,
+            "y": 0
         },
         {
             "local_id": 39,
@@ -331,8 +343,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 852,
-            "z": 0
+            "z": 852,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -345,8 +357,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 614,
-            "y": 818,
-            "z": 0
+            "z": 818,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -359,8 +371,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 607,
-            "y": 833,
-            "z": 0
+            "z": 833,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -373,8 +385,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 609,
-            "y": 844,
-            "z": 0
+            "z": 844,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -387,8 +399,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 589,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 128,
@@ -401,8 +413,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 589,
-            "y": 827,
-            "z": 0
+            "z": 827,
+            "y": 0
         },
         {
             "graphics_id": 229,
@@ -415,80 +427,80 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 611,
-            "y": 821,
-            "z": 0
+            "z": 821,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 589,
-            "y": 827,
+            "z": 827,
             "dest_header_id": 122,
             "dest_warp_id": 0
         },
         {
             "x": 601,
-            "y": 835,
+            "z": 835,
             "dest_header_id": 128,
             "dest_warp_id": 0
         },
         {
             "x": 601,
-            "y": 844,
+            "z": 844,
             "dest_header_id": 121,
             "dest_warp_id": 0
         },
         {
             "x": 600,
-            "y": 824,
+            "z": 824,
             "dest_header_id": 130,
             "dest_warp_id": 0
         },
         {
             "x": 611,
-            "y": 835,
+            "z": 835,
             "dest_header_id": 129,
             "dest_warp_id": 0
         },
         {
             "x": 624,
-            "y": 819,
+            "z": 819,
             "dest_header_id": 131,
             "dest_warp_id": 0
         },
         {
             "x": 589,
-            "y": 844,
+            "z": 844,
             "dest_header_id": 127,
             "dest_warp_id": 0
         },
         {
             "x": 610,
-            "y": 809,
+            "z": 809,
             "dest_header_id": 125,
             "dest_warp_id": 0
         },
         {
             "x": 611,
-            "y": 809,
+            "z": 809,
             "dest_header_id": 125,
             "dest_warp_id": 0
         },
         {
             "x": 600,
-            "y": 815,
+            "z": 815,
             "dest_header_id": 123,
             "dest_warp_id": 0
         },
         {
             "x": 639,
-            "y": 812,
+            "z": 812,
             "dest_header_id": 374,
             "dest_warp_id": 1
         },
         {
             "x": 639,
-            "y": 813,
+            "z": 813,
             "dest_header_id": 374,
             "dest_warp_id": 1
         }
@@ -497,42 +509,42 @@
         {
             "script": 22,
             "x": 610,
-            "y": 810,
+            "z": 810,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 5,
-            "var": 16508
+            "var": 16508,
+            "value": 5
         },
         {
             "script": 18,
             "x": 589,
-            "y": 828,
+            "z": 828,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16508
+            "var": 16508,
+            "value": 1
         },
         {
             "script": 21,
             "x": 610,
-            "y": 810,
+            "z": 810,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 4,
-            "var": 16508
+            "var": 16508,
+            "value": 4
         },
         {
             "script": 23,
             "x": 608,
-            "y": 814,
+            "z": 814,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16583
+            "var": 16583,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0120.json b/res/field/events/events_0120.json
index 25769d3391..9b9342f968 100644
--- a/res/field/events/events_0120.json
+++ b/res/field/events/events_0120.json
@@ -4,8 +4,8 @@
             "script": 5,
             "type": 0,
             "x": 1,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -49,8 +49,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -77,14 +77,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 120,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0121.json b/res/field/events/events_0121.json
index 1025af83bb..cfe4ec9e25 100644
--- a/res/field/events/events_0121.json
+++ b/res/field/events/events_0121.json
@@ -4,16 +4,16 @@
             "script": 7,
             "type": 0,
             "x": 11,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 15,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 49,
@@ -53,12 +53,14 @@
             "flag": 0,
             "script": 3496,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -67,12 +69,14 @@
             "flag": 0,
             "script": 3338,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 48,
@@ -81,12 +85,14 @@
             "flag": 0,
             "script": 3497,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -95,12 +101,14 @@
             "flag": 0,
             "script": 3482,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -113,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -127,14 +135,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 13,
-            "y": 42,
+            "z": 42,
             "dest_header_id": 120,
             "dest_warp_id": 0
         }
@@ -143,102 +151,102 @@
         {
             "script": 2,
             "x": 3,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16385
+            "var": 16385,
+            "value": 0
         },
         {
             "script": 3,
             "x": 19,
-            "y": 24,
+            "z": 24,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 2,
             "x": 9,
-            "y": 24,
+            "z": 24,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16385
+            "var": 16385,
+            "value": 0
         },
         {
             "script": 3,
             "x": 17,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 3,
             "x": 10,
-            "y": 30,
+            "z": 30,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 3,
             "x": 19,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 4,
             "x": 9,
-            "y": 14,
+            "z": 14,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 4,
             "x": 23,
-            "y": 31,
+            "z": 31,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 4,
             "x": 19,
-            "y": 22,
+            "z": 22,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 4,
             "x": 3,
-            "y": 34,
+            "z": 34,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0122.json b/res/field/events/events_0122.json
index cc872468c4..106c626327 100644
--- a/res/field/events/events_0122.json
+++ b/res/field/events/events_0122.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -68,26 +68,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 120,
             "dest_warp_id": 9
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 124,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 479,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0123.json b/res/field/events/events_0123.json
index 14d00b1cfd..ceefb1d59d 100644
--- a/res/field/events/events_0123.json
+++ b/res/field/events/events_0123.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -54,20 +54,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 10,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 123,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0124.json b/res/field/events/events_0124.json
index cf7cc5a61e..a09984aedf 100644
--- a/res/field/events/events_0124.json
+++ b/res/field/events/events_0124.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -40,26 +40,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 120,
             "dest_warp_id": 7
         },
         {
             "x": 10,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 126,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 509,
             "dest_warp_id": 0
         }
@@ -68,12 +68,12 @@
         {
             "script": 2,
             "x": 4,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16599
+            "var": 16599,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0125.json b/res/field/events/events_0125.json
index 85907ba1df..f4afdb4cbe 100644
--- a/res/field/events/events_0125.json
+++ b/res/field/events/events_0125.json
@@ -4,24 +4,24 @@
             "script": 1,
             "type": 0,
             "x": 2,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 6,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 10,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -79,14 +79,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 125,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0126.json b/res/field/events/events_0126.json
index 67bf74961e..259464db68 100644
--- a/res/field/events/events_0126.json
+++ b/res/field/events/events_0126.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 120,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0127.json b/res/field/events/events_0127.json
index 264f806ae9..1aaf14d8a6 100644
--- a/res/field/events/events_0127.json
+++ b/res/field/events/events_0127.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 120,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0128.json b/res/field/events/events_0128.json
index 257df0e7c3..1fe8d823a8 100644
--- a/res/field/events/events_0128.json
+++ b/res/field/events/events_0128.json
@@ -12,8 +12,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 120,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0129.json b/res/field/events/events_0129.json
index fcccfeee15..e7b87a7992 100644
--- a/res/field/events/events_0129.json
+++ b/res/field/events/events_0129.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 194,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 120,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0130.json b/res/field/events/events_0130.json
index 0a373ed75b..9157f6d022 100644
--- a/res/field/events/events_0130.json
+++ b/res/field/events/events_0130.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 204,
@@ -40,14 +40,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 120,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0131.json b/res/field/events/events_0131.json
index 0cebfa3b98..ae67692c28 100644
--- a/res/field/events/events_0131.json
+++ b/res/field/events/events_0131.json
@@ -4,56 +4,56 @@
             "script": 8041,
             "type": 2,
             "x": 688,
-            "y": 592,
-            "z": 0,
+            "z": 592,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8040,
             "type": 2,
             "x": 698,
-            "y": 599,
-            "z": 0,
+            "z": 599,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 25,
             "type": 0,
             "x": 729,
-            "y": 616,
-            "z": 0,
+            "z": 616,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 26,
             "type": 0,
             "x": 730,
-            "y": 629,
-            "z": 0,
+            "z": 629,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 27,
             "type": 0,
             "x": 732,
-            "y": 628,
-            "z": 0,
+            "z": 628,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 28,
             "type": 0,
             "x": 731,
-            "y": 622,
-            "z": 0,
+            "z": 622,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8259,
             "type": 2,
             "x": 732,
-            "y": 630,
-            "z": 0,
+            "z": 630,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -69,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 722,
-            "y": 614,
-            "z": 7
+            "z": 614,
+            "y": 7
         },
         {
             "graphics_id": 15,
@@ -83,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 706,
-            "y": 614,
-            "z": 7
+            "z": 614,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -97,8 +97,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 701,
-            "y": 618,
-            "z": 7
+            "z": 618,
+            "y": 7
         },
         {
             "graphics_id": 63,
@@ -111,8 +111,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 699,
-            "y": 606,
-            "z": 7
+            "z": 606,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -125,8 +125,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 710,
-            "y": 605,
-            "z": 7
+            "z": 605,
+            "y": 7
         },
         {
             "graphics_id": 31,
@@ -139,8 +139,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 709,
-            "y": 612,
-            "z": 7
+            "z": 612,
+            "y": 7
         },
         {
             "graphics_id": 101,
@@ -153,8 +153,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 682,
-            "y": 614,
-            "z": 7
+            "z": 614,
+            "y": 7
         },
         {
             "graphics_id": 124,
@@ -167,8 +167,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 697,
-            "y": 595,
-            "z": 7
+            "z": 595,
+            "y": 7
         },
         {
             "graphics_id": 91,
@@ -177,12 +177,14 @@
             "flag": 0,
             "script": 17,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 697,
-            "y": 612,
-            "z": 0
+            "z": 612,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -191,12 +193,14 @@
             "flag": 0,
             "script": 19,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 696,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -205,12 +209,14 @@
             "flag": 0,
             "script": 20,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 719,
-            "y": 593,
-            "z": 0
+            "z": 593,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -219,12 +225,14 @@
             "flag": 0,
             "script": 21,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 704,
-            "y": 603,
-            "z": 0
+            "z": 603,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -233,12 +241,14 @@
             "flag": 0,
             "script": 18,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 688,
-            "y": 611,
-            "z": 0
+            "z": 611,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -247,12 +257,14 @@
             "flag": 0,
             "script": 22,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 709,
-            "y": 623,
-            "z": 0
+            "z": 623,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -261,12 +273,14 @@
             "flag": 0,
             "script": 23,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 714,
-            "y": 623,
-            "z": 0
+            "z": 623,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -275,12 +289,14 @@
             "flag": 0,
             "script": 24,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 715,
-            "y": 635,
-            "z": 0
+            "z": 635,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -293,8 +309,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 710,
-            "y": 635,
-            "z": 0
+            "z": 635,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -307,8 +323,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 712,
-            "y": 637,
-            "z": 0
+            "z": 637,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -321,8 +337,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 690,
-            "y": 613,
-            "z": 0
+            "z": 613,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -335,8 +351,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 710,
-            "y": 584,
-            "z": 0
+            "z": 584,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -349,8 +365,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 697,
-            "y": 597,
-            "z": 7
+            "z": 597,
+            "y": 7
         },
         {
             "graphics_id": 10,
@@ -363,8 +379,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 711,
-            "y": 625,
-            "z": 0
+            "z": 625,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -377,8 +393,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 687,
-            "y": 624,
-            "z": 0
+            "z": 624,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -391,8 +407,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 721,
-            "y": 593,
-            "z": 7
+            "z": 593,
+            "y": 7
         },
         {
             "graphics_id": 124,
@@ -405,8 +421,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 720,
-            "y": 632,
-            "z": 7
+            "z": 632,
+            "y": 7
         },
         {
             "graphics_id": 128,
@@ -419,8 +435,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 684,
-            "y": 611,
-            "z": 7
+            "z": 611,
+            "y": 7
         },
         {
             "graphics_id": 213,
@@ -433,8 +449,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 692,
-            "y": 603,
-            "z": 7
+            "z": 603,
+            "y": 7
         },
         {
             "graphics_id": 87,
@@ -447,8 +463,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 693,
-            "y": 584,
-            "z": 0
+            "z": 584,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -461,8 +477,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 705,
-            "y": 632,
-            "z": 7
+            "z": 632,
+            "y": 7
         },
         {
             "graphics_id": 10,
@@ -475,110 +491,110 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 695,
-            "y": 613,
-            "z": 0
+            "z": 613,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 678,
-            "y": 598,
+            "z": 598,
             "dest_header_id": 149,
             "dest_warp_id": 0
         },
         {
             "x": 678,
-            "y": 599,
+            "z": 599,
             "dest_header_id": 149,
             "dest_warp_id": 0
         },
         {
             "x": 706,
-            "y": 623,
+            "z": 623,
             "dest_header_id": 136,
             "dest_warp_id": 0
         },
         {
             "x": 701,
-            "y": 603,
+            "z": 603,
             "dest_header_id": 137,
             "dest_warp_id": 0
         },
         {
             "x": 701,
-            "y": 591,
+            "z": 591,
             "dest_header_id": 143,
             "dest_warp_id": 0
         },
         {
             "x": 716,
-            "y": 623,
+            "z": 623,
             "dest_header_id": 144,
             "dest_warp_id": 0
         },
         {
             "x": 690,
-            "y": 623,
+            "z": 623,
             "dest_header_id": 148,
             "dest_warp_id": 0
         },
         {
             "x": 696,
-            "y": 623,
+            "z": 623,
             "dest_header_id": 145,
             "dest_warp_id": 0
         },
         {
             "x": 711,
-            "y": 602,
+            "z": 602,
             "dest_header_id": 146,
             "dest_warp_id": 0
         },
         {
             "x": 717,
-            "y": 602,
+            "z": 602,
             "dest_header_id": 147,
             "dest_warp_id": 0
         },
         {
             "x": 717,
-            "y": 611,
+            "z": 611,
             "dest_header_id": 134,
             "dest_warp_id": 0
         },
         {
             "x": 718,
-            "y": 638,
+            "z": 638,
             "dest_header_id": 381,
             "dest_warp_id": 0
         },
         {
             "x": 719,
-            "y": 638,
+            "z": 638,
             "dest_header_id": 381,
             "dest_warp_id": 0
         },
         {
             "x": 684,
-            "y": 611,
+            "z": 611,
             "dest_header_id": 133,
             "dest_warp_id": 0
         },
         {
             "x": 714,
-            "y": 589,
+            "z": 589,
             "dest_header_id": 305,
             "dest_warp_id": 0
         },
         {
             "x": 717,
-            "y": 589,
+            "z": 589,
             "dest_header_id": 305,
             "dest_warp_id": 1
         },
         {
             "x": 720,
-            "y": 589,
+            "z": 589,
             "dest_header_id": 305,
             "dest_warp_id": 2
         }
@@ -587,22 +603,22 @@
         {
             "script": 10,
             "x": 697,
-            "y": 596,
+            "z": 596,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16509
+            "var": 16509,
+            "value": 0
         },
         {
             "script": 15,
             "x": 681,
-            "y": 616,
+            "z": 616,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16629
+            "var": 16629,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0132.json b/res/field/events/events_0132.json
index 1136e6db99..17f7a0ee1d 100644
--- a/res/field/events/events_0132.json
+++ b/res/field/events/events_0132.json
@@ -4,40 +4,40 @@
             "script": 4,
             "type": 0,
             "x": 10,
-            "y": 29,
-            "z": 0,
+            "z": 29,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 14,
-            "y": 29,
-            "z": 0,
+            "z": 29,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 12,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 10,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 14,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -53,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -67,8 +67,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -77,12 +77,14 @@
             "flag": 0,
             "script": 3308,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -91,12 +93,14 @@
             "flag": 0,
             "script": 3309,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -105,12 +109,14 @@
             "flag": 0,
             "script": 3311,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -119,18 +125,20 @@
             "flag": 0,
             "script": 3310,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 12,
-            "y": 30,
+            "z": 30,
             "dest_header_id": 132,
             "dest_warp_id": 13
         }
diff --git a/res/field/events/events_0133.json b/res/field/events/events_0133.json
index 02f93800a1..1dff0044a7 100644
--- a/res/field/events/events_0133.json
+++ b/res/field/events/events_0133.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -68,26 +68,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 132,
             "dest_warp_id": 10
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 135,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 480,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0134.json b/res/field/events/events_0134.json
index 9fdfb1a5d3..5d724b4afb 100644
--- a/res/field/events/events_0134.json
+++ b/res/field/events/events_0134.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 134,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0135.json b/res/field/events/events_0135.json
index dcc4038a8d..9e55b62106 100644
--- a/res/field/events/events_0135.json
+++ b/res/field/events/events_0135.json
@@ -4,104 +4,104 @@
             "script": 1,
             "type": 0,
             "x": 12,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 2,
             "type": 0,
             "x": 13,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 3,
             "type": 0,
             "x": 7,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 4,
             "type": 0,
             "x": 7,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 5,
             "type": 0,
             "x": 13,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 6,
             "type": 0,
             "x": 8,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 7,
             "type": 0,
             "x": 8,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 8,
             "type": 0,
             "x": 8,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 9,
             "type": 0,
             "x": 8,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 10,
             "type": 0,
             "x": 13,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 11,
             "type": 0,
             "x": 12,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 12,
             "type": 0,
             "x": 12,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 21,
             "type": 0,
             "x": 10,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -117,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -131,8 +131,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -145,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -159,8 +159,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -173,8 +173,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -187,8 +187,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -201,8 +201,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -215,8 +215,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -229,14 +229,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 9,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 132,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0136.json b/res/field/events/events_0136.json
index 1e151ef1bf..222ad935e6 100644
--- a/res/field/events/events_0136.json
+++ b/res/field/events/events_0136.json
@@ -4,16 +4,16 @@
             "script": 6,
             "type": 0,
             "x": 10,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -43,8 +43,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -57,8 +57,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -71,8 +71,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -99,32 +99,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 132,
             "dest_warp_id": 3
         },
         {
             "x": 12,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 138,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 566,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0137.json b/res/field/events/events_0137.json
index 71751e50bd..90d454b5b9 100644
--- a/res/field/events/events_0137.json
+++ b/res/field/events/events_0137.json
@@ -4,8 +4,8 @@
             "script": 8,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 15,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 18,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -105,26 +105,26 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 137,
             "dest_warp_id": 1
         },
         {
             "x": 12,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 139,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0138.json b/res/field/events/events_0138.json
index 64e96f8a07..9c81b3a799 100644
--- a/res/field/events/events_0138.json
+++ b/res/field/events/events_0138.json
@@ -4,8 +4,8 @@
             "script": 7,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -49,8 +49,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -91,26 +91,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 138,
             "dest_warp_id": 1
         },
         {
             "x": 12,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 140,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0139.json b/res/field/events/events_0139.json
index 3c8ca60d94..db83fa3888 100644
--- a/res/field/events/events_0139.json
+++ b/res/field/events/events_0139.json
@@ -4,8 +4,8 @@
             "script": 7,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 16,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -91,26 +91,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 139,
             "dest_warp_id": 1
         },
         {
             "x": 12,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 141,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0140.json b/res/field/events/events_0140.json
index 8cf4eb81d1..28df68b902 100644
--- a/res/field/events/events_0140.json
+++ b/res/field/events/events_0140.json
@@ -4,24 +4,24 @@
             "script": 6,
             "type": 0,
             "x": 5,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 6,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 13,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 83,
@@ -51,8 +51,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 14,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -65,8 +65,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -79,20 +79,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 140,
             "dest_warp_id": 1
         },
         {
             "x": 15,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0141.json b/res/field/events/events_0141.json
index 0fbb68d0b6..c73dc08008 100644
--- a/res/field/events/events_0141.json
+++ b/res/field/events/events_0141.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0142.json b/res/field/events/events_0142.json
index 2309790ad9..5bd40dfb10 100644
--- a/res/field/events/events_0142.json
+++ b/res/field/events/events_0142.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -68,20 +68,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 132,
             "dest_warp_id": 4
         },
         {
             "x": 13,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 310,
             "dest_warp_id": 2
         }
@@ -90,12 +90,12 @@
         {
             "script": 5,
             "x": 8,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 3,
-            "var": 16671
+            "var": 16671,
+            "value": 3
         }
     ]
 }
diff --git a/res/field/events/events_0143.json b/res/field/events/events_0143.json
index 72d9369839..a674644b44 100644
--- a/res/field/events/events_0143.json
+++ b/res/field/events/events_0143.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -40,14 +40,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 132,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0144.json b/res/field/events/events_0144.json
index 99bcd7beb8..c383da5af2 100644
--- a/res/field/events/events_0144.json
+++ b/res/field/events/events_0144.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 132,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0145.json b/res/field/events/events_0145.json
index 71a1a24e34..7f57be9b23 100644
--- a/res/field/events/events_0145.json
+++ b/res/field/events/events_0145.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 132,
             "dest_warp_id": 8
         }
diff --git a/res/field/events/events_0146.json b/res/field/events/events_0146.json
index 1cf766abaa..52b5b8a83a 100644
--- a/res/field/events/events_0146.json
+++ b/res/field/events/events_0146.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 132,
             "dest_warp_id": 9
         }
diff --git a/res/field/events/events_0147.json b/res/field/events/events_0147.json
index bf0964dc95..f54d4c5f38 100644
--- a/res/field/events/events_0147.json
+++ b/res/field/events/events_0147.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 204,
@@ -40,14 +40,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 132,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0148.json b/res/field/events/events_0148.json
index 92cce44d69..7d252af315 100644
--- a/res/field/events/events_0148.json
+++ b/res/field/events/events_0148.json
@@ -12,20 +12,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 132,
             "dest_warp_id": 0
         },
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 382,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0149.json b/res/field/events/events_0149.json
index 4a51ae9d4f..2b3bfc10ef 100644
--- a/res/field/events/events_0149.json
+++ b/res/field/events/events_0149.json
@@ -4,16 +4,16 @@
             "script": 8111,
             "type": 2,
             "x": 855,
-            "y": 759,
-            "z": 0,
+            "z": 759,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8110,
             "type": 2,
             "x": 889,
-            "y": 792,
-            "z": 0,
+            "z": 792,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 883,
-            "y": 770,
-            "z": 7
+            "z": 770,
+            "y": 7
         },
         {
             "graphics_id": 16,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 856,
-            "y": 782,
-            "z": 7
+            "z": 782,
+            "y": 7
         },
         {
             "graphics_id": 12,
@@ -57,8 +57,8 @@
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 848,
-            "y": 785,
-            "z": 7
+            "z": 785,
+            "y": 7
         },
         {
             "graphics_id": 40,
@@ -71,8 +71,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 881,
-            "y": 793,
-            "z": 7
+            "z": 793,
+            "y": 7
         },
         {
             "graphics_id": 93,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 848,
-            "y": 763,
-            "z": 0
+            "z": 763,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -95,12 +95,14 @@
             "flag": 0,
             "script": 10,
             "initial_dir": 0,
-            "data": [15],
+            "data": [
+                15
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 841,
-            "y": 788,
-            "z": 0
+            "z": 788,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -113,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 847,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -127,8 +129,8 @@
             "movement_range_x": 0,
             "movement_range_y": 5,
             "x": 854,
-            "y": 754,
-            "z": 7
+            "z": 754,
+            "y": 7
         },
         {
             "graphics_id": 93,
@@ -141,8 +143,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 882,
-            "y": 790,
-            "z": 0
+            "z": 790,
+            "y": 0
         },
         {
             "graphics_id": 167,
@@ -155,8 +157,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 857,
-            "y": 741,
-            "z": 0
+            "z": 741,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -169,8 +171,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 853,
-            "y": 751,
-            "z": 0
+            "z": 751,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -183,8 +185,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 853,
-            "y": 745,
-            "z": 0
+            "z": 745,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -197,8 +199,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 853,
-            "y": 755,
-            "z": 0
+            "z": 755,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -211,8 +213,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 885,
-            "y": 744,
-            "z": 0
+            "z": 744,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -225,8 +227,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 885,
-            "y": 770,
-            "z": 0
+            "z": 770,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -239,8 +241,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 858,
-            "y": 759,
-            "z": 0
+            "z": 759,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -253,8 +255,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 884,
-            "y": 794,
-            "z": 0
+            "z": 794,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -267,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 881,
-            "y": 779,
-            "z": 0
+            "z": 779,
+            "y": 0
         },
         {
             "graphics_id": 136,
@@ -281,8 +283,8 @@
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 845,
-            "y": 748,
-            "z": 7
+            "z": 748,
+            "y": 7
         },
         {
             "graphics_id": 182,
@@ -295,8 +297,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 878,
-            "y": 794,
-            "z": 0
+            "z": 794,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -309,92 +311,92 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 855,
-            "y": 747,
-            "z": 0
+            "z": 747,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 849,
-            "y": 762,
+            "z": 762,
             "dest_header_id": 157,
             "dest_warp_id": 0
         },
         {
             "x": 883,
-            "y": 743,
+            "z": 743,
             "dest_header_id": 158,
             "dest_warp_id": 0
         },
         {
             "x": 845,
-            "y": 768,
+            "z": 768,
             "dest_header_id": 159,
             "dest_warp_id": 0
         },
         {
             "x": 832,
-            "y": 790,
+            "z": 790,
             "dest_header_id": 398,
             "dest_warp_id": 1
         },
         {
             "x": 875,
-            "y": 743,
+            "z": 743,
             "dest_header_id": 160,
             "dest_warp_id": 0
         },
         {
             "x": 853,
-            "y": 768,
+            "z": 768,
             "dest_header_id": 153,
             "dest_warp_id": 0
         },
         {
             "x": 832,
-            "y": 791,
+            "z": 791,
             "dest_header_id": 398,
             "dest_warp_id": 1
         },
         {
             "x": 832,
-            "y": 751,
+            "z": 751,
             "dest_header_id": 161,
             "dest_warp_id": 0
         },
         {
             "x": 832,
-            "y": 750,
+            "z": 750,
             "dest_header_id": 162,
             "dest_warp_id": 0
         },
         {
             "x": 888,
-            "y": 771,
+            "z": 771,
             "dest_header_id": 163,
             "dest_warp_id": 0
         },
         {
             "x": 886,
-            "y": 790,
+            "z": 790,
             "dest_header_id": 516,
             "dest_warp_id": 0
         },
         {
             "x": 860,
-            "y": 784,
+            "z": 784,
             "dest_header_id": 151,
             "dest_warp_id": 0
         },
         {
             "x": 845,
-            "y": 747,
+            "z": 747,
             "dest_header_id": 154,
             "dest_warp_id": 0
         },
         {
             "x": 850,
-            "y": 762,
+            "z": 762,
             "dest_header_id": 157,
             "dest_warp_id": 0
         }
@@ -403,12 +405,12 @@
         {
             "script": 8,
             "x": 853,
-            "y": 743,
+            "z": 743,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 2,
-            "var": 16510
+            "var": 16510,
+            "value": 2
         }
     ]
 }
diff --git a/res/field/events/events_0150.json b/res/field/events/events_0150.json
index 2e03499efe..06ea2a6d0c 100644
--- a/res/field/events/events_0150.json
+++ b/res/field/events/events_0150.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -82,26 +82,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 150,
             "dest_warp_id": 11
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 152,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 481,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0151.json b/res/field/events/events_0151.json
index bf94f7ac21..c3ed4a0114 100644
--- a/res/field/events/events_0151.json
+++ b/res/field/events/events_0151.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 151,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0152.json b/res/field/events/events_0152.json
index f481bdcf28..644cc8cb10 100644
--- a/res/field/events/events_0152.json
+++ b/res/field/events/events_0152.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 150,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0153.json b/res/field/events/events_0153.json
index 429a6c3f29..1bc1ba4ab5 100644
--- a/res/field/events/events_0153.json
+++ b/res/field/events/events_0153.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 6,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 10,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -39,24 +39,26 @@
             "flag": 0,
             "script": 3343,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 150,
             "dest_warp_id": 12
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 155,
             "dest_warp_id": 0
         }
@@ -65,22 +67,22 @@
         {
             "script": 2,
             "x": 3,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 2,
             "x": 13,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0154.json b/res/field/events/events_0154.json
index dd9ebcfd84..1a17de6f32 100644
--- a/res/field/events/events_0154.json
+++ b/res/field/events/events_0154.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3340,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3300,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -36,24 +40,26 @@
             "flag": 0,
             "script": 3330,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 9,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 154,
             "dest_warp_id": 1
         },
         {
             "x": 9,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 156,
             "dest_warp_id": 0
         }
@@ -62,32 +68,32 @@
         {
             "script": 2,
             "x": 6,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 3,
             "x": 6,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 3,
             "x": 11,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0155.json b/res/field/events/events_0155.json
index 66071ee67f..5c6e5da942 100644
--- a/res/field/events/events_0155.json
+++ b/res/field/events/events_0155.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -22,12 +22,14 @@
             "flag": 0,
             "script": 3284,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -36,12 +38,14 @@
             "flag": 0,
             "script": 3301,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -50,12 +54,14 @@
             "flag": 0,
             "script": 3302,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -64,18 +70,20 @@
             "flag": 0,
             "script": 3280,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 25,
+            "z": 25,
             "dest_header_id": 155,
             "dest_warp_id": 1
         }
@@ -84,42 +92,42 @@
         {
             "script": 2,
             "x": 6,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 2,
             "x": 16,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 3,
             "x": 6,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 3,
             "x": 16,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0156.json b/res/field/events/events_0156.json
index 1ed8d9c7dc..b00ec22cd3 100644
--- a/res/field/events/events_0156.json
+++ b/res/field/events/events_0156.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -40,8 +40,8 @@
             "movement_range_x": 10,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 150,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0157.json b/res/field/events/events_0157.json
index 149040b9da..9281ac1f76 100644
--- a/res/field/events/events_0157.json
+++ b/res/field/events/events_0157.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0158.json b/res/field/events/events_0158.json
index e86ed9658b..adc07f25b2 100644
--- a/res/field/events/events_0158.json
+++ b/res/field/events/events_0158.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 43,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -96,14 +96,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0159.json b/res/field/events/events_0159.json
index d74992e743..138d71fb28 100644
--- a/res/field/events/events_0159.json
+++ b/res/field/events/events_0159.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0160.json b/res/field/events/events_0160.json
index 8f2560c02a..ffb68ce1b9 100644
--- a/res/field/events/events_0160.json
+++ b/res/field/events/events_0160.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0161.json b/res/field/events/events_0161.json
index 92dddaf032..63836dcfab 100644
--- a/res/field/events/events_0161.json
+++ b/res/field/events/events_0161.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 8
         }
diff --git a/res/field/events/events_0162.json b/res/field/events/events_0162.json
index 2013493d01..e01108dd53 100644
--- a/res/field/events/events_0162.json
+++ b/res/field/events/events_0162.json
@@ -12,14 +12,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 150,
             "dest_warp_id": 9
         }
diff --git a/res/field/events/events_0163.json b/res/field/events/events_0163.json
index edbfc9bb4e..457bbb56e8 100644
--- a/res/field/events/events_0163.json
+++ b/res/field/events/events_0163.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 6,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 133,
@@ -49,14 +49,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 516,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0164.json b/res/field/events/events_0164.json
index 6c8549dc42..7fa5bded39 100644
--- a/res/field/events/events_0164.json
+++ b/res/field/events/events_0164.json
@@ -4,8 +4,8 @@
             "script": 8178,
             "type": 2,
             "x": 381,
-            "y": 220,
-            "z": 0,
+            "z": 220,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 365,
-            "y": 243,
-            "z": 7
+            "z": 243,
+            "y": 7
         },
         {
             "graphics_id": 91,
@@ -31,12 +31,14 @@
             "flag": 0,
             "script": 10,
             "initial_dir": 0,
-            "data": [16],
+            "data": [
+                16
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 360,
-            "y": 240,
-            "z": 0
+            "z": 240,
+            "y": 0
         },
         {
             "graphics_id": 95,
@@ -49,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 363,
-            "y": 222,
-            "z": 0
+            "z": 222,
+            "y": 0
         },
         {
             "graphics_id": 64,
@@ -63,8 +65,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 361,
-            "y": 216,
-            "z": 7
+            "z": 216,
+            "y": 7
         },
         {
             "graphics_id": 65,
@@ -77,8 +79,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 376,
-            "y": 211,
-            "z": 7
+            "z": 211,
+            "y": 7
         },
         {
             "graphics_id": 56,
@@ -91,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 373,
-            "y": 228,
-            "z": 7
+            "z": 228,
+            "y": 7
         },
         {
             "graphics_id": 69,
@@ -105,8 +107,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 367,
-            "y": 198,
-            "z": 7
+            "z": 198,
+            "y": 7
         },
         {
             "graphics_id": 131,
@@ -119,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 366,
-            "y": 208,
-            "z": 7
+            "z": 208,
+            "y": 7
         },
         {
             "graphics_id": 56,
@@ -133,8 +135,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 356,
-            "y": 247,
-            "z": 7
+            "z": 247,
+            "y": 7
         },
         {
             "graphics_id": 65,
@@ -147,8 +149,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 355,
-            "y": 221,
-            "z": 7
+            "z": 221,
+            "y": 7
         },
         {
             "graphics_id": 138,
@@ -161,8 +163,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 366,
-            "y": 241,
-            "z": 7
+            "z": 241,
+            "y": 7
         },
         {
             "graphics_id": 87,
@@ -175,50 +177,50 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 372,
-            "y": 245,
-            "z": 0
+            "z": 245,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 353,
-            "y": 208,
+            "z": 208,
             "dest_header_id": 170,
             "dest_warp_id": 0
         },
         {
             "x": 379,
-            "y": 208,
+            "z": 208,
             "dest_header_id": 171,
             "dest_warp_id": 0
         },
         {
             "x": 366,
-            "y": 197,
+            "z": 197,
             "dest_header_id": 278,
             "dest_warp_id": 0
         },
         {
             "x": 353,
-            "y": 232,
+            "z": 232,
             "dest_header_id": 166,
             "dest_warp_id": 0
         },
         {
             "x": 379,
-            "y": 233,
+            "z": 233,
             "dest_header_id": 168,
             "dest_warp_id": 0
         },
         {
             "x": 367,
-            "y": 222,
+            "z": 222,
             "dest_header_id": 167,
             "dest_warp_id": 0
         },
         {
             "x": 367,
-            "y": 197,
+            "z": 197,
             "dest_header_id": 278,
             "dest_warp_id": 0
         }
@@ -227,12 +229,12 @@
         {
             "script": 3,
             "x": 366,
-            "y": 198,
+            "z": 198,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16511
+            "var": 16511,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0165.json b/res/field/events/events_0165.json
index 5b71f2ff7d..44d3fcfc84 100644
--- a/res/field/events/events_0165.json
+++ b/res/field/events/events_0165.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 65,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 9,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 165,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0166.json b/res/field/events/events_0166.json
index 404997a49a..b3010d7ac1 100644
--- a/res/field/events/events_0166.json
+++ b/res/field/events/events_0166.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 9,
-            "y": 27,
-            "z": 0,
+            "z": 27,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 13,
-            "y": 27,
-            "z": 0,
+            "z": 27,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 27,
-            "z": 0
+            "z": 27,
+            "y": 0
         },
         {
             "graphics_id": 68,
@@ -53,12 +53,14 @@
             "flag": 0,
             "script": 3826,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -67,12 +69,14 @@
             "flag": 0,
             "script": 3269,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -81,12 +85,14 @@
             "flag": 0,
             "script": 3270,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 68,
@@ -95,12 +101,14 @@
             "flag": 0,
             "script": 3268,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -109,12 +117,14 @@
             "flag": 0,
             "script": 3827,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 68,
@@ -123,12 +133,14 @@
             "flag": 0,
             "script": 3267,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -141,8 +153,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -155,8 +167,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -169,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -183,8 +195,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -197,8 +209,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -211,8 +223,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -225,8 +237,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -239,8 +251,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -253,8 +265,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -267,8 +279,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -281,8 +293,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -295,8 +307,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -309,8 +321,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -323,8 +335,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -337,8 +349,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -351,8 +363,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -365,8 +377,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -379,8 +391,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 118,
@@ -393,14 +405,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 28,
+            "z": 28,
             "dest_header_id": 165,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0167.json b/res/field/events/events_0167.json
index 4068277f92..2d8cd708bc 100644
--- a/res/field/events/events_0167.json
+++ b/res/field/events/events_0167.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 12,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 129,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -96,26 +96,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 165,
             "dest_warp_id": 4
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 169,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 482,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0168.json b/res/field/events/events_0168.json
index c8e533138e..d785d8a233 100644
--- a/res/field/events/events_0168.json
+++ b/res/field/events/events_0168.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 168,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0169.json b/res/field/events/events_0169.json
index a19b047fcd..5298318bba 100644
--- a/res/field/events/events_0169.json
+++ b/res/field/events/events_0169.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 165,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0170.json b/res/field/events/events_0170.json
index eda6eea6e1..037cc6abfa 100644
--- a/res/field/events/events_0170.json
+++ b/res/field/events/events_0170.json
@@ -4,8 +4,8 @@
             "script": 2053,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -35,14 +35,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 165,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0171.json b/res/field/events/events_0171.json
index 5fbf983ef6..1c0148760b 100644
--- a/res/field/events/events_0171.json
+++ b/res/field/events/events_0171.json
@@ -4,72 +4,72 @@
             "script": 8120,
             "type": 2,
             "x": 842,
-            "y": 580,
-            "z": 0,
+            "z": 580,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 842,
-            "y": 577,
-            "z": 0,
+            "z": 577,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 843,
-            "y": 577,
-            "z": 0,
+            "z": 577,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 851,
-            "y": 577,
-            "z": 0,
+            "z": 577,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 852,
-            "y": 577,
-            "z": 0,
+            "z": 577,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 837,
-            "y": 561,
-            "z": 0,
+            "z": 561,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 838,
-            "y": 561,
-            "z": 0,
+            "z": 561,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 856,
-            "y": 561,
-            "z": 0,
+            "z": 561,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 857,
-            "y": 561,
-            "z": 0,
+            "z": 561,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 848,
-            "y": 598,
-            "z": 0
+            "z": 598,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -95,60 +95,62 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 849,
-            "y": 580,
-            "z": 0
+            "z": 580,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 842,
-            "y": 598,
+            "z": 598,
             "dest_header_id": 173,
             "dest_warp_id": 0
         },
         {
             "x": 847,
-            "y": 559,
+            "z": 559,
             "dest_header_id": 175,
             "dest_warp_id": 1
         },
         {
             "x": 851,
-            "y": 597,
+            "z": 597,
             "dest_header_id": 244,
             "dest_warp_id": 7
         },
         {
             "x": 853,
-            "y": 582,
+            "z": 582,
             "dest_header_id": 244,
             "dest_warp_id": 8
         },
         {
             "x": 850,
-            "y": 597,
+            "z": 597,
             "dest_header_id": 244,
             "dest_warp_id": 7
         },
         {
             "x": 852,
-            "y": 597,
+            "z": 597,
             "dest_header_id": 244,
             "dest_warp_id": 7
         },
         {
             "x": 853,
-            "y": 581,
+            "z": 581,
             "dest_header_id": 244,
             "dest_warp_id": 8
         },
         {
             "x": 853,
-            "y": 583,
+            "z": 583,
             "dest_header_id": 244,
             "dest_warp_id": 8
         }
diff --git a/res/field/events/events_0172.json b/res/field/events/events_0172.json
index ee2a193ef6..09f047095f 100644
--- a/res/field/events/events_0172.json
+++ b/res/field/events/events_0172.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -40,26 +40,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 172,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 174,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 483,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0173.json b/res/field/events/events_0173.json
index 10fef6ec3d..c0207f70b1 100644
--- a/res/field/events/events_0173.json
+++ b/res/field/events/events_0173.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 173,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0174.json b/res/field/events/events_0174.json
index 75d909721d..5d7b2a469d 100644
--- a/res/field/events/events_0174.json
+++ b/res/field/events/events_0174.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -96,32 +96,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 176,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 172,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 495,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 496,
             "dest_warp_id": 0
         }
@@ -130,12 +130,12 @@
         {
             "script": 4,
             "x": 10,
-            "y": 4,
+            "z": 4,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16623
+            "var": 16623,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0175.json b/res/field/events/events_0175.json
index 55385be553..e78badb452 100644
--- a/res/field/events/events_0175.json
+++ b/res/field/events/events_0175.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 177,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 175,
             "dest_warp_id": 0
         }
@@ -19,12 +19,12 @@
         {
             "script": 3,
             "x": 4,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0176.json b/res/field/events/events_0176.json
index 3d4fb48831..ba4be77687 100644
--- a/res/field/events/events_0176.json
+++ b/res/field/events/events_0176.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 178,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 176,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0177.json b/res/field/events/events_0177.json
index 6d7ac1ecac..6b451d5285 100644
--- a/res/field/events/events_0177.json
+++ b/res/field/events/events_0177.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 179,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 177,
             "dest_warp_id": 0
         }
@@ -19,12 +19,12 @@
         {
             "script": 3,
             "x": 4,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0178.json b/res/field/events/events_0178.json
index eb87b57468..4660eed05a 100644
--- a/res/field/events/events_0178.json
+++ b/res/field/events/events_0178.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 180,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 178,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0179.json b/res/field/events/events_0179.json
index c6c1e06f5e..a0033bf1c4 100644
--- a/res/field/events/events_0179.json
+++ b/res/field/events/events_0179.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 181,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 179,
             "dest_warp_id": 0
         }
@@ -19,12 +19,12 @@
         {
             "script": 3,
             "x": 4,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0180.json b/res/field/events/events_0180.json
index 88234f3700..6ce9d69134 100644
--- a/res/field/events/events_0180.json
+++ b/res/field/events/events_0180.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 182,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 180,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0181.json b/res/field/events/events_0181.json
index 6b47ffe9c1..9c7ce604f0 100644
--- a/res/field/events/events_0181.json
+++ b/res/field/events/events_0181.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 183,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 181,
             "dest_warp_id": 0
         }
@@ -19,12 +19,12 @@
         {
             "script": 3,
             "x": 4,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0182.json b/res/field/events/events_0182.json
index 012aae981e..1b0f80798e 100644
--- a/res/field/events/events_0182.json
+++ b/res/field/events/events_0182.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 209,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 184,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 182,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0183.json b/res/field/events/events_0183.json
index 85537ce6de..de03da7fa5 100644
--- a/res/field/events/events_0183.json
+++ b/res/field/events/events_0183.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 185,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 23,
+            "z": 23,
             "dest_header_id": 183,
             "dest_warp_id": 0
         }
@@ -19,12 +19,12 @@
         {
             "script": 3,
             "x": 4,
-            "y": 19,
+            "z": 19,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0184.json b/res/field/events/events_0184.json
index 71e011077b..d5855831d1 100644
--- a/res/field/events/events_0184.json
+++ b/res/field/events/events_0184.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 186,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 18,
+            "z": 18,
             "dest_header_id": 184,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0185.json b/res/field/events/events_0185.json
index 7f40eb19bf..4114307bd7 100644
--- a/res/field/events/events_0185.json
+++ b/res/field/events/events_0185.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 187,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 23,
+            "z": 23,
             "dest_header_id": 185,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0186.json b/res/field/events/events_0186.json
index dcf2b371c3..90234fa308 100644
--- a/res/field/events/events_0186.json
+++ b/res/field/events/events_0186.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 186,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0187.json b/res/field/events/events_0187.json
index 5595799e43..40a7957cf4 100644
--- a/res/field/events/events_0187.json
+++ b/res/field/events/events_0187.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 9,
             "initial_dir": 0,
-            "data": [18],
+            "data": [
+                18
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 633,
-            "y": 433,
-            "z": 0
+            "z": 433,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 11,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 631,
-            "y": 430,
-            "z": 0
+            "z": 430,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 10,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 652,
-            "y": 426,
-            "z": 0
+            "z": 426,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -54,8 +60,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 648,
-            "y": 438,
-            "z": 0
+            "z": 438,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -68,8 +74,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 648,
-            "y": 437,
-            "z": 0
+            "z": 437,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -82,8 +88,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 634,
-            "y": 442,
-            "z": 0
+            "z": 442,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -96,8 +102,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 423,
-            "z": 0
+            "z": 423,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -110,8 +116,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -124,8 +130,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 426,
-            "z": 0
+            "z": 426,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -134,12 +140,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [90],
+            "data": [
+                90
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 639,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -148,12 +156,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [91],
+            "data": [
+                91
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 640,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -162,12 +172,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [92],
+            "data": [
+                92
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 641,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -176,12 +188,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [93],
+            "data": [
+                93
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 642,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -194,8 +208,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 652,
-            "y": 440,
-            "z": 0
+            "z": 440,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -208,8 +222,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 658,
-            "y": 428,
-            "z": 0
+            "z": 428,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -222,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 657,
-            "y": 433,
-            "z": 0
+            "z": 433,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -236,8 +250,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 650,
-            "y": 431,
-            "z": 0
+            "z": 431,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -250,8 +264,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 642,
-            "y": 432,
-            "z": 0
+            "z": 432,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -264,8 +278,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 619,
-            "y": 435,
-            "z": 0
+            "z": 435,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -278,8 +292,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 648,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -292,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 617,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -306,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 617,
-            "y": 435,
-            "z": 0
+            "z": 435,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -320,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 629,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -334,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 630,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 133,
@@ -348,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 655,
-            "y": 424,
-            "z": 0
+            "z": 424,
+            "y": 0
         },
         {
             "graphics_id": 136,
@@ -362,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 654,
-            "y": 424,
-            "z": 0
+            "z": 424,
+            "y": 0
         },
         {
             "graphics_id": 169,
@@ -376,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 655,
-            "y": 423,
-            "z": 0
+            "z": 423,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -390,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 652,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -404,8 +418,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 651,
-            "y": 428,
-            "z": 0
+            "z": 428,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -418,8 +432,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 651,
-            "y": 427,
-            "z": 0
+            "z": 427,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -432,8 +446,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 428,
-            "z": 0
+            "z": 428,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -446,56 +460,56 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 427,
-            "z": 0
+            "z": 427,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 630,
-            "y": 421,
+            "z": 421,
             "dest_header_id": 193,
             "dest_warp_id": 0
         },
         {
             "x": 631,
-            "y": 421,
+            "z": 421,
             "dest_header_id": 193,
             "dest_warp_id": 0
         },
         {
             "x": 654,
-            "y": 423,
+            "z": 423,
             "dest_header_id": 560,
             "dest_warp_id": 3
         },
         {
             "x": 655,
-            "y": 423,
+            "z": 423,
             "dest_header_id": 560,
             "dest_warp_id": 3
         },
         {
             "x": 654,
-            "y": 438,
+            "z": 438,
             "dest_header_id": 194,
             "dest_warp_id": 0
         },
         {
             "x": 654,
-            "y": 444,
+            "z": 444,
             "dest_header_id": 195,
             "dest_warp_id": 0
         },
         {
             "x": 647,
-            "y": 429,
+            "z": 429,
             "dest_header_id": 189,
             "dest_warp_id": 0
         },
         {
             "x": 660,
-            "y": 429,
+            "z": 429,
             "dest_header_id": 191,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0188.json b/res/field/events/events_0188.json
index b8bf0ffd77..e38dc955ee 100644
--- a/res/field/events/events_0188.json
+++ b/res/field/events/events_0188.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -82,26 +82,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 188,
             "dest_warp_id": 6
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 190,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 484,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0189.json b/res/field/events/events_0189.json
index 2105d6d8e4..95b09a807c 100644
--- a/res/field/events/events_0189.json
+++ b/res/field/events/events_0189.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 189,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0190.json b/res/field/events/events_0190.json
index 55fb911283..4ed48f667d 100644
--- a/res/field/events/events_0190.json
+++ b/res/field/events/events_0190.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 188,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0191.json b/res/field/events/events_0191.json
index 0d2c66528a..3779d6c4fd 100644
--- a/res/field/events/events_0191.json
+++ b/res/field/events/events_0191.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 322,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0192.json b/res/field/events/events_0192.json
index 9cc71c7069..bba0576ffd 100644
--- a/res/field/events/events_0192.json
+++ b/res/field/events/events_0192.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 188,
             "dest_warp_id": 0
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 400,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0193.json b/res/field/events/events_0193.json
index 01f68e773f..6fc3231881 100644
--- a/res/field/events/events_0193.json
+++ b/res/field/events/events_0193.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 188,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0194.json b/res/field/events/events_0194.json
index 7a74cf00ce..f6b27a4c9d 100644
--- a/res/field/events/events_0194.json
+++ b/res/field/events/events_0194.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 78,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 188,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0196.json b/res/field/events/events_0196.json
index c81b7f2adb..24992cc5a6 100644
--- a/res/field/events/events_0196.json
+++ b/res/field/events/events_0196.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -54,44 +54,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 45,
             "dest_warp_id": 12
         },
         {
             "x": 12,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 45,
             "dest_warp_id": 13
         },
         {
             "x": 13,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 45,
             "dest_warp_id": 14
         },
         {
             "x": 12,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 199,
             "dest_warp_id": 0
         },
         {
             "x": 11,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 199,
             "dest_warp_id": 0
         },
         {
             "x": 13,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 199,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0197.json b/res/field/events/events_0197.json
index 041af2bbe4..0cd937128a 100644
--- a/res/field/events/events_0197.json
+++ b/res/field/events/events_0197.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 28,
-            "z": 1
+            "z": 28,
+            "y": 1
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 28,
-            "z": 1
+            "z": 28,
+            "y": 1
         },
         {
             "graphics_id": 40,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 20,
-            "z": 1
+            "z": 20,
+            "y": 1
         },
         {
             "graphics_id": 40,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 15,
-            "z": 1
+            "z": 15,
+            "y": 1
         },
         {
             "graphics_id": 208,
@@ -124,8 +124,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 12,
-            "y": 28,
-            "z": 1
+            "z": 28,
+            "y": 1
         },
         {
             "graphics_id": 208,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 15,
-            "z": 1
+            "z": 15,
+            "y": 1
         },
         {
             "graphics_id": 208,
@@ -152,14 +152,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 15,
-            "z": 1
+            "z": 15,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 198,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0198.json b/res/field/events/events_0198.json
index d942e9bb8d..e4f76c3204 100644
--- a/res/field/events/events_0198.json
+++ b/res/field/events/events_0198.json
@@ -4,16 +4,16 @@
             "script": 8000,
             "type": 2,
             "x": 236,
-            "y": 651,
-            "z": 0,
+            "z": 651,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 4,
             "type": 0,
             "x": 243,
-            "y": 654,
-            "z": 0,
+            "z": 654,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 398,
             "script": 3,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 243,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 240,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "local_id": 6,
@@ -54,12 +56,14 @@
             "flag": 347,
             "script": 65535,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 215,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -72,8 +76,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 242,
-            "y": 644,
-            "z": 0
+            "z": 644,
+            "y": 0
         },
         {
             "graphics_id": 185,
@@ -82,12 +86,14 @@
             "flag": 523,
             "script": 6,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 241,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -100,8 +106,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 246,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -110,12 +116,14 @@
             "flag": 506,
             "script": 0,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 242,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -128,14 +136,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 232,
-            "y": 649,
-            "z": 0
+            "z": 649,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 243,
-            "y": 654,
+            "z": 654,
             "dest_header_id": 201,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0199.json b/res/field/events/events_0199.json
index 1f74bbd6dd..49ba654dac 100644
--- a/res/field/events/events_0199.json
+++ b/res/field/events/events_0199.json
@@ -4,16 +4,16 @@
             "script": 7,
             "type": 0,
             "x": 19,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 8,
             "type": 0,
             "x": 22,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 1
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 121,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -67,12 +67,14 @@
             "flag": 421,
             "script": 3297,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -81,12 +83,14 @@
             "flag": 421,
             "script": 3298,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -99,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -113,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 214,
@@ -127,14 +131,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 12,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 200,
             "dest_warp_id": 0
         }
@@ -143,12 +147,12 @@
         {
             "script": 4,
             "x": 19,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 1,
-            "var": 16591
+            "var": 16591,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0200.json b/res/field/events/events_0200.json
index 54e613bb8b..8de47a5beb 100644
--- a/res/field/events/events_0200.json
+++ b/res/field/events/events_0200.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [7],
+            "data": [
+                7
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 231,
-            "y": 554,
-            "z": 0
+            "z": 554,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 230,
-            "y": 554,
-            "z": 0
+            "z": 554,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 232,
-            "y": 554,
-            "z": 0
+            "z": 554,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -50,12 +56,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [9],
+            "data": [
+                9
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 233,
-            "y": 554,
-            "z": 0
+            "z": 554,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -68,8 +76,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 246,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -82,8 +90,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 247,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -96,8 +104,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 216,
-            "y": 566,
-            "z": 0
+            "z": 566,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -110,8 +118,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 216,
-            "y": 567,
-            "z": 0
+            "z": 567,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -124,8 +132,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 243,
-            "y": 569,
-            "z": 0
+            "z": 569,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -138,8 +146,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 228,
-            "y": 571,
-            "z": 0
+            "z": 571,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -152,8 +160,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 232,
-            "y": 560,
-            "z": 0
+            "z": 560,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0201.json b/res/field/events/events_0201.json
index 87df1cafe1..482530ae26 100644
--- a/res/field/events/events_0201.json
+++ b/res/field/events/events_0201.json
@@ -4,8 +4,8 @@
             "script": 8001,
             "type": 2,
             "x": 80,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 83,
-            "z": 0
+            "z": 83,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 24,
-            "y": 80,
-            "z": 0
+            "z": 80,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -45,12 +45,14 @@
             "flag": 0,
             "script": 3200,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 37,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -59,12 +61,14 @@
             "flag": 0,
             "script": 3201,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 65,
-            "y": 87,
-            "z": 0
+            "z": 87,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -73,12 +77,14 @@
             "flag": 0,
             "script": 3394,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 74,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -87,12 +93,14 @@
             "flag": 0,
             "script": 3205,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 50,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -101,12 +109,14 @@
             "flag": 0,
             "script": 3203,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -115,12 +125,14 @@
             "flag": 0,
             "script": 3202,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 65,
-            "y": 83,
-            "z": 0
+            "z": 83,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -133,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 81,
-            "z": 0
+            "z": 81,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -147,8 +159,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 59,
-            "z": 0
+            "z": 59,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -161,8 +173,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 50,
-            "y": 85,
-            "z": 0
+            "z": 85,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -175,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 66,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -189,8 +201,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 82,
-            "z": 0
+            "z": 82,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -203,8 +215,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 76,
-            "y": 72,
-            "z": 0
+            "z": 72,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -213,12 +225,14 @@
             "flag": 0,
             "script": 3204,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -227,12 +241,14 @@
             "flag": 0,
             "script": 3397,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 77,
-            "y": 67,
-            "z": 0
+            "z": 67,
+            "y": 0
         },
         {
             "graphics_id": 190,
@@ -245,8 +261,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 66,
-            "z": 0
+            "z": 66,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -259,8 +275,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 81,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -273,8 +289,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 84,
-            "y": 82,
-            "z": 0
+            "z": 82,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -287,8 +303,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 74,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -301,8 +317,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 75,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -315,8 +331,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 77,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -329,8 +345,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 64,
-            "z": 0
+            "z": 64,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -343,8 +359,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 65,
-            "z": 0
+            "z": 65,
+            "y": 0
         },
         {
             "graphics_id": 127,
@@ -357,38 +373,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 28,
-            "y": 86,
+            "z": 86,
             "dest_header_id": 347,
             "dest_warp_id": 0
         },
         {
             "x": 29,
-            "y": 86,
+            "z": 86,
             "dest_header_id": 347,
             "dest_warp_id": 1
         },
         {
             "x": 86,
-            "y": 36,
+            "z": 36,
             "dest_header_id": 349,
             "dest_warp_id": 1
         },
         {
             "x": 86,
-            "y": 37,
+            "z": 37,
             "dest_header_id": 349,
             "dest_warp_id": 0
         },
         {
             "x": 74,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 295,
             "dest_warp_id": 4
         }
@@ -397,32 +413,32 @@
         {
             "script": 1,
             "x": 28,
-            "y": 85,
+            "z": 85,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16561
+            "var": 16561,
+            "value": 0
         },
         {
             "script": 2,
             "x": 28,
-            "y": 86,
+            "z": 86,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16561
+            "var": 16561,
+            "value": 1
         },
         {
             "script": 3,
             "x": 82,
-            "y": 34,
+            "z": 34,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 1,
-            "var": 16561
+            "var": 16561,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0202.json b/res/field/events/events_0202.json
index 95e27bf58c..c7e6c5bd70 100644
--- a/res/field/events/events_0202.json
+++ b/res/field/events/events_0202.json
@@ -4,16 +4,16 @@
             "script": 8156,
             "type": 2,
             "x": 179,
-            "y": 594,
-            "z": 0,
+            "z": 594,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8155,
             "type": 2,
             "x": 177,
-            "y": 578,
-            "z": 0,
+            "z": 578,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 168,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 169,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [12],
+            "data": [
+                12
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 170,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [13],
+            "data": [
+                13
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 171,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -85,26 +93,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 172,
-            "y": 588,
-            "z": 0
+            "z": 588,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 169,
-            "y": 587,
+            "z": 587,
             "dest_header_id": 205,
             "dest_warp_id": 0
         },
         {
             "x": 168,
-            "y": 587,
+            "z": 587,
             "dest_header_id": 205,
             "dest_warp_id": 0
         },
         {
             "x": 170,
-            "y": 587,
+            "z": 587,
             "dest_header_id": 205,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0203.json b/res/field/events/events_0203.json
index 1da5142f4a..007e58a311 100644
--- a/res/field/events/events_0203.json
+++ b/res/field/events/events_0203.json
@@ -4,16 +4,16 @@
             "script": 8047,
             "type": 2,
             "x": 44,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8046,
             "type": 2,
             "x": 22,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 46,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 51,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -95,12 +95,14 @@
             "flag": 0,
             "script": 3843,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -109,12 +111,14 @@
             "flag": 0,
             "script": 3844,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -123,12 +127,14 @@
             "flag": 0,
             "script": 3845,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -141,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -155,8 +161,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -169,8 +175,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -183,14 +189,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 26,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 204,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0204.json b/res/field/events/events_0204.json
index 3c652471e6..fb5b07e8cd 100644
--- a/res/field/events/events_0204.json
+++ b/res/field/events/events_0204.json
@@ -4,24 +4,24 @@
             "script": 8013,
             "type": 2,
             "x": 13,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8271,
             "type": 2,
             "x": 4,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8272,
             "type": 2,
             "x": 7,
-            "y": 26,
-            "z": 0,
+            "z": 26,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -79,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -93,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -107,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 120,
@@ -121,26 +121,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 353,
             "dest_warp_id": 0
         },
         {
             "x": 27,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 354,
             "dest_warp_id": 3
         },
         {
             "x": 25,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 208,
             "dest_warp_id": 0
         }
@@ -149,12 +149,12 @@
         {
             "script": 1,
             "x": 14,
-            "y": 23,
+            "z": 23,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16534
+            "var": 16534,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0205.json b/res/field/events/events_0205.json
index dad0969acc..e73abfd3a2 100644
--- a/res/field/events/events_0205.json
+++ b/res/field/events/events_0205.json
@@ -4,16 +4,16 @@
             "script": 8082,
             "type": 2,
             "x": 25,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8081,
             "type": 2,
             "x": 16,
-            "y": 35,
-            "z": 0,
+            "z": 35,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 55,
-            "z": 0
+            "z": 55,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 60,
-            "z": 0
+            "z": 60,
+            "y": 0
         },
         {
             "graphics_id": 203,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -99,8 +99,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 250,
@@ -113,8 +113,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 251,
@@ -127,8 +127,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -141,44 +141,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 45,
-            "z": 0
+            "z": 45,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 27,
-            "y": 48,
+            "z": 48,
             "dest_header_id": 207,
             "dest_warp_id": 2
         },
         {
             "x": 2,
-            "y": 59,
+            "z": 59,
             "dest_header_id": 353,
             "dest_warp_id": 1
         },
         {
             "x": 7,
-            "y": 23,
+            "z": 23,
             "dest_header_id": 208,
             "dest_warp_id": 3
         },
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 208,
             "dest_warp_id": 2
         },
         {
             "x": 11,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 209,
             "dest_warp_id": 0
         },
         {
             "x": 21,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 209,
             "dest_warp_id": 1
         }
@@ -187,12 +187,12 @@
         {
             "script": 2,
             "x": 11,
-            "y": 24,
+            "z": 24,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 1,
-            "var": 16553
+            "var": 16553,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0206.json b/res/field/events/events_0206.json
index df4edb1fdf..ff44e9b70e 100644
--- a/res/field/events/events_0206.json
+++ b/res/field/events/events_0206.json
@@ -4,8 +4,8 @@
             "script": 8083,
             "type": 2,
             "x": 3,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 655,
             "script": 3522,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -31,30 +33,32 @@
             "flag": 655,
             "script": 3514,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 208,
             "dest_warp_id": 4
         },
         {
             "x": 18,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 208,
             "dest_warp_id": 5
         },
         {
             "x": 3,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 211,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0207.json b/res/field/events/events_0207.json
index 5edfea0937..7d8e7fab91 100644
--- a/res/field/events/events_0207.json
+++ b/res/field/events/events_0207.json
@@ -4,56 +4,56 @@
             "script": 8084,
             "type": 2,
             "x": 41,
-            "y": 44,
-            "z": 0,
+            "z": 44,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8092,
             "type": 2,
             "x": 44,
-            "y": 47,
-            "z": 0,
+            "z": 47,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8085,
             "type": 2,
             "x": 33,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8086,
             "type": 2,
             "x": 19,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8088,
             "type": 2,
             "x": 43,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8262,
             "type": 2,
             "x": 32,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8270,
             "type": 2,
             "x": 10,
-            "y": 20,
-            "z": 0,
+            "z": 20,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -69,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -83,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -97,8 +97,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -111,8 +111,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -125,8 +125,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -139,8 +139,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 39,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -153,26 +153,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 42,
-            "y": 40,
+            "z": 40,
             "dest_header_id": 212,
             "dest_warp_id": 4
         },
         {
             "x": 13,
-            "y": 19,
+            "z": 19,
             "dest_header_id": 213,
             "dest_warp_id": 0
         },
         {
             "x": 45,
-            "y": 28,
+            "z": 28,
             "dest_header_id": 216,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0208.json b/res/field/events/events_0208.json
index 8d5ed7953a..790bdf3d0d 100644
--- a/res/field/events/events_0208.json
+++ b/res/field/events/events_0208.json
@@ -4,48 +4,48 @@
             "script": 8084,
             "type": 2,
             "x": 41,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8092,
             "type": 2,
             "x": 44,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8089,
             "type": 2,
             "x": 13,
-            "y": 29,
-            "z": 0,
+            "z": 29,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8090,
             "type": 2,
             "x": 31,
-            "y": 33,
-            "z": 0,
+            "z": 33,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8260,
             "type": 2,
             "x": 15,
-            "y": 22,
-            "z": 0,
+            "z": 22,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8269,
             "type": 2,
             "x": 34,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -75,8 +75,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -89,8 +89,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -103,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -117,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -131,8 +131,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 0,
-            "z": 0
+            "z": 0,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -145,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 0,
-            "z": 0
+            "z": 0,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -159,26 +159,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 12,
-            "y": 35,
+            "z": 35,
             "dest_header_id": 209,
             "dest_warp_id": 2
         },
         {
             "x": 11,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 212,
             "dest_warp_id": 0
         },
         {
             "x": 39,
-            "y": 18,
+            "z": 18,
             "dest_header_id": 212,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0209.json b/res/field/events/events_0209.json
index 297f8c44f7..6bbde4fbf2 100644
--- a/res/field/events/events_0209.json
+++ b/res/field/events/events_0209.json
@@ -4,64 +4,64 @@
             "script": 8093,
             "type": 2,
             "x": 5,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8094,
             "type": 2,
             "x": 19,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8095,
             "type": 2,
             "x": 29,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8098,
             "type": 2,
             "x": 26,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8097,
             "type": 2,
             "x": 29,
-            "y": 24,
-            "z": 0,
+            "z": 24,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8096,
             "type": 2,
             "x": 38,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8099,
             "type": 2,
             "x": 59,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8261,
             "type": 2,
             "x": 37,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -133,8 +133,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -147,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -157,12 +157,15 @@
             "flag": 655,
             "script": 3516,
             "initial_dir": 0,
-            "data": [2, 5],
+            "data": [
+                2,
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -171,12 +174,14 @@
             "flag": 655,
             "script": 3515,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -189,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -203,38 +208,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 61,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 25,
+            "z": 25,
             "dest_header_id": 211,
             "dest_warp_id": 1
         },
         {
             "x": 35,
-            "y": 24,
+            "z": 24,
             "dest_header_id": 211,
             "dest_warp_id": 2
         },
         {
             "x": 17,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 212,
             "dest_warp_id": 3
         },
         {
             "x": 59,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 212,
             "dest_warp_id": 2
         },
         {
             "x": 40,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 210,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0210.json b/res/field/events/events_0210.json
index fe62991f3f..e459bc3a62 100644
--- a/res/field/events/events_0210.json
+++ b/res/field/events/events_0210.json
@@ -4,8 +4,8 @@
             "script": 8100,
             "type": 2,
             "x": 11,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,13 +13,13 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 210,
             "dest_warp_id": 1
         },
         {
             "x": 18,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 214,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0211.json b/res/field/events/events_0211.json
index 5a1b96909a..cf0998d2af 100644
--- a/res/field/events/events_0211.json
+++ b/res/field/events/events_0211.json
@@ -4,16 +4,16 @@
             "script": 8102,
             "type": 2,
             "x": 27,
-            "y": 16,
-            "z": 0,
+            "z": 16,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8101,
             "type": 2,
             "x": 27,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 655,
             "script": 3524,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -39,24 +41,26 @@
             "flag": 655,
             "script": 3519,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 21,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 213,
             "dest_warp_id": 1
         },
         {
             "x": 13,
-            "y": 24,
+            "z": 24,
             "dest_header_id": 215,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0212.json b/res/field/events/events_0212.json
index 1bd10f6532..f147226d2f 100644
--- a/res/field/events/events_0212.json
+++ b/res/field/events/events_0212.json
@@ -8,42 +8,44 @@
             "flag": 655,
             "script": 3525,
             "initial_dir": 2,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 24,
+            "z": 24,
             "dest_header_id": 214,
             "dest_warp_id": 1
         },
         {
             "x": 7,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 220,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 221,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 584,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 585,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0213.json b/res/field/events/events_0213.json
index 66c1430278..fbf49a34d1 100644
--- a/res/field/events/events_0213.json
+++ b/res/field/events/events_0213.json
@@ -4,48 +4,48 @@
             "script": 8105,
             "type": 2,
             "x": 6,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8103,
             "type": 2,
             "x": 18,
-            "y": 30,
-            "z": 0,
+            "z": 30,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8104,
             "type": 2,
             "x": 16,
-            "y": 35,
-            "z": 0,
+            "z": 35,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8107,
             "type": 2,
             "x": 16,
-            "y": 19,
-            "z": 0,
+            "z": 19,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8106,
             "type": 2,
             "x": 24,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8108,
             "type": 2,
             "x": 20,
-            "y": 58,
-            "z": 0,
+            "z": 58,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -75,8 +75,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -89,8 +89,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -103,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -117,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -131,8 +131,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -145,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -159,8 +159,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -173,8 +173,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -187,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -201,8 +201,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 54,
-            "z": 0
+            "z": 54,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -215,8 +215,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 55,
-            "z": 0
+            "z": 55,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -229,8 +229,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -239,12 +239,14 @@
             "flag": 655,
             "script": 3517,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -253,12 +255,14 @@
             "flag": 655,
             "script": 3518,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -267,12 +271,15 @@
             "flag": 655,
             "script": 3523,
             "initial_dir": 1,
-            "data": [1, 2],
+            "data": [
+                1,
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 10,
             "x": 25,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -285,20 +292,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 58,
+            "z": 58,
             "dest_header_id": 210,
             "dest_warp_id": 2
         },
         {
             "x": 16,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 218,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0214.json b/res/field/events/events_0214.json
index 98ed923259..70711a91b8 100644
--- a/res/field/events/events_0214.json
+++ b/res/field/events/events_0214.json
@@ -4,8 +4,8 @@
             "script": 8061,
             "type": 2,
             "x": 14,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,25 +13,25 @@
     "warp_events": [
         {
             "x": 10,
-            "y": 27,
+            "z": 27,
             "dest_header_id": 219,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 18,
+            "z": 18,
             "dest_header_id": 383,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 589,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 590,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0215.json b/res/field/events/events_0215.json
index c94d96a1ae..4d8e9d8d68 100644
--- a/res/field/events/events_0215.json
+++ b/res/field/events/events_0215.json
@@ -4,40 +4,40 @@
             "script": 8065,
             "type": 2,
             "x": 14,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8066,
             "type": 2,
             "x": 23,
-            "y": 35,
-            "z": 0,
+            "z": 35,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8064,
             "type": 2,
             "x": 15,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8062,
             "type": 2,
             "x": 4,
-            "y": 41,
-            "z": 0,
+            "z": 41,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8063,
             "type": 2,
             "x": 12,
-            "y": 59,
-            "z": 0,
+            "z": 59,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -53,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -67,8 +67,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -81,8 +81,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -95,8 +95,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 27,
-            "z": 0
+            "z": 27,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -109,8 +109,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -123,8 +123,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -137,8 +137,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 52,
-            "z": 0
+            "z": 52,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -151,8 +151,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -165,8 +165,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -179,8 +179,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -193,8 +193,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -207,8 +207,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -221,8 +221,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -235,8 +235,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -249,8 +249,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 60,
-            "z": 0
+            "z": 60,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -263,8 +263,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -277,8 +277,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -291,8 +291,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -305,32 +305,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 21,
-            "y": 61,
+            "z": 61,
             "dest_header_id": 216,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 219,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 41,
+            "z": 41,
             "dest_header_id": 365,
             "dest_warp_id": 0
         },
         {
             "x": 29,
-            "y": 35,
+            "z": 35,
             "dest_header_id": 366,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0216.json b/res/field/events/events_0216.json
index f2e5beee4a..11eb16d6c1 100644
--- a/res/field/events/events_0216.json
+++ b/res/field/events/events_0216.json
@@ -4,32 +4,32 @@
             "script": 8070,
             "type": 2,
             "x": 12,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8069,
             "type": 2,
             "x": 6,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8068,
             "type": 2,
             "x": 7,
-            "y": 27,
-            "z": 0,
+            "z": 27,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8067,
             "type": 2,
             "x": 2,
-            "y": 61,
-            "z": 0,
+            "z": 61,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -73,8 +73,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -87,8 +87,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -101,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -115,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -129,8 +129,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -143,8 +143,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -157,8 +157,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -171,8 +171,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -185,8 +185,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -199,8 +199,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -213,8 +213,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -227,8 +227,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 45,
-            "z": 0
+            "z": 45,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -241,8 +241,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -255,8 +255,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 60,
-            "z": 0
+            "z": 60,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -269,8 +269,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -283,8 +283,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -297,8 +297,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -311,8 +311,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -325,8 +325,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -339,8 +339,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -353,8 +353,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -367,20 +367,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 60,
-            "z": 0
+            "z": 60,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 60,
+            "z": 60,
             "dest_header_id": 218,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 217,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0217.json b/res/field/events/events_0217.json
index 3b0756a652..f848969da9 100644
--- a/res/field/events/events_0217.json
+++ b/res/field/events/events_0217.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 120,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 121,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 123,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 1
         }
@@ -98,32 +98,32 @@
         {
             "script": 3,
             "x": 31,
-            "y": 48,
+            "z": 48,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16536
+            "var": 16536,
+            "value": 0
         },
         {
             "script": 5,
             "x": 30,
-            "y": 32,
+            "z": 32,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16536
+            "var": 16536,
+            "value": 1
         },
         {
             "script": 2039,
             "x": 31,
-            "y": 52,
+            "z": 52,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16664
+            "var": 16664,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0218.json b/res/field/events/events_0218.json
index d41e8e8061..84f522e769 100644
--- a/res/field/events/events_0218.json
+++ b/res/field/events/events_0218.json
@@ -4,16 +4,16 @@
             "script": 7,
             "type": 0,
             "x": 29,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8,
             "type": 0,
             "x": 33,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 152,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 123,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 121,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -99,14 +99,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0220.json b/res/field/events/events_0220.json
index 8af489d2a9..a2f21a8d0c 100644
--- a/res/field/events/events_0220.json
+++ b/res/field/events/events_0220.json
@@ -4,24 +4,24 @@
             "script": 1,
             "type": 0,
             "x": 4,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 5,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,13 +29,13 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 433,
             "dest_warp_id": 7
         },
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 513,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0221.json b/res/field/events/events_0221.json
index cada538b29..4787efe75f 100644
--- a/res/field/events/events_0221.json
+++ b/res/field/events/events_0221.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 4,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 5,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,25 +29,25 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 433,
             "dest_warp_id": 8
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 229,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 230,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 228,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0222.json b/res/field/events/events_0222.json
index 83000c2b8d..576028944b 100644
--- a/res/field/events/events_0222.json
+++ b/res/field/events/events_0222.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 229,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0223.json b/res/field/events/events_0223.json
index 28aa981d20..cc105d69f6 100644
--- a/res/field/events/events_0223.json
+++ b/res/field/events/events_0223.json
@@ -4,8 +4,8 @@
             "script": 8036,
             "type": 2,
             "x": 3,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 226,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0224.json b/res/field/events/events_0224.json
index 2ac2130a8b..4303c29267 100644
--- a/res/field/events/events_0224.json
+++ b/res/field/events/events_0224.json
@@ -12,32 +12,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 226,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 231,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 227,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 232,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0225.json b/res/field/events/events_0225.json
index de83e98e7f..53643da643 100644
--- a/res/field/events/events_0225.json
+++ b/res/field/events/events_0225.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 226,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0226.json b/res/field/events/events_0226.json
index ca5defaa3d..5373d64f74 100644
--- a/res/field/events/events_0226.json
+++ b/res/field/events/events_0226.json
@@ -8,36 +8,38 @@
             "flag": 0,
             "script": 3552,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 229,
             "dest_warp_id": 1
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 237,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 235,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 236,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0227.json b/res/field/events/events_0227.json
index ffc1f97b2a..295b888819 100644
--- a/res/field/events/events_0227.json
+++ b/res/field/events/events_0227.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 229,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0228.json b/res/field/events/events_0228.json
index 3a0d2ebaab..c10917e03f 100644
--- a/res/field/events/events_0228.json
+++ b/res/field/events/events_0228.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 238,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0229.json b/res/field/events/events_0229.json
index 70e6ff3674..345e019345 100644
--- a/res/field/events/events_0229.json
+++ b/res/field/events/events_0229.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 239,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0230.json b/res/field/events/events_0230.json
index 2eb4f67561..4185beb4af 100644
--- a/res/field/events/events_0230.json
+++ b/res/field/events/events_0230.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 231,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0231.json b/res/field/events/events_0231.json
index a1d7999faf..9d61ac8a9a 100644
--- a/res/field/events/events_0231.json
+++ b/res/field/events/events_0231.json
@@ -4,8 +4,8 @@
             "script": 8037,
             "type": 2,
             "x": 3,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 231,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0232.json b/res/field/events/events_0232.json
index 78d9afbeff..a08cd022ef 100644
--- a/res/field/events/events_0232.json
+++ b/res/field/events/events_0232.json
@@ -4,19 +4,19 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 239,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 231,
             "dest_warp_id": 1
         },
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 241,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0233.json b/res/field/events/events_0233.json
index bf8ca77c98..5bbf759912 100644
--- a/res/field/events/events_0233.json
+++ b/res/field/events/events_0233.json
@@ -4,25 +4,25 @@
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 242,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 239,
             "dest_warp_id": 0
         },
         {
             "x": 4,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 240,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 233,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0234.json b/res/field/events/events_0234.json
index f2281c2aeb..83dc5fdfde 100644
--- a/res/field/events/events_0234.json
+++ b/res/field/events/events_0234.json
@@ -4,25 +4,25 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 238,
             "dest_warp_id": 1
         },
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 237,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 234,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 515,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0235.json b/res/field/events/events_0235.json
index d9dd90229c..9ff5e484ee 100644
--- a/res/field/events/events_0235.json
+++ b/res/field/events/events_0235.json
@@ -4,24 +4,24 @@
             "script": 1,
             "type": 0,
             "x": 4,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 5,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -79,14 +79,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 238,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0236.json b/res/field/events/events_0236.json
index b9836346e6..3f3db9355c 100644
--- a/res/field/events/events_0236.json
+++ b/res/field/events/events_0236.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 237,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0237.json b/res/field/events/events_0237.json
index 85aa4791b8..0974ace085 100644
--- a/res/field/events/events_0237.json
+++ b/res/field/events/events_0237.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 238,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0238.json b/res/field/events/events_0238.json
index 30603d9c86..6690ad7525 100644
--- a/res/field/events/events_0238.json
+++ b/res/field/events/events_0238.json
@@ -4,24 +4,24 @@
             "script": 8114,
             "type": 2,
             "x": 36,
-            "y": 41,
-            "z": 0,
+            "z": 41,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8115,
             "type": 2,
             "x": 20,
-            "y": 32,
-            "z": 0,
+            "z": 32,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8113,
             "type": 2,
             "x": 10,
-            "y": 26,
-            "z": 0,
+            "z": 26,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 61,
-            "z": 0
+            "z": 61,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -79,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -93,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -103,12 +103,14 @@
             "flag": 0,
             "script": 3233,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 69,
-            "z": 0
+            "z": 69,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -117,12 +119,14 @@
             "flag": 0,
             "script": 3443,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -131,12 +135,14 @@
             "flag": 0,
             "script": 3232,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 58,
-            "z": 0
+            "z": 58,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -145,12 +151,14 @@
             "flag": 0,
             "script": 3225,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -159,12 +167,14 @@
             "flag": 0,
             "script": 3227,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -173,12 +183,14 @@
             "flag": 0,
             "script": 3230,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -191,86 +203,86 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 37,
+            "z": 37,
             "dest_header_id": 245,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 47,
+            "z": 47,
             "dest_header_id": 245,
             "dest_warp_id": 1
         },
         {
             "x": 42,
-            "y": 41,
+            "z": 41,
             "dest_header_id": 246,
             "dest_warp_id": 0
         },
         {
             "x": 44,
-            "y": 48,
+            "z": 48,
             "dest_header_id": 246,
             "dest_warp_id": 1
         },
         {
             "x": 41,
-            "y": 24,
+            "z": 24,
             "dest_header_id": 246,
             "dest_warp_id": 2
         },
         {
             "x": 4,
-            "y": 25,
+            "z": 25,
             "dest_header_id": 245,
             "dest_warp_id": 2
         },
         {
             "x": 45,
-            "y": 33,
+            "z": 33,
             "dest_header_id": 248,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 78,
+            "z": 78,
             "dest_header_id": 172,
             "dest_warp_id": 2
         },
         {
             "x": 34,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 172,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 78,
+            "z": 78,
             "dest_header_id": 172,
             "dest_warp_id": 2
         },
         {
             "x": 16,
-            "y": 78,
+            "z": 78,
             "dest_header_id": 172,
             "dest_warp_id": 2
         },
         {
             "x": 34,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 172,
             "dest_warp_id": 3
         },
         {
             "x": 34,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 172,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0239.json b/res/field/events/events_0239.json
index 4d837afe4a..bcf17f11b3 100644
--- a/res/field/events/events_0239.json
+++ b/res/field/events/events_0239.json
@@ -4,16 +4,16 @@
             "script": 8116,
             "type": 2,
             "x": 45,
-            "y": 34,
-            "z": 0,
+            "z": 34,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8117,
             "type": 2,
             "x": 11,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -81,12 +81,14 @@
             "flag": 0,
             "script": 3223,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 27,
-            "z": 0
+            "z": 27,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -95,12 +97,14 @@
             "flag": 0,
             "script": 3226,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -109,12 +113,14 @@
             "flag": 0,
             "script": 3228,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -123,12 +129,14 @@
             "flag": 0,
             "script": 3236,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -137,12 +145,14 @@
             "flag": 0,
             "script": 5236,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -155,8 +165,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -169,8 +179,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -183,8 +193,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -197,8 +207,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -211,8 +221,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -225,8 +235,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -239,8 +249,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -253,8 +263,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -267,8 +277,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -281,8 +291,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -295,8 +305,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -309,8 +319,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -323,8 +333,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -337,8 +347,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -351,8 +361,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -365,8 +375,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -379,8 +389,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -393,8 +403,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -407,8 +417,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -421,8 +431,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -435,8 +445,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -449,8 +459,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -463,26 +473,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 20,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 244,
             "dest_warp_id": 0
         },
         {
             "x": 23,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 244,
             "dest_warp_id": 1
         },
         {
             "x": 20,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 244,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0240.json b/res/field/events/events_0240.json
index 34be725365..a0895d6ea7 100644
--- a/res/field/events/events_0240.json
+++ b/res/field/events/events_0240.json
@@ -4,16 +4,16 @@
             "script": 8118,
             "type": 2,
             "x": 24,
-            "y": 35,
-            "z": 0,
+            "z": 35,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8119,
             "type": 2,
             "x": 5,
-            "y": 24,
-            "z": 0,
+            "z": 24,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -39,12 +39,14 @@
             "flag": 0,
             "script": 3235,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -53,12 +55,14 @@
             "flag": 0,
             "script": 5235,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 6,
             "movement_range_y": 1,
             "x": 33,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -67,12 +71,14 @@
             "flag": 0,
             "script": 3229,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -81,12 +87,14 @@
             "flag": 0,
             "script": 3234,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -95,12 +103,14 @@
             "flag": 0,
             "script": 3224,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 6,
             "x": 32,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -113,8 +123,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -127,26 +137,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 39,
+            "z": 39,
             "dest_header_id": 244,
             "dest_warp_id": 2
         },
         {
             "x": 6,
-            "y": 46,
+            "z": 46,
             "dest_header_id": 244,
             "dest_warp_id": 3
         },
         {
             "x": 3,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 244,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0241.json b/res/field/events/events_0241.json
index 040d15c194..a406d71ae9 100644
--- a/res/field/events/events_0241.json
+++ b/res/field/events/events_0241.json
@@ -4,40 +4,40 @@
             "script": 8123,
             "type": 2,
             "x": 22,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8122,
             "type": 2,
             "x": 50,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8121,
             "type": 2,
             "x": 30,
-            "y": 20,
-            "z": 0,
+            "z": 20,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8129,
             "type": 2,
             "x": 40,
-            "y": 41,
-            "z": 0,
+            "z": 41,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8128,
             "type": 2,
             "x": 24,
-            "y": 46,
-            "z": 0,
+            "z": 46,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -53,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -67,8 +67,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -81,8 +81,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 1
+            "z": 4,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -95,8 +95,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 60,
-            "z": 1
+            "z": 60,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -105,12 +105,14 @@
             "flag": 0,
             "script": 3388,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 47,
-            "z": 1
+            "z": 47,
+            "y": 1
         },
         {
             "graphics_id": 14,
@@ -119,12 +121,14 @@
             "flag": 0,
             "script": 3392,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 47,
-            "z": 1
+            "z": 47,
+            "y": 1
         },
         {
             "graphics_id": 70,
@@ -133,12 +137,14 @@
             "flag": 0,
             "script": 3398,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 13,
-            "z": 1
+            "z": 13,
+            "y": 1
         },
         {
             "graphics_id": 70,
@@ -147,12 +153,14 @@
             "flag": 0,
             "script": 3395,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 17,
-            "z": 1
+            "z": 17,
+            "y": 1
         },
         {
             "graphics_id": 51,
@@ -161,12 +169,14 @@
             "flag": 0,
             "script": 3445,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 12,
-            "z": 1
+            "z": 12,
+            "y": 1
         },
         {
             "graphics_id": 17,
@@ -175,12 +185,14 @@
             "flag": 0,
             "script": 3498,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -189,12 +201,14 @@
             "flag": 0,
             "script": 3389,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 57,
-            "z": 1
+            "z": 57,
+            "y": 1
         },
         {
             "graphics_id": 14,
@@ -203,12 +217,14 @@
             "flag": 0,
             "script": 3393,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 57,
-            "z": 1
+            "z": 57,
+            "y": 1
         },
         {
             "graphics_id": 70,
@@ -217,12 +233,14 @@
             "flag": 0,
             "script": 3396,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 17,
-            "z": 1
+            "z": 17,
+            "y": 1
         },
         {
             "graphics_id": 70,
@@ -231,12 +249,14 @@
             "flag": 0,
             "script": 3399,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 17,
-            "z": 1
+            "z": 17,
+            "y": 1
         },
         {
             "graphics_id": 14,
@@ -245,12 +265,14 @@
             "flag": 0,
             "script": 3372,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 12,
-            "z": 1
+            "z": 12,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -259,12 +281,14 @@
             "flag": 0,
             "script": 3385,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         },
         {
             "graphics_id": 51,
@@ -273,12 +297,14 @@
             "flag": 0,
             "script": 3446,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 46,
-            "y": 25,
-            "z": 1
+            "z": 25,
+            "y": 1
         },
         {
             "graphics_id": 17,
@@ -287,12 +313,14 @@
             "flag": 0,
             "script": 3499,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 46,
-            "y": 23,
-            "z": 1
+            "z": 23,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -305,8 +333,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 51,
-            "z": 0
+            "z": 51,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -319,8 +347,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 31,
-            "z": 1
+            "z": 31,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -333,8 +361,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 28,
-            "z": 1
+            "z": 28,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -347,8 +375,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 25,
-            "z": 1
+            "z": 25,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -361,8 +389,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 1
+            "z": 9,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -375,8 +403,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 7,
-            "z": 1
+            "z": 7,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -389,8 +417,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 1
+            "z": 5,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -403,8 +431,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 32,
-            "z": 1
+            "z": 32,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -417,8 +445,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 31,
-            "z": 1
+            "z": 31,
+            "y": 1
         },
         {
             "graphics_id": 84,
@@ -431,8 +459,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 11,
-            "z": 1
+            "z": 11,
+            "y": 1
         },
         {
             "graphics_id": 143,
@@ -445,20 +473,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 58,
-            "z": 1
+            "z": 58,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 58,
+            "z": 58,
             "dest_header_id": 248,
             "dest_warp_id": 1
         },
         {
             "x": 56,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 249,
             "dest_warp_id": 0
         }
@@ -467,32 +495,32 @@
         {
             "script": 3,
             "x": 51,
-            "y": 19,
+            "z": 19,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16528
+            "var": 16528,
+            "value": 1
         },
         {
             "script": 2,
             "x": 4,
-            "y": 55,
+            "z": 55,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 1,
-            "var": 16528
+            "var": 16528,
+            "value": 1
         },
         {
             "script": 1,
             "x": 5,
-            "y": 55,
+            "z": 55,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 0,
-            "var": 16528
+            "var": 16528,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0242.json b/res/field/events/events_0242.json
index d76776c6d8..98508d4abd 100644
--- a/res/field/events/events_0242.json
+++ b/res/field/events/events_0242.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 244,
             "dest_warp_id": 6
         },
         {
             "x": 21,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 247,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0243.json b/res/field/events/events_0243.json
index 6ec47ac9ec..576a2d55ac 100644
--- a/res/field/events/events_0243.json
+++ b/res/field/events/events_0243.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 12,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 247,
             "dest_warp_id": 1
         },
         {
             "x": 29,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 399,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0245.json b/res/field/events/events_0245.json
index 6a58da829b..eb3006ba4e 100644
--- a/res/field/events/events_0245.json
+++ b/res/field/events/events_0245.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 24,
-            "y": 52,
+            "z": 52,
             "dest_header_id": 393,
             "dest_warp_id": 1
         },
         {
             "x": 25,
-            "y": 52,
+            "z": 52,
             "dest_header_id": 393,
             "dest_warp_id": 1
         }
@@ -34,12 +34,12 @@
         {
             "script": 5,
             "x": 22,
-            "y": 48,
+            "z": 48,
+            "y": 0,
             "width": 6,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16627
+            "var": 16627,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0246.json b/res/field/events/events_0246.json
index f49b533a4d..5f8244f089 100644
--- a/res/field/events/events_0246.json
+++ b/res/field/events/events_0246.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 37,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 45,
-            "z": 0
+            "z": 45,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 185,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 207,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 37,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -222,32 +222,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 51,
+            "z": 51,
             "dest_header_id": 107,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 51,
+            "z": 51,
             "dest_header_id": 107,
             "dest_warp_id": 1
         },
         {
             "x": 52,
-            "y": 51,
+            "z": 51,
             "dest_header_id": 108,
             "dest_warp_id": 1
         },
         {
             "x": 53,
-            "y": 51,
+            "z": 51,
             "dest_header_id": 108,
             "dest_warp_id": 1
         }
@@ -256,312 +256,312 @@
         {
             "script": 2,
             "x": 12,
-            "y": 46,
+            "z": 46,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16537
+            "var": 16537,
+            "value": 0
         },
         {
             "script": 3,
             "x": 12,
-            "y": 47,
+            "z": 47,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16537
+            "var": 16537,
+            "value": 1
         },
         {
             "script": 4,
             "x": 51,
-            "y": 46,
+            "z": 46,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16537
+            "var": 16537,
+            "value": 0
         },
         {
             "script": 5,
             "x": 51,
-            "y": 47,
+            "z": 47,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16537
+            "var": 16537,
+            "value": 1
         },
         {
             "script": 18,
             "x": 17,
-            "y": 17,
+            "z": 17,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 19,
             "x": 16,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 20,
             "x": 18,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 21,
             "x": 35,
-            "y": 16,
+            "z": 16,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 22,
             "x": 34,
-            "y": 17,
+            "z": 17,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 23,
             "x": 36,
-            "y": 17,
+            "z": 17,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 24,
             "x": 52,
-            "y": 26,
+            "z": 26,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 25,
             "x": 51,
-            "y": 27,
+            "z": 27,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 26,
             "x": 53,
-            "y": 27,
+            "z": 27,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 27,
             "x": 47,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 28,
             "x": 46,
-            "y": 10,
+            "z": 10,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 29,
             "x": 48,
-            "y": 10,
+            "z": 10,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 30,
             "x": 15,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 31,
             "x": 14,
-            "y": 12,
+            "z": 12,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 32,
             "x": 16,
-            "y": 12,
+            "z": 12,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 33,
             "x": 33,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 34,
             "x": 32,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 35,
             "x": 34,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 36,
             "x": 26,
-            "y": 10,
+            "z": 10,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 37,
             "x": 25,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 38,
             "x": 27,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 39,
             "x": 41,
-            "y": 17,
+            "z": 17,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 40,
             "x": 40,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 41,
             "x": 42,
-            "y": 18,
+            "z": 18,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 42,
             "x": 47,
-            "y": 35,
+            "z": 35,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 43,
             "x": 46,
-            "y": 36,
+            "z": 36,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         },
         {
             "script": 44,
             "x": 48,
-            "y": 36,
+            "z": 36,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16556
+            "var": 16556,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0247.json b/res/field/events/events_0247.json
index d4439af87f..ac8cbd01ef 100644
--- a/res/field/events/events_0247.json
+++ b/res/field/events/events_0247.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -418,8 +418,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -432,20 +432,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 19,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 345,
             "dest_warp_id": 0
         },
         {
             "x": 28,
-            "y": 44,
+            "z": 44,
             "dest_header_id": 346,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0249.json b/res/field/events/events_0249.json
index a0d19d3458..9760c2725a 100644
--- a/res/field/events/events_0249.json
+++ b/res/field/events/events_0249.json
@@ -4,88 +4,88 @@
             "script": 8058,
             "type": 2,
             "x": 39,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8059,
             "type": 2,
             "x": 33,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8220,
             "type": 2,
             "x": 13,
-            "y": 36,
-            "z": 0,
+            "z": 36,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8227,
             "type": 2,
             "x": 29,
-            "y": 30,
-            "z": 0,
+            "z": 30,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8226,
             "type": 2,
             "x": 39,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8219,
             "type": 2,
             "x": 48,
-            "y": 24,
-            "z": 0,
+            "z": 24,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8222,
             "type": 2,
             "x": 25,
-            "y": 23,
-            "z": 0,
+            "z": 23,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8223,
             "type": 2,
             "x": 52,
-            "y": 31,
-            "z": 0,
+            "z": 31,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8224,
             "type": 2,
             "x": 17,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8225,
             "type": 2,
             "x": 19,
-            "y": 35,
-            "z": 0,
+            "z": 35,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8221,
             "type": 2,
             "x": 21,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -101,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 47,
-            "z": 0
+            "z": 47,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -115,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 47,
-            "z": 0
+            "z": 47,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -129,8 +129,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -143,8 +143,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 47,
-            "z": 0
+            "z": 47,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -157,8 +157,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -171,8 +171,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 46,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -185,8 +185,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 27,
-            "z": 0
+            "z": 27,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -199,38 +199,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 50,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 426,
             "dest_warp_id": 5
         },
         {
             "x": 51,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 426,
             "dest_warp_id": 6
         },
         {
             "x": 39,
-            "y": 45,
+            "z": 45,
             "dest_header_id": 257,
             "dest_warp_id": 0
         },
         {
             "x": 12,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 426,
             "dest_warp_id": 7
         },
         {
             "x": 13,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 426,
             "dest_warp_id": 8
         }
@@ -239,12 +239,12 @@
         {
             "script": 2,
             "x": 12,
-            "y": 48,
+            "z": 48,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16617
+            "var": 16617,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0250.json b/res/field/events/events_0250.json
index 4d02d96ba1..0eafce8bb1 100644
--- a/res/field/events/events_0250.json
+++ b/res/field/events/events_0250.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 256,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0251.json b/res/field/events/events_0251.json
index def6635572..785474bf5e 100644
--- a/res/field/events/events_0251.json
+++ b/res/field/events/events_0251.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3328,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3264,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 25,
-            "z": 1
+            "z": 25,
+            "y": 1
         },
         {
             "graphics_id": 85,
@@ -40,8 +44,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +58,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +72,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +100,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +114,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +128,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +142,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -152,26 +156,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 20,
-            "z": 1
+            "z": 20,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 344,
             "dest_warp_id": 0
         },
         {
             "x": 27,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 45,
             "dest_warp_id": 10
         },
         {
             "x": 20,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 259,
             "dest_warp_id": 0
         }
@@ -180,12 +184,12 @@
         {
             "script": 3,
             "x": 7,
-            "y": 22,
+            "z": 22,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16531
+            "var": 16531,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0252.json b/res/field/events/events_0252.json
index 5cba71a754..84e4f7fd9d 100644
--- a/res/field/events/events_0252.json
+++ b/res/field/events/events_0252.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3239,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 17,
-            "z": 1
+            "z": 17,
+            "y": 1
         },
         {
             "graphics_id": 85,
@@ -26,8 +28,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -40,8 +42,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -54,8 +56,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +70,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +84,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +98,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 39,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +112,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +126,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +140,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +154,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -166,8 +168,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -180,8 +182,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -194,8 +196,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -208,8 +210,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 39,
@@ -222,8 +224,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 37,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -236,14 +238,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 48,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 258,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0253.json b/res/field/events/events_0253.json
index 8a2314bc6b..c58bcf6a36 100644
--- a/res/field/events/events_0253.json
+++ b/res/field/events/events_0253.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 277,
-            "z": 0
+            "z": 277,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 276,
-            "z": 0
+            "z": 276,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 275,
-            "z": 0
+            "z": 275,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -54,20 +54,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 278,
-            "z": 0
+            "z": 278,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 53,
-            "y": 268,
+            "z": 268,
             "dest_header_id": 261,
             "dest_warp_id": 0
         },
         {
             "x": 54,
-            "y": 268,
+            "z": 268,
             "dest_header_id": 261,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0254.json b/res/field/events/events_0254.json
index a9046eb91a..148a068854 100644
--- a/res/field/events/events_0254.json
+++ b/res/field/events/events_0254.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 15,
-            "z": 1
+            "z": 15,
+            "y": 1
         },
         {
             "graphics_id": 87,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 15,
-            "z": 1
+            "z": 15,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 260,
             "dest_warp_id": 0
         },
         {
             "x": 17,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 260,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0255.json b/res/field/events/events_0255.json
index faaed78d11..1f66bbe8b1 100644
--- a/res/field/events/events_0255.json
+++ b/res/field/events/events_0255.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 740,
-            "y": 248,
-            "z": 0
+            "z": 248,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 762,
-            "y": 232,
-            "z": 0
+            "z": 232,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -36,12 +36,14 @@
             "flag": 0,
             "script": 3557,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 749,
-            "y": 248,
-            "z": 0
+            "z": 248,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -54,8 +56,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 748,
-            "y": 232,
-            "z": 0
+            "z": 232,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -68,8 +70,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 751,
-            "y": 232,
-            "z": 0
+            "z": 232,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -82,8 +84,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 750,
-            "y": 233,
-            "z": 0
+            "z": 233,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -96,8 +98,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 742,
-            "y": 232,
-            "z": 0
+            "z": 232,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -110,14 +112,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 742,
-            "y": 233,
-            "z": 0
+            "z": 233,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 750,
-            "y": 231,
+            "z": 231,
             "dest_header_id": 263,
             "dest_warp_id": 0
         }
@@ -126,12 +128,12 @@
         {
             "script": 3,
             "x": 752,
-            "y": 235,
+            "z": 235,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16544
+            "var": 16544,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0256.json b/res/field/events/events_0256.json
index fd33267b68..2c074fab4d 100644
--- a/res/field/events/events_0256.json
+++ b/res/field/events/events_0256.json
@@ -4,8 +4,8 @@
             "script": 8138,
             "type": 2,
             "x": 25,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 123,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 26,
-            "z": 0
+            "z": 26,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -133,8 +133,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -147,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -161,8 +161,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -175,8 +175,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -189,8 +189,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -203,8 +203,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 214,
@@ -217,8 +217,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -231,8 +231,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -245,20 +245,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 24,
-            "z": 0
+            "z": 24,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 20,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 262,
             "dest_warp_id": 0
         },
         {
             "x": 17,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 264,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0257.json b/res/field/events/events_0257.json
index 0be23cc672..e02ab5036f 100644
--- a/res/field/events/events_0257.json
+++ b/res/field/events/events_0257.json
@@ -4,56 +4,56 @@
             "script": 8140,
             "type": 2,
             "x": 85,
-            "y": 49,
-            "z": 0,
+            "z": 49,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8141,
             "type": 2,
             "x": 73,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8139,
             "type": 2,
             "x": 5,
-            "y": 48,
-            "z": 0,
+            "z": 48,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8175,
             "type": 2,
             "x": 51,
-            "y": 77,
-            "z": 0,
+            "z": 77,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8176,
             "type": 2,
             "x": 53,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8177,
             "type": 2,
             "x": 18,
-            "y": 73,
-            "z": 0,
+            "z": 73,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8268,
             "type": 2,
             "x": 14,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -69,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -83,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -97,8 +97,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -111,8 +111,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 52,
-            "z": 0
+            "z": 52,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -125,8 +125,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 60,
-            "y": 53,
-            "z": 0
+            "z": 53,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -139,8 +139,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -153,8 +153,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -167,8 +167,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 49,
-            "y": 49,
-            "z": 0
+            "z": 49,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -181,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 54,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -195,8 +195,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 76,
-            "z": 0
+            "z": 76,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -209,8 +209,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 56,
-            "y": 77,
-            "z": 0
+            "z": 77,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -223,8 +223,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 69,
-            "y": 55,
-            "z": 0
+            "z": 55,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -237,8 +237,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 92,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -251,8 +251,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -265,8 +265,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 68,
-            "z": 0
+            "z": 68,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -275,12 +275,14 @@
             "flag": 0,
             "script": 3568,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 73,
-            "z": 0
+            "z": 73,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -289,12 +291,14 @@
             "flag": 0,
             "script": 3578,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 76,
-            "z": 0
+            "z": 76,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -303,12 +307,14 @@
             "flag": 0,
             "script": 3570,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 52,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -317,12 +323,14 @@
             "flag": 0,
             "script": 3580,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 54,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -331,12 +339,14 @@
             "flag": 0,
             "script": 3585,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 86,
-            "y": 75,
-            "z": 0
+            "z": 75,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -345,12 +355,14 @@
             "flag": 0,
             "script": 3583,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 83,
-            "y": 75,
-            "z": 0
+            "z": 75,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -359,12 +371,14 @@
             "flag": 0,
             "script": 3555,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 53,
-            "z": 0
+            "z": 53,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -373,12 +387,14 @@
             "flag": 0,
             "script": 3588,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -387,12 +403,14 @@
             "flag": 0,
             "script": 3569,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -401,12 +419,14 @@
             "flag": 0,
             "script": 3579,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -415,12 +435,14 @@
             "flag": 0,
             "script": 3560,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -429,12 +451,14 @@
             "flag": 0,
             "script": 3589,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -443,12 +467,14 @@
             "flag": 0,
             "script": 3571,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 77,
-            "y": 64,
-            "z": 0
+            "z": 64,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -457,12 +483,14 @@
             "flag": 0,
             "script": 3581,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 77,
-            "y": 66,
-            "z": 0
+            "z": 66,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -471,12 +499,14 @@
             "flag": 0,
             "script": 3605,
             "initial_dir": 3,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 62,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -485,24 +515,26 @@
             "flag": 0,
             "script": 3561,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 67,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 47,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 265,
             "dest_warp_id": 0
         },
         {
             "x": 42,
-            "y": 86,
+            "z": 86,
             "dest_header_id": 263,
             "dest_warp_id": 1
         }
@@ -511,32 +543,32 @@
         {
             "script": 1,
             "x": 42,
-            "y": 69,
+            "z": 69,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16532
+            "var": 16532,
+            "value": 0
         },
         {
             "script": 2,
             "x": 42,
-            "y": 70,
+            "z": 70,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16532
+            "var": 16532,
+            "value": 1
         },
         {
             "script": 3,
             "x": 47,
-            "y": 3,
+            "z": 3,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16532
+            "var": 16532,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0258.json b/res/field/events/events_0258.json
index 606162bd75..9634134b81 100644
--- a/res/field/events/events_0258.json
+++ b/res/field/events/events_0258.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 161,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 214,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -152,14 +152,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 264,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0259.json b/res/field/events/events_0259.json
index b5edabd4e0..c6255715be 100644
--- a/res/field/events/events_0259.json
+++ b/res/field/events/events_0259.json
@@ -12,26 +12,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 12,
-            "y": 56,
+            "z": 56,
             "dest_header_id": 341,
             "dest_warp_id": 0
         },
         {
             "x": 13,
-            "y": 56,
+            "z": 56,
             "dest_header_id": 341,
             "dest_warp_id": 1
         },
         {
             "x": 31,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 268,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0260.json b/res/field/events/events_0260.json
index 0b1af1b3c6..b7f947a212 100644
--- a/res/field/events/events_0260.json
+++ b/res/field/events/events_0260.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 10,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 11,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 12,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,31 +29,31 @@
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 267,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0261.json b/res/field/events/events_0261.json
index bf6a6b8bf8..813cd0b336 100644
--- a/res/field/events/events_0261.json
+++ b/res/field/events/events_0261.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 10,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 11,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 12,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,25 +29,25 @@
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0262.json b/res/field/events/events_0262.json
index ba00e85238..98bbe2f128 100644
--- a/res/field/events/events_0262.json
+++ b/res/field/events/events_0262.json
@@ -4,32 +4,32 @@
             "script": 4,
             "type": 0,
             "x": 11,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 10,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 12,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 11,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -59,32 +59,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0263.json b/res/field/events/events_0263.json
index 4092eca7ce..ca2e1c16d1 100644
--- a/res/field/events/events_0263.json
+++ b/res/field/events/events_0263.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,32 +152,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0264.json b/res/field/events/events_0264.json
index 6e48bd4ed5..492fd8b0de 100644
--- a/res/field/events/events_0264.json
+++ b/res/field/events/events_0264.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,32 +152,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0265.json b/res/field/events/events_0265.json
index b08b4e4668..e3461a0dc2 100644
--- a/res/field/events/events_0265.json
+++ b/res/field/events/events_0265.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,32 +180,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0266.json b/res/field/events/events_0266.json
index a65e25edae..9a7365f664 100644
--- a/res/field/events/events_0266.json
+++ b/res/field/events/events_0266.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 911,
-            "y": 203,
-            "z": 0
+            "z": 203,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0267.json b/res/field/events/events_0267.json
index 6085395b2c..a8444e0490 100644
--- a/res/field/events/events_0267.json
+++ b/res/field/events/events_0267.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 7,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 8,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 9,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,13 +29,13 @@
     "warp_events": [
         {
             "x": 8,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 165,
             "dest_warp_id": 2
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 279,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0268.json b/res/field/events/events_0268.json
index 18b186904b..c829dde833 100644
--- a/res/field/events/events_0268.json
+++ b/res/field/events/events_0268.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 278,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 280,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0269.json b/res/field/events/events_0269.json
index c07ed76924..8e49d68140 100644
--- a/res/field/events/events_0269.json
+++ b/res/field/events/events_0269.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 279,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 281,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0270.json b/res/field/events/events_0270.json
index 6d7c72cec5..ef8aacac53 100644
--- a/res/field/events/events_0270.json
+++ b/res/field/events/events_0270.json
@@ -4,8 +4,8 @@
             "script": 8179,
             "type": 2,
             "x": 10,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,13 +13,13 @@
     "warp_events": [
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 280,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 282,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0271.json b/res/field/events/events_0271.json
index ed4036a63f..68c1d90735 100644
--- a/res/field/events/events_0271.json
+++ b/res/field/events/events_0271.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 281,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 283,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0272.json b/res/field/events/events_0272.json
index 7636333cd4..f32d6cccbb 100644
--- a/res/field/events/events_0272.json
+++ b/res/field/events/events_0272.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 282,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0273.json b/res/field/events/events_0273.json
index 77c00a48e9..757343c1cd 100644
--- a/res/field/events/events_0273.json
+++ b/res/field/events/events_0273.json
@@ -4,48 +4,48 @@
             "script": 8006,
             "type": 2,
             "x": 72,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8009,
             "type": 2,
             "x": 74,
-            "y": 34,
-            "z": 0,
+            "z": 34,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8008,
             "type": 2,
             "x": 17,
-            "y": 43,
-            "z": 0,
+            "z": 43,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8162,
             "type": 2,
             "x": 43,
-            "y": 29,
-            "z": 0,
+            "z": 29,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8208,
             "type": 2,
             "x": 55,
-            "y": 41,
-            "z": 0,
+            "z": 41,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8209,
             "type": 2,
             "x": 92,
-            "y": 51,
-            "z": 0,
+            "z": 51,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 56,
-            "y": 55,
-            "z": 0
+            "z": 55,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -75,8 +75,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -89,8 +89,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -103,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 145,
@@ -117,8 +117,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 72,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -127,12 +127,14 @@
             "flag": 0,
             "script": 3378,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -141,12 +143,14 @@
             "flag": 0,
             "script": 3457,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -155,12 +159,14 @@
             "flag": 0,
             "script": 3449,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -169,12 +175,14 @@
             "flag": 0,
             "script": 3495,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -183,12 +191,14 @@
             "flag": 0,
             "script": 3453,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -197,12 +207,14 @@
             "flag": 0,
             "script": 3382,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 91,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -211,12 +223,14 @@
             "flag": 0,
             "script": 3458,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -225,12 +239,14 @@
             "flag": 0,
             "script": 3379,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 77,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -239,12 +255,14 @@
             "flag": 0,
             "script": 3442,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 93,
-            "y": 48,
-            "z": 0
+            "z": 48,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -253,12 +271,14 @@
             "flag": 0,
             "script": 3454,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -271,8 +291,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 42,
-            "z": 0
+            "z": 42,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -285,8 +305,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -299,8 +319,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -313,8 +333,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -327,8 +347,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -341,8 +361,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -355,8 +375,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -369,8 +389,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 54,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -383,8 +403,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -397,8 +417,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 66,
-            "y": 52,
-            "z": 0
+            "z": 52,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -411,32 +431,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 88,
-            "y": 27,
-            "z": 0
+            "z": 27,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 30,
-            "y": 55,
+            "z": 55,
             "dest_header_id": 350,
             "dest_warp_id": 12
         },
         {
             "x": 41,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 350,
             "dest_warp_id": 13
         },
         {
             "x": 28,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 285,
             "dest_warp_id": 1
         },
         {
             "x": 55,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 285,
             "dest_warp_id": 0
         }
@@ -445,12 +465,12 @@
         {
             "script": 4,
             "x": 41,
-            "y": 53,
+            "z": 53,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16529
+            "var": 16529,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0274.json b/res/field/events/events_0274.json
index 457acd4024..b88220447c 100644
--- a/res/field/events/events_0274.json
+++ b/res/field/events/events_0274.json
@@ -4,16 +4,16 @@
             "script": 8011,
             "type": 2,
             "x": 3,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8010,
             "type": 2,
             "x": 4,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,20 +57,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 33,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 43,
-            "y": 38,
+            "z": 38,
             "dest_header_id": 284,
             "dest_warp_id": 3
         },
         {
             "x": 16,
-            "y": 40,
+            "z": 40,
             "dest_header_id": 284,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0275.json b/res/field/events/events_0275.json
index 3cf1eaee95..42d5af1a37 100644
--- a/res/field/events/events_0275.json
+++ b/res/field/events/events_0275.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 380,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0276.json b/res/field/events/events_0276.json
index fc60198c02..9c946e1fd4 100644
--- a/res/field/events/events_0276.json
+++ b/res/field/events/events_0276.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 14,
-            "y": 25,
+            "z": 25,
             "dest_header_id": 368,
             "dest_warp_id": 5
         },
         {
             "x": 15,
-            "y": 25,
+            "z": 25,
             "dest_header_id": 368,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0277.json b/res/field/events/events_0277.json
index 97f08060d8..9451b9131e 100644
--- a/res/field/events/events_0277.json
+++ b/res/field/events/events_0277.json
@@ -4,8 +4,8 @@
             "script": 8051,
             "type": 2,
             "x": 114,
-            "y": 504,
-            "z": 0,
+            "z": 504,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 99,
-            "y": 502,
-            "z": 0
+            "z": 502,
+            "y": 0
         },
         {
             "graphics_id": 142,
@@ -35,26 +35,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 117,
-            "y": 490,
-            "z": 0
+            "z": 490,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 111,
-            "y": 499,
+            "z": 499,
             "dest_header_id": 514,
             "dest_warp_id": 0
         },
         {
             "x": 117,
-            "y": 489,
+            "z": 489,
             "dest_header_id": 289,
             "dest_warp_id": 0
         },
         {
             "x": 103,
-            "y": 489,
+            "z": 489,
             "dest_header_id": 294,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0278.json b/res/field/events/events_0278.json
index ae838ef4e6..3a23a848b1 100644
--- a/res/field/events/events_0278.json
+++ b/res/field/events/events_0278.json
@@ -4,19 +4,19 @@
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 288,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 290,
             "dest_warp_id": 0
         },
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 291,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0279.json b/res/field/events/events_0279.json
index 8af1c44ed4..41040c6068 100644
--- a/res/field/events/events_0279.json
+++ b/res/field/events/events_0279.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -22,12 +22,14 @@
             "flag": 0,
             "script": 3377,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -40,14 +42,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 289,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0280.json b/res/field/events/events_0280.json
index e653dacc95..5a0e0ecbf7 100644
--- a/res/field/events/events_0280.json
+++ b/res/field/events/events_0280.json
@@ -4,8 +4,8 @@
             "script": 8052,
             "type": 2,
             "x": 11,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -45,12 +45,14 @@
             "flag": 0,
             "script": 3456,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -63,26 +65,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 293,
             "dest_warp_id": 0
         },
         {
             "x": 16,
-            "y": 26,
+            "z": 26,
             "dest_header_id": 292,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 289,
             "dest_warp_id": 2
         }
@@ -91,12 +93,12 @@
         {
             "script": 2,
             "x": 11,
-            "y": 23,
+            "z": 23,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0281.json b/res/field/events/events_0281.json
index 7e5c92057d..6a7e4b7f10 100644
--- a/res/field/events/events_0281.json
+++ b/res/field/events/events_0281.json
@@ -4,8 +4,8 @@
             "script": 8053,
             "type": 2,
             "x": 12,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -45,12 +45,14 @@
             "flag": 0,
             "script": 3502,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 6,
             "movement_range_y": 1,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -59,18 +61,20 @@
             "flag": 0,
             "script": 3503,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 4,
             "movement_range_y": 6,
             "x": 1,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 291,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0282.json b/res/field/events/events_0282.json
index 2c36a02862..081ebdb6aa 100644
--- a/res/field/events/events_0282.json
+++ b/res/field/events/events_0282.json
@@ -4,24 +4,24 @@
             "script": 8056,
             "type": 2,
             "x": 32,
-            "y": 40,
-            "z": 0,
+            "z": 40,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8054,
             "type": 2,
             "x": 29,
-            "y": 29,
-            "z": 0,
+            "z": 29,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8055,
             "type": 2,
             "x": 14,
-            "y": 31,
-            "z": 0,
+            "z": 31,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -79,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 142,
@@ -93,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -107,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -121,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -131,12 +131,14 @@
             "flag": 0,
             "script": 3451,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -145,12 +147,14 @@
             "flag": 0,
             "script": 3452,
             "initial_dir": 3,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -159,12 +163,14 @@
             "flag": 0,
             "script": 3444,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -173,12 +179,14 @@
             "flag": 0,
             "script": 3371,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -187,12 +195,14 @@
             "flag": 0,
             "script": 3504,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -201,12 +211,14 @@
             "flag": 0,
             "script": 3505,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -215,12 +227,14 @@
             "flag": 0,
             "script": 3387,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -229,12 +243,14 @@
             "flag": 0,
             "script": 3391,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 31,
-            "z": 0
+            "z": 31,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -247,8 +263,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -261,20 +277,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 38,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 291,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 48,
+            "z": 48,
             "dest_header_id": 294,
             "dest_warp_id": 1
         }
@@ -283,42 +299,42 @@
         {
             "script": 3,
             "x": 35,
-            "y": 2,
+            "z": 2,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16530
+            "var": 16530,
+            "value": 0
         },
         {
             "script": 4,
             "x": 36,
-            "y": 2,
+            "z": 2,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 1,
-            "var": 16530
+            "var": 16530,
+            "value": 1
         },
         {
             "script": 2,
             "x": 19,
-            "y": 44,
+            "z": 44,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         },
         {
             "script": 9,
             "x": 21,
-            "y": 40,
+            "z": 40,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 1,
-            "var": 16530
+            "var": 16530,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0283.json b/res/field/events/events_0283.json
index 7946cd0b07..7ca5fc4c6b 100644
--- a/res/field/events/events_0283.json
+++ b/res/field/events/events_0283.json
@@ -12,32 +12,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 288,
             "dest_warp_id": 2
         },
         {
             "x": 14,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 293,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 587,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 588,
             "dest_warp_id": 0
         }
@@ -46,12 +46,12 @@
         {
             "script": 2,
             "x": 9,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16384
+            "var": 16384,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0284.json b/res/field/events/events_0284.json
index b8c2ad094a..7a5b9884c3 100644
--- a/res/field/events/events_0284.json
+++ b/res/field/events/events_0284.json
@@ -4,8 +4,8 @@
             "script": 2,
             "type": 0,
             "x": 7,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,31 +13,31 @@
     "warp_events": [
         {
             "x": 1,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 297,
             "dest_warp_id": 0
         },
         {
             "x": 17,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 297,
             "dest_warp_id": 1
         },
         {
             "x": 9,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 296,
             "dest_warp_id": 0
         },
         {
             "x": 9,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 298,
             "dest_warp_id": 0
         },
         {
             "x": 9,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 203,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0285.json b/res/field/events/events_0285.json
index 62b77628c0..6db2de4c08 100644
--- a/res/field/events/events_0285.json
+++ b/res/field/events/events_0285.json
@@ -4,8 +4,8 @@
             "script": 8167,
             "type": 2,
             "x": 2,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -49,14 +49,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 37,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 19,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 295,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0286.json b/res/field/events/events_0286.json
index 4bafbc30fd..b1f38f9db9 100644
--- a/res/field/events/events_0286.json
+++ b/res/field/events/events_0286.json
@@ -4,8 +4,8 @@
             "script": 1,
             "type": 0,
             "x": 30,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 1
         }
     ],
@@ -21,20 +21,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 295,
             "dest_warp_id": 0
         },
         {
             "x": 24,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 295,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0287.json b/res/field/events/events_0287.json
index 6f756dc702..6006727af9 100644
--- a/res/field/events/events_0287.json
+++ b/res/field/events/events_0287.json
@@ -4,37 +4,37 @@
     "warp_events": [
         {
             "x": 19,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 295,
             "dest_warp_id": 3
         },
         {
             "x": 4,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 299,
             "dest_warp_id": 0
         },
         {
             "x": 11,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 300,
             "dest_warp_id": 0
         },
         {
             "x": 19,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 301,
             "dest_warp_id": 0
         },
         {
             "x": 27,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 302,
             "dest_warp_id": 0
         },
         {
             "x": 34,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 303,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0288.json b/res/field/events/events_0288.json
index 4f7733e6c5..6e267f4271 100644
--- a/res/field/events/events_0288.json
+++ b/res/field/events/events_0288.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 298,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0289.json b/res/field/events/events_0289.json
index da93e68537..7a341e373b 100644
--- a/res/field/events/events_0289.json
+++ b/res/field/events/events_0289.json
@@ -4,16 +4,16 @@
             "script": 1,
             "type": 0,
             "x": 11,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 12,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,14 +29,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 298,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0290.json b/res/field/events/events_0290.json
index 8827f4e131..f494a909ea 100644
--- a/res/field/events/events_0290.json
+++ b/res/field/events/events_0290.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 12,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 298,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0291.json b/res/field/events/events_0291.json
index 5bafa4e1f8..c9a8b6671c 100644
--- a/res/field/events/events_0291.json
+++ b/res/field/events/events_0291.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 13,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 298,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0292.json b/res/field/events/events_0292.json
index fc09478b9d..c9b73ebb58 100644
--- a/res/field/events/events_0292.json
+++ b/res/field/events/events_0292.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 298,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0293.json b/res/field/events/events_0293.json
index 3afa2ea317..ad397497a1 100644
--- a/res/field/events/events_0293.json
+++ b/res/field/events/events_0293.json
@@ -4,16 +4,16 @@
             "script": 8074,
             "type": 2,
             "x": 45,
-            "y": 21,
-            "z": 0,
+            "z": 21,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 7,
             "type": 0,
             "x": 42,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 52,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -67,12 +67,14 @@
             "flag": 567,
             "script": 3427,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -81,12 +83,14 @@
             "flag": 567,
             "script": 3829,
             "initial_dir": 3,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -99,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -113,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -127,8 +131,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -141,8 +145,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 19,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 122,
@@ -155,8 +159,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 33,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -169,98 +173,98 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 132,
             "dest_warp_id": 14
         },
         {
             "x": 29,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 132,
             "dest_warp_id": 15
         },
         {
             "x": 42,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 132,
             "dest_warp_id": 16
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 306,
             "dest_warp_id": 0
         },
         {
             "x": 19,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 306,
             "dest_warp_id": 2
         },
         {
             "x": 27,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 306,
             "dest_warp_id": 1
         },
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 310,
             "dest_warp_id": 0
         },
         {
             "x": 46,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 309,
             "dest_warp_id": 0
         },
         {
             "x": 52,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 305,
             "dest_warp_id": 9
         },
         {
             "x": 41,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 8
         },
         {
             "x": 39,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 11
         },
         {
             "x": 32,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 10
         },
         {
             "x": 36,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 305,
             "dest_warp_id": 13
         },
         {
             "x": 1,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 305,
             "dest_warp_id": 12
         },
         {
             "x": 41,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 308,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0294.json b/res/field/events/events_0294.json
index 2b34a4e544..560f3528b6 100644
--- a/res/field/events/events_0294.json
+++ b/res/field/events/events_0294.json
@@ -4,96 +4,96 @@
             "script": 1,
             "type": 0,
             "x": 40,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8075,
             "type": 2,
             "x": 44,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8076,
             "type": 2,
             "x": 1,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 42,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 31,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 9,
-            "y": 19,
-            "z": 0,
+            "z": 19,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 39,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 41,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 42,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 40,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 3
         },
         {
             "script": 1,
             "type": 0,
             "x": 44,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 3
         },
         {
             "script": 1,
             "type": 0,
             "x": 44,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -109,8 +109,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -119,12 +119,14 @@
             "flag": 567,
             "script": 3509,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -133,12 +135,14 @@
             "flag": 567,
             "script": 3512,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -147,12 +151,14 @@
             "flag": 567,
             "script": 3429,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -161,12 +167,14 @@
             "flag": 567,
             "script": 3828,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 32,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -179,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -193,98 +201,98 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 41,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 3
         },
         {
             "x": 24,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 5
         },
         {
             "x": 10,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 305,
             "dest_warp_id": 4
         },
         {
             "x": 12,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 307,
             "dest_warp_id": 0
         },
         {
             "x": 50,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 307,
             "dest_warp_id": 1
         },
         {
             "x": 1,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 306,
             "dest_warp_id": 6
         },
         {
             "x": 17,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 306,
             "dest_warp_id": 5
         },
         {
             "x": 1,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 306,
             "dest_warp_id": 8
         },
         {
             "x": 45,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 306,
             "dest_warp_id": 7
         },
         {
             "x": 52,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 569,
             "dest_warp_id": 1
         },
         {
             "x": 29,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 569,
             "dest_warp_id": 0
         },
         {
             "x": 52,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 306,
             "dest_warp_id": 12
         },
         {
             "x": 18,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 306,
             "dest_warp_id": 11
         },
         {
             "x": 1,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 306,
             "dest_warp_id": 14
         },
         {
             "x": 45,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 306,
             "dest_warp_id": 13
         }
diff --git a/res/field/events/events_0295.json b/res/field/events/events_0295.json
index a9614dfddc..b8c1690a09 100644
--- a/res/field/events/events_0295.json
+++ b/res/field/events/events_0295.json
@@ -4,32 +4,32 @@
             "script": 8078,
             "type": 2,
             "x": 39,
-            "y": 21,
-            "z": 0,
+            "z": 21,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8077,
             "type": 2,
             "x": 2,
-            "y": 18,
-            "z": 0,
+            "z": 18,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8079,
             "type": 2,
             "x": 21,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 6,
-            "y": 19,
-            "z": 0,
+            "z": 19,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -69,12 +69,15 @@
             "flag": 567,
             "script": 3511,
             "initial_dir": 3,
-            "data": [2, 2],
+            "data": [
+                2,
+                2
+            ],
             "movement_range_x": 8,
             "movement_range_y": 0,
             "x": 9,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -83,12 +86,14 @@
             "flag": 567,
             "script": 3513,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -97,12 +102,14 @@
             "flag": 567,
             "script": 3521,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 42,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -115,8 +122,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -129,8 +136,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -139,12 +146,14 @@
             "flag": 567,
             "script": 3508,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -157,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 50,
-            "y": 21,
-            "z": 0
+            "z": 21,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -171,62 +180,62 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 306,
             "dest_warp_id": 3
         },
         {
             "x": 47,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 306,
             "dest_warp_id": 4
         },
         {
             "x": 10,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 308,
             "dest_warp_id": 0
         },
         {
             "x": 6,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 307,
             "dest_warp_id": 4
         },
         {
             "x": 15,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 307,
             "dest_warp_id": 3
         },
         {
             "x": 17,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 307,
             "dest_warp_id": 6
         },
         {
             "x": 52,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 307,
             "dest_warp_id": 5
         },
         {
             "x": 19,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 307,
             "dest_warp_id": 8
         },
         {
             "x": 32,
-            "y": 22,
+            "z": 22,
             "dest_header_id": 307,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0296.json b/res/field/events/events_0296.json
index 03571bcea8..148f78a699 100644
--- a/res/field/events/events_0296.json
+++ b/res/field/events/events_0296.json
@@ -4,24 +4,24 @@
             "script": 8080,
             "type": 2,
             "x": 20,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 21,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 0,
             "x": 1,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 2
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -79,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -93,32 +93,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 307,
             "dest_warp_id": 2
         },
         {
             "x": 22,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 497,
             "dest_warp_id": 0
         },
         {
             "x": 21,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 305,
             "dest_warp_id": 14
         },
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 569,
             "dest_warp_id": 2
         }
@@ -127,12 +127,12 @@
         {
             "script": 1,
             "x": 8,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16598
+            "var": 16598,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0297.json b/res/field/events/events_0297.json
index 9d298fe204..e7bcf507e4 100644
--- a/res/field/events/events_0297.json
+++ b/res/field/events/events_0297.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 7
         },
         {
             "x": 3,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 310,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0298.json b/res/field/events/events_0298.json
index 60894c640d..aca4de366a 100644
--- a/res/field/events/events_0298.json
+++ b/res/field/events/events_0298.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 26,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 5,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -50,12 +50,14 @@
             "flag": 567,
             "script": 3506,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -64,12 +66,14 @@
             "flag": 567,
             "script": 3507,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 71,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -82,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -96,8 +100,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 202,
@@ -110,8 +114,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -124,26 +128,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 62,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 50,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 305,
             "dest_warp_id": 6
         },
         {
             "x": 81,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 309,
             "dest_warp_id": 1
         },
         {
             "x": 3,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 143,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0299.json b/res/field/events/events_0299.json
index 445440e17a..5da9645202 100644
--- a/res/field/events/events_0299.json
+++ b/res/field/events/events_0299.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 49,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 173,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 57,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 173,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 51,
-            "z": 0
+            "z": 51,
+            "y": 0
         },
         {
             "graphics_id": 120,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 54,
-            "z": 0
+            "z": 54,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -96,20 +96,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 54,
-            "z": 0
+            "z": 54,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 46,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 334,
             "dest_warp_id": 1
         },
         {
             "x": 47,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 334,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0300.json b/res/field/events/events_0300.json
index 2cb4a6c7db..e426315314 100644
--- a/res/field/events/events_0300.json
+++ b/res/field/events/events_0300.json
@@ -8,12 +8,14 @@
             "flag": 448,
             "script": 3418,
             "initial_dir": 3,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 43,
-            "y": 49,
-            "z": 0
+            "z": 49,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -22,12 +24,14 @@
             "flag": 448,
             "script": 3419,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -36,12 +40,14 @@
             "flag": 448,
             "script": 3425,
             "initial_dir": 2,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 50,
-            "y": 49,
-            "z": 0
+            "z": 49,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -50,12 +56,14 @@
             "flag": 448,
             "script": 3426,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -68,8 +76,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 54,
-            "z": 0
+            "z": 54,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -82,8 +90,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -96,8 +104,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 54,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 121,
@@ -110,8 +118,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -124,26 +132,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 51,
-            "z": 0
+            "z": 51,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 32,
-            "y": 32,
+            "z": 32,
             "dest_header_id": 313,
             "dest_warp_id": 0
         },
         {
             "x": 46,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 334,
             "dest_warp_id": 2
         },
         {
             "x": 47,
-            "y": 54,
+            "z": 54,
             "dest_header_id": 334,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0301.json b/res/field/events/events_0301.json
index 46952ff264..b107020cd8 100644
--- a/res/field/events/events_0301.json
+++ b/res/field/events/events_0301.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 22,
-            "z": 0
+            "z": 22,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 312,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0302.json b/res/field/events/events_0302.json
index 0845504672..ea3998efba 100644
--- a/res/field/events/events_0302.json
+++ b/res/field/events/events_0302.json
@@ -4,8 +4,8 @@
             "script": 8057,
             "type": 2,
             "x": 12,
-            "y": 15,
-            "z": 0,
+            "z": 15,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 34,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 36,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -73,12 +73,14 @@
             "flag": 0,
             "script": 3416,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -87,12 +89,14 @@
             "flag": 0,
             "script": 3424,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -101,12 +105,14 @@
             "flag": 0,
             "script": 3417,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -119,8 +125,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -133,8 +139,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -147,8 +153,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -161,8 +167,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -175,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -189,8 +195,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -203,8 +209,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 34,
-            "z": 0
+            "z": 34,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -217,8 +223,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -231,8 +237,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 44,
-            "y": 33,
-            "z": 0
+            "z": 33,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -245,8 +251,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -259,8 +265,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -273,8 +279,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -287,8 +293,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -301,8 +307,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 12,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -315,8 +321,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -329,8 +335,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -343,8 +349,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 28,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -357,8 +363,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 25,
-            "z": 0
+            "z": 25,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -371,8 +377,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 30,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -385,8 +391,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 29,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -399,8 +405,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 195,
@@ -413,8 +419,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 40,
-            "y": 28,
-            "z": 0
+            "z": 28,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -427,26 +433,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 52,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 336,
             "dest_warp_id": 3
         },
         {
             "x": 32,
-            "y": 32,
+            "z": 32,
             "dest_header_id": 316,
             "dest_warp_id": 0
         },
         {
             "x": 52,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 336,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0303.json b/res/field/events/events_0303.json
index 654765e8d6..0d51d91bc1 100644
--- a/res/field/events/events_0303.json
+++ b/res/field/events/events_0303.json
@@ -12,38 +12,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 53,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 51,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 336,
             "dest_warp_id": 3
         },
         {
             "x": 32,
-            "y": 32,
+            "z": 32,
             "dest_header_id": 316,
             "dest_warp_id": 1
         },
         {
             "x": 51,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 336,
             "dest_warp_id": 4
         },
         {
             "x": 52,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 336,
             "dest_warp_id": 5
         },
         {
             "x": 52,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 336,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0304.json b/res/field/events/events_0304.json
index a481eb695e..2552e242b1 100644
--- a/res/field/events/events_0304.json
+++ b/res/field/events/events_0304.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 122,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 314,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 315,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0305.json b/res/field/events/events_0305.json
index 0db2d3dbab..3e93664353 100644
--- a/res/field/events/events_0305.json
+++ b/res/field/events/events_0305.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 0
         },
         {
             "x": 15,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0306.json b/res/field/events/events_0306.json
index df8a630003..4c714cf4f7 100644
--- a/res/field/events/events_0306.json
+++ b/res/field/events/events_0306.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 123,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 44,
-            "z": 0
+            "z": 44,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -40,38 +40,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 45,
-            "z": 0
+            "z": 45,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 0
         },
         {
             "x": 32,
-            "y": 32,
+            "z": 32,
             "dest_header_id": 319,
             "dest_warp_id": 0
         },
         {
             "x": 12,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 1
         },
         {
             "x": 14,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 2
         },
         {
             "x": 15,
-            "y": 50,
+            "z": 50,
             "dest_header_id": 340,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0307.json b/res/field/events/events_0307.json
index 8e9f3535b8..3738a8d157 100644
--- a/res/field/events/events_0307.json
+++ b/res/field/events/events_0307.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 29,
+            "z": 29,
             "dest_header_id": 318,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0308.json b/res/field/events/events_0308.json
index 36627d8506..f5036cc209 100644
--- a/res/field/events/events_0308.json
+++ b/res/field/events/events_0308.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 277,
-            "z": 0
+            "z": 277,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 278,
-            "z": 0
+            "z": 278,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 276,
-            "z": 0
+            "z": 276,
+            "y": 0
         },
         {
             "graphics_id": 192,
@@ -54,20 +54,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 275,
-            "z": 0
+            "z": 275,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 137,
-            "y": 268,
+            "z": 268,
             "dest_header_id": 321,
             "dest_warp_id": 0
         },
         {
             "x": 138,
-            "y": 268,
+            "z": 268,
             "dest_header_id": 321,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0309.json b/res/field/events/events_0309.json
index 033702cfd8..b4f7a74c5e 100644
--- a/res/field/events/events_0309.json
+++ b/res/field/events/events_0309.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 320,
             "dest_warp_id": 0
         },
         {
             "x": 17,
-            "y": 21,
+            "z": 21,
             "dest_header_id": 320,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0310.json b/res/field/events/events_0310.json
index 8915d9ddf6..5095b8aae5 100644
--- a/res/field/events/events_0310.json
+++ b/res/field/events/events_0310.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         },
         {
             "graphics_id": 81,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 35,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 29,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -82,8 +82,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 29,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 28,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 15,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -124,8 +124,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 14,
-            "y": 47,
-            "z": 0
+            "z": 47,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -138,8 +138,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 26,
-            "y": 47,
-            "z": 0
+            "z": 47,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 52,
-            "z": 0
+            "z": 52,
+            "y": 0
         },
         {
             "graphics_id": 169,
@@ -166,8 +166,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 23,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -180,8 +180,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 24,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -194,32 +194,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 27,
-            "y": 35,
-            "z": 0
+            "z": 35,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 20,
-            "y": 33,
+            "z": 33,
             "dest_header_id": 323,
             "dest_warp_id": 0
         },
         {
             "x": 29,
-            "y": 33,
+            "z": 33,
             "dest_header_id": 323,
             "dest_warp_id": 1
         },
         {
             "x": 24,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 192,
             "dest_warp_id": 0
         },
         {
             "x": 25,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 192,
             "dest_warp_id": 0
         }
@@ -228,12 +228,12 @@
         {
             "script": 1,
             "x": 23,
-            "y": 32,
+            "z": 32,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16654
+            "var": 16654,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0311.json b/res/field/events/events_0311.json
index 8162633319..67e8bac765 100644
--- a/res/field/events/events_0311.json
+++ b/res/field/events/events_0311.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 23,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 43,
@@ -96,8 +96,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -110,8 +110,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 19,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -124,20 +124,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 322,
             "dest_warp_id": 0
         },
         {
             "x": 21,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 322,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0312.json b/res/field/events/events_0312.json
index 92a1630dcf..31c2b93d64 100644
--- a/res/field/events/events_0312.json
+++ b/res/field/events/events_0312.json
@@ -4,24 +4,24 @@
             "script": 10450,
             "type": 0,
             "x": 13,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 17,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 13,
             "type": 0,
             "x": 21,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 232,
@@ -51,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 235,
@@ -65,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -79,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -93,8 +93,8 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -107,8 +107,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 13,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -121,8 +121,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -135,8 +135,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 25,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -149,8 +149,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 25,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -163,8 +163,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 19,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -177,8 +177,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 20,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -191,8 +191,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 9,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -205,8 +205,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -219,8 +219,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -233,26 +233,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 24,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 19,
+            "z": 19,
             "dest_header_id": 559,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 19,
+            "z": 19,
             "dest_header_id": 559,
             "dest_warp_id": 0
         },
         {
             "x": 16,
-            "y": 19,
+            "z": 19,
             "dest_header_id": 559,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0313.json b/res/field/events/events_0313.json
index c18b9c5601..a54788c8e8 100644
--- a/res/field/events/events_0313.json
+++ b/res/field/events/events_0313.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0314.json b/res/field/events/events_0314.json
index 145a21cf79..9f58f53fb8 100644
--- a/res/field/events/events_0314.json
+++ b/res/field/events/events_0314.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0315.json b/res/field/events/events_0315.json
index 6b53dac0f3..b00a94f1f0 100644
--- a/res/field/events/events_0315.json
+++ b/res/field/events/events_0315.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0316.json b/res/field/events/events_0316.json
index 31a146a271..b3253b48f1 100644
--- a/res/field/events/events_0316.json
+++ b/res/field/events/events_0316.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0317.json b/res/field/events/events_0317.json
index c217c58725..86d70c98d7 100644
--- a/res/field/events/events_0317.json
+++ b/res/field/events/events_0317.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 104,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 103,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0318.json b/res/field/events/events_0318.json
index c9b4ea121a..94fd843091 100644
--- a/res/field/events/events_0318.json
+++ b/res/field/events/events_0318.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [],
@@ -21,12 +21,12 @@
         {
             "script": 9101,
             "x": 7,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16399
+            "var": 16399,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0319.json b/res/field/events/events_0319.json
index f0e54f2118..be89b2e04a 100644
--- a/res/field/events/events_0319.json
+++ b/res/field/events/events_0319.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [],
@@ -21,12 +21,12 @@
         {
             "script": 9101,
             "x": 6,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16399
+            "var": 16399,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0320.json b/res/field/events/events_0320.json
index d4ec9290cc..ed1f1e1a90 100644
--- a/res/field/events/events_0320.json
+++ b/res/field/events/events_0320.json
@@ -4,8 +4,8 @@
             "script": 8160,
             "type": 2,
             "x": 86,
-            "y": 849,
-            "z": 0,
+            "z": 849,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,36 +17,38 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 79,
-            "y": 846,
-            "z": 0
+            "z": 846,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 81,
-            "y": 843,
+            "z": 843,
             "dest_header_id": 311,
             "dest_warp_id": 1
         },
         {
             "x": 80,
-            "y": 843,
+            "z": 843,
             "dest_header_id": 311,
             "dest_warp_id": 0
         },
         {
             "x": 80,
-            "y": 843,
+            "z": 843,
             "dest_header_id": 312,
             "dest_warp_id": 1
         },
         {
             "x": 81,
-            "y": 843,
+            "z": 843,
             "dest_header_id": 312,
             "dest_warp_id": 2
         }
@@ -55,12 +57,12 @@
         {
             "script": 3,
             "x": 80,
-            "y": 844,
+            "z": 844,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16514
+            "var": 16514,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0322.json b/res/field/events/events_0322.json
index 64e750497b..ce9a0f5516 100644
--- a/res/field/events/events_0322.json
+++ b/res/field/events/events_0322.json
@@ -4,32 +4,32 @@
             "script": 8031,
             "type": 2,
             "x": 720,
-            "y": 794,
-            "z": 0,
+            "z": 794,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8007,
             "type": 2,
             "x": 730,
-            "y": 773,
-            "z": 0,
+            "z": 773,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8166,
             "type": 2,
             "x": 692,
-            "y": 801,
-            "z": 0,
+            "z": 801,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8180,
             "type": 2,
             "x": 716,
-            "y": 745,
-            "z": 0,
+            "z": 745,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 723,
-            "y": 760,
-            "z": 0
+            "z": 760,
+            "y": 0
         },
         {
             "graphics_id": 23,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 718,
-            "y": 760,
-            "z": 0
+            "z": 760,
+            "y": 0
         },
         {
             "graphics_id": 23,
@@ -73,8 +73,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 718,
-            "y": 761,
-            "z": 0
+            "z": 761,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -87,8 +87,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 712,
-            "y": 783,
-            "z": 0
+            "z": 783,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -101,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 717,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -115,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 719,
-            "y": 790,
-            "z": 0
+            "z": 790,
+            "y": 0
         },
         {
             "local_id": 31,
@@ -130,8 +130,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 694,
-            "y": 804,
-            "z": 0
+            "z": 804,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -144,8 +144,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 704,
-            "y": 792,
-            "z": 0
+            "z": 792,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -158,8 +158,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 715,
-            "y": 782,
-            "z": 0
+            "z": 782,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -172,8 +172,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 724,
-            "y": 788,
-            "z": 0
+            "z": 788,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -186,8 +186,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 723,
-            "y": 777,
-            "z": 0
+            "z": 777,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -200,50 +200,50 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 712,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 706,
-            "y": 790,
+            "z": 790,
             "dest_header_id": 337,
             "dest_warp_id": 0
         },
         {
             "x": 715,
-            "y": 781,
+            "z": 781,
             "dest_header_id": 338,
             "dest_warp_id": 0
         },
         {
             "x": 690,
-            "y": 791,
+            "z": 791,
             "dest_header_id": 339,
             "dest_warp_id": 0
         },
         {
             "x": 717,
-            "y": 760,
+            "z": 760,
             "dest_header_id": 314,
             "dest_warp_id": 0
         },
         {
             "x": 717,
-            "y": 761,
+            "z": 761,
             "dest_header_id": 314,
             "dest_warp_id": 2
         },
         {
             "x": 717,
-            "y": 760,
+            "z": 760,
             "dest_header_id": 315,
             "dest_warp_id": 3
         },
         {
             "x": 717,
-            "y": 761,
+            "z": 761,
             "dest_header_id": 315,
             "dest_warp_id": 4
         }
@@ -252,12 +252,12 @@
         {
             "script": 9,
             "x": 724,
-            "y": 789,
+            "z": 789,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 0,
-            "var": 16658
+            "var": 16658,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0323.json b/res/field/events/events_0323.json
index d254adaa63..ac2819e6b1 100644
--- a/res/field/events/events_0323.json
+++ b/res/field/events/events_0323.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 23,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 59,
@@ -264,14 +264,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 9,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 336,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0324.json b/res/field/events/events_0324.json
index 289187a85b..2251633630 100644
--- a/res/field/events/events_0324.json
+++ b/res/field/events/events_0324.json
@@ -12,14 +12,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 336,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0325.json b/res/field/events/events_0325.json
index 2a7783fe10..7a099aba19 100644
--- a/res/field/events/events_0325.json
+++ b/res/field/events/events_0325.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 336,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0326.json b/res/field/events/events_0326.json
index 38c8ee8939..113ee21cbe 100644
--- a/res/field/events/events_0326.json
+++ b/res/field/events/events_0326.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 340,
-            "y": 230,
-            "z": 0
+            "z": 230,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -22,12 +22,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 309,
-            "y": 242,
-            "z": 0
+            "z": 242,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -40,8 +42,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 310,
-            "y": 237,
-            "z": 0
+            "z": 237,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -54,32 +56,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 323,
-            "y": 235,
-            "z": 0
+            "z": 235,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 308,
-            "y": 229,
+            "z": 229,
             "dest_header_id": 317,
             "dest_warp_id": 0
         },
         {
             "x": 309,
-            "y": 229,
+            "z": 229,
             "dest_header_id": 317,
             "dest_warp_id": 1
         },
         {
             "x": 308,
-            "y": 229,
+            "z": 229,
             "dest_header_id": 318,
             "dest_warp_id": 3
         },
         {
             "x": 309,
-            "y": 229,
+            "z": 229,
             "dest_header_id": 318,
             "dest_warp_id": 4
         }
@@ -88,12 +90,12 @@
         {
             "script": 4,
             "x": 310,
-            "y": 244,
+            "z": 244,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16516
+            "var": 16516,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0327.json b/res/field/events/events_0327.json
index 536f386397..ff8fe8cbf6 100644
--- a/res/field/events/events_0327.json
+++ b/res/field/events/events_0327.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 762,
-            "y": 713,
+            "z": 713,
             "dest_header_id": 267,
             "dest_warp_id": 0
         },
         {
             "x": 763,
-            "y": 713,
+            "z": 713,
             "dest_header_id": 267,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0328.json b/res/field/events/events_0328.json
index 9e32178edc..ef18ed0e65 100644
--- a/res/field/events/events_0328.json
+++ b/res/field/events/events_0328.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 123,
-            "y": 854,
-            "z": 1
+            "z": 854,
+            "y": 1
         },
         {
             "graphics_id": 24,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 140,
-            "y": 842,
-            "z": 1
+            "z": 842,
+            "y": 1
         },
         {
             "graphics_id": 148,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 112,
-            "y": 855,
-            "z": 1
+            "z": 855,
+            "y": 1
         },
         {
             "graphics_id": 94,
@@ -50,12 +50,14 @@
             "flag": 0,
             "script": 6,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 109,
-            "y": 856,
-            "z": 0
+            "z": 856,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -64,12 +66,14 @@
             "flag": 0,
             "script": 7,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 843,
-            "z": 0
+            "z": 843,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -82,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 105,
-            "y": 853,
-            "z": 0
+            "z": 853,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -96,8 +100,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 105,
-            "y": 853,
-            "z": 0
+            "z": 853,
+            "y": 0
         },
         {
             "local_id": 5,
@@ -111,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 165,
-            "y": 843,
-            "z": 0
+            "z": 843,
+            "y": 0
         },
         {
             "local_id": 3,
@@ -126,8 +130,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 108,
-            "y": 869,
-            "z": 0
+            "z": 869,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -140,8 +144,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 153,
-            "y": 847,
-            "z": 1
+            "z": 847,
+            "y": 1
         },
         {
             "graphics_id": 96,
@@ -154,8 +158,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 136,
-            "y": 851,
-            "z": 0
+            "z": 851,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -168,8 +172,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 142,
-            "y": 855,
-            "z": 0
+            "z": 855,
+            "y": 0
         },
         {
             "graphics_id": 174,
@@ -182,8 +186,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 112,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         }
     ],
     "warp_events": [],
@@ -191,62 +195,62 @@
         {
             "script": 2,
             "x": 110,
-            "y": 857,
+            "z": 857,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16518
+            "var": 16518,
+            "value": 0
         },
         {
             "script": 4,
             "x": 113,
-            "y": 855,
+            "z": 855,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16518
+            "var": 16518,
+            "value": 1
         },
         {
             "script": 3,
             "x": 110,
-            "y": 858,
+            "z": 858,
+            "y": 0,
             "width": 4,
             "length": 1,
-            "z": 0,
-            "value": 3,
-            "var": 16518
+            "var": 16518,
+            "value": 3
         },
         {
             "script": 4,
             "x": 115,
-            "y": 854,
+            "z": 854,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16518
+            "var": 16518,
+            "value": 1
         },
         {
             "script": 14,
             "x": 115,
-            "y": 852,
+            "z": 852,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 3,
-            "var": 16518
+            "var": 16518,
+            "value": 3
         },
         {
             "script": 16,
             "x": 109,
-            "y": 857,
+            "z": 857,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 2,
-            "var": 16518
+            "var": 16518,
+            "value": 2
         }
     ]
 }
diff --git a/res/field/events/events_0329.json b/res/field/events/events_0329.json
index 2471ce3b56..26c16a54bb 100644
--- a/res/field/events/events_0329.json
+++ b/res/field/events/events_0329.json
@@ -4,8 +4,8 @@
             "script": 8161,
             "type": 2,
             "x": 168,
-            "y": 795,
-            "z": 0,
+            "z": 795,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 0,
             "script": 3000,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 166,
-            "y": 813,
-            "z": 1
+            "z": 813,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -31,12 +33,14 @@
             "flag": 0,
             "script": 3002,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 181,
-            "y": 818,
-            "z": 1
+            "z": 818,
+            "y": 1
         },
         {
             "graphics_id": 4,
@@ -45,12 +49,14 @@
             "flag": 0,
             "script": 3001,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 185,
-            "y": 804,
-            "z": 1
+            "z": 804,
+            "y": 1
         },
         {
             "graphics_id": 101,
@@ -63,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 174,
-            "y": 827,
-            "z": 1
+            "z": 827,
+            "y": 1
         },
         {
             "graphics_id": 94,
@@ -73,12 +79,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 183,
-            "y": 825,
-            "z": 0
+            "z": 825,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -87,12 +95,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 176,
-            "y": 804,
-            "z": 0
+            "z": 804,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -105,8 +115,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 174,
-            "y": 816,
-            "z": 0
+            "z": 816,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -119,8 +129,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 169,
-            "y": 808,
-            "z": 0
+            "z": 808,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -133,8 +143,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 162,
-            "y": 806,
-            "z": 0
+            "z": 806,
+            "y": 0
         }
     ],
     "warp_events": [],
@@ -142,12 +152,12 @@
         {
             "script": 6,
             "x": 180,
-            "y": 825,
+            "z": 825,
+            "y": 0,
             "width": 1,
             "length": 5,
-            "z": 0,
-            "value": 0,
-            "var": 16519
+            "var": 16519,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0330.json b/res/field/events/events_0330.json
index abab238b07..5ca3ca0bc0 100644
--- a/res/field/events/events_0330.json
+++ b/res/field/events/events_0330.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3355,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 234,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3003,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 204,
-            "y": 750,
-            "z": 1
+            "z": 750,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 3322,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 243,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -50,12 +56,14 @@
             "flag": 0,
             "script": 3354,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 222,
-            "y": 756,
-            "z": 4
+            "z": 756,
+            "y": 4
         },
         {
             "graphics_id": 6,
@@ -64,12 +72,14 @@
             "flag": 0,
             "script": 3321,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 240,
-            "y": 748,
-            "z": 1
+            "z": 748,
+            "y": 1
         },
         {
             "graphics_id": 148,
@@ -82,8 +92,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 201,
-            "y": 757,
-            "z": 1
+            "z": 757,
+            "y": 1
         },
         {
             "graphics_id": 94,
@@ -92,12 +102,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 200,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -106,12 +118,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 244,
-            "y": 747,
-            "z": 0
+            "z": 747,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -124,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 238,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -138,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 217,
-            "y": 750,
-            "z": 0
+            "z": 750,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -152,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 222,
-            "y": 745,
-            "z": 0
+            "z": 745,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -166,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 211,
-            "y": 750,
-            "z": 0
+            "z": 750,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -180,8 +194,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 206,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -191,12 +205,14 @@
             "flag": 3,
             "script": 65535,
             "initial_dir": 0,
-            "data": [8],
+            "data": [
+                8
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 187,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -209,14 +225,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 231,
-            "y": 754,
-            "z": 0
+            "z": 754,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 246,
-            "y": 749,
+            "z": 749,
             "dest_header_id": 258,
             "dest_warp_id": 0
         }
@@ -225,12 +241,12 @@
         {
             "script": 6,
             "x": 196,
-            "y": 757,
+            "z": 757,
+            "y": 0,
             "width": 1,
             "length": 4,
-            "z": 0,
-            "value": 0,
-            "var": 16520
+            "var": 16520,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0331.json b/res/field/events/events_0331.json
index 7c01741c7e..5458844c8c 100644
--- a/res/field/events/events_0331.json
+++ b/res/field/events/events_0331.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3011,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 172,
-            "y": 725,
-            "z": 1
+            "z": 725,
+            "y": 1
         },
         {
             "graphics_id": 6,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3010,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 171,
-            "y": 712,
-            "z": 1
+            "z": 712,
+            "y": 1
         },
         {
             "graphics_id": 4,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 3009,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 167,
-            "y": 722,
-            "z": 1
+            "z": 722,
+            "y": 1
         },
         {
             "graphics_id": 4,
@@ -54,8 +60,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 173,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -64,12 +70,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 174,
-            "y": 721,
-            "z": 0
+            "z": 721,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -82,8 +90,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 170,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -96,8 +104,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 175,
-            "y": 700,
-            "z": 0
+            "z": 700,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -110,8 +118,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 162,
-            "y": 732,
-            "z": 0
+            "z": 732,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -124,8 +132,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 189,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -138,14 +146,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 177,
-            "y": 722,
-            "z": 0
+            "z": 722,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 171,
-            "y": 705,
+            "z": 705,
             "dest_header_id": 254,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0332.json b/res/field/events/events_0332.json
index bac48be258..348e440810 100644
--- a/res/field/events/events_0332.json
+++ b/res/field/events/events_0332.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3012,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 182,
-            "y": 685,
-            "z": 5
+            "z": 685,
+            "y": 5
         },
         {
             "graphics_id": 12,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3013,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 177,
-            "y": 692,
-            "z": 5
+            "z": 692,
+            "y": 5
         },
         {
             "graphics_id": 2,
@@ -36,12 +40,14 @@
             "flag": 0,
             "script": 3014,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 175,
-            "y": 679,
-            "z": 5
+            "z": 679,
+            "y": 5
         },
         {
             "graphics_id": 2,
@@ -50,12 +56,14 @@
             "flag": 0,
             "script": 5014,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 176,
-            "y": 679,
-            "z": 5
+            "z": 679,
+            "y": 5
         },
         {
             "graphics_id": 4,
@@ -68,8 +76,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 175,
-            "y": 700,
-            "z": 5
+            "z": 700,
+            "y": 5
         },
         {
             "graphics_id": 94,
@@ -78,12 +86,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [13],
+            "data": [
+                13
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 177,
-            "y": 681,
-            "z": 0
+            "z": 681,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -96,8 +106,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 170,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -110,8 +120,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 173,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -124,8 +134,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 181,
-            "y": 678,
-            "z": 0
+            "z": 678,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -138,8 +148,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 162,
-            "y": 682,
-            "z": 0
+            "z": 682,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -152,8 +162,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 191,
-            "y": 676,
-            "z": 0
+            "z": 676,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -166,14 +176,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 180,
-            "y": 695,
-            "z": 0
+            "z": 695,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 180,
-            "y": 698,
+            "z": 698,
             "dest_header_id": 254,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0333.json b/res/field/events/events_0333.json
index 2960d03b16..9b614e144c 100644
--- a/res/field/events/events_0333.json
+++ b/res/field/events/events_0333.json
@@ -4,8 +4,8 @@
             "script": 8217,
             "type": 2,
             "x": 212,
-            "y": 627,
-            "z": 0,
+            "z": 627,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 0,
             "script": 3017,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 210,
-            "y": 637,
-            "z": 5
+            "z": 637,
+            "y": 5
         },
         {
             "graphics_id": 12,
@@ -31,12 +33,14 @@
             "flag": 0,
             "script": 3020,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 215,
-            "y": 633,
-            "z": 5
+            "z": 633,
+            "y": 5
         },
         {
             "graphics_id": 52,
@@ -45,12 +49,14 @@
             "flag": 0,
             "script": 3015,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 215,
-            "y": 646,
-            "z": 6
+            "z": 646,
+            "y": 6
         },
         {
             "graphics_id": 53,
@@ -59,12 +65,14 @@
             "flag": 0,
             "script": 3016,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 215,
-            "y": 619,
-            "z": 7
+            "z": 619,
+            "y": 7
         },
         {
             "graphics_id": 20,
@@ -73,12 +81,14 @@
             "flag": 0,
             "script": 3018,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 208,
-            "y": 610,
-            "z": 7
+            "z": 610,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -87,12 +97,14 @@
             "flag": 0,
             "script": 3019,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 2,
             "movement_range_y": 5,
             "x": 207,
-            "y": 598,
-            "z": 7
+            "z": 598,
+            "y": 7
         },
         {
             "graphics_id": 94,
@@ -101,12 +113,14 @@
             "flag": 0,
             "script": 8,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 215,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -115,12 +129,14 @@
             "flag": 0,
             "script": 9,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 209,
-            "y": 587,
-            "z": 0
+            "z": 587,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -133,8 +149,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 209,
-            "y": 584,
-            "z": 0
+            "z": 584,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -147,8 +163,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 209,
-            "y": 623,
-            "z": 0
+            "z": 623,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -161,8 +177,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 204,
-            "y": 618,
-            "z": 0
+            "z": 618,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -175,8 +191,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 213,
-            "y": 640,
-            "z": 0
+            "z": 640,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -189,8 +205,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 218,
-            "y": 653,
-            "z": 5
+            "z": 653,
+            "y": 5
         },
         {
             "graphics_id": 124,
@@ -203,8 +219,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 216,
-            "y": 653,
-            "z": 5
+            "z": 653,
+            "y": 5
         },
         {
             "graphics_id": 100,
@@ -213,12 +229,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 202,
-            "y": 658,
-            "z": 0
+            "z": 658,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -227,12 +245,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 203,
-            "y": 658,
-            "z": 0
+            "z": 658,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -241,12 +261,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 211,
-            "y": 614,
-            "z": 0
+            "z": 614,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -255,12 +277,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 212,
-            "y": 614,
-            "z": 0
+            "z": 614,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -273,8 +297,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 211,
-            "y": 661,
-            "z": 0
+            "z": 661,
+            "y": 0
         },
         {
             "local_id": 11,
@@ -284,12 +308,14 @@
             "flag": 426,
             "script": 65535,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 189,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -298,12 +324,14 @@
             "flag": 0,
             "script": 3455,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 208,
-            "y": 595,
-            "z": 7
+            "z": 595,
+            "y": 7
         },
         {
             "graphics_id": 52,
@@ -312,12 +340,14 @@
             "flag": 0,
             "script": 3376,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 206,
-            "y": 625,
-            "z": 6
+            "z": 625,
+            "y": 6
         },
         {
             "graphics_id": 182,
@@ -330,8 +360,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 212,
-            "y": 623,
-            "z": 0
+            "z": 623,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -344,8 +374,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 219,
-            "y": 618,
-            "z": 0
+            "z": 618,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -358,8 +388,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 212,
-            "y": 622,
-            "z": 0
+            "z": 622,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -372,8 +402,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 219,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -386,8 +416,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 219,
-            "y": 597,
-            "z": 0
+            "z": 597,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -400,8 +430,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 220,
-            "y": 600,
-            "z": 0
+            "z": 600,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -414,8 +444,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 219,
-            "y": 619,
-            "z": 0
+            "z": 619,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -428,8 +458,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 219,
-            "y": 608,
-            "z": 0
+            "z": 608,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -442,8 +472,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 203,
-            "y": 603,
-            "z": 0
+            "z": 603,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -456,26 +486,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 212,
-            "y": 653,
-            "z": 0
+            "z": 653,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 206,
-            "y": 581,
+            "z": 581,
             "dest_header_id": 203,
             "dest_warp_id": 0
         },
         {
             "x": 207,
-            "y": 581,
+            "z": 581,
             "dest_header_id": 203,
             "dest_warp_id": 1
         },
         {
             "x": 214,
-            "y": 594,
+            "z": 594,
             "dest_header_id": 348,
             "dest_warp_id": 0
         }
@@ -484,22 +514,22 @@
         {
             "script": 6,
             "x": 211,
-            "y": 659,
+            "z": 659,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 0,
-            "var": 16521
+            "var": 16521,
+            "value": 0
         },
         {
             "script": 7,
             "x": 217,
-            "y": 653,
+            "z": 653,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16521
+            "var": 16521,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0334.json b/res/field/events/events_0334.json
index 90b1567d50..36890e320d 100644
--- a/res/field/events/events_0334.json
+++ b/res/field/events/events_0334.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 347,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0335.json b/res/field/events/events_0335.json
index 52fa2b9df8..d9198e087b 100644
--- a/res/field/events/events_0335.json
+++ b/res/field/events/events_0335.json
@@ -4,8 +4,8 @@
             "script": 8150,
             "type": 2,
             "x": 285,
-            "y": 520,
-            "z": 0,
+            "z": 520,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 274,
-            "y": 531,
-            "z": 7
+            "z": 531,
+            "y": 7
         },
         {
             "graphics_id": 54,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 270,
-            "y": 532,
-            "z": 7
+            "z": 532,
+            "y": 7
         },
         {
             "graphics_id": 54,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 277,
-            "y": 535,
-            "z": 7
+            "z": 535,
+            "y": 7
         },
         {
             "graphics_id": 94,
@@ -59,12 +59,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 262,
-            "y": 523,
-            "z": 0
+            "z": 523,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -73,12 +75,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 281,
-            "y": 532,
-            "z": 0
+            "z": 532,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -91,8 +95,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 267,
-            "y": 532,
-            "z": 7
+            "z": 532,
+            "y": 7
         },
         {
             "graphics_id": 87,
@@ -105,8 +109,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 274,
-            "y": 541,
-            "z": 0
+            "z": 541,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -115,12 +119,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [14],
+            "data": [
+                14
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 277,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -129,12 +135,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [15],
+            "data": [
+                15
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 278,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -143,12 +151,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [16],
+            "data": [
+                16
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 279,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -157,12 +167,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [17],
+            "data": [
+                17
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 280,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "local_id": 7,
@@ -172,24 +184,26 @@
             "flag": 65,
             "script": 65535,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 293,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 259,
-            "y": 525,
+            "z": 525,
             "dest_header_id": 203,
             "dest_warp_id": 3
         },
         {
             "x": 259,
-            "y": 524,
+            "z": 524,
             "dest_header_id": 203,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0336.json b/res/field/events/events_0336.json
index 0822403ebe..9d0b551d00 100644
--- a/res/field/events/events_0336.json
+++ b/res/field/events/events_0336.json
@@ -4,16 +4,16 @@
             "script": 8004,
             "type": 2,
             "x": 313,
-            "y": 647,
-            "z": 0,
+            "z": 647,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8005,
             "type": 2,
             "x": 295,
-            "y": 635,
-            "z": 0,
+            "z": 635,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3024,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 302,
-            "y": 601,
-            "z": 9
+            "z": 601,
+            "y": 9
         },
         {
             "graphics_id": 39,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3028,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 299,
-            "y": 611,
-            "z": 8
+            "z": 611,
+            "y": 8
         },
         {
             "graphics_id": 38,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3025,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 304,
-            "y": 622,
-            "z": 7
+            "z": 622,
+            "y": 7
         },
         {
             "graphics_id": 39,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 3029,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 299,
-            "y": 631,
-            "z": 7
+            "z": 631,
+            "y": 7
         },
         {
             "graphics_id": 38,
@@ -81,12 +89,14 @@
             "flag": 0,
             "script": 3026,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 303,
-            "y": 644,
-            "z": 6
+            "z": 644,
+            "y": 6
         },
         {
             "graphics_id": 39,
@@ -95,12 +105,14 @@
             "flag": 0,
             "script": 3030,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 306,
-            "y": 675,
-            "z": 3
+            "z": 675,
+            "y": 3
         },
         {
             "graphics_id": 38,
@@ -109,12 +121,14 @@
             "flag": 0,
             "script": 3027,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 300,
-            "y": 660,
-            "z": 4
+            "z": 660,
+            "y": 4
         },
         {
             "graphics_id": 39,
@@ -123,12 +137,14 @@
             "flag": 0,
             "script": 3031,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 299,
-            "y": 669,
-            "z": 4
+            "z": 669,
+            "y": 4
         },
         {
             "graphics_id": 94,
@@ -137,12 +153,14 @@
             "flag": 0,
             "script": 5,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 700,
-            "z": 0
+            "z": 700,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -151,12 +169,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 302,
-            "y": 578,
-            "z": 0
+            "z": 578,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -169,8 +189,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 310,
-            "y": 690,
-            "z": 0
+            "z": 690,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -183,8 +203,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 311,
-            "y": 690,
-            "z": 0
+            "z": 690,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -197,8 +217,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 312,
-            "y": 679,
-            "z": 0
+            "z": 679,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -211,8 +231,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 292,
-            "y": 623,
-            "z": 0
+            "z": 623,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -225,8 +245,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 679,
-            "z": 0
+            "z": 679,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -235,12 +255,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [18],
+            "data": [
+                18
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 293,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -249,12 +271,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [19],
+            "data": [
+                19
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 294,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -263,12 +287,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [20],
+            "data": [
+                20
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 295,
-            "y": 691,
-            "z": 0
+            "z": 691,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -277,12 +303,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [21],
+            "data": [
+                21
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 296,
-            "y": 691,
-            "z": 0
+            "z": 691,
+            "y": 0
         },
         {
             "local_id": 8,
@@ -296,8 +324,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -310,8 +338,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 302,
-            "y": 652,
-            "z": 0
+            "z": 652,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -324,8 +352,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 314,
-            "y": 631,
-            "z": 0
+            "z": 631,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -334,12 +362,14 @@
             "flag": 0,
             "script": 3450,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 311,
-            "y": 622,
-            "z": 0
+            "z": 622,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -352,92 +382,92 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 292,
-            "y": 643,
-            "z": 0
+            "z": 643,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 302,
-            "y": 688,
+            "z": 688,
             "dest_header_id": 351,
             "dest_warp_id": 4
         },
         {
             "x": 303,
-            "y": 688,
+            "z": 688,
             "dest_header_id": 351,
             "dest_warp_id": 4
         },
         {
             "x": 302,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 2
         },
         {
             "x": 303,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 2
         },
         {
             "x": 304,
-            "y": 576,
+            "z": 576,
             "dest_header_id": 80,
             "dest_warp_id": 1
         },
         {
             "x": 305,
-            "y": 576,
+            "z": 576,
             "dest_header_id": 80,
             "dest_warp_id": 1
         },
         {
             "x": 300,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 0
         },
         {
             "x": 301,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 2
         },
         {
             "x": 304,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 2
         },
         {
             "x": 305,
-            "y": 681,
+            "z": 681,
             "dest_header_id": 351,
             "dest_warp_id": 3
         },
         {
             "x": 301,
-            "y": 688,
+            "z": 688,
             "dest_header_id": 351,
             "dest_warp_id": 1
         },
         {
             "x": 304,
-            "y": 688,
+            "z": 688,
             "dest_header_id": 351,
             "dest_warp_id": 5
         },
         {
             "x": 299,
-            "y": 611,
+            "z": 611,
             "dest_header_id": 284,
             "dest_warp_id": 0
         },
         {
             "x": 310,
-            "y": 607,
+            "z": 607,
             "dest_header_id": 284,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0337.json b/res/field/events/events_0337.json
index d8e55b18c7..38c20ef2d3 100644
--- a/res/field/events/events_0337.json
+++ b/res/field/events/events_0337.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -40,44 +40,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 350,
             "dest_warp_id": 7
         },
         {
             "x": 6,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 0
         },
         {
             "x": 7,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 350,
             "dest_warp_id": 2
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 350,
             "dest_warp_id": 8
         },
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 0
         },
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 1
         }
@@ -86,22 +86,22 @@
         {
             "script": 3,
             "x": 5,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 4,
             "x": 5,
-            "y": 8,
+            "z": 8,
+            "y": 0,
             "width": 5,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16386
+            "var": 16386,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0338.json b/res/field/events/events_0338.json
index 5fa52c5887..6ef834756a 100644
--- a/res/field/events/events_0338.json
+++ b/res/field/events/events_0338.json
@@ -4,13 +4,13 @@
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 65,
             "dest_warp_id": 8
         },
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 350,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0339.json b/res/field/events/events_0339.json
index 220dfa5d3f..a1550ce0c6 100644
--- a/res/field/events/events_0339.json
+++ b/res/field/events/events_0339.json
@@ -4,40 +4,40 @@
             "script": 8012,
             "type": 2,
             "x": 313,
-            "y": 719,
-            "z": 0,
+            "z": 719,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8008,
             "type": 2,
             "x": 349,
-            "y": 725,
-            "z": 0,
+            "z": 725,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8091,
             "type": 2,
             "x": 299,
-            "y": 711,
-            "z": 0,
+            "z": 711,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8151,
             "type": 2,
             "x": 337,
-            "y": 712,
-            "z": 0,
+            "z": 712,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8256,
             "type": 2,
             "x": 338,
-            "y": 718,
-            "z": 0,
+            "z": 718,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -49,12 +49,14 @@
             "flag": 0,
             "script": 3033,
             "initial_dir": 0,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 320,
-            "y": 716,
-            "z": 5
+            "z": 716,
+            "y": 5
         },
         {
             "graphics_id": 53,
@@ -63,12 +65,14 @@
             "flag": 0,
             "script": 3034,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 320,
-            "y": 710,
-            "z": 5
+            "z": 710,
+            "y": 5
         },
         {
             "graphics_id": 4,
@@ -77,12 +81,14 @@
             "flag": 0,
             "script": 3032,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 6,
             "movement_range_y": 1,
             "x": 325,
-            "y": 725,
-            "z": 5
+            "z": 725,
+            "y": 5
         },
         {
             "graphics_id": 20,
@@ -91,12 +97,14 @@
             "flag": 0,
             "script": 3036,
             "initial_dir": 3,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 329,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -105,12 +113,14 @@
             "flag": 0,
             "script": 3035,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 319,
-            "y": 721,
-            "z": 7
+            "z": 721,
+            "y": 7
         },
         {
             "graphics_id": 7,
@@ -119,12 +129,14 @@
             "flag": 0,
             "script": 3037,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 336,
-            "y": 722,
-            "z": 6
+            "z": 722,
+            "y": 6
         },
         {
             "graphics_id": 94,
@@ -133,12 +145,14 @@
             "flag": 0,
             "script": 6,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 297,
-            "y": 726,
-            "z": 0
+            "z": 726,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -147,12 +161,14 @@
             "flag": 0,
             "script": 5,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 340,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -165,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -179,8 +195,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 291,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -193,8 +209,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 323,
-            "y": 730,
-            "z": 0
+            "z": 730,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -207,8 +223,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 335,
-            "y": 725,
-            "z": 0
+            "z": 725,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -217,12 +233,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [23],
+            "data": [
+                23
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 290,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -231,12 +249,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [22],
+            "data": [
+                22
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 291,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -245,12 +265,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [25],
+            "data": [
+                25
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 292,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -259,12 +281,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [24],
+            "data": [
+                24
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 293,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "local_id": 8,
@@ -274,12 +298,14 @@
             "flag": 350,
             "script": 65535,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 700,
-            "z": 0
+            "z": 700,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -289,12 +315,14 @@
             "flag": 45,
             "script": 65535,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 300,
-            "y": 737,
-            "z": 0
+            "z": 737,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -307,8 +335,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 301,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -321,8 +349,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 326,
-            "y": 728,
-            "z": 0
+            "z": 728,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -335,8 +363,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 327,
-            "y": 728,
-            "z": 0
+            "z": 728,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -349,8 +377,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 328,
-            "y": 728,
-            "z": 0
+            "z": 728,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -363,8 +391,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 326,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -377,8 +405,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 328,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 38,
@@ -391,8 +419,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 307,
-            "y": 723,
-            "z": 0
+            "z": 723,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -405,8 +433,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 327,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -419,20 +447,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 348,
-            "y": 727,
-            "z": 0
+            "z": 727,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 341,
-            "y": 712,
+            "z": 712,
             "dest_header_id": 207,
             "dest_warp_id": 0
         },
         {
             "x": 348,
-            "y": 717,
+            "z": 717,
             "dest_header_id": 208,
             "dest_warp_id": 1
         }
@@ -441,12 +469,12 @@
         {
             "script": 2,
             "x": 340,
-            "y": 712,
+            "z": 712,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 0,
-            "var": 16524
+            "var": 16524,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0340.json b/res/field/events/events_0340.json
index 0aad94451d..ecbdda9287 100644
--- a/res/field/events/events_0340.json
+++ b/res/field/events/events_0340.json
@@ -4,16 +4,16 @@
             "script": 8014,
             "type": 2,
             "x": 389,
-            "y": 717,
-            "z": 0,
+            "z": 717,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8015,
             "type": 2,
             "x": 428,
-            "y": 731,
-            "z": 0,
+            "z": 731,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3038,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 420,
-            "y": 722,
-            "z": 0
+            "z": 722,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3039,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 390,
-            "y": 719,
-            "z": 0
+            "z": 719,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3040,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 408,
-            "y": 723,
-            "z": 0
+            "z": 723,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 3041,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 5,
             "movement_range_y": 1,
             "x": 405,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -85,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 413,
-            "y": 727,
-            "z": 0
+            "z": 727,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -95,12 +103,14 @@
             "flag": 0,
             "script": 3043,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 433,
-            "y": 720,
-            "z": 0
+            "z": 720,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -109,12 +119,14 @@
             "flag": 0,
             "script": 3044,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 439,
-            "y": 724,
-            "z": 0
+            "z": 724,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -127,8 +139,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 419,
-            "y": 713,
-            "z": 0
+            "z": 713,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -141,8 +153,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 420,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -155,8 +167,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 420,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -165,12 +177,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 444,
-            "y": 724,
-            "z": 0
+            "z": 724,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -183,8 +197,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 439,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -193,12 +207,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 392,
-            "y": 723,
-            "z": 0
+            "z": 723,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -207,12 +223,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [26],
+            "data": [
+                26
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 435,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -221,12 +239,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [27],
+            "data": [
+                27
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 436,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -235,12 +255,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [28],
+            "data": [
+                28
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 437,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -249,12 +271,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [29],
+            "data": [
+                29
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 438,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -267,8 +291,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 416,
-            "y": 714,
-            "z": 0
+            "z": 714,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -281,8 +305,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 401,
-            "y": 705,
-            "z": 0
+            "z": 705,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -295,8 +319,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 399,
-            "y": 720,
-            "z": 0
+            "z": 720,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -309,8 +333,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 390,
-            "y": 717,
-            "z": 0
+            "z": 717,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -323,8 +347,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 391,
-            "y": 718,
-            "z": 0
+            "z": 718,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -337,8 +361,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 437,
-            "y": 733,
-            "z": 0
+            "z": 733,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -351,32 +375,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 434,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 447,
-            "y": 726,
+            "z": 726,
             "dest_header_id": 109,
             "dest_warp_id": 1
         },
         {
             "x": 447,
-            "y": 727,
+            "z": 727,
             "dest_header_id": 109,
             "dest_warp_id": 1
         },
         {
             "x": 441,
-            "y": 716,
+            "z": 716,
             "dest_header_id": 355,
             "dest_warp_id": 0
         },
         {
             "x": 392,
-            "y": 724,
+            "z": 724,
             "dest_header_id": 207,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0341.json b/res/field/events/events_0341.json
index 9cada824c3..8ae980fdb7 100644
--- a/res/field/events/events_0341.json
+++ b/res/field/events/events_0341.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 354,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0342.json b/res/field/events/events_0342.json
index e47f8c1d4d..8675711554 100644
--- a/res/field/events/events_0342.json
+++ b/res/field/events/events_0342.json
@@ -4,64 +4,64 @@
             "script": 8033,
             "type": 2,
             "x": 565,
-            "y": 694,
-            "z": 0,
+            "z": 694,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8032,
             "type": 2,
             "x": 522,
-            "y": 714,
-            "z": 0,
+            "z": 714,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 566,
-            "y": 713,
-            "z": 0,
+            "z": 713,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 566,
-            "y": 714,
-            "z": 0,
+            "z": 714,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 567,
-            "y": 714,
-            "z": 0,
+            "z": 714,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 567,
-            "y": 713,
-            "z": 0,
+            "z": 713,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8035,
             "type": 2,
             "x": 550,
-            "y": 710,
-            "z": 0,
+            "z": 710,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8153,
             "type": 2,
             "x": 539,
-            "y": 722,
-            "z": 0,
+            "z": 722,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -73,12 +73,14 @@
             "flag": 0,
             "script": 3045,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 522,
-            "y": 725,
-            "z": 0
+            "z": 725,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -87,12 +89,14 @@
             "flag": 0,
             "script": 3046,
             "initial_dir": 3,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 554,
-            "y": 711,
-            "z": 0
+            "z": 711,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -101,12 +105,14 @@
             "flag": 0,
             "script": 3047,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 690,
-            "z": 0
+            "z": 690,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -115,12 +121,14 @@
             "flag": 621,
             "script": 3048,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 8,
             "movement_range_y": 7,
             "x": 540,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -129,12 +137,14 @@
             "flag": 623,
             "script": 3307,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 5,
             "movement_range_y": 0,
             "x": 561,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -147,8 +157,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 552,
-            "y": 722,
-            "z": 0
+            "z": 722,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -157,12 +167,14 @@
             "flag": 0,
             "script": 3293,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 544,
-            "y": 720,
-            "z": 0
+            "z": 720,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -171,12 +183,14 @@
             "flag": 0,
             "script": 5054,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 561,
-            "y": 685,
-            "z": 0
+            "z": 685,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -185,12 +199,14 @@
             "flag": 0,
             "script": 3054,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 684,
-            "z": 0
+            "z": 684,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -199,12 +215,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 519,
-            "y": 724,
-            "z": 0
+            "z": 724,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -213,12 +231,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 678,
-            "z": 0
+            "z": 678,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -231,8 +251,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 573,
-            "y": 690,
-            "z": 0
+            "z": 690,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -245,8 +265,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 527,
-            "y": 708,
-            "z": 0
+            "z": 708,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -259,8 +279,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 557,
-            "y": 720,
-            "z": 0
+            "z": 720,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -273,8 +293,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 572,
-            "y": 692,
-            "z": 0
+            "z": 692,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -287,8 +307,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 548,
-            "y": 674,
-            "z": 0
+            "z": 674,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -301,8 +321,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 568,
-            "y": 726,
-            "z": 0
+            "z": 726,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -311,12 +331,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [30],
+            "data": [
+                30
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 530,
-            "y": 712,
-            "z": 0
+            "z": 712,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -325,12 +347,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [31],
+            "data": [
+                31
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 531,
-            "y": 712,
-            "z": 0
+            "z": 712,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -339,12 +363,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [32],
+            "data": [
+                32
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 566,
-            "y": 697,
-            "z": 0
+            "z": 697,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -353,12 +379,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [33],
+            "data": [
+                33
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 567,
-            "y": 697,
-            "z": 0
+            "z": 697,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -371,8 +399,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 570,
-            "y": 685,
-            "z": 0
+            "z": 685,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -381,12 +409,14 @@
             "flag": 0,
             "script": 5293,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 545,
-            "y": 720,
-            "z": 0
+            "z": 720,
+            "y": 0
         },
         {
             "local_id": 4,
@@ -396,12 +426,14 @@
             "flag": 433,
             "script": 65535,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 564,
-            "y": 667,
-            "z": 0
+            "z": 667,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -414,8 +446,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 540,
-            "y": 712,
-            "z": 0
+            "z": 712,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -428,8 +460,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 541,
-            "y": 712,
-            "z": 0
+            "z": 712,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -442,8 +474,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 565,
-            "y": 702,
-            "z": 0
+            "z": 702,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -456,8 +488,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 565,
-            "y": 700,
-            "z": 0
+            "z": 700,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -470,8 +502,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 532,
-            "y": 727,
-            "z": 0
+            "z": 727,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -480,12 +512,14 @@
             "flag": 620,
             "script": 6,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 8,
             "movement_range_y": 7,
             "x": 540,
-            "y": 716,
-            "z": 0
+            "z": 716,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -494,12 +528,14 @@
             "flag": 622,
             "script": 7,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 5,
             "movement_range_y": 0,
             "x": 561,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -512,8 +548,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 564,
-            "y": 709,
-            "z": 0
+            "z": 709,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -526,26 +562,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 556,
-            "y": 703,
-            "z": 0
+            "z": 703,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 512,
-            "y": 726,
+            "z": 726,
             "dest_header_id": 110,
             "dest_warp_id": 1
         },
         {
             "x": 512,
-            "y": 727,
+            "z": 727,
             "dest_header_id": 110,
             "dest_warp_id": 1
         },
         {
             "x": 568,
-            "y": 680,
+            "z": 680,
             "dest_header_id": 357,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0343.json b/res/field/events/events_0343.json
index c783fb5b19..4b9008d138 100644
--- a/res/field/events/events_0343.json
+++ b/res/field/events/events_0343.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 356,
             "dest_warp_id": 2
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 358,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0344.json b/res/field/events/events_0344.json
index 8b555671ce..dbdf9d6c96 100644
--- a/res/field/events/events_0344.json
+++ b/res/field/events/events_0344.json
@@ -4,8 +4,8 @@
             "script": 8187,
             "type": 2,
             "x": 10,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -31,24 +31,26 @@
             "flag": 0,
             "script": 3531,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 357,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 359,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0345.json b/res/field/events/events_0345.json
index 5d134c908d..c4dd77d7b4 100644
--- a/res/field/events/events_0345.json
+++ b/res/field/events/events_0345.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -22,12 +22,14 @@
             "flag": 0,
             "script": 3529,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -36,24 +38,26 @@
             "flag": 0,
             "script": 3528,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 358,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 360,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0346.json b/res/field/events/events_0346.json
index 71d6938f3d..54329fd0af 100644
--- a/res/field/events/events_0346.json
+++ b/res/field/events/events_0346.json
@@ -4,8 +4,8 @@
             "script": 8188,
             "type": 2,
             "x": 2,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -31,12 +31,14 @@
             "flag": 0,
             "script": 3530,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -45,12 +47,14 @@
             "flag": 0,
             "script": 3533,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -59,12 +63,14 @@
             "flag": 0,
             "script": 5533,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 41,
@@ -73,12 +79,14 @@
             "flag": 0,
             "script": 3532,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -87,24 +95,26 @@
             "flag": 0,
             "script": 5532,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 359,
             "dest_warp_id": 1
         },
         {
             "x": 4,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 361,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0347.json b/res/field/events/events_0347.json
index 753a7af90c..d130282edb 100644
--- a/res/field/events/events_0347.json
+++ b/res/field/events/events_0347.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 165,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 360,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0348.json b/res/field/events/events_0348.json
index d6a83ea4cb..821bf20bc7 100644
--- a/res/field/events/events_0348.json
+++ b/res/field/events/events_0348.json
@@ -4,40 +4,40 @@
             "script": 8039,
             "type": 2,
             "x": 549,
-            "y": 573,
-            "z": 0,
+            "z": 573,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8149,
             "type": 2,
             "x": 555,
-            "y": 562,
-            "z": 0,
+            "z": 562,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8154,
             "type": 2,
             "x": 565,
-            "y": 607,
-            "z": 0,
+            "z": 607,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8189,
             "type": 2,
             "x": 566,
-            "y": 571,
-            "z": 0,
+            "z": 571,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8202,
             "type": 2,
             "x": 573,
-            "y": 561,
-            "z": 0,
+            "z": 561,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -49,12 +49,14 @@
             "flag": 0,
             "script": 3487,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 562,
-            "y": 570,
-            "z": 0
+            "z": 570,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -63,12 +65,14 @@
             "flag": 0,
             "script": 3488,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 550,
-            "y": 571,
-            "z": 0
+            "z": 571,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -77,12 +81,14 @@
             "flag": 0,
             "script": 5064,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 558,
-            "y": 609,
-            "z": 0
+            "z": 609,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -91,12 +97,14 @@
             "flag": 0,
             "script": 3064,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 557,
-            "y": 609,
-            "z": 0
+            "z": 609,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -105,12 +113,14 @@
             "flag": 0,
             "script": 3489,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 572,
-            "y": 562,
-            "z": 0
+            "z": 562,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -119,12 +129,14 @@
             "flag": 625,
             "script": 3305,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 571,
-            "y": 624,
-            "z": 0
+            "z": 624,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -133,12 +145,14 @@
             "flag": 0,
             "script": 3055,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 554,
-            "y": 604,
-            "z": 0
+            "z": 604,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -147,12 +161,14 @@
             "flag": 0,
             "script": 3056,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 601,
-            "z": 0
+            "z": 601,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -161,12 +177,14 @@
             "flag": 0,
             "script": 5289,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 616,
-            "z": 0
+            "z": 616,
+            "y": 0
         },
         {
             "graphics_id": 41,
@@ -175,12 +193,14 @@
             "flag": 0,
             "script": 3289,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 615,
-            "z": 0
+            "z": 615,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -189,12 +209,14 @@
             "flag": 0,
             "script": 5,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 631,
-            "z": 0
+            "z": 631,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -207,8 +229,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 546,
-            "y": 578,
-            "z": 0
+            "z": 578,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -221,8 +243,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 554,
-            "y": 598,
-            "z": 0
+            "z": 598,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -235,8 +257,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 564,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -249,8 +271,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 575,
-            "y": 546,
-            "z": 0
+            "z": 546,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -259,12 +281,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [38],
+            "data": [
+                38
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -273,12 +297,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [39],
+            "data": [
+                39
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 571,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -287,12 +313,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [40],
+            "data": [
+                40
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 572,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -301,12 +329,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [41],
+            "data": [
+                41
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 573,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -315,12 +345,14 @@
             "flag": 432,
             "script": 1,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 587,
-            "z": 0
+            "z": 587,
+            "y": 0
         },
         {
             "graphics_id": 138,
@@ -329,12 +361,14 @@
             "flag": 433,
             "script": 0,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 580,
-            "z": 0
+            "z": 580,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -347,8 +381,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 566,
-            "y": 612,
-            "z": 0
+            "z": 612,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -361,8 +395,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 562,
-            "y": 565,
-            "z": 0
+            "z": 565,
+            "y": 0
         },
         {
             "local_id": 5,
@@ -376,8 +410,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 556,
-            "y": 645,
-            "z": 0
+            "z": 645,
+            "y": 0
         },
         {
             "graphics_id": 41,
@@ -386,12 +420,14 @@
             "flag": 0,
             "script": 3291,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 555,
-            "y": 627,
-            "z": 0
+            "z": 627,
+            "y": 0
         },
         {
             "local_id": 8,
@@ -401,12 +437,14 @@
             "flag": 382,
             "script": 65535,
             "initial_dir": 0,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 580,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -415,12 +453,14 @@
             "flag": 432,
             "script": 1,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 587,
-            "z": 0
+            "z": 587,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -429,12 +469,14 @@
             "flag": 432,
             "script": 1,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 585,
-            "z": 0
+            "z": 585,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -443,12 +485,14 @@
             "flag": 432,
             "script": 1,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 586,
-            "z": 0
+            "z": 586,
+            "y": 0
         },
         {
             "local_id": 23,
@@ -462,8 +506,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 535,
-            "z": 0
+            "z": 535,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -472,18 +516,20 @@
             "flag": 624,
             "script": 6,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 571,
-            "y": 624,
-            "z": 0
+            "z": 624,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 566,
-            "y": 591,
+            "z": 591,
             "dest_header_id": 492,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0349.json b/res/field/events/events_0349.json
index 8604b97b05..f6e7228814 100644
--- a/res/field/events/events_0349.json
+++ b/res/field/events/events_0349.json
@@ -4,16 +4,16 @@
             "script": 8045,
             "type": 2,
             "x": 547,
-            "y": 525,
-            "z": 0,
+            "z": 525,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8044,
             "type": 2,
             "x": 526,
-            "y": 519,
-            "z": 0,
+            "z": 519,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3065,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 534,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3066,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 547,
-            "y": 534,
-            "z": 0
+            "z": 534,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3069,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 564,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 3070,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 525,
-            "y": 534,
-            "z": 0
+            "z": 534,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -81,12 +89,14 @@
             "flag": 0,
             "script": 3071,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 499,
-            "y": 521,
-            "z": 0
+            "z": 521,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -95,12 +105,14 @@
             "flag": 0,
             "script": 3072,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -109,12 +121,14 @@
             "flag": 0,
             "script": 3073,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 511,
-            "y": 533,
-            "z": 0
+            "z": 533,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -127,8 +141,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 537,
-            "y": 528,
-            "z": 8
+            "z": 528,
+            "y": 8
         },
         {
             "graphics_id": 14,
@@ -137,12 +151,14 @@
             "flag": 0,
             "script": 5074,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 3,
             "movement_range_y": 1,
             "x": 537,
-            "y": 529,
-            "z": 8
+            "z": 529,
+            "y": 8
         },
         {
             "graphics_id": 17,
@@ -151,12 +167,14 @@
             "flag": 0,
             "script": 3067,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 494,
-            "y": 528,
-            "z": 0
+            "z": 528,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -165,12 +183,15 @@
             "flag": 0,
             "script": 3068,
             "initial_dir": 3,
-            "data": [4, 2],
+            "data": [
+                4,
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 518,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -179,12 +200,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 488,
-            "y": 529,
-            "z": 0
+            "z": 529,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -197,8 +220,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 562,
-            "y": 516,
-            "z": 0
+            "z": 516,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -211,8 +234,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 497,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -225,8 +248,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 559,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -239,8 +262,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 527,
-            "y": 535,
-            "z": 0
+            "z": 535,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -253,8 +276,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 497,
-            "y": 533,
-            "z": 0
+            "z": 533,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -267,8 +290,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 493,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -277,12 +300,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [42],
+            "data": [
+                42
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 492,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -291,12 +316,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [43],
+            "data": [
+                43
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 493,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -305,12 +332,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [44],
+            "data": [
+                44
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 494,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -319,12 +348,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [45],
+            "data": [
+                45
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 495,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -337,8 +368,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 498,
-            "y": 541,
-            "z": 0
+            "z": 541,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -351,8 +382,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 535,
-            "z": 0
+            "z": 535,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -365,8 +396,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 562,
-            "y": 526,
-            "z": 0
+            "z": 526,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -379,14 +410,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 551,
-            "y": 536,
-            "z": 0
+            "z": 536,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 564,
-            "y": 516,
+            "z": 516,
             "dest_header_id": 364,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0350.json b/res/field/events/events_0350.json
index 5bc967e932..c43689ed4b 100644
--- a/res/field/events/events_0350.json
+++ b/res/field/events/events_0350.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 363,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0351.json b/res/field/events/events_0351.json
index 3dd62acc0a..d643291774 100644
--- a/res/field/events/events_0351.json
+++ b/res/field/events/events_0351.json
@@ -4,16 +4,16 @@
             "script": 8003,
             "type": 2,
             "x": 355,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8228,
             "type": 2,
             "x": 347,
-            "y": 517,
-            "z": 0,
+            "z": 517,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3075,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 367,
-            "y": 523,
-            "z": 0
+            "z": 523,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3325,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 377,
-            "y": 529,
-            "z": 0
+            "z": 529,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3077,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 361,
-            "y": 525,
-            "z": 0
+            "z": 525,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 379,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -85,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 379,
-            "y": 527,
-            "z": 0
+            "z": 527,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -99,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 368,
-            "y": 535,
-            "z": 0
+            "z": 535,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -110,12 +118,14 @@
             "flag": 65,
             "script": 65535,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 344,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -124,18 +134,20 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 353,
-            "y": 531,
-            "z": 0
+            "z": 531,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 380,
-            "y": 532,
+            "z": 532,
             "dest_header_id": 218,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0352.json b/res/field/events/events_0352.json
index afdd5c0eae..8bb5aa0357 100644
--- a/res/field/events/events_0352.json
+++ b/res/field/events/events_0352.json
@@ -4,8 +4,8 @@
             "script": 8060,
             "type": 2,
             "x": 431,
-            "y": 514,
-            "z": 0,
+            "z": 514,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 0,
             "script": 3080,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 432,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -31,12 +33,14 @@
             "flag": 0,
             "script": 3079,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 425,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -45,12 +49,14 @@
             "flag": 0,
             "script": 3078,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 9,
             "movement_range_y": 0,
             "x": 428,
-            "y": 540,
-            "z": 0
+            "z": 540,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -63,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 423,
-            "y": 533,
-            "z": 0
+            "z": 533,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -77,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 438,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -91,8 +97,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 431,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -105,8 +111,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 429,
-            "y": 519,
-            "z": 0
+            "z": 519,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -119,8 +125,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 435,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -133,8 +139,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 430,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 84,
@@ -147,8 +153,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 427,
-            "y": 526,
-            "z": 0
+            "z": 526,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -161,8 +167,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 426,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -171,12 +177,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 420,
-            "y": 526,
-            "z": 0
+            "z": 526,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -189,8 +197,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 424,
-            "y": 514,
-            "z": 0
+            "z": 514,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -199,12 +207,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [46],
+            "data": [
+                46
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 435,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -213,12 +223,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [47],
+            "data": [
+                47
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 436,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -227,12 +239,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [48],
+            "data": [
+                48
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 437,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -241,12 +255,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [49],
+            "data": [
+                49
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 438,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -259,8 +275,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 430,
-            "y": 529,
-            "z": 0
+            "z": 529,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -273,8 +289,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 438,
-            "y": 520,
-            "z": 0
+            "z": 520,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -283,12 +299,14 @@
             "flag": 0,
             "script": 3441,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 429,
-            "y": 525,
-            "z": 0
+            "z": 525,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -297,12 +315,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 440,
-            "y": 526,
-            "z": 0
+            "z": 526,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -315,14 +335,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 433,
-            "y": 535,
-            "z": 0
+            "z": 535,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 419,
-            "y": 527,
+            "z": 527,
             "dest_header_id": 218,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0353.json b/res/field/events/events_0353.json
index 44d261d967..1eb07f282c 100644
--- a/res/field/events/events_0353.json
+++ b/res/field/events/events_0353.json
@@ -4,16 +4,16 @@
             "script": 8018,
             "type": 2,
             "x": 475,
-            "y": 803,
-            "z": 0,
+            "z": 803,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8017,
             "type": 2,
             "x": 467,
-            "y": 779,
-            "z": 0,
+            "z": 779,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3081,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 472,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3082,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 474,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3083,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 455,
-            "y": 796,
-            "z": 0
+            "z": 796,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 3084,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 458,
-            "y": 796,
-            "z": 0
+            "z": 796,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -81,12 +89,14 @@
             "flag": 609,
             "script": 3087,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 458,
-            "y": 759,
-            "z": 0
+            "z": 759,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -95,12 +105,14 @@
             "flag": 611,
             "script": 3088,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 3,
             "movement_range_y": 4,
             "x": 458,
-            "y": 777,
-            "z": 0
+            "z": 777,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -109,12 +121,15 @@
             "flag": 613,
             "script": 3089,
             "initial_dir": 1,
-            "data": [2, 1],
+            "data": [
+                2,
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 6,
             "x": 460,
-            "y": 787,
-            "z": 0
+            "z": 787,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -123,12 +138,14 @@
             "flag": 615,
             "script": 3101,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 9,
             "movement_range_y": 0,
             "x": 466,
-            "y": 797,
-            "z": 0
+            "z": 797,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -137,12 +154,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 455,
-            "y": 744,
-            "z": 0
+            "z": 744,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -155,8 +174,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 468,
-            "y": 803,
-            "z": 0
+            "z": 803,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -169,8 +188,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 459,
-            "y": 822,
-            "z": 0
+            "z": 822,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -183,8 +202,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 454,
-            "y": 807,
-            "z": 0
+            "z": 807,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -197,8 +216,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 456,
-            "y": 791,
-            "z": 0
+            "z": 791,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -211,8 +230,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 450,
-            "y": 777,
-            "z": 0
+            "z": 777,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -221,12 +240,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [51],
+            "data": [
+                51
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 460,
-            "y": 797,
-            "z": 0
+            "z": 797,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -235,12 +256,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [50],
+            "data": [
+                50
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 461,
-            "y": 797,
-            "z": 0
+            "z": 797,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -249,12 +272,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [53],
+            "data": [
+                53
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 448,
-            "y": 817,
-            "z": 0
+            "z": 817,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -263,12 +288,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [52],
+            "data": [
+                52
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 449,
-            "y": 817,
-            "z": 0
+            "z": 817,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -281,8 +308,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 459,
-            "y": 821,
-            "z": 0
+            "z": 821,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -295,8 +322,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 456,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -309,8 +336,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 461,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -323,8 +350,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 464,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -337,8 +364,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 461,
-            "y": 805,
-            "z": 0
+            "z": 805,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -351,8 +378,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 454,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -361,12 +388,14 @@
             "flag": 608,
             "script": 6,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 458,
-            "y": 759,
-            "z": 0
+            "z": 759,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -375,12 +404,14 @@
             "flag": 610,
             "script": 7,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 3,
             "movement_range_y": 4,
             "x": 458,
-            "y": 777,
-            "z": 0
+            "z": 777,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -389,12 +420,15 @@
             "flag": 612,
             "script": 8,
             "initial_dir": 1,
-            "data": [2, 1],
+            "data": [
+                2,
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 6,
             "x": 460,
-            "y": 787,
-            "z": 0
+            "z": 787,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -403,12 +437,14 @@
             "flag": 614,
             "script": 9,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 9,
             "movement_range_y": 0,
             "x": 466,
-            "y": 797,
-            "z": 0
+            "z": 797,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -421,8 +457,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 476,
-            "y": 768,
-            "z": 0
+            "z": 768,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -435,26 +471,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 461,
-            "y": 766,
-            "z": 0
+            "z": 766,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 458,
-            "y": 736,
+            "z": 736,
             "dest_header_id": 111,
             "dest_warp_id": 1
         },
         {
             "x": 459,
-            "y": 736,
+            "z": 736,
             "dest_header_id": 111,
             "dest_warp_id": 1
         },
         {
             "x": 470,
-            "y": 772,
+            "z": 772,
             "dest_header_id": 368,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0354.json b/res/field/events/events_0354.json
index f164e9dc3e..8b63894348 100644
--- a/res/field/events/events_0354.json
+++ b/res/field/events/events_0354.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 49,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 34,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 56,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -96,44 +96,44 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 42,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 33,
-            "y": 16,
+            "z": 16,
             "dest_header_id": 367,
             "dest_warp_id": 2
         },
         {
             "x": 5,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 369,
             "dest_warp_id": 1
         },
         {
             "x": 13,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 369,
             "dest_warp_id": 2
         },
         {
             "x": 21,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 369,
             "dest_warp_id": 0
         },
         {
             "x": 48,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 370,
             "dest_warp_id": 0
         },
         {
             "x": 33,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 287,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0355.json b/res/field/events/events_0355.json
index 6739264af5..6e52c8c217 100644
--- a/res/field/events/events_0355.json
+++ b/res/field/events/events_0355.json
@@ -4,56 +4,56 @@
             "script": 8163,
             "type": 2,
             "x": 23,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 6,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 6,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 14,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 14,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 22,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 22,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -69,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -83,8 +83,8 @@
             "movement_range_x": 2,
             "movement_range_y": 2,
             "x": 11,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -97,26 +97,26 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 20,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 368,
             "dest_warp_id": 3
         },
         {
             "x": 4,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 368,
             "dest_warp_id": 1
         },
         {
             "x": 12,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 368,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0356.json b/res/field/events/events_0356.json
index 34b5fbfcb8..ff30251ee3 100644
--- a/res/field/events/events_0356.json
+++ b/res/field/events/events_0356.json
@@ -4,16 +4,16 @@
             "script": 6,
             "type": 0,
             "x": 16,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 16,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 82,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -71,14 +71,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 368,
             "dest_warp_id": 4
         }
@@ -87,12 +87,12 @@
         {
             "script": 5,
             "x": 16,
-            "y": 4,
+            "z": 4,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16662
+            "var": 16662,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0357.json b/res/field/events/events_0357.json
index 832f9667e6..d09c54100b 100644
--- a/res/field/events/events_0357.json
+++ b/res/field/events/events_0357.json
@@ -4,64 +4,64 @@
             "script": 8019,
             "type": 2,
             "x": 493,
-            "y": 858,
-            "z": 0,
+            "z": 858,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8026,
             "type": 2,
             "x": 561,
-            "y": 835,
-            "z": 0,
+            "z": 835,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8025,
             "type": 2,
             "x": 534,
-            "y": 851,
-            "z": 0,
+            "z": 851,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8021,
             "type": 2,
             "x": 533,
-            "y": 857,
-            "z": 0,
+            "z": 857,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8024,
             "type": 2,
             "x": 571,
-            "y": 839,
-            "z": 0,
+            "z": 839,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8023,
             "type": 2,
             "x": 527,
-            "y": 847,
-            "z": 0,
+            "z": 847,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8022,
             "type": 2,
             "x": 570,
-            "y": 835,
-            "z": 0,
+            "z": 835,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8020,
             "type": 2,
             "x": 471,
-            "y": 856,
-            "z": 0,
+            "z": 856,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 507,
-            "y": 851,
-            "z": 0
+            "z": 851,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 500,
-            "y": 847,
-            "z": 0
+            "z": 847,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 499,
-            "y": 856,
-            "z": 0
+            "z": 856,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -115,12 +115,14 @@
             "flag": 0,
             "script": 3093,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 551,
-            "y": 855,
-            "z": 0
+            "z": 855,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -129,12 +131,14 @@
             "flag": 0,
             "script": 3095,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 457,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -143,12 +147,14 @@
             "flag": 0,
             "script": 3094,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 457,
-            "y": 845,
-            "z": 0
+            "z": 845,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -157,12 +163,14 @@
             "flag": 617,
             "script": 3331,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 474,
-            "y": 838,
-            "z": 0
+            "z": 838,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -171,12 +179,14 @@
             "flag": 0,
             "script": 3098,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 458,
-            "y": 856,
-            "z": 0
+            "z": 856,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -185,12 +195,14 @@
             "flag": 0,
             "script": 3380,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 492,
-            "y": 853,
-            "z": 0
+            "z": 853,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -199,12 +211,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 845,
-            "z": 0
+            "z": 845,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -217,8 +231,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 516,
-            "y": 847,
-            "z": 0
+            "z": 847,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -231,8 +245,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 463,
-            "y": 848,
-            "z": 0
+            "z": 848,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -245,8 +259,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 496,
-            "y": 840,
-            "z": 0
+            "z": 840,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -259,8 +273,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 496,
-            "y": 841,
-            "z": 0
+            "z": 841,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -273,8 +287,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 525,
-            "y": 836,
-            "z": 0
+            "z": 836,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -287,8 +301,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 533,
-            "y": 837,
-            "z": 0
+            "z": 837,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -301,8 +315,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 536,
-            "y": 838,
-            "z": 0
+            "z": 838,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -315,8 +329,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 549,
-            "y": 839,
-            "z": 0
+            "z": 839,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -329,8 +343,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 859,
-            "z": 0
+            "z": 859,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -343,8 +357,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 859,
-            "z": 0
+            "z": 859,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -357,8 +371,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 455,
-            "y": 860,
-            "z": 0
+            "z": 860,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -371,8 +385,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 475,
-            "y": 852,
-            "z": 0
+            "z": 852,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -385,8 +399,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 507,
-            "y": 846,
-            "z": 0
+            "z": 846,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -399,8 +413,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 522,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -413,8 +427,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 545,
-            "y": 835,
-            "z": 0
+            "z": 835,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -427,8 +441,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 547,
-            "y": 862,
-            "z": 0
+            "z": 862,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -441,8 +455,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 558,
-            "y": 844,
-            "z": 0
+            "z": 844,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -451,12 +465,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [54],
+            "data": [
+                54
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 559,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -465,12 +481,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [55],
+            "data": [
+                55
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 560,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -479,12 +497,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [56],
+            "data": [
+                56
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 561,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -493,12 +513,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [57],
+            "data": [
+                57
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 562,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -507,12 +529,14 @@
             "flag": 0,
             "script": 3485,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 541,
-            "y": 839,
-            "z": 0
+            "z": 839,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -521,12 +545,14 @@
             "flag": 0,
             "script": 3326,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 520,
-            "y": 848,
-            "z": 0
+            "z": 848,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -535,12 +561,14 @@
             "flag": 0,
             "script": 3327,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 528,
-            "y": 837,
-            "z": 0
+            "z": 837,
+            "y": 0
         },
         {
             "local_id": 19,
@@ -554,8 +582,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 456,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "local_id": 20,
@@ -569,8 +597,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 462,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "local_id": 21,
@@ -584,8 +612,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 464,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -598,8 +626,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 494,
-            "y": 844,
-            "z": 0
+            "z": 844,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -612,8 +640,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 543,
-            "y": 851,
-            "z": 0
+            "z": 851,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -626,8 +654,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 570,
-            "y": 852,
-            "z": 0
+            "z": 852,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -636,12 +664,14 @@
             "flag": 616,
             "script": 6,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 474,
-            "y": 838,
-            "z": 0
+            "z": 838,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -654,8 +684,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 523,
-            "y": 850,
-            "z": 0
+            "z": 850,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -668,8 +698,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 531,
-            "y": 849,
-            "z": 0
+            "z": 849,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -682,14 +712,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 452,
-            "y": 840,
-            "z": 0
+            "z": 840,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 517,
-            "y": 846,
+            "z": 846,
             "dest_header_id": 372,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0358.json b/res/field/events/events_0358.json
index 396e50ba05..2702ccca49 100644
--- a/res/field/events/events_0358.json
+++ b/res/field/events/events_0358.json
@@ -4,16 +4,16 @@
             "script": 4,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 2051,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -57,14 +57,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 371,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0359.json b/res/field/events/events_0359.json
index 53cdc9a453..06ec045f93 100644
--- a/res/field/events/events_0359.json
+++ b/res/field/events/events_0359.json
@@ -4,96 +4,96 @@
             "script": 8030,
             "type": 2,
             "x": 691,
-            "y": 819,
-            "z": 0,
+            "z": 819,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8029,
             "type": 2,
             "x": 722,
-            "y": 856,
-            "z": 0,
+            "z": 856,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8028,
             "type": 2,
             "x": 667,
-            "y": 841,
-            "z": 0,
+            "z": 841,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8152,
             "type": 2,
             "x": 650,
-            "y": 825,
-            "z": 0,
+            "z": 825,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8164,
             "type": 2,
             "x": 678,
-            "y": 834,
-            "z": 0,
+            "z": 834,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8165,
             "type": 2,
             "x": 702,
-            "y": 830,
-            "z": 0,
+            "z": 830,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8166,
             "type": 2,
             "x": 692,
-            "y": 801,
-            "z": 0,
+            "z": 801,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8184,
             "type": 2,
             "x": 714,
-            "y": 831,
-            "z": 0,
+            "z": 831,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8185,
             "type": 2,
             "x": 683,
-            "y": 856,
-            "z": 0,
+            "z": 856,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8186,
             "type": 2,
             "x": 661,
-            "y": 845,
-            "z": 0,
+            "z": 845,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8216,
             "type": 2,
             "x": 705,
-            "y": 812,
-            "z": 0,
+            "z": 812,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8258,
             "type": 2,
             "x": 712,
-            "y": 826,
-            "z": 0,
+            "z": 826,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -105,12 +105,14 @@
             "flag": 0,
             "script": 3102,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 8,
             "movement_range_y": 1,
             "x": 691,
-            "y": 858,
-            "z": 0
+            "z": 858,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -119,12 +121,14 @@
             "flag": 0,
             "script": 3103,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 725,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -133,12 +137,14 @@
             "flag": 0,
             "script": 3105,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 730,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -147,12 +153,15 @@
             "flag": 0,
             "script": 3104,
             "initial_dir": 3,
-            "data": [2, 1],
+            "data": [
+                2,
+                1
+            ],
             "movement_range_x": 5,
             "movement_range_y": 0,
             "x": 702,
-            "y": 851,
-            "z": 0
+            "z": 851,
+            "y": 0
         },
         {
             "graphics_id": 49,
@@ -161,12 +170,14 @@
             "flag": 0,
             "script": 3106,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 9,
             "movement_range_y": 0,
             "x": 703,
-            "y": 832,
-            "z": 0
+            "z": 832,
+            "y": 0
         },
         {
             "graphics_id": 48,
@@ -175,12 +186,14 @@
             "flag": 0,
             "script": 3107,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 704,
-            "y": 827,
-            "z": 0
+            "z": 827,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -189,12 +202,14 @@
             "flag": 0,
             "script": 3345,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 668,
-            "y": 827,
-            "z": 0
+            "z": 827,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -207,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 665,
-            "y": 845,
-            "z": 0
+            "z": 845,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -217,12 +232,14 @@
             "flag": 0,
             "script": 3109,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 717,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -235,8 +252,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 655,
-            "y": 828,
-            "z": 0
+            "z": 828,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -249,8 +266,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 677,
-            "y": 827,
-            "z": 0
+            "z": 827,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -263,8 +280,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 665,
-            "y": 839,
-            "z": 0
+            "z": 839,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -277,8 +294,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 669,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -291,8 +308,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 662,
-            "y": 843,
-            "z": 0
+            "z": 843,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -305,8 +322,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 663,
-            "y": 844,
-            "z": 0
+            "z": 844,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -315,12 +332,14 @@
             "flag": 0,
             "script": 6,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 651,
-            "y": 810,
-            "z": 0
+            "z": 810,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -333,8 +352,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 665,
-            "y": 835,
-            "z": 0
+            "z": 835,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -347,8 +366,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 704,
-            "y": 819,
-            "z": 0
+            "z": 819,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -357,12 +376,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [62],
+            "data": [
+                62
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 656,
-            "y": 808,
-            "z": 0
+            "z": 808,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -371,12 +392,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [64],
+            "data": [
+                64
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 808,
-            "z": 0
+            "z": 808,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -385,12 +408,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [65],
+            "data": [
+                65
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 658,
-            "y": 808,
-            "z": 0
+            "z": 808,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -399,12 +424,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [63],
+            "data": [
+                63
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 659,
-            "y": 808,
-            "z": 0
+            "z": 808,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -417,8 +444,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 677,
-            "y": 831,
-            "z": 0
+            "z": 831,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -431,8 +458,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 700,
-            "y": 818,
-            "z": 0
+            "z": 818,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -445,8 +472,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 686,
-            "y": 851,
-            "z": 0
+            "z": 851,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -459,8 +486,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 726,
-            "y": 837,
-            "z": 0
+            "z": 837,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -473,8 +500,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 689,
-            "y": 826,
-            "z": 0
+            "z": 826,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -487,8 +514,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 690,
-            "y": 811,
-            "z": 0
+            "z": 811,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -501,8 +528,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 717,
-            "y": 813,
-            "z": 0
+            "z": 813,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -515,8 +542,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 677,
-            "y": 837,
-            "z": 0
+            "z": 837,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -529,8 +556,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 683,
-            "y": 833,
-            "z": 0
+            "z": 833,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -543,8 +570,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 694,
-            "y": 804,
-            "z": 0
+            "z": 804,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -557,8 +584,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 677,
-            "y": 823,
-            "z": 0
+            "z": 823,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -571,56 +598,56 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 671,
-            "y": 835,
-            "z": 0
+            "z": 835,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 646,
-            "y": 812,
+            "z": 812,
             "dest_header_id": 374,
             "dest_warp_id": 0
         },
         {
             "x": 646,
-            "y": 813,
+            "z": 813,
             "dest_header_id": 374,
             "dest_warp_id": 0
         },
         {
             "x": 663,
-            "y": 834,
+            "z": 834,
             "dest_header_id": 375,
             "dest_warp_id": 0
         },
         {
             "x": 706,
-            "y": 818,
+            "z": 818,
             "dest_header_id": 376,
             "dest_warp_id": 1
         },
         {
             "x": 706,
-            "y": 813,
+            "z": 813,
             "dest_header_id": 376,
             "dest_warp_id": 0
         },
         {
             "x": 710,
-            "y": 810,
+            "z": 810,
             "dest_header_id": 377,
             "dest_warp_id": 0
         },
         {
             "x": 701,
-            "y": 805,
+            "z": 805,
             "dest_header_id": 378,
             "dest_warp_id": 0
         },
         {
             "x": 712,
-            "y": 805,
+            "z": 805,
             "dest_header_id": 379,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0360.json b/res/field/events/events_0360.json
index 04271bb0a3..c0bc494df8 100644
--- a/res/field/events/events_0360.json
+++ b/res/field/events/events_0360.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -26,20 +26,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 373,
             "dest_warp_id": 0
         },
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 120,
             "dest_warp_id": 10
         }
diff --git a/res/field/events/events_0361.json b/res/field/events/events_0361.json
index 7b67c80569..1b1291f7f0 100644
--- a/res/field/events/events_0361.json
+++ b/res/field/events/events_0361.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 373,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0362.json b/res/field/events/events_0362.json
index cfd544e630..c6fd789c29 100644
--- a/res/field/events/events_0362.json
+++ b/res/field/events/events_0362.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -40,20 +40,20 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 373,
             "dest_warp_id": 4
         },
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 373,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0363.json b/res/field/events/events_0363.json
index 95dd07065d..30b4f3e977 100644
--- a/res/field/events/events_0363.json
+++ b/res/field/events/events_0363.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 373,
             "dest_warp_id": 5
         }
diff --git a/res/field/events/events_0364.json b/res/field/events/events_0364.json
index f9b9bfe423..01f5660125 100644
--- a/res/field/events/events_0364.json
+++ b/res/field/events/events_0364.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -40,14 +40,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 373,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0365.json b/res/field/events/events_0365.json
index d048474dd4..94186891e2 100644
--- a/res/field/events/events_0365.json
+++ b/res/field/events/events_0365.json
@@ -4,8 +4,8 @@
             "script": 8174,
             "type": 2,
             "x": 9,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -35,14 +35,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 373,
             "dest_warp_id": 7
         }
diff --git a/res/field/events/events_0366.json b/res/field/events/events_0366.json
index 4b3b7f1d3c..7464d5dddf 100644
--- a/res/field/events/events_0366.json
+++ b/res/field/events/events_0366.json
@@ -4,24 +4,24 @@
             "script": 8043,
             "type": 2,
             "x": 724,
-            "y": 695,
-            "z": 0,
+            "z": 695,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8042,
             "type": 2,
             "x": 734,
-            "y": 681,
-            "z": 0,
+            "z": 681,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8168,
             "type": 2,
             "x": 722,
-            "y": 704,
-            "z": 0,
+            "z": 704,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -33,12 +33,14 @@
             "flag": 0,
             "script": 3120,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 726,
-            "y": 676,
-            "z": 0
+            "z": 676,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -47,12 +49,14 @@
             "flag": 0,
             "script": 3271,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 731,
-            "y": 719,
-            "z": 0
+            "z": 719,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -61,12 +65,15 @@
             "flag": 0,
             "script": 3272,
             "initial_dir": 0,
-            "data": [2, 6],
+            "data": [
+                2,
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 6,
             "x": 729,
-            "y": 685,
-            "z": 0
+            "z": 685,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -75,12 +82,14 @@
             "flag": 0,
             "script": 3112,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 714,
-            "y": 691,
-            "z": 0
+            "z": 691,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -89,12 +98,14 @@
             "flag": 0,
             "script": 3113,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 721,
-            "y": 709,
-            "z": 0
+            "z": 709,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -103,12 +114,14 @@
             "flag": 0,
             "script": 3381,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 719,
-            "y": 701,
-            "z": 0
+            "z": 701,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -117,12 +130,14 @@
             "flag": 0,
             "script": 3490,
             "initial_dir": 3,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 731,
-            "y": 688,
-            "z": 0
+            "z": 688,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -131,12 +146,15 @@
             "flag": 0,
             "script": 3118,
             "initial_dir": 1,
-            "data": [1, 2],
+            "data": [
+                1,
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 4,
             "x": 731,
-            "y": 694,
-            "z": 0
+            "z": 694,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -145,12 +163,14 @@
             "flag": 0,
             "script": 3119,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 721,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -163,8 +183,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 712,
-            "y": 681,
-            "z": 0
+            "z": 681,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -177,8 +197,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 682,
-            "z": 0
+            "z": 682,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -187,12 +207,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 716,
-            "y": 656,
-            "z": 0
+            "z": 656,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -201,12 +223,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 726,
-            "y": 717,
-            "z": 0
+            "z": 717,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -215,12 +239,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [66],
+            "data": [
+                66
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 728,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -229,12 +255,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [67],
+            "data": [
+                67
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 729,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -243,12 +271,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [68],
+            "data": [
+                68
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 730,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -257,12 +287,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [69],
+            "data": [
+                69
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 731,
-            "y": 660,
-            "z": 0
+            "z": 660,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -275,8 +307,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 731,
-            "y": 648,
-            "z": 0
+            "z": 648,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -289,8 +321,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 725,
-            "y": 678,
-            "z": 0
+            "z": 678,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -303,8 +335,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 722,
-            "y": 727,
-            "z": 0
+            "z": 727,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -317,8 +349,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 724,
-            "y": 701,
-            "z": 0
+            "z": 701,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -331,8 +363,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 707,
-            "z": 0
+            "z": 707,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -345,8 +377,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 706,
-            "z": 0
+            "z": 706,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -359,8 +391,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 705,
-            "z": 0
+            "z": 705,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -373,8 +405,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 676,
-            "z": 0
+            "z": 676,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -387,8 +419,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 677,
-            "z": 0
+            "z": 677,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -401,8 +433,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 678,
-            "z": 0
+            "z": 678,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -415,38 +447,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 711,
-            "y": 687,
-            "z": 0
+            "z": 687,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 718,
-            "y": 645,
+            "z": 645,
             "dest_header_id": 381,
             "dest_warp_id": 1
         },
         {
             "x": 719,
-            "y": 645,
+            "z": 645,
             "dest_header_id": 381,
             "dest_warp_id": 1
         },
         {
             "x": 713,
-            "y": 670,
+            "z": 670,
             "dest_header_id": 286,
             "dest_warp_id": 0
         },
         {
             "x": 713,
-            "y": 670,
+            "z": 670,
             "dest_header_id": 512,
             "dest_warp_id": 0
         },
         {
             "x": 713,
-            "y": 670,
+            "z": 670,
             "dest_header_id": 513,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0367.json b/res/field/events/events_0367.json
index 16d7f09ce0..49e8873960 100644
--- a/res/field/events/events_0367.json
+++ b/res/field/events/events_0367.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 132,
             "dest_warp_id": 11
         },
         {
             "x": 5,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 380,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0368.json b/res/field/events/events_0368.json
index 08e1da5179..accd563f40 100644
--- a/res/field/events/events_0368.json
+++ b/res/field/events/events_0368.json
@@ -4,24 +4,24 @@
             "script": 8181,
             "type": 2,
             "x": 614,
-            "y": 582,
-            "z": 0,
+            "z": 582,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8182,
             "type": 2,
             "x": 659,
-            "y": 583,
-            "z": 0,
+            "z": 583,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8183,
             "type": 2,
             "x": 643,
-            "y": 591,
-            "z": 0,
+            "z": 591,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -33,12 +33,14 @@
             "flag": 0,
             "script": 3127,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 607,
-            "y": 584,
-            "z": 0
+            "z": 584,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -47,12 +49,14 @@
             "flag": 0,
             "script": 3126,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 621,
-            "y": 578,
-            "z": 0
+            "z": 578,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -61,12 +65,14 @@
             "flag": 0,
             "script": 3128,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 643,
-            "y": 582,
-            "z": 0
+            "z": 582,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -75,12 +81,14 @@
             "flag": 627,
             "script": 3129,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 9,
             "movement_range_y": 4,
             "x": 654,
-            "y": 589,
-            "z": 0
+            "z": 589,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -89,12 +97,14 @@
             "flag": 0,
             "script": 3303,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 589,
-            "y": 590,
-            "z": 0
+            "z": 590,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -103,12 +113,14 @@
             "flag": 0,
             "script": 3277,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 648,
-            "y": 599,
-            "z": 0
+            "z": 599,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -117,12 +129,14 @@
             "flag": 0,
             "script": 3286,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 648,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -131,12 +145,14 @@
             "flag": 629,
             "script": 3306,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 5,
             "movement_range_y": 3,
             "x": 603,
-            "y": 593,
-            "z": 0
+            "z": 593,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -145,12 +161,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 580,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -159,12 +177,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 658,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -177,8 +197,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 578,
-            "z": 0
+            "z": 578,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -191,8 +211,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 621,
-            "y": 594,
-            "z": 0
+            "z": 594,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -205,8 +225,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 634,
-            "y": 578,
-            "z": 0
+            "z": 578,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -219,8 +239,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 588,
-            "z": 0
+            "z": 588,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -233,8 +253,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 657,
-            "y": 589,
-            "z": 0
+            "z": 589,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -243,12 +263,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [70],
+            "data": [
+                70
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 592,
-            "z": 0
+            "z": 592,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -257,12 +279,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [71],
+            "data": [
+                71
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 629,
-            "y": 592,
-            "z": 0
+            "z": 592,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -271,12 +295,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [72],
+            "data": [
+                72
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 660,
-            "y": 593,
-            "z": 0
+            "z": 593,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -285,12 +311,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [73],
+            "data": [
+                73
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 661,
-            "y": 593,
-            "z": 0
+            "z": 593,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -303,8 +331,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 626,
-            "y": 599,
-            "z": 0
+            "z": 599,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -317,8 +345,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 637,
-            "y": 596,
-            "z": 0
+            "z": 596,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -331,8 +359,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 600,
-            "y": 591,
-            "z": 0
+            "z": 591,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -345,8 +373,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 661,
-            "y": 587,
-            "z": 0
+            "z": 587,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -359,8 +387,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 598,
-            "z": 0
+            "z": 598,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -373,8 +401,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 620,
-            "y": 580,
-            "z": 0
+            "z": 580,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -383,12 +411,14 @@
             "flag": 626,
             "script": 5,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 9,
             "movement_range_y": 4,
             "x": 654,
-            "y": 589,
-            "z": 0
+            "z": 589,
+            "y": 0
         },
         {
             "graphics_id": 45,
@@ -397,12 +427,14 @@
             "flag": 628,
             "script": 6,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 5,
             "movement_range_y": 3,
             "x": 603,
-            "y": 593,
-            "z": 0
+            "z": 593,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -415,8 +447,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 619,
-            "y": 585,
-            "z": 0
+            "z": 585,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -429,20 +461,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 660,
-            "y": 576,
-            "z": 0
+            "z": 576,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 671,
-            "y": 598,
+            "z": 598,
             "dest_header_id": 149,
             "dest_warp_id": 1
         },
         {
             "x": 671,
-            "y": 599,
+            "z": 599,
             "dest_header_id": 149,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0369.json b/res/field/events/events_0369.json
index 6fda80d969..f3a9bf9b10 100644
--- a/res/field/events/events_0369.json
+++ b/res/field/events/events_0369.json
@@ -4,8 +4,8 @@
             "script": 8071,
             "type": 2,
             "x": 357,
-            "y": 409,
-            "z": 0,
+            "z": 409,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 0,
             "script": 3131,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 355,
-            "y": 402,
-            "z": 0
+            "z": 402,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -31,12 +33,14 @@
             "flag": 0,
             "script": 3133,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 328,
-            "y": 405,
-            "z": 0
+            "z": 405,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -45,12 +49,14 @@
             "flag": 0,
             "script": 3257,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 337,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 32,
@@ -59,12 +65,14 @@
             "flag": 0,
             "script": 3135,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 350,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 68,
@@ -73,12 +81,14 @@
             "flag": 0,
             "script": 3132,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 299,
-            "y": 394,
-            "z": 0
+            "z": 394,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -87,12 +97,14 @@
             "flag": 0,
             "script": 3134,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 344,
-            "y": 411,
-            "z": 0
+            "z": 411,
+            "y": 0
         },
         {
             "graphics_id": 33,
@@ -101,12 +113,14 @@
             "flag": 0,
             "script": 3137,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 12,
             "movement_range_y": 4,
             "x": 342,
-            "y": 385,
-            "z": 0
+            "z": 385,
+            "y": 0
         },
         {
             "graphics_id": 32,
@@ -115,12 +129,14 @@
             "flag": 0,
             "script": 3136,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 4,
             "movement_range_y": 2,
             "x": 311,
-            "y": 402,
-            "z": 0
+            "z": 402,
+            "y": 0
         },
         {
             "graphics_id": 33,
@@ -129,12 +145,14 @@
             "flag": 0,
             "script": 3138,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 4,
             "x": 366,
-            "y": 391,
-            "z": 0
+            "z": 391,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -143,12 +161,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 375,
-            "y": 402,
-            "z": 0
+            "z": 402,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -161,8 +181,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 399,
-            "z": 0
+            "z": 399,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -175,8 +195,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 377,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -189,8 +209,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 342,
-            "y": 396,
-            "z": 0
+            "z": 396,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -203,8 +223,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 358,
-            "y": 389,
-            "z": 0
+            "z": 389,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -217,8 +237,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 367,
-            "y": 386,
-            "z": 0
+            "z": 386,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -231,8 +251,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 369,
-            "y": 397,
-            "z": 0
+            "z": 397,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -245,20 +265,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 331,
-            "y": 411,
-            "z": 0
+            "z": 411,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 375,
-            "y": 403,
+            "z": 403,
             "dest_header_id": 217,
             "dest_warp_id": 1
         },
         {
             "x": 303,
-            "y": 398,
+            "z": 398,
             "dest_header_id": 384,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0370.json b/res/field/events/events_0370.json
index 5301ab5c11..24f39831bb 100644
--- a/res/field/events/events_0370.json
+++ b/res/field/events/events_0370.json
@@ -4,16 +4,16 @@
             "script": 3,
             "type": 0,
             "x": 8,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 5
         },
         {
             "script": 3,
             "type": 0,
             "x": 8,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 3
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 65,
@@ -43,14 +43,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 383,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0371.json b/res/field/events/events_0371.json
index cc234a6479..ddcbd141f3 100644
--- a/res/field/events/events_0371.json
+++ b/res/field/events/events_0371.json
@@ -4,80 +4,80 @@
             "script": 8072,
             "type": 2,
             "x": 292,
-            "y": 332,
-            "z": 0,
+            "z": 332,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8073,
             "type": 2,
             "x": 316,
-            "y": 291,
-            "z": 0,
+            "z": 291,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8193,
             "type": 2,
             "x": 291,
-            "y": 299,
-            "z": 0,
+            "z": 299,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8194,
             "type": 2,
             "x": 304,
-            "y": 354,
-            "z": 0,
+            "z": 354,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8195,
             "type": 2,
             "x": 305,
-            "y": 308,
-            "z": 0,
+            "z": 308,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8196,
             "type": 2,
             "x": 313,
-            "y": 324,
-            "z": 0,
+            "z": 324,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8197,
             "type": 2,
             "x": 299,
-            "y": 319,
-            "z": 0,
+            "z": 319,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8198,
             "type": 2,
             "x": 318,
-            "y": 303,
-            "z": 0,
+            "z": 303,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8199,
             "type": 2,
             "x": 314,
-            "y": 348,
-            "z": 0,
+            "z": 348,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8200,
             "type": 2,
             "x": 288,
-            "y": 337,
-            "z": 0,
+            "z": 337,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -89,12 +89,14 @@
             "flag": 0,
             "script": 3141,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 2,
             "movement_range_y": 8,
             "x": 318,
-            "y": 344,
-            "z": 0
+            "z": 344,
+            "y": 0
         },
         {
             "graphics_id": 33,
@@ -103,12 +105,14 @@
             "flag": 0,
             "script": 3143,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 4,
             "movement_range_y": 6,
             "x": 294,
-            "y": 296,
-            "z": 0
+            "z": 296,
+            "y": 0
         },
         {
             "graphics_id": 32,
@@ -117,12 +121,14 @@
             "flag": 0,
             "script": 3142,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 4,
             "movement_range_y": 6,
             "x": 314,
-            "y": 296,
-            "z": 0
+            "z": 296,
+            "y": 0
         },
         {
             "graphics_id": 33,
@@ -131,12 +137,14 @@
             "flag": 0,
             "script": 3144,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 291,
-            "y": 344,
-            "z": 0
+            "z": 344,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -145,12 +153,14 @@
             "flag": 0,
             "script": 3145,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 310,
-            "y": 351,
-            "z": 0
+            "z": 351,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -159,12 +169,14 @@
             "flag": 0,
             "script": 3146,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 290,
-            "y": 321,
-            "z": 0
+            "z": 321,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -173,12 +185,14 @@
             "flag": 0,
             "script": 3147,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 8,
             "x": 291,
-            "y": 273,
-            "z": 0
+            "z": 273,
+            "y": 0
         },
         {
             "graphics_id": 68,
@@ -187,12 +201,14 @@
             "flag": 0,
             "script": 3139,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 307,
-            "y": 369,
-            "z": 0
+            "z": 369,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -201,12 +217,14 @@
             "flag": 0,
             "script": 3140,
             "initial_dir": 3,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 302,
-            "y": 267,
-            "z": 0
+            "z": 267,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -215,12 +233,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [10],
+            "data": [
+                10
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 292,
-            "y": 270,
-            "z": 0
+            "z": 270,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -233,8 +253,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 296,
-            "y": 305,
-            "z": 0
+            "z": 305,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -247,8 +267,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 330,
-            "z": 0
+            "z": 330,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -261,8 +281,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 300,
-            "y": 316,
-            "z": 0
+            "z": 316,
+            "y": 0
         },
         {
             "graphics_id": 191,
@@ -275,8 +295,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 275,
-            "z": 0
+            "z": 275,
+            "y": 0
         },
         {
             "graphics_id": 65,
@@ -289,8 +309,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 313,
-            "y": 281,
-            "z": 0
+            "z": 281,
+            "y": 0
         },
         {
             "graphics_id": 129,
@@ -303,8 +323,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 383,
-            "z": 0
+            "z": 383,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -317,8 +337,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 297,
-            "y": 358,
-            "z": 0
+            "z": 358,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -331,8 +351,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 311,
-            "y": 350,
-            "z": 0
+            "z": 350,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -345,20 +365,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 316,
-            "y": 309,
-            "z": 0
+            "z": 309,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 293,
-            "y": 311,
+            "z": 311,
             "dest_header_id": 386,
             "dest_warp_id": 0
         },
         {
             "x": 316,
-            "y": 285,
+            "z": 285,
             "dest_header_id": 387,
             "dest_warp_id": 0
         }
@@ -367,12 +387,12 @@
         {
             "script": 4,
             "x": 302,
-            "y": 376,
+            "z": 376,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16552
+            "var": 16552,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0372.json b/res/field/events/events_0372.json
index 8206df34c9..b4b42510ef 100644
--- a/res/field/events/events_0372.json
+++ b/res/field/events/events_0372.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 385,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0373.json b/res/field/events/events_0373.json
index 333cca6b8f..7b68f8bf02 100644
--- a/res/field/events/events_0373.json
+++ b/res/field/events/events_0373.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 385,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0374.json b/res/field/events/events_0374.json
index a16f2c1aee..f460157536 100644
--- a/res/field/events/events_0374.json
+++ b/res/field/events/events_0374.json
@@ -8,12 +8,14 @@
             "flag": 0,
             "script": 3299,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 80,
-            "y": 753,
-            "z": 0
+            "z": 753,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -22,12 +24,14 @@
             "flag": 0,
             "script": 3337,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 76,
-            "y": 746,
-            "z": 0
+            "z": 746,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -40,8 +44,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 93,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -54,8 +58,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 93,
-            "y": 751,
-            "z": 0
+            "z": 751,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -64,12 +68,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 119,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -78,12 +84,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -96,8 +104,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 117,
-            "y": 744,
-            "z": 0
+            "z": 744,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -110,8 +118,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 93,
-            "y": 759,
-            "z": 0
+            "z": 759,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -120,12 +128,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [74],
+            "data": [
+                74
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 87,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -134,12 +144,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [75],
+            "data": [
+                75
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 88,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -148,12 +160,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [76],
+            "data": [
+                76
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 89,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -162,12 +176,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [77],
+            "data": [
+                77
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 90,
-            "y": 752,
-            "z": 0
+            "z": 752,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -180,8 +196,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 74,
-            "y": 744,
-            "z": 0
+            "z": 744,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -194,8 +210,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 74,
-            "y": 749,
-            "z": 0
+            "z": 749,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -208,8 +224,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 753,
-            "z": 0
+            "z": 753,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -222,8 +238,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 754,
-            "z": 0
+            "z": 754,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -236,8 +252,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 755,
-            "z": 0
+            "z": 755,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -250,8 +266,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -264,8 +280,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 71,
-            "y": 756,
-            "z": 0
+            "z": 756,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -278,8 +294,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 73,
-            "y": 757,
-            "z": 0
+            "z": 757,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -292,32 +308,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 104,
-            "y": 748,
-            "z": 0
+            "z": 748,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 70,
-            "y": 754,
+            "z": 754,
             "dest_header_id": 390,
             "dest_warp_id": 1
         },
         {
             "x": 70,
-            "y": 755,
+            "z": 755,
             "dest_header_id": 390,
             "dest_warp_id": 1
         },
         {
             "x": 121,
-            "y": 758,
+            "z": 758,
             "dest_header_id": 389,
             "dest_warp_id": 0
         },
         {
             "x": 121,
-            "y": 759,
+            "z": 759,
             "dest_header_id": 389,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0375.json b/res/field/events/events_0375.json
index 8df54df70e..f4bce03171 100644
--- a/res/field/events/events_0375.json
+++ b/res/field/events/events_0375.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 388,
             "dest_warp_id": 2
         },
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 3,
             "dest_warp_id": 12
         }
diff --git a/res/field/events/events_0376.json b/res/field/events/events_0376.json
index b6618268ca..6d3439d2a2 100644
--- a/res/field/events/events_0376.json
+++ b/res/field/events/events_0376.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 33,
             "dest_warp_id": 7
         },
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 388,
             "dest_warp_id": 0
         }
@@ -48,12 +48,12 @@
         {
             "script": 2,
             "x": 7,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 5,
-            "z": 0,
-            "value": 0,
-            "var": 16645
+            "var": 16645,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0377.json b/res/field/events/events_0377.json
index 7232d56e90..77e310244c 100644
--- a/res/field/events/events_0377.json
+++ b/res/field/events/events_0377.json
@@ -4,8 +4,8 @@
             "script": 8169,
             "type": 2,
             "x": 175,
-            "y": 889,
-            "z": 0,
+            "z": 889,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -17,12 +17,14 @@
             "flag": 0,
             "script": 3357,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 171,
-            "y": 887,
-            "z": 0
+            "z": 887,
+            "y": 0
         },
         {
             "graphics_id": 48,
@@ -31,12 +33,14 @@
             "flag": 0,
             "script": 3359,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 176,
-            "y": 887,
-            "z": 0
+            "z": 887,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -45,12 +49,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 179,
-            "y": 866,
-            "z": 0
+            "z": 866,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -63,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 169,
-            "y": 877,
-            "z": 0
+            "z": 877,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0378.json b/res/field/events/events_0378.json
index 4f00520c5e..475f661f2d 100644
--- a/res/field/events/events_0378.json
+++ b/res/field/events/events_0378.json
@@ -4,40 +4,40 @@
             "script": 8050,
             "type": 2,
             "x": 267,
-            "y": 923,
-            "z": 0,
+            "z": 923,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8049,
             "type": 2,
             "x": 264,
-            "y": 897,
-            "z": 0,
+            "z": 897,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8190,
             "type": 2,
             "x": 280,
-            "y": 921,
-            "z": 0,
+            "z": 921,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8191,
             "type": 2,
             "x": 308,
-            "y": 919,
-            "z": 0,
+            "z": 919,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8192,
             "type": 2,
             "x": 272,
-            "y": 917,
-            "z": 0,
+            "z": 917,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -49,12 +49,14 @@
             "flag": 0,
             "script": 3165,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 235,
-            "y": 912,
-            "z": 0
+            "z": 912,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -63,12 +65,14 @@
             "flag": 0,
             "script": 3166,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 237,
-            "y": 922,
-            "z": 0
+            "z": 922,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -81,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 250,
-            "y": 919,
-            "z": 1
+            "z": 919,
+            "y": 1
         },
         {
             "graphics_id": 19,
@@ -91,12 +95,14 @@
             "flag": 0,
             "script": 3273,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 288,
-            "y": 915,
-            "z": 1
+            "z": 915,
+            "y": 1
         },
         {
             "graphics_id": 11,
@@ -105,12 +111,14 @@
             "flag": 0,
             "script": 3169,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 305,
-            "y": 917,
-            "z": 1
+            "z": 917,
+            "y": 1
         },
         {
             "graphics_id": 14,
@@ -119,12 +127,14 @@
             "flag": 0,
             "script": 3170,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 277,
-            "y": 923,
-            "z": 1
+            "z": 923,
+            "y": 1
         },
         {
             "graphics_id": 93,
@@ -137,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 308,
-            "y": 913,
-            "z": 0
+            "z": 913,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -151,8 +161,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 239,
-            "y": 908,
-            "z": 0
+            "z": 908,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -165,8 +175,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 295,
-            "y": 922,
-            "z": 0
+            "z": 922,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -179,8 +189,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 256,
-            "y": 916,
-            "z": 0
+            "z": 916,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -189,12 +199,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [78],
+            "data": [
+                78
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 278,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -203,12 +215,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [79],
+            "data": [
+                79
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 279,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -217,12 +231,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [80],
+            "data": [
+                80
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 280,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -231,12 +247,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [81],
+            "data": [
+                81
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 281,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -249,8 +267,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 250,
-            "y": 902,
-            "z": 0
+            "z": 902,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -263,8 +281,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 306,
-            "y": 912,
-            "z": 0
+            "z": 912,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -277,26 +295,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 307,
-            "y": 912,
-            "z": 0
+            "z": 912,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 261,
-            "y": 900,
+            "z": 900,
             "dest_header_id": 394,
             "dest_warp_id": 0
         },
         {
             "x": 306,
-            "y": 909,
+            "z": 909,
             "dest_header_id": 393,
             "dest_warp_id": 0
         },
         {
             "x": 307,
-            "y": 909,
+            "z": 909,
             "dest_header_id": 393,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0379.json b/res/field/events/events_0379.json
index 69d9829760..c73580e313 100644
--- a/res/field/events/events_0379.json
+++ b/res/field/events/events_0379.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 166,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 12,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -82,8 +82,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -96,8 +96,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -110,8 +110,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -124,20 +124,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 19,
+            "z": 19,
             "dest_header_id": 392,
             "dest_warp_id": 1
         },
         {
             "x": 7,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 251,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0380.json b/res/field/events/events_0380.json
index 6b67ee0797..adc510cd2f 100644
--- a/res/field/events/events_0380.json
+++ b/res/field/events/events_0380.json
@@ -4,8 +4,8 @@
             "script": 2,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 392,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0381.json b/res/field/events/events_0381.json
index abe182c63d..6170aa6258 100644
--- a/res/field/events/events_0381.json
+++ b/res/field/events/events_0381.json
@@ -4,64 +4,64 @@
             "script": 8109,
             "type": 2,
             "x": 806,
-            "y": 792,
-            "z": 0,
+            "z": 792,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8007,
             "type": 2,
             "x": 730,
-            "y": 773,
-            "z": 0,
+            "z": 773,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8157,
             "type": 2,
             "x": 813,
-            "y": 792,
-            "z": 0,
+            "z": 792,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8158,
             "type": 2,
             "x": 783,
-            "y": 774,
-            "z": 0,
+            "z": 774,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8263,
             "type": 2,
             "x": 819,
-            "y": 789,
-            "z": 0,
+            "z": 789,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8264,
             "type": 2,
             "x": 765,
-            "y": 788,
-            "z": 0,
+            "z": 788,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8265,
             "type": 2,
             "x": 779,
-            "y": 790,
-            "z": 0,
+            "z": 790,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8266,
             "type": 2,
             "x": 796,
-            "y": 789,
-            "z": 0,
+            "z": 789,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 777,
-            "y": 790,
-            "z": 0
+            "z": 790,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 761,
-            "y": 789,
-            "z": 0
+            "z": 789,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 769,
-            "y": 789,
-            "z": 0
+            "z": 789,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 782,
-            "y": 790,
-            "z": 0
+            "z": 790,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -129,12 +129,14 @@
             "flag": 0,
             "script": 3491,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 771,
-            "y": 777,
-            "z": 0
+            "z": 777,
+            "y": 0
         },
         {
             "graphics_id": 49,
@@ -143,12 +145,14 @@
             "flag": 0,
             "script": 3358,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 812,
-            "y": 781,
-            "z": 0
+            "z": 781,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -157,12 +161,14 @@
             "flag": 0,
             "script": 3334,
             "initial_dir": 3,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 751,
-            "y": 782,
-            "z": 0
+            "z": 782,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -171,12 +177,14 @@
             "flag": 0,
             "script": 3179,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 814,
-            "y": 785,
-            "z": 0
+            "z": 785,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -185,12 +193,15 @@
             "flag": 619,
             "script": 3332,
             "initial_dir": 3,
-            "data": [2, 2],
+            "data": [
+                2,
+                2
+            ],
             "movement_range_x": 8,
             "movement_range_y": 0,
             "x": 794,
-            "y": 778,
-            "z": 0
+            "z": 778,
+            "y": 0
         },
         {
             "graphics_id": 48,
@@ -199,12 +210,14 @@
             "flag": 0,
             "script": 3360,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 787,
-            "y": 788,
-            "z": 0
+            "z": 788,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -213,12 +226,14 @@
             "flag": 0,
             "script": 3336,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 808,
-            "y": 781,
-            "z": 0
+            "z": 781,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -227,12 +242,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 0,
-            "data": [9],
+            "data": [
+                9
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 821,
-            "y": 784,
-            "z": 0
+            "z": 784,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -241,12 +258,14 @@
             "flag": 0,
             "script": 3,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 749,
-            "y": 787,
-            "z": 0
+            "z": 787,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -259,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 793,
-            "y": 784,
-            "z": 0
+            "z": 784,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -273,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 804,
-            "y": 784,
-            "z": 0
+            "z": 784,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -287,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 801,
-            "y": 791,
-            "z": 0
+            "z": 791,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -301,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 789,
-            "y": 785,
-            "z": 0
+            "z": 785,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -315,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 804,
-            "y": 792,
-            "z": 0
+            "z": 792,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -329,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 814,
-            "y": 775,
-            "z": 0
+            "z": 775,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -343,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 785,
-            "y": 781,
-            "z": 0
+            "z": 781,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -357,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 816,
-            "y": 783,
-            "z": 0
+            "z": 783,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -367,12 +386,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [82],
+            "data": [
+                82
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 760,
-            "y": 772,
-            "z": 0
+            "z": 772,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -381,12 +402,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [83],
+            "data": [
+                83
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 761,
-            "y": 772,
-            "z": 0
+            "z": 772,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -395,12 +418,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [84],
+            "data": [
+                84
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 762,
-            "y": 772,
-            "z": 0
+            "z": 772,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -409,12 +434,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [85],
+            "data": [
+                85
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 763,
-            "y": 772,
-            "z": 0
+            "z": 772,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -427,8 +454,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 788,
-            "y": 781,
-            "z": 0
+            "z": 781,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -441,8 +468,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 775,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -455,8 +482,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 773,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -469,8 +496,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 771,
-            "y": 780,
-            "z": 0
+            "z": 780,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -479,12 +506,15 @@
             "flag": 618,
             "script": 7,
             "initial_dir": 3,
-            "data": [2, 2],
+            "data": [
+                2,
+                2
+            ],
             "movement_range_x": 8,
             "movement_range_y": 0,
             "x": 794,
-            "y": 778,
-            "z": 0
+            "z": 778,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -497,8 +527,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 809,
-            "y": 790,
-            "z": 0
+            "z": 790,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -511,32 +541,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 798,
-            "y": 782,
-            "z": 0
+            "z": 782,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 825,
-            "y": 790,
+            "z": 790,
             "dest_header_id": 398,
             "dest_warp_id": 0
         },
         {
             "x": 825,
-            "y": 791,
+            "z": 791,
             "dest_header_id": 398,
             "dest_warp_id": 0
         },
         {
             "x": 801,
-            "y": 784,
+            "z": 784,
             "dest_header_id": 397,
             "dest_warp_id": 0
         },
         {
             "x": 795,
-            "y": 784,
+            "z": 784,
             "dest_header_id": 396,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0382.json b/res/field/events/events_0382.json
index 9876ebb695..0239233d12 100644
--- a/res/field/events/events_0382.json
+++ b/res/field/events/events_0382.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 1,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 71,
@@ -96,14 +96,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 395,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0383.json b/res/field/events/events_0383.json
index 1fb84a979d..030306afbd 100644
--- a/res/field/events/events_0383.json
+++ b/res/field/events/events_0383.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 395,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0384.json b/res/field/events/events_0384.json
index e53bfe71bc..4c666d4d24 100644
--- a/res/field/events/events_0384.json
+++ b/res/field/events/events_0384.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -26,20 +26,20 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 395,
             "dest_warp_id": 0
         },
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 150,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0385.json b/res/field/events/events_0385.json
index 357f689844..2f5d569599 100644
--- a/res/field/events/events_0385.json
+++ b/res/field/events/events_0385.json
@@ -4,64 +4,64 @@
             "script": 8124,
             "type": 2,
             "x": 881,
-            "y": 530,
-            "z": 0,
+            "z": 530,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8125,
             "type": 2,
             "x": 899,
-            "y": 535,
-            "z": 0,
+            "z": 535,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8126,
             "type": 2,
             "x": 908,
-            "y": 530,
-            "z": 0,
+            "z": 530,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8127,
             "type": 2,
             "x": 914,
-            "y": 533,
-            "z": 0,
+            "z": 533,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8170,
             "type": 2,
             "x": 917,
-            "y": 529,
-            "z": 0,
+            "z": 529,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8171,
             "type": 2,
             "x": 883,
-            "y": 563,
-            "z": 0,
+            "z": 563,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8172,
             "type": 2,
             "x": 908,
-            "y": 527,
-            "z": 0,
+            "z": 527,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 908,
-            "y": 491,
-            "z": 0,
+            "z": 491,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 884,
-            "y": 570,
-            "z": 0
+            "z": 570,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 869,
-            "y": 530,
-            "z": 0
+            "z": 530,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 907,
-            "y": 509,
-            "z": 0
+            "z": 509,
+            "y": 0
         },
         {
             "graphics_id": 166,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 909,
-            "y": 492,
-            "z": 0
+            "z": 492,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -129,12 +129,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [86],
+            "data": [
+                86
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 906,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -143,12 +145,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [87],
+            "data": [
+                87
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 907,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -157,12 +161,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [88],
+            "data": [
+                88
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 908,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -171,12 +177,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [89],
+            "data": [
+                89
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 909,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -185,12 +193,14 @@
             "flag": 0,
             "script": 3281,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 883,
-            "y": 547,
-            "z": 0
+            "z": 547,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -199,12 +209,14 @@
             "flag": 0,
             "script": 3287,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 875,
-            "y": 529,
-            "z": 0
+            "z": 529,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -213,12 +225,14 @@
             "flag": 0,
             "script": 3312,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 10,
             "movement_range_y": 2,
             "x": 901,
-            "y": 532,
-            "z": 0
+            "z": 532,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -227,12 +241,14 @@
             "flag": 0,
             "script": 3361,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 885,
-            "y": 533,
-            "z": 0
+            "z": 533,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -241,12 +257,14 @@
             "flag": 0,
             "script": 3288,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 869,
-            "y": 536,
-            "z": 0
+            "z": 536,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -255,12 +273,14 @@
             "flag": 0,
             "script": 3285,
             "initial_dir": 2,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 915,
-            "y": 518,
-            "z": 0
+            "z": 518,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -269,12 +289,14 @@
             "flag": 0,
             "script": 3304,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 913,
-            "y": 522,
-            "z": 0
+            "z": 522,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -283,12 +305,14 @@
             "flag": 0,
             "script": 3276,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 904,
-            "y": 511,
-            "z": 0
+            "z": 511,
+            "y": 0
         },
         {
             "graphics_id": 158,
@@ -301,8 +325,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 911,
-            "y": 480,
-            "z": 0
+            "z": 480,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -315,8 +339,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 923,
-            "y": 503,
-            "z": 0
+            "z": 503,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -329,8 +353,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 904,
-            "y": 524,
-            "z": 0
+            "z": 524,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -343,8 +367,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 914,
-            "y": 509,
-            "z": 0
+            "z": 509,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -357,8 +381,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 877,
-            "y": 541,
-            "z": 0
+            "z": 541,
+            "y": 0
         },
         {
             "graphics_id": 143,
@@ -371,14 +395,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 907,
-            "y": 493,
-            "z": 0
+            "z": 493,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 878,
-            "y": 560,
+            "z": 560,
             "dest_header_id": 249,
             "dest_warp_id": 1
         }
@@ -387,12 +411,12 @@
         {
             "script": 5,
             "x": 903,
-            "y": 496,
+            "z": 496,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 1,
-            "var": 16517
+            "var": 16517,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0386.json b/res/field/events/events_0386.json
index 5937bf8cb0..a31910aa10 100644
--- a/res/field/events/events_0386.json
+++ b/res/field/events/events_0386.json
@@ -4,32 +4,32 @@
             "script": 8130,
             "type": 2,
             "x": 627,
-            "y": 370,
-            "z": 0,
+            "z": 370,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8173,
             "type": 2,
             "x": 636,
-            "y": 389,
-            "z": 0,
+            "z": 389,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8203,
             "type": 2,
             "x": 614,
-            "y": 373,
-            "z": 0,
+            "z": 373,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8204,
             "type": 2,
             "x": 621,
-            "y": 331,
-            "z": 0,
+            "z": 331,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -41,12 +41,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 410,
-            "z": 0
+            "z": 410,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -55,12 +57,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 630,
-            "y": 330,
-            "z": 0
+            "z": 330,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -73,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 410,
-            "z": 0
+            "z": 410,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -87,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 637,
-            "y": 394,
-            "z": 0
+            "z": 394,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -101,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 618,
-            "y": 399,
-            "z": 0
+            "z": 399,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -115,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 610,
-            "y": 368,
-            "z": 0
+            "z": 368,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -129,8 +133,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 610,
-            "y": 350,
-            "z": 0
+            "z": 350,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -143,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 321,
-            "z": 0
+            "z": 321,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -153,12 +157,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [97],
+            "data": [
+                97
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 610,
-            "y": 337,
-            "z": 0
+            "z": 337,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -167,12 +173,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [96],
+            "data": [
+                96
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 613,
-            "y": 337,
-            "z": 0
+            "z": 337,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -181,12 +189,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [95],
+            "data": [
+                95
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 337,
-            "z": 0
+            "z": 337,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -195,12 +205,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [94],
+            "data": [
+                94
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 612,
-            "y": 337,
-            "z": 0
+            "z": 337,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -213,8 +225,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 611,
-            "y": 388,
-            "z": 0
+            "z": 388,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -227,8 +239,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 632,
-            "y": 394,
-            "z": 0
+            "z": 394,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -241,8 +253,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 632,
-            "y": 395,
-            "z": 0
+            "z": 395,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -255,8 +267,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 613,
-            "y": 368,
-            "z": 0
+            "z": 368,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -269,8 +281,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 613,
-            "y": 369,
-            "z": 0
+            "z": 369,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -283,8 +295,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 614,
-            "y": 339,
-            "z": 0
+            "z": 339,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -297,8 +309,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 614,
-            "y": 340,
-            "z": 0
+            "z": 340,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -307,12 +319,15 @@
             "flag": 0,
             "script": 3562,
             "initial_dir": 3,
-            "data": [2, 2],
+            "data": [
+                2,
+                2
+            ],
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 612,
-            "y": 377,
-            "z": 0
+            "z": 377,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -321,12 +336,14 @@
             "flag": 0,
             "script": 3593,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -335,12 +352,14 @@
             "flag": 0,
             "script": 3553,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 628,
-            "y": 397,
-            "z": 0
+            "z": 397,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -349,12 +368,14 @@
             "flag": 0,
             "script": 3584,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 631,
-            "y": 392,
-            "z": 0
+            "z": 392,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -363,12 +384,14 @@
             "flag": 0,
             "script": 3556,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 627,
-            "y": 322,
-            "z": 0
+            "z": 322,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -377,12 +400,14 @@
             "flag": 0,
             "script": 3572,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 619,
-            "y": 340,
-            "z": 0
+            "z": 340,
+            "y": 0
         },
         {
             "local_id": 0,
@@ -392,12 +417,14 @@
             "flag": 450,
             "script": 65535,
             "initial_dir": 0,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 646,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -406,12 +433,14 @@
             "flag": 0,
             "script": 3592,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 2,
             "movement_range_y": 6,
             "x": 612,
-            "y": 397,
-            "z": 0
+            "z": 397,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -420,12 +449,14 @@
             "flag": 0,
             "script": 3566,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 624,
-            "y": 367,
-            "z": 0
+            "z": 367,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -438,8 +469,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 634,
-            "y": 361,
-            "z": 0
+            "z": 361,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -452,8 +483,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 635,
-            "y": 361,
-            "z": 0
+            "z": 361,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -466,26 +497,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 630,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 630,
-            "y": 413,
+            "z": 413,
             "dest_header_id": 193,
             "dest_warp_id": 1
         },
         {
             "x": 631,
-            "y": 413,
+            "z": 413,
             "dest_header_id": 193,
             "dest_warp_id": 1
         },
         {
             "x": 617,
-            "y": 368,
+            "z": 368,
             "dest_header_id": 498,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0387.json b/res/field/events/events_0387.json
index edd5b5b746..01da6b925d 100644
--- a/res/field/events/events_0387.json
+++ b/res/field/events/events_0387.json
@@ -4,24 +4,24 @@
             "script": 8136,
             "type": 2,
             "x": 741,
-            "y": 264,
-            "z": 0,
+            "z": 264,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8137,
             "type": 2,
             "x": 749,
-            "y": 280,
-            "z": 0,
+            "z": 280,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8159,
             "type": 2,
             "x": 744,
-            "y": 326,
-            "z": 0,
+            "z": 326,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -33,12 +33,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 755,
-            "y": 314,
-            "z": 0
+            "z": 314,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -51,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 759,
-            "y": 283,
-            "z": 0
+            "z": 283,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -65,8 +67,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 745,
-            "y": 295,
-            "z": 0
+            "z": 295,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -79,8 +81,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 739,
-            "y": 305,
-            "z": 0
+            "z": 305,
+            "y": 0
         },
         {
             "graphics_id": 128,
@@ -93,8 +95,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 738,
-            "y": 305,
-            "z": 0
+            "z": 305,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -103,12 +105,14 @@
             "flag": 0,
             "script": 3563,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 756,
-            "y": 308,
-            "z": 0
+            "z": 308,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -117,12 +121,14 @@
             "flag": 0,
             "script": 3594,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 747,
-            "y": 311,
-            "z": 0
+            "z": 311,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -131,12 +137,14 @@
             "flag": 0,
             "script": 3587,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 764,
-            "y": 266,
-            "z": 0
+            "z": 266,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -145,12 +153,14 @@
             "flag": 0,
             "script": 3575,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 752,
-            "y": 295,
-            "z": 0
+            "z": 295,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -163,8 +173,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 754,
-            "y": 297,
-            "z": 0
+            "z": 297,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -177,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 754,
-            "y": 296,
-            "z": 0
+            "z": 296,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -191,8 +201,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 758,
-            "y": 275,
-            "z": 0
+            "z": 275,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -205,14 +215,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 751,
-            "y": 271,
-            "z": 0
+            "z": 271,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 740,
-            "y": 302,
+            "z": 302,
             "dest_header_id": 500,
             "dest_warp_id": 0
         }
@@ -221,22 +231,22 @@
         {
             "script": 1,
             "x": 738,
-            "y": 306,
+            "z": 306,
+            "y": 0,
             "width": 2,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16523
+            "var": 16523,
+            "value": 0
         },
         {
             "script": 3,
             "x": 758,
-            "y": 277,
+            "z": 277,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16665
+            "var": 16665,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0388.json b/res/field/events/events_0388.json
index 7635a1d316..8e4aa628ee 100644
--- a/res/field/events/events_0388.json
+++ b/res/field/events/events_0388.json
@@ -4,48 +4,48 @@
             "script": 8142,
             "type": 2,
             "x": 793,
-            "y": 402,
-            "z": 0,
+            "z": 402,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8144,
             "type": 2,
             "x": 774,
-            "y": 357,
-            "z": 0,
+            "z": 357,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8143,
             "type": 2,
             "x": 781,
-            "y": 365,
-            "z": 0,
+            "z": 365,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8205,
             "type": 2,
             "x": 780,
-            "y": 334,
-            "z": 0,
+            "z": 334,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8206,
             "type": 2,
             "x": 778,
-            "y": 326,
-            "z": 0,
+            "z": 326,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8207,
             "type": 2,
             "x": 775,
-            "y": 404,
-            "z": 0,
+            "z": 404,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -57,12 +57,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 779,
-            "y": 329,
-            "z": 0
+            "z": 329,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -71,12 +73,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 786,
-            "y": 406,
-            "z": 0
+            "z": 406,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -89,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 793,
-            "y": 372,
-            "z": 0
+            "z": 372,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -103,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 781,
-            "y": 352,
-            "z": 0
+            "z": 352,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -117,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 782,
-            "y": 352,
-            "z": 0
+            "z": 352,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -131,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 783,
-            "y": 353,
-            "z": 0
+            "z": 353,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -145,8 +149,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 786,
-            "y": 333,
-            "z": 0
+            "z": 333,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -159,8 +163,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 796,
-            "y": 346,
-            "z": 0
+            "z": 346,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -173,8 +177,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 794,
-            "y": 385,
-            "z": 0
+            "z": 385,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -187,8 +191,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 780,
-            "y": 345,
-            "z": 0
+            "z": 345,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -201,8 +205,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 779,
-            "y": 380,
-            "z": 0
+            "z": 380,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -211,12 +215,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [102],
+            "data": [
+                102
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 779,
-            "y": 389,
-            "z": 0
+            "z": 389,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -225,12 +231,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [103],
+            "data": [
+                103
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 782,
-            "y": 389,
-            "z": 0
+            "z": 389,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -239,12 +247,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [104],
+            "data": [
+                104
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 780,
-            "y": 389,
-            "z": 0
+            "z": 389,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -253,12 +263,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [105],
+            "data": [
+                105
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 781,
-            "y": 389,
-            "z": 0
+            "z": 389,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -267,12 +279,14 @@
             "flag": 0,
             "script": 3564,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 779,
-            "y": 325,
-            "z": 0
+            "z": 325,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -281,12 +295,14 @@
             "flag": 0,
             "script": 3573,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 773,
-            "y": 346,
-            "z": 0
+            "z": 346,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -295,12 +311,14 @@
             "flag": 0,
             "script": 3590,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 789,
-            "y": 375,
-            "z": 0
+            "z": 375,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -309,12 +327,14 @@
             "flag": 0,
             "script": 3595,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 786,
-            "y": 375,
-            "z": 0
+            "z": 375,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -323,12 +343,14 @@
             "flag": 0,
             "script": 3558,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 796,
-            "y": 327,
-            "z": 0
+            "z": 327,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -337,12 +359,14 @@
             "flag": 0,
             "script": 3582,
             "initial_dir": 2,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 785,
-            "y": 398,
-            "z": 0
+            "z": 398,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -351,12 +375,14 @@
             "flag": 0,
             "script": 3576,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 795,
-            "y": 394,
-            "z": 0
+            "z": 394,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -365,12 +391,14 @@
             "flag": 0,
             "script": 3586,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 776,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -383,8 +411,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 785,
-            "y": 390,
-            "z": 0
+            "z": 390,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -397,8 +425,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 786,
-            "y": 390,
-            "z": 0
+            "z": 390,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -411,8 +439,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 772,
-            "y": 384,
-            "z": 0
+            "z": 384,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -425,44 +453,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 773,
-            "y": 384,
-            "z": 0
+            "z": 384,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 774,
-            "y": 331,
+            "z": 331,
             "dest_header_id": 501,
             "dest_warp_id": 1
         },
         {
             "x": 774,
-            "y": 330,
+            "z": 330,
             "dest_header_id": 501,
             "dest_warp_id": 1
         },
         {
             "x": 789,
-            "y": 356,
+            "z": 356,
             "dest_header_id": 502,
             "dest_warp_id": 0
         },
         {
             "x": 775,
-            "y": 386,
+            "z": 386,
             "dest_header_id": 503,
             "dest_warp_id": 0
         },
         {
             "x": 785,
-            "y": 340,
+            "z": 340,
             "dest_header_id": 591,
             "dest_warp_id": 0
         },
         {
             "x": 785,
-            "y": 340,
+            "z": 340,
             "dest_header_id": 592,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0389.json b/res/field/events/events_0389.json
index 4c5ec9ea9a..8351681d28 100644
--- a/res/field/events/events_0389.json
+++ b/res/field/events/events_0389.json
@@ -4,8 +4,8 @@
             "script": 8145,
             "type": 2,
             "x": 822,
-            "y": 445,
-            "z": 0,
+            "z": 445,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 820,
-            "y": 439,
-            "z": 0
+            "z": 439,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -31,12 +31,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [11],
+            "data": [
+                11
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 800,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -49,8 +51,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 814,
-            "y": 431,
-            "z": 0
+            "z": 431,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -63,8 +65,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 820,
-            "y": 438,
-            "z": 0
+            "z": 438,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -77,8 +79,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 808,
-            "y": 427,
-            "z": 0
+            "z": 427,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -91,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 821,
-            "y": 437,
-            "z": 0
+            "z": 437,
+            "y": 0
         },
         {
             "graphics_id": 86,
@@ -105,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 826,
-            "y": 437,
-            "z": 0
+            "z": 437,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -119,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 816,
-            "y": 426,
-            "z": 0
+            "z": 426,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -133,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 828,
-            "y": 420,
-            "z": 0
+            "z": 420,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -147,8 +149,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 828,
-            "y": 438,
-            "z": 0
+            "z": 438,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -157,12 +159,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [106],
+            "data": [
+                106
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 810,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -171,12 +175,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [107],
+            "data": [
+                107
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 811,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -185,12 +191,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [108],
+            "data": [
+                108
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 812,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -199,12 +207,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [109],
+            "data": [
+                109
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 813,
-            "y": 434,
-            "z": 0
+            "z": 434,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -213,12 +223,14 @@
             "flag": 0,
             "script": 3591,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 829,
-            "y": 433,
-            "z": 0
+            "z": 433,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -227,12 +239,14 @@
             "flag": 0,
             "script": 3565,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 796,
-            "y": 432,
-            "z": 0
+            "z": 432,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -241,12 +255,14 @@
             "flag": 0,
             "script": 3574,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 801,
-            "y": 432,
-            "z": 0
+            "z": 432,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -255,12 +271,14 @@
             "flag": 0,
             "script": 3577,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 820,
-            "y": 418,
-            "z": 0
+            "z": 418,
+            "y": 0
         },
         {
             "local_id": 0,
@@ -270,12 +288,14 @@
             "flag": 457,
             "script": 65535,
             "initial_dir": 0,
-            "data": [7],
+            "data": [
+                7
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 805,
-            "y": 451,
-            "z": 0
+            "z": 451,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0390.json b/res/field/events/events_0390.json
index 4f0ddfd179..51bc0a453e 100644
--- a/res/field/events/events_0390.json
+++ b/res/field/events/events_0390.json
@@ -4,8 +4,8 @@
             "script": 8201,
             "type": 2,
             "x": 107,
-            "y": 893,
-            "z": 0,
+            "z": 893,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 119,
-            "y": 878,
-            "z": 1
+            "z": 878,
+            "y": 1
         },
         {
             "graphics_id": 19,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 108,
-            "y": 889,
-            "z": 1
+            "z": 889,
+            "y": 1
         },
         {
             "graphics_id": 148,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 105,
-            "y": 875,
-            "z": 0
+            "z": 875,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 108,
-            "y": 869,
-            "z": 0
+            "z": 869,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -73,12 +73,14 @@
             "flag": 0,
             "script": 7,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 112,
-            "y": 878,
-            "z": 0
+            "z": 878,
+            "y": 0
         },
         {
             "graphics_id": 92,
@@ -91,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 114,
-            "y": 885,
-            "z": 0
+            "z": 885,
+            "y": 0
         },
         {
             "graphics_id": 92,
@@ -105,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 109,
-            "y": 875,
-            "z": 0
+            "z": 875,
+            "y": 0
         },
         {
             "local_id": 3,
@@ -116,36 +118,38 @@
             "flag": 342,
             "script": 65535,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 109,
-            "y": 856,
-            "z": 0
+            "z": 856,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 105,
-            "y": 875,
+            "z": 875,
             "dest_header_id": 412,
             "dest_warp_id": 0
         },
         {
             "x": 116,
-            "y": 885,
+            "z": 885,
             "dest_header_id": 414,
             "dest_warp_id": 0
         },
         {
             "x": 116,
-            "y": 875,
+            "z": 875,
             "dest_header_id": 416,
             "dest_warp_id": 0
         },
         {
             "x": 106,
-            "y": 885,
+            "z": 885,
             "dest_header_id": 417,
             "dest_warp_id": 0
         }
@@ -154,22 +158,22 @@
         {
             "script": 4,
             "x": 108,
-            "y": 867,
+            "z": 867,
+            "y": 0,
             "width": 8,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16496
+            "var": 16496,
+            "value": 1
         },
         {
             "script": 2,
             "x": 105,
-            "y": 876,
+            "z": 876,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16614
+            "var": 16614,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0391.json b/res/field/events/events_0391.json
index e1d5bd04d8..1e294272fc 100644
--- a/res/field/events/events_0391.json
+++ b/res/field/events/events_0391.json
@@ -12,20 +12,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 411,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 413,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0392.json b/res/field/events/events_0392.json
index f78a478a79..987c81b689 100644
--- a/res/field/events/events_0392.json
+++ b/res/field/events/events_0392.json
@@ -4,16 +4,16 @@
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 9,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,14 +29,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 412,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0393.json b/res/field/events/events_0393.json
index 5076ac8818..6d01b370da 100644
--- a/res/field/events/events_0393.json
+++ b/res/field/events/events_0393.json
@@ -4,64 +4,64 @@
             "script": 7,
             "type": 0,
             "x": 6,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 7,
             "type": 0,
             "x": 7,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8,
             "type": 0,
             "x": 5,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 2,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 1,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 1,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 2,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 10,
             "type": 0,
             "x": 3,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -77,8 +77,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 7,
-            "y": 8,
-            "z": 1
+            "z": 8,
+            "y": 1
         },
         {
             "graphics_id": 16,
@@ -91,20 +91,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 10,
-            "z": 1
+            "z": 10,
+            "y": 1
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 411,
             "dest_warp_id": 1
         },
         {
             "x": 10,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 415,
             "dest_warp_id": 0
         }
@@ -113,12 +113,12 @@
         {
             "script": 5,
             "x": 6,
-            "y": 10,
+            "z": 10,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16548
+            "var": 16548,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0394.json b/res/field/events/events_0394.json
index f5c52d2225..54c10b89da 100644
--- a/res/field/events/events_0394.json
+++ b/res/field/events/events_0394.json
@@ -4,40 +4,40 @@
             "script": 1,
             "type": 0,
             "x": 5,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 4,
             "type": 1,
             "x": 7,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 4,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 3,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -53,14 +53,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 414,
             "dest_warp_id": 1
         }
@@ -69,42 +69,42 @@
         {
             "script": 7,
             "x": 4,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16549
+            "var": 16549,
+            "value": 0
         },
         {
             "script": 8,
             "x": 3,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16549
+            "var": 16549,
+            "value": 0
         },
         {
             "script": 9,
             "x": 5,
-            "y": 6,
+            "z": 6,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16549
+            "var": 16549,
+            "value": 0
         },
         {
             "script": 10,
             "x": 4,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16549
+            "var": 16549,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0395.json b/res/field/events/events_0395.json
index 69e357dcfc..72a9c9229f 100644
--- a/res/field/events/events_0395.json
+++ b/res/field/events/events_0395.json
@@ -12,14 +12,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 411,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0396.json b/res/field/events/events_0396.json
index ea135eca64..755e3fe0fd 100644
--- a/res/field/events/events_0396.json
+++ b/res/field/events/events_0396.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 2,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 411,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0397.json b/res/field/events/events_0397.json
index bfa5382c19..a864b53858 100644
--- a/res/field/events/events_0397.json
+++ b/res/field/events/events_0397.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 187,
-            "y": 855,
-            "z": 1
+            "z": 855,
+            "y": 1
         },
         {
             "graphics_id": 9,
@@ -26,8 +26,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 171,
-            "y": 854,
-            "z": 1
+            "z": 854,
+            "y": 1
         },
         {
             "graphics_id": 12,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 183,
-            "y": 852,
-            "z": 1
+            "z": 852,
+            "y": 1
         },
         {
             "graphics_id": 148,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 168,
-            "y": 842,
-            "z": 1
+            "z": 842,
+            "y": 1
         },
         {
             "graphics_id": 101,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 168,
-            "y": 845,
-            "z": 1
+            "z": 845,
+            "y": 1
         },
         {
             "graphics_id": 93,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 165,
-            "y": 843,
-            "z": 0
+            "z": 843,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 174,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -106,12 +106,14 @@
             "flag": 0,
             "script": 8,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 182,
-            "y": 854,
-            "z": 0
+            "z": 854,
+            "y": 0
         },
         {
             "local_id": 2,
@@ -121,12 +123,14 @@
             "flag": 391,
             "script": 65535,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 179,
-            "y": 866,
-            "z": 0
+            "z": 866,
+            "y": 0
         },
         {
             "local_id": 4,
@@ -136,12 +140,14 @@
             "flag": 343,
             "script": 65535,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 183,
-            "y": 825,
-            "z": 0
+            "z": 825,
+            "y": 0
         },
         {
             "local_id": 4,
@@ -151,12 +157,14 @@
             "flag": 342,
             "script": 65535,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 151,
-            "y": 843,
-            "z": 0
+            "z": 843,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -170,8 +178,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 153,
-            "y": 847,
-            "z": 0
+            "z": 847,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -184,8 +192,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 180,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -198,8 +206,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 185,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -212,38 +220,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 168,
-            "y": 842,
-            "z": 0
+            "z": 842,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 187,
-            "y": 842,
+            "z": 842,
             "dest_header_id": 419,
             "dest_warp_id": 0
         },
         {
             "x": 177,
-            "y": 842,
+            "z": 842,
             "dest_header_id": 420,
             "dest_warp_id": 0
         },
         {
             "x": 168,
-            "y": 842,
+            "z": 842,
             "dest_header_id": 422,
             "dest_warp_id": 0
         },
         {
             "x": 176,
-            "y": 854,
+            "z": 854,
             "dest_header_id": 423,
             "dest_warp_id": 0
         },
         {
             "x": 167,
-            "y": 854,
+            "z": 854,
             "dest_header_id": 425,
             "dest_warp_id": 0
         }
@@ -252,12 +260,12 @@
         {
             "script": 2,
             "x": 164,
-            "y": 842,
+            "z": 842,
+            "y": 0,
             "width": 1,
             "length": 6,
-            "z": 0,
-            "value": 0,
-            "var": 16497
+            "var": 16497,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0398.json b/res/field/events/events_0398.json
index 76322bdd38..243c7362b3 100644
--- a/res/field/events/events_0398.json
+++ b/res/field/events/events_0398.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 418,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0399.json b/res/field/events/events_0399.json
index 0cf12e46e1..51cc57f2b1 100644
--- a/res/field/events/events_0399.json
+++ b/res/field/events/events_0399.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -68,26 +68,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 418,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 421,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 485,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0400.json b/res/field/events/events_0400.json
index 0f7b0fa6d0..44e21aea13 100644
--- a/res/field/events/events_0400.json
+++ b/res/field/events/events_0400.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -54,20 +54,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 8,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 420,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0401.json b/res/field/events/events_0401.json
index 1833c1da15..113baa052e 100644
--- a/res/field/events/events_0401.json
+++ b/res/field/events/events_0401.json
@@ -4,48 +4,48 @@
             "script": 8,
             "type": 0,
             "x": 3,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 9,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 10,
             "type": 0,
             "x": 5,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 6,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 11,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 14,
             "type": 0,
             "x": 20,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 29,
@@ -75,8 +75,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 3,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 30,
@@ -89,8 +89,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 10,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 101,
@@ -103,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 166,
@@ -117,14 +117,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 418,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0402.json b/res/field/events/events_0402.json
index f78c95f424..7525e196f1 100644
--- a/res/field/events/events_0402.json
+++ b/res/field/events/events_0402.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 5,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 6,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 418,
             "dest_warp_id": 3
         },
         {
             "x": 9,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 424,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0403.json b/res/field/events/events_0403.json
index 46add9cfe0..11c9796717 100644
--- a/res/field/events/events_0403.json
+++ b/res/field/events/events_0403.json
@@ -4,8 +4,8 @@
             "script": 1,
             "type": 0,
             "x": 2,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 6,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 423,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0404.json b/res/field/events/events_0404.json
index f99279b428..2dea68d05d 100644
--- a/res/field/events/events_0404.json
+++ b/res/field/events/events_0404.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 418,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0405.json b/res/field/events/events_0405.json
index f4d04c0846..61aab98998 100644
--- a/res/field/events/events_0405.json
+++ b/res/field/events/events_0405.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 179,
-            "y": 661,
-            "z": 5
+            "z": 661,
+            "y": 5
         },
         {
             "graphics_id": 6,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 170,
-            "y": 645,
-            "z": 5
+            "z": 645,
+            "y": 5
         },
         {
             "graphics_id": 3,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 176,
-            "y": 656,
-            "z": 5
+            "z": 656,
+            "y": 5
         },
         {
             "graphics_id": 13,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 170,
-            "y": 659,
-            "z": 5
+            "z": 659,
+            "y": 5
         },
         {
             "graphics_id": 6,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 183,
-            "y": 651,
-            "z": 5
+            "z": 651,
+            "y": 5
         },
         {
             "graphics_id": 100,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 178,
-            "y": 651,
-            "z": 0
+            "z": 651,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -92,12 +92,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 182,
-            "y": 651,
-            "z": 0
+            "z": 651,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -110,8 +112,8 @@
             "movement_range_x": 1,
             "movement_range_y": 4,
             "x": 162,
-            "y": 641,
-            "z": 5
+            "z": 641,
+            "y": 5
         },
         {
             "graphics_id": 124,
@@ -124,8 +126,8 @@
             "movement_range_x": 1,
             "movement_range_y": 4,
             "x": 163,
-            "y": 641,
-            "z": 5
+            "z": 641,
+            "y": 5
         },
         {
             "graphics_id": 91,
@@ -134,12 +136,14 @@
             "flag": 0,
             "script": 8,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 173,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -152,8 +156,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 177,
-            "y": 651,
-            "z": 0
+            "z": 651,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -162,12 +166,14 @@
             "flag": 0,
             "script": 10,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 189,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -180,62 +186,62 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 166,
-            "y": 650,
-            "z": 0
+            "z": 650,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 184,
-            "y": 657,
+            "z": 657,
             "dest_header_id": 427,
             "dest_warp_id": 0
         },
         {
             "x": 176,
-            "y": 666,
+            "z": 666,
             "dest_header_id": 428,
             "dest_warp_id": 0
         },
         {
             "x": 180,
-            "y": 651,
+            "z": 651,
             "dest_header_id": 430,
             "dest_warp_id": 0
         },
         {
             "x": 184,
-            "y": 666,
+            "z": 666,
             "dest_header_id": 431,
             "dest_warp_id": 0
         },
         {
             "x": 171,
-            "y": 654,
+            "z": 654,
             "dest_header_id": 432,
             "dest_warp_id": 0
         },
         {
             "x": 180,
-            "y": 612,
+            "z": 612,
             "dest_header_id": 256,
             "dest_warp_id": 0
         },
         {
             "x": 181,
-            "y": 612,
+            "z": 612,
             "dest_header_id": 256,
             "dest_warp_id": 1
         },
         {
             "x": 162,
-            "y": 641,
+            "z": 641,
             "dest_header_id": 256,
             "dest_warp_id": 3
         },
         {
             "x": 163,
-            "y": 641,
+            "z": 641,
             "dest_header_id": 256,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0406.json b/res/field/events/events_0406.json
index d4135e48b5..67bb342ff4 100644
--- a/res/field/events/events_0406.json
+++ b/res/field/events/events_0406.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -22,12 +22,14 @@
             "flag": 0,
             "script": 4,
             "initial_dir": 3,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +42,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +56,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,14 +70,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 426,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0407.json b/res/field/events/events_0407.json
index 250fb2308f..e3a5f23fbd 100644
--- a/res/field/events/events_0407.json
+++ b/res/field/events/events_0407.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 12,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 26,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -82,26 +82,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 426,
             "dest_warp_id": 1
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 429,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 486,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0408.json b/res/field/events/events_0408.json
index b1595a901a..699fbfc0e9 100644
--- a/res/field/events/events_0408.json
+++ b/res/field/events/events_0408.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 428,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0409.json b/res/field/events/events_0409.json
index e5d9700564..aee39cf130 100644
--- a/res/field/events/events_0409.json
+++ b/res/field/events/events_0409.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -26,8 +26,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 14,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 426,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0410.json b/res/field/events/events_0410.json
index 4298892be0..5d1199c5e7 100644
--- a/res/field/events/events_0410.json
+++ b/res/field/events/events_0410.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 426,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0411.json b/res/field/events/events_0411.json
index bae54b2866..b46567609b 100644
--- a/res/field/events/events_0411.json
+++ b/res/field/events/events_0411.json
@@ -12,8 +12,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 72,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 426,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0412.json b/res/field/events/events_0412.json
index cfae40ecd2..edd211ee8b 100644
--- a/res/field/events/events_0412.json
+++ b/res/field/events/events_0412.json
@@ -4,8 +4,8 @@
             "script": 8034,
             "type": 2,
             "x": 594,
-            "y": 640,
-            "z": 0,
+            "z": 640,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 563,
-            "y": 652,
-            "z": 7
+            "z": 652,
+            "y": 7
         },
         {
             "graphics_id": 2,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 551,
-            "y": 658,
-            "z": 7
+            "z": 658,
+            "y": 7
         },
         {
             "graphics_id": 41,
@@ -49,8 +49,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 569,
-            "y": 659,
-            "z": 7
+            "z": 659,
+            "y": 7
         },
         {
             "graphics_id": 17,
@@ -63,8 +63,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 555,
-            "y": 648,
-            "z": 0
+            "z": 648,
+            "y": 0
         },
         {
             "graphics_id": 91,
@@ -73,12 +73,14 @@
             "flag": 0,
             "script": 7,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 564,
-            "y": 667,
-            "z": 0
+            "z": 667,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -91,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 556,
-            "y": 645,
-            "z": 0
+            "z": 645,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -105,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 569,
-            "y": 656,
-            "z": 0
+            "z": 656,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -119,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 559,
-            "y": 653,
-            "z": 7
+            "z": 653,
+            "y": 7
         },
         {
             "graphics_id": 50,
@@ -133,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 558,
-            "y": 659,
-            "z": 7
+            "z": 659,
+            "y": 7
         },
         {
             "graphics_id": 100,
@@ -143,12 +145,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [34],
+            "data": [
+                34
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 565,
-            "y": 663,
-            "z": 0
+            "z": 663,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -157,12 +161,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [35],
+            "data": [
+                35
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 566,
-            "y": 663,
-            "z": 0
+            "z": 663,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -171,12 +177,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [36],
+            "data": [
+                36
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 567,
-            "y": 663,
-            "z": 0
+            "z": 663,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -185,12 +193,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [37],
+            "data": [
+                37
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 568,
-            "y": 663,
-            "z": 0
+            "z": 663,
+            "y": 0
         },
         {
             "local_id": 10,
@@ -200,12 +210,14 @@
             "flag": 356,
             "script": 65535,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 563,
-            "y": 678,
-            "z": 0
+            "z": 678,
+            "y": 0
         },
         {
             "graphics_id": 41,
@@ -218,8 +230,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 569,
-            "y": 650,
-            "z": 7
+            "z": 650,
+            "y": 7
         },
         {
             "graphics_id": 206,
@@ -232,8 +244,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 549,
-            "y": 659,
-            "z": 0
+            "z": 659,
+            "y": 0
         },
         {
             "graphics_id": 206,
@@ -246,8 +258,8 @@
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 552,
-            "y": 652,
-            "z": 0
+            "z": 652,
+            "y": 0
         },
         {
             "graphics_id": 204,
@@ -260,8 +272,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 553,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -274,8 +286,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 560,
-            "y": 659,
-            "z": 7
+            "z": 659,
+            "y": 7
         },
         {
             "graphics_id": 87,
@@ -288,8 +300,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 584,
-            "y": 662,
-            "z": 0
+            "z": 662,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -302,62 +314,62 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 594,
-            "y": 653,
-            "z": 0
+            "z": 653,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 553,
-            "y": 645,
+            "z": 645,
             "dest_header_id": 437,
             "dest_warp_id": 0
         },
         {
             "x": 579,
-            "y": 648,
+            "z": 648,
             "dest_header_id": 438,
             "dest_warp_id": 0
         },
         {
             "x": 571,
-            "y": 656,
+            "z": 656,
             "dest_header_id": 439,
             "dest_warp_id": 0
         },
         {
             "x": 565,
-            "y": 646,
+            "z": 646,
             "dest_header_id": 440,
             "dest_warp_id": 0
         },
         {
             "x": 581,
-            "y": 656,
+            "z": 656,
             "dest_header_id": 441,
             "dest_warp_id": 0
         },
         {
             "x": 566,
-            "y": 656,
+            "z": 656,
             "dest_header_id": 435,
             "dest_warp_id": 0
         },
         {
             "x": 571,
-            "y": 665,
+            "z": 665,
             "dest_header_id": 434,
             "dest_warp_id": 0
         },
         {
             "x": 597,
-            "y": 652,
+            "z": 652,
             "dest_header_id": 225,
             "dest_warp_id": 0
         },
         {
             "x": 595,
-            "y": 655,
+            "z": 655,
             "dest_header_id": 226,
             "dest_warp_id": 0
         }
@@ -366,12 +378,12 @@
         {
             "script": 12,
             "x": 557,
-            "y": 669,
+            "z": 669,
+            "y": 0,
             "width": 7,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16499
+            "var": 16499,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0413.json b/res/field/events/events_0413.json
index 8dc4e0bbbf..3508a4f452 100644
--- a/res/field/events/events_0413.json
+++ b/res/field/events/events_0413.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 24,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -68,14 +68,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 433,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0414.json b/res/field/events/events_0414.json
index 6278cfb06b..045d0e2689 100644
--- a/res/field/events/events_0414.json
+++ b/res/field/events/events_0414.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -82,26 +82,26 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 433,
             "dest_warp_id": 5
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 436,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 487,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0415.json b/res/field/events/events_0415.json
index c06e49aa35..e381611bb8 100644
--- a/res/field/events/events_0415.json
+++ b/res/field/events/events_0415.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 435,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0416.json b/res/field/events/events_0416.json
index 592881a247..6a8a7819ca 100644
--- a/res/field/events/events_0416.json
+++ b/res/field/events/events_0416.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 11,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -35,14 +35,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 9,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 433,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0417.json b/res/field/events/events_0417.json
index 7120737a7c..711fd9b3f9 100644
--- a/res/field/events/events_0417.json
+++ b/res/field/events/events_0417.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 433,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0418.json b/res/field/events/events_0418.json
index 4d7fe89b54..caec942e1b 100644
--- a/res/field/events/events_0418.json
+++ b/res/field/events/events_0418.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 1,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 2
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -35,14 +35,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 433,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0419.json b/res/field/events/events_0419.json
index 3477cb0f2b..773b775dc0 100644
--- a/res/field/events/events_0419.json
+++ b/res/field/events/events_0419.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 433,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0420.json b/res/field/events/events_0420.json
index 673931bb1b..8bbec7ff10 100644
--- a/res/field/events/events_0420.json
+++ b/res/field/events/events_0420.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 433,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0421.json b/res/field/events/events_0421.json
index 109cc05e28..b92231aa69 100644
--- a/res/field/events/events_0421.json
+++ b/res/field/events/events_0421.json
@@ -4,56 +4,56 @@
             "script": 11,
             "type": 0,
             "x": 459,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 460,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 11,
             "type": 0,
             "x": 461,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 465,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 466,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 467,
-            "y": 521,
-            "z": 0,
+            "z": 521,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8273,
             "type": 2,
             "x": 457,
-            "y": 523,
-            "z": 0,
+            "z": 523,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -69,8 +69,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 469,
-            "y": 518,
-            "z": 7
+            "z": 518,
+            "y": 7
         },
         {
             "graphics_id": 1,
@@ -83,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 454,
-            "y": 541,
-            "z": 0
+            "z": 541,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -97,8 +97,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 463,
-            "y": 522,
-            "z": 7
+            "z": 522,
+            "y": 7
         },
         {
             "graphics_id": 18,
@@ -111,8 +111,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 462,
-            "y": 538,
-            "z": 7
+            "z": 538,
+            "y": 7
         },
         {
             "graphics_id": 138,
@@ -125,8 +125,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 466,
-            "y": 522,
-            "z": 7
+            "z": 522,
+            "y": 7
         },
         {
             "graphics_id": 91,
@@ -135,12 +135,14 @@
             "flag": 0,
             "script": 10,
             "initial_dir": 0,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 466,
-            "y": 537,
-            "z": 0
+            "z": 537,
+            "y": 0
         },
         {
             "local_id": 11,
@@ -150,12 +152,14 @@
             "flag": 363,
             "script": 65535,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 488,
-            "y": 529,
-            "z": 0
+            "z": 529,
+            "y": 0
         },
         {
             "local_id": 20,
@@ -165,12 +169,14 @@
             "flag": 366,
             "script": 65535,
             "initial_dir": 0,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 440,
-            "y": 526,
-            "z": 0
+            "z": 526,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -183,8 +189,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 454,
-            "y": 516,
-            "z": 0
+            "z": 516,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -197,8 +203,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 476,
-            "y": 542,
-            "z": 0
+            "z": 542,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -211,8 +217,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 470,
-            "y": 542,
-            "z": 0
+            "z": 542,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -225,44 +231,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 469,
-            "y": 533,
-            "z": 0
+            "z": 533,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 463,
-            "y": 515,
+            "z": 515,
             "dest_header_id": 445,
             "dest_warp_id": 0
         },
         {
             "x": 450,
-            "y": 515,
+            "z": 515,
             "dest_header_id": 446,
             "dest_warp_id": 0
         },
         {
             "x": 473,
-            "y": 515,
+            "z": 515,
             "dest_header_id": 447,
             "dest_warp_id": 0
         },
         {
             "x": 454,
-            "y": 538,
+            "z": 538,
             "dest_header_id": 448,
             "dest_warp_id": 0
         },
         {
             "x": 463,
-            "y": 521,
+            "z": 521,
             "dest_header_id": 449,
             "dest_warp_id": 0
         },
         {
             "x": 472,
-            "y": 538,
+            "z": 538,
             "dest_header_id": 443,
             "dest_warp_id": 0
         }
@@ -271,12 +277,12 @@
         {
             "script": 3,
             "x": 463,
-            "y": 538,
+            "z": 538,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16625
+            "var": 16625,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0422.json b/res/field/events/events_0422.json
index f9968e547f..7f7b71c6ea 100644
--- a/res/field/events/events_0422.json
+++ b/res/field/events/events_0422.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 10,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -54,8 +54,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -82,26 +82,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 442,
             "dest_warp_id": 5
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 444,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 488,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0423.json b/res/field/events/events_0423.json
index 129a316a65..3568c6fda8 100644
--- a/res/field/events/events_0423.json
+++ b/res/field/events/events_0423.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 443,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0424.json b/res/field/events/events_0424.json
index 96a73ce7ae..56d3b39702 100644
--- a/res/field/events/events_0424.json
+++ b/res/field/events/events_0424.json
@@ -4,8 +4,8 @@
             "script": 4,
             "type": 0,
             "x": 8,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -35,8 +35,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -49,8 +49,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -63,14 +63,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 442,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0425.json b/res/field/events/events_0425.json
index ba93b80a72..0e7aadafad 100644
--- a/res/field/events/events_0425.json
+++ b/res/field/events/events_0425.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 168,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 442,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0426.json b/res/field/events/events_0426.json
index 9b524b736c..31069ee81d 100644
--- a/res/field/events/events_0426.json
+++ b/res/field/events/events_0426.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -26,14 +26,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 442,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0427.json b/res/field/events/events_0427.json
index cba75e6f0d..44921aad55 100644
--- a/res/field/events/events_0427.json
+++ b/res/field/events/events_0427.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 442,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0428.json b/res/field/events/events_0428.json
index bc3b097887..b73dc39437 100644
--- a/res/field/events/events_0428.json
+++ b/res/field/events/events_0428.json
@@ -4,16 +4,16 @@
             "script": 1,
             "type": 0,
             "x": 9,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 1,
             "type": 0,
             "x": 10,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 120,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 138,
@@ -57,14 +57,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 10,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 442,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0429.json b/res/field/events/events_0429.json
index c6b56f013d..9e0cbc0185 100644
--- a/res/field/events/events_0429.json
+++ b/res/field/events/events_0429.json
@@ -4,16 +4,16 @@
             "script": 8131,
             "type": 2,
             "x": 649,
-            "y": 346,
-            "z": 0,
+            "z": 346,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 7,
             "type": 0,
             "x": 652,
-            "y": 338,
-            "z": 0,
+            "z": 338,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 5,
             "initial_dir": 0,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 646,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -43,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 660,
-            "y": 327,
-            "z": 0
+            "z": 327,
+            "y": 0
         },
         {
             "graphics_id": 182,
@@ -57,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 652,
-            "y": 327,
-            "z": 0
+            "z": 327,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -71,8 +73,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 659,
-            "y": 350,
-            "z": 0
+            "z": 350,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -85,8 +87,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 652,
-            "y": 341,
-            "z": 0
+            "z": 341,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -99,8 +101,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 667,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         },
         {
             "local_id": 0,
@@ -110,12 +112,14 @@
             "flag": 469,
             "script": 65535,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 679,
-            "y": 340,
-            "z": 0
+            "z": 340,
+            "y": 0
         },
         {
             "graphics_id": 23,
@@ -128,8 +132,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 651,
-            "y": 348,
-            "z": 0
+            "z": 348,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -142,8 +146,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 652,
-            "y": 339,
-            "z": 0
+            "z": 339,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -156,8 +160,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 662,
-            "y": 335,
-            "z": 0
+            "z": 335,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -170,8 +174,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 649,
-            "y": 324,
-            "z": 0
+            "z": 324,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -184,38 +188,38 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 651,
-            "y": 339,
-            "z": 0
+            "z": 339,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 652,
-            "y": 338,
+            "z": 338,
             "dest_header_id": 454,
             "dest_warp_id": 0
         },
         {
             "x": 655,
-            "y": 348,
+            "z": 348,
             "dest_header_id": 455,
             "dest_warp_id": 0
         },
         {
             "x": 656,
-            "y": 325,
+            "z": 325,
             "dest_header_id": 456,
             "dest_warp_id": 0
         },
         {
             "x": 659,
-            "y": 338,
+            "z": 338,
             "dest_header_id": 452,
             "dest_warp_id": 0
         },
         {
             "x": 663,
-            "y": 338,
+            "z": 338,
             "dest_header_id": 451,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0430.json b/res/field/events/events_0430.json
index 098fc661c4..de073fb4e7 100644
--- a/res/field/events/events_0430.json
+++ b/res/field/events/events_0430.json
@@ -12,8 +12,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 8,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 193,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 450,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0431.json b/res/field/events/events_0431.json
index f486463b38..ae0e5d3c18 100644
--- a/res/field/events/events_0431.json
+++ b/res/field/events/events_0431.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -54,26 +54,26 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 450,
             "dest_warp_id": 3
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 453,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 489,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0432.json b/res/field/events/events_0432.json
index 69548c30b7..a63299f8a5 100644
--- a/res/field/events/events_0432.json
+++ b/res/field/events/events_0432.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 452,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0433.json b/res/field/events/events_0433.json
index 0de5d2e50b..e9152b6e0b 100644
--- a/res/field/events/events_0433.json
+++ b/res/field/events/events_0433.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 103,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 104,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 105,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 450,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0434.json b/res/field/events/events_0434.json
index 8f02810506..7cb66e5042 100644
--- a/res/field/events/events_0434.json
+++ b/res/field/events/events_0434.json
@@ -12,14 +12,14 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 450,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0435.json b/res/field/events/events_0435.json
index 96128731f4..a80015721f 100644
--- a/res/field/events/events_0435.json
+++ b/res/field/events/events_0435.json
@@ -4,16 +4,16 @@
             "script": 2052,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 1,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 2
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -43,14 +43,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 450,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0436.json b/res/field/events/events_0436.json
index 225e2ccea6..8cd18660f8 100644
--- a/res/field/events/events_0436.json
+++ b/res/field/events/events_0436.json
@@ -4,16 +4,16 @@
             "script": 8146,
             "type": 2,
             "x": 822,
-            "y": 473,
-            "z": 0,
+            "z": 473,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8145,
             "type": 2,
             "x": 822,
-            "y": 445,
-            "z": 0,
+            "z": 445,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 5,
             "initial_dir": 0,
-            "data": [7],
+            "data": [
+                7
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 805,
-            "y": 451,
-            "z": 0
+            "z": 451,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 813,
-            "y": 457,
-            "z": 0
+            "z": 457,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -57,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 815,
-            "y": 462,
-            "z": 0
+            "z": 462,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -71,8 +73,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 806,
-            "y": 458,
-            "z": 0
+            "z": 458,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -85,8 +87,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 822,
-            "y": 459,
-            "z": 0
+            "z": 459,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -99,8 +101,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 809,
-            "y": 477,
-            "z": 0
+            "z": 477,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -113,8 +115,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 806,
-            "y": 471,
-            "z": 0
+            "z": 471,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -123,12 +125,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [110],
+            "data": [
+                110
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 828,
-            "y": 469,
-            "z": 0
+            "z": 469,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -137,12 +141,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [111],
+            "data": [
+                111
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 816,
-            "y": 469,
-            "z": 0
+            "z": 469,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -151,12 +157,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [112],
+            "data": [
+                112
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 817,
-            "y": 469,
-            "z": 0
+            "z": 469,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -165,12 +173,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [113],
+            "data": [
+                113
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 827,
-            "y": 469,
-            "z": 0
+            "z": 469,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -183,8 +193,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 816,
-            "y": 455,
-            "z": 0
+            "z": 455,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -197,8 +207,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 810,
-            "y": 471,
-            "z": 0
+            "z": 471,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -211,8 +221,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 816,
-            "y": 473,
-            "z": 0
+            "z": 473,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -225,8 +235,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 821,
-            "y": 473,
-            "z": 0
+            "z": 473,
+            "y": 0
         },
         {
             "graphics_id": 127,
@@ -239,8 +249,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 822,
-            "y": 473,
-            "z": 0
+            "z": 473,
+            "y": 0
         },
         {
             "graphics_id": 132,
@@ -253,8 +263,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 823,
-            "y": 473,
-            "z": 0
+            "z": 473,
+            "y": 0
         },
         {
             "graphics_id": 126,
@@ -267,8 +277,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 822,
-            "y": 472,
-            "z": 0
+            "z": 472,
+            "y": 0
         },
         {
             "graphics_id": 129,
@@ -281,32 +291,32 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 822,
-            "y": 474,
-            "z": 0
+            "z": 474,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 822,
-            "y": 469,
+            "z": 469,
             "dest_header_id": 464,
             "dest_warp_id": 0
         },
         {
             "x": 810,
-            "y": 455,
+            "z": 455,
             "dest_header_id": 465,
             "dest_warp_id": 0
         },
         {
             "x": 824,
-            "y": 453,
+            "z": 453,
             "dest_header_id": 461,
             "dest_warp_id": 0
         },
         {
             "x": 802,
-            "y": 472,
+            "z": 472,
             "dest_header_id": 459,
             "dest_warp_id": 0
         }
@@ -315,12 +325,12 @@
         {
             "script": 8,
             "x": 815,
-            "y": 472,
+            "z": 472,
+            "y": 0,
             "width": 1,
             "length": 3,
-            "z": 0,
-            "value": 0,
-            "var": 16584
+            "var": 16584,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0437.json b/res/field/events/events_0437.json
index ff62b5ae75..ce81651f38 100644
--- a/res/field/events/events_0437.json
+++ b/res/field/events/events_0437.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 433,
             "dest_warp_id": 6
         }
diff --git a/res/field/events/events_0438.json b/res/field/events/events_0438.json
index d58724c32f..74a6db16e3 100644
--- a/res/field/events/events_0438.json
+++ b/res/field/events/events_0438.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -40,8 +40,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 111,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 112,
@@ -68,26 +68,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 457,
             "dest_warp_id": 3
         },
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 460,
             "dest_warp_id": 0
         },
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 490,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0439.json b/res/field/events/events_0439.json
index 8464321a4c..4883d6339f 100644
--- a/res/field/events/events_0439.json
+++ b/res/field/events/events_0439.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 459,
             "dest_warp_id": 1
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0440.json b/res/field/events/events_0440.json
index 4f403e2560..68e4c7411f 100644
--- a/res/field/events/events_0440.json
+++ b/res/field/events/events_0440.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 83,
@@ -40,8 +40,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 23,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -54,8 +54,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 6,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 79,
@@ -68,8 +68,8 @@
             "movement_range_x": 1,
             "movement_range_y": 3,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 74,
@@ -82,20 +82,20 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 25,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 15,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 457,
             "dest_warp_id": 2
         },
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 463,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0441.json b/res/field/events/events_0441.json
index fcd005176e..a97f5b9feb 100644
--- a/res/field/events/events_0441.json
+++ b/res/field/events/events_0441.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -26,8 +26,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 12,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 463,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0442.json b/res/field/events/events_0442.json
index 0fbb68d0b6..c73dc08008 100644
--- a/res/field/events/events_0442.json
+++ b/res/field/events/events_0442.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0443.json b/res/field/events/events_0443.json
index ef194f15b0..bb41dae6bb 100644
--- a/res/field/events/events_0443.json
+++ b/res/field/events/events_0443.json
@@ -4,24 +4,24 @@
             "script": 44,
             "type": 0,
             "x": 11,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 44,
             "type": 0,
             "x": 13,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 44,
             "type": 0,
             "x": 12,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -37,8 +37,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 148,
@@ -51,8 +51,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 4,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -65,8 +65,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 17,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 140,
@@ -79,8 +79,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 126,
@@ -93,8 +93,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 127,
@@ -107,8 +107,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 130,
@@ -121,8 +121,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 129,
@@ -135,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 132,
@@ -149,8 +149,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 9,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 128,
@@ -163,8 +163,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 19,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 131,
@@ -177,8 +177,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 133,
@@ -191,8 +191,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 13,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 138,
@@ -205,8 +205,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 136,
@@ -219,8 +219,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -233,8 +233,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 9,
@@ -247,8 +247,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -261,14 +261,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 457,
             "dest_warp_id": 0
         }
@@ -277,52 +277,52 @@
         {
             "script": 17,
             "x": 10,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 6,
-            "var": 16399
+            "var": 16399,
+            "value": 6
         },
         {
             "script": 18,
             "x": 10,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 8,
-            "var": 16399
+            "var": 16399,
+            "value": 8
         },
         {
             "script": 19,
             "x": 10,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 10,
-            "var": 16399
+            "var": 16399,
+            "value": 10
         },
         {
             "script": 20,
             "x": 10,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 12,
-            "var": 16399
+            "var": 16399,
+            "value": 12
         },
         {
             "script": 43,
             "x": 11,
-            "y": 11,
+            "z": 11,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16545
+            "var": 16545,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0444.json b/res/field/events/events_0444.json
index 754b1961a6..0081365b62 100644
--- a/res/field/events/events_0444.json
+++ b/res/field/events/events_0444.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 457,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0445.json b/res/field/events/events_0445.json
index feacfff2b3..4cd5473e62 100644
--- a/res/field/events/events_0445.json
+++ b/res/field/events/events_0445.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -418,8 +418,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -432,8 +432,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -446,8 +446,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -460,8 +460,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -474,8 +474,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -488,8 +488,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -502,8 +502,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -516,8 +516,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -530,8 +530,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -544,8 +544,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -558,8 +558,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -572,8 +572,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -586,8 +586,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -600,8 +600,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -614,8 +614,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -628,8 +628,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -642,8 +642,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -656,8 +656,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -670,8 +670,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -684,8 +684,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -698,8 +698,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -712,14 +712,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 421,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0446.json b/res/field/events/events_0446.json
index 0ad29920f0..996d52f564 100644
--- a/res/field/events/events_0446.json
+++ b/res/field/events/events_0446.json
@@ -4,16 +4,16 @@
             "script": 8048,
             "type": 2,
             "x": 181,
-            "y": 922,
-            "z": 0,
+            "z": 922,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8169,
             "type": 2,
             "x": 175,
-            "y": 889,
-            "z": 0,
+            "z": 889,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3159,
             "initial_dir": 0,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 211,
-            "y": 917,
-            "z": 0
+            "z": 917,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -39,12 +41,15 @@
             "flag": 0,
             "script": 3160,
             "initial_dir": 2,
-            "data": [1, 2],
+            "data": [
+                1,
+                2
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 198,
-            "y": 911,
-            "z": 0
+            "z": 911,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -53,12 +58,14 @@
             "flag": 0,
             "script": 3161,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 7,
             "movement_range_y": 0,
             "x": 175,
-            "y": 905,
-            "z": 0
+            "z": 905,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -67,12 +74,14 @@
             "flag": 0,
             "script": 3162,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 5,
             "movement_range_y": 0,
             "x": 169,
-            "y": 907,
-            "z": 0
+            "z": 907,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -81,12 +90,14 @@
             "flag": 0,
             "script": 3158,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 185,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -95,12 +106,14 @@
             "flag": 0,
             "script": 3163,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 6,
             "movement_range_y": 1,
             "x": 204,
-            "y": 903,
-            "z": 0
+            "z": 903,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -109,12 +122,14 @@
             "flag": 0,
             "script": 3493,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 211,
-            "y": 911,
-            "z": 0
+            "z": 911,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -127,8 +142,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 199,
-            "y": 917,
-            "z": 0
+            "z": 917,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -141,8 +156,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 171,
-            "y": 918,
-            "z": 0
+            "z": 918,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -155,8 +170,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 180,
-            "y": 910,
-            "z": 0
+            "z": 910,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0447.json b/res/field/events/events_0447.json
index c028f770d6..435fb71095 100644
--- a/res/field/events/events_0447.json
+++ b/res/field/events/events_0447.json
@@ -4,16 +4,16 @@
             "script": 8112,
             "type": 2,
             "x": 849,
-            "y": 727,
-            "z": 0,
+            "z": 727,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8267,
             "type": 2,
             "x": 842,
-            "y": 656,
-            "z": 0,
+            "z": 656,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -25,12 +25,14 @@
             "flag": 0,
             "script": 3182,
             "initial_dir": 1,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 837,
-            "y": 664,
-            "z": 0
+            "z": 664,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -39,12 +41,14 @@
             "flag": 0,
             "script": 3183,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 844,
-            "y": 682,
-            "z": 0
+            "z": 682,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -53,12 +57,14 @@
             "flag": 0,
             "script": 3184,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 861,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -67,12 +73,14 @@
             "flag": 0,
             "script": 3185,
             "initial_dir": 2,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 854,
-            "y": 689,
-            "z": 0
+            "z": 689,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -81,12 +89,14 @@
             "flag": 0,
             "script": 3186,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 6,
             "movement_range_y": 0,
             "x": 850,
-            "y": 622,
-            "z": 0
+            "z": 622,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -95,12 +105,14 @@
             "flag": 0,
             "script": 3187,
             "initial_dir": 3,
-            "data": [5],
+            "data": [
+                5
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 844,
-            "y": 698,
-            "z": 0
+            "z": 698,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -109,12 +121,14 @@
             "flag": 0,
             "script": 3188,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 8,
             "movement_range_y": 0,
             "x": 847,
-            "y": 723,
-            "z": 0
+            "z": 723,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -123,12 +137,14 @@
             "flag": 0,
             "script": 3189,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 851,
-            "y": 715,
-            "z": 0
+            "z": 715,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -137,12 +153,14 @@
             "flag": 0,
             "script": 3190,
             "initial_dir": 3,
-            "data": [6],
+            "data": [
+                6
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 847,
-            "y": 689,
-            "z": 0
+            "z": 689,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -151,12 +169,15 @@
             "flag": 0,
             "script": 3191,
             "initial_dir": 3,
-            "data": [4, 5],
+            "data": [
+                4,
+                5
+            ],
             "movement_range_x": 5,
             "movement_range_y": 0,
             "x": 848,
-            "y": 668,
-            "z": 0
+            "z": 668,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -165,12 +186,14 @@
             "flag": 0,
             "script": 3192,
             "initial_dir": 2,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 7,
             "movement_range_y": 5,
             "x": 855,
-            "y": 636,
-            "z": 0
+            "z": 636,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -179,12 +202,14 @@
             "flag": 0,
             "script": 3193,
             "initial_dir": 2,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 843,
-            "y": 642,
-            "z": 0
+            "z": 642,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -197,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 840,
-            "y": 684,
-            "z": 0
+            "z": 684,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -211,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 850,
-            "y": 649,
-            "z": 0
+            "z": 649,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -221,12 +246,14 @@
             "flag": 0,
             "script": 3481,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 847,
-            "y": 655,
-            "z": 0
+            "z": 655,
+            "y": 0
         },
         {
             "local_id": 9,
@@ -240,8 +267,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 853,
-            "y": 740,
-            "z": 0
+            "z": 740,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -254,8 +281,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 842,
-            "y": 636,
-            "z": 0
+            "z": 636,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -268,8 +295,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 858,
-            "y": 630,
-            "z": 0
+            "z": 630,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0448.json b/res/field/events/events_0448.json
index 4ec4819b2b..41446485bb 100644
--- a/res/field/events/events_0448.json
+++ b/res/field/events/events_0448.json
@@ -4,40 +4,40 @@
             "script": 8135,
             "type": 2,
             "x": 715,
-            "y": 345,
-            "z": 0,
+            "z": 345,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8132,
             "type": 2,
             "x": 719,
-            "y": 333,
-            "z": 0,
+            "z": 333,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8134,
             "type": 2,
             "x": 724,
-            "y": 334,
-            "z": 0,
+            "z": 334,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8133,
             "type": 2,
             "x": 723,
-            "y": 331,
-            "z": 0,
+            "z": 331,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8159,
             "type": 2,
             "x": 744,
-            "y": 326,
-            "z": 0,
+            "z": 326,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -49,12 +49,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 679,
-            "y": 341,
-            "z": 0
+            "z": 341,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -67,8 +69,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 717,
-            "y": 339,
-            "z": 0
+            "z": 339,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -81,8 +83,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 690,
-            "y": 344,
-            "z": 0
+            "z": 344,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -95,8 +97,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 693,
-            "y": 333,
-            "z": 0
+            "z": 333,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -105,12 +107,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [98],
+            "data": [
+                98
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 689,
-            "y": 328,
-            "z": 0
+            "z": 328,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -119,12 +123,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [99],
+            "data": [
+                99
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 692,
-            "y": 328,
-            "z": 0
+            "z": 328,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -133,12 +139,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [100],
+            "data": [
+                100
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 690,
-            "y": 328,
-            "z": 0
+            "z": 328,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -147,12 +155,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [101],
+            "data": [
+                101
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 691,
-            "y": 328,
-            "z": 0
+            "z": 328,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -161,12 +171,14 @@
             "flag": 0,
             "script": 3603,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 727,
-            "y": 342,
-            "z": 0
+            "z": 342,
+            "y": 0
         },
         {
             "local_id": 0,
@@ -176,12 +188,14 @@
             "flag": 403,
             "script": 65535,
             "initial_dir": 0,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 755,
-            "y": 314,
-            "z": 0
+            "z": 314,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -190,12 +204,14 @@
             "flag": 0,
             "script": 3567,
             "initial_dir": 2,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 4,
             "movement_range_y": 0,
             "x": 689,
-            "y": 335,
-            "z": 0
+            "z": 335,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -204,12 +220,14 @@
             "flag": 0,
             "script": 3554,
             "initial_dir": 2,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 707,
-            "y": 331,
-            "z": 0
+            "z": 331,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -218,12 +236,14 @@
             "flag": 0,
             "script": 3559,
             "initial_dir": 1,
-            "data": [1],
+            "data": [
+                1
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 707,
-            "y": 329,
-            "z": 0
+            "z": 329,
+            "y": 0
         },
         {
             "local_id": 5,
@@ -237,8 +257,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 667,
-            "y": 338,
-            "z": 0
+            "z": 338,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -247,12 +267,14 @@
             "flag": 0,
             "script": 2,
             "initial_dir": 0,
-            "data": [18],
+            "data": [
+                18
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 760,
-            "y": 327,
-            "z": 0
+            "z": 327,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -261,30 +283,32 @@
             "flag": 0,
             "script": 3599,
             "initial_dir": 1,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 760,
-            "y": 342,
-            "z": 0
+            "z": 342,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 739,
-            "y": 339,
+            "z": 339,
             "dest_header_id": 499,
             "dest_warp_id": 0
         },
         {
             "x": 767,
-            "y": 330,
+            "z": 330,
             "dest_header_id": 501,
             "dest_warp_id": 0
         },
         {
             "x": 767,
-            "y": 331,
+            "z": 331,
             "dest_header_id": 501,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0449.json b/res/field/events/events_0449.json
index 2309402959..070508bd9a 100644
--- a/res/field/events/events_0449.json
+++ b/res/field/events/events_0449.json
@@ -4,16 +4,16 @@
             "script": 8147,
             "type": 2,
             "x": 718,
-            "y": 419,
-            "z": 0,
+            "z": 419,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 8148,
             "type": 2,
             "x": 725,
-            "y": 427,
-            "z": 0,
+            "z": 427,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 710,
-            "y": 425,
-            "z": 0
+            "z": 425,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 716,
-            "y": 419,
-            "z": 0
+            "z": 419,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 725,
-            "y": 428,
-            "z": 0
+            "z": 428,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 729,
-            "y": 431,
-            "z": 0
+            "z": 431,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -85,8 +85,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 727,
-            "y": 427,
-            "z": 0
+            "z": 427,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -95,12 +95,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [114],
+            "data": [
+                114
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 684,
-            "y": 420,
-            "z": 0
+            "z": 420,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -109,12 +111,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [115],
+            "data": [
+                115
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 685,
-            "y": 420,
-            "z": 0
+            "z": 420,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -123,12 +127,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [116],
+            "data": [
+                116
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 686,
-            "y": 420,
-            "z": 0
+            "z": 420,
+            "y": 0
         },
         {
             "graphics_id": 100,
@@ -137,12 +143,14 @@
             "flag": 0,
             "script": 2800,
             "initial_dir": 0,
-            "data": [117],
+            "data": [
+                117
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 687,
-            "y": 420,
-            "z": 0
+            "z": 420,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -151,12 +159,14 @@
             "flag": 0,
             "script": 3596,
             "initial_dir": 1,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 10,
             "movement_range_y": 2,
             "x": 731,
-            "y": 440,
-            "z": 0
+            "z": 440,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -165,12 +175,14 @@
             "flag": 0,
             "script": 3600,
             "initial_dir": 3,
-            "data": [3],
+            "data": [
+                3
+            ],
             "movement_range_x": 13,
             "movement_range_y": 6,
             "x": 734,
-            "y": 433,
-            "z": 0
+            "z": 433,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -179,12 +191,14 @@
             "flag": 0,
             "script": 3597,
             "initial_dir": 3,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 1,
             "movement_range_y": 8,
             "x": 750,
-            "y": 430,
-            "z": 0
+            "z": 430,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -193,12 +207,14 @@
             "flag": 0,
             "script": 3601,
             "initial_dir": 0,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 699,
-            "y": 438,
-            "z": 0
+            "z": 438,
+            "y": 0
         },
         {
             "graphics_id": 46,
@@ -207,12 +223,14 @@
             "flag": 0,
             "script": 3598,
             "initial_dir": 1,
-            "data": [4],
+            "data": [
+                4
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 699,
-            "y": 433,
-            "z": 0
+            "z": 433,
+            "y": 0
         },
         {
             "graphics_id": 47,
@@ -221,12 +239,15 @@
             "flag": 0,
             "script": 3602,
             "initial_dir": 3,
-            "data": [3, 3],
+            "data": [
+                3,
+                3
+            ],
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 738,
-            "y": 425,
-            "z": 0
+            "z": 425,
+            "y": 0
         },
         {
             "graphics_id": 94,
@@ -235,12 +256,14 @@
             "flag": 0,
             "script": 1,
             "initial_dir": 0,
-            "data": [2],
+            "data": [
+                2
+            ],
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 680,
-            "y": 429,
-            "z": 0
+            "z": 429,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -253,8 +276,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 682,
-            "y": 430,
-            "z": 0
+            "z": 430,
+            "y": 0
         },
         {
             "graphics_id": 62,
@@ -267,8 +290,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 682,
-            "y": 431,
-            "z": 0
+            "z": 431,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -281,8 +304,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 708,
-            "y": 431,
-            "z": 0
+            "z": 431,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0451.json b/res/field/events/events_0451.json
index 15fe614890..98d3c1c913 100644
--- a/res/field/events/events_0451.json
+++ b/res/field/events/events_0451.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 6,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0452.json b/res/field/events/events_0452.json
index 9418d60f8a..ea6427890d 100644
--- a/res/field/events/events_0452.json
+++ b/res/field/events/events_0452.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 36,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0453.json b/res/field/events/events_0453.json
index 44af604e16..64f591f36a 100644
--- a/res/field/events/events_0453.json
+++ b/res/field/events/events_0453.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 7,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 48,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0454.json b/res/field/events/events_0454.json
index 9db975f667..7e43490822 100644
--- a/res/field/events/events_0454.json
+++ b/res/field/events/events_0454.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 69,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0455.json b/res/field/events/events_0455.json
index 9e90db9f09..30a06ea92b 100644
--- a/res/field/events/events_0455.json
+++ b/res/field/events/events_0455.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 101,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0456.json b/res/field/events/events_0456.json
index 6db9cb070d..f9172c7c04 100644
--- a/res/field/events/events_0456.json
+++ b/res/field/events/events_0456.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 123,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0457.json b/res/field/events/events_0457.json
index fd5cf6729d..8428fa63a1 100644
--- a/res/field/events/events_0457.json
+++ b/res/field/events/events_0457.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 134,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0458.json b/res/field/events/events_0458.json
index 549bb9efad..4dc6084d6c 100644
--- a/res/field/events/events_0458.json
+++ b/res/field/events/events_0458.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 151,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0459.json b/res/field/events/events_0459.json
index 2b7e823873..b90a8c135b 100644
--- a/res/field/events/events_0459.json
+++ b/res/field/events/events_0459.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 168,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0460.json b/res/field/events/events_0460.json
index 4baca33b84..fd3ee892ce 100644
--- a/res/field/events/events_0460.json
+++ b/res/field/events/events_0460.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 173,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0461.json b/res/field/events/events_0461.json
index e37ef2df42..32b10006a8 100644
--- a/res/field/events/events_0461.json
+++ b/res/field/events/events_0461.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 189,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0462.json b/res/field/events/events_0462.json
index 019bd63d27..21a196a6fb 100644
--- a/res/field/events/events_0462.json
+++ b/res/field/events/events_0462.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 420,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0463.json b/res/field/events/events_0463.json
index a658273dd3..349589a9eb 100644
--- a/res/field/events/events_0463.json
+++ b/res/field/events/events_0463.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 428,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0464.json b/res/field/events/events_0464.json
index d53e0d725b..1adfc06c6c 100644
--- a/res/field/events/events_0464.json
+++ b/res/field/events/events_0464.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 435,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0465.json b/res/field/events/events_0465.json
index d55dfce136..4357a0b1ed 100644
--- a/res/field/events/events_0465.json
+++ b/res/field/events/events_0465.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 443,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0466.json b/res/field/events/events_0466.json
index 7084e98c0b..949e43c2a0 100644
--- a/res/field/events/events_0466.json
+++ b/res/field/events/events_0466.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 235,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 452,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0467.json b/res/field/events/events_0467.json
index 010e9f7713..99bf5f21d4 100644
--- a/res/field/events/events_0467.json
+++ b/res/field/events/events_0467.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 235,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 459,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0468.json b/res/field/events/events_0468.json
index 5b6f05fda4..5af4857e11 100644
--- a/res/field/events/events_0468.json
+++ b/res/field/events/events_0468.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 33,
             "dest_warp_id": 10
         }
diff --git a/res/field/events/events_0469.json b/res/field/events/events_0469.json
index fb50d285b8..6d855508a9 100644
--- a/res/field/events/events_0469.json
+++ b/res/field/events/events_0469.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 164,
@@ -82,14 +82,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 5,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 362,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0470.json b/res/field/events/events_0470.json
index 8056db9f9b..3d223f537f 100644
--- a/res/field/events/events_0470.json
+++ b/res/field/events/events_0470.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 1,
-            "z": 0
+            "z": 1,
+            "y": 0
         },
         {
             "graphics_id": 141,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 145,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 142,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 143,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 144,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0471.json b/res/field/events/events_0471.json
index 593735a26d..f99c8101d9 100644
--- a/res/field/events/events_0471.json
+++ b/res/field/events/events_0471.json
@@ -4,32 +4,32 @@
             "script": 4,
             "type": 0,
             "x": 8,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 5,
             "type": 0,
             "x": 2,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 6,
             "type": 0,
             "x": 14,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 10,
             "type": 0,
             "x": 8,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -45,8 +45,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 153,
@@ -59,8 +59,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 152,
@@ -73,8 +73,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 151,
@@ -87,8 +87,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 214,
@@ -101,14 +101,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 13,
+            "z": 13,
             "dest_header_id": 497,
             "dest_warp_id": 1
         }
@@ -117,12 +117,12 @@
         {
             "script": 14,
             "x": 8,
-            "y": 13,
+            "z": 13,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16653
+            "var": 16653,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0472.json b/res/field/events/events_0472.json
index d8df8527c9..99148d1c5c 100644
--- a/res/field/events/events_0472.json
+++ b/res/field/events/events_0472.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,20 +40,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 2,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 175,
             "dest_warp_id": 2
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 466,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0473.json b/res/field/events/events_0473.json
index 96de9cf5e1..914ee01910 100644
--- a/res/field/events/events_0473.json
+++ b/res/field/events/events_0473.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 27,
@@ -40,14 +40,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 14,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 175,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0474.json b/res/field/events/events_0474.json
index bf62a1bc7c..cd9752e759 100644
--- a/res/field/events/events_0474.json
+++ b/res/field/events/events_0474.json
@@ -4,80 +4,80 @@
             "script": 3,
             "type": 0,
             "x": 10,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 11,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 17,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 18,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 21,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 22,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 25,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 26,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 29,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 3,
             "type": 0,
             "x": 30,
-            "y": 9,
-            "z": 0,
+            "z": 9,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -93,8 +93,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 8,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 30,
@@ -107,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 3,
             "x": 36,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -121,20 +121,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 308,
             "dest_warp_id": 1
         },
         {
             "x": 36,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 494,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0475.json b/res/field/events/events_0475.json
index 71ac2feff3..aeae582c98 100644
--- a/res/field/events/events_0475.json
+++ b/res/field/events/events_0475.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 400,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0476.json b/res/field/events/events_0476.json
index 155444ff9d..12e375b51c 100644
--- a/res/field/events/events_0476.json
+++ b/res/field/events/events_0476.json
@@ -4,8 +4,8 @@
             "script": 3,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 469,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0477.json b/res/field/events/events_0477.json
index 7e89841ca5..a032e8cbd6 100644
--- a/res/field/events/events_0477.json
+++ b/res/field/events/events_0477.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 403,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0478.json b/res/field/events/events_0478.json
index df579450ce..ade8b50921 100644
--- a/res/field/events/events_0478.json
+++ b/res/field/events/events_0478.json
@@ -12,8 +12,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 14,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 469,
             "dest_warp_id": 1
         },
         {
             "x": 10,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 406,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0479.json b/res/field/events/events_0479.json
index 17cfef3f94..b675670018 100644
--- a/res/field/events/events_0479.json
+++ b/res/field/events/events_0479.json
@@ -4,8 +4,8 @@
             "script": 2,
             "type": 0,
             "x": 4,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 406,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0480.json b/res/field/events/events_0480.json
index daed679c30..2c59f50d72 100644
--- a/res/field/events/events_0480.json
+++ b/res/field/events/events_0480.json
@@ -4,32 +4,32 @@
             "script": 4,
             "type": 0,
             "x": 5,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 5,
             "type": 0,
             "x": 1,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 3,
             "type": 0,
             "x": 7,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 2,
             "type": 0,
             "x": 9,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -45,14 +45,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 406,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0481.json b/res/field/events/events_0481.json
index 0b67e0a169..f97fef1256 100644
--- a/res/field/events/events_0481.json
+++ b/res/field/events/events_0481.json
@@ -4,16 +4,16 @@
             "script": 8803,
             "type": 0,
             "x": 62,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8210,
             "type": 2,
             "x": 33,
-            "y": 37,
-            "z": 0,
+            "z": 37,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 49,
-            "y": 54,
-            "z": 0
+            "z": 54,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 61,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 58,
-            "z": 0
+            "z": 58,
+            "y": 0
         },
         {
             "local_id": 1,
@@ -86,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 70,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0482.json b/res/field/events/events_0482.json
index d7187a1257..6c01681bce 100644
--- a/res/field/events/events_0482.json
+++ b/res/field/events/events_0482.json
@@ -4,16 +4,16 @@
             "script": 8804,
             "type": 0,
             "x": 69,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8211,
             "type": 2,
             "x": 90,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 76,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 70,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -57,8 +57,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 85,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "local_id": 2,
@@ -72,8 +72,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 61,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0483.json b/res/field/events/events_0483.json
index a40cae47fa..c5d90ef419 100644
--- a/res/field/events/events_0483.json
+++ b/res/field/events/events_0483.json
@@ -4,16 +4,16 @@
             "script": 8805,
             "type": 0,
             "x": 62,
-            "y": 80,
-            "z": 0,
+            "z": 80,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8212,
             "type": 2,
             "x": 49,
-            "y": 75,
-            "z": 0,
+            "z": 75,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 38,
-            "y": 79,
-            "z": 0
+            "z": 79,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 59,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 38,
-            "y": 75,
-            "z": 0
+            "z": 75,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 58,
-            "z": 0
+            "z": 58,
+            "y": 0
         },
         {
             "local_id": 2,
@@ -86,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 71,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0484.json b/res/field/events/events_0484.json
index 1630ffc476..747f555af5 100644
--- a/res/field/events/events_0484.json
+++ b/res/field/events/events_0484.json
@@ -4,16 +4,16 @@
             "script": 8806,
             "type": 0,
             "x": 69,
-            "y": 80,
-            "z": 0,
+            "z": 80,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8213,
             "type": 2,
             "x": 74,
-            "y": 76,
-            "z": 0,
+            "z": 76,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 80,
-            "y": 78,
-            "z": 0
+            "z": 78,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 83,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 71,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -71,8 +71,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 83,
-            "y": 82,
-            "z": 0
+            "z": 82,
+            "y": 0
         },
         {
             "local_id": 1,
@@ -86,8 +86,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 59,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0485.json b/res/field/events/events_0485.json
index be19baca76..b30341ee0e 100644
--- a/res/field/events/events_0485.json
+++ b/res/field/events/events_0485.json
@@ -4,16 +4,16 @@
             "script": 8807,
             "type": 0,
             "x": 62,
-            "y": 106,
-            "z": 0,
+            "z": 106,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8214,
             "type": 2,
             "x": 47,
-            "y": 120,
-            "z": 0,
+            "z": 120,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 112,
-            "z": 0
+            "z": 112,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 63,
-            "y": 113,
-            "z": 0
+            "z": 113,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -57,8 +57,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 62,
-            "y": 115,
-            "z": 0
+            "z": 115,
+            "y": 0
         },
         {
             "local_id": 1,
@@ -72,8 +72,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 113,
-            "z": 0
+            "z": 113,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0486.json b/res/field/events/events_0486.json
index 5875ff7b3c..04382b6015 100644
--- a/res/field/events/events_0486.json
+++ b/res/field/events/events_0486.json
@@ -4,16 +4,16 @@
             "script": 8808,
             "type": 0,
             "x": 69,
-            "y": 106,
-            "z": 0,
+            "z": 106,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 8215,
             "type": 2,
             "x": 91,
-            "y": 113,
-            "z": 0,
+            "z": 113,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -29,8 +29,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 91,
-            "y": 105,
-            "z": 0
+            "z": 105,
+            "y": 0
         },
         {
             "graphics_id": 93,
@@ -43,8 +43,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 113,
-            "z": 0
+            "z": 113,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -57,8 +57,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 74,
-            "y": 115,
-            "z": 0
+            "z": 115,
+            "y": 0
         },
         {
             "local_id": 2,
@@ -72,8 +72,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 62,
-            "y": 115,
-            "z": 0
+            "z": 115,
+            "y": 0
         },
         {
             "local_id": 1,
@@ -87,8 +87,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 63,
-            "y": 113,
-            "z": 0
+            "z": 113,
+            "y": 0
         },
         {
             "local_id": 2,
@@ -102,20 +102,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 86,
-            "z": 0
+            "z": 86,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 68,
-            "y": 118,
+            "z": 118,
             "dest_header_id": 125,
             "dest_warp_id": 2
         },
         {
             "x": 69,
-            "y": 118,
+            "z": 118,
             "dest_header_id": 125,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0487.json b/res/field/events/events_0487.json
index e34af5e130..0f931cd3cd 100644
--- a/res/field/events/events_0487.json
+++ b/res/field/events/events_0487.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 31,
-            "y": 27,
-            "z": 16
+            "z": 27,
+            "y": 16
         }
     ],
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 1
         }
@@ -28,12 +28,12 @@
         {
             "script": 2,
             "x": 30,
-            "y": 35,
+            "z": 35,
+            "y": 0,
             "width": 3,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16664
+            "var": 16664,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0488.json b/res/field/events/events_0488.json
index b8a8236b97..a52fd4bee3 100644
--- a/res/field/events/events_0488.json
+++ b/res/field/events/events_0488.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,14 +26,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 58,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 60,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 380,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0489.json b/res/field/events/events_0489.json
index 30e8a6a29b..b9ec020745 100644
--- a/res/field/events/events_0489.json
+++ b/res/field/events/events_0489.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 87,
@@ -26,20 +26,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 90,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 92,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 380,
             "dest_warp_id": 4
         },
         {
             "x": 2,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 225,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0490.json b/res/field/events/events_0490.json
index a58be6f159..226f324fd8 100644
--- a/res/field/events/events_0490.json
+++ b/res/field/events/events_0490.json
@@ -12,14 +12,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 4,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 288,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0491.json b/res/field/events/events_0491.json
index 9269abc848..3ad46f7759 100644
--- a/res/field/events/events_0491.json
+++ b/res/field/events/events_0491.json
@@ -4,8 +4,8 @@
             "script": 8038,
             "type": 2,
             "x": 4,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 2,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 239,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0492.json b/res/field/events/events_0492.json
index 070af0fbd3..a3af49282c 100644
--- a/res/field/events/events_0492.json
+++ b/res/field/events/events_0492.json
@@ -4,7 +4,7 @@
     "warp_events": [
         {
             "x": 3,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 4095,
             "dest_warp_id": 256
         }
diff --git a/res/field/events/events_0493.json b/res/field/events/events_0493.json
index 745f0c05db..4b9d6cb969 100644
--- a/res/field/events/events_0493.json
+++ b/res/field/events/events_0493.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -54,14 +54,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 8,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 30,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0494.json b/res/field/events/events_0494.json
index 02bd370acd..f39287abcb 100644
--- a/res/field/events/events_0494.json
+++ b/res/field/events/events_0494.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,32 +180,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0495.json b/res/field/events/events_0495.json
index c460b7f018..00192cdff1 100644
--- a/res/field/events/events_0495.json
+++ b/res/field/events/events_0495.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,32 +180,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0496.json b/res/field/events/events_0496.json
index 6068cc5a6d..8e9e91239e 100644
--- a/res/field/events/events_0496.json
+++ b/res/field/events/events_0496.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,32 +180,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0497.json b/res/field/events/events_0497.json
index eca91876b4..5846226091 100644
--- a/res/field/events/events_0497.json
+++ b/res/field/events/events_0497.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0498.json b/res/field/events/events_0498.json
index 9121031f7e..c3890324e4 100644
--- a/res/field/events/events_0498.json
+++ b/res/field/events/events_0498.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,32 +404,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0499.json b/res/field/events/events_0499.json
index b8c37bbcc8..7c4f5901f6 100644
--- a/res/field/events/events_0499.json
+++ b/res/field/events/events_0499.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,32 +404,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0500.json b/res/field/events/events_0500.json
index 01dcececcb..b2bef9060f 100644
--- a/res/field/events/events_0500.json
+++ b/res/field/events/events_0500.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,32 +404,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0501.json b/res/field/events/events_0501.json
index c1e988b724..7903e3e620 100644
--- a/res/field/events/events_0501.json
+++ b/res/field/events/events_0501.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0502.json b/res/field/events/events_0502.json
index f9f4e7c5bd..c138b5299f 100644
--- a/res/field/events/events_0502.json
+++ b/res/field/events/events_0502.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0503.json b/res/field/events/events_0503.json
index 124eda8033..ec0faeaf80 100644
--- a/res/field/events/events_0503.json
+++ b/res/field/events/events_0503.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0504.json b/res/field/events/events_0504.json
index 380f36cfa3..33c1186b65 100644
--- a/res/field/events/events_0504.json
+++ b/res/field/events/events_0504.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,32 +404,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0505.json b/res/field/events/events_0505.json
index 886c2ab897..35835d88cb 100644
--- a/res/field/events/events_0505.json
+++ b/res/field/events/events_0505.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0506.json b/res/field/events/events_0506.json
index f0c051f37a..3988389408 100644
--- a/res/field/events/events_0506.json
+++ b/res/field/events/events_0506.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 9,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 2,
-            "z": 0
+            "z": 2,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 20,
-            "z": 0
+            "z": 20,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0507.json b/res/field/events/events_0507.json
index c38ade6a47..47f7d39e74 100644
--- a/res/field/events/events_0507.json
+++ b/res/field/events/events_0507.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0508.json b/res/field/events/events_0508.json
index 229f1c2865..af69e5b81c 100644
--- a/res/field/events/events_0508.json
+++ b/res/field/events/events_0508.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 85,
@@ -418,32 +418,32 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 1,
+            "z": 1,
             "dest_header_id": 268,
             "dest_warp_id": 2
         },
         {
             "x": 20,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 3
         },
         {
             "x": 11,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 268,
             "dest_warp_id": 0
         },
         {
             "x": 2,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 268,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0512.json b/res/field/events/events_0512.json
index 376388514e..7a270bff61 100644
--- a/res/field/events/events_0512.json
+++ b/res/field/events/events_0512.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 40,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -26,8 +26,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 18,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -40,8 +40,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 31,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -54,14 +54,14 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 24,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 29,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 117,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0513.json b/res/field/events/events_0513.json
index 345cd9fa96..602c771535 100644
--- a/res/field/events/events_0513.json
+++ b/res/field/events/events_0513.json
@@ -4,160 +4,160 @@
             "script": 31,
             "type": 0,
             "x": 46,
-            "y": 49,
-            "z": 0,
+            "z": 49,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 32,
             "type": 0,
             "x": 50,
-            "y": 49,
-            "z": 0,
+            "z": 49,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 31,
             "type": 0,
             "x": 46,
-            "y": 48,
-            "z": 0,
+            "z": 48,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 31,
             "type": 0,
             "x": 47,
-            "y": 48,
-            "z": 0,
+            "z": 48,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 31,
             "type": 0,
             "x": 47,
-            "y": 49,
-            "z": 0,
+            "z": 49,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 32,
             "type": 0,
             "x": 50,
-            "y": 48,
-            "z": 0,
+            "z": 48,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 32,
             "type": 0,
             "x": 51,
-            "y": 49,
-            "z": 0,
+            "z": 49,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 32,
             "type": 0,
             "x": 51,
-            "y": 48,
-            "z": 0,
+            "z": 48,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 33,
             "type": 0,
             "x": 50,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 33,
             "type": 0,
             "x": 51,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 33,
             "type": 0,
             "x": 50,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 33,
             "type": 0,
             "x": 50,
-            "y": 37,
-            "z": 0,
+            "z": 37,
+            "y": 0,
             "player_facing_dir": 1
         },
         {
             "script": 33,
             "type": 0,
             "x": 50,
-            "y": 36,
-            "z": 0,
+            "z": 36,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 33,
             "type": 0,
             "x": 51,
-            "y": 36,
-            "z": 0,
+            "z": 36,
+            "y": 0,
             "player_facing_dir": 3
         },
         {
             "script": 33,
             "type": 0,
             "x": 52,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 33,
             "type": 0,
             "x": 52,
-            "y": 36,
-            "z": 0,
+            "z": 36,
+            "y": 0,
             "player_facing_dir": 3
         },
         {
             "script": 33,
             "type": 0,
             "x": 53,
-            "y": 36,
-            "z": 0,
+            "z": 36,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 33,
             "type": 0,
             "x": 53,
-            "y": 37,
-            "z": 0,
+            "z": 37,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 33,
             "type": 0,
             "x": 53,
-            "y": 38,
-            "z": 0,
+            "z": 38,
+            "y": 0,
             "player_facing_dir": 2
         },
         {
             "script": 33,
             "type": 0,
             "x": 53,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -173,8 +173,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -187,8 +187,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 47,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -201,8 +201,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 44,
-            "y": 50,
-            "z": 0
+            "z": 50,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -215,8 +215,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 49,
-            "y": 64,
-            "z": 0
+            "z": 64,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -229,8 +229,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 48,
-            "y": 64,
-            "z": 0
+            "z": 64,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -243,8 +243,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 41,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 3,
@@ -257,8 +257,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 59,
-            "y": 45,
-            "z": 0
+            "z": 45,
+            "y": 0
         },
         {
             "graphics_id": 1,
@@ -271,8 +271,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 50,
-            "y": 19,
-            "z": 0
+            "z": 19,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -285,8 +285,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 26,
-            "y": 30,
-            "z": 0
+            "z": 30,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -299,8 +299,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 67,
-            "y": 39,
-            "z": 0
+            "z": 39,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -313,8 +313,8 @@
             "movement_range_x": 3,
             "movement_range_y": 3,
             "x": 38,
-            "y": 23,
-            "z": 0
+            "z": 23,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -327,8 +327,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -341,8 +341,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 45,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -355,8 +355,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 52,
-            "y": 43,
-            "z": 0
+            "z": 43,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -369,8 +369,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 60,
-            "y": 29,
-            "z": 0
+            "z": 29,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -383,8 +383,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 59,
-            "y": 18,
-            "z": 0
+            "z": 18,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -397,8 +397,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 38,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 49,
@@ -411,8 +411,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 55,
-            "y": 38,
-            "z": 0
+            "z": 38,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -425,8 +425,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 54,
-            "y": 49,
-            "z": 0
+            "z": 49,
+            "y": 0
         },
         {
             "graphics_id": 42,
@@ -439,8 +439,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 66,
-            "y": 50,
-            "z": 0
+            "z": 50,
+            "y": 0
         },
         {
             "graphics_id": 54,
@@ -453,8 +453,8 @@
             "movement_range_x": 2,
             "movement_range_y": 1,
             "x": 60,
-            "y": 37,
-            "z": 0
+            "z": 37,
+            "y": 0
         },
         {
             "graphics_id": 53,
@@ -467,8 +467,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 45,
-            "y": 46,
-            "z": 0
+            "z": 46,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -481,8 +481,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 44,
-            "y": 61,
-            "z": 0
+            "z": 61,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -495,8 +495,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 54,
-            "y": 59,
-            "z": 0
+            "z": 59,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -509,8 +509,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 35,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -523,8 +523,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 62,
-            "y": 57,
-            "z": 0
+            "z": 57,
+            "y": 0
         },
         {
             "graphics_id": 96,
@@ -537,8 +537,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 72,
-            "y": 32,
-            "z": 0
+            "z": 32,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -551,8 +551,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 42,
-            "y": 41,
-            "z": 0
+            "z": 41,
+            "y": 0
         },
         {
             "graphics_id": 69,
@@ -565,8 +565,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 31,
-            "y": 40,
-            "z": 0
+            "z": 40,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -579,104 +579,104 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 25,
-            "y": 36,
-            "z": 0
+            "z": 36,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 48,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 326,
             "dest_warp_id": 0
         },
         {
             "x": 49,
-            "y": 17,
+            "z": 17,
             "dest_header_id": 326,
             "dest_warp_id": 0
         },
         {
             "x": 77,
-            "y": 34,
+            "z": 34,
             "dest_header_id": 562,
             "dest_warp_id": 0
         },
         {
             "x": 77,
-            "y": 35,
+            "z": 35,
             "dest_header_id": 562,
             "dest_warp_id": 0
         },
         {
             "x": 19,
-            "y": 34,
+            "z": 34,
             "dest_header_id": 563,
             "dest_warp_id": 0
         },
         {
             "x": 19,
-            "y": 35,
+            "z": 35,
             "dest_header_id": 563,
             "dest_warp_id": 0
         },
         {
             "x": 33,
-            "y": 62,
+            "z": 62,
             "dest_header_id": 564,
             "dest_warp_id": 0
         },
         {
             "x": 33,
-            "y": 63,
+            "z": 63,
             "dest_header_id": 564,
             "dest_warp_id": 0
         },
         {
             "x": 64,
-            "y": 62,
+            "z": 62,
             "dest_header_id": 565,
             "dest_warp_id": 0
         },
         {
             "x": 64,
-            "y": 63,
+            "z": 63,
             "dest_header_id": 565,
             "dest_warp_id": 0
         },
         {
             "x": 48,
-            "y": 52,
+            "z": 52,
             "dest_header_id": 560,
             "dest_warp_id": 0
         },
         {
             "x": 49,
-            "y": 52,
+            "z": 52,
             "dest_header_id": 560,
             "dest_warp_id": 0
         },
         {
             "x": 73,
-            "y": 34,
+            "z": 34,
             "dest_header_id": 562,
             "dest_warp_id": 0
         },
         {
             "x": 23,
-            "y": 34,
+            "z": 34,
             "dest_header_id": 563,
             "dest_warp_id": 0
         },
         {
             "x": 60,
-            "y": 62,
+            "z": 62,
             "dest_header_id": 565,
             "dest_warp_id": 0
         },
         {
             "x": 36,
-            "y": 62,
+            "z": 62,
             "dest_header_id": 564,
             "dest_warp_id": 0
         }
@@ -685,42 +685,42 @@
         {
             "script": 34,
             "x": 22,
-            "y": 34,
+            "z": 34,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16501
+            "var": 16501,
+            "value": 0
         },
         {
             "script": 35,
             "x": 35,
-            "y": 62,
+            "z": 62,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16501
+            "var": 16501,
+            "value": 0
         },
         {
             "script": 36,
             "x": 61,
-            "y": 62,
+            "z": 62,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16501
+            "var": 16501,
+            "value": 0
         },
         {
             "script": 37,
             "x": 74,
-            "y": 34,
+            "z": 34,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16501
+            "var": 16501,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0514.json b/res/field/events/events_0514.json
index 31dff153b5..c89f358ec5 100644
--- a/res/field/events/events_0514.json
+++ b/res/field/events/events_0514.json
@@ -12,8 +12,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -26,8 +26,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 11,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 50,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 3,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -54,8 +54,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 5,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -68,8 +68,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 5,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -82,8 +82,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 5,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -96,8 +96,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -110,8 +110,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 233,
@@ -124,8 +124,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -138,44 +138,44 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 559,
             "dest_warp_id": 10
         },
         {
             "x": 6,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 559,
             "dest_warp_id": 10
         },
         {
             "x": 8,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 559,
             "dest_warp_id": 10
         },
         {
             "x": 7,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 188,
             "dest_warp_id": 2
         },
         {
             "x": 6,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 188,
             "dest_warp_id": 2
         },
         {
             "x": 8,
-            "y": 20,
+            "z": 20,
             "dest_header_id": 188,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0515.json b/res/field/events/events_0515.json
index 119e86c740..578f5de5b1 100644
--- a/res/field/events/events_0515.json
+++ b/res/field/events/events_0515.json
@@ -4,8 +4,8 @@
             "script": 10452,
             "type": 0,
             "x": 22,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 232,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 23,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -63,8 +63,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 15,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 34,
@@ -77,8 +77,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 25,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 56,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 12,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 1,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 43,
@@ -119,8 +119,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 18,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 63,
@@ -133,26 +133,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 22,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 559,
             "dest_warp_id": 12
         },
         {
             "x": 1,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 559,
             "dest_warp_id": 12
         },
         {
             "x": 1,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 559,
             "dest_warp_id": 12
         }
diff --git a/res/field/events/events_0516.json b/res/field/events/events_0516.json
index 884b12c23c..1fa5fd45fb 100644
--- a/res/field/events/events_0516.json
+++ b/res/field/events/events_0516.json
@@ -4,8 +4,8 @@
             "script": 10453,
             "type": 0,
             "x": 7,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 232,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 175,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -63,8 +63,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 3,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 204,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 65,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 20,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 23,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 17,
@@ -133,8 +133,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 10,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -147,8 +147,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 22,
@@ -161,8 +161,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -175,8 +175,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 25,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 104,
@@ -189,8 +189,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 18,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 102,
@@ -203,8 +203,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 231,
@@ -217,26 +217,26 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 25,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 559,
             "dest_warp_id": 13
         },
         {
             "x": 25,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 559,
             "dest_warp_id": 13
         },
         {
             "x": 25,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 559,
             "dest_warp_id": 13
         }
diff --git a/res/field/events/events_0517.json b/res/field/events/events_0517.json
index 972e5dbec5..9ba4e6f1f9 100644
--- a/res/field/events/events_0517.json
+++ b/res/field/events/events_0517.json
@@ -4,8 +4,8 @@
             "script": 10454,
             "type": 0,
             "x": 6,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 232,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 31,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 51,
@@ -63,8 +63,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -77,8 +77,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 8,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 19,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 12,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 20,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -119,8 +119,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -133,26 +133,26 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 21,
-            "y": 9,
+            "z": 9,
             "dest_header_id": 559,
             "dest_warp_id": 15
         },
         {
             "x": 21,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 559,
             "dest_warp_id": 15
         },
         {
             "x": 21,
-            "y": 10,
+            "z": 10,
             "dest_header_id": 559,
             "dest_warp_id": 15
         }
diff --git a/res/field/events/events_0518.json b/res/field/events/events_0518.json
index a5f6873821..c17db0680c 100644
--- a/res/field/events/events_0518.json
+++ b/res/field/events/events_0518.json
@@ -4,8 +4,8 @@
             "script": 10455,
             "type": 0,
             "x": 16,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 14,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 232,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 70,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 60,
@@ -63,8 +63,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 2,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 2,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 40,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 12,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 5,
@@ -119,8 +119,8 @@
             "movement_range_x": 3,
             "movement_range_y": 0,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 48,
@@ -133,8 +133,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 21,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 55,
@@ -147,8 +147,8 @@
             "movement_range_x": 1,
             "movement_range_y": 0,
             "x": 19,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -161,8 +161,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -175,26 +175,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 1,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 559,
             "dest_warp_id": 14
         },
         {
             "x": 1,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 559,
             "dest_warp_id": 14
         },
         {
             "x": 1,
-            "y": 7,
+            "z": 7,
             "dest_header_id": 559,
             "dest_warp_id": 14
         }
diff --git a/res/field/events/events_0519.json b/res/field/events/events_0519.json
index 8fd16e6ba4..7dd8c97f4f 100644
--- a/res/field/events/events_0519.json
+++ b/res/field/events/events_0519.json
@@ -4,8 +4,8 @@
             "script": 12,
             "type": 0,
             "x": 12,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -21,8 +21,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -35,8 +35,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -49,8 +49,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -63,8 +63,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 3,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 163,
@@ -77,8 +77,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -91,8 +91,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 25,
@@ -105,8 +105,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 37,
@@ -119,8 +119,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 16,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 36,
@@ -133,8 +133,8 @@
             "movement_range_x": 1,
             "movement_range_y": 1,
             "x": 21,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -147,20 +147,20 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 15,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 11,
-            "y": 8,
+            "z": 8,
             "dest_header_id": 137,
             "dest_warp_id": 3
         },
         {
             "x": 14,
-            "y": 2,
+            "z": 2,
             "dest_header_id": 142,
             "dest_warp_id": 0
         }
diff --git a/res/field/events/events_0520.json b/res/field/events/events_0520.json
index 698e07b962..5930c60f56 100644
--- a/res/field/events/events_0520.json
+++ b/res/field/events/events_0520.json
@@ -4,80 +4,80 @@
             "script": 11,
             "type": 0,
             "x": 15,
-            "y": 3,
-            "z": 0,
+            "z": 3,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 15,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 13,
             "type": 0,
             "x": 6,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 6,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 9,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 9,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 6,
-            "y": 13,
-            "z": 0,
+            "z": 13,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 14,
             "type": 0,
             "x": 6,
-            "y": 14,
-            "z": 0,
+            "z": 14,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 9,
-            "y": 8,
-            "z": 0,
+            "z": 8,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 9,
-            "y": 7,
-            "z": 0,
+            "z": 7,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -93,8 +93,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 2,
@@ -107,8 +107,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 16,
@@ -121,8 +121,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 13,
@@ -135,8 +135,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 6,
@@ -149,8 +149,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 18,
@@ -163,8 +163,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -177,8 +177,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 5,
-            "y": 8,
-            "z": 0
+            "z": 8,
+            "y": 0
         },
         {
             "graphics_id": 35,
@@ -191,8 +191,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 20,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 44,
@@ -205,20 +205,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 7,
-            "y": 4,
-            "z": 0
+            "z": 4,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 16,
-            "y": 5,
+            "z": 5,
             "dest_header_id": 28,
             "dest_warp_id": 1
         },
         {
             "x": 16,
-            "y": 15,
+            "z": 15,
             "dest_header_id": 568,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0521.json b/res/field/events/events_0521.json
index 06b5ebf2c0..fbd3dca980 100644
--- a/res/field/events/events_0521.json
+++ b/res/field/events/events_0521.json
@@ -4,48 +4,48 @@
             "script": 11,
             "type": 0,
             "x": 12,
-            "y": 2,
-            "z": 0,
+            "z": 2,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 12,
             "type": 0,
             "x": 12,
-            "y": 12,
-            "z": 0,
+            "z": 12,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 13,
             "type": 0,
             "x": 8,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 8,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 5,
-            "y": 11,
-            "z": 0,
+            "z": 11,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 13,
             "type": 0,
             "x": 5,
-            "y": 10,
-            "z": 0,
+            "z": 10,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -61,8 +61,8 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 8,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 20,
@@ -75,8 +75,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 18,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 10,
@@ -89,8 +89,8 @@
             "movement_range_x": 0,
             "movement_range_y": 2,
             "x": 15,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 8,
@@ -103,8 +103,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 52,
@@ -117,8 +117,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 4,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 4,
@@ -131,8 +131,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         },
         {
             "graphics_id": 15,
@@ -145,8 +145,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 4,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 43,
@@ -159,8 +159,8 @@
             "movement_range_x": 0,
             "movement_range_y": 1,
             "x": 11,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 11,
@@ -173,20 +173,20 @@
             "movement_range_x": 2,
             "movement_range_y": 0,
             "x": 9,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 13,
-            "y": 4,
+            "z": 4,
             "dest_header_id": 28,
             "dest_warp_id": 2
         },
         {
             "x": 13,
-            "y": 14,
+            "z": 14,
             "dest_header_id": 567,
             "dest_warp_id": 1
         }
diff --git a/res/field/events/events_0522.json b/res/field/events/events_0522.json
index 4f9a391ff9..6eb0cab444 100644
--- a/res/field/events/events_0522.json
+++ b/res/field/events/events_0522.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -26,8 +26,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 120,
@@ -40,8 +40,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 17,
-            "y": 3,
-            "z": 0
+            "z": 3,
+            "y": 0
         },
         {
             "graphics_id": 213,
@@ -54,8 +54,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 19,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -68,8 +68,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -82,8 +82,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -96,8 +96,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -110,8 +110,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -124,8 +124,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -138,8 +138,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -152,8 +152,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -166,8 +166,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -180,8 +180,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -194,8 +194,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -208,8 +208,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -222,8 +222,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -236,8 +236,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -250,8 +250,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 249,
@@ -264,8 +264,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -278,8 +278,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -292,8 +292,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 16,
-            "z": 0
+            "z": 16,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -306,8 +306,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -320,8 +320,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -334,8 +334,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -348,8 +348,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -362,8 +362,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 12,
-            "z": 0
+            "z": 12,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -376,8 +376,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -390,8 +390,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 14,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 248,
@@ -404,8 +404,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 17,
-            "z": 0
+            "z": 17,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -418,8 +418,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 15,
-            "z": 0
+            "z": 15,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -432,8 +432,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 14,
-            "z": 0
+            "z": 14,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -446,8 +446,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -460,8 +460,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 13,
-            "z": 0
+            "z": 13,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -474,8 +474,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 124,
@@ -488,8 +488,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 125,
@@ -502,26 +502,26 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 16,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 24,
-            "y": 6,
+            "z": 6,
             "dest_header_id": 306,
             "dest_warp_id": 10
         },
         {
             "x": 1,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 306,
             "dest_warp_id": 9
         },
         {
             "x": 17,
-            "y": 3,
+            "z": 3,
             "dest_header_id": 308,
             "dest_warp_id": 3
         }
@@ -530,12 +530,12 @@
         {
             "script": 1,
             "x": 20,
-            "y": 12,
+            "z": 12,
+            "y": 0,
             "width": 1,
             "length": 2,
-            "z": 0,
-            "value": 0,
-            "var": 16526
+            "var": 16526,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0523.json b/res/field/events/events_0523.json
index 263291f0a4..4697364835 100644
--- a/res/field/events/events_0523.json
+++ b/res/field/events/events_0523.json
@@ -4,40 +4,40 @@
             "script": 9,
             "type": 0,
             "x": 6,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 4,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 8,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 10,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 9,
             "type": 0,
             "x": 12,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -53,8 +53,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 4,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 238,
@@ -67,8 +67,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 6,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 239,
@@ -81,8 +81,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 8,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 240,
@@ -95,8 +95,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 10,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 241,
@@ -109,8 +109,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 12,
-            "y": 6,
-            "z": 0
+            "z": 6,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -123,8 +123,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 11,
-            "y": 9,
-            "z": 0
+            "z": 9,
+            "y": 0
         },
         {
             "graphics_id": 99,
@@ -137,8 +137,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 11,
-            "z": 0
+            "z": 11,
+            "y": 0
         },
         {
             "graphics_id": 183,
@@ -151,14 +151,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 13,
-            "y": 5,
-            "z": 0
+            "z": 5,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 11,
+            "z": 11,
             "dest_header_id": 72,
             "dest_warp_id": 3
         }
diff --git a/res/field/events/events_0524.json b/res/field/events/events_0524.json
index 5242456fbc..8cc19f05ac 100644
--- a/res/field/events/events_0524.json
+++ b/res/field/events/events_0524.json
@@ -4,8 +4,8 @@
             "script": 2,
             "type": 0,
             "x": 55,
-            "y": 39,
-            "z": 0,
+            "z": 39,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -13,7 +13,7 @@
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0525.json b/res/field/events/events_0525.json
index f2aa11540e..b768b3ba7c 100644
--- a/res/field/events/events_0525.json
+++ b/res/field/events/events_0525.json
@@ -4,16 +4,16 @@
             "script": 1,
             "type": 0,
             "x": 29,
-            "y": 16,
-            "z": 0,
+            "z": 16,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 1,
             "type": 0,
             "x": 29,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,7 +21,7 @@
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 3
         }
@@ -30,12 +30,12 @@
         {
             "script": 2039,
             "x": 31,
-            "y": 52,
+            "z": 52,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16664
+            "var": 16664,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0526.json b/res/field/events/events_0526.json
index 7e72995d46..63c8884666 100644
--- a/res/field/events/events_0526.json
+++ b/res/field/events/events_0526.json
@@ -4,16 +4,16 @@
             "script": 1,
             "type": 0,
             "x": 33,
-            "y": 16,
-            "z": 0,
+            "z": 16,
+            "y": 0,
             "player_facing_dir": 4
         },
         {
             "script": 1,
             "type": 0,
             "x": 33,
-            "y": 17,
-            "z": 0,
+            "z": 17,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,7 +21,7 @@
     "warp_events": [
         {
             "x": 31,
-            "y": 53,
+            "z": 53,
             "dest_header_id": 215,
             "dest_warp_id": 4
         }
@@ -30,12 +30,12 @@
         {
             "script": 2039,
             "x": 31,
-            "y": 52,
+            "z": 52,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 1,
-            "var": 16664
+            "var": 16664,
+            "value": 1
         }
     ]
 }
diff --git a/res/field/events/events_0527.json b/res/field/events/events_0527.json
index 2bc38c2d3e..61f55ef50f 100644
--- a/res/field/events/events_0527.json
+++ b/res/field/events/events_0527.json
@@ -12,8 +12,8 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 20,
-            "y": 10,
-            "z": 0
+            "z": 10,
+            "y": 0
         }
     ],
     "warp_events": [],
diff --git a/res/field/events/events_0528.json b/res/field/events/events_0528.json
index 04c1fbd202..7ad4650a2a 100644
--- a/res/field/events/events_0528.json
+++ b/res/field/events/events_0528.json
@@ -4,8 +4,8 @@
             "script": 8274,
             "type": 2,
             "x": 3,
-            "y": 6,
-            "z": 0,
+            "z": 6,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 294,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0529.json b/res/field/events/events_0529.json
index 838282f897..279e084d25 100644
--- a/res/field/events/events_0529.json
+++ b/res/field/events/events_0529.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 7,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 8,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,7 +29,7 @@
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 294,
             "dest_warp_id": 3
         }
@@ -38,72 +38,72 @@
         {
             "script": 6,
             "x": 7,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16388
+            "var": 16388,
+            "value": 0
         },
         {
             "script": 3,
             "x": 5,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16385
+            "var": 16385,
+            "value": 0
         },
         {
             "script": 4,
             "x": 9,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 5,
             "x": 4,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 7,
             "x": 10,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16389
+            "var": 16389,
+            "value": 0
         },
         {
             "script": 8,
             "x": 5,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16390
+            "var": 16390,
+            "value": 0
         },
         {
             "script": 9,
             "x": 9,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16391
+            "var": 16391,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0530.json b/res/field/events/events_0530.json
index b811cc7470..70760132cc 100644
--- a/res/field/events/events_0530.json
+++ b/res/field/events/events_0530.json
@@ -4,8 +4,8 @@
             "script": 8275,
             "type": 2,
             "x": 6,
-            "y": 5,
-            "z": 0,
+            "z": 5,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 217,
             "dest_warp_id": 2
         }
diff --git a/res/field/events/events_0531.json b/res/field/events/events_0531.json
index 0c0213b41e..33ab8bce9d 100644
--- a/res/field/events/events_0531.json
+++ b/res/field/events/events_0531.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 7,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 8,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,7 +29,7 @@
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 217,
             "dest_warp_id": 3
         }
@@ -38,72 +38,72 @@
         {
             "script": 9,
             "x": 7,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16391
+            "var": 16391,
+            "value": 0
         },
         {
             "script": 6,
             "x": 7,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16388
+            "var": 16388,
+            "value": 0
         },
         {
             "script": 3,
             "x": 7,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16385
+            "var": 16385,
+            "value": 0
         },
         {
             "script": 5,
             "x": 5,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 4,
             "x": 3,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 7,
             "x": 9,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16389
+            "var": 16389,
+            "value": 0
         },
         {
             "script": 8,
             "x": 11,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16390
+            "var": 16390,
+            "value": 0
         }
     ]
 }
diff --git a/res/field/events/events_0532.json b/res/field/events/events_0532.json
index 8c18835030..8c2928b233 100644
--- a/res/field/events/events_0532.json
+++ b/res/field/events/events_0532.json
@@ -4,8 +4,8 @@
             "script": 8276,
             "type": 2,
             "x": 11,
-            "y": 4,
-            "z": 0,
+            "z": 4,
+            "y": 0,
             "player_facing_dir": 4
         }
     ],
@@ -21,14 +21,14 @@
             "movement_range_x": 0,
             "movement_range_y": 0,
             "x": 7,
-            "y": 7,
-            "z": 0
+            "z": 7,
+            "y": 0
         }
     ],
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 406,
             "dest_warp_id": 4
         }
diff --git a/res/field/events/events_0533.json b/res/field/events/events_0533.json
index 9d7f547046..8b8afe4abe 100644
--- a/res/field/events/events_0533.json
+++ b/res/field/events/events_0533.json
@@ -4,24 +4,24 @@
             "script": 2,
             "type": 0,
             "x": 6,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 7,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         },
         {
             "script": 2,
             "type": 0,
             "x": 8,
-            "y": 1,
-            "z": 0,
+            "z": 1,
+            "y": 0,
             "player_facing_dir": 0
         }
     ],
@@ -29,7 +29,7 @@
     "warp_events": [
         {
             "x": 7,
-            "y": 12,
+            "z": 12,
             "dest_header_id": 406,
             "dest_warp_id": 5
         }
@@ -38,72 +38,72 @@
         {
             "script": 6,
             "x": 7,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16388
+            "var": 16388,
+            "value": 0
         },
         {
             "script": 8,
             "x": 5,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16390
+            "var": 16390,
+            "value": 0
         },
         {
             "script": 9,
             "x": 9,
-            "y": 9,
+            "z": 9,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16391
+            "var": 16391,
+            "value": 0
         },
         {
             "script": 3,
             "x": 5,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16385
+            "var": 16385,
+            "value": 0
         },
         {
             "script": 4,
             "x": 9,
-            "y": 5,
+            "z": 5,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16386
+            "var": 16386,
+            "value": 0
         },
         {
             "script": 5,
             "x": 5,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16387
+            "var": 16387,
+            "value": 0
         },
         {
             "script": 7,
             "x": 9,
-            "y": 7,
+            "z": 7,
+            "y": 0,
             "width": 1,
             "length": 1,
-            "z": 0,
-            "value": 0,
-            "var": 16389
+            "var": 16389,
+            "value": 0
         }
     ]
 }
diff --git a/tools/json2bin/events.py b/tools/json2bin/events.py
index 896db80f0a..aea312ede2 100644
--- a/tools/json2bin/events.py
+++ b/tools/json2bin/events.py
@@ -12,8 +12,8 @@ def parse_bg_events(bg_events: Sequence[Mapping], *args) -> bytes:
         bg_bytes.extend(j2b.parse_int(bg['script'], 2))
         bg_bytes.extend(j2b.parse_int(bg['type'], 2))
         bg_bytes.extend(j2b.parse_int(bg['x'], 4))
-        bg_bytes.extend(j2b.parse_int(bg['y'], 4))
         bg_bytes.extend(j2b.parse_int(bg['z'], 4))
+        bg_bytes.extend(j2b.parse_int(bg['y'], 4))
         bg_bytes.extend(j2b.parse_int(bg['player_facing_dir'], 4))
     return bg_bytes
 
@@ -38,8 +38,8 @@ def parse_object_events(obj_events: Sequence[Mapping], *args) -> bytes:
         obj_bytes.extend(j2b.parse_int(obj['movement_range_x'], 2))
         obj_bytes.extend(j2b.parse_int(obj['movement_range_y'], 2))
         obj_bytes.extend(j2b.parse_int(obj['x'], 2))
-        obj_bytes.extend(j2b.parse_int(obj['y'], 2))
-        obj_bytes.extend(j2b.parse_int(obj['z'] * 0x10000, 4))
+        obj_bytes.extend(j2b.parse_int(obj['z'], 2))
+        obj_bytes.extend(j2b.parse_int(obj['y'] * 0x10000, 4))
     return obj_bytes
 
 def parse_warp_events(warp_events: Sequence[Mapping], *args) -> bytes:
@@ -47,7 +47,7 @@ def parse_warp_events(warp_events: Sequence[Mapping], *args) -> bytes:
     warp_bytes.extend(j2b.parse_int(len(warp_events), 4))
     for warp in warp_events:
         warp_bytes.extend(j2b.parse_int(warp['x'], 2))
-        warp_bytes.extend(j2b.parse_int(warp['y'], 2))
+        warp_bytes.extend(j2b.parse_int(warp['z'], 2))
         warp_bytes.extend(j2b.parse_int(warp['dest_header_id'], 2))
         warp_bytes.extend(j2b.parse_int(warp['dest_warp_id'], 2))
         warp_bytes.extend(j2b.parse_int(0, 4))
@@ -59,10 +59,10 @@ def parse_coord_events(coord_events: Sequence[Mapping], *args) -> bytes:
     for coord in coord_events:
         coords_bytes.extend(j2b.parse_int(coord['script'], 2))
         coords_bytes.extend(j2b.parse_int(coord['x'], 2))
-        coords_bytes.extend(j2b.parse_int(coord['y'], 2))
+        coords_bytes.extend(j2b.parse_int(coord['z'], 2))
         coords_bytes.extend(j2b.parse_int(coord['width'], 2))
         coords_bytes.extend(j2b.parse_int(coord['length'], 2))
-        coords_bytes.extend(j2b.parse_int(coord['z'], 2))
+        coords_bytes.extend(j2b.parse_int(coord['y'], 2))
         coords_bytes.extend(j2b.parse_int(coord['value'], 2))
         coords_bytes.extend(j2b.parse_int(coord['var'], 2))
     return coords_bytes