diff --git a/asm/macros/scripts.inc b/asm/macros/scripts.inc index 3363f3df..9d40b8d1 100644 --- a/asm/macros/scripts.inc +++ b/asm/macros/scripts.inc @@ -1,5 +1,4 @@ @ All the macro functions for scripts -@ Generated by disassemble_script.py @ helper macros diff --git a/data/scripts/script_08008B5C.inc b/data/scripts/script_08008B5C.inc index 0116c89c..3ae98443 100644 --- a/data/scripts/script_08008B5C.inc +++ b/data/scripts/script_08008B5C.inc @@ -15,7 +15,7 @@ script_08008B6E: _0807E930 0x0008 _0807E878 Jump script_08008B6E - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -126,4 +126,4 @@ script_08008C5C: _0807E5F8 0x00000001 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08008D50.inc b/data/scripts/script_08008D50.inc index 38305661..1b90b9f7 100644 --- a/data/scripts/script_08008D50.inc +++ b/data/scripts/script_08008D50.inc @@ -14,4 +14,4 @@ SCRIPT_START script_08008D50 _0807E5F8 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08008D8C.inc b/data/scripts/script_08008D8C.inc index 4f31145b..6f419bac 100644 --- a/data/scripts/script_08008D8C.inc +++ b/data/scripts/script_08008D8C.inc @@ -14,7 +14,7 @@ script_08008DA0: _0807EA94 _0807E878 Jump script_08008DA0 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -107,4 +107,4 @@ script_08008E12: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08008F74.inc b/data/scripts/script_08008F74.inc index f8f1f63c..087bb253 100644 --- a/data/scripts/script_08008F74.inc +++ b/data/scripts/script_08008F74.inc @@ -16,4 +16,4 @@ SCRIPT_START script_08008F74 _0807E5F8 0x00000020 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08008FC0.inc b/data/scripts/script_08008FC0.inc index ec7f9ecf..dd2791f8 100644 --- a/data/scripts/script_08008FC0.inc +++ b/data/scripts/script_08008FC0.inc @@ -9,4 +9,4 @@ SCRIPT_START script_08008FC0 _0807E5F8 0x00000020 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800903C.inc b/data/scripts/script_0800903C.inc index 43e1ad79..ac832c53 100644 --- a/data/scripts/script_0800903C.inc +++ b/data/scripts/script_0800903C.inc @@ -15,7 +15,7 @@ SCRIPT_START script_0800903C _0807E9D4 DoPostScriptAction 0x000a Jump script_0800927E - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0807F348 SetEntityNonPlanarMovement 0x0100 @@ -134,7 +134,7 @@ script_0800917C: _0807E9D4 DoPostScriptAction 0x000a Jump script_080092B2 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -152,7 +152,7 @@ script_0800928A: Wait 0x000f _0807E878 Jump script_0800928A - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0006 DoPostScriptAction 0x0000 @@ -177,7 +177,7 @@ script_080092BA: DoPostScriptAction 0x000a EndBlock Jump script_0800917C - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a Call sub_08066E38 @@ -192,8 +192,8 @@ script_08009300: _0807EA94 _0807E878 Jump script_08009300 - .short 0x0000 + .2byte 0x0000 BeginBlock EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009340.inc b/data/scripts/script_08009340.inc index 6385266f..9f5907f4 100644 --- a/data/scripts/script_08009340.inc +++ b/data/scripts/script_08009340.inc @@ -2,4 +2,4 @@ SCRIPT_START script_08009340 BeginBlock EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009464.inc b/data/scripts/script_08009464.inc index e490d51f..b3865077 100644 --- a/data/scripts/script_08009464.inc +++ b/data/scripts/script_08009464.inc @@ -14,7 +14,7 @@ SCRIPT_START script_08009464 _0807EA94 Wait 0x000a Jump script_08009376 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0806D7C4 SetEntityNonPlanarMovement 0x0080 diff --git a/data/scripts/script_080094CC.inc b/data/scripts/script_080094CC.inc index 5422e60d..d9c26006 100644 --- a/data/scripts/script_080094CC.inc +++ b/data/scripts/script_080094CC.inc @@ -12,4 +12,4 @@ script_080094EA: Wait 0x001e DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080094FC.inc b/data/scripts/script_080094FC.inc index aafd95f8..6c0e9858 100644 --- a/data/scripts/script_080094FC.inc +++ b/data/scripts/script_080094FC.inc @@ -17,7 +17,7 @@ script_08009512: _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_08009512 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08067100 DoPostScriptAction 0x000a @@ -36,7 +36,7 @@ script_0800954E: _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_0800954E - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08067314 DoPostScriptAction 0x000a @@ -59,7 +59,7 @@ script_08009592: SetIntVariable 0x00000000 Call sub_080672B0 Jump script_08009592 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0806BE3C DoPostScriptAction 0x000a diff --git a/data/scripts/script_08009740.inc b/data/scripts/script_08009740.inc index 1418cfcf..707cc5e4 100644 --- a/data/scripts/script_08009740.inc +++ b/data/scripts/script_08009740.inc @@ -16,7 +16,7 @@ script_0800975A: _0807EA94 _0807E878 Jump script_0800975A - .short 0x0000 + .2byte 0x0000 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_08009838.inc b/data/scripts/script_08009838.inc index e1737518..2918b662 100644 --- a/data/scripts/script_08009838.inc +++ b/data/scripts/script_08009838.inc @@ -14,4 +14,4 @@ SCRIPT_START script_08009838 _0807E5F8 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800987C.inc b/data/scripts/script_0800987C.inc index 14a31e8f..1a1f41bd 100644 --- a/data/scripts/script_0800987C.inc +++ b/data/scripts/script_0800987C.inc @@ -17,4 +17,4 @@ SCRIPT_START script_0800987C _0807E5F8 0x00000040 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080098D4.inc b/data/scripts/script_080098D4.inc index 105a4124..d87a79bd 100644 --- a/data/scripts/script_080098D4.inc +++ b/data/scripts/script_080098D4.inc @@ -20,4 +20,4 @@ script_080098E0: script_08009910: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080099DC.inc b/data/scripts/script_080099DC.inc index c983ca21..fef3b8bc 100644 --- a/data/scripts/script_080099DC.inc +++ b/data/scripts/script_080099DC.inc @@ -20,4 +20,4 @@ SCRIPT_START script_080099DC DoPostScriptAction 0x0000 _0807E5F8 0x00000008 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009A84.inc b/data/scripts/script_08009A84.inc index 02fd4d8c..da26d106 100644 --- a/data/scripts/script_08009A84.inc +++ b/data/scripts/script_08009A84.inc @@ -23,4 +23,4 @@ SCRIPT_START script_08009A84 DoPostScriptAction 0x0008 _0807EDD4 0x0290, 0x0188 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009AF8.inc b/data/scripts/script_08009AF8.inc index 4ef2891b..8e1ae84a 100644 --- a/data/scripts/script_08009AF8.inc +++ b/data/scripts/script_08009AF8.inc @@ -13,4 +13,4 @@ SCRIPT_START script_08009AF8 WaitFor_2 Call sub_0805367C SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009B78.inc b/data/scripts/script_08009B78.inc index c5204cb2..e0f83575 100644 --- a/data/scripts/script_08009B78.inc +++ b/data/scripts/script_08009B78.inc @@ -60,4 +60,4 @@ script_08009C50: _0807E878 Jump script_08009C50 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009C68.inc b/data/scripts/script_08009C68.inc index 30dca264..f78beac8 100644 --- a/data/scripts/script_08009C68.inc +++ b/data/scripts/script_08009C68.inc @@ -36,4 +36,4 @@ SCRIPT_START script_08009C68 _0807E878 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009E4E.inc b/data/scripts/script_08009E4E.inc index 6e239720..8174277e 100644 --- a/data/scripts/script_08009E4E.inc +++ b/data/scripts/script_08009E4E.inc @@ -2,4 +2,4 @@ SCRIPT_START script_08009E4E _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009E80.inc b/data/scripts/script_08009E80.inc index a7a249dd..bb82f0fd 100644 --- a/data/scripts/script_08009E80.inc +++ b/data/scripts/script_08009E80.inc @@ -2,4 +2,4 @@ SCRIPT_START script_08009E80 BeginBlock EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08009F14.inc b/data/scripts/script_08009F14.inc index 16b7954c..828f4cf9 100644 --- a/data/scripts/script_08009F14.inc +++ b/data/scripts/script_08009F14.inc @@ -115,4 +115,4 @@ script_0800A064: _0807EA94 _0807E878 Jump script_0800A024 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A0FC.inc b/data/scripts/script_0800A0FC.inc index a83416b8..c7e7f59c 100644 --- a/data/scripts/script_0800A0FC.inc +++ b/data/scripts/script_0800A0FC.inc @@ -22,4 +22,4 @@ script_0800A0FE: CallWithArg sub_0806DA1C, 0x00000006 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A160.inc b/data/scripts/script_0800A160.inc index 148b1209..ea5cf308 100644 --- a/data/scripts/script_0800A160.inc +++ b/data/scripts/script_0800A160.inc @@ -16,4 +16,4 @@ SCRIPT_START script_0800A160 Wait 0x003c _0807E5F8 0x00000004 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A1B4.inc b/data/scripts/script_0800A1B4.inc index 933c0576..9ea82fa3 100644 --- a/data/scripts/script_0800A1B4.inc +++ b/data/scripts/script_0800A1B4.inc @@ -7,4 +7,4 @@ SCRIPT_START script_0800A1B4 WaitForSomething 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A310.inc b/data/scripts/script_0800A310.inc index 2ac3adb5..1d8c805e 100644 --- a/data/scripts/script_0800A310.inc +++ b/data/scripts/script_0800A310.inc @@ -10,7 +10,7 @@ SCRIPT_START script_0800A310 Wait 0x000a _0807E5F8 0x00000001 Call sub_080791BC - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0008 SetEntityNonPlanarMovement 0x0080 @@ -40,4 +40,4 @@ SCRIPT_START script_0800A310 CallWithArg sub_080960C4, script_0800A680 _0807E5F8 0x00000040 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A3D8.inc b/data/scripts/script_0800A3D8.inc index 9e2aa8ca..f4260f81 100644 --- a/data/scripts/script_0800A3D8.inc +++ b/data/scripts/script_0800A3D8.inc @@ -57,4 +57,4 @@ SCRIPT_START script_0800A3D8 WaitForSomething2 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A638.inc b/data/scripts/script_0800A638.inc index 40523784..1f099721 100644 --- a/data/scripts/script_0800A638.inc +++ b/data/scripts/script_0800A638.inc @@ -7,4 +7,4 @@ SCRIPT_START script_0800A638 WaitForSomething 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A65C.inc b/data/scripts/script_0800A65C.inc index e221b79a..78eb79bf 100644 --- a/data/scripts/script_0800A65C.inc +++ b/data/scripts/script_0800A65C.inc @@ -7,4 +7,4 @@ SCRIPT_START script_0800A65C WaitForSomething 0x00000800 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A680.inc b/data/scripts/script_0800A680.inc index 87bf2e8e..7112b6da 100644 --- a/data/scripts/script_0800A680.inc +++ b/data/scripts/script_0800A680.inc @@ -7,4 +7,4 @@ SCRIPT_START script_0800A680 WaitForSomething 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A964.inc b/data/scripts/script_0800A964.inc index 393a57c4..d00269a5 100644 --- a/data/scripts/script_0800A964.inc +++ b/data/scripts/script_0800A964.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800A964 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A988.inc b/data/scripts/script_0800A988.inc index aad9af72..f0b9135c 100644 --- a/data/scripts/script_0800A988.inc +++ b/data/scripts/script_0800A988.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800A988 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A9AC.inc b/data/scripts/script_0800A9AC.inc index 2d8f3578..9a235bcf 100644 --- a/data/scripts/script_0800A9AC.inc +++ b/data/scripts/script_0800A9AC.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800A9AC Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800A9D0.inc b/data/scripts/script_0800A9D0.inc index c2d5e2b3..2f385317 100644 --- a/data/scripts/script_0800A9D0.inc +++ b/data/scripts/script_0800A9D0.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800A9D0 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AA48.inc b/data/scripts/script_0800AA48.inc index 989a90a2..e992d04f 100644 --- a/data/scripts/script_0800AA48.inc +++ b/data/scripts/script_0800AA48.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AA48 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AA6C.inc b/data/scripts/script_0800AA6C.inc index f46249d4..e9bbd201 100644 --- a/data/scripts/script_0800AA6C.inc +++ b/data/scripts/script_0800AA6C.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AA6C Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AA90.inc b/data/scripts/script_0800AA90.inc index f5f4c96c..0a55246e 100644 --- a/data/scripts/script_0800AA90.inc +++ b/data/scripts/script_0800AA90.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AA90 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AAB4.inc b/data/scripts/script_0800AAB4.inc index e7b8d6b9..bc7bf8ad 100644 --- a/data/scripts/script_0800AAB4.inc +++ b/data/scripts/script_0800AAB4.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AAB4 Call CreateDust DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800ACBC.inc b/data/scripts/script_0800ACBC.inc index 035a5e25..5fa1b6a4 100644 --- a/data/scripts/script_0800ACBC.inc +++ b/data/scripts/script_0800ACBC.inc @@ -7,4 +7,4 @@ SCRIPT_START script_0800ACBC DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800ACE0.inc b/data/scripts/script_0800ACE0.inc index 3ddf7d42..7f22b9cf 100644 --- a/data/scripts/script_0800ACE0.inc +++ b/data/scripts/script_0800ACE0.inc @@ -22,4 +22,4 @@ SCRIPT_START script_0800ACE0 DoPostScriptAction 0x0000 _0807E5F8 0x00000001 Call sub_080791BC - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AF18.inc b/data/scripts/script_0800AF18.inc index 588860a3..71358dea 100644 --- a/data/scripts/script_0800AF18.inc +++ b/data/scripts/script_0800AF18.inc @@ -9,4 +9,4 @@ SCRIPT_START script_0800AF18 SoundReq 0x0143 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AF44.inc b/data/scripts/script_0800AF44.inc index 600b6138..9a6fe0ff 100644 --- a/data/scripts/script_0800AF44.inc +++ b/data/scripts/script_0800AF44.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AF44 _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AF68.inc b/data/scripts/script_0800AF68.inc index c051e9d2..17d3b4c5 100644 --- a/data/scripts/script_0800AF68.inc +++ b/data/scripts/script_0800AF68.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AF68 _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AF8C.inc b/data/scripts/script_0800AF8C.inc index c413b752..2966dc38 100644 --- a/data/scripts/script_0800AF8C.inc +++ b/data/scripts/script_0800AF8C.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AF8C _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AFB0.inc b/data/scripts/script_0800AFB0.inc index aec2c2e2..21e9510d 100644 --- a/data/scripts/script_0800AFB0.inc +++ b/data/scripts/script_0800AFB0.inc @@ -15,4 +15,4 @@ script_0800AFB2: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800AFE8.inc b/data/scripts/script_0800AFE8.inc index 92f7317f..7cf12c3d 100644 --- a/data/scripts/script_0800AFE8.inc +++ b/data/scripts/script_0800AFE8.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800AFE8 _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B00C.inc b/data/scripts/script_0800B00C.inc index b7748277..0d1b013e 100644 --- a/data/scripts/script_0800B00C.inc +++ b/data/scripts/script_0800B00C.inc @@ -45,4 +45,4 @@ script_0800B09C: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B0D0.inc b/data/scripts/script_0800B0D0.inc index 4e167a77..c4687bdc 100644 --- a/data/scripts/script_0800B0D0.inc +++ b/data/scripts/script_0800B0D0.inc @@ -53,4 +53,4 @@ script_0800B160: _0807E878 Call sub_0807DF50 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B254.inc b/data/scripts/script_0800B254.inc index 872613b6..3686156d 100644 --- a/data/scripts/script_0800B254.inc +++ b/data/scripts/script_0800B254.inc @@ -14,7 +14,7 @@ script_0800B268: Call sub_0807DF50 _0807E878 Jump script_0800B268 - .short 0x0000 + .2byte 0x0000 BeginBlock CheckKinstoneFused 0x0007 JumpIf script_0800B302 @@ -30,7 +30,7 @@ script_0800B298: Call sub_0807DF50 _0807E878 Jump script_0800B298 - .short 0x0000 + .2byte 0x0000 BeginBlock CheckKinstoneFused 0x0008 JumpIf script_0800B302 @@ -57,4 +57,4 @@ script_0800B2E2: script_0800B302: EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B308.inc b/data/scripts/script_0800B308.inc index 6fa1ad9f..aa0f455a 100644 --- a/data/scripts/script_0800B308.inc +++ b/data/scripts/script_0800B308.inc @@ -41,4 +41,4 @@ script_0800B350: script_0800B39C: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B5C4.inc b/data/scripts/script_0800B5C4.inc index 3d18214c..45b307ad 100644 --- a/data/scripts/script_0800B5C4.inc +++ b/data/scripts/script_0800B5C4.inc @@ -9,4 +9,4 @@ SCRIPT_START script_0800B5C4 Wait 0x000a Call sub_08069EE8 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B6C8.inc b/data/scripts/script_0800B6C8.inc index 4168693b..18560a5c 100644 --- a/data/scripts/script_0800B6C8.inc +++ b/data/scripts/script_0800B6C8.inc @@ -24,7 +24,7 @@ script_0800B6D4: SetLocalFlag 0x009f _0807F034 0x0064 Jump script_0800B698 - .short 0x0000 + .2byte 0x0000 BeginBlock EndBlock script_0800B734: @@ -64,4 +64,4 @@ script_0800B7A2: TextboxNoOverlap 0x057f _0807EA94 Jump script_0800B6A6 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B7FC.inc b/data/scripts/script_0800B7FC.inc index 3e2d3fa4..e2a45b4a 100644 --- a/data/scripts/script_0800B7FC.inc +++ b/data/scripts/script_0800B7FC.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800B7FC _0807E930 0x0000 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800B828.inc b/data/scripts/script_0800B828.inc index ae2357f1..d3083099 100644 --- a/data/scripts/script_0800B828.inc +++ b/data/scripts/script_0800B828.inc @@ -12,7 +12,7 @@ script_0800B836: Wait 0x000f _0807E878 Jump script_0800B836 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -60,7 +60,7 @@ script_0800B8D4: Wait 0x003c Call sub_080646A4 Jump script_0800B8D4 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a @@ -77,7 +77,7 @@ script_0800B8FC: _0807EA94 _0807E878 Jump script_0800B8FC - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -126,4 +126,4 @@ script_0800B99E: script_0800B9AC: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800BB00.inc b/data/scripts/script_0800BB00.inc index e7e21cd9..3f992005 100644 --- a/data/scripts/script_0800BB00.inc +++ b/data/scripts/script_0800BB00.inc @@ -13,4 +13,4 @@ script_0800BB04: Wait 0x00b4 Call sub_08054968 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800BBDC.inc b/data/scripts/script_0800BBDC.inc index 61a8f18b..a9b2b676 100644 --- a/data/scripts/script_0800BBDC.inc +++ b/data/scripts/script_0800BBDC.inc @@ -12,4 +12,4 @@ script_0800BBE4: Wait 0x0078 Call sub_08054968 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800BC50.inc b/data/scripts/script_0800BC50.inc index baa24609..ec6f2a37 100644 --- a/data/scripts/script_0800BC50.inc +++ b/data/scripts/script_0800BC50.inc @@ -35,4 +35,4 @@ script_0800BC62: Wait 0x0078 Call sub_08054968 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800BE1C.inc b/data/scripts/script_0800BE1C.inc index 5df0ddf2..ef5f897c 100644 --- a/data/scripts/script_0800BE1C.inc +++ b/data/scripts/script_0800BE1C.inc @@ -14,7 +14,7 @@ SCRIPT_START script_0800BE1C _0807E930 0x0008 Wait 0x003c Jump script_0800BE88 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800BF38.inc b/data/scripts/script_0800BF38.inc index 0e16a8ad..7b131db4 100644 --- a/data/scripts/script_0800BF38.inc +++ b/data/scripts/script_0800BF38.inc @@ -14,7 +14,7 @@ SCRIPT_START script_0800BF38 _0807E930 0x0008 Wait 0x003c Jump script_0800BFA4 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C0B0.inc b/data/scripts/script_0800C0B0.inc index b5c2d224..04950467 100644 --- a/data/scripts/script_0800C0B0.inc +++ b/data/scripts/script_0800C0B0.inc @@ -14,7 +14,7 @@ SCRIPT_START script_0800C0B0 _0807E930 0x0008 Wait 0x003c Jump script_0800C11C - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C1D8.inc b/data/scripts/script_0800C1D8.inc index f4b62315..98163565 100644 --- a/data/scripts/script_0800C1D8.inc +++ b/data/scripts/script_0800C1D8.inc @@ -14,7 +14,7 @@ SCRIPT_START script_0800C1D8 _0807E930 0x0008 Wait 0x003c Jump script_0800C244 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0008 diff --git a/data/scripts/script_0800C410.inc b/data/scripts/script_0800C410.inc index eb91cfce..42903575 100644 --- a/data/scripts/script_0800C410.inc +++ b/data/scripts/script_0800C410.inc @@ -13,4 +13,4 @@ SCRIPT_START script_0800C410 SoundReq 0x010b _0807E5F8 0x00000001 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800C45C.inc b/data/scripts/script_0800C45C.inc index 99d16109..d1078766 100644 --- a/data/scripts/script_0800C45C.inc +++ b/data/scripts/script_0800C45C.inc @@ -15,4 +15,4 @@ script_0800C47A: _0807E930 0x0005 Wait 0x000f SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800C494.inc b/data/scripts/script_0800C494.inc index 375f4770..5aa15f03 100644 --- a/data/scripts/script_0800C494.inc +++ b/data/scripts/script_0800C494.inc @@ -14,4 +14,4 @@ SCRIPT_START script_0800C494 _0807E930 0x0005 Wait 0x000f SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800C4D0.inc b/data/scripts/script_0800C4D0.inc index 68d2a19f..5186a76a 100644 --- a/data/scripts/script_0800C4D0.inc +++ b/data/scripts/script_0800C4D0.inc @@ -14,4 +14,4 @@ SCRIPT_START script_0800C4D0 _0807E930 0x0005 Wait 0x000f SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CA8C.inc b/data/scripts/script_0800CA8C.inc index fd9661ce..a2429daa 100644 --- a/data/scripts/script_0800CA8C.inc +++ b/data/scripts/script_0800CA8C.inc @@ -10,4 +10,4 @@ SCRIPT_START script_0800CA8C _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CABC.inc b/data/scripts/script_0800CABC.inc index 465dc589..67cac527 100644 --- a/data/scripts/script_0800CABC.inc +++ b/data/scripts/script_0800CABC.inc @@ -31,4 +31,4 @@ SCRIPT_START script_0800CABC _0807E5F8 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CB54.inc b/data/scripts/script_0800CB54.inc index 38f0687a..206ad5fb 100644 --- a/data/scripts/script_0800CB54.inc +++ b/data/scripts/script_0800CB54.inc @@ -27,4 +27,4 @@ SCRIPT_START script_0800CB54 _0807E5F8 0x00001000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CBD4.inc b/data/scripts/script_0800CBD4.inc index 0e6187bc..32847309 100644 --- a/data/scripts/script_0800CBD4.inc +++ b/data/scripts/script_0800CBD4.inc @@ -31,4 +31,4 @@ SCRIPT_START script_0800CBD4 _0807E5F8 0x00004000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CC6C.inc b/data/scripts/script_0800CC6C.inc index 523e3bf3..ffeff6d3 100644 --- a/data/scripts/script_0800CC6C.inc +++ b/data/scripts/script_0800CC6C.inc @@ -31,4 +31,4 @@ SCRIPT_START script_0800CC6C _0807E5F8 0x00010000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CD04.inc b/data/scripts/script_0800CD04.inc index 9d75f438..c25ec6ca 100644 --- a/data/scripts/script_0800CD04.inc +++ b/data/scripts/script_0800CD04.inc @@ -25,4 +25,4 @@ SCRIPT_START script_0800CD04 _0807E5F8 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800CD7C.inc b/data/scripts/script_0800CD7C.inc index e225e56f..bac529fa 100644 --- a/data/scripts/script_0800CD7C.inc +++ b/data/scripts/script_0800CD7C.inc @@ -144,7 +144,7 @@ script_0800CF40: Call sub_0807DF50 _0807E878 Jump script_0800CD92 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08068104 DoPostScriptAction 0x000a @@ -290,4 +290,4 @@ script_0800D17C: _0807E878 Call sub_0807DF50 Jump script_0800CFFA - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D1B4.inc b/data/scripts/script_0800D1B4.inc index 986fa584..855279ca 100644 --- a/data/scripts/script_0800D1B4.inc +++ b/data/scripts/script_0800D1B4.inc @@ -9,4 +9,4 @@ SCRIPT_START script_0800D1B4 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D24C.inc b/data/scripts/script_0800D24C.inc index 0f9b2640..f56e72d8 100644 --- a/data/scripts/script_0800D24C.inc +++ b/data/scripts/script_0800D24C.inc @@ -1,4 +1,4 @@ SCRIPT_START script_0800D24C DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D254.inc b/data/scripts/script_0800D254.inc index c0f99f30..27de55ab 100644 --- a/data/scripts/script_0800D254.inc +++ b/data/scripts/script_0800D254.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800D254 DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D278.inc b/data/scripts/script_0800D278.inc index a7c3a384..4f5fdc32 100644 --- a/data/scripts/script_0800D278.inc +++ b/data/scripts/script_0800D278.inc @@ -108,4 +108,4 @@ script_0800D3B2: script_0800D3E4: _0807E878 Jump script_0800D35E - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D3EC.inc b/data/scripts/script_0800D3EC.inc index 0300f2e7..95b38e48 100644 --- a/data/scripts/script_0800D3EC.inc +++ b/data/scripts/script_0800D3EC.inc @@ -9,4 +9,4 @@ SCRIPT_START script_0800D3EC _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D414.inc b/data/scripts/script_0800D414.inc index 5f7545e1..fac4b733 100644 --- a/data/scripts/script_0800D414.inc +++ b/data/scripts/script_0800D414.inc @@ -38,7 +38,7 @@ script_0800D426: Call sub_0806AF60 _0807EDD4 0x0228, 0x01e8 Jump script_0800D426 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a Call sub_08062A48 @@ -124,7 +124,7 @@ script_0800D5F2: _0807EE30 JumpIfNot script_0800D5F2 Jump script_0800D5AC - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000b diff --git a/data/scripts/script_0800D6B4.inc b/data/scripts/script_0800D6B4.inc index c994019e..5ecafb12 100644 --- a/data/scripts/script_0800D6B4.inc +++ b/data/scripts/script_0800D6B4.inc @@ -6,4 +6,4 @@ SCRIPT_START script_0800D6B4 Call sub_0807F738 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D6D0.inc b/data/scripts/script_0800D6D0.inc index 65080eb4..40d9c3a4 100644 --- a/data/scripts/script_0800D6D0.inc +++ b/data/scripts/script_0800D6D0.inc @@ -10,4 +10,4 @@ script_0800D6E0: script_0800D6E8: DoPostScriptAction 0x0007 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D6F0.inc b/data/scripts/script_0800D6F0.inc index a39a56f4..fb84a2c7 100644 --- a/data/scripts/script_0800D6F0.inc +++ b/data/scripts/script_0800D6F0.inc @@ -9,4 +9,4 @@ script_0800D700: JumpIfNot script_0800D700 DoPostScriptAction 0x0007 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D710.inc b/data/scripts/script_0800D710.inc index e5130920..f5787251 100644 --- a/data/scripts/script_0800D710.inc +++ b/data/scripts/script_0800D710.inc @@ -20,4 +20,4 @@ SCRIPT_START script_0800D710 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D76C.inc b/data/scripts/script_0800D76C.inc index 373f3f59..c676c9df 100644 --- a/data/scripts/script_0800D76C.inc +++ b/data/scripts/script_0800D76C.inc @@ -47,4 +47,4 @@ script_0800D82A: _0807E5F8 0x00000004 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D84C.inc b/data/scripts/script_0800D84C.inc index 32cd7303..8b2968e9 100644 --- a/data/scripts/script_0800D84C.inc +++ b/data/scripts/script_0800D84C.inc @@ -11,4 +11,4 @@ script_0800D850: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D874.inc b/data/scripts/script_0800D874.inc index ef4b487b..f16e938f 100644 --- a/data/scripts/script_0800D874.inc +++ b/data/scripts/script_0800D874.inc @@ -30,7 +30,7 @@ script_0800D8D6: Call sub_0807DF50 _0807E878 Jump script_0800D88E - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0008 CheckInventory1 0x0017 @@ -52,4 +52,4 @@ script_0800D8F4: script_0800D924: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800D954.inc b/data/scripts/script_0800D954.inc index fa5755b5..b745268a 100644 --- a/data/scripts/script_0800D954.inc +++ b/data/scripts/script_0800D954.inc @@ -39,4 +39,4 @@ script_0800D962: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DA60.inc b/data/scripts/script_0800DA60.inc index 733bf33b..7b451f6c 100644 --- a/data/scripts/script_0800DA60.inc +++ b/data/scripts/script_0800DA60.inc @@ -43,4 +43,4 @@ script_0800DA64: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DB28.inc b/data/scripts/script_0800DB28.inc index 08038ccb..5dd5e987 100644 --- a/data/scripts/script_0800DB28.inc +++ b/data/scripts/script_0800DB28.inc @@ -18,4 +18,4 @@ SCRIPT_START script_0800DB28 _0807EB44 0x0004 DoPostScriptAction 0x0014 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DCAC.inc b/data/scripts/script_0800DCAC.inc index a3c0f2e5..582e4f0d 100644 --- a/data/scripts/script_0800DCAC.inc +++ b/data/scripts/script_0800DCAC.inc @@ -65,4 +65,4 @@ script_0800DCD0: SetEntityNonPlanarMovement 0x0100 _0807EEF4 0x0000, 0x0080 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DDD0.inc b/data/scripts/script_0800DDD0.inc index dd7e3a6a..8f6197ab 100644 --- a/data/scripts/script_0800DDD0.inc +++ b/data/scripts/script_0800DDD0.inc @@ -9,4 +9,4 @@ SCRIPT_START script_0800DDD0 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DE00.inc b/data/scripts/script_0800DE00.inc index e1425d7e..cda0a5f9 100644 --- a/data/scripts/script_0800DE00.inc +++ b/data/scripts/script_0800DE00.inc @@ -10,4 +10,4 @@ SCRIPT_START script_0800DE00 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DED4.inc b/data/scripts/script_0800DED4.inc index a88bfd5b..d3aa6911 100644 --- a/data/scripts/script_0800DED4.inc +++ b/data/scripts/script_0800DED4.inc @@ -18,4 +18,4 @@ SCRIPT_START script_0800DED4 Call sub_08066D4C DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800DFE4.inc b/data/scripts/script_0800DFE4.inc index b628b130..d1de2e0b 100644 --- a/data/scripts/script_0800DFE4.inc +++ b/data/scripts/script_0800DFE4.inc @@ -28,4 +28,4 @@ script_0800E012: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E050.inc b/data/scripts/script_0800E050.inc index 008f8c98..f44b8f44 100644 --- a/data/scripts/script_0800E050.inc +++ b/data/scripts/script_0800E050.inc @@ -17,4 +17,4 @@ SCRIPT_START script_0800E050 _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E094.inc b/data/scripts/script_0800E094.inc index 5b912f70..c3a946ef 100644 --- a/data/scripts/script_0800E094.inc +++ b/data/scripts/script_0800E094.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800E094 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E0BC.inc b/data/scripts/script_0800E0BC.inc index 7bf1a3eb..5afb7a99 100644 --- a/data/scripts/script_0800E0BC.inc +++ b/data/scripts/script_0800E0BC.inc @@ -44,7 +44,7 @@ script_0800E138: Wait 0x000f _0807E878 Jump script_0800E138 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a @@ -180,7 +180,7 @@ script_0800E32E: _0807EA94 _0807E878 Jump script_0800E32E - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x000a diff --git a/data/scripts/script_0800E544.inc b/data/scripts/script_0800E544.inc index f8ea1fde..7b085256 100644 --- a/data/scripts/script_0800E544.inc +++ b/data/scripts/script_0800E544.inc @@ -19,4 +19,4 @@ script_0800E582: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E58C.inc b/data/scripts/script_0800E58C.inc index 03454897..54971859 100644 --- a/data/scripts/script_0800E58C.inc +++ b/data/scripts/script_0800E58C.inc @@ -14,4 +14,4 @@ SCRIPT_START script_0800E58C Wait 0x003c Call sub_08053C84 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E5D6.inc b/data/scripts/script_0800E5D6.inc index 6bc30b46..c1219cee 100644 --- a/data/scripts/script_0800E5D6.inc +++ b/data/scripts/script_0800E5D6.inc @@ -11,4 +11,4 @@ script_0800E5D8: Wait 0x001e _0807E878 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800E6B0.inc b/data/scripts/script_0800E6B0.inc index dd055f19..e7c074fe 100644 --- a/data/scripts/script_0800E6B0.inc +++ b/data/scripts/script_0800E6B0.inc @@ -44,7 +44,7 @@ script_0800E722: _0807EA94 _0807E878 Jump script_0800E6F4 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -120,7 +120,7 @@ script_0800E806: _0807E878 _0807EB44 0x0004 Jump script_0800E806 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a diff --git a/data/scripts/script_0800E908.inc b/data/scripts/script_0800E908.inc index 29579a3d..84d61ce1 100644 --- a/data/scripts/script_0800E908.inc +++ b/data/scripts/script_0800E908.inc @@ -28,7 +28,7 @@ script_0800E942: _0807EB44 0x0000 _0807E930 0x0000 Jump script_0800E932 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a _0807EB44 0x0004 diff --git a/data/scripts/script_0800EA1C.inc b/data/scripts/script_0800EA1C.inc index 037d857f..57360433 100644 --- a/data/scripts/script_0800EA1C.inc +++ b/data/scripts/script_0800EA1C.inc @@ -12,4 +12,4 @@ SCRIPT_START script_0800EA1C _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800EA54.inc b/data/scripts/script_0800EA54.inc index ae6cfc3d..87291df6 100644 --- a/data/scripts/script_0800EA54.inc +++ b/data/scripts/script_0800EA54.inc @@ -61,7 +61,7 @@ script_0800EB0E: Wait 0x000f _0807E878 Jump script_0800EB0E - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a @@ -78,7 +78,7 @@ script_0800EB44: _0807EA94 _0807E878 Jump script_0800EB44 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a @@ -127,7 +127,7 @@ script_0800EBF4: _0807EA94 _0807E878 Jump script_0800EBF4 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08061E70 DoPostScriptAction 0x000a @@ -162,7 +162,7 @@ script_0800EC6C: _0807EA94 _0807E878 Jump script_0800EC6C - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 CallWithArg sub_08061FB8, 0x00000001 @@ -232,7 +232,7 @@ script_0800ED76: Wait 0x000f _0807E878 Jump script_0800ED76 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a diff --git a/data/scripts/script_0800EF40.inc b/data/scripts/script_0800EF40.inc index fa2511c4..74e61575 100644 --- a/data/scripts/script_0800EF40.inc +++ b/data/scripts/script_0800EF40.inc @@ -26,4 +26,4 @@ script_0800EF82: script_0800EF92: Call sub_0808692C SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800EF9C.inc b/data/scripts/script_0800EF9C.inc index 61f94c12..a246d1fe 100644 --- a/data/scripts/script_0800EF9C.inc +++ b/data/scripts/script_0800EF9C.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0800EF9C _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800EFC0.inc b/data/scripts/script_0800EFC0.inc index e69fb191..ba645685 100644 --- a/data/scripts/script_0800EFC0.inc +++ b/data/scripts/script_0800EFC0.inc @@ -42,7 +42,7 @@ script_0800F082: EndBlock Call sub_0806AEE4 Jump script_0800F082 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807F0B4 0x0001 CameraTargetPlayer @@ -88,4 +88,4 @@ script_0800F11A: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F33C.inc b/data/scripts/script_0800F33C.inc index 7fa6f67e..cf83ab8e 100644 --- a/data/scripts/script_0800F33C.inc +++ b/data/scripts/script_0800F33C.inc @@ -4,4 +4,4 @@ SCRIPT_START script_0800F33C _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F354.inc b/data/scripts/script_0800F354.inc index faa7609d..30e7f1ef 100644 --- a/data/scripts/script_0800F354.inc +++ b/data/scripts/script_0800F354.inc @@ -4,4 +4,4 @@ SCRIPT_START script_0800F354 _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F36C.inc b/data/scripts/script_0800F36C.inc index 3f5d8959..e3192b28 100644 --- a/data/scripts/script_0800F36C.inc +++ b/data/scripts/script_0800F36C.inc @@ -4,4 +4,4 @@ SCRIPT_START script_0800F36C _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F384.inc b/data/scripts/script_0800F384.inc index 349b1715..38780c9b 100644 --- a/data/scripts/script_0800F384.inc +++ b/data/scripts/script_0800F384.inc @@ -4,4 +4,4 @@ SCRIPT_START script_0800F384 _0807E5F8 0x00000400 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F430.inc b/data/scripts/script_0800F430.inc index 45b67055..023bf67d 100644 --- a/data/scripts/script_0800F430.inc +++ b/data/scripts/script_0800F430.inc @@ -40,4 +40,4 @@ script_0800F490: _0807E5F8 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F4C4.inc b/data/scripts/script_0800F4C4.inc index 86830725..4d285fdc 100644 --- a/data/scripts/script_0800F4C4.inc +++ b/data/scripts/script_0800F4C4.inc @@ -39,4 +39,4 @@ script_0800F524: _0807E5F8 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800F554.inc b/data/scripts/script_0800F554.inc index d362eb4b..e8de87fb 100644 --- a/data/scripts/script_0800F554.inc +++ b/data/scripts/script_0800F554.inc @@ -14,7 +14,7 @@ script_0800F564: _0807EA94 _0807E878 Jump script_0800F564 - .short 0x0000 + .2byte 0x0000 script_0800F584: BeginBlock DoPostScriptAction 0x0001 @@ -31,7 +31,7 @@ script_0800F592: _0807E878 DoPostScriptAction 0x0001 Jump script_0800F592 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0006 _0807E9D4 @@ -48,7 +48,7 @@ script_0800F5C8: _0807EA94 _0807E878 Jump script_0800F5C8 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0000 @@ -81,7 +81,7 @@ script_0800F636: _0807EA94 _0807E878 Jump script_0800F636 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -100,7 +100,7 @@ script_0800F662: _0807E878 DoPostScriptAction 0x0000 Jump script_0800F662 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E930 0x0000 @@ -126,7 +126,7 @@ script_0800F6C8: _0807E878 CallWithArg sub_0807F3D8, 0x00000000 Jump script_0800F6A0 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0001 _0807E9D4 diff --git a/data/scripts/script_0800F724.inc b/data/scripts/script_0800F724.inc index 0a5bab7d..3bddc5e9 100644 --- a/data/scripts/script_0800F724.inc +++ b/data/scripts/script_0800F724.inc @@ -173,4 +173,4 @@ script_0800F72C: script_0800FA4C: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800FB2C.inc b/data/scripts/script_0800FB2C.inc index 8a92506b..6f074f03 100644 --- a/data/scripts/script_0800FB2C.inc +++ b/data/scripts/script_0800FB2C.inc @@ -4,4 +4,4 @@ SCRIPT_START script_0800FB2C _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800FD0C.inc b/data/scripts/script_0800FD0C.inc index cdb8328b..0720943c 100644 --- a/data/scripts/script_0800FD0C.inc +++ b/data/scripts/script_0800FD0C.inc @@ -27,4 +27,4 @@ script_0800FD5C: WaitForSomething2 0x00000008 _0807E878 Jump script_0800FD50 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800FD80.inc b/data/scripts/script_0800FD80.inc index 724039bc..69ac239e 100644 --- a/data/scripts/script_0800FD80.inc +++ b/data/scripts/script_0800FD80.inc @@ -6,4 +6,4 @@ SCRIPT_START script_0800FD80 _0807E5F8 0x00000008 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0800FDA0.inc b/data/scripts/script_0800FDA0.inc index 192cfda5..15f53ddd 100644 --- a/data/scripts/script_0800FDA0.inc +++ b/data/scripts/script_0800FDA0.inc @@ -14,7 +14,7 @@ script_0800FDB2: _0807EA94 _0807E878 Jump script_0800FDB2 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -50,7 +50,7 @@ script_0800FE06: Wait 0x003c Call sub_08069A3C Jump script_0800FDE8 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -86,7 +86,7 @@ script_0800FE7E: Wait 0x003c Call sub_08069A84 Jump script_0800FE60 - .short 0x0000 + .2byte 0x0000 BeginBlock CheckInventory1 0x0012 JumpIf script_0800FF0E diff --git a/data/scripts/script_0800FF74.inc b/data/scripts/script_0800FF74.inc index 1b87d588..91997467 100644 --- a/data/scripts/script_0800FF74.inc +++ b/data/scripts/script_0800FF74.inc @@ -66,7 +66,7 @@ script_08010060: CallWithArg sub_0807F5B0, 0x0000000a _0807E878 Jump script_0800FF92 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a diff --git a/data/scripts/script_080100C8.inc b/data/scripts/script_080100C8.inc index ac42504d..fd50b2f9 100644 --- a/data/scripts/script_080100C8.inc +++ b/data/scripts/script_080100C8.inc @@ -14,7 +14,7 @@ script_080100DC: _0807EA94 _0807E878 Jump script_080100DC - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08061FE4 Call sub_08061E70 @@ -24,7 +24,7 @@ script_08010110: Wait 0x003c Call sub_08061E90 Jump script_08010110 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -116,4 +116,4 @@ script_08010240: Call sub_080A169C DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010264.inc b/data/scripts/script_08010264.inc index 3a0354d7..d45d6fda 100644 --- a/data/scripts/script_08010264.inc +++ b/data/scripts/script_08010264.inc @@ -15,7 +15,7 @@ script_0801027A: _0807EA94 _0807E878 Jump script_0801027A - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 @@ -40,7 +40,7 @@ script_080102CC: _0807EA94 _0807E878 Jump script_080102A6 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 @@ -55,7 +55,7 @@ script_080102F2: _0807EA94 _0807E878 Jump script_080102F2 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0000 EndBlock @@ -99,7 +99,7 @@ script_08010396: _0807EE30 JumpIfNot script_08010396 Jump script_08010314 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0000 Call sub_08062A48 @@ -119,7 +119,7 @@ script_080103E8: Wait 0x003c Call sub_0806407C Jump script_080103E8 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 _0807EB44 0x0004 @@ -256,7 +256,7 @@ script_080105E0: Call sub_0807DF50 _0807E878 Jump script_08010502 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -290,19 +290,19 @@ script_0801062E: BeginBlock _0807E930 0x0009 Jump script_08010622 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E930 0x000b Jump script_08010622 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E930 0x000c Jump script_08010622 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E930 0x000d Jump script_08010622 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -321,7 +321,7 @@ script_08010686: _0807E878 _0807EB44 0x0004 Jump script_08010686 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 DoPostScriptAction 0x000a @@ -364,7 +364,7 @@ script_08010726: _0807E878 DoPostScriptAction 0x0001 Jump script_080106BE - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0007 _0807E9D4 @@ -415,7 +415,7 @@ script_080107AA: _0807E878 DoPostScriptAction 0x0000 Jump script_080107AA - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 DoPostScriptAction 0x0000 @@ -534,4 +534,4 @@ script_08010942: Jump script_0801091C Call sub_0808692C SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080109F0.inc b/data/scripts/script_080109F0.inc index 04fe995f..99e7d042 100644 --- a/data/scripts/script_080109F0.inc +++ b/data/scripts/script_080109F0.inc @@ -8,4 +8,4 @@ SCRIPT_START script_080109F0 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010A14.inc b/data/scripts/script_08010A14.inc index 53105cf2..d3ecbef6 100644 --- a/data/scripts/script_08010A14.inc +++ b/data/scripts/script_08010A14.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08010A14 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010A38.inc b/data/scripts/script_08010A38.inc index 0f012078..2f5dcc02 100644 --- a/data/scripts/script_08010A38.inc +++ b/data/scripts/script_08010A38.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08010A38 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010A5C.inc b/data/scripts/script_08010A5C.inc index 0f9dcf76..2cdf5764 100644 --- a/data/scripts/script_08010A5C.inc +++ b/data/scripts/script_08010A5C.inc @@ -16,4 +16,4 @@ script_08010A78: Call sub_0807DF50 Call sub_080791D0 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010B68.inc b/data/scripts/script_08010B68.inc index 27dbc37f..44727354 100644 --- a/data/scripts/script_08010B68.inc +++ b/data/scripts/script_08010B68.inc @@ -25,4 +25,4 @@ script_08010B88: script_08010BAC: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08010BB4.inc b/data/scripts/script_08010BB4.inc index 8fee4cbf..b2c8633f 100644 --- a/data/scripts/script_08010BB4.inc +++ b/data/scripts/script_08010BB4.inc @@ -16,7 +16,7 @@ script_08010BCA: _0807E878 _0807E930 0x0008 Jump script_08010BCA - .short 0x0000 + .2byte 0x0000 _0807E864 Call sub_0807F9A4 Call sub_0807DF28 diff --git a/data/scripts/script_08010F84.inc b/data/scripts/script_08010F84.inc index 0e59d2cd..730c4f02 100644 --- a/data/scripts/script_08010F84.inc +++ b/data/scripts/script_08010F84.inc @@ -41,4 +41,4 @@ SCRIPT_START script_08010F84 Call sub_0804BCDC DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08011508.inc b/data/scripts/script_08011508.inc index 8232437f..fa5574e6 100644 --- a/data/scripts/script_08011508.inc +++ b/data/scripts/script_08011508.inc @@ -41,4 +41,4 @@ SCRIPT_START script_08011508 _0807E5F8 0x00040000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080116A8.inc b/data/scripts/script_080116A8.inc index 2809f1cf..dd4be295 100644 --- a/data/scripts/script_080116A8.inc +++ b/data/scripts/script_080116A8.inc @@ -82,4 +82,4 @@ SCRIPT_START script_080116A8 _0807E5F8 0x00000200 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801183C.inc b/data/scripts/script_0801183C.inc index 823a28a1..09d8d177 100644 --- a/data/scripts/script_0801183C.inc +++ b/data/scripts/script_0801183C.inc @@ -16,4 +16,4 @@ SCRIPT_START script_0801183C WaitForSomething2 0x00800000 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080118D4.inc b/data/scripts/script_080118D4.inc index 9b8ec154..178ed17f 100644 --- a/data/scripts/script_080118D4.inc +++ b/data/scripts/script_080118D4.inc @@ -18,4 +18,4 @@ SCRIPT_START script_080118D4 SoundReq 0x011d DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08011930.inc b/data/scripts/script_08011930.inc index 387c954c..2dcc1588 100644 --- a/data/scripts/script_08011930.inc +++ b/data/scripts/script_08011930.inc @@ -2,4 +2,4 @@ SCRIPT_START script_08011930 WaitForSomething 0x20000000 Call sub_0809567C SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801194C.inc b/data/scripts/script_0801194C.inc index 03141c41..7d19a55f 100644 --- a/data/scripts/script_0801194C.inc +++ b/data/scripts/script_0801194C.inc @@ -2,11 +2,11 @@ SCRIPT_START script_0801194C BeginBlock _0807EB44 0x0002 Jump script_0801196A - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0006 Jump script_0801196A - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 script_0801196A: @@ -41,15 +41,15 @@ script_080119C8: Wait 0x003c Call sub_0806407C Jump script_080119C8 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0002 Jump script_080119F6 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 Jump script_080119F6 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0006 script_080119F6: @@ -67,7 +67,7 @@ script_08011A08: _0807EA94 _0807E878 Jump script_08011A08 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E9D4 @@ -102,7 +102,7 @@ script_08011A7C: _0807EA94 _0807E878 Jump script_08011A7C - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 _0807E9D4 @@ -134,4 +134,4 @@ script_08011AFA: Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08011B20.inc b/data/scripts/script_08011B20.inc index 8e19052d..0e870c50 100644 --- a/data/scripts/script_08011B20.inc +++ b/data/scripts/script_08011B20.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08011B20 Call sub_0807DF50 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08011C50.inc b/data/scripts/script_08011C50.inc index a31ccbe5..c74be3e5 100644 --- a/data/scripts/script_08011C50.inc +++ b/data/scripts/script_08011C50.inc @@ -10,4 +10,4 @@ SCRIPT_START script_08011C50 Wait 0x001e _0807E5F8 0x00000004 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08011C7C.inc b/data/scripts/script_08011C7C.inc index 82e25509..bd6a73f6 100644 --- a/data/scripts/script_08011C7C.inc +++ b/data/scripts/script_08011C7C.inc @@ -57,7 +57,7 @@ script_08011D0E: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011D00 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -116,7 +116,7 @@ script_08011DBA: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011DAC - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -175,7 +175,7 @@ script_08011E66: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08011E58 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064828 _0807EB44 0x0004 @@ -365,7 +365,7 @@ script_0801209E: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_0801203A - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064928 _0807EB44 0x0004 @@ -411,7 +411,7 @@ script_0801212A: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_080120C6 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064A28 _0807EB44 0x0004 @@ -457,7 +457,7 @@ script_080121B6: _0807EB44 0x0004 DoPostScriptAction 0x0001 Jump script_08012152 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08064828 _0807EB44 0x0004 @@ -572,4 +572,4 @@ script_080122EC: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801232C.inc b/data/scripts/script_0801232C.inc index d6a27b80..08b3dd09 100644 --- a/data/scripts/script_0801232C.inc +++ b/data/scripts/script_0801232C.inc @@ -68,4 +68,4 @@ script_08012368: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012410.inc b/data/scripts/script_08012410.inc index 7eb8b910..1d89d4c4 100644 --- a/data/scripts/script_08012410.inc +++ b/data/scripts/script_08012410.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08012410 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012430.inc b/data/scripts/script_08012430.inc index 7032e0df..4827856a 100644 --- a/data/scripts/script_08012430.inc +++ b/data/scripts/script_08012430.inc @@ -23,7 +23,7 @@ script_08012474: _0807E878 _0807E930 0x0000 Jump script_08012440 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_08054564 EndBlock diff --git a/data/scripts/script_08012AB0.inc b/data/scripts/script_08012AB0.inc index bb737cda..d88f3c06 100644 --- a/data/scripts/script_08012AB0.inc +++ b/data/scripts/script_08012AB0.inc @@ -6,4 +6,4 @@ script_08012AB2: _0807EB44 0x0006 Wait 0x000a Jump script_08012AB2 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012AC8.inc b/data/scripts/script_08012AC8.inc index a4e1e4c6..cdd07661 100644 --- a/data/scripts/script_08012AC8.inc +++ b/data/scripts/script_08012AC8.inc @@ -9,4 +9,4 @@ SCRIPT_START script_08012AC8 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012C48.inc b/data/scripts/script_08012C48.inc index bfeb243d..4c7cd730 100644 --- a/data/scripts/script_08012C48.inc +++ b/data/scripts/script_08012C48.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08012C48 _0807E5F8 0x00000100 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012D18.inc b/data/scripts/script_08012D18.inc index 053ed2d2..73cb0ac9 100644 --- a/data/scripts/script_08012D18.inc +++ b/data/scripts/script_08012D18.inc @@ -21,4 +21,4 @@ SCRIPT_START script_08012D18 script_08012D68: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012D70.inc b/data/scripts/script_08012D70.inc index e290f964..1f0dfcfe 100644 --- a/data/scripts/script_08012D70.inc +++ b/data/scripts/script_08012D70.inc @@ -13,4 +13,4 @@ SCRIPT_START script_08012D70 _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012DD8.inc b/data/scripts/script_08012DD8.inc index 02f50996..d7874822 100644 --- a/data/scripts/script_08012DD8.inc +++ b/data/scripts/script_08012DD8.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08012DD8 WaitForSomething2 0x00000001 _0807E908 0x0002 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012DF8.inc b/data/scripts/script_08012DF8.inc index 4fc67096..760a0faf 100644 --- a/data/scripts/script_08012DF8.inc +++ b/data/scripts/script_08012DF8.inc @@ -9,4 +9,4 @@ SCRIPT_START script_08012DF8 Wait 0x0008 _0807E5F8 0x00000001 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012E44.inc b/data/scripts/script_08012E44.inc index 3f2b72df..b58b20ab 100644 --- a/data/scripts/script_08012E44.inc +++ b/data/scripts/script_08012E44.inc @@ -16,4 +16,4 @@ SCRIPT_START script_08012E44 _0807E5F8 0x00000002 _0807EDD4 0x0088, 0x0158 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08012E88.inc b/data/scripts/script_08012E88.inc index 74f77908..bf393c4d 100644 --- a/data/scripts/script_08012E88.inc +++ b/data/scripts/script_08012E88.inc @@ -16,7 +16,7 @@ script_08012E9E: _0807E878 DoPostScriptAction 0x0000 Jump script_08012E9E - .short 0x0000 + .2byte 0x0000 BeginBlock _0807EB44 0x0004 CallWithArg sub_0807F3D8, 0x00000008 diff --git a/data/scripts/script_080130E4.inc b/data/scripts/script_080130E4.inc index 7c273007..713ffc5d 100644 --- a/data/scripts/script_080130E4.inc +++ b/data/scripts/script_080130E4.inc @@ -11,4 +11,4 @@ SCRIPT_START script_080130E4 Wait 0x000f _0807E5F8 0x00000004 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801319A.inc b/data/scripts/script_0801319A.inc index cc3e52d6..5d272cf2 100644 --- a/data/scripts/script_0801319A.inc +++ b/data/scripts/script_0801319A.inc @@ -75,4 +75,4 @@ script_080131AC: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801330C.inc b/data/scripts/script_0801330C.inc index 298ffe37..0463b892 100644 --- a/data/scripts/script_0801330C.inc +++ b/data/scripts/script_0801330C.inc @@ -8,4 +8,4 @@ SCRIPT_START script_0801330C _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801334C.inc b/data/scripts/script_0801334C.inc index e8edd9b8..c69a56b2 100644 --- a/data/scripts/script_0801334C.inc +++ b/data/scripts/script_0801334C.inc @@ -10,4 +10,4 @@ SCRIPT_START script_0801334C _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013378.inc b/data/scripts/script_08013378.inc index 8c8dbfbf..e6a8ec58 100644 --- a/data/scripts/script_08013378.inc +++ b/data/scripts/script_08013378.inc @@ -13,4 +13,4 @@ SCRIPT_START script_08013378 _0807E5F8 0x00000002 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080133C4.inc b/data/scripts/script_080133C4.inc index 6ce49d56..52231159 100644 --- a/data/scripts/script_080133C4.inc +++ b/data/scripts/script_080133C4.inc @@ -11,4 +11,4 @@ SCRIPT_START script_080133C4 _0807E5F8 0x00000010 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080133F8.inc b/data/scripts/script_080133F8.inc index 285ce1a5..1e720d3b 100644 --- a/data/scripts/script_080133F8.inc +++ b/data/scripts/script_080133F8.inc @@ -31,4 +31,4 @@ SCRIPT_START script_080133F8 _0807E5F8 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013720.inc b/data/scripts/script_08013720.inc index 11cd6075..e3ef357e 100644 --- a/data/scripts/script_08013720.inc +++ b/data/scripts/script_08013720.inc @@ -78,4 +78,4 @@ script_0801373C: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013B18.inc b/data/scripts/script_08013B18.inc index 43d1d8a9..e1b11b09 100644 --- a/data/scripts/script_08013B18.inc +++ b/data/scripts/script_08013B18.inc @@ -21,4 +21,4 @@ script_08013B1E: Call sub_0807DF50 _0807E878 Jump script_08013B1E - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013B70.inc b/data/scripts/script_08013B70.inc index 485fb1df..76310119 100644 --- a/data/scripts/script_08013B70.inc +++ b/data/scripts/script_08013B70.inc @@ -9,4 +9,4 @@ SCRIPT_START script_08013B70 WaitForSomething2 0x00040000 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013BE8.inc b/data/scripts/script_08013BE8.inc index 67891a1b..a49ba76f 100644 --- a/data/scripts/script_08013BE8.inc +++ b/data/scripts/script_08013BE8.inc @@ -55,4 +55,4 @@ script_08013C98: DoPostScriptAction 0x0008 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013D04.inc b/data/scripts/script_08013D04.inc index 90cfccf5..025d0eb7 100644 --- a/data/scripts/script_08013D04.inc +++ b/data/scripts/script_08013D04.inc @@ -13,4 +13,4 @@ script_08013D1C: Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013D44.inc b/data/scripts/script_08013D44.inc index bb4117f3..0dfb9d8c 100644 --- a/data/scripts/script_08013D44.inc +++ b/data/scripts/script_08013D44.inc @@ -13,4 +13,4 @@ script_08013D5C: Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013D84.inc b/data/scripts/script_08013D84.inc index 4b637104..b61269d4 100644 --- a/data/scripts/script_08013D84.inc +++ b/data/scripts/script_08013D84.inc @@ -13,4 +13,4 @@ script_08013D9C: Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013DC4.inc b/data/scripts/script_08013DC4.inc index edb69499..fa1c2572 100644 --- a/data/scripts/script_08013DC4.inc +++ b/data/scripts/script_08013DC4.inc @@ -13,4 +13,4 @@ script_08013DDC: Call sub_080791BC DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013E04.inc b/data/scripts/script_08013E04.inc index 71123815..f956f230 100644 --- a/data/scripts/script_08013E04.inc +++ b/data/scripts/script_08013E04.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08013E04 _0807E930 0x0001 _0807E5F8 0x08000000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013E28.inc b/data/scripts/script_08013E28.inc index 424bed26..8f80fedd 100644 --- a/data/scripts/script_08013E28.inc +++ b/data/scripts/script_08013E28.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08013E28 _0807E930 0x0003 _0807E5F8 0x10000000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013E4C.inc b/data/scripts/script_08013E4C.inc index e41a8b42..0e0bfde8 100644 --- a/data/scripts/script_08013E4C.inc +++ b/data/scripts/script_08013E4C.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08013E4C _0807E930 0x0005 _0807E5F8 0x20000000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013E70.inc b/data/scripts/script_08013E70.inc index 8207c91f..ef89297d 100644 --- a/data/scripts/script_08013E70.inc +++ b/data/scripts/script_08013E70.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08013E70 _0807E930 0x0007 _0807E5F8 0x40000000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013E94.inc b/data/scripts/script_08013E94.inc index 4775f6f3..a01fcca2 100644 --- a/data/scripts/script_08013E94.inc +++ b/data/scripts/script_08013E94.inc @@ -6,4 +6,4 @@ SCRIPT_START script_08013E94 _0807E930 0x0001 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013EB0.inc b/data/scripts/script_08013EB0.inc index 094b17ce..777ce0e7 100644 --- a/data/scripts/script_08013EB0.inc +++ b/data/scripts/script_08013EB0.inc @@ -6,4 +6,4 @@ SCRIPT_START script_08013EB0 _0807E930 0x0003 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013ECC.inc b/data/scripts/script_08013ECC.inc index b3ce8ba1..daeb7eb8 100644 --- a/data/scripts/script_08013ECC.inc +++ b/data/scripts/script_08013ECC.inc @@ -6,4 +6,4 @@ SCRIPT_START script_08013ECC _0807E930 0x0005 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013EE8.inc b/data/scripts/script_08013EE8.inc index e0b367c4..081cdfbb 100644 --- a/data/scripts/script_08013EE8.inc +++ b/data/scripts/script_08013EE8.inc @@ -6,4 +6,4 @@ SCRIPT_START script_08013EE8 _0807E930 0x0007 EndBlock SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013F04.inc b/data/scripts/script_08013F04.inc index 750253da..8e99a3ff 100644 --- a/data/scripts/script_08013F04.inc +++ b/data/scripts/script_08013F04.inc @@ -10,4 +10,4 @@ SCRIPT_START script_08013F04 WaitForSomething2 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013F34.inc b/data/scripts/script_08013F34.inc index 568b3d9e..18a770a5 100644 --- a/data/scripts/script_08013F34.inc +++ b/data/scripts/script_08013F34.inc @@ -10,4 +10,4 @@ SCRIPT_START script_08013F34 WaitForSomething2 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013F64.inc b/data/scripts/script_08013F64.inc index df02227b..5dbd9cdb 100644 --- a/data/scripts/script_08013F64.inc +++ b/data/scripts/script_08013F64.inc @@ -10,4 +10,4 @@ SCRIPT_START script_08013F64 WaitForSomething2 0x00000080 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013F94.inc b/data/scripts/script_08013F94.inc index 9f773d46..b34394a6 100644 --- a/data/scripts/script_08013F94.inc +++ b/data/scripts/script_08013F94.inc @@ -24,4 +24,4 @@ script_08013FA4: script_08013FE0: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08013FE8.inc b/data/scripts/script_08013FE8.inc index 29ae298f..605788ba 100644 --- a/data/scripts/script_08013FE8.inc +++ b/data/scripts/script_08013FE8.inc @@ -29,4 +29,4 @@ script_08013FF0: script_0801404C: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014054.inc b/data/scripts/script_08014054.inc index c19c455e..b00a8e67 100644 --- a/data/scripts/script_08014054.inc +++ b/data/scripts/script_08014054.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08014054 WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014074.inc b/data/scripts/script_08014074.inc index e8fe16a3..33a943f1 100644 --- a/data/scripts/script_08014074.inc +++ b/data/scripts/script_08014074.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08014074 WaitForSomething 0x00000040 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014154.inc b/data/scripts/script_08014154.inc index 834b28ca..898e3180 100644 --- a/data/scripts/script_08014154.inc +++ b/data/scripts/script_08014154.inc @@ -14,4 +14,4 @@ SCRIPT_START script_08014154 Call sub_0807F2D4 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014198.inc b/data/scripts/script_08014198.inc index 8934d70d..a7e84754 100644 --- a/data/scripts/script_08014198.inc +++ b/data/scripts/script_08014198.inc @@ -14,4 +14,4 @@ SCRIPT_START script_08014198 Call sub_0807F2D4 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080141DC.inc b/data/scripts/script_080141DC.inc index fab8a67a..e80ffd66 100644 --- a/data/scripts/script_080141DC.inc +++ b/data/scripts/script_080141DC.inc @@ -10,4 +10,4 @@ SCRIPT_START script_080141DC Call sub_0807F2D4 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014248.inc b/data/scripts/script_08014248.inc index 30fb9e3d..c49a5bc0 100644 --- a/data/scripts/script_08014248.inc +++ b/data/scripts/script_08014248.inc @@ -7,7 +7,7 @@ SCRIPT_START script_08014248 script_08014264: CallWithArg sub_08095EAC, 0x00000001 Jump script_08014264 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x0008 EndBlock @@ -26,4 +26,4 @@ script_08014298: _0807EA94 _0807E878 Jump script_08014298 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014384.inc b/data/scripts/script_08014384.inc index 3d215c0e..7689da1c 100644 --- a/data/scripts/script_08014384.inc +++ b/data/scripts/script_08014384.inc @@ -19,4 +19,4 @@ script_080143AC: _0807E908 0x0001 _0807E878 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014450.inc b/data/scripts/script_08014450.inc index f1a44fb0..e0eaae33 100644 --- a/data/scripts/script_08014450.inc +++ b/data/scripts/script_08014450.inc @@ -56,4 +56,4 @@ script_080144FC: JumpIfNot script_08014462 _0807E9DC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801450C.inc b/data/scripts/script_0801450C.inc index 06a34665..6ac1a03a 100644 --- a/data/scripts/script_0801450C.inc +++ b/data/scripts/script_0801450C.inc @@ -14,7 +14,7 @@ SCRIPT_START script_0801450C ClearLocalFlag 0x0092 Call sub_0807DF50 Jump script_080144FC - .short 0x0000 + .2byte 0x0000 BeginBlock EndBlock script_0801454C: @@ -32,4 +32,4 @@ script_0801454C: _0807E878 Jump script_0801454C SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080145E8.inc b/data/scripts/script_080145E8.inc index 01413c54..4bd860cd 100644 --- a/data/scripts/script_080145E8.inc +++ b/data/scripts/script_080145E8.inc @@ -143,4 +143,4 @@ script_080147CE: Wait 0x0004 _0807E878 Jump script_0801463A - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014804.inc b/data/scripts/script_08014804.inc index d69ee530..26b288d3 100644 --- a/data/scripts/script_08014804.inc +++ b/data/scripts/script_08014804.inc @@ -64,7 +64,7 @@ script_080148D8: _0807E930 0x0002 _0807E5F8 0x00000008 Jump script_0801488E - .short 0x0000 + .2byte 0x0000 BeginBlock EndBlock script_080148F4: @@ -94,4 +94,4 @@ script_08014938: Wait 0x001e Call sub_0807DF50 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080149CC.inc b/data/scripts/script_080149CC.inc index 44cd6af7..268787d0 100644 --- a/data/scripts/script_080149CC.inc +++ b/data/scripts/script_080149CC.inc @@ -26,7 +26,7 @@ script_080149DE: script_08014A20: _0807E878 Jump script_080149DE - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a @@ -41,7 +41,7 @@ script_08014A36: Wait 0x000f _0807E878 Jump script_08014A36 - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a @@ -56,4 +56,4 @@ script_08014A62: Wait 0x000f _0807E878 Jump script_08014A62 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014A80.inc b/data/scripts/script_08014A80.inc index 673f7fcc..ff503803 100644 --- a/data/scripts/script_08014A80.inc +++ b/data/scripts/script_08014A80.inc @@ -19,7 +19,7 @@ script_08014AAC: _0807EA94 _0807E878 Jump script_08014AAC - .short 0x0000 + .2byte 0x0000 BeginBlock Call sub_0806C870 DoPostScriptAction 0x000a @@ -44,4 +44,4 @@ script_08014B02: Wait 0x000f _0807E878 Jump script_08014AD2 - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014B34.inc b/data/scripts/script_08014B34.inc index cd5191b5..03c382c6 100644 --- a/data/scripts/script_08014B34.inc +++ b/data/scripts/script_08014B34.inc @@ -127,4 +127,4 @@ script_08014CAE: script_08014CD4: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014DCC.inc b/data/scripts/script_08014DCC.inc index d71a64c0..f8df2393 100644 --- a/data/scripts/script_08014DCC.inc +++ b/data/scripts/script_08014DCC.inc @@ -17,4 +17,4 @@ SCRIPT_START script_08014DCC _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08014E14.inc b/data/scripts/script_08014E14.inc index 3f660b57..f6497d3c 100644 --- a/data/scripts/script_08014E14.inc +++ b/data/scripts/script_08014E14.inc @@ -15,7 +15,7 @@ script_08014E2C: _0807EA94 _0807E878 Jump script_08014E2C - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -50,7 +50,7 @@ script_08014EBC: Call sub_0807DF50 _0807E878 Jump script_08014E64 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -66,7 +66,7 @@ script_08014EE0: _0807EA94 _0807E878 Jump script_08014EE0 - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 @@ -85,7 +85,7 @@ script_08014F0C: _0807EB44 0x0004 _0807E930 0x000a Jump script_08014F0C - .short 0x0000 + .2byte 0x0000 BeginBlock DoPostScriptAction 0x000a DoPostScriptAction 0x0007 diff --git a/data/scripts/script_08015304.inc b/data/scripts/script_08015304.inc index 6d8e17e3..85133e67 100644 --- a/data/scripts/script_08015304.inc +++ b/data/scripts/script_08015304.inc @@ -11,4 +11,4 @@ SCRIPT_START script_08015304 _0807E5F8 0x00000001 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080155F4.inc b/data/scripts/script_080155F4.inc index 0538498b..8d2bae15 100644 --- a/data/scripts/script_080155F4.inc +++ b/data/scripts/script_080155F4.inc @@ -8,4 +8,4 @@ script_08015608: JumpIfNot script_08015608 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015618.inc b/data/scripts/script_08015618.inc index ae9fb4d9..47e1488a 100644 --- a/data/scripts/script_08015618.inc +++ b/data/scripts/script_08015618.inc @@ -19,4 +19,4 @@ SCRIPT_START script_08015618 Call sub_0807F2D4 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015958.inc b/data/scripts/script_08015958.inc index 9932c7a1..5bf2e8fa 100644 --- a/data/scripts/script_08015958.inc +++ b/data/scripts/script_08015958.inc @@ -70,4 +70,4 @@ script_08015A54: _0807E5F8 0x00000002 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015A7C.inc b/data/scripts/script_08015A7C.inc index 82ec4092..a5c8b58e 100644 --- a/data/scripts/script_08015A7C.inc +++ b/data/scripts/script_08015A7C.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08015A7C _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015AA0.inc b/data/scripts/script_08015AA0.inc index d1e1aa77..d009852f 100644 --- a/data/scripts/script_08015AA0.inc +++ b/data/scripts/script_08015AA0.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08015AA0 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015AC4.inc b/data/scripts/script_08015AC4.inc index 05f17a9e..f2de00b5 100644 --- a/data/scripts/script_08015AC4.inc +++ b/data/scripts/script_08015AC4.inc @@ -18,4 +18,4 @@ SCRIPT_START script_08015AC4 Call sub_08046078 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015B14.inc b/data/scripts/script_08015B14.inc index b2c61214..859115b3 100644 --- a/data/scripts/script_08015B14.inc +++ b/data/scripts/script_08015B14.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08015B14 _0807E5F8 0x00000020 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015B84.inc b/data/scripts/script_08015B84.inc index a316c70a..b20e3589 100644 --- a/data/scripts/script_08015B84.inc +++ b/data/scripts/script_08015B84.inc @@ -7,4 +7,4 @@ SCRIPT_START script_08015B84 _0807E5F8 0x00000004 Call sub_080791BC SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015BE8.inc b/data/scripts/script_08015BE8.inc index 9bed7be6..82ec46eb 100644 --- a/data/scripts/script_08015BE8.inc +++ b/data/scripts/script_08015BE8.inc @@ -37,4 +37,4 @@ script_08015BF0: _0807E878 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015F3C.inc b/data/scripts/script_08015F3C.inc index 1845bd29..171e7ea6 100644 --- a/data/scripts/script_08015F3C.inc +++ b/data/scripts/script_08015F3C.inc @@ -15,4 +15,4 @@ SCRIPT_START script_08015F3C WaitForSomething 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015F80.inc b/data/scripts/script_08015F80.inc index 4b208e24..754f1236 100644 --- a/data/scripts/script_08015F80.inc +++ b/data/scripts/script_08015F80.inc @@ -8,4 +8,4 @@ SCRIPT_START script_08015F80 WaitForSomething 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08015FA4.inc b/data/scripts/script_08015FA4.inc index 2c4817d2..b33a121f 100644 --- a/data/scripts/script_08015FA4.inc +++ b/data/scripts/script_08015FA4.inc @@ -6,4 +6,4 @@ SCRIPT_START script_08015FA4 WaitForSomething 0x00000400 DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08016004.inc b/data/scripts/script_08016004.inc index 86740a2a..7bcdb876 100644 --- a/data/scripts/script_08016004.inc +++ b/data/scripts/script_08016004.inc @@ -10,4 +10,4 @@ SCRIPT_START script_08016004 script_08016028: DoPostScriptAction 0x0006 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08016062.inc b/data/scripts/script_08016062.inc index 7f7886a1..d3b89b6b 100644 --- a/data/scripts/script_08016062.inc +++ b/data/scripts/script_08016062.inc @@ -1,4 +1,4 @@ SCRIPT_START script_08016062 SetEntityPosition 0xfff0, 0x0000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_0801609E.inc b/data/scripts/script_0801609E.inc index 69e5c09b..22853136 100644 --- a/data/scripts/script_0801609E.inc +++ b/data/scripts/script_0801609E.inc @@ -1,4 +1,4 @@ SCRIPT_START script_0801609E SetEntityPosition 0x0010, 0x0000 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080160A8.inc b/data/scripts/script_080160A8.inc index 9bf8bbdc..bcd54937 100644 --- a/data/scripts/script_080160A8.inc +++ b/data/scripts/script_080160A8.inc @@ -204,4 +204,4 @@ script_08016346: _0807EB44 0x0004 DoPostScriptAction 0x0000 Jump script_080161FE - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_08016482.inc b/data/scripts/script_08016482.inc index 63c6e52b..5999bc0c 100644 --- a/data/scripts/script_08016482.inc +++ b/data/scripts/script_08016482.inc @@ -77,4 +77,4 @@ SCRIPT_START script_08016482 _0807F0B4 0x0007 _0807F0C8 0x003c, 0x0003 SCRIPT_END - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080165A4.inc b/data/scripts/script_080165A4.inc index 4cd700ef..c8af0ba1 100644 --- a/data/scripts/script_080165A4.inc +++ b/data/scripts/script_080165A4.inc @@ -7,7 +7,7 @@ SCRIPT_START script_080165A4 script_080165B2: _0807E974 0x0601 Jump script_080165B2 - .short 0x0000 + .2byte 0x0000 script_080165BC: Wait 0x001e CheckPlayerInRegion2 0x2020 @@ -15,4 +15,4 @@ script_080165BC: DoPostScriptAction 0x0003 Call script_0801637C+1 Jump script_080165BC - .short 0x0000 + .2byte 0x0000 diff --git a/data/scripts/script_080165D8.inc b/data/scripts/script_080165D8.inc index 92c33414..cc22a1f0 100644 --- a/data/scripts/script_080165D8.inc +++ b/data/scripts/script_080165D8.inc @@ -5,7 +5,7 @@ SCRIPT_START script_080165D8 DoPostScriptAction 0x0003 Call script_0801637C+1 JumpAbsolute script_080165D8 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 EndBlock @@ -25,7 +25,7 @@ script_08016612: Wait 0x000f _0807E878 Jump script_08016612 - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 EndBlock @@ -37,7 +37,7 @@ script_0801662E: Wait 0x000f _0807E878 Jump script_0801662E - .short 0x0000 + .2byte 0x0000 SetEntityNonPlanarMovement 0x0100 script_08016648: _0807ECF4 0x0030 @@ -234,7 +234,7 @@ script_0801693E: Wait 0x000f _0807E878 Jump script_0801693E - .short 0x0000 + .2byte 0x0000 BeginBlock _0807E9D4 _0807EB44 0x0000 @@ -250,4 +250,4 @@ script_0801696A: Wait 0x000f _0807E878 Jump script_0801696A - .short 0x0000 + .2byte 0x0000 diff --git a/tools/script_disassembler/definitions.py b/tools/script_disassembler/definitions.py index 0793db76..d71d5040 100644 --- a/tools/script_disassembler/definitions.py +++ b/tools/script_disassembler/definitions.py @@ -85,7 +85,7 @@ commands = [ {'fun': 'ScriptCommand_0807E8E4_2', 'params': ''}, # duplicate {'fun': 'ScriptCommand_0807E8E4_3', 'params': ''}, # duplicate {'fun': 'ScriptCommand_0807E908', 'params': 's'}, - {'fun': 'ScriptCommandSetIntVariable', 'params': 'w'}, + {'fun': 'ScriptCommand_SetIntVariable', 'params': 'w'}, {'fun': 'ScriptCommand_0807E924', 'params': ''}, {'fun': 'ScriptCommand_0807E930', 'params': 's'}, {'fun': 'ScriptCommand_0807E944', 'params': ''}, @@ -100,7 +100,7 @@ commands = [ {'fun': 'ScriptCommand_TextboxNoOverlapFollow', 'params': 's'}, {'fun': 'ScriptCommand_TextboxNoOverlap', 'params': 's'}, {'fun': 'ScriptCommand_TextboxNoOverlapFollowPos', 'params': ['ss', 's']}, - {'fun': 'ScriptCommandTextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']}, + {'fun': 'ScriptCommand_TextboxNoOverlapFollowTable', 'params': ['ss', 'sss', 'ssss']}, {'fun': 'ScriptCommand_TextboxNoOverlapVar', 'params': ''}, {'fun': 'ScriptCommand_0807EB28', 'params': 's'}, {'fun': 'ScriptCommand_0807EB38', 'params': ''}, @@ -216,106 +216,106 @@ parameters = { 's': { 'length': 1, 'param': 's', - 'expr': ' .short \s', + 'expr': ' .2byte \s', 'read': lambda ctx: barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 4])[0] }, 'ss': { 'length': 2, 'param': 'a,b', - 'expr': ' .short \\a\n .short \\b', + 'expr': ' .2byte \\a\n .2byte \\b', 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6])) }, 'sss': { 'length': 3, 'param': 'a,b,c', - 'expr': ' .short \\a\n .short \\b\n .short \\c', + 'expr': ' .2byte \\a\n .2byte \\b\n .2byte \\c', 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 8])) }, 'ssss': { 'length': 4, 'param': 'a,b,c,d', - 'expr': ' .short \\a\n .short \\b\n .short \\c\n .short \\d', + 'expr': ' .2byte \\a\n .2byte \\b\n .2byte \\c\n .2byte \\d', 'read': lambda ctx: ', '.join(barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10])) }, 'w': { 'length': 2, 'param': 'w', - 'expr': ' .word \w', + 'expr': ' .4byte \w', 'read': lambda ctx: barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 6])[0] }, 'ww': { 'length': 4, 'param': 'a,b', - 'expr': ' .word \\a\n .word \\b', + 'expr': ' .4byte \\a\n .4byte \\b', 'read': lambda ctx: ', '.join(barray_to_u32_hex(ctx.data[ctx.ptr + 2:ctx.ptr + 10])) }, 'j': { # Relative jump target 'length': 1, 'param': 's', - 'expr': '1: .short \s - 1b', + 'expr': '1: .2byte \s - 1b', 'read': lambda ctx: use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + 2:ctx.ptr + 4])) }, 'jj': { 'length': 2, 'param': 'a,b', - 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2', + 'expr': '1: .2byte \\a - 1b\n .2byte \\b - 1b - 2', 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x * 2) for x in range(0, 2)]) }, 'jjj': { 'length': 3, 'param': 'a,b,c', - 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4', + 'expr': '1: .2byte \\a - 1b\n .2byte \\b - 1b - 2\n .2byte \\c - 1b - 4', 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 3)]) }, 'jjjj': { 'length': 4, 'param': 'a,b,c,d', - 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6', + 'expr': '1: .2byte \\a - 1b\n .2byte \\b - 1b - 2\n .2byte \\c - 1b - 4\n .2byte \\d - 1b - 6', 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 4)]) }, 'jjjjjjj': { 'length': 7, 'param': 'a,b,c,d,e,f,g', - 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6\n .short \\e - 1b - 8\n .short \\f - 1b - 10\n .short \\g - 1b - 12', + 'expr': '1: .2byte \\a - 1b\n .2byte \\b - 1b - 2\n .2byte \\c - 1b - 4\n .2byte \\d - 1b - 6\n .2byte \\e - 1b - 8\n .2byte \\f - 1b - 10\n .2byte \\g - 1b - 12', 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 7)]) }, 'jjjjjjjjj': { 'length': 9, 'param': 'a,b,c,d,e,f,g,h,i', - 'expr': '1: .short \\a - 1b\n .short \\b - 1b - 2\n .short \\c - 1b - 4\n .short \\d - 1b - 6\n .short \\e - 1b - 8\n .short \\f - 1b - 10\n .short \\g - 1b - 12\n .short \\h - 1b - 14\n .short \\i - 1b - 16', + 'expr': '1: .2byte \\a - 1b\n .2byte \\b - 1b - 2\n .2byte \\c - 1b - 4\n .2byte \\d - 1b - 6\n .2byte \\e - 1b - 8\n .2byte \\f - 1b - 10\n .2byte \\g - 1b - 12\n .2byte \\h - 1b - 14\n .2byte \\i - 1b - 16', 'read': lambda ctx: ', '.join([use_script_label(ctx.script_addr + ctx.ptr + 2 + barray_to_s16(ctx.data[ctx.ptr + x * 2 + 2:ctx.ptr + x * 2 + 4]) + x*2) for x in range(0, 9)]) }, 'p': { 'length': 2, 'param': 'w', - 'expr': ' .word \w', + 'expr': ' .4byte \w', 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) }, 'px': { 'length': 4, 'param': 'a,b', - 'expr': ' .word \\a\n .word \\b', + 'expr': ' .4byte \\a\n .4byte \\b', 'read': lambda ctx: get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10]) }, 'd': { # Data pointer 'length': 2, 'param': 'w', - 'expr': ' .word \w', + 'expr': ' .4byte \w', 'read': lambda ctx: get_data_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) }, 'x': { # Script pointer 'length': 2, 'param': 'w', - 'expr': ' .word \w', + 'expr': ' .4byte \w', 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) }, 'xx': { 'length': 4, 'param': 'a, b', - 'expr': ' .word \\a\n .word \\b', + 'expr': ' .4byte \\a\n .4byte \\b', 'read': lambda ctx: get_script_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6]) + ', ' + get_script_pointer(ctx.data[ctx.ptr + 6:ctx.ptr + 10]) }, # Commands with variable parameter count are now handled by explicitely defining all used parameter configurations @@ -328,7 +328,7 @@ parameters = { # 'pv': { # 'length': -2, # 'param': 'w', - # 'expr': ' .word \w', + # 'expr': ' .4byte \w', # 'read': lambda ctx: '' # }, } diff --git a/tools/script_disassembler/script_disassembler.py b/tools/script_disassembler/script_disassembler.py index 3095533c..3b7094d8 100644 --- a/tools/script_disassembler/script_disassembler.py +++ b/tools/script_disassembler/script_disassembler.py @@ -37,7 +37,7 @@ def disassemble_command(ctx: Context, add_all_annotations=False): cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0] if cmd == 0: # this does not need to be the end of the script - print('\t.short 0x0000') + print('\t.2byte 0x0000') ctx.ptr += 2 return 1 @@ -47,7 +47,7 @@ def disassemble_command(ctx: Context, add_all_annotations=False): cmd = struct.unpack('H', ctx.data[ctx.ptr:ctx.ptr + 2])[0] if cmd == 0x0000: # This is actually the end of the script - print('\t.short 0x0000') + print('\t.2byte 0x0000') ctx.ptr += 2 return 2 return 3 # There is a SCRIPT_END without 0x0000 afterwards, but still split into a new file, please @@ -93,18 +93,18 @@ def disassemble_command(ctx: Context, add_all_annotations=False): command_name = f'{command["fun"]}{suffix}' if params['length'] == -1: # variable parameter length - print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters') + print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-1} parameters') if commandSize > 1: - print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])])) + print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 2:ctx.ptr + commandSize * 2])])) print(f'@ End of parameters') ctx.ptr += commandSize * 2 return 1 elif params['length'] == -2: # point and var - print(f'\t.short {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters') + print(f'\t.2byte {u16_to_hex(cmd)} @ {build_script_command(command_name)} with {commandSize-3} parameters') - print('\t.word ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])) + print('\t.4byte ' + get_pointer(ctx.data[ctx.ptr + 2:ctx.ptr + 6])) if commandSize > 3: - print('\n'.join(['\t.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])])) + print('\n'.join(['\t.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr + 6:ctx.ptr + commandSize * 2])])) print(f'@ End of parameters') ctx.ptr += commandSize * 2 return 1 @@ -142,7 +142,7 @@ def disassemble_script(input_bytes, script_addr, add_all_annotations=False): if (len(ctx.data) - ctx.ptr) % 2 != 0: print_rest_bytes(ctx) raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}') - print('\n'.join(['.short ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])])) + print('\n'.join(['.2byte ' + x for x in barray_to_u16_hex(ctx.data[ctx.ptr:])])) raise Exception(f'There is extra data at the end {ctx.ptr} / {len(ctx.data)}') if not foundEnd: @@ -163,7 +163,7 @@ def generate_macros(): print('.endm') print('.macro SCRIPT_END') - print(' .short 0xffff') + print(' .2byte 0xffff') print('.endm') print('') @@ -173,7 +173,7 @@ def generate_macros(): def emit_macro(command_name, id, params): print(f'.macro {command_name} {params["param"]}') - print(f' .short {u16_to_hex(id)}') + print(f' .2byte {u16_to_hex(id)}') if params['expr'] != '': print(params['expr']) print('.endm')