diff --git a/asm/macros/btlcmd.inc b/asm/macros/btlcmd.inc index 4d5429c6d0..0a01b1dfd0 100644 --- a/asm/macros/btlcmd.inc +++ b/asm/macros/btlcmd.inc @@ -1232,4 +1232,8 @@ .long 222 .endm + .text + .globl _start +_start: + .endif // ASM_BATTLE_SCRIPT_INC diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index 60a4f09144..ec62d467da 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -4892,3 +4892,7 @@ CanFitItem \item, \count, \destVarID GoToIfEq \destVarID, FALSE, \offset .endm + + .text + .globl _start +_start: diff --git a/res/battle/scripts/effects/effect_script_0000.s b/res/battle/scripts/effects/effect_script_0000.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0000.s +++ b/res/battle/scripts/effects/effect_script_0000.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0001.s b/res/battle/scripts/effects/effect_script_0001.s index 3d13cfa979..f2ff5f718e 100644 --- a/res/battle/scripts/effects/effect_script_0001.s +++ b/res/battle/scripts/effects/effect_script_0001.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SLEEP diff --git a/res/battle/scripts/effects/effect_script_0002.s b/res/battle/scripts/effects/effect_script_0002.s index 722f9a0f48..cde8faf5c4 100644 --- a/res/battle/scripts/effects/effect_script_0002.s +++ b/res/battle/scripts/effects/effect_script_0002.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON diff --git a/res/battle/scripts/effects/effect_script_0003.s b/res/battle/scripts/effects/effect_script_0003.s index 380cbd73f1..db314b7159 100644 --- a/res/battle/scripts/effects/effect_script_0003.s +++ b/res/battle/scripts/effects/effect_script_0003.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_DRAIN_HALF_DAMAGE_DEALT diff --git a/res/battle/scripts/effects/effect_script_0004.s b/res/battle/scripts/effects/effect_script_0004.s index 39633cd4d0..fc1f8b24cd 100644 --- a/res/battle/scripts/effects/effect_script_0004.s +++ b/res/battle/scripts/effects/effect_script_0004.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN diff --git a/res/battle/scripts/effects/effect_script_0005.s b/res/battle/scripts/effects/effect_script_0005.s index 65304f0e73..993429f413 100644 --- a/res/battle/scripts/effects/effect_script_0005.s +++ b/res/battle/scripts/effects/effect_script_0005.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE diff --git a/res/battle/scripts/effects/effect_script_0006.s b/res/battle/scripts/effects/effect_script_0006.s index 94eaeb2a37..07a127d442 100644 --- a/res/battle/scripts/effects/effect_script_0006.s +++ b/res/battle/scripts/effects/effect_script_0006.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE diff --git a/res/battle/scripts/effects/effect_script_0007.s b/res/battle/scripts/effects/effect_script_0007.s index 38231aa227..8b4f8be7f1 100644 --- a/res/battle/scripts/effects/effect_script_0007.s +++ b/res/battle/scripts/effects/effect_script_0007.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_ALL_BATTLERS, ABILITY_DAMP, _038 diff --git a/res/battle/scripts/effects/effect_script_0008.s b/res/battle/scripts/effects/effect_script_0008.s index ebf3ca3a34..38be5c853f 100644 --- a/res/battle/scripts/effects/effect_script_0008.s +++ b/res/battle/scripts/effects/effect_script_0008.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _015 diff --git a/res/battle/scripts/effects/effect_script_0009.s b/res/battle/scripts/effects/effect_script_0009.s index 44c6c08a82..46adbfce19 100644 --- a/res/battle/scripts/effects/effect_script_0009.s +++ b/res/battle/scripts/effects/effect_script_0009.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/effects/effect_script_0010.s b/res/battle/scripts/effects/effect_script_0010.s index 4c54089dd9..56ccb1b220 100644 --- a/res/battle/scripts/effects/effect_script_0010.s +++ b/res/battle/scripts/effects/effect_script_0010.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0011.s b/res/battle/scripts/effects/effect_script_0011.s index e751745a3e..1469dc0d3a 100644 --- a/res/battle/scripts/effects/effect_script_0011.s +++ b/res/battle/scripts/effects/effect_script_0011.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0012.s b/res/battle/scripts/effects/effect_script_0012.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0012.s +++ b/res/battle/scripts/effects/effect_script_0012.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0013.s b/res/battle/scripts/effects/effect_script_0013.s index 9fe6525303..21fe16e4e7 100644 --- a/res/battle/scripts/effects/effect_script_0013.s +++ b/res/battle/scripts/effects/effect_script_0013.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0014.s b/res/battle/scripts/effects/effect_script_0014.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0014.s +++ b/res/battle/scripts/effects/effect_script_0014.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0015.s b/res/battle/scripts/effects/effect_script_0015.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0015.s +++ b/res/battle/scripts/effects/effect_script_0015.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0016.s b/res/battle/scripts/effects/effect_script_0016.s index d07f933216..859e3ab194 100644 --- a/res/battle/scripts/effects/effect_script_0016.s +++ b/res/battle/scripts/effects/effect_script_0016.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_EVASION_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0017.s b/res/battle/scripts/effects/effect_script_0017.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0017.s +++ b/res/battle/scripts/effects/effect_script_0017.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0018.s b/res/battle/scripts/effects/effect_script_0018.s index 0d18c2aa2e..be8e4a5c13 100644 --- a/res/battle/scripts/effects/effect_script_0018.s +++ b/res/battle/scripts/effects/effect_script_0018.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0019.s b/res/battle/scripts/effects/effect_script_0019.s index 493534c260..084c8f3c9b 100644 --- a/res/battle/scripts/effects/effect_script_0019.s +++ b/res/battle/scripts/effects/effect_script_0019.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0020.s b/res/battle/scripts/effects/effect_script_0020.s index 2e7ed73151..ed407a30dc 100644 --- a/res/battle/scripts/effects/effect_script_0020.s +++ b/res/battle/scripts/effects/effect_script_0020.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0021.s b/res/battle/scripts/effects/effect_script_0021.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0021.s +++ b/res/battle/scripts/effects/effect_script_0021.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0022.s b/res/battle/scripts/effects/effect_script_0022.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0022.s +++ b/res/battle/scripts/effects/effect_script_0022.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0023.s b/res/battle/scripts/effects/effect_script_0023.s index 379581b97b..5c554f88ce 100644 --- a/res/battle/scripts/effects/effect_script_0023.s +++ b/res/battle/scripts/effects/effect_script_0023.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ACCURACY_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0024.s b/res/battle/scripts/effects/effect_script_0024.s index d868735838..3da12698f4 100644 --- a/res/battle/scripts/effects/effect_script_0024.s +++ b/res/battle/scripts/effects/effect_script_0024.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EVASION_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0025.s b/res/battle/scripts/effects/effect_script_0025.s index a3a03512c2..614673f29a 100644 --- a/res/battle/scripts/effects/effect_script_0025.s +++ b/res/battle/scripts/effects/effect_script_0025.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RESET_ALL_STAT_STAGES diff --git a/res/battle/scripts/effects/effect_script_0026.s b/res/battle/scripts/effects/effect_script_0026.s index 4e742bf0e9..0334cee73a 100644 --- a/res/battle/scripts/effects/effect_script_0026.s +++ b/res/battle/scripts/effects/effect_script_0026.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _015 diff --git a/res/battle/scripts/effects/effect_script_0027.s b/res/battle/scripts/effects/effect_script_0027.s index e8ac4d16cc..f053732c8c 100644 --- a/res/battle/scripts/effects/effect_script_0027.s +++ b/res/battle/scripts/effects/effect_script_0027.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_THRASH, _009 diff --git a/res/battle/scripts/effects/effect_script_0028.s b/res/battle/scripts/effects/effect_script_0028.s index c801aa4b22..83433535b2 100644 --- a/res/battle/scripts/effects/effect_script_0028.s +++ b/res/battle/scripts/effects/effect_script_0028.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FORCE_TARGET_TO_SWITCH_OR_FLEE diff --git a/res/battle/scripts/effects/effect_script_0029.s b/res/battle/scripts/effects/effect_script_0029.s index d347874ec4..0ac8db8a9b 100644 --- a/res/battle/scripts/effects/effect_script_0029.s +++ b/res/battle/scripts/effects/effect_script_0029.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: SetMultiHit 0, SYSCTL_MULTI_HIT_MOVE diff --git a/res/battle/scripts/effects/effect_script_0030.s b/res/battle/scripts/effects/effect_script_0030.s index f7fbaaa4a7..c7a3761b4c 100644 --- a/res/battle/scripts/effects/effect_script_0030.s +++ b/res/battle/scripts/effects/effect_script_0030.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CONVERSION diff --git a/res/battle/scripts/effects/effect_script_0031.s b/res/battle/scripts/effects/effect_script_0031.s index 3c7422a732..7dac9c6306 100644 --- a/res/battle/scripts/effects/effect_script_0031.s +++ b/res/battle/scripts/effects/effect_script_0031.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0032.s b/res/battle/scripts/effects/effect_script_0032.s index 145dd3f2d5..098f6b8b8b 100644 --- a/res/battle/scripts/effects/effect_script_0032.s +++ b/res/battle/scripts/effects/effect_script_0032.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOVER_HALF_MAX_HP diff --git a/res/battle/scripts/effects/effect_script_0033.s b/res/battle/scripts/effects/effect_script_0033.s index 1e974e261f..5c49de206e 100644 --- a/res/battle/scripts/effects/effect_script_0033.s +++ b/res/battle/scripts/effects/effect_script_0033.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BADLY_POISON diff --git a/res/battle/scripts/effects/effect_script_0034.s b/res/battle/scripts/effects/effect_script_0034.s index 4e76a85541..1599dd4fb9 100644 --- a/res/battle/scripts/effects/effect_script_0034.s +++ b/res/battle/scripts/effects/effect_script_0034.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PAY_DAY diff --git a/res/battle/scripts/effects/effect_script_0035.s b/res/battle/scripts/effects/effect_script_0035.s index a73df90e2f..bb54f63d4a 100644 --- a/res/battle/scripts/effects/effect_script_0035.s +++ b/res/battle/scripts/effects/effect_script_0035.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_LIGHT_SCREEN diff --git a/res/battle/scripts/effects/effect_script_0036.s b/res/battle/scripts/effects/effect_script_0036.s index bcb15c518f..cdf3790016 100644 --- a/res/battle/scripts/effects/effect_script_0036.s +++ b/res/battle/scripts/effects/effect_script_0036.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Random 2, 3 diff --git a/res/battle/scripts/effects/effect_script_0037.s b/res/battle/scripts/effects/effect_script_0037.s index 3977e51e79..cd97fd1994 100644 --- a/res/battle/scripts/effects/effect_script_0037.s +++ b/res/battle/scripts/effects/effect_script_0037.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_REST diff --git a/res/battle/scripts/effects/effect_script_0038.s b/res/battle/scripts/effects/effect_script_0038.s index 912b3f5a6f..6ef0a8fc45 100644 --- a/res/battle/scripts/effects/effect_script_0038.s +++ b/res/battle/scripts/effects/effect_script_0038.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryOHKOMove diff --git a/res/battle/scripts/effects/effect_script_0039.s b/res/battle/scripts/effects/effect_script_0039.s index aed0c8a764..a94c312e92 100644 --- a/res/battle/scripts/effects/effect_script_0039.s +++ b/res/battle/scripts/effects/effect_script_0039.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _031 diff --git a/res/battle/scripts/effects/effect_script_0040.s b/res/battle/scripts/effects/effect_script_0040.s index c3e889a8fe..5bdd82ab41 100644 --- a/res/battle/scripts/effects/effect_script_0040.s +++ b/res/battle/scripts/effects/effect_script_0040.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS diff --git a/res/battle/scripts/effects/effect_script_0041.s b/res/battle/scripts/effects/effect_script_0041.s index 44561941a6..0ffb2b1098 100644 --- a/res/battle/scripts/effects/effect_script_0041.s +++ b/res/battle/scripts/effects/effect_script_0041.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_REGULATION_FLAG, 1, _013 diff --git a/res/battle/scripts/effects/effect_script_0042.s b/res/battle/scripts/effects/effect_script_0042.s index 8853f7c733..0b5e2b7579 100644 --- a/res/battle/scripts/effects/effect_script_0042.s +++ b/res/battle/scripts/effects/effect_script_0042.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_HP_AND_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BIND_TARGET diff --git a/res/battle/scripts/effects/effect_script_0043.s b/res/battle/scripts/effects/effect_script_0043.s index 1b4ec7b0be..f95b6f7304 100644 --- a/res/battle/scripts/effects/effect_script_0043.s +++ b/res/battle/scripts/effects/effect_script_0043.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 diff --git a/res/battle/scripts/effects/effect_script_0044.s b/res/battle/scripts/effects/effect_script_0044.s index 0a734b9cd2..32ce21dcaf 100644 --- a/res/battle/scripts/effects/effect_script_0044.s +++ b/res/battle/scripts/effects/effect_script_0044.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: SetMultiHit 2, SYSCTL_MULTI_HIT_MOVE diff --git a/res/battle/scripts/effects/effect_script_0045.s b/res/battle/scripts/effects/effect_script_0045.s index b95bdecc05..8332308808 100644 --- a/res/battle/scripts/effects/effect_script_0045.s +++ b/res/battle/scripts/effects/effect_script_0045.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0046.s b/res/battle/scripts/effects/effect_script_0046.s index 3807300441..f716e708a0 100644 --- a/res/battle/scripts/effects/effect_script_0046.s +++ b/res/battle/scripts/effects/effect_script_0046.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIST diff --git a/res/battle/scripts/effects/effect_script_0047.s b/res/battle/scripts/effects/effect_script_0047.s index 5b5a198a1e..914ae5fcc5 100644 --- a/res/battle/scripts/effects/effect_script_0047.s +++ b/res/battle/scripts/effects/effect_script_0047.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FOCUS_ENERGY, _010 diff --git a/res/battle/scripts/effects/effect_script_0048.s b/res/battle/scripts/effects/effect_script_0048.s index 4a4297889e..f7873a59b6 100644 --- a/res/battle/scripts/effects/effect_script_0048.s +++ b/res/battle/scripts/effects/effect_script_0048.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0049.s b/res/battle/scripts/effects/effect_script_0049.s index b8d0cc7723..b0df675751 100644 --- a/res/battle/scripts/effects/effect_script_0049.s +++ b/res/battle/scripts/effects/effect_script_0049.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE diff --git a/res/battle/scripts/effects/effect_script_0050.s b/res/battle/scripts/effects/effect_script_0050.s index 317842936d..b60dbb3c84 100644 --- a/res/battle/scripts/effects/effect_script_0050.s +++ b/res/battle/scripts/effects/effect_script_0050.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0051.s b/res/battle/scripts/effects/effect_script_0051.s index 476bfc63d9..c5dbfb7a17 100644 --- a/res/battle/scripts/effects/effect_script_0051.s +++ b/res/battle/scripts/effects/effect_script_0051.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0052.s b/res/battle/scripts/effects/effect_script_0052.s index 6e68cfaa9f..097b0074e6 100644 --- a/res/battle/scripts/effects/effect_script_0052.s +++ b/res/battle/scripts/effects/effect_script_0052.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SPEED_UP_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0053.s b/res/battle/scripts/effects/effect_script_0053.s index 96ea7bd165..1a6feacaa7 100644 --- a/res/battle/scripts/effects/effect_script_0053.s +++ b/res/battle/scripts/effects/effect_script_0053.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0054.s b/res/battle/scripts/effects/effect_script_0054.s index 0fa578bdc9..a54016cc4e 100644 --- a/res/battle/scripts/effects/effect_script_0054.s +++ b/res/battle/scripts/effects/effect_script_0054.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_UP_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0055.s b/res/battle/scripts/effects/effect_script_0055.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0055.s +++ b/res/battle/scripts/effects/effect_script_0055.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0056.s b/res/battle/scripts/effects/effect_script_0056.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0056.s +++ b/res/battle/scripts/effects/effect_script_0056.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0057.s b/res/battle/scripts/effects/effect_script_0057.s index 37728ddcf1..30917a9aaf 100644 --- a/res/battle/scripts/effects/effect_script_0057.s +++ b/res/battle/scripts/effects/effect_script_0057.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TRANSFORM_INTO_TARGET diff --git a/res/battle/scripts/effects/effect_script_0058.s b/res/battle/scripts/effects/effect_script_0058.s index a7ed1278fb..e07c5e17e3 100644 --- a/res/battle/scripts/effects/effect_script_0058.s +++ b/res/battle/scripts/effects/effect_script_0058.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0059.s b/res/battle/scripts/effects/effect_script_0059.s index cd6a7e084d..19648661d8 100644 --- a/res/battle/scripts/effects/effect_script_0059.s +++ b/res/battle/scripts/effects/effect_script_0059.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0060.s b/res/battle/scripts/effects/effect_script_0060.s index a773bac8f5..48d2058945 100644 --- a/res/battle/scripts/effects/effect_script_0060.s +++ b/res/battle/scripts/effects/effect_script_0060.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0061.s b/res/battle/scripts/effects/effect_script_0061.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0061.s +++ b/res/battle/scripts/effects/effect_script_0061.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0062.s b/res/battle/scripts/effects/effect_script_0062.s index db6aefdc3a..bcbf7b7653 100644 --- a/res/battle/scripts/effects/effect_script_0062.s +++ b/res/battle/scripts/effects/effect_script_0062.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0063.s b/res/battle/scripts/effects/effect_script_0063.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0063.s +++ b/res/battle/scripts/effects/effect_script_0063.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0064.s b/res/battle/scripts/effects/effect_script_0064.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0064.s +++ b/res/battle/scripts/effects/effect_script_0064.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0065.s b/res/battle/scripts/effects/effect_script_0065.s index ec11b75e67..74114325ea 100644 --- a/res/battle/scripts/effects/effect_script_0065.s +++ b/res/battle/scripts/effects/effect_script_0065.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_REFLECT diff --git a/res/battle/scripts/effects/effect_script_0066.s b/res/battle/scripts/effects/effect_script_0066.s index c8a0f359f2..2c73dd06ff 100644 --- a/res/battle/scripts/effects/effect_script_0066.s +++ b/res/battle/scripts/effects/effect_script_0066.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON diff --git a/res/battle/scripts/effects/effect_script_0067.s b/res/battle/scripts/effects/effect_script_0067.s index 10609dc03b..00c839921f 100644 --- a/res/battle/scripts/effects/effect_script_0067.s +++ b/res/battle/scripts/effects/effect_script_0067.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE diff --git a/res/battle/scripts/effects/effect_script_0068.s b/res/battle/scripts/effects/effect_script_0068.s index 96495758c3..95ec446ab3 100644 --- a/res/battle/scripts/effects/effect_script_0068.s +++ b/res/battle/scripts/effects/effect_script_0068.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_ATTACK_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0069.s b/res/battle/scripts/effects/effect_script_0069.s index 572918b7bb..dd97a2cc4c 100644 --- a/res/battle/scripts/effects/effect_script_0069.s +++ b/res/battle/scripts/effects/effect_script_0069.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFENSE_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0070.s b/res/battle/scripts/effects/effect_script_0070.s index 526e3c3131..22b831113e 100644 --- a/res/battle/scripts/effects/effect_script_0070.s +++ b/res/battle/scripts/effects/effect_script_0070.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0071.s b/res/battle/scripts/effects/effect_script_0071.s index 20b8898466..d35dc270b6 100644 --- a/res/battle/scripts/effects/effect_script_0071.s +++ b/res/battle/scripts/effects/effect_script_0071.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0072.s b/res/battle/scripts/effects/effect_script_0072.s index 85eb725186..a145fa486c 100644 --- a/res/battle/scripts/effects/effect_script_0072.s +++ b/res/battle/scripts/effects/effect_script_0072.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0073.s b/res/battle/scripts/effects/effect_script_0073.s index e5bd353cb8..1a84f03892 100644 --- a/res/battle/scripts/effects/effect_script_0073.s +++ b/res/battle/scripts/effects/effect_script_0073.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0074.s b/res/battle/scripts/effects/effect_script_0074.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0074.s +++ b/res/battle/scripts/effects/effect_script_0074.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0075.s b/res/battle/scripts/effects/effect_script_0075.s index 446eab63aa..3e0f41cbc9 100644 --- a/res/battle/scripts/effects/effect_script_0075.s +++ b/res/battle/scripts/effects/effect_script_0075.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _026 diff --git a/res/battle/scripts/effects/effect_script_0076.s b/res/battle/scripts/effects/effect_script_0076.s index 6821cc3371..8f102f3170 100644 --- a/res/battle/scripts/effects/effect_script_0076.s +++ b/res/battle/scripts/effects/effect_script_0076.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE diff --git a/res/battle/scripts/effects/effect_script_0077.s b/res/battle/scripts/effects/effect_script_0077.s index 4d23000f2b..ad83446bf9 100644 --- a/res/battle/scripts/effects/effect_script_0077.s +++ b/res/battle/scripts/effects/effect_script_0077.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_POISON diff --git a/res/battle/scripts/effects/effect_script_0078.s b/res/battle/scripts/effects/effect_script_0078.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0078.s +++ b/res/battle/scripts/effects/effect_script_0078.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0079.s b/res/battle/scripts/effects/effect_script_0079.s index 129c881e63..3df94eaa1b 100644 --- a/res/battle/scripts/effects/effect_script_0079.s +++ b/res/battle/scripts/effects/effect_script_0079.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_TRY_SUBSTITUTE diff --git a/res/battle/scripts/effects/effect_script_0080.s b/res/battle/scripts/effects/effect_script_0080.s index 943102fa45..aad17af724 100644 --- a/res/battle/scripts/effects/effect_script_0080.s +++ b/res/battle/scripts/effects/effect_script_0080.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECHARGE_TURN diff --git a/res/battle/scripts/effects/effect_script_0081.s b/res/battle/scripts/effects/effect_script_0081.s index e5aad04c63..0944b8c577 100644 --- a/res/battle/scripts/effects/effect_script_0081.s +++ b/res/battle/scripts/effects/effect_script_0081.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SET_RAGE_FLAG diff --git a/res/battle/scripts/effects/effect_script_0082.s b/res/battle/scripts/effects/effect_script_0082.s index 1b13f1baf8..a565575a2e 100644 --- a/res/battle/scripts/effects/effect_script_0082.s +++ b/res/battle/scripts/effects/effect_script_0082.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIMIC diff --git a/res/battle/scripts/effects/effect_script_0083.s b/res/battle/scripts/effects/effect_script_0083.s index 22a5d9ed9b..a6ac4cfad2 100644 --- a/res/battle/scripts/effects/effect_script_0083.s +++ b/res/battle/scripts/effects/effect_script_0083.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/effects/effect_script_0084.s b/res/battle/scripts/effects/effect_script_0084.s index 07b92a345f..df416c358f 100644 --- a/res/battle/scripts/effects/effect_script_0084.s +++ b/res/battle/scripts/effects/effect_script_0084.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_LEECH_SEED_START diff --git a/res/battle/scripts/effects/effect_script_0085.s b/res/battle/scripts/effects/effect_script_0085.s index 2951a3b305..d155626613 100644 --- a/res/battle/scripts/effects/effect_script_0085.s +++ b/res/battle/scripts/effects/effect_script_0085.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SPLASH diff --git a/res/battle/scripts/effects/effect_script_0086.s b/res/battle/scripts/effects/effect_script_0086.s index af3318756e..ba4d4e66a2 100644 --- a/res/battle/scripts/effects/effect_script_0086.s +++ b/res/battle/scripts/effects/effect_script_0086.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DISABLE_START diff --git a/res/battle/scripts/effects/effect_script_0087.s b/res/battle/scripts/effects/effect_script_0087.s index 37ab7759a1..f9316ab855 100644 --- a/res/battle/scripts/effects/effect_script_0087.s +++ b/res/battle/scripts/effects/effect_script_0087.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS diff --git a/res/battle/scripts/effects/effect_script_0088.s b/res/battle/scripts/effects/effect_script_0088.s index 08947c8e3d..f6daa66367 100644 --- a/res/battle/scripts/effects/effect_script_0088.s +++ b/res/battle/scripts/effects/effect_script_0088.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS diff --git a/res/battle/scripts/effects/effect_script_0089.s b/res/battle/scripts/effects/effect_script_0089.s index 34e61decd0..201d4175cf 100644 --- a/res/battle/scripts/effects/effect_script_0089.s +++ b/res/battle/scripts/effects/effect_script_0089.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS diff --git a/res/battle/scripts/effects/effect_script_0090.s b/res/battle/scripts/effects/effect_script_0090.s index 27e2d4da1d..bd10e8a00d 100644 --- a/res/battle/scripts/effects/effect_script_0090.s +++ b/res/battle/scripts/effects/effect_script_0090.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_ENCORE_START diff --git a/res/battle/scripts/effects/effect_script_0091.s b/res/battle/scripts/effects/effect_script_0091.s index 08efcd7057..910cb458b1 100644 --- a/res/battle/scripts/effects/effect_script_0091.s +++ b/res/battle/scripts/effects/effect_script_0091.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PAIN_SPLIT diff --git a/res/battle/scripts/effects/effect_script_0092.s b/res/battle/scripts/effects/effect_script_0092.s index 0e4e180d3b..9314069f2a 100644 --- a/res/battle/scripts/effects/effect_script_0092.s +++ b/res/battle/scripts/effects/effect_script_0092.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _019 diff --git a/res/battle/scripts/effects/effect_script_0093.s b/res/battle/scripts/effects/effect_script_0093.s index 35d561dcf1..d879eaf54d 100644 --- a/res/battle/scripts/effects/effect_script_0093.s +++ b/res/battle/scripts/effects/effect_script_0093.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CONVERSION_2 diff --git a/res/battle/scripts/effects/effect_script_0094.s b/res/battle/scripts/effects/effect_script_0094.s index ffe21b89ce..ef0cc217f8 100644 --- a/res/battle/scripts/effects/effect_script_0094.s +++ b/res/battle/scripts/effects/effect_script_0094.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_LOCK_ON diff --git a/res/battle/scripts/effects/effect_script_0095.s b/res/battle/scripts/effects/effect_script_0095.s index 82382432b6..ea3bb5b653 100644 --- a/res/battle/scripts/effects/effect_script_0095.s +++ b/res/battle/scripts/effects/effect_script_0095.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SKETCH diff --git a/res/battle/scripts/effects/effect_script_0096.s b/res/battle/scripts/effects/effect_script_0096.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0096.s +++ b/res/battle/scripts/effects/effect_script_0096.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0097.s b/res/battle/scripts/effects/effect_script_0097.s index 301e98c8c4..e5669be84a 100644 --- a/res/battle/scripts/effects/effect_script_0097.s +++ b/res/battle/scripts/effects/effect_script_0097.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _013 diff --git a/res/battle/scripts/effects/effect_script_0098.s b/res/battle/scripts/effects/effect_script_0098.s index 2c34994d9d..8453d807a4 100644 --- a/res/battle/scripts/effects/effect_script_0098.s +++ b/res/battle/scripts/effects/effect_script_0098.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_DESTINY_BOND diff --git a/res/battle/scripts/effects/effect_script_0099.s b/res/battle/scripts/effects/effect_script_0099.s index 5e82aefe3e..f6fbfa844c 100644 --- a/res/battle/scripts/effects/effect_script_0099.s +++ b/res/battle/scripts/effects/effect_script_0099.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcFlailPower diff --git a/res/battle/scripts/effects/effect_script_0100.s b/res/battle/scripts/effects/effect_script_0100.s index 1527001b70..df147193eb 100644 --- a/res/battle/scripts/effects/effect_script_0100.s +++ b/res/battle/scripts/effects/effect_script_0100.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_REDUCE_TARGET_PP diff --git a/res/battle/scripts/effects/effect_script_0101.s b/res/battle/scripts/effects/effect_script_0101.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0101.s +++ b/res/battle/scripts/effects/effect_script_0101.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0102.s b/res/battle/scripts/effects/effect_script_0102.s index 1fc93efeba..24782c16ec 100644 --- a/res/battle/scripts/effects/effect_script_0102.s +++ b/res/battle/scripts/effects/effect_script_0102.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_HEAL_BELL diff --git a/res/battle/scripts/effects/effect_script_0103.s b/res/battle/scripts/effects/effect_script_0103.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0103.s +++ b/res/battle/scripts/effects/effect_script_0103.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0104.s b/res/battle/scripts/effects/effect_script_0104.s index 79540f7713..93ce7ce773 100644 --- a/res/battle/scripts/effects/effect_script_0104.s +++ b/res/battle/scripts/effects/effect_script_0104.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: SetMultiHit 3, SYSCTL_TRIPLE_KICK diff --git a/res/battle/scripts/effects/effect_script_0105.s b/res/battle/scripts/effects/effect_script_0105.s index 7568bd3888..877695df7a 100644 --- a/res/battle/scripts/effects/effect_script_0105.s +++ b/res/battle/scripts/effects/effect_script_0105.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_CHECK_SUBSTITUTE|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_STEAL_ITEM diff --git a/res/battle/scripts/effects/effect_script_0106.s b/res/battle/scripts/effects/effect_script_0106.s index 30ac05f087..570f280372 100644 --- a/res/battle/scripts/effects/effect_script_0106.s +++ b/res/battle/scripts/effects/effect_script_0106.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_MEAN_LOOK diff --git a/res/battle/scripts/effects/effect_script_0107.s b/res/battle/scripts/effects/effect_script_0107.s index a95be5c8be..3f216f73ba 100644 --- a/res/battle/scripts/effects/effect_script_0107.s +++ b/res/battle/scripts/effects/effect_script_0107.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _019 diff --git a/res/battle/scripts/effects/effect_script_0108.s b/res/battle/scripts/effects/effect_script_0108.s index 30c1426248..35af6ac459 100644 --- a/res/battle/scripts/effects/effect_script_0108.s +++ b/res/battle/scripts/effects/effect_script_0108.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_MINIMIZE diff --git a/res/battle/scripts/effects/effect_script_0109.s b/res/battle/scripts/effects/effect_script_0109.s index 4f98b7bd8b..f9df344d31 100644 --- a/res/battle/scripts/effects/effect_script_0109.s +++ b/res/battle/scripts/effects/effect_script_0109.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_TYPE_1, TYPE_GHOST, _016 diff --git a/res/battle/scripts/effects/effect_script_0110.s b/res/battle/scripts/effects/effect_script_0110.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0110.s +++ b/res/battle/scripts/effects/effect_script_0110.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0111.s b/res/battle/scripts/effects/effect_script_0111.s index 7267a05a62..e833f8116d 100644 --- a/res/battle/scripts/effects/effect_script_0111.s +++ b/res/battle/scripts/effects/effect_script_0111.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_PROTECT diff --git a/res/battle/scripts/effects/effect_script_0112.s b/res/battle/scripts/effects/effect_script_0112.s index 5e47990b29..87d2588524 100644 --- a/res/battle/scripts/effects/effect_script_0112.s +++ b/res/battle/scripts/effects/effect_script_0112.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrySpikes _010 diff --git a/res/battle/scripts/effects/effect_script_0113.s b/res/battle/scripts/effects/effect_script_0113.s index 6873c3f1ef..1a76247b8c 100644 --- a/res/battle/scripts/effects/effect_script_0113.s +++ b/res/battle/scripts/effects/effect_script_0113.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_FORESIGHT diff --git a/res/battle/scripts/effects/effect_script_0114.s b/res/battle/scripts/effects/effect_script_0114.s index c7b32e14f9..eea3c1177a 100644 --- a/res/battle/scripts/effects/effect_script_0114.s +++ b/res/battle/scripts/effects/effect_script_0114.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PERISH_SONG_START diff --git a/res/battle/scripts/effects/effect_script_0115.s b/res/battle/scripts/effects/effect_script_0115.s index 726f8b95a2..fc15546e09 100644 --- a/res/battle/scripts/effects/effect_script_0115.s +++ b/res/battle/scripts/effects/effect_script_0115.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM, _036 diff --git a/res/battle/scripts/effects/effect_script_0116.s b/res/battle/scripts/effects/effect_script_0116.s index 7267a05a62..e833f8116d 100644 --- a/res/battle/scripts/effects/effect_script_0116.s +++ b/res/battle/scripts/effects/effect_script_0116.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_PROTECT diff --git a/res/battle/scripts/effects/effect_script_0117.s b/res/battle/scripts/effects/effect_script_0117.s index 7bc22c0c1e..356248bb60 100644 --- a/res/battle/scripts/effects/effect_script_0117.s +++ b/res/battle/scripts/effects/effect_script_0117.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcRolloutPower diff --git a/res/battle/scripts/effects/effect_script_0118.s b/res/battle/scripts/effects/effect_script_0118.s index 20295b8d2a..98e0aad9c8 100644 --- a/res/battle/scripts/effects/effect_script_0118.s +++ b/res/battle/scripts/effects/effect_script_0118.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SWAGGER diff --git a/res/battle/scripts/effects/effect_script_0119.s b/res/battle/scripts/effects/effect_script_0119.s index 6e52afc106..4c4847351b 100644 --- a/res/battle/scripts/effects/effect_script_0119.s +++ b/res/battle/scripts/effects/effect_script_0119.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcFuryCutterPower diff --git a/res/battle/scripts/effects/effect_script_0120.s b/res/battle/scripts/effects/effect_script_0120.s index b7e268bb75..38d71aafa7 100644 --- a/res/battle/scripts/effects/effect_script_0120.s +++ b/res/battle/scripts/effects/effect_script_0120.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_INFATUATE diff --git a/res/battle/scripts/effects/effect_script_0121.s b/res/battle/scripts/effects/effect_script_0121.s index 4b320e3ccb..1a12d9c28e 100644 --- a/res/battle/scripts/effects/effect_script_0121.s +++ b/res/battle/scripts/effects/effect_script_0121.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_FRIENDSHIP, BTLVAR_MOVE_POWER diff --git a/res/battle/scripts/effects/effect_script_0122.s b/res/battle/scripts/effects/effect_script_0122.s index ea63bd87ab..7714367e20 100644 --- a/res/battle/scripts/effects/effect_script_0122.s +++ b/res/battle/scripts/effects/effect_script_0122.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Present _004 diff --git a/res/battle/scripts/effects/effect_script_0123.s b/res/battle/scripts/effects/effect_script_0123.s index a2ac3940cf..e392c515a4 100644 --- a/res/battle/scripts/effects/effect_script_0123.s +++ b/res/battle/scripts/effects/effect_script_0123.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_FRIENDSHIP, BTLVAR_MOVE_POWER diff --git a/res/battle/scripts/effects/effect_script_0124.s b/res/battle/scripts/effects/effect_script_0124.s index f624bca9f3..db29ab968d 100644 --- a/res/battle/scripts/effects/effect_script_0124.s +++ b/res/battle/scripts/effects/effect_script_0124.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_SAFEGUARD_START diff --git a/res/battle/scripts/effects/effect_script_0125.s b/res/battle/scripts/effects/effect_script_0125.s index 39633cd4d0..fc1f8b24cd 100644 --- a/res/battle/scripts/effects/effect_script_0125.s +++ b/res/battle/scripts/effects/effect_script_0125.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN diff --git a/res/battle/scripts/effects/effect_script_0126.s b/res/battle/scripts/effects/effect_script_0126.s index 833c3f6dc1..f567f71efb 100644 --- a/res/battle/scripts/effects/effect_script_0126.s +++ b/res/battle/scripts/effects/effect_script_0126.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIG diff --git a/res/battle/scripts/effects/effect_script_0127.s b/res/battle/scripts/effects/effect_script_0127.s index 08ee96de7d..4baef22ff4 100644 --- a/res/battle/scripts/effects/effect_script_0127.s +++ b/res/battle/scripts/effects/effect_script_0127.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_BATON_PASS diff --git a/res/battle/scripts/effects/effect_script_0128.s b/res/battle/scripts/effects/effect_script_0128.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0128.s +++ b/res/battle/scripts/effects/effect_script_0128.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0129.s b/res/battle/scripts/effects/effect_script_0129.s index dc19311bb2..4bb79fa150 100644 --- a/res/battle/scripts/effects/effect_script_0129.s +++ b/res/battle/scripts/effects/effect_script_0129.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RAPID_SPIN diff --git a/res/battle/scripts/effects/effect_script_0130.s b/res/battle/scripts/effects/effect_script_0130.s index a9858e7d87..447baa4610 100644 --- a/res/battle/scripts/effects/effect_script_0130.s +++ b/res/battle/scripts/effects/effect_script_0130.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_REGULATION_FLAG, 1, _013 diff --git a/res/battle/scripts/effects/effect_script_0131.s b/res/battle/scripts/effects/effect_script_0131.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0131.s +++ b/res/battle/scripts/effects/effect_script_0131.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0132.s b/res/battle/scripts/effects/effect_script_0132.s index 8c12d5b508..3728951778 100644 --- a/res/battle/scripts/effects/effect_script_0132.s +++ b/res/battle/scripts/effects/effect_script_0132.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WeatherHPRecovery diff --git a/res/battle/scripts/effects/effect_script_0133.s b/res/battle/scripts/effects/effect_script_0133.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0133.s +++ b/res/battle/scripts/effects/effect_script_0133.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0134.s b/res/battle/scripts/effects/effect_script_0134.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0134.s +++ b/res/battle/scripts/effects/effect_script_0134.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0135.s b/res/battle/scripts/effects/effect_script_0135.s index 5e68c7a3a5..795395dd1b 100644 --- a/res/battle/scripts/effects/effect_script_0135.s +++ b/res/battle/scripts/effects/effect_script_0135.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcHiddenPowerParams diff --git a/res/battle/scripts/effects/effect_script_0136.s b/res/battle/scripts/effects/effect_script_0136.s index b4528458d1..af69dd2c0b 100644 --- a/res/battle/scripts/effects/effect_script_0136.s +++ b/res/battle/scripts/effects/effect_script_0136.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING, _036 diff --git a/res/battle/scripts/effects/effect_script_0137.s b/res/battle/scripts/effects/effect_script_0137.s index 755d45900f..adb19ca41c 100644 --- a/res/battle/scripts/effects/effect_script_0137.s +++ b/res/battle/scripts/effects/effect_script_0137.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY, _036 diff --git a/res/battle/scripts/effects/effect_script_0138.s b/res/battle/scripts/effects/effect_script_0138.s index 2713d78b0f..fc2752de5a 100644 --- a/res/battle/scripts/effects/effect_script_0138.s +++ b/res/battle/scripts/effects/effect_script_0138.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_DEFENSE_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0139.s b/res/battle/scripts/effects/effect_script_0139.s index 8a50b5d010..d3bbc6a64a 100644 --- a/res/battle/scripts/effects/effect_script_0139.s +++ b/res/battle/scripts/effects/effect_script_0139.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ATTACK_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0140.s b/res/battle/scripts/effects/effect_script_0140.s index 8735a44076..c3d983587b 100644 --- a/res/battle/scripts/effects/effect_script_0140.s +++ b/res/battle/scripts/effects/effect_script_0140.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_BOOST_ALL_STATS diff --git a/res/battle/scripts/effects/effect_script_0141.s b/res/battle/scripts/effects/effect_script_0141.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0141.s +++ b/res/battle/scripts/effects/effect_script_0141.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0142.s b/res/battle/scripts/effects/effect_script_0142.s index c22cc10842..243dddcb08 100644 --- a/res/battle/scripts/effects/effect_script_0142.s +++ b/res/battle/scripts/effects/effect_script_0142.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_BELLY_DRUM diff --git a/res/battle/scripts/effects/effect_script_0143.s b/res/battle/scripts/effects/effect_script_0143.s index 72d572052c..bc29cef063 100644 --- a/res/battle/scripts/effects/effect_script_0143.s +++ b/res/battle/scripts/effects/effect_script_0143.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CopyStatStages diff --git a/res/battle/scripts/effects/effect_script_0144.s b/res/battle/scripts/effects/effect_script_0144.s index 5f5e44968f..0d5ca8f093 100644 --- a/res/battle/scripts/effects/effect_script_0144.s +++ b/res/battle/scripts/effects/effect_script_0144.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS diff --git a/res/battle/scripts/effects/effect_script_0145.s b/res/battle/scripts/effects/effect_script_0145.s index aa725a3cc4..4d825583ec 100644 --- a/res/battle/scripts/effects/effect_script_0145.s +++ b/res/battle/scripts/effects/effect_script_0145.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _030 diff --git a/res/battle/scripts/effects/effect_script_0146.s b/res/battle/scripts/effects/effect_script_0146.s index f8303d4952..39b6e58dcc 100644 --- a/res/battle/scripts/effects/effect_script_0146.s +++ b/res/battle/scripts/effects/effect_script_0146.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0147.s b/res/battle/scripts/effects/effect_script_0147.s index 4c88257736..a4b6dc5256 100644 --- a/res/battle/scripts/effects/effect_script_0147.s +++ b/res/battle/scripts/effects/effect_script_0147.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIG diff --git a/res/battle/scripts/effects/effect_script_0148.s b/res/battle/scripts/effects/effect_script_0148.s index 8c0c653392..a6723957e8 100644 --- a/res/battle/scripts/effects/effect_script_0148.s +++ b/res/battle/scripts/effects/effect_script_0148.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryFutureSight _010 diff --git a/res/battle/scripts/effects/effect_script_0149.s b/res/battle/scripts/effects/effect_script_0149.s index b68e82ca21..fe69cef2e3 100644 --- a/res/battle/scripts/effects/effect_script_0149.s +++ b/res/battle/scripts/effects/effect_script_0149.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY diff --git a/res/battle/scripts/effects/effect_script_0150.s b/res/battle/scripts/effects/effect_script_0150.s index 1f0efa1b0a..677407550d 100644 --- a/res/battle/scripts/effects/effect_script_0150.s +++ b/res/battle/scripts/effects/effect_script_0150.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0151.s b/res/battle/scripts/effects/effect_script_0151.s index 394a06add0..4ad6aea2ce 100644 --- a/res/battle/scripts/effects/effect_script_0151.s +++ b/res/battle/scripts/effects/effect_script_0151.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnoreWeather _006 diff --git a/res/battle/scripts/effects/effect_script_0152.s b/res/battle/scripts/effects/effect_script_0152.s index 0bf98a5700..d3fe391377 100644 --- a/res/battle/scripts/effects/effect_script_0152.s +++ b/res/battle/scripts/effects/effect_script_0152.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE diff --git a/res/battle/scripts/effects/effect_script_0153.s b/res/battle/scripts/effects/effect_script_0153.s index b82866ba1d..c1291afaab 100644 --- a/res/battle/scripts/effects/effect_script_0153.s +++ b/res/battle/scripts/effects/effect_script_0153.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _009 diff --git a/res/battle/scripts/effects/effect_script_0154.s b/res/battle/scripts/effects/effect_script_0154.s index e97944972e..ced60b2d59 100644 --- a/res/battle/scripts/effects/effect_script_0154.s +++ b/res/battle/scripts/effects/effect_script_0154.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_IMMUNITIES diff --git a/res/battle/scripts/effects/effect_script_0155.s b/res/battle/scripts/effects/effect_script_0155.s index 69a4bffb4b..fa34a53509 100644 --- a/res/battle/scripts/effects/effect_script_0155.s +++ b/res/battle/scripts/effects/effect_script_0155.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 diff --git a/res/battle/scripts/effects/effect_script_0156.s b/res/battle/scripts/effects/effect_script_0156.s index 21a50567b0..9404adfa5e 100644 --- a/res/battle/scripts/effects/effect_script_0156.s +++ b/res/battle/scripts/effects/effect_script_0156.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DEFENSE_CURL diff --git a/res/battle/scripts/effects/effect_script_0157.s b/res/battle/scripts/effects/effect_script_0157.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0157.s +++ b/res/battle/scripts/effects/effect_script_0157.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0158.s b/res/battle/scripts/effects/effect_script_0158.s index 0bb2ce4df7..ed9f6f3ea1 100644 --- a/res/battle/scripts/effects/effect_script_0158.s +++ b/res/battle/scripts/effects/effect_script_0158.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToVar OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_FAKE_OUT_TURN_NUMBER, BTLVAR_TOTAL_TURNS, _012 diff --git a/res/battle/scripts/effects/effect_script_0159.s b/res/battle/scripts/effects/effect_script_0159.s index 2aeb54fa0e..65556a3e96 100644 --- a/res/battle/scripts/effects/effect_script_0159.s +++ b/res/battle/scripts/effects/effect_script_0159.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_UPROAR, _009 diff --git a/res/battle/scripts/effects/effect_script_0160.s b/res/battle/scripts/effects/effect_script_0160.s index f5a31dd799..dcf5d3cf60 100644 --- a/res/battle/scripts/effects/effect_script_0160.s +++ b/res/battle/scripts/effects/effect_script_0160.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_STOCKPILE diff --git a/res/battle/scripts/effects/effect_script_0161.s b/res/battle/scripts/effects/effect_script_0161.s index 15c5ddce99..1f6a4af339 100644 --- a/res/battle/scripts/effects/effect_script_0161.s +++ b/res/battle/scripts/effects/effect_script_0161.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0, _064 diff --git a/res/battle/scripts/effects/effect_script_0162.s b/res/battle/scripts/effects/effect_script_0162.s index c23cc6b791..963c97c046 100644 --- a/res/battle/scripts/effects/effect_script_0162.s +++ b/res/battle/scripts/effects/effect_script_0162.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_STOCKPILE_COUNT, 0, _078 diff --git a/res/battle/scripts/effects/effect_script_0163.s b/res/battle/scripts/effects/effect_script_0163.s index b7b7cc4c66..4ea67c3272 100644 --- a/res/battle/scripts/effects/effect_script_0163.s +++ b/res/battle/scripts/effects/effect_script_0163.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0164.s b/res/battle/scripts/effects/effect_script_0164.s index 0801b6a600..996e7c9f22 100644 --- a/res/battle/scripts/effects/effect_script_0164.s +++ b/res/battle/scripts/effects/effect_script_0164.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_TEMP, _036 diff --git a/res/battle/scripts/effects/effect_script_0165.s b/res/battle/scripts/effects/effect_script_0165.s index 36a057c82b..0e25728cc5 100644 --- a/res/battle/scripts/effects/effect_script_0165.s +++ b/res/battle/scripts/effects/effect_script_0165.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TORMENT_START diff --git a/res/battle/scripts/effects/effect_script_0166.s b/res/battle/scripts/effects/effect_script_0166.s index 5572973a9c..15eaa53dfb 100644 --- a/res/battle/scripts/effects/effect_script_0166.s +++ b/res/battle/scripts/effects/effect_script_0166.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FLATTER diff --git a/res/battle/scripts/effects/effect_script_0167.s b/res/battle/scripts/effects/effect_script_0167.s index 2756fd03d1..417d27e0dd 100644 --- a/res/battle/scripts/effects/effect_script_0167.s +++ b/res/battle/scripts/effects/effect_script_0167.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN diff --git a/res/battle/scripts/effects/effect_script_0168.s b/res/battle/scripts/effects/effect_script_0168.s index 04d65101a8..b28440766e 100644 --- a/res/battle/scripts/effects/effect_script_0168.s +++ b/res/battle/scripts/effects/effect_script_0168.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x10000000 diff --git a/res/battle/scripts/effects/effect_script_0169.s b/res/battle/scripts/effects/effect_script_0169.s index 4c897c083e..272ec8ac0b 100644 --- a/res/battle/scripts/effects/effect_script_0169.s +++ b/res/battle/scripts/effects/effect_script_0169.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FACADE_BOOST, _009 diff --git a/res/battle/scripts/effects/effect_script_0170.s b/res/battle/scripts/effects/effect_script_0170.s index 1929734346..6543029497 100644 --- a/res/battle/scripts/effects/effect_script_0170.s +++ b/res/battle/scripts/effects/effect_script_0170.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_ATTACKER_PHYSICAL_DAMAGE_MASK, 0, _016 diff --git a/res/battle/scripts/effects/effect_script_0171.s b/res/battle/scripts/effects/effect_script_0171.s index 3b370bdd93..0fb4b6532a 100644 --- a/res/battle/scripts/effects/effect_script_0171.s +++ b/res/battle/scripts/effects/effect_script_0171.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _022 diff --git a/res/battle/scripts/effects/effect_script_0172.s b/res/battle/scripts/effects/effect_script_0172.s index 3b410bfa67..bbc9e57786 100644 --- a/res/battle/scripts/effects/effect_script_0172.s +++ b/res/battle/scripts/effects/effect_script_0172.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: FollowMe diff --git a/res/battle/scripts/effects/effect_script_0173.s b/res/battle/scripts/effects/effect_script_0173.s index 5a4af4ea86..487b4f5377 100644 --- a/res/battle/scripts/effects/effect_script_0173.s +++ b/res/battle/scripts/effects/effect_script_0173.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/effects/effect_script_0174.s b/res/battle/scripts/effects/effect_script_0174.s index 1282f53992..6e7408b860 100644 --- a/res/battle/scripts/effects/effect_script_0174.s +++ b/res/battle/scripts/effects/effect_script_0174.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_CHARGE diff --git a/res/battle/scripts/effects/effect_script_0175.s b/res/battle/scripts/effects/effect_script_0175.s index e74a15411f..e177f9e006 100644 --- a/res/battle/scripts/effects/effect_script_0175.s +++ b/res/battle/scripts/effects/effect_script_0175.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TAUNT_START diff --git a/res/battle/scripts/effects/effect_script_0176.s b/res/battle/scripts/effects/effect_script_0176.s index cf0fc48e5b..234dae0cae 100644 --- a/res/battle/scripts/effects/effect_script_0176.s +++ b/res/battle/scripts/effects/effect_script_0176.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryHelpingHand _015 diff --git a/res/battle/scripts/effects/effect_script_0177.s b/res/battle/scripts/effects/effect_script_0177.s index 328c847d30..a0ff1fa305 100644 --- a/res/battle/scripts/effects/effect_script_0177.s +++ b/res/battle/scripts/effects/effect_script_0177.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ITEMS diff --git a/res/battle/scripts/effects/effect_script_0178.s b/res/battle/scripts/effects/effect_script_0178.s index f867efa447..5e8c536e35 100644 --- a/res/battle/scripts/effects/effect_script_0178.s +++ b/res/battle/scripts/effects/effect_script_0178.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MULTITYPE, _015 diff --git a/res/battle/scripts/effects/effect_script_0179.s b/res/battle/scripts/effects/effect_script_0179.s index 787e898bf3..7991120af2 100644 --- a/res/battle/scripts/effects/effect_script_0179.s +++ b/res/battle/scripts/effects/effect_script_0179.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryWish _002 diff --git a/res/battle/scripts/effects/effect_script_0180.s b/res/battle/scripts/effects/effect_script_0180.s index 686c09bd03..079766c332 100644 --- a/res/battle/scripts/effects/effect_script_0180.s +++ b/res/battle/scripts/effects/effect_script_0180.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryAssist _008 diff --git a/res/battle/scripts/effects/effect_script_0181.s b/res/battle/scripts/effects/effect_script_0181.s index 63b495690b..10a7e612cd 100644 --- a/res/battle/scripts/effects/effect_script_0181.s +++ b/res/battle/scripts/effects/effect_script_0181.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_INGRAIN, _019 diff --git a/res/battle/scripts/effects/effect_script_0182.s b/res/battle/scripts/effects/effect_script_0182.s index 55200a26a3..0290b7e5a8 100644 --- a/res/battle/scripts/effects/effect_script_0182.s +++ b/res/battle/scripts/effects/effect_script_0182.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0183.s b/res/battle/scripts/effects/effect_script_0183.s index c2c75e212b..15ed0ceb72 100644 --- a/res/battle/scripts/effects/effect_script_0183.s +++ b/res/battle/scripts/effects/effect_script_0183.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrySetMagicCoat _010 diff --git a/res/battle/scripts/effects/effect_script_0184.s b/res/battle/scripts/effects/effect_script_0184.s index 1b4f7f7fc4..a8baefed1b 100644 --- a/res/battle/scripts/effects/effect_script_0184.s +++ b/res/battle/scripts/effects/effect_script_0184.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_HELD_ITEM, ITEM_NONE, _022 diff --git a/res/battle/scripts/effects/effect_script_0185.s b/res/battle/scripts/effects/effect_script_0185.s index 75a6ffd074..451a762919 100644 --- a/res/battle/scripts/effects/effect_script_0185.s +++ b/res/battle/scripts/effects/effect_script_0185.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcRevengePowerMul diff --git a/res/battle/scripts/effects/effect_script_0186.s b/res/battle/scripts/effects/effect_script_0186.s index 295cdd65a6..27c0a0b141 100644 --- a/res/battle/scripts/effects/effect_script_0186.s +++ b/res/battle/scripts/effects/effect_script_0186.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_BREAK_SCREENS|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BREAK_SCREENS diff --git a/res/battle/scripts/effects/effect_script_0187.s b/res/battle/scripts/effects/effect_script_0187.s index 634a0aaa80..3511c2a80b 100644 --- a/res/battle/scripts/effects/effect_script_0187.s +++ b/res/battle/scripts/effects/effect_script_0187.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_YAWN diff --git a/res/battle/scripts/effects/effect_script_0188.s b/res/battle/scripts/effects/effect_script_0188.s index aaa27c892b..762b7c19e0 100644 --- a/res/battle/scripts/effects/effect_script_0188.s +++ b/res/battle/scripts/effects/effect_script_0188.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_KNOCK_OFF diff --git a/res/battle/scripts/effects/effect_script_0189.s b/res/battle/scripts/effects/effect_script_0189.s index 757f064d85..ffb0ae50ab 100644 --- a/res/battle/scripts/effects/effect_script_0189.s +++ b/res/battle/scripts/effects/effect_script_0189.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, BTLVAR_DAMAGE diff --git a/res/battle/scripts/effects/effect_script_0190.s b/res/battle/scripts/effects/effect_script_0190.s index 50815ddec0..3658dd267f 100644 --- a/res/battle/scripts/effects/effect_script_0190.s +++ b/res/battle/scripts/effects/effect_script_0190.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcHPFalloffPower diff --git a/res/battle/scripts/effects/effect_script_0191.s b/res/battle/scripts/effects/effect_script_0191.s index 0120d91a11..e2e2cb405a 100644 --- a/res/battle/scripts/effects/effect_script_0191.s +++ b/res/battle/scripts/effects/effect_script_0191.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ABILITIES diff --git a/res/battle/scripts/effects/effect_script_0192.s b/res/battle/scripts/effects/effect_script_0192.s index 67316d92dc..fd16be9634 100644 --- a/res/battle/scripts/effects/effect_script_0192.s +++ b/res/battle/scripts/effects/effect_script_0192.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryImprison _010 diff --git a/res/battle/scripts/effects/effect_script_0193.s b/res/battle/scripts/effects/effect_script_0193.s index ac9cf06a49..f4d41a015a 100644 --- a/res/battle/scripts/effects/effect_script_0193.s +++ b/res/battle/scripts/effects/effect_script_0193.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_RECOVER_PSN_PRZ_BRN diff --git a/res/battle/scripts/effects/effect_script_0194.s b/res/battle/scripts/effects/effect_script_0194.s index 97cb18ec98..848cbb64ed 100644 --- a/res/battle/scripts/effects/effect_script_0194.s +++ b/res/battle/scripts/effects/effect_script_0194.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_GRUDGE, _019 diff --git a/res/battle/scripts/effects/effect_script_0195.s b/res/battle/scripts/effects/effect_script_0195.s index a807a7bf80..f413dbaf6c 100644 --- a/res/battle/scripts/effects/effect_script_0195.s +++ b/res/battle/scripts/effects/effect_script_0195.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrySnatch _010 diff --git a/res/battle/scripts/effects/effect_script_0196.s b/res/battle/scripts/effects/effect_script_0196.s index 4e8c3684b1..6c83826f7b 100644 --- a/res/battle/scripts/effects/effect_script_0196.s +++ b/res/battle/scripts/effects/effect_script_0196.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcWeightBasedPower diff --git a/res/battle/scripts/effects/effect_script_0197.s b/res/battle/scripts/effects/effect_script_0197.s index a00bb65beb..72cfc234f3 100644 --- a/res/battle/scripts/effects/effect_script_0197.s +++ b/res/battle/scripts/effects/effect_script_0197.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcCrit diff --git a/res/battle/scripts/effects/effect_script_0198.s b/res/battle/scripts/effects/effect_script_0198.s index 84e0a173aa..04ce5a7124 100644 --- a/res/battle/scripts/effects/effect_script_0198.s +++ b/res/battle/scripts/effects/effect_script_0198.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0199.s b/res/battle/scripts/effects/effect_script_0199.s index b8d0cc7723..b0df675751 100644 --- a/res/battle/scripts/effects/effect_script_0199.s +++ b/res/battle/scripts/effects/effect_script_0199.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CONFUSE diff --git a/res/battle/scripts/effects/effect_script_0200.s b/res/battle/scripts/effects/effect_script_0200.s index 5253f4408d..96a5bfbb51 100644 --- a/res/battle/scripts/effects/effect_script_0200.s +++ b/res/battle/scripts/effects/effect_script_0200.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 diff --git a/res/battle/scripts/effects/effect_script_0201.s b/res/battle/scripts/effects/effect_script_0201.s index d75fad5433..808499b6af 100644 --- a/res/battle/scripts/effects/effect_script_0201.s +++ b/res/battle/scripts/effects/effect_script_0201.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MUD_SPORT, _018 diff --git a/res/battle/scripts/effects/effect_script_0202.s b/res/battle/scripts/effects/effect_script_0202.s index eeaa059cef..7f0e75a334 100644 --- a/res/battle/scripts/effects/effect_script_0202.s +++ b/res/battle/scripts/effects/effect_script_0202.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BADLY_POISON diff --git a/res/battle/scripts/effects/effect_script_0203.s b/res/battle/scripts/effects/effect_script_0203.s index af28f01670..e4445d6a68 100644 --- a/res/battle/scripts/effects/effect_script_0203.s +++ b/res/battle/scripts/effects/effect_script_0203.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcWeatherBallParams diff --git a/res/battle/scripts/effects/effect_script_0204.s b/res/battle/scripts/effects/effect_script_0204.s index 2d4d5fc43d..009093b02b 100644 --- a/res/battle/scripts/effects/effect_script_0204.s +++ b/res/battle/scripts/effects/effect_script_0204.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0205.s b/res/battle/scripts/effects/effect_script_0205.s index 9ebdb4fc00..3120cb6aef 100644 --- a/res/battle/scripts/effects/effect_script_0205.s +++ b/res/battle/scripts/effects/effect_script_0205.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_TARGET_ATK_AND_DEF_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0206.s b/res/battle/scripts/effects/effect_script_0206.s index bc900087fe..0ad1f1faba 100644 --- a/res/battle/scripts/effects/effect_script_0206.s +++ b/res/battle/scripts/effects/effect_script_0206.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0207.s b/res/battle/scripts/effects/effect_script_0207.s index 738697ac5f..a2cd938fdf 100644 --- a/res/battle/scripts/effects/effect_script_0207.s +++ b/res/battle/scripts/effects/effect_script_0207.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_FLY diff --git a/res/battle/scripts/effects/effect_script_0208.s b/res/battle/scripts/effects/effect_script_0208.s index 1d1f9fc3e2..7d82756f92 100644 --- a/res/battle/scripts/effects/effect_script_0208.s +++ b/res/battle/scripts/effects/effect_script_0208.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_DEF_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0209.s b/res/battle/scripts/effects/effect_script_0209.s index 2192acca7b..7c77dbf6c1 100644 --- a/res/battle/scripts/effects/effect_script_0209.s +++ b/res/battle/scripts/effects/effect_script_0209.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_ADD, BTLVAR_CRITICAL_BOOSTS, 1 diff --git a/res/battle/scripts/effects/effect_script_0210.s b/res/battle/scripts/effects/effect_script_0210.s index 0092911d23..c54b760dc1 100644 --- a/res/battle/scripts/effects/effect_script_0210.s +++ b/res/battle/scripts/effects/effect_script_0210.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_WATER_SPORT, _018 diff --git a/res/battle/scripts/effects/effect_script_0211.s b/res/battle/scripts/effects/effect_script_0211.s index d192c9cb22..671e4343ba 100644 --- a/res/battle/scripts/effects/effect_script_0211.s +++ b/res/battle/scripts/effects/effect_script_0211.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_SPATK_AND_SPDEF_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0212.s b/res/battle/scripts/effects/effect_script_0212.s index 8a310e54bd..86711b4462 100644 --- a/res/battle/scripts/effects/effect_script_0212.s +++ b/res/battle/scripts/effects/effect_script_0212.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_ATK_AND_SPEED_UP_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0213.s b/res/battle/scripts/effects/effect_script_0213.s index cf97520a1b..48318bf85b 100644 --- a/res/battle/scripts/effects/effect_script_0213.s +++ b/res/battle/scripts/effects/effect_script_0213.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryCamouflage _016 diff --git a/res/battle/scripts/effects/effect_script_0214.s b/res/battle/scripts/effects/effect_script_0214.s index e80afda982..a6e9d21b8d 100644 --- a/res/battle/scripts/effects/effect_script_0214.s +++ b/res/battle/scripts/effects/effect_script_0214.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_ROOST diff --git a/res/battle/scripts/effects/effect_script_0215.s b/res/battle/scripts/effects/effect_script_0215.s index 5ec89cf3f0..016c302ab9 100644 --- a/res/battle/scripts/effects/effect_script_0215.s +++ b/res/battle/scripts/effects/effect_script_0215.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_GRAVITY, _009 diff --git a/res/battle/scripts/effects/effect_script_0216.s b/res/battle/scripts/effects/effect_script_0216.s index c54cdfcefe..5b553e2556 100644 --- a/res/battle/scripts/effects/effect_script_0216.s +++ b/res/battle/scripts/effects/effect_script_0216.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_MIRACLE_EYE diff --git a/res/battle/scripts/effects/effect_script_0217.s b/res/battle/scripts/effects/effect_script_0217.s index 0030561157..3dec54b558 100644 --- a/res/battle/scripts/effects/effect_script_0217.s +++ b/res/battle/scripts/effects/effect_script_0217.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _022 diff --git a/res/battle/scripts/effects/effect_script_0218.s b/res/battle/scripts/effects/effect_script_0218.s index 07d2412d65..a8f04da7cc 100644 --- a/res/battle/scripts/effects/effect_script_0218.s +++ b/res/battle/scripts/effects/effect_script_0218.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0219.s b/res/battle/scripts/effects/effect_script_0219.s index 9c6d8801ce..f9c0939b61 100644 --- a/res/battle/scripts/effects/effect_script_0219.s +++ b/res/battle/scripts/effects/effect_script_0219.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcGyroBallPower diff --git a/res/battle/scripts/effects/effect_script_0220.s b/res/battle/scripts/effects/effect_script_0220.s index 5526f3d919..de46ceee2e 100644 --- a/res/battle/scripts/effects/effect_script_0220.s +++ b/res/battle/scripts/effects/effect_script_0220.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _008 diff --git a/res/battle/scripts/effects/effect_script_0221.s b/res/battle/scripts/effects/effect_script_0221.s index af8064e1b9..cc316463a8 100644 --- a/res/battle/scripts/effects/effect_script_0221.s +++ b/res/battle/scripts/effects/effect_script_0221.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP diff --git a/res/battle/scripts/effects/effect_script_0222.s b/res/battle/scripts/effects/effect_script_0222.s index 17057708a8..959d62c3d7 100644 --- a/res/battle/scripts/effects/effect_script_0222.s +++ b/res/battle/scripts/effects/effect_script_0222.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcNaturalGiftParams _006 diff --git a/res/battle/scripts/effects/effect_script_0223.s b/res/battle/scripts/effects/effect_script_0223.s index 6bd257ff42..a9f45ffc3b 100644 --- a/res/battle/scripts/effects/effect_script_0223.s +++ b/res/battle/scripts/effects/effect_script_0223.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryFeint _008 diff --git a/res/battle/scripts/effects/effect_script_0224.s b/res/battle/scripts/effects/effect_script_0224.s index 132d490c2c..9ca3e438b1 100644 --- a/res/battle/scripts/effects/effect_script_0224.s +++ b/res/battle/scripts/effects/effect_script_0224.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_PLUCK diff --git a/res/battle/scripts/effects/effect_script_0225.s b/res/battle/scripts/effects/effect_script_0225.s index 8b5b31f7aa..a28ac48852 100644 --- a/res/battle/scripts/effects/effect_script_0225.s +++ b/res/battle/scripts/effects/effect_script_0225.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_TAILWIND_START diff --git a/res/battle/scripts/effects/effect_script_0226.s b/res/battle/scripts/effects/effect_script_0226.s index ae92ae6141..ee5dac6b0a 100644 --- a/res/battle/scripts/effects/effect_script_0226.s +++ b/res/battle/scripts/effects/effect_script_0226.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _005 diff --git a/res/battle/scripts/effects/effect_script_0227.s b/res/battle/scripts/effects/effect_script_0227.s index 7cf42829bd..06ff409073 100644 --- a/res/battle/scripts/effects/effect_script_0227.s +++ b/res/battle/scripts/effects/effect_script_0227.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryMetalBurst _006 diff --git a/res/battle/scripts/effects/effect_script_0228.s b/res/battle/scripts/effects/effect_script_0228.s index 49526a4a42..d878c678bb 100644 --- a/res/battle/scripts/effects/effect_script_0228.s +++ b/res/battle/scripts/effects/effect_script_0228.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_ATTACK_THEN_SWITCH_OUT diff --git a/res/battle/scripts/effects/effect_script_0229.s b/res/battle/scripts/effects/effect_script_0229.s index bf510130b6..66fe7b7c8b 100644 --- a/res/battle/scripts/effects/effect_script_0229.s +++ b/res/battle/scripts/effects/effect_script_0229.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_USER_DEF_AND_SPDEF_DOWN_1_STAGE diff --git a/res/battle/scripts/effects/effect_script_0230.s b/res/battle/scripts/effects/effect_script_0230.s index 7541c6a2bf..3873a904d1 100644 --- a/res/battle/scripts/effects/effect_script_0230.s +++ b/res/battle/scripts/effects/effect_script_0230.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcPaybackPower diff --git a/res/battle/scripts/effects/effect_script_0231.s b/res/battle/scripts/effects/effect_script_0231.s index e7bdbcfdb1..c8549481fa 100644 --- a/res/battle/scripts/effects/effect_script_0231.s +++ b/res/battle/scripts/effects/effect_script_0231.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GetCurrentMoveData MOVEATTRIBUTE_POWER diff --git a/res/battle/scripts/effects/effect_script_0232.s b/res/battle/scripts/effects/effect_script_0232.s index 74f04047e5..cb5d95dfdc 100644 --- a/res/battle/scripts/effects/effect_script_0232.s +++ b/res/battle/scripts/effects/effect_script_0232.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _007 diff --git a/res/battle/scripts/effects/effect_script_0233.s b/res/battle/scripts/effects/effect_script_0233.s index 702a54ba1c..4135ed4633 100644 --- a/res/battle/scripts/effects/effect_script_0233.s +++ b/res/battle/scripts/effects/effect_script_0233.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ABILITY, ABILITY_MULTITYPE, _034 diff --git a/res/battle/scripts/effects/effect_script_0234.s b/res/battle/scripts/effects/effect_script_0234.s index 109b0db807..7fe7eb1c98 100644 --- a/res/battle/scripts/effects/effect_script_0234.s +++ b/res/battle/scripts/effects/effect_script_0234.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckCanShareStatus _006 diff --git a/res/battle/scripts/effects/effect_script_0235.s b/res/battle/scripts/effects/effect_script_0235.s index 43dad64258..668cebbd74 100644 --- a/res/battle/scripts/effects/effect_script_0235.s +++ b/res/battle/scripts/effects/effect_script_0235.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcTrumpCardPower diff --git a/res/battle/scripts/effects/effect_script_0236.s b/res/battle/scripts/effects/effect_script_0236.s index d3e73dc5e9..a9af651bad 100644 --- a/res/battle/scripts/effects/effect_script_0236.s +++ b/res/battle/scripts/effects/effect_script_0236.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_HEAL_BLOCK_START diff --git a/res/battle/scripts/effects/effect_script_0237.s b/res/battle/scripts/effects/effect_script_0237.s index d6a991f982..c8e1345a77 100644 --- a/res/battle/scripts/effects/effect_script_0237.s +++ b/res/battle/scripts/effects/effect_script_0237.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcWringOutPower diff --git a/res/battle/scripts/effects/effect_script_0238.s b/res/battle/scripts/effects/effect_script_0238.s index 534ac6fd8d..cbcbc59f20 100644 --- a/res/battle/scripts/effects/effect_script_0238.s +++ b/res/battle/scripts/effects/effect_script_0238.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_USER_SWAP_ATK_AND_DEF diff --git a/res/battle/scripts/effects/effect_script_0239.s b/res/battle/scripts/effects/effect_script_0239.s index 106bc4e5f4..88b3ce1423 100644 --- a/res/battle/scripts/effects/effect_script_0239.s +++ b/res/battle/scripts/effects/effect_script_0239.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SUPPRESS_TARGET_ABILITY diff --git a/res/battle/scripts/effects/effect_script_0240.s b/res/battle/scripts/effects/effect_script_0240.s index 1e9cd4db43..ffb135d4fd 100644 --- a/res/battle/scripts/effects/effect_script_0240.s +++ b/res/battle/scripts/effects/effect_script_0240.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_ATTACKER, SIDE_CONDITION_LUCKY_CHANT, _009 diff --git a/res/battle/scripts/effects/effect_script_0241.s b/res/battle/scripts/effects/effect_script_0241.s index 727394c87c..746493f677 100644 --- a/res/battle/scripts/effects/effect_script_0241.s +++ b/res/battle/scripts/effects/effect_script_0241.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryMeFirst _008 diff --git a/res/battle/scripts/effects/effect_script_0242.s b/res/battle/scripts/effects/effect_script_0242.s index a2d401a92d..0acfef2b18 100644 --- a/res/battle/scripts/effects/effect_script_0242.s +++ b/res/battle/scripts/effects/effect_script_0242.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryCopycat _008 diff --git a/res/battle/scripts/effects/effect_script_0243.s b/res/battle/scripts/effects/effect_script_0243.s index e13a704eb9..95350f2280 100644 --- a/res/battle/scripts/effects/effect_script_0243.s +++ b/res/battle/scripts/effects/effect_script_0243.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_EXCHANGE_ATK_AND_SPATK_STAGES diff --git a/res/battle/scripts/effects/effect_script_0244.s b/res/battle/scripts/effects/effect_script_0244.s index f5489d5d9e..e60d37d7b0 100644 --- a/res/battle/scripts/effects/effect_script_0244.s +++ b/res/battle/scripts/effects/effect_script_0244.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_EXCHANGE_DEF_AND_SPDEF_STAGES diff --git a/res/battle/scripts/effects/effect_script_0245.s b/res/battle/scripts/effects/effect_script_0245.s index c6e3be438c..3d74599f84 100644 --- a/res/battle/scripts/effects/effect_script_0245.s +++ b/res/battle/scripts/effects/effect_script_0245.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcPunishmentPower diff --git a/res/battle/scripts/effects/effect_script_0246.s b/res/battle/scripts/effects/effect_script_0246.s index cb52a74e36..3c5ed5ed77 100644 --- a/res/battle/scripts/effects/effect_script_0246.s +++ b/res/battle/scripts/effects/effect_script_0246.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryLastResort _004 diff --git a/res/battle/scripts/effects/effect_script_0247.s b/res/battle/scripts/effects/effect_script_0247.s index 2eacc64f02..553f649c4e 100644 --- a/res/battle/scripts/effects/effect_script_0247.s +++ b/res/battle/scripts/effects/effect_script_0247.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_GIVE_TARGET_INSOMNIA diff --git a/res/battle/scripts/effects/effect_script_0248.s b/res/battle/scripts/effects/effect_script_0248.s index 12f1cca22d..1a7f097614 100644 --- a/res/battle/scripts/effects/effect_script_0248.s +++ b/res/battle/scripts/effects/effect_script_0248.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrySuckerPunch _004 diff --git a/res/battle/scripts/effects/effect_script_0249.s b/res/battle/scripts/effects/effect_script_0249.s index 09477c4989..66d9a170a8 100644 --- a/res/battle/scripts/effects/effect_script_0249.s +++ b/res/battle/scripts/effects/effect_script_0249.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryToxicSpikes _010 diff --git a/res/battle/scripts/effects/effect_script_0250.s b/res/battle/scripts/effects/effect_script_0250.s index 542768b86d..92e5a527db 100644 --- a/res/battle/scripts/effects/effect_script_0250.s +++ b/res/battle/scripts/effects/effect_script_0250.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_CHECK_HP|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_EXCHANGE_ALL_STAT_STAGES diff --git a/res/battle/scripts/effects/effect_script_0251.s b/res/battle/scripts/effects/effect_script_0251.s index 6d6c10389e..e2ce333a29 100644 --- a/res/battle/scripts/effects/effect_script_0251.s +++ b/res/battle/scripts/effects/effect_script_0251.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_AQUA_RING, _019 diff --git a/res/battle/scripts/effects/effect_script_0252.s b/res/battle/scripts/effects/effect_script_0252.s index d6bf4c19cc..40862550e1 100644 --- a/res/battle/scripts/effects/effect_script_0252.s +++ b/res/battle/scripts/effects/effect_script_0252.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_MAGNET_RISE_TURNS, 0, _035 diff --git a/res/battle/scripts/effects/effect_script_0253.s b/res/battle/scripts/effects/effect_script_0253.s index ac79786fdd..21714ba975 100644 --- a/res/battle/scripts/effects/effect_script_0253.s +++ b/res/battle/scripts/effects/effect_script_0253.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0254.s b/res/battle/scripts/effects/effect_script_0254.s index da8ecfb27d..fa3f92064f 100644 --- a/res/battle/scripts/effects/effect_script_0254.s +++ b/res/battle/scripts/effects/effect_script_0254.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SUBSCRIPT_PTR_STRUGGLE diff --git a/res/battle/scripts/effects/effect_script_0255.s b/res/battle/scripts/effects/effect_script_0255.s index 5eaf6a9366..a9211908e7 100644 --- a/res/battle/scripts/effects/effect_script_0255.s +++ b/res/battle/scripts/effects/effect_script_0255.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 diff --git a/res/battle/scripts/effects/effect_script_0256.s b/res/battle/scripts/effects/effect_script_0256.s index f11276ca40..65950d1a33 100644 --- a/res/battle/scripts/effects/effect_script_0256.s +++ b/res/battle/scripts/effects/effect_script_0256.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 diff --git a/res/battle/scripts/effects/effect_script_0257.s b/res/battle/scripts/effects/effect_script_0257.s index 102b6cfa49..096a5e9b05 100644 --- a/res/battle/scripts/effects/effect_script_0257.s +++ b/res/battle/scripts/effects/effect_script_0257.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIVE diff --git a/res/battle/scripts/effects/effect_script_0258.s b/res/battle/scripts/effects/effect_script_0258.s index 2f3b9ca6fc..54a2ca54ed 100644 --- a/res/battle/scripts/effects/effect_script_0258.s +++ b/res/battle/scripts/effects/effect_script_0258.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_DIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_DEFOG diff --git a/res/battle/scripts/effects/effect_script_0259.s b/res/battle/scripts/effects/effect_script_0259.s index 67a854ef7c..ea87606e52 100644 --- a/res/battle/scripts/effects/effect_script_0259.s +++ b/res/battle/scripts/effects/effect_script_0259.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_TRICK_ROOM, _014 diff --git a/res/battle/scripts/effects/effect_script_0260.s b/res/battle/scripts/effects/effect_script_0260.s index 65304f0e73..993429f413 100644 --- a/res/battle/scripts/effects/effect_script_0260.s +++ b/res/battle/scripts/effects/effect_script_0260.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE diff --git a/res/battle/scripts/effects/effect_script_0261.s b/res/battle/scripts/effects/effect_script_0261.s index b545b00f57..5c18053691 100644 --- a/res/battle/scripts/effects/effect_script_0261.s +++ b/res/battle/scripts/effects/effect_script_0261.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_HIT_DURING_DIVE diff --git a/res/battle/scripts/effects/effect_script_0262.s b/res/battle/scripts/effects/effect_script_0262.s index 5cd7272840..67671cdc20 100644 --- a/res/battle/scripts/effects/effect_script_0262.s +++ b/res/battle/scripts/effects/effect_script_0262.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0263.s b/res/battle/scripts/effects/effect_script_0263.s index 8536de854b..87f0450cf3 100644 --- a/res/battle/scripts/effects/effect_script_0263.s +++ b/res/battle/scripts/effects/effect_script_0263.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _044 diff --git a/res/battle/scripts/effects/effect_script_0264.s b/res/battle/scripts/effects/effect_script_0264.s index 2951a3b305..d155626613 100644 --- a/res/battle/scripts/effects/effect_script_0264.s +++ b/res/battle/scripts/effects/effect_script_0264.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SPLASH diff --git a/res/battle/scripts/effects/effect_script_0265.s b/res/battle/scripts/effects/effect_script_0265.s index 25d692e77a..24471a0512 100644 --- a/res/battle/scripts/effects/effect_script_0265.s +++ b/res/battle/scripts/effects/effect_script_0265.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_DEFENDER, ABILITY_OBLIVIOUS, _048 diff --git a/res/battle/scripts/effects/effect_script_0266.s b/res/battle/scripts/effects/effect_script_0266.s index b6c5c9711f..e1c97228a6 100644 --- a/res/battle/scripts/effects/effect_script_0266.s +++ b/res/battle/scripts/effects/effect_script_0266.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_DEFENDER, SIDE_CONDITION_STEALTH_ROCK, _017 diff --git a/res/battle/scripts/effects/effect_script_0267.s b/res/battle/scripts/effects/effect_script_0267.s index 30c5a3fad0..6470bb1cab 100644 --- a/res/battle/scripts/effects/effect_script_0267.s +++ b/res/battle/scripts/effects/effect_script_0267.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_CHATTER diff --git a/res/battle/scripts/effects/effect_script_0268.s b/res/battle/scripts/effects/effect_script_0268.s index ab9213a60d..5aa1d03c27 100644 --- a/res/battle/scripts/effects/effect_script_0268.s +++ b/res/battle/scripts/effects/effect_script_0268.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckItemHoldEffect CHECK_HAVE, BTLSCR_ATTACKER, HOLD_EFFECT_ARCEUS_FIGHTING, _081 diff --git a/res/battle/scripts/effects/effect_script_0269.s b/res/battle/scripts/effects/effect_script_0269.s index a949b50225..350a88cc57 100644 --- a/res/battle/scripts/effects/effect_script_0269.s +++ b/res/battle/scripts/effects/effect_script_0269.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_NOT_HAVE, BTLSCR_ATTACKER, ABILITY_RECKLESS, _008 diff --git a/res/battle/scripts/effects/effect_script_0270.s b/res/battle/scripts/effects/effect_script_0270.s index 6db6e2a01b..1e61fa9f87 100644 --- a/res/battle/scripts/effects/effect_script_0270.s +++ b/res/battle/scripts/effects/effect_script_0270.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _008 diff --git a/res/battle/scripts/effects/effect_script_0271.s b/res/battle/scripts/effects/effect_script_0271.s index 99c61e5543..1131bdcba4 100644 --- a/res/battle/scripts/effects/effect_script_0271.s +++ b/res/battle/scripts/effects/effect_script_0271.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_SP_DEFENSE_DOWN_2_STAGES diff --git a/res/battle/scripts/effects/effect_script_0272.s b/res/battle/scripts/effects/effect_script_0272.s index 2f755eb50b..d08cec48f0 100644 --- a/res/battle/scripts/effects/effect_script_0272.s +++ b/res/battle/scripts/effects/effect_script_0272.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _049 diff --git a/res/battle/scripts/effects/effect_script_0273.s b/res/battle/scripts/effects/effect_script_0273.s index fec83b9798..dc1de8038e 100644 --- a/res/battle/scripts/effects/effect_script_0273.s +++ b/res/battle/scripts/effects/effect_script_0273.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_BURN_OR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0274.s b/res/battle/scripts/effects/effect_script_0274.s index 8ef9c243e6..299edced4b 100644 --- a/res/battle/scripts/effects/effect_script_0274.s +++ b/res/battle/scripts/effects/effect_script_0274.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_FREEZE_OR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0275.s b/res/battle/scripts/effects/effect_script_0275.s index cc119d62cd..9c16aee349 100644 --- a/res/battle/scripts/effects/effect_script_0275.s +++ b/res/battle/scripts/effects/effect_script_0275.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_ON_HIT|MOVE_SIDE_EFFECT_TO_DEFENDER|MOVE_SUBSCRIPT_PTR_PARALYZE_OR_FLINCH diff --git a/res/battle/scripts/effects/effect_script_0276.s b/res/battle/scripts/effects/effect_script_0276.s index cda37060eb..137d55072f 100644 --- a/res/battle/scripts/effects/effect_script_0276.s +++ b/res/battle/scripts/effects/effect_script_0276.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_FLAGS_INDIRECT, MOVE_SIDE_EFFECT_TO_ATTACKER|MOVE_SUBSCRIPT_PTR_SP_ATTACK_UP_1_STAGE diff --git a/res/battle/scripts/moves/move_script_0000.s b/res/battle/scripts/moves/move_script_0000.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0000.s +++ b/res/battle/scripts/moves/move_script_0000.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0001.s b/res/battle/scripts/moves/move_script_0001.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0001.s +++ b/res/battle/scripts/moves/move_script_0001.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0002.s b/res/battle/scripts/moves/move_script_0002.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0002.s +++ b/res/battle/scripts/moves/move_script_0002.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0003.s b/res/battle/scripts/moves/move_script_0003.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0003.s +++ b/res/battle/scripts/moves/move_script_0003.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0004.s b/res/battle/scripts/moves/move_script_0004.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0004.s +++ b/res/battle/scripts/moves/move_script_0004.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0005.s b/res/battle/scripts/moves/move_script_0005.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0005.s +++ b/res/battle/scripts/moves/move_script_0005.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0006.s b/res/battle/scripts/moves/move_script_0006.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0006.s +++ b/res/battle/scripts/moves/move_script_0006.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0007.s b/res/battle/scripts/moves/move_script_0007.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0007.s +++ b/res/battle/scripts/moves/move_script_0007.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0008.s b/res/battle/scripts/moves/move_script_0008.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0008.s +++ b/res/battle/scripts/moves/move_script_0008.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0009.s b/res/battle/scripts/moves/move_script_0009.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0009.s +++ b/res/battle/scripts/moves/move_script_0009.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0010.s b/res/battle/scripts/moves/move_script_0010.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0010.s +++ b/res/battle/scripts/moves/move_script_0010.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0011.s b/res/battle/scripts/moves/move_script_0011.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0011.s +++ b/res/battle/scripts/moves/move_script_0011.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0012.s b/res/battle/scripts/moves/move_script_0012.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0012.s +++ b/res/battle/scripts/moves/move_script_0012.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0013.s b/res/battle/scripts/moves/move_script_0013.s index 19aa545dcb..958dde2b06 100644 --- a/res/battle/scripts/moves/move_script_0013.s +++ b/res/battle/scripts/moves/move_script_0013.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} whipped up a whirlwind! diff --git a/res/battle/scripts/moves/move_script_0014.s b/res/battle/scripts/moves/move_script_0014.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0014.s +++ b/res/battle/scripts/moves/move_script_0014.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0015.s b/res/battle/scripts/moves/move_script_0015.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0015.s +++ b/res/battle/scripts/moves/move_script_0015.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0016.s b/res/battle/scripts/moves/move_script_0016.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0016.s +++ b/res/battle/scripts/moves/move_script_0016.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0017.s b/res/battle/scripts/moves/move_script_0017.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0017.s +++ b/res/battle/scripts/moves/move_script_0017.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0018.s b/res/battle/scripts/moves/move_script_0018.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0018.s +++ b/res/battle/scripts/moves/move_script_0018.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0019.s b/res/battle/scripts/moves/move_script_0019.s index 7e838c3411..dfc28787f2 100644 --- a/res/battle/scripts/moves/move_script_0019.s +++ b/res/battle/scripts/moves/move_script_0019.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} flew up high! diff --git a/res/battle/scripts/moves/move_script_0020.s b/res/battle/scripts/moves/move_script_0020.s index 0f6be43f5a..5520b8edd9 100644 --- a/res/battle/scripts/moves/move_script_0020.s +++ b/res/battle/scripts/moves/move_script_0020.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was squeezed by {1}! diff --git a/res/battle/scripts/moves/move_script_0021.s b/res/battle/scripts/moves/move_script_0021.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0021.s +++ b/res/battle/scripts/moves/move_script_0021.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0022.s b/res/battle/scripts/moves/move_script_0022.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0022.s +++ b/res/battle/scripts/moves/move_script_0022.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0023.s b/res/battle/scripts/moves/move_script_0023.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0023.s +++ b/res/battle/scripts/moves/move_script_0023.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0024.s b/res/battle/scripts/moves/move_script_0024.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0024.s +++ b/res/battle/scripts/moves/move_script_0024.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0025.s b/res/battle/scripts/moves/move_script_0025.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0025.s +++ b/res/battle/scripts/moves/move_script_0025.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0026.s b/res/battle/scripts/moves/move_script_0026.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0026.s +++ b/res/battle/scripts/moves/move_script_0026.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0027.s b/res/battle/scripts/moves/move_script_0027.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0027.s +++ b/res/battle/scripts/moves/move_script_0027.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0028.s b/res/battle/scripts/moves/move_script_0028.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0028.s +++ b/res/battle/scripts/moves/move_script_0028.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0029.s b/res/battle/scripts/moves/move_script_0029.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0029.s +++ b/res/battle/scripts/moves/move_script_0029.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0030.s b/res/battle/scripts/moves/move_script_0030.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0030.s +++ b/res/battle/scripts/moves/move_script_0030.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0031.s b/res/battle/scripts/moves/move_script_0031.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0031.s +++ b/res/battle/scripts/moves/move_script_0031.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0032.s b/res/battle/scripts/moves/move_script_0032.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0032.s +++ b/res/battle/scripts/moves/move_script_0032.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0033.s b/res/battle/scripts/moves/move_script_0033.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0033.s +++ b/res/battle/scripts/moves/move_script_0033.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0034.s b/res/battle/scripts/moves/move_script_0034.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0034.s +++ b/res/battle/scripts/moves/move_script_0034.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0035.s b/res/battle/scripts/moves/move_script_0035.s index aedaf9f782..b4be4aa9ee 100644 --- a/res/battle/scripts/moves/move_script_0035.s +++ b/res/battle/scripts/moves/move_script_0035.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was wrapped by {1}! diff --git a/res/battle/scripts/moves/move_script_0036.s b/res/battle/scripts/moves/move_script_0036.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0036.s +++ b/res/battle/scripts/moves/move_script_0036.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0037.s b/res/battle/scripts/moves/move_script_0037.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0037.s +++ b/res/battle/scripts/moves/move_script_0037.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0038.s b/res/battle/scripts/moves/move_script_0038.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0038.s +++ b/res/battle/scripts/moves/move_script_0038.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0039.s b/res/battle/scripts/moves/move_script_0039.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0039.s +++ b/res/battle/scripts/moves/move_script_0039.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0040.s b/res/battle/scripts/moves/move_script_0040.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0040.s +++ b/res/battle/scripts/moves/move_script_0040.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0041.s b/res/battle/scripts/moves/move_script_0041.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0041.s +++ b/res/battle/scripts/moves/move_script_0041.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0042.s b/res/battle/scripts/moves/move_script_0042.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0042.s +++ b/res/battle/scripts/moves/move_script_0042.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0043.s b/res/battle/scripts/moves/move_script_0043.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0043.s +++ b/res/battle/scripts/moves/move_script_0043.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0044.s b/res/battle/scripts/moves/move_script_0044.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0044.s +++ b/res/battle/scripts/moves/move_script_0044.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0045.s b/res/battle/scripts/moves/move_script_0045.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0045.s +++ b/res/battle/scripts/moves/move_script_0045.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0046.s b/res/battle/scripts/moves/move_script_0046.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0046.s +++ b/res/battle/scripts/moves/move_script_0046.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0047.s b/res/battle/scripts/moves/move_script_0047.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0047.s +++ b/res/battle/scripts/moves/move_script_0047.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0048.s b/res/battle/scripts/moves/move_script_0048.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0048.s +++ b/res/battle/scripts/moves/move_script_0048.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0049.s b/res/battle/scripts/moves/move_script_0049.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0049.s +++ b/res/battle/scripts/moves/move_script_0049.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0050.s b/res/battle/scripts/moves/move_script_0050.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0050.s +++ b/res/battle/scripts/moves/move_script_0050.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0051.s b/res/battle/scripts/moves/move_script_0051.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0051.s +++ b/res/battle/scripts/moves/move_script_0051.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0052.s b/res/battle/scripts/moves/move_script_0052.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0052.s +++ b/res/battle/scripts/moves/move_script_0052.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0053.s b/res/battle/scripts/moves/move_script_0053.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0053.s +++ b/res/battle/scripts/moves/move_script_0053.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0054.s b/res/battle/scripts/moves/move_script_0054.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0054.s +++ b/res/battle/scripts/moves/move_script_0054.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0055.s b/res/battle/scripts/moves/move_script_0055.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0055.s +++ b/res/battle/scripts/moves/move_script_0055.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0056.s b/res/battle/scripts/moves/move_script_0056.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0056.s +++ b/res/battle/scripts/moves/move_script_0056.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0057.s b/res/battle/scripts/moves/move_script_0057.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0057.s +++ b/res/battle/scripts/moves/move_script_0057.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0058.s b/res/battle/scripts/moves/move_script_0058.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0058.s +++ b/res/battle/scripts/moves/move_script_0058.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0059.s b/res/battle/scripts/moves/move_script_0059.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0059.s +++ b/res/battle/scripts/moves/move_script_0059.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0060.s b/res/battle/scripts/moves/move_script_0060.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0060.s +++ b/res/battle/scripts/moves/move_script_0060.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0061.s b/res/battle/scripts/moves/move_script_0061.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0061.s +++ b/res/battle/scripts/moves/move_script_0061.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0062.s b/res/battle/scripts/moves/move_script_0062.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0062.s +++ b/res/battle/scripts/moves/move_script_0062.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0063.s b/res/battle/scripts/moves/move_script_0063.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0063.s +++ b/res/battle/scripts/moves/move_script_0063.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0064.s b/res/battle/scripts/moves/move_script_0064.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0064.s +++ b/res/battle/scripts/moves/move_script_0064.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0065.s b/res/battle/scripts/moves/move_script_0065.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0065.s +++ b/res/battle/scripts/moves/move_script_0065.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0066.s b/res/battle/scripts/moves/move_script_0066.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0066.s +++ b/res/battle/scripts/moves/move_script_0066.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0067.s b/res/battle/scripts/moves/move_script_0067.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0067.s +++ b/res/battle/scripts/moves/move_script_0067.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0068.s b/res/battle/scripts/moves/move_script_0068.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0068.s +++ b/res/battle/scripts/moves/move_script_0068.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0069.s b/res/battle/scripts/moves/move_script_0069.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0069.s +++ b/res/battle/scripts/moves/move_script_0069.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0070.s b/res/battle/scripts/moves/move_script_0070.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0070.s +++ b/res/battle/scripts/moves/move_script_0070.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0071.s b/res/battle/scripts/moves/move_script_0071.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0071.s +++ b/res/battle/scripts/moves/move_script_0071.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0072.s b/res/battle/scripts/moves/move_script_0072.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0072.s +++ b/res/battle/scripts/moves/move_script_0072.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0073.s b/res/battle/scripts/moves/move_script_0073.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0073.s +++ b/res/battle/scripts/moves/move_script_0073.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0074.s b/res/battle/scripts/moves/move_script_0074.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0074.s +++ b/res/battle/scripts/moves/move_script_0074.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0075.s b/res/battle/scripts/moves/move_script_0075.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0075.s +++ b/res/battle/scripts/moves/move_script_0075.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0076.s b/res/battle/scripts/moves/move_script_0076.s index 61174316cb..7b0c6a243f 100644 --- a/res/battle/scripts/moves/move_script_0076.s +++ b/res/battle/scripts/moves/move_script_0076.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} absorbed light! diff --git a/res/battle/scripts/moves/move_script_0077.s b/res/battle/scripts/moves/move_script_0077.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0077.s +++ b/res/battle/scripts/moves/move_script_0077.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0078.s b/res/battle/scripts/moves/move_script_0078.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0078.s +++ b/res/battle/scripts/moves/move_script_0078.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0079.s b/res/battle/scripts/moves/move_script_0079.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0079.s +++ b/res/battle/scripts/moves/move_script_0079.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0080.s b/res/battle/scripts/moves/move_script_0080.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0080.s +++ b/res/battle/scripts/moves/move_script_0080.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0081.s b/res/battle/scripts/moves/move_script_0081.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0081.s +++ b/res/battle/scripts/moves/move_script_0081.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0082.s b/res/battle/scripts/moves/move_script_0082.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0082.s +++ b/res/battle/scripts/moves/move_script_0082.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0083.s b/res/battle/scripts/moves/move_script_0083.s index bdd8416240..b64959d954 100644 --- a/res/battle/scripts/moves/move_script_0083.s +++ b/res/battle/scripts/moves/move_script_0083.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was trapped in the vortex! diff --git a/res/battle/scripts/moves/move_script_0084.s b/res/battle/scripts/moves/move_script_0084.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0084.s +++ b/res/battle/scripts/moves/move_script_0084.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0085.s b/res/battle/scripts/moves/move_script_0085.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0085.s +++ b/res/battle/scripts/moves/move_script_0085.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0086.s b/res/battle/scripts/moves/move_script_0086.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0086.s +++ b/res/battle/scripts/moves/move_script_0086.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0087.s b/res/battle/scripts/moves/move_script_0087.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0087.s +++ b/res/battle/scripts/moves/move_script_0087.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0088.s b/res/battle/scripts/moves/move_script_0088.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0088.s +++ b/res/battle/scripts/moves/move_script_0088.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0089.s b/res/battle/scripts/moves/move_script_0089.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0089.s +++ b/res/battle/scripts/moves/move_script_0089.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0090.s b/res/battle/scripts/moves/move_script_0090.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0090.s +++ b/res/battle/scripts/moves/move_script_0090.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0091.s b/res/battle/scripts/moves/move_script_0091.s index 2d3e814a6f..dd0b552222 100644 --- a/res/battle/scripts/moves/move_script_0091.s +++ b/res/battle/scripts/moves/move_script_0091.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} burrowed its way under the ground! diff --git a/res/battle/scripts/moves/move_script_0092.s b/res/battle/scripts/moves/move_script_0092.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0092.s +++ b/res/battle/scripts/moves/move_script_0092.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0093.s b/res/battle/scripts/moves/move_script_0093.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0093.s +++ b/res/battle/scripts/moves/move_script_0093.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0094.s b/res/battle/scripts/moves/move_script_0094.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0094.s +++ b/res/battle/scripts/moves/move_script_0094.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0095.s b/res/battle/scripts/moves/move_script_0095.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0095.s +++ b/res/battle/scripts/moves/move_script_0095.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0096.s b/res/battle/scripts/moves/move_script_0096.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0096.s +++ b/res/battle/scripts/moves/move_script_0096.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0097.s b/res/battle/scripts/moves/move_script_0097.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0097.s +++ b/res/battle/scripts/moves/move_script_0097.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0098.s b/res/battle/scripts/moves/move_script_0098.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0098.s +++ b/res/battle/scripts/moves/move_script_0098.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0099.s b/res/battle/scripts/moves/move_script_0099.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0099.s +++ b/res/battle/scripts/moves/move_script_0099.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0100.s b/res/battle/scripts/moves/move_script_0100.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0100.s +++ b/res/battle/scripts/moves/move_script_0100.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0101.s b/res/battle/scripts/moves/move_script_0101.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0101.s +++ b/res/battle/scripts/moves/move_script_0101.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0102.s b/res/battle/scripts/moves/move_script_0102.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0102.s +++ b/res/battle/scripts/moves/move_script_0102.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0103.s b/res/battle/scripts/moves/move_script_0103.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0103.s +++ b/res/battle/scripts/moves/move_script_0103.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0104.s b/res/battle/scripts/moves/move_script_0104.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0104.s +++ b/res/battle/scripts/moves/move_script_0104.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0105.s b/res/battle/scripts/moves/move_script_0105.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0105.s +++ b/res/battle/scripts/moves/move_script_0105.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0106.s b/res/battle/scripts/moves/move_script_0106.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0106.s +++ b/res/battle/scripts/moves/move_script_0106.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0107.s b/res/battle/scripts/moves/move_script_0107.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0107.s +++ b/res/battle/scripts/moves/move_script_0107.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0108.s b/res/battle/scripts/moves/move_script_0108.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0108.s +++ b/res/battle/scripts/moves/move_script_0108.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0109.s b/res/battle/scripts/moves/move_script_0109.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0109.s +++ b/res/battle/scripts/moves/move_script_0109.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0110.s b/res/battle/scripts/moves/move_script_0110.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0110.s +++ b/res/battle/scripts/moves/move_script_0110.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0111.s b/res/battle/scripts/moves/move_script_0111.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0111.s +++ b/res/battle/scripts/moves/move_script_0111.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0112.s b/res/battle/scripts/moves/move_script_0112.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0112.s +++ b/res/battle/scripts/moves/move_script_0112.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0113.s b/res/battle/scripts/moves/move_script_0113.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0113.s +++ b/res/battle/scripts/moves/move_script_0113.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0114.s b/res/battle/scripts/moves/move_script_0114.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0114.s +++ b/res/battle/scripts/moves/move_script_0114.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0115.s b/res/battle/scripts/moves/move_script_0115.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0115.s +++ b/res/battle/scripts/moves/move_script_0115.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0116.s b/res/battle/scripts/moves/move_script_0116.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0116.s +++ b/res/battle/scripts/moves/move_script_0116.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0117.s b/res/battle/scripts/moves/move_script_0117.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0117.s +++ b/res/battle/scripts/moves/move_script_0117.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0118.s b/res/battle/scripts/moves/move_script_0118.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0118.s +++ b/res/battle/scripts/moves/move_script_0118.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0119.s b/res/battle/scripts/moves/move_script_0119.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0119.s +++ b/res/battle/scripts/moves/move_script_0119.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0120.s b/res/battle/scripts/moves/move_script_0120.s index 168b89de7a..34ae2a2cf8 100644 --- a/res/battle/scripts/moves/move_script_0120.s +++ b/res/battle/scripts/moves/move_script_0120.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: IncrementGameRecord BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, RECORD_USED_SELFDESTRUCT diff --git a/res/battle/scripts/moves/move_script_0121.s b/res/battle/scripts/moves/move_script_0121.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0121.s +++ b/res/battle/scripts/moves/move_script_0121.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0122.s b/res/battle/scripts/moves/move_script_0122.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0122.s +++ b/res/battle/scripts/moves/move_script_0122.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0123.s b/res/battle/scripts/moves/move_script_0123.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0123.s +++ b/res/battle/scripts/moves/move_script_0123.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0124.s b/res/battle/scripts/moves/move_script_0124.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0124.s +++ b/res/battle/scripts/moves/move_script_0124.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0125.s b/res/battle/scripts/moves/move_script_0125.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0125.s +++ b/res/battle/scripts/moves/move_script_0125.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0126.s b/res/battle/scripts/moves/move_script_0126.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0126.s +++ b/res/battle/scripts/moves/move_script_0126.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0127.s b/res/battle/scripts/moves/move_script_0127.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0127.s +++ b/res/battle/scripts/moves/move_script_0127.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0128.s b/res/battle/scripts/moves/move_script_0128.s index 62513acec2..cab153defb 100644 --- a/res/battle/scripts/moves/move_script_0128.s +++ b/res/battle/scripts/moves/move_script_0128.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {1} clamped {0}! diff --git a/res/battle/scripts/moves/move_script_0129.s b/res/battle/scripts/moves/move_script_0129.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0129.s +++ b/res/battle/scripts/moves/move_script_0129.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0130.s b/res/battle/scripts/moves/move_script_0130.s index 76b20bf498..b6ca77e471 100644 --- a/res/battle/scripts/moves/move_script_0130.s +++ b/res/battle/scripts/moves/move_script_0130.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} tucked in its head! diff --git a/res/battle/scripts/moves/move_script_0131.s b/res/battle/scripts/moves/move_script_0131.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0131.s +++ b/res/battle/scripts/moves/move_script_0131.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0132.s b/res/battle/scripts/moves/move_script_0132.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0132.s +++ b/res/battle/scripts/moves/move_script_0132.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0133.s b/res/battle/scripts/moves/move_script_0133.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0133.s +++ b/res/battle/scripts/moves/move_script_0133.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0134.s b/res/battle/scripts/moves/move_script_0134.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0134.s +++ b/res/battle/scripts/moves/move_script_0134.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0135.s b/res/battle/scripts/moves/move_script_0135.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0135.s +++ b/res/battle/scripts/moves/move_script_0135.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0136.s b/res/battle/scripts/moves/move_script_0136.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0136.s +++ b/res/battle/scripts/moves/move_script_0136.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0137.s b/res/battle/scripts/moves/move_script_0137.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0137.s +++ b/res/battle/scripts/moves/move_script_0137.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0138.s b/res/battle/scripts/moves/move_script_0138.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0138.s +++ b/res/battle/scripts/moves/move_script_0138.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0139.s b/res/battle/scripts/moves/move_script_0139.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0139.s +++ b/res/battle/scripts/moves/move_script_0139.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0140.s b/res/battle/scripts/moves/move_script_0140.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0140.s +++ b/res/battle/scripts/moves/move_script_0140.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0141.s b/res/battle/scripts/moves/move_script_0141.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0141.s +++ b/res/battle/scripts/moves/move_script_0141.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0142.s b/res/battle/scripts/moves/move_script_0142.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0142.s +++ b/res/battle/scripts/moves/move_script_0142.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0143.s b/res/battle/scripts/moves/move_script_0143.s index e840222381..515721d250 100644 --- a/res/battle/scripts/moves/move_script_0143.s +++ b/res/battle/scripts/moves/move_script_0143.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} became cloaked in a harsh light! diff --git a/res/battle/scripts/moves/move_script_0144.s b/res/battle/scripts/moves/move_script_0144.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0144.s +++ b/res/battle/scripts/moves/move_script_0144.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0145.s b/res/battle/scripts/moves/move_script_0145.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0145.s +++ b/res/battle/scripts/moves/move_script_0145.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0146.s b/res/battle/scripts/moves/move_script_0146.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0146.s +++ b/res/battle/scripts/moves/move_script_0146.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0147.s b/res/battle/scripts/moves/move_script_0147.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0147.s +++ b/res/battle/scripts/moves/move_script_0147.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0148.s b/res/battle/scripts/moves/move_script_0148.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0148.s +++ b/res/battle/scripts/moves/move_script_0148.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0149.s b/res/battle/scripts/moves/move_script_0149.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0149.s +++ b/res/battle/scripts/moves/move_script_0149.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0150.s b/res/battle/scripts/moves/move_script_0150.s index 9728f3b2b2..3b70763fd7 100644 --- a/res/battle/scripts/moves/move_script_0150.s +++ b/res/battle/scripts/moves/move_script_0150.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: IncrementGameRecord BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, RECORD_USED_SPLASH diff --git a/res/battle/scripts/moves/move_script_0151.s b/res/battle/scripts/moves/move_script_0151.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0151.s +++ b/res/battle/scripts/moves/move_script_0151.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0152.s b/res/battle/scripts/moves/move_script_0152.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0152.s +++ b/res/battle/scripts/moves/move_script_0152.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0153.s b/res/battle/scripts/moves/move_script_0153.s index 9417ddf65e..e944d67734 100644 --- a/res/battle/scripts/moves/move_script_0153.s +++ b/res/battle/scripts/moves/move_script_0153.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: IncrementGameRecord BTLSCR_ATTACKER, BATTLER_TYPE_SOLO_PLAYER, RECORD_USED_EXPLOSION diff --git a/res/battle/scripts/moves/move_script_0154.s b/res/battle/scripts/moves/move_script_0154.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0154.s +++ b/res/battle/scripts/moves/move_script_0154.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0155.s b/res/battle/scripts/moves/move_script_0155.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0155.s +++ b/res/battle/scripts/moves/move_script_0155.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0156.s b/res/battle/scripts/moves/move_script_0156.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0156.s +++ b/res/battle/scripts/moves/move_script_0156.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0157.s b/res/battle/scripts/moves/move_script_0157.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0157.s +++ b/res/battle/scripts/moves/move_script_0157.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0158.s b/res/battle/scripts/moves/move_script_0158.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0158.s +++ b/res/battle/scripts/moves/move_script_0158.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0159.s b/res/battle/scripts/moves/move_script_0159.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0159.s +++ b/res/battle/scripts/moves/move_script_0159.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0160.s b/res/battle/scripts/moves/move_script_0160.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0160.s +++ b/res/battle/scripts/moves/move_script_0160.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0161.s b/res/battle/scripts/moves/move_script_0161.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0161.s +++ b/res/battle/scripts/moves/move_script_0161.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0162.s b/res/battle/scripts/moves/move_script_0162.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0162.s +++ b/res/battle/scripts/moves/move_script_0162.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0163.s b/res/battle/scripts/moves/move_script_0163.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0163.s +++ b/res/battle/scripts/moves/move_script_0163.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0164.s b/res/battle/scripts/moves/move_script_0164.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0164.s +++ b/res/battle/scripts/moves/move_script_0164.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0165.s b/res/battle/scripts/moves/move_script_0165.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0165.s +++ b/res/battle/scripts/moves/move_script_0165.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0166.s b/res/battle/scripts/moves/move_script_0166.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0166.s +++ b/res/battle/scripts/moves/move_script_0166.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0167.s b/res/battle/scripts/moves/move_script_0167.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0167.s +++ b/res/battle/scripts/moves/move_script_0167.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0168.s b/res/battle/scripts/moves/move_script_0168.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0168.s +++ b/res/battle/scripts/moves/move_script_0168.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0169.s b/res/battle/scripts/moves/move_script_0169.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0169.s +++ b/res/battle/scripts/moves/move_script_0169.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0170.s b/res/battle/scripts/moves/move_script_0170.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0170.s +++ b/res/battle/scripts/moves/move_script_0170.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0171.s b/res/battle/scripts/moves/move_script_0171.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0171.s +++ b/res/battle/scripts/moves/move_script_0171.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0172.s b/res/battle/scripts/moves/move_script_0172.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0172.s +++ b/res/battle/scripts/moves/move_script_0172.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0173.s b/res/battle/scripts/moves/move_script_0173.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0173.s +++ b/res/battle/scripts/moves/move_script_0173.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0174.s b/res/battle/scripts/moves/move_script_0174.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0174.s +++ b/res/battle/scripts/moves/move_script_0174.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0175.s b/res/battle/scripts/moves/move_script_0175.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0175.s +++ b/res/battle/scripts/moves/move_script_0175.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0176.s b/res/battle/scripts/moves/move_script_0176.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0176.s +++ b/res/battle/scripts/moves/move_script_0176.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0177.s b/res/battle/scripts/moves/move_script_0177.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0177.s +++ b/res/battle/scripts/moves/move_script_0177.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0178.s b/res/battle/scripts/moves/move_script_0178.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0178.s +++ b/res/battle/scripts/moves/move_script_0178.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0179.s b/res/battle/scripts/moves/move_script_0179.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0179.s +++ b/res/battle/scripts/moves/move_script_0179.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0180.s b/res/battle/scripts/moves/move_script_0180.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0180.s +++ b/res/battle/scripts/moves/move_script_0180.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0181.s b/res/battle/scripts/moves/move_script_0181.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0181.s +++ b/res/battle/scripts/moves/move_script_0181.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0182.s b/res/battle/scripts/moves/move_script_0182.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0182.s +++ b/res/battle/scripts/moves/move_script_0182.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0183.s b/res/battle/scripts/moves/move_script_0183.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0183.s +++ b/res/battle/scripts/moves/move_script_0183.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0184.s b/res/battle/scripts/moves/move_script_0184.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0184.s +++ b/res/battle/scripts/moves/move_script_0184.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0185.s b/res/battle/scripts/moves/move_script_0185.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0185.s +++ b/res/battle/scripts/moves/move_script_0185.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0186.s b/res/battle/scripts/moves/move_script_0186.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0186.s +++ b/res/battle/scripts/moves/move_script_0186.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0187.s b/res/battle/scripts/moves/move_script_0187.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0187.s +++ b/res/battle/scripts/moves/move_script_0187.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0188.s b/res/battle/scripts/moves/move_script_0188.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0188.s +++ b/res/battle/scripts/moves/move_script_0188.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0189.s b/res/battle/scripts/moves/move_script_0189.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0189.s +++ b/res/battle/scripts/moves/move_script_0189.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0190.s b/res/battle/scripts/moves/move_script_0190.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0190.s +++ b/res/battle/scripts/moves/move_script_0190.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0191.s b/res/battle/scripts/moves/move_script_0191.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0191.s +++ b/res/battle/scripts/moves/move_script_0191.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0192.s b/res/battle/scripts/moves/move_script_0192.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0192.s +++ b/res/battle/scripts/moves/move_script_0192.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0193.s b/res/battle/scripts/moves/move_script_0193.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0193.s +++ b/res/battle/scripts/moves/move_script_0193.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0194.s b/res/battle/scripts/moves/move_script_0194.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0194.s +++ b/res/battle/scripts/moves/move_script_0194.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0195.s b/res/battle/scripts/moves/move_script_0195.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0195.s +++ b/res/battle/scripts/moves/move_script_0195.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0196.s b/res/battle/scripts/moves/move_script_0196.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0196.s +++ b/res/battle/scripts/moves/move_script_0196.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0197.s b/res/battle/scripts/moves/move_script_0197.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0197.s +++ b/res/battle/scripts/moves/move_script_0197.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0198.s b/res/battle/scripts/moves/move_script_0198.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0198.s +++ b/res/battle/scripts/moves/move_script_0198.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0199.s b/res/battle/scripts/moves/move_script_0199.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0199.s +++ b/res/battle/scripts/moves/move_script_0199.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0200.s b/res/battle/scripts/moves/move_script_0200.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0200.s +++ b/res/battle/scripts/moves/move_script_0200.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0201.s b/res/battle/scripts/moves/move_script_0201.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0201.s +++ b/res/battle/scripts/moves/move_script_0201.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0202.s b/res/battle/scripts/moves/move_script_0202.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0202.s +++ b/res/battle/scripts/moves/move_script_0202.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0203.s b/res/battle/scripts/moves/move_script_0203.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0203.s +++ b/res/battle/scripts/moves/move_script_0203.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0204.s b/res/battle/scripts/moves/move_script_0204.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0204.s +++ b/res/battle/scripts/moves/move_script_0204.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0205.s b/res/battle/scripts/moves/move_script_0205.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0205.s +++ b/res/battle/scripts/moves/move_script_0205.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0206.s b/res/battle/scripts/moves/move_script_0206.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0206.s +++ b/res/battle/scripts/moves/move_script_0206.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0207.s b/res/battle/scripts/moves/move_script_0207.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0207.s +++ b/res/battle/scripts/moves/move_script_0207.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0208.s b/res/battle/scripts/moves/move_script_0208.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0208.s +++ b/res/battle/scripts/moves/move_script_0208.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0209.s b/res/battle/scripts/moves/move_script_0209.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0209.s +++ b/res/battle/scripts/moves/move_script_0209.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0210.s b/res/battle/scripts/moves/move_script_0210.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0210.s +++ b/res/battle/scripts/moves/move_script_0210.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0211.s b/res/battle/scripts/moves/move_script_0211.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0211.s +++ b/res/battle/scripts/moves/move_script_0211.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0212.s b/res/battle/scripts/moves/move_script_0212.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0212.s +++ b/res/battle/scripts/moves/move_script_0212.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0213.s b/res/battle/scripts/moves/move_script_0213.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0213.s +++ b/res/battle/scripts/moves/move_script_0213.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0214.s b/res/battle/scripts/moves/move_script_0214.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0214.s +++ b/res/battle/scripts/moves/move_script_0214.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0215.s b/res/battle/scripts/moves/move_script_0215.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0215.s +++ b/res/battle/scripts/moves/move_script_0215.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0216.s b/res/battle/scripts/moves/move_script_0216.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0216.s +++ b/res/battle/scripts/moves/move_script_0216.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0217.s b/res/battle/scripts/moves/move_script_0217.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0217.s +++ b/res/battle/scripts/moves/move_script_0217.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0218.s b/res/battle/scripts/moves/move_script_0218.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0218.s +++ b/res/battle/scripts/moves/move_script_0218.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0219.s b/res/battle/scripts/moves/move_script_0219.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0219.s +++ b/res/battle/scripts/moves/move_script_0219.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0220.s b/res/battle/scripts/moves/move_script_0220.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0220.s +++ b/res/battle/scripts/moves/move_script_0220.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0221.s b/res/battle/scripts/moves/move_script_0221.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0221.s +++ b/res/battle/scripts/moves/move_script_0221.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0222.s b/res/battle/scripts/moves/move_script_0222.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0222.s +++ b/res/battle/scripts/moves/move_script_0222.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0223.s b/res/battle/scripts/moves/move_script_0223.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0223.s +++ b/res/battle/scripts/moves/move_script_0223.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0224.s b/res/battle/scripts/moves/move_script_0224.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0224.s +++ b/res/battle/scripts/moves/move_script_0224.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0225.s b/res/battle/scripts/moves/move_script_0225.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0225.s +++ b/res/battle/scripts/moves/move_script_0225.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0226.s b/res/battle/scripts/moves/move_script_0226.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0226.s +++ b/res/battle/scripts/moves/move_script_0226.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0227.s b/res/battle/scripts/moves/move_script_0227.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0227.s +++ b/res/battle/scripts/moves/move_script_0227.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0228.s b/res/battle/scripts/moves/move_script_0228.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0228.s +++ b/res/battle/scripts/moves/move_script_0228.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0229.s b/res/battle/scripts/moves/move_script_0229.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0229.s +++ b/res/battle/scripts/moves/move_script_0229.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0230.s b/res/battle/scripts/moves/move_script_0230.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0230.s +++ b/res/battle/scripts/moves/move_script_0230.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0231.s b/res/battle/scripts/moves/move_script_0231.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0231.s +++ b/res/battle/scripts/moves/move_script_0231.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0232.s b/res/battle/scripts/moves/move_script_0232.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0232.s +++ b/res/battle/scripts/moves/move_script_0232.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0233.s b/res/battle/scripts/moves/move_script_0233.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0233.s +++ b/res/battle/scripts/moves/move_script_0233.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0234.s b/res/battle/scripts/moves/move_script_0234.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0234.s +++ b/res/battle/scripts/moves/move_script_0234.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0235.s b/res/battle/scripts/moves/move_script_0235.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0235.s +++ b/res/battle/scripts/moves/move_script_0235.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0236.s b/res/battle/scripts/moves/move_script_0236.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0236.s +++ b/res/battle/scripts/moves/move_script_0236.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0237.s b/res/battle/scripts/moves/move_script_0237.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0237.s +++ b/res/battle/scripts/moves/move_script_0237.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0238.s b/res/battle/scripts/moves/move_script_0238.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0238.s +++ b/res/battle/scripts/moves/move_script_0238.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0239.s b/res/battle/scripts/moves/move_script_0239.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0239.s +++ b/res/battle/scripts/moves/move_script_0239.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0240.s b/res/battle/scripts/moves/move_script_0240.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0240.s +++ b/res/battle/scripts/moves/move_script_0240.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0241.s b/res/battle/scripts/moves/move_script_0241.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0241.s +++ b/res/battle/scripts/moves/move_script_0241.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0242.s b/res/battle/scripts/moves/move_script_0242.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0242.s +++ b/res/battle/scripts/moves/move_script_0242.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0243.s b/res/battle/scripts/moves/move_script_0243.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0243.s +++ b/res/battle/scripts/moves/move_script_0243.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0244.s b/res/battle/scripts/moves/move_script_0244.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0244.s +++ b/res/battle/scripts/moves/move_script_0244.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0245.s b/res/battle/scripts/moves/move_script_0245.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0245.s +++ b/res/battle/scripts/moves/move_script_0245.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0246.s b/res/battle/scripts/moves/move_script_0246.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0246.s +++ b/res/battle/scripts/moves/move_script_0246.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0247.s b/res/battle/scripts/moves/move_script_0247.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0247.s +++ b/res/battle/scripts/moves/move_script_0247.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0248.s b/res/battle/scripts/moves/move_script_0248.s index f33e4f298d..0761e3edd4 100644 --- a/res/battle/scripts/moves/move_script_0248.s +++ b/res/battle/scripts/moves/move_script_0248.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} foresaw an attack! diff --git a/res/battle/scripts/moves/move_script_0249.s b/res/battle/scripts/moves/move_script_0249.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0249.s +++ b/res/battle/scripts/moves/move_script_0249.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0250.s b/res/battle/scripts/moves/move_script_0250.s index bdd8416240..b64959d954 100644 --- a/res/battle/scripts/moves/move_script_0250.s +++ b/res/battle/scripts/moves/move_script_0250.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was trapped in the vortex! diff --git a/res/battle/scripts/moves/move_script_0251.s b/res/battle/scripts/moves/move_script_0251.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0251.s +++ b/res/battle/scripts/moves/move_script_0251.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0252.s b/res/battle/scripts/moves/move_script_0252.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0252.s +++ b/res/battle/scripts/moves/move_script_0252.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0253.s b/res/battle/scripts/moves/move_script_0253.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0253.s +++ b/res/battle/scripts/moves/move_script_0253.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0254.s b/res/battle/scripts/moves/move_script_0254.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0254.s +++ b/res/battle/scripts/moves/move_script_0254.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0255.s b/res/battle/scripts/moves/move_script_0255.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0255.s +++ b/res/battle/scripts/moves/move_script_0255.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0256.s b/res/battle/scripts/moves/move_script_0256.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0256.s +++ b/res/battle/scripts/moves/move_script_0256.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0257.s b/res/battle/scripts/moves/move_script_0257.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0257.s +++ b/res/battle/scripts/moves/move_script_0257.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0258.s b/res/battle/scripts/moves/move_script_0258.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0258.s +++ b/res/battle/scripts/moves/move_script_0258.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0259.s b/res/battle/scripts/moves/move_script_0259.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0259.s +++ b/res/battle/scripts/moves/move_script_0259.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0260.s b/res/battle/scripts/moves/move_script_0260.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0260.s +++ b/res/battle/scripts/moves/move_script_0260.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0261.s b/res/battle/scripts/moves/move_script_0261.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0261.s +++ b/res/battle/scripts/moves/move_script_0261.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0262.s b/res/battle/scripts/moves/move_script_0262.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0262.s +++ b/res/battle/scripts/moves/move_script_0262.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0263.s b/res/battle/scripts/moves/move_script_0263.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0263.s +++ b/res/battle/scripts/moves/move_script_0263.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0264.s b/res/battle/scripts/moves/move_script_0264.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0264.s +++ b/res/battle/scripts/moves/move_script_0264.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0265.s b/res/battle/scripts/moves/move_script_0265.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0265.s +++ b/res/battle/scripts/moves/move_script_0265.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0266.s b/res/battle/scripts/moves/move_script_0266.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0266.s +++ b/res/battle/scripts/moves/move_script_0266.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0267.s b/res/battle/scripts/moves/move_script_0267.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0267.s +++ b/res/battle/scripts/moves/move_script_0267.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0268.s b/res/battle/scripts/moves/move_script_0268.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0268.s +++ b/res/battle/scripts/moves/move_script_0268.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0269.s b/res/battle/scripts/moves/move_script_0269.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0269.s +++ b/res/battle/scripts/moves/move_script_0269.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0270.s b/res/battle/scripts/moves/move_script_0270.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0270.s +++ b/res/battle/scripts/moves/move_script_0270.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0271.s b/res/battle/scripts/moves/move_script_0271.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0271.s +++ b/res/battle/scripts/moves/move_script_0271.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0272.s b/res/battle/scripts/moves/move_script_0272.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0272.s +++ b/res/battle/scripts/moves/move_script_0272.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0273.s b/res/battle/scripts/moves/move_script_0273.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0273.s +++ b/res/battle/scripts/moves/move_script_0273.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0274.s b/res/battle/scripts/moves/move_script_0274.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0274.s +++ b/res/battle/scripts/moves/move_script_0274.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0275.s b/res/battle/scripts/moves/move_script_0275.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0275.s +++ b/res/battle/scripts/moves/move_script_0275.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0276.s b/res/battle/scripts/moves/move_script_0276.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0276.s +++ b/res/battle/scripts/moves/move_script_0276.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0277.s b/res/battle/scripts/moves/move_script_0277.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0277.s +++ b/res/battle/scripts/moves/move_script_0277.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0278.s b/res/battle/scripts/moves/move_script_0278.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0278.s +++ b/res/battle/scripts/moves/move_script_0278.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0279.s b/res/battle/scripts/moves/move_script_0279.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0279.s +++ b/res/battle/scripts/moves/move_script_0279.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0280.s b/res/battle/scripts/moves/move_script_0280.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0280.s +++ b/res/battle/scripts/moves/move_script_0280.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0281.s b/res/battle/scripts/moves/move_script_0281.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0281.s +++ b/res/battle/scripts/moves/move_script_0281.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0282.s b/res/battle/scripts/moves/move_script_0282.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0282.s +++ b/res/battle/scripts/moves/move_script_0282.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0283.s b/res/battle/scripts/moves/move_script_0283.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0283.s +++ b/res/battle/scripts/moves/move_script_0283.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0284.s b/res/battle/scripts/moves/move_script_0284.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0284.s +++ b/res/battle/scripts/moves/move_script_0284.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0285.s b/res/battle/scripts/moves/move_script_0285.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0285.s +++ b/res/battle/scripts/moves/move_script_0285.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0286.s b/res/battle/scripts/moves/move_script_0286.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0286.s +++ b/res/battle/scripts/moves/move_script_0286.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0287.s b/res/battle/scripts/moves/move_script_0287.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0287.s +++ b/res/battle/scripts/moves/move_script_0287.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0288.s b/res/battle/scripts/moves/move_script_0288.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0288.s +++ b/res/battle/scripts/moves/move_script_0288.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0289.s b/res/battle/scripts/moves/move_script_0289.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0289.s +++ b/res/battle/scripts/moves/move_script_0289.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0290.s b/res/battle/scripts/moves/move_script_0290.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0290.s +++ b/res/battle/scripts/moves/move_script_0290.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0291.s b/res/battle/scripts/moves/move_script_0291.s index b83b8f54df..d696c985e7 100644 --- a/res/battle/scripts/moves/move_script_0291.s +++ b/res/battle/scripts/moves/move_script_0291.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} hid underwater! diff --git a/res/battle/scripts/moves/move_script_0292.s b/res/battle/scripts/moves/move_script_0292.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0292.s +++ b/res/battle/scripts/moves/move_script_0292.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0293.s b/res/battle/scripts/moves/move_script_0293.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0293.s +++ b/res/battle/scripts/moves/move_script_0293.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0294.s b/res/battle/scripts/moves/move_script_0294.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0294.s +++ b/res/battle/scripts/moves/move_script_0294.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0295.s b/res/battle/scripts/moves/move_script_0295.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0295.s +++ b/res/battle/scripts/moves/move_script_0295.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0296.s b/res/battle/scripts/moves/move_script_0296.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0296.s +++ b/res/battle/scripts/moves/move_script_0296.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0297.s b/res/battle/scripts/moves/move_script_0297.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0297.s +++ b/res/battle/scripts/moves/move_script_0297.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0298.s b/res/battle/scripts/moves/move_script_0298.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0298.s +++ b/res/battle/scripts/moves/move_script_0298.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0299.s b/res/battle/scripts/moves/move_script_0299.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0299.s +++ b/res/battle/scripts/moves/move_script_0299.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0300.s b/res/battle/scripts/moves/move_script_0300.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0300.s +++ b/res/battle/scripts/moves/move_script_0300.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0301.s b/res/battle/scripts/moves/move_script_0301.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0301.s +++ b/res/battle/scripts/moves/move_script_0301.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0302.s b/res/battle/scripts/moves/move_script_0302.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0302.s +++ b/res/battle/scripts/moves/move_script_0302.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0303.s b/res/battle/scripts/moves/move_script_0303.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0303.s +++ b/res/battle/scripts/moves/move_script_0303.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0304.s b/res/battle/scripts/moves/move_script_0304.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0304.s +++ b/res/battle/scripts/moves/move_script_0304.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0305.s b/res/battle/scripts/moves/move_script_0305.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0305.s +++ b/res/battle/scripts/moves/move_script_0305.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0306.s b/res/battle/scripts/moves/move_script_0306.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0306.s +++ b/res/battle/scripts/moves/move_script_0306.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0307.s b/res/battle/scripts/moves/move_script_0307.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0307.s +++ b/res/battle/scripts/moves/move_script_0307.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0308.s b/res/battle/scripts/moves/move_script_0308.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0308.s +++ b/res/battle/scripts/moves/move_script_0308.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0309.s b/res/battle/scripts/moves/move_script_0309.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0309.s +++ b/res/battle/scripts/moves/move_script_0309.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0310.s b/res/battle/scripts/moves/move_script_0310.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0310.s +++ b/res/battle/scripts/moves/move_script_0310.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0311.s b/res/battle/scripts/moves/move_script_0311.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0311.s +++ b/res/battle/scripts/moves/move_script_0311.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0312.s b/res/battle/scripts/moves/move_script_0312.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0312.s +++ b/res/battle/scripts/moves/move_script_0312.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0313.s b/res/battle/scripts/moves/move_script_0313.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0313.s +++ b/res/battle/scripts/moves/move_script_0313.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0314.s b/res/battle/scripts/moves/move_script_0314.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0314.s +++ b/res/battle/scripts/moves/move_script_0314.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0315.s b/res/battle/scripts/moves/move_script_0315.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0315.s +++ b/res/battle/scripts/moves/move_script_0315.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0316.s b/res/battle/scripts/moves/move_script_0316.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0316.s +++ b/res/battle/scripts/moves/move_script_0316.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0317.s b/res/battle/scripts/moves/move_script_0317.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0317.s +++ b/res/battle/scripts/moves/move_script_0317.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0318.s b/res/battle/scripts/moves/move_script_0318.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0318.s +++ b/res/battle/scripts/moves/move_script_0318.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0319.s b/res/battle/scripts/moves/move_script_0319.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0319.s +++ b/res/battle/scripts/moves/move_script_0319.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0320.s b/res/battle/scripts/moves/move_script_0320.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0320.s +++ b/res/battle/scripts/moves/move_script_0320.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0321.s b/res/battle/scripts/moves/move_script_0321.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0321.s +++ b/res/battle/scripts/moves/move_script_0321.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0322.s b/res/battle/scripts/moves/move_script_0322.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0322.s +++ b/res/battle/scripts/moves/move_script_0322.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0323.s b/res/battle/scripts/moves/move_script_0323.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0323.s +++ b/res/battle/scripts/moves/move_script_0323.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0324.s b/res/battle/scripts/moves/move_script_0324.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0324.s +++ b/res/battle/scripts/moves/move_script_0324.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0325.s b/res/battle/scripts/moves/move_script_0325.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0325.s +++ b/res/battle/scripts/moves/move_script_0325.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0326.s b/res/battle/scripts/moves/move_script_0326.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0326.s +++ b/res/battle/scripts/moves/move_script_0326.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0327.s b/res/battle/scripts/moves/move_script_0327.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0327.s +++ b/res/battle/scripts/moves/move_script_0327.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0328.s b/res/battle/scripts/moves/move_script_0328.s index f4275de48c..803a5a735e 100644 --- a/res/battle/scripts/moves/move_script_0328.s +++ b/res/battle/scripts/moves/move_script_0328.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was trapped by Sand Tomb! diff --git a/res/battle/scripts/moves/move_script_0329.s b/res/battle/scripts/moves/move_script_0329.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0329.s +++ b/res/battle/scripts/moves/move_script_0329.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0330.s b/res/battle/scripts/moves/move_script_0330.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0330.s +++ b/res/battle/scripts/moves/move_script_0330.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0331.s b/res/battle/scripts/moves/move_script_0331.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0331.s +++ b/res/battle/scripts/moves/move_script_0331.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0332.s b/res/battle/scripts/moves/move_script_0332.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0332.s +++ b/res/battle/scripts/moves/move_script_0332.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0333.s b/res/battle/scripts/moves/move_script_0333.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0333.s +++ b/res/battle/scripts/moves/move_script_0333.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0334.s b/res/battle/scripts/moves/move_script_0334.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0334.s +++ b/res/battle/scripts/moves/move_script_0334.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0335.s b/res/battle/scripts/moves/move_script_0335.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0335.s +++ b/res/battle/scripts/moves/move_script_0335.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0336.s b/res/battle/scripts/moves/move_script_0336.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0336.s +++ b/res/battle/scripts/moves/move_script_0336.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0337.s b/res/battle/scripts/moves/move_script_0337.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0337.s +++ b/res/battle/scripts/moves/move_script_0337.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0338.s b/res/battle/scripts/moves/move_script_0338.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0338.s +++ b/res/battle/scripts/moves/move_script_0338.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0339.s b/res/battle/scripts/moves/move_script_0339.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0339.s +++ b/res/battle/scripts/moves/move_script_0339.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0340.s b/res/battle/scripts/moves/move_script_0340.s index 91839b58db..f392d6c0f4 100644 --- a/res/battle/scripts/moves/move_script_0340.s +++ b/res/battle/scripts/moves/move_script_0340.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} sprang up! diff --git a/res/battle/scripts/moves/move_script_0341.s b/res/battle/scripts/moves/move_script_0341.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0341.s +++ b/res/battle/scripts/moves/move_script_0341.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0342.s b/res/battle/scripts/moves/move_script_0342.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0342.s +++ b/res/battle/scripts/moves/move_script_0342.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0343.s b/res/battle/scripts/moves/move_script_0343.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0343.s +++ b/res/battle/scripts/moves/move_script_0343.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0344.s b/res/battle/scripts/moves/move_script_0344.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0344.s +++ b/res/battle/scripts/moves/move_script_0344.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0345.s b/res/battle/scripts/moves/move_script_0345.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0345.s +++ b/res/battle/scripts/moves/move_script_0345.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0346.s b/res/battle/scripts/moves/move_script_0346.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0346.s +++ b/res/battle/scripts/moves/move_script_0346.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0347.s b/res/battle/scripts/moves/move_script_0347.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0347.s +++ b/res/battle/scripts/moves/move_script_0347.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0348.s b/res/battle/scripts/moves/move_script_0348.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0348.s +++ b/res/battle/scripts/moves/move_script_0348.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0349.s b/res/battle/scripts/moves/move_script_0349.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0349.s +++ b/res/battle/scripts/moves/move_script_0349.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0350.s b/res/battle/scripts/moves/move_script_0350.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0350.s +++ b/res/battle/scripts/moves/move_script_0350.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0351.s b/res/battle/scripts/moves/move_script_0351.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0351.s +++ b/res/battle/scripts/moves/move_script_0351.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0352.s b/res/battle/scripts/moves/move_script_0352.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0352.s +++ b/res/battle/scripts/moves/move_script_0352.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0353.s b/res/battle/scripts/moves/move_script_0353.s index 91b9ecec60..94616646ee 100644 --- a/res/battle/scripts/moves/move_script_0353.s +++ b/res/battle/scripts/moves/move_script_0353.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} chose {1} as its destiny! diff --git a/res/battle/scripts/moves/move_script_0354.s b/res/battle/scripts/moves/move_script_0354.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0354.s +++ b/res/battle/scripts/moves/move_script_0354.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0355.s b/res/battle/scripts/moves/move_script_0355.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0355.s +++ b/res/battle/scripts/moves/move_script_0355.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0356.s b/res/battle/scripts/moves/move_script_0356.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0356.s +++ b/res/battle/scripts/moves/move_script_0356.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0357.s b/res/battle/scripts/moves/move_script_0357.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0357.s +++ b/res/battle/scripts/moves/move_script_0357.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0358.s b/res/battle/scripts/moves/move_script_0358.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0358.s +++ b/res/battle/scripts/moves/move_script_0358.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0359.s b/res/battle/scripts/moves/move_script_0359.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0359.s +++ b/res/battle/scripts/moves/move_script_0359.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0360.s b/res/battle/scripts/moves/move_script_0360.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0360.s +++ b/res/battle/scripts/moves/move_script_0360.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0361.s b/res/battle/scripts/moves/move_script_0361.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0361.s +++ b/res/battle/scripts/moves/move_script_0361.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0362.s b/res/battle/scripts/moves/move_script_0362.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0362.s +++ b/res/battle/scripts/moves/move_script_0362.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0363.s b/res/battle/scripts/moves/move_script_0363.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0363.s +++ b/res/battle/scripts/moves/move_script_0363.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0364.s b/res/battle/scripts/moves/move_script_0364.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0364.s +++ b/res/battle/scripts/moves/move_script_0364.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0365.s b/res/battle/scripts/moves/move_script_0365.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0365.s +++ b/res/battle/scripts/moves/move_script_0365.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0366.s b/res/battle/scripts/moves/move_script_0366.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0366.s +++ b/res/battle/scripts/moves/move_script_0366.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0367.s b/res/battle/scripts/moves/move_script_0367.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0367.s +++ b/res/battle/scripts/moves/move_script_0367.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0368.s b/res/battle/scripts/moves/move_script_0368.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0368.s +++ b/res/battle/scripts/moves/move_script_0368.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0369.s b/res/battle/scripts/moves/move_script_0369.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0369.s +++ b/res/battle/scripts/moves/move_script_0369.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0370.s b/res/battle/scripts/moves/move_script_0370.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0370.s +++ b/res/battle/scripts/moves/move_script_0370.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0371.s b/res/battle/scripts/moves/move_script_0371.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0371.s +++ b/res/battle/scripts/moves/move_script_0371.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0372.s b/res/battle/scripts/moves/move_script_0372.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0372.s +++ b/res/battle/scripts/moves/move_script_0372.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0373.s b/res/battle/scripts/moves/move_script_0373.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0373.s +++ b/res/battle/scripts/moves/move_script_0373.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0374.s b/res/battle/scripts/moves/move_script_0374.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0374.s +++ b/res/battle/scripts/moves/move_script_0374.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0375.s b/res/battle/scripts/moves/move_script_0375.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0375.s +++ b/res/battle/scripts/moves/move_script_0375.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0376.s b/res/battle/scripts/moves/move_script_0376.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0376.s +++ b/res/battle/scripts/moves/move_script_0376.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0377.s b/res/battle/scripts/moves/move_script_0377.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0377.s +++ b/res/battle/scripts/moves/move_script_0377.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0378.s b/res/battle/scripts/moves/move_script_0378.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0378.s +++ b/res/battle/scripts/moves/move_script_0378.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0379.s b/res/battle/scripts/moves/move_script_0379.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0379.s +++ b/res/battle/scripts/moves/move_script_0379.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0380.s b/res/battle/scripts/moves/move_script_0380.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0380.s +++ b/res/battle/scripts/moves/move_script_0380.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0381.s b/res/battle/scripts/moves/move_script_0381.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0381.s +++ b/res/battle/scripts/moves/move_script_0381.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0382.s b/res/battle/scripts/moves/move_script_0382.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0382.s +++ b/res/battle/scripts/moves/move_script_0382.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0383.s b/res/battle/scripts/moves/move_script_0383.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0383.s +++ b/res/battle/scripts/moves/move_script_0383.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0384.s b/res/battle/scripts/moves/move_script_0384.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0384.s +++ b/res/battle/scripts/moves/move_script_0384.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0385.s b/res/battle/scripts/moves/move_script_0385.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0385.s +++ b/res/battle/scripts/moves/move_script_0385.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0386.s b/res/battle/scripts/moves/move_script_0386.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0386.s +++ b/res/battle/scripts/moves/move_script_0386.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0387.s b/res/battle/scripts/moves/move_script_0387.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0387.s +++ b/res/battle/scripts/moves/move_script_0387.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0388.s b/res/battle/scripts/moves/move_script_0388.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0388.s +++ b/res/battle/scripts/moves/move_script_0388.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0389.s b/res/battle/scripts/moves/move_script_0389.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0389.s +++ b/res/battle/scripts/moves/move_script_0389.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0390.s b/res/battle/scripts/moves/move_script_0390.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0390.s +++ b/res/battle/scripts/moves/move_script_0390.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0391.s b/res/battle/scripts/moves/move_script_0391.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0391.s +++ b/res/battle/scripts/moves/move_script_0391.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0392.s b/res/battle/scripts/moves/move_script_0392.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0392.s +++ b/res/battle/scripts/moves/move_script_0392.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0393.s b/res/battle/scripts/moves/move_script_0393.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0393.s +++ b/res/battle/scripts/moves/move_script_0393.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0394.s b/res/battle/scripts/moves/move_script_0394.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0394.s +++ b/res/battle/scripts/moves/move_script_0394.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0395.s b/res/battle/scripts/moves/move_script_0395.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0395.s +++ b/res/battle/scripts/moves/move_script_0395.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0396.s b/res/battle/scripts/moves/move_script_0396.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0396.s +++ b/res/battle/scripts/moves/move_script_0396.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0397.s b/res/battle/scripts/moves/move_script_0397.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0397.s +++ b/res/battle/scripts/moves/move_script_0397.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0398.s b/res/battle/scripts/moves/move_script_0398.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0398.s +++ b/res/battle/scripts/moves/move_script_0398.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0399.s b/res/battle/scripts/moves/move_script_0399.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0399.s +++ b/res/battle/scripts/moves/move_script_0399.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0400.s b/res/battle/scripts/moves/move_script_0400.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0400.s +++ b/res/battle/scripts/moves/move_script_0400.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0401.s b/res/battle/scripts/moves/move_script_0401.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0401.s +++ b/res/battle/scripts/moves/move_script_0401.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0402.s b/res/battle/scripts/moves/move_script_0402.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0402.s +++ b/res/battle/scripts/moves/move_script_0402.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0403.s b/res/battle/scripts/moves/move_script_0403.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0403.s +++ b/res/battle/scripts/moves/move_script_0403.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0404.s b/res/battle/scripts/moves/move_script_0404.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0404.s +++ b/res/battle/scripts/moves/move_script_0404.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0405.s b/res/battle/scripts/moves/move_script_0405.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0405.s +++ b/res/battle/scripts/moves/move_script_0405.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0406.s b/res/battle/scripts/moves/move_script_0406.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0406.s +++ b/res/battle/scripts/moves/move_script_0406.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0407.s b/res/battle/scripts/moves/move_script_0407.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0407.s +++ b/res/battle/scripts/moves/move_script_0407.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0408.s b/res/battle/scripts/moves/move_script_0408.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0408.s +++ b/res/battle/scripts/moves/move_script_0408.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0409.s b/res/battle/scripts/moves/move_script_0409.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0409.s +++ b/res/battle/scripts/moves/move_script_0409.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0410.s b/res/battle/scripts/moves/move_script_0410.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0410.s +++ b/res/battle/scripts/moves/move_script_0410.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0411.s b/res/battle/scripts/moves/move_script_0411.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0411.s +++ b/res/battle/scripts/moves/move_script_0411.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0412.s b/res/battle/scripts/moves/move_script_0412.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0412.s +++ b/res/battle/scripts/moves/move_script_0412.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0413.s b/res/battle/scripts/moves/move_script_0413.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0413.s +++ b/res/battle/scripts/moves/move_script_0413.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0414.s b/res/battle/scripts/moves/move_script_0414.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0414.s +++ b/res/battle/scripts/moves/move_script_0414.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0415.s b/res/battle/scripts/moves/move_script_0415.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0415.s +++ b/res/battle/scripts/moves/move_script_0415.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0416.s b/res/battle/scripts/moves/move_script_0416.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0416.s +++ b/res/battle/scripts/moves/move_script_0416.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0417.s b/res/battle/scripts/moves/move_script_0417.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0417.s +++ b/res/battle/scripts/moves/move_script_0417.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0418.s b/res/battle/scripts/moves/move_script_0418.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0418.s +++ b/res/battle/scripts/moves/move_script_0418.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0419.s b/res/battle/scripts/moves/move_script_0419.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0419.s +++ b/res/battle/scripts/moves/move_script_0419.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0420.s b/res/battle/scripts/moves/move_script_0420.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0420.s +++ b/res/battle/scripts/moves/move_script_0420.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0421.s b/res/battle/scripts/moves/move_script_0421.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0421.s +++ b/res/battle/scripts/moves/move_script_0421.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0422.s b/res/battle/scripts/moves/move_script_0422.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0422.s +++ b/res/battle/scripts/moves/move_script_0422.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0423.s b/res/battle/scripts/moves/move_script_0423.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0423.s +++ b/res/battle/scripts/moves/move_script_0423.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0424.s b/res/battle/scripts/moves/move_script_0424.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0424.s +++ b/res/battle/scripts/moves/move_script_0424.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0425.s b/res/battle/scripts/moves/move_script_0425.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0425.s +++ b/res/battle/scripts/moves/move_script_0425.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0426.s b/res/battle/scripts/moves/move_script_0426.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0426.s +++ b/res/battle/scripts/moves/move_script_0426.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0427.s b/res/battle/scripts/moves/move_script_0427.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0427.s +++ b/res/battle/scripts/moves/move_script_0427.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0428.s b/res/battle/scripts/moves/move_script_0428.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0428.s +++ b/res/battle/scripts/moves/move_script_0428.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0429.s b/res/battle/scripts/moves/move_script_0429.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0429.s +++ b/res/battle/scripts/moves/move_script_0429.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0430.s b/res/battle/scripts/moves/move_script_0430.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0430.s +++ b/res/battle/scripts/moves/move_script_0430.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0431.s b/res/battle/scripts/moves/move_script_0431.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0431.s +++ b/res/battle/scripts/moves/move_script_0431.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0432.s b/res/battle/scripts/moves/move_script_0432.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0432.s +++ b/res/battle/scripts/moves/move_script_0432.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0433.s b/res/battle/scripts/moves/move_script_0433.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0433.s +++ b/res/battle/scripts/moves/move_script_0433.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0434.s b/res/battle/scripts/moves/move_script_0434.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0434.s +++ b/res/battle/scripts/moves/move_script_0434.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0435.s b/res/battle/scripts/moves/move_script_0435.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0435.s +++ b/res/battle/scripts/moves/move_script_0435.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0436.s b/res/battle/scripts/moves/move_script_0436.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0436.s +++ b/res/battle/scripts/moves/move_script_0436.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0437.s b/res/battle/scripts/moves/move_script_0437.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0437.s +++ b/res/battle/scripts/moves/move_script_0437.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0438.s b/res/battle/scripts/moves/move_script_0438.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0438.s +++ b/res/battle/scripts/moves/move_script_0438.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0439.s b/res/battle/scripts/moves/move_script_0439.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0439.s +++ b/res/battle/scripts/moves/move_script_0439.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0440.s b/res/battle/scripts/moves/move_script_0440.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0440.s +++ b/res/battle/scripts/moves/move_script_0440.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0441.s b/res/battle/scripts/moves/move_script_0441.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0441.s +++ b/res/battle/scripts/moves/move_script_0441.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0442.s b/res/battle/scripts/moves/move_script_0442.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0442.s +++ b/res/battle/scripts/moves/move_script_0442.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0443.s b/res/battle/scripts/moves/move_script_0443.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0443.s +++ b/res/battle/scripts/moves/move_script_0443.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0444.s b/res/battle/scripts/moves/move_script_0444.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0444.s +++ b/res/battle/scripts/moves/move_script_0444.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0445.s b/res/battle/scripts/moves/move_script_0445.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0445.s +++ b/res/battle/scripts/moves/move_script_0445.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0446.s b/res/battle/scripts/moves/move_script_0446.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0446.s +++ b/res/battle/scripts/moves/move_script_0446.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0447.s b/res/battle/scripts/moves/move_script_0447.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0447.s +++ b/res/battle/scripts/moves/move_script_0447.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0448.s b/res/battle/scripts/moves/move_script_0448.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0448.s +++ b/res/battle/scripts/moves/move_script_0448.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0449.s b/res/battle/scripts/moves/move_script_0449.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0449.s +++ b/res/battle/scripts/moves/move_script_0449.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0450.s b/res/battle/scripts/moves/move_script_0450.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0450.s +++ b/res/battle/scripts/moves/move_script_0450.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0451.s b/res/battle/scripts/moves/move_script_0451.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0451.s +++ b/res/battle/scripts/moves/move_script_0451.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0452.s b/res/battle/scripts/moves/move_script_0452.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0452.s +++ b/res/battle/scripts/moves/move_script_0452.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0453.s b/res/battle/scripts/moves/move_script_0453.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0453.s +++ b/res/battle/scripts/moves/move_script_0453.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0454.s b/res/battle/scripts/moves/move_script_0454.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0454.s +++ b/res/battle/scripts/moves/move_script_0454.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0455.s b/res/battle/scripts/moves/move_script_0455.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0455.s +++ b/res/battle/scripts/moves/move_script_0455.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0456.s b/res/battle/scripts/moves/move_script_0456.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0456.s +++ b/res/battle/scripts/moves/move_script_0456.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0457.s b/res/battle/scripts/moves/move_script_0457.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0457.s +++ b/res/battle/scripts/moves/move_script_0457.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0458.s b/res/battle/scripts/moves/move_script_0458.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0458.s +++ b/res/battle/scripts/moves/move_script_0458.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0459.s b/res/battle/scripts/moves/move_script_0459.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0459.s +++ b/res/battle/scripts/moves/move_script_0459.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0460.s b/res/battle/scripts/moves/move_script_0460.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0460.s +++ b/res/battle/scripts/moves/move_script_0460.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0461.s b/res/battle/scripts/moves/move_script_0461.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0461.s +++ b/res/battle/scripts/moves/move_script_0461.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0462.s b/res/battle/scripts/moves/move_script_0462.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0462.s +++ b/res/battle/scripts/moves/move_script_0462.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0463.s b/res/battle/scripts/moves/move_script_0463.s index f46db5d4b5..f07bd5ce67 100644 --- a/res/battle/scripts/moves/move_script_0463.s +++ b/res/battle/scripts/moves/move_script_0463.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} became trapped by swirling magma! diff --git a/res/battle/scripts/moves/move_script_0464.s b/res/battle/scripts/moves/move_script_0464.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0464.s +++ b/res/battle/scripts/moves/move_script_0464.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0465.s b/res/battle/scripts/moves/move_script_0465.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0465.s +++ b/res/battle/scripts/moves/move_script_0465.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0466.s b/res/battle/scripts/moves/move_script_0466.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0466.s +++ b/res/battle/scripts/moves/move_script_0466.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0467.s b/res/battle/scripts/moves/move_script_0467.s index e88fa797b9..19a2d15304 100644 --- a/res/battle/scripts/moves/move_script_0467.s +++ b/res/battle/scripts/moves/move_script_0467.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} vanished instantly! diff --git a/res/battle/scripts/moves/move_script_0468.s b/res/battle/scripts/moves/move_script_0468.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0468.s +++ b/res/battle/scripts/moves/move_script_0468.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0469.s b/res/battle/scripts/moves/move_script_0469.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0469.s +++ b/res/battle/scripts/moves/move_script_0469.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0470.s b/res/battle/scripts/moves/move_script_0470.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0470.s +++ b/res/battle/scripts/moves/move_script_0470.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0471.s b/res/battle/scripts/moves/move_script_0471.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0471.s +++ b/res/battle/scripts/moves/move_script_0471.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0472.s b/res/battle/scripts/moves/move_script_0472.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0472.s +++ b/res/battle/scripts/moves/move_script_0472.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0473.s b/res/battle/scripts/moves/move_script_0473.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0473.s +++ b/res/battle/scripts/moves/move_script_0473.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0474.s b/res/battle/scripts/moves/move_script_0474.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0474.s +++ b/res/battle/scripts/moves/move_script_0474.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0475.s b/res/battle/scripts/moves/move_script_0475.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0475.s +++ b/res/battle/scripts/moves/move_script_0475.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0476.s b/res/battle/scripts/moves/move_script_0476.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0476.s +++ b/res/battle/scripts/moves/move_script_0476.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0477.s b/res/battle/scripts/moves/move_script_0477.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0477.s +++ b/res/battle/scripts/moves/move_script_0477.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0478.s b/res/battle/scripts/moves/move_script_0478.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0478.s +++ b/res/battle/scripts/moves/move_script_0478.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0479.s b/res/battle/scripts/moves/move_script_0479.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0479.s +++ b/res/battle/scripts/moves/move_script_0479.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0480.s b/res/battle/scripts/moves/move_script_0480.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0480.s +++ b/res/battle/scripts/moves/move_script_0480.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0481.s b/res/battle/scripts/moves/move_script_0481.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0481.s +++ b/res/battle/scripts/moves/move_script_0481.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0482.s b/res/battle/scripts/moves/move_script_0482.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0482.s +++ b/res/battle/scripts/moves/move_script_0482.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0483.s b/res/battle/scripts/moves/move_script_0483.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0483.s +++ b/res/battle/scripts/moves/move_script_0483.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0484.s b/res/battle/scripts/moves/move_script_0484.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0484.s +++ b/res/battle/scripts/moves/move_script_0484.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0485.s b/res/battle/scripts/moves/move_script_0485.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0485.s +++ b/res/battle/scripts/moves/move_script_0485.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0486.s b/res/battle/scripts/moves/move_script_0486.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0486.s +++ b/res/battle/scripts/moves/move_script_0486.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0487.s b/res/battle/scripts/moves/move_script_0487.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0487.s +++ b/res/battle/scripts/moves/move_script_0487.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0488.s b/res/battle/scripts/moves/move_script_0488.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0488.s +++ b/res/battle/scripts/moves/move_script_0488.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0489.s b/res/battle/scripts/moves/move_script_0489.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0489.s +++ b/res/battle/scripts/moves/move_script_0489.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0490.s b/res/battle/scripts/moves/move_script_0490.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0490.s +++ b/res/battle/scripts/moves/move_script_0490.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0491.s b/res/battle/scripts/moves/move_script_0491.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0491.s +++ b/res/battle/scripts/moves/move_script_0491.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0492.s b/res/battle/scripts/moves/move_script_0492.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0492.s +++ b/res/battle/scripts/moves/move_script_0492.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0493.s b/res/battle/scripts/moves/move_script_0493.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0493.s +++ b/res/battle/scripts/moves/move_script_0493.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0494.s b/res/battle/scripts/moves/move_script_0494.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0494.s +++ b/res/battle/scripts/moves/move_script_0494.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0495.s b/res/battle/scripts/moves/move_script_0495.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0495.s +++ b/res/battle/scripts/moves/move_script_0495.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0496.s b/res/battle/scripts/moves/move_script_0496.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0496.s +++ b/res/battle/scripts/moves/move_script_0496.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0497.s b/res/battle/scripts/moves/move_script_0497.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0497.s +++ b/res/battle/scripts/moves/move_script_0497.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0498.s b/res/battle/scripts/moves/move_script_0498.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0498.s +++ b/res/battle/scripts/moves/move_script_0498.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0499.s b/res/battle/scripts/moves/move_script_0499.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0499.s +++ b/res/battle/scripts/moves/move_script_0499.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/moves/move_script_0500.s b/res/battle/scripts/moves/move_script_0500.s index 3c18001f9b..00c1dcc3fa 100644 --- a/res/battle/scripts/moves/move_script_0500.s +++ b/res/battle/scripts/moves/move_script_0500.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: GoToEffectScript diff --git a/res/battle/scripts/subscripts/subscript_ability_forbids_status.s b/res/battle/scripts/subscripts/subscript_ability_forbids_status.s index 2872807937..7f6693ab7f 100644 --- a/res/battle/scripts/subscripts/subscript_ability_forbids_status.s +++ b/res/battle/scripts/subscripts/subscript_ability_forbids_status.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} cured its {2} status with its {1}! diff --git a/res/battle/scripts/subscripts/subscript_ability_hp_restore_gradual.s b/res/battle/scripts/subscripts/subscript_ability_hp_restore_gradual.s index da01cb8ba2..9b065e20b4 100644 --- a/res/battle/scripts/subscripts/subscript_ability_hp_restore_gradual.s +++ b/res/battle/scripts/subscripts/subscript_ability_hp_restore_gradual.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} restored HP using its {1}! diff --git a/res/battle/scripts/subscripts/subscript_ability_restore_status.s b/res/battle/scripts/subscripts/subscript_ability_restore_status.s index f422fa685e..e5b7b064b2 100644 --- a/res/battle/scripts/subscripts/subscript_ability_restore_status.s +++ b/res/battle/scripts/subscripts/subscript_ability_restore_status.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_SET, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_NONE diff --git a/res/battle/scripts/subscripts/subscript_ability_restores_hp.s b/res/battle/scripts/subscripts/subscript_ability_restores_hp.s index e9a54da855..d4d98f47a5 100644 --- a/res/battle/scripts/subscripts/subscript_ability_restores_hp.s +++ b/res/battle/scripts/subscripts/subscript_ability_restores_hp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_absorb_and_boost_fire_type_moves.s b/res/battle/scripts/subscripts/subscript_absorb_and_boost_fire_type_moves.s index 42aec023e3..2d64d4e6a6 100644 --- a/res/battle/scripts/subscripts/subscript_absorb_and_boost_fire_type_moves.s +++ b/res/battle/scripts/subscripts/subscript_absorb_and_boost_fire_type_moves.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_absorb_and_speed_up_1_stage.s b/res/battle/scripts/subscripts/subscript_absorb_and_speed_up_1_stage.s index e312b893fe..b0c2fae3e2 100644 --- a/res/battle/scripts/subscripts/subscript_absorb_and_speed_up_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_absorb_and_speed_up_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_after_selfdestruct.s b/res/battle/scripts/subscripts/subscript_after_selfdestruct.s index 7fb965ccce..77f49ebd8b 100644 --- a/res/battle/scripts/subscripts/subscript_after_selfdestruct.s +++ b/res/battle/scripts/subscripts/subscript_after_selfdestruct.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_FAINT_MON diff --git a/res/battle/scripts/subscripts/subscript_aftermath.s b/res/battle/scripts/subscripts/subscript_aftermath.s index b2c487b2f7..31ea93fcbc 100644 --- a/res/battle/scripts/subscripts/subscript_aftermath.s +++ b/res/battle/scripts/subscripts/subscript_aftermath.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK diff --git a/res/battle/scripts/subscripts/subscript_animation_prepared_message.s b/res/battle/scripts/subscripts/subscript_animation_prepared_message.s index 93cb95b9f2..ce5ea46dfe 100644 --- a/res/battle/scripts/subscripts/subscript_animation_prepared_message.s +++ b/res/battle/scripts/subscripts/subscript_animation_prepared_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION diff --git a/res/battle/scripts/subscripts/subscript_anticipation.s b/res/battle/scripts/subscripts/subscript_anticipation.s index eda2611b78..bcd65b4726 100644 --- a/res/battle/scripts/subscripts/subscript_anticipation.s +++ b/res/battle/scripts/subscripts/subscript_anticipation.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {1}’s {0} made it shudder! diff --git a/res/battle/scripts/subscripts/subscript_aqua_ring_heal.s b/res/battle/scripts/subscripts/subscript_aqua_ring_heal.s index 4d5d36c0e1..aaee34972c 100644 --- a/res/battle/scripts/subscripts/subscript_aqua_ring_heal.s +++ b/res/battle/scripts/subscripts/subscript_aqua_ring_heal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {1} restored {0}’s HP! diff --git a/res/battle/scripts/subscripts/subscript_attack_message_and_animation.s b/res/battle/scripts/subscripts/subscript_attack_message_and_animation.s index a6465d9a30..749d2e7d8b 100644 --- a/res/battle/scripts/subscripts/subscript_attack_message_and_animation.s +++ b/res/battle/scripts/subscripts/subscript_attack_message_and_animation.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_attack_then_switch_out.s b/res/battle/scripts/subscripts/subscript_attack_then_switch_out.s index 6982ccaf00..101583160d 100644 --- a/res/battle/scripts/subscripts/subscript_attack_then_switch_out.s +++ b/res/battle/scripts/subscripts/subscript_attack_then_switch_out.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckBlackOut BTLSCR_DEFENDER, _172 diff --git a/res/battle/scripts/subscripts/subscript_bad_dreams.s b/res/battle/scripts/subscripts/subscript_bad_dreams.s index c08bf3b08d..da49344990 100644 --- a/res/battle/scripts/subscripts/subscript_bad_dreams.s +++ b/res/battle/scripts/subscripts/subscript_bad_dreams.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_ATTACKER, 0 diff --git a/res/battle/scripts/subscripts/subscript_badly_poison.s b/res/battle/scripts/subscripts/subscript_badly_poison.s index 2b43634601..39e68121d4 100644 --- a/res/battle/scripts/subscripts/subscript_badly_poison.s +++ b/res/battle/scripts/subscripts/subscript_badly_poison.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _023 diff --git a/res/battle/scripts/subscripts/subscript_bag_item_hp_restore.s b/res/battle/scripts/subscripts/subscript_bag_item_hp_restore.s index 2df6a406b5..b1e05dd056 100644 --- a/res/battle/scripts/subscripts/subscript_bag_item_hp_restore.s +++ b/res/battle/scripts/subscripts/subscript_bag_item_hp_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ITEM_HP_RECOVERY, 0, _025 diff --git a/res/battle/scripts/subscripts/subscript_bag_item_pp_restore.s b/res/battle/scripts/subscripts/subscript_bag_item_pp_restore.s index 76339b5cae..c007de6cd4 100644 --- a/res/battle/scripts/subscripts/subscript_bag_item_pp_restore.s +++ b/res/battle/scripts/subscripts/subscript_bag_item_pp_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: End diff --git a/res/battle/scripts/subscripts/subscript_baton_pass.s b/res/battle/scripts/subscripts/subscript_baton_pass.s index c420d08c9d..8480d885fd 100644 --- a/res/battle/scripts/subscripts/subscript_baton_pass.s +++ b/res/battle/scripts/subscripts/subscript_baton_pass.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryReplaceFaintedMon BTLSCR_ATTACKER, TRUE, _029 diff --git a/res/battle/scripts/subscripts/subscript_battle_item.s b/res/battle/scripts/subscripts/subscript_battle_item.s index 76339b5cae..c007de6cd4 100644 --- a/res/battle/scripts/subscripts/subscript_battle_item.s +++ b/res/battle/scripts/subscripts/subscript_battle_item.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: End diff --git a/res/battle/scripts/subscripts/subscript_battle_lost.s b/res/battle/scripts/subscripts/subscript_battle_lost.s index b6102b2034..e012b4524a 100644 --- a/res/battle/scripts/subscripts/subscript_battle_lost.s +++ b/res/battle/scripts/subscripts/subscript_battle_lost.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_FRONTIER, _068 diff --git a/res/battle/scripts/subscripts/subscript_battle_won.s b/res/battle/scripts/subscripts/subscript_battle_won.s index 3fdbc9e191..f5a79364a4 100644 --- a/res/battle/scripts/subscripts/subscript_battle_won.s +++ b/res/battle/scripts/subscripts/subscript_battle_won.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_1, _007 diff --git a/res/battle/scripts/subscripts/subscript_belly_drum.s b/res/battle/scripts/subscripts/subscript_belly_drum.s index 63cb1b8884..55ab33f2cc 100644 --- a/res/battle/scripts/subscripts/subscript_belly_drum.s +++ b/res/battle/scripts/subscripts/subscript_belly_drum.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, 12, _052 diff --git a/res/battle/scripts/subscripts/subscript_bide_end.s b/res/battle/scripts/subscripts/subscript_bide_end.s index 1d3244026b..4efc0b88ce 100644 --- a/res/battle/scripts/subscripts/subscript_bide_end.s +++ b/res/battle/scripts/subscripts/subscript_bide_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_BIDE, _038 diff --git a/res/battle/scripts/subscripts/subscript_bide_no_target.s b/res/battle/scripts/subscripts/subscript_bide_no_target.s index 00e81b34f7..9b98428b3d 100644 --- a/res/battle/scripts/subscripts/subscript_bide_no_target.s +++ b/res/battle/scripts/subscripts/subscript_bide_no_target.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} unleashed energy! diff --git a/res/battle/scripts/subscripts/subscript_bide_start.s b/res/battle/scripts/subscripts/subscript_bide_start.s index 71e8b18d50..ee4cfd0087 100644 --- a/res/battle/scripts/subscripts/subscript_bide_start.s +++ b/res/battle/scripts/subscripts/subscript_bide_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION diff --git a/res/battle/scripts/subscripts/subscript_bind_effect.s b/res/battle/scripts/subscripts/subscript_bind_effect.s index 6f2669ab1e..689068a55e 100644 --- a/res/battle/scripts/subscripts/subscript_bind_effect.s +++ b/res/battle/scripts/subscripts/subscript_bind_effect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _082 diff --git a/res/battle/scripts/subscripts/subscript_bind_end.s b/res/battle/scripts/subscripts/subscript_bind_end.s index 1827a5a638..965eec80c7 100644 --- a/res/battle/scripts/subscripts/subscript_bind_end.s +++ b/res/battle/scripts/subscripts/subscript_bind_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} was freed from {1}! diff --git a/res/battle/scripts/subscripts/subscript_bind_start.s b/res/battle/scripts/subscripts/subscript_bind_start.s index 3be0d00a2a..85c77ddbc4 100644 --- a/res/battle/scripts/subscripts/subscript_bind_start.s +++ b/res/battle/scripts/subscripts/subscript_bind_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_SIDE_EFFECT_MON, _043 diff --git a/res/battle/scripts/subscripts/subscript_blocked_by_soundproof.s b/res/battle/scripts/subscripts/subscript_blocked_by_soundproof.s index bddaff5166..bb4eb96a79 100644 --- a/res/battle/scripts/subscripts/subscript_blocked_by_soundproof.s +++ b/res/battle/scripts/subscripts/subscript_blocked_by_soundproof.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_blow_away_hazards.s b/res/battle/scripts/subscripts/subscript_blow_away_hazards.s index 69a84468c6..6fbe661ffe 100644 --- a/res/battle/scripts/subscripts/subscript_blow_away_hazards.s +++ b/res/battle/scripts/subscripts/subscript_blow_away_hazards.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} blew away {1}! diff --git a/res/battle/scripts/subscripts/subscript_boost_all_stats.s b/res/battle/scripts/subscripts/subscript_boost_all_stats.s index 93c65ee717..81824751a0 100644 --- a/res/battle/scripts/subscripts/subscript_boost_all_stats.s +++ b/res/battle/scripts/subscripts/subscript_boost_all_stats.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN diff --git a/res/battle/scripts/subscripts/subscript_break_bind_effect.s b/res/battle/scripts/subscripts/subscript_break_bind_effect.s index 5b1e64c420..ec55b332a9 100644 --- a/res/battle/scripts/subscripts/subscript_break_bind_effect.s +++ b/res/battle/scripts/subscripts/subscript_break_bind_effect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} got free of {1}’s {2}! diff --git a/res/battle/scripts/subscripts/subscript_break_screens.s b/res/battle/scripts/subscripts/subscript_break_screens.s index 53a317cf23..578bc0740c 100644 --- a/res/battle/scripts/subscripts/subscript_break_screens.s +++ b/res/battle/scripts/subscripts/subscript_break_screens.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryBreakScreens _015 diff --git a/res/battle/scripts/subscripts/subscript_burn.s b/res/battle/scripts/subscripts/subscript_burn.s index 5be03b3705..688ba02b0a 100644 --- a/res/battle/scripts/subscripts/subscript_burn.s +++ b/res/battle/scripts/subscripts/subscript_burn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _052 diff --git a/res/battle/scripts/subscripts/subscript_burn_damage.s b/res/battle/scripts/subscripts/subscript_burn_damage.s index 88e5c6151e..dbf83edfc1 100644 --- a/res/battle/scripts/subscripts/subscript_burn_damage.s +++ b/res/battle/scripts/subscripts/subscript_burn_damage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _041 diff --git a/res/battle/scripts/subscripts/subscript_burn_or_flinch.s b/res/battle/scripts/subscripts/subscript_burn_or_flinch.s index 57ae19bcfb..b97a3869d3 100644 --- a/res/battle/scripts/subscripts/subscript_burn_or_flinch.s +++ b/res/battle/scripts/subscripts/subscript_burn_or_flinch.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckEffectActivation _003 diff --git a/res/battle/scripts/subscripts/subscript_but_it_failed.s b/res/battle/scripts/subscripts/subscript_but_it_failed.s index 076286f531..c902ded6b2 100644 --- a/res/battle/scripts/subscripts/subscript_but_it_failed.s +++ b/res/battle/scripts/subscripts/subscript_but_it_failed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // But it failed! diff --git a/res/battle/scripts/subscripts/subscript_cannot_heal.s b/res/battle/scripts/subscripts/subscript_cannot_heal.s index 7ebefd618d..b1111a4619 100644 --- a/res/battle/scripts/subscripts/subscript_cannot_heal.s +++ b/res/battle/scripts/subscripts/subscript_cannot_heal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK diff --git a/res/battle/scripts/subscripts/subscript_charge.s b/res/battle/scripts/subscripts/subscript_charge.s index b191acfb10..9aaa864ff8 100644 --- a/res/battle/scripts/subscripts/subscript_charge.s +++ b/res/battle/scripts/subscripts/subscript_charge.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_CHARGE diff --git a/res/battle/scripts/subscripts/subscript_charge_move_cleanup.s b/res/battle/scripts/subscripts/subscript_charge_move_cleanup.s index 8c9d6c44de..b461d78df2 100644 --- a/res/battle/scripts/subscripts/subscript_charge_move_cleanup.s +++ b/res/battle/scripts/subscripts/subscript_charge_move_cleanup.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MOVE_EFFECT_CHANCE, 1 diff --git a/res/battle/scripts/subscripts/subscript_chatter.s b/res/battle/scripts/subscripts/subscript_chatter.s index 7c68a5a042..615c5d8142 100644 --- a/res/battle/scripts/subscripts/subscript_chatter.s +++ b/res/battle/scripts/subscripts/subscript_chatter.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckChatterActivation _003 diff --git a/res/battle/scripts/subscripts/subscript_check_quick_claw.s b/res/battle/scripts/subscripts/subscript_check_quick_claw.s index db0da231a4..3f11f33858 100644 --- a/res/battle/scripts/subscripts/subscript_check_quick_claw.s +++ b/res/battle/scripts/subscripts/subscript_check_quick_claw.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_ATTACKER, BATTLEMON_CUSTAP_BERRY, 1, _022 diff --git a/res/battle/scripts/subscripts/subscript_check_shaymin_form.s b/res/battle/scripts/subscripts/subscript_check_shaymin_form.s index b28d085cab..a8c6f05bac 100644 --- a/res/battle/scripts/subscripts/subscript_check_shaymin_form.s +++ b/res/battle/scripts/subscripts/subscript_check_shaymin_form.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_DEFENDER, BATTLER_NONE, _097 diff --git a/res/battle/scripts/subscripts/subscript_color_change.s b/res/battle/scripts/subscripts/subscript_color_change.s index 04ca73f960..639fded87b 100644 --- a/res/battle/scripts/subscripts/subscript_color_change.s +++ b/res/battle/scripts/subscripts/subscript_color_change.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s {1} made it the {2} type! diff --git a/res/battle/scripts/subscripts/subscript_confuse.s b/res/battle/scripts/subscripts/subscript_confuse.s index 15bc1cf65e..24cb624786 100644 --- a/res/battle/scripts/subscripts/subscript_confuse.s +++ b/res/battle/scripts/subscripts/subscript_confuse.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_HELD_ITEM, _022 diff --git a/res/battle/scripts/subscripts/subscript_confused.s b/res/battle/scripts/subscripts/subscript_confused.s index d76fdc4a70..44ef207cb8 100644 --- a/res/battle/scripts/subscripts/subscript_confused.s +++ b/res/battle/scripts/subscripts/subscript_confused.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is confused! diff --git a/res/battle/scripts/subscripts/subscript_continue_perish_song.s b/res/battle/scripts/subscripts/subscript_continue_perish_song.s index 241062e9c5..b59c64c5ac 100644 --- a/res/battle/scripts/subscripts/subscript_continue_perish_song.s +++ b/res/battle/scripts/subscripts/subscript_continue_perish_song.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s perish count fell to {1}! diff --git a/res/battle/scripts/subscripts/subscript_conversion.s b/res/battle/scripts/subscripts/subscript_conversion.s index 8aac42d531..0c1b4a2cb3 100644 --- a/res/battle/scripts/subscripts/subscript_conversion.s +++ b/res/battle/scripts/subscripts/subscript_conversion.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryConversion _012 diff --git a/res/battle/scripts/subscripts/subscript_conversion_2.s b/res/battle/scripts/subscripts/subscript_conversion_2.s index f0dc649b62..11aebc714b 100644 --- a/res/battle/scripts/subscripts/subscript_conversion_2.s +++ b/res/battle/scripts/subscripts/subscript_conversion_2.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryConversion2 _012 diff --git a/res/battle/scripts/subscripts/subscript_copy_ability.s b/res/battle/scripts/subscripts/subscript_copy_ability.s index a01199cffa..6180ef69b5 100644 --- a/res/battle/scripts/subscripts/subscript_copy_ability.s +++ b/res/battle/scripts/subscripts/subscript_copy_ability.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _091 diff --git a/res/battle/scripts/subscripts/subscript_crash_on_miss.s b/res/battle/scripts/subscripts/subscript_crash_on_miss.s index 9ee79dede1..cc7b9da869 100644 --- a/res/battle/scripts/subscripts/subscript_crash_on_miss.s +++ b/res/battle/scripts/subscripts/subscript_crash_on_miss.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_MAGIC_GUARD, _054 diff --git a/res/battle/scripts/subscripts/subscript_critical_hit.s b/res/battle/scripts/subscripts/subscript_critical_hit.s index 05b3ee8d5e..801592d702 100644 --- a/res/battle/scripts/subscripts/subscript_critical_hit.s +++ b/res/battle/scripts/subscripts/subscript_critical_hit.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_CRITICAL_MUL, 1, _049 diff --git a/res/battle/scripts/subscripts/subscript_curse_damage.s b/res/battle/scripts/subscripts/subscript_curse_damage.s index 6f865c2834..40508e3efe 100644 --- a/res/battle/scripts/subscripts/subscript_curse_damage.s +++ b/res/battle/scripts/subscripts/subscript_curse_damage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _033 diff --git a/res/battle/scripts/subscripts/subscript_curse_ghost.s b/res/battle/scripts/subscripts/subscript_curse_ghost.s index 0a47b31f09..7ace4b2ed6 100644 --- a/res/battle/scripts/subscripts/subscript_curse_ghost.s +++ b/res/battle/scripts/subscripts/subscript_curse_ghost.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE, _051 diff --git a/res/battle/scripts/subscripts/subscript_curse_normal.s b/res/battle/scripts/subscripts/subscript_curse_normal.s index 51a7e93373..a6ba4f1c8b 100644 --- a/res/battle/scripts/subscripts/subscript_curse_normal.s +++ b/res/battle/scripts/subscripts/subscript_curse_normal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_PARAM, MOVE_SUBSCRIPT_PTR_SPEED_DOWN_1_STAGE diff --git a/res/battle/scripts/subscripts/subscript_defog.s b/res/battle/scripts/subscripts/subscript_defog.s index beb0b9f1dd..ca90e02ba3 100644 --- a/res/battle/scripts/subscripts/subscript_defog.s +++ b/res/battle/scripts/subscripts/subscript_defog.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSideCondition BTLSCR_DEFENDER, CHECK_SIDE_COND_VAL_NOT_ZERO, SIDE_COND_REFLECT_TURNS, _041 diff --git a/res/battle/scripts/subscripts/subscript_defog_message.s b/res/battle/scripts/subscripts/subscript_defog_message.s index fc69f39df2..53cfdbf3e0 100644 --- a/res/battle/scripts/subscripts/subscript_defog_message.s +++ b/res/battle/scripts/subscripts/subscript_defog_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} blew away {1}! diff --git a/res/battle/scripts/subscripts/subscript_defrosted_by_move.s b/res/battle/scripts/subscripts/subscript_defrosted_by_move.s index 6c29f01243..7b910d25cf 100644 --- a/res/battle/scripts/subscripts/subscript_defrosted_by_move.s +++ b/res/battle/scripts/subscripts/subscript_defrosted_by_move.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_OFF, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FREEZE diff --git a/res/battle/scripts/subscripts/subscript_destiny_bond.s b/res/battle/scripts/subscripts/subscript_destiny_bond.s index 7955eadd50..770e3949b3 100644 --- a/res/battle/scripts/subscripts/subscript_destiny_bond.s +++ b/res/battle/scripts/subscripts/subscript_destiny_bond.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is trying to take its foe with it! diff --git a/res/battle/scripts/subscripts/subscript_disable_end.s b/res/battle/scripts/subscripts/subscript_disable_end.s index f9bcd155ce..ad756b2344 100644 --- a/res/battle/scripts/subscripts/subscript_disable_end.s +++ b/res/battle/scripts/subscripts/subscript_disable_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is no longer disabled! diff --git a/res/battle/scripts/subscripts/subscript_disable_start.s b/res/battle/scripts/subscripts/subscript_disable_start.s index 4bd0f221db..874ea72764 100644 --- a/res/battle/scripts/subscripts/subscript_disable_start.s +++ b/res/battle/scripts/subscripts/subscript_disable_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _017 diff --git a/res/battle/scripts/subscripts/subscript_disobey_do_nothing.s b/res/battle/scripts/subscripts/subscript_disobey_do_nothing.s index 14a2336ab3..bbb5fa8e5f 100644 --- a/res/battle/scripts/subscripts/subscript_disobey_do_nothing.s +++ b/res/battle/scripts/subscripts/subscript_disobey_do_nothing.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_disobey_hit_self.s b/res/battle/scripts/subscripts/subscript_disobey_hit_self.s index ef224da50e..fc461e91b0 100644 --- a/res/battle/scripts/subscripts/subscript_disobey_hit_self.s +++ b/res/battle/scripts/subscripts/subscript_disobey_hit_self.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} won’t obey! diff --git a/res/battle/scripts/subscripts/subscript_disobey_orders.s b/res/battle/scripts/subscripts/subscript_disobey_orders.s index ee47050739..67bbddac71 100644 --- a/res/battle/scripts/subscripts/subscript_disobey_orders.s +++ b/res/battle/scripts/subscripts/subscript_disobey_orders.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_disobey_sleep.s b/res/battle/scripts/subscripts/subscript_disobey_sleep.s index a933f516bb..69702ce42e 100644 --- a/res/battle/scripts/subscripts/subscript_disobey_sleep.s +++ b/res/battle/scripts/subscripts/subscript_disobey_sleep.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_disobey_while_asleep.s b/res/battle/scripts/subscripts/subscript_disobey_while_asleep.s index 06329b86c4..a3690c2af6 100644 --- a/res/battle/scripts/subscripts/subscript_disobey_while_asleep.s +++ b/res/battle/scripts/subscripts/subscript_disobey_while_asleep.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_drain_half_damage_dealt.s b/res/battle/scripts/subscripts/subscript_drain_half_damage_dealt.s index b90ee9c9e4..c82863e031 100644 --- a/res/battle/scripts/subscripts/subscript_drain_half_damage_dealt.s +++ b/res/battle/scripts/subscripts/subscript_drain_half_damage_dealt.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVarFromVar OPCODE_SET, BTLVAR_HP_CALC_TEMP, BTLVAR_HIT_DAMAGE diff --git a/res/battle/scripts/subscripts/subscript_dream_eater.s b/res/battle/scripts/subscripts/subscript_dream_eater.s index cd25565d8a..801c6b912e 100644 --- a/res/battle/scripts/subscripts/subscript_dream_eater.s +++ b/res/battle/scripts/subscripts/subscript_dream_eater.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_ATTACKER, BATTLEMON_HEAL_BLOCK_TURNS, 0, _059 diff --git a/res/battle/scripts/subscripts/subscript_drizzle.s b/res/battle/scripts/subscripts/subscript_drizzle.s index 508001c398..c12c115c09 100644 --- a/res/battle/scripts/subscripts/subscript_drizzle.s +++ b/res/battle/scripts/subscripts/subscript_drizzle.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_RAIN diff --git a/res/battle/scripts/subscripts/subscript_drought.s b/res/battle/scripts/subscripts/subscript_drought.s index df59004ed1..a527a4adb5 100644 --- a/res/battle/scripts/subscripts/subscript_drought.s +++ b/res/battle/scripts/subscripts/subscript_drought.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SUN diff --git a/res/battle/scripts/subscripts/subscript_embargo_end.s b/res/battle/scripts/subscripts/subscript_embargo_end.s index 24b0624d92..f0353e03ac 100644 --- a/res/battle/scripts/subscripts/subscript_embargo_end.s +++ b/res/battle/scripts/subscripts/subscript_embargo_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can use items again! diff --git a/res/battle/scripts/subscripts/subscript_embargo_start.s b/res/battle/scripts/subscripts/subscript_embargo_start.s index f7c9bf1772..24f5f1b8a0 100644 --- a/res/battle/scripts/subscripts/subscript_embargo_start.s +++ b/res/battle/scripts/subscripts/subscript_embargo_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _057 diff --git a/res/battle/scripts/subscripts/subscript_encore_end.s b/res/battle/scripts/subscripts/subscript_encore_end.s index 2a18ac5cb4..98e5682fe9 100644 --- a/res/battle/scripts/subscripts/subscript_encore_end.s +++ b/res/battle/scripts/subscripts/subscript_encore_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s encore ended! diff --git a/res/battle/scripts/subscripts/subscript_encore_start.s b/res/battle/scripts/subscripts/subscript_encore_start.s index c229c74b30..9a02462078 100644 --- a/res/battle/scripts/subscripts/subscript_encore_start.s +++ b/res/battle/scripts/subscripts/subscript_encore_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryEncore _010 diff --git a/res/battle/scripts/subscripts/subscript_enemy_escape.s b/res/battle/scripts/subscripts/subscript_enemy_escape.s index ee843921b5..76330b8cc9 100644 --- a/res/battle/scripts/subscripts/subscript_enemy_escape.s +++ b/res/battle/scripts/subscripts/subscript_enemy_escape.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlaySound BTLSCR_ATTACKER, 1791 diff --git a/res/battle/scripts/subscripts/subscript_enemy_escape_failed.s b/res/battle/scripts/subscripts/subscript_enemy_escape_failed.s index 042e07e21e..ce05009d0d 100644 --- a/res/battle/scripts/subscripts/subscript_enemy_escape_failed.s +++ b/res/battle/scripts/subscripts/subscript_enemy_escape_failed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can’t escape! diff --git a/res/battle/scripts/subscripts/subscript_escape.s b/res/battle/scripts/subscripts/subscript_escape.s index 055ee2c466..a99b1e00d8 100644 --- a/res/battle/scripts/subscripts/subscript_escape.s +++ b/res/battle/scripts/subscripts/subscript_escape.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryRestoreStatusOnSwitch BTLSCR_PLAYER_SLOT_1, _007 diff --git a/res/battle/scripts/subscripts/subscript_escape_failed.s b/res/battle/scripts/subscripts/subscript_escape_failed.s index 8682c08403..9f5294214e 100644 --- a/res/battle/scripts/subscripts/subscript_escape_failed.s +++ b/res/battle/scripts/subscripts/subscript_escape_failed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Can’t escape! diff --git a/res/battle/scripts/subscripts/subscript_escape_item.s b/res/battle/scripts/subscripts/subscript_escape_item.s index c141b4ded4..c9a9b5717b 100644 --- a/res/battle/scripts/subscripts/subscript_escape_item.s +++ b/res/battle/scripts/subscripts/subscript_escape_item.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Used the {0}! diff --git a/res/battle/scripts/subscripts/subscript_escape_success.s b/res/battle/scripts/subscripts/subscript_escape_success.s index 074a0046c4..aeb18e5708 100644 --- a/res/battle/scripts/subscripts/subscript_escape_success.s +++ b/res/battle/scripts/subscripts/subscript_escape_success.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlaySound BTLSCR_ATTACKER, 1791 diff --git a/res/battle/scripts/subscripts/subscript_exchange_abilities.s b/res/battle/scripts/subscripts/subscript_exchange_abilities.s index 74c3ebac4e..5781977d01 100644 --- a/res/battle/scripts/subscripts/subscript_exchange_abilities.s +++ b/res/battle/scripts/subscripts/subscript_exchange_abilities.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _156 diff --git a/res/battle/scripts/subscripts/subscript_exchange_all_stat_stages.s b/res/battle/scripts/subscripts/subscript_exchange_all_stat_stages.s index 81a9e276b3..e142b414c4 100644 --- a/res/battle/scripts/subscripts/subscript_exchange_all_stat_stages.s +++ b/res/battle/scripts/subscripts/subscript_exchange_all_stat_stages.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _198 diff --git a/res/battle/scripts/subscripts/subscript_exchange_atk_and_spatk_stages.s b/res/battle/scripts/subscripts/subscript_exchange_atk_and_spatk_stages.s index 1b7d7bdc05..1e058a8239 100644 --- a/res/battle/scripts/subscripts/subscript_exchange_atk_and_spatk_stages.s +++ b/res/battle/scripts/subscripts/subscript_exchange_atk_and_spatk_stages.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_ATTACK_STAGE, BTLVAR_CALC_TEMP diff --git a/res/battle/scripts/subscripts/subscript_exchange_def_and_spdef_stages.s b/res/battle/scripts/subscripts/subscript_exchange_def_and_spdef_stages.s index fae8e02bbc..5056fa1595 100644 --- a/res/battle/scripts/subscripts/subscript_exchange_def_and_spdef_stages.s +++ b/res/battle/scripts/subscripts/subscript_exchange_def_and_spdef_stages.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_DEFENSE_STAGE, BTLVAR_CALC_TEMP diff --git a/res/battle/scripts/subscripts/subscript_exchange_items.s b/res/battle/scripts/subscripts/subscript_exchange_items.s index 7c6bcc6a70..eb92121733 100644 --- a/res/battle/scripts/subscripts/subscript_exchange_items.s +++ b/res/battle/scripts/subscripts/subscript_exchange_items.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _118 diff --git a/res/battle/scripts/subscripts/subscript_faint_check_destiny_bond.s b/res/battle/scripts/subscripts/subscript_faint_check_destiny_bond.s index 9d06e0218d..e664f59f44 100644 --- a/res/battle/scripts/subscripts/subscript_faint_check_destiny_bond.s +++ b/res/battle/scripts/subscripts/subscript_faint_check_destiny_bond.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_FAINTED_MON, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_DESTINY_BOND, _066 diff --git a/res/battle/scripts/subscripts/subscript_faint_mon.s b/res/battle/scripts/subscripts/subscript_faint_mon.s index 971adabd8d..52dd7409fe 100644 --- a/res/battle/scripts/subscripts/subscript_faint_mon.s +++ b/res/battle/scripts/subscripts/subscript_faint_mon.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: IncrementGameRecord BTLSCR_FAINTED_MON, BATTLER_TYPE_SOLO_ENEMY, RECORD_FAINTED_IN_BATTLE diff --git a/res/battle/scripts/subscripts/subscript_fall_asleep.s b/res/battle/scripts/subscripts/subscript_fall_asleep.s index 337fce9b36..487e70f0e2 100644 --- a/res/battle/scripts/subscripts/subscript_fall_asleep.s +++ b/res/battle/scripts/subscripts/subscript_fall_asleep.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DISOBEDIENCE, _147 diff --git a/res/battle/scripts/subscripts/subscript_feint.s b/res/battle/scripts/subscripts/subscript_feint.s index ca60b31a41..0d12a52ad2 100644 --- a/res/battle/scripts/subscripts/subscript_feint.s +++ b/res/battle/scripts/subscripts/subscript_feint.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_CURRENT_MOVE, MOVE_FEINT, _015 diff --git a/res/battle/scripts/subscripts/subscript_flatter.s b/res/battle/scripts/subscripts/subscript_flatter.s index 2ef92813e1..fb03086e54 100644 --- a/res/battle/scripts/subscripts/subscript_flatter.s +++ b/res/battle/scripts/subscripts/subscript_flatter.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _031 diff --git a/res/battle/scripts/subscripts/subscript_flinch_mon.s b/res/battle/scripts/subscripts/subscript_flinch_mon.s index 478dbfea88..2fd5b0613f 100644 --- a/res/battle/scripts/subscripts/subscript_flinch_mon.s +++ b/res/battle/scripts/subscripts/subscript_flinch_mon.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: IfMovedThisTurn BTLSCR_SIDE_EFFECT_MON, _025 diff --git a/res/battle/scripts/subscripts/subscript_flinched.s b/res/battle/scripts/subscripts/subscript_flinched.s index 69f3fa49d8..db09e035e8 100644 --- a/res/battle/scripts/subscripts/subscript_flinched.s +++ b/res/battle/scripts/subscripts/subscript_flinched.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} flinched! diff --git a/res/battle/scripts/subscripts/subscript_fling.s b/res/battle/scripts/subscripts/subscript_fling.s index d581d272f5..38480f4a8f 100644 --- a/res/battle/scripts/subscripts/subscript_fling.s +++ b/res/battle/scripts/subscripts/subscript_fling.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_FLING_SCRIPT, 0, _019 diff --git a/res/battle/scripts/subscripts/subscript_focus_energy.s b/res/battle/scripts/subscripts/subscript_focus_energy.s index d60ebd0e4d..38f1ffabb1 100644 --- a/res/battle/scripts/subscripts/subscript_focus_energy.s +++ b/res/battle/scripts/subscripts/subscript_focus_energy.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_ATTACK_MESSAGE_AND_ANIMATION diff --git a/res/battle/scripts/subscripts/subscript_force_target_to_switch_or_flee.s b/res/battle/scripts/subscripts/subscript_force_target_to_switch_or_flee.s index 3769934867..c6dc351790 100644 --- a/res/battle/scripts/subscripts/subscript_force_target_to_switch_or_flee.s +++ b/res/battle/scripts/subscripts/subscript_force_target_to_switch_or_flee.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_SEMI_INVULNERABLE, _074 diff --git a/res/battle/scripts/subscripts/subscript_foresight.s b/res/battle/scripts/subscripts/subscript_foresight.s index 35fd959673..7ddeaf9602 100644 --- a/res/battle/scripts/subscripts/subscript_foresight.s +++ b/res/battle/scripts/subscripts/subscript_foresight.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_FORESIGHT diff --git a/res/battle/scripts/subscripts/subscript_forewarn.s b/res/battle/scripts/subscripts/subscript_forewarn.s index f6d9dc1892..3298d67ef3 100644 --- a/res/battle/scripts/subscripts/subscript_forewarn.s +++ b/res/battle/scripts/subscripts/subscript_forewarn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s {1} alerted it to {2}! diff --git a/res/battle/scripts/subscripts/subscript_form_change.s b/res/battle/scripts/subscripts/subscript_form_change.s index dfdbf55e55..6301074485 100644 --- a/res/battle/scripts/subscripts/subscript_form_change.s +++ b/res/battle/scripts/subscripts/subscript_form_change.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_MSG_TEMP, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_SUBSTITUTE, _016 diff --git a/res/battle/scripts/subscripts/subscript_freeze.s b/res/battle/scripts/subscripts/subscript_freeze.s index 8823d73eaa..a2d4664d50 100644 --- a/res/battle/scripts/subscripts/subscript_freeze.s +++ b/res/battle/scripts/subscripts/subscript_freeze.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_MAGMA_ARMOR, _128 diff --git a/res/battle/scripts/subscripts/subscript_freeze_or_flinch.s b/res/battle/scripts/subscripts/subscript_freeze_or_flinch.s index 35c2a56b66..44700e6267 100644 --- a/res/battle/scripts/subscripts/subscript_freeze_or_flinch.s +++ b/res/battle/scripts/subscripts/subscript_freeze_or_flinch.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckEffectActivation _003 diff --git a/res/battle/scripts/subscripts/subscript_frisk.s b/res/battle/scripts/subscripts/subscript_frisk.s index 86d3c29ecc..04dd0b109a 100644 --- a/res/battle/scripts/subscripts/subscript_frisk.s +++ b/res/battle/scripts/subscripts/subscript_frisk.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_frozen.s b/res/battle/scripts/subscripts/subscript_frozen.s index 7b9873a1b4..255ee796b2 100644 --- a/res/battle/scripts/subscripts/subscript_frozen.s +++ b/res/battle/scripts/subscripts/subscript_frozen.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is frozen solid! diff --git a/res/battle/scripts/subscripts/subscript_fully_paralyzed.s b/res/battle/scripts/subscripts/subscript_fully_paralyzed.s index 6590e343f3..0143b82219 100644 --- a/res/battle/scripts/subscripts/subscript_fully_paralyzed.s +++ b/res/battle/scripts/subscripts/subscript_fully_paralyzed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is paralyzed! It can’t move! diff --git a/res/battle/scripts/subscripts/subscript_future_sight_damage.s b/res/battle/scripts/subscripts/subscript_future_sight_damage.s index a78f02844a..cd2a0b2a7f 100644 --- a/res/battle/scripts/subscripts/subscript_future_sight_damage.s +++ b/res/battle/scripts/subscripts/subscript_future_sight_damage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintBufferedMessage diff --git a/res/battle/scripts/subscripts/subscript_future_sight_start.s b/res/battle/scripts/subscripts/subscript_future_sight_start.s index 950edd5e2f..8d1782eea4 100644 --- a/res/battle/scripts/subscripts/subscript_future_sight_start.s +++ b/res/battle/scripts/subscripts/subscript_future_sight_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_giratina_form_change.s b/res/battle/scripts/subscripts/subscript_giratina_form_change.s index 414a127811..b340244951 100644 --- a/res/battle/scripts/subscripts/subscript_giratina_form_change.s +++ b/res/battle/scripts/subscripts/subscript_giratina_form_change.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_RECALC_MON_STATS diff --git a/res/battle/scripts/subscripts/subscript_give_target_insomnia.s b/res/battle/scripts/subscripts/subscript_give_target_insomnia.s index fd16e612b8..448495736c 100644 --- a/res/battle/scripts/subscripts/subscript_give_target_insomnia.s +++ b/res/battle/scripts/subscripts/subscript_give_target_insomnia.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _041 diff --git a/res/battle/scripts/subscripts/subscript_give_target_own_status.s b/res/battle/scripts/subscripts/subscript_give_target_own_status.s index c2c33bf3a8..704f5536fe 100644 --- a/res/battle/scripts/subscripts/subscript_give_target_own_status.s +++ b/res/battle/scripts/subscripts/subscript_give_target_own_status.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_SLEEP, _009 diff --git a/res/battle/scripts/subscripts/subscript_grant_exp.s b/res/battle/scripts/subscripts/subscript_grant_exp.s index b35e7d80bd..fd85918c98 100644 --- a/res/battle/scripts/subscripts/subscript_grant_exp.s +++ b/res/battle/scripts/subscripts/subscript_grant_exp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CalcExpGain _005 diff --git a/res/battle/scripts/subscripts/subscript_gravity_end.s b/res/battle/scripts/subscripts/subscript_gravity_end.s index 5ae163c047..da58f8f2ac 100644 --- a/res/battle/scripts/subscripts/subscript_gravity_end.s +++ b/res/battle/scripts/subscripts/subscript_gravity_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Gravity returned to normal! diff --git a/res/battle/scripts/subscripts/subscript_gravity_start.s b/res/battle/scripts/subscripts/subscript_gravity_start.s index 7b29999a0d..54413eda5d 100644 --- a/res/battle/scripts/subscripts/subscript_gravity_start.s +++ b/res/battle/scripts/subscripts/subscript_gravity_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Gravity intensified! diff --git a/res/battle/scripts/subscripts/subscript_hailing_end.s b/res/battle/scripts/subscripts/subscript_hailing_end.s index c413817a8b..4c4700047e 100644 --- a/res/battle/scripts/subscripts/subscript_hailing_end.s +++ b/res/battle/scripts/subscripts/subscript_hailing_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_HAILING_TEMP diff --git a/res/battle/scripts/subscripts/subscript_hazards_check.s b/res/battle/scripts/subscripts/subscript_hazards_check.s index a806d0619d..97eefa5092 100644 --- a/res/battle/scripts/subscripts/subscript_hazards_check.s +++ b/res/battle/scripts/subscripts/subscript_hazards_check.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_SWITCHED_MON, ABILITY_MAGIC_GUARD, _105 diff --git a/res/battle/scripts/subscripts/subscript_heal_bell.s b/res/battle/scripts/subscripts/subscript_heal_bell.s index c99c39bfc5..c057b4dfbe 100644 --- a/res/battle/scripts/subscripts/subscript_heal_bell.s +++ b/res/battle/scripts/subscripts/subscript_heal_bell.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryPartyStatusRefresh diff --git a/res/battle/scripts/subscripts/subscript_heal_block_end.s b/res/battle/scripts/subscripts/subscript_heal_block_end.s index 6dc7fbdd34..e99f84454c 100644 --- a/res/battle/scripts/subscripts/subscript_heal_block_end.s +++ b/res/battle/scripts/subscripts/subscript_heal_block_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK diff --git a/res/battle/scripts/subscripts/subscript_heal_block_start.s b/res/battle/scripts/subscripts/subscript_heal_block_start.s index a7d1608b21..ecfe85c572 100644 --- a/res/battle/scripts/subscripts/subscript_heal_block_start.s +++ b/res/battle/scripts/subscripts/subscript_heal_block_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _028 diff --git a/res/battle/scripts/subscripts/subscript_heal_target_paralysis.s b/res/battle/scripts/subscripts/subscript_heal_target_paralysis.s index 626b389399..0dbc6cba33 100644 --- a/res/battle/scripts/subscripts/subscript_heal_target_paralysis.s +++ b/res/battle/scripts/subscripts/subscript_heal_target_paralysis.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _020 diff --git a/res/battle/scripts/subscripts/subscript_heal_target_sleep.s b/res/battle/scripts/subscripts/subscript_heal_target_sleep.s index cfb81223d9..92807db755 100644 --- a/res/battle/scripts/subscripts/subscript_heal_target_sleep.s +++ b/res/battle/scripts/subscripts/subscript_heal_target_sleep.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _020 diff --git a/res/battle/scripts/subscripts/subscript_healing_wish.s b/res/battle/scripts/subscripts/subscript_healing_wish.s index 3d88f730e1..e824b84903 100644 --- a/res/battle/scripts/subscripts/subscript_healing_wish.s +++ b/res/battle/scripts/subscripts/subscript_healing_wish.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 diff --git a/res/battle/scripts/subscripts/subscript_held_item_brn_restore.s b/res/battle/scripts/subscripts/subscript_held_item_brn_restore.s index 6499a67deb..ba48693a7b 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_brn_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_brn_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_cnf_restore.s b/res/battle/scripts/subscripts/subscript_held_item_cnf_restore.s index 157ea9ac3a..ffd6441b34 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_cnf_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_cnf_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_dislike_flavor.s b/res/battle/scripts/subscripts/subscript_held_item_dislike_flavor.s index 1d2a01770e..afb7036849 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_dislike_flavor.s +++ b/res/battle/scripts/subscripts/subscript_held_item_dislike_flavor.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_HELD_ITEM_HP_RESTORE diff --git a/res/battle/scripts/subscripts/subscript_held_item_frz_restore.s b/res/battle/scripts/subscripts/subscript_held_item_frz_restore.s index 9c70e95c28..d06b9b2950 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_frz_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_frz_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_heal_infatuation.s b/res/battle/scripts/subscripts/subscript_held_item_heal_infatuation.s index d52b626333..de120175c5 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_heal_infatuation.s +++ b/res/battle/scripts/subscripts/subscript_held_item_heal_infatuation.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_hp_restore.s b/res/battle/scripts/subscripts/subscript_held_item_hp_restore.s index f5bb13b180..e5048e8602 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_hp_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_hp_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_multi_restore.s b/res/battle/scripts/subscripts/subscript_held_item_multi_restore.s index 2155741046..978378495c 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_multi_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_multi_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_pp_restore.s b/res/battle/scripts/subscripts/subscript_held_item_pp_restore.s index 0dfe403694..cb0e8c2a38 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_pp_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_pp_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_prz_restore.s b/res/battle/scripts/subscripts/subscript_held_item_prz_restore.s index ad7df46a58..11e96a9244 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_prz_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_prz_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_psn_restore.s b/res/battle/scripts/subscripts/subscript_held_item_psn_restore.s index b8d2bb3c5d..2d33a943a7 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_psn_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_psn_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_raise_crit.s b/res/battle/scripts/subscripts/subscript_held_item_raise_crit.s index bbff82761e..cc8adeb48d 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_raise_crit.s +++ b/res/battle/scripts/subscripts/subscript_held_item_raise_crit.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_raise_stat.s b/res/battle/scripts/subscripts/subscript_held_item_raise_stat.s index fcec319d45..4a1d7b46c8 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_raise_stat.s +++ b/res/battle/scripts/subscripts/subscript_held_item_raise_stat.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_recoil_when_hit.s b/res/battle/scripts/subscripts/subscript_held_item_recoil_when_hit.s index 3206663528..2820d46738 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_recoil_when_hit.s +++ b/res/battle/scripts/subscripts/subscript_held_item_recoil_when_hit.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_EQU, BTLSCR_DEFENDER, BATTLEMON_CUR_HP, 0, _009 diff --git a/res/battle/scripts/subscripts/subscript_held_item_sharply_raise_stat.s b/res/battle/scripts/subscripts/subscript_held_item_sharply_raise_stat.s index 82303a5a68..9091b9fdb5 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_sharply_raise_stat.s +++ b/res/battle/scripts/subscripts/subscript_held_item_sharply_raise_stat.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_slp_restore.s b/res/battle/scripts/subscripts/subscript_held_item_slp_restore.s index 863de241da..10ffb659dc 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_slp_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_slp_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_statdown_restore.s b/res/battle/scripts/subscripts/subscript_held_item_statdown_restore.s index caf095f221..8d39e88467 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_statdown_restore.s +++ b/res/battle/scripts/subscripts/subscript_held_item_statdown_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_held_item_temp_acc_up.s b/res/battle/scripts/subscripts/subscript_held_item_temp_acc_up.s index e9acf8ac38..0711431e8c 100644 --- a/res/battle/scripts/subscripts/subscript_held_item_temp_acc_up.s +++ b/res/battle/scripts/subscripts/subscript_held_item_temp_acc_up.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_hit_substitute.s b/res/battle/scripts/subscripts/subscript_hit_substitute.s index 3a4f217d31..47a29b959f 100644 --- a/res/battle/scripts/subscripts/subscript_hit_substitute.s +++ b/res/battle/scripts/subscripts/subscript_hit_substitute.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK, _009 diff --git a/res/battle/scripts/subscripts/subscript_hit_x_times.s b/res/battle/scripts/subscripts/subscript_hit_x_times.s index 49c751230d..9c65698203 100644 --- a/res/battle/scripts/subscripts/subscript_hit_x_times.s +++ b/res/battle/scripts/subscripts/subscript_hit_x_times.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_MULTI_HIT_SKIP_MESSAGE, _011 diff --git a/res/battle/scripts/subscripts/subscript_hurt_self_in_confusion.s b/res/battle/scripts/subscripts/subscript_hurt_self_in_confusion.s index 1faa39f9e7..77ceece293 100644 --- a/res/battle/scripts/subscripts/subscript_hurt_self_in_confusion.s +++ b/res/battle/scripts/subscripts/subscript_hurt_self_in_confusion.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is confused! diff --git a/res/battle/scripts/subscripts/subscript_immobilized_by_love.s b/res/battle/scripts/subscripts/subscript_immobilized_by_love.s index 70aa3ae6af..0c08433a5d 100644 --- a/res/battle/scripts/subscripts/subscript_immobilized_by_love.s +++ b/res/battle/scripts/subscripts/subscript_immobilized_by_love.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_INFATUATED diff --git a/res/battle/scripts/subscripts/subscript_infatuate.s b/res/battle/scripts/subscripts/subscript_infatuate.s index c541799f08..7aa133164d 100644 --- a/res/battle/scripts/subscripts/subscript_infatuate.s +++ b/res/battle/scripts/subscripts/subscript_infatuate.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_OBLIVIOUS, _055 diff --git a/res/battle/scripts/subscripts/subscript_infatuated.s b/res/battle/scripts/subscripts/subscript_infatuated.s index 45b84d1536..a84c746528 100644 --- a/res/battle/scripts/subscripts/subscript_infatuated.s +++ b/res/battle/scripts/subscripts/subscript_infatuated.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is in love with {1}! diff --git a/res/battle/scripts/subscripts/subscript_ingrain_heal.s b/res/battle/scripts/subscripts/subscript_ingrain_heal.s index 7a6912599e..6582c8f266 100644 --- a/res/battle/scripts/subscripts/subscript_ingrain_heal.s +++ b/res/battle/scripts/subscripts/subscript_ingrain_heal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_DAMAGE_INGRAIN diff --git a/res/battle/scripts/subscripts/subscript_intimidate.s b/res/battle/scripts/subscripts/subscript_intimidate.s index ba52a3821e..097ee210e8 100644 --- a/res/battle/scripts/subscripts/subscript_intimidate.s +++ b/res/battle/scripts/subscripts/subscript_intimidate.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_item_skip_charge_turn.s b/res/battle/scripts/subscripts/subscript_item_skip_charge_turn.s index 73ed3db936..a146bc0b40 100644 --- a/res/battle/scripts/subscripts/subscript_item_skip_charge_turn.s +++ b/res/battle/scripts/subscripts/subscript_item_skip_charge_turn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayMoveAnimation BTLSCR_ATTACKER diff --git a/res/battle/scripts/subscripts/subscript_knock_off.s b/res/battle/scripts/subscripts/subscript_knock_off.s index 568d7d5ba8..68bcfac702 100644 --- a/res/battle/scripts/subscripts/subscript_knock_off.s +++ b/res/battle/scripts/subscripts/subscript_knock_off.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _032 diff --git a/res/battle/scripts/subscripts/subscript_leech_seed_effect.s b/res/battle/scripts/subscripts/subscript_leech_seed_effect.s index 6fe4ee9e63..124e212712 100644 --- a/res/battle/scripts/subscripts/subscript_leech_seed_effect.s +++ b/res/battle/scripts/subscripts/subscript_leech_seed_effect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimationOnMons BTLSCR_MSG_ATTACKER, BTLSCR_MSG_DEFENDER, BATTLE_ANIMATION_DAMAGE_LEECH_SEED diff --git a/res/battle/scripts/subscripts/subscript_leech_seed_start.s b/res/battle/scripts/subscripts/subscript_leech_seed_start.s index 99ec0ec1ff..f54f5db272 100644 --- a/res/battle/scripts/subscripts/subscript_leech_seed_start.s +++ b/res/battle/scripts/subscripts/subscript_leech_seed_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _060 diff --git a/res/battle/scripts/subscripts/subscript_light_screen.s b/res/battle/scripts/subscripts/subscript_light_screen.s index 589eccfebb..10e79a19b1 100644 --- a/res/battle/scripts/subscripts/subscript_light_screen.s +++ b/res/battle/scripts/subscripts/subscript_light_screen.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryLightScreen _003 diff --git a/res/battle/scripts/subscripts/subscript_lightning_rod_redirected.s b/res/battle/scripts/subscripts/subscript_lightning_rod_redirected.s index a92ecc86f7..91b5770e02 100644 --- a/res/battle/scripts/subscripts/subscript_lightning_rod_redirected.s +++ b/res/battle/scripts/subscripts/subscript_lightning_rod_redirected.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_link_win_lose.s b/res/battle/scripts/subscripts/subscript_link_win_lose.s index 7d8934d0bc..4d5c64b0eb 100644 --- a/res/battle/scripts/subscripts/subscript_link_win_lose.s +++ b/res/battle/scripts/subscripts/subscript_link_win_lose.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: SetLinkBattleResult diff --git a/res/battle/scripts/subscripts/subscript_loafing_around.s b/res/battle/scripts/subscripts/subscript_loafing_around.s index 69534670eb..55f8931d23 100644 --- a/res/battle/scripts/subscripts/subscript_loafing_around.s +++ b/res/battle/scripts/subscripts/subscript_loafing_around.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is loafing around! diff --git a/res/battle/scripts/subscripts/subscript_lock_on.s b/res/battle/scripts/subscripts/subscript_lock_on.s index e0261beb9e..29cc585924 100644 --- a/res/battle/scripts/subscripts/subscript_lock_on.s +++ b/res/battle/scripts/subscripts/subscript_lock_on.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _033 diff --git a/res/battle/scripts/subscripts/subscript_lose_hp_from_item.s b/res/battle/scripts/subscripts/subscript_lose_hp_from_item.s index 66239b825d..ab21e00d46 100644 --- a/res/battle/scripts/subscripts/subscript_lose_hp_from_item.s +++ b/res/battle/scripts/subscripts/subscript_lose_hp_from_item.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK diff --git a/res/battle/scripts/subscripts/subscript_lose_hp_from_item_with_message.s b/res/battle/scripts/subscripts/subscript_lose_hp_from_item_with_message.s index 50cd85f77b..786f8af82c 100644 --- a/res/battle/scripts/subscripts/subscript_lose_hp_from_item_with_message.s +++ b/res/battle/scripts/subscripts/subscript_lose_hp_from_item_with_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_lucky_chant_end.s b/res/battle/scripts/subscripts/subscript_lucky_chant_end.s index 6d803bbd7c..3a6be4f6f7 100644 --- a/res/battle/scripts/subscripts/subscript_lucky_chant_end.s +++ b/res/battle/scripts/subscripts/subscript_lucky_chant_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Your team’s Lucky Chant wore off! diff --git a/res/battle/scripts/subscripts/subscript_lucky_chant_start.s b/res/battle/scripts/subscripts/subscript_lucky_chant_start.s index f20711ce61..334e17e27b 100644 --- a/res/battle/scripts/subscripts/subscript_lucky_chant_start.s +++ b/res/battle/scripts/subscripts/subscript_lucky_chant_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_CALC_TEMP, 0x00005000 diff --git a/res/battle/scripts/subscripts/subscript_lunar_dance.s b/res/battle/scripts/subscripts/subscript_lunar_dance.s index f691341ef3..65529e0697 100644 --- a/res/battle/scripts/subscripts/subscript_lunar_dance.s +++ b/res/battle/scripts/subscripts/subscript_lunar_dance.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_SET, BTLSCR_ATTACKER, BATTLEMON_CUR_HP, 0 diff --git a/res/battle/scripts/subscripts/subscript_magic_coat.s b/res/battle/scripts/subscripts/subscript_magic_coat.s index 32f9775947..6e3f9d8450 100644 --- a/res/battle/scripts/subscripts/subscript_magic_coat.s +++ b/res/battle/scripts/subscripts/subscript_magic_coat.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_magnet_rise_end.s b/res/battle/scripts/subscripts/subscript_magnet_rise_end.s index 4d7ddbbdb7..e0d6efe64d 100644 --- a/res/battle/scripts/subscripts/subscript_magnet_rise_end.s +++ b/res/battle/scripts/subscripts/subscript_magnet_rise_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s electromagnetism wore off! diff --git a/res/battle/scripts/subscripts/subscript_magnitude.s b/res/battle/scripts/subscripts/subscript_magnitude.s index 00befb1fb0..d0ee4d89d4 100644 --- a/res/battle/scripts/subscripts/subscript_magnitude.s +++ b/res/battle/scripts/subscripts/subscript_magnitude.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_PLAYED_MOVE_ANIMATION, _015 diff --git a/res/battle/scripts/subscripts/subscript_mean_look.s b/res/battle/scripts/subscripts/subscript_mean_look.s index b8442ce45c..8a41b96848 100644 --- a/res/battle/scripts/subscripts/subscript_mean_look.s +++ b/res/battle/scripts/subscripts/subscript_mean_look.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_PROTECTED, _044 diff --git a/res/battle/scripts/subscripts/subscript_memento.s b/res/battle/scripts/subscripts/subscript_memento.s index 39700a611d..ae57cd8106 100644 --- a/res/battle/scripts/subscripts/subscript_memento.s +++ b/res/battle/scripts/subscripts/subscript_memento.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_mimic.s b/res/battle/scripts/subscripts/subscript_mimic.s index e1db7a9bb2..1f20bb8c6b 100644 --- a/res/battle/scripts/subscripts/subscript_mimic.s +++ b/res/battle/scripts/subscripts/subscript_mimic.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryMimic _016 diff --git a/res/battle/scripts/subscripts/subscript_minimize.s b/res/battle/scripts/subscripts/subscript_minimize.s index 7f2e19aad3..b77e597871 100644 --- a/res/battle/scripts/subscripts/subscript_minimize.s +++ b/res/battle/scripts/subscripts/subscript_minimize.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MINIMIZE diff --git a/res/battle/scripts/subscripts/subscript_miracle_eye.s b/res/battle/scripts/subscripts/subscript_miracle_eye.s index 3ca366a42a..5b5ed40c15 100644 --- a/res/battle/scripts/subscripts/subscript_miracle_eye.s +++ b/res/battle/scripts/subscripts/subscript_miracle_eye.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_MIRACLE_EYE diff --git a/res/battle/scripts/subscripts/subscript_missed.s b/res/battle/scripts/subscripts/subscript_missed.s index 8d0fb9bbda..ad87976f69 100644 --- a/res/battle/scripts/subscripts/subscript_missed.s +++ b/res/battle/scripts/subscripts/subscript_missed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_mist.s b/res/battle/scripts/subscripts/subscript_mist.s index 4a40e99034..725c1d8c74 100644 --- a/res/battle/scripts/subscripts/subscript_mist.s +++ b/res/battle/scripts/subscripts/subscript_mist.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryMist _007 diff --git a/res/battle/scripts/subscripts/subscript_mold_breaker.s b/res/battle/scripts/subscripts/subscript_mold_breaker.s index a3ba40c584..223888d87f 100644 --- a/res/battle/scripts/subscripts/subscript_mold_breaker.s +++ b/res/battle/scripts/subscripts/subscript_mold_breaker.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} has {1}! diff --git a/res/battle/scripts/subscripts/subscript_move_effect_end.s b/res/battle/scripts/subscripts/subscript_move_effect_end.s index b1e2ed13f1..23bee62110 100644 --- a/res/battle/scripts/subscripts/subscript_move_effect_end.s +++ b/res/battle/scripts/subscripts/subscript_move_effect_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Your team’s {0} wore off! diff --git a/res/battle/scripts/subscripts/subscript_move_fail_gravity.s b/res/battle/scripts/subscripts/subscript_move_fail_gravity.s index 90f053ab69..5660a63297 100644 --- a/res/battle/scripts/subscripts/subscript_move_fail_gravity.s +++ b/res/battle/scripts/subscripts/subscript_move_fail_gravity.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can’t use {1} because of gravity! diff --git a/res/battle/scripts/subscripts/subscript_move_fail_missed.s b/res/battle/scripts/subscripts/subscript_move_fail_missed.s index 642b71fc58..db00450b9e 100644 --- a/res/battle/scripts/subscripts/subscript_move_fail_missed.s +++ b/res/battle/scripts/subscripts/subscript_move_fail_missed.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} avoided the attack! diff --git a/res/battle/scripts/subscripts/subscript_move_fail_taunted.s b/res/battle/scripts/subscripts/subscript_move_fail_taunted.s index a8660e12b5..da35969ba3 100644 --- a/res/battle/scripts/subscripts/subscript_move_fail_taunted.s +++ b/res/battle/scripts/subscripts/subscript_move_fail_taunted.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can’t use {1} after the taunt! diff --git a/res/battle/scripts/subscripts/subscript_move_followup_message.s b/res/battle/scripts/subscripts/subscript_move_followup_message.s index a55dec2386..37c3ad4b8d 100644 --- a/res/battle/scripts/subscripts/subscript_move_followup_message.s +++ b/res/battle/scripts/subscripts/subscript_move_followup_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_move_is_disabled.s b/res/battle/scripts/subscripts/subscript_move_is_disabled.s index 86ebd1b47c..e3a8f7f43c 100644 --- a/res/battle/scripts/subscripts/subscript_move_is_disabled.s +++ b/res/battle/scripts/subscripts/subscript_move_is_disabled.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_MOVE_LOCKED, _005 diff --git a/res/battle/scripts/subscripts/subscript_move_is_heal_blocked.s b/res/battle/scripts/subscripts/subscript_move_is_heal_blocked.s index e7c393e83b..4b7ca14ca5 100644 --- a/res/battle/scripts/subscripts/subscript_move_is_heal_blocked.s +++ b/res/battle/scripts/subscripts/subscript_move_is_heal_blocked.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_HEAL_BLOCK diff --git a/res/battle/scripts/subscripts/subscript_move_is_imprisoned.s b/res/battle/scripts/subscripts/subscript_move_is_imprisoned.s index 603c600cad..692ae9f798 100644 --- a/res/battle/scripts/subscripts/subscript_move_is_imprisoned.s +++ b/res/battle/scripts/subscripts/subscript_move_is_imprisoned.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can’t use the sealed {1}! diff --git a/res/battle/scripts/subscripts/subscript_nightmare_effect.s b/res/battle/scripts/subscripts/subscript_nightmare_effect.s index 44df110c76..b82564cc58 100644 --- a/res/battle/scripts/subscripts/subscript_nightmare_effect.s +++ b/res/battle/scripts/subscripts/subscript_nightmare_effect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _033 diff --git a/res/battle/scripts/subscripts/subscript_nightmare_start.s b/res/battle/scripts/subscripts/subscript_nightmare_start.s index 4c903b0a24..eedffd6a46 100644 --- a/res/battle/scripts/subscripts/subscript_nightmare_start.s +++ b/res/battle/scripts/subscripts/subscript_nightmare_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _029 diff --git a/res/battle/scripts/subscripts/subscript_no_pp.s b/res/battle/scripts/subscripts/subscript_no_pp.s index e038186af6..4a4223a4ae 100644 --- a/res/battle/scripts/subscripts/subscript_no_pp.s +++ b/res/battle/scripts/subscripts/subscript_no_pp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_no_target.s b/res/battle/scripts/subscripts/subscript_no_target.s index 35f77211a3..6c98fb8540 100644 --- a/res/battle/scripts/subscripts/subscript_no_target.s +++ b/res/battle/scripts/subscripts/subscript_no_target.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_overworld_fog.s b/res/battle/scripts/subscripts/subscript_overworld_fog.s index b9cbdb5e76..0344dae945 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_fog.s +++ b/res/battle/scripts/subscripts/subscript_overworld_fog.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_FOG diff --git a/res/battle/scripts/subscripts/subscript_overworld_hail.s b/res/battle/scripts/subscripts/subscript_overworld_hail.s index ae56bf9bf5..2cf9788be8 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_hail.s +++ b/res/battle/scripts/subscripts/subscript_overworld_hail.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_HAIL diff --git a/res/battle/scripts/subscripts/subscript_overworld_rain.s b/res/battle/scripts/subscripts/subscript_overworld_rain.s index 54e0d4a766..0e873518b4 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_rain.s +++ b/res/battle/scripts/subscripts/subscript_overworld_rain.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_RAIN diff --git a/res/battle/scripts/subscripts/subscript_overworld_sand.s b/res/battle/scripts/subscripts/subscript_overworld_sand.s index 6c9bce9fea..ec29b1aa42 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_sand.s +++ b/res/battle/scripts/subscripts/subscript_overworld_sand.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SAND diff --git a/res/battle/scripts/subscripts/subscript_overworld_sun.s b/res/battle/scripts/subscripts/subscript_overworld_sun.s index f73ffbf459..0d3ec53183 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_sun.s +++ b/res/battle/scripts/subscripts/subscript_overworld_sun.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SUN diff --git a/res/battle/scripts/subscripts/subscript_overworld_trick_room.s b/res/battle/scripts/subscripts/subscript_overworld_trick_room.s index 77cb19093e..8b8f076c72 100644 --- a/res/battle/scripts/subscripts/subscript_overworld_trick_room.s +++ b/res/battle/scripts/subscripts/subscript_overworld_trick_room.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_TRICK_ROOM diff --git a/res/battle/scripts/subscripts/subscript_pain_split.s b/res/battle/scripts/subscripts/subscript_pain_split.s index eee745144d..004bbbaf2e 100644 --- a/res/battle/scripts/subscripts/subscript_pain_split.s +++ b/res/battle/scripts/subscripts/subscript_pain_split.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _075 diff --git a/res/battle/scripts/subscripts/subscript_paralyze.s b/res/battle/scripts/subscripts/subscript_paralyze.s index 05cace2ee0..4b6cee4fcb 100644 --- a/res/battle/scripts/subscripts/subscript_paralyze.s +++ b/res/battle/scripts/subscripts/subscript_paralyze.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_LIMBER, _170 diff --git a/res/battle/scripts/subscripts/subscript_paralyze_or_flinch.s b/res/battle/scripts/subscripts/subscript_paralyze_or_flinch.s index 3342d8de41..ef4477712f 100644 --- a/res/battle/scripts/subscripts/subscript_paralyze_or_flinch.s +++ b/res/battle/scripts/subscripts/subscript_paralyze_or_flinch.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckEffectActivation _003 diff --git a/res/battle/scripts/subscripts/subscript_pay_day.s b/res/battle/scripts/subscripts/subscript_pay_day.s index 12342a5185..1f7717e12d 100644 --- a/res/battle/scripts/subscripts/subscript_pay_day.s +++ b/res/battle/scripts/subscripts/subscript_pay_day.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_LEVEL, BTLVAR_CALC_TEMP diff --git a/res/battle/scripts/subscripts/subscript_perish_song_start.s b/res/battle/scripts/subscripts/subscript_perish_song_start.s index 2996478e8b..0c623f3d5f 100644 --- a/res/battle/scripts/subscripts/subscript_perish_song_start.s +++ b/res/battle/scripts/subscripts/subscript_perish_song_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryPerishSong _045 diff --git a/res/battle/scripts/subscripts/subscript_pluck.s b/res/battle/scripts/subscripts/subscript_pluck.s index a200d57768..afb1ec9952 100644 --- a/res/battle/scripts/subscripts/subscript_pluck.s +++ b/res/battle/scripts/subscripts/subscript_pluck.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryPluck _024, _023 diff --git a/res/battle/scripts/subscripts/subscript_pluck_check.s b/res/battle/scripts/subscripts/subscript_pluck_check.s index da0f17204b..73e76d9182 100644 --- a/res/battle/scripts/subscripts/subscript_pluck_check.s +++ b/res/battle/scripts/subscripts/subscript_pluck_check.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_ATTACKER_SELF_TURN_STATUS_FLAGS, SELF_TURN_FLAG_PLUCK_BERRY, _006 diff --git a/res/battle/scripts/subscripts/subscript_poison.s b/res/battle/scripts/subscripts/subscript_poison.s index 156f3f926d..2b1781082f 100644 --- a/res/battle/scripts/subscripts/subscript_poison.s +++ b/res/battle/scripts/subscripts/subscript_poison.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_TOXIC_SPIKES, _023 diff --git a/res/battle/scripts/subscripts/subscript_poison_damage.s b/res/battle/scripts/subscripts/subscript_poison_damage.s index 0c16654f3e..3a32918cfb 100644 --- a/res/battle/scripts/subscripts/subscript_poison_damage.s +++ b/res/battle/scripts/subscripts/subscript_poison_damage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_MAGIC_GUARD, _055 diff --git a/res/battle/scripts/subscripts/subscript_pop_attacker_and_defender.s b/res/battle/scripts/subscripts/subscript_pop_attacker_and_defender.s index 03f7fb5b23..9759444471 100644 --- a/res/battle/scripts/subscripts/subscript_pop_attacker_and_defender.s +++ b/res/battle/scripts/subscripts/subscript_pop_attacker_and_defender.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVarFromVar OPCODE_GET, BTLVAR_ATTACKER_TEMP, BTLVAR_ATTACKER diff --git a/res/battle/scripts/subscripts/subscript_power_herb_skull_bash.s b/res/battle/scripts/subscripts/subscript_power_herb_skull_bash.s index b764ddbee0..eeb0e00721 100644 --- a/res/battle/scripts/subscripts/subscript_power_herb_skull_bash.s +++ b/res/battle/scripts/subscripts/subscript_power_herb_skull_bash.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayMoveAnimation BTLSCR_ATTACKER diff --git a/res/battle/scripts/subscripts/subscript_present_heal.s b/res/battle/scripts/subscripts/subscript_present_heal.s index c5dc6cbe44..d3a168b123 100644 --- a/res/battle/scripts/subscripts/subscript_present_heal.s +++ b/res/battle/scripts/subscripts/subscript_present_heal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_DID_NOT_HIT, _014 diff --git a/res/battle/scripts/subscripts/subscript_pressure.s b/res/battle/scripts/subscripts/subscript_pressure.s index 6b5ef5e7d4..a1242551c5 100644 --- a/res/battle/scripts/subscripts/subscript_pressure.s +++ b/res/battle/scripts/subscripts/subscript_pressure.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is exerting its {1}! diff --git a/res/battle/scripts/subscripts/subscript_print_message_and_play_animation.s b/res/battle/scripts/subscripts/subscript_print_message_and_play_animation.s index 485575c2a5..8cae3c5551 100644 --- a/res/battle/scripts/subscripts/subscript_print_message_and_play_animation.s +++ b/res/battle/scripts/subscripts/subscript_print_message_and_play_animation.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_NEQ, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _009 diff --git a/res/battle/scripts/subscripts/subscript_protect.s b/res/battle/scripts/subscripts/subscript_protect.s index 77e69f6bb4..be06a368bc 100644 --- a/res/battle/scripts/subscripts/subscript_protect.s +++ b/res/battle/scripts/subscripts/subscript_protect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryProtection _006 diff --git a/res/battle/scripts/subscripts/subscript_pursuit.s b/res/battle/scripts/subscripts/subscript_pursuit.s index e0ca7bf8bf..ba24be79eb 100644 --- a/res/battle/scripts/subscripts/subscript_pursuit.s +++ b/res/battle/scripts/subscripts/subscript_pursuit.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_PUSH_ATTACKER_AND_DEFENDER diff --git a/res/battle/scripts/subscripts/subscript_push_attacker_and_defender.s b/res/battle/scripts/subscripts/subscript_push_attacker_and_defender.s index 759db145db..4bb2af6d86 100644 --- a/res/battle/scripts/subscripts/subscript_push_attacker_and_defender.s +++ b/res/battle/scripts/subscripts/subscript_push_attacker_and_defender.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVarFromVar OPCODE_GET, BTLVAR_ATTACKER, BTLVAR_ATTACKER_TEMP diff --git a/res/battle/scripts/subscripts/subscript_rage_is_building.s b/res/battle/scripts/subscripts/subscript_rage_is_building.s index 1f4954cfff..f3886d0dca 100644 --- a/res/battle/scripts/subscripts/subscript_rage_is_building.s +++ b/res/battle/scripts/subscripts/subscript_rage_is_building.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0}’s rage is building! diff --git a/res/battle/scripts/subscripts/subscript_raining_end.s b/res/battle/scripts/subscripts/subscript_raining_end.s index ac6fddfd4a..e15d8bf9bb 100644 --- a/res/battle/scripts/subscripts/subscript_raining_end.s +++ b/res/battle/scripts/subscripts/subscript_raining_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_RAINING_TEMP diff --git a/res/battle/scripts/subscripts/subscript_rapid_spin.s b/res/battle/scripts/subscripts/subscript_rapid_spin.s index 2f99b628a3..8b3d0f8cb2 100644 --- a/res/battle/scripts/subscripts/subscript_rapid_spin.s +++ b/res/battle/scripts/subscripts/subscript_rapid_spin.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: RapidSpin diff --git a/res/battle/scripts/subscripts/subscript_recharge_turn.s b/res/battle/scripts/subscripts/subscript_recharge_turn.s index 7f78ee3ae9..7ad8d18544 100644 --- a/res/battle/scripts/subscripts/subscript_recharge_turn.s +++ b/res/battle/scripts/subscripts/subscript_recharge_turn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RECHARGING diff --git a/res/battle/scripts/subscripts/subscript_recharging.s b/res/battle/scripts/subscripts/subscript_recharging.s index 6efcb92b04..79ee9460b6 100644 --- a/res/battle/scripts/subscripts/subscript_recharging.s +++ b/res/battle/scripts/subscripts/subscript_recharging.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} must recharge! diff --git a/res/battle/scripts/subscripts/subscript_recoil_1_2.s b/res/battle/scripts/subscripts/subscript_recoil_1_2.s index e2e970a856..17755c96f1 100644 --- a/res/battle/scripts/subscripts/subscript_recoil_1_2.s +++ b/res/battle/scripts/subscripts/subscript_recoil_1_2.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 diff --git a/res/battle/scripts/subscripts/subscript_recoil_1_3.s b/res/battle/scripts/subscripts/subscript_recoil_1_3.s index 35d835c381..7b06269cd5 100644 --- a/res/battle/scripts/subscripts/subscript_recoil_1_3.s +++ b/res/battle/scripts/subscripts/subscript_recoil_1_3.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 diff --git a/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_burn.s b/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_burn.s index 4ffb4486ee..002a3f00a9 100644 --- a/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_burn.s +++ b/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_burn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_RECOIL_1_3 diff --git a/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_paralyze.s b/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_paralyze.s index b3df65a8a2..05c47fd874 100644 --- a/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_paralyze.s +++ b/res/battle/scripts/subscripts/subscript_recoil_1_3_chance_to_paralyze.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_RECOIL_1_3 diff --git a/res/battle/scripts/subscripts/subscript_recoil_1_4.s b/res/battle/scripts/subscripts/subscript_recoil_1_4.s index a41525eb9f..3a13166e2e 100644 --- a/res/battle/scripts/subscripts/subscript_recoil_1_4.s +++ b/res/battle/scripts/subscripts/subscript_recoil_1_4.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_ATTACKER, ABILITY_ROCK_HEAD, _038 diff --git a/res/battle/scripts/subscripts/subscript_recover_half_max_hp.s b/res/battle/scripts/subscripts/subscript_recover_half_max_hp.s index 168672c666..a332e041a1 100644 --- a/res/battle/scripts/subscripts/subscript_recover_half_max_hp.s +++ b/res/battle/scripts/subscripts/subscript_recover_half_max_hp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_recover_hp.s b/res/battle/scripts/subscripts/subscript_recover_hp.s index 01f00955b5..1c04441b2c 100644 --- a/res/battle/scripts/subscripts/subscript_recover_hp.s +++ b/res/battle/scripts/subscripts/subscript_recover_hp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_MSG_TEMP, BATTLEMON_MAX_HP, BTLVAR_CALC_TEMP diff --git a/res/battle/scripts/subscripts/subscript_recover_psn_prz_brn.s b/res/battle/scripts/subscripts/subscript_recover_psn_prz_brn.s index ec569af112..c37500a090 100644 --- a/res/battle/scripts/subscripts/subscript_recover_psn_prz_brn.s +++ b/res/battle/scripts/subscripts/subscript_recover_psn_prz_brn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_NOT, BTLSCR_ATTACKER, BATTLEMON_STATUS, MON_CONDITION_FACADE_BOOST, _023 diff --git a/res/battle/scripts/subscripts/subscript_reduce_target_pp.s b/res/battle/scripts/subscripts/subscript_reduce_target_pp.s index 3fad4a59fc..b81f033ac1 100644 --- a/res/battle/scripts/subscripts/subscript_reduce_target_pp.s +++ b/res/battle/scripts/subscripts/subscript_reduce_target_pp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_MOVE_STATUS_FLAGS, MOVE_STATUS_MISSED|MOVE_STATUS_SEMI_INVULNERABLE, _018 diff --git a/res/battle/scripts/subscripts/subscript_reflect.s b/res/battle/scripts/subscripts/subscript_reflect.s index 7a6f81d4c5..937844a5c7 100644 --- a/res/battle/scripts/subscripts/subscript_reflect.s +++ b/res/battle/scripts/subscripts/subscript_reflect.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryReflect _003 diff --git a/res/battle/scripts/subscripts/subscript_replace_fainted.s b/res/battle/scripts/subscripts/subscript_replace_fainted.s index 527ee443fc..94a1089d1f 100644 --- a/res/battle/scripts/subscripts/subscript_replace_fainted.s +++ b/res/battle/scripts/subscripts/subscript_replace_fainted.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_SCRIPT_TEMP, 1, _034 diff --git a/res/battle/scripts/subscripts/subscript_reset_all_stat_stages.s b/res/battle/scripts/subscripts/subscript_reset_all_stat_stages.s index 45fc3bd481..dcaf9571e8 100644 --- a/res/battle/scripts/subscripts/subscript_reset_all_stat_stages.s +++ b/res/battle/scripts/subscripts/subscript_reset_all_stat_stages.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: ResetAllStatChanges diff --git a/res/battle/scripts/subscripts/subscript_rest.s b/res/battle/scripts/subscripts/subscript_rest.s index b98bf61bb7..d46d8d0ec5 100644 --- a/res/battle/scripts/subscripts/subscript_rest.s +++ b/res/battle/scripts/subscripts/subscript_rest.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_restore_a_little_hp.s b/res/battle/scripts/subscripts/subscript_restore_a_little_hp.s index cac4e897b8..992889cd0b 100644 --- a/res/battle/scripts/subscripts/subscript_restore_a_little_hp.s +++ b/res/battle/scripts/subscripts/subscript_restore_a_little_hp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_MSG_TEMP, BATTLE_ANIMATION_HELD_ITEM diff --git a/res/battle/scripts/subscripts/subscript_roost.s b/res/battle/scripts/subscripts/subscript_roost.s index 89ae37018c..40ba4512cf 100644 --- a/res/battle/scripts/subscripts/subscript_roost.s +++ b/res/battle/scripts/subscripts/subscript_roost.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_ATTACKER, BATTLEMON_MAX_HP, BTLVAR_HP_CALC_TEMP diff --git a/res/battle/scripts/subscripts/subscript_rough_skin.s b/res/battle/scripts/subscripts/subscript_rough_skin.s index 33bc30d1e2..fd1936a150 100644 --- a/res/battle/scripts/subscripts/subscript_rough_skin.s +++ b/res/battle/scripts/subscripts/subscript_rough_skin.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK diff --git a/res/battle/scripts/subscripts/subscript_safari_escape.s b/res/battle/scripts/subscripts/subscript_safari_escape.s index 44881d35b3..f2608e1585 100644 --- a/res/battle/scripts/subscripts/subscript_safari_escape.s +++ b/res/battle/scripts/subscripts/subscript_safari_escape.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is watching carefully! diff --git a/res/battle/scripts/subscripts/subscript_safari_throw_bait.s b/res/battle/scripts/subscripts/subscript_safari_throw_bait.s index 5326b0e514..a854088643 100644 --- a/res/battle/scripts/subscripts/subscript_safari_throw_bait.s +++ b/res/battle/scripts/subscripts/subscript_safari_throw_bait.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} threw some Bait at the {1}! diff --git a/res/battle/scripts/subscripts/subscript_safari_throw_rock.s b/res/battle/scripts/subscripts/subscript_safari_throw_rock.s index 7ba5844228..485356e03b 100644 --- a/res/battle/scripts/subscripts/subscript_safari_throw_rock.s +++ b/res/battle/scripts/subscripts/subscript_safari_throw_rock.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} threw mud at the {1}! diff --git a/res/battle/scripts/subscripts/subscript_safeguard_end.s b/res/battle/scripts/subscripts/subscript_safeguard_end.s index b852d18b10..46d6019076 100644 --- a/res/battle/scripts/subscripts/subscript_safeguard_end.s +++ b/res/battle/scripts/subscripts/subscript_safeguard_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Your team is no longer protected by Safeguard! diff --git a/res/battle/scripts/subscripts/subscript_safeguard_start.s b/res/battle/scripts/subscripts/subscript_safeguard_start.s index d6e984bb00..50c596a6e3 100644 --- a/res/battle/scripts/subscripts/subscript_safeguard_start.s +++ b/res/battle/scripts/subscripts/subscript_safeguard_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrySafeguard _003 diff --git a/res/battle/scripts/subscripts/subscript_sand_stream.s b/res/battle/scripts/subscripts/subscript_sand_stream.s index 4e2b3e7de8..bef9c24389 100644 --- a/res/battle/scripts/subscripts/subscript_sand_stream.s +++ b/res/battle/scripts/subscripts/subscript_sand_stream.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_SAND diff --git a/res/battle/scripts/subscripts/subscript_sandstorm_end.s b/res/battle/scripts/subscripts/subscript_sandstorm_end.s index 27d56a1e94..6926d2928a 100644 --- a/res/battle/scripts/subscripts/subscript_sandstorm_end.s +++ b/res/battle/scripts/subscripts/subscript_sandstorm_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SANDSTORM_TEMP diff --git a/res/battle/scripts/subscripts/subscript_set_rage_flag.s b/res/battle/scripts/subscripts/subscript_set_rage_flag.s index 2ab5f4d070..5ce6f11a5c 100644 --- a/res/battle/scripts/subscripts/subscript_set_rage_flag.s +++ b/res/battle/scripts/subscripts/subscript_set_rage_flag.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_ON, BTLSCR_ATTACKER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_RAGE diff --git a/res/battle/scripts/subscripts/subscript_show_party_list.s b/res/battle/scripts/subscripts/subscript_show_party_list.s index 7905831c4b..ab0b95a450 100644 --- a/res/battle/scripts/subscripts/subscript_show_party_list.s +++ b/res/battle/scripts/subscripts/subscript_show_party_list.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: ShowParty diff --git a/res/battle/scripts/subscripts/subscript_show_prepared_message.s b/res/battle/scripts/subscripts/subscript_show_prepared_message.s index 9b41eb3b55..43338e6a15 100644 --- a/res/battle/scripts/subscripts/subscript_show_prepared_message.s +++ b/res/battle/scripts/subscripts/subscript_show_prepared_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintBufferedMessage diff --git a/res/battle/scripts/subscripts/subscript_sketch.s b/res/battle/scripts/subscripts/subscript_sketch.s index 0a6913f9d3..8d41f6769a 100644 --- a/res/battle/scripts/subscripts/subscript_sketch.s +++ b/res/battle/scripts/subscripts/subscript_sketch.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _015 diff --git a/res/battle/scripts/subscripts/subscript_sleeping.s b/res/battle/scripts/subscripts/subscript_sleeping.s index b1129b2315..cc71da92aa 100644 --- a/res/battle/scripts/subscripts/subscript_sleeping.s +++ b/res/battle/scripts/subscripts/subscript_sleeping.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is fast asleep. diff --git a/res/battle/scripts/subscripts/subscript_slow_start.s b/res/battle/scripts/subscripts/subscript_slow_start.s index 6adf3f2187..5246257da0 100644 --- a/res/battle/scripts/subscripts/subscript_slow_start.s +++ b/res/battle/scripts/subscripts/subscript_slow_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} can’t get it going because of its {1}! diff --git a/res/battle/scripts/subscripts/subscript_slow_start_end.s b/res/battle/scripts/subscripts/subscript_slow_start_end.s index 80e0d805f9..40a03558a2 100644 --- a/res/battle/scripts/subscripts/subscript_slow_start_end.s +++ b/res/battle/scripts/subscripts/subscript_slow_start_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} finally got its act together! diff --git a/res/battle/scripts/subscripts/subscript_snap_out_of_confusion.s b/res/battle/scripts/subscripts/subscript_snap_out_of_confusion.s index 5d22dcd016..0aa3b43005 100644 --- a/res/battle/scripts/subscripts/subscript_snap_out_of_confusion.s +++ b/res/battle/scripts/subscripts/subscript_snap_out_of_confusion.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} snapped out of confusion! diff --git a/res/battle/scripts/subscripts/subscript_snatch.s b/res/battle/scripts/subscripts/subscript_snatch.s index 601a6bbfa7..bf2f0b3f99 100644 --- a/res/battle/scripts/subscripts/subscript_snatch.s +++ b/res/battle/scripts/subscripts/subscript_snatch.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_snow_warning.s b/res/battle/scripts/subscripts/subscript_snow_warning.s index 385abc8332..c074086ddb 100644 --- a/res/battle/scripts/subscripts/subscript_snow_warning.s +++ b/res/battle/scripts/subscripts/subscript_snow_warning.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayBattleAnimation BTLSCR_PLAYER, BATTLE_ANIMATION_WEATHER_HAIL diff --git a/res/battle/scripts/subscripts/subscript_start_encounter.s b/res/battle/scripts/subscripts/subscript_start_encounter.s index 1e7106ae80..e1f5593dda 100644 --- a/res/battle/scripts/subscripts/subscript_start_encounter.s +++ b/res/battle/scripts/subscripts/subscript_start_encounter.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_TRAINER, _118 diff --git a/res/battle/scripts/subscripts/subscript_steal_item.s b/res/battle/scripts/subscripts/subscript_steal_item.s index d3434de290..042847c12d 100644 --- a/res/battle/scripts/subscripts/subscript_steal_item.s +++ b/res/battle/scripts/subscripts/subscript_steal_item.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryStealItem _048, _039 diff --git a/res/battle/scripts/subscripts/subscript_stockpile.s b/res/battle/scripts/subscripts/subscript_stockpile.s index 7800531d1a..feed09ec04 100644 --- a/res/battle/scripts/subscripts/subscript_stockpile.s +++ b/res/battle/scripts/subscripts/subscript_stockpile.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_struggle.s b/res/battle/scripts/subscripts/subscript_struggle.s index c5fed3bb65..39f799c52c 100644 --- a/res/battle/scripts/subscripts/subscript_struggle.s +++ b/res/battle/scripts/subscripts/subscript_struggle.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVarFromVar OPCODE_SET, BTLVAR_MSG_BATTLER_TEMP, BTLVAR_ATTACKER diff --git a/res/battle/scripts/subscripts/subscript_sunny_end.s b/res/battle/scripts/subscripts/subscript_sunny_end.s index dba58ce2c0..e1abb21438 100644 --- a/res/battle/scripts/subscripts/subscript_sunny_end.s +++ b/res/battle/scripts/subscripts/subscript_sunny_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_OFF, BTLVAR_FIELD_CONDITIONS, FIELD_CONDITION_SUNNY_TEMP diff --git a/res/battle/scripts/subscripts/subscript_suppress_target_ability.s b/res/battle/scripts/subscripts/subscript_suppress_target_ability.s index 7c03e2cfb3..7b142e6add 100644 --- a/res/battle/scripts/subscripts/subscript_suppress_target_ability.s +++ b/res/battle/scripts/subscripts/subscript_suppress_target_ability.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _034 diff --git a/res/battle/scripts/subscripts/subscript_swagger.s b/res/battle/scripts/subscripts/subscript_swagger.s index 03f2cd56ef..ba5354f1cf 100644 --- a/res/battle/scripts/subscripts/subscript_swagger.s +++ b/res/battle/scripts/subscripts/subscript_swagger.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckSubstitute BTLSCR_DEFENDER, _031 diff --git a/res/battle/scripts/subscripts/subscript_swallow.s b/res/battle/scripts/subscripts/subscript_swallow.s index e452e2fee4..9b48966429 100644 --- a/res/battle/scripts/subscripts/subscript_swallow.s +++ b/res/battle/scripts/subscripts/subscript_swallow.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_switch_pokemon.s b/res/battle/scripts/subscripts/subscript_switch_pokemon.s index 45270275a6..77d7cdfac3 100644 --- a/res/battle/scripts/subscripts/subscript_switch_pokemon.s +++ b/res/battle/scripts/subscripts/subscript_switch_pokemon.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TryRestoreStatusOnSwitch BTLSCR_SWITCHED_MON, _007 diff --git a/res/battle/scripts/subscripts/subscript_tailwind_end.s b/res/battle/scripts/subscripts/subscript_tailwind_end.s index ee9c2cef5a..4e95a8ac99 100644 --- a/res/battle/scripts/subscripts/subscript_tailwind_end.s +++ b/res/battle/scripts/subscripts/subscript_tailwind_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // Your team’s tailwind petered out! diff --git a/res/battle/scripts/subscripts/subscript_tailwind_start.s b/res/battle/scripts/subscripts/subscript_tailwind_start.s index 0b4dbd869a..b395e1d615 100644 --- a/res/battle/scripts/subscripts/subscript_tailwind_start.s +++ b/res/battle/scripts/subscripts/subscript_tailwind_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_SIDE_CONDITIONS_ATTACKER, SIDE_CONDITION_TAILWIND, _018 diff --git a/res/battle/scripts/subscripts/subscript_target_atk_and_def_down_1_stage.s b/res/battle/scripts/subscripts/subscript_target_atk_and_def_down_1_stage.s index eac3d315c0..b1e617f4c2 100644 --- a/res/battle/scripts/subscripts/subscript_target_atk_and_def_down_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_target_atk_and_def_down_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 0, _011 diff --git a/res/battle/scripts/subscripts/subscript_taunt_end.s b/res/battle/scripts/subscripts/subscript_taunt_end.s index 29e39ec39c..86c32bbe87 100644 --- a/res/battle/scripts/subscripts/subscript_taunt_end.s +++ b/res/battle/scripts/subscripts/subscript_taunt_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_TAUNT diff --git a/res/battle/scripts/subscripts/subscript_taunt_start.s b/res/battle/scripts/subscripts/subscript_taunt_start.s index 9074272238..fd5dfab768 100644 --- a/res/battle/scripts/subscripts/subscript_taunt_start.s +++ b/res/battle/scripts/subscripts/subscript_taunt_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_DEFENDER, BATTLEMON_TAUNTED_TURNS, 0, _028 diff --git a/res/battle/scripts/subscripts/subscript_teleport.s b/res/battle/scripts/subscripts/subscript_teleport.s index ff973464e2..8cb283a6f8 100644 --- a/res/battle/scripts/subscripts/subscript_teleport.s +++ b/res/battle/scripts/subscripts/subscript_teleport.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_DOUBLES|BATTLE_TYPE_2vs2|BATTLE_TYPE_AI, _026 diff --git a/res/battle/scripts/subscripts/subscript_thaw_out.s b/res/battle/scripts/subscripts/subscript_thaw_out.s index e33d8bf84f..8597b03069 100644 --- a/res/battle/scripts/subscripts/subscript_thaw_out.s +++ b/res/battle/scripts/subscripts/subscript_thaw_out.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_FLAG_OFF, BTLSCR_MSG_TEMP, BATTLEMON_STATUS, MON_CONDITION_FREEZE diff --git a/res/battle/scripts/subscripts/subscript_thrash.s b/res/battle/scripts/subscripts/subscript_thrash.s index ce055708da..cef6e75747 100644 --- a/res/battle/scripts/subscripts/subscript_thrash.s +++ b/res/battle/scripts/subscripts/subscript_thrash.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Random 1, 2 diff --git a/res/battle/scripts/subscripts/subscript_thrash_end.s b/res/battle/scripts/subscripts/subscript_thrash_end.s index 715fcc0be5..f56324bed8 100644 --- a/res/battle/scripts/subscripts/subscript_thrash_end.s +++ b/res/battle/scripts/subscripts/subscript_thrash_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_MOVE_EFFECT diff --git a/res/battle/scripts/subscripts/subscript_throw_pokeball.s b/res/battle/scripts/subscripts/subscript_throw_pokeball.s index 1a66b27636..d7507bece6 100644 --- a/res/battle/scripts/subscripts/subscript_throw_pokeball.s +++ b/res/battle/scripts/subscripts/subscript_throw_pokeball.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} used one {1}! diff --git a/res/battle/scripts/subscripts/subscript_throw_safari_ball.s b/res/battle/scripts/subscripts/subscript_throw_safari_ball.s index 8467b7c9c2..c843d897f9 100644 --- a/res/battle/scripts/subscripts/subscript_throw_safari_ball.s +++ b/res/battle/scripts/subscripts/subscript_throw_safari_ball.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_TYPE, BATTLE_TYPE_PAL_PARK, _015 diff --git a/res/battle/scripts/subscripts/subscript_tighten_focus.s b/res/battle/scripts/subscripts/subscript_tighten_focus.s index 4a05a8c4e7..471c1895fd 100644 --- a/res/battle/scripts/subscripts/subscript_tighten_focus.s +++ b/res/battle/scripts/subscripts/subscript_tighten_focus.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_SET, BTLVAR_MSG_MOVE_TEMP, MOVE_FOCUS_PUNCH diff --git a/res/battle/scripts/subscripts/subscript_torment_start.s b/res/battle/scripts/subscripts/subscript_torment_start.s index 38fdd9b8d5..56eea94038 100644 --- a/res/battle/scripts/subscripts/subscript_torment_start.s +++ b/res/battle/scripts/subscripts/subscript_torment_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_VOLATILE_STATUS, VOLATILE_CONDITION_TORMENT, _025 diff --git a/res/battle/scripts/subscripts/subscript_trace.s b/res/battle/scripts/subscripts/subscript_trace.s index 05c774c936..005dbef114 100644 --- a/res/battle/scripts/subscripts/subscript_trace.s +++ b/res/battle/scripts/subscripts/subscript_trace.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_trainer_message.s b/res/battle/scripts/subscripts/subscript_trainer_message.s index 0abc48f91d..f6f5383dee 100644 --- a/res/battle/scripts/subscripts/subscript_trainer_message.s +++ b/res/battle/scripts/subscripts/subscript_trainer_message.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: TrainerSlideIn BTLSCR_ENEMY, BATTLER_TYPE_SOLO_ENEMY diff --git a/res/battle/scripts/subscripts/subscript_transfer_sticky_barb.s b/res/battle/scripts/subscripts/subscript_transfer_sticky_barb.s index 2f94502492..f7522553c7 100644 --- a/res/battle/scripts/subscripts/subscript_transfer_sticky_barb.s +++ b/res/battle/scripts/subscripts/subscript_transfer_sticky_barb.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonDataFromVar OPCODE_GET, BTLSCR_DEFENDER, BATTLEMON_HELD_ITEM, BTLVAR_SCRIPT_TEMP diff --git a/res/battle/scripts/subscripts/subscript_transform_into_target.s b/res/battle/scripts/subscripts/subscript_transform_into_target.s index 60296b838f..a8a7006cb0 100644 --- a/res/battle/scripts/subscripts/subscript_transform_into_target.s +++ b/res/battle/scripts/subscripts/subscript_transform_into_target.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_FLAG_SET, BTLSCR_DEFENDER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_SEMI_INVULNERABLE, _023 diff --git a/res/battle/scripts/subscripts/subscript_trick_room_end.s b/res/battle/scripts/subscripts/subscript_trick_room_end.s index ea261f0e3f..4f3d8b2532 100644 --- a/res/battle/scripts/subscripts/subscript_trick_room_end.s +++ b/res/battle/scripts/subscripts/subscript_trick_room_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // The twisted dimensions returned to normal! diff --git a/res/battle/scripts/subscripts/subscript_try_substitute.s b/res/battle/scripts/subscripts/subscript_try_substitute.s index 527bc9ec3f..4322172a7f 100644 --- a/res/battle/scripts/subscripts/subscript_try_substitute.s +++ b/res/battle/scripts/subscripts/subscript_try_substitute.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintAttackMessage diff --git a/res/battle/scripts/subscripts/subscript_type_resist_berry.s b/res/battle/scripts/subscripts/subscript_type_resist_berry.s index 131a705ee0..9cab827689 100644 --- a/res/battle/scripts/subscripts/subscript_type_resist_berry.s +++ b/res/battle/scripts/subscripts/subscript_type_resist_berry.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_IGNORE_TYPE_CHECKS|SYSCTL_IGNORE_IMMUNITIES, _262 diff --git a/res/battle/scripts/subscripts/subscript_update_hp.s b/res/battle/scripts/subscripts/subscript_update_hp.s index 6453710a40..c9670729fd 100644 --- a/res/battle/scripts/subscripts/subscript_update_hp.s +++ b/res/battle/scripts/subscripts/subscript_update_hp.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_FLAG_SET, BTLVAR_BATTLE_CTX_STATUS, SYSCTL_SKIP_SPRITE_BLINK, _016 diff --git a/res/battle/scripts/subscripts/subscript_update_stat_stage.s b/res/battle/scripts/subscripts/subscript_update_stat_stage.s index 2ba3799542..4c8277ac3e 100644 --- a/res/battle/scripts/subscripts/subscript_update_stat_stage.s +++ b/res/battle/scripts/subscripts/subscript_update_stat_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: ChangeStatStage _041, _059, _060 diff --git a/res/battle/scripts/subscripts/subscript_uproar.s b/res/battle/scripts/subscripts/subscript_uproar.s index 72f5701202..9c77d7d0d0 100644 --- a/res/battle/scripts/subscripts/subscript_uproar.s +++ b/res/battle/scripts/subscripts/subscript_uproar.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVarFromVar OPCODE_SET, BTLVAR_ATTACKER_LOCKED_MOVE, BTLVAR_CURRENT_MOVE diff --git a/res/battle/scripts/subscripts/subscript_uproar_continues.s b/res/battle/scripts/subscripts/subscript_uproar_continues.s index ebcaaed84d..6c55316e98 100644 --- a/res/battle/scripts/subscripts/subscript_uproar_continues.s +++ b/res/battle/scripts/subscripts/subscript_uproar_continues.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} is making an uproar! diff --git a/res/battle/scripts/subscripts/subscript_uproar_end.s b/res/battle/scripts/subscripts/subscript_uproar_end.s index 542f1698c2..a72a96a0c7 100644 --- a/res/battle/scripts/subscripts/subscript_uproar_end.s +++ b/res/battle/scripts/subscripts/subscript_uproar_end.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: // {0} calmed down. diff --git a/res/battle/scripts/subscripts/subscript_use_full_restore.s b/res/battle/scripts/subscripts/subscript_use_full_restore.s index 8d37ec3cf4..966656b0b5 100644 --- a/res/battle/scripts/subscripts/subscript_use_full_restore.s +++ b/res/battle/scripts/subscripts/subscript_use_full_restore.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: SetHealthbarStatus BTLSCR_ATTACKER, BATTLE_ANIMATION_NONE diff --git a/res/battle/scripts/subscripts/subscript_use_guard_spec.s b/res/battle/scripts/subscripts/subscript_use_guard_spec.s index 2174cf362d..bf7ba08f5d 100644 --- a/res/battle/scripts/subscripts/subscript_use_guard_spec.s +++ b/res/battle/scripts/subscripts/subscript_use_guard_spec.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_use_move.s b/res/battle/scripts/subscripts/subscript_use_move.s index 8fa67d7bd2..45b66cdcd6 100644 --- a/res/battle/scripts/subscripts/subscript_use_move.s +++ b/res/battle/scripts/subscripts/subscript_use_move.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareVarToValue OPCODE_EQU, BTLVAR_SIDE_EFFECT_TYPE, SIDE_EFFECT_TYPE_DIRECT, _006 diff --git a/res/battle/scripts/subscripts/subscript_use_potion.s b/res/battle/scripts/subscripts/subscript_use_potion.s index f760d9e76a..56f854313c 100644 --- a/res/battle/scripts/subscripts/subscript_use_potion.s +++ b/res/battle/scripts/subscripts/subscript_use_potion.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_use_stat_booster.s b/res/battle/scripts/subscripts/subscript_use_stat_booster.s index 1f772765f0..66b5b5f34c 100644 --- a/res/battle/scripts/subscripts/subscript_use_stat_booster.s +++ b/res/battle/scripts/subscripts/subscript_use_stat_booster.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_use_status_recovery.s b/res/battle/scripts/subscripts/subscript_use_status_recovery.s index baa2175008..be384e2aaf 100644 --- a/res/battle/scripts/subscripts/subscript_use_status_recovery.s +++ b/res/battle/scripts/subscripts/subscript_use_status_recovery.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: WaitButtonABTime 15 diff --git a/res/battle/scripts/subscripts/subscript_user_atk_and_def_down_1_stage.s b/res/battle/scripts/subscripts/subscript_user_atk_and_def_down_1_stage.s index 8244e40271..bb067832d1 100644 --- a/res/battle/scripts/subscripts/subscript_user_atk_and_def_down_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_atk_and_def_down_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN diff --git a/res/battle/scripts/subscripts/subscript_user_atk_and_def_up_1_stage.s b/res/battle/scripts/subscripts/subscript_user_atk_and_def_up_1_stage.s index a460006842..b06201252b 100644 --- a/res/battle/scripts/subscripts/subscript_user_atk_and_def_up_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_atk_and_def_up_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 12, _011 diff --git a/res/battle/scripts/subscripts/subscript_user_atk_and_speed_up_1_stage.s b/res/battle/scripts/subscripts/subscript_user_atk_and_speed_up_1_stage.s index ebd5920376..5f42db517b 100644 --- a/res/battle/scripts/subscripts/subscript_user_atk_and_speed_up_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_atk_and_speed_up_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_ATTACK_STAGE, 12, _011 diff --git a/res/battle/scripts/subscripts/subscript_user_def_and_spdef_down_1_stage.s b/res/battle/scripts/subscripts/subscript_user_def_and_spdef_down_1_stage.s index 5fc926f1a8..daca196017 100644 --- a/res/battle/scripts/subscripts/subscript_user_def_and_spdef_down_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_def_and_spdef_down_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateVar OPCODE_FLAG_ON, BTLVAR_BATTLE_CTX_STATUS_2, SYSCTL_STAT_STAGE_CHANGE_SHOWN diff --git a/res/battle/scripts/subscripts/subscript_user_def_and_spdef_up_1_stage.s b/res/battle/scripts/subscripts/subscript_user_def_and_spdef_up_1_stage.s index 1b7601e155..6144690039 100644 --- a/res/battle/scripts/subscripts/subscript_user_def_and_spdef_up_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_def_and_spdef_up_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_DEFENSE_STAGE, 12, _011 diff --git a/res/battle/scripts/subscripts/subscript_user_spatk_and_spdef_up_1_stage.s b/res/battle/scripts/subscripts/subscript_user_spatk_and_spdef_up_1_stage.s index ed41a55efd..1c8045a32b 100644 --- a/res/battle/scripts/subscripts/subscript_user_spatk_and_spdef_up_1_stage.s +++ b/res/battle/scripts/subscripts/subscript_user_spatk_and_spdef_up_1_stage.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CompareMonDataToValue OPCODE_NEQ, BTLSCR_SIDE_EFFECT_MON, BATTLEMON_SP_ATTACK_STAGE, 12, _011 diff --git a/res/battle/scripts/subscripts/subscript_user_swap_atk_and_def.s b/res/battle/scripts/subscripts/subscript_user_swap_atk_and_def.s index ac7c1e41a3..5c0d31cab5 100644 --- a/res/battle/scripts/subscripts/subscript_user_swap_atk_and_def.s +++ b/res/battle/scripts/subscripts/subscript_user_swap_atk_and_def.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: UpdateMonData OPCODE_BITWISE_XOR, BTLSCR_ATTACKER, BATTLEMON_MOVE_EFFECTS_MASK, MOVE_EFFECT_POWER_TRICK diff --git a/res/battle/scripts/subscripts/subscript_vanish_off.s b/res/battle/scripts/subscripts/subscript_vanish_off.s index c48be0b089..ad6a7fdae4 100644 --- a/res/battle/scripts/subscripts/subscript_vanish_off.s +++ b/res/battle/scripts/subscripts/subscript_vanish_off.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: ToggleVanish BTLSCR_MSG_TEMP, FALSE diff --git a/res/battle/scripts/subscripts/subscript_vanish_on_charge_turn.s b/res/battle/scripts/subscripts/subscript_vanish_on_charge_turn.s index cb2d51e4ff..be44243698 100644 --- a/res/battle/scripts/subscripts/subscript_vanish_on_charge_turn.s +++ b/res/battle/scripts/subscripts/subscript_vanish_on_charge_turn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PlayMoveAnimation BTLSCR_ATTACKER diff --git a/res/battle/scripts/subscripts/subscript_wait_move_animation.s b/res/battle/scripts/subscripts/subscript_wait_move_animation.s index 76339b5cae..c007de6cd4 100644 --- a/res/battle/scripts/subscripts/subscript_wait_move_animation.s +++ b/res/battle/scripts/subscripts/subscript_wait_move_animation.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: End diff --git a/res/battle/scripts/subscripts/subscript_wake_up.s b/res/battle/scripts/subscripts/subscript_wake_up.s index 99c98ffb41..a89e2540dc 100644 --- a/res/battle/scripts/subscripts/subscript_wake_up.s +++ b/res/battle/scripts/subscripts/subscript_wake_up.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckAbility CHECK_HAVE, BTLSCR_MSG_TEMP, ABILITY_SOUNDPROOF, _015 diff --git a/res/battle/scripts/subscripts/subscript_weather_continues.s b/res/battle/scripts/subscripts/subscript_weather_continues.s index cf289e5488..85b006bee2 100644 --- a/res/battle/scripts/subscripts/subscript_weather_continues.s +++ b/res/battle/scripts/subscripts/subscript_weather_continues.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE diff --git a/res/battle/scripts/subscripts/subscript_weather_start.s b/res/battle/scripts/subscripts/subscript_weather_start.s index 27be8a5c36..00dbd6777f 100644 --- a/res/battle/scripts/subscripts/subscript_weather_start.s +++ b/res/battle/scripts/subscripts/subscript_weather_start.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: Call BATTLE_SUBSCRIPT_SHOW_PREPARED_MESSAGE diff --git a/res/battle/scripts/subscripts/subscript_wish_heal.s b/res/battle/scripts/subscripts/subscript_wish_heal.s index ecf3cd0da5..a911083527 100644 --- a/res/battle/scripts/subscripts/subscript_wish_heal.s +++ b/res/battle/scripts/subscripts/subscript_wish_heal.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: PrintBufferedMessage diff --git a/res/battle/scripts/subscripts/subscript_yawn.s b/res/battle/scripts/subscripts/subscript_yawn.s index d59f2f82bc..c5c2bd3f8c 100644 --- a/res/battle/scripts/subscripts/subscript_yawn.s +++ b/res/battle/scripts/subscripts/subscript_yawn.s @@ -1,6 +1,5 @@ #include "macros/btlcmd.inc" - .data _000: CheckIgnorableAbility CHECK_HAVE, BTLSCR_SIDE_EFFECT_MON, ABILITY_INSOMNIA, _066 diff --git a/res/field/scripts/scripts_acuity_cavern.s b/res/field/scripts/scripts_acuity_cavern.s index 94182d1754..7137dc2392 100644 --- a/res/field/scripts/scripts_acuity_cavern.s +++ b/res/field/scripts/scripts_acuity_cavern.s @@ -3,7 +3,6 @@ #define LOCALID_UXIE 0 - .data ScriptEntry _000E ScriptEntry AcuityCavern_CheckShouldUxieBeRemoved diff --git a/res/field/scripts/scripts_acuity_lakefront.s b/res/field/scripts/scripts_acuity_lakefront.s index 8a997788aa..b797928cf2 100644 --- a/res/field/scripts/scripts_acuity_lakefront.s +++ b/res/field/scripts/scripts_acuity_lakefront.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/acuity_lakefront.h" - .data ScriptEntry _004E ScriptEntry _0012 diff --git a/res/field/scripts/scripts_amity_square.s b/res/field/scripts/scripts_amity_square.s index 35c4aac562..822dc17f9c 100644 --- a/res/field/scripts/scripts_amity_square.s +++ b/res/field/scripts/scripts_amity_square.s @@ -8,7 +8,6 @@ #define PICKUP_TYPE_ITEM 0 #define PICKUP_TYPE_ACCESORY 1 - .data ScriptEntry _00B6 ScriptEntry AmitySquare_Trigger_WestGate diff --git a/res/field/scripts/scripts_battle_arcade.s b/res/field/scripts/scripts_battle_arcade.s index 2631d9d8bf..a64de4be38 100644 --- a/res/field/scripts/scripts_battle_arcade.s +++ b/res/field/scripts/scripts_battle_arcade.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_arcade.h" - .data ScriptEntry _0065 ScriptEntry _06B8 diff --git a/res/field/scripts/scripts_battle_castle.s b/res/field/scripts/scripts_battle_castle.s index d0200b6beb..2b78f8cfab 100644 --- a/res/field/scripts/scripts_battle_castle.s +++ b/res/field/scripts/scripts_battle_castle.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_castle.h" - .data ScriptEntry _0059 ScriptEntry _06A4 diff --git a/res/field/scripts/scripts_battle_factory.s b/res/field/scripts/scripts_battle_factory.s index 77afefc5df..a4ad75c461 100644 --- a/res/field/scripts/scripts_battle_factory.s +++ b/res/field/scripts/scripts_battle_factory.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_factory.h" - .data ScriptEntry _0059 ScriptEntry _05B0 diff --git a/res/field/scripts/scripts_battle_frontier.s b/res/field/scripts/scripts_battle_frontier.s index 1f6c745f05..a93f67d7a1 100644 --- a/res/field/scripts/scripts_battle_frontier.s +++ b/res/field/scripts/scripts_battle_frontier.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_frontier.h" - .data ScriptEntry _0460 ScriptEntry _00DB diff --git a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s index d052d0fdd5..9210f6e75e 100644 --- a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_frontier_gate_to_fight_area.h" - .data ScriptEntry _0038 ScriptEntry _007C diff --git a/res/field/scripts/scripts_battle_hall.s b/res/field/scripts/scripts_battle_hall.s index e7ed260068..e1f842e5b8 100644 --- a/res/field/scripts/scripts_battle_hall.s +++ b/res/field/scripts/scripts_battle_hall.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_hall.h" - .data ScriptEntry _026D ScriptEntry _08B4 diff --git a/res/field/scripts/scripts_battle_park.s b/res/field/scripts/scripts_battle_park.s index a650de7f73..94c81fa515 100644 --- a/res/field/scripts/scripts_battle_park.s +++ b/res/field/scripts/scripts_battle_park.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_park.h" - .data ScriptEntry _0032 ScriptEntry _0308 diff --git a/res/field/scripts/scripts_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_battle_park_exchange_service_corner.s index 25b44079d6..54560432ce 100644 --- a/res/field/scripts/scripts_battle_park_exchange_service_corner.s +++ b/res/field/scripts/scripts_battle_park_exchange_service_corner.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_park_exchange_service_corner.h" - .data ScriptEntry _0024 ScriptEntry _002A diff --git a/res/field/scripts/scripts_battle_park_gate_to_fight_area.s b/res/field/scripts/scripts_battle_park_gate_to_fight_area.s index 919f184456..9826c058f0 100644 --- a/res/field/scripts/scripts_battle_park_gate_to_fight_area.s +++ b/res/field/scripts/scripts_battle_park_gate_to_fight_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0020 ScriptEntry _0022 diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index f8b8988e63..af215d019c 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_tower.h" - .data ScriptEntry _028A ScriptEntry _0ACF diff --git a/res/field/scripts/scripts_battle_tower_battle_room.s b/res/field/scripts/scripts_battle_tower_battle_room.s index c419078fa5..fc2fe26433 100644 --- a/res/field/scripts/scripts_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_battle_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_tower_battle_room.h" - .data ScriptEntry _0016 ScriptEntry _0101 diff --git a/res/field/scripts/scripts_battle_tower_battle_salon.s b/res/field/scripts/scripts_battle_tower_battle_salon.s index 957e67d89d..b25674bdcb 100644 --- a/res/field/scripts/scripts_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_battle_tower_battle_salon.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_tower_battle_salon.h" - .data ScriptEntry _01AC ScriptEntry _0275 diff --git a/res/field/scripts/scripts_battle_tower_corridor.s b/res/field/scripts/scripts_battle_tower_corridor.s index 1b1cbc41f4..ed3f64a8ff 100644 --- a/res/field/scripts/scripts_battle_tower_corridor.s +++ b/res/field/scripts/scripts_battle_tower_corridor.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0010 diff --git a/res/field/scripts/scripts_battle_tower_corridor_multi.s b/res/field/scripts/scripts_battle_tower_corridor_multi.s index 1cfa24459c..62022e040b 100644 --- a/res/field/scripts/scripts_battle_tower_corridor_multi.s +++ b/res/field/scripts/scripts_battle_tower_corridor_multi.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0068 diff --git a/res/field/scripts/scripts_battle_tower_elevator.s b/res/field/scripts/scripts_battle_tower_elevator.s index 3639fd9014..3930a6acad 100644 --- a/res/field/scripts/scripts_battle_tower_elevator.s +++ b/res/field/scripts/scripts_battle_tower_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0012 ScriptEntry _0146 diff --git a/res/field/scripts/scripts_battle_tower_multi_battle_room.s b/res/field/scripts/scripts_battle_tower_multi_battle_room.s index 6a2f8ce732..99613b830a 100644 --- a/res/field/scripts/scripts_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_battle_tower_multi_battle_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battle_tower_multi_battle_room.h" - .data ScriptEntry _0012 ScriptEntry _0074 diff --git a/res/field/scripts/scripts_battleground.s b/res/field/scripts/scripts_battleground.s index acec974745..9e9cc7daf0 100644 --- a/res/field/scripts/scripts_battleground.s +++ b/res/field/scripts/scripts_battleground.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/battleground.h" - .data ScriptEntry _015A ScriptEntry _0183 diff --git a/res/field/scripts/scripts_cafe.s b/res/field/scripts/scripts_cafe.s index 3870c52cbf..a2b381a84b 100644 --- a/res/field/scripts/scripts_cafe.s +++ b/res/field/scripts/scripts_cafe.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/cafe.h" - .data ScriptEntry _0012 ScriptEntry _0018 diff --git a/res/field/scripts/scripts_canalave_city.s b/res/field/scripts/scripts_canalave_city.s index 15419932c2..e3738de57b 100644 --- a/res/field/scripts/scripts_canalave_city.s +++ b/res/field/scripts/scripts_canalave_city.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/canalave_city.h" - .data ScriptEntry _0066 ScriptEntry _01F9 diff --git a/res/field/scripts/scripts_canalave_city_east_house.s b/res/field/scripts/scripts_canalave_city_east_house.s index 5b728aa170..b21eac6546 100644 --- a/res/field/scripts/scripts_canalave_city_east_house.s +++ b/res/field/scripts/scripts_canalave_city_east_house.s @@ -2,7 +2,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_east_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_canalave_city_gym.s b/res/field/scripts/scripts_canalave_city_gym.s index 4b94073331..8a9c597796 100644 --- a/res/field/scripts/scripts_canalave_city_gym.s +++ b/res/field/scripts/scripts_canalave_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_gym.h" - .data ScriptEntry _0012 ScriptEntry _0016 diff --git a/res/field/scripts/scripts_canalave_city_harbor_inn.s b/res/field/scripts/scripts_canalave_city_harbor_inn.s index 41a6464027..0a356b4a1b 100644 --- a/res/field/scripts/scripts_canalave_city_harbor_inn.s +++ b/res/field/scripts/scripts_canalave_city_harbor_inn.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/canalave_city_harbor_inn.h" - .data ScriptEntry _000E ScriptEntry _0093 diff --git a/res/field/scripts/scripts_canalave_city_mart.s b/res/field/scripts/scripts_canalave_city_mart.s index 2006fb3293..3144b9f0b0 100644 --- a/res/field/scripts/scripts_canalave_city_mart.s +++ b/res/field/scripts/scripts_canalave_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s index 5ad65d5586..c2e448b717 100644 --- a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_pokecenter_1f.h" - .data ScriptEntry _0016 ScriptEntry _0022 diff --git a/res/field/scripts/scripts_canalave_city_pokecenter_2f.s b/res/field/scripts/scripts_canalave_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_canalave_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_canalave_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_canalave_city_pokecenter_b1f.s b/res/field/scripts/scripts_canalave_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_canalave_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_canalave_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s index 25438348db..bcf9d6b9c5 100644 --- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_sailor_eldritch_house.h" - .data ScriptEntry _000E ScriptEntry _010B diff --git a/res/field/scripts/scripts_canalave_city_southeast_house.s b/res/field/scripts/scripts_canalave_city_southeast_house.s index dc3f5bb560..fe7d7c8c64 100644 --- a/res/field/scripts/scripts_canalave_city_southeast_house.s +++ b/res/field/scripts/scripts_canalave_city_southeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_city_southeast_house.h" - .data ScriptEntry _000A ScriptEntry _0066 diff --git a/res/field/scripts/scripts_canalave_city_west_house.s b/res/field/scripts/scripts_canalave_city_west_house.s index c16bf3cdc1..1e8e98b322 100644 --- a/res/field/scripts/scripts_canalave_city_west_house.s +++ b/res/field/scripts/scripts_canalave_city_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0029 ScriptEntry _000A diff --git a/res/field/scripts/scripts_canalave_library_1f.s b/res/field/scripts/scripts_canalave_library_1f.s index 2e234eecb2..04dfada74a 100644 --- a/res/field/scripts/scripts_canalave_library_1f.s +++ b/res/field/scripts/scripts_canalave_library_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_library_1f.h" - .data ScriptEntry _0016 ScriptEntry _003F diff --git a/res/field/scripts/scripts_canalave_library_2f.s b/res/field/scripts/scripts_canalave_library_2f.s index f72d65ccda..448cbafac5 100644 --- a/res/field/scripts/scripts_canalave_library_2f.s +++ b/res/field/scripts/scripts_canalave_library_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_library_2f.h" - .data ScriptEntry _0033 ScriptEntry _005C diff --git a/res/field/scripts/scripts_canalave_library_3f.s b/res/field/scripts/scripts_canalave_library_3f.s index a308dd075e..331eb0801c 100644 --- a/res/field/scripts/scripts_canalave_library_3f.s +++ b/res/field/scripts/scripts_canalave_library_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/canalave_library_3f.h" - .data ScriptEntry _0032 ScriptEntry _0062 diff --git a/res/field/scripts/scripts_celestic_town.s b/res/field/scripts/scripts_celestic_town.s index 5e19c69d53..9b5a39021b 100644 --- a/res/field/scripts/scripts_celestic_town.s +++ b/res/field/scripts/scripts_celestic_town.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town.h" - .data ScriptEntry _0032 ScriptEntry _026C diff --git a/res/field/scripts/scripts_celestic_town_cave.s b/res/field/scripts/scripts_celestic_town_cave.s index 328cead119..8da4e5d17e 100644 --- a/res/field/scripts/scripts_celestic_town_cave.s +++ b/res/field/scripts/scripts_celestic_town_cave.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_cave.h" - .data ScriptEntry _000E ScriptEntry _0538 diff --git a/res/field/scripts/scripts_celestic_town_north_house.s b/res/field/scripts/scripts_celestic_town_north_house.s index d8a26919e2..53739950da 100644 --- a/res/field/scripts/scripts_celestic_town_north_house.s +++ b/res/field/scripts/scripts_celestic_town_north_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_north_house.h" - .data ScriptEntry _001C ScriptEntry _0056 diff --git a/res/field/scripts/scripts_celestic_town_northeast_house.s b/res/field/scripts/scripts_celestic_town_northeast_house.s index 0b995ec815..387ed68a4c 100644 --- a/res/field/scripts/scripts_celestic_town_northeast_house.s +++ b/res/field/scripts/scripts_celestic_town_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_northeast_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_celestic_town_northwest_house.s b/res/field/scripts/scripts_celestic_town_northwest_house.s index 502e4e68cb..a7a214d0f9 100644 --- a/res/field/scripts/scripts_celestic_town_northwest_house.s +++ b/res/field/scripts/scripts_celestic_town_northwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_northwest_house.h" - .data ScriptEntry _0012 ScriptEntry _002B diff --git a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s index c910431bdc..5d8d19a165 100644 --- a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_celestic_town_pokecenter_2f.s b/res/field/scripts/scripts_celestic_town_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_celestic_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_celestic_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_celestic_town_pokecenter_b1f.s b/res/field/scripts/scripts_celestic_town_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_celestic_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_celestic_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_celestic_town_southwest_house.s b/res/field/scripts/scripts_celestic_town_southwest_house.s index 3745a0fac5..3d803acacc 100644 --- a/res/field/scripts/scripts_celestic_town_southwest_house.s +++ b/res/field/scripts/scripts_celestic_town_southwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/celestic_town_southwest_house.h" - .data ScriptEntry _000A ScriptEntry _0045 diff --git a/res/field/scripts/scripts_common.s b/res/field/scripts/scripts_common.s index 728066d076..c65d5ba1d4 100644 --- a/res/field/scripts/scripts_common.s +++ b/res/field/scripts/scripts_common.s @@ -3,7 +3,6 @@ #include "generated/tutor_locations.h" #include "res/text/bank/common_strings.h" - .data ScriptEntry Common_HandleSignpostInput ScriptEntry _034C diff --git a/res/field/scripts/scripts_communication_club_colosseum_2p.s b/res/field/scripts/scripts_communication_club_colosseum_2p.s index 2c6d4a28d3..5887646805 100644 --- a/res/field/scripts/scripts_communication_club_colosseum_2p.s +++ b/res/field/scripts/scripts_communication_club_colosseum_2p.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_communication_club_colosseum_4p.s b/res/field/scripts/scripts_communication_club_colosseum_4p.s index 3535249e5c..d74a19d36f 100644 --- a/res/field/scripts/scripts_communication_club_colosseum_4p.s +++ b/res/field/scripts/scripts_communication_club_colosseum_4p.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_contest_hall_lobby.s b/res/field/scripts/scripts_contest_hall_lobby.s index f2d3039b61..8720e25b8d 100644 --- a/res/field/scripts/scripts_contest_hall_lobby.s +++ b/res/field/scripts/scripts_contest_hall_lobby.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/contest_hall_lobby.h" - .data ScriptEntry _002E ScriptEntry _01EC diff --git a/res/field/scripts/scripts_contest_hall_stage_no_contest.s b/res/field/scripts/scripts_contest_hall_stage_no_contest.s index 98dc7aa703..10a512b86c 100644 --- a/res/field/scripts/scripts_contest_hall_stage_no_contest.s +++ b/res/field/scripts/scripts_contest_hall_stage_no_contest.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/contest_hall_stage_no_contest.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_contest_hall_stage_ongoing_contest.s b/res/field/scripts/scripts_contest_hall_stage_ongoing_contest.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_contest_hall_stage_ongoing_contest.s +++ b/res/field/scripts/scripts_contest_hall_stage_ongoing_contest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_cycle_shop.s b/res/field/scripts/scripts_cycle_shop.s index 722efc24c8..17adb72bba 100644 --- a/res/field/scripts/scripts_cycle_shop.s +++ b/res/field/scripts/scripts_cycle_shop.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/cycle_shop.h" - .data ScriptEntry _0016 ScriptEntry _005D diff --git a/res/field/scripts/scripts_distortion_world_1f.s b/res/field/scripts/scripts_distortion_world_1f.s index d0256da5ef..fedc7d9f9b 100644 --- a/res/field/scripts/scripts_distortion_world_1f.s +++ b/res/field/scripts/scripts_distortion_world_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_1f.h" - .data ScriptEntry _0016 ScriptEntry _001A diff --git a/res/field/scripts/scripts_distortion_world_b1f.s b/res/field/scripts/scripts_distortion_world_b1f.s index 128406fc94..1bf14d9d06 100644 --- a/res/field/scripts/scripts_distortion_world_b1f.s +++ b/res/field/scripts/scripts_distortion_world_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_b1f.h" - .data ScriptEntry _000E ScriptEntry _0012 diff --git a/res/field/scripts/scripts_distortion_world_b2f.s b/res/field/scripts/scripts_distortion_world_b2f.s index 2f7463e6c8..a51b4b9a49 100644 --- a/res/field/scripts/scripts_distortion_world_b2f.s +++ b/res/field/scripts/scripts_distortion_world_b2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_b2f.h" - .data ScriptEntry _000E ScriptEntry _0012 diff --git a/res/field/scripts/scripts_distortion_world_b3f.s b/res/field/scripts/scripts_distortion_world_b3f.s index fc056fffb1..fa35fa7c48 100644 --- a/res/field/scripts/scripts_distortion_world_b3f.s +++ b/res/field/scripts/scripts_distortion_world_b3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_b3f.h" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_distortion_world_b4f.s b/res/field/scripts/scripts_distortion_world_b4f.s index 44c3d997df..989f94c366 100644 --- a/res/field/scripts/scripts_distortion_world_b4f.s +++ b/res/field/scripts/scripts_distortion_world_b4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_distortion_world_b5f.s b/res/field/scripts/scripts_distortion_world_b5f.s index 44c3d997df..989f94c366 100644 --- a/res/field/scripts/scripts_distortion_world_b5f.s +++ b/res/field/scripts/scripts_distortion_world_b5f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_distortion_world_b6f.s b/res/field/scripts/scripts_distortion_world_b6f.s index 337f357c64..667b62f1d5 100644 --- a/res/field/scripts/scripts_distortion_world_b6f.s +++ b/res/field/scripts/scripts_distortion_world_b6f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_b6f.h" - .data ScriptEntry _0022 ScriptEntry _0026 diff --git a/res/field/scripts/scripts_distortion_world_b7f.s b/res/field/scripts/scripts_distortion_world_b7f.s index aec1da7174..9793a19625 100644 --- a/res/field/scripts/scripts_distortion_world_b7f.s +++ b/res/field/scripts/scripts_distortion_world_b7f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_b7f.h" - .data ScriptEntry _001A ScriptEntry _001E diff --git a/res/field/scripts/scripts_distortion_world_giratina_room.s b/res/field/scripts/scripts_distortion_world_giratina_room.s index 03fbfc95d0..dcb07bdb29 100644 --- a/res/field/scripts/scripts_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_distortion_world_giratina_room.s @@ -2,7 +2,6 @@ #include "generated/hidden_locations.h" #include "res/text/bank/distortion_world_giratina_room.h" - .data ScriptEntry _0022 ScriptEntry _0026 diff --git a/res/field/scripts/scripts_distortion_world_turnback_cave_room.s b/res/field/scripts/scripts_distortion_world_turnback_cave_room.s index 0fc7dd71b7..8b23b7014e 100644 --- a/res/field/scripts/scripts_distortion_world_turnback_cave_room.s +++ b/res/field/scripts/scripts_distortion_world_turnback_cave_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/distortion_world_turnback_cave_room.h" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_empty.s b/res/field/scripts/scripts_empty.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_empty.s +++ b/res/field/scripts/scripts_empty.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_eterna_city.s b/res/field/scripts/scripts_eterna_city.s index 02a09f5a6c..e04f828ce3 100644 --- a/res/field/scripts/scripts_eterna_city.s +++ b/res/field/scripts/scripts_eterna_city.s @@ -2,7 +2,6 @@ #include "res/text/bank/eterna_city.h" #include "res/text/bank/special_met_location_names.h" - .data ScriptEntry _01BF ScriptEntry _04FC diff --git a/res/field/scripts/scripts_eterna_city_condominiums_1f.s b/res/field/scripts/scripts_eterna_city_condominiums_1f.s index 667480bacb..5f9f1ffdf2 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_1f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_condominiums_1f.h" - .data ScriptEntry _000E ScriptEntry _0139 diff --git a/res/field/scripts/scripts_eterna_city_condominiums_2f.s b/res/field/scripts/scripts_eterna_city_condominiums_2f.s index 60250c9603..9981b4b421 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_2f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_condominiums_2f.h" - .data ScriptEntry _000E ScriptEntry _0068 diff --git a/res/field/scripts/scripts_eterna_city_condominiums_3f.s b/res/field/scripts/scripts_eterna_city_condominiums_3f.s index ddd54f8373..7cc40fb33e 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_3f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_condominiums_3f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_eterna_city_condominiums_4f.s b/res/field/scripts/scripts_eterna_city_condominiums_4f.s index 8806339648..5d31eff39f 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_4f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_condominiums_4f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_eterna_city_dp_gym.s b/res/field/scripts/scripts_eterna_city_dp_gym.s index a2582e059c..2ad7fe4128 100644 --- a/res/field/scripts/scripts_eterna_city_dp_gym.s +++ b/res/field/scripts/scripts_eterna_city_dp_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000C diff --git a/res/field/scripts/scripts_eterna_city_east_house.s b/res/field/scripts/scripts_eterna_city_east_house.s index e3c7c2258b..4f06905732 100644 --- a/res/field/scripts/scripts_eterna_city_east_house.s +++ b/res/field/scripts/scripts_eterna_city_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_east_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_eterna_city_gym.s b/res/field/scripts/scripts_eterna_city_gym.s index d1dc35d877..af5a822b31 100644 --- a/res/field/scripts/scripts_eterna_city_gym.s +++ b/res/field/scripts/scripts_eterna_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_gym.h" - .data ScriptEntry _001E ScriptEntry _0022 diff --git a/res/field/scripts/scripts_eterna_city_mart.s b/res/field/scripts/scripts_eterna_city_mart.s index 1ae42fcd01..57a9ab650a 100644 --- a/res/field/scripts/scripts_eterna_city_mart.s +++ b/res/field/scripts/scripts_eterna_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_eterna_city_north_house.s b/res/field/scripts/scripts_eterna_city_north_house.s index d0c89efffb..3c2a0f465a 100644 --- a/res/field/scripts/scripts_eterna_city_north_house.s +++ b/res/field/scripts/scripts_eterna_city_north_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_north_house.h" - .data ScriptEntry _000E ScriptEntry _0023 diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s index 3f26d3c853..dbd3cbb491 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_pokecenter_1f.h" - .data ScriptEntry _0016 ScriptEntry _0022 diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_2f.s b/res/field/scripts/scripts_eterna_city_pokecenter_2f.s index ad1683f735..036932589c 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_pokecenter_2f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_eterna_city_pokecenter_b1f.s b/res/field/scripts/scripts_eterna_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_eterna_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_eterna_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_eterna_city_south_house.s b/res/field/scripts/scripts_eterna_city_south_house.s index 8ecfa2abb4..94a2de0fd9 100644 --- a/res/field/scripts/scripts_eterna_city_south_house.s +++ b/res/field/scripts/scripts_eterna_city_south_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_south_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_eterna_city_underground_man_house.s b/res/field/scripts/scripts_eterna_city_underground_man_house.s index 324658da34..3a4e72b769 100644 --- a/res/field/scripts/scripts_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_city_underground_man_house.h" - .data ScriptEntry _001A ScriptEntry _0634 diff --git a/res/field/scripts/scripts_eterna_forest.s b/res/field/scripts/scripts_eterna_forest.s index 1f4fbdfc1a..cac2eb9c8f 100644 --- a/res/field/scripts/scripts_eterna_forest.s +++ b/res/field/scripts/scripts_eterna_forest.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_forest.h" - .data ScriptEntry _0047 ScriptEntry _0108 diff --git a/res/field/scripts/scripts_eterna_forest_outside.s b/res/field/scripts/scripts_eterna_forest_outside.s index b19a805c13..6134ee6264 100644 --- a/res/field/scripts/scripts_eterna_forest_outside.s +++ b/res/field/scripts/scripts_eterna_forest_outside.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/eterna_forest_outside.h" - .data ScriptEntry _0012 ScriptEntry _0058 diff --git a/res/field/scripts/scripts_field_moves.s b/res/field/scripts/scripts_field_moves.s index ec56519329..ac45eaef5b 100644 --- a/res/field/scripts/scripts_field_moves.s +++ b/res/field/scripts/scripts_field_moves.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/field_moves.h" - .data ScriptEntry FieldMoves_CutTree ScriptEntry FieldMoves_Rock diff --git a/res/field/scripts/scripts_fight_area.s b/res/field/scripts/scripts_fight_area.s index 13164083c1..79b2f7f98c 100644 --- a/res/field/scripts/scripts_fight_area.s +++ b/res/field/scripts/scripts_fight_area.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fight_area.h" - .data ScriptEntry _00D8 ScriptEntry _049C diff --git a/res/field/scripts/scripts_fight_area_mart.s b/res/field/scripts/scripts_fight_area_mart.s index 4c93ec6f12..4383b4ded0 100644 --- a/res/field/scripts/scripts_fight_area_mart.s +++ b/res/field/scripts/scripts_fight_area_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fight_area_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_fight_area_middle_house.s b/res/field/scripts/scripts_fight_area_middle_house.s index 3fb54b3686..c117a5444d 100644 --- a/res/field/scripts/scripts_fight_area_middle_house.s +++ b/res/field/scripts/scripts_fight_area_middle_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fight_area_middle_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_fight_area_pokecenter_1f.s b/res/field/scripts/scripts_fight_area_pokecenter_1f.s index aa4806e10f..c3eb511da8 100644 --- a/res/field/scripts/scripts_fight_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_fight_area_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fight_area_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_fight_area_pokecenter_2f.s b/res/field/scripts/scripts_fight_area_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_fight_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_fight_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_fight_area_pokecenter_b1f.s b/res/field/scripts/scripts_fight_area_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_fight_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_fight_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_fight_area_south_house.s b/res/field/scripts/scripts_fight_area_south_house.s index 8ed8de4d32..e66294f1d0 100644 --- a/res/field/scripts/scripts_fight_area_south_house.s +++ b/res/field/scripts/scripts_fight_area_south_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fight_area_south_house.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_floaroma_meadow.s b/res/field/scripts/scripts_floaroma_meadow.s index f7b373702c..d3484942f6 100644 --- a/res/field/scripts/scripts_floaroma_meadow.s +++ b/res/field/scripts/scripts_floaroma_meadow.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_meadow.h" - .data ScriptEntry _001E ScriptEntry _0024 diff --git a/res/field/scripts/scripts_floaroma_meadow_house.s b/res/field/scripts/scripts_floaroma_meadow_house.s index 2fe9db7958..7f39d0956b 100644 --- a/res/field/scripts/scripts_floaroma_meadow_house.s +++ b/res/field/scripts/scripts_floaroma_meadow_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_meadow_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_floaroma_town.s b/res/field/scripts/scripts_floaroma_town.s index 8b1f398218..e2ce94c82f 100644 --- a/res/field/scripts/scripts_floaroma_town.s +++ b/res/field/scripts/scripts_floaroma_town.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town.h" - .data ScriptEntry _002E ScriptEntry _0030 diff --git a/res/field/scripts/scripts_floaroma_town_mart.s b/res/field/scripts/scripts_floaroma_town_mart.s index d301a7ec06..b485543115 100644 --- a/res/field/scripts/scripts_floaroma_town_mart.s +++ b/res/field/scripts/scripts_floaroma_town_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_floaroma_town_middle_house.s b/res/field/scripts/scripts_floaroma_town_middle_house.s index d7aa68bf78..60af8eefc2 100644 --- a/res/field/scripts/scripts_floaroma_town_middle_house.s +++ b/res/field/scripts/scripts_floaroma_town_middle_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town_middle_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s index 4fa525d0ef..04d2153eb5 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_2f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_floaroma_town_pokecenter_b1f.s b/res/field/scripts/scripts_floaroma_town_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_floaroma_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_floaroma_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_floaroma_town_southeast_house.s b/res/field/scripts/scripts_floaroma_town_southeast_house.s index cf25d94c61..e166bf3ff0 100644 --- a/res/field/scripts/scripts_floaroma_town_southeast_house.s +++ b/res/field/scripts/scripts_floaroma_town_southeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/floaroma_town_southeast_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_flower_paradise.s b/res/field/scripts/scripts_flower_paradise.s index edcd08b92a..a39dc5ee7c 100644 --- a/res/field/scripts/scripts_flower_paradise.s +++ b/res/field/scripts/scripts_flower_paradise.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/flower_paradise.h" - .data ScriptEntry _000E ScriptEntry _0062 diff --git a/res/field/scripts/scripts_flower_shop.s b/res/field/scripts/scripts_flower_shop.s index 2ddee25cc5..8fc1ce0377 100644 --- a/res/field/scripts/scripts_flower_shop.s +++ b/res/field/scripts/scripts_flower_shop.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/flower_shop.h" - .data ScriptEntry _000E ScriptEntry _006E diff --git a/res/field/scripts/scripts_follower_partners.s b/res/field/scripts/scripts_follower_partners.s index 35a1d7a6d7..ffc50f6856 100644 --- a/res/field/scripts/scripts_follower_partners.s +++ b/res/field/scripts/scripts_follower_partners.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/follower_partners.h" - .data ScriptEntry FollowerPartners_Rival ScriptEntry _00F9 diff --git a/res/field/scripts/scripts_footstep_house.s b/res/field/scripts/scripts_footstep_house.s index 4329885ffc..4b34053b04 100644 --- a/res/field/scripts/scripts_footstep_house.s +++ b/res/field/scripts/scripts_footstep_house.s @@ -7,7 +7,6 @@ #define LOCALID_FOOTPRINT_TYPE VAR_0x8001 #define LOCALID_PARTY_SLOT VAR_0x8002 - .data ScriptEntry _000A ScriptEntry FootstepHouse_DrFootstep diff --git a/res/field/scripts/scripts_foreign_building.s b/res/field/scripts/scripts_foreign_building.s index 07ab54c79a..a27c4f15bb 100644 --- a/res/field/scripts/scripts_foreign_building.s +++ b/res/field/scripts/scripts_foreign_building.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/foreign_building.h" - .data ScriptEntry _0026 ScriptEntry _0039 diff --git a/res/field/scripts/scripts_fuego_ironworks_building.s b/res/field/scripts/scripts_fuego_ironworks_building.s index c8f8d1d26c..b41ba9c933 100644 --- a/res/field/scripts/scripts_fuego_ironworks_building.s +++ b/res/field/scripts/scripts_fuego_ironworks_building.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fuego_ironworks_building.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_fuego_ironworks_outside.s b/res/field/scripts/scripts_fuego_ironworks_outside.s index 253936efcf..65bf91efb9 100644 --- a/res/field/scripts/scripts_fuego_ironworks_outside.s +++ b/res/field/scripts/scripts_fuego_ironworks_outside.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_fullmoon_island.s b/res/field/scripts/scripts_fullmoon_island.s index 231b68e35a..2240998284 100644 --- a/res/field/scripts/scripts_fullmoon_island.s +++ b/res/field/scripts/scripts_fullmoon_island.s @@ -2,7 +2,6 @@ #include "generated/hidden_locations.h" #include "res/text/bank/fullmoon_island.h" - .data ScriptEntry _000A ScriptEntry _0015 diff --git a/res/field/scripts/scripts_fullmoon_island_forest.s b/res/field/scripts/scripts_fullmoon_island_forest.s index 3fb86c0051..5c183316ab 100644 --- a/res/field/scripts/scripts_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_fullmoon_island_forest.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/fullmoon_island_forest.h" - .data ScriptEntry _000A ScriptEntry _000C diff --git a/res/field/scripts/scripts_galactic_hq_1f.s b/res/field/scripts/scripts_galactic_hq_1f.s index 22d61dc30d..ad983c1359 100644 --- a/res/field/scripts/scripts_galactic_hq_1f.s +++ b/res/field/scripts/scripts_galactic_hq_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_1f.h" - .data ScriptEntry _0022 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_galactic_hq_2f.s b/res/field/scripts/scripts_galactic_hq_2f.s index 3e029f9537..878997f515 100644 --- a/res/field/scripts/scripts_galactic_hq_2f.s +++ b/res/field/scripts/scripts_galactic_hq_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_2f.h" - .data ScriptEntry _001E ScriptEntry _007A diff --git a/res/field/scripts/scripts_galactic_hq_3f.s b/res/field/scripts/scripts_galactic_hq_3f.s index 375d4967bf..bb60c6ac6b 100644 --- a/res/field/scripts/scripts_galactic_hq_3f.s +++ b/res/field/scripts/scripts_galactic_hq_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_3f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_galactic_hq_4f.s b/res/field/scripts/scripts_galactic_hq_4f.s index a9476ec192..f29e13d51c 100644 --- a/res/field/scripts/scripts_galactic_hq_4f.s +++ b/res/field/scripts/scripts_galactic_hq_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_4f.h" - .data ScriptEntry _0012 ScriptEntry _012C diff --git a/res/field/scripts/scripts_galactic_hq_b1f.s b/res/field/scripts/scripts_galactic_hq_b1f.s index 70b10d7163..27b2b580f6 100644 --- a/res/field/scripts/scripts_galactic_hq_b1f.s +++ b/res/field/scripts/scripts_galactic_hq_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_b1f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_galactic_hq_b2f.s b/res/field/scripts/scripts_galactic_hq_b2f.s index 3e25b390a4..2c157f9bce 100644 --- a/res/field/scripts/scripts_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_galactic_hq_b2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_b2f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_galactic_hq_control_room.s b/res/field/scripts/scripts_galactic_hq_control_room.s index 6ab2584792..4972f35c57 100644 --- a/res/field/scripts/scripts_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_galactic_hq_control_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_control_room.h" - .data ScriptEntry _003E ScriptEntry _0055 diff --git a/res/field/scripts/scripts_galactic_hq_hall.s b/res/field/scripts/scripts_galactic_hq_hall.s index 03ff5c0904..a70a2a03b1 100644 --- a/res/field/scripts/scripts_galactic_hq_hall.s +++ b/res/field/scripts/scripts_galactic_hq_hall.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_hall.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_galactic_hq_laboratory.s b/res/field/scripts/scripts_galactic_hq_laboratory.s index 6799a2451b..eeb0324dfa 100644 --- a/res/field/scripts/scripts_galactic_hq_laboratory.s +++ b/res/field/scripts/scripts_galactic_hq_laboratory.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/galactic_hq_laboratory.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_game_corner.s b/res/field/scripts/scripts_game_corner.s index 1605847d60..50540d4a9a 100644 --- a/res/field/scripts/scripts_game_corner.s +++ b/res/field/scripts/scripts_game_corner.s @@ -3,7 +3,6 @@ #define LOCALID_SLOT_MACHINE_ID VAR_0x8004 - .data ScriptEntry GameCorner_SlotMachine_0 ScriptEntry GameCorner_SlotMachine_1 diff --git a/res/field/scripts/scripts_gate_between_eterna_city_route_206.s b/res/field/scripts/scripts_gate_between_eterna_city_route_206.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_gate_between_eterna_city_route_206.s +++ b/res/field/scripts/scripts_gate_between_eterna_city_route_206.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_global_terminal_1f.s b/res/field/scripts/scripts_global_terminal_1f.s index ef7ef49441..24331d2f58 100644 --- a/res/field/scripts/scripts_global_terminal_1f.s +++ b/res/field/scripts/scripts_global_terminal_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/global_terminal_1f.h" - .data ScriptEntry _00F0 ScriptEntry _00F2 diff --git a/res/field/scripts/scripts_global_terminal_2f.s b/res/field/scripts/scripts_global_terminal_2f.s index cc5201fce4..3d0bdc99e7 100644 --- a/res/field/scripts/scripts_global_terminal_2f.s +++ b/res/field/scripts/scripts_global_terminal_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/global_terminal_2f.h" - .data ScriptEntry _0107 ScriptEntry _003A diff --git a/res/field/scripts/scripts_global_terminal_3f.s b/res/field/scripts/scripts_global_terminal_3f.s index 9733f26ad0..a438eef09a 100644 --- a/res/field/scripts/scripts_global_terminal_3f.s +++ b/res/field/scripts/scripts_global_terminal_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/global_terminal_3f.h" - .data ScriptEntry _0103 ScriptEntry _0036 diff --git a/res/field/scripts/scripts_grand_lake_route_213_east_house.s b/res/field/scripts/scripts_grand_lake_route_213_east_house.s index 57a975875e..95bed73560 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_east_house.s +++ b/res/field/scripts/scripts_grand_lake_route_213_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_route_213_east_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_grand_lake_route_213_lobby.s b/res/field/scripts/scripts_grand_lake_route_213_lobby.s index 500cad8df0..cb2411efd1 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_lobby.s +++ b/res/field/scripts/scripts_grand_lake_route_213_lobby.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_route_213_lobby.h" - .data ScriptEntry _0012 ScriptEntry _0014 diff --git a/res/field/scripts/scripts_grand_lake_route_213_northeast_house.s b/res/field/scripts/scripts_grand_lake_route_213_northeast_house.s index 25467e0ef2..fd9ce02fc7 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_northeast_house.s +++ b/res/field/scripts/scripts_grand_lake_route_213_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_route_213_northeast_house.h" - .data ScriptEntry _000A ScriptEntry _0045 diff --git a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s index 38e6a21b16..2c5d87d22c 100644 --- a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s +++ b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_route_213_northwest_house.h" - .data ScriptEntry _000E ScriptEntry _0068 diff --git a/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s b/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s index a166762b33..f3ea46daef 100644 --- a/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s +++ b/res/field/scripts/scripts_grand_lake_valor_lakefront_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_valor_lakefront_east_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s b/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s index 9b68cc461c..f718401f09 100644 --- a/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s +++ b/res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/grand_lake_valor_lakefront_west_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_great_marsh_1.s b/res/field/scripts/scripts_great_marsh_1.s index aea6771a77..8793af1409 100644 --- a/res/field/scripts/scripts_great_marsh_1.s +++ b/res/field/scripts/scripts_great_marsh_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_1.h" - .data ScriptEntry _001D ScriptEntry _000A diff --git a/res/field/scripts/scripts_great_marsh_2.s b/res/field/scripts/scripts_great_marsh_2.s index 4fab601bfa..5a7651b157 100644 --- a/res/field/scripts/scripts_great_marsh_2.s +++ b/res/field/scripts/scripts_great_marsh_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_2.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_great_marsh_3.s b/res/field/scripts/scripts_great_marsh_3.s index 32fcba5acd..808ba20806 100644 --- a/res/field/scripts/scripts_great_marsh_3.s +++ b/res/field/scripts/scripts_great_marsh_3.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_3.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_great_marsh_4.s b/res/field/scripts/scripts_great_marsh_4.s index 760b49438f..74c152f066 100644 --- a/res/field/scripts/scripts_great_marsh_4.s +++ b/res/field/scripts/scripts_great_marsh_4.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_4.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_great_marsh_5.s b/res/field/scripts/scripts_great_marsh_5.s index 6e700e86d4..17642299a9 100644 --- a/res/field/scripts/scripts_great_marsh_5.s +++ b/res/field/scripts/scripts_great_marsh_5.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_5.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_great_marsh_6.s b/res/field/scripts/scripts_great_marsh_6.s index 004d9d1dcc..ad9b9a9cd4 100644 --- a/res/field/scripts/scripts_great_marsh_6.s +++ b/res/field/scripts/scripts_great_marsh_6.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/great_marsh_6.h" - .data ScriptEntry _000A ScriptEntry _00D1 diff --git a/res/field/scripts/scripts_hall_of_origin.s b/res/field/scripts/scripts_hall_of_origin.s index 3ee38328ff..f793cca78e 100644 --- a/res/field/scripts/scripts_hall_of_origin.s +++ b/res/field/scripts/scripts_hall_of_origin.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/hall_of_origin.h" - .data ScriptEntry _003B ScriptEntry _0056 diff --git a/res/field/scripts/scripts_hearthome_city.s b/res/field/scripts/scripts_hearthome_city.s index 393a3446af..e2ea68582b 100644 --- a/res/field/scripts/scripts_hearthome_city.s +++ b/res/field/scripts/scripts_hearthome_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city.h" - .data ScriptEntry _0082 ScriptEntry _0084 diff --git a/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_1.s b/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_1.s index db022e5099..20a2086604 100644 --- a/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_1.s +++ b/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_dp_gym_elevator_room_1.h" - .data ScriptEntry _0012 ScriptEntry _0016 diff --git a/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_2.s b/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_2.s index afb40e3893..618edc9524 100644 --- a/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_2.s +++ b/res/field/scripts/scripts_hearthome_city_dp_gym_elevator_room_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_dp_gym_elevator_room_2.h" - .data ScriptEntry _0012 ScriptEntry _0016 diff --git a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s index 0a9a80162c..bde79dc913 100644 --- a/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_dp_gym_leader_room.h" - .data ScriptEntry _0014 ScriptEntry _012B diff --git a/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s b/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s index f1352885a5..245ed53309 100644 --- a/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s +++ b/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_east_gate_to_amity_square.h" - .data ScriptEntry _002D ScriptEntry _0040 diff --git a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s index 8f33e092e0..29fd8115c7 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_entrance_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_gym_entrance_room.h" - .data ScriptEntry _000E ScriptEntry _0078 diff --git a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s index cf2f39bfd0..e577c7b6c1 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_leader_room.s +++ b/res/field/scripts/scripts_hearthome_city_gym_leader_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_gym_leader_room.h" - .data ScriptEntry _0039 ScriptEntry _0158 diff --git a/res/field/scripts/scripts_hearthome_city_gym_trainer_room_1.s b/res/field/scripts/scripts_hearthome_city_gym_trainer_room_1.s index e32c7095d6..73cd05dbd5 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_trainer_room_1.s +++ b/res/field/scripts/scripts_hearthome_city_gym_trainer_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_gym_trainer_room_2.s b/res/field/scripts/scripts_hearthome_city_gym_trainer_room_2.s index e32c7095d6..73cd05dbd5 100644 --- a/res/field/scripts/scripts_hearthome_city_gym_trainer_room_2.s +++ b/res/field/scripts/scripts_hearthome_city_gym_trainer_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_mart.s b/res/field/scripts/scripts_hearthome_city_mart.s index 7caf91f334..5bc7e45d68 100644 --- a/res/field/scripts/scripts_hearthome_city_mart.s +++ b/res/field/scripts/scripts_hearthome_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s b/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s index d78914385a..aec9588011 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_northeast_house_1f.h" - .data ScriptEntry _0026 ScriptEntry _0039 diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s b/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s index fc41f71415..93fd1a559e 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_northeast_house_2f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s index cf749f9528..7bb068a74d 100644 --- a/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_northeast_house_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_northwest_house.s b/res/field/scripts/scripts_hearthome_city_northwest_house.s index 035d2e0800..6020d12b8e 100644 --- a/res/field/scripts/scripts_hearthome_city_northwest_house.s +++ b/res/field/scripts/scripts_hearthome_city_northwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_northwest_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s index 7f74738e12..24d84a159c 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_2f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_pokecenter_b1f.s b/res/field/scripts/scripts_hearthome_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_hearthome_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_hearthome_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s index ee25ea78a5..bc1c39ed53 100644 --- a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s +++ b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_pokemon_fan_club.h" - .data ScriptEntry _0039 ScriptEntry _0098 diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s index f51d37f1d2..8bbb0fad33 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_southeast_house_1f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s index 3cfa0c773b..c48caec235 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_southeast_house_2f.h" - .data ScriptEntry _000A ScriptEntry _006E diff --git a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s index 9e6b1f7260..dee9a11fe1 100644 --- a/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s +++ b/res/field/scripts/scripts_hearthome_city_southeast_house_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s b/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s index 87ca1752b0..f74d9231b1 100644 --- a/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s +++ b/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/hearthome_city_west_gate_to_amity_square.h" - .data ScriptEntry _0031 ScriptEntry _0044 diff --git a/res/field/scripts/scripts_iceberg_ruins.s b/res/field/scripts/scripts_iceberg_ruins.s index 402ac03579..09793a672d 100644 --- a/res/field/scripts/scripts_iceberg_ruins.s +++ b/res/field/scripts/scripts_iceberg_ruins.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/iceberg_ruins.h" - .data ScriptEntry _0026 ScriptEntry _003D diff --git a/res/field/scripts/scripts_init_acuity_cavern.s b/res/field/scripts/scripts_init_acuity_cavern.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_acuity_cavern.s +++ b/res/field/scripts/scripts_init_acuity_cavern.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_acuity_lakefront.s b/res/field/scripts/scripts_init_acuity_lakefront.s index 133f4ff632..f94eae511b 100644 --- a/res/field/scripts/scripts_init_acuity_lakefront.s +++ b/res/field/scripts/scripts_init_acuity_lakefront.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 2, 0 diff --git a/res/field/scripts/scripts_init_amity_square.s b/res/field/scripts/scripts_init_amity_square.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_amity_square.s +++ b/res/field/scripts/scripts_init_amity_square.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battle_arcade.s b/res/field/scripts/scripts_init_battle_arcade.s index 58f0a452df..491c67df73 100644 --- a/res/field/scripts/scripts_init_battle_arcade.s +++ b/res/field/scripts/scripts_init_battle_arcade.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 15, 0 diff --git a/res/field/scripts/scripts_init_battle_castle.s b/res/field/scripts/scripts_init_battle_castle.s index a3b9c3cb7a..a52b25c966 100644 --- a/res/field/scripts/scripts_init_battle_castle.s +++ b/res/field/scripts/scripts_init_battle_castle.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 14, 0 diff --git a/res/field/scripts/scripts_init_battle_factory.s b/res/field/scripts/scripts_init_battle_factory.s index 8a8c797dd6..f2e02963ac 100644 --- a/res/field/scripts/scripts_init_battle_factory.s +++ b/res/field/scripts/scripts_init_battle_factory.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 14, 0 diff --git a/res/field/scripts/scripts_init_battle_frontier.s b/res/field/scripts/scripts_init_battle_frontier.s index b28d115894..3227a39aa5 100644 --- a/res/field/scripts/scripts_init_battle_frontier.s +++ b/res/field/scripts/scripts_init_battle_frontier.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 38, 0 diff --git a/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s b/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s index 983fd9a9d8..b7e6300686 100644 --- a/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s +++ b/res/field/scripts/scripts_init_battle_frontier_gate_to_fight_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 12, 0 diff --git a/res/field/scripts/scripts_init_battle_hall.s b/res/field/scripts/scripts_init_battle_hall.s index edf3be6fdf..fdca836146 100644 --- a/res/field/scripts/scripts_init_battle_hall.s +++ b/res/field/scripts/scripts_init_battle_hall.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 21, 0 diff --git a/res/field/scripts/scripts_init_battle_park.s b/res/field/scripts/scripts_init_battle_park.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_battle_park.s +++ b/res/field/scripts/scripts_init_battle_park.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_battle_park_exchange_service_corner.s b/res/field/scripts/scripts_init_battle_park_exchange_service_corner.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_battle_park_exchange_service_corner.s +++ b/res/field/scripts/scripts_init_battle_park_exchange_service_corner.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s b/res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s +++ b/res/field/scripts/scripts_init_battle_park_gate_to_fight_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_battle_tower.s b/res/field/scripts/scripts_init_battle_tower.s index f995b65ebe..b7c1972a7f 100644 --- a/res/field/scripts/scripts_init_battle_tower.s +++ b/res/field/scripts/scripts_init_battle_tower.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 22, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_battle_room.s b/res/field/scripts/scripts_init_battle_tower_battle_room.s index 74b3e5664f..455190e653 100644 --- a/res/field/scripts/scripts_init_battle_tower_battle_room.s +++ b/res/field/scripts/scripts_init_battle_tower_battle_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_battle_salon.s b/res/field/scripts/scripts_init_battle_tower_battle_salon.s index 8fea4a25a5..64f6030e68 100644 --- a/res/field/scripts/scripts_init_battle_tower_battle_salon.s +++ b/res/field/scripts/scripts_init_battle_tower_battle_salon.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_corridor.s b/res/field/scripts/scripts_init_battle_tower_corridor.s index 649e9eb066..b5e0d47f1a 100644 --- a/res/field/scripts/scripts_init_battle_tower_corridor.s +++ b/res/field/scripts/scripts_init_battle_tower_corridor.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_corridor_multi.s b/res/field/scripts/scripts_init_battle_tower_corridor_multi.s index 50f165bd1e..5e91460601 100644 --- a/res/field/scripts/scripts_init_battle_tower_corridor_multi.s +++ b/res/field/scripts/scripts_init_battle_tower_corridor_multi.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_elevator.s b/res/field/scripts/scripts_init_battle_tower_elevator.s index 1735eb9fdb..2ae9666c39 100644 --- a/res/field/scripts/scripts_init_battle_tower_elevator.s +++ b/res/field/scripts/scripts_init_battle_tower_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battle_tower_multi_battle_room.s b/res/field/scripts/scripts_init_battle_tower_multi_battle_room.s index f438a2123e..17f53c576a 100644 --- a/res/field/scripts/scripts_init_battle_tower_multi_battle_room.s +++ b/res/field/scripts/scripts_init_battle_tower_multi_battle_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_battleground.s b/res/field/scripts/scripts_init_battleground.s index c022e585b5..63e81597e3 100644 --- a/res/field/scripts/scripts_init_battleground.s +++ b/res/field/scripts/scripts_init_battleground.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_cafe.s b/res/field/scripts/scripts_init_cafe.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_cafe.s +++ b/res/field/scripts/scripts_init_cafe.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_canalave_city.s b/res/field/scripts/scripts_init_canalave_city.s index c16fcc2dc2..541aabb47f 100644 --- a/res/field/scripts/scripts_init_canalave_city.s +++ b/res/field/scripts/scripts_init_canalave_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_east_house.s b/res/field/scripts/scripts_init_canalave_city_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_canalave_city_east_house.s +++ b/res/field/scripts/scripts_init_canalave_city_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_canalave_city_gym.s b/res/field/scripts/scripts_init_canalave_city_gym.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_canalave_city_gym.s +++ b/res/field/scripts/scripts_init_canalave_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_harbor_inn.s b/res/field/scripts/scripts_init_canalave_city_harbor_inn.s index 99472ef74e..2286de454a 100644 --- a/res/field/scripts/scripts_init_canalave_city_harbor_inn.s +++ b/res/field/scripts/scripts_init_canalave_city_harbor_inn.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_mart.s b/res/field/scripts/scripts_init_canalave_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_canalave_city_mart.s +++ b/res/field/scripts/scripts_init_canalave_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_pokecenter_1f.s b/res/field/scripts/scripts_init_canalave_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_canalave_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_canalave_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_pokecenter_2f.s b/res/field/scripts/scripts_init_canalave_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_canalave_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_canalave_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_canalave_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_canalave_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_canalave_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_sailor_eldritch_house.s b/res/field/scripts/scripts_init_canalave_city_sailor_eldritch_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_canalave_city_sailor_eldritch_house.s +++ b/res/field/scripts/scripts_init_canalave_city_sailor_eldritch_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_canalave_city_southeast_house.s b/res/field/scripts/scripts_init_canalave_city_southeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_canalave_city_southeast_house.s +++ b/res/field/scripts/scripts_init_canalave_city_southeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_canalave_city_west_house.s b/res/field/scripts/scripts_init_canalave_city_west_house.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_canalave_city_west_house.s +++ b/res/field/scripts/scripts_init_canalave_city_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_canalave_library_1f.s b/res/field/scripts/scripts_init_canalave_library_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_canalave_library_1f.s +++ b/res/field/scripts/scripts_init_canalave_library_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_canalave_library_2f.s b/res/field/scripts/scripts_init_canalave_library_2f.s index 1ce8e2a6e1..7c05227a75 100644 --- a/res/field/scripts/scripts_init_canalave_library_2f.s +++ b/res/field/scripts/scripts_init_canalave_library_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_canalave_library_3f.s b/res/field/scripts/scripts_init_canalave_library_3f.s index 3b80fa29c5..283919f4f2 100644 --- a/res/field/scripts/scripts_init_canalave_library_3f.s +++ b/res/field/scripts/scripts_init_canalave_library_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_celestic_town.s b/res/field/scripts/scripts_init_celestic_town.s index 7d8ced050f..927ad528b5 100644 --- a/res/field/scripts/scripts_init_celestic_town.s +++ b/res/field/scripts/scripts_init_celestic_town.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_celestic_town_cave.s b/res/field/scripts/scripts_init_celestic_town_cave.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_celestic_town_cave.s +++ b/res/field/scripts/scripts_init_celestic_town_cave.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_celestic_town_north_house.s b/res/field/scripts/scripts_init_celestic_town_north_house.s index 76de2716fd..bc28f65937 100644 --- a/res/field/scripts/scripts_init_celestic_town_north_house.s +++ b/res/field/scripts/scripts_init_celestic_town_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_celestic_town_northeast_house.s b/res/field/scripts/scripts_init_celestic_town_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_celestic_town_northeast_house.s +++ b/res/field/scripts/scripts_init_celestic_town_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_celestic_town_northwest_house.s b/res/field/scripts/scripts_init_celestic_town_northwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_celestic_town_northwest_house.s +++ b/res/field/scripts/scripts_init_celestic_town_northwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_celestic_town_pokecenter_1f.s b/res/field/scripts/scripts_init_celestic_town_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_celestic_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_celestic_town_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_celestic_town_pokecenter_2f.s b/res/field/scripts/scripts_init_celestic_town_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_celestic_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_celestic_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_celestic_town_pokecenter_b1f.s b/res/field/scripts/scripts_init_celestic_town_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_celestic_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_celestic_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_celestic_town_southwest_house.s b/res/field/scripts/scripts_init_celestic_town_southwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_celestic_town_southwest_house.s +++ b/res/field/scripts/scripts_init_celestic_town_southwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_communication_club_colosseum_2p.s b/res/field/scripts/scripts_init_communication_club_colosseum_2p.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_communication_club_colosseum_2p.s +++ b/res/field/scripts/scripts_init_communication_club_colosseum_2p.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_communication_club_colosseum_4p.s b/res/field/scripts/scripts_init_communication_club_colosseum_4p.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_communication_club_colosseum_4p.s +++ b/res/field/scripts/scripts_init_communication_club_colosseum_4p.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_contest_hall_lobby.s b/res/field/scripts/scripts_init_contest_hall_lobby.s index 295136faa3..0269dd0ff8 100644 --- a/res/field/scripts/scripts_init_contest_hall_lobby.s +++ b/res/field/scripts/scripts_init_contest_hall_lobby.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x264B, 0 diff --git a/res/field/scripts/scripts_init_contest_hall_stage_no_contest.s b/res/field/scripts/scripts_init_contest_hall_stage_no_contest.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_contest_hall_stage_no_contest.s +++ b/res/field/scripts/scripts_init_contest_hall_stage_no_contest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_contest_hall_stage_ongoing_contest.s b/res/field/scripts/scripts_init_contest_hall_stage_ongoing_contest.s index 3c3853db10..ee8cda5e21 100644 --- a/res/field/scripts/scripts_init_contest_hall_stage_ongoing_contest.s +++ b/res/field/scripts/scripts_init_contest_hall_stage_ongoing_contest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x264C, 0 diff --git a/res/field/scripts/scripts_init_cycle_shop.s b/res/field/scripts/scripts_init_cycle_shop.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_cycle_shop.s +++ b/res/field/scripts/scripts_init_cycle_shop.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_distortion_world_1f.s b/res/field/scripts/scripts_init_distortion_world_1f.s index 97c339bb73..f8b6a55525 100644 --- a/res/field/scripts/scripts_init_distortion_world_1f.s +++ b/res/field/scripts/scripts_init_distortion_world_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b1f.s b/res/field/scripts/scripts_init_distortion_world_b1f.s index 000f58d00c..2e8f209cfb 100644 --- a/res/field/scripts/scripts_init_distortion_world_b1f.s +++ b/res/field/scripts/scripts_init_distortion_world_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b2f.s b/res/field/scripts/scripts_init_distortion_world_b2f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_b2f.s +++ b/res/field/scripts/scripts_init_distortion_world_b2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b3f.s b/res/field/scripts/scripts_init_distortion_world_b3f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_b3f.s +++ b/res/field/scripts/scripts_init_distortion_world_b3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b4f.s b/res/field/scripts/scripts_init_distortion_world_b4f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_b4f.s +++ b/res/field/scripts/scripts_init_distortion_world_b4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b5f.s b/res/field/scripts/scripts_init_distortion_world_b5f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_b5f.s +++ b/res/field/scripts/scripts_init_distortion_world_b5f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b6f.s b/res/field/scripts/scripts_init_distortion_world_b6f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_b6f.s +++ b/res/field/scripts/scripts_init_distortion_world_b6f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_b7f.s b/res/field/scripts/scripts_init_distortion_world_b7f.s index 0085c36cf0..19ff8c05d8 100644 --- a/res/field/scripts/scripts_init_distortion_world_b7f.s +++ b/res/field/scripts/scripts_init_distortion_world_b7f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_giratina_room.s b/res/field/scripts/scripts_init_distortion_world_giratina_room.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_distortion_world_giratina_room.s +++ b/res/field/scripts/scripts_init_distortion_world_giratina_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_distortion_world_turnback_cave_room.s b/res/field/scripts/scripts_init_distortion_world_turnback_cave_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_distortion_world_turnback_cave_room.s +++ b/res/field/scripts/scripts_init_distortion_world_turnback_cave_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_empty.s b/res/field/scripts/scripts_init_empty.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_empty.s +++ b/res/field/scripts/scripts_init_empty.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city.s b/res/field/scripts/scripts_init_eterna_city.s index 04f2500835..96c2c199aa 100644 --- a/res/field/scripts/scripts_init_eterna_city.s +++ b/res/field/scripts/scripts_init_eterna_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 21, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_condominiums_1f.s b/res/field/scripts/scripts_init_eterna_city_condominiums_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_condominiums_1f.s +++ b/res/field/scripts/scripts_init_eterna_city_condominiums_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_condominiums_2f.s b/res/field/scripts/scripts_init_eterna_city_condominiums_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_condominiums_2f.s +++ b/res/field/scripts/scripts_init_eterna_city_condominiums_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_condominiums_3f.s b/res/field/scripts/scripts_init_eterna_city_condominiums_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_condominiums_3f.s +++ b/res/field/scripts/scripts_init_eterna_city_condominiums_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_condominiums_4f.s b/res/field/scripts/scripts_init_eterna_city_condominiums_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_condominiums_4f.s +++ b/res/field/scripts/scripts_init_eterna_city_condominiums_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_dp_gym.s b/res/field/scripts/scripts_init_eterna_city_dp_gym.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_eterna_city_dp_gym.s +++ b/res/field/scripts/scripts_init_eterna_city_dp_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_east_house.s b/res/field/scripts/scripts_init_eterna_city_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_east_house.s +++ b/res/field/scripts/scripts_init_eterna_city_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_gym.s b/res/field/scripts/scripts_init_eterna_city_gym.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_eterna_city_gym.s +++ b/res/field/scripts/scripts_init_eterna_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_mart.s b/res/field/scripts/scripts_init_eterna_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_eterna_city_mart.s +++ b/res/field/scripts/scripts_init_eterna_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_north_house.s b/res/field/scripts/scripts_init_eterna_city_north_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_north_house.s +++ b/res/field/scripts/scripts_init_eterna_city_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_pokecenter_1f.s b/res/field/scripts/scripts_init_eterna_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_eterna_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_eterna_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_pokecenter_2f.s b/res/field/scripts/scripts_init_eterna_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_eterna_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_eterna_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_eterna_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_eterna_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_eterna_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_eterna_city_south_house.s b/res/field/scripts/scripts_init_eterna_city_south_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_south_house.s +++ b/res/field/scripts/scripts_init_eterna_city_south_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_city_underground_man_house.s b/res/field/scripts/scripts_init_eterna_city_underground_man_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_eterna_city_underground_man_house.s +++ b/res/field/scripts/scripts_init_eterna_city_underground_man_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_eterna_forest.s b/res/field/scripts/scripts_init_eterna_forest.s index 7ace15c14e..433c964e25 100644 --- a/res/field/scripts/scripts_init_eterna_forest.s +++ b/res/field/scripts/scripts_init_eterna_forest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 11, 0 diff --git a/res/field/scripts/scripts_init_eterna_forest_outside.s b/res/field/scripts/scripts_init_eterna_forest_outside.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_eterna_forest_outside.s +++ b/res/field/scripts/scripts_init_eterna_forest_outside.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_fight_area.s b/res/field/scripts/scripts_init_fight_area.s index 084823e814..8c818bdd7b 100644 --- a/res/field/scripts/scripts_init_fight_area.s +++ b/res/field/scripts/scripts_init_fight_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 15, 0 diff --git a/res/field/scripts/scripts_init_fight_area_mart.s b/res/field/scripts/scripts_init_fight_area_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_fight_area_mart.s +++ b/res/field/scripts/scripts_init_fight_area_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_fight_area_middle_house.s b/res/field/scripts/scripts_init_fight_area_middle_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_fight_area_middle_house.s +++ b/res/field/scripts/scripts_init_fight_area_middle_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_fight_area_pokecenter_1f.s b/res/field/scripts/scripts_init_fight_area_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_fight_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_fight_area_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_fight_area_pokecenter_2f.s b/res/field/scripts/scripts_init_fight_area_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_fight_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_fight_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_fight_area_pokecenter_b1f.s b/res/field/scripts/scripts_init_fight_area_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_fight_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_fight_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_fight_area_south_house.s b/res/field/scripts/scripts_init_fight_area_south_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_fight_area_south_house.s +++ b/res/field/scripts/scripts_init_fight_area_south_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_floaroma_meadow.s b/res/field/scripts/scripts_init_floaroma_meadow.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_floaroma_meadow.s +++ b/res/field/scripts/scripts_init_floaroma_meadow.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_floaroma_meadow_house.s b/res/field/scripts/scripts_init_floaroma_meadow_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_floaroma_meadow_house.s +++ b/res/field/scripts/scripts_init_floaroma_meadow_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_floaroma_town.s b/res/field/scripts/scripts_init_floaroma_town.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_floaroma_town.s +++ b/res/field/scripts/scripts_init_floaroma_town.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_mart.s b/res/field/scripts/scripts_init_floaroma_town_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_floaroma_town_mart.s +++ b/res/field/scripts/scripts_init_floaroma_town_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_middle_house.s b/res/field/scripts/scripts_init_floaroma_town_middle_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_floaroma_town_middle_house.s +++ b/res/field/scripts/scripts_init_floaroma_town_middle_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_pokecenter_1f.s b/res/field/scripts/scripts_init_floaroma_town_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_floaroma_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_floaroma_town_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_pokecenter_2f.s b/res/field/scripts/scripts_init_floaroma_town_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_floaroma_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_floaroma_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_pokecenter_b1f.s b/res/field/scripts/scripts_init_floaroma_town_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_floaroma_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_floaroma_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_floaroma_town_southeast_house.s b/res/field/scripts/scripts_init_floaroma_town_southeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_floaroma_town_southeast_house.s +++ b/res/field/scripts/scripts_init_floaroma_town_southeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_flower_paradise.s b/res/field/scripts/scripts_init_flower_paradise.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_flower_paradise.s +++ b/res/field/scripts/scripts_init_flower_paradise.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_flower_shop.s b/res/field/scripts/scripts_init_flower_shop.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_flower_shop.s +++ b/res/field/scripts/scripts_init_flower_shop.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_footstep_house.s b/res/field/scripts/scripts_init_footstep_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_footstep_house.s +++ b/res/field/scripts/scripts_init_footstep_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_foreign_building.s b/res/field/scripts/scripts_init_foreign_building.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_foreign_building.s +++ b/res/field/scripts/scripts_init_foreign_building.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_fuego_ironworks_building.s b/res/field/scripts/scripts_init_fuego_ironworks_building.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_fuego_ironworks_building.s +++ b/res/field/scripts/scripts_init_fuego_ironworks_building.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_fuego_ironworks_outside.s b/res/field/scripts/scripts_init_fuego_ironworks_outside.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_fuego_ironworks_outside.s +++ b/res/field/scripts/scripts_init_fuego_ironworks_outside.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_fullmoon_island.s b/res/field/scripts/scripts_init_fullmoon_island.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_fullmoon_island.s +++ b/res/field/scripts/scripts_init_fullmoon_island.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_fullmoon_island_forest.s b/res/field/scripts/scripts_init_fullmoon_island_forest.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_fullmoon_island_forest.s +++ b/res/field/scripts/scripts_init_fullmoon_island_forest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_1f.s b/res/field/scripts/scripts_init_galactic_hq_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_galactic_hq_1f.s +++ b/res/field/scripts/scripts_init_galactic_hq_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_2f.s b/res/field/scripts/scripts_init_galactic_hq_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_2f.s +++ b/res/field/scripts/scripts_init_galactic_hq_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_3f.s b/res/field/scripts/scripts_init_galactic_hq_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_3f.s +++ b/res/field/scripts/scripts_init_galactic_hq_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_4f.s b/res/field/scripts/scripts_init_galactic_hq_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_4f.s +++ b/res/field/scripts/scripts_init_galactic_hq_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_b1f.s b/res/field/scripts/scripts_init_galactic_hq_b1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_b1f.s +++ b/res/field/scripts/scripts_init_galactic_hq_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_b2f.s b/res/field/scripts/scripts_init_galactic_hq_b2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_b2f.s +++ b/res/field/scripts/scripts_init_galactic_hq_b2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_control_room.s b/res/field/scripts/scripts_init_galactic_hq_control_room.s index ce6f4dc72d..5a764bdb09 100644 --- a/res/field/scripts/scripts_init_galactic_hq_control_room.s +++ b/res/field/scripts/scripts_init_galactic_hq_control_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_hall.s b/res/field/scripts/scripts_init_galactic_hq_hall.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_hall.s +++ b/res/field/scripts/scripts_init_galactic_hq_hall.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_galactic_hq_laboratory.s b/res/field/scripts/scripts_init_galactic_hq_laboratory.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_galactic_hq_laboratory.s +++ b/res/field/scripts/scripts_init_galactic_hq_laboratory.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_game_corner.s b/res/field/scripts/scripts_init_game_corner.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_game_corner.s +++ b/res/field/scripts/scripts_init_game_corner.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_gate_between_eterna_city_route_206.s b/res/field/scripts/scripts_init_gate_between_eterna_city_route_206.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_gate_between_eterna_city_route_206.s +++ b/res/field/scripts/scripts_init_gate_between_eterna_city_route_206.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_global_terminal_1f.s b/res/field/scripts/scripts_init_global_terminal_1f.s index eccbf85bc5..40f120da5e 100644 --- a/res/field/scripts/scripts_init_global_terminal_1f.s +++ b/res/field/scripts/scripts_init_global_terminal_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 13, 0 diff --git a/res/field/scripts/scripts_init_global_terminal_2f.s b/res/field/scripts/scripts_init_global_terminal_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_global_terminal_2f.s +++ b/res/field/scripts/scripts_init_global_terminal_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_global_terminal_3f.s b/res/field/scripts/scripts_init_global_terminal_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_global_terminal_3f.s +++ b/res/field/scripts/scripts_init_global_terminal_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_grand_lake_route_213_east_house.s b/res/field/scripts/scripts_init_grand_lake_route_213_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_grand_lake_route_213_east_house.s +++ b/res/field/scripts/scripts_init_grand_lake_route_213_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_grand_lake_route_213_lobby.s b/res/field/scripts/scripts_init_grand_lake_route_213_lobby.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_grand_lake_route_213_lobby.s +++ b/res/field/scripts/scripts_init_grand_lake_route_213_lobby.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_grand_lake_route_213_northeast_house.s b/res/field/scripts/scripts_init_grand_lake_route_213_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_grand_lake_route_213_northeast_house.s +++ b/res/field/scripts/scripts_init_grand_lake_route_213_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_grand_lake_route_213_northwest_house.s b/res/field/scripts/scripts_init_grand_lake_route_213_northwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_grand_lake_route_213_northwest_house.s +++ b/res/field/scripts/scripts_init_grand_lake_route_213_northwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_grand_lake_valor_lakefront_east_house.s b/res/field/scripts/scripts_init_grand_lake_valor_lakefront_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_grand_lake_valor_lakefront_east_house.s +++ b/res/field/scripts/scripts_init_grand_lake_valor_lakefront_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_grand_lake_valor_lakefront_west_house.s b/res/field/scripts/scripts_init_grand_lake_valor_lakefront_west_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_grand_lake_valor_lakefront_west_house.s +++ b/res/field/scripts/scripts_init_grand_lake_valor_lakefront_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_great_marsh_1.s b/res/field/scripts/scripts_init_great_marsh_1.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_1.s +++ b/res/field/scripts/scripts_init_great_marsh_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_great_marsh_2.s b/res/field/scripts/scripts_init_great_marsh_2.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_2.s +++ b/res/field/scripts/scripts_init_great_marsh_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_great_marsh_3.s b/res/field/scripts/scripts_init_great_marsh_3.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_3.s +++ b/res/field/scripts/scripts_init_great_marsh_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_great_marsh_4.s b/res/field/scripts/scripts_init_great_marsh_4.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_4.s +++ b/res/field/scripts/scripts_init_great_marsh_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_great_marsh_5.s b/res/field/scripts/scripts_init_great_marsh_5.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_5.s +++ b/res/field/scripts/scripts_init_great_marsh_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_great_marsh_6.s b/res/field/scripts/scripts_init_great_marsh_6.s index 43325a7d82..3429ee3995 100644 --- a/res/field/scripts/scripts_init_great_marsh_6.s +++ b/res/field/scripts/scripts_init_great_marsh_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x2260, 0 diff --git a/res/field/scripts/scripts_init_hall_of_origin.s b/res/field/scripts/scripts_init_hall_of_origin.s index fe507d5401..21e287046f 100644 --- a/res/field/scripts/scripts_init_hall_of_origin.s +++ b/res/field/scripts/scripts_init_hall_of_origin.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 3, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city.s b/res/field/scripts/scripts_init_hearthome_city.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_hearthome_city.s +++ b/res/field/scripts/scripts_init_hearthome_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_1.s b/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_1.s +++ b/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_2.s b/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_2.s +++ b/res/field/scripts/scripts_init_hearthome_city_dp_gym_elevator_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_dp_gym_leader_room.s b/res/field/scripts/scripts_init_hearthome_city_dp_gym_leader_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_dp_gym_leader_room.s +++ b/res/field/scripts/scripts_init_hearthome_city_dp_gym_leader_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_east_gate_to_amity_square.s b/res/field/scripts/scripts_init_hearthome_city_east_gate_to_amity_square.s index 67db8f56b3..202ee545ec 100644 --- a/res/field/scripts/scripts_init_hearthome_city_east_gate_to_amity_square.s +++ b/res/field/scripts/scripts_init_hearthome_city_east_gate_to_amity_square.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 3, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_gym_entrance_room.s b/res/field/scripts/scripts_init_hearthome_city_gym_entrance_room.s index 8d38a7aa44..52e091d16c 100644 --- a/res/field/scripts/scripts_init_hearthome_city_gym_entrance_room.s +++ b/res/field/scripts/scripts_init_hearthome_city_gym_entrance_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_hearthome_city_gym_leader_room.s b/res/field/scripts/scripts_init_hearthome_city_gym_leader_room.s index 5e95896112..4aac3b32a0 100644 --- a/res/field/scripts/scripts_init_hearthome_city_gym_leader_room.s +++ b/res/field/scripts/scripts_init_hearthome_city_gym_leader_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 6, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_1.s b/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_1.s +++ b/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_2.s b/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_2.s +++ b/res/field/scripts/scripts_init_hearthome_city_gym_trainer_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_mart.s b/res/field/scripts/scripts_init_hearthome_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_hearthome_city_mart.s +++ b/res/field/scripts/scripts_init_hearthome_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_northeast_house_1f.s b/res/field/scripts/scripts_init_hearthome_city_northeast_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_northeast_house_1f.s +++ b/res/field/scripts/scripts_init_hearthome_city_northeast_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_northeast_house_2f.s b/res/field/scripts/scripts_init_hearthome_city_northeast_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_northeast_house_2f.s +++ b/res/field/scripts/scripts_init_hearthome_city_northeast_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_northeast_house_elevator.s b/res/field/scripts/scripts_init_hearthome_city_northeast_house_elevator.s index 57558c3a2c..d8ea9c9d9f 100644 --- a/res/field/scripts/scripts_init_hearthome_city_northeast_house_elevator.s +++ b/res/field/scripts/scripts_init_hearthome_city_northeast_house_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_hearthome_city_northwest_house.s b/res/field/scripts/scripts_init_hearthome_city_northwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_northwest_house.s +++ b/res/field/scripts/scripts_init_hearthome_city_northwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_pokecenter_1f.s b/res/field/scripts/scripts_init_hearthome_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_hearthome_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_hearthome_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_pokecenter_2f.s b/res/field/scripts/scripts_init_hearthome_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_hearthome_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_hearthome_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_hearthome_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_hearthome_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_hearthome_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_pokemon_fan_club.s b/res/field/scripts/scripts_init_hearthome_city_pokemon_fan_club.s index dba49aab84..599a7067f0 100644 --- a/res/field/scripts/scripts_init_hearthome_city_pokemon_fan_club.s +++ b/res/field/scripts/scripts_init_hearthome_city_pokemon_fan_club.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 6, 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_southeast_house_1f.s b/res/field/scripts/scripts_init_hearthome_city_southeast_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_southeast_house_1f.s +++ b/res/field/scripts/scripts_init_hearthome_city_southeast_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_southeast_house_2f.s b/res/field/scripts/scripts_init_hearthome_city_southeast_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_hearthome_city_southeast_house_2f.s +++ b/res/field/scripts/scripts_init_hearthome_city_southeast_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_hearthome_city_southeast_house_elevator.s b/res/field/scripts/scripts_init_hearthome_city_southeast_house_elevator.s index 57558c3a2c..d8ea9c9d9f 100644 --- a/res/field/scripts/scripts_init_hearthome_city_southeast_house_elevator.s +++ b/res/field/scripts/scripts_init_hearthome_city_southeast_house_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_hearthome_city_west_gate_to_amity_square.s b/res/field/scripts/scripts_init_hearthome_city_west_gate_to_amity_square.s index 7e5da3dcaa..c9437ce121 100644 --- a/res/field/scripts/scripts_init_hearthome_city_west_gate_to_amity_square.s +++ b/res/field/scripts/scripts_init_hearthome_city_west_gate_to_amity_square.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_iceberg_ruins.s b/res/field/scripts/scripts_init_iceberg_ruins.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iceberg_ruins.s +++ b/res/field/scripts/scripts_init_iceberg_ruins.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island.s b/res/field/scripts/scripts_init_iron_island.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_island.s +++ b/res/field/scripts/scripts_init_iron_island.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island_1f.s b/res/field/scripts/scripts_init_iron_island_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_island_1f.s +++ b/res/field/scripts/scripts_init_iron_island_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island_b1f_right_room.s b/res/field/scripts/scripts_init_iron_island_b1f_right_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_island_b1f_right_room.s +++ b/res/field/scripts/scripts_init_iron_island_b1f_right_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island_b2f_left_room.s b/res/field/scripts/scripts_init_iron_island_b2f_left_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_init_iron_island_b2f_left_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island_b3f.s b/res/field/scripts/scripts_init_iron_island_b3f.s index 8eef57eb4d..b86379e135 100644 --- a/res/field/scripts/scripts_init_iron_island_b3f.s +++ b/res/field/scripts/scripts_init_iron_island_b3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_island_house.s b/res/field/scripts/scripts_init_iron_island_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_island_house.s +++ b/res/field/scripts/scripts_init_iron_island_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_iron_ruins.s b/res/field/scripts/scripts_init_iron_ruins.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_iron_ruins.s +++ b/res/field/scripts/scripts_init_iron_ruins.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city.s b/res/field/scripts/scripts_init_jubilife_city.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_jubilife_city.s +++ b/res/field/scripts/scripts_init_jubilife_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_condominiums_1f.s b/res/field/scripts/scripts_init_jubilife_city_condominiums_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_condominiums_1f.s +++ b/res/field/scripts/scripts_init_jubilife_city_condominiums_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_condominiums_2f.s b/res/field/scripts/scripts_init_jubilife_city_condominiums_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_condominiums_2f.s +++ b/res/field/scripts/scripts_init_jubilife_city_condominiums_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_condominiums_3f.s b/res/field/scripts/scripts_init_jubilife_city_condominiums_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_condominiums_3f.s +++ b/res/field/scripts/scripts_init_jubilife_city_condominiums_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_condominiums_4f.s b/res/field/scripts/scripts_init_jubilife_city_condominiums_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_condominiums_4f.s +++ b/res/field/scripts/scripts_init_jubilife_city_condominiums_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_mart.s b/res/field/scripts/scripts_init_jubilife_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_jubilife_city_mart.s +++ b/res/field/scripts/scripts_init_jubilife_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_init_jubilife_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_jubilife_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_pokecenter_2f.s b/res/field/scripts/scripts_init_jubilife_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_jubilife_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_jubilife_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_jubilife_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_jubilife_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_jubilife_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_south_house_1f.s b/res/field/scripts/scripts_init_jubilife_city_south_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_south_house_1f.s +++ b/res/field/scripts/scripts_init_jubilife_city_south_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_south_house_2f.s b/res/field/scripts/scripts_init_jubilife_city_south_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_south_house_2f.s +++ b/res/field/scripts/scripts_init_jubilife_city_south_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_south_house_3f.s b/res/field/scripts/scripts_init_jubilife_city_south_house_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_south_house_3f.s +++ b/res/field/scripts/scripts_init_jubilife_city_south_house_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_southwest_house_1f.s b/res/field/scripts/scripts_init_jubilife_city_southwest_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_southwest_house_1f.s +++ b/res/field/scripts/scripts_init_jubilife_city_southwest_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_southwest_house_2f.s b/res/field/scripts/scripts_init_jubilife_city_southwest_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_southwest_house_2f.s +++ b/res/field/scripts/scripts_init_jubilife_city_southwest_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s b/res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s +++ b/res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s b/res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s +++ b/res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s b/res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s +++ b/res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s b/res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s +++ b/res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_1f.s b/res/field/scripts/scripts_init_jubilife_tv_1f.s index 92e8259308..f65682ce40 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_1f.s +++ b/res/field/scripts/scripts_init_jubilife_tv_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 8, 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_2f.s b/res/field/scripts/scripts_init_jubilife_tv_2f.s index 7e5da3dcaa..c9437ce121 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_init_jubilife_tv_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_init_jubilife_tv_2f_gallery.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_init_jubilife_tv_2f_gallery.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_3f.s b/res/field/scripts/scripts_init_jubilife_tv_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_init_jubilife_tv_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_3f_global_ranking_room.s b/res/field/scripts/scripts_init_jubilife_tv_3f_global_ranking_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_3f_global_ranking_room.s +++ b/res/field/scripts/scripts_init_jubilife_tv_3f_global_ranking_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_3f_group_ranking_room.s b/res/field/scripts/scripts_init_jubilife_tv_3f_group_ranking_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_3f_group_ranking_room.s +++ b/res/field/scripts/scripts_init_jubilife_tv_3f_group_ranking_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_4f.s b/res/field/scripts/scripts_init_jubilife_tv_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_4f.s +++ b/res/field/scripts/scripts_init_jubilife_tv_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_jubilife_tv_elevator.s b/res/field/scripts/scripts_init_jubilife_tv_elevator.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_jubilife_tv_elevator.s +++ b/res/field/scripts/scripts_init_jubilife_tv_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_lake_acuity.s b/res/field/scripts/scripts_init_lake_acuity.s index 39439424c4..bed1351f9f 100644 --- a/res/field/scripts/scripts_init_lake_acuity.s +++ b/res/field/scripts/scripts_init_lake_acuity.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_lake_acuity_low_water.s b/res/field/scripts/scripts_init_lake_acuity_low_water.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_lake_acuity_low_water.s +++ b/res/field/scripts/scripts_init_lake_acuity_low_water.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_lake_valor.s b/res/field/scripts/scripts_init_lake_valor.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_lake_valor.s +++ b/res/field/scripts/scripts_init_lake_valor.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_lake_valor_drained.s b/res/field/scripts/scripts_init_lake_valor_drained.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_lake_valor_drained.s +++ b/res/field/scripts/scripts_init_lake_valor_drained.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_lake_verity.s b/res/field/scripts/scripts_init_lake_verity.s index 57d55643de..6633020a46 100644 --- a/res/field/scripts/scripts_init_lake_verity.s +++ b/res/field/scripts/scripts_init_lake_verity.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_lake_verity_low_water.s b/res/field/scripts/scripts_init_lake_verity_low_water.s index 8e339aafe5..00aa49399c 100644 --- a/res/field/scripts/scripts_init_lake_verity_low_water.s +++ b/res/field/scripts/scripts_init_lake_verity_low_water.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_maniac_tunnel.s b/res/field/scripts/scripts_init_maniac_tunnel.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_maniac_tunnel.s +++ b/res/field/scripts/scripts_init_maniac_tunnel.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_mining_museum.s b/res/field/scripts/scripts_init_mining_museum.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_mining_museum.s +++ b/res/field/scripts/scripts_init_mining_museum.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_1f_north_room_1.s b/res/field/scripts/scripts_init_mt_coronet_1f_north_room_1.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_mt_coronet_1f_north_room_1.s +++ b/res/field/scripts/scripts_init_mt_coronet_1f_north_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_1f_north_room_2.s b/res/field/scripts/scripts_init_mt_coronet_1f_north_room_2.s index 02bcdf6265..25e55203ae 100644 --- a/res/field/scripts/scripts_init_mt_coronet_1f_north_room_2.s +++ b/res/field/scripts/scripts_init_mt_coronet_1f_north_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_1f_south.s b/res/field/scripts/scripts_init_mt_coronet_1f_south.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_init_mt_coronet_1f_south.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_1f_tunnel_room.s b/res/field/scripts/scripts_init_mt_coronet_1f_tunnel_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_mt_coronet_1f_tunnel_room.s +++ b/res/field/scripts/scripts_init_mt_coronet_1f_tunnel_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_2f.s b/res/field/scripts/scripts_init_mt_coronet_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_mt_coronet_2f.s +++ b/res/field/scripts/scripts_init_mt_coronet_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_mt_coronet_6f.s b/res/field/scripts/scripts_init_mt_coronet_6f.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_mt_coronet_6f.s +++ b/res/field/scripts/scripts_init_mt_coronet_6f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_new_game.s b/res/field/scripts/scripts_init_new_game.s index d5b47217ad..c5a5590d35 100644 --- a/res/field/scripts/scripts_init_new_game.s +++ b/res/field/scripts/scripts_init_new_game.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_init_newmoon_island.s b/res/field/scripts/scripts_init_newmoon_island.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_newmoon_island.s +++ b/res/field/scripts/scripts_init_newmoon_island.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_newmoon_island_forest.s b/res/field/scripts/scripts_init_newmoon_island_forest.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_newmoon_island_forest.s +++ b/res/field/scripts/scripts_init_newmoon_island_forest.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_old_chateau.s b/res/field/scripts/scripts_init_old_chateau.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_old_chateau.s +++ b/res/field/scripts/scripts_init_old_chateau.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_old_chateau_back_middle_east_room.s b/res/field/scripts/scripts_init_old_chateau_back_middle_east_room.s index e45fd649bb..edae0a72bf 100644 --- a/res/field/scripts/scripts_init_old_chateau_back_middle_east_room.s +++ b/res/field/scripts/scripts_init_old_chateau_back_middle_east_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_old_chateau_back_middle_west_room.s b/res/field/scripts/scripts_init_old_chateau_back_middle_west_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_old_chateau_back_middle_west_room.s +++ b/res/field/scripts/scripts_init_old_chateau_back_middle_west_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_old_chateau_dining_area.s b/res/field/scripts/scripts_init_old_chateau_dining_area.s index 94c5036105..6f5dff5375 100644 --- a/res/field/scripts/scripts_init_old_chateau_dining_area.s +++ b/res/field/scripts/scripts_init_old_chateau_dining_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_old_chateau_side_rooms.s b/res/field/scripts/scripts_init_old_chateau_side_rooms.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_old_chateau_side_rooms.s +++ b/res/field/scripts/scripts_init_old_chateau_side_rooms.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city.s b/res/field/scripts/scripts_init_oreburgh_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city.s +++ b/res/field/scripts/scripts_init_oreburgh_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_east_house_1f.s b/res/field/scripts/scripts_init_oreburgh_city_east_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_east_house_1f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_east_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_east_house_2f.s b/res/field/scripts/scripts_init_oreburgh_city_east_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_east_house_2f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_east_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_east_house_3f.s b/res/field/scripts/scripts_init_oreburgh_city_east_house_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_east_house_3f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_east_house_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_gym.s b/res/field/scripts/scripts_init_oreburgh_city_gym.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_gym.s +++ b/res/field/scripts/scripts_init_oreburgh_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_mart.s b/res/field/scripts/scripts_init_oreburgh_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_mart.s +++ b/res/field/scripts/scripts_init_oreburgh_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_middle_house.s b/res/field/scripts/scripts_init_oreburgh_city_middle_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_middle_house.s +++ b/res/field/scripts/scripts_init_oreburgh_city_middle_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_init_oreburgh_city_north_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_north_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_north_house_2f.s b/res/field/scripts/scripts_init_oreburgh_city_north_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_north_house_2f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_north_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_north_house_3f.s b/res/field/scripts/scripts_init_oreburgh_city_north_house_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_north_house_3f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_north_house_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_north_house_4f.s b/res/field/scripts/scripts_init_oreburgh_city_north_house_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_north_house_4f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_north_house_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_1f.s b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_1f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_2f.s b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_2f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_3f.s b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_3f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_4f.s b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_northwest_house_4f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_northwest_house_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_2f.s b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_oreburgh_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_south_house.s b/res/field/scripts/scripts_init_oreburgh_city_south_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_south_house.s +++ b/res/field/scripts/scripts_init_oreburgh_city_south_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_city_west_house.s b/res/field/scripts/scripts_init_oreburgh_city_west_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_city_west_house.s +++ b/res/field/scripts/scripts_init_oreburgh_city_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_gate_1f.s b/res/field/scripts/scripts_init_oreburgh_gate_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_oreburgh_gate_1f.s +++ b/res/field/scripts/scripts_init_oreburgh_gate_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_gate_b1f.s b/res/field/scripts/scripts_init_oreburgh_gate_b1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_gate_b1f.s +++ b/res/field/scripts/scripts_init_oreburgh_gate_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_oreburgh_mine_b1f.s b/res/field/scripts/scripts_init_oreburgh_mine_b1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_init_oreburgh_mine_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_oreburgh_mine_b2f.s b/res/field/scripts/scripts_init_oreburgh_mine_b2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_init_oreburgh_mine_b2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pal_park.s b/res/field/scripts/scripts_init_pal_park.s index 355dce4430..18e145c9a2 100644 --- a/res/field/scripts/scripts_init_pal_park.s +++ b/res/field/scripts/scripts_init_pal_park.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pal_park_lobby.s b/res/field/scripts/scripts_init_pal_park_lobby.s index a076e38a14..39f47c3b43 100644 --- a/res/field/scripts/scripts_init_pal_park_lobby.s +++ b/res/field/scripts/scripts_init_pal_park_lobby.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city.s b/res/field/scripts/scripts_init_pastoria_city.s index 93e00b66dd..a851e21159 100644 --- a/res/field/scripts/scripts_init_pastoria_city.s +++ b/res/field/scripts/scripts_init_pastoria_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_east_house.s b/res/field/scripts/scripts_init_pastoria_city_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_east_house.s +++ b/res/field/scripts/scripts_init_pastoria_city_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_gym.s b/res/field/scripts/scripts_init_pastoria_city_gym.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pastoria_city_gym.s +++ b/res/field/scripts/scripts_init_pastoria_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_mart.s b/res/field/scripts/scripts_init_pastoria_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_pastoria_city_mart.s +++ b/res/field/scripts/scripts_init_pastoria_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_middle_house.s b/res/field/scripts/scripts_init_pastoria_city_middle_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_middle_house.s +++ b/res/field/scripts/scripts_init_pastoria_city_middle_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_north_house.s b/res/field/scripts/scripts_init_pastoria_city_north_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_north_house.s +++ b/res/field/scripts/scripts_init_pastoria_city_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_northeast_house.s b/res/field/scripts/scripts_init_pastoria_city_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_northeast_house.s +++ b/res/field/scripts/scripts_init_pastoria_city_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_observatory_gate_1f.s b/res/field/scripts/scripts_init_pastoria_city_observatory_gate_1f.s index 54353025aa..4f5d8efe0e 100644 --- a/res/field/scripts/scripts_init_pastoria_city_observatory_gate_1f.s +++ b/res/field/scripts/scripts_init_pastoria_city_observatory_gate_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_observatory_gate_2f.s b/res/field/scripts/scripts_init_pastoria_city_observatory_gate_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_observatory_gate_2f.s +++ b/res/field/scripts/scripts_init_pastoria_city_observatory_gate_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_pokecenter_1f.s b/res/field/scripts/scripts_init_pastoria_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_pastoria_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_pastoria_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_pokecenter_2f.s b/res/field/scripts/scripts_init_pastoria_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_pastoria_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_pastoria_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_pastoria_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_pastoria_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_pastoria_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_pastoria_city_southwest_house.s b/res/field/scripts/scripts_init_pastoria_city_southwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pastoria_city_southwest_house.s +++ b/res/field/scripts/scripts_init_pastoria_city_southwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_poffin_house.s b/res/field/scripts/scripts_init_poffin_house.s index 1cb9b890c7..e1dd7f62e0 100644 --- a/res/field/scripts/scripts_init_poffin_house.s +++ b/res/field/scripts/scripts_init_poffin_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 6, 0 diff --git a/res/field/scripts/scripts_init_pokemon_day_care.s b/res/field/scripts/scripts_init_pokemon_day_care.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_day_care.s +++ b/res/field/scripts/scripts_init_pokemon_day_care.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league.s b/res/field/scripts/scripts_init_pokemon_league.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pokemon_league.s +++ b/res/field/scripts/scripts_init_pokemon_league.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_aaron_room.s b/res/field/scripts/scripts_init_pokemon_league_aaron_room.s index dacb23b64e..7c8b917f8e 100644 --- a/res/field/scripts/scripts_init_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_aaron_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_bertha_room.s b/res/field/scripts/scripts_init_pokemon_league_bertha_room.s index dacb23b64e..7c8b917f8e 100644 --- a/res/field/scripts/scripts_init_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_bertha_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_champion_room.s b/res/field/scripts/scripts_init_pokemon_league_champion_room.s index ad80db8258..7da206901c 100644 --- a/res/field/scripts/scripts_init_pokemon_league_champion_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_champion_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_aaron_room.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_aaron_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_aaron_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_aaron_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_bertha_room.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_bertha_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_bertha_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_bertha_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_champion_room.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_champion_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_champion_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_champion_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_flint_room.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_flint_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_flint_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_flint_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_hall_of_fame.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_hall_of_fame.s index 76c54235a0..797f6eb2a3 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_hall_of_fame.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_hall_of_fame.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_elevator_to_lucian_room.s b/res/field/scripts/scripts_init_pokemon_league_elevator_to_lucian_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_league_elevator_to_lucian_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_elevator_to_lucian_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_flint_room.s b/res/field/scripts/scripts_init_pokemon_league_flint_room.s index dacb23b64e..7c8b917f8e 100644 --- a/res/field/scripts/scripts_init_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_flint_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_init_pokemon_league_hall_of_fame.s index 76c54235a0..797f6eb2a3 100644 --- a/res/field/scripts/scripts_init_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_init_pokemon_league_hall_of_fame.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_lucian_room.s b/res/field/scripts/scripts_init_pokemon_league_lucian_room.s index dacb23b64e..7c8b917f8e 100644 --- a/res/field/scripts/scripts_init_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_init_pokemon_league_lucian_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_1f.s index 76de2716fd..bc28f65937 100644 --- a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_2f.s b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_b1f.s b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_pokemon_league_north_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_1f.s b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_1f.s index 7e5da3dcaa..c9437ce121 100644 --- a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_2f.s b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_b1f.s b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_pokemon_league_south_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_pokemon_mansion.s b/res/field/scripts/scripts_init_pokemon_mansion.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_mansion.s +++ b/res/field/scripts/scripts_init_pokemon_mansion.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_pokemon_mansion_maids_room.s b/res/field/scripts/scripts_init_pokemon_mansion_maids_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_pokemon_mansion_maids_room.s +++ b/res/field/scripts/scripts_init_pokemon_mansion_maids_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_pokemon_mansion_office.s b/res/field/scripts/scripts_init_pokemon_mansion_office.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_init_pokemon_mansion_office.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_poketch_co_1f.s b/res/field/scripts/scripts_init_poketch_co_1f.s index 76de2716fd..bc28f65937 100644 --- a/res/field/scripts/scripts_init_poketch_co_1f.s +++ b/res/field/scripts/scripts_init_poketch_co_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_poketch_co_2f.s b/res/field/scripts/scripts_init_poketch_co_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_poketch_co_2f.s +++ b/res/field/scripts/scripts_init_poketch_co_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_poketch_co_3f.s b/res/field/scripts/scripts_init_poketch_co_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_poketch_co_3f.s +++ b/res/field/scripts/scripts_init_poketch_co_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_ravaged_path.s b/res/field/scripts/scripts_init_ravaged_path.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_ravaged_path.s +++ b/res/field/scripts/scripts_init_ravaged_path.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_resort_area.s b/res/field/scripts/scripts_init_resort_area.s index fbb5fe3611..ad81f3daf6 100644 --- a/res/field/scripts/scripts_init_resort_area.s +++ b/res/field/scripts/scripts_init_resort_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 14, 0 diff --git a/res/field/scripts/scripts_init_resort_area_house.s b/res/field/scripts/scripts_init_resort_area_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_resort_area_house.s +++ b/res/field/scripts/scripts_init_resort_area_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_resort_area_mart.s b/res/field/scripts/scripts_init_resort_area_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_resort_area_mart.s +++ b/res/field/scripts/scripts_init_resort_area_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_resort_area_pokecenter_1f.s b/res/field/scripts/scripts_init_resort_area_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_resort_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_resort_area_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_resort_area_pokecenter_2f.s b/res/field/scripts/scripts_init_resort_area_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_resort_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_resort_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_resort_area_pokecenter_b1f.s b/res/field/scripts/scripts_init_resort_area_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_resort_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_resort_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s index 3cebd270b0..8fe0f87dd2 100644 --- a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 8, 0 diff --git a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_2f.s b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_elevator.s b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_elevator.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_elevator.s +++ b/res/field/scripts/scripts_init_resort_area_ribbon_syndicate_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_restaurant.s b/res/field/scripts/scripts_init_restaurant.s index f5d80ee543..84923ab3c1 100644 --- a/res/field/scripts/scripts_init_restaurant.s +++ b/res/field/scripts/scripts_init_restaurant.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_rock_peak_ruins.s b/res/field/scripts/scripts_init_rock_peak_ruins.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_rock_peak_ruins.s +++ b/res/field/scripts/scripts_init_rock_peak_ruins.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_rotoms_room.s b/res/field/scripts/scripts_init_rotoms_room.s index d74ead45ab..1e95ee9e9d 100644 --- a/res/field/scripts/scripts_init_rotoms_room.s +++ b/res/field/scripts/scripts_init_rotoms_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_route_201.s b/res/field/scripts/scripts_init_route_201.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_201.s +++ b/res/field/scripts/scripts_init_route_201.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_202.s b/res/field/scripts/scripts_init_route_202.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_202.s +++ b/res/field/scripts/scripts_init_route_202.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_203.s b/res/field/scripts/scripts_init_route_203.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_203.s +++ b/res/field/scripts/scripts_init_route_203.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_204_north.s b/res/field/scripts/scripts_init_route_204_north.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_204_north.s +++ b/res/field/scripts/scripts_init_route_204_north.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_204_south.s b/res/field/scripts/scripts_init_route_204_south.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_204_south.s +++ b/res/field/scripts/scripts_init_route_204_south.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_205_house.s b/res/field/scripts/scripts_init_route_205_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_205_house.s +++ b/res/field/scripts/scripts_init_route_205_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_205_north.s b/res/field/scripts/scripts_init_route_205_north.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_205_north.s +++ b/res/field/scripts/scripts_init_route_205_north.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_205_south.s b/res/field/scripts/scripts_init_route_205_south.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_205_south.s +++ b/res/field/scripts/scripts_init_route_205_south.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_206.s b/res/field/scripts/scripts_init_route_206.s index 7d083b2b04..ed5187a977 100644 --- a/res/field/scripts/scripts_init_route_206.s +++ b/res/field/scripts/scripts_init_route_206.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 2, 0 diff --git a/res/field/scripts/scripts_init_route_206_cycling_road_north_gate.s b/res/field/scripts/scripts_init_route_206_cycling_road_north_gate.s index dd7c160188..848e082274 100644 --- a/res/field/scripts/scripts_init_route_206_cycling_road_north_gate.s +++ b/res/field/scripts/scripts_init_route_206_cycling_road_north_gate.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_206_cycling_road_south_gate.s b/res/field/scripts/scripts_init_route_206_cycling_road_south_gate.s index dd7c160188..848e082274 100644 --- a/res/field/scripts/scripts_init_route_206_cycling_road_south_gate.s +++ b/res/field/scripts/scripts_init_route_206_cycling_road_south_gate.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_207.s b/res/field/scripts/scripts_init_route_207.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_207.s +++ b/res/field/scripts/scripts_init_route_207.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_208.s b/res/field/scripts/scripts_init_route_208.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_208.s +++ b/res/field/scripts/scripts_init_route_208.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_208_gate_to_hearthome_city.s b/res/field/scripts/scripts_init_route_208_gate_to_hearthome_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_208_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_init_route_208_gate_to_hearthome_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_208_house.s b/res/field/scripts/scripts_init_route_208_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_208_house.s +++ b/res/field/scripts/scripts_init_route_208_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_209.s b/res/field/scripts/scripts_init_route_209.s index 92e8259308..f65682ce40 100644 --- a/res/field/scripts/scripts_init_route_209.s +++ b/res/field/scripts/scripts_init_route_209.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 8, 0 diff --git a/res/field/scripts/scripts_init_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_init_route_209_gate_to_hearthome_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_init_route_209_gate_to_hearthome_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_209_lost_tower_1f.s b/res/field/scripts/scripts_init_route_209_lost_tower_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_209_lost_tower_1f.s +++ b/res/field/scripts/scripts_init_route_209_lost_tower_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_209_lost_tower_5f.s b/res/field/scripts/scripts_init_route_209_lost_tower_5f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_209_lost_tower_5f.s +++ b/res/field/scripts/scripts_init_route_209_lost_tower_5f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_210_grandma_wilma_house.s b/res/field/scripts/scripts_init_route_210_grandma_wilma_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_210_grandma_wilma_house.s +++ b/res/field/scripts/scripts_init_route_210_grandma_wilma_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_210_north.s b/res/field/scripts/scripts_init_route_210_north.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_210_north.s +++ b/res/field/scripts/scripts_init_route_210_north.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_210_south.s b/res/field/scripts/scripts_init_route_210_south.s index c48691f3f6..1519c692dd 100644 --- a/res/field/scripts/scripts_init_route_210_south.s +++ b/res/field/scripts/scripts_init_route_210_south.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_route_211_east.s b/res/field/scripts/scripts_init_route_211_east.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_211_east.s +++ b/res/field/scripts/scripts_init_route_211_east.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_211_west.s b/res/field/scripts/scripts_init_route_211_west.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_211_west.s +++ b/res/field/scripts/scripts_init_route_211_west.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_212_gate_to_hearthome_city.s b/res/field/scripts/scripts_init_route_212_gate_to_hearthome_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_212_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_init_route_212_gate_to_hearthome_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_212_house.s b/res/field/scripts/scripts_init_route_212_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_212_house.s +++ b/res/field/scripts/scripts_init_route_212_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_212_north.s b/res/field/scripts/scripts_init_route_212_north.s index 4230eab363..94ba2338ee 100644 --- a/res/field/scripts/scripts_init_route_212_north.s +++ b/res/field/scripts/scripts_init_route_212_north.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 10, 0 diff --git a/res/field/scripts/scripts_init_route_212_south.s b/res/field/scripts/scripts_init_route_212_south.s index c48691f3f6..1519c692dd 100644 --- a/res/field/scripts/scripts_init_route_212_south.s +++ b/res/field/scripts/scripts_init_route_212_south.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_route_213.s b/res/field/scripts/scripts_init_route_213.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_213.s +++ b/res/field/scripts/scripts_init_route_213.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_213_gate_to_pastoria_city.s b/res/field/scripts/scripts_init_route_213_gate_to_pastoria_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_213_gate_to_pastoria_city.s +++ b/res/field/scripts/scripts_init_route_213_gate_to_pastoria_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_214.s b/res/field/scripts/scripts_init_route_214.s index 0f9ce4f6d4..01cfe0502b 100644 --- a/res/field/scripts/scripts_init_route_214.s +++ b/res/field/scripts/scripts_init_route_214.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 3, 0 diff --git a/res/field/scripts/scripts_init_route_214_gate_to_veilstone_city.s b/res/field/scripts/scripts_init_route_214_gate_to_veilstone_city.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_route_214_gate_to_veilstone_city.s +++ b/res/field/scripts/scripts_init_route_214_gate_to_veilstone_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_route_215.s b/res/field/scripts/scripts_init_route_215.s index c48691f3f6..1519c692dd 100644 --- a/res/field/scripts/scripts_init_route_215.s +++ b/res/field/scripts/scripts_init_route_215.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_route_215_gate_to_veilstone_city.s b/res/field/scripts/scripts_init_route_215_gate_to_veilstone_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_215_gate_to_veilstone_city.s +++ b/res/field/scripts/scripts_init_route_215_gate_to_veilstone_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_216.s b/res/field/scripts/scripts_init_route_216.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_216.s +++ b/res/field/scripts/scripts_init_route_216.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_216_house.s b/res/field/scripts/scripts_init_route_216_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_216_house.s +++ b/res/field/scripts/scripts_init_route_216_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_217.s b/res/field/scripts/scripts_init_route_217.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_217.s +++ b/res/field/scripts/scripts_init_route_217.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_217_northeast_house.s b/res/field/scripts/scripts_init_route_217_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_217_northeast_house.s +++ b/res/field/scripts/scripts_init_route_217_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_217_west_house.s b/res/field/scripts/scripts_init_route_217_west_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_217_west_house.s +++ b/res/field/scripts/scripts_init_route_217_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_218.s b/res/field/scripts/scripts_init_route_218.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_218.s +++ b/res/field/scripts/scripts_init_route_218.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_218_gate_to_canalave_city.s b/res/field/scripts/scripts_init_route_218_gate_to_canalave_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_218_gate_to_canalave_city.s +++ b/res/field/scripts/scripts_init_route_218_gate_to_canalave_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_218_gate_to_jubilife_city.s b/res/field/scripts/scripts_init_route_218_gate_to_jubilife_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_218_gate_to_jubilife_city.s +++ b/res/field/scripts/scripts_init_route_218_gate_to_jubilife_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_219.s b/res/field/scripts/scripts_init_route_219.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_219.s +++ b/res/field/scripts/scripts_init_route_219.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_221.s b/res/field/scripts/scripts_init_route_221.s index 7e5da3dcaa..c9437ce121 100644 --- a/res/field/scripts/scripts_init_route_221.s +++ b/res/field/scripts/scripts_init_route_221.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_route_221_house.s b/res/field/scripts/scripts_init_route_221_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_221_house.s +++ b/res/field/scripts/scripts_init_route_221_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_222.s b/res/field/scripts/scripts_init_route_222.s index 92e8259308..f65682ce40 100644 --- a/res/field/scripts/scripts_init_route_222.s +++ b/res/field/scripts/scripts_init_route_222.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 8, 0 diff --git a/res/field/scripts/scripts_init_route_222_east_house.s b/res/field/scripts/scripts_init_route_222_east_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_222_east_house.s +++ b/res/field/scripts/scripts_init_route_222_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_222_gate_to_sunyshore_city.s b/res/field/scripts/scripts_init_route_222_gate_to_sunyshore_city.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_222_gate_to_sunyshore_city.s +++ b/res/field/scripts/scripts_init_route_222_gate_to_sunyshore_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_222_west_house.s b/res/field/scripts/scripts_init_route_222_west_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_222_west_house.s +++ b/res/field/scripts/scripts_init_route_222_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_224.s b/res/field/scripts/scripts_init_route_224.s index ce6f4dc72d..5a764bdb09 100644 --- a/res/field/scripts/scripts_init_route_224.s +++ b/res/field/scripts/scripts_init_route_224.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_225.s b/res/field/scripts/scripts_init_route_225.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_225.s +++ b/res/field/scripts/scripts_init_route_225.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_225_gate_to_fight_area.s b/res/field/scripts/scripts_init_route_225_gate_to_fight_area.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_225_gate_to_fight_area.s +++ b/res/field/scripts/scripts_init_route_225_gate_to_fight_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_225_house.s b/res/field/scripts/scripts_init_route_225_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_225_house.s +++ b/res/field/scripts/scripts_init_route_225_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_226.s b/res/field/scripts/scripts_init_route_226.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_226.s +++ b/res/field/scripts/scripts_init_route_226.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_226_house.s b/res/field/scripts/scripts_init_route_226_house.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_route_226_house.s +++ b/res/field/scripts/scripts_init_route_226_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_route_227.s b/res/field/scripts/scripts_init_route_227.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_227.s +++ b/res/field/scripts/scripts_init_route_227.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_227_house.s b/res/field/scripts/scripts_init_route_227_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_227_house.s +++ b/res/field/scripts/scripts_init_route_227_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_228.s b/res/field/scripts/scripts_init_route_228.s index 0f9ce4f6d4..01cfe0502b 100644 --- a/res/field/scripts/scripts_init_route_228.s +++ b/res/field/scripts/scripts_init_route_228.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 3, 0 diff --git a/res/field/scripts/scripts_init_route_228_gate_to_route_226.s b/res/field/scripts/scripts_init_route_228_gate_to_route_226.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_228_gate_to_route_226.s +++ b/res/field/scripts/scripts_init_route_228_gate_to_route_226.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_228_north_house.s b/res/field/scripts/scripts_init_route_228_north_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_228_north_house.s +++ b/res/field/scripts/scripts_init_route_228_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_228_south_house.s b/res/field/scripts/scripts_init_route_228_south_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_228_south_house.s +++ b/res/field/scripts/scripts_init_route_228_south_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_229.s b/res/field/scripts/scripts_init_route_229.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_229.s +++ b/res/field/scripts/scripts_init_route_229.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_route_230.s b/res/field/scripts/scripts_init_route_230.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_route_230.s +++ b/res/field/scripts/scripts_init_route_230.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_ruin_maniac_cave_long.s b/res/field/scripts/scripts_init_ruin_maniac_cave_long.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_ruin_maniac_cave_long.s +++ b/res/field/scripts/scripts_init_ruin_maniac_cave_long.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_ruin_maniac_cave_short.s b/res/field/scripts/scripts_init_ruin_maniac_cave_short.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_ruin_maniac_cave_short.s +++ b/res/field/scripts/scripts_init_ruin_maniac_cave_short.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sandgem_town.s b/res/field/scripts/scripts_init_sandgem_town.s index ce747a4ba3..5f4064fd2e 100644 --- a/res/field/scripts/scripts_init_sandgem_town.s +++ b/res/field/scripts/scripts_init_sandgem_town.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_counterpart_house_1f.s b/res/field/scripts/scripts_init_sandgem_town_counterpart_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sandgem_town_counterpart_house_1f.s +++ b/res/field/scripts/scripts_init_sandgem_town_counterpart_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_counterpart_house_2f.s b/res/field/scripts/scripts_init_sandgem_town_counterpart_house_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sandgem_town_counterpart_house_2f.s +++ b/res/field/scripts/scripts_init_sandgem_town_counterpart_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_house.s b/res/field/scripts/scripts_init_sandgem_town_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sandgem_town_house.s +++ b/res/field/scripts/scripts_init_sandgem_town_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_mart.s b/res/field/scripts/scripts_init_sandgem_town_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_sandgem_town_mart.s +++ b/res/field/scripts/scripts_init_sandgem_town_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_pokecenter_1f.s b/res/field/scripts/scripts_init_sandgem_town_pokecenter_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sandgem_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_sandgem_town_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_pokecenter_2f.s b/res/field/scripts/scripts_init_sandgem_town_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_sandgem_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_sandgem_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_pokecenter_b1f.s b/res/field/scripts/scripts_init_sandgem_town_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_sandgem_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_sandgem_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_init_sandgem_town_pokemon_research_lab.s index d76db63b29..0986d8f408 100644 --- a/res/field/scripts/scripts_init_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_init_sandgem_town_pokemon_research_lab.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sendoff_spring.s b/res/field/scripts/scripts_init_sendoff_spring.s index 32da23140f..11b9fda517 100644 --- a/res/field/scripts/scripts_init_sendoff_spring.s +++ b/res/field/scripts/scripts_init_sendoff_spring.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 3, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city.s b/res/field/scripts/scripts_init_snowpoint_city.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_snowpoint_city.s +++ b/res/field/scripts/scripts_init_snowpoint_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_east_house.s b/res/field/scripts/scripts_init_snowpoint_city_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_east_house.s +++ b/res/field/scripts/scripts_init_snowpoint_city_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_gym.s b/res/field/scripts/scripts_init_snowpoint_city_gym.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_gym.s +++ b/res/field/scripts/scripts_init_snowpoint_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_mart.s b/res/field/scripts/scripts_init_snowpoint_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_mart.s +++ b/res/field/scripts/scripts_init_snowpoint_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_2f.s b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_snowpoint_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_city_west_house.s b/res/field/scripts/scripts_init_snowpoint_city_west_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_snowpoint_city_west_house.s +++ b/res/field/scripts/scripts_init_snowpoint_city_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_snowpoint_temple_1f.s b/res/field/scripts/scripts_init_snowpoint_temple_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_snowpoint_temple_1f.s +++ b/res/field/scripts/scripts_init_snowpoint_temple_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_snowpoint_temple_b5f.s b/res/field/scripts/scripts_init_snowpoint_temple_b5f.s index f49b4b332f..45ac16c97e 100644 --- a/res/field/scripts/scripts_init_snowpoint_temple_b5f.s +++ b/res/field/scripts/scripts_init_snowpoint_temple_b5f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 1, 0 diff --git a/res/field/scripts/scripts_init_solaceon_ruins_maniac_tunnel_room.s b/res/field/scripts/scripts_init_solaceon_ruins_maniac_tunnel_room.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_ruins_maniac_tunnel_room.s +++ b/res/field/scripts/scripts_init_solaceon_ruins_maniac_tunnel_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_ruins_room_1.s b/res/field/scripts/scripts_init_solaceon_ruins_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_solaceon_ruins_room_1.s +++ b/res/field/scripts/scripts_init_solaceon_ruins_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_solaceon_ruins_room_2.s b/res/field/scripts/scripts_init_solaceon_ruins_room_2.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_ruins_room_2.s +++ b/res/field/scripts/scripts_init_solaceon_ruins_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_ruins_room_7.s b/res/field/scripts/scripts_init_solaceon_ruins_room_7.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_ruins_room_7.s +++ b/res/field/scripts/scripts_init_solaceon_ruins_room_7.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_town.s b/res/field/scripts/scripts_init_solaceon_town.s index ff283d20bf..7f4c3fc25a 100644 --- a/res/field/scripts/scripts_init_solaceon_town.s +++ b/res/field/scripts/scripts_init_solaceon_town.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 10, 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_east_house.s b/res/field/scripts/scripts_init_solaceon_town_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_town_east_house.s +++ b/res/field/scripts/scripts_init_solaceon_town_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_mart.s b/res/field/scripts/scripts_init_solaceon_town_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_solaceon_town_mart.s +++ b/res/field/scripts/scripts_init_solaceon_town_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_north_house.s b/res/field/scripts/scripts_init_solaceon_town_north_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_town_north_house.s +++ b/res/field/scripts/scripts_init_solaceon_town_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_northeast_house.s b/res/field/scripts/scripts_init_solaceon_town_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_town_northeast_house.s +++ b/res/field/scripts/scripts_init_solaceon_town_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_pokecenter_1f.s b/res/field/scripts/scripts_init_solaceon_town_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_solaceon_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_solaceon_town_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_pokecenter_2f.s b/res/field/scripts/scripts_init_solaceon_town_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_solaceon_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_solaceon_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_pokecenter_b1f.s b/res/field/scripts/scripts_init_solaceon_town_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_solaceon_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_solaceon_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_solaceon_town_pokemon_news_press.s b/res/field/scripts/scripts_init_solaceon_town_pokemon_news_press.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_solaceon_town_pokemon_news_press.s +++ b/res/field/scripts/scripts_init_solaceon_town_pokemon_news_press.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_spear_pillar.s b/res/field/scripts/scripts_init_spear_pillar.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_spear_pillar.s +++ b/res/field/scripts/scripts_init_spear_pillar.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_spear_pillar_dialga.s b/res/field/scripts/scripts_init_spear_pillar_dialga.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_spear_pillar_dialga.s +++ b/res/field/scripts/scripts_init_spear_pillar_dialga.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_spear_pillar_distorted.s b/res/field/scripts/scripts_init_spear_pillar_distorted.s index e3198f66e8..366a75f35c 100644 --- a/res/field/scripts/scripts_init_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_init_spear_pillar_distorted.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_spear_pillar_palkia.s b/res/field/scripts/scripts_init_spear_pillar_palkia.s index 8e0dba1de6..3a7f2abdad 100644 --- a/res/field/scripts/scripts_init_spear_pillar_palkia.s +++ b/res/field/scripts/scripts_init_spear_pillar_palkia.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 2, 0 diff --git a/res/field/scripts/scripts_init_stark_mountain_outside.s b/res/field/scripts/scripts_init_stark_mountain_outside.s index f325fac548..d6c3ae04b1 100644 --- a/res/field/scripts/scripts_init_stark_mountain_outside.s +++ b/res/field/scripts/scripts_init_stark_mountain_outside.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_stark_mountain_room_1.s b/res/field/scripts/scripts_init_stark_mountain_room_1.s index 870f1f87b0..31c342f090 100644 --- a/res/field/scripts/scripts_init_stark_mountain_room_1.s +++ b/res/field/scripts/scripts_init_stark_mountain_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_stark_mountain_room_2.s b/res/field/scripts/scripts_init_stark_mountain_room_2.s index dba49aab84..599a7067f0 100644 --- a/res/field/scripts/scripts_init_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_init_stark_mountain_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 6, 0 diff --git a/res/field/scripts/scripts_init_stark_mountain_room_3.s b/res/field/scripts/scripts_init_stark_mountain_room_3.s index 2b58a01e2e..add4f40ce2 100644 --- a/res/field/scripts/scripts_init_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_init_stark_mountain_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city.s b/res/field/scripts/scripts_init_sunyshore_city.s index a3bede3d70..1606a4c0e2 100644 --- a/res/field/scripts/scripts_init_sunyshore_city.s +++ b/res/field/scripts/scripts_init_sunyshore_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 19, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_east_house.s b/res/field/scripts/scripts_init_sunyshore_city_east_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_east_house.s +++ b/res/field/scripts/scripts_init_sunyshore_city_east_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_gym_room_1.s b/res/field/scripts/scripts_init_sunyshore_city_gym_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_gym_room_1.s +++ b/res/field/scripts/scripts_init_sunyshore_city_gym_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_gym_room_2.s b/res/field/scripts/scripts_init_sunyshore_city_gym_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_gym_room_2.s +++ b/res/field/scripts/scripts_init_sunyshore_city_gym_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_gym_room_3.s b/res/field/scripts/scripts_init_sunyshore_city_gym_room_3.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_gym_room_3.s +++ b/res/field/scripts/scripts_init_sunyshore_city_gym_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_mart.s b/res/field/scripts/scripts_init_sunyshore_city_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_mart.s +++ b/res/field/scripts/scripts_init_sunyshore_city_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_init_sunyshore_city_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_init_sunyshore_city_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_northwest_house.s b/res/field/scripts/scripts_init_sunyshore_city_northwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_northwest_house.s +++ b/res/field/scripts/scripts_init_sunyshore_city_northwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_1f.s b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_2f.s b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_sunyshore_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s b/res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s +++ b/res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s b/res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s +++ b/res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_city_west_house.s b/res/field/scripts/scripts_init_sunyshore_city_west_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_sunyshore_city_west_house.s +++ b/res/field/scripts/scripts_init_sunyshore_city_west_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_sunyshore_market.s b/res/field/scripts/scripts_init_sunyshore_market.s index 76de2716fd..bc28f65937 100644 --- a/res/field/scripts/scripts_init_sunyshore_market.s +++ b/res/field/scripts/scripts_init_sunyshore_market.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_survival_area.s b/res/field/scripts/scripts_init_survival_area.s index 34f1483f8b..29bcfcf499 100644 --- a/res/field/scripts/scripts_init_survival_area.s +++ b/res/field/scripts/scripts_init_survival_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 8, 0 diff --git a/res/field/scripts/scripts_init_survival_area_mart.s b/res/field/scripts/scripts_init_survival_area_mart.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_init_survival_area_mart.s +++ b/res/field/scripts/scripts_init_survival_area_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_init_survival_area_north_house.s b/res/field/scripts/scripts_init_survival_area_north_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_survival_area_north_house.s +++ b/res/field/scripts/scripts_init_survival_area_north_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_survival_area_pokecenter_1f.s b/res/field/scripts/scripts_init_survival_area_pokecenter_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_survival_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_survival_area_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_survival_area_pokecenter_2f.s b/res/field/scripts/scripts_init_survival_area_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_survival_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_survival_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_survival_area_pokecenter_b1f.s b/res/field/scripts/scripts_init_survival_area_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_survival_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_survival_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_survival_area_south_house.s b/res/field/scripts/scripts_init_survival_area_south_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_survival_area_south_house.s +++ b/res/field/scripts/scripts_init_survival_area_south_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_team_galactic_eterna_building_1f.s b/res/field/scripts/scripts_init_team_galactic_eterna_building_1f.s index cefb744bea..235fdc9ca8 100644 --- a/res/field/scripts/scripts_init_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_init_team_galactic_eterna_building_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 7, 0 diff --git a/res/field/scripts/scripts_init_team_galactic_eterna_building_2f.s b/res/field/scripts/scripts_init_team_galactic_eterna_building_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_team_galactic_eterna_building_2f.s +++ b/res/field/scripts/scripts_init_team_galactic_eterna_building_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_team_galactic_eterna_building_3f.s b/res/field/scripts/scripts_init_team_galactic_eterna_building_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_team_galactic_eterna_building_3f.s +++ b/res/field/scripts/scripts_init_team_galactic_eterna_building_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_team_galactic_eterna_building_4f.s b/res/field/scripts/scripts_init_team_galactic_eterna_building_4f.s index f49b4b332f..45ac16c97e 100644 --- a/res/field/scripts/scripts_init_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_init_team_galactic_eterna_building_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 1, 0 diff --git a/res/field/scripts/scripts_init_trainers_school.s b/res/field/scripts/scripts_init_trainers_school.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_trainers_school.s +++ b/res/field/scripts/scripts_init_trainers_school.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_entrance.s b/res/field/scripts/scripts_init_turnback_cave_entrance.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_entrance.s +++ b/res/field/scripts/scripts_init_turnback_cave_entrance.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_giratina_room.s b/res/field/scripts/scripts_init_turnback_cave_giratina_room.s index 4f2f697e99..bc2c6280c6 100644 --- a/res/field/scripts/scripts_init_turnback_cave_giratina_room.s +++ b/res/field/scripts/scripts_init_turnback_cave_giratina_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_1.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_1.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_2.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_2.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_3.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_3.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_3.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_4.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_4.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_4.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_5.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_5.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_5.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_6.s b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_6.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_6.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_1_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_1.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_1.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_2.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_2.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_3.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_3.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_3.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_4.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_4.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_4.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_5.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_5.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_5.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_6.s b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_6.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_6.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_2_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_1.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_1.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_1.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_2.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_2.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_2.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_3.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_3.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_3.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_4.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_4.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_4.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_5.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_5.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_5.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_6.s b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_6.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_6.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_3_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_turnback_cave_pillar_room.s b/res/field/scripts/scripts_init_turnback_cave_pillar_room.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_turnback_cave_pillar_room.s +++ b/res/field/scripts/scripts_init_turnback_cave_pillar_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town.s b/res/field/scripts/scripts_init_twinleaf_town.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_twinleaf_town.s +++ b/res/field/scripts/scripts_init_twinleaf_town.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town_northeast_house.s b/res/field/scripts/scripts_init_twinleaf_town_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_northeast_house.s +++ b/res/field/scripts/scripts_init_twinleaf_town_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_init_twinleaf_town_player_house_1f.s index 6ce6cf6069..810be3481f 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_init_twinleaf_town_player_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town_player_house_2f.s b/res/field/scripts/scripts_init_twinleaf_town_player_house_2f.s index 5d19eb75df..80765cef35 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_init_twinleaf_town_player_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 5, 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town_rival_house_1f.s b/res/field/scripts/scripts_init_twinleaf_town_rival_house_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_rival_house_1f.s +++ b/res/field/scripts/scripts_init_twinleaf_town_rival_house_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_twinleaf_town_rival_house_2f.s b/res/field/scripts/scripts_init_twinleaf_town_rival_house_2f.s index 8664e839e2..72bca95543 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_init_twinleaf_town_rival_house_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_twinleaf_town_southwest_house.s b/res/field/scripts/scripts_init_twinleaf_town_southwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_twinleaf_town_southwest_house.s +++ b/res/field/scripts/scripts_init_twinleaf_town_southwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_underground.s b/res/field/scripts/scripts_init_underground.s index 6a39fdec3b..332c5ad464 100644 --- a/res/field/scripts/scripts_init_underground.s +++ b/res/field/scripts/scripts_init_underground.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_union_room.s b/res/field/scripts/scripts_init_union_room.s index 64c257be2b..8067d22467 100644 --- a/res/field/scripts/scripts_init_union_room.s +++ b/res/field/scripts/scripts_init_union_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_unknown_578.s b/res/field/scripts/scripts_init_unknown_578.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_unknown_578.s +++ b/res/field/scripts/scripts_init_unknown_578.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_valley_windworks_building.s b/res/field/scripts/scripts_init_valley_windworks_building.s index 3d1028732b..e605b5c901 100644 --- a/res/field/scripts/scripts_init_valley_windworks_building.s +++ b/res/field/scripts/scripts_init_valley_windworks_building.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_valley_windworks_outside.s b/res/field/scripts/scripts_init_valley_windworks_outside.s index c07e71b1a0..c1e140b249 100644 --- a/res/field/scripts/scripts_init_valley_windworks_outside.s +++ b/res/field/scripts/scripts_init_valley_windworks_outside.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 2, 0 diff --git a/res/field/scripts/scripts_init_valor_cavern.s b/res/field/scripts/scripts_init_valor_cavern.s index 04e666f81d..1373cadae2 100644 --- a/res/field/scripts/scripts_init_valor_cavern.s +++ b/res/field/scripts/scripts_init_valor_cavern.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_valor_lakefront.s b/res/field/scripts/scripts_init_valor_lakefront.s index 133f4ff632..f94eae511b 100644 --- a/res/field/scripts/scripts_init_valor_lakefront.s +++ b/res/field/scripts/scripts_init_valor_lakefront.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 2, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city.s b/res/field/scripts/scripts_init_veilstone_city.s index 10e6a62398..d4cbcf03d4 100644 --- a/res/field/scripts/scripts_init_veilstone_city.s +++ b/res/field/scripts/scripts_init_veilstone_city.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_galactic_warehouse.s b/res/field/scripts/scripts_init_veilstone_city_galactic_warehouse.s index 34917d18ce..29b8ceaea5 100644 --- a/res/field/scripts/scripts_init_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_init_veilstone_city_galactic_warehouse.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_gym.s b/res/field/scripts/scripts_init_veilstone_city_gym.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_veilstone_city_gym.s +++ b/res/field/scripts/scripts_init_veilstone_city_gym.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_northeast_house.s b/res/field/scripts/scripts_init_veilstone_city_northeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_city_northeast_house.s +++ b/res/field/scripts/scripts_init_veilstone_city_northeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_northwest_house.s b/res/field/scripts/scripts_init_veilstone_city_northwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_city_northwest_house.s +++ b/res/field/scripts/scripts_init_veilstone_city_northwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_pokecenter_1f.s b/res/field/scripts/scripts_init_veilstone_city_pokecenter_1f.s index 38de2936fc..0b0244560c 100644 --- a/res/field/scripts/scripts_init_veilstone_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_init_veilstone_city_pokecenter_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x28A0, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_pokecenter_2f.s b/res/field/scripts/scripts_init_veilstone_city_pokecenter_2f.s index e4111658c9..1d014a52d2 100644 --- a/res/field/scripts/scripts_init_veilstone_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_init_veilstone_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 3 .short 0x2328, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_pokecenter_b1f.s b/res/field/scripts/scripts_init_veilstone_city_pokecenter_b1f.s index 4a4828eee5..f95bb590eb 100644 --- a/res/field/scripts/scripts_init_veilstone_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_init_veilstone_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 0x23F3, 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_prize_exchange.s b/res/field/scripts/scripts_init_veilstone_city_prize_exchange.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_city_prize_exchange.s +++ b/res/field/scripts/scripts_init_veilstone_city_prize_exchange.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_southeast_house.s b/res/field/scripts/scripts_init_veilstone_city_southeast_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_city_southeast_house.s +++ b/res/field/scripts/scripts_init_veilstone_city_southeast_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_city_southwest_house.s b/res/field/scripts/scripts_init_veilstone_city_southwest_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_city_southwest_house.s +++ b/res/field/scripts/scripts_init_veilstone_city_southwest_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_1f.s b/res/field/scripts/scripts_init_veilstone_store_1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_1f.s +++ b/res/field/scripts/scripts_init_veilstone_store_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_2f.s b/res/field/scripts/scripts_init_veilstone_store_2f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_2f.s +++ b/res/field/scripts/scripts_init_veilstone_store_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_3f.s b/res/field/scripts/scripts_init_veilstone_store_3f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_3f.s +++ b/res/field/scripts/scripts_init_veilstone_store_3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_4f.s b/res/field/scripts/scripts_init_veilstone_store_4f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_4f.s +++ b/res/field/scripts/scripts_init_veilstone_store_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_5f.s b/res/field/scripts/scripts_init_veilstone_store_5f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_5f.s +++ b/res/field/scripts/scripts_init_veilstone_store_5f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_b1f.s b/res/field/scripts/scripts_init_veilstone_store_b1f.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_b1f.s +++ b/res/field/scripts/scripts_init_veilstone_store_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_veilstone_store_elevator.s b/res/field/scripts/scripts_init_veilstone_store_elevator.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_veilstone_store_elevator.s +++ b/res/field/scripts/scripts_init_veilstone_store_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_verity_cavern.s b/res/field/scripts/scripts_init_verity_cavern.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_verity_cavern.s +++ b/res/field/scripts/scripts_init_verity_cavern.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_verity_lakefront.s b/res/field/scripts/scripts_init_verity_lakefront.s index f084da1906..d04fe3319b 100644 --- a/res/field/scripts/scripts_init_verity_lakefront.s +++ b/res/field/scripts/scripts_init_verity_lakefront.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 4 .short 1, 0 diff --git a/res/field/scripts/scripts_init_verity_lakefront_unknown_house.s b/res/field/scripts/scripts_init_verity_lakefront_unknown_house.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_verity_lakefront_unknown_house.s +++ b/res/field/scripts/scripts_init_verity_lakefront_unknown_house.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_victory_road_1f.s b/res/field/scripts/scripts_init_victory_road_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_victory_road_1f.s +++ b/res/field/scripts/scripts_init_victory_road_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_victory_road_1f_room_2.s b/res/field/scripts/scripts_init_victory_road_1f_room_2.s index 7e5da3dcaa..c9437ce121 100644 --- a/res/field/scripts/scripts_init_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_init_victory_road_1f_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 4, 0 diff --git a/res/field/scripts/scripts_init_villa.s b/res/field/scripts/scripts_init_villa.s index 29f0353053..1909d7418c 100644 --- a/res/field/scripts/scripts_init_villa.s +++ b/res/field/scripts/scripts_init_villa.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_vista_lighthouse.s b/res/field/scripts/scripts_init_vista_lighthouse.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_init_vista_lighthouse.s +++ b/res/field/scripts/scripts_init_vista_lighthouse.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_init_vista_lighthouse_elevator.s b/res/field/scripts/scripts_init_vista_lighthouse_elevator.s index 57558c3a2c..d8ea9c9d9f 100644 --- a/res/field/scripts/scripts_init_vista_lighthouse_elevator.s +++ b/res/field/scripts/scripts_init_vista_lighthouse_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_init_wayward_cave_1f.s b/res/field/scripts/scripts_init_wayward_cave_1f.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_init_wayward_cave_1f.s +++ b/res/field/scripts/scripts_init_wayward_cave_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_init_wifi_plaza_entrance.s b/res/field/scripts/scripts_init_wifi_plaza_entrance.s index 76c54235a0..797f6eb2a3 100644 --- a/res/field/scripts/scripts_init_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_init_wifi_plaza_entrance.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 1 ScriptEntry _0006 diff --git a/res/field/scripts/scripts_iron_island.s b/res/field/scripts/scripts_iron_island.s index f53acc81bb..08d13996da 100644 --- a/res/field/scripts/scripts_iron_island.s +++ b/res/field/scripts/scripts_iron_island.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/iron_island.h" - .data ScriptEntry _000E ScriptEntry _0014 diff --git a/res/field/scripts/scripts_iron_island_1f.s b/res/field/scripts/scripts_iron_island_1f.s index 9bd855b3e5..9a035355be 100644 --- a/res/field/scripts/scripts_iron_island_1f.s +++ b/res/field/scripts/scripts_iron_island_1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_iron_island_b1f_right_room.s b/res/field/scripts/scripts_iron_island_b1f_right_room.s index 8b4375401b..07f0e70bd2 100644 --- a/res/field/scripts/scripts_iron_island_b1f_right_room.s +++ b/res/field/scripts/scripts_iron_island_b1f_right_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_iron_island_b2f_left_room.s b/res/field/scripts/scripts_iron_island_b2f_left_room.s index 98e8d4c2cb..2ad78a063c 100644 --- a/res/field/scripts/scripts_iron_island_b2f_left_room.s +++ b/res/field/scripts/scripts_iron_island_b2f_left_room.s @@ -2,7 +2,6 @@ #include "res/text/bank/iron_island_b2f_left_room.h" #include "res/text/bank/special_met_location_names.h" - .data ScriptEntry _0026 ScriptEntry _0060 diff --git a/res/field/scripts/scripts_iron_island_b3f.s b/res/field/scripts/scripts_iron_island_b3f.s index 9d54e2cc17..286c938508 100644 --- a/res/field/scripts/scripts_iron_island_b3f.s +++ b/res/field/scripts/scripts_iron_island_b3f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0032 ScriptEntry _0075 diff --git a/res/field/scripts/scripts_iron_island_house.s b/res/field/scripts/scripts_iron_island_house.s index 1b383e6ada..7b4472a065 100644 --- a/res/field/scripts/scripts_iron_island_house.s +++ b/res/field/scripts/scripts_iron_island_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/iron_island_house.h" - .data ScriptEntry _000A ScriptEntry _0035 diff --git a/res/field/scripts/scripts_iron_ruins.s b/res/field/scripts/scripts_iron_ruins.s index d62f525eb3..4dd29efbc2 100644 --- a/res/field/scripts/scripts_iron_ruins.s +++ b/res/field/scripts/scripts_iron_ruins.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/iron_ruins.h" - .data ScriptEntry _0026 ScriptEntry _003D diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index 38e7b2cf37..d509cde98d 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city.h" - .data ScriptEntry _0072 ScriptEntry _00E8 diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s index c4aa0a18ab..cf764cc515 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_condominiums_1f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s index 0225c5842b..8ce0283f99 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_condominiums_2f.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s index f714aa74a7..5ad320431a 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_condominiums_3f.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s index 22a93fbabd..e0033f247b 100644 --- a/res/field/scripts/scripts_jubilife_city_condominiums_4f.s +++ b/res/field/scripts/scripts_jubilife_city_condominiums_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_condominiums_4f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_mart.s b/res/field/scripts/scripts_jubilife_city_mart.s index f72e0084a6..dcc81f4bb5 100644 --- a/res/field/scripts/scripts_jubilife_city_mart.s +++ b/res/field/scripts/scripts_jubilife_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_mart.h" - .data ScriptEntry _0016 ScriptEntry _002C diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s index 8b0d2d9cde..05c3481afe 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_2f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_pokecenter_b1f.s b/res/field/scripts/scripts_jubilife_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_jubilife_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_jubilife_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_south_house_1f.s b/res/field/scripts/scripts_jubilife_city_south_house_1f.s index 482c85cddf..5b2f3367c3 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_south_house_1f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_2f.s b/res/field/scripts/scripts_jubilife_city_south_house_2f.s index 519f8538a7..059b72cc98 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_south_house_2f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_jubilife_city_south_house_3f.s b/res/field/scripts/scripts_jubilife_city_south_house_3f.s index 28041aea30..c8761dcae7 100644 --- a/res/field/scripts/scripts_jubilife_city_south_house_3f.s +++ b/res/field/scripts/scripts_jubilife_city_south_house_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_south_house_3f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s index dbe8fe6e4a..8e39947eb8 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_southwest_house_1f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s index 2a54852d43..1aa80e6eb9 100644 --- a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s +++ b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_southwest_house_2f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s index 8608b6f5f4..485e5d75e5 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_unknown_house_1.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s b/res/field/scripts/scripts_jubilife_city_unknown_house_2.s index fe33bb374d..e09f2810b8 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_unknown_house_2.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s b/res/field/scripts/scripts_jubilife_city_unknown_house_3.s index da9217a235..8e77d030d1 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_3.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_unknown_house_3.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s b/res/field/scripts/scripts_jubilife_city_unknown_house_4.s index b134224792..712c17683f 100644 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s +++ b/res/field/scripts/scripts_jubilife_city_unknown_house_4.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_city_unknown_house_4.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_jubilife_tv_1f.s b/res/field/scripts/scripts_jubilife_tv_1f.s index 6425a00568..6e19440e10 100644 --- a/res/field/scripts/scripts_jubilife_tv_1f.s +++ b/res/field/scripts/scripts_jubilife_tv_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_1f.h" - .data ScriptEntry _0028 ScriptEntry _002A diff --git a/res/field/scripts/scripts_jubilife_tv_2f.s b/res/field/scripts/scripts_jubilife_tv_2f.s index 2f92f73364..032b7198e2 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f.s +++ b/res/field/scripts/scripts_jubilife_tv_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_2f.h" - .data ScriptEntry _0031 ScriptEntry _0044 diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 29cbbe9b89..36876c80b5 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_2f_gallery.h" - .data ScriptEntry _003A ScriptEntry _03CC diff --git a/res/field/scripts/scripts_jubilife_tv_3f.s b/res/field/scripts/scripts_jubilife_tv_3f.s index 07c827a046..cf79414da1 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f.s +++ b/res/field/scripts/scripts_jubilife_tv_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_3f.h" - .data ScriptEntry _0012 ScriptEntry _0054 diff --git a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s index 08e39b1aba..39dd424e9d 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_global_ranking_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_3f_global_ranking_room.h" - .data ScriptEntry _001E ScriptEntry _002C diff --git a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s index d865a7169f..3d027d83fb 100644 --- a/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s +++ b/res/field/scripts/scripts_jubilife_tv_3f_group_ranking_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_3f_group_ranking_room.h" - .data ScriptEntry _001A ScriptEntry _0028 diff --git a/res/field/scripts/scripts_jubilife_tv_4f.s b/res/field/scripts/scripts_jubilife_tv_4f.s index 8cfb97652d..97e05d9440 100644 --- a/res/field/scripts/scripts_jubilife_tv_4f.s +++ b/res/field/scripts/scripts_jubilife_tv_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_4f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_jubilife_tv_elevator.s b/res/field/scripts/scripts_jubilife_tv_elevator.s index e97d4a29bb..156afc8754 100644 --- a/res/field/scripts/scripts_jubilife_tv_elevator.s +++ b/res/field/scripts/scripts_jubilife_tv_elevator.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/jubilife_tv_elevator.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_lake_acuity.s b/res/field/scripts/scripts_lake_acuity.s index 734eeccaa6..089ba77d14 100644 --- a/res/field/scripts/scripts_lake_acuity.s +++ b/res/field/scripts/scripts_lake_acuity.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_acuity.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_lake_acuity_low_water.s b/res/field/scripts/scripts_lake_acuity_low_water.s index 4ab98c3ab2..5f02a0494e 100644 --- a/res/field/scripts/scripts_lake_acuity_low_water.s +++ b/res/field/scripts/scripts_lake_acuity_low_water.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_acuity_low_water.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_lake_valor.s b/res/field/scripts/scripts_lake_valor.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_lake_valor.s +++ b/res/field/scripts/scripts_lake_valor.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_lake_valor_drained.s b/res/field/scripts/scripts_lake_valor_drained.s index 6d529d48ab..bf4177f03e 100644 --- a/res/field/scripts/scripts_lake_valor_drained.s +++ b/res/field/scripts/scripts_lake_valor_drained.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_valor_drained.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_lake_verity.s b/res/field/scripts/scripts_lake_verity.s index c43b8135f2..484b594226 100644 --- a/res/field/scripts/scripts_lake_verity.s +++ b/res/field/scripts/scripts_lake_verity.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_verity.h" - .data ScriptEntry _001E ScriptEntry _00C7 diff --git a/res/field/scripts/scripts_lake_verity_low_water.s b/res/field/scripts/scripts_lake_verity_low_water.s index 30e7cc4576..e987c31013 100644 --- a/res/field/scripts/scripts_lake_verity_low_water.s +++ b/res/field/scripts/scripts_lake_verity_low_water.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/lake_verity_low_water.h" - .data ScriptEntry _001E ScriptEntry _004E diff --git a/res/field/scripts/scripts_maniac_tunnel.s b/res/field/scripts/scripts_maniac_tunnel.s index b63a67c27f..18be789bac 100644 --- a/res/field/scripts/scripts_maniac_tunnel.s +++ b/res/field/scripts/scripts_maniac_tunnel.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/maniac_tunnel.h" - .data ScriptEntry _0010 ScriptEntry _000A diff --git a/res/field/scripts/scripts_map_header_unknown_578.s b/res/field/scripts/scripts_map_header_unknown_578.s index 44c3d997df..989f94c366 100644 --- a/res/field/scripts/scripts_map_header_unknown_578.s +++ b/res/field/scripts/scripts_map_header_unknown_578.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_mining_museum.s b/res/field/scripts/scripts_mining_museum.s index e3994ea296..18933a30df 100644 --- a/res/field/scripts/scripts_mining_museum.s +++ b/res/field/scripts/scripts_mining_museum.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mining_museum.h" - .data ScriptEntry _0042 ScriptEntry _0055 diff --git a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s index 91c2276a74..fdcd86c368 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s +++ b/res/field/scripts/scripts_mt_coronet_1f_north_room_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mt_coronet_1f_north_room_1.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_mt_coronet_1f_north_room_2.s b/res/field/scripts/scripts_mt_coronet_1f_north_room_2.s index 2f6eb41252..79f2a26496 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_north_room_2.s +++ b/res/field/scripts/scripts_mt_coronet_1f_north_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0077 ScriptEntry _000E diff --git a/res/field/scripts/scripts_mt_coronet_1f_south.s b/res/field/scripts/scripts_mt_coronet_1f_south.s index 5b9393b9d5..a5c389d572 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_south.s +++ b/res/field/scripts/scripts_mt_coronet_1f_south.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mt_coronet_1f_south.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s b/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s index 23e7ad958f..5ca1a813e4 100644 --- a/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s +++ b/res/field/scripts/scripts_mt_coronet_1f_tunnel_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mt_coronet_1f_tunnel_room.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_mt_coronet_2f.s b/res/field/scripts/scripts_mt_coronet_2f.s index 74809ff7a0..7183d3c55c 100644 --- a/res/field/scripts/scripts_mt_coronet_2f.s +++ b/res/field/scripts/scripts_mt_coronet_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mt_coronet_2f.h" - .data ScriptEntry _0012 ScriptEntry _0036 diff --git a/res/field/scripts/scripts_mt_coronet_6f.s b/res/field/scripts/scripts_mt_coronet_6f.s index 7fa7837c15..2ada24a4a0 100644 --- a/res/field/scripts/scripts_mt_coronet_6f.s +++ b/res/field/scripts/scripts_mt_coronet_6f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _0022 diff --git a/res/field/scripts/scripts_newmoon_island.s b/res/field/scripts/scripts_newmoon_island.s index 6da8740a85..9e95f5c5c2 100644 --- a/res/field/scripts/scripts_newmoon_island.s +++ b/res/field/scripts/scripts_newmoon_island.s @@ -2,7 +2,6 @@ #include "generated/hidden_locations.h" #include "res/text/bank/newmoon_island.h" - .data ScriptEntry _000A ScriptEntry _0037 diff --git a/res/field/scripts/scripts_newmoon_island_forest.s b/res/field/scripts/scripts_newmoon_island_forest.s index fd3dd24c2b..bdfa32106d 100644 --- a/res/field/scripts/scripts_newmoon_island_forest.s +++ b/res/field/scripts/scripts_newmoon_island_forest.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/newmoon_island_forest.h" - .data ScriptEntry _000E ScriptEntry _005E diff --git a/res/field/scripts/scripts_old_chateau.s b/res/field/scripts/scripts_old_chateau.s index 7e28b7ccb1..60950effe6 100644 --- a/res/field/scripts/scripts_old_chateau.s +++ b/res/field/scripts/scripts_old_chateau.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/old_chateau.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s index ab56fac4c9..699a5c7a4d 100644 --- a/res/field/scripts/scripts_old_chateau_back_middle_east_room.s +++ b/res/field/scripts/scripts_old_chateau_back_middle_east_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _002E diff --git a/res/field/scripts/scripts_old_chateau_back_middle_west_room.s b/res/field/scripts/scripts_old_chateau_back_middle_west_room.s index 330d55f4ae..08102a7f9b 100644 --- a/res/field/scripts/scripts_old_chateau_back_middle_west_room.s +++ b/res/field/scripts/scripts_old_chateau_back_middle_west_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/old_chateau_back_middle_west_room.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_old_chateau_dining_area.s b/res/field/scripts/scripts_old_chateau_dining_area.s index 9053d2f7ba..9b9b83059f 100644 --- a/res/field/scripts/scripts_old_chateau_dining_area.s +++ b/res/field/scripts/scripts_old_chateau_dining_area.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _002E diff --git a/res/field/scripts/scripts_old_chateau_side_rooms.s b/res/field/scripts/scripts_old_chateau_side_rooms.s index 8406f76eb0..c9453300a8 100644 --- a/res/field/scripts/scripts_old_chateau_side_rooms.s +++ b/res/field/scripts/scripts_old_chateau_side_rooms.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/old_chateau_side_rooms.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_city.s b/res/field/scripts/scripts_oreburgh_city.s index c779ec4064..a1cfbac8df 100644 --- a/res/field/scripts/scripts_oreburgh_city.s +++ b/res/field/scripts/scripts_oreburgh_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city.h" - .data ScriptEntry _005A ScriptEntry _0090 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s index 94c11c980d..7a0bf35bcf 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_east_house_1f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s index 205a095453..44aff90a33 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_east_house_2f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s index c4b9670e04..0c28e15246 100644 --- a/res/field/scripts/scripts_oreburgh_city_east_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_east_house_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_east_house_3f.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_oreburgh_city_gym.s b/res/field/scripts/scripts_oreburgh_city_gym.s index c8118a5972..52289ddd3d 100644 --- a/res/field/scripts/scripts_oreburgh_city_gym.s +++ b/res/field/scripts/scripts_oreburgh_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_gym.h" - .data ScriptEntry _000E ScriptEntry _011F diff --git a/res/field/scripts/scripts_oreburgh_city_mart.s b/res/field/scripts/scripts_oreburgh_city_mart.s index 16ea03caba..60ca96ce48 100644 --- a/res/field/scripts/scripts_oreburgh_city_mart.s +++ b/res/field/scripts/scripts_oreburgh_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_oreburgh_city_middle_house.s b/res/field/scripts/scripts_oreburgh_city_middle_house.s index edcadc743c..04deee23ea 100644 --- a/res/field/scripts/scripts_oreburgh_city_middle_house.s +++ b/res/field/scripts/scripts_oreburgh_city_middle_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_middle_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s index 3626bb0168..cf8e9eed2a 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_north_house_1f.h" - .data ScriptEntry _000E ScriptEntry _00C2 diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s index 5206538253..af62af795c 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_north_house_2f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s index 9ec3e56c3a..73d2d08b2e 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_north_house_3f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_city_north_house_4f.s b/res/field/scripts/scripts_oreburgh_city_north_house_4f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_oreburgh_city_north_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_north_house_4f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s index b92ed5bba1..a7573d91e6 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_northwest_house_1f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s index da713b4ae0..0d5f358e16 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_northwest_house_2f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s index 3b36093299..4ab4abaee6 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_northwest_house_3f.h" - .data ScriptEntry _000A ScriptEntry _006E diff --git a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s index 69c09d0637..6fd553ed12 100644 --- a/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s +++ b/res/field/scripts/scripts_oreburgh_city_northwest_house_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_northwest_house_4f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s index 4ddb90113d..7048abeeb8 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_pokecenter_1f.h" - .data ScriptEntry _001E ScriptEntry _002A diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_2f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s index 2c838a6219..018874ce8d 100644 --- a/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_oreburgh_city_pokecenter_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_pokecenter_b1f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_city_south_house.s b/res/field/scripts/scripts_oreburgh_city_south_house.s index 816fbf415a..f756c3aa4a 100644 --- a/res/field/scripts/scripts_oreburgh_city_south_house.s +++ b/res/field/scripts/scripts_oreburgh_city_south_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_south_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_city_west_house.s b/res/field/scripts/scripts_oreburgh_city_west_house.s index 1384a35b7d..2ef830a72f 100644 --- a/res/field/scripts/scripts_oreburgh_city_west_house.s +++ b/res/field/scripts/scripts_oreburgh_city_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_city_west_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_oreburgh_gate_1f.s b/res/field/scripts/scripts_oreburgh_gate_1f.s index 7509512751..dc0c80a80d 100644 --- a/res/field/scripts/scripts_oreburgh_gate_1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_gate_1f.h" - .data ScriptEntry _000E ScriptEntry _0014 diff --git a/res/field/scripts/scripts_oreburgh_gate_b1f.s b/res/field/scripts/scripts_oreburgh_gate_b1f.s index dc6e579eed..b817edd051 100644 --- a/res/field/scripts/scripts_oreburgh_gate_b1f.s +++ b/res/field/scripts/scripts_oreburgh_gate_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_gate_b1f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_oreburgh_mine_b1f.s b/res/field/scripts/scripts_oreburgh_mine_b1f.s index cf0208191f..8300e602f5 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b1f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_mine_b1f.h" - .data ScriptEntry _0012 ScriptEntry _002F diff --git a/res/field/scripts/scripts_oreburgh_mine_b2f.s b/res/field/scripts/scripts_oreburgh_mine_b2f.s index 7b5c3f7cca..62e0d87633 100644 --- a/res/field/scripts/scripts_oreburgh_mine_b2f.s +++ b/res/field/scripts/scripts_oreburgh_mine_b2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/oreburgh_mine_b2f.h" - .data ScriptEntry _0016 ScriptEntry _00FC diff --git a/res/field/scripts/scripts_pal_park.s b/res/field/scripts/scripts_pal_park.s index af134745f1..822acaee04 100644 --- a/res/field/scripts/scripts_pal_park.s +++ b/res/field/scripts/scripts_pal_park.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pal_park.h" - .data ScriptEntry _001A ScriptEntry PalPark_Trigger_Countdown diff --git a/res/field/scripts/scripts_pal_park_lobby.s b/res/field/scripts/scripts_pal_park_lobby.s index 16d26927b7..72c4a1e4a5 100644 --- a/res/field/scripts/scripts_pal_park_lobby.s +++ b/res/field/scripts/scripts_pal_park_lobby.s @@ -7,7 +7,6 @@ #define LOCALID_OAK 1 #define LOCALID_RECEPCIONIST 7 - .data ScriptEntry PalParkLobby_OnLoad ScriptEntry PalParkLobby_Receptionist diff --git a/res/field/scripts/scripts_pastoria_city.s b/res/field/scripts/scripts_pastoria_city.s index ec2a0090bd..832ce78341 100644 --- a/res/field/scripts/scripts_pastoria_city.s +++ b/res/field/scripts/scripts_pastoria_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city.h" - .data ScriptEntry _005E ScriptEntry _00B2 diff --git a/res/field/scripts/scripts_pastoria_city_east_house.s b/res/field/scripts/scripts_pastoria_city_east_house.s index d884efbce1..2a5d73487f 100644 --- a/res/field/scripts/scripts_pastoria_city_east_house.s +++ b/res/field/scripts/scripts_pastoria_city_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_east_house.h" - .data ScriptEntry _000A ScriptEntry _0125 diff --git a/res/field/scripts/scripts_pastoria_city_gym.s b/res/field/scripts/scripts_pastoria_city_gym.s index 1aaf263334..10d0278643 100644 --- a/res/field/scripts/scripts_pastoria_city_gym.s +++ b/res/field/scripts/scripts_pastoria_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_gym.h" - .data ScriptEntry _001E ScriptEntry _0034 diff --git a/res/field/scripts/scripts_pastoria_city_mart.s b/res/field/scripts/scripts_pastoria_city_mart.s index c158ca5f20..2c4e371f9b 100644 --- a/res/field/scripts/scripts_pastoria_city_mart.s +++ b/res/field/scripts/scripts_pastoria_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_mart.h" - .data ScriptEntry _0016 ScriptEntry _002C diff --git a/res/field/scripts/scripts_pastoria_city_middle_house.s b/res/field/scripts/scripts_pastoria_city_middle_house.s index 6708385058..cd2b35cb2a 100644 --- a/res/field/scripts/scripts_pastoria_city_middle_house.s +++ b/res/field/scripts/scripts_pastoria_city_middle_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_middle_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_pastoria_city_north_house.s b/res/field/scripts/scripts_pastoria_city_north_house.s index 95b4d194e4..865c0ae864 100644 --- a/res/field/scripts/scripts_pastoria_city_north_house.s +++ b/res/field/scripts/scripts_pastoria_city_north_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_north_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_pastoria_city_northeast_house.s b/res/field/scripts/scripts_pastoria_city_northeast_house.s index 8abf0275e8..6eedbe7a18 100644 --- a/res/field/scripts/scripts_pastoria_city_northeast_house.s +++ b/res/field/scripts/scripts_pastoria_city_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_northeast_house.h" - .data ScriptEntry _000E ScriptEntry _030C diff --git a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s index 8461c72b1a..22d00bd3b7 100644 --- a/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s +++ b/res/field/scripts/scripts_pastoria_city_observatory_gate_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_observatory_gate_1f.h" - .data ScriptEntry _0020 ScriptEntry _0022 diff --git a/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s b/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s index 8a28b44ea7..5a6fdb6ada 100644 --- a/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s +++ b/res/field/scripts/scripts_pastoria_city_observatory_gate_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_observatory_gate_2f.h" - .data ScriptEntry _0016 ScriptEntry _0078 diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s index f39178f14a..678e4acda4 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_pokecenter_1f.h" - .data ScriptEntry _000E ScriptEntry _001A diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s index c7ff4ca242..a01cd91b92 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_pokecenter_2f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pastoria_city_pokecenter_b1f.s b/res/field/scripts/scripts_pastoria_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_pastoria_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_pastoria_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pastoria_city_southwest_house.s b/res/field/scripts/scripts_pastoria_city_southwest_house.s index f875288038..b27ff3f9dd 100644 --- a/res/field/scripts/scripts_pastoria_city_southwest_house.s +++ b/res/field/scripts/scripts_pastoria_city_southwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pastoria_city_southwest_house.h" - .data ScriptEntry _000A ScriptEntry _006A diff --git a/res/field/scripts/scripts_poffin_house.s b/res/field/scripts/scripts_poffin_house.s index ca908a4c8c..2760ae7fd5 100644 --- a/res/field/scripts/scripts_poffin_house.s +++ b/res/field/scripts/scripts_poffin_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poffin_house.h" - .data ScriptEntry _0070 ScriptEntry _0083 diff --git a/res/field/scripts/scripts_pokemon_center_daily_trainers.s b/res/field/scripts/scripts_pokemon_center_daily_trainers.s index 761a5f5541..1f28bc407d 100644 --- a/res/field/scripts/scripts_pokemon_center_daily_trainers.s +++ b/res/field/scripts/scripts_pokemon_center_daily_trainers.s @@ -19,7 +19,6 @@ #define VAR_TRAINER VAR_0x8005 #define VAR_DEFEATED VAR_0x8006 - .data ScriptEntry PokemonCenterDailyTrainers_CheckUnlockedVSSeeker ScriptEntry PokemonCenterDailyTrainers_FirstNPC diff --git a/res/field/scripts/scripts_pokemon_day_care.s b/res/field/scripts/scripts_pokemon_day_care.s index 2efc5b4792..63331d206d 100644 --- a/res/field/scripts/scripts_pokemon_day_care.s +++ b/res/field/scripts/scripts_pokemon_day_care.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_day_care.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_pokemon_league.s b/res/field/scripts/scripts_pokemon_league.s index 970ee6e8e3..c2cde88ec0 100644 --- a/res/field/scripts/scripts_pokemon_league.s +++ b/res/field/scripts/scripts_pokemon_league.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league.h" - .data ScriptEntry _000E ScriptEntry _0025 diff --git a/res/field/scripts/scripts_pokemon_league_aaron_room.s b/res/field/scripts/scripts_pokemon_league_aaron_room.s index b8cd589e4b..6868d094c3 100644 --- a/res/field/scripts/scripts_pokemon_league_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_aaron_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_aaron_room.h" - .data ScriptEntry _000A ScriptEntry _00B7 diff --git a/res/field/scripts/scripts_pokemon_league_bertha_room.s b/res/field/scripts/scripts_pokemon_league_bertha_room.s index 61df65e430..7b22dabbdd 100644 --- a/res/field/scripts/scripts_pokemon_league_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_bertha_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_bertha_room.h" - .data ScriptEntry _000A ScriptEntry _00B7 diff --git a/res/field/scripts/scripts_pokemon_league_champion_room.s b/res/field/scripts/scripts_pokemon_league_champion_room.s index 1fd6702459..0998f7716f 100644 --- a/res/field/scripts/scripts_pokemon_league_champion_room.s +++ b/res/field/scripts/scripts_pokemon_league_champion_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_champion_room.h" - .data ScriptEntry _000A ScriptEntry _000E diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_aaron_room.s b/res/field/scripts/scripts_pokemon_league_elevator_to_aaron_room.s index eb4d2ba49b..ca126b52e8 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_aaron_room.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_aaron_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0029 diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_bertha_room.s b/res/field/scripts/scripts_pokemon_league_elevator_to_bertha_room.s index eb4d2ba49b..ca126b52e8 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_bertha_room.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_bertha_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0029 diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_champion_room.s b/res/field/scripts/scripts_pokemon_league_elevator_to_champion_room.s index eb4d2ba49b..ca126b52e8 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_champion_room.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_champion_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0029 diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_flint_room.s b/res/field/scripts/scripts_pokemon_league_elevator_to_flint_room.s index eb4d2ba49b..ca126b52e8 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_flint_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0029 diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s index 868c2848ef..93e386dd77 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_hall_of_fame.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_elevator_to_hall_of_fame.h" - .data ScriptEntry _000A ScriptEntry _000A diff --git a/res/field/scripts/scripts_pokemon_league_elevator_to_lucian_room.s b/res/field/scripts/scripts_pokemon_league_elevator_to_lucian_room.s index eb4d2ba49b..ca126b52e8 100644 --- a/res/field/scripts/scripts_pokemon_league_elevator_to_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_elevator_to_lucian_room.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000E ScriptEntry _0029 diff --git a/res/field/scripts/scripts_pokemon_league_flint_room.s b/res/field/scripts/scripts_pokemon_league_flint_room.s index defc6f9663..67adc60428 100644 --- a/res/field/scripts/scripts_pokemon_league_flint_room.s +++ b/res/field/scripts/scripts_pokemon_league_flint_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_flint_room.h" - .data ScriptEntry _000A ScriptEntry _0138 diff --git a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s index 7d68fff1d9..6cf4a47436 100644 --- a/res/field/scripts/scripts_pokemon_league_hall_of_fame.s +++ b/res/field/scripts/scripts_pokemon_league_hall_of_fame.s @@ -2,7 +2,6 @@ #include "generated/hidden_locations.h" #include "res/text/bank/pokemon_league_hall_of_fame.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pokemon_league_lucian_room.s b/res/field/scripts/scripts_pokemon_league_lucian_room.s index 13e190bca2..db32212e98 100644 --- a/res/field/scripts/scripts_pokemon_league_lucian_room.s +++ b/res/field/scripts/scripts_pokemon_league_lucian_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_lucian_room.h" - .data ScriptEntry _000A ScriptEntry _00B7 diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s index 26bf580e37..08fb8308db 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_north_pokecenter_1f.h" - .data ScriptEntry _006D ScriptEntry _0128 diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_2f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_2f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pokemon_league_north_pokecenter_b1f.s b/res/field/scripts/scripts_pokemon_league_north_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_pokemon_league_north_pokecenter_b1f.s +++ b/res/field/scripts/scripts_pokemon_league_north_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s index 032d194c8e..46e5837dee 100644 --- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s +++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_league_south_pokecenter_1f.h" - .data ScriptEntry _0020 ScriptEntry _002C diff --git a/res/field/scripts/scripts_pokemon_league_south_pokecenter_2f.s b/res/field/scripts/scripts_pokemon_league_south_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_2f.s +++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pokemon_league_south_pokecenter_b1f.s b/res/field/scripts/scripts_pokemon_league_south_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_pokemon_league_south_pokecenter_b1f.s +++ b/res/field/scripts/scripts_pokemon_league_south_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_pokemon_mansion.s b/res/field/scripts/scripts_pokemon_mansion.s index 0024274182..cf2d671e1f 100644 --- a/res/field/scripts/scripts_pokemon_mansion.s +++ b/res/field/scripts/scripts_pokemon_mansion.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_mansion.h" - .data ScriptEntry _001A ScriptEntry _004D diff --git a/res/field/scripts/scripts_pokemon_mansion_maids_room.s b/res/field/scripts/scripts_pokemon_mansion_maids_room.s index fe100fecaa..7dd48f0fe4 100644 --- a/res/field/scripts/scripts_pokemon_mansion_maids_room.s +++ b/res/field/scripts/scripts_pokemon_mansion_maids_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_mansion_maids_room.h" - .data ScriptEntry _000E ScriptEntry _0068 diff --git a/res/field/scripts/scripts_pokemon_mansion_office.s b/res/field/scripts/scripts_pokemon_mansion_office.s index e98e081e4d..09ffe1bd08 100644 --- a/res/field/scripts/scripts_pokemon_mansion_office.s +++ b/res/field/scripts/scripts_pokemon_mansion_office.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/pokemon_mansion_office.h" - .data ScriptEntry _001E ScriptEntry _0067 diff --git a/res/field/scripts/scripts_poketch_co_1f.s b/res/field/scripts/scripts_poketch_co_1f.s index 8dd008be2c..2b9a51f216 100644 --- a/res/field/scripts/scripts_poketch_co_1f.s +++ b/res/field/scripts/scripts_poketch_co_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poketch_co_1f.h" - .data ScriptEntry _0042 ScriptEntry _01C3 diff --git a/res/field/scripts/scripts_poketch_co_2f.s b/res/field/scripts/scripts_poketch_co_2f.s index f738579f4f..00c46ff952 100644 --- a/res/field/scripts/scripts_poketch_co_2f.s +++ b/res/field/scripts/scripts_poketch_co_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poketch_co_2f.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_poketch_co_3f.s b/res/field/scripts/scripts_poketch_co_3f.s index 32da64f2db..ca80419690 100644 --- a/res/field/scripts/scripts_poketch_co_3f.s +++ b/res/field/scripts/scripts_poketch_co_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/poketch_co_3f.h" - .data ScriptEntry _001E ScriptEntry _0031 diff --git a/res/field/scripts/scripts_ravaged_path.s b/res/field/scripts/scripts_ravaged_path.s index 3ce6714011..576fa5c66e 100644 --- a/res/field/scripts/scripts_ravaged_path.s +++ b/res/field/scripts/scripts_ravaged_path.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_resort_area.s b/res/field/scripts/scripts_resort_area.s index 8f6d823cba..6b3e6f59e3 100644 --- a/res/field/scripts/scripts_resort_area.s +++ b/res/field/scripts/scripts_resort_area.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area.h" - .data ScriptEntry _00DA ScriptEntry _00ED diff --git a/res/field/scripts/scripts_resort_area_house.s b/res/field/scripts/scripts_resort_area_house.s index 85465800c8..07c749a335 100644 --- a/res/field/scripts/scripts_resort_area_house.s +++ b/res/field/scripts/scripts_resort_area_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_house.h" - .data ScriptEntry _000E ScriptEntry _0034 diff --git a/res/field/scripts/scripts_resort_area_mart.s b/res/field/scripts/scripts_resort_area_mart.s index add8e9a019..a6474eb066 100644 --- a/res/field/scripts/scripts_resort_area_mart.s +++ b/res/field/scripts/scripts_resort_area_mart.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _0020 diff --git a/res/field/scripts/scripts_resort_area_pokecenter_1f.s b/res/field/scripts/scripts_resort_area_pokecenter_1f.s index 95f0f42f64..c067cedd65 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_pokecenter_1f.h" - .data ScriptEntry _000E ScriptEntry _001A diff --git a/res/field/scripts/scripts_resort_area_pokecenter_2f.s b/res/field/scripts/scripts_resort_area_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_resort_area_pokecenter_b1f.s b/res/field/scripts/scripts_resort_area_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_resort_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_resort_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s index b3ae100119..ab1e48c571 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_1f.s @@ -2,7 +2,6 @@ #include "res/text/bank/resort_area_ribbon_syndicate_1f.h" #include "generated/ribbons.h" - .data ScriptEntry _00C0 ScriptEntry _00D6 diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s index 97177245b8..25a8d07209 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_ribbon_syndicate_2f.h" - .data ScriptEntry _0012 ScriptEntry _02E8 diff --git a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s index 348e3309ad..7f495e4daf 100644 --- a/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s +++ b/res/field/scripts/scripts_resort_area_ribbon_syndicate_elevator.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/resort_area_ribbon_syndicate_elevator.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_restaurant.s b/res/field/scripts/scripts_restaurant.s index 46bf0cdf58..23e1e25db1 100644 --- a/res/field/scripts/scripts_restaurant.s +++ b/res/field/scripts/scripts_restaurant.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/restaurant.h" - .data ScriptEntry _031E ScriptEntry _0058 diff --git a/res/field/scripts/scripts_rock_peak_ruins.s b/res/field/scripts/scripts_rock_peak_ruins.s index fc9319e41d..893c841db9 100644 --- a/res/field/scripts/scripts_rock_peak_ruins.s +++ b/res/field/scripts/scripts_rock_peak_ruins.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/rock_peak_ruins.h" - .data ScriptEntry _0026 ScriptEntry _003D diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index 7a522d96ab..9bdda6d318 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -7,7 +7,6 @@ #define LOCALID_MOVE_TO_LEARN VAR_0x8001 #define LOCALID_ROTOM_FORM VAR_0x8004 - .data ScriptEntry RotomsRoom_MicrowaveOven ScriptEntry RotomsRoom_Refrigerator diff --git a/res/field/scripts/scripts_route_201.s b/res/field/scripts/scripts_route_201.s index d1986d5541..e233cfd01c 100644 --- a/res/field/scripts/scripts_route_201.s +++ b/res/field/scripts/scripts_route_201.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_201.h" - .data ScriptEntry _0042 ScriptEntry _0072 diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index a47968210d..b6248dd9dd 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_202.h" - .data ScriptEntry _001E ScriptEntry _0071 diff --git a/res/field/scripts/scripts_route_203.s b/res/field/scripts/scripts_route_203.s index 60ef870955..a098fd432e 100644 --- a/res/field/scripts/scripts_route_203.s +++ b/res/field/scripts/scripts_route_203.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_203.h" - .data ScriptEntry _001A ScriptEntry _002D diff --git a/res/field/scripts/scripts_route_204_north.s b/res/field/scripts/scripts_route_204_north.s index 189756db6a..4a327bc6c2 100644 --- a/res/field/scripts/scripts_route_204_north.s +++ b/res/field/scripts/scripts_route_204_north.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_204_north.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_204_south.s b/res/field/scripts/scripts_route_204_south.s index f1c64aa3c0..e67c2b9328 100644 --- a/res/field/scripts/scripts_route_204_south.s +++ b/res/field/scripts/scripts_route_204_south.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_204_south.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_205_house.s b/res/field/scripts/scripts_route_205_house.s index 30e4715e78..056fb91156 100644 --- a/res/field/scripts/scripts_route_205_house.s +++ b/res/field/scripts/scripts_route_205_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_205_house.h" - .data ScriptEntry _000A ScriptEntry _006D diff --git a/res/field/scripts/scripts_route_205_north.s b/res/field/scripts/scripts_route_205_north.s index e7a2e436b3..db8bf1ed91 100644 --- a/res/field/scripts/scripts_route_205_north.s +++ b/res/field/scripts/scripts_route_205_north.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_205_north.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_205_south.s b/res/field/scripts/scripts_route_205_south.s index 0e3e63468d..7223b6bd70 100644 --- a/res/field/scripts/scripts_route_205_south.s +++ b/res/field/scripts/scripts_route_205_south.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_205_south.h" - .data ScriptEntry _002A ScriptEntry _00F8 diff --git a/res/field/scripts/scripts_route_206.s b/res/field/scripts/scripts_route_206.s index 5d884ed874..f44532d917 100644 --- a/res/field/scripts/scripts_route_206.s +++ b/res/field/scripts/scripts_route_206.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_206.h" - .data ScriptEntry _0016 ScriptEntry _001C diff --git a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s index f4a0f3812b..b43122bdcb 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_north_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_north_gate.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_206_cycling_road_north_gate.h" - .data ScriptEntry _003B ScriptEntry _004E diff --git a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s index d0f49b0b24..3d670e6264 100644 --- a/res/field/scripts/scripts_route_206_cycling_road_south_gate.s +++ b/res/field/scripts/scripts_route_206_cycling_road_south_gate.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_206_cycling_road_south_gate.h" - .data ScriptEntry _001A ScriptEntry _003D diff --git a/res/field/scripts/scripts_route_207.s b/res/field/scripts/scripts_route_207.s index 990e757f88..66a5428bb9 100644 --- a/res/field/scripts/scripts_route_207.s +++ b/res/field/scripts/scripts_route_207.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_207.h" - .data ScriptEntry _001E ScriptEntry _004E diff --git a/res/field/scripts/scripts_route_208.s b/res/field/scripts/scripts_route_208.s index 8606f320f5..2bec8da152 100644 --- a/res/field/scripts/scripts_route_208.s +++ b/res/field/scripts/scripts_route_208.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_208.h" - .data ScriptEntry _0016 ScriptEntry _002D diff --git a/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s index 49d25c39d1..17e65a571a 100644 --- a/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_208_gate_to_hearthome_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_208_gate_to_hearthome_city.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_208_house.s b/res/field/scripts/scripts_route_208_house.s index c3be6cae0f..529a3d7424 100644 --- a/res/field/scripts/scripts_route_208_house.s +++ b/res/field/scripts/scripts_route_208_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_208_house.h" - .data ScriptEntry _0016 ScriptEntry _001C diff --git a/res/field/scripts/scripts_route_209.s b/res/field/scripts/scripts_route_209.s index 0a62252256..35021b8ff4 100644 --- a/res/field/scripts/scripts_route_209.s +++ b/res/field/scripts/scripts_route_209.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_209.h" - .data ScriptEntry _0091 ScriptEntry _00A4 diff --git a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s index f0b3a35f08..b2d7875d29 100644 --- a/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_209_gate_to_hearthome_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_209_gate_to_hearthome_city.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_209_lost_tower_1f.s b/res/field/scripts/scripts_route_209_lost_tower_1f.s index 9173da56c1..e8c0675dac 100644 --- a/res/field/scripts/scripts_route_209_lost_tower_1f.s +++ b/res/field/scripts/scripts_route_209_lost_tower_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_209_lost_tower_1f.h" - .data ScriptEntry _000E ScriptEntry _0014 diff --git a/res/field/scripts/scripts_route_209_lost_tower_5f.s b/res/field/scripts/scripts_route_209_lost_tower_5f.s index 1d36a1f4d1..a0f3e96a7e 100644 --- a/res/field/scripts/scripts_route_209_lost_tower_5f.s +++ b/res/field/scripts/scripts_route_209_lost_tower_5f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_209_lost_tower_5f.h" - .data ScriptEntry _000A ScriptEntry _0072 diff --git a/res/field/scripts/scripts_route_210_grandma_wilma_house.s b/res/field/scripts/scripts_route_210_grandma_wilma_house.s index 8a5a35f282..42e835e010 100644 --- a/res/field/scripts/scripts_route_210_grandma_wilma_house.s +++ b/res/field/scripts/scripts_route_210_grandma_wilma_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_210_grandma_wilma_house.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_route_210_north.s b/res/field/scripts/scripts_route_210_north.s index 18617bf515..3e932dc7dc 100644 --- a/res/field/scripts/scripts_route_210_north.s +++ b/res/field/scripts/scripts_route_210_north.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_210_north.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_210_south.s b/res/field/scripts/scripts_route_210_south.s index 24f05c3efe..c4bcf7fcae 100644 --- a/res/field/scripts/scripts_route_210_south.s +++ b/res/field/scripts/scripts_route_210_south.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_210_south.h" - .data ScriptEntry _0079 ScriptEntry _030C diff --git a/res/field/scripts/scripts_route_211_east.s b/res/field/scripts/scripts_route_211_east.s index 83081efd4c..a7e589ed78 100644 --- a/res/field/scripts/scripts_route_211_east.s +++ b/res/field/scripts/scripts_route_211_east.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_211_east.h" - .data ScriptEntry _0012 ScriptEntry _0088 diff --git a/res/field/scripts/scripts_route_211_west.s b/res/field/scripts/scripts_route_211_west.s index 7a6345fa5a..463d2168ca 100644 --- a/res/field/scripts/scripts_route_211_west.s +++ b/res/field/scripts/scripts_route_211_west.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_211_west.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s b/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s index d7ad7bc933..c31db72ca7 100644 --- a/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s +++ b/res/field/scripts/scripts_route_212_gate_to_hearthome_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_212_gate_to_hearthome_city.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_route_212_house.s b/res/field/scripts/scripts_route_212_house.s index 1bcb604955..0d684a6f17 100644 --- a/res/field/scripts/scripts_route_212_house.s +++ b/res/field/scripts/scripts_route_212_house.s @@ -2,7 +2,6 @@ #include "generated/tutor_locations.h" #include "res/text/bank/route_212_house.h" - .data ScriptEntry _0016 ScriptEntry _001C diff --git a/res/field/scripts/scripts_route_212_north.s b/res/field/scripts/scripts_route_212_north.s index 38eff2a749..8efb7cce34 100644 --- a/res/field/scripts/scripts_route_212_north.s +++ b/res/field/scripts/scripts_route_212_north.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_212_north.h" - .data ScriptEntry _00B5 ScriptEntry _00C8 diff --git a/res/field/scripts/scripts_route_212_south.s b/res/field/scripts/scripts_route_212_south.s index 008eb6e5ab..2616bb4d14 100644 --- a/res/field/scripts/scripts_route_212_south.s +++ b/res/field/scripts/scripts_route_212_south.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_212_south.h" - .data ScriptEntry _007D ScriptEntry _0090 diff --git a/res/field/scripts/scripts_route_213.s b/res/field/scripts/scripts_route_213.s index 4e4e07b165..9c82f93150 100644 --- a/res/field/scripts/scripts_route_213.s +++ b/res/field/scripts/scripts_route_213.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_213.h" - .data ScriptEntry _0022 ScriptEntry _0078 diff --git a/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s b/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s index 978d4c8539..9ad2356cc2 100644 --- a/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s +++ b/res/field/scripts/scripts_route_213_gate_to_pastoria_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_213_gate_to_pastoria_city.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_214.s b/res/field/scripts/scripts_route_214.s index bb1a10f752..8e0c8821ad 100644 --- a/res/field/scripts/scripts_route_214.s +++ b/res/field/scripts/scripts_route_214.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _00A2 ScriptEntry _00B9 diff --git a/res/field/scripts/scripts_route_214_gate_to_veilstone_city.s b/res/field/scripts/scripts_route_214_gate_to_veilstone_city.s index 51f70f4b29..6081279f68 100644 --- a/res/field/scripts/scripts_route_214_gate_to_veilstone_city.s +++ b/res/field/scripts/scripts_route_214_gate_to_veilstone_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_214_gate_to_veilstone_city.h" - .data ScriptEntry _0068 ScriptEntry _000A diff --git a/res/field/scripts/scripts_route_215.s b/res/field/scripts/scripts_route_215.s index 31036f1c32..f8521d8ca4 100644 --- a/res/field/scripts/scripts_route_215.s +++ b/res/field/scripts/scripts_route_215.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_215.h" - .data ScriptEntry _008D ScriptEntry _00A0 diff --git a/res/field/scripts/scripts_route_215_gate_to_veilstone_city.s b/res/field/scripts/scripts_route_215_gate_to_veilstone_city.s index fa4685dda5..234f8fda93 100644 --- a/res/field/scripts/scripts_route_215_gate_to_veilstone_city.s +++ b/res/field/scripts/scripts_route_215_gate_to_veilstone_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_215_gate_to_veilstone_city.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_216.s b/res/field/scripts/scripts_route_216.s index ac72b21ce2..6a6a849774 100644 --- a/res/field/scripts/scripts_route_216.s +++ b/res/field/scripts/scripts_route_216.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_216.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_216_house.s b/res/field/scripts/scripts_route_216_house.s index 13bf835d7e..12f014eb20 100644 --- a/res/field/scripts/scripts_route_216_house.s +++ b/res/field/scripts/scripts_route_216_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_216_house.h" - .data ScriptEntry _000E ScriptEntry _0071 diff --git a/res/field/scripts/scripts_route_217.s b/res/field/scripts/scripts_route_217.s index 9eb2c6fdfe..1733f64efa 100644 --- a/res/field/scripts/scripts_route_217.s +++ b/res/field/scripts/scripts_route_217.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_217.h" - .data ScriptEntry _0012 ScriptEntry _0023 diff --git a/res/field/scripts/scripts_route_217_northeast_house.s b/res/field/scripts/scripts_route_217_northeast_house.s index a301258742..4714d47c46 100644 --- a/res/field/scripts/scripts_route_217_northeast_house.s +++ b/res/field/scripts/scripts_route_217_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_217_northeast_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_217_west_house.s b/res/field/scripts/scripts_route_217_west_house.s index 6652227dc8..388899eb35 100644 --- a/res/field/scripts/scripts_route_217_west_house.s +++ b/res/field/scripts/scripts_route_217_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_217_west_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_218.s b/res/field/scripts/scripts_route_218.s index c7648ce780..5535aa9868 100644 --- a/res/field/scripts/scripts_route_218.s +++ b/res/field/scripts/scripts_route_218.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_218.h" - .data ScriptEntry _001E ScriptEntry _0035 diff --git a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s index 2143ec1615..81f1f7eb80 100644 --- a/res/field/scripts/scripts_route_218_gate_to_canalave_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_canalave_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_218_gate_to_canalave_city.h" - .data ScriptEntry _0208 ScriptEntry _000A diff --git a/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s b/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s index 150d6e7812..b8a6ed022b 100644 --- a/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s +++ b/res/field/scripts/scripts_route_218_gate_to_jubilife_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_218_gate_to_jubilife_city.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_219.s b/res/field/scripts/scripts_route_219.s index d50795323a..9cbad48009 100644 --- a/res/field/scripts/scripts_route_219.s +++ b/res/field/scripts/scripts_route_219.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_221.s b/res/field/scripts/scripts_route_221.s index 65b29aff8e..369691a0a8 100644 --- a/res/field/scripts/scripts_route_221.s +++ b/res/field/scripts/scripts_route_221.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_221.h" - .data ScriptEntry _002E ScriptEntry _0041 diff --git a/res/field/scripts/scripts_route_221_house.s b/res/field/scripts/scripts_route_221_house.s index ad5e70ad12..4136c4d306 100644 --- a/res/field/scripts/scripts_route_221_house.s +++ b/res/field/scripts/scripts_route_221_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_221_house.h" - .data ScriptEntry _000A ScriptEntry _017A diff --git a/res/field/scripts/scripts_route_222.s b/res/field/scripts/scripts_route_222.s index bbabea87e7..fec55b4c96 100644 --- a/res/field/scripts/scripts_route_222.s +++ b/res/field/scripts/scripts_route_222.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_222.h" - .data ScriptEntry _00D7 ScriptEntry _007D diff --git a/res/field/scripts/scripts_route_222_east_house.s b/res/field/scripts/scripts_route_222_east_house.s index da209c298f..69439ad0e8 100644 --- a/res/field/scripts/scripts_route_222_east_house.s +++ b/res/field/scripts/scripts_route_222_east_house.s @@ -2,7 +2,6 @@ #include "res/text/bank/route_222_east_house.h" #include "generated/size_contest_results.h" - .data ScriptEntry Route222EastHouse_OnLoad ScriptEntry Route222EastHouse_Fisherman diff --git a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s index 06fc5ec4f5..e1874945e7 100644 --- a/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s +++ b/res/field/scripts/scripts_route_222_gate_to_sunyshore_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_222_gate_to_sunyshore_city.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_222_west_house.s b/res/field/scripts/scripts_route_222_west_house.s index bda1564d12..4ebe6db63f 100644 --- a/res/field/scripts/scripts_route_222_west_house.s +++ b/res/field/scripts/scripts_route_222_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_222_west_house.h" - .data ScriptEntry _001E ScriptEntry _0024 diff --git a/res/field/scripts/scripts_route_224.s b/res/field/scripts/scripts_route_224.s index ec996bbcdc..85e56a9212 100644 --- a/res/field/scripts/scripts_route_224.s +++ b/res/field/scripts/scripts_route_224.s @@ -3,7 +3,6 @@ #include "generated/hidden_locations.h" #include "res/text/bank/route_224.h" - .data ScriptEntry _001A ScriptEntry _0082 diff --git a/res/field/scripts/scripts_route_225.s b/res/field/scripts/scripts_route_225.s index 3e981325d3..437f0f9d95 100644 --- a/res/field/scripts/scripts_route_225.s +++ b/res/field/scripts/scripts_route_225.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_225_gate_to_fight_area.s b/res/field/scripts/scripts_route_225_gate_to_fight_area.s index 68b627bf7c..43ce45ce3f 100644 --- a/res/field/scripts/scripts_route_225_gate_to_fight_area.s +++ b/res/field/scripts/scripts_route_225_gate_to_fight_area.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_225_gate_to_fight_area.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_225_house.s b/res/field/scripts/scripts_route_225_house.s index 79a5597c8a..8292d0dc79 100644 --- a/res/field/scripts/scripts_route_225_house.s +++ b/res/field/scripts/scripts_route_225_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_225_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_226.s b/res/field/scripts/scripts_route_226.s index 3e981325d3..437f0f9d95 100644 --- a/res/field/scripts/scripts_route_226.s +++ b/res/field/scripts/scripts_route_226.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _0021 diff --git a/res/field/scripts/scripts_route_226_house.s b/res/field/scripts/scripts_route_226_house.s index 56f8f5442c..09a9c43942 100644 --- a/res/field/scripts/scripts_route_226_house.s +++ b/res/field/scripts/scripts_route_226_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_226_house.h" - .data ScriptEntry _000E ScriptEntry _0014 diff --git a/res/field/scripts/scripts_route_227.s b/res/field/scripts/scripts_route_227.s index 601a042037..ba25c0b3a9 100644 --- a/res/field/scripts/scripts_route_227.s +++ b/res/field/scripts/scripts_route_227.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_227.h" - .data ScriptEntry _0012 ScriptEntry _01CC diff --git a/res/field/scripts/scripts_route_227_house.s b/res/field/scripts/scripts_route_227_house.s index 1a0f1d143b..fa866d5c15 100644 --- a/res/field/scripts/scripts_route_227_house.s +++ b/res/field/scripts/scripts_route_227_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_227_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_route_228.s b/res/field/scripts/scripts_route_228.s index 16b8ab92ad..09db2cf27a 100644 --- a/res/field/scripts/scripts_route_228.s +++ b/res/field/scripts/scripts_route_228.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _007B ScriptEntry _0092 diff --git a/res/field/scripts/scripts_route_228_gate_to_route_226.s b/res/field/scripts/scripts_route_228_gate_to_route_226.s index 64a3996d1f..6e375fae98 100644 --- a/res/field/scripts/scripts_route_228_gate_to_route_226.s +++ b/res/field/scripts/scripts_route_228_gate_to_route_226.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_228_gate_to_route_226.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_route_228_north_house.s b/res/field/scripts/scripts_route_228_north_house.s index 482da82875..e0ac664525 100644 --- a/res/field/scripts/scripts_route_228_north_house.s +++ b/res/field/scripts/scripts_route_228_north_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_228_north_house.h" - .data ScriptEntry _000A ScriptEntry _02C6 diff --git a/res/field/scripts/scripts_route_228_south_house.s b/res/field/scripts/scripts_route_228_south_house.s index c16df8ced5..0a40c425b5 100644 --- a/res/field/scripts/scripts_route_228_south_house.s +++ b/res/field/scripts/scripts_route_228_south_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_228_south_house.h" - .data ScriptEntry _0016 ScriptEntry _005F diff --git a/res/field/scripts/scripts_route_229.s b/res/field/scripts/scripts_route_229.s index a7f0db3ea0..067ee9409b 100644 --- a/res/field/scripts/scripts_route_229.s +++ b/res/field/scripts/scripts_route_229.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_229.h" - .data ScriptEntry _000A ScriptEntry _008E diff --git a/res/field/scripts/scripts_route_230.s b/res/field/scripts/scripts_route_230.s index d5afff7ecb..2d66236635 100644 --- a/res/field/scripts/scripts_route_230.s +++ b/res/field/scripts/scripts_route_230.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/route_230.h" - .data ScriptEntry _000E ScriptEntry _0025 diff --git a/res/field/scripts/scripts_ruin_maniac_cave_long.s b/res/field/scripts/scripts_ruin_maniac_cave_long.s index 38a05ce2f3..454f014997 100644 --- a/res/field/scripts/scripts_ruin_maniac_cave_long.s +++ b/res/field/scripts/scripts_ruin_maniac_cave_long.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/ruin_maniac_cave_long.h" - .data ScriptEntry _0010 ScriptEntry _000A diff --git a/res/field/scripts/scripts_ruin_maniac_cave_short.s b/res/field/scripts/scripts_ruin_maniac_cave_short.s index 1f3b33d54d..98f5b17983 100644 --- a/res/field/scripts/scripts_ruin_maniac_cave_short.s +++ b/res/field/scripts/scripts_ruin_maniac_cave_short.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/ruin_maniac_cave_short.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_sandgem_town.s b/res/field/scripts/scripts_sandgem_town.s index 88e5de570c..372a08302c 100644 --- a/res/field/scripts/scripts_sandgem_town.s +++ b/res/field/scripts/scripts_sandgem_town.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town.h" - .data ScriptEntry _0032 ScriptEntry _0085 diff --git a/res/field/scripts/scripts_sandgem_town_counterpart_house_1f.s b/res/field/scripts/scripts_sandgem_town_counterpart_house_1f.s index a5f7f69b33..57d3c89971 100644 --- a/res/field/scripts/scripts_sandgem_town_counterpart_house_1f.s +++ b/res/field/scripts/scripts_sandgem_town_counterpart_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_counterpart_house_1f.h" - .data ScriptEntry _000A ScriptEntry _003A diff --git a/res/field/scripts/scripts_sandgem_town_counterpart_house_2f.s b/res/field/scripts/scripts_sandgem_town_counterpart_house_2f.s index ee27416f45..b50004c39b 100644 --- a/res/field/scripts/scripts_sandgem_town_counterpart_house_2f.s +++ b/res/field/scripts/scripts_sandgem_town_counterpart_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_counterpart_house_2f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sandgem_town_house.s b/res/field/scripts/scripts_sandgem_town_house.s index c81244a69b..17d86ee548 100644 --- a/res/field/scripts/scripts_sandgem_town_house.s +++ b/res/field/scripts/scripts_sandgem_town_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_sandgem_town_mart.s b/res/field/scripts/scripts_sandgem_town_mart.s index dc04ace3c4..541ae0eb90 100644 --- a/res/field/scripts/scripts_sandgem_town_mart.s +++ b/res/field/scripts/scripts_sandgem_town_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s index c382d500fc..cb5991ca46 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s index adb29d78ed..a24b368685 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_pokecenter_2f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sandgem_town_pokecenter_b1f.s b/res/field/scripts/scripts_sandgem_town_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_sandgem_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_sandgem_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s index d239560ea9..b2772792f1 100644 --- a/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s +++ b/res/field/scripts/scripts_sandgem_town_pokemon_research_lab.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sandgem_town_pokemon_research_lab.h" - .data ScriptEntry _003E ScriptEntry _01AE diff --git a/res/field/scripts/scripts_sendoff_spring.s b/res/field/scripts/scripts_sendoff_spring.s index fd75f8a908..c6e714b8d7 100644 --- a/res/field/scripts/scripts_sendoff_spring.s +++ b/res/field/scripts/scripts_sendoff_spring.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sendoff_spring.h" - .data ScriptEntry _0021 ScriptEntry _00C0 diff --git a/res/field/scripts/scripts_snowpoint_city.s b/res/field/scripts/scripts_snowpoint_city.s index 06de82fc20..37535ff0e6 100644 --- a/res/field/scripts/scripts_snowpoint_city.s +++ b/res/field/scripts/scripts_snowpoint_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_city.h" - .data ScriptEntry _0032 ScriptEntry _00B4 diff --git a/res/field/scripts/scripts_snowpoint_city_east_house.s b/res/field/scripts/scripts_snowpoint_city_east_house.s index a2ab81192c..c46138a500 100644 --- a/res/field/scripts/scripts_snowpoint_city_east_house.s +++ b/res/field/scripts/scripts_snowpoint_city_east_house.s @@ -2,7 +2,6 @@ #include "generated/tutor_locations.h" #include "res/text/bank/snowpoint_city_east_house.h" - .data ScriptEntry _000A ScriptEntry _0085 diff --git a/res/field/scripts/scripts_snowpoint_city_gym.s b/res/field/scripts/scripts_snowpoint_city_gym.s index c21af90ea3..f4f3fad236 100644 --- a/res/field/scripts/scripts_snowpoint_city_gym.s +++ b/res/field/scripts/scripts_snowpoint_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_city_gym.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_snowpoint_city_mart.s b/res/field/scripts/scripts_snowpoint_city_mart.s index a300f750f7..4ad4b66060 100644 --- a/res/field/scripts/scripts_snowpoint_city_mart.s +++ b/res/field/scripts/scripts_snowpoint_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s index 7208da6985..fb76e8278d 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_city_pokecenter_1f.h" - .data ScriptEntry _0016 ScriptEntry _0022 diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_2f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_snowpoint_city_pokecenter_b1f.s b/res/field/scripts/scripts_snowpoint_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_snowpoint_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_snowpoint_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_snowpoint_city_west_house.s b/res/field/scripts/scripts_snowpoint_city_west_house.s index c2b3b3aa29..e034de0c04 100644 --- a/res/field/scripts/scripts_snowpoint_city_west_house.s +++ b/res/field/scripts/scripts_snowpoint_city_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_city_west_house.h" - .data ScriptEntry _000A ScriptEntry _0033 diff --git a/res/field/scripts/scripts_snowpoint_temple_1f.s b/res/field/scripts/scripts_snowpoint_temple_1f.s index 9f97f664f9..3d9593a702 100644 --- a/res/field/scripts/scripts_snowpoint_temple_1f.s +++ b/res/field/scripts/scripts_snowpoint_temple_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_temple_1f.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_snowpoint_temple_b5f.s b/res/field/scripts/scripts_snowpoint_temple_b5f.s index aee9b49daa..901736bbcc 100644 --- a/res/field/scripts/scripts_snowpoint_temple_b5f.s +++ b/res/field/scripts/scripts_snowpoint_temple_b5f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/snowpoint_temple_b5f.h" - .data ScriptEntry _000A ScriptEntry _0025 diff --git a/res/field/scripts/scripts_solaceon_ruins_maniac_tunnel_room.s b/res/field/scripts/scripts_solaceon_ruins_maniac_tunnel_room.s index b3f03c288d..7f9c2b45a0 100644 --- a/res/field/scripts/scripts_solaceon_ruins_maniac_tunnel_room.s +++ b/res/field/scripts/scripts_solaceon_ruins_maniac_tunnel_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_ruins_maniac_tunnel_room.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_solaceon_ruins_room_1.s b/res/field/scripts/scripts_solaceon_ruins_room_1.s index a2f4fc50c0..c18f773539 100644 --- a/res/field/scripts/scripts_solaceon_ruins_room_1.s +++ b/res/field/scripts/scripts_solaceon_ruins_room_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_ruins_room_1.h" - .data ScriptEntry _000A ScriptEntry _0010 diff --git a/res/field/scripts/scripts_solaceon_ruins_room_2.s b/res/field/scripts/scripts_solaceon_ruins_room_2.s index 904c90ac2b..a99e48b241 100644 --- a/res/field/scripts/scripts_solaceon_ruins_room_2.s +++ b/res/field/scripts/scripts_solaceon_ruins_room_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_ruins_room_2.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_solaceon_ruins_room_7.s b/res/field/scripts/scripts_solaceon_ruins_room_7.s index 49ca69b7d6..80b533abf4 100644 --- a/res/field/scripts/scripts_solaceon_ruins_room_7.s +++ b/res/field/scripts/scripts_solaceon_ruins_room_7.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_ruins_room_7.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_solaceon_town.s b/res/field/scripts/scripts_solaceon_town.s index 2dae877241..e3e843450a 100644 --- a/res/field/scripts/scripts_solaceon_town.s +++ b/res/field/scripts/scripts_solaceon_town.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town.h" - .data ScriptEntry _004F ScriptEntry _0062 diff --git a/res/field/scripts/scripts_solaceon_town_east_house.s b/res/field/scripts/scripts_solaceon_town_east_house.s index 4dc9802321..004dce14ff 100644 --- a/res/field/scripts/scripts_solaceon_town_east_house.s +++ b/res/field/scripts/scripts_solaceon_town_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_east_house.h" - .data ScriptEntry _000C ScriptEntry _0109 diff --git a/res/field/scripts/scripts_solaceon_town_mart.s b/res/field/scripts/scripts_solaceon_town_mart.s index 6c49a2f1ad..756225380c 100644 --- a/res/field/scripts/scripts_solaceon_town_mart.s +++ b/res/field/scripts/scripts_solaceon_town_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_solaceon_town_north_house.s b/res/field/scripts/scripts_solaceon_town_north_house.s index aba20af91e..ce93b18a8f 100644 --- a/res/field/scripts/scripts_solaceon_town_north_house.s +++ b/res/field/scripts/scripts_solaceon_town_north_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_north_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_solaceon_town_northeast_house.s b/res/field/scripts/scripts_solaceon_town_northeast_house.s index 9be04f4c62..d94f37abed 100644 --- a/res/field/scripts/scripts_solaceon_town_northeast_house.s +++ b/res/field/scripts/scripts_solaceon_town_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_northeast_house.h" - .data ScriptEntry _000A ScriptEntry _002C diff --git a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s index c60b199015..6e4b52387e 100644 --- a/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s +++ b/res/field/scripts/scripts_solaceon_town_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_solaceon_town_pokecenter_2f.s b/res/field/scripts/scripts_solaceon_town_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_solaceon_town_pokecenter_2f.s +++ b/res/field/scripts/scripts_solaceon_town_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_solaceon_town_pokecenter_b1f.s b/res/field/scripts/scripts_solaceon_town_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_solaceon_town_pokecenter_b1f.s +++ b/res/field/scripts/scripts_solaceon_town_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s b/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s index 0a9170664f..48919e88dd 100644 --- a/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s +++ b/res/field/scripts/scripts_solaceon_town_pokemon_news_press.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/solaceon_town_pokemon_news_press.h" - .data ScriptEntry _000E ScriptEntry _02BB diff --git a/res/field/scripts/scripts_spear_pillar.s b/res/field/scripts/scripts_spear_pillar.s index c4f5e25ec1..a1c6b475d3 100644 --- a/res/field/scripts/scripts_spear_pillar.s +++ b/res/field/scripts/scripts_spear_pillar.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/spear_pillar.h" - .data ScriptEntry _0022 ScriptEntry _0107 diff --git a/res/field/scripts/scripts_spear_pillar_dialga.s b/res/field/scripts/scripts_spear_pillar_dialga.s index cde8cdbaec..44c568d7e2 100644 --- a/res/field/scripts/scripts_spear_pillar_dialga.s +++ b/res/field/scripts/scripts_spear_pillar_dialga.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/spear_pillar_dialga.h" - .data ScriptEntry _0077 ScriptEntry _000A diff --git a/res/field/scripts/scripts_spear_pillar_distorted.s b/res/field/scripts/scripts_spear_pillar_distorted.s index 48ac93c9dd..847f15783f 100644 --- a/res/field/scripts/scripts_spear_pillar_distorted.s +++ b/res/field/scripts/scripts_spear_pillar_distorted.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/spear_pillar_distorted.h" - .data ScriptEntry _0022 ScriptEntry _0184 diff --git a/res/field/scripts/scripts_spear_pillar_palkia.s b/res/field/scripts/scripts_spear_pillar_palkia.s index c9414eeadb..d4f414540f 100644 --- a/res/field/scripts/scripts_spear_pillar_palkia.s +++ b/res/field/scripts/scripts_spear_pillar_palkia.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/spear_pillar_palkia.h" - .data ScriptEntry _0077 ScriptEntry _000A diff --git a/res/field/scripts/scripts_stark_mountain_outside.s b/res/field/scripts/scripts_stark_mountain_outside.s index 00d58bc25e..91c1cd114d 100644 --- a/res/field/scripts/scripts_stark_mountain_outside.s +++ b/res/field/scripts/scripts_stark_mountain_outside.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/stark_mountain_outside.h" - .data ScriptEntry _0012 ScriptEntry _0018 diff --git a/res/field/scripts/scripts_stark_mountain_room_1.s b/res/field/scripts/scripts_stark_mountain_room_1.s index 89eb85be1b..bd66e062c6 100644 --- a/res/field/scripts/scripts_stark_mountain_room_1.s +++ b/res/field/scripts/scripts_stark_mountain_room_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/stark_mountain_room_1.h" - .data ScriptEntry _000A ScriptEntry _0014 diff --git a/res/field/scripts/scripts_stark_mountain_room_2.s b/res/field/scripts/scripts_stark_mountain_room_2.s index 682a053d83..6768c7ddcc 100644 --- a/res/field/scripts/scripts_stark_mountain_room_2.s +++ b/res/field/scripts/scripts_stark_mountain_room_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/stark_mountain_room_2.h" - .data ScriptEntry _0031 ScriptEntry _00FC diff --git a/res/field/scripts/scripts_stark_mountain_room_3.s b/res/field/scripts/scripts_stark_mountain_room_3.s index cf54040b0f..1b51d7d70d 100644 --- a/res/field/scripts/scripts_stark_mountain_room_3.s +++ b/res/field/scripts/scripts_stark_mountain_room_3.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/stark_mountain_room_3.h" - .data ScriptEntry _0016 ScriptEntry _0089 diff --git a/res/field/scripts/scripts_sunyshore_city.s b/res/field/scripts/scripts_sunyshore_city.s index 8d05d58b1a..36ebc6e879 100644 --- a/res/field/scripts/scripts_sunyshore_city.s +++ b/res/field/scripts/scripts_sunyshore_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city.h" - .data ScriptEntry _0593 ScriptEntry _0680 diff --git a/res/field/scripts/scripts_sunyshore_city_east_house.s b/res/field/scripts/scripts_sunyshore_city_east_house.s index d6374d7e96..63540fd00d 100644 --- a/res/field/scripts/scripts_sunyshore_city_east_house.s +++ b/res/field/scripts/scripts_sunyshore_city_east_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_east_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_gym_room_1.s b/res/field/scripts/scripts_sunyshore_city_gym_room_1.s index 345f792982..0ab12febe1 100644 --- a/res/field/scripts/scripts_sunyshore_city_gym_room_1.s +++ b/res/field/scripts/scripts_sunyshore_city_gym_room_1.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_gym_room_1.h" - .data ScriptEntry _0012 ScriptEntry _001D diff --git a/res/field/scripts/scripts_sunyshore_city_gym_room_2.s b/res/field/scripts/scripts_sunyshore_city_gym_room_2.s index 753b6bf6ac..d31131b0c4 100644 --- a/res/field/scripts/scripts_sunyshore_city_gym_room_2.s +++ b/res/field/scripts/scripts_sunyshore_city_gym_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0012 ScriptEntry _001D diff --git a/res/field/scripts/scripts_sunyshore_city_gym_room_3.s b/res/field/scripts/scripts_sunyshore_city_gym_room_3.s index 173f92715f..372de72420 100644 --- a/res/field/scripts/scripts_sunyshore_city_gym_room_3.s +++ b/res/field/scripts/scripts_sunyshore_city_gym_room_3.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_gym_room_3.h" - .data ScriptEntry _0012 ScriptEntry _001D diff --git a/res/field/scripts/scripts_sunyshore_city_mart.s b/res/field/scripts/scripts_sunyshore_city_mart.s index 5e79917053..13a93099ad 100644 --- a/res/field/scripts/scripts_sunyshore_city_mart.s +++ b/res/field/scripts/scripts_sunyshore_city_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_sunyshore_city_northeast_house.s b/res/field/scripts/scripts_sunyshore_city_northeast_house.s index 4172cd039a..06103d086b 100644 --- a/res/field/scripts/scripts_sunyshore_city_northeast_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northeast_house.s @@ -2,7 +2,6 @@ #include "res/text/bank/sunyshore_city_northeast_house.h" #include "generated/ribbons.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_northwest_house.s b/res/field/scripts/scripts_sunyshore_city_northwest_house.s index 3bf163d1fa..7a973072a4 100644 --- a/res/field/scripts/scripts_sunyshore_city_northwest_house.s +++ b/res/field/scripts/scripts_sunyshore_city_northwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_northwest_house.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s index ee51c2a430..23f8963223 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_2f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_pokecenter_b1f.s b/res/field/scripts/scripts_sunyshore_city_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_sunyshore_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_sunyshore_city_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s b/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s +++ b/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s b/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s +++ b/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_sunyshore_city_west_house.s b/res/field/scripts/scripts_sunyshore_city_west_house.s index 9d8caec1d2..adda7f94c1 100644 --- a/res/field/scripts/scripts_sunyshore_city_west_house.s +++ b/res/field/scripts/scripts_sunyshore_city_west_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/sunyshore_city_west_house.h" - .data ScriptEntry _001E ScriptEntry _0031 diff --git a/res/field/scripts/scripts_sunyshore_market.s b/res/field/scripts/scripts_sunyshore_market.s index 2ff5d6da7c..1c039bbf4e 100644 --- a/res/field/scripts/scripts_sunyshore_market.s +++ b/res/field/scripts/scripts_sunyshore_market.s @@ -2,7 +2,6 @@ #include "res/text/bank/sunyshore_market.h" #include "generated/ribbons.h" - .data ScriptEntry _001A ScriptEntry _0096 diff --git a/res/field/scripts/scripts_survival_area.s b/res/field/scripts/scripts_survival_area.s index 384d46ed12..86218d0e12 100644 --- a/res/field/scripts/scripts_survival_area.s +++ b/res/field/scripts/scripts_survival_area.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/survival_area.h" - .data ScriptEntry _005C ScriptEntry _006F diff --git a/res/field/scripts/scripts_survival_area_mart.s b/res/field/scripts/scripts_survival_area_mart.s index 336e55ab2b..26e7b1711b 100644 --- a/res/field/scripts/scripts_survival_area_mart.s +++ b/res/field/scripts/scripts_survival_area_mart.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/survival_area_mart.h" - .data ScriptEntry _0012 ScriptEntry _0028 diff --git a/res/field/scripts/scripts_survival_area_north_house.s b/res/field/scripts/scripts_survival_area_north_house.s index 0fa9b10349..aac6b9486d 100644 --- a/res/field/scripts/scripts_survival_area_north_house.s +++ b/res/field/scripts/scripts_survival_area_north_house.s @@ -2,7 +2,6 @@ #include "generated/tutor_locations.h" #include "res/text/bank/survival_area_north_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_survival_area_pokecenter_1f.s b/res/field/scripts/scripts_survival_area_pokecenter_1f.s index 8261e5267b..e521b09743 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_1f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/survival_area_pokecenter_1f.h" - .data ScriptEntry _0012 ScriptEntry _001E diff --git a/res/field/scripts/scripts_survival_area_pokecenter_2f.s b/res/field/scripts/scripts_survival_area_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_2f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_survival_area_pokecenter_b1f.s b/res/field/scripts/scripts_survival_area_pokecenter_b1f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_survival_area_pokecenter_b1f.s +++ b/res/field/scripts/scripts_survival_area_pokecenter_b1f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_survival_area_south_house.s b/res/field/scripts/scripts_survival_area_south_house.s index 3ecc0e5e91..2fbe9ac937 100644 --- a/res/field/scripts/scripts_survival_area_south_house.s +++ b/res/field/scripts/scripts_survival_area_south_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/survival_area_south_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s index 87528fb872..e07b2c5a76 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_1f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_1f.s @@ -2,7 +2,6 @@ #include "generated/distribution_events.h" #include "res/text/bank/team_galactic_eterna_building_1f.h" - .data ScriptEntry _0020 ScriptEntry _0033 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_2f.s b/res/field/scripts/scripts_team_galactic_eterna_building_2f.s index c9b1fb4a93..ead3ecc707 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_2f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/team_galactic_eterna_building_2f.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_3f.s b/res/field/scripts/scripts_team_galactic_eterna_building_3f.s index 0c7dcff5db..2305ced269 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_3f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/team_galactic_eterna_building_3f.h" - .data ScriptEntry _000A ScriptEntry _001D diff --git a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s index abc479ae89..46787ffb2b 100644 --- a/res/field/scripts/scripts_team_galactic_eterna_building_4f.s +++ b/res/field/scripts/scripts_team_galactic_eterna_building_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/team_galactic_eterna_building_4f.h" - .data ScriptEntry _001A ScriptEntry _0022 diff --git a/res/field/scripts/scripts_trainers_school.s b/res/field/scripts/scripts_trainers_school.s index f5e32ef62a..7e223d7da4 100644 --- a/res/field/scripts/scripts_trainers_school.s +++ b/res/field/scripts/scripts_trainers_school.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/trainers_school.h" - .data ScriptEntry _0032 ScriptEntry _0154 diff --git a/res/field/scripts/scripts_turnback_cave_entrance.s b/res/field/scripts/scripts_turnback_cave_entrance.s index 7b6fbad02f..52c1975540 100644 --- a/res/field/scripts/scripts_turnback_cave_entrance.s +++ b/res/field/scripts/scripts_turnback_cave_entrance.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/turnback_cave_entrance.h" - .data ScriptEntry _000A ScriptEntry _002A diff --git a/res/field/scripts/scripts_turnback_cave_giratina_room.s b/res/field/scripts/scripts_turnback_cave_giratina_room.s index d6d39dec0d..8fad3f8cc2 100644 --- a/res/field/scripts/scripts_turnback_cave_giratina_room.s +++ b/res/field/scripts/scripts_turnback_cave_giratina_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/turnback_cave_giratina_room.h" - .data ScriptEntry _001C ScriptEntry _0037 diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_1.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_1.s index 735d6605a4..be2a6461cf 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_1.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_2.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_2.s index 735d6605a4..be2a6461cf 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_2.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_3.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_3.s index 735d6605a4..be2a6461cf 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_3.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_4.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_4.s index 06258df5e4..2f04a4959e 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_4.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_5.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_5.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_5.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_1_room_6.s b/res/field/scripts/scripts_turnback_cave_pillar_1_room_6.s index 06258df5e4..2f04a4959e 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_1_room_6.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_1_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_1.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_1.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_1.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_2.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_2.s index 06258df5e4..2f04a4959e 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_2.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_3.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_3.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_3.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_4.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_4.s index 06258df5e4..2f04a4959e 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_4.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_5.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_5.s index 06258df5e4..2f04a4959e 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_5.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_2_room_6.s b/res/field/scripts/scripts_turnback_cave_pillar_2_room_6.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_2_room_6.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_2_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_1.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_1.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_1.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_1.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_2.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_2.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_2.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_2.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_3.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_3.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_3.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_3.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_4.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_4.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_4.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_4.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_5.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_5.s index 3bb4ba0c66..9012f3976d 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_5.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_5.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_3_room_6.s b/res/field/scripts/scripts_turnback_cave_pillar_3_room_6.s index 735d6605a4..be2a6461cf 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_3_room_6.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_3_room_6.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_turnback_cave_pillar_room.s b/res/field/scripts/scripts_turnback_cave_pillar_room.s index b8a9791eec..2e39301674 100644 --- a/res/field/scripts/scripts_turnback_cave_pillar_room.s +++ b/res/field/scripts/scripts_turnback_cave_pillar_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/turnback_cave_pillar_room.h" - .data ScriptEntry _000A ScriptEntry _0026 diff --git a/res/field/scripts/scripts_twinleaf_town.s b/res/field/scripts/scripts_twinleaf_town.s index a18a1c299c..8e179a8eb4 100644 --- a/res/field/scripts/scripts_twinleaf_town.s +++ b/res/field/scripts/scripts_twinleaf_town.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town.h" - .data ScriptEntry _0026 ScriptEntry _04D0 diff --git a/res/field/scripts/scripts_twinleaf_town_northeast_house.s b/res/field/scripts/scripts_twinleaf_town_northeast_house.s index 7d15dc7c45..5aa35774df 100644 --- a/res/field/scripts/scripts_twinleaf_town_northeast_house.s +++ b/res/field/scripts/scripts_twinleaf_town_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_northeast_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s index ad5d4faa59..e442ff576b 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_player_house_1f.h" - .data ScriptEntry _002E ScriptEntry _0064 diff --git a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s index 37be4b6413..01af9b2388 100644 --- a/res/field/scripts/scripts_twinleaf_town_player_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_player_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_player_house_2f.h" - .data ScriptEntry _005D ScriptEntry _006E diff --git a/res/field/scripts/scripts_twinleaf_town_rival_house_1f.s b/res/field/scripts/scripts_twinleaf_town_rival_house_1f.s index d78f3a67f1..9ea11d0ddf 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_1f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_rival_house_1f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s index 51a9373dd7..dd47e21814 100644 --- a/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s +++ b/res/field/scripts/scripts_twinleaf_town_rival_house_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_rival_house_2f.h" - .data ScriptEntry _000E ScriptEntry _0090 diff --git a/res/field/scripts/scripts_twinleaf_town_southwest_house.s b/res/field/scripts/scripts_twinleaf_town_southwest_house.s index 0608277d67..00a421ad9d 100644 --- a/res/field/scripts/scripts_twinleaf_town_southwest_house.s +++ b/res/field/scripts/scripts_twinleaf_town_southwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/twinleaf_town_southwest_house.h" - .data ScriptEntry _000A ScriptEntry _0033 diff --git a/res/field/scripts/scripts_underground.s b/res/field/scripts/scripts_underground.s index a837e85f35..59092aab4a 100644 --- a/res/field/scripts/scripts_underground.s +++ b/res/field/scripts/scripts_underground.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _001A ScriptEntry _00BE diff --git a/res/field/scripts/scripts_union_room.s b/res/field/scripts/scripts_union_room.s index daff00d7da..34fd59ab93 100644 --- a/res/field/scripts/scripts_union_room.s +++ b/res/field/scripts/scripts_union_room.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/union_room.h" - .data ScriptEntry _0022 ScriptEntry _0024 diff --git a/res/field/scripts/scripts_unk_0000.s b/res/field/scripts/scripts_unk_0000.s index 5a2315f70b..d1501fbaae 100644 --- a/res/field/scripts/scripts_unk_0000.s +++ b/res/field/scripts/scripts_unk_0000.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0011.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_unk_0001.s b/res/field/scripts/scripts_unk_0001.s index 09b0ad9f26..5c716145df 100644 --- a/res/field/scripts/scripts_unk_0001.s +++ b/res/field/scripts/scripts_unk_0001.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0017.h" - .data ScriptEntry _0026 ScriptEntry _0037 diff --git a/res/field/scripts/scripts_unk_0022.s b/res/field/scripts/scripts_unk_0022.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0022.s +++ b/res/field/scripts/scripts_unk_0022.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0173.s b/res/field/scripts/scripts_unk_0173.s index d716591ac7..82bd7d2d77 100644 --- a/res/field/scripts/scripts_unk_0173.s +++ b/res/field/scripts/scripts_unk_0173.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0210.s b/res/field/scripts/scripts_unk_0210.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0210.s +++ b/res/field/scripts/scripts_unk_0210.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0212.s b/res/field/scripts/scripts_unk_0212.s index 1e1cb77c60..505b2d984f 100644 --- a/res/field/scripts/scripts_unk_0212.s +++ b/res/field/scripts/scripts_unk_0212.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0217.h" - .data ScriptEntry _0036 ScriptEntry _0148 diff --git a/res/field/scripts/scripts_unk_0213.s b/res/field/scripts/scripts_unk_0213.s index 7041d37f88..b191c6c8f6 100644 --- a/res/field/scripts/scripts_unk_0213.s +++ b/res/field/scripts/scripts_unk_0213.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0221.h" - .data ScriptEntry _0046 ScriptEntry _0108 diff --git a/res/field/scripts/scripts_unk_0222.s b/res/field/scripts/scripts_unk_0222.s index 91fd2dd9dd..c17b434600 100644 --- a/res/field/scripts/scripts_unk_0222.s +++ b/res/field/scripts/scripts_unk_0222.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0225.s b/res/field/scripts/scripts_unk_0225.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0225.s +++ b/res/field/scripts/scripts_unk_0225.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0226.s b/res/field/scripts/scripts_unk_0226.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0226.s +++ b/res/field/scripts/scripts_unk_0226.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0227.s b/res/field/scripts/scripts_unk_0227.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0227.s +++ b/res/field/scripts/scripts_unk_0227.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0228.s b/res/field/scripts/scripts_unk_0228.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0228.s +++ b/res/field/scripts/scripts_unk_0228.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0229.s b/res/field/scripts/scripts_unk_0229.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0229.s +++ b/res/field/scripts/scripts_unk_0229.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0230.s b/res/field/scripts/scripts_unk_0230.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0230.s +++ b/res/field/scripts/scripts_unk_0230.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0235.s b/res/field/scripts/scripts_unk_0235.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0235.s +++ b/res/field/scripts/scripts_unk_0235.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0241.s b/res/field/scripts/scripts_unk_0241.s index b14efd26ff..42ff627abd 100644 --- a/res/field/scripts/scripts_unk_0241.s +++ b/res/field/scripts/scripts_unk_0241.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0242.s b/res/field/scripts/scripts_unk_0242.s index b7fe8ddd24..97637780d9 100644 --- a/res/field/scripts/scripts_unk_0242.s +++ b/res/field/scripts/scripts_unk_0242.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0032 ScriptEntry _0034 diff --git a/res/field/scripts/scripts_unk_0251.s b/res/field/scripts/scripts_unk_0251.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0251.s +++ b/res/field/scripts/scripts_unk_0251.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0252.s b/res/field/scripts/scripts_unk_0252.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0252.s +++ b/res/field/scripts/scripts_unk_0252.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0254.s b/res/field/scripts/scripts_unk_0254.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0254.s +++ b/res/field/scripts/scripts_unk_0254.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0255.s b/res/field/scripts/scripts_unk_0255.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0255.s +++ b/res/field/scripts/scripts_unk_0255.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0256.s b/res/field/scripts/scripts_unk_0256.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0256.s +++ b/res/field/scripts/scripts_unk_0256.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0257.s b/res/field/scripts/scripts_unk_0257.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0257.s +++ b/res/field/scripts/scripts_unk_0257.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0258.s b/res/field/scripts/scripts_unk_0258.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0258.s +++ b/res/field/scripts/scripts_unk_0258.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0259.s b/res/field/scripts/scripts_unk_0259.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0259.s +++ b/res/field/scripts/scripts_unk_0259.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0260.s b/res/field/scripts/scripts_unk_0260.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0260.s +++ b/res/field/scripts/scripts_unk_0260.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0261.s b/res/field/scripts/scripts_unk_0261.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0261.s +++ b/res/field/scripts/scripts_unk_0261.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0262.s b/res/field/scripts/scripts_unk_0262.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0262.s +++ b/res/field/scripts/scripts_unk_0262.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0263.s b/res/field/scripts/scripts_unk_0263.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0263.s +++ b/res/field/scripts/scripts_unk_0263.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0265.s b/res/field/scripts/scripts_unk_0265.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0265.s +++ b/res/field/scripts/scripts_unk_0265.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0266.s b/res/field/scripts/scripts_unk_0266.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0266.s +++ b/res/field/scripts/scripts_unk_0266.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0268.s b/res/field/scripts/scripts_unk_0268.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0268.s +++ b/res/field/scripts/scripts_unk_0268.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0269.s b/res/field/scripts/scripts_unk_0269.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0269.s +++ b/res/field/scripts/scripts_unk_0269.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0271.s b/res/field/scripts/scripts_unk_0271.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0271.s +++ b/res/field/scripts/scripts_unk_0271.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0272.s b/res/field/scripts/scripts_unk_0272.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0272.s +++ b/res/field/scripts/scripts_unk_0272.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0276.s b/res/field/scripts/scripts_unk_0276.s index 7fdf3ac142..9088ed56a5 100644 --- a/res/field/scripts/scripts_unk_0276.s +++ b/res/field/scripts/scripts_unk_0276.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _000C diff --git a/res/field/scripts/scripts_unk_0287.s b/res/field/scripts/scripts_unk_0287.s index 3ee1f6d8e6..51a9d5181b 100644 --- a/res/field/scripts/scripts_unk_0287.s +++ b/res/field/scripts/scripts_unk_0287.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0311.s b/res/field/scripts/scripts_unk_0311.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0311.s +++ b/res/field/scripts/scripts_unk_0311.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0313.s b/res/field/scripts/scripts_unk_0313.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0313.s +++ b/res/field/scripts/scripts_unk_0313.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0314.s b/res/field/scripts/scripts_unk_0314.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0314.s +++ b/res/field/scripts/scripts_unk_0314.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0315.s b/res/field/scripts/scripts_unk_0315.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0315.s +++ b/res/field/scripts/scripts_unk_0315.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0316.s b/res/field/scripts/scripts_unk_0316.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0316.s +++ b/res/field/scripts/scripts_unk_0316.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0319.s b/res/field/scripts/scripts_unk_0319.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0319.s +++ b/res/field/scripts/scripts_unk_0319.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0323.s b/res/field/scripts/scripts_unk_0323.s index 9ebe568ba9..c00092c1ba 100644 --- a/res/field/scripts/scripts_unk_0323.s +++ b/res/field/scripts/scripts_unk_0323.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0326.s b/res/field/scripts/scripts_unk_0326.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0326.s +++ b/res/field/scripts/scripts_unk_0326.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0328.s b/res/field/scripts/scripts_unk_0328.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0328.s +++ b/res/field/scripts/scripts_unk_0328.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0335.s b/res/field/scripts/scripts_unk_0335.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0335.s +++ b/res/field/scripts/scripts_unk_0335.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0336.s b/res/field/scripts/scripts_unk_0336.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0336.s +++ b/res/field/scripts/scripts_unk_0336.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0338.s b/res/field/scripts/scripts_unk_0338.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0338.s +++ b/res/field/scripts/scripts_unk_0338.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0340.s b/res/field/scripts/scripts_unk_0340.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0340.s +++ b/res/field/scripts/scripts_unk_0340.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0350.s b/res/field/scripts/scripts_unk_0350.s index 45919c6e1e..f6f1927fec 100644 --- a/res/field/scripts/scripts_unk_0350.s +++ b/res/field/scripts/scripts_unk_0350.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0354.s b/res/field/scripts/scripts_unk_0354.s index f572b94f89..1a28a50d43 100644 --- a/res/field/scripts/scripts_unk_0354.s +++ b/res/field/scripts/scripts_unk_0354.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0358.s b/res/field/scripts/scripts_unk_0358.s index 103a54e7dc..3cc56b3826 100644 --- a/res/field/scripts/scripts_unk_0358.s +++ b/res/field/scripts/scripts_unk_0358.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0366.s b/res/field/scripts/scripts_unk_0366.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0366.s +++ b/res/field/scripts/scripts_unk_0366.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0391.s b/res/field/scripts/scripts_unk_0391.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0391.s +++ b/res/field/scripts/scripts_unk_0391.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0393.s b/res/field/scripts/scripts_unk_0393.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0393.s +++ b/res/field/scripts/scripts_unk_0393.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0395.s b/res/field/scripts/scripts_unk_0395.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0395.s +++ b/res/field/scripts/scripts_unk_0395.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0397.s b/res/field/scripts/scripts_unk_0397.s index 272199a1d4..962e27ff2b 100644 --- a/res/field/scripts/scripts_unk_0397.s +++ b/res/field/scripts/scripts_unk_0397.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/common_strings.h" - .data ScriptEntry _0022 ScriptEntry _002E diff --git a/res/field/scripts/scripts_unk_0402.s b/res/field/scripts/scripts_unk_0402.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0402.s +++ b/res/field/scripts/scripts_unk_0402.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0403.s b/res/field/scripts/scripts_unk_0403.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0403.s +++ b/res/field/scripts/scripts_unk_0403.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0404.s b/res/field/scripts/scripts_unk_0404.s index cbfeabdb34..a5171d32d5 100644 --- a/res/field/scripts/scripts_unk_0404.s +++ b/res/field/scripts/scripts_unk_0404.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0369.h" - .data ScriptEntry _0522 ScriptEntry _0536 diff --git a/res/field/scripts/scripts_unk_0405.s b/res/field/scripts/scripts_unk_0405.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0405.s +++ b/res/field/scripts/scripts_unk_0405.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0406.s b/res/field/scripts/scripts_unk_0406.s index 32c3f75287..6371c5fbda 100644 --- a/res/field/scripts/scripts_unk_0406.s +++ b/res/field/scripts/scripts_unk_0406.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0374.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0407.s b/res/field/scripts/scripts_unk_0407.s index 5f4e4de568..4839a8f351 100644 --- a/res/field/scripts/scripts_unk_0407.s +++ b/res/field/scripts/scripts_unk_0407.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/mystery_gift_deliveryman.h" - .data ScriptEntry _000A ScriptEntry _0035 diff --git a/res/field/scripts/scripts_unk_0408.s b/res/field/scripts/scripts_unk_0408.s index 6edfbd9917..0123a24f42 100644 --- a/res/field/scripts/scripts_unk_0408.s +++ b/res/field/scripts/scripts_unk_0408.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0380.h" - .data ScriptEntry _0472 ScriptEntry _0472 diff --git a/res/field/scripts/scripts_unk_0411.s b/res/field/scripts/scripts_unk_0411.s index 6962c15b7e..1c41f853c3 100644 --- a/res/field/scripts/scripts_unk_0411.s +++ b/res/field/scripts/scripts_unk_0411.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0383.h" - .data ScriptEntry _0012 ScriptEntry _00AB diff --git a/res/field/scripts/scripts_unk_0413.s b/res/field/scripts/scripts_unk_0413.s index bfff5dcf9b..b4a99ecc1e 100644 --- a/res/field/scripts/scripts_unk_0413.s +++ b/res/field/scripts/scripts_unk_0413.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/berry_trees.h" - .data ScriptEntry _0012 ScriptEntry _055F diff --git a/res/field/scripts/scripts_unk_0421.s b/res/field/scripts/scripts_unk_0421.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0421.s +++ b/res/field/scripts/scripts_unk_0421.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0423.s b/res/field/scripts/scripts_unk_0423.s index ae144f1eb7..421b095628 100644 --- a/res/field/scripts/scripts_unk_0423.s +++ b/res/field/scripts/scripts_unk_0423.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0430.h" - .data ScriptEntry _001A ScriptEntry _00F4 diff --git a/res/field/scripts/scripts_unk_0424.s b/res/field/scripts/scripts_unk_0424.s index 0177d33684..6459a54578 100644 --- a/res/field/scripts/scripts_unk_0424.s +++ b/res/field/scripts/scripts_unk_0424.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0431.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0425.s b/res/field/scripts/scripts_unk_0425.s index a69f703a6d..acf67946a2 100644 --- a/res/field/scripts/scripts_unk_0425.s +++ b/res/field/scripts/scripts_unk_0425.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0007.h" - .data ScriptEntry _000A ScriptEntry _001C diff --git a/res/field/scripts/scripts_unk_0426.s b/res/field/scripts/scripts_unk_0426.s index 850dee5b51..877dbc01eb 100644 --- a/res/field/scripts/scripts_unk_0426.s +++ b/res/field/scripts/scripts_unk_0426.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0432.h" - .data ScriptEntry _0008 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0443.s b/res/field/scripts/scripts_unk_0443.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0443.s +++ b/res/field/scripts/scripts_unk_0443.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0444.s b/res/field/scripts/scripts_unk_0444.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0444.s +++ b/res/field/scripts/scripts_unk_0444.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0445.s b/res/field/scripts/scripts_unk_0445.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0445.s +++ b/res/field/scripts/scripts_unk_0445.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0488.s b/res/field/scripts/scripts_unk_0488.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0488.s +++ b/res/field/scripts/scripts_unk_0488.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0496.s b/res/field/scripts/scripts_unk_0496.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_0496.s +++ b/res/field/scripts/scripts_unk_0496.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0497.s b/res/field/scripts/scripts_unk_0497.s index 326daa0187..6444b4fc4e 100644 --- a/res/field/scripts/scripts_unk_0497.s +++ b/res/field/scripts/scripts_unk_0497.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0538.h" - .data ScriptEntry _005E ScriptEntry _0062 diff --git a/res/field/scripts/scripts_unk_0498.s b/res/field/scripts/scripts_unk_0498.s index d78e2f029e..3aac934652 100644 --- a/res/field/scripts/scripts_unk_0498.s +++ b/res/field/scripts/scripts_unk_0498.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0539.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0499.s b/res/field/scripts/scripts_unk_0499.s index a97165d62c..6981113f78 100644 --- a/res/field/scripts/scripts_unk_0499.s +++ b/res/field/scripts/scripts_unk_0499.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/scratch_off_cards.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_0500.s b/res/field/scripts/scripts_unk_0500.s index 0efe06883d..dd10284715 100644 --- a/res/field/scripts/scripts_unk_0500.s +++ b/res/field/scripts/scripts_unk_0500.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0016.h" - .data ScriptEntry _001A ScriptEntry _0068 diff --git a/res/field/scripts/scripts_unk_0501.s b/res/field/scripts/scripts_unk_0501.s index 59cc0de421..46ff525c8f 100644 --- a/res/field/scripts/scripts_unk_0501.s +++ b/res/field/scripts/scripts_unk_0501.s @@ -2,7 +2,6 @@ #include "res/text/bank/unk_0547.h" #include "constants/daycare.h" - .data ScriptEntry _000A ScriptEntry _0124 diff --git a/res/field/scripts/scripts_unk_0522.s b/res/field/scripts/scripts_unk_0522.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0522.s +++ b/res/field/scripts/scripts_unk_0522.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0673.s b/res/field/scripts/scripts_unk_0673.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0673.s +++ b/res/field/scripts/scripts_unk_0673.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0710.s b/res/field/scripts/scripts_unk_0710.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0710.s +++ b/res/field/scripts/scripts_unk_0710.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0719.s b/res/field/scripts/scripts_unk_0719.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0719.s +++ b/res/field/scripts/scripts_unk_0719.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0722.s b/res/field/scripts/scripts_unk_0722.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0722.s +++ b/res/field/scripts/scripts_unk_0722.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0723.s b/res/field/scripts/scripts_unk_0723.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0723.s +++ b/res/field/scripts/scripts_unk_0723.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0724.s b/res/field/scripts/scripts_unk_0724.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0724.s +++ b/res/field/scripts/scripts_unk_0724.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0725.s b/res/field/scripts/scripts_unk_0725.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0725.s +++ b/res/field/scripts/scripts_unk_0725.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0726.s b/res/field/scripts/scripts_unk_0726.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0726.s +++ b/res/field/scripts/scripts_unk_0726.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0727.s b/res/field/scripts/scripts_unk_0727.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0727.s +++ b/res/field/scripts/scripts_unk_0727.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0732.s b/res/field/scripts/scripts_unk_0732.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0732.s +++ b/res/field/scripts/scripts_unk_0732.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0738.s b/res/field/scripts/scripts_unk_0738.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0738.s +++ b/res/field/scripts/scripts_unk_0738.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0739.s b/res/field/scripts/scripts_unk_0739.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0739.s +++ b/res/field/scripts/scripts_unk_0739.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0748.s b/res/field/scripts/scripts_unk_0748.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0748.s +++ b/res/field/scripts/scripts_unk_0748.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0749.s b/res/field/scripts/scripts_unk_0749.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0749.s +++ b/res/field/scripts/scripts_unk_0749.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0751.s b/res/field/scripts/scripts_unk_0751.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0751.s +++ b/res/field/scripts/scripts_unk_0751.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0752.s b/res/field/scripts/scripts_unk_0752.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0752.s +++ b/res/field/scripts/scripts_unk_0752.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0753.s b/res/field/scripts/scripts_unk_0753.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0753.s +++ b/res/field/scripts/scripts_unk_0753.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0754.s b/res/field/scripts/scripts_unk_0754.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0754.s +++ b/res/field/scripts/scripts_unk_0754.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0755.s b/res/field/scripts/scripts_unk_0755.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0755.s +++ b/res/field/scripts/scripts_unk_0755.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0756.s b/res/field/scripts/scripts_unk_0756.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0756.s +++ b/res/field/scripts/scripts_unk_0756.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0757.s b/res/field/scripts/scripts_unk_0757.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0757.s +++ b/res/field/scripts/scripts_unk_0757.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0758.s b/res/field/scripts/scripts_unk_0758.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0758.s +++ b/res/field/scripts/scripts_unk_0758.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0759.s b/res/field/scripts/scripts_unk_0759.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0759.s +++ b/res/field/scripts/scripts_unk_0759.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0760.s b/res/field/scripts/scripts_unk_0760.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0760.s +++ b/res/field/scripts/scripts_unk_0760.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0762.s b/res/field/scripts/scripts_unk_0762.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0762.s +++ b/res/field/scripts/scripts_unk_0762.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0763.s b/res/field/scripts/scripts_unk_0763.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0763.s +++ b/res/field/scripts/scripts_unk_0763.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0765.s b/res/field/scripts/scripts_unk_0765.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0765.s +++ b/res/field/scripts/scripts_unk_0765.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0766.s b/res/field/scripts/scripts_unk_0766.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0766.s +++ b/res/field/scripts/scripts_unk_0766.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0768.s b/res/field/scripts/scripts_unk_0768.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0768.s +++ b/res/field/scripts/scripts_unk_0768.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0769.s b/res/field/scripts/scripts_unk_0769.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0769.s +++ b/res/field/scripts/scripts_unk_0769.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0773.s b/res/field/scripts/scripts_unk_0773.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0773.s +++ b/res/field/scripts/scripts_unk_0773.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0784.s b/res/field/scripts/scripts_unk_0784.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0784.s +++ b/res/field/scripts/scripts_unk_0784.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0808.s b/res/field/scripts/scripts_unk_0808.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0808.s +++ b/res/field/scripts/scripts_unk_0808.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0810.s b/res/field/scripts/scripts_unk_0810.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0810.s +++ b/res/field/scripts/scripts_unk_0810.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0811.s b/res/field/scripts/scripts_unk_0811.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0811.s +++ b/res/field/scripts/scripts_unk_0811.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0812.s b/res/field/scripts/scripts_unk_0812.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0812.s +++ b/res/field/scripts/scripts_unk_0812.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0813.s b/res/field/scripts/scripts_unk_0813.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0813.s +++ b/res/field/scripts/scripts_unk_0813.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0816.s b/res/field/scripts/scripts_unk_0816.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0816.s +++ b/res/field/scripts/scripts_unk_0816.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0820.s b/res/field/scripts/scripts_unk_0820.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0820.s +++ b/res/field/scripts/scripts_unk_0820.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0823.s b/res/field/scripts/scripts_unk_0823.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0823.s +++ b/res/field/scripts/scripts_unk_0823.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0825.s b/res/field/scripts/scripts_unk_0825.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0825.s +++ b/res/field/scripts/scripts_unk_0825.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0832.s b/res/field/scripts/scripts_unk_0832.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0832.s +++ b/res/field/scripts/scripts_unk_0832.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0833.s b/res/field/scripts/scripts_unk_0833.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0833.s +++ b/res/field/scripts/scripts_unk_0833.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0835.s b/res/field/scripts/scripts_unk_0835.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0835.s +++ b/res/field/scripts/scripts_unk_0835.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0837.s b/res/field/scripts/scripts_unk_0837.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0837.s +++ b/res/field/scripts/scripts_unk_0837.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0847.s b/res/field/scripts/scripts_unk_0847.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0847.s +++ b/res/field/scripts/scripts_unk_0847.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0851.s b/res/field/scripts/scripts_unk_0851.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0851.s +++ b/res/field/scripts/scripts_unk_0851.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0855.s b/res/field/scripts/scripts_unk_0855.s index b2fe4956f4..62a3189564 100644 --- a/res/field/scripts/scripts_unk_0855.s +++ b/res/field/scripts/scripts_unk_0855.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 1, 0 diff --git a/res/field/scripts/scripts_unk_0863.s b/res/field/scripts/scripts_unk_0863.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0863.s +++ b/res/field/scripts/scripts_unk_0863.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0888.s b/res/field/scripts/scripts_unk_0888.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0888.s +++ b/res/field/scripts/scripts_unk_0888.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0890.s b/res/field/scripts/scripts_unk_0890.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0890.s +++ b/res/field/scripts/scripts_unk_0890.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0892.s b/res/field/scripts/scripts_unk_0892.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0892.s +++ b/res/field/scripts/scripts_unk_0892.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0896.s b/res/field/scripts/scripts_unk_0896.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0896.s +++ b/res/field/scripts/scripts_unk_0896.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0898.s b/res/field/scripts/scripts_unk_0898.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0898.s +++ b/res/field/scripts/scripts_unk_0898.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0900.s b/res/field/scripts/scripts_unk_0900.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0900.s +++ b/res/field/scripts/scripts_unk_0900.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0908.s b/res/field/scripts/scripts_unk_0908.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0908.s +++ b/res/field/scripts/scripts_unk_0908.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0925.s b/res/field/scripts/scripts_unk_0925.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0925.s +++ b/res/field/scripts/scripts_unk_0925.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0926.s b/res/field/scripts/scripts_unk_0926.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0926.s +++ b/res/field/scripts/scripts_unk_0926.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0927.s b/res/field/scripts/scripts_unk_0927.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0927.s +++ b/res/field/scripts/scripts_unk_0927.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0970.s b/res/field/scripts/scripts_unk_0970.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0970.s +++ b/res/field/scripts/scripts_unk_0970.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0978.s b/res/field/scripts/scripts_unk_0978.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0978.s +++ b/res/field/scripts/scripts_unk_0978.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0979.s b/res/field/scripts/scripts_unk_0979.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0979.s +++ b/res/field/scripts/scripts_unk_0979.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0980.s b/res/field/scripts/scripts_unk_0980.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0980.s +++ b/res/field/scripts/scripts_unk_0980.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_0981.s b/res/field/scripts/scripts_unk_0981.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_0981.s +++ b/res/field/scripts/scripts_unk_0981.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_1017.s b/res/field/scripts/scripts_unk_1017.s index 938eb624bf..1ea8bbfd70 100644 --- a/res/field/scripts/scripts_unk_1017.s +++ b/res/field/scripts/scripts_unk_1017.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 2 .short 0x27D8, 0 diff --git a/res/field/scripts/scripts_unk_1046.s b/res/field/scripts/scripts_unk_1046.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_1046.s +++ b/res/field/scripts/scripts_unk_1046.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_1047.s b/res/field/scripts/scripts_unk_1047.s index 7efe58bd77..ed8e190449 100644 --- a/res/field/scripts/scripts_unk_1047.s +++ b/res/field/scripts/scripts_unk_1047.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data .byte 0 diff --git a/res/field/scripts/scripts_unk_1051.s b/res/field/scripts/scripts_unk_1051.s index e2bb9b2083..e73948703b 100644 --- a/res/field/scripts/scripts_unk_1051.s +++ b/res/field/scripts/scripts_unk_1051.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0552.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_1087.s b/res/field/scripts/scripts_unk_1087.s index 0aae3924d4..b02f3f0d4d 100644 --- a/res/field/scripts/scripts_unk_1087.s +++ b/res/field/scripts/scripts_unk_1087.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _000A ScriptEntry _0020 diff --git a/res/field/scripts/scripts_unk_1114.s b/res/field/scripts/scripts_unk_1114.s index 77b749571e..f7e75e6396 100644 --- a/res/field/scripts/scripts_unk_1114.s +++ b/res/field/scripts/scripts_unk_1114.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/common_strings.h" - .data ScriptEntry _0E86 ScriptEntry _0E86 diff --git a/res/field/scripts/scripts_unk_1115.s b/res/field/scripts/scripts_unk_1115.s index 4f5f5a1a52..12bf3c38e9 100644 --- a/res/field/scripts/scripts_unk_1115.s +++ b/res/field/scripts/scripts_unk_1115.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0622.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_1116.s b/res/field/scripts/scripts_unk_1116.s index 0020367e6e..5a9490e91a 100644 --- a/res/field/scripts/scripts_unk_1116.s +++ b/res/field/scripts/scripts_unk_1116.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/unk_0621.h" - .data ScriptEntry _004E ScriptEntry _005A diff --git a/res/field/scripts/scripts_unk_1119.s b/res/field/scripts/scripts_unk_1119.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_1119.s +++ b/res/field/scripts/scripts_unk_1119.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_unk_1120.s b/res/field/scripts/scripts_unk_1120.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_unk_1120.s +++ b/res/field/scripts/scripts_unk_1120.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_valley_windworks_building.s b/res/field/scripts/scripts_valley_windworks_building.s index c18400e305..2e9f39f84a 100644 --- a/res/field/scripts/scripts_valley_windworks_building.s +++ b/res/field/scripts/scripts_valley_windworks_building.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/valley_windworks_building.h" - .data ScriptEntry _0022 ScriptEntry _005F diff --git a/res/field/scripts/scripts_valley_windworks_outside.s b/res/field/scripts/scripts_valley_windworks_outside.s index da1fbd8f9c..f46e3b99f0 100644 --- a/res/field/scripts/scripts_valley_windworks_outside.s +++ b/res/field/scripts/scripts_valley_windworks_outside.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/valley_windworks_outside.h" - .data ScriptEntry _0024 ScriptEntry _008A diff --git a/res/field/scripts/scripts_valor_cavern.s b/res/field/scripts/scripts_valor_cavern.s index e7848f863c..26cc558911 100644 --- a/res/field/scripts/scripts_valor_cavern.s +++ b/res/field/scripts/scripts_valor_cavern.s @@ -4,7 +4,6 @@ #define LOCALID_AZELF 0 #define LOCALID_SATURN 1 - .data ScriptEntry _0012 ScriptEntry _0042 diff --git a/res/field/scripts/scripts_valor_lakefront.s b/res/field/scripts/scripts_valor_lakefront.s index 0e2fe471bb..2e1ac6be9f 100644 --- a/res/field/scripts/scripts_valor_lakefront.s +++ b/res/field/scripts/scripts_valor_lakefront.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/valor_lakefront.h" - .data ScriptEntry _0026 ScriptEntry _0061 diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index 4c05f4d8d0..cdebd987a5 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city.h" - .data ScriptEntry _0082 ScriptEntry _0C18 diff --git a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s index 0b9d41ca8a..50b1c212a1 100644 --- a/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s +++ b/res/field/scripts/scripts_veilstone_city_galactic_warehouse.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_galactic_warehouse.h" - .data ScriptEntry _003B ScriptEntry _00D8 diff --git a/res/field/scripts/scripts_veilstone_city_gym.s b/res/field/scripts/scripts_veilstone_city_gym.s index 83e2ca709e..eba0e3ca04 100644 --- a/res/field/scripts/scripts_veilstone_city_gym.s +++ b/res/field/scripts/scripts_veilstone_city_gym.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_gym.h" - .data ScriptEntry _001E ScriptEntry _0022 diff --git a/res/field/scripts/scripts_veilstone_city_northeast_house.s b/res/field/scripts/scripts_veilstone_city_northeast_house.s index 2045f8d974..5dce0c1ee1 100644 --- a/res/field/scripts/scripts_veilstone_city_northeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_northeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_northeast_house.h" - .data ScriptEntry _000A ScriptEntry _011C diff --git a/res/field/scripts/scripts_veilstone_city_northwest_house.s b/res/field/scripts/scripts_veilstone_city_northwest_house.s index 0c53a19321..81d4d18e3d 100644 --- a/res/field/scripts/scripts_veilstone_city_northwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_northwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_northwest_house.h" - .data ScriptEntry _000E ScriptEntry _0021 diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s index 10bf47c296..6a027acc19 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_pokecenter_1f.h" - .data ScriptEntry _000E ScriptEntry _001A diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_2f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_2f.s index 6a372a9406..ac162a2b65 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_2f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_2f.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s b/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s index 5b7bde5242..af084a8cf3 100644 --- a/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s +++ b/res/field/scripts/scripts_veilstone_city_pokecenter_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_pokecenter_b1f.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_veilstone_city_prize_exchange.s b/res/field/scripts/scripts_veilstone_city_prize_exchange.s index 8bb4134b08..633d5ae3fe 100644 --- a/res/field/scripts/scripts_veilstone_city_prize_exchange.s +++ b/res/field/scripts/scripts_veilstone_city_prize_exchange.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_prize_exchange.h" - .data ScriptEntry _000E ScriptEntry _017C diff --git a/res/field/scripts/scripts_veilstone_city_southeast_house.s b/res/field/scripts/scripts_veilstone_city_southeast_house.s index c2854efb10..f07b66167b 100644 --- a/res/field/scripts/scripts_veilstone_city_southeast_house.s +++ b/res/field/scripts/scripts_veilstone_city_southeast_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_southeast_house.h" - .data ScriptEntry _000A ScriptEntry _018C diff --git a/res/field/scripts/scripts_veilstone_city_southwest_house.s b/res/field/scripts/scripts_veilstone_city_southwest_house.s index b5b976ca35..949c864db1 100644 --- a/res/field/scripts/scripts_veilstone_city_southwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_southwest_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_city_southwest_house.h" - .data ScriptEntry _000E ScriptEntry _0101 diff --git a/res/field/scripts/scripts_veilstone_store_1f.s b/res/field/scripts/scripts_veilstone_store_1f.s index ad76cbc5c5..9c85267f94 100644 --- a/res/field/scripts/scripts_veilstone_store_1f.s +++ b/res/field/scripts/scripts_veilstone_store_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_1f.h" - .data ScriptEntry _0022 ScriptEntry _0035 diff --git a/res/field/scripts/scripts_veilstone_store_2f.s b/res/field/scripts/scripts_veilstone_store_2f.s index 3e170ccfe4..4fb12870d8 100644 --- a/res/field/scripts/scripts_veilstone_store_2f.s +++ b/res/field/scripts/scripts_veilstone_store_2f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_2f.h" - .data ScriptEntry _0022 ScriptEntry _00F2 diff --git a/res/field/scripts/scripts_veilstone_store_3f.s b/res/field/scripts/scripts_veilstone_store_3f.s index fb106c29d0..d3cb45dff4 100644 --- a/res/field/scripts/scripts_veilstone_store_3f.s +++ b/res/field/scripts/scripts_veilstone_store_3f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_3f.h" - .data ScriptEntry _001E ScriptEntry _00EE diff --git a/res/field/scripts/scripts_veilstone_store_4f.s b/res/field/scripts/scripts_veilstone_store_4f.s index 325a368623..98d7f6a03b 100644 --- a/res/field/scripts/scripts_veilstone_store_4f.s +++ b/res/field/scripts/scripts_veilstone_store_4f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_4f.h" - .data ScriptEntry _001E ScriptEntry _00EE diff --git a/res/field/scripts/scripts_veilstone_store_5f.s b/res/field/scripts/scripts_veilstone_store_5f.s index c30ed00c65..6ed51bba20 100644 --- a/res/field/scripts/scripts_veilstone_store_5f.s +++ b/res/field/scripts/scripts_veilstone_store_5f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_5f.h" - .data ScriptEntry _001A ScriptEntry _002D diff --git a/res/field/scripts/scripts_veilstone_store_b1f.s b/res/field/scripts/scripts_veilstone_store_b1f.s index 2ba1f10790..ff646ca837 100644 --- a/res/field/scripts/scripts_veilstone_store_b1f.s +++ b/res/field/scripts/scripts_veilstone_store_b1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_b1f.h" - .data ScriptEntry _0032 ScriptEntry _0045 diff --git a/res/field/scripts/scripts_veilstone_store_elevator.s b/res/field/scripts/scripts_veilstone_store_elevator.s index 6c3ccd8c57..393cfd0184 100644 --- a/res/field/scripts/scripts_veilstone_store_elevator.s +++ b/res/field/scripts/scripts_veilstone_store_elevator.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/veilstone_store_elevator.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_verity_cavern.s b/res/field/scripts/scripts_verity_cavern.s index 3b5abee0ad..22d4240e1e 100644 --- a/res/field/scripts/scripts_verity_cavern.s +++ b/res/field/scripts/scripts_verity_cavern.s @@ -4,7 +4,6 @@ #define LOCALID_MESPRIT 0 #define LOCALID_ROWAN 1 - .data ScriptEntry _000A ScriptEntry VerityCavern_Mesprit diff --git a/res/field/scripts/scripts_verity_lakefront.s b/res/field/scripts/scripts_verity_lakefront.s index 59f2e3fc33..5fe2361672 100644 --- a/res/field/scripts/scripts_verity_lakefront.s +++ b/res/field/scripts/scripts_verity_lakefront.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/verity_lakefront.h" - .data ScriptEntry _0012 ScriptEntry _004E diff --git a/res/field/scripts/scripts_verity_lakefront_unknown_house.s b/res/field/scripts/scripts_verity_lakefront_unknown_house.s index 9550a40829..c4b08c5806 100644 --- a/res/field/scripts/scripts_verity_lakefront_unknown_house.s +++ b/res/field/scripts/scripts_verity_lakefront_unknown_house.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/verity_lakefront_unknown_house.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_victory_road_1f.s b/res/field/scripts/scripts_victory_road_1f.s index 9370251fe5..c8b3dd4bcb 100644 --- a/res/field/scripts/scripts_victory_road_1f.s +++ b/res/field/scripts/scripts_victory_road_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/victory_road_1f.h" - .data ScriptEntry _000A ScriptEntry _0031 diff --git a/res/field/scripts/scripts_victory_road_1f_room_2.s b/res/field/scripts/scripts_victory_road_1f_room_2.s index 09d9d1eca8..9f6e10a348 100644 --- a/res/field/scripts/scripts_victory_road_1f_room_2.s +++ b/res/field/scripts/scripts_victory_road_1f_room_2.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/victory_road_1f_room_2.h" - .data ScriptEntry _0027 ScriptEntry _0190 diff --git a/res/field/scripts/scripts_villa.s b/res/field/scripts/scripts_villa.s index ef2ac433a3..eae268545e 100644 --- a/res/field/scripts/scripts_villa.s +++ b/res/field/scripts/scripts_villa.s @@ -2,7 +2,6 @@ #include "res/text/bank/villa.h" #include "generated/string_padding_mode.h" - .data ScriptEntry _00B2 ScriptEntry _029C diff --git a/res/field/scripts/scripts_vista_lighthouse.s b/res/field/scripts/scripts_vista_lighthouse.s index a372d4c83d..109b0980a9 100644 --- a/res/field/scripts/scripts_vista_lighthouse.s +++ b/res/field/scripts/scripts_vista_lighthouse.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/vista_lighthouse.h" - .data ScriptEntry _0012 ScriptEntry _0025 diff --git a/res/field/scripts/scripts_vista_lighthouse_elevator.s b/res/field/scripts/scripts_vista_lighthouse_elevator.s index c12724a02b..691974a76e 100644 --- a/res/field/scripts/scripts_vista_lighthouse_elevator.s +++ b/res/field/scripts/scripts_vista_lighthouse_elevator.s @@ -1,6 +1,5 @@ #include "macros/scrcmd.inc" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/res/field/scripts/scripts_wayward_cave_1f.s b/res/field/scripts/scripts_wayward_cave_1f.s index ed91dcae0f..45c9fc32b2 100644 --- a/res/field/scripts/scripts_wayward_cave_1f.s +++ b/res/field/scripts/scripts_wayward_cave_1f.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/wayward_cave_1f.h" - .data ScriptEntry _0012 ScriptEntry _002B diff --git a/res/field/scripts/scripts_wifi_plaza_entrance.s b/res/field/scripts/scripts_wifi_plaza_entrance.s index 20edb61b3e..345bd974a1 100644 --- a/res/field/scripts/scripts_wifi_plaza_entrance.s +++ b/res/field/scripts/scripts_wifi_plaza_entrance.s @@ -1,7 +1,6 @@ #include "macros/scrcmd.inc" #include "res/text/bank/wifi_plaza_entrance.h" - .data ScriptEntry _0006 ScriptEntryEnd diff --git a/tools/scripts/make_script_bin.sh b/tools/scripts/make_script_bin.sh index 28ebb360d4..ddb8d0d479 100755 --- a/tools/scripts/make_script_bin.sh +++ b/tools/scripts/make_script_bin.sh @@ -17,6 +17,7 @@ INCLUDE_ARGS=() SCRIPT_FILES=() AS="arm-none-eabi-gcc" OBJCOPY="arm-none-eabi-objcopy" +LD="arm-none-eabi-ld" OUTDIR="." MD="" @@ -68,5 +69,6 @@ for script_file in "${SCRIPT_FILES[@]}" ; do # Convert + clean-up $AS $MD -c -x assembler-with-cpp "${INCLUDE_ARGS[@]}" -o "$script_obj" "$script_file" $OBJCOPY -O binary --file-alignment 4 "$script_obj" "$script_bin" - rm "$script_obj" + $LD "$script_obj" -o "$script_obj.dummy" + rm "$script_obj" "$script_obj.dummy" done